|
| From: | sigurdne |
| Subject: | [Fmsystem-commits] [15778] logistic: typo |
| Date: | Sun, 2 Oct 2016 13:27:34 +0000 (UTC) |
Revision: 15778
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15778
Author: sigurdne
Date: 2016-10-02 13:27:33 +0000 (Sun, 02 Oct 2016)
Log Message:
-----------
logistic: typo
Modified Paths:
--------------
trunk/logistic/inc/class.uiactivity.inc.php
trunk/logistic/templates/base/activity/add_activity_item.xsl
Modified: trunk/logistic/inc/class.uiactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.uiactivity.inc.php 2016-10-02 13:14:24 UTC (rev
15777)
+++ trunk/logistic/inc/class.uiactivity.inc.php 2016-10-02 13:27:33 UTC (rev
15778)
@@ -480,7 +480,7 @@
}
else
{
- $projects = $this->so_project->get();
+ $projects =
$this->so_project->get(0,0,'',false,'','',array());
$data['projects'] = $projects;
}
Modified: trunk/logistic/templates/base/activity/add_activity_item.xsl
===================================================================
--- trunk/logistic/templates/base/activity/add_activity_item.xsl
2016-10-02 13:14:24 UTC (rev 15777)
+++ trunk/logistic/templates/base/activity/add_activity_item.xsl
2016-10-02 13:27:33 UTC (rev 15778)
@@ -9,52 +9,52 @@
<div>
- <xsl:choose>
- <xsl:when test="project/id != '' or project/id != 0">
- <h1>
- <xsl:value-of select="php:function('lang', 'Add
activity to project')" />
+ <xsl:choose>
+ <xsl:when test="project/id != '' or project/id != 0">
+ <h1>
+ <xsl:value-of
select="php:function('lang', 'Add activity to project')" />
<span style="margin-left:5px;">
<xsl:value-of
select="project/name" />
</span>
- </h1>
- </xsl:when>
- <xsl:when test="activity/id != '' and activity/id != 0">
- <h1>
- <xsl:value-of select="php:function('lang',
'Edit activity')" />
- </h1>
- </xsl:when>
- <xsl:otherwise>
- <h1>
- <xsl:value-of select="php:function('lang', 'Add
activity')" />
- </h1>
- </xsl:otherwise>
- </xsl:choose>
+ </h1>
+ </xsl:when>
+ <xsl:when test="activity/id != '' and activity/id != 0">
+ <h1>
+ <xsl:value-of
select="php:function('lang', 'Edit activity')" />
+ </h1>
+ </xsl:when>
+ <xsl:otherwise>
+ <h1>
+ <xsl:value-of
select="php:function('lang', 'Add activity')" />
+ </h1>
+ </xsl:otherwise>
+ </xsl:choose>
- <xsl:choose>
- <xsl:when test="breadcrumb != ''">
- <xsl:call-template name="breadcrumb" />
- </xsl:when>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="breadcrumb != ''">
+ <xsl:call-template name="breadcrumb" />
+ </xsl:when>
+ </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>
+ <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>
<xsl:variable name="parent_id">
<xsl:value-of
select="parent_activity/id"/>
</xsl:variable>
- <form id='activity_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}" />
+ <form id='activity_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">
+ <dl class="proplist-col">
- <xsl:choose>
- <xsl:when test="(editable) and
(activities !='')">
- <dt>
+ <xsl:choose>
+ <xsl:when
test="(editable) and (activities !='')">
+ <dt>
<div
style="margin-bottom: 1em;">
<label style="display:block;">
<xsl:value-of select="php:function('lang', 'Choose another main
activity for this sub activity')" />
@@ -62,39 +62,39 @@
<select id="select_parent_activity" name="parent_activity_id">
<option value="0">Velg annen hovedaktivitet</option>
<xsl:for-each select="activities">
- <option
value="{id}">
-
<xsl:if test="id = $parent_id">
-
<xsl:attribute name="selected">
-
<xsl:text>selected</xsl:text>
-
</xsl:attribute>
-
</xsl:if>
-
<xsl:value-of disable-output-escaping="yes" select="name"/>
-
</option>
-
</xsl:for-each>
+
<option value="{id}">
+
<xsl:if test="id = $parent_id">
+
<xsl:attribute name="selected">
+
<xsl:text>selected</xsl:text>
+
</xsl:attribute>
+
</xsl:if>
+
<xsl:value-of disable-output-escaping="yes"
select="name"/>
+
</option>
+
</xsl:for-each>
</select>
</div>
</dt>
- </xsl:when>
- <!-- <xsl:when
test="(editable) and not(parent_activity) and not(project)">
- <dt>
- <div
style="margin-bottom: 1em;">
-
<label style="display:block;"><xsl:value-of select="php:function('lang',
'Choose the project in which the activity is part of')" /></label>
-
<select id="select_project" name="select_project">
-
<option><xsl:value-of select="php:function('lang', 'Choose project')"
/></option>
-
<xsl:for-each select="projects">
- <option
value="{id}">
-
<xsl:if test="project/id = project_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>
- </dt>
- </xsl:when>-->
+ </xsl:when>
+ <!-- <xsl:when
test="(editable) and not(parent_activity) and not(project)">
+ <dt>
+ <div
style="margin-bottom: 1em;">
+
<label style="display:block;"><xsl:value-of select="php:function('lang',
'Choose the project in which the activity is part of')" /></label>
+
<select id="select_project" name="select_project">
+
<option><xsl:value-of select="php:function('lang', 'Choose project')"
/></option>
+
<xsl:for-each select="projects">
+
<option value="{id}">
+
<xsl:if test="project/id = project_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>
+ </dt>
+ </xsl:when>-->
</xsl:choose>
<xsl:choose>
<xsl:when
test="projects != ''">
@@ -110,37 +110,37 @@
<option value=''>
<xsl:value-of select="php:function('lang', 'Choose another
project')" />
</option>
-
<xsl:for-each select="projects">
-
<option value="{id}">
-
<xsl:if test="project/id = project_id">
-
<xsl:attribute name="selected">
-
selected
-
</xsl:attribute>
-
</xsl:if>
-
<xsl:value-of disable-output-escaping="yes"
select="name"/>
-
</option>
-
</xsl:for-each>
+
<xsl:for-each select="projects">
+
<option value="{id}">
+
<xsl:if test="project/id = project_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>
</dt>
- </xsl:when>
- </xsl:choose>
- <dt>
+ </xsl:when>
+ </xsl:choose>
+ <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 != ''">
+ </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>
+
</xsl:if>
<div
class="help_text">
<xsl:value-of select="php:function('lang','Give name to this activity')" />
</div>
@@ -149,199 +149,199 @@
<xsl:text>required</xsl:text>
</xsl:attribute>
</input>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="activity/name" />
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
+ </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 != ''">
+ </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>
+
</xsl:if>
<div
class="help_text">
<xsl:value-of select="php:function('lang','Give description to activity')" />
</div>
<textarea id="description" name="description" rows="5" cols="60">
-
<xsl:value-of select="activity/description" disable-output-escaping="yes"/>
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
+
<xsl:value-of select="activity/description" disable-output-escaping="yes"/>
</textarea>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="activity/description" disable-output-escaping="yes"/>
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:value-of select="activity/description" disable-output-escaping="yes"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
<label for="start_date">
<xsl:value-of
select="php:function('lang','Start date')" />
</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when
test="editable">
- <xsl:if
test="activity/error_msg_array/start_date != ''">
+ </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>
+
</xsl:if>
<div
class="help_text">
<xsl:value-of select="php:function('lang','Give start date to activity')" />
</div>
- <input
class="datetime" id="start_date" name="start_date" type="text">
- <xsl:if
test="activity/start_date != ''">
+ <input
class="datetime" 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', $datetime_format,
number(activity/start_date))"/>
</xsl:attribute>
- </xsl:if>
+
</xsl:if>
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
- </input>
- </xsl:when>
- <xsl:otherwise>
+ </input>
+ </xsl:when>
+ <xsl:otherwise>
<span>
<xsl:value-of select="php:function('date', $datetime_format,
number(activity/start_date))"/>
</span>
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
<label for="end_date">
<xsl:value-of
select="php:function('lang','End date')" />
</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when
test="editable">
- <xsl:if
test="activity/error_msg_array/end_date != ''">
+ </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>
+
</xsl:if>
<div
class="help_text">
<xsl:value-of select="php:function('lang','Give end date to activity')" />
</div>
- <input
class="datetime" id="end_date" name="end_date" type="text">
- <xsl:if
test="activity/end_date != ''">
+ <input
class="datetime" 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', $datetime_format,
number(activity/end_date))"/>
</xsl:attribute>
- </xsl:if>
- </input>
- </xsl:when>
- <xsl:otherwise>
+
</xsl:if>
+ </input>
+ </xsl:when>
+ <xsl:otherwise>
<span>
<xsl:value-of select="php:function('date', $datetime_format,
number(activity/end_date))"/>
</span>
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
<label for="end_date">
<xsl:value-of
select="php:function('lang', 'Responsible person')" />
</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when
test="editable">
- <xsl:if
test="activity/error_msg_array/responsible_user_id != ''">
+ </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>
+
</xsl:if>
<div
class="help_text">
<xsl:value-of select="php:function('lang', 'Responsible person for activity')"
/>
</div>
- <select
name="responsible_user_id">
+ <select
name="responsible_user_id">
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
- <option
value="">Velg ansvarlig bruker</option>
- <xsl:for-each
select="responsible_users">
- <xsl:variable
name="full_name">
+
<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>
- </xsl:when>
- <xsl:otherwise>
+
<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>
+ </xsl:when>
+ <xsl:otherwise>
<span>
<xsl:value-of select="activity/responsible_user_name"/>
</span>
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- </dl>
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ </dl>
- <div class="form-buttons">
- <xsl:choose>
- <xsl:when test="editable">
+ <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 class="submit"
type="button" name="cancel_activity" id ='cancel_activity'
value="{$lang_cancel}" title = "{$lang_cancel}"
onClick="document.cancel_form.submit();"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:variable
name="params">
-
<xsl:text>menuaction:logistic.uiactivity.edit, 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>
+ <input
type="submit" name="save_activity" value="{$lang_save}" title = "{$lang_save}"
/>
+ <input
class="submit" type="button" name="cancel_activity" id ='cancel_activity'
value="{$lang_cancel}" title = "{$lang_cancel}"
onClick="document.cancel_form.submit();"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:variable
name="params">
+
<xsl:text>menuaction:logistic.uiactivity.edit, 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>
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </form>
+ </div>
</div>
</div>
- </div>
<xsl:variable name="cancel_url">
<xsl:value-of select="php:function('get_phpgw_link',
'/index.php', 'menuaction:logistic.uiactivity.index')" />
@@ -365,7 +365,7 @@
<!-- =========== BREADCRUMB TEMPLATE ============== -->
<xsl:template name="breadcrumb">
- <div id="breadcrumb">
+ <div id="breadcrumb">
<span class="intro">Du er her:</span>
<xsl:for-each select="breadcrumb">
<xsl:choose>
@@ -381,8 +381,8 @@
</xsl:otherwise>
</xsl:choose>
<xsl:if test="not( position() = last() )">
- <img src="logistic/images/arrow_right.png" />
- </xsl:if>
- </xsl:for-each>
+ <img src="logistic/images/arrow_right.png" />
+ </xsl:if>
+ </xsl:for-each>
</div>
</xsl:template>
| [Prev in Thread] | Current Thread | [Next in Thread] |