fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [10023] controller: use generated urls


From: Sigurd Nes
Subject: [Fmsystem-commits] [10023] controller: use generated urls
Date: Sun, 23 Sep 2012 12:09:36 +0000

Revision: 10023
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10023
Author:   sigurdne
Date:     2012-09-23 12:09:32 +0000 (Sun, 23 Sep 2012)
Log Message:
-----------
controller: use generated urls

Modified Paths:
--------------
    trunk/controller/templates/base/check_list/add_case.xsl
    trunk/controller/templates/base/check_list/edit_check_list.xsl
    trunk/controller/templates/base/control_group/control_groups.xsl
    trunk/controller/templates/base/control_item/choose_control_items.xsl
    trunk/controller/templates/base/control_item/control_item.xsl
    trunk/controller/templates/base/control_item/control_item_option.xsl
    trunk/controller/templates/base/procedure/procedure_documents.xsl

Modified: trunk/controller/templates/base/check_list/add_case.xsl
===================================================================
--- trunk/controller/templates/base/check_list/add_case.xsl     2012-09-21 
14:12:35 UTC (rev 10022)
+++ trunk/controller/templates/base/check_list/add_case.xsl     2012-09-23 
12:09:32 UTC (rev 10023)
@@ -75,6 +75,8 @@
                
                <div class="expand_menu"><div class="expand_all">Vis 
alle</div><div class="collapse_all focus">Skjul alle</div></div>
                
+               <xsl:variable name="action_url"><xsl:value-of 
select="php:function('get_phpgw_link', 'index.php', 
'menuaction:controller.uicase.add_case,phpgw_return_as:json')" /></xsl:variable>
+
                <ul class="control_groups">
                        <xsl:for-each select="control_groups_with_items_array">
                        <xsl:choose>
@@ -87,7 +89,7 @@
                                                                        
<h4><img src="controller/images/arrow_right.png" /><span><xsl:value-of 
select="title"/></span></h4>     
                                                                                
<xsl:choose>
                                                                                
        <xsl:when test="type = 'control_item_type_1'">
-                                                                               
                <form class="frm_register_case expand_item" 
action="index.php?menuaction=controller.uicase.add_case&amp;phpgw_return_as=json"
 method="post">
+                                                                               
                <form class="frm_register_case expand_item" 
action="{$action_url}" 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="check_list_id" 
type="hidden"><xsl:attribute name="value"><xsl:value-of 
select="//check_list/id"/></xsl:attribute></input>
@@ -104,7 +106,7 @@
                                                                                
                </form>
                                                                                
        </xsl:when>
                                                                                
        <xsl:when test="type = 'control_item_type_2'">
-                                                                               
        <form class="frm_register_case expand_item" 
action="index.php?menuaction=controller.uicase.add_case&amp;phpgw_return_as=json"
 method="post">
+                                                                               
        <form class="frm_register_case expand_item" action="{$action_url}" 
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="check_list_id" 
type="hidden"><xsl:attribute name="value"><xsl:value-of 
select="//check_list/id"/></xsl:attribute></input>
@@ -139,7 +141,7 @@
                                                                                
                </form>
                                                                                
        </xsl:when>
                                                                                
        <xsl:when test="type = 'control_item_type_3'">
-                                                                               
                <form class="frm_register_case expand_item" 
action="index.php?menuaction=controller.uicase.add_case&amp;phpgw_return_as=json"
 method="post">
+                                                                               
                <form class="frm_register_case expand_item" 
action="{$action_url}" 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="check_list_id" 
type="hidden"><xsl:attribute name="value"><xsl:value-of 
select="//check_list/id"/></xsl:attribute></input>
@@ -175,7 +177,7 @@
                                                                                
                </form>
                                                                                
        </xsl:when>
                                                                                
        <xsl:when test="type = 'control_item_type_4'">
-                                                                               
                <form class="frm_register_case expand_item" 
action="index.php?menuaction=controller.uicase.add_case&amp;phpgw_return_as=json"
 method="post">
+                                                                               
                <form class="frm_register_case expand_item" 
action="{$action_url}" 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="check_list_id" 
type="hidden"><xsl:attribute name="value"><xsl:value-of 
select="//check_list/id"/></xsl:attribute></input>

Modified: trunk/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/edit_check_list.xsl      
2012-09-21 14:12:35 UTC (rev 10022)
+++ trunk/controller/templates/base/check_list/edit_check_list.xsl      
2012-09-23 12:09:32 UTC (rev 10023)
@@ -73,7 +73,8 @@
        <!-- ==================  CHECKLIST DETAILS  ===================== -->
        <div id="check_list_details">
                <h3 class="box_header">Sjekklistedetaljer</h3>
-                       <form id="frm_update_check_list" 
action="index.php?menuaction=controller.uicheck_list.save_check_list" 
method="post">   
+                       <xsl:variable name="action_url"><xsl:value-of 
select="php:function('get_phpgw_link', 'index.php', 
'menuaction:controller.uicheck_list.save_check_list')" /></xsl:variable>
+                       <form id="frm_update_check_list" action="{$action_url}" 
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/control_group/control_groups.xsl
===================================================================
--- trunk/controller/templates/base/control_group/control_groups.xsl    
2012-09-21 14:12:35 UTC (rev 10022)
+++ trunk/controller/templates/base/control_group/control_groups.xsl    
2012-09-23 12:09:32 UTC (rev 10023)
@@ -6,7 +6,9 @@
        
                <h2><xsl:value-of select="control_area/title"/></h2>
                
-               <form id="frm_save_control_groups" 
action="index.php?menuaction=controller.uicontrol.save_control_groups" 
method="post">
+               <xsl:variable name="action_url"><xsl:value-of 
select="php:function('get_phpgw_link', 'index.php', 
'menuaction:controller.uicontrol.save_control_groups')" /></xsl:variable>
+
+               <form id="frm_save_control_groups" action="{$action_url}" 
method="post">
                        <xsl:variable name="control_area_id"><xsl:value-of 
select="control_area/id"/></xsl:variable>
                        <input type="hidden" name="control_area_id" 
value="{$control_area_id}" />
                        

Modified: trunk/controller/templates/base/control_item/choose_control_items.xsl
===================================================================
--- trunk/controller/templates/base/control_item/choose_control_items.xsl       
2012-09-21 14:12:35 UTC (rev 10022)
+++ trunk/controller/templates/base/control_item/choose_control_items.xsl       
2012-09-23 12:09:32 UTC (rev 10023)
@@ -9,7 +9,8 @@
           <!-- ==== CHOOSE NONE/ALL ===== -->
                <div class="expand_menu"><div class="expand_all">Vis 
alle</div><div class="collapse_all focus">Skjul alle</div></div>
                
-               <form id="frm_control_items" 
action="index.php?menuaction=controller.uicontrol.save_control_items" 
method="post">       
+               <xsl:variable name="action_url"><xsl:value-of 
select="php:function('get_phpgw_link', 'index.php', 
'menuaction:controller.uicontrol.save_control_items')" /></xsl:variable>
+               <form id="frm_control_items" action="{$action_url}" 
method="post">      
                        <xsl:variable name="control_id"><xsl:value-of 
select="control/id"/></xsl:variable>
                        <input type="hidden" name="control_id" 
value="{$control_id}" />
                        

Modified: trunk/controller/templates/base/control_item/control_item.xsl
===================================================================
--- trunk/controller/templates/base/control_item/control_item.xsl       
2012-09-21 14:12:35 UTC (rev 10022)
+++ trunk/controller/templates/base/control_item/control_item.xsl       
2012-09-23 12:09:32 UTC (rev 10023)
@@ -17,7 +17,8 @@
 </xsl:choose>
        
        <div id="control_item_details">
-               <form 
action="index.php?menuaction=controller.uicontrol_item.save" method="post">
+               <xsl:variable name="action_url"><xsl:value-of 
select="php:function('get_phpgw_link', 'index.php', 
'menuaction:controller.uicontrol_item.save')" /></xsl:variable>
+               <form action="{$action_url}" method="post">
                        <input type="hidden" name="id" 
value="{control_item/id}" />
                        <dl class="proplist">
                                <dt>

Modified: trunk/controller/templates/base/control_item/control_item_option.xsl
===================================================================
--- trunk/controller/templates/base/control_item/control_item_option.xsl        
2012-09-21 14:12:35 UTC (rev 10022)
+++ trunk/controller/templates/base/control_item/control_item_option.xsl        
2012-09-23 12:09:32 UTC (rev 10023)
@@ -13,7 +13,8 @@
        
 <div class="yui-content">
        <div id="details">
-               <form id="frm_add_control_item_option" 
action="index.php?menuaction=controller.uicontrol_item_option.save" 
method="post">
+               <xsl:variable name="action_url"><xsl:value-of 
select="php:function('get_phpgw_link', 'index.php', 
'menuaction:controller.uicontrol_item_option.save')" /></xsl:variable>
+               <form id="frm_add_control_item_option" action="{$action_url}" 
method="post">
                        <input type="hidden" name="control_item_id">
                                <xsl:attribute name="value"><xsl:value-of 
select="control_item/id"/></xsl:attribute>
                        </input>

Modified: trunk/controller/templates/base/procedure/procedure_documents.xsl
===================================================================
--- trunk/controller/templates/base/procedure/procedure_documents.xsl   
2012-09-21 14:12:35 UTC (rev 10022)
+++ trunk/controller/templates/base/procedure/procedure_documents.xsl   
2012-09-23 12:09:32 UTC (rev 10023)
@@ -7,7 +7,8 @@
 
 <div class="yui-content">
                <div id="details">
-                       <form enctype="multipart/form-data" 
action="?menuaction=controller.uidocument.add" method="POST">
+                       <xsl:variable name="action_url"><xsl:value-of 
select="php:function('get_phpgw_link', 'index.php', 
'menuaction:controller.uidocument.add')" /></xsl:variable>
+                       <form enctype="multipart/form-data" 
action="{$action_url}" method="POST">
                                <xsl:variable name="lang_upload"><xsl:value-of 
select="php:function('lang', 'upload')" /></xsl:variable>
                                <input type="hidden" name="procedure_id" value 
= "{procedure_id}" />
                                <input type="hidden" name="document_type" 
value="1" />
@@ -63,4 +64,4 @@
                        </xsl:for-each>
                </tr>
        </xsl:for-each>
-</xsl:template>
\ No newline at end of file
+</xsl:template>




reply via email to

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