[Fmsystem-commits] [9676]

[Torstein]

Revision: 9676
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9676
Author:   vator
Date:     2012-06-27 08:18:22 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.uicheck_list.inc.php
    trunk/controller/templates/base/css/base.css

Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php     2012-06-27 06:46:51 UTC 
(rev 9675)
+++ trunk/controller/inc/class.uicheck_list.inc.php     2012-06-27 08:18:22 UTC 
(rev 9676)
@@ -577,17 +577,15 @@
                        $open_check_items_and_cases = 
$this->so_check_item->get_check_items_with_cases($check_list_id, $type = null, 
'open_or_waiting', null, 'return_array');
 
                        foreach($open_check_items_and_cases as $key => 
$check_item){
-                               
-                               $check_item_with_options = 
$this->so_control_item->get_single_with_options($check_item['control_item_id']);
-                               $check_item['control_item']['options_array'] = 
$check_item_with_options['options_array'];
-                               
+                               $control_item_with_options = 
$this->so_control_item->get_single_with_options($check_item['control_item_id'], 
"return_array");
+                               $check_item['control_item']['options_array'] = 
$control_item_with_options['options_array'];
                                $open_check_items_and_cases[$key] = $check_item;
                        }
-                       
+
                        $data = array
                        (
-                               'open_check_items_and_cases'            => 
$open_check_items_and_cases,
-                               'check_list'                                    
        => $check_list->toArray()
+                               'open_check_items_and_cases'    => 
$open_check_items_and_cases,
+                               'check_list'                                    
                                => $check_list->toArray()
                        );
                        
                        self::render_template_xsl( 
array('check_list/cases_tab_menu', 'check_list/view_open_cases'), $data );      
             

Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css        2012-06-27 06:46:51 UTC 
(rev 9675)
+++ trunk/controller/templates/base/css/base.css        2012-06-27 08:18:22 UTC 
(rev 9676)
@@ -1500,6 +1500,8 @@
        font-size: 13px;
 }
 
+/* ======================== TAB MENU ========================== */
+
 .tab_menu a {
     background: none repeat scroll 0 0 #F9F5F0;
     border: 1px solid #F0F0F0;
@@ -1521,6 +1523,12 @@
        border-bottom: 0;       
 }
 
+#tab_content {
+  background: none repeat scroll 0 0 #EDF5FF;
+  border: 1px solid #DBE5EF;
+  padding: 0 20px 20px;
+}
+
 /* ======================== CHECK LIST MENU ========================== */
 #check_list_menu {
     margin: 0 0 20px;