[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10437]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [10437] |
|
Date: |
Fri, 02 Nov 2012 13:59:22 +0000 |
Revision: 10437
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10437
Author: vator
Date: 2012-11-02 13:59:22 +0000 (Fri, 02 Nov 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/logistic/inc/class.uiproject.inc.php
trunk/logistic/setup/phpgw_no.lang
trunk/logistic/templates/base/activity/view_activity_item.xsl
trunk/logistic/templates/base/project/project_item.xsl
Modified: trunk/logistic/inc/class.uiproject.inc.php
===================================================================
--- trunk/logistic/inc/class.uiproject.inc.php 2012-11-02 13:03:39 UTC (rev
10436)
+++ trunk/logistic/inc/class.uiproject.inc.php 2012-11-02 13:59:22 UTC (rev
10437)
@@ -178,7 +178,7 @@
$project_type_array = $this->so->get_project_types();
$data = array(
- 'datatable_name' => lang('project'),
+ 'datatable_name' => lang('Overview
projects'),
'form' => array(
'toolbar' => array(
'item' => array(
Modified: trunk/logistic/setup/phpgw_no.lang
===================================================================
--- trunk/logistic/setup/phpgw_no.lang 2012-11-02 13:03:39 UTC (rev 10436)
+++ trunk/logistic/setup/phpgw_no.lang 2012-11-02 13:59:22 UTC (rev 10437)
@@ -76,4 +76,6 @@
select logistic no Velg
Add project logistic no Nytt prosjekt
Booking of resources logistic no Bestilling av ressurser
-Requirement to activity logistic no Krav for aktiviteten
\ No newline at end of file
+Requirement to activity logistic no Krav for aktiviteten
+edit logistic no Rediger
+Overview projects logistic no Oversikt over prosjekter
\ No newline at end of file
Modified: trunk/logistic/templates/base/activity/view_activity_item.xsl
===================================================================
--- trunk/logistic/templates/base/activity/view_activity_item.xsl
2012-11-02 13:03:39 UTC (rev 10436)
+++ trunk/logistic/templates/base/activity/view_activity_item.xsl
2012-11-02 13:59:22 UTC (rev 10437)
@@ -155,23 +155,7 @@
</xsl:choose>
</dd>
</dl>
-
- <!-- ========= SUBACTIVITIES ========= -->
-
- <xsl:variable name="add_sub_activity_params">
-
<xsl:text>menuaction:logistic.uiactivity.edit, parent_id:</xsl:text>
- <xsl:value-of select="activity/id" />
- </xsl:variable>
- <xsl:variable name="add_sub_activity_url">
- <xsl:value-of
select="php:function('get_phpgw_link', '/index.php', $add_sub_activity_params
)" />
- </xsl:variable>
-
- <h3 style="clear:left; float:left;margin: 0;
padding: 10px 0 5px;">Underaktiviteter</h3>
- <a id="add-sub-activity-btn" class="btn focus"
href="{$add_sub_activity_url}"><xsl:value-of select="php:function('lang', 'Add
sub activity')" /></a>
- <div style="clear:both;"
id="sub-activities-container"></div>
- <xsl:call-template name="datasource-definition"
/>
-
- <div class="form-buttons">
+ <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>
@@ -192,6 +176,22 @@
</xsl:choose>
</div>
</form>
+
+ <!-- ========= SUBACTIVITIES ========= -->
+ <div style="">
+ <xsl:variable name="add_sub_activity_params">
+
<xsl:text>menuaction:logistic.uiactivity.edit, parent_id:</xsl:text>
+ <xsl:value-of select="activity/id" />
+ </xsl:variable>
+ <xsl:variable name="add_sub_activity_url">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php', $add_sub_activity_params
)" />
+ </xsl:variable>
+
+ <h3 style="clear:left; float:left;margin: 0;
padding: 10px 0 5px;">Underaktiviteter</h3>
+ <a id="add-sub-activity-btn" class="btn focus"
href="{$add_sub_activity_url}"><xsl:value-of select="php:function('lang', 'Add
sub activity')" /></a>
+ <div style="clear:both;"
id="sub-activities-container"></div>
+ <xsl:call-template name="datasource-definition"
/>
+ </div>
</div>
</div>
</xsl:template>
Modified: trunk/logistic/templates/base/project/project_item.xsl
===================================================================
--- trunk/logistic/templates/base/project/project_item.xsl 2012-11-02
13:03:39 UTC (rev 10436)
+++ trunk/logistic/templates/base/project/project_item.xsl 2012-11-02
13:59:22 UTC (rev 10437)
@@ -10,7 +10,7 @@
<h1>
<xsl:value-of select="php:function('lang', 'Project')"
/>
</h1>
-
+
<div id="project_details" class="content-wrp">
<div id="details">
<xsl:variable name="action_url">
@@ -126,22 +126,21 @@
<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_project" value="{$lang_save}" title = "{$lang_save}" />
- <input type="submit"
name="cancel_project" value="{$lang_cancel}" title = "{$lang_cancel}" />
+
+ <xsl:variable
name="view_projects_url">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:logistic.uiproject.index' )" />
+ </xsl:variable>
+ <a class="btn"
href="{$view_projects_url}"><xsl:value-of select="php:function('lang',
'Cancel')" /></a>
</xsl:when>
<xsl:otherwise>
<xsl:variable
name="lang_edit"><xsl:value-of select="php:function('lang', 'edit')"
/></xsl:variable>
<input type="submit"
name="edit_project" value="{$lang_edit}" title = "{$lang_edit}" />
- <xsl:variable
name="add_new_project_params">
-
<xsl:text>menuaction:logistic.uiproject.edit, project_id:</xsl:text>
- <xsl:value-of
select="project/id" />
+ <xsl:variable
name="view_projects_url_2">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:logistic.uiproject.index' )" />
</xsl:variable>
- <xsl:variable
name="add_new_project_url">
- <xsl:value-of
select="php:function('get_phpgw_link', '/index.php', $add_new_project_params )"
/>
- </xsl:variable>
- <a class="btn
non-focus" href="{$add_new_project_url}"><xsl:value-of
select="php:function('lang', 'Add project')" /></a>
+ <a class="btn"
href="{$view_projects_url_2}">Vis prosjektoversikt</a>
</xsl:otherwise>
</xsl:choose>
</div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10437],
Torstein <=