[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9521] controller: register control to component
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9521] controller: register control to component |
|
Date: |
Wed, 06 Jun 2012 12:57:05 +0000 |
Revision: 9521
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9521
Author: sigurdne
Date: 2012-06-06 12:57:05 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
controller: register control to component
Modified Paths:
--------------
trunk/controller/inc/class.uicontrol_location.inc.php
trunk/controller/templates/base/control_location/register_control_to_component.xsl
trunk/property/inc/class.socommon.inc.php
Modified: trunk/controller/inc/class.uicontrol_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_location.inc.php 2012-06-06
10:59:10 UTC (rev 9520)
+++ trunk/controller/inc/class.uicontrol_location.inc.php 2012-06-06
12:57:05 UTC (rev 9521)
@@ -629,8 +629,27 @@
array_unshift ($control_area_list ,array
('id'=>'','name'=>lang('select')));
+ $tabs = array
+ (
+ array
+ (
+ 'label' =>
lang('View_locations_for_control'),
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol_location.index'))
+ ),
+ array
+ (
+ 'label' =>
lang('Add_locations_for_control'),
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol_location.register_control_to_location'))
+ ),
+ array
+ (
+ 'label' => lang('add components for
control')
+ )
+ );
+
$data = array
(
+ 'tabs'
=> $GLOBALS['phpgw']->common->create_tabs($tabs, 2),
'td_count'
=> '""',
'property_js'
=>
json_encode($GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property2.js"),
'datatable'
=> $datavalues,
@@ -649,6 +668,7 @@
);
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/datatable/assets/skins/sam/datatable.css');
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/paginator/assets/skins/sam/paginator.css');
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/container/assets/skins/sam/container.css');
@@ -684,7 +704,7 @@
(
'key' => 'select',
'label' => lang('select'),
- 'sortable' => false,
+ 'sortable' => true,
'formatter' => false,
'hidden' => false,
'formatter' => '',
@@ -750,7 +770,6 @@
$part_of_town_id =
phpgw::get_var('part_of_town_id', 'int');
$control_id =
phpgw::get_var('control_id', 'int');
-
if(!$entity_id && !$cat_id)
{
return json_encode(array());
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-06 10:59:10 UTC (rev 9520)
+++
trunk/controller/templates/base/control_location/register_control_to_component.xsl
2012-06-06 12:57:05 UTC (rev 9521)
@@ -22,26 +22,19 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<style type="text/css">
- #box { width: 200px; height: 5px; background: blue; }
- select { width: 200px; }
- .row_on,.th_bright
- {
- background-color: #CCEEFF;
- }
-
- .row_off
- {
- background-color: #DDF0FF;
- }
-
+ select { width: 100px; }
</style>
- <xsl:call-template name="invoice" />
- <div id="popupBox"></div>
- <div id="curtain"></div>
+<div class="yui-navset yui-navset-top" id="control_location_tabview">
+ <div class="identifier-header">
+ <h1><xsl:value-of select="php:function('lang', 'components for
control')"/></h1>
+ </div>
+ <xsl:value-of disable-output-escaping="yes" select="tabs" />
+ <xsl:call-template name="register_control_to_component" />
+</div>
</xsl:template>
-<xsl:template name="invoice" xmlns:php="http://php.net/xsl";>
+<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">
@@ -94,7 +87,7 @@
<xsl:value-of select="php:function('lang', 'control
area')" />
</td>
<td>
- <xsl:value-of select="php:function('lang', 'control
id')" />
+ <xsl:value-of select="php:function('lang', 'control')"
/>
</td>
</tr>
<tr id="filter1">
@@ -103,7 +96,7 @@
<xsl:apply-templates
select="control_area_list/options"/>
</select>
</td>
- <td>
+ <td colspan='4'>
<select id="control_id" name="control_id">
<xsl:apply-templates select="control/options"/>
</select>
@@ -183,13 +176,13 @@
<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 class="row_on"><input type="submit" name="update_acl"
id="frm_update_acl" value="{$label_submit}"/></div>
+ <div><input type="submit" name="update_acl" id="frm_update_acl"
value="{$label_submit}"/></div>
<xsl:variable name="label_select_add"><xsl:value-of
select="php:function('lang', 'select')" /></xsl:variable>
- <div class="row_on"><input type="button" name="select_add"
id="frm_update_add" value="{$label_select_add}"
onclick="checkAll('mychecks_add')"/></div>
+ <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_delete"><xsl:value-of
select="php:function('lang', 'select delete')" /></xsl:variable>
- <div class="row_on"><input type="button" name="select_add"
id="frm_update_delete" value="{$label_select_delete}"
onclick="checkAll('mychecks_delete')"/></div>
+ <div><input type="button" name="select_add" id="frm_update_delete"
value="{$label_select_delete}" onclick="checkAll('mychecks_delete')"/></div>
</xsl:template>
Modified: trunk/property/inc/class.socommon.inc.php
===================================================================
--- trunk/property/inc/class.socommon.inc.php 2012-06-06 10:59:10 UTC (rev
9520)
+++ trunk/property/inc/class.socommon.inc.php 2012-06-06 12:57:05 UTC (rev
9521)
@@ -167,7 +167,7 @@
function reset_fm_cache_userlist()
{
- $this->db->query("DELETE FROM fm_cache WHERE name
$this->like 'acl_userlist_%'",__LINE__,__FILE__, true);
+ $this->db->query("DELETE FROM fm_cache WHERE name
{$this->like} 'acl_userlist_%'",__LINE__,__FILE__, true);
return $this->db->affected_rows();
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9521] controller: register control to component,
Sigurd Nes <=