|
| From: | Torstein |
| Subject: | [Fmsystem-commits] [8583] |
| Date: | Mon, 16 Jan 2012 10:02:25 +0000 |
Revision: 8583
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8583
Author: vator
Date: 2012-01-16 10:02:24 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uicalendar.inc.php
trunk/controller/inc/helper/class.location_finder.inc.php
trunk/controller/templates/base/calendar/view_calendar_month.xsl
trunk/controller/templates/base/css/base.css
Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php 2012-01-16 09:31:56 UTC
(rev 8582)
+++ trunk/controller/inc/class.uicalendar.inc.php 2012-01-16 10:02:24 UTC
(rev 8583)
@@ -35,6 +35,7 @@
include_class('controller', 'check_item', 'inc/model/');
include_class('controller', 'check_list_status_info', 'inc/helper/');
include_class('controller', 'calendar_builder', 'inc/component/');
+ include_class('controller', 'location_finder', 'inc/helper/');
class controller_uicalendar extends controller_uicommon
{
@@ -104,17 +105,9 @@
'allrows' => false
);
- $test = new test();
- $locations = $test->get_responsibilities($criteria);
-
-
-
-
-
-
-
-
-
+ $location_finder = new location_finder();
+ $locations = $location_finder->get_responsibilities(
$criteria );
+
$controls_for_location_array =
$this->so_control->get_controls_by_location($location_code, $from_date,
$to_date, $repeat_type);
$control_id_with_check_list_array =
$this->so->get_check_lists_for_location_2($location_code, $from_date, $to_date,
$repeat_type);
Modified: trunk/controller/inc/helper/class.location_finder.inc.php
===================================================================
--- trunk/controller/inc/helper/class.location_finder.inc.php 2012-01-16
09:31:56 UTC (rev 8582)
+++ trunk/controller/inc/helper/class.location_finder.inc.php 2012-01-16
10:02:24 UTC (rev 8583)
@@ -28,643 +28,23 @@
* @version $Id: class.uicontrol_group.inc.php 8267 2011-12-11 12:27:18Z
sigurdne $
*/
- phpgw::import_class('controller.uicommon');
- phpgw::import_class('property.boevent');
- phpgw::import_class('controller.socontrol');
- phpgw::import_class('controller.socontrol_item');
- phpgw::import_class('controller.socontrol_group_list');
- phpgw::import_class('controller.socontrol_area');
+ phpgw::import_class('property.solocation');
- include_class('controller', 'control_group', 'inc/model/');
-
- class controller_uilocation extends controller_uicommon
+ class location_finder
{
private $so;
- public $public_functions = array
- (
- 'index' => true,
- 'query' => true,
- 'edit' => true,
- 'view' => true,
- 'add' => true,
- 'save_group_order' => true
- );
-
public function __construct()
{
- parent::__construct();
$this->so = CreateObject('property.solocation');
}
- class test
- {
- var $total_records = 0;
- function __construct()
- {
-
- }
-
- function get_responsibilities($data = array())
- {
- $data['filter_role_on_contact'] =
$GLOBALS['phpgw']->accounts->get($data['user_id'])->person_id;
- $locations = $this->bo->read($data);
- $this->total_records =
$this->bo->total_records;
- return $locations;
- }
- }
-
- public function index()
+ function get_responsibilities($data = array())
{
- if(phpgw::get_var('phpgw_return_as') == 'json') {
- return $this->query();
- }
- self::add_javascript('controller', 'yahoo',
'datatable.js');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('paginator');
-
- $data = array(
- 'form' => array(
- 'toolbar' => array(
- 'item' => array(
- array('type' =>
'filter',
- 'name' =>
'status',
- 'text' =>
lang('Status').':',
- 'list' => array(
- array(
-
'id' => 'none',
-
'name' => lang('Not selected')
- ),
- array(
-
'id' => 'NEW',
-
'name' => lang('NEW')
- ),
- array(
-
'id' => 'PENDING',
-
'name' => lang('PENDING')
- ),
- array(
-
'id' => 'REJECTED',
-
'name' => lang('REJECTED')
- ),
- array(
-
'id' => 'ACCEPTED',
-
'name' => lang('ACCEPTED')
- )
- )
- ),
- array('type' =>
'filter',
- 'name' =>
'control_areas',
- 'text' =>
lang('Control_area').':',
- 'list' =>
$this->so_control_area->get_control_area_select_array(),
- ),
- array('type' => 'text',
- 'text' =>
lang('searchfield'),
- 'name' =>
'query'
- ),
- array(
- 'type' =>
'submit',
- 'name' =>
'search',
- 'value' =>
lang('Search')
- ),
- array(
- 'type' =>
'link',
- 'value' =>
$_SESSION['showall'] ? lang('Show only active') : lang('Show all'),
- 'href' =>
self::link(array('menuaction' => $this->url_prefix.'.toggle_show_inactive'))
- ),
- array(
- 'type' =>
'link',
- 'value' =>
lang('New control group'),
- 'href' =>
self::link(array('menuaction' => 'controller.uicontrol_group.add')),
- 'class' =>
'new_item'
- ),
- ),
- ),
- ),
- 'datatable' => array(
- 'source' =>
self::link(array('menuaction' => 'controller.uicontrol_group.index',
'phpgw_return_as' => 'json')),
- 'field' => array(
- array(
- 'key' => 'id',
- 'label' => lang('ID'),
- 'sortable' => true,
- 'formatter' =>
'YAHOO.portico.formatLink'
- ),
- array(
- 'key' =>
'group_name',
- 'label' =>
lang('Control group title'),
- 'sotrable' =>
false
- ),
- array(
- 'key' => 'control_area',
- 'label' =>
lang('Control area'),
- 'sortable' => false
- ),
- array(
- 'key' => 'procedure',
- 'label' =>
lang('Procedure'),
- 'sortable' => false
- ),
- array(
- 'key' =>
'building_part',
- 'label' =>
lang('Building part'),
- 'sortable' => false
- ),
- array(
- 'key' => 'link',
- 'hidden' => true
- )
- )
- ),
- );
-//_debug_array($data);
-
- self::render_template_xsl('datatable', $data);
+ $data['filter_role_on_contact'] =
$GLOBALS['phpgw']->accounts->get($data['user_id'])->person_id;
+ $locations = $this->so->read($data);
+ $total_records = $this->so->total_records;
+
+ return $locations;
}
-
- /**
- * Public method. Forwards the user to edit mode.
- */
- public function add()
- {
- $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'controller.uicontrol_group.edit'));
- }
-
-
- public function edit()
- {
- $tabs = array
- (
- 'control_group' => array('label' =>
lang('Control_group'), 'link' => '#control_group'),
- 'control_items' => array('label' =>
lang('Control_items'), 'link' => '#control_items')
- );
- $tab_to_display = 'control_group';
- $control_group_id = phpgw::get_var('id');
- $new_control_group = false;
- if(isset($control_group_id) && $control_group_id > 0)
- {
- $control_group =
$this->so->get_single($control_group_id);
- }
- else
- {
- $control_group = new controller_control_group();
- $new_control_group = true;
- }
-
- if(isset($_POST['save_control_group'])) // The user has
pressed the save button
- {
- if(isset($control_group)) // Add new values to
the control item
- {
-
$control_group->set_group_name(phpgw::get_var('group_name'));
- $control_group->set_procedure_id(
phpgw::get_var('procedure') );
- $control_group->set_control_area_id(
phpgw::get_var('control_area') );
- $control_group->set_building_part_id(
phpgw::get_var('building_part') );
-
- //$this->so->store($control_item);
-
- if(isset($control_group_id) &&
$control_group_id > 0)
- {
- $ctrl_group_id =
$control_group_id;
-
if($this->so->store($control_group))
- {
- $message =
lang('messages_saved_form');
- }
- else
- {
- $error =
lang('messages_form_error');
- }
- }
- else
- {
- $ctrl_group_id =
$this->so->add($control_group);
- if($ctrl_group_id)
- {
- $message =
lang('messages_saved_form');
- }
- else
- {
- $error =
lang('messages_form_error');
- }
- }
- if($new_control_group)
- {
-
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'controller.uicontrol_group.edit', 'id' => $ctrl_group_id));
- }
- else
- {
-
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'controller.uicontrol_group.view', 'id' => $ctrl_group_id));
- }
- }
- }
- else if(isset($_POST['cancel_control_group'])) // The
user has pressed the cancel button
- {
- if(isset($control_group_id) &&
$control_group_id > 0)
- {
-
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'controller.uicontrol_group.view', 'id' => $control_group_id));
- }
- else
- {
-
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'controller.uicontrol_group.index'));
- }
- }
- else if(isset($_POST['remove_control_group_items']))
- {
- $control_item_ids = array();
- // Fetching selected control items
- $control_tag_ids =
phpgw::get_var('item_remove_ids');
-
- foreach ($control_tag_ids as $control_item_id)
- {
- $curr_control_item =
$this->so_control_item->get_single($control_item_id);
-
$curr_control_item->set_control_group_id(null);
-
-
$this->so_control_item->store($curr_control_item);
- }
-
- $control_area_array =
$this->so_control_area->get_control_area_array();
- $procedure_array =
$this->so_procedure->get_procedures();
-
-
- if($this->flash_msgs)
- {
- $msgbox_data =
$GLOBALS['phpgw']->common->msgbox_data($this->flash_msgs);
- $msgbox_data =
$GLOBALS['phpgw']->common->msgbox($msgbox_data);
- }
-
- foreach ($control_area_array as $control_area)
- {
-
if($control_group->get_control_area_id() && $control_area->get_id() ==
$control_group->get_control_area_id())
- {
- $control_area_options[] = array
- (
- 'id' =>
$control_area->get_id(),
- 'name' =>
$control_area->get_title(),
- 'selected' => 'yes'
- );
- }
- else
- {
- $control_area_options[] = array
- (
- 'id' =>
$control_area->get_id(),
- 'name' =>
$control_area->get_title()
- );
- }
- }
-
- foreach ($procedure_array as $procedure)
- {
- if($control_group->get_procedure_id()
&& $procedure->get_id() == $control_group->get_procedure_id())
- {
- $procedure_options[] = array
- (
- 'id' =>
$procedure->get_id(),
- 'name' =>
$procedure->get_title(),
- 'selected' => 'yes'
- );
- }
- else
- {
- $procedure_options[] = array
- (
- 'id' =>
$procedure->get_id(),
- 'name' =>
$procedure->get_title()
- );
- }
- }
-
- $building_part_options =
$this->so->get_building_part_select_array($control_group->get_building_part_id());
-
- $control_group_array =
$control_group->toArray();
- $control_items_array =
$this->so_control_item->get(null,null,'controller_control_item.control_area_id',true,null,null,array('available'
=> 'yes'));
-
- $control_items = array();
-
- foreach ($control_items_array as $control_item)
- {
- $control_items[] =
$control_item->serialize();
- }
-
- $selected_control_items_array =
controller_socontrol_item::get_instance()->get_control_items($control_group->get_id());
-
- $selected_control_items = array();
-
- foreach ($selected_control_items_array as
$ctrl_item)
- {
- $selected_control_items[] =
$ctrl_item->serialize();
- }
-
phpgwapi_yui::tabview_setup('control_group_tabview');
-
- $data = array
- (
- 'tabs'
=> phpgwapi_yui::tabview_generate($tabs, 'control_items'),
- 'value_id'
=> !empty($control_group) ? $control_group->get_id() : 0,
- 'img_go_home'
=> 'rental/templates/base/images/32x32/actions/go-home.png',
- 'editable'
=> true,
- 'procedure'
=> array('options' => $procedure_options),
- 'control_area'
=> array('options' => $control_area_options),
- 'control_group'
=> $control_group_array,
- 'control_items'
=> $control_items,
- 'selected_control_items' =>
$selected_control_items,
- 'building_part'
=> array('building_part_options' => $building_part_options),
- );
-
-
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('controller') . '::' . lang('Control_group');
-
- self::add_javascript('controller', 'yahoo',
'control_tabs.js');
-
self::render_template_xsl(array('control_group_tabs','control_group','control_group_items'),
$data);
- }
- else if(isset($_POST['save_control_group_items']))
- {
- $tab_to_display = 'control_group_items';
- //update control items with control group id
- //$control_group_id =
phpgw::get_var('control_group_id');
-
- $control_item_ids = array();
- // Fetching selected control items
- $control_tag_ids =
phpgw::get_var('control_tag_ids');
-
- foreach ($control_tag_ids as $control_item_id)
- {
- $curr_control_item =
$this->so_control_item->get_single($control_item_id);
-
$curr_control_item->set_control_group_id($control_group_id);
-
-
$this->so_control_item->store($curr_control_item);
- }
-
- $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'controller.uicontrol_group.view', 'id' =>
$control_group_id));
- }
- else
- {
-
- $control_area_array =
$this->so_control_area->get_control_area_array();
- $procedure_array =
$this->so_procedure->get_procedures();
-
-
- if($this->flash_msgs)
- {
- $msgbox_data =
$GLOBALS['phpgw']->common->msgbox_data($this->flash_msgs);
- $msgbox_data =
$GLOBALS['phpgw']->common->msgbox($msgbox_data);
- }
-
- foreach ($control_area_array as $control_area)
- {
-
if($control_group->get_control_area_id() && $control_area->get_id() ==
$control_group->get_control_area_id())
- {
- $control_area_options[] = array
- (
- 'id' =>
$control_area->get_id(),
- 'name' =>
$control_area->get_title(),
- 'selected' => 'yes'
- );
- }
- else
- {
- $control_area_options[] = array
- (
- 'id' =>
$control_area->get_id(),
- 'name' =>
$control_area->get_title()
- );
- }
- }
-
- foreach ($procedure_array as $procedure)
- {
- if($control_group->get_procedure_id()
&& $procedure->get_id() == $control_group->get_procedure_id())
- {
- $procedure_options[] = array
- (
- 'id' =>
$procedure->get_id(),
- 'name' =>
$procedure->get_title(),
- 'selected' => 'yes'
- );
- }
- else
- {
- $procedure_options[] = array
- (
- 'id' =>
$procedure->get_id(),
- 'name' =>
$procedure->get_title()
- );
- }
- }
-
- $building_part_options =
$this->so->get_building_part_select_array($control_group->get_building_part_id());
-
- $control_group_array =
$control_group->toArray();
- $control_items_array =
$this->so_control_item->get(null,null,'controller_control_item.control_area_id',true,null,null,array('available'
=> 'yes'));
-
- $control_items = array();
-
- foreach ($control_items_array as $control_item)
- {
- $control_items[] =
$control_item->serialize();
- }
-
- $selected_control_items_array =
controller_socontrol_item::get_instance()->get_control_items($control_group->get_id());
-
- $selected_control_items = array();
-
- foreach ($selected_control_items_array as
$ctrl_item)
- {
- $selected_control_items[] =
$ctrl_item->serialize();
- }
-
phpgwapi_yui::tabview_setup('control_group_tabview');
-
- $data = array
- (
- 'tabs'
=> phpgwapi_yui::tabview_generate($tabs, $tab_to_display),
- 'value_id'
=> !empty($control_group) ? $control_group->get_id() : 0,
- 'img_go_home'
=> 'rental/templates/base/images/32x32/actions/go-home.png',
- 'editable'
=> true,
- 'procedure'
=> array('options' => $procedure_options),
- 'control_area'
=> array('options' => $control_area_options),
- 'control_group'
=> $control_group_array,
- 'control_items'
=> $control_items,
- 'selected_control_items' =>
$selected_control_items,
- 'building_part'
=> array('building_part_options' => $building_part_options),
- );
-
-
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('controller') . '::' . lang('Control_group');
-
-/*
-
$GLOBALS['phpgw']->richtext->replace_element('what_to_do');
-
$GLOBALS['phpgw']->richtext->replace_element('how_to_do');
- $GLOBALS['phpgw']->richtext->generate_script();
-*/
-
- // $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'controller.item', 'controller' );
-
- self::add_javascript('controller', 'yahoo',
'control_tabs.js');
-
self::render_template_xsl(array('control_group_tabs','control_group','control_group_items'),
$data);
- }
- }
-
- public function save_group_order(){
- $control_group_id = phpgw::get_var('control_group_id');
- $control_id = phpgw::get_var('control_id');
- $group_order_nr = phpgw::get_var('group_order_nr');
-
- $status = true;
-
- $control_group_list =
$this->so_control_group_list->get_single_2($control_id, $control_group_id);
-
- var_dump("Skriver ut control_group_list");
- var_dump($control_group_list);
-
- if( $control_group_list == null ){
- $control_group_list = new
controller_control_group_list();
-
$control_group_list->set_control_id($control_id);
-
$control_group_list->set_control_group_id($control_group_id);
- $control_group_list->set_order_nr(
$group_order_nr );
- $this->so_control_group_list->add(
$control_group_list );
- }else{
- $control_group_list->set_order_nr(
$group_order_nr );
- $this->so_control_group_list->update(
$control_group_list );
- }
-
- return status;
- }
-
-
- public function query()
- {
- $params = array(
- 'start' => phpgw::get_var('startIndex', 'int',
'REQUEST', 0),
- 'results' => phpgw::get_var('results', 'int',
'REQUEST', null),
- 'query' => phpgw::get_var('query'),
- 'sort' => phpgw::get_var('sort'),
- 'dir' => phpgw::get_var('dir'),
- 'filters' => $filters
- );
-
- $search_for = phpgw::get_var('query');
-
- $ctrl_area = phpgw::get_var('control_areas');
- if(isset($ctrl_area) && $ctrl_area > 0)
- {
- $filters['control_areas'] = $ctrl_area;
- }
-
-
if($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
- {
- $user_rows_per_page =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
- }
- else {
- $user_rows_per_page = 10;
- }
-
- // YUI variables for paging and sorting
- $start_index = phpgw::get_var('startIndex', 'int');
- $num_of_objects = phpgw::get_var('results', 'int',
'GET', $user_rows_per_page);
- $sort_field = phpgw::get_var('sort');
- if($sort_field == null)
- {
- $sort_field = 'control_group_id';
- }
- $sort_ascending = phpgw::get_var('dir') == 'desc' ?
false : true;
- //Create an empty result set
- $records = array();
-
- //Retrieve a contract identifier and load corresponding
contract
- $control_group_id = phpgw::get_var('control_group_id');
- /*if(isset($control_group_id))
- {
- $control_item =
$this->so->get_single($control_group_id);
- }*/
-
//var_dump($start_index.'-'.$num_of_objects.'-'.$sort_field.'-'.$sort_ascending.'-'.$search_for.'-'.$search_type.'-'.$filters);
- $result_objects = $this->so->get($start_index,
$num_of_objects, $sort_field, $sort_ascending, $search_for, $search_type,
$filters);
- $object_count = $this->so->get_count($search_for,
$search_type, $filters);
- //var_dump($result_objects);
-
- $results = array();
-
- foreach($result_objects as $control_group_obj)
- {
- $results['results'][] =
$control_group_obj->serialize();
- }
-
- $results['total_records'] = $object_count;
- $results['start'] = $params['start'];
- $results['sort'] = $params['sort'];
- $results['dir'] = $params['dir'];
-
- array_walk($results["results"], array($this,
"_add_links"), "controller.uicontrol_group.view");
-
- return $this->yui_results($results);
- }
-
- /**
- * Public method. Called when a user wants to view information
about a control group.
- * @param HTTP::id the control_group ID
- */
- public function view()
- {
- $GLOBALS['phpgw_info']['flags']['app_header'] .=
'::'.lang('view');
-
- $tabs = array
- (
- 'control_group' => array('label' =>
lang('Control_group'), 'link' => '#control_group'),
- 'control_items' => array('label' =>
lang('Control_items'), 'link' => '#control_items')
- );
- //Retrieve the control_group object
- $control_group_id = (int)phpgw::get_var('id');
- if(isset($_POST['edit_control_group']))
- {
- $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'controller.uicontrol_group.edit', 'id' =>
$control_group_id));
- }
- else
- {
- if(isset($control_group_id) &&
$control_group_id > 0)
- {
- $control_group =
$this->so->get_single($control_group_id);
- //var_dump($control_group);
- }
- else
- {
-
$this->render('permission_denied.php',array('error' =>
lang('invalid_request')));
- return;
- }
- //var_dump($control_group);
-
- if($this->flash_msgs)
- {
- $msgbox_data =
$GLOBALS['phpgw']->common->msgbox_data($this->flash_msgs);
- $msgbox_data =
$GLOBALS['phpgw']->common->msgbox($msgbox_data);
- }
-
- $control_group_array =
$control_group->toArray();
- //var_dump($control_group_array);
-
- $control_items_array =
$this->so_control_item->get_control_items($control_group_id);
-
- $control_items = array();
-
- foreach ($control_items_array as $control_item)
- {
- $control_items[] =
$control_item->serialize();
- }
-
-
phpgwapi_yui::tabview_setup('control_group_tabview');
-
- $data = array
- (
- 'tabs'
=> phpgwapi_yui::tabview_generate($tabs, 'control_group'),
- 'value_id'
=> !empty($control_group) ? $control_group->get_id() : 0,
- 'img_go_home'
=> 'rental/templates/base/images/32x32/actions/go-home.png',
- 'control_group'
=> $control_group_array,
- 'selected_control_items' =>
$control_items,
- );
-
-
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('controller') . '::' . lang('Control group');
-
- self::add_javascript('controller', 'yahoo',
'control_tabs.js');
-
self::render_template_xsl(array('control_group_tabs','control_group','control_group_items'),
$data);
- }
- }
-
-
}
Modified: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-01-16 09:31:56 UTC (rev 8582)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-01-16 10:02:24 UTC (rev 8583)
@@ -59,8 +59,6 @@
});
</script>
- <xsl:choose>
- <xsl:when test="controls_calendar_array/child::node()">
<ul style="clear:left;" class="calendar info month">
<li class="heading">
<div class="id">ID</div>
@@ -70,7 +68,8 @@
<div
class="frequency">Frekvenstype</div>
<div
class="frequency">Frekvensintervall</div>
</li>
-
+ <xsl:choose>
+ <xsl:when
test="controls_calendar_array/child::node()">
<xsl:for-each select="controls_calendar_array">
<li>
<div class="id">
@@ -100,6 +99,11 @@
</div>
</li>
</xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ <div class="cal_info_msg">Ingen
sjekklister for bygg i angitt periode</div>
+ </xsl:otherwise>
+ </xsl:choose>
</ul>
<div id="days_wrp">
@@ -108,8 +112,9 @@
<xsl:for-each
select="heading_array">
<div><xsl:value-of
select="."/></div>
</xsl:for-each>
- </li>
-
+ </li>
+ <xsl:choose>
+ <xsl:when
test="controls_calendar_array/child::node()">
<xsl:for-each
select="controls_calendar_array">
<li>
<xsl:for-each
select="calendar_array">
@@ -186,24 +191,6 @@
</a>
</div>
</xsl:when>
- <!--
xsl:when test="status = 'control_accomplished_with_errors'">
-
<div style="position:relative;">
-
<div id="info_box" style="position:absolute;display:none;"></div>
-
<a class="view_check_list">
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list</xsl:text>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="info/check_list_id"/>
-
</xsl:attribute>
-
<span style="display:none">
-
<xsl:text>&check_list_id=</xsl:text><xsl:value-of
select="info/check_list_id"/>
-
<xsl:text>&phpgw_return_as=json</xsl:text>
-
</span>
-
<img height="15"
src="controller/images/status_icon_red_empty.png" />
-
</a>
-
</div>
-
</xsl:when>
- -->
<xsl:when test="status = 'control_not_accomplished_with_info'">
<div style="position:relative;">
<div id="info_box" style="position:absolute;display:none;"></div>
@@ -234,13 +221,14 @@
</xsl:choose>
</xsl:for-each>
</li>
+
</xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ <div>Ingen sjekklister for bygg
i angitt periode</div>
+ </xsl:otherwise>
+ </xsl:choose>
</ul>
</div>
- </xsl:when>
- <xsl:otherwise>
- <div>Ingen sjekklister for bygg i angitt periode</div>
- </xsl:otherwise>
- </xsl:choose>
</div>
</xsl:template>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-01-16 09:31:56 UTC
(rev 8582)
+++ trunk/controller/templates/base/css/base.css 2012-01-16 10:02:24 UTC
(rev 8583)
@@ -1245,3 +1245,7 @@
text-decoration: none;
width: 24px;
}
+.cal_info_msg{
+ font-size: 16px;
+ padding: 40px 20px;
+}
\ No newline at end of file
| [Prev in Thread] | Current Thread | [Next in Thread] |