|
| From: | Torstein |
| Subject: | [Fmsystem-commits] [9901] |
| Date: | Wed, 22 Aug 2012 11:58:28 +0000 |
Revision: 9901
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9901
Author: vator
Date: 2012-08-22 11:58:22 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uicontrol_item.inc.php
trunk/controller/templates/base/control_item/control_item.xsl
trunk/controller/templates/base/css/base.css
Modified: trunk/controller/inc/class.uicontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_item.inc.php 2012-08-22 10:45:54 UTC
(rev 9900)
+++ trunk/controller/inc/class.uicontrol_item.inc.php 2012-08-22 11:58:22 UTC
(rev 9901)
@@ -202,7 +202,7 @@
// Edit control item
if($control_item_id > 0)
{
- $control_item =
$this->so->get_single_with_options($control_item_id , "return_object");
+ $control_item_array =
$this->so->get_single_with_options($control_item_id , "return_array");
}
// New control item
else
@@ -211,9 +211,6 @@
}
}
- $control_item_array = array();
- $control_item_array = $control_item->toArray();
-
// Sigurd: START as categories
$cats = CreateObject('phpgwapi.categories', -1,
'controller', '.control');
$cats->supress_info = true;
Modified: trunk/controller/templates/base/control_item/control_item.xsl
===================================================================
--- trunk/controller/templates/base/control_item/control_item.xsl
2012-08-22 10:45:54 UTC (rev 9900)
+++ trunk/controller/templates/base/control_item/control_item.xsl
2012-08-22 11:58:22 UTC (rev 9901)
@@ -70,7 +70,7 @@
<xsl:choose>
<xsl:when test="view">
<xsl:variable
name="lang_type"><xsl:value-of select="control_item/type" /></xsl:variable>
- <xsl:value-of
select="php:function('lang', $lang_type)" />
+ <h4
class="option-list-heading"><xsl:value-of select="php:function('lang',
$lang_type)" /></h4>
<xsl:if
test="control_item/options_array/child::node()">
<h4
class="option-list-heading">Verdier i liste</h4>
@@ -109,13 +109,11 @@
</div>
</xsl:otherwise>
</xsl:choose>
-
</xsl:for-each>
</xsl:when>
<xsl:otherwise>
<xsl:for-each select="control_item/control_item_types">
<xsl:variable name="current_type"><xsl:value-of select="."
/></xsl:variable>
-
<xsl:choose>
<xsl:when test="//control_item/type = $current_type">
<div class="control_item_type">
@@ -138,7 +136,6 @@
</div>
</xsl:otherwise>
</xsl:choose>
-
</xsl:for-each>
</xsl:otherwise>
</xsl:choose>
@@ -149,7 +146,6 @@
<xsl:when
test="control_item/options_array/child::node()">
<div
id="add_control_item_option_panel" style="display:block;">
<hr />
-
<xsl:choose>
<xsl:when test="//control_item/type = 'control_item_type_3'">
<h2 class="type">Nedtrekksliste</h2>
@@ -171,7 +167,7 @@
<li>
<label>Listeverdi<span class="order_nr"><xsl:number
/></span></label>
<xsl:variable name="option_value"><xsl:value-of
select="option_value" /></xsl:variable>
-
<input type="" name="option_values[]"
value="{$option_value}" />
+
<input type="text" name="option_values[]"
value="{$option_value}" />
<span class="btn delete">Slett</span>
</li>
</xsl:for-each>
@@ -179,7 +175,7 @@
<div id="add_control_item_list_value" class="row">
<label>Ny listeverdi</label>
-
<input type="" name="option_value" />
+
<input type="text" name="option_value" />
<input class="btn" type="button" value="Legg til" />
</div>
</div>
@@ -187,7 +183,6 @@
<xsl:otherwise>
<div
id="add_control_item_option_panel">
<hr />
-
<h2 class="type"></h2>
<h3>Legg til verdier som listen skal inneholde</h3>
@@ -199,7 +194,7 @@
<div id="add_control_item_list_value" class="row">
<label>Ny listeverdi</label>
-
<input type="" name="option_value" />
+
<input type="text" name="option_value" />
<input class="btn" type="button" value="Legg til" />
</div>
</div>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-08-22 10:45:54 UTC
(rev 9900)
+++ trunk/controller/templates/base/css/base.css 2012-08-22 11:58:22 UTC
(rev 9901)
@@ -148,6 +148,10 @@
padding-top: 1em;
}
+.form-buttons input[type=submit]{
+ margin-right: 5px;
+}
+
.form-buttons button {
margin-right: .5em;
}
@@ -566,6 +570,16 @@
border: 1px solid #CCD2D9;
}
+#add_control_item_list_value .btn{
+ margin-left: 5px;
+ vertical-align: middle;
+ padding: 2px 10px;
+}
+
+#add_control_item_list_value input{
+ vertical-align: middle;
+}
+
ul#control_item_options{
margin-bottom: 1em;
}
@@ -592,11 +606,11 @@
background: none repeat scroll 0 0 #EEEEEE;
border: 1px solid #CCCCCC;
color: #333333;
- font-size: 1.1em;
font-weight: normal;
- margin: 0 0 0 2px;
+ margin: 0 0 0 4px;
+ padding: 2px 10px;
text-align: center;
- width: 45px;
+ width: 49px;
}
#frm_control_items{
@@ -2137,16 +2151,21 @@
}
.option-list-heading {
- margin-bottom: 5px;
+ margin: 0 0 10px;
}
.option-list{
margin-top: 5px;
}
+
.option-list{
padding-left:10px;
}
+.option-list li{
+ margin-bottom: 5px;
+}
+
.input_error_msg {
background: none repeat scroll 0 0 #FBE3E4;
border-bottom-right-radius: 4px;
| [Prev in Thread] | Current Thread | [Next in Thread] |