[Fmsystem-commits] [8468]

[Torstein]

Revision: 8468
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8468
Author:   vator
Date:     2012-01-02 08:21:35 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/setup/setup.inc.php
    trunk/controller/setup/tables_current.inc.php
    trunk/controller/setup/tables_update.inc.php
    trunk/controller/templates/base/css/base.css

Modified: trunk/controller/setup/setup.inc.php
===================================================================
--- trunk/controller/setup/setup.inc.php        2012-01-02 07:58:57 UTC (rev 
8467)
+++ trunk/controller/setup/setup.inc.php        2012-01-02 08:21:35 UTC (rev 
8468)
@@ -1,6 +1,6 @@
 <?php
        $setup_info['controller']['name'] = 'controller';
-       $setup_info['controller']['version'] = '0.1.14';
+       $setup_info['controller']['version'] = '0.1.15';
        $setup_info['controller']['app_order'] = 100;
        $setup_info['controller']['enable'] = 1;
        $setup_info['controller']['app_group']  = 'office';

Modified: trunk/controller/setup/tables_current.inc.php
===================================================================
--- trunk/controller/setup/tables_current.inc.php       2012-01-02 07:58:57 UTC 
(rev 8467)
+++ trunk/controller/setup/tables_current.inc.php       2012-01-02 08:21:35 UTC 
(rev 8468)
@@ -60,7 +60,7 @@
                                'comment' => array('type' => 
'varchar','precision' => '255','nullable' => False),
                                'check_list_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => True),
                                'message_ticket_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => True),
-                               'measurement' => array('type' => 'int', 
'precision' => 4, 'nullable' => True)
+                               'measurement' => array('type' => 'int', 
'precision' => 8, 'nullable' => True)
                        ),
                        'pk' => array('id'),
                        'fk' => array(),

Modified: trunk/controller/setup/tables_update.inc.php
===================================================================
--- trunk/controller/setup/tables_update.inc.php        2012-01-02 07:58:57 UTC 
(rev 8467)
+++ trunk/controller/setup/tables_update.inc.php        2012-01-02 08:21:35 UTC 
(rev 8468)
@@ -296,3 +296,25 @@
                $GLOBALS['setup_info']['controller']['currentver'] = '0.1.14';
                return $GLOBALS['setup_info']['controller']['currentver'];
        }
+
+       $test[] = '0.1.14';
+       function controller_upgrade0_1_14()
+       {
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('controller_check_item', 
'measurement',array(
+                       'type' => 'int',
+                       'precision' => 8,
+                       'nullable' => true,
+                       'default' => 0
+               ));
+               
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('controller_control_item', 
'type',array(
+                       'type' => 'varchar',
+                       'precision' => 255,
+                       'nullable' => true,
+                       'default' => 0
+               ));
+
+               $GLOBALS['setup_info']['controller']['currentver'] = '0.1.15';
+               return $GLOBALS['setup_info']['controller']['currentver'];
+       }
+       
\ No newline at end of file

Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css        2012-01-02 07:58:57 UTC 
(rev 8467)
+++ trunk/controller/templates/base/css/base.css        2012-01-02 08:21:35 UTC 
(rev 8468)
@@ -1056,7 +1056,7 @@
     display: none;
     margin: 0 318px 0 0;
     padding: 15px;
-    width: 625px;
+    width: 628px;
 }
 .tab_item h2{
        margin:0 0 10px;
@@ -1135,13 +1135,13 @@
 }
 #error_message_menu a {
     text-align: center;
-    width: 140px;
+    width: 130px;
     margin: 2px 0;   
 }
 
 #view_errors {
-       float:right;
-    margin: 20px 0;   
+       float:left;
+    margin: 20px 0 0 20px;   
 }
 #register_errors {
        display:none;