[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11201] Layout-fixing on request form
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [11201] Layout-fixing on request form |
|
Date: |
Tue, 25 Jun 2013 08:03:13 +0000 |
Revision: 11201
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11201
Author: erikhl
Date: 2013-06-25 08:03:06 +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-24 12:58:04 UTC (rev
11200)
+++ trunk/property/inc/class.uirequest.inc.php 2013-06-25 08:03:06 UTC (rev
11201)
@@ -309,7 +309,7 @@
$_filter_buildingpart = array();
$filter_buildingpart =
isset($this->bo->config->config_data['filter_buildingpart']) ?
$this->bo->config->config_data['filter_buildingpart'] : array();
-
+
if($filter_key =
array_search('.project.request', $filter_buildingpart))
{
$_filter_buildingpart =
array("filter_{$filter_key}" => 1);
@@ -824,7 +824,7 @@
//all colums should be have formatter
$datatable['headers']['header'][$i]['formatter'] =
($uicols['formatter'][$i]==''? '""' : $uicols['formatter'][$i]);
-
$datatable['headers']['header'][$i]['className'] = $uicols['classname'][$i] ?
$uicols['classname'][$i] : '';
+
$datatable['headers']['header'][$i]['className'] = $uicols['classname'][$i] ?
$uicols['classname'][$i] : '';
if($uicols['input_type'][$i]!='hidden')
{
$datatable['headers']['header'][$i]['name'] =
$uicols['name'][$i];
@@ -874,7 +874,7 @@
if($dry_run)
{
- $datatable['pagination']['records_returned'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+ $datatable['pagination']['records_returned'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
}
else
{
@@ -1234,7 +1234,7 @@
$_condition = array_keys($values['condition']);
$__condition = isset($_condition[0]) &&
$_condition[0] ? $_condition[0] : 0;
-
+
if(!isset($values['condition'][$__condition]['condition_type']) ||
!isset($values['condition'][$__condition]['degree']))
{
$receipt['error'][]=array('msg'=>lang('Please select a condition!'));
@@ -1499,9 +1499,9 @@
else
{
$content_files[$z]['file_name'] = '<a
href="'.$link_view_file.'&file_name='.$values['files'][$z]['file_name'].'"
target="_blank" title="'.lang('click to view file').'"
style="cursor:help">'.$values['files'][$z]['name'].'</a>';
- }
+ }
$content_files[$z]['delete_file'] = '<input
type="checkbox" name="values[file_action][]"
value="'.$values['files'][$z]['name'].'" title="'.lang('Check to delete
file').'" style="cursor:help">';
- }
+ }
$datavalues[1] = array
(
@@ -1596,7 +1596,7 @@
$_filter_buildingpart = array();
$filter_buildingpart =
isset($this->config->config_data['filter_buildingpart']) ?
$this->config->config_data['filter_buildingpart'] : array();
-
+
if($filter_key = array_search('.project.request',
$filter_buildingpart))
{
$_filter_buildingpart =
array("filter_{$filter_key}" => 1);
@@ -1709,7 +1709,7 @@
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
- 'lang_request_id'
=> lang('request ID'),
+ 'lang_request_id'
=> lang('request ID condition'),
'value_request_id'
=> $id,
'value_title'
=> $values['title'],
@@ -1852,7 +1852,7 @@
{
return array();
}
-
+
$interlink = CreateObject('property.interlink');
$target = $interlink->get_relation('property',
$this->acl_location, $id, 'target');
@@ -1919,7 +1919,7 @@
$total_records = count($values);
- $num_rows =
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']) &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] ? (int)
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] : 15;
+ $num_rows =
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']) &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] ? (int)
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] : 15;
if($allrows)
{
Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang 2013-06-24 12:58:04 UTC (rev 11200)
+++ trunk/property/setup/phpgw_no.lang 2013-06-25 08:03:06 UTC (rev 11201)
@@ -1996,3 +1996,4 @@
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
Modified: trunk/property/templates/base/css/base.css
===================================================================
--- trunk/property/templates/base/css/base.css 2013-06-24 12:58:04 UTC (rev
11200)
+++ trunk/property/templates/base/css/base.css 2013-06-25 08:03:06 UTC (rev
11201)
@@ -1456,10 +1456,17 @@
}
.messages {
font-size: 20px;
+ margin-right: 0.5em;
}
+.messages table {
+ display: inline;
+ position: absolute;
+}
.coordinator_select dd select{
width:300px;
}
.controlButton {
margin-left: 2em;
+ margin-right: 1.5em;
+ float: right;
}
\ No newline at end of file
Modified: trunk/property/templates/base/request.xsl
===================================================================
--- trunk/property/templates/base/request.xsl 2013-06-24 12:58:04 UTC (rev
11200)
+++ trunk/property/templates/base/request.xsl 2013-06-25 08:03:06 UTC (rev
11201)
@@ -202,9 +202,6 @@
</xsl:when>
</xsl:choose>
</span>
- </div>
- <div
class="clearBoth"> </div>
- <div
class="requirement-responsibility-left">
<span class="messages">
<xsl:choose>
<xsl:when test="value_request_id!=''">
@@ -647,12 +644,12 @@
</div>
</div>
</div>
- <xsl:choose>
- <xsl:when test="mode = 'edit'">
- <div class="controlButton">
- <table>
- <tr height="50">
- <td>
+ <div class="controlButton">
+ <table>
+ <tr height="50">
+ <xsl:choose>
+ <xsl:when test="mode =
'edit'">
+ <td
style="padding-right: 5px;">
<xsl:variable name="lang_save">
<xsl:value-of select="lang_save"/>
</xsl:variable>
@@ -662,52 +659,42 @@
</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:when>
+ </xsl:choose>
+ <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>
+ <input type="button"
name="done" value="{$lang_done}" onclick="location.href='{$done_action}'">
<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}">
+ </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>
+ <input
type="button" class="forms" name="edit" value="{$lang_edit}"
onclick="location.href='{$edit_action}'">
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'edit')"/>
</xsl:attribute>
</input>
- </form>
- </td>
- </xsl:when>
- </xsl:choose>
- </tr>
- </table>
- </div>
+ </td>
+ </xsl:when>
+ </xsl:choose>
+ </tr>
+ </table>
+ </div>
+ </form>
</xsl:template>
<!-- New template-->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11201] Layout-fixing on request form,
Erik Holm-Larsen <=