[Fmsystem-commits] [10409]

[Torstein]

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


Modified Paths:
--------------
    trunk/logistic/templates/base/css/base.css
    trunk/logistic/templates/base/requirement/requirement_overview.xsl

Modified: trunk/logistic/templates/base/css/base.css
===================================================================
--- trunk/logistic/templates/base/css/base.css  2012-11-01 13:11:13 UTC (rev 
10408)
+++ trunk/logistic/templates/base/css/base.css  2012-11-01 13:17:37 UTC (rev 
10409)
@@ -2330,8 +2330,7 @@
 }
 
 #resource_alloc_wrp #btn_menu {
-       float:left;
-       margin-left: 20px;
+    margin-left: 747px;
 }
 
 #resource_alloc_wrp input[type="submit"] {
@@ -2361,4 +2360,8 @@
 
 #requirement-container table td{
        padding: 5px 0; 
+}
+
+#activity_tabview .yui-navset {
+       margin-left: 0; 
 }
\ No newline at end of file

Modified: trunk/logistic/templates/base/requirement/requirement_overview.xsl
===================================================================
--- trunk/logistic/templates/base/requirement/requirement_overview.xsl  
2012-11-01 13:11:13 UTC (rev 10408)
+++ trunk/logistic/templates/base/requirement/requirement_overview.xsl  
2012-11-01 13:17:37 UTC (rev 10409)
@@ -18,11 +18,8 @@
 <xsl:template name="requirement_overview" xmlns:php="http://php.net/xsl";>
        <div id="resource_alloc_wrp" class="content-wrp">
 
-                       <div id="paging"></div>
+                       
 
-                       <h2>Krav</h2>
-                       <div style="float:left;margin-bottom: 40px;" 
id="requirement-container"></div>
-
                        <div id="btn_menu">
                                <xsl:variable name="add_requirement_url">
                                        <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:logistic.uirequirement.edit' )" />
@@ -30,13 +27,17 @@
                                
                                <form action="{$add_requirement_url}" 
name="acl_form" id="acl_form" method="post">
                                        <input type="hidden" name="activity_id" 
value="{activity/id}" />
-                                       <input class="btn" type="submit">
+                                       <input class="btn focus" type="submit">
                                                <xsl:attribute name="value">
                                                        <xsl:value-of 
select="php:function('lang', 'Add requirement')" />
                                                </xsl:attribute>
                                        </input>
                                </form>
-                               </div>
+                       </div>
+
+                       <h2>Krav</h2>
+                       <div id="paging"></div>
+                       <div style="float:left;margin-bottom: 40px;" 
id="requirement-container"></div>
                                
                        <h2 style="clear:both;">Allokerte ressurser</h2>
                        <div id="allocation-container"></div>