[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9674]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9674] |
|
Date: |
Wed, 27 Jun 2012 06:42:13 +0000 |
Revision: 9674
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9674
Author: vator
Date: 2012-06-27 06:42:11 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uicontrol_location.inc.php
trunk/controller/templates/base/control_item/control_item.xsl
trunk/controller/templates/base/control_location/register_control_to_component.xsl
trunk/controller/templates/base/css/base.css
Modified: trunk/controller/inc/class.uicontrol_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_location.inc.php 2012-06-26
14:15:52 UTC (rev 9673)
+++ trunk/controller/inc/class.uicontrol_location.inc.php 2012-06-27
06:42:11 UTC (rev 9674)
@@ -111,7 +111,7 @@
self::set_active_menu('controller::control::location_for_check_list');
}
-
+ /*
function index_old()
{
if(phpgw::get_var('phpgw_return_as') == 'json') {
@@ -197,7 +197,7 @@
self::render_template_xsl(array('control_location/control_location_tabs',
'control_location/view_locations_for_control', 'common' ), $data);
}
-
+ */
function index()
{
$control_id = phpgw::get_var('control_id');
@@ -210,7 +210,7 @@
$ok =
$this->so_control->register_control_to_location($control_id, $values);
- $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' =>
'controller.uicontrol_location.register_control_to_location', 'control_id' =>
$control_id));
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'controller.uicontrol_location.index', 'control_id' =>
$control_id));
}
else
Modified: trunk/controller/templates/base/control_item/control_item.xsl
===================================================================
--- trunk/controller/templates/base/control_item/control_item.xsl
2012-06-26 14:15:52 UTC (rev 9673)
+++ trunk/controller/templates/base/control_item/control_item.xsl
2012-06-27 06:42:11 UTC (rev 9674)
@@ -68,14 +68,14 @@
<xsl:variable
name="lang_type"><xsl:value-of select="control_item/type" /></xsl:variable>
<xsl:value-of
select="php:function('lang', $lang_type)" />
- <h3>Verdier i
liste</h3>
-
- <!--
============== RADIOBUTTONS FOR CHOOSING CONTROL ITEM TYPE ============== -->
- <ul>
- <xsl:for-each
select="control_item/options_array">
-
<li><xsl:value-of select="option_value" /></li>
- </xsl:for-each>
- </ul>
+ <xsl:if
test="control_item/options_array/child::node()">
+
<h3>Verdier i liste</h3>
+ <ul>
+
<xsl:for-each select="control_item/options_array">
+
<li><xsl:value-of select="option_value" /></li>
+
</xsl:for-each>
+ </ul>
+ </xsl:if>
</xsl:when>
<xsl:when
test="editable">
Modified:
trunk/controller/templates/base/control_location/register_control_to_component.xsl
===================================================================
---
trunk/controller/templates/base/control_location/register_control_to_component.xsl
2012-06-26 14:15:52 UTC (rev 9673)
+++
trunk/controller/templates/base/control_location/register_control_to_component.xsl
2012-06-27 06:42:11 UTC (rev 9674)
@@ -32,13 +32,6 @@
</xsl:template>
<xsl:template name="register_control_to_component"
xmlns:php="http://php.net/xsl";>
- <!-- loads translations into array for use with javascripts -->
- <!--
- <script type="text/javascript">
- var lang = <xsl:value-of select="php:function('js_lang',
'edit')"/>;
- </script>
- -->
-
<div class="yui-content">
<div id="invoice-layout">
<div class="header">
@@ -65,9 +58,9 @@
</div>
<div id="choose-location">
- <table align = "center"
width="95%">
+
<xsl:apply-templates
select="filter_form" />
- </table>
+
<form action="{update_action}"
name="acl_form" id="acl_form" method="post">
<table align = "center"
width="95%">
<tr>
@@ -88,130 +81,73 @@
</xsl:template>
<xsl:template name="filter_list" xmlns:php="http://php.net/xsl";>
- <tr>
- <td colspan = '6'>
- <table>
- <tr>
- <tr>
- <td>
+
+ <label>Velg komponenter som du vil knytte til
kontrollen</label>
+
+ <input id= "control_id_hidden" type="hidden"
name="control_id"/>
+
<xsl:value-of select="php:function('lang', 'entity')" />
- </td>
- <td>
+ <select id="entity_id" name="entity_id">
+ <xsl:apply-templates
select="entity_list/options"/>
+ </select>
+
<xsl:value-of select="php:function('lang', 'category')"
/>
- </td>
- <td>
+ <select id="cat_id" name="cat_id">
+ <xsl:apply-templates
select="category_list/options"/>
+ </select>
+
<xsl:value-of select="php:function('lang', 'district')"
/>
- </td>
- <td>
+ <select id="district_id" name="district_id">
+ <xsl:apply-templates
select="district_list/options"/>
+ </select>
+
<xsl:value-of select="php:function('lang', 'part of
town')" />
- </td>
- <td>
+ <select id="part_of_town_id" name="part_of_town_id">
+ <xsl:apply-templates
select="part_of_town_list/options"/>
+ </select>
+
<xsl:value-of select="php:function('lang', 'property')"
/>
- </td>
- <td>
- <xsl:value-of select="php:function('lang', 'building')"
/>
- </td>
-<!--
- <td >
- <xsl:value-of select="php:function('lang', 'search')" />
- </td>
--->
- </tr>
- <tr id="filter2">
- <td>
- <select id="entity_id" name="entity_id">
- <xsl:apply-templates select="entity_list/options"/>
+ <select id="loc1" name="loc1">
+ <xsl:apply-templates
select="loc1_list/options"/>
</select>
- </td>
- <td>
- <select id="cat_id" name="cat_id">
- <xsl:apply-templates select="category_list/options"/>
- </select>
- </td>
- <td>
- <select id="district_id" name="district_id">
- <xsl:apply-templates select="district_list/options"/>
- </select>
- </td>
- <td>
- <select id="part_of_town_id" name="part_of_town_id">
- <xsl:apply-templates
select="part_of_town_list/options"/>
- </select>
- </td>
- <td>
- <select id="loc1" name="loc1">
- <xsl:apply-templates select="loc1_list/options"/>
- </select>
- </td>
- <td>
+
+ <xsl:value-of select="php:function('lang', 'building')"
/>
<select id="loc2" name="loc2">
- <xsl:apply-templates select="loc2_list/options"/>
+ <xsl:apply-templates
select="loc2_list/options"/>
</select>
- </td>
-<!--
- <td>
- <xsl:variable name="lang_search"><xsl:value-of
select="php:function('lang', 'Search')" /></xsl:variable>
- <input type="button" id = "search" name="search"
value="{$lang_search}" title = "{$lang_search}" />
- </td>
--->
- </tr>
- <td>
- <xsl:value-of select="php:function('lang',
'registered')" />
- </td>
- <td>
- <xsl:value-of select="php:function('lang', 'location
type')" />
- </td>
- <td>
- <xsl:value-of select="php:function('lang', 'location
category')" />
- </td>
- <td>
<xsl:value-of select="php:function('lang', 'name')" />
- </td>
- </tr>
- <tr id="filter1">
- <td >
+
+ <xsl:value-of select="php:function('lang',
'registered')" />
<input id= "control_registered" type="checkbox"
name="control_registered" value="1"/>
- </td>
- <td >
- <input id= "control_id_hidden" type="hidden"
name="control_id"/>
+ <xsl:value-of select="php:function('lang', 'location
type')" />
<select id="location_type" name="location_type">
- <xsl:apply-templates
select="location_type_list/options"/>
+ <xsl:apply-templates
select="location_type_list/options"/>
</select>
- </td>
- <td >
- <select id="location_type_category"
name="location_type_category">
- </select>
- </td>
- <td colspan = '2'>
+
+ <xsl:value-of select="php:function('lang', 'location
category')" />
+ <select id="location_type_category"
name="location_type_category"></select>
+
<input type="text" value="" id="search-location-name" />
<input id= "search-location_code" type="hidden"
name="search-location_code"/>
- </td>
- </tr>
- </table>
- </td>
- </tr>
</xsl:template>
-
-
<xsl:template match="datatable" xmlns:php="http://php.net/xsl";>
<div id="paging"></div>
<div id="datatable-container"></div>
- <xsl:call-template name="datasource-definition" />
+ <xsl:call-template name="datasource-definition" />
<div id="receipt"></div>
- <xsl:variable name="label_submit"><xsl:value-of
select="php:function('lang', 'save')" /></xsl:variable>
- <div><input type="submit" name="update_acl" id="frm_update_acl"
value="{$label_submit}"/></div>
+ <xsl:variable name="label_submit"><xsl:value-of select="php:function('lang',
'save')" /></xsl:variable>
+ <input type="submit" name="update_acl" id="frm_update_acl" class="btn"
value="{$label_submit}"/>
- <xsl:variable name="label_select_add"><xsl:value-of
select="php:function('lang', 'select add')" /></xsl:variable>
- <div><input type="button" name="select_add" id="frm_update_add"
value="{$label_select_add}" onclick="checkAll('mychecks_add')"/></div>
+ <xsl:variable name="label_select_add"><xsl:value-of
select="php:function('lang', 'select add')" /></xsl:variable>
+ <input type="button" name="select_add" id="frm_update_add" class="btn"
value="{$label_select_add}" onclick="checkAll('mychecks_add')"/>
- <xsl:variable name="label_select_delete"><xsl:value-of
select="php:function('lang', 'select delete')" /></xsl:variable>
- <div><input type="button" name="select_add" id="frm_update_delete"
value="{$label_select_delete}" onclick="checkAll('mychecks_delete')"/></div>
-
+ <xsl:variable name="label_select_delete"><xsl:value-of
select="php:function('lang', 'select delete')" /></xsl:variable>
+ <input type="button" name="select_add" id="frm_update_delete"
class="btn" value="{$label_select_delete}"
onclick="checkAll('mychecks_delete')"/>
</xsl:template>
<xsl:template name="datasource-definition" xmlns:php="http://php.net/xsl";>
@@ -241,8 +177,6 @@
myButtons[<xsl:value-of select="name"/>] =
<xsl:value-of select="values"/>
</xsl:for-each>
</script>
-
-
</xsl:template>
<!-- options for use with select-->
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-06-26 14:15:52 UTC
(rev 9673)
+++ trunk/controller/templates/base/css/base.css 2012-06-27 06:42:11 UTC
(rev 9674)
@@ -1826,7 +1826,7 @@
float: left;
margin: 20px;
width: 500px;
-}
+}
#choose_control label {
display: block;
font-size: 17px;
@@ -1836,8 +1836,10 @@
#choose_control select {
width: 245px;
}
+
#choose-location {
- clear:both;
+ clear: both;
+ margin: 20px;
}
#choose-location label{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9674],
Torstein <=