fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [11196] property: formatting code


From: Sigurd Nes
Subject: [Fmsystem-commits] [11196] property: formatting code
Date: Mon, 24 Jun 2013 07:08:18 +0000

Revision: 11196
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11196
Author:   sigurdne
Date:     2013-06-24 07:08:16 +0000 (Mon, 24 Jun 2013)
Log Message:
-----------
property: formatting code

Modified Paths:
--------------
    trunk/property/templates/base/request.xsl

Modified: trunk/property/templates/base/request.xsl
===================================================================
--- trunk/property/templates/base/request.xsl   2013-06-24 05:51:44 UTC (rev 
11195)
+++ trunk/property/templates/base/request.xsl   2013-06-24 07:08:16 UTC (rev 
11196)
@@ -136,38 +136,37 @@
                                                                        </input>
                                                                </form>
                                                        </td>
-                                               <td valign="top">
-                                                       <xsl:variable 
name="add_to_project_link">
-                                                               <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:property.uiproject.index,from:workorder,lookup:true,origin:.project.request')"
 />
-                                                       </xsl:variable>
-                                                       <form method="post" 
action="{$add_to_project_link}">
-                                                               <xsl:variable 
name="lang_add_to_project">
-                                                                       
<xsl:value-of select="php:function('lang', 'add to project as order')"/>
+                                                       <td valign="top">
+                                                               <xsl:variable 
name="add_to_project_link">
+                                                                       
<xsl:value-of select="php:function('get_phpgw_link', '/index.php', 
'menuaction:property.uiproject.index,from:workorder,lookup:true,origin:.project.request')"/>
                                                                </xsl:variable>
-                                                               <input 
type="hidden" name="origin_id" value="{value_request_id}"/>
-                                                               <input 
type="hidden" name="query" value="{loc1}"/>
-                                                               <input 
type="submit" name="location" value="{$lang_add_to_project}">
-                                                                       
<xsl:attribute name="title">
-                                                                               
<xsl:value-of select="php:function('lang', 'click this to add an order to an 
existing project')"/>
-                                                                       
</xsl:attribute>
-                                                               </input>
-                                                       </form>
-                                               </td>
-                                               <td valign="top">
-                                                       <xsl:variable 
name="add_to_project_link2">
-                                                               <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:property.uiproject.index,from:project,lookup:true,origin:.project.request')"
 />
-                                                       </xsl:variable>
-                                                       <form method="post" 
action="{$add_to_project_link2}">
-                                                               <input 
type="hidden" name="origin_id" value="{value_request_id}"/>
-                                                               <input 
type="hidden" name="query" value="{loc1}"/>
-                                                               <input 
type="submit" name="location" value="{php:function('lang', 'add to project as 
relation')}">
-                                                                       
<xsl:attribute name="title">
-                                                                               
<xsl:value-of select="php:function('lang', 'click this to link this request to 
an existing project')"/>
-                                                                       
</xsl:attribute>
-                                                               </input>
-                                                       </form>
-                                               </td>
-
+                                                               <form 
method="post" action="{$add_to_project_link}">
+                                                                       
<xsl:variable name="lang_add_to_project">
+                                                                               
<xsl:value-of select="php:function('lang', 'add to project as order')"/>
+                                                                       
</xsl:variable>
+                                                                       <input 
type="hidden" name="origin_id" value="{value_request_id}"/>
+                                                                       <input 
type="hidden" name="query" value="{loc1}"/>
+                                                                       <input 
type="submit" name="location" value="{$lang_add_to_project}">
+                                                                               
<xsl:attribute name="title">
+                                                                               
        <xsl:value-of select="php:function('lang', 'click this to add an order 
to an existing project')"/>
+                                                                               
</xsl:attribute>
+                                                                       </input>
+                                                               </form>
+                                                       </td>
+                                                       <td valign="top">
+                                                               <xsl:variable 
name="add_to_project_link2">
+                                                                       
<xsl:value-of select="php:function('get_phpgw_link', '/index.php', 
'menuaction:property.uiproject.index,from:project,lookup:true,origin:.project.request')"/>
+                                                               </xsl:variable>
+                                                               <form 
method="post" action="{$add_to_project_link2}">
+                                                                       <input 
type="hidden" name="origin_id" value="{value_request_id}"/>
+                                                                       <input 
type="hidden" name="query" value="{loc1}"/>
+                                                                       <input 
type="submit" name="location" value="{php:function('lang', 'add to project as 
relation')}">
+                                                                               
<xsl:attribute name="title">
+                                                                               
        <xsl:value-of select="php:function('lang', 'click this to link this 
request to an existing project')"/>
+                                                                               
</xsl:attribute>
+                                                                       </input>
+                                                               </form>
+                                                       </td>
                                                        <td>
                                                                <form 
method="post" action="{ticket_link}">
                                                                        
<xsl:variable name="lang_start_ticket">
@@ -194,83 +193,68 @@
                                        <div id="general" class="content-wrp 
requirement">
                                                <div 
class="requirement-responsibility-left">
                                                        <span class="messages">
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="value_request_id!=''">
+                                                               <xsl:choose>
+                                                                       
<xsl:when test="value_request_id!=''">
                                                                                
<label class="messages">
                                                                                
        <xsl:value-of select="lang_request_id"/>
                                                                                
</label>
-
-                                                                               
        <xsl:value-of select="value_request_id"/>
-
-
-                                                               </xsl:when>
-                                                       </xsl:choose>
+                                                                               
<xsl:value-of select="value_request_id"/>
+                                                                       
</xsl:when>
+                                                               </xsl:choose>
                                                        </span>
                                                </div>
-<div class="clearBoth">&nbsp;</div>
+                                               <div 
class="clearBoth">&nbsp;</div>
                                                <div 
class="requirement-responsibility-left">
                                                        <span class="messages">
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="value_request_id!=''">
-
-                                                                       
<xsl:for-each select="value_origin">
-
+                                                               <xsl:choose>
+                                                                       
<xsl:when test="value_request_id!=''">
+                                                                               
<xsl:for-each select="value_origin">
                                                                                
        <label class="messages" for="msg_table">
                                                                                
                <xsl:value-of select="descr"/>
                                                                                
        </label>
-
-                                                                               
                <table name="msg_table">
-                                                                               
                        <xsl:for-each select="data">
-
-                                                                               
                                        <td class="th_text" align="left">
-                                                                               
                                                <a href="{link}" 
title="{statustext}">
-                                                                               
                                                        <xsl:value-of 
select="id"/>
-                                                                               
                                                </a>
-                                                                               
                                                <xsl:text> </xsl:text>
-                                                                               
                                                <xsl:choose>
-                                                                               
                                                        <xsl:when 
test="location ='.project.request'">
-                                                                               
                                                                <input 
type="checkbox" name="values[delete_request][]" value="{id}">
-                                                                               
                                                                  
<xsl:attribute name="title">
-                                                                               
                                                                    
<xsl:value-of select="//lang_delete_request_statustext"/>
-                                                                               
                                                                  
</xsl:attribute>
-                                                                               
                                                                </input>
-                                                                               
                                                        </xsl:when>
-                                                                               
                                                </xsl:choose>
-                                                                               
                                        </td>
-
-                                                                               
                        </xsl:for-each>
-                                                                               
                </table>
-
-
-                                                                       
</xsl:for-each>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<xsl:for-each select="value_origin">
-
+                                                                               
        <table name="msg_table">
+                                                                               
                <xsl:for-each select="data">
+                                                                               
                        <td class="th_text" align="left">
+                                                                               
                                <a href="{link}" title="{statustext}">
+                                                                               
                                        <xsl:value-of select="id"/>
+                                                                               
                                </a>
+                                                                               
                                <xsl:text> </xsl:text>
+                                                                               
                                <xsl:choose>
+                                                                               
                                        <xsl:when test="location 
='.project.request'">
+                                                                               
                                                <input type="checkbox" 
name="values[delete_request][]" value="{id}">
+                                                                               
                                                        <xsl:attribute 
name="title">
+                                                                               
                                                                <xsl:value-of 
select="//lang_delete_request_statustext"/>
+                                                                               
                                                        </xsl:attribute>
+                                                                               
                                                </input>
+                                                                               
                                        </xsl:when>
+                                                                               
                                </xsl:choose>
+                                                                               
                        </td>
+                                                                               
                </xsl:for-each>
+                                                                               
        </table>
+                                                                               
</xsl:for-each>
+                                                                       
</xsl:when>
+                                                                       
<xsl:otherwise>
+                                                                               
<xsl:for-each select="value_origin">
                                                                                
        <label>
                                                                                
                <xsl:value-of select="descr"/>
                                                                                
        </label>
-
-                                                                               
                <table>
-                                                                               
                        <xsl:for-each select="data">
-
-                                                                               
                                        <td class="th_text" align="left">
-                                                                               
                                                <a href="{link}" 
title="{statustext}">
-                                                                               
                                                        <xsl:value-of 
select="id"/>
-                                                                               
                                                </a>
-                                                                               
                                                <xsl:text> </xsl:text>
-                                                                               
                                        </td>
-
-                                                                               
                        </xsl:for-each>
-                                                                               
                </table>
-
-                                                                       
</xsl:for-each>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
+                                                                               
        <table>
+                                                                               
                <xsl:for-each select="data">
+                                                                               
                        <td class="th_text" align="left">
+                                                                               
                                <a href="{link}" title="{statustext}">
+                                                                               
                                        <xsl:value-of select="id"/>
+                                                                               
                                </a>
+                                                                               
                                <xsl:text> </xsl:text>
+                                                                               
                        </td>
+                                                                               
                </xsl:for-each>
+                                                                               
        </table>
+                                                                               
</xsl:for-each>
+                                                                       
</xsl:otherwise>
+                                                               </xsl:choose>
                                                        </span>
                                                </div>
                                                <div 
class="clearBoth">&nbsp;</div>
-<hr/>
+                                               <hr/>
                                                <div>
                                                        <div 
class="requirement-responsibility-left">
                                                                <div 
class="requirement-responsibility-left-sub">
@@ -302,41 +286,40 @@
                                                                                
</option>
                                                                                
<xsl:apply-templates select="status_list/options"/>
                                                                        
</select>
-
                                                                </div>
                                                                <div 
class="coordinator_select">
-                                                                       
<dt><label>
-                                                                               
<xsl:value-of select="lang_coordinator"/>
-                                                                       
</label></dt>
+                                                                       <dt>
+                                                                               
<label>
+                                                                               
        <xsl:value-of select="lang_coordinator"/>
+                                                                               
</label>
+                                                                       </dt>
                                                                        <dd>
                                                                                
<xsl:call-template name="user_id_select"/>
                                                                        </dd>
                                                                </div>
                                                        </div>
                                                        <div 
class="requirement-responsibility-right">
-<!--                                                           <legend>
+                                                               <!--<legend>
                                                                                
<xsl:value-of select="php:function('lang', 'location')"/>
-                                                               </legend> -->
+                                                                       
</legend> -->
                                                                <dl 
class="proplist-col">
                                                                        <input 
type="hidden" name="values[origin]" value="{value_origin_type}"/>
                                                                        <input 
type="hidden" name="values[origin_id]" value="{value_origin_id}"/>
-
                                                                        
<xsl:for-each select="value_target">
-
-                                                                               
        <dt><label>
+                                                                               
<dt>
+                                                                               
        <label>
                                                                                
                <xsl:value-of select="descr"/>
-                                                                               
        </label></dt>
-                                                                               
        <dd>
-                                                                               
                <xsl:for-each select="data">
-                                                                               
                        <a href="{link}" title="{statustext}">
-                                                                               
                                <xsl:value-of select="id"/>
-                                                                               
                        </a>
-                                                                               
                        <xsl:text> </xsl:text>
-                                                                               
                </xsl:for-each>
-                                                                               
        </dd>
-
+                                                                               
        </label>
+                                                                               
</dt>
+                                                                               
<dd>
+                                                                               
        <xsl:for-each select="data">
+                                                                               
                <a href="{link}" title="{statustext}">
+                                                                               
                        <xsl:value-of select="id"/>
+                                                                               
                </a>
+                                                                               
                <xsl:text> </xsl:text>
+                                                                               
        </xsl:for-each>
+                                                                               
</dd>
                                                                        
</xsl:for-each>
-
                                                                        
<xsl:choose>
                                                                                
<xsl:when test="mode ='edit'">
                                                                                
        <xsl:call-template name="location_form2"/>
@@ -345,9 +328,11 @@
                                                                                
        <xsl:call-template name="location_view2"/>
                                                                                
        <xsl:choose>
                                                                                
                <xsl:when test="contact_phone !=''">
-                                                                               
                        <dt><label>
-                                                                               
                                <xsl:value-of select="lang_contact_phone"/>
-                                                                               
                        </label></dt>
+                                                                               
                        <dt>
+                                                                               
                                <label>
+                                                                               
                                        <xsl:value-of 
select="lang_contact_phone"/>
+                                                                               
                                </label>
+                                                                               
                        </dt>
                                                                                
                        <dd>
                                                                                
                                <xsl:value-of select="contact_phone"/>
                                                                                
                        </dd>
@@ -355,434 +340,250 @@
                                                                                
        </xsl:choose>
                                                                                
</xsl:otherwise>
                                                                        
</xsl:choose>
-
-
                                                                        
<xsl:choose>
                                                                                
<xsl:when test="suppressmeter =''">
-
-                                                                               
                <dt><label>
+                                                                               
        <dt>
+                                                                               
                <label>
                                                                                
                        <xsl:value-of select="lang_power_meter"/>
-                                                                               
                </label></dt>
-                                                                               
                <dd>
-                                                                               
                        <input type="text" name="values[power_meter]" 
value="{value_power_meter}" size="12">
-                                                                               
                                <xsl:attribute name="title">
-                                                                               
                                        <xsl:value-of 
select="lang_power_meter_statustext"/>
-                                                                               
                                </xsl:attribute>
-                                                                               
                        </input>
-                                                                               
                </dd>
-
+                                                                               
                </label>
+                                                                               
        </dt>
+                                                                               
        <dd>
+                                                                               
                <input type="text" name="values[power_meter]" 
value="{value_power_meter}" size="12">
+                                                                               
                        <xsl:attribute name="title">
+                                                                               
                                <xsl:value-of 
select="lang_power_meter_statustext"/>
+                                                                               
                        </xsl:attribute>
+                                                                               
                </input>
+                                                                               
        </dd>
                                                                                
</xsl:when>
                                                                        
</xsl:choose>
-
                                                                </dl>
                                                        </div>
                                                </div>
-                                                       <div 
class="clearBoth">&nbsp;</div>
-<hr/>
-<div class="requirement-description">
-  <h3>
-                       <xsl:value-of select="php:function('lang', 
'description')"/>
-  </h3>
-                                               <label>
+                                               <div 
class="clearBoth">&nbsp;</div>
+                                               <hr/>
+                                               <div 
class="requirement-description">
+                                                       <h3>
+                                                               <xsl:value-of 
select="php:function('lang', 'description')"/>
+                                                       </h3>
+                                                       <label>
                                                                <xsl:value-of 
select="php:function('lang', 'building part')"/>
                                                        </label>
                                                        <br/>
-                                                               <select 
name="values[building_part]">
-                                                                       
<xsl:attribute name="title">
-                                                                               
<xsl:value-of select="php:function('lang', 'select building part')"/>
-                                                                       
</xsl:attribute>
-                                                                       <option 
value="0">
-                                                                               
<xsl:value-of select="php:function('lang', 'select building part')"/>
-                                                                       
</option>
-                                                                       
<xsl:apply-templates select="building_part_list/options"/>
-                                                               </select>
+                                                       <select 
name="values[building_part]">
+                                                               <xsl:attribute 
name="title">
+                                                                       
<xsl:value-of select="php:function('lang', 'select building part')"/>
+                                                               </xsl:attribute>
+                                                               <option 
value="0">
+                                                                       
<xsl:value-of select="php:function('lang', 'select building part')"/>
+                                                               </option>
+                                                               
<xsl:apply-templates select="building_part_list/options"/>
+                                                       </select>
                                                        <br/>
-
                                                        <xsl:variable 
name="lang_request_title">
                                                                <xsl:value-of 
select="php:function('lang', 'enter request title')"/>
                                                        </xsl:variable>
-
-                                                               <label 
title="{$lang_request_title}">
-                                                                       
<xsl:value-of select="php:function('lang', 'request title')"/>
-                                                               </label>
-                                                               <br/>
-                                                                       <input 
type="text" name="values[title]" value="{value_title}" size="120" 
title="{$lang_request_title}">
-                                                                       </input>
-                                                               <br/>
-
+                                                       <label 
title="{$lang_request_title}">
+                                                               <xsl:value-of 
select="php:function('lang', 'request title')"/>
+                                                       </label>
+                                                       <br/>
+                                                       <input type="text" 
name="values[title]" value="{value_title}" size="120" 
title="{$lang_request_title}">
+                                                       </input>
+                                                       <br/>
                                                        <xsl:variable 
name="lang_request_description">
                                                                <xsl:value-of 
select="php:function('lang', 'enter a description of the request')"/>
                                                        </xsl:variable>
-
-                                                               <label 
title="{$lang_request_description}">
-                                                                       
<xsl:value-of select="php:function('lang', 'request description')"/>
-                                                               </label>
-                                                               <br/>
-                                                                       
<textarea cols="120" rows="6" name="values[descr]" 
title="{$lang_request_description}">
-                                                                               
<xsl:value-of select="value_descr"/>
-                                                                       
</textarea>
-</div>
+                                                       <label 
title="{$lang_request_description}">
+                                                               <xsl:value-of 
select="php:function('lang', 'request description')"/>
+                                                       </label>
+                                                       <br/>
+                                                       <textarea cols="120" 
rows="6" name="values[descr]" title="{$lang_request_description}">
+                                                               <xsl:value-of 
select="value_descr"/>
+                                                       </textarea>
+                                               </div>
                                                <div 
class="clearBoth">&nbsp;</div>
-<hr/>
- <div class="requirement-condition">
-  <h3>
-                       <xsl:value-of select="php:function('lang', 
'condition')"/>
-  </h3>
-                                               <dl class="proplist-col">
-
-                                               <table>
-                                                       <xsl:apply-templates 
select="custom_attributes/attributes"/>
-                                                       <tr>
-                                                               <td colspan="2">
-                                                                       <table 
border="1" width="100%" cellpadding="2" cellspacing="2" align="center">
-                                                                               
<xsl:call-template name="table_header_importance"/>
-                                                                               
<xsl:apply-templates select="condition_list"/>
-                                                                       </table>
-                                                               </td>
-                                                       </tr>
-                                                       <tr>
-                                                               <td>
-                                                                       <br/>
-                                                               </td>
-                                                       </tr>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="authorities_demands/options!=''">
+                                               <hr/>
+                                               <div 
class="requirement-condition">
+                                                       <h3>
+                                                               <xsl:value-of 
select="php:function('lang', 'condition')"/>
+                                                       </h3>
+                                                       <dl 
class="proplist-col">
+                                                               <table>
+                                                                       
<xsl:apply-templates select="custom_attributes/attributes"/>
                                                                        <tr>
-                                                                               
<td align="left">
-                                                                               
        <xsl:value-of select="php:function('lang', 'Authorities Demands')"/>
+                                                                               
<td colspan="2">
+                                                                               
        <table border="1" width="100%" cellpadding="2" cellspacing="2" 
align="center">
+                                                                               
                <xsl:call-template name="table_header_importance"/>
+                                                                               
                <xsl:apply-templates select="condition_list"/>
+                                                                               
        </table>
                                                                                
</td>
+                                                                       </tr>
+                                                                       <tr>
                                                                                
<td>
-                                                                               
        <select name="values[authorities_demands]" class="forms">
-                                                                               
                <xsl:attribute name="title">
-                                                                               
                        <xsl:value-of select="php:function('lang', 'Is there a 
demand from the authorities to correct this condition?')"/>
-                                                                               
                        <xsl:text> + </xsl:text>
-                                                                               
                        <xsl:value-of select="value_authorities_demands"/>
-                                                                               
                </xsl:attribute>
-                                                                               
                <option value="0">
-                                                                               
                        <xsl:value-of select="php:function('lang', 'no 
authorities demands')"/>
-                                                                               
                </option>
-                                                                               
                <xsl:apply-templates select="authorities_demands/options"/>
-                                                                               
        </select>
+                                                                               
        <br/>
                                                                                
</td>
                                                                        </tr>
+                                                                       
<xsl:choose>
+                                                                               
<xsl:when test="authorities_demands/options!=''">
+                                                                               
        <tr>
+                                                                               
                <td align="left">
+                                                                               
                        <xsl:value-of select="php:function('lang', 'Authorities 
Demands')"/>
+                                                                               
                </td>
+                                                                               
                <td>
+                                                                               
                        <select name="values[authorities_demands]" 
class="forms">
+                                                                               
                                <xsl:attribute name="title">
+                                                                               
                                        <xsl:value-of 
select="php:function('lang', 'Is there a demand from the authorities to correct 
this condition?')"/>
+                                                                               
                                        <xsl:text> + </xsl:text>
+                                                                               
                                        <xsl:value-of 
select="value_authorities_demands"/>
+                                                                               
                                </xsl:attribute>
+                                                                               
                                <option value="0">
+                                                                               
                                        <xsl:value-of 
select="php:function('lang', 'no authorities demands')"/>
+                                                                               
                                </option>
+                                                                               
                                <xsl:apply-templates 
select="authorities_demands/options"/>
+                                                                               
                        </select>
+                                                                               
                </td>
+                                                                               
        </tr>
+                                                                               
        <tr>
+                                                                               
                <td>
+                                                                               
                        <br/>
+                                                                               
                </td>
+                                                                               
        </tr>
+                                                                               
</xsl:when>
+                                                                       
</xsl:choose>
                                                                        <tr>
                                                                                
<td>
                                                                                
        <br/>
                                                                                
</td>
                                                                        </tr>
-                                                               </xsl:when>
-                                                       </xsl:choose>
-                                                       <!--
-<tr>
-<td valign='top' align="left">
-<xsl:value-of select="php:function('lang', 'regulations')" />
-</td>
-<td colspan='3'>
-<table cellpadding="2" cellspacing="2" width="50%" align="left">
-<xsl:for-each select="regulations" >
-<tr>
-<xsl:attribute name="class">
-<xsl:choose>
-<xsl:when test="@class">
-<xsl:value-of select="@class"/>
-</xsl:when>
-<xsl:when test="position() mod 2 = 0">
-<xsl:text>row_off</xsl:text>
-</xsl:when>
-<xsl:otherwise>
-<xsl:text>row_on</xsl:text>
-</xsl:otherwise>
-</xsl:choose>
-</xsl:attribute>
-<td align="left" title='{descr}'>
-<xsl:text> </xsl:text>
-<xsl:choose>
-<xsl:when test="external_ref!=''">
-<a href="{external_ref}" target="_blank"><xsl:value-of select="name"/></a>
-</xsl:when>
-<xsl:otherwise>
-<xsl:value-of select="name"/>
-</xsl:otherwise>
-</xsl:choose>
-</td>
-<td align="left">
-<input type="checkbox" name="values[regulations][]" value="{id}">
-<xsl:if test="selected = '1'">
-<xsl:attribute name="checked">
-<xsl:text>checked</xsl:text>
-</xsl:attribute>
-</xsl:if>
-<xsl:attribute name="title">
-<xsl:value-of select="descr"/>
-</xsl:attribute>
-</input>
-</td>
-</tr>
-</xsl:for-each>
-</table>
-</td>
-</tr>
--->
-                                                       <tr>
-                                                               <td>
-                                                                       <br/>
-                                                               </td>
-                                                       </tr>
-                                               </table>
-
-<!--
-                                                               <dt>
-                                                                       <label>
-                                                                               
<xsl:value-of select="php:function('lang', 'score')"/>
-                                                                       </label>
-                                                               </dt>
-                                                               <dd>
-                                                                       
<xsl:value-of select="value_score"/>
-                                                               </dd>
--->
-                                               </dl>
- </div>
- <div class="clearBoth">&nbsp;</div>
- <hr/>
- <div>
- <div class="requirement-action-left">
-  <h3>
-                       <!-- xsl:value-of select="php:function('lang', 'economy 
and progress')"/ -->
-               <xsl:value-of select="php:function('lang', 'action year')"/>
-
-  </h3>
+                                                               </table>
+                                                       </dl>
+                                               </div>
+                                               <div 
class="clearBoth">&nbsp;</div>
+                                               <hr/>
+                                               <div>
+                                                       <div 
class="requirement-action-left">
+                                                               <h3>
+                                                                       <!-- 
xsl:value-of select="php:function('lang', 'economy and progress')"/ -->
+                                                                       
<xsl:value-of select="php:function('lang', 'action year')"/>
+                                                               </h3>
                                                                <label>
                                                                        
<xsl:value-of select="php:function('lang', 'recommended year')"/>
                                                                </label>
                                                                <br/>
-                                                                       <input 
type="text" id="recommended_year" name="values[recommended_year]" size="10" 
value="{value_recommended_year}">
-                                                                               
<xsl:attribute name="title">
-                                                                               
        <xsl:value-of select="php:function('lang', 'year')"/>
-                                                                               
</xsl:attribute>
-                                                                       </input>
-
-
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="show_dates !=''">
+                                                               <input 
type="text" id="recommended_year" name="values[recommended_year]" size="10" 
value="{value_recommended_year}">
+                                                                       
<xsl:attribute name="title">
+                                                                               
<xsl:value-of select="php:function('lang', 'year')"/>
+                                                                       
</xsl:attribute>
+                                                               </input>
+                                                               <xsl:choose>
+                                                                       
<xsl:when test="show_dates !=''">
                                                                                
<br/>
                                                                                
<label>
                                                                                
        <xsl:value-of select="php:function('lang', 'start date')"/>
                                                                                
</label>
                                                                                
<br/>
-                                                                               
        <input type="text" id="values_start_date" name="values[start_date]" 
size="10" value="{value_start_date}" readonly="readonly">
-                                                                               
                <xsl:attribute name="title">
-                                                                               
                        <xsl:value-of select="lang_start_date_statustext"/>
-                                                                               
                </xsl:attribute>
-                                                                               
        </input>
-                                                                               
        <br/>
+                                                                               
<input type="text" id="values_start_date" name="values[start_date]" size="10" 
value="{value_start_date}" readonly="readonly">
+                                                                               
        <xsl:attribute name="title">
+                                                                               
                <xsl:value-of select="lang_start_date_statustext"/>
+                                                                               
        </xsl:attribute>
+                                                                               
</input>
+                                                                               
<br/>
                                                                                
<label>
                                                                                
        <xsl:value-of select="php:function('lang', 'end date')"/>
                                                                                
</label>
                                                                                
<br/>
-                                                                               
        <input type="text" id="values_end_date" name="values[end_date]" 
size="10" value="{value_end_date}" readonly="readonly">
-                                                                               
                <xsl:attribute name="title">
-                                                                               
                        <xsl:value-of select="lang_end_date_statustext"/>
-                                                                               
                </xsl:attribute>
-                                                                               
        </input>
-
-
-                                                               </xsl:when>
-                                                       </xsl:choose>
+                                                                               
<input type="text" id="values_end_date" name="values[end_date]" size="10" 
value="{value_end_date}" readonly="readonly">
+                                                                               
        <xsl:attribute name="title">
+                                                                               
                <xsl:value-of select="lang_end_date_statustext"/>
+                                                                               
        </xsl:attribute>
+                                                                               
</input>
+                                                                       
</xsl:when>
+                                                               </xsl:choose>
                                                                <br/>
-                                                                               
<label>
-                                                                               
        <xsl:value-of select="php:function('lang', 'entry date')"/>
+                                                               <label>
+                                                                       
<xsl:value-of select="php:function('lang', 'entry date')"/>
+                                                               </label>
+                                                               <br/>
+                                                               <xsl:value-of 
select="value_entry_date"/>
+                                                       </div>
+                                                       <div 
class="requirement-action-right">
+                                                               <h3>
+                                                                       <!-- 
xsl:value-of select="php:function('lang', 'economy and progress')"/ -->
+                                                                       
<xsl:value-of select="php:function('lang', 'action cost overview')"/>
+                                                               </h3>
+                                                               <div 
class="requirement-action-sub-left">
+                                                                       <div>
+                                                                               
<label class="requirement-action-label">
+                                                                               
        <xsl:value-of select="php:function('lang', 'operation')"/>
                                                                                
</label>
-                                                                               
<br/>
-                                                                               
        <xsl:value-of select="value_entry_date"/>
-
- </div>
- <div class="requirement-action-right">
-<h3>
-                       <!-- xsl:value-of select="php:function('lang', 'economy 
and progress')"/ -->
-                       <xsl:value-of select="php:function('lang', 'action cost 
overview')"/>
-  </h3>
-                                               <div 
class="requirement-action-sub-left">
-                                                               <div>
-                                                                       <label 
class="requirement-action-label">
-                                                                               
<xsl:value-of select="php:function('lang', 'operation')"/>
-                                                                       </label>
-                                                                       <input 
type="text" name="values[amount_operation]" value="{value_amount_operation}">
-                                                                               
<xsl:attribute name="title"><xsl:value-of 
select="lang_budget_statustext"/></xsl:attribute>
-                                                                       </input>
-                                                                       
<xsl:text> </xsl:text>
+                                                                               
<input type="text" name="values[amount_operation]" 
value="{value_amount_operation}">
+                                                                               
        <xsl:attribute name="title">
+                                                                               
                <xsl:value-of select="lang_budget_statustext"/>
+                                                                               
        </xsl:attribute>
+                                                                               
</input>
+                                                                               
<xsl:text> </xsl:text>
+                                                                       </div>
+                                                                       <div>
+                                                                               
<label class="requirement-action-label">
+                                                                               
        <xsl:value-of select="php:function('lang', 'investment')"/>
+                                                                               
</label>
+                                                                               
<input type="text" name="values[amount_investment]" 
value="{value_amount_investment}">
+                                                                               
        <xsl:attribute name="title">
+                                                                               
                <xsl:value-of select="lang_budget_statustext"/>
+                                                                               
        </xsl:attribute>
+                                                                               
</input>
+                                                                               
<xsl:text> </xsl:text>
+                                                                       </div>
+                                                                       
<div><label class="requirement-action-label"><xsl:value-of 
select="php:function('lang', 'total cost estimate')"/></label><xsl:value-of 
select="value_budget"/><xsl:text> </xsl:text> [ <xsl:value-of 
select="currency"/> ]
+                                                                       </div>
                                                                </div>
-                                                               <div>
-                                                                       <label 
class="requirement-action-label">
-                                                                               
<xsl:value-of select="php:function('lang', 'investment')"/>
-                                                                       </label>
-                                                                       <input 
type="text" name="values[amount_investment]" value="{value_amount_investment}">
-                                                                               
<xsl:attribute name="title"><xsl:value-of 
select="lang_budget_statustext"/></xsl:attribute>
-                                                                       </input>
-                                                                       
<xsl:text> </xsl:text>
+                                                               <div 
class="requirement-action-sub-right">
+                                                                       <div>
+                                                                               
<label class="requirement-action-label-wide">
+                                                                               
        <xsl:value-of select="php:function('lang', 'potential grants')"/>
+                                                                               
</label>
+                                                                               
<input type="text" name="values[amount_potential_grants]" 
value="{value_amount_potential_grants}">
+                                                                               
        <xsl:attribute name="title">
+                                                                               
                <xsl:value-of select="lang_budget_statustext"/>
+                                                                               
        </xsl:attribute>
+                                                                               
</input>
+                                                                               
<xsl:text> </xsl:text>
+                                                                       </div>
+                                                                       <div>
+                                                                               
<label class="requirement-action-label-wide">
+                                                                               
        <xsl:value-of select="php:function('lang', 'category')"/>
+                                                                               
</label>
+                                                                               
<xsl:call-template name="categories"/>
+                                                                       </div>
+                                                                       
<xsl:choose>
+                                                                               
<xsl:when test="notify='yes'">
+                                                                               
        <div>
+                                                                               
                <label class="requirement-action-label-wide">
+                                                                               
                        <xsl:value-of select="lang_notify"/>
+                                                                               
                </label>
+                                                                               
                <input type="checkbox" name="values[notify]" value="True">
+                                                                               
                        <xsl:attribute name="title">
+                                                                               
                                <xsl:value-of select="lang_notify_statustext"/>
+                                                                               
                        </xsl:attribute>
+                                                                               
                </input>
+                                                                               
                <input type="text" name="values[mail_address]" 
value="{value_notify_mail_address}">
+                                                                               
                        <xsl:attribute name="title">
+                                                                               
                                <xsl:value-of select="lang_notify_statustext"/>
+                                                                               
                        </xsl:attribute>
+                                                                               
                </input>
+                                                                               
        </div>
+                                                                               
</xsl:when>
+                                                                       
</xsl:choose>
                                                                </div>
-                                                               <div>
-                                                                       <label 
class="requirement-action-label">
-                                                                               
<xsl:value-of select="php:function('lang', 'total cost estimate')"/>
-                                                                       </label>
-                                                                       
<xsl:value-of select="value_budget"/><xsl:text> </xsl:text> [ <xsl:value-of 
select="currency"/> ]
-                                                               </div>
+                                                       </div>
                                                </div>
-                                               <div 
class="requirement-action-sub-right">
-<!--
-                                                                               
<dt><label>
-                                                                               
        <xsl:value-of select="php:function('lang', 'in progress date')"/>
-                                                                               
</label></dt>
-                                                                               
<dd>
-                                                                               
        <xsl:value-of select="value_in_progress_date"/>
-                                                                               
</dd>
-
-
-                                                                               
<dt><label>
-                                                                               
        <xsl:value-of select="php:function('lang', 'delivered date')"/>
-                                                                               
</label></dt>
-                                                                               
<dd>
-                                                                               
        <xsl:value-of select="value_delivered_date"/>
-                                                                               
</dd>
-
-
-                                                                               
<dt><label>
-                                                                               
        <xsl:value-of select="php:function('lang', 'closed date')"/>
-                                                                               
</label></dt>
-                                                                               
<dd>
-                                                                               
        <xsl:value-of select="value_closed_date"/>
-                                                                               
</dd>
--->
-                                                               <div>
-                                                                       <label 
class="requirement-action-label-wide">
-                                                                               
<xsl:value-of select="php:function('lang', 'potential grants')"/>
-                                                                       </label>
-                                                                       <input 
type="text" name="values[amount_potential_grants]" 
value="{value_amount_potential_grants}">
-                                                                               
<xsl:attribute name="title"><xsl:value-of 
select="lang_budget_statustext"/></xsl:attribute>
-                                                                       </input>
-                                                                       
<xsl:text> </xsl:text>
-                                                               </div>
-                                                               <div>
-                                                                       <label 
class="requirement-action-label-wide">
-                                                                               
<xsl:value-of select="php:function('lang', 'category')"/>
-                                                                       </label>
-                                                                       
<xsl:call-template name="categories"/>
-                                                               </div>
-
-
-
-
-
-
-
-<!--
-
-                                                               <dt><label>
-                                                                       
<xsl:value-of select="php:function('lang', 'not allocated')"/>
-                                                               </label></dt>
-                                                               <dd>
-                                                                       
<xsl:value-of select="value_diff"/><xsl:text> </xsl:text> [ <xsl:value-of 
select="currency"/> ]
-                                                               </dd>
-
-
-                                                               <dt><label>
-                                                                       
<xsl:value-of select="php:function('lang', 'residual demand')"/>
-                                                               </label></dt>
-                                                               <dd>
-                                                                       
<xsl:value-of select="value_diff2"/><xsl:text> </xsl:text> [ <xsl:value-of 
select="currency"/> ]
-                                                               </dd>
-
-
-                                                               <dt><label>
-                                                                       
<xsl:value-of select="php:function('lang', 'planning date')"/>
-                                                               </label></dt>
-                                                               <dd>
-                                                                       <input 
type="text" id="values_planning_date" name="values[planning_date]" size="10" 
value="" readonly="readonly">
-                                                                               
<xsl:attribute name="title">
-                                                                               
        <xsl:value-of select="php:function('lang', 'planning date')"/>
-                                                                               
</xsl:attribute>
-                                                                       </input>
-                                                               </dd>
-
-
-                                                               <dt><label>
-                                                                       
<xsl:value-of select="php:function('lang', 'planning value')"/>
-                                                               </label></dt>
-                                                               <dd>
-                                                                       <input 
type="text" id="values_planning_value" name="values[planning_value]" size="10" 
value="{value_planning}"><xsl:attribute name="title"><xsl:value-of 
select="php:function('lang', 'planning 
value')"/></xsl:attribute></input><xsl:text> </xsl:text> [ <xsl:value-of 
select="currency"/> ]
-                                                               </dd>
-
-
-                                                               <dt><label>
-                                                                       
<xsl:value-of select="php:function('lang', 'planning serie')"/>
-                                                               </label></dt>
-                                                               <dd>
-                                                                       <div 
id="datatable-container_2"/>
-                                                               </dd>
-
-
-                                                               <dt><label>
-                                                                       
<xsl:value-of select="php:function('lang', 'consume date')"/>
-                                                               </label></dt>
-                                                               <dd>
-                                                                       <input 
type="text" id="values_consume_date" name="values[consume_date]" size="10" 
value="" readonly="readonly">
-                                                                               
<xsl:attribute name="title">
-                                                                               
        <xsl:value-of select="php:function('lang', 'consume date')"/>
-                                                                               
</xsl:attribute>
-                                                                       </input>
-                                                               </dd>
-
-
-                                                               <dt><label>
-                                                                       
<xsl:value-of select="php:function('lang', 'consume value')"/>
-                                                               </label></dt>
-                                                               <dd>
-                                                                       <input 
type="text" id="values_consume_value" name="values[consume_value]" size="10" 
value="{value_consume}"><xsl:attribute name="title"><xsl:value-of 
select="php:function('lang', 'consume 
value')"/></xsl:attribute></input><xsl:text> </xsl:text> [ <xsl:value-of 
select="currency"/> ]
-                                                               </dd>
-
-
-                                                               <dt><label>
-                                                                       
<xsl:value-of select="php:function('lang', 'consume history')"/>
-                                                               </label></dt>
-                                                               <dd>
-                                                                       <div 
id="datatable-container_3"/>
-                                                               </dd>
--->
-
-                                                               <xsl:choose>
-                                                                       
<xsl:when test="notify='yes'">
-                                                                               
<div>
-                                                                               
        <label class="requirement-action-label-wide">
-                                                                               
                <xsl:value-of select="lang_notify"/>
-                                                                               
        </label>
-                                                                               
        <input type="checkbox" name="values[notify]" value="True">
-                                                                               
                <xsl:attribute name="title">
-                                                                               
                        <xsl:value-of select="lang_notify_statustext"/>
-                                                                               
                </xsl:attribute>
-                                                                               
        </input>
-                                                                               
        <input type="text" name="values[mail_address]" 
value="{value_notify_mail_address}">
-                                                                               
                <xsl:attribute name="title">
-                                                                               
                        <xsl:value-of select="lang_notify_statustext"/>
-                                                                               
                </xsl:attribute>
-                                                                               
        </input>
-                                                                               
</div>
-                                                                       
</xsl:when>
-                                                               </xsl:choose>
+                                               <div 
class="clearBoth">&nbsp;</div>
+                                               <hr/>
+                                               <div 
class="requirement-related">
+                                                       <h3><!-- xsl:value-of 
select="php:function('lang', 'related')"/-->
+                                                               <xsl:value-of 
select="php:function('lang', 'economy and progress')"/>
+                                                       </h3>
+                                                       <div 
id="datatable-container_2"/>
                                                </div>
-
-
- </div>
- </div>
-  <div class="clearBoth">&nbsp;</div>
- <hr/>
- <div class="requirement-related">
-  <h3>
-                       <!-- xsl:value-of select="php:function('lang', 
'related')"/ -->
-                       Forbruk - fremdrift
-  </h3>
-
-                                       <div id="datatable-container_2"/>
-
- </div>
                                        </div>
                                        <div id="documents">
                                                <table>
@@ -829,14 +630,14 @@
 
                                                        <xsl:for-each 
select="datatable">
                                                                
datatable[<xsl:value-of select="name"/>] = [
-                                                                       {
-                                                                               
values:<xsl:value-of select="values"/>,
-                                                                               
total_records: <xsl:value-of select="total_records"/>,
-                                                                               
edit_action:  <xsl:value-of select="edit_action"/>,
-                                                                               
is_paginator:  <xsl:value-of select="is_paginator"/>,
-                                                                               
footer:<xsl:value-of select="footer"/>
-                                                                       }
-                                                               ]
+                                                               {
+                                                                       
values:<xsl:value-of select="values"/>,
+                                                                       
total_records: <xsl:value-of select="total_records"/>,
+                                                                       
edit_action:  <xsl:value-of select="edit_action"/>,
+                                                                       
is_paginator:  <xsl:value-of select="is_paginator"/>,
+                                                                       
footer:<xsl:value-of select="footer"/>
+                                                               }
+                                                       ]
                                                        </xsl:for-each>
 
                                                        <xsl:for-each 
select="myColumnDefs">
@@ -849,63 +650,63 @@
                        <xsl:choose>
                                <xsl:when test="mode = 'edit'">
                                        <div class="controlButton">
-                                       <table>
-                                               <tr height="50">
-                                                       <td>
-                                                               <xsl:variable 
name="lang_save">
-                                                                       
<xsl:value-of select="lang_save"/>
-                                                               </xsl:variable>
-                                                               <input 
type="submit" name="values[save]" value="{$lang_save}">
-                                                                       
<xsl:attribute name="title">
-                                                                               
<xsl:value-of select="lang_save_statustext"/>
-                                                                       
</xsl:attribute>
-                                                               </input>
-                                                       </td>
-                                               </tr>
-                                       </table>
+                                               <table>
+                                                       <tr height="50">
+                                                               <td>
+                                                                       
<xsl:variable name="lang_save">
+                                                                               
<xsl:value-of select="lang_save"/>
+                                                                       
</xsl:variable>
+                                                                       <input 
type="submit" name="values[save]" value="{$lang_save}">
+                                                                               
<xsl:attribute name="title">
+                                                                               
        <xsl:value-of select="lang_save_statustext"/>
+                                                                               
</xsl:attribute>
+                                                                       </input>
+                                                               </td>
+                                                       </tr>
+                                               </table>
                                        </div>
                                </xsl:when>
                        </xsl:choose>
                </form>
                <div class="controlButton">
-               <table>
-                       <tr>
-                               <td>
-                                       <xsl:variable name="done_action">
-                                               <xsl:value-of 
select="done_action"/>
-                                       </xsl:variable>
-                                       <xsl:variable name="lang_done">
-                                               <xsl:value-of 
select="lang_done"/>
-                                       </xsl:variable>
-                                       <form method="post" 
action="{$done_action}">
-                                               <input type="submit" 
name="done" value="{$lang_done}">
-                                                       <xsl:attribute 
name="title">
-                                                               <xsl:value-of 
select="lang_done_statustext"/>
-                                                       </xsl:attribute>
-                                               </input>
-                                       </form>
-                               </td>
-                               <xsl:choose>
-                                       <xsl:when test="mode = 'view'">
-                                               <td>
-                                                       <xsl:variable 
name="edit_action">
-                                                               <xsl:value-of 
select="edit_action"/>
-                                                       </xsl:variable>
-                                                       <xsl:variable 
name="lang_edit">
-                                                               <xsl:value-of 
select="php:function('lang', 'edit')"/>
-                                                       </xsl:variable>
-                                                       <form method="post" 
action="{$edit_action}">
-                                                               <input 
type="submit" class="forms" name="edit" value="{$lang_edit}">
-                                                                       
<xsl:attribute name="title">
-                                                                               
<xsl:value-of select="php:function('lang', 'edit')"/>
-                                                                       
</xsl:attribute>
-                                                               </input>
-                                                       </form>
-                                               </td>
-                                       </xsl:when>
-                               </xsl:choose>
-                       </tr>
-               </table>
+                       <table>
+                               <tr>
+                                       <td>
+                                               <xsl:variable 
name="done_action">
+                                                       <xsl:value-of 
select="done_action"/>
+                                               </xsl:variable>
+                                               <xsl:variable name="lang_done">
+                                                       <xsl:value-of 
select="lang_done"/>
+                                               </xsl:variable>
+                                               <form method="post" 
action="{$done_action}">
+                                                       <input type="submit" 
name="done" value="{$lang_done}">
+                                                               <xsl:attribute 
name="title">
+                                                                       
<xsl:value-of select="lang_done_statustext"/>
+                                                               </xsl:attribute>
+                                                       </input>
+                                               </form>
+                                       </td>
+                                       <xsl:choose>
+                                               <xsl:when test="mode = 'view'">
+                                                       <td>
+                                                               <xsl:variable 
name="edit_action">
+                                                                       
<xsl:value-of select="edit_action"/>
+                                                               </xsl:variable>
+                                                               <xsl:variable 
name="lang_edit">
+                                                                       
<xsl:value-of select="php:function('lang', 'edit')"/>
+                                                               </xsl:variable>
+                                                               <form 
method="post" action="{$edit_action}">
+                                                                       <input 
type="submit" class="forms" name="edit" value="{$lang_edit}">
+                                                                               
<xsl:attribute name="title">
+                                                                               
        <xsl:value-of select="php:function('lang', 'edit')"/>
+                                                                               
</xsl:attribute>
+                                                                       </input>
+                                                               </form>
+                                                       </td>
+                                               </xsl:when>
+                                       </xsl:choose>
+                               </tr>
+                       </table>
                </div>
        </xsl:template>
 




reply via email to

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