fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [8726]


From: Torstein
Subject: [Fmsystem-commits] [8726]
Date: Mon, 30 Jan 2012 18:20:32 +0000

Revision: 8726
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8726
Author:   vator
Date:     2012-01-30 18:20:31 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.menu.inc.php
    trunk/controller/inc/class.uicase.inc.php
    trunk/controller/inc/class.uicontrol.inc.php
    trunk/controller/inc/class.uicontrol_location.inc.php
    trunk/controller/inc/hook_home.inc.php
    trunk/controller/js/controller/ajax.js
    trunk/controller/templates/base/calendar/view_calendar_month.xsl
    trunk/controller/templates/base/calendar/view_calendar_year.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/register_case.xsl
    trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
    trunk/controller/templates/base/check_list/view_check_list.xsl
    trunk/controller/templates/base/check_list/view_check_lists.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_measurements.xsl
    trunk/controller/templates/base/check_list/view_open_cases.xsl
    trunk/controller/templates/base/control_item/view_control_item_list.xsl

Modified: trunk/controller/inc/class.menu.inc.php
===================================================================
--- trunk/controller/inc/class.menu.inc.php     2012-01-30 18:13:57 UTC (rev 
8725)
+++ trunk/controller/inc/class.menu.inc.php     2012-01-30 18:20:31 UTC (rev 
8726)
@@ -99,7 +99,7 @@
                                        'check_list' => array
                                        (
                                                'text'  => lang('Check_list'),
-                                               'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'controller.uicheck_list_for_location.index') ),
+                                               'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'controller.uicheck_list.index') ),
                                                'image' => array('property', 
'location_1'),
                                        ),
                                        'calendar_overview' => array
@@ -117,7 +117,7 @@
                                        'check_list' => array
                                        (
                                                'text'  => lang('Check_list'),
-                                               'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'controller.uicheck_list_for_location.index') ),
+                                               'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'controller.uicheck_list.index') ),
                                                'image' => array('property', 
'location_1'),
                                        ),
                                        'location_check_list' => array

Modified: trunk/controller/inc/class.uicase.inc.php
===================================================================
--- trunk/controller/inc/class.uicase.inc.php   2012-01-30 18:13:57 UTC (rev 
8725)
+++ trunk/controller/inc/class.uicase.inc.php   2012-01-30 18:20:31 UTC (rev 
8726)
@@ -25,7 +25,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/
        * @package property
        * @subpackage controller
-       * @version $Id: class.uicheck_list_for_location.inc.php 8419 2011-12-23 
09:54:15Z vator $
+       * @version $Id: class.uicheck_list.inc.php 8419 2011-12-23 09:54:15Z 
vator $
        */
        
        phpgw::import_class('phpgwapi.yui');

Modified: trunk/controller/inc/class.uicontrol.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol.inc.php        2012-01-30 18:13:57 UTC 
(rev 8725)
+++ trunk/controller/inc/class.uicontrol.inc.php        2012-01-30 18:20:31 UTC 
(rev 8726)
@@ -640,7 +640,7 @@
                        $value['parameters'] = array();
                        
                        $value['ajax'][] = false;
-                       $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'controller.uicheck_list_for_location.add_check_list', 'location_code' => 
$value['location_code'])));
+                       $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'controller.uicheck_list.add_check_list', 'location_code' => 
$value['location_code'])));
                        $value['labels'][] = lang('add_check_list_to_location');
                        $value['parameters'][] = "control_id";
                }

Modified: trunk/controller/inc/class.uicontrol_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_location.inc.php       2012-01-30 
18:13:57 UTC (rev 8725)
+++ trunk/controller/inc/class.uicontrol_location.inc.php       2012-01-30 
18:20:31 UTC (rev 8726)
@@ -25,7 +25,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/
        * @package property
        * @subpackage controller
-       * @version $Id: class.uicheck_list_for_location.inc.php 8628 2012-01-21 
10:42:05Z vator $
+       * @version $Id: class.uicheck_list.inc.php 8628 2012-01-21 10:42:05Z 
vator $
        */
        
        phpgw::import_class('phpgwapi.yui');

Modified: trunk/controller/inc/hook_home.inc.php
===================================================================
--- trunk/controller/inc/hook_home.inc.php      2012-01-30 18:13:57 UTC (rev 
8725)
+++ trunk/controller/inc/hook_home.inc.php      2012-01-30 18:20:31 UTC (rev 
8726)
@@ -141,7 +141,7 @@
                        ($check_list->get_planned_date(), array
                        (
                                'text' => "{$location_name} - 
{$control_area_name} - {$current_control->get_title()} :: {$next_date}",
-                               'link' => $GLOBALS['phpgw']->link('/index.php', 
array('menuaction' => 'controller.uicheck_list_for_location.edit_check_list', 
'check_list_id' => $check_list->get_id()))
+                               'link' => $GLOBALS['phpgw']->link('/index.php', 
array('menuaction' => 'controller.uicheck_list.edit_check_list', 
'check_list_id' => $check_list->get_id()))
                        ));
                }
        }
@@ -222,7 +222,7 @@
                                                ($current_date, array
                                                (
                                                        'text' => 
"{$location_name} - {$control_area_name} - {$current_control->get_title()} :: 
{$next_date}",
-                                                       'link' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'controller.uicheck_list_for_location.add_check_list', 'date' => $current_date, 
'control_id' => $current_control->get_id(), 'location_code' => '1101'))
+                                                       'link' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'controller.uicheck_list.add_check_list', 'date' => $current_date, 'control_id' 
=> $current_control->get_id(), 'location_code' => '1101'))
                                                ));
                                        }
                                }
@@ -234,7 +234,7 @@
                                ($current_date, array
                                (
                                        'text' => "{$location_name} - 
{$control_area_name} - {$current_control->get_title()} :: {$next_date}",
-                                       'link' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'controller.uicheck_list_for_location.add_check_list', 'date' => $current_date, 
'control_id' => $current_control->get_id(), 'location_code' => '1101'))
+                                       'link' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'controller.uicheck_list.add_check_list', 'date' => $current_date, 'control_id' 
=> $current_control->get_id(), 'location_code' => '1101'))
                                ));                                     
                        }
                }

Modified: trunk/controller/js/controller/ajax.js
===================================================================
--- trunk/controller/js/controller/ajax.js      2012-01-30 18:13:57 UTC (rev 
8725)
+++ trunk/controller/js/controller/ajax.js      2012-01-30 18:20:31 UTC (rev 
8726)
@@ -17,7 +17,7 @@
                 window.location.href = requestUrl;
     });
        
-       // file: uicheck_list_for_location.xsl
+       // file: uicheck_list.xsl
        // When control area is selected, controls are fetched from db and 
control select list is populated
        $("#control_area_list option").click(function () {
                 var control_area_id = $(this).val();
@@ -230,7 +230,7 @@
                
                var add_param = $(thisA).find("span").text();
                
-               var requestUrl = 
"http://portico/pe/index.php?menuaction=controller.uicheck_list_for_location.get_cases_for_check_list";
 + add_param;
+               var requestUrl = 
"http://portico/pe/index.php?menuaction=controller.uicheck_list.get_cases_for_check_list";
 + add_param;
                
                $.ajax({
                          type: 'POST',

Modified: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl    
2012-01-30 18:13:57 UTC (rev 8725)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl    
2012-01-30 18:20:31 UTC (rev 8726)
@@ -153,7 +153,7 @@
                                                                                
<div>
                                                                                
<a>
                                                                                
        <xsl:attribute name="href">
-                                                                               
                
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.add_check_list</xsl:text>
+                                                                               
                
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
                                                                                
                <xsl:text>&amp;date=</xsl:text>
                                                                                
                <xsl:value-of select="info/date"/>
                                                                                
                <xsl:text>&amp;control_id=</xsl:text>
@@ -169,7 +169,7 @@
                                                                                
<div>
                                                                                
<a>
                                                                                
        <xsl:attribute name="href">
-                                                                               
                
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list</xsl:text>
+                                                                               
                
<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="info/check_list_id"/>
                                                                                
        </xsl:attribute>
@@ -181,7 +181,7 @@
                                                                                
<div>
                                                                                
        <a>
                                                                                
        <xsl:attribute name="href">
-                                                                               
                
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list</xsl:text>
+                                                                               
                
<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="info/check_list_id"/>
                                                                                
        </xsl:attribute>
@@ -195,7 +195,7 @@
                                                                                
<div id="info_box" style="position:absolute;display:none;"></div>
                                                                                
        <a>
                                                                                
        <xsl:attribute name="href">
-                                                                               
                
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list</xsl:text>
+                                                                               
                
<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="info/check_list_id"/>
                                                                                
        </xsl:attribute>
@@ -209,7 +209,7 @@
                                                                                
        <div id="info_box" style="position:absolute;display:none;"></div>
                                                                                
<a class="view_check_list">
                                                                                
                <xsl:attribute name="href">
-                                                                               
                        
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list</xsl:text>
+                                                                               
                        
<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="info/check_list_id"/>
                                                                                
                </xsl:attribute>
@@ -226,7 +226,7 @@
                                                                                
<div id="info_box" style="position:absolute;display:none;"></div>
                                                                                
        <a>
                                                                                
        <xsl:attribute name="href">
-                                                                               
                
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list</xsl:text>
+                                                                               
                
<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="info/check_list_id"/>
                                                                                
        </xsl:attribute>
@@ -239,7 +239,7 @@
                                                                                
<div>
                                                                                
        <a>
                                                                                
                <xsl:attribute name="href">
-                                                                               
                        
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.add_check_list</xsl:text>
+                                                                               
                        
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
                                                                                
                        <xsl:text>&amp;date=</xsl:text>
                                                                                
                        <xsl:value-of select="info/date"/>
                                                                                
                        <xsl:text>&amp;control_id=</xsl:text>

Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl     
2012-01-30 18:13:57 UTC (rev 8725)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl     
2012-01-30 18:20:31 UTC (rev 8726)
@@ -113,7 +113,7 @@
                                                                                
<div>
                                                                                
<a>
                                                                                
        <xsl:attribute name="href">
-                                                                               
                
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.add_check_list</xsl:text>
+                                                                               
                
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
                                                                                
                <xsl:text>&amp;date=</xsl:text>
                                                                                
                <xsl:value-of select="info/date"/>
                                                                                
                <xsl:text>&amp;control_id=</xsl:text>
@@ -134,7 +134,7 @@
                                                                                
<div>
                                                                                
<a>
                                                                                
        <xsl:attribute name="href">
-                                                                               
                
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for</xsl:text>
+                                                                               
                
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list_for</xsl:text>
                                                                                
                <xsl:text>&amp;check_list_id=</xsl:text>
                                                                                
                <xsl:value-of select="info/check_list_id"/>
                                                                                
        </xsl:attribute>
@@ -146,7 +146,7 @@
                                                                                
<div>
                                                                                
        <a>
                                                                                
        <xsl:attribute name="href">
-                                                                               
                
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list</xsl:text>
+                                                                               
                
<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="info/check_list_id"/>
                                                                                
        </xsl:attribute>
@@ -160,7 +160,7 @@
                                                                                
<div id="info_box" style="position:absolute;display:none;"></div>
                                                                                
        <a>
                                                                                
        <xsl:attribute name="href">
-                                                                               
                
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list</xsl:text>
+                                                                               
                
<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="info/check_list_id"/>
                                                                                
        </xsl:attribute>
@@ -179,7 +179,7 @@
                                                                                
<div id="info_box" style="position:absolute;display:none;"></div>
                                                                                
        <a class="view_check_list">
                                                                                
                <xsl:attribute name="href">
-                                                                               
                        
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list</xsl:text>
+                                                                               
                        
<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="info/check_list_id"/>
                                                                                
                </xsl:attribute>

Modified: trunk/controller/templates/base/check_list/add_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/add_check_list.xsl       
2012-01-30 18:13:57 UTC (rev 8725)
+++ trunk/controller/templates/base/check_list/add_check_list.xsl       
2012-01-30 18:20:31 UTC (rev 8726)
@@ -29,7 +29,7 @@
        
        <h3 class="box_header">Sjekklistedetaljer</h3>
        <fieldset class="check_list_details">
-               <form id="frm_add_check_list" 
action="index.php?menuaction=controller.uicheck_list_for_location.save_check_list"
 method="post">
+               <form id="frm_add_check_list" 
action="index.php?menuaction=controller.uicheck_list.save_check_list" 
method="post">
                                        
                        <div id="calendar_dates">
                                <xsl:for-each select="calendar_array">

Modified: trunk/controller/templates/base/check_list/cases_tab_menu.xsl
===================================================================
--- trunk/controller/templates/base/check_list/cases_tab_menu.xsl       
2012-01-30 18:13:57 UTC (rev 8725)
+++ trunk/controller/templates/base/check_list/cases_tab_menu.xsl       
2012-01-30 18:20:31 UTC (rev 8726)
@@ -8,7 +8,7 @@
                                <xsl:attribute 
name="class">active</xsl:attribute>
                        </xsl:if>                               
                        <xsl:attribute name="href">
-                               
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_open_cases</xsl:text>
+                               
<xsl:text>index.php?menuaction=controller.uicheck_list.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>
@@ -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_for_location.view_closed_cases</xsl:text>
+                               
<xsl:text>index.php?menuaction=controller.uicheck_list.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>
@@ -33,7 +33,7 @@
                                <xsl:attribute 
name="class">active</xsl:attribute>
                        </xsl:if>                                       
                        <xsl:attribute name="href">
-                               
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_measurements</xsl:text>
+                               
<xsl:text>index.php?menuaction=controller.uicheck_list.view_measurements</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>

Modified: trunk/controller/templates/base/check_list/check_list_tab_menu.xsl
===================================================================
--- trunk/controller/templates/base/check_list/check_list_tab_menu.xsl  
2012-01-30 18:13:57 UTC (rev 8725)
+++ trunk/controller/templates/base/check_list/check_list_tab_menu.xsl  
2012-01-30 18:20:31 UTC (rev 8726)
@@ -9,7 +9,7 @@
                                <xsl:attribute 
name="class">active</xsl:attribute>
                        </xsl:if>
                        <xsl:attribute name="href">
-                               
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list</xsl:text>
+                               
<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>
@@ -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_for_location.view_cases_for_check_list</xsl:text>
+                               
<xsl:text>index.php?menuaction=controller.uicheck_list.view_cases_for_check_list</xsl:text>
                                <xsl:text>&amp;check_list_id=</xsl:text>
                                <xsl:value-of select="check_list/id"/>
                        </xsl:attribute>
@@ -31,7 +31,7 @@
                                <xsl:attribute 
name="class">active</xsl:attribute>
                        </xsl:if>
                        <xsl:attribute name="href">
-                               
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_control_info</xsl:text>
+                               
<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>
@@ -40,7 +40,7 @@
                <div>
                        <a class="btn focus first">
                                <xsl:attribute name="href">
-                                       
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.register_case</xsl:text>
+                                       
<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>

Modified: trunk/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/edit_check_list.xsl      
2012-01-30 18:13:57 UTC (rev 8725)
+++ trunk/controller/templates/base/check_list/edit_check_list.xsl      
2012-01-30 18:20:31 UTC (rev 8726)
@@ -34,7 +34,7 @@
        
                <h3 class="box_header">Sjekklistedetaljer</h3>
                <fieldset class="check_list_details">
-                       <form id="frm_update_check_list" 
action="index.php?menuaction=controller.uicheck_list_for_location.update_check_list"
 method="post">
+                       <form id="frm_update_check_list" 
action="index.php?menuaction=controller.uicheck_list.update_check_list" 
method="post">
                                
                        <xsl:variable name="check_list_id"><xsl:value-of 
select="check_list/id"/></xsl:variable>
                        <input id="check_list_id" type="hidden" 
name="check_list_id" value="{$check_list_id}" />

Modified: trunk/controller/templates/base/check_list/register_case.xsl
===================================================================
--- trunk/controller/templates/base/check_list/register_case.xsl        
2012-01-30 18:13:57 UTC (rev 8725)
+++ trunk/controller/templates/base/check_list/register_case.xsl        
2012-01-30 18:20:31 UTC (rev 8726)
@@ -46,7 +46,7 @@
                                                                        </form>
                                                                </xsl:when>
                                                                <xsl:when 
test="type = 'control_item_type_2'">
-                                                               <form 
id="frm_save_check_item" 
action="index.php?menuaction=controller.uicheck_list_for_location.save_check_item&amp;phpgw_return_as=json"
 method="post">
+                                                               <form 
id="frm_save_check_item" 
action="index.php?menuaction=controller.uicheck_list.save_check_item&amp;phpgw_return_as=json"
 method="post">
                                                                        
<xsl:variable name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
                                                                        <input 
type="hidden" name="control_item_id" value="{$control_item_id}" /> 
                                                                        <input 
name="status" type="hidden" value="1" />

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    
2012-01-30 18:13:57 UTC (rev 8725)
+++ trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl    
2012-01-30 18:20:31 UTC (rev 8726)
@@ -64,7 +64,7 @@
                
                <a style="display:none;" id="view_open_cases">
                        <xsl:attribute name="href">
-                               
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_open_cases</xsl:text>
+                               
<xsl:text>index.php?menuaction=controller.uicheck_list.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>

Modified: trunk/controller/templates/base/check_list/view_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_check_list.xsl      
2012-01-30 18:13:57 UTC (rev 8725)
+++ trunk/controller/templates/base/check_list/view_check_list.xsl      
2012-01-30 18:20:31 UTC (rev 8726)
@@ -53,7 +53,7 @@
                
                <a>
                        <xsl:attribute name="href">
-                       
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list</xsl:text>
+                       
<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>

Modified: trunk/controller/templates/base/check_list/view_check_lists.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_check_lists.xsl     
2012-01-30 18:13:57 UTC (rev 8725)
+++ trunk/controller/templates/base/check_list/view_check_lists.xsl     
2012-01-30 18:20:31 UTC (rev 8726)
@@ -51,7 +51,7 @@
                                                   <div>
                                                           <a>
                                                                        
<xsl:attribute name="href">
-                                                                               
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_check_list</xsl:text>
+                                                                               
<xsl:text>index.php?menuaction=controller.uicheck_list.view_check_list</xsl:text>
                                                                                
<xsl:text>&amp;check_list_id=</xsl:text>
                                                                                
        <xsl:value-of select="id"/>
                                                                        
</xsl:attribute>
@@ -81,7 +81,7 @@
                </ul>
                 <a>
                        <xsl:attribute name="href">
-                               
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.control_calendar_status_overview</xsl:text>
+                               
<xsl:text>index.php?menuaction=controller.uicheck_list.control_calendar_status_overview</xsl:text>
                                <xsl:text>&amp;control_id=</xsl:text>
                                        <xsl:value-of 
select="control_as_array/id"/>
                        </xsl:attribute>

Modified: trunk/controller/templates/base/check_list/view_control_info.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_info.xsl    
2012-01-30 18:13:57 UTC (rev 8725)
+++ trunk/controller/templates/base/check_list/view_control_info.xsl    
2012-01-30 18:20:31 UTC (rev 8726)
@@ -76,7 +76,7 @@
        <div class="tab_menu">
                <a id="view_control_details" class="active">
                        <xsl:attribute name="href">
-                               
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_control_details</xsl:text>
+                               
<xsl:text>index.php?menuaction=controller.uicheck_list.view_control_details</xsl:text>
                                <xsl:text>&amp;control_id=</xsl:text>
                                <xsl:value-of select="control/id"/>
                                
<xsl:text>&amp;phpgw_return_as=stripped_html</xsl:text>
@@ -85,7 +85,7 @@
                </a>
                <a id="view_control_items">
                        <xsl:attribute name="href">
-                               
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_control_items</xsl:text>
+                               
<xsl:text>index.php?menuaction=controller.uicheck_list.view_control_items</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>

Modified: trunk/controller/templates/base/check_list/view_control_items.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_items.xsl   
2012-01-30 18:13:57 UTC (rev 8725)
+++ trunk/controller/templates/base/check_list/view_control_items.xsl   
2012-01-30 18:20:31 UTC (rev 8726)
@@ -38,7 +38,7 @@
 </ul>
 <a style="margin-top:20px;" id="print_control_items" class="btn" 
target="_blank">
        <xsl:attribute name="href">
-               
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.print_check_list</xsl:text>
+               
<xsl:text>index.php?menuaction=controller.uicheck_list.print_check_list</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>

Modified: trunk/controller/templates/base/check_list/view_measurements.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_measurements.xsl    
2012-01-30 18:13:57 UTC (rev 8725)
+++ trunk/controller/templates/base/check_list/view_measurements.xsl    
2012-01-30 18:20:31 UTC (rev 8726)
@@ -18,7 +18,7 @@
                                        <xsl:for-each 
select="measurement_check_items">
                                                        <li>
                                                                <h4><img 
src="controller/images/arrow_right.png" width="14"/><span><xsl:value-of 
select="control_item/title"/></span></h4>                                       
       
-                                                               <form 
id="frm_save_check_item" 
action="index.php?menuaction=controller.uicheck_list_for_location.save_check_item"
 method="post">
+                                                               <form 
id="frm_save_check_item" 
action="index.php?menuaction=controller.uicheck_list.save_check_item" 
method="post">
                                                                        
<xsl:variable name="check_item_id"><xsl:value-of select="id"/></xsl:variable>
                                                                        <input 
type="hidden" name="check_item_id" value="{$check_item_id}" />
                                                                        <input 
type="hidden" name="type" value="control_item_type_2" />

Modified: trunk/controller/templates/base/check_list/view_open_cases.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_open_cases.xsl      
2012-01-30 18:13:57 UTC (rev 8725)
+++ trunk/controller/templates/base/check_list/view_open_cases.xsl      
2012-01-30 18:20:31 UTC (rev 8726)
@@ -78,7 +78,7 @@
                        
                        <a style="font-size: 11px;margin-top: 20px;padding: 3px 
20px;" class="btn focus">
                                <xsl:attribute name="href">
-                                       
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.register_case</xsl:text>
+                                       
<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>

Modified: 
trunk/controller/templates/base/control_item/view_control_item_list.xsl
===================================================================
--- trunk/controller/templates/base/control_item/view_control_item_list.xsl     
2012-01-30 18:13:57 UTC (rev 8725)
+++ trunk/controller/templates/base/control_item/view_control_item_list.xsl     
2012-01-30 18:20:31 UTC (rev 8726)
@@ -51,7 +51,7 @@
                <div style="margin:20px 0;">
                        <a  
style="text-decoration:underline;font-size:20px;color:#333;">
                                <xsl:attribute name="href">
-                                       
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.save_check_list</xsl:text>
+                                       
<xsl:text>index.php?menuaction=controller.uicheck_list.save_check_list</xsl:text>
                                        <xsl:text>&amp;control_id=</xsl:text>
                                                <xsl:value-of 
select="control_as_array/id"/>
                                </xsl:attribute>




reply via email to

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