[Fmsystem-commits] [10415]

[Torstein]

Revision: 10415
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10415
Author:   vator
Date:     2012-11-01 14:24:58 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/logistic/templates/base/activity/activity_tabs.xsl
    trunk/logistic/templates/base/activity/view_activity_item.xsl
    trunk/logistic/templates/base/css/base.css

Modified: trunk/logistic/templates/base/activity/activity_tabs.xsl
===================================================================
--- trunk/logistic/templates/base/activity/activity_tabs.xsl    2012-11-01 
14:20:12 UTC (rev 10414)
+++ trunk/logistic/templates/base/activity/activity_tabs.xsl    2012-11-01 
14:24:58 UTC (rev 10415)
@@ -2,7 +2,7 @@
 <!-- separate tabs and  inline tables-->
 
 <xsl:template match="data" xmlns:php="http://php.net/xsl";>
-<div class="yui-navset yui-navset-top" id="activity_tabview">
+<div class="yui-navset yui-navset-top" id="activity-tabview">
 
        <xsl:choose>
                <xsl:when test="view = 'activity_details'">

Modified: trunk/logistic/templates/base/activity/view_activity_item.xsl
===================================================================
--- trunk/logistic/templates/base/activity/view_activity_item.xsl       
2012-11-01 14:20:12 UTC (rev 10414)
+++ trunk/logistic/templates/base/activity/view_activity_item.xsl       
2012-11-01 14:24:58 UTC (rev 10415)
@@ -157,8 +157,17 @@
                                        </dd>
                                </dl>
                                
-                               <h3 style="clear: both; margin: 0; padding: 
20px 0 5px;">Underaktiviteter</h3>
-                               <div id="sub-activities-container"></div>       
        
+                               <xsl:variable name="add_req_params">
+                                       
<xsl:text>menuaction:logistic.uirequirement.edit, id:</xsl:text>
+                                       <xsl:value-of select="activity/id" />
+                               </xsl:variable>
+                               <xsl:variable name="add_req_url">
+                                       <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', $add_req_params )" />
+                               </xsl:variable>
+                               
+                               <h2 style="clear:left; float:left;margin: 0; 
padding: 20px 0 5px;">Underaktiviteter</h2>
+                               <a id="add-sub-activity-btn" class="btn focus" 
href="{$add_req_url}"><xsl:value-of select="php:function('lang', 'Add sub 
activity')" /></a>
+                               <div style="clear:both;" 
id="sub-activities-container"></div>           
                                <xsl:call-template name="datasource-definition" 
/>
                                
                                <div class="form-buttons">

Modified: trunk/logistic/templates/base/css/base.css
===================================================================
--- trunk/logistic/templates/base/css/base.css  2012-11-01 14:20:12 UTC (rev 
10414)
+++ trunk/logistic/templates/base/css/base.css  2012-11-01 14:24:58 UTC (rev 
10415)
@@ -2358,7 +2358,7 @@
        padding: 5px 0; 
 }
 
-#activity_tabview .yui-navset {
+#activity-tabview .yui-navset {
        margin-left: 0; 
 }
 
@@ -2370,9 +2370,17 @@
        text-align: center;
 }
 
-#add_requirement_btn {
+#add-requirement-btn {
     float: left;
     margin-left: 658px;
     text-align: center;
     width: 120px;
+}
+
+#add-sub-activity-btn {
+    float: left;
+    margin-left: 474px;
+    margin-top: 14px;
+    text-align: center;
+    width: 120px;
 }
\ No newline at end of file