|
| From: | Erik Holm-Larsen |
| Subject: | [Fmsystem-commits] [11193] Added new styling and layout on request-form |
| Date: | Sun, 23 Jun 2013 19:56:30 +0000 |
Revision: 11193
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11193
Author: erikhl
Date: 2013-06-23 19:56:30 +0000 (Sun, 23 Jun 2013)
Log Message:
-----------
Added new styling and layout on request-form
Modified Paths:
--------------
trunk/property/setup/phpgw_no.lang
trunk/property/templates/base/css/base.css
trunk/property/templates/base/request.xsl
Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang 2013-06-21 11:13:49 UTC (rev 11192)
+++ trunk/property/setup/phpgw_no.lang 2013-06-23 19:56:30 UTC (rev 11193)
@@ -935,7 +935,7 @@
invoice address property no Fakturaadresse
invoice date property no Fakturadato
invoice id property no Faktura ID
-invoice id already taken for this vendor property no
Fakturanummeret er allerede registrert for denne leverandøren
+invoice id already taken for this vendor property no
Fakturanummeret er allerede registrert for denne leverandøren
invoice is not added! property no Fakturaen er IKKE lagt til!
invoice number property no FakturaNr
invoice transferred property no bilag er overført
@@ -1304,7 +1304,7 @@
popup calendar property no Kalender
post property no post
power meter property no Strømmåler
-potential grants property no Pos.Off.St
+potential grants property no Potensiale offentlig tilskudd
precision property no Presisjon
prefix property no prefiks
preview html property no Forhåndsvis som HTML
@@ -1354,7 +1354,7 @@
receipt property no Kvittering
receipt date property no Kvitteringsdato
reconciliation property no Avstemming
-recommended year property no Anbefalt år
+recommended year property no Anbefalt tiltaksår
record property no Post
reference level property no Referanse nivå
regulations property no Forskrifter
@@ -1389,9 +1389,9 @@
request entry date property no Registreringsdato for tiltak
request id property no Behov ID
request start date property no Behov startdato
-request status property no Status Behov
-request title property no Tiltak tittel
-request description property no Tilstandbeskrivelse
+request status property no Status
+request title property no Tiltaksbeskrivelse / Beskriv tiltak
+request description property no Tilstandbeskrivelse / Beskriv
tilstand
requirement property no Behov/pålegg
resend workorder property no Send ordre på nytt
reserve property no reserve
@@ -1994,3 +1994,8 @@
previous property no Forrige
next property no Neste
last property no Siste
+action year property no Tiltaksår
+action cost overview property no Kostnadsoversikt
+request operation share property no Andel driftskostnad i
kr.
+request investment share property no Andel investering i kr
+grants category property no Tilskuddskategori
\ No newline at end of file
Modified: trunk/property/templates/base/css/base.css
===================================================================
--- trunk/property/templates/base/css/base.css 2013-06-21 11:13:49 UTC (rev
11192)
+++ trunk/property/templates/base/css/base.css 2013-06-23 19:56:30 UTC (rev
11193)
@@ -123,7 +123,7 @@
#user_messages { float: right; width: 40%;}
div.content {
- margin: 2em;
+ margin: 2em;
}
.hd {
margin-bottom: 0;
@@ -154,7 +154,7 @@
}
a{
- cursor: pointer;
+ cursor: pointer;
}
.row{
@@ -193,7 +193,7 @@
}
.breadcrumbs{
- margin-left: 20px;
+ margin-left: 20px;
}
ul.pathway {
@@ -203,7 +203,7 @@
}
ul.pathway li a { color: #000; text-decoration: none;}
ul.pathway li a:hover { color: #008; }
-ul.pathway li {
+ul.pathway li {
display: inline;
background: url(../images/pathwaysep.png) no-repeat 0% 50%;
padding-left: 16px;
@@ -275,7 +275,7 @@
div.identifier-header {
padding-left: 2em;
- margin-bottom: 1em;
+ margin-bottom: 1em;
}
div.identifier-header label {
@@ -300,8 +300,8 @@
}
.date-picker .container,
-.datetime-picker .container {
- display:none;
+.datetime-picker .container {
+ display:none;
position:absolute; z-index:1;
}
@@ -340,7 +340,7 @@
}
td.toolbarlabel {
width: 10em;
- font-weight: bold;
+ font-weight: bold;
}
td.toolbarcol {
padding-left: 1em;
@@ -480,7 +480,7 @@
margin-right: 2em;
}
-h1 img, li img {
+h1 img, li img {
vertical-align: middle;
}
/* Set up common form styles. TODO: needs refinement. */
@@ -513,7 +513,7 @@
}
textarea{
- padding: 4px;
+ padding: 4px;
}
h1 em {
@@ -586,7 +586,7 @@
border: none !important;
}
-.yui-skin-sam .yui-dt TABLE TD{
+.yui-skin-sam .yui-dt TABLE TD{
border: none !important;
}
@@ -714,7 +714,7 @@
}
.yui-button.yui-link-button.new_button{
- margin-left:30px;
+ margin-left:30px;
}
#view_check_lists {
@@ -724,7 +724,7 @@
ul.th {
font-weight: bold;
- overflow:hidden;
+ overflow:hidden;
}
ul.th li {
@@ -735,11 +735,11 @@
}
ul.row{
- overflow: hidden;
+ overflow: hidden;
}
ul.row li{
- float:left;
+ float:left;
margin-right: 20px;
padding: 3px 6px;
width: 100px;
@@ -828,7 +828,7 @@
}
#main_content.groups{
- cursor: default;
+ cursor: default;
}
#main_content h1{
@@ -894,7 +894,7 @@
}
ul.check_list {
- width: 925px;
+ width: 925px;
}
/* ============================= SEARCH LOCATION BOX =======================
*/
@@ -922,23 +922,23 @@
float: left;
}
-.select-box {
+.select-box {
background: none repeat scroll 0 0 #FEFBF4;
border: 1px solid #DDDDDD;
border-radius: 4px;
- padding: 1em;
+ padding: 1em;
}
.select-box label{
margin-bottom:5px;
- display: block;
+ display: block;
}
.select-box a{
display: block;
font-weight: bold;
padding: 0 0 10px;
- text-align: justify;
+ text-align: justify;
}
.select-box a.last{
@@ -956,7 +956,7 @@
}
#choose-loc .btn.active{
- background: #3F7EC1;
+ background: #3F7EC1;
}
#choose-loc label {
display: inline-block;
@@ -966,16 +966,16 @@
.yui-pg-first{
margin-left: 14px;
- margin-top: 5px;
+ margin-top: 5px;
}
#data_paginator, #loc_paginator{
- margin:8px;
+ margin:8px;
clear:left;
}
ul#filters li, ul#search_list li{
- float:left;
+ float:left;
}
ul#filters input[type="text"], ul#filters select {
@@ -1009,7 +1009,7 @@
}
fieldset.add_check_list div{
- padding:2px;
+ padding:2px;
}
fieldset.add_check_list label{
display:inline-table;
@@ -1018,7 +1018,7 @@
label.comment{
- vertical-align:top;
+ vertical-align:top;
}
/* ======================== TAB MENU ========================== */
@@ -1040,7 +1040,7 @@
font-weight: bold;
}
.tab_menu a, .tab_menu a.active{
- border-bottom: 0;
+ border-bottom: 0;
}
#tab_content {
@@ -1067,14 +1067,14 @@
padding: 3px 6px;
}
.tab_item h2.last{
- margin:20px 0 10px;
+ margin:20px 0 10px;
}
#main_content fieldset.location_details{
background: none repeat scroll 0 0 #EDF5FF;
border: 1px solid #CCCCCC;
padding: 15px;
- float:left;
+ float:left;
border: 1px solid #ddd;
}
fieldset.location_details div{
@@ -1119,12 +1119,12 @@
#error_message_menu a {
text-align: center;
width: 140px;
- margin: 2px 0;
+ margin: 2px 0;
display:block;
}
#register_errors_content {
float: right;
- margin-top: 20px;
+ margin-top: 20px;
}
@@ -1134,7 +1134,7 @@
margin-bottom: 1em;
}
.frm_register_case input[type="text"]{
- width: 170px;
+ width: 170px;
}
.frm_register_case select {
width: 184px;
@@ -1194,7 +1194,7 @@
#select_all {
float: right;
- margin-right: 805px;
+ margin-right: 805px;
}
#save_location {
@@ -1214,11 +1214,11 @@
margin:20px 0 0 40px;
}
-#yui-history-iframe {
+#yui-history-iframe {
position:absolute;
- top:0;
+ top:0;
left:0;
- width:1px;
+ width:1px;
height:1px;
visibility:hidden;
}
@@ -1234,7 +1234,7 @@
}
#control_location #queryForm{
- margin: 20px;
+ margin: 20px;
width: 65%;
}
@@ -1248,29 +1248,29 @@
padding: 10px;
margin: 10px;
text-align: left;
- margin-left: 1em;
+ margin-left: 1em;
}
#details table td{
text-align: left;
- padding-right: 10px;
+ padding-right: 10px;
}
.yui-skin-sam td.auto{
- width: 160px;
+ width: 160px;
}
.yui-skin-sam div.auto{
- width: 140px;
+ width: 140px;
}
.yui-skin-sam thead{
- background: none;
+ background: none;
}
p.no_items_msg {
- padding: 5px;
+ padding: 5px;
}
.no-comp-msg {
@@ -1283,15 +1283,15 @@
}
.option-list{
- margin-top: 5px;
+ margin-top: 5px;
}
.option-list{
- padding-left:10px;
+ padding-left:10px;
}
.option-list li{
- margin-bottom: 5px;
+ margin-bottom: 5px;
}
.input_error_msg {
@@ -1387,3 +1387,79 @@
.yui-skin-sam .autocomplete .yui-ac-content li {
white-space: wrap;
}
+.requirement {
+ line-height:2;
+}
+.requirement hr {
+ border: 1px solid white;
+}
+.requirement-responsibility-left {
+ float: left;
+ margin-left: 1em;
+}
+.requirement-responsibility-left-sub {
+ float: left;
+}
+.requirement-responsibility-right {
+ float: right;
+ margin-left: 1em;
+}
+
+.requirement-responsibility-right .proplist-col {
+ width: auto;
+}
+.requirement-description {
+ margin-left: 1em;
+ margin-bottom: 1em;
+}
+.requirement-condition {
+ margin-left: 1em;
+ line-height: 2.2;
+}
+.requirement-related {
+ margin-left: 1em;
+}
+.requirement-action-left {
+ float:left;
+ width: 20%;
+ margin-left:1em;
+ border-right: 1px solid white;
+}
+.requirement-action-right {
+ margin-left: 1em;
+ width: 75%;
+ float:right;
+}
+.requirement-action-label {
+ width: 45%;
+}
+.requirement-action-label-wide {
+ width: 52%;
+}
+.requirement-action-sub-left {
+ float:left;
+ width:45%;
+}
+.requirement-action-sub-left div {
+ line-height: 2;
+}
+.requirement-action-sub-right {
+ float: right;
+ text-align: left;
+ width: 40%;
+}
+.requirement-action-sub-right div {
+ line-height: 2;
+}
+.clearBoth {
+ clear: both;
+}
+.messages {
+ font-size: 20px;
+}
+.coordinator_select dd select{
+ width:300px;
+}
+.controlButton {
+ margin-left: 2em;
+}
\ No newline at end of file
Modified: trunk/property/templates/base/request.xsl
===================================================================
--- trunk/property/templates/base/request.xsl 2013-06-21 11:13:49 UTC (rev
11192)
+++ trunk/property/templates/base/request.xsl 2013-06-23 19:56:30 UTC (rev
11193)
@@ -191,75 +191,35 @@
<div class="yui-navset yui-navset-top"
id="project_tabview">
<xsl:value-of disable-output-escaping="yes"
select="tabs"/>
<div class="yui-content">
- <div id="general" class="content-wrp">
-
+ <div id="general" class="content-wrp
requirement">
+ <div
class="requirement-responsibility-left">
+ <span class="messages">
<xsl:choose>
<xsl:when
test="value_request_id!=''">
-
<dt><label>
+
<label class="messages">
<xsl:value-of select="lang_request_id"/>
-
</label></dt>
-
<dd>
+
</label>
+
<xsl:value-of select="value_request_id"/>
-
</dd>
+
</xsl:when>
</xsl:choose>
- <dt><label>
-
<xsl:value-of select="php:function('lang', 'responsible unit')"/>
- </label></dt>
- <dd>
- <select
name="values[responsible_unit]" class="forms">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'Set responsible unit')"/>
-
</xsl:attribute>
-
<option value="0">
-
<xsl:value-of select="php:function('lang', 'select')"/>
-
</option>
-
<xsl:apply-templates select="responsible_unit_list/options"/>
-
</select>
- </dd>
-
- <dt><label>
-
<xsl:value-of select="lang_coordinator"/>
- </label></dt>
- <dd>
-
<xsl:call-template name="user_id_select"/>
- </dd>
-
- <dt><label>
-
<xsl:value-of select="php:function('lang', 'request status')"/>
- </label></dt>
- <dd>
- <select
name="values[status]" class="forms">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'Set the status of the
request')"/>
-
</xsl:attribute>
-
<option value="0">
-
<xsl:value-of select="php:function('lang', 'no status')"/>
-
</option>
-
<xsl:apply-templates select="status_list/options"/>
-
</select>
- </dd>
-
-
-
- <fieldset>
- <legend>
- <xsl:value-of select="php:function('lang',
'location')"/>
- </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}"/>
+ </span>
+ </div>
+<div class="clearBoth"> </div>
+ <div
class="requirement-responsibility-left">
+ <span class="messages">
<xsl:choose>
<xsl:when
test="value_request_id!=''">
<xsl:for-each select="value_origin">
-
<dt><label>
+
<label class="messages" for="msg_table">
<xsl:value-of select="descr"/>
-
</label></dt>
-
<dd>
-
<table>
+
</label>
+
+
<table name="msg_table">
<xsl:for-each select="data">
<td class="th_text" align="left">
@@ -280,17 +240,17 @@
</xsl:for-each>
</table>
-
</dd>
+
</xsl:for-each>
</xsl:when>
<xsl:otherwise>
<xsl:for-each select="value_origin">
-
<dt><label>
+
<label>
<xsl:value-of select="descr"/>
-
</label></dt>
-
<dd>
+
</label>
+
<table>
<xsl:for-each select="data">
@@ -303,77 +263,130 @@
</xsl:for-each>
</table>
-
</dd>
</xsl:for-each>
</xsl:otherwise>
</xsl:choose>
- <xsl:for-each
select="value_target">
+ </span>
+ </div>
+ <div
class="clearBoth"> </div>
+<hr/>
+ <div>
+ <div
class="requirement-responsibility-left">
+ <div
class="requirement-responsibility-left-sub">
+ <label>
+
<xsl:value-of select="php:function('lang', 'responsible unit')"/>
+ </label>
+ <br/>
+ <select
name="values[responsible_unit]" class="forms" style="width:300px;">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'Set responsible unit')"/>
+
</xsl:attribute>
+
<option value="0">
+
<xsl:value-of select="php:function('lang', 'select')"/>
+
</option>
+
<xsl:apply-templates select="responsible_unit_list/options"/>
+
</select>
+ </div>
+ <div
class="requirement-responsibility-right">
+ <label>
+
<xsl:value-of select="php:function('lang', 'request status')"/>
+ </label>
+ <br/>
+ <select
name="values[status]" class="forms" style="width:200px;">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'Set the status of the
request')"/>
+
</xsl:attribute>
+
<option value="0">
+
<xsl:value-of select="php:function('lang', 'no status')"/>
+
</option>
+
<xsl:apply-templates select="status_list/options"/>
+
</select>
+ </div>
+ <div
class="coordinator_select">
<dt><label>
-
<xsl:value-of select="descr"/>
+
<xsl:value-of select="lang_coordinator"/>
</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>
+
<xsl:call-template name="user_id_select"/>
</dd>
+ </div>
+ </div>
+ <div
class="requirement-responsibility-right">
+<!-- <legend>
+
<xsl:value-of select="php:function('lang', 'location')"/>
+ </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>
+
<xsl:for-each select="value_target">
- <xsl:choose>
- <xsl:when
test="mode ='edit'">
-
<xsl:call-template name="location_form2"/>
- </xsl:when>
- <xsl:otherwise>
-
<xsl:call-template name="location_view2"/>
-
<xsl:choose>
-
<xsl:when test="contact_phone !=''">
<dt><label>
-
<xsl:value-of select="lang_contact_phone"/>
+
<xsl:value-of select="descr"/>
</label></dt>
<dd>
-
<xsl:value-of select="contact_phone"/>
+
<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"/>
</xsl:when>
+
<xsl:otherwise>
+
<xsl:call-template name="location_view2"/>
+
<xsl:choose>
+
<xsl:when test="contact_phone !=''">
+
<dt><label>
+
<xsl:value-of select="lang_contact_phone"/>
+
</label></dt>
+
<dd>
+
<xsl:value-of select="contact_phone"/>
+
</dd>
+
</xsl:when>
+
</xsl:choose>
+
</xsl:otherwise>
</xsl:choose>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:choose>
- <xsl:when
test="suppressmeter =''">
+
<xsl:choose>
+
<xsl:when test="suppressmeter =''">
-
<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>
+
<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>
- </xsl:when>
- </xsl:choose>
+
</xsl:when>
+
</xsl:choose>
- </dl>
-
- </fieldset>
- <fieldset>
- <legend>
+ </dl>
+ </div>
+ </div>
+ <div
class="clearBoth"> </div>
+<hr/>
+<div class="requirement-description">
+ <h3>
<xsl:value-of select="php:function('lang',
'description')"/>
- </legend>
- <dl class="proplist-col">
-
- <dt><label>
+ </h3>
+ <label>
<xsl:value-of
select="php:function('lang', 'building part')"/>
- </label></dt>
- <dd>
+ </label>
+ <br/>
<select
name="values[building_part]">
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'select building part')"/>
@@ -383,39 +396,38 @@
</option>
<xsl:apply-templates select="building_part_list/options"/>
</select>
- </dd>
+ <br/>
<xsl:variable
name="lang_request_title">
<xsl:value-of
select="php:function('lang', 'enter request title')"/>
</xsl:variable>
- <dt><label
title="{$lang_request_title}">
+ <label
title="{$lang_request_title}">
<xsl:value-of select="php:function('lang', 'request title')"/>
- </label></dt>
- <dd>
- <input
type="text" name="values[title]" value="{value_title}" size="60"
title="{$lang_request_title}">
+ </label>
+ <br/>
+ <input
type="text" name="values[title]" value="{value_title}" size="120"
title="{$lang_request_title}">
</input>
- </dd>
+ <br/>
<xsl:variable
name="lang_request_description">
<xsl:value-of
select="php:function('lang', 'enter a description of the request')"/>
</xsl:variable>
- <dt><label
title="{$lang_request_description}">
+ <label
title="{$lang_request_description}">
<xsl:value-of select="php:function('lang', 'request description')"/>
- </label></dt>
- <dd>
-
<textarea cols="60" rows="6" name="values[descr]"
title="{$lang_request_description}">
+ </label>
+ <br/>
+
<textarea cols="120" rows="6" name="values[descr]"
title="{$lang_request_description}">
<xsl:value-of select="value_descr"/>
</textarea>
- </dd>
-
- </dl>
- </fieldset>
- <fieldset>
- <legend>
+</div>
+ <div
class="clearBoth"> </div>
+<hr/>
+ <div class="requirement-condition">
+ <h3>
<xsl:value-of select="php:function('lang',
'condition')"/>
- </legend>
+ </h3>
<dl class="proplist-col">
<table>
@@ -529,59 +541,93 @@
</dd>
-->
</dl>
- </fieldset>
- <fieldset>
- <legend>
- <xsl:value-of select="php:function('lang', 'economy and
progress')"/>
- </legend>
+ </div>
+ <div class="clearBoth"> </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')"/>
- <dl class="proplist-col">
-
-
- <dt><label>
+ </h3>
+ <label>
<xsl:value-of select="php:function('lang', 'recommended year')"/>
- </label></dt>
- <dd>
+ </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>
- </dd>
+
<xsl:choose>
<xsl:when
test="show_dates !=''">
-
-
<dt><label>
+
<br/>
+
<label>
<xsl:value-of select="php:function('lang', 'start date')"/>
-
</label></dt>
-
<dd>
+
</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>
-
</dd>
-
<dt><label>
+
<br/>
+
<label>
<xsl:value-of select="php:function('lang', 'end date')"/>
-
</label></dt>
-
<dd>
+
</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>
-
</dd>
+
</xsl:when>
</xsl:choose>
-
-
<dt><label>
+ <br/>
+
<label>
<xsl:value-of select="php:function('lang', 'entry date')"/>
-
</label></dt>
-
<dd>
+
</label>
+
<br/>
<xsl:value-of select="value_entry_date"/>
-
</dd>
+
+ </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', 'request operation share')"/>
+ </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>
+ </div>
+ <div>
+ <label
class="requirement-action-label">
+
<xsl:value-of select="php:function('lang', 'request investment share')"/>
+ </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
class="requirement-action-sub-right">
<!--
<dt><label>
<xsl:value-of select="php:function('lang', 'in progress date')"/>
@@ -606,47 +652,28 @@
<xsl:value-of select="value_closed_date"/>
</dd>
-->
- <dt><label>
-
<xsl:value-of select="php:function('lang', 'category')"/>
- </label></dt>
- <dd>
-
<xsl:call-template name="categories"/>
- </dd>
-
- <dt><label>
-
<xsl:value-of select="php:function('lang', 'investment')"/>
- </label></dt>
- <dd>
- <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> [ <xsl:value-of select="currency"/> ]
- </dd>
- <dt><label>
-
<xsl:value-of select="php:function('lang', 'operation')"/>
- </label></dt>
- <dd>
- <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> [ <xsl:value-of select="currency"/> ]
- </dd>
- <dt><label>
-
<xsl:value-of select="php:function('lang', 'potential grants')"/>
- </label></dt>
- <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> [ <xsl:value-of select="currency"/> ]
- </dd>
+
<xsl:text> </xsl:text>
+ </div>
+ <div>
+ <label
class="requirement-action-label-wide">
+
<xsl:value-of select="php:function('lang', 'grants category')"/>
+ </label>
+
<xsl:call-template name="categories"/>
+ </div>
- <dt><label>
-
<xsl:value-of select="php:function('lang', 'total cost estimate')"/>
- </label></dt>
- <dd>
-
<xsl:value-of select="value_budget"/><xsl:text> </xsl:text> [ <xsl:value-of
select="currency"/> ]
- </dd>
+
+
+
+
+
+
<!--
<dt><label>
@@ -723,10 +750,10 @@
<xsl:choose>
<xsl:when test="notify='yes'">
-
<dt><label>
-
<xsl:value-of select="lang_notify"/>
-
</label></dt>
-
<dd>
+
<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"/>
@@ -737,20 +764,25 @@
<xsl:value-of select="lang_notify_statustext"/>
</xsl:attribute>
</input>
-
</dd>
+
</div>
</xsl:when>
</xsl:choose>
+ </div>
- </dl>
- </fieldset>
- <fieldset>
- <legend>
- <xsl:value-of select="php:function('lang', 'related')"/>
- </legend>
+ </div>
+ </div>
+ <div class="clearBoth"> </div>
+ <hr/>
+ <div class="requirement-related">
+ <h3>
+ <!-- xsl:value-of select="php:function('lang',
'related')"/ -->
+ Forbruk - fremdrift
+ </h3>
+
<div id="datatable-container_2"/>
- </fieldset>
+ </div>
</div>
<div id="documents">
<table>
@@ -816,6 +848,7 @@
</div>
<xsl:choose>
<xsl:when test="mode = 'edit'">
+ <div class="controlButton">
<table>
<tr height="50">
<td>
@@ -830,9 +863,11 @@
</td>
</tr>
</table>
+ </div>
</xsl:when>
</xsl:choose>
</form>
+ <div class="controlButton">
<table>
<tr>
<td>
@@ -871,6 +906,7 @@
</xsl:choose>
</tr>
</table>
+ </div>
</xsl:template>
<!-- New template-->
| [Prev in Thread] | Current Thread | [Next in Thread] |