[Fmsystem-commits] [9483] frontend: remember tab

[Sigurd Nes]

Revision: 9483
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9483
Author:   sigurdne
Date:     2012-06-01 14:01:43 +0000 (Fri, 01 Jun 2012)
Log Message:
-----------
frontend: remember tab

Modified Paths:
--------------
    trunk/frontend/inc/class.uifrontend.inc.php
    trunk/frontend/templates/base/frontend.xsl

Modified: trunk/frontend/inc/class.uifrontend.inc.php
===================================================================
--- trunk/frontend/inc/class.uifrontend.inc.php 2012-06-01 13:08:32 UTC (rev 
9482)
+++ trunk/frontend/inc/class.uifrontend.inc.php 2012-06-01 14:01:43 UTC (rev 
9483)
@@ -75,6 +75,7 @@
                        $this->header_state = 
phpgwapi_cache::session_get('frontend', 'header_state');
                        $this->header_state['use_fellesdata'] = $use_fellesdata;
                        $this->header_state['logo_path'] = $logo_path;
+                       $this->header_state['form_action'] = 
$tabs[$selected]['link'];
                        
                        // Get navigation parameters
                        $param_selected_location = phpgw::get_var('location');  
                // New location selected from locations list
@@ -82,8 +83,8 @@
                        $param_only_org_unit = phpgw::get_var('org_enhet_id');  
// Frontend access from rental module regarding specific organisational unit
                        
                        //Refresh organisation list
-                       $refresh = phpgw::get_var('refresh'); 
-                       
+                       $refresh = phpgw::get_var('refresh','bool'); 
+
                        $property_locations_update = false;
                        
                        /* If the user has selected an organisational unit or 
all units */

Modified: trunk/frontend/templates/base/frontend.xsl
===================================================================
--- trunk/frontend/templates/base/frontend.xsl  2012-06-01 13:08:32 UTC (rev 
9482)
+++ trunk/frontend/templates/base/frontend.xsl  2012-06-01 14:01:43 UTC (rev 
9483)
@@ -36,7 +36,7 @@
                                                        </em>
                                                        <xsl:value-of 
select="php:function('lang', 'organisational_units')"/> 
                                                        (<xsl:value-of 
select="number_of_org_units"/>)
-                                                       <a 
href="index.php?menuaction=frontend.uihelpdesk.index&amp;refresh=true" 
class="list_image">
+                                                       <a 
href="{form_action}&amp;refresh=true" class="list_image">
                                                                <img 
src="frontend/templates/base/images/16x16/page_refresh.png" class="list_image"/>
                                                        </a>
                                                </li>
@@ -87,7 +87,7 @@
                                                <label>
                                                        <xsl:choose>
                                                                <xsl:when 
test="use_fellesdata != 1">
-                                                                       <a 
href="index.php?menuaction=frontend.uihelpdesk.index&amp;refresh=true" 
class="list_image">
+                                                                       <a 
href="{form_action}&amp;refresh=true" class="list_image">
                                                                                
                                <img 
src="frontend/templates/base/images/16x16/page_refresh.png" class="list_image"/>
                                                                                
                        </a>
                                                                  </xsl:when>
@@ -102,11 +102,11 @@
                                <tr valign="top">
                                        <td>
                                                <div id="unit_selector">
-                                                       <form 
action="index.php?menuaction=frontend.uihelpdesk.index" method="post">
+                                                       <form 
action="{form_action}" method="post">
                                                                <label>
                                                                        
<xsl:choose>
                                                                                
<xsl:when test="use_fellesdata != 1">
-                                                                               
        <a 
href="index.php?menuaction=frontend.uihelpdesk.index&amp;refresh=true" 
class="list_image">
+                                                                               
        <a href="{form_action}&amp;refresh=true" class="list_image">
                                                                                
                                                <img 
src="frontend/templates/base/images/16x16/page_refresh.png" class="list_image"/>
                                                                                
                                        </a>
                                                                                
  </xsl:when>