[Fmsystem-commits] [10462]

[Torstein]

Revision: 10462
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10462
Author:   vator
Date:     2012-11-04 23:12:26 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php
    trunk/logistic/templates/base/allocation/book_resources.xsl

Modified: trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php
===================================================================
--- trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php  
2012-11-04 22:58:44 UTC (rev 10461)
+++ trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php  
2012-11-04 23:12:26 UTC (rev 10462)
@@ -404,11 +404,11 @@
                                
                                $activity = 
$this->so_activity->get_single($requirement->get_activity_id()); 
 
-                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uiactivity.view_resource_allocation', 
'activity_id' => $activity_id));
+                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uiactivity.view_resource_allocation', 
'activity_id' => $requirement->get_activity_id()));
                        }
                        else
                        {
-                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uiactivity.view_resource_allocation', 
'requirement_id' => $requirement_id));
+                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uiactivity.view_resource_allocation', 
'activity_id' => $requirement->get_activity_id()));
                        }
                }
                

Modified: trunk/logistic/templates/base/allocation/book_resources.xsl
===================================================================
--- trunk/logistic/templates/base/allocation/book_resources.xsl 2012-11-04 
22:58:44 UTC (rev 10461)
+++ trunk/logistic/templates/base/allocation/book_resources.xsl 2012-11-04 
23:12:26 UTC (rev 10462)
@@ -3,7 +3,7 @@
 
 <xsl:call-template name="yui_phpgw_i18n"/>
 <div id="resource-allocation" class="yui-navset yui-navset-top">
-       <h1>
+       <h1 style="margin-bottom:10px;">
                <xsl:value-of select="php:function('lang', 'Booking of 
resources')"/> for <xsl:value-of select="activity/name"/>
        </h1>
        
@@ -14,7 +14,7 @@
                <xsl:variable name="view_resources_url">
                        <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', $view_resources_params )" />
        </xsl:variable>
-       <a style="margin-left: 20px;" id="view-resources-btn" class="btn 
non-focus" href="{$view_resources_url}">
+       <a style="margin-left:0;margin-bottom:5px;" id="view-resources-btn" 
class="btn non-focus" href="{$view_resources_url}">
                <xsl:value-of select="php:function('lang', 'View resources 
overview')" />
        </a>