[Fmsystem-commits] [10428]

[Torstein]

Revision: 10428
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10428
Author:   vator
Date:     2012-11-02 09:50:51 +0000 (Fri, 02 Nov 2012)
Log Message:
-----------


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

Added Paths:
-----------
    trunk/logistic/images/
    trunk/logistic/images/arrow_left.png

Added: trunk/logistic/images/arrow_left.png
===================================================================
(Binary files differ)


Property changes on: trunk/logistic/images/arrow_left.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/logistic/templates/base/activity/activity_tabs.xsl
===================================================================
--- trunk/logistic/templates/base/activity/activity_tabs.xsl    2012-11-02 
09:36:28 UTC (rev 10427)
+++ trunk/logistic/templates/base/activity/activity_tabs.xsl    2012-11-02 
09:50:51 UTC (rev 10428)
@@ -10,6 +10,8 @@
 
                        <xsl:choose>
                                <xsl:when test="activity/id != '' or 
activity/id != 0">
+                                       
+                                       <!-- =========== HEADING ============== 
-->
                                        <h1 style="float:left;"> 
                                                <span>
                                                        <xsl:value-of 
select="php:function('lang', 'Add requirement to activity')" />
@@ -18,13 +20,26 @@
                                                        <xsl:value-of 
select="activity/name" />
                                                </span>
                                        </h1>
-                                       <xsl:value-of 
disable-output-escaping="yes" select="breadcrumb" />      
+                                       
+                                       <!-- =========== BREADCRUMB 
============== -->
+                                       <div id="breadcrumb">
+                                               <img height="17" 
src="logistic/images/arrow_left.png" />
+                                               <xsl:value-of 
disable-output-escaping="yes" select="breadcrumb" />
+                                       </div>
+                                               
                                </xsl:when>
                                <xsl:otherwise>
+                               
+                                       <!-- =========== HEADING ============== 
-->
                                        <h1 style="float:left;"> 
                                                <xsl:value-of 
select="php:function('lang', 'Requirement allocation')" />
                                        </h1>
-                                       <xsl:value-of 
disable-output-escaping="yes" select="breadcrumb" />      
+                                       
+                                       <!-- =========== BREADCRUMB 
============== -->
+                                       <div id="breadcrumb">
+                                               <img height="17" 
src="logistic/images/arrow_left.png" />
+                                               <xsl:value-of 
disable-output-escaping="yes" select="breadcrumb" />
+                                       </div>
                                </xsl:otherwise>
                        </xsl:choose>
                

Modified: trunk/logistic/templates/base/activity/add_activity_item.xsl
===================================================================
--- trunk/logistic/templates/base/activity/add_activity_item.xsl        
2012-11-02 09:36:28 UTC (rev 10427)
+++ trunk/logistic/templates/base/activity/add_activity_item.xsl        
2012-11-02 09:50:51 UTC (rev 10428)
@@ -4,7 +4,9 @@
 <xsl:call-template name="yui_phpgw_i18n"/>
 <div class="yui-navset yui-navset-top">
 
-       <xsl:value-of disable-output-escaping="yes" select="breadcrumb" />      
                
+       <div id="breadcrumb">
+               <xsl:value-of disable-output-escaping="yes" select="breadcrumb" 
/>
+       </div>                  
 
        <xsl:choose>
                <xsl:when test="parent_activity/id &gt; 0">

Modified: trunk/logistic/templates/base/activity/view_activity_item.xsl
===================================================================
--- trunk/logistic/templates/base/activity/view_activity_item.xsl       
2012-11-02 09:36:28 UTC (rev 10427)
+++ trunk/logistic/templates/base/activity/view_activity_item.xsl       
2012-11-02 09:50:51 UTC (rev 10428)
@@ -3,6 +3,8 @@
 
        <div class="content-wrp">
                <div id="details">
+               
+                       <h3 style="margin: 0 0 5px 0;">Detaljer</h3>
                        <xsl:variable name="action_url">
                                <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:logistic.uiactivity.save')" />
                        </xsl:variable>
@@ -154,6 +156,8 @@
                                        </dd>
                                </dl>
                                
+                               <!-- =========  SUBACTIVITIES  =========  -->
+                               
                                <xsl:variable name="add_sub_activity_params">
                                        
<xsl:text>menuaction:logistic.uiactivity.edit, parent_id:</xsl:text>
                                        <xsl:value-of select="activity/id" />
@@ -162,7 +166,7 @@
                                        <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', $add_sub_activity_params 
)" />
                                </xsl:variable>
                                
-                               <h2 style="clear:left; float:left;margin: 0; 
padding: 20px 0 5px;">Underaktiviteter</h2>
+                               <h3 style="clear:left; float:left;margin: 0; 
padding: 10px 0 5px;">Underaktiviteter</h3>
                                <a id="add-sub-activity-btn" class="btn focus" 
href="{$add_sub_activity_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" 
/>

Modified: trunk/logistic/templates/base/css/base.css
===================================================================
--- trunk/logistic/templates/base/css/base.css  2012-11-02 09:36:28 UTC (rev 
10427)
+++ trunk/logistic/templates/base/css/base.css  2012-11-02 09:50:51 UTC (rev 
10428)
@@ -2383,8 +2383,8 @@
 
 #add-sub-activity-btn {
     float: left;
-    margin-left: 494px;
-    margin-top: 14px;
+    margin-left: 525px;
+    margin-top: 0;
     text-align: center;
     width: 136px;
 }
@@ -2409,4 +2409,10 @@
 #sub-activities-container th span, #requirement-container th span {
     color: #F9FCFE;
     font-weight: bold;
+}
+
+#breadcrumb {
+       clear: both;
+  font-size: 16px;
+  margin-bottom: 1em;
 }
\ No newline at end of file