|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [6694] property: formatting |
| Date: | Wed, 22 Dec 2010 10:05:00 +0000 |
Revision: 6694
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6694
Author: sigurdne
Date: 2010-12-22 10:04:57 +0000 (Wed, 22 Dec 2010)
Log Message:
-----------
property: formatting
Modified Paths:
--------------
trunk/property/templates/base/request.xsl
Modified: trunk/property/templates/base/request.xsl
===================================================================
--- trunk/property/templates/base/request.xsl 2010-12-21 20:29:05 UTC (rev
6693)
+++ trunk/property/templates/base/request.xsl 2010-12-22 10:04:57 UTC (rev
6694)
@@ -420,52 +420,48 @@
<div id="importance">
<table>
<tr>
- <td
class="th_text" valign="top">
-
<xsl:value-of select="lang_importance"/>
- </td>
-
<td>
-
<table width="100%" cellpadding="2" cellspacing="2" align="center">
-
<xsl:apply-templates select="table_header_importance"/>
-
<xsl:apply-templates select="condition_list"/>
-
<tr>
-
<td align="left">
-
<xsl:value-of
select="lang_authorities_demands"/>
-
</td>
-
<td>
-
<xsl:choose>
-
<xsl:when
test="authorities_demands='1'">
-
<input type="checkbox"
name="values[authorities_demands]" value="1" checked="checked">
-
<xsl:attribute
name="title">
-
<xsl:value-of
select="lang_authorities_demands_statustext"/>
-
</xsl:attribute>
-
</input>
-
</xsl:when>
-
<xsl:otherwise>
-
<input type="checkbox"
name="values[authorities_demands]" value="1">
-
<xsl:attribute
name="title">
-
<xsl:value-of
select="lang_authorities_demands_statustext"/>
-
</xsl:attribute>
-
</input>
-
</xsl:otherwise>
-
</xsl:choose>
-
</td>
-
</tr>
+ <td>
+
<table width="100%" cellpadding="2" cellspacing="2" align="center">
+
<xsl:apply-templates select="table_header_importance"/>
+
<xsl:apply-templates select="condition_list"/>
+
<tr>
+
<td align="left">
+
<xsl:value-of select="lang_authorities_demands"/>
+
</td>
+
<td>
+
<xsl:choose>
+
<xsl:when test="authorities_demands='1'">
+
<input type="checkbox"
name="values[authorities_demands]" value="1" checked="checked">
+
<xsl:attribute name="title">
+
<xsl:value-of
select="lang_authorities_demands_statustext"/>
+
</xsl:attribute>
+
</input>
+
</xsl:when>
+
<xsl:otherwise>
+
<input type="checkbox"
name="values[authorities_demands]" value="1">
+
<xsl:attribute name="title">
+
<xsl:value-of
select="lang_authorities_demands_statustext"/>
+
</xsl:attribute>
+
</input>
+
</xsl:otherwise>
+
</xsl:choose>
+
</td>
+
</tr>
<xsl:call-template name="attributes"/>
-
<tr>
-
<td align="left">
-
<xsl:value-of select="lang_score"/>
-
</td>
-
<td>
-
<xsl:value-of select="value_score"/>
-
</td>
-
</tr>
-
</table>
-
</td>
+
<tr>
+
<td align="left">
+
<xsl:value-of select="lang_score"/>
+
</td>
+
<td>
+
<xsl:value-of select="value_score"/>
+
</td>
+
</tr>
+
</table>
+ </td>
</tr>
</table>
</div>
-
<div id="documents">
<table>
<xsl:choose>
@@ -504,26 +500,6 @@
</div>
<div id="history">
- <!--table width="80%"
cellpadding="2" cellspacing="2" align="center">
- <xsl:choose>
-
<xsl:when test="record_history=''">
-
<tr>
-
<td class="th_text" align="center">
-
<xsl:value-of select="lang_no_history"/>
-
</td>
-
</tr>
-
</xsl:when>
-
<xsl:otherwise>
-
<tr>
-
<td class="th_text" align="left">
-
<xsl:value-of select="lang_history"/>
-
</td>
-
</tr>
-
<xsl:apply-templates select="table_header_history"/>
-
<xsl:apply-templates select="record_history"/>
-
</xsl:otherwise>
- </xsl:choose>
- </table-->
<div id="paging_0">
</div>
<div
id="datatable-container_0"></div>
<div
id="contextmenu_0"></div>
@@ -586,444 +562,8 @@
</tr>
</table>
- <!-- input type="hidden" name="values[origin]"
value="{value_origin_type}"></input>
- <input type="hidden" name="values[origin_id]"
value="{value_origin_id}"></input>
- <xsl:choose>
- <xsl:when test="value_request_id!=''">
- <tr>
- <td>
- <xsl:value-of
select="lang_copy_request"/>
- </td>
- <td>
- <input type="checkbox"
name="values[copy_request]" value="True" onMouseout="window.status='';return
true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_copy_request_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
- </xsl:attribute>
- </input>
- </td>
- </tr>
- <tr>
- <td>
- <xsl:value-of
select="lang_request_id"/>
- </td>
- <td>
- <xsl:value-of
select="value_request_id"/>
- </td>
- </tr>
- <xsl:for-each select="value_origin" >
- <tr>
- <td class="th_text"
valign ="top">
- <xsl:value-of
select="descr"/>
- </td>
- <td>
- <table>
-
- <xsl:for-each
select="data">
- <tr>
-
- <td class="th_text"
align="left" >
- <a
href="{link}" title="{//lang_origin_statustext}" style
="cursor:help"><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}"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="//lang_delete_request_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
-
</xsl:when>
- </xsl:choose>
- </td>
- </tr>
- </xsl:for-each>
- </table>
- </td>
- </tr>
- </xsl:for-each>
- </xsl:when>
- <xsl:otherwise>
- <xsl:for-each select="value_origin" >
- <tr>
- <td class="th_text"
valign ="top">
- <xsl:value-of
select="descr"/>
- </td>
- <td>
- <table>
-
<xsl:for-each select="data">
-
<tr>
-
<td class="th_text" align="left" >
-
<a href="{link}" title="{//lang_origin_statustext}" style
="cursor:help"><xsl:value-of select="id"/></a>
-
<xsl:text> </xsl:text>
-
</td>
-
</tr>
-
</xsl:for-each>
- </table>
- </td>
- </tr>
- </xsl:for-each>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:for-each select="value_target" >
- <tr>
- <td class="th_text" valign ="top">
- <xsl:value-of select="descr"/>
- </td>
- <td class="th_text"
align="left" >
- <xsl:for-each select="data">
- <a href="{link}"
title="{//lang_target_statustext}" style ="cursor:help"><xsl:value-of
select="id"/></a>
- <xsl:text> </xsl:text>
- </xsl:for-each>
- </td>
- </tr>
- </xsl:for-each>
-
- <tr>
- <td valign="top">
- <xsl:value-of select="lang_title"/>
- </td>
- <td>
- <input type="text" name="values[title]"
value="{value_title}" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_title_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
- </xsl:attribute>
- </input>
- </td>
- </tr>
- <tr>
- <td valign="top">
- <xsl:value-of select="lang_descr"/>
- </td>
- <td>
- <textarea cols="60" rows="6"
name="values[descr]" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_descr_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
- </xsl:attribute>
- <xsl:value-of
select="value_descr"/>
- </textarea>
- </td>
- </tr>
- <tr>
- <td>
- <xsl:value-of select="lang_category"/>
- </td>
- <td>
- <xsl:call-template name="categories"/>
- </td>
- </tr>
- <xsl:choose>
- <xsl:when test="location_type='form'">
- <xsl:call-template
name="location_form"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:call-template
name="location_view"/>
- <xsl:choose>
- <xsl:when test="contact_phone
!=''">
- <tr>
- <td
class="th_text" align="left">
-
<xsl:value-of select="lang_contact_phone"/>
- </td>
- <td
align="left">
-
<xsl:value-of select="contact_phone"/>
- </td>
- </tr>
- </xsl:when>
- </xsl:choose>
-
- </xsl:otherwise>
- </xsl:choose>
-
- <tr>
- <td valign="top">
- <xsl:value-of
select="lang_power_meter"/>
- </td>
- <td>
- <input type="text"
name="values[power_meter]" value="{value_power_meter}" size="12"
onMouseout="window.status='';return true;" >
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_power_meter_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
- </xsl:attribute>
- </input>
- </td>
- </tr>
- <tr>
- <td valign="top">
- <xsl:value-of select="lang_budget"/>
- </td>
- <td>
- <input type="text"
name="values[budget]" value="{value_budget}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_budget_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
- </xsl:attribute>
- </input>
- <xsl:text> </xsl:text> [ <xsl:value-of
select="currency"/> ]
- </td>
- </tr>
- <tr>
- <td>
- <xsl:value-of
select="lang_coordinator"/>
- </td>
- <td>
- <xsl:call-template
name="user_id_select"/>
- </td>
- </tr>
- <tr>
- <td>
- <xsl:value-of select="lang_status"/>
- </td>
- <td>
- <xsl:call-template
name="status_select"/>
- </td>
- </tr>
- <tr>
- <td valign="top">
- <xsl:value-of select="lang_start_date"/>
- </td>
- <td>
- <input type="text"
id="values_start_date" name="values[start_date]" size="10"
value="{value_start_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_start_date_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
- </xsl:attribute>
- </input>
- <img id="values_start_date-trigger"
src="{img_cal}" alt="{lang_datetitle}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;" />
- </td>
- </tr>
- <tr>
- <td valign="top">
- <xsl:value-of select="lang_end_date"/>
- </td>
- <td>
- <input type="text" id="values_end_date"
name="values[end_date]" size="10" value="{value_end_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_end_date_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
- </xsl:attribute>
- </input>
- <img id="values_end_date-trigger"
src="{img_cal}" alt="{lang_datetitle}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;" />
- </td>
- </tr>
- <tr>
- <td valign="top">
- <xsl:value-of select="lang_branch"/>
- </td>
- <td>
- <xsl:variable
name="lang_branch_statustext"><xsl:value-of
select="lang_branch_statustext"/></xsl:variable>
- <select
name="values[branch_id]" class="forms"
onMouseover="window.status='{$lang_branch_statustext}'; return true;"
onMouseout="window.status='';return true;">
- <option
value=""><xsl:value-of select="lang_no_branch"/></option>
- <xsl:apply-templates
select="branch_list"/>
- </select>
- </td>
- </tr>
-
-
-
-
-
-
-
-
-
- <tr>
- <td class="th_text" valign="top">
- <xsl:value-of select="lang_importance"/>
- </td>
- <td>
-
-
- <table width="100%" cellpadding="2"
cellspacing="2" align="center">
- <xsl:apply-templates
select="table_header_importance"/>
- <xsl:apply-templates
select="condition_list"/>
- <tr>
- <td align="left">
- <xsl:value-of
select="lang_authorities_demands"/>
- </td>
- <td align="center">
- <xsl:choose>
-
<xsl:when test="authorities_demands='1'">
-
<input type="checkbox" name="values[authorities_demands]" value="1"
checked="checked" onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of
select="lang_authorities_demands_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
-
</input>
-
</xsl:when>
-
<xsl:otherwise>
-
<input type="checkbox" name="values[authorities_demands]" value="1"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of
select="lang_authorities_demands_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
-
</input>
-
</xsl:otherwise>
- </xsl:choose>
- </td>
- </tr>
-
- </table>
-
-
-
- </td>
- </tr>
-
-
-
-
-
-
-
-
- <tr>
- <td align="left">
- <xsl:value-of select="lang_score"/>
- </td>
- <td>
- <xsl:value-of select="value_score"/>
- </td>
- </tr>
-
- <xsl:choose>
- <xsl:when test="files!=''">
- <xsl:call-template name="file_list"/>
- </xsl:when>
- </xsl:choose>
-
- <xsl:choose>
- <xsl:when test="fileupload = 1">
- <xsl:call-template name="file_upload"/>
- </xsl:when>
- </xsl:choose>
-
- <tr>
- <xsl:choose>
- <xsl:when test="notify='yes'">
- <td valign="top">
- <xsl:value-of select="lang_notify"/>
- </td>
- <td>
- <input type="checkbox"
name="values[notify]" value="True" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_notify_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
- </xsl:attribute>
- </input>
-
- <input type="text"
name="values[mail_address]" value="{value_notify_mail_address}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_notify_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
- </xsl:attribute>
- </input>
- </td>
- </xsl:when>
- </xsl:choose>
- </tr>
- <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}" onMouseout="window.status='';return
true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_save_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
- </xsl:attribute>
- </input>
- </td>
- </tr>
-
-
- </form>
- <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}" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_done_statustext"/>
- <xsl:text>';
return true;</xsl:text>
- </xsl:attribute>
- </input>
- </form>
- </td>
- </tr>
- </table>
- <hr noshade="noshade" width="100%" align="center" size="1"/>
- <div id="paging_0"> </div>
- <div id="datatable-container_0" style="left:330px;
position:absolute;"></div>
- <table width="80%" cellpadding="2" cellspacing="2"
align="center">
- <xsl:choose>
- <xsl:when test="record_history=''">
- <tr>
- <td class="th_text"
align="center">
- <xsl:value-of
select="lang_no_history"/>
- </td>
- </tr>
- </xsl:when>
- <xsl:otherwise>
- <tr>
- <td class="th_text"
align="left">
- <xsl:value-of
select="lang_history"/>
- </td>
- </tr>
- <xsl:apply-templates
select="table_header_history"/>
- <xsl:apply-templates
select="record_history"/>
- </xsl:otherwise>
- </xsl:choose>
- </table>
- <script type="text/javascript">
- var property_js = <xsl:value-of select="property_js" />;
- var datatable = new Array();
- var myColumnDefs = new Array();
-
- <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"/>
- }
- ]
- </xsl:for-each>
-
- <xsl:for-each select="myColumnDefs">
- myColumnDefs[<xsl:value-of select="name"/>] =
<xsl:value-of select="values"/>
- </xsl:for-each>
- </script>
-
- </div>
- <hr noshade="noshade" width="100%" align="center" size="1"/>-->
</xsl:template>
-
-
-
-
-
-
-
-
<xsl:template match="condition_list">
<tr>
<xsl:attribute name="class">
@@ -1418,7 +958,6 @@
<xsl:template match="table_header_importance">
<tr class="th">
<td class="th_text" width="10%" align="left">
- <xsl:value-of select="lang_subject"/>
</td>
<td class="th_text" width="10%" align="left">
<xsl:value-of
select="lang_condition_degree"/>
@@ -1626,10 +1165,7 @@
</xsl:for-each>
</tr>
<tr>
- <td class="th_text" valign="top">
- <xsl:value-of select="lang_importance"/>
- </td>
- <td>
+ <td>
<table width="100%" cellpadding="2"
cellspacing="2" align="center">
<xsl:apply-templates
select="table_header_importance"/>
<xsl:apply-templates
select="condition_list_view"/>
@@ -1647,7 +1183,7 @@
</tr>
</table>
- </td>
+ </td>
</tr>
<tr>
| [Prev in Thread] | Current Thread | [Next in Thread] |