[Fmsystem-commits] [10868]

[Torstein]

Revision: 10868
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10868
Author:   vator
Date:     2013-02-16 08:43:35 +0000 (Sat, 16 Feb 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/templates/base/case/cases_tab_menu.xsl
    trunk/controller/templates/base/check_list/fragments/check_list_menu.xsl
    trunk/controller/templates/base/css/base.css
    
trunk/controller/templates/mobilefrontend/check_list/fragments/check_list_menu.xsl
    
trunk/controller/templates/mobilefrontend/check_list/fragments/check_list_top_section.xsl

Removed Paths:
-------------
    trunk/controller/templates/mobilefrontend/control/

Modified: trunk/controller/templates/base/case/cases_tab_menu.xsl
===================================================================
--- trunk/controller/templates/base/case/cases_tab_menu.xsl     2013-02-16 
08:30:29 UTC (rev 10867)
+++ trunk/controller/templates/base/case/cases_tab_menu.xsl     2013-02-16 
08:43:35 UTC (rev 10868)
@@ -11,7 +11,6 @@
                                
<xsl:text>index.php?menuaction=controller.uicase.view_open_cases</xsl:text>
                                <xsl:text>&amp;check_list_id=</xsl:text>
                                <xsl:value-of select="check_list/id"/>
-                               
<xsl:text>&amp;phpgw_return_as=stripped_html</xsl:text>
                                <xsl:value-of select="$session_url"/>
                        </xsl:attribute>
                        Åpne saker
@@ -24,7 +23,6 @@
                                
<xsl:text>index.php?menuaction=controller.uicase.view_closed_cases</xsl:text>
                                <xsl:text>&amp;check_list_id=</xsl:text>
                                <xsl:value-of select="check_list/id"/>
-                               
<xsl:text>&amp;phpgw_return_as=stripped_html</xsl:text>
                                <xsl:value-of select="$session_url"/>
                        </xsl:attribute>
                        Lukkede saker

Modified: 
trunk/controller/templates/base/check_list/fragments/check_list_menu.xsl
===================================================================
--- trunk/controller/templates/base/check_list/fragments/check_list_menu.xsl    
2013-02-16 08:30:29 UTC (rev 10867)
+++ trunk/controller/templates/base/check_list/fragments/check_list_menu.xsl    
2013-02-16 08:43:35 UTC (rev 10868)
@@ -29,7 +29,7 @@
                                        <xsl:attribute 
name="class">active</xsl:attribute>
                                </xsl:if>
                                <xsl:attribute name="href">
-                                       
<xsl:text>index.php?menuaction=controller.uicheck_list.view_cases_for_check_list</xsl:text>
+                                       
<xsl:text>index.php?menuaction=controller.uicase.view_open_cases</xsl:text>
                                        <xsl:text>&amp;check_list_id=</xsl:text>
                                        <xsl:value-of select="check_list/id"/>
                                        <xsl:value-of select="$session_url"/>

Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css        2013-02-16 08:30:29 UTC 
(rev 10867)
+++ trunk/controller/templates/base/css/base.css        2013-02-16 08:43:35 UTC 
(rev 10868)
@@ -1641,7 +1641,7 @@
 
 #check_list_menu a {
   background: none repeat scroll 0 0 #F4EDE3;
-  border: 1px solid #D9D4CE;
+  border: 1px solid #E7E1DA;
   color: #444444;
   cursor: pointer;
   display: inline-block;
@@ -1663,8 +1663,8 @@
 }
 
 #check_list_menu a.active {
-  background: none repeat scroll 0 0 #D9D4CE;
-  border: 1px solid #D9D4CE;
+  background: none repeat scroll 0 0 #E7E1DA;
+  border: 1px solid #E7E1DA;
 }
 
 #check_list_menu .left_btns {

Modified: 
trunk/controller/templates/mobilefrontend/check_list/fragments/check_list_menu.xsl
===================================================================
--- 
trunk/controller/templates/mobilefrontend/check_list/fragments/check_list_menu.xsl
  2013-02-16 08:30:29 UTC (rev 10867)
+++ 
trunk/controller/templates/mobilefrontend/check_list/fragments/check_list_menu.xsl
  2013-02-16 08:43:35 UTC (rev 10868)
@@ -1,4 +1,4 @@
-<xsl:template name="cases_menu" xmlns:php="http://php.net/xsl";>
+<xsl:template name="check_list_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>
 
@@ -20,7 +20,7 @@
       <xsl:attribute name="class">active</xsl:attribute>
     </xsl:if>
     <xsl:attribute name="href">
-      
<xsl:text>index.php?menuaction=controller.uicheck_list.view_cases_for_check_list</xsl:text>
+      
<xsl:text>index.php?menuaction=controller.uicase.view_open_cases</xsl:text>
       <xsl:text>&amp;check_list_id=</xsl:text>
       <xsl:value-of select="check_list/id"/>
       <xsl:value-of select="$session_url"/>
@@ -32,7 +32,7 @@
       <xsl:attribute name="class">active</xsl:attribute>
     </xsl:if>
     <xsl:attribute name="href">
-      
<xsl:text>index.php?menuaction=controller.uicheck_list.view_cases_for_check_list</xsl:text>
+      
<xsl:text>index.php?menuaction=controller.uicase.view_closed_cases</xsl:text>
       <xsl:text>&amp;check_list_id=</xsl:text>
       <xsl:value-of select="check_list/id"/>
       <xsl:value-of select="$session_url"/>

Modified: 
trunk/controller/templates/mobilefrontend/check_list/fragments/check_list_top_section.xsl
===================================================================
--- 
trunk/controller/templates/mobilefrontend/check_list/fragments/check_list_top_section.xsl
   2013-02-16 08:30:29 UTC (rev 10867)
+++ 
trunk/controller/templates/mobilefrontend/check_list/fragments/check_list_top_section.xsl
   2013-02-16 08:43:35 UTC (rev 10868)
@@ -22,15 +22,8 @@
                                </xsl:otherwise>
                        </xsl:choose>
                </div>
-               
-               <div class="box-2 select-box">
-      <xsl:call-template name="nav_control_plan" />
-               </div>
-               
+                               
                <!-- ==================  CHECKLIST TAB MENU  
===================== -->
-               <xsl:call-template name="check_list_menu">
-                       <xsl:with-param 
name="active_tab">view_details</xsl:with-param>
-               </xsl:call-template>
-       </div>
-               
+               <xsl:call-template name="check_list_menu" />
+       </div>          
 </xsl:template>