fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [10768] Moved control plan navigation to seperate fil


From: Torstein
Subject: [Fmsystem-commits] [10768] Moved control plan navigation to seperate file
Date: Wed, 06 Feb 2013 12:38:56 +0000

Revision: 10768
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10768
Author:   vator
Date:     2013-02-06 12:38:56 +0000 (Wed, 06 Feb 2013)
Log Message:
-----------
Moved control plan navigation to seperate file

Modified Paths:
--------------
    trunk/controller/inc/class.uicheck_list.inc.php
    trunk/controller/templates/base/check_list/add_case.xsl
    trunk/controller/templates/base/check_list/add_check_list.xsl
    trunk/controller/templates/base/check_list/cases_tab_menu.xsl
    trunk/controller/templates/base/check_list/check_list_tab_menu.xsl
    trunk/controller/templates/base/check_list/edit_check_list.xsl
    trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
    trunk/controller/templates/base/check_list/view_closed_cases.xsl
    trunk/controller/templates/base/check_list/view_control_details.xsl
    trunk/controller/templates/base/check_list/view_control_info.xsl
    trunk/controller/templates/base/check_list/view_control_items.xsl
    trunk/controller/templates/base/check_list/view_open_cases.xsl
    trunk/controller/templates/base/css/base.css

Added Paths:
-----------
    trunk/controller/templates/base/check_list/nav_control_plan.xsl

Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php     2013-02-06 10:29:26 UTC 
(rev 10767)
+++ trunk/controller/inc/class.uicheck_list.inc.php     2013-02-06 12:38:56 UTC 
(rev 10768)
@@ -345,7 +345,7 @@
                        self::add_javascript('controller', 'controller', 
'custom_ui.js');
                        self::add_javascript('controller', 'controller', 
'ajax.js');
                        
-                       
self::render_template_xsl(array('check_list/check_list_tab_menu','check_list/edit_check_list'),
 $data);
+                       
self::render_template_xsl(array('check_list/check_list_tab_menu', 
'check_list/nav_control_plan', 'check_list/edit_check_list'), $data);
                }
                
                /**
@@ -493,7 +493,7 @@
                        self::add_javascript('controller', 'controller', 
'custom_ui.js');
                        self::add_javascript('controller', 'controller', 
'ajax.js');
                        
-                       
self::render_template_xsl(array('check_list/check_list_tab_menu', 
'check_list/view_cases_for_check_list'), $data);
+                       
self::render_template_xsl(array('check_list/check_list_tab_menu', 
'check_list/nav_control_plan', 'check_list/view_cases_for_check_list'), $data);
                }
                
                public function print_check_list()
@@ -576,7 +576,7 @@
 
                        phpgwapi_jquery::load_widget('core');
                        
-                       
self::render_template_xsl(array('check_list/check_list_tab_menu','check_list/view_control_info'),
 $data);
+                       
self::render_template_xsl(array('check_list/check_list_tab_menu', 
'check_list/nav_control_plan', 'check_list/view_control_info'), $data);
                }
                
                function view_control_details()
@@ -706,7 +706,7 @@
                        self::add_javascript('controller', 'controller', 
'custom_ui.js');
                        self::add_javascript('controller', 'controller', 
'ajax.js');
                        
-                       
self::render_template_xsl(array('check_list/check_list_tab_menu', 
'check_list/add_case'), $data);
+                       
self::render_template_xsl(array('check_list/check_list_tab_menu', 
'check_list/nav_control_plan', 'check_list/add_case'), $data);
                }
                
                function view_open_cases()

Modified: trunk/controller/templates/base/check_list/add_case.xsl
===================================================================
--- trunk/controller/templates/base/check_list/add_case.xsl     2013-02-06 
10:29:26 UTC (rev 10767)
+++ trunk/controller/templates/base/check_list/add_case.xsl     2013-02-06 
12:38:56 UTC (rev 10768)
@@ -1,11 +1,8 @@
 <!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
-
 <xsl:template match="data" xmlns:php="http://php.net/xsl";>
-
 <xsl:variable name="session_url">&amp;<xsl:value-of 
select="php:function('get_phpgw_session_url')" /></xsl:variable>
 
 <div id="main_content" class="medium">
-       
        <div id="check-list-heading">
                <div class="box-1">
                        <h1>Kontroll: <xsl:value-of 
select="control/title"/></h1>
@@ -26,44 +23,7 @@
                        </xsl:choose>
                </div>
                <div class="box-2 select-box">
-                       <a>
-                               <xsl:attribute name="href">
-                                       
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
-                                       <xsl:text>&amp;year=</xsl:text>
-                                       <xsl:value-of select="current_year"/>
-                                       <xsl:text>&amp;location_code=</xsl:text>
-                                       <xsl:choose>
-                                         <xsl:when test="type = 'component'">
-                                                 <xsl:value-of 
select="building_location_code"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                 <xsl:value-of 
select="location_array/location_code"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       <xsl:value-of select="$session_url"/>
-                               </xsl:attribute>
-                               Kontrolplan for bygg/eiendom (år)
-                       </a>
-                       <a class="last">
-                               <xsl:attribute name="href">
-                                       
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
-                                       <xsl:text>&amp;year=</xsl:text>
-                                       <xsl:value-of select="current_year"/>
-                                       <xsl:text>&amp;month=</xsl:text>
-                                       <xsl:value-of 
select="current_month_nr"/>
-                                       <xsl:text>&amp;location_code=</xsl:text>
-                                       <xsl:choose>
-                                         <xsl:when test="type = 'component'">
-                                                 <xsl:value-of 
select="building_location_code"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                 <xsl:value-of 
select="location_array/location_code"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       <xsl:value-of select="$session_url"/>
-                               </xsl:attribute>
-                               Kontrolplan for bygg/eiendom (måned)
-                       </a>
+      <xsl:call-template name="nav_control_plan" />
                </div>
                
                <!-- ==================  CHECKLIST TAB MENU  
===================== -->

Modified: trunk/controller/templates/base/check_list/add_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/add_check_list.xsl       
2013-02-06 10:29:26 UTC (rev 10767)
+++ trunk/controller/templates/base/check_list/add_check_list.xsl       
2013-02-06 12:38:56 UTC (rev 10768)
@@ -26,44 +26,7 @@
                        </xsl:choose>
                </div>
                <div class="box-2 select-box">
-               
-                       <a>
-                               <xsl:attribute name="href">
-                                       <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:controller.uicalendar.view_calendar_for_year' )" />
-                                       <xsl:text>&amp;year=</xsl:text>
-                                       <xsl:value-of select="current_year"/>
-                                       <xsl:text>&amp;location_code=</xsl:text>
-                                       <xsl:choose>
-                                         <xsl:when test="type = 'component'">
-                                                 <xsl:value-of 
select="building_location_code"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                 <xsl:value-of 
select="location_array/location_code"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:attribute>
-                               Vis kontrollplan (år)
-                       </a>
-                               
-                       <a class="last">
-                               <xsl:attribute name="href">
-                                       <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:controller.uicalendar.view_calendar_for_month' )" />
-                                       <xsl:text>&amp;year=</xsl:text>
-                                       <xsl:value-of select="current_year"/>
-                                       <xsl:text>&amp;month=</xsl:text>
-                                       <xsl:value-of 
select="current_month_nr"/>
-                                       <xsl:text>&amp;location_code=</xsl:text>
-                                       <xsl:choose>
-                                         <xsl:when test="type = 'component'">
-                                                 <xsl:value-of 
select="building_location_code"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                 <xsl:value-of 
select="location_array/location_code"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:attribute>
-                               Vis kontrollplan (måned)
-                       </a>
+      <xsl:call-template name="nav_control_plan" />
                </div>
        </div>
                

Modified: trunk/controller/templates/base/check_list/cases_tab_menu.xsl
===================================================================
--- trunk/controller/templates/base/check_list/cases_tab_menu.xsl       
2013-02-06 10:29:26 UTC (rev 10767)
+++ trunk/controller/templates/base/check_list/cases_tab_menu.xsl       
2013-02-06 12:38:56 UTC (rev 10768)
@@ -1,7 +1,5 @@
 <xsl:template name="cases_tab_menu" xmlns:php="http://php.net/xsl";>
-
 <xsl:param name="active_tab" />
-
 <xsl:variable name="session_url">&amp;<xsl:value-of 
select="php:function('get_phpgw_session_url')" /></xsl:variable>
 
 <div class="tab_menu">

Modified: trunk/controller/templates/base/check_list/check_list_tab_menu.xsl
===================================================================
--- trunk/controller/templates/base/check_list/check_list_tab_menu.xsl  
2013-02-06 10:29:26 UTC (rev 10767)
+++ trunk/controller/templates/base/check_list/check_list_tab_menu.xsl  
2013-02-06 12:38:56 UTC (rev 10768)
@@ -1,8 +1,7 @@
 <xsl:template name="check_list_tab_menu" xmlns:php="http://php.net/xsl";>
-
 <xsl:param name="active_tab" />
-
 <xsl:variable name="session_url">&amp;<xsl:value-of 
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+
 <div id="check_list_menu">
                <!-- ==================  LOADS VIEW CHECKLIST DETAILS   
===================== -->
                <div class="left_btns">

Modified: trunk/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/edit_check_list.xsl      
2013-02-06 10:29:26 UTC (rev 10767)
+++ trunk/controller/templates/base/check_list/edit_check_list.xsl      
2013-02-06 12:38:56 UTC (rev 10768)
@@ -1,5 +1,5 @@
 <!-- $Id$ -->
-<xsl:template match="data" name="view_check_list" 
xmlns:php="http://php.net/xsl";>
+<xsl:template match="data" name="edit_check_list" 
xmlns:php="http://php.net/xsl";>
 <xsl:variable name="date_format"><xsl:value-of 
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')" 
/></xsl:variable>
 <xsl:variable name="session_url">&amp;<xsl:value-of 
select="php:function('get_phpgw_session_url')" /></xsl:variable>
 
@@ -26,45 +26,9 @@
                                </xsl:otherwise>
                        </xsl:choose>
                </div>
+               
                <div class="box-2 select-box">
-                       <a>
-                               <xsl:attribute name="href">
-                                       
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
-                                       <xsl:text>&amp;year=</xsl:text>
-                                       <xsl:value-of select="current_year"/>
-                                       <xsl:text>&amp;location_code=</xsl:text>
-                                       <xsl:choose>
-                                         <xsl:when test="type = 'component'">
-                                                 <xsl:value-of 
select="building_location_code"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                 <xsl:value-of 
select="location_array/location_code"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       <xsl:value-of select="$session_url"/>
-                               </xsl:attribute>
-                               Vis kontrolplan (år)
-                       </a>
-                       <a class="last">
-                               <xsl:attribute name="href">
-                                       
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
-                                       <xsl:text>&amp;year=</xsl:text>
-                                       <xsl:value-of select="current_year"/>
-                                       <xsl:text>&amp;month=</xsl:text>
-                                       <xsl:value-of 
select="current_month_nr"/>
-                                       <xsl:text>&amp;location_code=</xsl:text>
-                                       <xsl:choose>
-                                         <xsl:when test="type = 'component'">
-                                                 <xsl:value-of 
select="building_location_code"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                 <xsl:value-of 
select="location_array/location_code"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       <xsl:value-of select="$session_url"/>
-                               </xsl:attribute>
-                               Vis kontrolplan (måned)
-                       </a>
+      <xsl:call-template name="nav_control_plan" />
                </div>
                
                <!-- ==================  CHECKLIST TAB MENU  
===================== -->
@@ -165,9 +129,9 @@
                        
                        <div class="form-buttons">
                                <xsl:variable name="lang_save"><xsl:value-of 
select="php:function('lang', 'save_check_list')" /></xsl:variable>
-                               <input class="btn not_active" type="submit" 
name="save_control" value="Lagre detaljer" />
+                               <input class="btn" type="submit" 
name="save_control" value="Lagre detaljer" />
                        </div>
                        </form>
                </div>
        </div>
-</xsl:template>
+</xsl:template>
\ No newline at end of file

Added: trunk/controller/templates/base/check_list/nav_control_plan.xsl
===================================================================
--- trunk/controller/templates/base/check_list/nav_control_plan.xsl             
                (rev 0)
+++ trunk/controller/templates/base/check_list/nav_control_plan.xsl     
2013-02-06 12:38:56 UTC (rev 10768)
@@ -0,0 +1,42 @@
+  <xsl:template name="nav_control_plan" xmlns:php="http://php.net/xsl";>
+  <xsl:variable name="session_url">&amp;<xsl:value-of 
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+
+  <a>
+    <xsl:attribute name="href">
+      
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
+      <xsl:text>&amp;year=</xsl:text>
+      <xsl:value-of select="current_year"/>
+      <xsl:text>&amp;location_code=</xsl:text>
+      <xsl:choose>
+        <xsl:when test="type = 'component'">
+          <xsl:value-of select="building_location_code"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="location_array/location_code"/>
+        </xsl:otherwise>
+      </xsl:choose>
+      <xsl:value-of select="$session_url"/>
+    </xsl:attribute>
+    Vis kontrolplan for år
+  </a>
+  <a class="last">
+    <xsl:attribute name="href">
+      
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+      <xsl:text>&amp;year=</xsl:text>
+      <xsl:value-of select="current_year"/>
+      <xsl:text>&amp;month=</xsl:text>
+      <xsl:value-of select="current_month_nr"/>
+      <xsl:text>&amp;location_code=</xsl:text>
+      <xsl:choose>
+        <xsl:when test="type = 'component'">
+          <xsl:value-of select="building_location_code"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="location_array/location_code"/>
+        </xsl:otherwise>
+      </xsl:choose>
+      <xsl:value-of select="$session_url"/>
+    </xsl:attribute>
+    Vis kontrolplan for måned
+  </a>         
+  </xsl:template>
\ No newline at end of file

Modified: 
trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl    
2013-02-06 10:29:26 UTC (rev 10767)
+++ trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl    
2013-02-06 12:38:56 UTC (rev 10768)
@@ -4,7 +4,6 @@
 <xsl:variable name="session_url">&amp;<xsl:value-of 
select="php:function('get_phpgw_session_url')" /></xsl:variable>
 
 <div id="main_content" class="medium">
-               
        <script>
        
                // ======================  LASTER FANEN view_open_errors NÅR 
SIDEN LASTES FØRSTE GANG  ===================
@@ -81,44 +80,7 @@
                        </xsl:choose>
                </div>
                <div class="box-2 select-box">
-                       <a>
-                               <xsl:attribute name="href">
-                                       
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
-                                       <xsl:text>&amp;year=</xsl:text>
-                                       <xsl:value-of select="current_year"/>
-                                       <xsl:text>&amp;location_code=</xsl:text>
-                                       <xsl:choose>
-                                         <xsl:when test="type = 'component'">
-                                                 <xsl:value-of 
select="building_location_code"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                 <xsl:value-of 
select="location_array/location_code"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       <xsl:value-of select="$session_url"/>
-                               </xsl:attribute>
-                               Vis kontrolplan (år)
-                       </a>
-                       <a class="last">
-                               <xsl:attribute name="href">
-                                       
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
-                                       <xsl:text>&amp;year=</xsl:text>
-                                       <xsl:value-of select="current_year"/>
-                                       <xsl:text>&amp;month=</xsl:text>
-                                       <xsl:value-of 
select="current_month_nr"/>
-                                       <xsl:text>&amp;location_code=</xsl:text>
-                                       <xsl:choose>
-                                         <xsl:when test="type = 'component'">
-                                                 <xsl:value-of 
select="building_location_code"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                 <xsl:value-of 
select="location_array/location_code"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       <xsl:value-of select="$session_url"/>
-                               </xsl:attribute>
-                               Vis kontrolplan (måned)
-                       </a>
+      <xsl:call-template name="nav_control_plan" />
                </div>
                
                <!-- ==================  CHECKLIST TAB MENU  
===================== -->

Modified: trunk/controller/templates/base/check_list/view_closed_cases.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_closed_cases.xsl    
2013-02-06 10:29:26 UTC (rev 10767)
+++ trunk/controller/templates/base/check_list/view_closed_cases.xsl    
2013-02-06 12:38:56 UTC (rev 10768)
@@ -1,11 +1,8 @@
 <!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
-
 <xsl:template match="data" xmlns:php="http://php.net/xsl";>
-
 <xsl:variable name="session_url">&amp;<xsl:value-of 
select="php:function('get_phpgw_session_url')" /></xsl:variable>   
 
 <div id="view_cases">
-       
        <xsl:call-template name="cases_tab_menu">
                <xsl:with-param 
name="active_tab">view_closed_cases</xsl:with-param>
        </xsl:call-template>    

Modified: trunk/controller/templates/base/check_list/view_control_details.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_details.xsl 
2013-02-06 10:29:26 UTC (rev 10767)
+++ trunk/controller/templates/base/check_list/view_control_details.xsl 
2013-02-06 12:38:56 UTC (rev 10768)
@@ -69,25 +69,20 @@
                      </xsl:otherwise>
              </xsl:choose>
                </div>
-               <div class="row">
-                       <label>Frekvenstype</label>
-                       <xsl:choose>
-                     <xsl:when test="control/repeat_type = 0">Dag</xsl:when>
-                     <xsl:when test="control/repeat_type = 1">Uke</xsl:when>
-                     <xsl:when test="control/repeat_type = 2">Måned</xsl:when>
-                     <xsl:when test="control/repeat_type = 3">År</xsl:when>
-             </xsl:choose>
-               </div>
-               <div class="row">
+               <div class="row frequency">
                        <label>Frekvens</label>
                        <xsl:choose>
-                               <xsl:when test="editable">
-                                       <input size="2" type="text" 
name="repeat_interval" value="{control/repeat_interval}" />
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <xsl:value-of 
select="control/repeat_interval" />
-                               </xsl:otherwise>
-                       </xsl:choose>
+                               <xsl:when test="control/repeat_interval = 1">
+                       <span class="pre">Hver</span>
+               </xsl:when>
+               <xsl:when test="control/repeat_interval = 2">
+                       <span class="pre">Annenhver</span>
+               </xsl:when>
+               <xsl:when test="control/repeat_interval > 2">
+                       <span class="pre">Hver</span><span><xsl:value-of 
select="control/repeat_interval"/>.</span>
+               </xsl:when>
+            </xsl:choose>
+            <span class="val"><xsl:value-of 
select="control/repeat_type_label"/></span>
                </div>
                <div class="row">
                        <label>Rolle</label>

Modified: trunk/controller/templates/base/check_list/view_control_info.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_info.xsl    
2013-02-06 10:29:26 UTC (rev 10767)
+++ trunk/controller/templates/base/check_list/view_control_info.xsl    
2013-02-06 12:38:56 UTC (rev 10768)
@@ -4,7 +4,6 @@
 <xsl:variable name="session_url">&amp;<xsl:value-of 
select="php:function('get_phpgw_session_url')" /></xsl:variable>
 
 <div id="main_content" class="medium">
-               
        <script>
          
                $(document).ready(function() {
@@ -88,44 +87,7 @@
                        </xsl:choose>
                </div>
                <div class="box-2 select-box">
-                       <a>
-                               <xsl:attribute name="href">
-                                       
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
-                                       <xsl:text>&amp;year=</xsl:text>
-                                       <xsl:value-of select="current_year"/>
-                                       <xsl:text>&amp;location_code=</xsl:text>
-                                       <xsl:choose>
-                                         <xsl:when test="type = 'component'">
-                                                 <xsl:value-of 
select="building_location_code"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                 <xsl:value-of 
select="location_array/location_code"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       <xsl:value-of select="$session_url"/>
-                               </xsl:attribute>
-                               Kontrolplan for bygg/eiendom (år)
-                       </a>
-                       <a class="last">
-                               <xsl:attribute name="href">
-                                       
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
-                                       <xsl:text>&amp;year=</xsl:text>
-                                       <xsl:value-of select="current_year"/>
-                                       <xsl:text>&amp;month=</xsl:text>
-                                       <xsl:value-of 
select="current_month_nr"/>
-                                       <xsl:text>&amp;location_code=</xsl:text>
-                                       <xsl:choose>
-                                         <xsl:when test="type = 'component'">
-                                                 <xsl:value-of 
select="building_location_code"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                 <xsl:value-of 
select="location_array/location_code"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       <xsl:value-of select="$session_url"/>
-                               </xsl:attribute>
-                               Kontrolplan for bygg/eiendom (måned)
-                       </a>
+      <xsl:call-template name="nav_control_plan" />
                </div>
                
                <!-- ==================  CHECKLIST TAB MENU  
===================== -->

Modified: trunk/controller/templates/base/check_list/view_control_items.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_items.xsl   
2013-02-06 10:29:26 UTC (rev 10767)
+++ trunk/controller/templates/base/check_list/view_control_items.xsl   
2013-02-06 12:38:56 UTC (rev 10768)
@@ -1,7 +1,5 @@
 <!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
-
 <xsl:template match="data" xmlns:php="http://php.net/xsl";>
-
 <xsl:variable name="session_url">&amp;<xsl:value-of 
select="php:function('get_phpgw_session_url')" /></xsl:variable>   
 
 <div id="control-items">

Modified: trunk/controller/templates/base/check_list/view_open_cases.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_open_cases.xsl      
2013-02-06 10:29:26 UTC (rev 10767)
+++ trunk/controller/templates/base/check_list/view_open_cases.xsl      
2013-02-06 12:38:56 UTC (rev 10768)
@@ -1,9 +1,7 @@
 <!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
-
 <xsl:template match="data" xmlns:php="http://php.net/xsl";>
 
   <div id="view_cases">
-       
     <xsl:call-template name="cases_tab_menu">
       <xsl:with-param name="active_tab">view_open_cases</xsl:with-param>
     </xsl:call-template>

Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css        2013-02-06 10:29:26 UTC 
(rev 10767)
+++ trunk/controller/templates/base/css/base.css        2013-02-06 12:38:56 UTC 
(rev 10768)
@@ -1834,15 +1834,14 @@
 
 /* ===============================  FORM REGISTER CASE  
============================= */
 
-.frm_register_case {
-  margin-bottom: 1em;
-}
 .frm_register_case input[type="text"]{
        width: 170px;  
 }
+
 .frm_register_case select {
   width: 184px;
 }
+
 .frm_register_case textarea {
   display: block;
   height: 100px;
@@ -1850,12 +1849,40 @@
   margin-bottom: 1em;
   width: 63%;
 }
+
 .frm_register_case label {
   display: inline-block;
   width: 18%;
 }
 
+.frm_register_case .what-to-do, .frm_register_case .how-to-do {
+  line-height: 20px;
+}
 
+.frm_register_case .how-to-do {
+  margin-bottom: 10px;
+}
+
+.add-cases .expand_list li{
+  background: none repeat scroll 0 0 #EEEEEE;
+  margin-bottom: 10px;
+  padding: 10px; 
+}
+
+.add-cases .expand_list h4{
+  margin-bottom: 0;
+}
+
+.add-cases h3 img {
+  height: 15px;
+  margin-right: 5px;
+}
+
+.add-cases .expand-trigger{
+  cursor: pointer;
+}
+
+
 /* ================================ CASE MESSAGE ============================= 
*/
 
 #caseMessage a#showMessage {
@@ -2023,6 +2050,11 @@
   margin-bottom: 1em;  
 }
 
+#control_details .frequency .val {
+  margin-left: 5px;
+  text-transform: lowercase;   
+}
+
 #repeat_interval {
   width: 28px;
 }
@@ -2055,9 +2087,11 @@
   margin-left: 11px;
   vertical-align: middle;
 }
+
 #view-procedures .box {
-  background: none repeat scroll 0 0 #E7EFF8;
-  border: 1px solid #DDDDDD;
+  background: none repeat scroll 0 0 #FFFFFF;
+  border: 1px solid #DBE5EF;
+  border-radius: 4px 4px 4px 4px;
   margin-bottom: 20px;
   padding: 0 20px;
 }




reply via email to

[Prev in Thread] Current Thread [Next in Thread]