[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9678]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9678] |
|
Date: |
Wed, 27 Jun 2012 10:37:09 +0000 |
Revision: 9678
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9678
Author: vator
Date: 2012-06-27 10:37:08 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/templates/base/calendar/view_calendar_year.xsl
trunk/controller/templates/base/control_location/register_control_to_component.xsl
trunk/controller/templates/base/css/base.css
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2012-06-27 08:19:44 UTC
(rev 9677)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2012-06-27 10:37:08 UTC
(rev 9678)
@@ -331,7 +331,8 @@
self::render_template_xsl(array('check_list/check_list_tab_menu','check_list/edit_check_list'),
$data);
}
- function view_cases_for_check_list(){
+ function view_cases_for_check_list()
+ {
$check_list_id = phpgw::get_var('check_list_id');
$check_list = $this->so->get_single($check_list_id);
@@ -360,7 +361,8 @@
self::render_template_xsl(array('check_list/check_list_tab_menu',
'check_list/view_cases_for_check_list'), $data);
}
- function create_case_message(){
+ function create_case_message()
+ {
$check_list_id = phpgw::get_var('check_list_id');
$check_list_with_check_items =
$this->so->get_single_with_check_items($check_list_id);
@@ -393,7 +395,8 @@
}
// Saves a check list that already exists. Returns status for
update as a JSON array with values update/not updated
- public function update_check_list(){
+ public function update_check_list()
+ {
$check_list_id = phpgw::get_var('check_list_id');
$status = (int)phpgw::get_var('status');
$comment = phpgw::get_var('comment');
@@ -428,7 +431,8 @@
return json_encode( array( "status" =>
"not_updated" ) );
}
- public function print_check_list(){
+ public function print_check_list()
+ {
$check_list_id = phpgw::get_var('check_list_id');
$check_list = $this->so->get_single($check_list_id);
@@ -456,7 +460,8 @@
self::render_template_xsl('check_list/print_check_list', $data);
}
- public function view_control_info(){
+ public function view_control_info()
+ {
$check_list_id = phpgw::get_var('check_list_id');
$check_list = $this->so->get_single($check_list_id);
@@ -478,7 +483,8 @@
self::render_template_xsl(array('check_list/check_list_tab_menu','check_list/view_control_info'),
$data);
}
- function view_control_details(){
+ function view_control_details()
+ {
$control_id = phpgw::get_var('control_id');
$control = $this->so_control->get_single($control_id);
@@ -492,7 +498,8 @@
}
// Displays control groups and control items for a check list
- function register_case(){
+ function register_case()
+ {
$check_list_id = phpgw::get_var('check_list_id');
$check_list = $this->so->get_single($check_list_id);
@@ -507,7 +514,8 @@
{
$saved_control_items =
$this->so_control_item_list->get_control_items_and_options_by_control_and_group($control->get_id(),
$control_group->get_id(), "return_array");
- if(count($saved_control_items) > 0){
+ if(count($saved_control_items) > 0)
+ {
$control_groups_with_items_array[] =
array("control_group" => $control_group->toArray(), "control_items" =>
$saved_control_items);
}
}
@@ -569,14 +577,16 @@
self::render_template_xsl(array('check_list/check_list_tab_menu',
'check_list/register_case'), $data);
}
- function view_open_cases(){
+ function view_open_cases()
+ {
$check_list_id = phpgw::get_var('check_list_id');
$check_list = $this->so->get_single($check_list_id);
$open_check_items_and_cases =
$this->so_check_item->get_check_items_with_cases($check_list_id, $type = null,
'open_or_waiting', null, 'return_array');
- foreach($open_check_items_and_cases as $key =>
$check_item){
+ foreach($open_check_items_and_cases as $key =>
$check_item)
+ {
$control_item_with_options =
$this->so_control_item->get_single_with_options($check_item['control_item_id'],
"return_array");
$check_item['control_item']['options_array'] =
$control_item_with_options['options_array'];
$open_check_items_and_cases[$key] = $check_item;
@@ -591,7 +601,8 @@
self::render_template_xsl(
array('check_list/cases_tab_menu', 'check_list/view_open_cases'), $data );
}
- function view_closed_cases(){
+ function view_closed_cases()
+ {
$check_list_id = phpgw::get_var('check_list_id');
$check_list = $this->so->get_single($check_list_id);
@@ -609,7 +620,8 @@
self::render_template_xsl(
array('check_list/cases_tab_menu', 'check_list/view_closed_cases'), $data );
}
- function view_control_items(){
+ function view_control_items()
+ {
$check_list_id = phpgw::get_var('check_list_id');
$check_list = $this->so->get_single($check_list_id);
Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-06-27 08:19:44 UTC (rev 9677)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-06-27 10:37:08 UTC (rev 9678)
@@ -217,12 +217,7 @@
<h2 class="components">Komponenter</h2>
-
-
-
<xsl:for-each select="components_calendar_array">
-
-
<h3><xsl:value-of
select="component/xml_short_desc"/></h3>
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-27 08:19:44 UTC (rev 9677)
+++
trunk/controller/templates/base/control_location/register_control_to_component.xsl
2012-06-27 10:37:08 UTC (rev 9678)
@@ -45,10 +45,10 @@
<div class="body">
<style type="text/css">
- select { width: 100px; }
+
</style>
<div id="choose_control">
- <label>Velg kontrollen du vil
vise komponent for</label>
+ <h4>Velg kontrollen du vil vise
komponent for</h4>
<select id="control_area_id"
name="control_area_id">
<xsl:apply-templates
select="control_area_list/options"/>
</select>
@@ -58,17 +58,10 @@
</div>
<div id="choose-location">
-
<xsl:apply-templates
select="filter_form" />
<form action="{update_action}"
name="acl_form" id="acl_form" method="post">
- <table align = "center"
width="95%">
- <tr>
- <td
colspan = '6'>
-
<xsl:apply-templates select="datatable"/>
- </td>
- </tr>
- </table>
+
<xsl:apply-templates select="datatable"/>
</form>
</div>
</div>
@@ -81,56 +74,80 @@
</xsl:template>
<xsl:template name="filter_list" xmlns:php="http://php.net/xsl";>
-
- <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')" />
- <select id="entity_id" name="entity_id">
- <xsl:apply-templates
select="entity_list/options"/>
- </select>
-
- <xsl:value-of select="php:function('lang', 'category')"
/>
- <select id="cat_id" name="cat_id">
- <xsl:apply-templates
select="category_list/options"/>
- </select>
-
- <xsl:value-of select="php:function('lang', 'district')"
/>
- <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')" />
- <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')"
/>
- <select id="loc1" name="loc1">
- <xsl:apply-templates
select="loc1_list/options"/>
- </select>
-
- <xsl:value-of select="php:function('lang', 'building')"
/>
- <select id="loc2" name="loc2">
- <xsl:apply-templates
select="loc2_list/options"/>
- </select>
-
- <xsl:value-of select="php:function('lang', 'name')" />
-
- <xsl:value-of select="php:function('lang',
'registered')" />
- <input id= "control_registered" type="checkbox"
name="control_registered" value="1"/>
-
- <xsl:value-of select="php:function('lang', 'location
type')" />
- <select id="location_type" name="location_type">
- <xsl:apply-templates
select="location_type_list/options"/>
- </select>
-
- <xsl:value-of select="php:function('lang', 'location
category')" />
- <select id="location_type_category"
name="location_type_category"></select>
-
+ <h4>Velg komponenter som du vil knytte til kontrollen</h4>
+ <fieldset id="comp-filters">
+ <input id= "control_id_hidden" type="hidden" name="control_id"/>
+
+ <div class="select-box">
+ <label><xsl:value-of select="php:function('lang',
'registered')" /></label>
+ <input id= "control_registered" type="checkbox"
name="control_registered" value="1"/>
+ </div>
+
+ <div class="select-box">
+ <div class="filter">
+ <label><xsl:value-of
select="php:function('lang', 'entity')" /></label>
+ <select id="entity_id" name="entity_id">
+ <xsl:apply-templates
select="entity_list/options"/>
+ </select>
+ </div>
+ <div class="filter">
+ <label><xsl:value-of select="php:function('lang',
'category')" /></label>
+ <select id="cat_id" name="cat_id">
+ <xsl:apply-templates
select="category_list/options"/>
+ </select>
+ </div>
+ </div>
+
+ <div class="select-box">
+ <div class="filter">
+ <label><xsl:value-of select="php:function('lang',
'district')" /></label>
+ <select id="district_id" name="district_id">
+ <xsl:apply-templates
select="district_list/options"/>
+ </select>
+ </div>
+ <div class="filter">
+ <label><xsl:value-of
select="php:function('lang', 'part of town')" /></label>
+ <select id="part_of_town_id"
name="part_of_town_id">
+ <xsl:apply-templates
select="part_of_town_list/options"/>
+ </select>
+ </div>
+ </div>
+
+ <div class="select-box">
+ <div class="filter">
+ <label><xsl:value-of
select="php:function('lang', 'property')" /></label>
+ <select id="loc1" name="loc1">
+ <xsl:apply-templates
select="loc1_list/options"/>
+ </select>
+ </div>
+ <div class="filter">
+ <label><xsl:value-of select="php:function('lang',
'building')" /></label>
+ <select id="loc2" name="loc2">
+ <xsl:apply-templates
select="loc2_list/options"/>
+ </select>
+ </div>
+ </div>
+
+ <div class="select-box">
+ <div class="filter">
+ <label><xsl:value-of
select="php:function('lang', 'location type')" /></label>
+ <select id="location_type" name="location_type">
+ <xsl:apply-templates
select="location_type_list/options"/>
+ </select>
+ </div>
+ <div class="filter">
+ <label><xsl:value-of
select="php:function('lang', 'location category')" /></label>
+ <select id="location_type_category"
name="location_type_category"></select>
+ </div>
+ </div>
+
+ <div class="select-box">
+ <label>Søk etter eiendom/bygg/rom</label>
<input type="text" value="" id="search-location-name" />
<input id= "search-location_code" type="hidden"
name="search-location_code"/>
+ </div>
+
+ </fieldset>
</xsl:template>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-06-27 08:19:44 UTC
(rev 9677)
+++ trunk/controller/templates/base/css/base.css 2012-06-27 10:37:08 UTC
(rev 9678)
@@ -355,6 +355,10 @@
padding: 3px 6px;
}
+input[type="checkbox"] {
+ margin: 5px;
+}
+
#innertoolbar-button, input[type="submit"] {
background: none repeat scroll 0 0 #4F9AEA;
border: 1px solid #4685C8;
@@ -1835,7 +1839,7 @@
margin: 20px;
width: 500px;
}
-#choose_control label {
+#choose_control h4 {
display: block;
font-size: 17px;
margin: 5px 0;
@@ -1850,12 +1854,38 @@
margin: 20px;
}
-#choose-location label{
+#choose-location h4{
display: block;
font-size: 17px;
margin: 5px 0;
}
+#comp-filters {
+ padding: 10px 0;
+}
+
+#comp-filters label {
+ font-size: 1em;
+ font-weight: bold;
+}
+
+#comp-filters .select-box {
+ background: none repeat scroll 0 0 #DEEAF8;
+ border: 1px solid #BDD3ED;
+ float: left;
+ height: 50px;
+ margin-right: 5px;
+}
+
+#comp-filters .filter {
+ float: left;
+}
+
+
+#choose-location #datatable-container{
+ margin: 20px 0;
+}
+
.error_msg {
color: red;
display: none;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9678],
Torstein <=