[Fmsystem-commits] [8812]

[Torstein]

Revision: 8812
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8812
Author:   vator
Date:     2012-02-08 09:51:35 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.uicheck_list.inc.php
    trunk/controller/templates/base/check_list/add_check_list.xsl

Removed Paths:
-------------
    trunk/controller/templates/base/check_list/add_check_list_tab_menu.xsl

Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php     2012-02-08 09:50:00 UTC 
(rev 8811)
+++ trunk/controller/inc/class.uicheck_list.inc.php     2012-02-08 09:51:35 UTC 
(rev 8812)
@@ -216,7 +216,7 @@
                        $data = array
                        (
                                'location_array'        => $location_array,
-                               'control_array'         => $control->toArray(),
+                               'control'                       => 
$control->toArray(),
                                'deadline'                      => 
$calendar_array[0],
                                'date_format'           => $date_format         
        
                        );
@@ -235,6 +235,7 @@
                        $check_list_id = phpgw::get_var('check_list_id');
                        
                        $check_list = $this->so->get_single($check_list_id);
+                       
                        $control = 
$this->so_control->get_single($check_list->get_control_id());
                        
                        $date_format = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];

Modified: trunk/controller/templates/base/check_list/add_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/add_check_list.xsl       
2012-02-08 09:50:00 UTC (rev 8811)
+++ trunk/controller/templates/base/check_list/add_check_list.xsl       
2012-02-08 09:51:35 UTC (rev 8812)
@@ -23,8 +23,19 @@
        
        <h1>Registrere sjekkliste for <xsl:value-of 
select="location_array/loc1_name"/></h1>
 
-       <xsl:call-template name="add_check_list_tab_menu" />
+       <div id="edit_check_list_menu" class="hor_menu">
+               <a href="#" class="active">
+                       Vis detaljer for sjekkliste
+               </a>
+               <a href="#">
+                       Vis saker
+               </a>                    
+               <a href="#">
+                       Vis info om kontroll
+               </a>
+       </div>
        
+       
        <h3 class="box_header">Sjekklistedetaljer</h3>
        <fieldset class="check_list_details">
                <form id="frm_add_check_list" 
action="index.php?menuaction=controller.uicheck_list.save_check_list" 
method="post">
@@ -38,7 +49,7 @@
                        </div>
                
                        <xsl:variable name="location_code"><xsl:value-of 
select="location_array/location_code"/></xsl:variable>
-                       <xsl:variable name="control_id"><xsl:value-of 
select="control_array/id"/></xsl:variable>
+                       <xsl:variable name="control_id"><xsl:value-of 
select="control/id"/></xsl:variable>
                
                        <input type="hidden" name="control_id" 
value="{$control_id}" />
                        <input type="hidden" name="location_code" 
value="{$location_code}" />

Deleted: trunk/controller/templates/base/check_list/add_check_list_tab_menu.xsl
===================================================================
--- trunk/controller/templates/base/check_list/add_check_list_tab_menu.xsl      
2012-02-08 09:50:00 UTC (rev 8811)
+++ trunk/controller/templates/base/check_list/add_check_list_tab_menu.xsl      
2012-02-08 09:51:35 UTC (rev 8812)
@@ -1,48 +0,0 @@
-<xsl:template name="check_list_tab_menu" xmlns:php="http://php.net/xsl";>
-
-<xsl:param name="active_tab" />
-
-<div id="edit_check_list_menu" class="hor_menu">
-               <a>
-                       <xsl:attribute name="href">
-                               
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
-                               <xsl:text>&amp;check_list_id=</xsl:text>
-                               <xsl:value-of select="check_list/id"/>
-                       </xsl:attribute>
-                       Vis detaljer for sjekkliste
-               </a>
-               <a href="#">
-                       Vis saker
-               </a>                    
-               <a>
-                       <xsl:if test="$active_tab = 'view_control_info'">
-                               <xsl:attribute 
name="class">active</xsl:attribute>
-                       </xsl:if>
-                       <xsl:attribute name="href">
-                               
<xsl:text>index.php?menuaction=controller.uicheck_list.view_control_info</xsl:text>
-                               <xsl:text>&amp;check_list_id=</xsl:text>
-                               <xsl:value-of select="check_list/id"/>
-                       </xsl:attribute>
-                       Vis info om kontroll
-               </a>
-               <div>
-                       <a class="btn focus first">
-                               <xsl:attribute name="href">
-                                       
<xsl:text>index.php?menuaction=controller.uicheck_list.register_case</xsl:text>
-                                       <xsl:text>&amp;check_list_id=</xsl:text>
-                                       <xsl:value-of select="check_list/id"/>
-                               </xsl:attribute>
-                               Registrer sak
-                       </a>
-                       <a class="btn focus">
-                               <xsl:attribute name="href">
-                                       
<xsl:text>index.php?menuaction=controller.uicase.create_case_message</xsl:text>
-                                       <xsl:text>&amp;check_list_id=</xsl:text>
-                                       <xsl:value-of select="check_list/id"/>
-                               </xsl:attribute>
-                               Registrer melding
-                       </a>
-               </div>
-       </div>
-               
-</xsl:template>