Oprava google linku

[mirrors/SokoMan.git] / index.php

diff --git a/index.php b/index.php
index bf7614a0bf73323b30142110739289e90e5ad886..389587fd29c96ebdad887d7355e473313d5d2fb7 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -219,7 +219,8 @@ li a, a:hover { text-decoration:underline; }
 .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-top: 5px; }
+.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; } */
@@ -389,7 +390,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, false).',';
                                        }
                                }
                        }
@@ -497,7 +498,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 +729,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