kosmeticky vylepseni migracnich skriptu

[mirrors/SokoMan.git] / index.php

diff --git a/index.php b/index.php
index 2eea85a1f51e3e48802c75a79e44241d781bfbd6..74fcabaf4345f6a362da080f6a5e37b96a80d36f 100755 (executable)
--- 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; />";
        }
@@ -220,6 +221,7 @@ li a, a:hover { text-decoration:underline; }
 .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; } */
@@ -359,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')),
@@ -389,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) ).',';
                                        }
                                }
                        }
@@ -497,7 +499,7 @@ EOF;
                                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);
@@ -728,8 +730,8 @@ class Sklad_DB extends PDO {
                }
                //echo('<pre>'); print_r($selectbox);
                //return array_filter($selectbox, 'ksort');
-               array_multisort($selectbox);
-               return $selectbox;
+               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
@@ -900,9 +902,12 @@ 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.= '&nbsp;&nbsp;&nbsp;';
                $html.= $this->html->link('new', "$class/new/$get");