[Fmsystem-commits] [10422]

[Torstein]

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


Modified Paths:
--------------
    trunk/logistic/setup/phpgw_no.lang
    trunk/logistic/templates/base/activity/activity_item.xsl
    trunk/logistic/templates/base/css/base.css

Modified: trunk/logistic/setup/phpgw_no.lang
===================================================================
--- trunk/logistic/setup/phpgw_no.lang  2012-11-02 07:31:45 UTC (rev 10421)
+++ trunk/logistic/setup/phpgw_no.lang  2012-11-02 07:48:05 UTC (rev 10422)
@@ -30,7 +30,7 @@
 my_activities  logistic        no      Mine aktiviteter
 Project type name updated              logistic        no      
Prosjekttypenavn oppdatert
 Add activity   logistic        no      Legg til aktivitet
-Add sub activity       logistic        no      Legg til subaktivitet
+Add sub activity       logistic        no      Legg til underaktivitet
 Entity logistic        no      Entitet
 Category       logistic        no      Kategori
 Attributes     logistic        no      Attributter
@@ -72,4 +72,5 @@
 Status logistic        no      Status
 Requirement allocation logistic        no      Bestilling av ressurser
 Activity details       logistic        no      Detaljer for aktivitet
-Status requirement     logistic        no      Status behov
\ No newline at end of file
+Status requirement     logistic        no      Status behov
+select logistic        no      Velg 
\ No newline at end of file

Modified: trunk/logistic/templates/base/activity/activity_item.xsl
===================================================================
--- trunk/logistic/templates/base/activity/activity_item.xsl    2012-11-02 
07:31:45 UTC (rev 10421)
+++ trunk/logistic/templates/base/activity/activity_item.xsl    2012-11-02 
07:48:05 UTC (rev 10422)
@@ -176,14 +176,12 @@
                                <div class="form-buttons">
                                        <xsl:choose>
                                                <xsl:when test="editable">
-                                                       <xsl:variable 
name="lang_save"><xsl:value-of select="php:function('lang', 'save')" 
/></xsl:variable>
-                                                       <xsl:variable 
name="lang_cancel"><xsl:value-of select="php:function('lang', 'cancel')" 
/></xsl:variable>
                                                        <input type="submit" 
name="save_activity" value="{$lang_save}" title = "{$lang_save}" />
                                                        <input type="submit" 
name="cancel_activity" value="{$lang_cancel}" title = "{$lang_cancel}" />
                                                </xsl:when>
                                                <xsl:otherwise>
                                                        <xsl:variable 
name="params">
-                                                               
<xsl:text>menuaction:logistic.uiactivity.edit, id:</xsl:text>
+                                                               
<xsl:text>menuaction:logistic.uiactivity.edit, parent_id:</xsl:text>
                                                                <xsl:value-of 
select="activity/id" />
                                                        </xsl:variable>
                                                        <xsl:variable 
name="edit_url">

Modified: trunk/logistic/templates/base/css/base.css
===================================================================
--- trunk/logistic/templates/base/css/base.css  2012-11-02 07:31:45 UTC (rev 
10421)
+++ trunk/logistic/templates/base/css/base.css  2012-11-02 07:48:05 UTC (rev 
10422)
@@ -2376,29 +2376,37 @@
 
 #add-requirement-btn {
     float: left;
-    margin-left: 669px;
+    margin-left: 715px;
     text-align: center;
     width: 120px;
 }
 
 #add-sub-activity-btn {
     float: left;
-    margin-left: 510px;
+    margin-left: 494px;
     margin-top: 14px;
     text-align: center;
-    width: 120px;
+    width: 136px;
 }
 
-#sub-activities-container th.yui-dt-sortable div {
+#sub-activities-container th div, #requirement-container th div {
     background: #6292C5;
 }
 
+#sub-activities-container .yui-dt table, #requirement-container .yui-dt table {
+    border: 1px solid #98BFE8;
+}
+
 #sub-activities-container .yui-dt table {
-    border: 1px solid #98BFE8;
     width: 800px;
 }
 
-#sub-activities-container .yui-dt th a {
+#requirement-container .yui-dt table {
+    width: 900px;
+}
+       
+#sub-activities-container th a, #requirement-container th a,
+#sub-activities-container th span, #requirement-container th span {
     color: #F9FCFE;
     font-weight: bold;
 }
\ No newline at end of file