[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10427]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [10427] |
|
Date: |
Fri, 02 Nov 2012 09:36:28 +0000 |
Revision: 10427
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10427
Author: vator
Date: 2012-11-02 09:36:28 +0000 (Fri, 02 Nov 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/logistic/inc/class.soactivity.inc.php
trunk/logistic/templates/base/activity/activity_tabs.xsl
trunk/logistic/templates/base/activity/add_activity_item.xsl
trunk/logistic/templates/base/activity/view_activity_item.xsl
Removed Paths:
-------------
trunk/logistic/templates/base/activity/activity_item.xsl
Modified: trunk/logistic/inc/class.soactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.soactivity.inc.php 2012-11-02 09:22:15 UTC (rev
10426)
+++ trunk/logistic/inc/class.soactivity.inc.php 2012-11-02 09:36:28 UTC (rev
10427)
@@ -433,7 +433,6 @@
$activity->set_project_id($this->unmarshal($this->db->f('project_id'), 'int'));
$activity->set_start_date($this->unmarshal($this->db->f('start_date'), 'int'));
$activity->set_end_date($this->unmarshal($this->db->f('end_date'), 'int'));
-//
$activity->set_responsible_user_name($GLOBALS['phpgw']->accounts->get($this->db->f('responsible_user_id'))->__toString());
$activity->set_responsible_user_id($this->unmarshal($this->db->f('responsible_user_id'),
'int'));
$activity->set_create_date($this->unmarshal($this->db->f('create_date'),
'int'));
$activity->set_create_user($this->unmarshal($this->db->f('create_user'),
'int'));
Deleted: trunk/logistic/templates/base/activity/activity_item.xsl
===================================================================
--- trunk/logistic/templates/base/activity/activity_item.xsl 2012-11-02
09:22:15 UTC (rev 10426)
+++ trunk/logistic/templates/base/activity/activity_item.xsl 2012-11-02
09:36:28 UTC (rev 10427)
@@ -1,198 +0,0 @@
-<!-- $Id$ -->
-<!-- item -->
-
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info',
'user|preferences|common|dateformat')"/></xsl:variable>
-
-<xsl:call-template name="yui_phpgw_i18n"/>
-<div class="yui-navset yui-navset-top">
-
- <xsl:choose>
- <xsl:when test="parent_activity/id > 0">
- <h1>
- <xsl:value-of select="parent_activity/name"
disable-output-escaping="yes"/>::<xsl:value-of select="php:function('lang',
'Add sub activity')" />
- </h1>
- </xsl:when>
- <xsl:otherwise>
- <h1>
- <xsl:value-of select="php:function('lang', 'Add
activity')" />
- </h1>
- </xsl:otherwise>
- </xsl:choose>
-
- <div id="activity_details" class="content-wrp">
- <div id="details">
- <xsl:variable name="action_url">
- <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:logistic.uiactivity.save')" />
- </xsl:variable>
- <form action="{$action_url}" method="post">
- <input type="hidden" name="id" value =
"{activity/id}" />
- <input type="hidden" name="project_id"
value="{activity/project_id}" />
- <input type="hidden" name="parent_id"
value="{parent_activity/id}" />
-
- <dl class="proplist-col">
- <xsl:if test="parent_activity/id >
0">
- <dt>
- <xsl:if test="editable">
- <div
style="margin-bottom: 1em;width: 88%;" class="select-box">
- <label>Velg en
annen hovedaktivitet</label>
- <select
id="select_activity" name="parent_activity_id" class="selectLocation">
-
<option>Velg aktivitet</option>
-
<xsl:for-each select="activities">
- <option value="{id}">
- <xsl:if
test="activity/parent_id = id">
-
<xsl:attribute name="selected">
-
selected
-
</xsl:attribute>
- </xsl:if>
- <xsl:value-of
disable-output-escaping="yes" select="name"/>
- </option>
-
</xsl:for-each>
- </select>
- </div>
- </xsl:if>
- </dt>
- </xsl:if>
- <dt>
- <label for="name"><xsl:value-of
select="php:function('lang','Activity name')" /></label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <xsl:if
test="activity/error_msg_array/name != ''">
- <xsl:variable
name="error_msg"><xsl:value-of select="activity/error_msg_array/name"
/></xsl:variable>
- <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
- </xsl:if>
- <input type="text"
name="name" id="name" value="{activity/name}" size="100"/>
- <span class="help_text
line">Angi startdato for aktiviteten</span>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="activity/name" />
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label
for="description"><xsl:value-of select="php:function('lang', 'Description')"
/></label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <xsl:if
test="activity/error_msg_array/description != ''">
- <xsl:variable
name="error_msg"><xsl:value-of select="activity/error_msg_array/description"
/></xsl:variable>
- <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
- </xsl:if>
- <textarea
id="description" name="description" rows="5" cols="60"><xsl:value-of
select="activity/description" disable-output-escaping="yes"/></textarea>
- <span class="help_text
line">Angi startdato for aktiviteten</span>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="activity/description" disable-output-escaping="yes"/>
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label
for="start_date">Startdato</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when
test="editable">
- <xsl:if
test="activity/error_msg_array/start_date != ''">
-
<xsl:variable name="error_msg"><xsl:value-of
select="activity/error_msg_array/start_date" /></xsl:variable>
- <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
- </xsl:if>
- <input
class="date" id="start_date" name="start_date" type="text">
- <xsl:if
test="activity/start_date != ''">
- <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(activity/start_date))"/></xsl:attribute>
- </xsl:if>
- </input>
- <span class="help_text
line">Angi startdato for aktiviteten</span>
- </xsl:when>
- <xsl:otherwise>
- <span><xsl:value-of
select="php:function('date', $date_format,
number(activity/start_date))"/></span>
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label
for="end_date">Sluttdato</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when
test="editable">
- <xsl:if
test="activity/error_msg_array/end_date != ''">
-
<xsl:variable name="error_msg"><xsl:value-of
select="activity/error_msg_array/end_date" /></xsl:variable>
- <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
- </xsl:if>
- <input
class="date" id="end_date" name="end_date" type="text">
- <xsl:if
test="activity/end_date != ''">
- <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(activity/end_date))"/></xsl:attribute>
- </xsl:if>
- </input>
- <span class="help_text
line">Angi startdato for aktiviteten</span>
- </xsl:when>
- <xsl:otherwise>
- <span><xsl:value-of
select="php:function('date', $date_format, number(activity/end_date))"/></span>
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label
for="end_date">Ansvarlig</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when
test="editable">
- <xsl:if
test="activity/error_msg_array/responsible_user_id != ''">
-
<xsl:variable name="error_msg"><xsl:value-of
select="activity/error_msg_array/responsible_user_id" /></xsl:variable>
- <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
- </xsl:if>
- <select
name="responsible_user_id">
- <option
value="">Velg ansvarlig bruker</option>
- <xsl:for-each
select="responsible_users">
- <xsl:variable
name="full_name">
- <xsl:value-of
disable-output-escaping="yes" select="account_firstname"/><xsl:text> </xsl:text>
- <xsl:value-of
disable-output-escaping="yes" select="account_lastname"/>
- </xsl:variable>
- <xsl:choose>
- <xsl:when
test="//activity/responsible_user_id = account_id">
-
<option selected="selected" value="{account_id}">
-
<xsl:value-of disable-output-escaping="yes" select="$full_name"/>
-
</option>
- </xsl:when>
- <xsl:otherwise>
- <option
value="{account_id}">
-
<xsl:value-of disable-output-escaping="yes" select="$full_name"/>
-
</option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </select>
- <span class="help_text line">Angi
startdato for aktiviteten</span>
- </xsl:when>
- <xsl:otherwise>
- <span><xsl:value-of
select="activity/responsible_user_name"/></span>
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- </dl>
-
- <div class="form-buttons">
- <xsl:choose>
- <xsl:when test="editable">
- <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, parent_id:</xsl:text>
- <xsl:value-of
select="activity/id" />
- </xsl:variable>
- <xsl:variable
name="edit_url">
- <xsl:value-of
select="php:function('get_phpgw_link', '/index.php', $params )" />
- </xsl:variable>
- <a class="btn"
href="{$edit_url}"><xsl:value-of select="php:function('lang', 'edit')" /></a>
- </xsl:otherwise>
- </xsl:choose>
- </div>
- </form>
- </div>
- </div>
-</div>
-</xsl:template>
\ No newline at end of file
Modified: trunk/logistic/templates/base/activity/activity_tabs.xsl
===================================================================
--- trunk/logistic/templates/base/activity/activity_tabs.xsl 2012-11-02
09:22:15 UTC (rev 10426)
+++ trunk/logistic/templates/base/activity/activity_tabs.xsl 2012-11-02
09:36:28 UTC (rev 10427)
@@ -4,8 +4,6 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<div class="yui-navset yui-navset-top" id="activity-tabview">
- <xsl:value-of disable-output-escaping="yes" select="breadcrumb" />
-
<xsl:choose>
<xsl:when test="view = 'activity_details'">
<xsl:call-template name="yui_phpgw_i18n"/>
@@ -20,11 +18,13 @@
<xsl:value-of
select="activity/name" />
</span>
</h1>
+ <xsl:value-of
disable-output-escaping="yes" select="breadcrumb" />
</xsl:when>
<xsl:otherwise>
<h1 style="float:left;">
<xsl:value-of
select="php:function('lang', 'Requirement allocation')" />
</h1>
+ <xsl:value-of
disable-output-escaping="yes" select="breadcrumb" />
</xsl:otherwise>
</xsl:choose>
Modified: trunk/logistic/templates/base/activity/add_activity_item.xsl
===================================================================
--- trunk/logistic/templates/base/activity/add_activity_item.xsl
2012-11-02 09:22:15 UTC (rev 10426)
+++ trunk/logistic/templates/base/activity/add_activity_item.xsl
2012-11-02 09:36:28 UTC (rev 10427)
@@ -33,8 +33,8 @@
<xsl:if test="parent_activity/id >
0">
<dt>
<xsl:if test="editable">
- <div
style="margin-bottom: 1em;width: 88%;" class="select-box">
- <label>Velg en
annen hovedaktivitet</label>
+ <div
style="margin-bottom: 1em;">
+ <label
style="display:block;">Velg en annen hovedaktivitet</label>
<select
id="select_activity" name="parent_activity_id" class="selectLocation">
<option>Velg aktivitet</option>
<xsl:for-each select="activities">
Modified: trunk/logistic/templates/base/activity/view_activity_item.xsl
===================================================================
--- trunk/logistic/templates/base/activity/view_activity_item.xsl
2012-11-02 09:22:15 UTC (rev 10426)
+++ trunk/logistic/templates/base/activity/view_activity_item.xsl
2012-11-02 09:36:28 UTC (rev 10427)
@@ -154,16 +154,16 @@
</dd>
</dl>
- <xsl:variable name="add_req_params">
-
<xsl:text>menuaction:logistic.uirequirement.edit, id:</xsl:text>
+ <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_req_url">
- <xsl:value-of
select="php:function('get_phpgw_link', '/index.php', $add_req_params )" />
+ <xsl:variable name="add_sub_activity_url">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php', $add_sub_activity_params
)" />
</xsl:variable>
<h2 style="clear:left; float:left;margin: 0;
padding: 20px 0 5px;">Underaktiviteter</h2>
- <a id="add-sub-activity-btn" class="btn focus"
href="{$add_req_url}"><xsl:value-of select="php:function('lang', 'Add sub
activity')" /></a>
+ <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"
/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10427],
Torstein <=