Sfoglia il codice sorgente

fixed Storage nav and dropdown z-index

Piotr Labudda 9 anni fa
parent
commit
f1aecb34fc
1 ha cambiato i file con 45 aggiunte e 44 eliminazioni
  1. 45 44
      SE/se-lib/Route/Storage.php

+ 45 - 44
SE/se-lib/Route/Storage.php

@@ -128,19 +128,20 @@ class Route_Storage extends RouteBase {
 			$onClick = "return p5UI__ButtonAjax(this, 'p5UIBtnAjax:Storage:checkObjectInstallAjax', { href: '{$ajaxCheckInstall}' })";
 			$btnCheckInstall = '<a onclick="'.$onClick.'" href="#" title="check install db tables"><i class="glyphicon glyphicon-cog"></i></a>';
 
+			UI::startContainer();
+			UI::tag('h1', [], "Obiekt <code>{$label}</code> <small>{$btnCheckInstall}</small>");
+			if (!empty($parentList)) {
+				UI::startTag('ol', ['class'=>"breadcrumb"]);
+					UI::tag('li', [], "Dziedziczy z:");
+					foreach ($linksParentList as $parentLink) {
+						UI::tag('li', [], $parentLink);
+					}
+					// <!-- <li class="active">Data</li> -->
+				UI::endTag('ol');
+				// <!-- <p> implode(", ", $parentList);</p> -->
+			}
+			// TODO: UI::table(['rows'=>array_map()]);
 ?>
-<div class="container">
-	<h1>Obiekt <code><?php echo $label; ?></code> <small><?php echo $btnCheckInstall; ?></small></h1>
-	<?php if (!empty($parentList)) : ?>
-		<ol class="breadcrumb">
-		  <li>Dziedziczy z:</li>
-			<?php foreach ($linksParentList as $parentLink) : ?>
-			  <li><?php echo $parentLink; ?></li>
-			<?php endforeach; ?>
-		  <!-- <li class="active">Data</li> -->
-		</ol>
-		<!-- <p> <?php echo implode(", ", $parentList); ?></p> -->
-	<?php endif; ?>
 	<table class="table table-bordered table-hovered">
 		<caption>Struktura:</caption>
 		<thead>
@@ -1187,38 +1188,38 @@ jQuery(document).on('p5UIBtnAjax:Storage:addBaseProces:ajaxLoaded', function(e,
 				case 'objectList': $currentLabel = "Obiekty z aktualnej domeny"; break;// TODO: domain from $_GET
 			}
 		}
-		?>
-<nav class="navbar navbar-default navbar-static-top">
-  <div class="container-fluid">
-    <div class="navbar-left">
-			<ul class="nav navbar-nav navbar-center">
-				<li><a href="<?php echo $backLink; ?>" class="btn <?php echo ($backDisabled)? 'disabled' : ''; ?>"><i class="glyphicon glyphicon-chevron-left"></i> <?php echo $backLabel; ?></a></li>
-			</ul>
-		</div>
-    <div class="navbar-left">
-			<ul class="nav navbar-nav navbar-center">
-				<li><a class="btn" href="<?php echo $currentLink; ?>"><?php echo $currentLabel; ?></a></li>
-			</ul>
-		</div>
-    <div class="navbar-right">
-<!--
-			<ul class="nav navbar-nav navbar-right">
-				<li><a href="#">Link</a></li>
-				<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
-					<ul class="dropdown-menu">
-						<li><a href="#">Action</a></li>
-						<li><a href="#">Another action</a></li>
-						<li><a href="#">Something else here</a></li>
-						<li role="separator" class="divider"></li>
-						<li><a href="#">Separated link</a></li>
-					</ul>
-				</li>
-			</ul>
--->
-		</div>
-  </div>
-</nav>
-		<?php
+		UI::startTag('nav', ['class'=>"navbar navbar-default navbar-static-top", 'style'=>"z-index:999"]);
+		UI::startTag('div', ['class'=>"container-fluid"]);
+		UI::startTag('div', ['class'=>"navbar-left"]);
+			UI::startTag('ul', ['class'=>"nav navbar-nav navbar-center"]);
+				UI::startTag('li');
+					UI::tag('a', ['href'=>$backLink, 'class'=>"btn" . ($backDisabled ? ' disabled' : '')], '<i class="glyphicon glyphicon-chevron-left"></i> ' . $backLabel);
+				UI::endTag('li');
+			UI::endTag('ul');
+		UI::endTag('div');
+		UI::startTag('div', ['class'=>"navbar-left"]);
+			UI::startTag('ul', ['class'=>"nav navbar-nav navbar-center"]);
+				UI::startTag('li');
+					UI::tag('a', ['href'=>$currentLink, 'class'=>"btn"], $currentLabel);
+				UI::endTag('li');
+			UI::endTag('ul');
+		UI::endTag('div');
+		UI::startTag('div', ['class'=>"navbar-right"]);
+			// <ul class="nav navbar-nav navbar-right">
+			// 	<li><a href="#">Link</a></li>
+			// 	<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
+			// 		<ul class="dropdown-menu">
+			// 			<li><a href="#">Action</a></li>
+			// 			<li><a href="#">Another action</a></li>
+			// 			<li><a href="#">Something else here</a></li>
+			// 			<li role="separator" class="divider"></li>
+			// 			<li><a href="#">Separated link</a></li>
+			// 		</ul>
+			// 	</li>
+			// </ul>
+		UI::endTag('div');
+		UI::endTag('div');// .container-fluid
+		UI::endTag('nav');
 	}
 
 	public function getStorageList() {