X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=74fcabaf4345f6a362da080f6a5e37b96a80d36f;hb=79cc0871640b08bbe5c5e7b132e7bcc934d20823;hp=07937b04286720f06227298259e8c2a4850263d7;hpb=3b62698949ec9f94f06f0f7c7fe46a7ba59c9992;p=mirrors%2FSokoMan.git

diff --git a/index.php b/index.php
index 07937b0..74fcaba 100755
--- a/index.php
+++ b/index.php
@@ -82,6 +82,7 @@ class HTML {
 	}
 
 	function img($src='#void', $title='img', $options='height=64') {
+		if(isset($_GET['noimgs'])) return "<span title='$title'>".basename($src).'</span>';
 		$options = $options ? " $options" : '';
 		return "<img src='$src' alt='$title' title='$title'$options; />";
 	}
@@ -129,11 +130,11 @@ class HTML {
 
 		if(!is_bool($default)) {
 			$value=$default; $title=$selectbox[$value];
-			$html .= "<option value='$value'>$value :: $title</option>";
+			$html .= "<option value='$value'>$title (($value))</option>";
 			unset($selectbox[$value]);
 		}
 		foreach($selectbox as $value => $title) {
-			$html .= "<option value='$value'>$value :: $title</option>";
+			$html .= "<option value='$value'>$title (($value))</option>";
 		}
 		$html .= "</select>";
 		return $html;
@@ -210,17 +211,21 @@ class Sklad_HTML extends HTML { //TODO: Split into few more methods
 td,body { background-color: white; border: orange; }
 .tr_nobr td { border-top: 3px solid orange; }
 table { background-color: orange; border: orange; }
+td textarea { width:100%; height:100%; }
 a, a img { text-decoration:none; color: darkblue; border:none; }
 li a, a:hover { text-decoration:underline; }
 .tr_even td { background-color: lemonchiffon; }
+.tr_nobr.tr_even td:first-child { border-left: 5px solid orange; }
+.tr_nobr.tr_odd td:first-child { border-left: 5px solid white; }
 .item_status_stored td { font-weight:bold; }
 .item_status_deleted td { text-decoration:line-through; }
 .item_status_destroyed td { font-style:italic; }
+.floating_barcode { margin: 5px; }
+.disabled { color: grey; }
 /* table, table * { table-layout:fixed; width:100%; overflow:hidden; word-wrap:break-word; } */
 /* td { position:absolute; } */
 /* .cell_model_name { float:left; } */
 
-
 .menu li {
 	float: left;
 	padding: 0.2em;
@@ -356,7 +361,7 @@ EOF;
 			'model' => array(
 				'model_id' => array(array('item',$where_url),array('edit','model/%v/edit/')),
 				'model_barcode' => array(array('store','assistant/%d?barcode=%v')),
-				'model_name' => array(array('google','http://google.com/search?q=%v',true)) //TODO: add manufacturer to google query
+				'model_name' => array(array('google','http://google.com/search?q=%v')) //TODO: add manufacturer to google query
 			),
 			'item' => array(
 				'item_serial' => array(array('dispose','assistant/%d?serial=%v','in_stock'),array('sell','assistant/%d?serial=%v','in_stock')),
@@ -386,7 +391,7 @@ EOF;
 							//$condition = $relations_conditions[$destination[2]]($table,$id);
 							if(!eval($relations_conditions[$destination[2]])) continue;
 						}
-						@$table[$id][$class.$suffix_relations] .= $this->link($destination[0], $destination_url).',';
+						@$table[$id][$class.$suffix_relations] .= $this->link($destination[0], $destination_url, !preg_match('/http/', $destination_url) ).',';
 					}
 				}
 			}
@@ -485,16 +490,16 @@ EOF;
 			'item' => array('item_note'),
 			'model' => array('model_descript')
 		);
-		$html = '';
+		$html = '<table>';
 		foreach($columns as $column)	{
-			$html.=T($class).':<b>'.T($column['Field']).'</b>: ';
+			$html.='<tr><td>'.T($class).':<b>'.T($column['Field']).'</b>:&nbsp;</td><td>';
 			$name="values[$class][".$column['Field'].'][]';
 			$val = $update && isset($current[$column['Field']]) ? $current[$column['Field']] : false;
 			switch(true) {
 				case (preg_match('/auto_increment/', $column['Extra']) || in_array($column['Field'], $hidecols)):
 					if(is_bool($val) && !$val) $val = '';
 					$html.=$this->input($name, $val, 'hidden');
-					$html.=$val.'(AUTO)';
+					$html.='<span class="disabled"><i>[AUTO]</i> '.$val.'</span>';
 					break;
 				case isset($selectbox[$column['Field']]):
 					$html.=$this->select($name,$selectbox[$column['Field']],$val);
@@ -506,8 +511,9 @@ EOF;
 					$html.=$this->input($name, $val);
 					break;
 			}
-			$html.='<br />';
+			$html.='</td></tr>';
 		}
+		$html.='</table>';
 		return $html;
 	}
 
@@ -723,7 +729,9 @@ class Sklad_DB extends PDO {
 			foreach($result as $row) $selectbox[$table.$suffix_id][$row[$table.$suffix_id]]=$row[$table.$suffix_name];
 		}
 		//echo('<pre>'); print_r($selectbox);
-		return array_filter($selectbox, 'ksort');
+		//return array_filter($selectbox, 'ksort');
+		return array_filter($selectbox, 'natcasesort');
+		//array_multisort($selectbox); return $selectbox;
 	}
 
 	function map_unique($key, $value, $select, $table, $fatal=true) { //TODO: Guess $select and $table if not passed
@@ -875,7 +883,7 @@ class Sklad_UI {
 		return $this->html->render_insert_form($class, $columns, $selectbox, $current, false, false, $multi_insert);
 	}
 
-	function render_single_record_details($class, $id) {
+	function render_single_record_details($class, $id, $barcode=true) {
 		$id_next = $id + 1;
 		$id_prev = $id - 1 > 0 ? $id - 1 : 0;
 		$get = $_SERVER['QUERY_STRING'] != '' ? '?'.$_SERVER['QUERY_STRING'] : '';
@@ -883,8 +891,8 @@ class Sklad_UI {
 		$html.= $this->html->link('<<', "$class/$id_prev/");
 		$html.= '-';
 		$html.= $this->html->link('>>', "$class/$id_next/");
-		$html.= '<br />';
-		$html.='<span style="float:right;">'.$this->html->render_barcode(BARCODE_PREFIX.strtoupper("$class/$id")).'</span>';
+		$html.= '&nbsp;&nbsp;&nbsp;';
+		$barcode && $html.='<span style="float:right;" class="floating_barcode">'.$this->html->render_barcode(BARCODE_PREFIX.strtoupper("$class/$id")).'</span>';
 		$html.= $this->html->link('edit', "$class/$id/edit/");
 		if($this->db->contains_history($class)) $html.= ' ][ '.$this->html->link('history', "$class/$id/history/");
 		return $html;
@@ -894,23 +902,26 @@ class Sklad_UI {
 		$offset_next = $offset + $limit;
 		$offset_prev = $offset - $limit > 0 ? $offset - $limit : 0;
 		$get = $_SERVER['QUERY_STRING'] != '' ? '?'.$_SERVER['QUERY_STRING'] : '';
+		$moreget = isset($get[0]) ? '&' : '?';
 		$html='';
 		$html.= $this->html->link('<<', "$class/$id/$limit/$offset_prev/$get");
 		$html.= '-';
+		$html.= $this->html->link('[*]', "$class/$id/0/0/$get$moreget".'noimgs');
+		$html.= '-';
 		$html.= $this->html->link('>>', "$class/$id/$limit/$offset_next/$get");
-		$html.= '<br />';
+		$html.= '&nbsp;&nbsp;&nbsp;';
 		$html.= $this->html->link('new', "$class/new/$get");
 		return $html;
 	}
 
-	function render_listing_extensions($class, $id, $limit, $offset, $edit=false) {
+	function render_listing_extensions($class, $id, $limit, $offset, $edit=false, $barcode=true) {
 		$html='';
 		if(is_numeric($id)) {
-			$html.=$this->render_single_record_details($class, $id);
+			$html.=$this->render_single_record_details($class, $id, $barcode);
 		} else {
 			$html.=$this->render_listing_navigation($class, '*', $limit, $offset);
 		}
-		if($edit)	{
+		if($edit && $barcode)	{
 			$html.= $this->render_form_edit($class, $id, false);
 			$action = $_SERVER['SCRIPT_NAME']."/$class/$id/delete";
 			$html.=$this->html->form($action,'POST',array(
@@ -1086,6 +1097,7 @@ class Sklad_UI {
 								$limit	= is_numeric($PATH_CHUNKS[3]) ? (int) $PATH_CHUNKS[3] : FRONTEND_LISTING_LIMIT;
 								$offset	= isset($PATH_CHUNKS[4]) ? (int) $PATH_CHUNKS[4] : 0;
 								$where = @is_array($_GET['where']) ? $_GET['where'] : false;
+								echo $this->render_listing_extensions($class, $id, $limit, $offset, $edit, false);
 								echo $this->render_items($class, $id, $limit, $offset, $where, $search, $history);
 								echo $this->render_listing_extensions($class, $id, $limit, $offset, $edit);
 								//print_r(array("<pre>",$_SERVER));