[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10418]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [10418] |
|
Date: |
Fri, 02 Nov 2012 07:29:26 +0000 |
Revision: 10418
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10418
Author: vator
Date: 2012-11-02 07:29:25 +0000 (Fri, 02 Nov 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/logistic/templates/base/css/base.css
trunk/logistic/templates/base/project/project_item.xsl
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-02 07:29:09 UTC (rev
10417)
+++ trunk/logistic/templates/base/css/base.css 2012-11-02 07:29:25 UTC (rev
10418)
@@ -865,6 +865,12 @@
color: #333333;
}
+.btn.non-focus {
+ background: none repeat scroll 0 0 #A0C8F2;
+ border: 1px solid #74B0EF;
+ color: #0A3E74;
+}
+
.btn.focus, .btn_m.focus {
background: none repeat scroll 0 0 #F57056;
border-color: #EE836F -moz-use-text-color #CB563F;
@@ -2356,7 +2362,8 @@
}
#activity-tabview .yui-navset {
- margin-left: 0;
+ margin-left: 0;
+ margin-right: 0;
}
.yui-dt19-col-delete_link .yui-dt-liner, .yui-dt19-col-alloc_link
.yui-dt-liner {
@@ -2369,14 +2376,14 @@
#add-requirement-btn {
float: left;
- margin-left: 658px;
+ margin-left: 669px;
text-align: center;
width: 120px;
}
#add-sub-activity-btn {
float: left;
- margin-left: 474px;
+ margin-left: 510px;
margin-top: 14px;
text-align: center;
width: 120px;
@@ -2388,6 +2395,7 @@
#sub-activities-container .yui-dt table {
border: 1px solid #98BFE8;
+ width: 800px;
}
#sub-activities-container .yui-dt th a {
Modified: trunk/logistic/templates/base/project/project_item.xsl
===================================================================
--- trunk/logistic/templates/base/project/project_item.xsl 2012-11-02
07:29:09 UTC (rev 10417)
+++ trunk/logistic/templates/base/project/project_item.xsl 2012-11-02
07:29:25 UTC (rev 10418)
@@ -29,7 +29,7 @@
<xsl:variable
name="error_msg"><xsl:value-of select="project/error_msg_array/name"
/></xsl:variable>
<div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
</xsl:if>
- <div
style="margin-left:0; margin-bottom: 3px;" class="help_text line">Angi
startdato for aktiviteten</div>
+ <div
style="margin-left:0; margin-bottom: 3px;" class="help_text line">Angi navn for
prosjektet</div>
<input type="text"
name="name" id="name" value="{project/name}" size="100"/>
</xsl:when>
<xsl:otherwise>
@@ -47,7 +47,7 @@
<xsl:variable
name="error_msg"><xsl:value-of select="project/error_msg_array/project_type_id"
/></xsl:variable>
<div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
</xsl:if>
- <div
style="margin-left:0; margin-bottom: 3px;" class="help_text line">Angi
startdato for aktiviteten</div>
+ <div
style="margin-left:0; margin-bottom: 3px;" class="help_text line">Angi
prosjekttype</div>
<select
id="project_type_id" name="project_type_id">
<xsl:apply-templates select="options"/>
</select>
@@ -67,7 +67,7 @@
<xsl:variable
name="error_msg"><xsl:value-of select="project/error_msg_array/description"
/></xsl:variable>
<div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
</xsl:if>
- <div
style="margin-left:0; margin-bottom: 3px;" class="help_text line">Angi
startdato for aktiviteten</div>
+ <div
style="margin-left:0; margin-bottom: 3px;" class="help_text line">Gi en
beskrivelse av prosjektet</div>
<textarea
id="description" name="description" rows="5" cols="60"><xsl:value-of
select="project/description" disable-output-escaping="yes"/></textarea>
</xsl:when>
<xsl:otherwise>
@@ -87,9 +87,16 @@
</xsl:when>
<xsl:otherwise>
<xsl:variable
name="lang_edit"><xsl:value-of select="php:function('lang', 'edit')"
/></xsl:variable>
- <xsl:variable
name="lang_new_activity"><xsl:value-of select="php:function('lang',
't_new_activity')" /></xsl:variable>
<input type="submit"
name="edit_project" value="{$lang_edit}" title = "{$lang_edit}" />
- <input type="submit"
name="new_activity" value="{$lang_new_activity}" title = "{$lang_new_activity}"
/>
+
+ <xsl:variable
name="add_new_activity_params">
+
<xsl:text>menuaction:logistic.uiactivity.edit, project_id:</xsl:text>
+ <xsl:value-of
select="project/id" />
+ </xsl:variable>
+ <xsl:variable
name="add_new_activity_url">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php', $add_new_activity_params
)" />
+ </xsl:variable>
+ <a class="btn
non-focus" href="{$add_new_activity_url}"><xsl:value-of
select="php:function('lang', 'Add activity')" /></a>
</xsl:otherwise>
</xsl:choose>
</div>
Modified: trunk/logistic/templates/base/requirement/requirement_overview.xsl
===================================================================
--- trunk/logistic/templates/base/requirement/requirement_overview.xsl
2012-11-02 07:29:09 UTC (rev 10417)
+++ trunk/logistic/templates/base/requirement/requirement_overview.xsl
2012-11-02 07:29:25 UTC (rev 10418)
@@ -27,7 +27,7 @@
</xsl:variable>
<h2 style="float:left;">Krav</h2>
- <a id="add_requirement_btn" 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>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10418],
Torstein <=