[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11203] Layout-fixing on request form
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [11203] Layout-fixing on request form |
|
Date: |
Tue, 25 Jun 2013 10:47:28 +0000 |
Revision: 11203
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11203
Author: erikhl
Date: 2013-06-25 10:47:28 +0000 (Tue, 25 Jun 2013)
Log Message:
-----------
Layout-fixing on request form
Modified Paths:
--------------
trunk/property/inc/class.uirequest.inc.php
trunk/property/setup/phpgw_no.lang
trunk/property/templates/base/css/base.css
trunk/property/templates/base/request.xsl
Modified: trunk/property/inc/class.uirequest.inc.php
===================================================================
--- trunk/property/inc/class.uirequest.inc.php 2013-06-25 08:54:54 UTC (rev
11202)
+++ trunk/property/inc/class.uirequest.inc.php 2013-06-25 10:47:28 UTC (rev
11203)
@@ -1725,7 +1725,7 @@
'cat_select'
=> $this->cats->formatted_xslt_list(array('select_name' =>
'values[cat_id]','selected' => $values['cat_id'])),
- 'lang_coordinator'
=>
isset($this->config->config_data['lang_request_coordinator']) &&
$this->config->config_data['lang_request_coordinator'] ?
$this->config->config_data['lang_request_coordinator'] : lang('coordinator'),
+ 'lang_coordinator'
=>
isset($this->config->config_data['lang_request_coordinator']) &&
$this->config->config_data['lang_request_coordinator'] ?
$this->config->config_data['lang_request_coordinator'] : lang('request
coordinator'),
'lang_user_statustext'
=> lang('Select the coordinator the request belongs to. To do not use a
category select NO USER'),
'select_user_name'
=> 'values[coordinator]',
Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang 2013-06-25 08:54:54 UTC (rev 11202)
+++ trunk/property/setup/phpgw_no.lang 2013-06-25 10:47:28 UTC (rev 11203)
@@ -1996,4 +1996,12 @@
last property no Siste
action year property no Tiltaksår
action cost overview property no Kostnadsoversikt
-request ID condition property no Fra tilstandsanalyse ID
\ No newline at end of file
+request ID condition property no Fra tilstandsanalyse ID
+request coordinator property no Byggforvalter
+request action mouseover title property no Beskriv tiltak
+request action title property no Tiltaksbeskrivelse
+request condition mouseover description property no Beskriv
tilstand
+request condition description property no Tilstandsbeskrivelse
+cost operation property no Andel driftskonstnad i kr.
+cost investment property no Andel investering i kr.
+grant 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-25 08:54:54 UTC (rev
11202)
+++ trunk/property/templates/base/css/base.css 2013-06-25 10:47:28 UTC (rev
11203)
@@ -1397,6 +1397,10 @@
float: left;
margin-left: 1em;
}
+.requirement-responsibility-left h2 {
+ text-transform: uppercase;
+ margin-bottom: 0em;;
+}
.requirement-responsibility-left-sub {
float: left;
}
@@ -1434,7 +1438,7 @@
width: 45%;
}
.requirement-action-label-wide {
- width: 52%;
+ width: 45%;
}
.requirement-action-sub-left {
float:left;
@@ -1446,7 +1450,7 @@
.requirement-action-sub-right {
float: right;
text-align: left;
- width: 40%;
+ width: 50%;
}
.requirement-action-sub-right div {
line-height: 2;
@@ -1455,8 +1459,7 @@
clear: both;
}
.messages {
- font-size: 20px;
- margin-right: 0.5em;
+ font-size: 15px;
}
.messages table {
display: inline;
@@ -1469,4 +1472,21 @@
margin-left: 2em;
margin-right: 1.5em;
float: right;
+}
+.requirement-condition .proplist-col table tr td table {
+ border: none;
+ padding-left: 2px;
+ padding-right: 2px;
+}
+.requirement-condition .proplist-col table tr td table th {
+ border: none;
+ background: none;
+ font-weight: bold;
+ padding-right: 1em;
+}
+.requirement-condition .proplist-col table tr td table td {
+ border: none;
+ padding-right: 1em;
+ text-align: center;
+ font-weight: bold;
}
\ No newline at end of file
Modified: trunk/property/templates/base/request.xsl
===================================================================
--- trunk/property/templates/base/request.xsl 2013-06-25 08:54:54 UTC (rev
11202)
+++ trunk/property/templates/base/request.xsl 2013-06-25 10:47:28 UTC (rev
11203)
@@ -192,21 +192,22 @@
<div class="yui-content">
<div id="general" class="content-wrp
requirement">
<div
class="requirement-responsibility-left">
- <span class="messages">
+ <h2><xsl:value-of
select="php:function('lang', 'request')"/></h2>
+<!-- <span class="messages">
<xsl:choose>
<xsl:when test="value_request_id!=''">
-
<label class="messages">
+
<label>
<xsl:value-of select="lang_request_id"/>
</label>
<xsl:value-of select="value_request_id"/>
</xsl:when>
</xsl:choose>
- </span>
+ </span> -->
<span class="messages">
<xsl:choose>
<xsl:when test="value_request_id!=''">
<xsl:for-each select="value_origin">
-
<label class="messages" for="msg_table">
+
<label for="msg_table" class="messages">
<xsl:value-of select="descr"/>
</label>
<table name="msg_table">
@@ -232,7 +233,7 @@
</xsl:when>
<xsl:otherwise>
<xsl:for-each select="value_origin">
-
<label>
+
<label class="messages">
<xsl:value-of select="descr"/>
</label>
<table>
@@ -377,20 +378,20 @@
</select>
<br/>
<xsl:variable
name="lang_request_title">
- <xsl:value-of
select="php:function('lang', 'enter request title')"/>
+ <xsl:value-of
select="php:function('lang', 'request action mouseover title')"/>
</xsl:variable>
<label
title="{$lang_request_title}">
- <xsl:value-of
select="php:function('lang', 'request title')"/>
+ <xsl:value-of
select="php:function('lang', 'request action 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:value-of
select="php:function('lang', 'request condition mouseover description')"/>
</xsl:variable>
<label
title="{$lang_request_description}">
- <xsl:value-of
select="php:function('lang', 'request description')"/>
+ <xsl:value-of
select="php:function('lang', 'request condition description')"/>
</label>
<br/>
<textarea cols="120"
rows="6" name="values[descr]" title="{$lang_request_description}">
@@ -510,7 +511,7 @@
<div
class="requirement-action-sub-left">
<div>
<label class="requirement-action-label">
-
<xsl:value-of select="php:function('lang', 'operation')"/>
+
<xsl:value-of select="php:function('lang', 'cost operation')"/>
</label>
<input type="text" name="values[amount_operation]"
value="{value_amount_operation}">
<xsl:attribute name="title">
@@ -521,7 +522,7 @@
</div>
<div>
<label class="requirement-action-label">
-
<xsl:value-of select="php:function('lang', 'investment')"/>
+
<xsl:value-of select="php:function('lang', 'cost investment')"/>
</label>
<input type="text" name="values[amount_investment]"
value="{value_amount_investment}">
<xsl:attribute name="title">
@@ -547,7 +548,7 @@
</div>
<div>
<label class="requirement-action-label-wide">
-
<xsl:value-of select="php:function('lang', 'category')"/>
+
<xsl:value-of select="php:function('lang', 'grant category')"/>
</label>
<xsl:call-template name="categories"/>
</div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11203] Layout-fixing on request form,
Erik Holm-Larsen <=