fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [10272]


From: Torstein
Subject: [Fmsystem-commits] [10272]
Date: Fri, 19 Oct 2012 12:20:22 +0000

Revision: 10272
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10272
Author:   vator
Date:     2012-10-19 12:20:21 +0000 (Fri, 19 Oct 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/logistic/inc/class.uiactivity.inc.php
    trunk/logistic/inc/class.uiproject.inc.php
    trunk/logistic/inc/class.uiresource_type_requirement.inc.php
    trunk/logistic/templates/base/css/base.css

Added Paths:
-----------
    trunk/logistic/templates/base/project/project_item.xsl
    trunk/logistic/templates/base/project/project_type_item.xsl
    trunk/logistic/templates/base/project/resource_type_requirement_item.xsl

Removed Paths:
-------------
    trunk/logistic/templates/base/project_item.xsl
    trunk/logistic/templates/base/project_type_item.xsl
    trunk/logistic/templates/base/resource_type_requirement_item.xsl

Modified: trunk/logistic/inc/class.uiactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.uiactivity.inc.php 2012-10-19 12:00:27 UTC (rev 
10271)
+++ trunk/logistic/inc/class.uiactivity.inc.php 2012-10-19 12:20:21 UTC (rev 
10272)
@@ -332,6 +332,11 @@
                                $parent_activity = $this->so->get_single( 
$parent_activity_id );
                                $activity->set_project_id( 
$parent_activity->get_project_id() );
                        }
+                       
+                       if($activity->get_parent_id() > 0)
+                       {
+                               $parent_activity = $this->so->get_single( 
$activity->get_parent_id() );
+                       }
 
                        if (isset($_POST['save_activity']))
                        {
@@ -389,9 +394,9 @@
                                        'editable' => true,
                                );
                                
-                               if($parent_activity_id > 0)
+                               if($parent_activity)
                                {
-                                       $data['parent_activity'] = 
$parent_activity->toArray();
+                                       $data['parent_activity'] = 
$parent_activity;
                                }
 
                                $this->use_yui_editor('description');

Modified: trunk/logistic/inc/class.uiproject.inc.php
===================================================================
--- trunk/logistic/inc/class.uiproject.inc.php  2012-10-19 12:00:27 UTC (rev 
10271)
+++ trunk/logistic/inc/class.uiproject.inc.php  2012-10-19 12:20:21 UTC (rev 
10272)
@@ -450,13 +450,12 @@
                                $data = array
                                        (
                                        'value_id' => !empty($project) ? 
$project->get_id() : 0,
-                                       'img_go_home' => 
'rental/templates/base/images/32x32/actions/go-home.png',
                                        'project' => $project_array,
                                        'editable' => true
                                );
 
                                $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('logistic') . '::' . lang('Project type');
-                               
self::render_template_xsl(array('project_type_item'), $data);
+                               
self::render_template_xsl(array('project/project_type_item'), $data);
                        }
                }
 
@@ -528,7 +527,6 @@
                                $data = array
                                        (
                                        'value_id' => !empty($project) ? 
$project->get_id() : 0,
-                                       'img_go_home' => 
'rental/templates/base/images/32x32/actions/go-home.png',
                                        'project' => $project_array,
                                        'options' => $project_types,
                                        'editable' => true
@@ -536,7 +534,7 @@
 
                                $this->use_yui_editor('description');
                                $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('logistic') . '::' . lang('Project type');
-                               
self::render_template_xsl(array('project_item'), $data);
+                               
self::render_template_xsl(array('project/project_item'), $data);
                        }
                }
 

Modified: trunk/logistic/inc/class.uiresource_type_requirement.inc.php
===================================================================
--- trunk/logistic/inc/class.uiresource_type_requirement.inc.php        
2012-10-19 12:00:27 UTC (rev 10271)
+++ trunk/logistic/inc/class.uiresource_type_requirement.inc.php        
2012-10-19 12:20:21 UTC (rev 10272)
@@ -359,7 +359,6 @@
                                $data = array
                                                (
                                                'value_id' => !empty($req_type) 
? $req_type->get_id() : 0,
-                                               'img_go_home' => 
'rental/templates/base/images/32x32/actions/go-home.png',
                                                'entities' => $entity_list,
                                                'categories' => $category_list,
                                                'attributes' => $attributes,
@@ -373,7 +372,7 @@
                                phpgwapi_jquery::load_widget('core');
 
                                self::add_javascript('logistic', 'logistic', 
'resource_type_requirement.js');
-                               
self::render_template_xsl(array('resource_type_requirement_item'), $data);
+                               
self::render_template_xsl(array('project/resource_type_requirement_item'), 
$data);
                        }
                }
 

Modified: trunk/logistic/templates/base/css/base.css
===================================================================
--- trunk/logistic/templates/base/css/base.css  2012-10-19 12:00:27 UTC (rev 
10271)
+++ trunk/logistic/templates/base/css/base.css  2012-10-19 12:20:21 UTC (rev 
10272)
@@ -2254,3 +2254,7 @@
 #requirement_tabview .yui-navset {
     margin: 0;
 }
+
+#details {
+       padding: 20px;  
+}
\ No newline at end of file

Copied: trunk/logistic/templates/base/project/project_item.xsl (from rev 10206, 
trunk/logistic/templates/base/project_item.xsl)
===================================================================
--- trunk/logistic/templates/base/project/project_item.xsl                      
        (rev 0)
+++ trunk/logistic/templates/base/project/project_item.xsl      2012-10-19 
12:20:21 UTC (rev 10272)
@@ -0,0 +1,91 @@
+<!-- $Id$ -->
+<!-- item  -->
+
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+
+<xsl:call-template name="yui_phpgw_i18n"/>
+<div class="yui-navset yui-navset-top">
+       <div class="identifier-header">
+               <h1><img src="{img_go_home}" />
+                               <xsl:value-of select="php:function('lang', 
'Project')" />
+               </h1>
+       </div>
+       <div class="yui-content">
+               <div id="details">
+                       <form action="#" method="post">
+                               <input type="hidden" name="id" value = 
"{value_id}">
+                               </input>
+                               <dl class="proplist-col">
+                                       <dt>
+                                               <label for="name"><xsl:value-of 
select="php:function('lang','Project title')" /></label>
+                                       </dt>
+                                       <dd>
+                                       <xsl:choose>
+                                               <xsl:when test="editable">
+                                                       <input type="text" 
name="name" id="name" value="{project/name}" size="100"/>
+                                               </xsl:when>
+                                               <xsl:otherwise>
+                                                       <xsl:value-of 
select="project/name" />
+                                               </xsl:otherwise>
+                                       </xsl:choose>
+                                       </dd>
+                                       <dt>
+                                               <label 
for="project_type"><xsl:value-of select="php:function('lang','Project_type')" 
/></label>
+                                       </dt>
+                                       <dd>
+                                       <xsl:choose>
+                                               <xsl:when test="editable">
+                                                       <select 
id="project_type_id" name="project_type_id">
+                                                               
<xsl:apply-templates select="options"/>
+                                                       </select>
+                                               </xsl:when>
+                                               <xsl:otherwise>
+                                                       <xsl:value-of 
select="project/project_type_label" />
+                                               </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">
+                                                       <textarea 
id="description" name="description" rows="5" cols="60"><xsl:value-of 
select="project/description" disable-output-escaping="yes"/></textarea>
+                                               </xsl:when>
+                                               <xsl:otherwise>
+                                                       <xsl:value-of 
select="project/description" disable-output-escaping="yes"/>
+                                               </xsl:otherwise>
+                                       </xsl:choose>
+                                       </dd>
+                               </dl>
+
+                               <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_project" value="{$lang_save}" title = "{$lang_save}" />
+                                                       <input type="submit" 
name="cancel_project" value="{$lang_cancel}" title = "{$lang_cancel}" />
+                                               </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:otherwise>
+                                       </xsl:choose>
+                               </div>
+                       </form>
+               </div>
+       </div>
+</div>
+</xsl:template>
+
+<xsl:template match="options">
+       <option value="{id}">
+               <xsl:if test="selected">
+                       <xsl:attribute name="selected" value="selected" />
+               </xsl:if>
+               <xsl:value-of disable-output-escaping="yes" select="name"/>
+       </option>
+</xsl:template>


Property changes on: trunk/logistic/templates/base/project/project_item.xsl
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id

Copied: trunk/logistic/templates/base/project/project_type_item.xsl (from rev 
10206, trunk/logistic/templates/base/project_type_item.xsl)
===================================================================
--- trunk/logistic/templates/base/project/project_type_item.xsl                 
        (rev 0)
+++ trunk/logistic/templates/base/project/project_type_item.xsl 2012-10-19 
12:20:21 UTC (rev 10272)
@@ -0,0 +1,54 @@
+<!-- $Id$ -->
+<!-- item  -->
+
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+
+<div id="main_content" class="yui-content">
+       <h1>Prosjekttype</h1>
+               <div style="padding:20px;" class="content-wrp">
+                       <form action="#" method="post">
+                               <input type="hidden" name="id" value = 
"{value_id}">
+                               </input>
+                               <dl class="proplist-col">
+                                       <dt>
+                                               <label for="name"><xsl:value-of 
select="php:function('lang','Project type name')" /></label>
+                                       </dt>
+                                       <dd>
+                                       <xsl:choose>
+                                               <xsl:when test="editable">
+                                                       <input type="text" 
name="title" id="title" value="{project/name}" size="100"/>
+                                               </xsl:when>
+                                               <xsl:otherwise>
+                                                       <xsl:value-of 
select="project/name" />
+                                               </xsl:otherwise>
+                                       </xsl:choose>
+                                       </dd>           
+                               </dl>
+                               
+                               <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_project_type" value="{$lang_save}" title = "{$lang_save}" />
+                                                       <input type="submit" 
name="cancel_project_type" value="{$lang_cancel}" title = "{$lang_cancel}" />
+                                               </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_type" value="{$lang_edit}" title = "{$lang_edit}" />
+                                               </xsl:otherwise>
+                                       </xsl:choose>
+                               </div>
+                       </form>
+               </div>
+       </div>
+</xsl:template>
+
+<xsl:template match="options">
+       <option value="{id}">
+               <xsl:if test="selected">
+                       <xsl:attribute name="selected" value="selected" />
+               </xsl:if>
+               <xsl:value-of disable-output-escaping="yes" select="name"/>
+       </option>
+</xsl:template>


Property changes on: trunk/logistic/templates/base/project/project_type_item.xsl
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id

Copied: 
trunk/logistic/templates/base/project/resource_type_requirement_item.xsl (from 
rev 10206, trunk/logistic/templates/base/resource_type_requirement_item.xsl)
===================================================================
--- trunk/logistic/templates/base/project/resource_type_requirement_item.xsl    
                        (rev 0)
+++ trunk/logistic/templates/base/project/resource_type_requirement_item.xsl    
2012-10-19 12:20:21 UTC (rev 10272)
@@ -0,0 +1,135 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+
+<xsl:call-template name="yui_phpgw_i18n"/>
+<div class="yui-navset yui-navset-top">
+       <div>
+               <h1><img src="{img_go_home}" />
+                               <xsl:value-of select="php:function('lang', 
'Administrate requirements')" />
+               </h1>
+       </div>
+       <div class="main_content">
+               <div id="details" class="content-wrp">
+                       <form action="#" method="post">
+                               <input type="hidden" name="id" value = 
"{value_id}" />
+                               <input type="hidden" name="location_id" value = 
"{location_id}" />
+                               <input type="hidden" name="project_type_id" 
value = "{project_type_id}" />
+                               <dl class="proplist-col">
+                                       <dt>
+                                               <label><xsl:value-of 
select="php:function('lang', 'Project_type')" /></label>
+                                       </dt>
+                                       <dd>
+                                               <xsl:choose>
+                                                       <xsl:when 
test="editable">
+                                                               <select 
name="project_type_id" id="project_type_id">
+                                                                       
<xsl:for-each select="project_types">
+                                                                               
<option value="{id}">
+                                                                               
        <xsl:if test="selected">
+                                                                               
                <xsl:attribute name="selected" value="selected" />
+                                                                               
        </xsl:if>
+                                                                               
        <xsl:value-of select="name"/>
+                                                                               
</option>
+                                                                       
</xsl:for-each>
+                                                               </select>
+                                                       </xsl:when>
+                                                       <xsl:otherwise>
+                                                               <xsl:value-of 
select="project_type/name" />
+                                                       </xsl:otherwise>
+                                               </xsl:choose>
+                                       </dd>
+                                       <xsl:choose>
+                                               <xsl:when test="editable">
+                                                       <dt>
+                                                               
<label><xsl:value-of select="php:function('lang', 'Entity')" /></label>
+                                                       </dt>
+                                                       <dd>
+                                                               <select 
name="entity_id" id="entity_id">
+                                                                       
<xsl:for-each select="entities">
+                                                                               
<option value="{id}">
+                                                                               
        <xsl:if test="selected">
+                                                                               
                <xsl:attribute name="selected" value="selected" />
+                                                                               
        </xsl:if>
+                                                                               
        <xsl:value-of select="name"/>
+                                                                               
</option>
+                                                                       
</xsl:for-each>
+                                                               </select>
+                                                       </dd>
+                                                       <dt>
+                                                               
<label><xsl:value-of select="php:function('lang', 'Category')" /></label>
+                                                       </dt>
+                                                       <dd>
+                                                               <select 
name="category_id" id="category_id">
+                                                                       
<xsl:for-each select="categories">
+                                                                               
<option value="{id}">
+                                                                               
        <xsl:if test="selected">
+                                                                               
                <xsl:attribute name="selected" value="selected" />
+                                                                               
        </xsl:if>
+                                                                               
        <xsl:value-of select="name"/>
+                                                                               
</option>
+                                                                       
</xsl:for-each>
+                                                               </select>
+                                                       </dd>
+                                                       <dt>
+                                                               
<label><xsl:value-of select="php:function('lang', 'Attributes')" /></label>
+                                                       </dt>
+                                                       <dd>
+                                                               <div 
id="attributes">
+                                                                       <xsl:if 
test="req_type/cust_attribute_id">
+                                                                               
<xsl:for-each select="attributes">
+                                                                               
        <xsl:if test="input_text">
+                                                                               
                <xsl:choose>
+                                                                               
                        <xsl:when test="checked">
+                                                                               
                                <input type='checkbox' name='attributes[]' 
id='attributes[]' value='{id}' checked='checked'/><xsl:value-of 
select="input_text" /> <xsl:value-of select="trans_datatype" /><br/>
+                                                                               
                        </xsl:when>
+                                                                               
                        <xsl:otherwise>
+                                                                               
                                <input type='checkbox' name='attributes[]' 
id='attributes[]' value='{id}'/><xsl:value-of select="input_text" /> 
<xsl:value-of select="trans_datatype" /><br/>
+                                                                               
                        </xsl:otherwise>
+                                                                               
                </xsl:choose>
+                                                                               
        </xsl:if>
+                                                                               
</xsl:for-each>
+                                                                       
</xsl:if>
+                                                               </div>
+                                                       </dd>
+                                               </xsl:when>
+                                               <xsl:otherwise>
+                                                       <dt>
+                                                               
<label><xsl:value-of select="php:function('lang', 'Entity')" /></label>
+                                                       </dt>
+                                                       <dd>
+                                                               <xsl:value-of 
select="entity/name" />
+                                                       </dd>
+                                                       <dt>
+                                                               
<label><xsl:value-of select="php:function('lang', 'Category')" /></label>
+                                                       </dt>
+                                                       <dd>
+                                                               <xsl:value-of 
select="category/name" />
+                                                       </dd>
+                                                       <dt>
+                                                               
<label><xsl:value-of select="php:function('lang', 'Chosen attributes')" 
/></label>
+                                                       </dt>
+                                                       <dd>
+                                                               <xsl:for-each 
select="attributes">
+                                                                       
<xsl:value-of select="input_text" /> (<xsl:value-of select="trans_datatype" 
/>)<br/>
+                                                               </xsl:for-each>
+                                                       </dd>
+                                               </xsl:otherwise>
+                                       </xsl:choose>
+                               </dl>
+                               <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" value="{$lang_save}" title = "{$lang_save}" />
+                                                       <input type="submit" 
name="cancel" value="{$lang_cancel}" title = "{$lang_cancel}" />
+                                               </xsl:when>
+                                               <xsl:otherwise>
+                                                       <xsl:variable 
name="lang_edit"><xsl:value-of select="php:function('lang', 'edit')" 
/></xsl:variable>
+                                                       <input type="submit" 
name="edit" value="{$lang_edit}" title = "{$lang_edit}" />
+                                               </xsl:otherwise>
+                                       </xsl:choose>
+                               </div>
+                       </form>
+               </div>
+       </div>
+</div>
+</xsl:template>

Deleted: trunk/logistic/templates/base/project_item.xsl
===================================================================
--- trunk/logistic/templates/base/project_item.xsl      2012-10-19 12:00:27 UTC 
(rev 10271)
+++ trunk/logistic/templates/base/project_item.xsl      2012-10-19 12:20:21 UTC 
(rev 10272)
@@ -1,91 +0,0 @@
-<!-- $Id$ -->
-<!-- item  -->
-
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-
-<xsl:call-template name="yui_phpgw_i18n"/>
-<div class="yui-navset yui-navset-top">
-       <div class="identifier-header">
-               <h1><img src="{img_go_home}" />
-                               <xsl:value-of select="php:function('lang', 
'Project')" />
-               </h1>
-       </div>
-       <div class="yui-content">
-               <div id="details">
-                       <form action="#" method="post">
-                               <input type="hidden" name="id" value = 
"{value_id}">
-                               </input>
-                               <dl class="proplist-col">
-                                       <dt>
-                                               <label for="name"><xsl:value-of 
select="php:function('lang','Project title')" /></label>
-                                       </dt>
-                                       <dd>
-                                       <xsl:choose>
-                                               <xsl:when test="editable">
-                                                       <input type="text" 
name="name" id="name" value="{project/name}" size="100"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:value-of 
select="project/name" />
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       </dd>
-                                       <dt>
-                                               <label 
for="project_type"><xsl:value-of select="php:function('lang','Project_type')" 
/></label>
-                                       </dt>
-                                       <dd>
-                                       <xsl:choose>
-                                               <xsl:when test="editable">
-                                                       <select 
id="project_type_id" name="project_type_id">
-                                                               
<xsl:apply-templates select="options"/>
-                                                       </select>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:value-of 
select="project/project_type_label" />
-                                               </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">
-                                                       <textarea 
id="description" name="description" rows="5" cols="60"><xsl:value-of 
select="project/description" disable-output-escaping="yes"/></textarea>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:value-of 
select="project/description" disable-output-escaping="yes"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       </dd>
-                               </dl>
-
-                               <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_project" value="{$lang_save}" title = "{$lang_save}" />
-                                                       <input type="submit" 
name="cancel_project" value="{$lang_cancel}" title = "{$lang_cancel}" />
-                                               </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:otherwise>
-                                       </xsl:choose>
-                               </div>
-                       </form>
-               </div>
-       </div>
-</div>
-</xsl:template>
-
-<xsl:template match="options">
-       <option value="{id}">
-               <xsl:if test="selected">
-                       <xsl:attribute name="selected" value="selected" />
-               </xsl:if>
-               <xsl:value-of disable-output-escaping="yes" select="name"/>
-       </option>
-</xsl:template>

Deleted: trunk/logistic/templates/base/project_type_item.xsl
===================================================================
--- trunk/logistic/templates/base/project_type_item.xsl 2012-10-19 12:00:27 UTC 
(rev 10271)
+++ trunk/logistic/templates/base/project_type_item.xsl 2012-10-19 12:20:21 UTC 
(rev 10272)
@@ -1,54 +0,0 @@
-<!-- $Id$ -->
-<!-- item  -->
-
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-
-<div class="yui-content">
-<h2>Prosjekttype</h2>
-               <div id="details">
-                       <form action="#" method="post">
-                               <input type="hidden" name="id" value = 
"{value_id}">
-                               </input>
-                               <dl class="proplist-col">
-                                       <dt>
-                                               <label for="name"><xsl:value-of 
select="php:function('lang','Project type name')" /></label>
-                                       </dt>
-                                       <dd>
-                                       <xsl:choose>
-                                               <xsl:when test="editable">
-                                                       <input type="text" 
name="title" id="title" value="{project/name}" size="100"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:value-of 
select="project/name" />
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       </dd>           
-                               </dl>
-                               
-                               <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_project_type" value="{$lang_save}" title = "{$lang_save}" />
-                                                       <input type="submit" 
name="cancel_project_type" value="{$lang_cancel}" title = "{$lang_cancel}" />
-                                               </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_type" value="{$lang_edit}" title = "{$lang_edit}" />
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </div>
-                       </form>
-               </div>
-       </div>
-</xsl:template>
-
-<xsl:template match="options">
-       <option value="{id}">
-               <xsl:if test="selected">
-                       <xsl:attribute name="selected" value="selected" />
-               </xsl:if>
-               <xsl:value-of disable-output-escaping="yes" select="name"/>
-       </option>
-</xsl:template>

Deleted: trunk/logistic/templates/base/resource_type_requirement_item.xsl
===================================================================
--- trunk/logistic/templates/base/resource_type_requirement_item.xsl    
2012-10-19 12:00:27 UTC (rev 10271)
+++ trunk/logistic/templates/base/resource_type_requirement_item.xsl    
2012-10-19 12:20:21 UTC (rev 10272)
@@ -1,135 +0,0 @@
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-
-<xsl:call-template name="yui_phpgw_i18n"/>
-<div class="yui-navset yui-navset-top">
-       <div class="identifier-header">
-               <h1><img src="{img_go_home}" />
-                               <xsl:value-of select="php:function('lang', 
'Administrate requirements')" />
-               </h1>
-       </div>
-       <div class="yui-content">
-               <div id="details">
-                       <form action="#" method="post">
-                               <input type="hidden" name="id" value = 
"{value_id}" />
-                               <input type="hidden" name="location_id" value = 
"{location_id}" />
-                               <input type="hidden" name="project_type_id" 
value = "{project_type_id}" />
-                               <dl class="proplist-col">
-                                       <dt>
-                                               <label><xsl:value-of 
select="php:function('lang', 'Project_type')" /></label>
-                                       </dt>
-                                       <dd>
-                                               <xsl:choose>
-                                                       <xsl:when 
test="editable">
-                                                               <select 
name="project_type_id" id="project_type_id">
-                                                                       
<xsl:for-each select="project_types">
-                                                                               
<option value="{id}">
-                                                                               
        <xsl:if test="selected">
-                                                                               
                <xsl:attribute name="selected" value="selected" />
-                                                                               
        </xsl:if>
-                                                                               
        <xsl:value-of select="name"/>
-                                                                               
</option>
-                                                                       
</xsl:for-each>
-                                                               </select>
-                                                       </xsl:when>
-                                                       <xsl:otherwise>
-                                                               <xsl:value-of 
select="project_type/name" />
-                                                       </xsl:otherwise>
-                                               </xsl:choose>
-                                       </dd>
-                                       <xsl:choose>
-                                               <xsl:when test="editable">
-                                                       <dt>
-                                                               
<label><xsl:value-of select="php:function('lang', 'Entity')" /></label>
-                                                       </dt>
-                                                       <dd>
-                                                               <select 
name="entity_id" id="entity_id">
-                                                                       
<xsl:for-each select="entities">
-                                                                               
<option value="{id}">
-                                                                               
        <xsl:if test="selected">
-                                                                               
                <xsl:attribute name="selected" value="selected" />
-                                                                               
        </xsl:if>
-                                                                               
        <xsl:value-of select="name"/>
-                                                                               
</option>
-                                                                       
</xsl:for-each>
-                                                               </select>
-                                                       </dd>
-                                                       <dt>
-                                                               
<label><xsl:value-of select="php:function('lang', 'Category')" /></label>
-                                                       </dt>
-                                                       <dd>
-                                                               <select 
name="category_id" id="category_id">
-                                                                       
<xsl:for-each select="categories">
-                                                                               
<option value="{id}">
-                                                                               
        <xsl:if test="selected">
-                                                                               
                <xsl:attribute name="selected" value="selected" />
-                                                                               
        </xsl:if>
-                                                                               
        <xsl:value-of select="name"/>
-                                                                               
</option>
-                                                                       
</xsl:for-each>
-                                                               </select>
-                                                       </dd>
-                                                       <dt>
-                                                               
<label><xsl:value-of select="php:function('lang', 'Attributes')" /></label>
-                                                       </dt>
-                                                       <dd>
-                                                               <div 
id="attributes">
-                                                                       <xsl:if 
test="req_type/cust_attribute_id">
-                                                                               
<xsl:for-each select="attributes">
-                                                                               
        <xsl:if test="input_text">
-                                                                               
                <xsl:choose>
-                                                                               
                        <xsl:when test="checked">
-                                                                               
                                <input type='checkbox' name='attributes[]' 
id='attributes[]' value='{id}' checked='checked'/><xsl:value-of 
select="input_text" /> <xsl:value-of select="trans_datatype" /><br/>
-                                                                               
                        </xsl:when>
-                                                                               
                        <xsl:otherwise>
-                                                                               
                                <input type='checkbox' name='attributes[]' 
id='attributes[]' value='{id}'/><xsl:value-of select="input_text" /> 
<xsl:value-of select="trans_datatype" /><br/>
-                                                                               
                        </xsl:otherwise>
-                                                                               
                </xsl:choose>
-                                                                               
        </xsl:if>
-                                                                               
</xsl:for-each>
-                                                                       
</xsl:if>
-                                                               </div>
-                                                       </dd>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <dt>
-                                                               
<label><xsl:value-of select="php:function('lang', 'Entity')" /></label>
-                                                       </dt>
-                                                       <dd>
-                                                               <xsl:value-of 
select="entity/name" />
-                                                       </dd>
-                                                       <dt>
-                                                               
<label><xsl:value-of select="php:function('lang', 'Category')" /></label>
-                                                       </dt>
-                                                       <dd>
-                                                               <xsl:value-of 
select="category/name" />
-                                                       </dd>
-                                                       <dt>
-                                                               
<label><xsl:value-of select="php:function('lang', 'Chosen attributes')" 
/></label>
-                                                       </dt>
-                                                       <dd>
-                                                               <xsl:for-each 
select="attributes">
-                                                                       
<xsl:value-of select="input_text" /> (<xsl:value-of select="trans_datatype" 
/>)<br/>
-                                                               </xsl:for-each>
-                                                       </dd>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </dl>
-                               <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" value="{$lang_save}" title = "{$lang_save}" />
-                                                       <input type="submit" 
name="cancel" value="{$lang_cancel}" title = "{$lang_cancel}" />
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:variable 
name="lang_edit"><xsl:value-of select="php:function('lang', 'edit')" 
/></xsl:variable>
-                                                       <input type="submit" 
name="edit" value="{$lang_edit}" title = "{$lang_edit}" />
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </div>
-                       </form>
-               </div>
-       </div>
-</div>
-</xsl:template>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]