[Fmsystem-commits] [10412]

[Torstein]

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


Modified Paths:
--------------
    trunk/logistic/inc/class.uirequirement.inc.php
    trunk/logistic/setup/phpgw_no.lang
    trunk/logistic/templates/base/css/base.css
    trunk/logistic/templates/base/requirement/requirement_overview.xsl

Modified: trunk/logistic/inc/class.uirequirement.inc.php
===================================================================
--- trunk/logistic/inc/class.uirequirement.inc.php      2012-11-01 13:51:33 UTC 
(rev 10411)
+++ trunk/logistic/inc/class.uirequirement.inc.php      2012-11-01 14:15:40 UTC 
(rev 10412)
@@ -173,11 +173,11 @@
                                $entry['allocated'] = $num_allocated;
                                
                                $href = self::link(array('menuaction' => 
'logistic.uirequirement.delete', 'id' => $entry['id']));
-                               $entry['delete_link'] = "<a class=\"btn-sm 
delete\" href=\"{$href}\">Slett krav</a>";
+                               $entry['delete_link'] = "<a class=\"btn-sm 
delete\" href=\"{$href}\">Slett</a>";
                                
                                $entry['select'] = "<input 
class=\"select_line\" type =\"radio\" {$_checked} name=\"values[select_line]\" 
value=\"{$entry['id']}\">";
                                $href = self::link(array('menuaction' => 
'logistic.uirequirement_resource_allocation.edit', 'requirement_id' => 
$entry['id']));
-                               $entry['alloc_link'] = "<a class=\"btn-sm 
alloc\" href=\"{$href}\">Alloker ressurser</a>";
+                               $entry['alloc_link'] = "<a class=\"btn-sm 
alloc\" href=\"{$href}\">Bestill</a>";
                        }
 
                        // ... add result data

Modified: trunk/logistic/setup/phpgw_no.lang
===================================================================
--- trunk/logistic/setup/phpgw_no.lang  2012-11-01 13:51:33 UTC (rev 10411)
+++ trunk/logistic/setup/phpgw_no.lang  2012-11-01 14:15:40 UTC (rev 10412)
@@ -65,10 +65,10 @@
 Add criterias  logistic        no      Legg til kriterier
 favorites      logistic        no      Favoritter
 toggle as favorite     logistic        no      Legg til / fjern som favoritt
-Add allocation to requirement  logistic        no      Bestill ressurser til 
krav
-Delete requirement     logistic        no Slett krav
+Add allocation to requirement  logistic        no      Bestill ressurser til 
behov
+Delete requirement     logistic        no      Slett behov
 Allocate resources     logistic        no      Bestill ressurser
 Num allocated  logistic        no      Antall bestilte
 Status logistic        no      Status
-Requirement allocation logistic        no      Allokering av ressurser
+Requirement allocation logistic        no      Bestilling 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:51:33 UTC (rev 
10411)
+++ trunk/logistic/templates/base/css/base.css  2012-11-01 14:15:40 UTC (rev 
10412)
@@ -2360,4 +2360,19 @@
 
 #activity_tabview .yui-navset {
        margin-left: 0; 
+}
+
+.yui-dt19-col-delete_link .yui-dt-liner, .yui-dt19-col-alloc_link 
.yui-dt-liner {
+       text-align: right;      
+}
+
+.yui-dt19-col-no_of_items .yui-dt-liner, .yui-dt19-col-allocated .yui-dt-liner 
{
+       text-align: center;
+}
+
+#add_requirement_btn {
+    float: left;
+    margin-left: 658px;
+    text-align: center;
+    width: 120px;
 }
\ 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:51:33 UTC (rev 10411)
+++ trunk/logistic/templates/base/requirement/requirement_overview.xsl  
2012-11-01 14:15:40 UTC (rev 10412)
@@ -26,9 +26,8 @@
                                <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', $add_req_params )" />
                        </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>
+                       <a id="add_requirement_btn" 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>