[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10411]
From: |
Torstein |
Subject: |
[Fmsystem-commits] [10411] |
Date: |
Thu, 01 Nov 2012 13:51:33 +0000 |
Revision: 10411
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10411
Author: vator
Date: 2012-11-01 13:51:33 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/logistic/setup/phpgw_no.lang
trunk/logistic/templates/base/css/base.css
trunk/logistic/templates/base/requirement/requirement_overview.xsl
Modified: trunk/logistic/setup/phpgw_no.lang
===================================================================
--- trunk/logistic/setup/phpgw_no.lang 2012-11-01 13:40:50 UTC (rev 10410)
+++ trunk/logistic/setup/phpgw_no.lang 2012-11-01 13:51:33 UTC (rev 10411)
@@ -70,4 +70,5 @@
Allocate resources logistic no Bestill ressurser
Num allocated logistic no Antall bestilte
Status logistic no Status
-Requirement allocation logistic no Allokering av ressurser
\ No newline at end of file
+Requirement allocation logistic no Allokering av ressurser
+Activity details logistic no Detaljer for aktivitet
\ No newline at end of file
Modified: trunk/logistic/templates/base/css/base.css
===================================================================
--- trunk/logistic/templates/base/css/base.css 2012-11-01 13:40:50 UTC (rev
10410)
+++ trunk/logistic/templates/base/css/base.css 2012-11-01 13:51:33 UTC (rev
10411)
@@ -2329,10 +2329,6 @@
padding: 20px;
}
-#resource_alloc_wrp #btn_menu {
- margin-left: 747px;
-}
-
#resource_alloc_wrp input[type="submit"] {
font-size: 13px;
margin-bottom: 1px;
Modified: trunk/logistic/templates/base/requirement/requirement_overview.xsl
===================================================================
--- trunk/logistic/templates/base/requirement/requirement_overview.xsl
2012-11-01 13:40:50 UTC (rev 10410)
+++ trunk/logistic/templates/base/requirement/requirement_overview.xsl
2012-11-01 13:51:33 UTC (rev 10411)
@@ -17,28 +17,21 @@
<xsl:template name="requirement_overview" xmlns:php="http://php.net/xsl">
<div id="resource_alloc_wrp" class="content-wrp">
-
+
+ <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>
-
- <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' )" />
- </xsl:variable>
+
+ <h2 style="float:left;">Krav</h2>
+ <a style="float: left;margin-left: 724px;text-align:
center;width: 120px;" id="" class="btn focus"
href="{$add_req_url}"><xsl:value-of select="php:function('lang', 'Add
requirement')" /></a>
+ <div style="clear:both;" id="paging"></div>
+ <div style="margin-bottom: 40px;"
id="requirement-container"></div>
- <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 focus" type="submit">
- <xsl:attribute name="value">
- <xsl:value-of
select="php:function('lang', 'Add requirement')" />
- </xsl:attribute>
- </input>
- </form>
- </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>
</div>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10411],
Torstein <=