X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;ds=inline;f=index.php;h=63633b022bcbb411401e5a2e02bc86e89d66af45;hb=8acef003f115dedfe9d130cf306f63f5a0da08c3;hp=9900ba75c42afc1decab347071fc8cb96bc7c945;hpb=5895162b21c18b47ffff966184e8f2917095e6dd;p=mirrors%2FSokoMan.git

diff --git a/index.php b/index.php
index 9900ba7..63633b0 100755
--- a/index.php
+++ b/index.php
@@ -111,14 +111,18 @@ class Sklad_HTML extends HTML {
 <h1><a href="$script/">SystémSklad</a><small>$title</small></h1>
 
 <style type="text/css">
-.menu li, .menu * li {
+.menu li {
 	float: left;
-	margin: 0.2em;
+	padding: 0.2em;
+}
+
+.menu * li {
+	float: none;
 }
 
 .menu * menu {
 	position: absolute;
-	background-color: yellow;
+	padding: 0.2em;
 }
 
 .menu, .menu * menu {
@@ -126,22 +130,29 @@ class Sklad_HTML extends HTML {
 }
 
 .menu * menu {
+	border: 1px solid orange;
 	display: none;
 	margin: 0;
 }
 
-.menu li:hover menu {
+.menu li:hover menu, .menu li:hover {
 	display: block;
+	background-color: yellow;
 }
+
 </style>
 
 <div>
 	<menu class="menu">
 		<li><a href="?logout">Logout</a></li>
 		<li><a href="$script/">Home</a></li>
-		<li><a href="#">Assistants</A>
+		<li><a href="#">Assistants</a>
 			<menu>
+				<li><a href="$script/assistant/stats">stats</a></li>
 				<li><a href="$script/assistant/store">store</a></li>
+				<li><a href="$script/assistant/dispose">dispose</a></li>
+				<li><a href="$script/assistant/sell">sell</a></li>
+				<li>&darr;&darr; BETA &darr;&darr;</li>
 				<li><a href="$script/assistant/new-item">new-item</a></li>
 			</menu>
 		</li>
@@ -170,7 +181,11 @@ class Sklad_HTML extends HTML {
 	</menu>
 
 	<div style="float: right;">
-		<form action="?" method="GET">
+		<form action="$script/assistant/go" method="GET" style="float: left;"><!-- TODO: Display only when go plugin available -->
+			<input type="text" name="q" placeholder="smart id..." />
+			<input type="submit" value="go" />
+		</form>
+		<form action="?" method="GET" style="float: left;">
 			<input type="text" name="q" placeholder="regexp..." value="$search" />
 			<input type="submit" value="filter" />
 		</form>
@@ -214,7 +229,7 @@ EOF;
 		);
 		foreach($table as $id => $row) {
 			foreach($collapse as $link => $title)
-				if(isset($table[$id][$link])) {
+				if(isset($table[$id][$link]) && isset($row[$title])) {
 					$type = @array_shift(preg_split('/_/', $link));
 					if($link != $title) unset($table[$id][$link]);
 					$table[$id][$title]=$this->link($row[$title], $type.'/'.$row[$link].'/');
@@ -328,7 +343,7 @@ class Sklad_DB extends PDO {
 			'model'	=> array('category', 'producer')
 		); //TODO Autodetect using foreign keys?
 		$search_fields = array(
-			'item'	=> array('item_id','model_name','model_barcode','model_descript','producer_name','vendor_name')
+			'item'	=> array('item_id','item_serial','model_name','model_barcode','model_descript','producer_name','vendor_name')
 		); //TODO Autodetect
 
 		//Escaping
@@ -611,10 +626,15 @@ class Sklad_UI {
 	}
 
 	function post_redirect_get($location, $message='', $error=false) {
-		$location = $this->html->internal_url($location).'?message='.urlencode($message);
+		$url_args = $message != '' ? '?message='.urlencode($message) : '';
+		$location = $this->html->internal_url($location).$url_args;
 		header('Location: '.$location);
 		if($error) trigger_error($message);
-		die("Location: <a href='$location'>$location</a>");
+		$location=htmlspecialchars($location);
+		die(
+			"<meta http-equiv='refresh' content='0; url=$location'>".
+			"Location: <a href='$location'>$location</a>"
+		);
 	}
 
 	function safe_include($dir,$name,$vars=array(),$ext='.inc.php') {