[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9545]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9545] |
|
Date: |
Mon, 11 Jun 2012 12:27:09 +0000 |
Revision: 9545
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9545
Author: vator
Date: 2012-06-11 12:25:36 +0000 (Mon, 11 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uicontrol.inc.php
trunk/controller/inc/class.uiprocedure.inc.php
trunk/controller/setup/setup.inc.php
trunk/controller/setup/tables_current.inc.php
trunk/controller/setup/tables_update.inc.php
trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
trunk/controller/templates/base/control/control.xsl
trunk/controller/templates/base/control/control_tabs.xsl
trunk/controller/templates/base/control_group/control_group_tabs.xsl
trunk/controller/templates/base/control_location/control_location_tabs.xsl
trunk/controller/templates/base/control_location/register_control_to_location.xsl
trunk/controller/templates/base/control_location/view_locations_for_control.xsl
trunk/controller/templates/base/css/base.css
trunk/controller/templates/base/datatable.xsl
Added Paths:
-----------
trunk/controller/templates/base/control/controls_datatable.xsl
trunk/controller/templates/base/control_group/control_groups_datatable.xsl
trunk/controller/templates/base/control_item/control_items_datatable.xsl
trunk/controller/templates/base/procedure/procedures_datatable.xsl
Modified: trunk/controller/inc/class.uicontrol.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol.inc.php 2012-06-11 08:45:03 UTC
(rev 9544)
+++ trunk/controller/inc/class.uicontrol.inc.php 2012-06-11 12:25:36 UTC
(rev 9545)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* phpGroupWare - controller: a part of a Facilities Management System.
*
@@ -28,51 +28,48 @@
* @version $Id$
*/
- phpgw::import_class('controller.uicommon');
- phpgw::import_class('property.boevent');
- phpgw::import_class('controller.socontrol');
- phpgw::import_class('controller.socontrol_group');
- phpgw::import_class('controller.socontrol_area');
- phpgw::import_class('controller.socontrol_item');
- phpgw::import_class('controller.socontrol_item_list');
- phpgw::import_class('controller.soprocedure');
+ phpgw::import_class('controller.uicommon');
+ phpgw::import_class('property.boevent');
+ phpgw::import_class('controller.socontrol');
+ phpgw::import_class('controller.socontrol_group');
+ phpgw::import_class('controller.socontrol_area');
+ phpgw::import_class('controller.socontrol_item');
+ phpgw::import_class('controller.socontrol_item_list');
+ phpgw::import_class('controller.soprocedure');
- phpgw::import_class('phpgwapi.yui');
+ phpgw::import_class('phpgwapi.yui');
- include_class('controller', 'control', 'inc/model/');
- include_class('controller', 'control_area', 'inc/model/');
- include_class('controller', 'control_item_list', 'inc/model/');
- include_class('controller', 'control_group_list', 'inc/model/');
- include_class('controller', 'check_item', 'inc/model/');
+ include_class('controller', 'control', 'inc/model/');
+ include_class('controller', 'control_area', 'inc/model/');
+ include_class('controller', 'control_item_list', 'inc/model/');
+ include_class('controller', 'control_group_list', 'inc/model/');
+ include_class('controller', 'check_item', 'inc/model/');
- class controller_uicontrol extends controller_uicommon
- {
- private $bo;
- private $so;
- private $so_procedure;
- private $so_control_group;
- private $so_control_area;
- private $so_control_item;
- private $so_control_item_list;
- private $so_control_group_list;
- private $so_check_list_list;
- private $so_check_item;
- private $_category_acl;
+ class controller_uicontrol extends controller_uicommon
+ {
+ private $bo;
+ private $so;
+ private $so_procedure;
+ private $so_control_group;
+ private $so_control_area;
+ private $so_control_item;
+ private $so_control_item_list;
+ private $so_control_group_list;
+ private $so_check_item;
+ private $_category_acl;
- public $public_functions = array
- (
- 'index'
=> true,
- 'control_list'
=> true,
- 'view'
=> true,
- 'view_control_details' =>
true,
- 'save_control_details' =>
true,
- 'view_control_groups' =>
true,
- 'save_control_groups' =>
true,
- 'view_control_items' =>
true,
- 'save_control_items' =>
true,
- 'view_check_list'
=> true,
- 'generate_check_lists_for_control' => true,
- 'view_check_lists_for_control' => true,
+ public $public_functions = array
+ (
+ 'index'
=> true,
+ 'control_list'
=> true,
+ 'view'
=> true,
+ 'view_control_details'
=> true,
+ 'save_control_details'
=> true,
+ 'view_control_groups'
=> true,
+ 'save_control_groups'
=> true,
+ 'view_control_items'
=> true,
+ 'save_control_items'
=> true,
+ 'view_check_list'
=> true,
'get_controls_by_control_area' => true,
);
@@ -188,13 +185,7 @@
'type' =>
'submit',
'name' =>
'search',
'value' =>
lang('Search')
- ),
- array(
- 'type' =>
'link',
- 'value' =>
lang('New control'),
- 'href' =>
self::link(array('menuaction' => 'controller.uicontrol.view_control_details')),
- 'class' =>
'new_item'
- ),
+ )
),
),
),
@@ -240,47 +231,8 @@
)
),
);
-/*
- * ,
- array(
- 'key' => 'actions',
- 'hidden' => true
- ),
- array(
- 'key' => 'labels',
- 'hidden' => true
- ),
- array(
- 'key' => 'ajax',
- 'hidden' => true
- )
- *
- * $parameters3 = array
- (
- 'parameter' => array
- (
- array
- (
- 'name'
=> 'search_for',
- 'source'
=> 'location_code'
- ),
- )
- );
- $data['rowactions']['action'][] = array
- (
- 'my_name'
=> 'view',
- 'text'
=> lang('composites'),
- 'action'
=> $GLOBALS['phpgw']->link('/index.php',array
- (
- 'menuaction'
=> 'rental.uicomposite.index',
- 'search_type'
=> 'location_id',
- 'populate_form'
=> 'yes'
- )),
- 'parameters' =>
$parameters3
- );*/
-//_debug_array($data);
- self::render_template_xsl('datatable', $data);
+ self::render_template_xsl(array(
'control/controls_datatable', 'datatable' ), $data);
}
/**
@@ -323,13 +275,13 @@
$data = array
(
- 'tabs'
=> $GLOBALS['phpgw']->common->create_tabs($tabs, 0),
- 'view'
=> "control_details",
- 'editable'
=> true,
- 'control'
=> ($control != null) ? $control->toArray() : null,
+ 'tabs'
=> $GLOBALS['phpgw']->common->create_tabs($tabs, 0),
+ 'view'
=> "control_details",
+ 'editable'
=> true,
+ 'control'
=> ($control != null) ? $control->toArray() : null,
'control_areas_array' =>
$control_areas_array,
'procedures_array' =>
$procedures_array,
- 'role_array' =>
$role_array,
+ 'role_array'
=> $role_array,
'repeat_type_array' =>
$repeat_type_array
);
@@ -547,10 +499,10 @@
$data = array
(
- 'tabs'
=> $GLOBALS['phpgw']->common->create_tabs($tabs, 2),
- 'view'
=> 'control_items',
- 'control_group_ids' =>
implode($control_group_ids, ","),
- 'control' =>
$control->toArray(),
+ 'tabs'
=>
$GLOBALS['phpgw']->common->create_tabs($tabs, 2),
+ 'view'
=> 'control_items',
+ 'control_group_ids'
=> implode($control_group_ids, ","),
+ 'control'
=> $control->toArray(),
'groups_with_control_items' =>
$groups_with_control_items
);
Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php 2012-06-11 08:45:03 UTC
(rev 9544)
+++ trunk/controller/inc/class.uiprocedure.inc.php 2012-06-11 12:25:36 UTC
(rev 9545)
@@ -118,13 +118,7 @@
'type' =>
'submit',
'name' =>
'search',
'value' =>
lang('Search')
- ),
- array(
- 'type' =>
'link',
- 'value' =>
lang('t_new_procedure'),
- 'href' =>
self::link(array('menuaction' => 'controller.uiprocedure.add')),
- 'class' =>
'new_item'
- ),
+ )
),
),
),
@@ -166,7 +160,7 @@
);
//_debug_array($data);
- self::render_template_xsl('datatable', $data);
+ self::render_template_xsl(array(
'procedure/procedures_datatable', 'datatable' ), $data);
}
public function edit()
Modified: trunk/controller/setup/setup.inc.php
===================================================================
--- trunk/controller/setup/setup.inc.php 2012-06-11 08:45:03 UTC (rev
9544)
+++ trunk/controller/setup/setup.inc.php 2012-06-11 12:25:36 UTC (rev
9545)
@@ -1,6 +1,6 @@
<?php
$setup_info['controller']['name'] = 'controller';
- $setup_info['controller']['version'] = '0.1.37';
+ $setup_info['controller']['version'] = '0.1.38';
$setup_info['controller']['app_order'] = 100;
$setup_info['controller']['enable'] = 1;
$setup_info['controller']['app_group'] = 'office';
Modified: trunk/controller/setup/tables_current.inc.php
===================================================================
--- trunk/controller/setup/tables_current.inc.php 2012-06-11 08:45:03 UTC
(rev 9544)
+++ trunk/controller/setup/tables_current.inc.php 2012-06-11 12:25:36 UTC
(rev 9545)
@@ -12,8 +12,6 @@
'costResponsibility_id' => array('type' =>
'int', 'precision' => 4, 'nullable' => True),
'responsibility_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
'control_area_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
- 'component_type_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
- 'component_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
'repeat_type' => array('type' => 'int',
'precision' => 2, 'nullable' => True),
'repeat_interval' => array('type' => 'int',
'precision' => 2, 'nullable' => True),
'enabled' => array('type' => 'int', 'precision'
=> 2, 'nullable' => True)
@@ -73,6 +71,7 @@
'completed_date' => array('type' => 'int',
'precision' => 8, 'nullable' => True),
'component_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
'location_code' => array('type' => 'varchar',
'precision' => 30, 'nullable' => false),
+ 'location_id' => array('type' => 'int',
'precision' => 4, 'nullable' => true),
'num_open_cases' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
'num_pending_cases' => array('type' => 'int',
'precision' => 4, 'nullable' => True)
),
@@ -205,17 +204,17 @@
'status' => array('type'
=> 'int', 'precision' => '4', 'nullable' => false),
'measurement' => array('type' =>
'varchar', 'precision' => '50', 'nullable' => True),
'location_id' => array('type' =>
'int', 'precision' => '4', 'nullable' => true), // representer
meldingsfregisteret
- 'location_item_id' => array('type' => 'int', 'precision'
=> '8', 'nullable' => true), //meldings id
- 'descr' => array('type' =>
'text','nullable' => true),
- 'user_id' => array('type' =>
'int','precision' => '4','nullable' => true),
- 'entry_date' => array('type' => 'int', 'precision'
=> 8,'nullable' => false),
- 'modified_date' => array('type' => 'int',
'precision' => 8,'nullable' => True),
- 'modified_by' => array('type' => 'int', 'precision'
=> 4,'nullable' => True),
- ),
- 'pk' => array('id'),
- 'fk' => array('controller_check_item' => array('check_item_id'
=> 'id')),
- 'ix' => array(),
- 'uc' => array()
+ 'location_item_id' => array('type' => 'int', 'precision' => '8',
'nullable' => true), //meldings id
+ 'descr' => array('type' => 'text','nullable' =>
true),
+ 'user_id' => array('type' => 'int','precision' =>
'4','nullable' => true),
+ 'entry_date' => array('type' => 'int', 'precision' =>
8,'nullable' => false),
+ 'modified_date' => array('type' => 'int', 'precision'
=> 8,'nullable' => True),
+ 'modified_by' => array('type' => 'int', 'precision' =>
4,'nullable' => True),
+ ),
+ 'pk' => array('id'),
+ 'fk' => array('controller_check_item' => array('check_item_id' => 'id')),
+ 'ix' => array(),
+ 'uc' => array()
),
'controller_check_item_status' => array(
'fd' => array(
Modified: trunk/controller/setup/tables_update.inc.php
===================================================================
--- trunk/controller/setup/tables_update.inc.php 2012-06-11 08:45:03 UTC
(rev 9544)
+++ trunk/controller/setup/tables_update.inc.php 2012-06-11 12:25:36 UTC
(rev 9545)
@@ -714,7 +714,7 @@
$GLOBALS['phpgw_setup']->oProc->AddColumn('controller_check_list','location_id',array(
'type' => 'int',
'precision' => 4,
- 'nullable' => false
+ 'nullable' => true
));
if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
@@ -722,4 +722,14 @@
$GLOBALS['setup_info']['controller']['currentver'] =
'0.1.37';
return
$GLOBALS['setup_info']['controller']['currentver'];
}
+ }
+
+ $test[] = '0.1.37';
+ function controller_upgrade0_1_37()
+ {
+
$GLOBALS['phpgw_setup']->oProc->DropColumn('controller_control', array(),
'component_type_id');
+
$GLOBALS['phpgw_setup']->oProc->DropColumn('controller_control', array(),
'component_id');
+
+ $GLOBALS['setup_info']['controller']['currentver'] = '0.1.38';
+ return $GLOBALS['setup_info']['controller']['currentver'];
}
\ No newline at end of file
Modified:
trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
2012-06-11 08:45:03 UTC (rev 9544)
+++ trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
2012-06-11 12:25:36 UTC (rev 9545)
@@ -51,6 +51,11 @@
success: function(data) {
$("#load_view_content").html(data);
}
+ error: function(XMLHttpRequest, textStatus,
errorThrown) {
+ if (XMLHttpRequest.status === 401) {
+ location.href = '/';
+ }
+ }
});
}
</script>
Modified: trunk/controller/templates/base/control/control.xsl
===================================================================
--- trunk/controller/templates/base/control/control.xsl 2012-06-11 08:45:03 UTC
(rev 9544)
+++ trunk/controller/templates/base/control/control.xsl 2012-06-11 12:25:36 UTC
(rev 9545)
@@ -99,8 +99,8 @@
<dd>
<xsl:choose>
<xsl:when test="editable">
- <input class="required"
type="text" name="title" id="title" value="{control/title}" size="80"/>
- <div
class="help_text">Angi tittel på kontrollen</div>
+ <input class="required"
type="text" name="title" id="title" value="{control/title}" size="70"/>
+ <div class="help_text
ext">Angi tittel på kontrollen</div>
</xsl:when>
<xsl:otherwise>
<xsl:value-of
select="control/title" />
@@ -111,7 +111,7 @@
<label
for="start_date">Startdato</label>
</dt>
<dd>
- <input class="required" id="start_date"
name="start_date" type="text">
+ <input class="required date"
id="start_date" name="start_date" type="text">
<xsl:if test="control/start_date != ''">
<xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(control/start_date))"/></xsl:attribute>
</xsl:if>
@@ -122,7 +122,7 @@
<label for="end_date">Sluttdato</label>
</dt>
<dd>
- <input id="end_date" name="end_date"
type="text">
+ <input class="date" id="end_date"
name="end_date" type="text">
<xsl:if test="control/end_date != 0">
<xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(control/end_date))"/></xsl:attribute>
</xsl:if>
@@ -159,7 +159,7 @@
<xsl:choose>
<xsl:when test="editable">
<input class="required"
id="repeat_interval" size="2" type="text" name="repeat_interval"
value="{control/repeat_interval}" />
- <span class="help_text">Angi
hvilket frekvensintervall kontrollen skal ha. Hvis du velger 2, betyr det at
kontrollen skal gjennomføres annenhver dag</span>
+ <span class="help_text">Angi
hvilket frekvensintervall kontrollen skal ha. Hvis du velger 2, betyr det
eksempelvis at kontrollen skal gjennomføres annenhver dag</span>
</xsl:when>
<xsl:otherwise>
<xsl:value-of
select="control/repeat_interval" />
Modified: trunk/controller/templates/base/control/control_tabs.xsl
===================================================================
--- trunk/controller/templates/base/control/control_tabs.xsl 2012-06-11
08:45:03 UTC (rev 9544)
+++ trunk/controller/templates/base/control/control_tabs.xsl 2012-06-11
12:25:36 UTC (rev 9545)
@@ -3,6 +3,7 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<div class="yui-navset yui-navset-top" id="control_tabview">
+
<xsl:choose>
<xsl:when test="view = 'control_details'">
<xsl:call-template name="yui_booking_i18n"/>
Added: trunk/controller/templates/base/control/controls_datatable.xsl
===================================================================
--- trunk/controller/templates/base/control/controls_datatable.xsl
(rev 0)
+++ trunk/controller/templates/base/control/controls_datatable.xsl
2012-06-11 12:25:36 UTC (rev 9545)
@@ -0,0 +1,13 @@
+<!-- $Id: view_locations_for_control.xsl 9485 2012-06-04 08:39:52Z vator $ -->
+
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+
+<div id="main_content">
+
+ <h1>Kontroller</h1>
+
+ <div class="content-wrp">
+ <xsl:call-template name="datatable" />
+ </div>
+</div>
+</xsl:template>
Property changes on:
trunk/controller/templates/base/control/controls_datatable.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/controller/templates/base/control_group/control_group_tabs.xsl
===================================================================
--- trunk/controller/templates/base/control_group/control_group_tabs.xsl
2012-06-11 08:45:03 UTC (rev 9544)
+++ trunk/controller/templates/base/control_group/control_group_tabs.xsl
2012-06-11 12:25:36 UTC (rev 9545)
@@ -16,8 +16,4 @@
</div>
</div>
</div>
- <!-- script type="text/javascript">
- var resource_id = <xsl:value-of select="resource/id"/>;
- var lang = <xsl:value-of select="php:function('js_lang',
'Name', 'Category', 'Actions', 'Edit', 'Delete', 'Account', 'Role')"/>;
- </script-->
</xsl:template>
Added:
trunk/controller/templates/base/control_group/control_groups_datatable.xsl
===================================================================
--- trunk/controller/templates/base/control_group/control_groups_datatable.xsl
(rev 0)
+++ trunk/controller/templates/base/control_group/control_groups_datatable.xsl
2012-06-11 12:25:36 UTC (rev 9545)
@@ -0,0 +1,13 @@
+<!-- $Id: view_locations_for_control.xsl 9485 2012-06-04 08:39:52Z vator $ -->
+
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+
+<div id="main_content">
+
+ <h1>Kontrollgrupper</h1>
+
+ <div id="control_items" class="content-wrp">
+ <xsl:call-template name="datatable" />
+ </div>
+</div>
+</xsl:template>
Property changes on:
trunk/controller/templates/base/control_group/control_groups_datatable.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/controller/templates/base/control_item/control_items_datatable.xsl
===================================================================
--- trunk/controller/templates/base/control_item/control_items_datatable.xsl
(rev 0)
+++ trunk/controller/templates/base/control_item/control_items_datatable.xsl
2012-06-11 12:25:36 UTC (rev 9545)
@@ -0,0 +1,13 @@
+<!-- $Id: view_locations_for_control.xsl 9485 2012-06-04 08:39:52Z vator $ -->
+
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+
+<div id="main_content">
+
+ <h1>Kontrollpunkter</h1>
+
+ <div id="control_items" class="content-wrp">
+ <xsl:call-template name="datatable" />
+ </div>
+</div>
+</xsl:template>
Property changes on:
trunk/controller/templates/base/control_item/control_items_datatable.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified:
trunk/controller/templates/base/control_location/control_location_tabs.xsl
===================================================================
--- trunk/controller/templates/base/control_location/control_location_tabs.xsl
2012-06-11 08:45:03 UTC (rev 9544)
+++ trunk/controller/templates/base/control_location/control_location_tabs.xsl
2012-06-11 12:25:36 UTC (rev 9545)
@@ -3,6 +3,44 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<div class="yui-navset yui-navset-top" id="control_location_tabview">
+
+<div id="choose_control" class="select-box">
+
+ <!-- When control area is chosen, an ajax
request is executed.
+ The operation fetches controls from db
and populates the control list.
+ The ajax operation is handled in
ajax.js
+ -->
+ <label>Velg kontrollen du vil vise bygg
for</label>
+ <select id="control_area_list"
name="control_area_list">
+ <option value="">Velg
kontrollområde</option>
+ <xsl:for-each
select="control_areas_array">
+ <option value="{id}">
+ <xsl:value-of
disable-output-escaping="yes" select="name"/>
+ </option>
+ </xsl:for-each>
+ </select>
+
+ <form id="loc_form" action="" method="GET">
+ <select id="control_id"
name="control_id">
+ <xsl:choose>
+ <xsl:when
test="control_array/child::node()">
+ <xsl:for-each
select="control_array">
+
<xsl:variable name="control_id"><xsl:value-of select="id"/></xsl:variable>
+ <option
value="{$control_id}">
+
<xsl:value-of select="title"/>
+
</option>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ <option>
+ Ingen
kontroller
+ </option>
+ </xsl:otherwise>
+ </xsl:choose>
+ </select>
+ </form>
+ </div>
+
<xsl:choose>
<xsl:when test="view = 'view_locations_for_control'">
<div class="identifier-header">
Modified:
trunk/controller/templates/base/control_location/register_control_to_location.xsl
===================================================================
---
trunk/controller/templates/base/control_location/register_control_to_location.xsl
2012-06-11 08:45:03 UTC (rev 9544)
+++
trunk/controller/templates/base/control_location/register_control_to_location.xsl
2012-06-11 12:25:36 UTC (rev 9545)
@@ -32,45 +32,7 @@
</div>
</xsl:template>
-<xsl:template match="control_filters" name="control_filters"
xmlns:php="http://php.net/xsl";>
-
- <div id="choose_control">
- <!--
- When control area is chosen, an ajax request is
executed.
- The operation fetches controls from db and populates
the control list.
- The ajax opearation is handled in ajax.js
- -->
- <div class="error_msg">Du må velge kontroll før du kan legge
til bygg</div>
- <select id="control_area_list" name="control_area_id">
- <option value="">Velg kontrollområde</option>
- <xsl:for-each select="control_areas_array">
- <option value="{id}">
- <xsl:value-of
disable-output-escaping="yes" select="name"/>
- </option>
- </xsl:for-each>
- </select>
-
- <form id="loc_form" action="" method="GET">
- <select id="control_id" name="control_id">
- <xsl:choose>
- <xsl:when
test="control_array/child::node()">
- <xsl:for-each
select="control_array">
- <xsl:variable
name="control_id"><xsl:value-of select="id"/></xsl:variable>
- <option
value="{$control_id}">
- <xsl:value-of
select="title"/>
- </option>
- </xsl:for-each>
- </xsl:when>
- <xsl:otherwise>
- <option>
- Ingen kontroller
- </option>
- </xsl:otherwise>
- </xsl:choose>
- </select>
- </form>
- </div>
-</xsl:template>
+<xsl:template match="control_filters" name="control_filters"
xmlns:php="http://php.net/xsl";></xsl:template>
<xsl:template match="filter_form" xmlns:php="http://php.net/xsl";>
Modified:
trunk/controller/templates/base/control_location/view_locations_for_control.xsl
===================================================================
---
trunk/controller/templates/base/control_location/view_locations_for_control.xsl
2012-06-11 08:45:03 UTC (rev 9544)
+++
trunk/controller/templates/base/control_location/view_locations_for_control.xsl
2012-06-11 12:25:36 UTC (rev 9545)
@@ -22,43 +22,8 @@
<xsl:call-template name="common"/>
<div class="yui-content">
- <div id="control_details">
- <div id="choose_control">
-
- <!-- When control area is chosen, an ajax
request is executed.
- The operation fetches controls from db
and populates the control list.
- The ajax operation is handled in
ajax.js
- -->
- <select id="control_area_list"
name="control_area_list">
- <option value="">Velg
kontrollområde</option>
- <xsl:for-each
select="control_areas_array">
- <option value="{id}">
- <xsl:value-of
disable-output-escaping="yes" select="name"/>
- </option>
- </xsl:for-each>
- </select>
-
- <form id="loc_form" action="" method="GET">
- <select id="control_id"
name="control_id">
- <xsl:choose>
- <xsl:when
test="control_array/child::node()">
- <xsl:for-each
select="control_array">
-
<xsl:variable name="control_id"><xsl:value-of select="id"/></xsl:variable>
- <option
value="{$control_id}">
-
<xsl:value-of select="title"/>
-
</option>
- </xsl:for-each>
- </xsl:when>
- <xsl:otherwise>
- <option>
- Ingen
kontroller
- </option>
- </xsl:otherwise>
- </xsl:choose>
- </select>
- </form>
- </div>
-
+ <div id="control_location">
+
<div id="addedProperties">
<ul id="locations_for_control"
name="locations_for_control">
<xsl:for-each
select="locations_for_control">
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-06-11 08:45:03 UTC
(rev 9544)
+++ trunk/controller/templates/base/css/base.css 2012-06-11 12:25:36 UTC
(rev 9545)
@@ -169,10 +169,8 @@
}
#toolbar {
- width: 100%;
- background-color: #eee;
- border: 1px solid #bbb;
- margin-bottom: 0em;
+ background-color: #DEEAF8;
+ border: 1px solid #C7D8EB;
padding: 10px 30px;
}
@@ -298,55 +296,58 @@
}
dl.controller-description {
- width: 70%;
+ width: 70%;
}
+
dl.controller-description dt, dl.controller-description-edit {
- width: 100%;
- float:left;
- font-weight:bold;
+ width: 100%;
+ float:left;
+ font-weight:bold;
}
+
dl.controller-description dd {
- width: 100%;
- border: 1px solid #ccc;
- float: left;
- background-color: white;
- height: 100px;
- overflow-y: scroll;
+ width: 100%;
+ border: 1px solid #ccc;
+ float: left;
+ background-color: white;
+ height: 100px;
+ overflow-y: scroll;
}
+
dl.controller-description-edit textarea {
- width: 100%;
- height: 100px;
- border: 1px solid #ccc;
- float: left;
+ width: 100%;
+ height: 100px;
+ border: 1px solid #ccc;
+ float: left;
}
input#place {
- width:60%;
+ width:60%;
}
input#address_1 {
- width: 60%;
- float:left;
+ width: 60%;
+ float:left;
}
input#house_number {
- width: 20%;
- float: left;
+ width: 20%;
+ float: left;
}
input.postcode {
- width: 50px;
- float: left;
+ width: 50px;
+ float: left;
}
.yui-navset {
- clear: both;
- margin-left: 2em;
- margin-right: 2em;
+ clear: both;
+ margin-left: 2em;
+ margin-right: 2em;
}
-h1 img, li img {
- vertical-align: middle;
+h1 img, li img {
+ vertical-align: middle;
}
/* Set up common form styles. TODO: needs refinement. */
@@ -357,85 +358,101 @@
/* ========================================== SELECTORS, IDS AND CLASSES
=========================================== */
input{
- margin: 0 13px 0 0;
- padding: 3px 6px;
+ margin: 0 13px 0 0;
+ padding: 3px 6px;
}
input[type="radio"] {
- margin: 0 5px 0 2px;
- padding: 3px 6px;
+ margin: 0 5px 0 2px;
+ padding: 3px 6px;
}
-input[type="submit"] {
- background: none repeat scroll 0 0 #4F9AEA;
- border: 1px solid #4685C8;
- border-radius: 4px 4px 4px 4px;
- color: #FFFFFF;
- cursor: pointer;
- margin-top: 20px;
- padding: 5px 20px;
+#innertoolbar-button, input[type="submit"] {
+ background: none repeat scroll 0 0 #4F9AEA;
+ border: 1px solid #4685C8;
+ border-radius: 4px 4px 4px 4px;
+ color: #FFFFFF;
+ cursor: pointer;
+ padding: 5px 20px;
}
+#innertoolbar-button {
+ font-size: 1em;
+ line-height: 1.2em;
+ min-height: 1.2em;
+ padding: 2px 15px;
+}
+
.row input[type="submit"] {
- padding: 2px 10px;
+ padding: 2px 10px;
}
select{
- padding: 3px 1px 3px 4px;
+ padding: 3px 1px 3px 4px;
}
fieldset {
- border-bottom:0px solid #ccc;
+ border-bottom:0px solid #ccc;
}
textarea{
- padding: 4px;
+ padding: 4px;
}
h1 em {
- font-style:italic;
+ font-style:italic;
}
a {
- color: #0066CC;
- text-decoration: none;
+ color: #0066CC;
+ text-decoration: none;
}
.info, .error, .warning {
- font-weight: normal;
- margin:20px;
- padding:5px;
- font-size:1.1em;
- text-align: left;
+ font-weight: normal;
+ margin:20px;
+ padding:5px;
+ font-size:1.1em;
+ text-align: left;
}
.message {
- margin: 5px;
+ margin: 5px;
}
.info {
- background-color:#CCFFCC;
- border:1px solid #00FF00;
- color:black;
+ background-color:#CCFFCC;
+ border:1px solid #00FF00;
+ color:black;
}
.warning {
- background-color: #FEEFB3;
- border:1px solid #9F6000;
- color:#9F6000;
+ background-color: #FEEFB3;
+ border:1px solid #9F6000;
+ color:#9F6000;
}
.yui-calendar td.calcell {
- border:0px !important;
+ border:0px !important;
}
.yui-skin-sam .yui-dt TABLE TH{
- border: none !important;
+ border: none !important;
}
-.yui-skin-sam .yui-dt TABLE TD{
- border: none !important;
+.yui-skin-sam .yui-dt TABLE TD{
+ border: none !important;
}
+.yui-skin-sam .yui-button .first-child {
+ border: 0;
+ margin:0;
+}
+.yui-skin-sam .yui-button {
+ background: none;
+ border:0;
+ margin: 0;
+}
+
.datatable_container {
margin-left: 1em;
margin-top: 1em;
@@ -711,68 +728,64 @@
margin: 20px 0 0 20px;
}
-.yui-skin-sam .yui-button button, .yui-skin-sam .yui-button a, .yui-skin-sam
.yui-button a:visited {
- height: 24px;
-}
-
#toolbar {
padding: 10px;
}
#toolbar input[type="text"] {
- font-size: 100%;
- padding: 3px;
+ font-size: 100%;
+ padding: 3px;
}
#toolbar input[type="submit"] {
- padding:0 8px;
- margin-top:0;
+ padding:0 8px;
+ margin-top:0;
}
-#innertoolbar-button{
- color: #111111;
-}
-
.yui-button.yui-link-button.new_button{
- margin-left:30px;
+ margin-left:30px;
}
#view_check_lists {
- padding: 30px;
- width: 600px;
+ padding: 30px;
+ width: 600px;
}
ul.th {
- font-weight: bold;
- overflow:hidden;
+ font-weight: bold;
+ overflow:hidden;
}
ul.th li {
- float: left;
- margin-right: 20px;
- padding: 3px 6px;
- width: 100px;
+ float: left;
+ margin-right: 20px;
+ padding: 3px 6px;
+ width: 100px;
}
ul.row{
- overflow: hidden;
+ overflow: hidden;
}
ul.row li{
- float:left;
- margin-right: 20px;
- padding: 3px 6px;
- width: 100px;
+ float:left;
+ margin-right: 20px;
+ padding: 3px 6px;
+ width: 100px;
}
/* ======================================= GENERAL CLASSES
========================================= */
-.content_wrp {
- background: none repeat scroll 0 0 #EDF5FF;
- border: 1px solid #eee;
- margin-bottom: 20px;
- padding: 15px;
+.content-wrp {
+ background: none repeat scroll 0 0 #EDF5FF;
+ border: 1px solid #eee;
+ margin-bottom: 20px;
+ padding: 15px;
}
+.content-wrp .yui-skin-sam .yui-dt table {
+ border: 1px solid #CCCCCC;
+}
+
.box {
background: none repeat scroll 0 0 #EDF5FF;
border: 1px solid #eee;
@@ -855,6 +868,13 @@
margin-top:0;
}
+.content-wrp{
+ background: none repeat scroll 0 0 #EDF5FF;
+ border: 1px solid #DBE5EF;
+ margin-top: 1em;
+ padding: 1em;
+}
+
/* ======================================= CHECK LIST DETAILS
========================================= */
input.id {
@@ -1126,7 +1146,8 @@
}
#calendar {
- width: 100%
+ table-layout: fixed;
+ width: 100%;
}
#calendar th {
@@ -1498,13 +1519,6 @@
margin:10px 0;
}
-#create_message_dialog{
- display:none;
- position:absolute;
- width: 600px;
- z-index: 2;
- background:#aaa;
-}
#curtain {
background: none repeat scroll 0 0 #000000;
display: none;
@@ -1856,7 +1870,7 @@
width: 25%;
}
-#queryForm{
+#control_location #queryForm{
margin: 20px;
width: 65%;
}
Modified: trunk/controller/templates/base/datatable.xsl
===================================================================
--- trunk/controller/templates/base/datatable.xsl 2012-06-11 08:45:03 UTC
(rev 9544)
+++ trunk/controller/templates/base/datatable.xsl 2012-06-11 12:25:36 UTC
(rev 9545)
@@ -16,7 +16,7 @@
</func:result>
</func:function>
-<xsl:template match="data">
+<xsl:template name="datatable">
<iframe id="yui-history-iframe"
src="phpgwapi/js/yahoo/history/assets/blank.html"></iframe>
<input id="yui-history-field" type="hidden"/>
<xsl:call-template name="yui_booking_i18n"/>
Added: trunk/controller/templates/base/procedure/procedures_datatable.xsl
===================================================================
--- trunk/controller/templates/base/procedure/procedures_datatable.xsl
(rev 0)
+++ trunk/controller/templates/base/procedure/procedures_datatable.xsl
2012-06-11 12:25:36 UTC (rev 9545)
@@ -0,0 +1,13 @@
+<!-- $Id: view_locations_for_control.xsl 9485 2012-06-04 08:39:52Z vator $ -->
+
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+
+<div id="main_content">
+
+ <h1>Prosedyrer</h1>
+
+ <div id="control_items" class="content-wrp">
+ <xsl:call-template name="datatable" />
+ </div>
+</div>
+</xsl:template>
Property changes on:
trunk/controller/templates/base/procedure/procedures_datatable.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9545],
Torstein <=