Komplet prepsano (a prelozeno) menu, Prohloubena abstrakce generovani HTML kodu
authorThomas Mudrunka <tomas@mudrunka.cz>
Tue, 23 Aug 2011 04:51:03 +0000 (06:51 +0200)
committerThomas Mudrunka <tomas@mudrunka.cz>
Tue, 23 Aug 2011 04:51:03 +0000 (06:51 +0200)
assistants/dispose.inc.php
assistants/go.inc.php
assistants/sell.inc.php
assistants/stats.inc.php
assistants/store.inc.php
index.php
lib/Locale.class.php
locale/cs/messages.inc.php

index 691b258665fc6af99b5081c25bfcaf1bb3e956c9..fcaf7f2cdda4246adf42f674cbb113be8dd223c2 100644 (file)
@@ -1,12 +1,10 @@
 <?php
 switch($SUBPATH[0]) {
        default: case 1:
-?>
-<form action="<?=$URL?>/2" method="GET">
-       item_serial: <input type="text" name="serial" autofocus />
-       <input type="submit" value="DISPOSE" />
-</form>
-<?php
+               echo $this->html->form("$URL/2", 'GET', array(
+                       array('serial','','text',false,'autofocus','item_serial:'),
+                       array(false,'DISPOSE','submit')
+               ));
                break;
        case 2:
                $item_id = $this->db->map_unique('item_serial', $_GET['serial'], 'item_id', 'item');
index d488e5edc982cbbe3aae6dca5fffae8790df8b5f..a0521018779d4b40a6f16f64ecce26936e1ff313 100644 (file)
@@ -1,4 +1,5 @@
 <?php
+if(!isset($_GET['q'])) $this->post_redirect_get('',"This assistant shouldn't be used like this");
 $id=$_GET['q'];
 $barcode_prefix_regexp = '/^'.preg_replace('/\//', '\/', BARCODE_PREFIX).'/';
 if(preg_match($barcode_prefix_regexp, $id)) $id=preg_replace($barcode_prefix_regexp, '', $id);
index af7ef8b5e47d28568d8ea34059b2bb115dd4c86c..4bdfbfd2a6b5a907a45ee436ad99f0b1d97f669a 100644 (file)
@@ -5,12 +5,10 @@
 //TODO: Reuse /item/$item_id/edit
 switch($SUBPATH[0]) {
        default: case 1:
-?>
-<form action="<?=$URL?>/2" method="GET">
-       item_serial: <input type="text" name="serial" autofocus />
-       <input type="submit" value="SELL" />
-</form>
-<?php
+               echo $this->html->form("$URL/2", 'GET', array(
+                       array('serial','','text',false,'autofocus','item_serial:'),
+                       array(false,'SELL','submit')
+               ));
                break;
        case 2:
                $item_id = $this->db->map_unique('item_serial', $_GET['serial'], 'item_id', 'item');
index e3531281c83e3343d77a0ff0808cae1695411454..6ccfb9f693fefa61d6b689ba527477ff93d0e88f 100644 (file)
@@ -5,13 +5,11 @@ if(isset($_GET['month'])) {
        $month = htmlspecialchars($_GET['month']);
        $month_sql = " AND DATE_FORMAT(item_valid_from, '%Y-%m') = ".$this->db->quote($_GET['month']);
 }
-?>
 
-<form action="<?=$URL?>/" method="GET">
-       YYYY-MM: <input type="text" name="month" autofocus value="<?=$month?>" />
-       <input type="submit" value="SELECT BY MONTH" />
-</form>
-<?php
+echo $this->html->form($URL, 'GET', array(
+       array('month',$month,'text',false,'autofocus','YYYY-MM:'),
+       array(false,'SELECT BY MONTH','submit')
+));
 
 if($month_sql == '') $month='';
 $queries = array( //TODO: use build_query_select()!!!
index 3e05919a679ff9e440d9ae288d0fbb63aff82dbb..cacee8f53c02dfabd70e94d5029e60d4300b4324 100644 (file)
@@ -1,12 +1,10 @@
 <?php
 switch($SUBPATH[0]) {
        default: case 1:
-?>
-<form action="<?=$URL?>/2" method="GET">
-       model_barcode: <input type="text" name="barcode" autofocus />
-       <input type="submit" value="STORE" />
-</form>
-<?php
+               echo $this->html->form("$URL/2", 'GET', array(
+                       array('barcode','','text',false,'autofocus','model_barcode:'),
+                       array(false,'STORE','submit')
+               ));
                break;
        case 2:
                $model_id = $this->db->map_unique('model_barcode', $_GET['barcode'], 'model_id', 'model');
index 9fd766b05d7eb10fb4696deacda9295f0a086d2e..ec062faa29d7c65b0884ed76a1b54c2abd90aebc 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -58,7 +58,7 @@ class HTML {
        }
 
        function link($title='n/a', $link='#void', $internal=true) {
-               if($internal) $link = $this->internal_url($link);
+               if($internal && (!isset($link[0]) || $link[0] != '#')) $link = $this->internal_url($link);
                return "<a href='$link'>".T($title)."</a>";
        }
 
@@ -66,8 +66,8 @@ class HTML {
                return "<img src='$src' alt='$title' title='$title' width=64 />";
        }
 
-       function input($name=false, $value=false, $type='text', $placeholder=false, $options=false) {
-               $html = "<input type='$type' ";
+       function input($name=false, $value=false, $type='text', $placeholder=false, $options=false, $prefix='') {
+               $html = T($prefix)."<input type='$type' ";
                if($name) $html.= "name='$name' ";
                if(!is_bool($value)) {
                        if($type == 'submit') $value = T($value);
@@ -79,6 +79,16 @@ class HTML {
                return $html;
        }
 
+       function form($action=false, $method=false, $inputs, $options=false) {
+               $action = $action ? " action='$action'" : '';
+               $method = $method ? " method='$method'" : '';
+               $options = $options ? " $options" : '';
+               $html = "<form$action$method$options>";
+               foreach($inputs as $input) $html .= call_user_func_array(array($this,'input'), $input);
+               $html .= "</form>";
+               return $html;
+       }
+
        function select($name, $selectbox, $default=false) {
                //echo('<pre>'); print_r($selectbox);
                $html = "<select name='$name'>";
@@ -94,6 +104,27 @@ class HTML {
                $html .= "</select>";
                return $html;
        }
+
+       function ul($items,$tag=ul,$head='',$class=false) {
+               $class = $class ? " class='$class'" : '';
+               $html = "$head<$tag$class>";
+               foreach($items as $key => $value) {
+                       $html .= '<li>';
+                       if(is_numeric($key)) {
+                               $html .= $value;
+                       } else {
+                               $html .= $this->link($key,$value);
+                       }
+                       $html .= '</li>';
+               }
+               $html .= "</$tag>";
+               return $html;
+       }
+
+       function div($html, $options) {
+               $options = $options ? " $options" : '';
+               return "<div$options>$html</div>";
+       }
 }
 
 /**
@@ -104,14 +135,15 @@ class HTML {
 * @package  Sklad_HTML
 * @author   Tomas Mudrunka
 */
-class Sklad_HTML extends HTML {
+class Sklad_HTML extends HTML { //TODO: Split into few more methods
        function header($title='') {
                $home = URL_HOME;
                $script = $_SERVER['SCRIPT_NAME'];
                $search = htmlspecialchars(@trim($_GET['q']));
                $message = strip_tags(@trim($_GET['message']),'<a><b><u><i>');
                $instance = INSTANCE_ID != '' ? '/'.INSTANCE_ID : '';
-               return <<<EOF
+               //$title = T($title); //TODO
+               $html = <<<EOF
 <head>
        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
        <title>SōkoMan$title</title>
@@ -153,63 +185,53 @@ class Sklad_HTML extends HTML {
 </style>
 
 <div>
-       <menu class="menu">
-               <li><a href="?logout">Logout</a></li>
-               <li><a href="$script/">Home</a></li>
-               <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/store-single">store-single</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>
-                       </menu>
-               </li>
-               <li><a href="#">List</a>
-                       <menu>
-                               <li><a href="$script/item">item</a></li>
-                               <li><a href="$script/model">model</a></li>
-                               <li><a href="$script/category">category</a></li>
-                               <li><a href="$script/producer">producer</a></li>
-                               <li><a href="$script/vendor">vendor</a></li>
-                               <li><a href="$script/room">room</a></li>
-                               <li><a href="$script/status">status</a></li>
-                       </menu>
-               </li>
-               <li><a href="#">New</a>
-                       <menu>
-                               <li><a href="$script/item/new">item</a></li>
-                               <li><a href="$script/model/new">model</a></li>
-                               <li><a href="$script/category/new">category</a></li>
-                               <li><a href="$script/producer/new">producer</a></li>
-                               <li><a href="$script/vendor/new">vendor</a></li>
-                               <li><a href="$script/room/new">room</a></li>
-                               <li><a href="$script/status/new">status</a></li>
-                       </menu>
-               </li>
-       </menu>
-
-       <div style="float: right;">
-               <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>
-               <!-- form action="$script/" method="GET">
-                       <input type="text" name="q" placeholder="regexp..." value="$search" />
-                       <input type="submit" value="search items" />
-               </form -->
-       </div>
+EOF;
+
+       $assistants=array();
+       foreach(scandir(DIR_ASSISTANTS) as $item) {
+               if($item == '.' || $item == '..') continue;
+               $item = preg_replace('/\.inc\.php$/','',$item);
+               $assistants[$item] = "assistant/$item";
+       }
+
+       $tables=array('item','model','category','producer','vendor','room','status');
+
+       foreach($tables as $table) {
+               $listable[$table] = $table;
+               $insertable[$table] = "$table/new";
+       }
+
+       $html .= $this->ul(array(
+               'Logout' => '?logout',
+               'Home' => '',
+               0 => $this->ul($assistants,'menu',$this->link('Assistants','#')),
+               1 => $this->ul($listable,'menu',$this->link('List','#')),
+               2 => $this->ul($insertable,'menu',$this->link('New','#'))
+       ),'menu', '', 'menu');
+
+       $html .= '<div style="float: right;">';
+
+       $html .= $this->form("$script/assistant/go", 'GET', array(
+               array('q','','text','smart id...'),
+               array(false,'go','submit')
+       ), 'style="float: left;"');
+
+       $html .= $this->form('?', 'GET', array(
+               array('q',$search,'text','regexp...'),
+               array(false,'filter','submit')
+       ), 'style="float: left;"');
+
+       $html .= '</div>';
+
+       $html .= <<<EOF
 </div>
 <hr style="clear: both;" />
 <div style="background-color:#FFDDDD;">
        <font color="red">$message</font>
 </div>
 EOF;
+
+       return $html;
        }
 
        function internal_url($link) {
@@ -281,7 +303,7 @@ EOF;
                if(!is_array($hidecols)) $hidecols = array('item_author', 'item_valid_from', 'item_valid_till'); //TODO Autodetect
 
                $action = $action ? " action='$action'" : false;
-               $html="<form$action method='POST'>";
+               $html="<form$action method='POST'>"; //TODO: use $this->form()
                if($multi_insert) $html.='<div name="input_set" style="float:left; border:1px solid grey;">';
                //$html.=$this->input('table', $class, 'hidden');
                foreach($columns as $column)    {
@@ -635,15 +657,15 @@ class Sklad_UI {
                if($edit)       {
                        $html.= $this->render_form_edit($class, $id);
                        $action = $_SERVER['SCRIPT_NAME']."/$class/$id/delete";
-           $html.= "<form action='$action' method='POST'>";
-                       $html.= $this->html->input(false, 'DELETE', 'submit');
-                       $html.= T('sure?').$this->html->input('sure', false, 'checkbox');
-                       $html.= '</form>';
+                       $html.=$this->html->form($action,'POST',array(
+                               array(false,'DELETE','submit'),
+                               array('sure', false, 'checkbox', false, false, 'sure?')
+                       ));
                        $action = $_SERVER['SCRIPT_NAME']."/$class/$id/image";
-           $html.= "<form action='$action' method='POST' enctype='multipart/form-data'>";
-                       $html.= $this->html->input('image', false, 'file', false, 'size="30"');
-                       $html.= $this->html->input(false, 'IMAGE', 'submit');
-                       $html.='</form>';
+                       $html.=$this->html->form($action,'POST',array(
+                               array('image', false, 'file', false, 'size="30"'),
+                               array(false, 'IMAGE', 'submit')
+                       ), "enctype='multipart/form-data'");
                }
                return $html;
        }
index a8c3d97e622313613a6031777f26a787f155939d..169fd0481a80275874fcf8b8e83529718b9154c9 100755 (executable)
 
 require_once(DIR_LOCALE.'/'.LOCALE_LANG.'/messages.inc.php');
 
+//Wrap regexes with slashes
 foreach($LOCALE_MESSAGES['regexp'] as $regexp => $replace) {
        $LOCALE_MESSAGES['regexp']['/'.$regexp.'/i'] = $LOCALE_MESSAGES['regexp'][$regexp];
        unset($LOCALE_MESSAGES['regexp'][$regexp]);
 }
 
+//Uppercase alternative
+/*$LOCALE_MESSAGES['map'] = array_merge($LOCALE_MESSAGES['map'],
+       array_flip(array_map('strtoupper',array_flip(array_map('strtoupper',$LOCALE_MESSAGES['map']))))
+);*/
+
 /**
  * !!! IMPORTANT NOTICE: This is ugly hack !!!
  * !!! You should rather use PHP's internal gettext support !!!
index aa4b516ba061eebbfd701195a6b4d6c06826ed30..679f4502e62cf6c8fcf3463a61bfc4cbd79351cd 100644 (file)
@@ -25,6 +25,7 @@ $LOCALE_MESSAGES = array(
                'model_name' => 'Model',
                'model_descript' => 'Popis modelu',
                'model_barcode' => 'Čárový kód modelu',
+               'model_barcode:' => 'Čárový kód modelu:',
                'model_price_out' => 'Doporučená cena',
 
                'room_name' => 'Sklad',
@@ -44,7 +45,7 @@ $LOCALE_MESSAGES = array(
                'producer' => '[výrobce]',
                'room' => '[sklad]',
                'status' => '[stav]',
-               'vendor' => '[výrobce]',
+               'vendor' => '[prodejce]',
                'category' => '[kategorie]',
                'model' => '[model]',
                'user' => '[uživatel]',
@@ -60,17 +61,31 @@ $LOCALE_MESSAGES = array(
                'SUM(' => 'SOUČET(',
                'COUNT(' => 'POČET(',
 
+               'Assistants' => 'Průvodci',
+               'dispose' => 'vyskladnit',
+               'sell' => 'prodat',
+               'stats' => 'statistiky',
+               'store' => 'naskladnit',
+               'store-single' => 'naskladnit 1ks',
+
                'update' => 'UPRAVIT',
                'insert' => 'VLOŽIT',
                'delete' => 'SMAZAT',
                'image' => 'OBRÁZEK',
-               //'filter' => 'filtr',
+               'SELECT BY MONTH' => 'ZOBRAZIT MĚSÍC',
+               'DISPOSE' => 'VYSKLADNIT',
+               'SELL' => 'PRODAT',
+               'STORE' => 'NASKLADNIT',
+               'filter' => 'filtr',
                //'go' => 'jdi',
                'sure?' => 'opravdu?',
+               'Logout' => 'Odhlásit',
+               'Home' => 'Domů',
 
-               'edit' => 'upravit',
-               'history' => 'historie',
-               'new' => 'nový',
+               'edit' => 'Upravit',
+               'history' => 'Historie',
+               'new' => 'Přidat',
+               'List' => 'Vypsat',
 
                '' => ''
        ),
This page took 0.294922 seconds and 4 git commands to generate.