[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9943]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9943] |
|
Date: |
Fri, 31 Aug 2012 07:50:23 +0000 |
Revision: 9943
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9943
Author: vator
Date: 2012-08-31 07:50:22 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/hook_home.inc.php
trunk/controller/templates/base/css/base.css
Modified: trunk/controller/inc/hook_home.inc.php
===================================================================
--- trunk/controller/inc/hook_home.inc.php 2012-08-31 07:42:36 UTC (rev
9942)
+++ trunk/controller/inc/hook_home.inc.php 2012-08-31 07:50:22 UTC (rev
9943)
@@ -50,14 +50,15 @@
$styling .= " .home-box { background: none repeat scroll 0 0 #EDF5FF;
border-color: #DBE5EF; border-radius: 4px; margin: 5px 20px 20px;}";
$styling .= " .home-box .home_portal { margin: 0;border: 1px solid
#DEEAF8;}";
$styling .= " .home_portal_content { padding:5px 10px;}";
- $styling .= " .home_portal_title h2 { font-size: 13px;font-weight:
bold;text-transform:uppercase; background: #DEEAF8; margin: 0; padding: 2px
10px; color: #1C3C6F;}";
+ $styling .= " .home_portal_title h2 {
overflow:hidden;clear:left;font-size: 13px;font-weight:
bold;text-transform:uppercase; background: #DEEAF8; margin: 0; padding: 2px
10px; color: #1C3C6F;}";
$styling .= " .property_tickets .home_portal_title h2 { font-size:
20px; padding: 5px 10px;}";
- $styling .= " .home_portal_content ul li { padding: 3px 0;}";
+ $styling .= " .home_portal_content ul li { clear: left; overflow:
hidden; padding: 3px 0;}";
$styling .= " .home_portal .title { width:300px;margin:0 20px 0 0;}";
$styling .= " .home_portal .control-area { width:200px;}";
$styling .= " .home_portal .control { width:300px;}";
$styling .= " .home_portal .date { width:300px;}";
- $styling .= " .home_portal span { display: table-cell;cursor:
pointer;vertical-align: middle;}";
+ $styling .= " .home_portal li div { display: block;float:left;cursor:
pointer;vertical-align: middle;}";
+ $styling .= " .home_portal_title h2 div{
display:block;float:left;cursor: pointer;vertical-align: middle;}";
$styling .= " h2.heading { font-size: 22px; font-weight:
normal;margin: 0 0 0 20px;}";
$styling .= "</style>";
$styling .= "\n".'<!-- END checklist info -->'."\n";
@@ -105,37 +106,37 @@
$my_controls = array();
foreach($my_locations as $location)
{
- $controls = array();
- $components_with_controls_array = array();
- $location_code = $location["location_code"];
-
- $controls_loc = $so_control->get_controls_by_location(
$location_code, $from_date_ts, $to_date_ts, $repeat_type, "return_array",
$location["role_id"] );
+ $controls = array();
+ $components_with_controls_array = array();
+ $location_code = $location["location_code"];
+
+ $controls_loc = $so_control->get_controls_by_location(
$location_code, $from_date_ts, $to_date_ts, $repeat_type, "return_array",
$location["role_id"] );
- $level = count(explode('-', $location_code));
+ $level = count(explode('-', $location_code));
- if($level == 1){
- // Fetches all controls for the components for
a location within time period
- $filter = "bim_item.location_code =
'$location_code' ";
- $components_with_controls_array =
$so_control->get_controls_by_component($from_date_ts, $to_date_ts,
$repeat_type, "return_array", $location["role_id"], $filter);
- }else
- {
- // Fetches all controls for the components for
a location within time period
- $filter = "bim_item.location_code LIKE
'$location_code%' ";
- $components_with_controls_array =
$so_control->get_controls_by_component($from_date_ts, $to_date_ts,
$repeat_type, "return_array", $location["role_id"], $filter);
- }
+ if($level == 1){
+ // Fetches all controls for the components for a
location within time period
+ $filter = "bim_item.location_code = '$location_code' ";
+ $components_with_controls_array =
$so_control->get_controls_by_component($from_date_ts, $to_date_ts,
$repeat_type, "return_array", $location["role_id"], $filter);
+ }else
+ {
+ // Fetches all controls for the components for a
location within time period
+ $filter = "bim_item.location_code LIKE
'$location_code%' ";
+ $components_with_controls_array =
$so_control->get_controls_by_component($from_date_ts, $to_date_ts,
$repeat_type, "return_array", $location["role_id"], $filter);
+ }
- if( count($controls_loc) > 0 )
- {
- $my_controls[] = array( $location_code, 'location',
$controls_loc );
- }
+ if( count($controls_loc) > 0 )
+ {
+ $my_controls[] = array( $location_code, 'location',
$controls_loc );
+ }
- if( count($components_with_controls_array) > 0 )
- {
- foreach($components_with_controls_array as $component)
- {
- $my_controls[] = array( $location_code, 'component',
$component['controls_array'], $component );
- }
- }
+ if( count($components_with_controls_array) > 0 )
+ {
+ foreach($components_with_controls_array as $component)
+ {
+ $my_controls[] = array( $location_code,
'component', $component['controls_array'], $component );
+ }
+ }
}
$my_undone_controls = array();
@@ -180,7 +181,7 @@
if($control_type == "location")
{
- $check_list =
$so_check_list->get_check_list_for_control_by_date($my_control['id'],
$deadline_ts, null, $location_code, null, null, "location" );
+ $check_list =
$so_check_list->get_check_list_for_control_by_date($my_control['id'],
$deadline_ts, null, $location_code, null, null, "location" );
}
else if($control_type == "component")
{
@@ -191,15 +192,15 @@
if($check_list == null)
{
- if($control_type == "location")
- {
- $my_undone_controls[] = array("add",
$deadline_ts, $my_control, "location", $location_code );
- }
+ if($control_type == "location")
+ {
+ $my_undone_controls[] =
array("add", $deadline_ts, $my_control, "location", $location_code );
+ }
else if($control_type == "component")
- {
- $component = $container_arr[3];
- $my_undone_controls[] = array("add",
$deadline_ts, $my_control, "component", $component['location_id'],
$component['id'] );
- }
+ {
+ $component = $container_arr[3];
+ $my_undone_controls[] =
array("add", $deadline_ts, $my_control, "component", $component['location_id'],
$component['id'] );
+ }
}
else if($check_list->get_status() ==
controller_check_list::STATUS_NOT_DONE)
{
@@ -211,7 +212,7 @@
$portalbox0 = CreateObject('phpgwapi.listbox', array
(
- 'title' => "<span class='title
heading'>Lokasjonsnavn</span><span class='control-area
heading'>Kontrollområde</span><span class='control heading'>Tittel på
kontroll</span><span class='date heading'>Fristdato</span>",
+ 'title' => "<div class='title
heading'>Lokasjonsnavn</div><div class='control-area
heading'>Kontrollområde</div><div class='control heading'>Tittel på
kontroll</div><div class='date heading'>Fristdato</div>",
'primary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
'secondary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
'tertiary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
@@ -225,14 +226,13 @@
foreach($my_undone_controls as $my_undone_control)
{
-
$check_list_status = $my_undone_control[0];
$deadline_ts = $my_undone_control[1];
$my_control = $my_undone_control[2];
$cats = CreateObject('phpgwapi.categories', -1, 'controller',
'.control');
- $cats->supress_info = true;
- $control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','selected' => '','globals'
=> true,'use_acl' => $this->_category_acl));
+ $cats->supress_info = true;
+ $control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','selected' => '','globals'
=> true,'use_acl' => $this->_category_acl));
foreach($control_areas['cat_list'] as $area)
{
@@ -255,35 +255,35 @@
$location_name = $location_array["loc1_name"];
$portalbox0->data[] = array(
- 'text' => "<span
class='title'>{$location_name}</span><span
class='control-area'>{$control_area_name}</span> <span
class='control'>{$my_control['title']}</span> <span class='date'>Fristdato
{$date_str}</span>",
- 'link' => $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'controller.uicheck_list.add_check_list', 'type' =>
"location", 'control_id' => $my_control['id'], 'location_code' =>
$location_code, 'deadline_ts' => $deadline_ts))
- );
+ 'text' => "<div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div> <div
class='control'>{$my_control['title']}</div> <div class='date'>Fristdato
{$date_str}</div>",
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.add_check_list', 'type' => "location", 'control_id' =>
$my_control['id'], 'location_code' => $location_code, 'deadline_ts' =>
$deadline_ts))
+ );
}
else if($check_list_type == "component")
{
$location_id = $my_undone_control[4];
$component_id = $my_undone_control[5];
- $short_desc_arr =
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
+ $short_desc_arr =
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
$portalbox0->data[] = array(
- 'text' => "<span
class='title'>{$short_desc_arr}</span><span
class='control-area'>{$control_area_name}</span> <span
class='control'>{$my_control['title']}</span> <span class='date'>Fristdato
{$date_str}</span>",
- 'link' => $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'controller.uicheck_list.add_check_list', 'type' =>
"component", 'control_id' => $my_control['id'], 'location_id' => $location_id,
'component_id' => $component_id, 'deadline_ts' => $deadline_ts))
- );
+ 'text' => "<div
class='title'>{$short_desc_arr}</div><div
class='control-area'>{$control_area_name}</div> <div
class='control'>{$my_control['title']}</div> <div class='date'>Fristdato
{$date_str}</div>",
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.add_check_list', 'type' => "component", 'control_id'
=> $my_control['id'], 'location_id' => $location_id, 'component_id' =>
$component_id, 'deadline_ts' => $deadline_ts))
+ );
}
}
else if($check_list_status == "edit")
{
- $check_list_id = $my_undone_control[3];
- $location_code = $my_undone_control[4];
+ $check_list_id = $my_undone_control[3];
+ $location_code = $my_undone_control[4];
- $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
- $location_name = $location_array["loc1_name"];
+ $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
+ $location_name = $location_array["loc1_name"];
- $portalbox0->data[] = array(
- 'text' => "<span
class='title'>{$location_name}</span><span
class='control-area'>{$control_area_name}</span> <span
class='control'>{$my_control['title']}</span> <span class='date'>Fristdato
{$date_str}</span>",
- 'link' => $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'controller.uicheck_list.edit_check_list',
'check_list_id' => $check_list_id))
- );
+ $portalbox0->data[] = array(
+ 'text' => "<div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div> <div
class='control'>{$my_control['title']}</div> <div class='date'>Fristdato
{$date_str}</div>",
+ 'link' => $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'controller.uicheck_list.edit_check_list',
'check_list_id' => $check_list_id))
+ );
}
}
@@ -296,21 +296,21 @@
$controls_for_location_array = array();
foreach($my_locations as $location)
{
- $controls = array();
- $controls_loc =
$so_control->get_controls_by_location($location["location_code"],
$from_date_ts, $to_date_ts, $repeat_type, "return_array", $location["role_id"]
);
- $controls_comp =
$so_control->get_controls_for_components_by_location($location["location_code"],
$from_date_ts, $to_date_ts, $repeat_type, "return_array", $location["role_id"]
);
+ $controls = array();
+ $controls_loc =
$so_control->get_controls_by_location($location["location_code"],
$from_date_ts, $to_date_ts, $repeat_type, "return_array", $location["role_id"]
);
+ $controls_comp =
$so_control->get_controls_for_components_by_location($location["location_code"],
$from_date_ts, $to_date_ts, $repeat_type, "return_array", $location["role_id"]
);
- foreach($controls_loc as $cl)
- {
- $controls[] = $cl;
- }
+ foreach($controls_loc as $cl)
+ {
+ $controls[] = $cl;
+ }
- foreach($controls_comp as $cc)
- {
- $controls[] = $cc;
- }
+ foreach($controls_comp as $cc)
+ {
+ $controls[] = $cc;
+ }
- $controls_for_location_array[] = array($location["location_code"],
$controls);
+ $controls_for_location_array[] =
array($location["location_code"], $controls);
}
$controls_array = array();
@@ -327,7 +327,7 @@
$portalbox1 = CreateObject('phpgwapi.listbox', array
(
- 'title' => "<span class='title
heading'>Lokasjonsnavn</span><span class='control-area
heading'>Kontrollområde</span><span class='control heading'>Tittel på
kontroll</span><span class='date heading'>Fristdato</span>",
+ 'title' => "<div class='title
heading'>Lokasjonsnavn</div><div class='control-area
heading'>Kontrollområde</div><div class='control heading'>Tittel på
kontroll</div><div class='date heading'>Fristdato</div>",
'primary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
'secondary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
'tertiary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
@@ -369,11 +369,10 @@
foreach($check_lists as $check_list)
{
$next_date = "Planlagt: " . date($dateformat,
$check_list->get_planned_date());
- $portalbox1_data[] = array
- ($check_list->get_planned_date(), array
- (
- 'text' => "<span
class='title'>{$location_name}</span><span
class='control-area'>{$control_area_name}</span> <span
class='control'>{$current_control["title"]}</span> <span
class='date'>{$next_date}</span>",
- 'link' => $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'controller.uicheck_list.edit_check_list',
'check_list_id' => $check_list->get_id()))
+ $portalbox1_data[] = array(
+ $check_list->get_planned_date(), array(
+ 'text' => "<div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div> <div
class='control'>{$current_control["title"]}</div> <div
class='date'>{$next_date}</div>",
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.edit_check_list', 'check_list_id' =>
$check_list->get_id()))
));
}
}
@@ -398,7 +397,7 @@
$portalbox2 = CreateObject('phpgwapi.listbox', array
(
- 'title' => "<span class='title
heading'>Lokasjonsnavn</span><span class='control-area
heading'>Kontrollområde</span><span class='control heading'>Tittel på
kontroll</span><span class='date heading'>Fristdato</span>",
+ 'title' => "<div class='title
heading'>Lokasjonsnavn</div><div class='control-area
heading'>Kontrollområde</div><div class='control heading'>Tittel på
kontroll</div><div class='date heading'>Fristdato</div>",
'primary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
'secondary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
'tertiary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
@@ -407,7 +406,6 @@
'header_background_image' =>
$GLOBALS['phpgw']->common->image('phpgwapi','bg_filler', '.png', False)
));
-
$my_controls = array();
$repeat_type = null;
@@ -418,37 +416,37 @@
$my_controls = array();
foreach($my_locations as $location)
{
- $controls = array();
- $components_with_controls_array = array();
- $location_code = $location["location_code"];
+ $controls = array();
+ $components_with_controls_array = array();
+ $location_code = $location["location_code"];
- $controls_loc = $so_control->get_controls_by_location(
$location_code, $from_date_ts, $to_date_ts, $repeat_type, "return_array",
$location["role_id"] );
+ $controls_loc = $so_control->get_controls_by_location(
$location_code, $from_date_ts, $to_date_ts, $repeat_type, "return_array",
$location["role_id"] );
- $level = count(explode('-', $location_code));
+ $level = count(explode('-', $location_code));
- if($level == 1){
- // Fetches all controls for the components for
a location within time period
- $filter = "bim_item.location_code =
'$location_code' ";
- $components_with_controls_array =
$so_control->get_controls_by_component($from_date_ts, $to_date_ts,
$repeat_type, "return_array", $location["role_id"], $filter);
- }else
- {
- // Fetches all controls for the components for
a location within time period
- $filter = "bim_item.location_code LIKE
'$location_code%' ";
- $components_with_controls_array =
$so_control->get_controls_by_component($from_date_ts, $to_date_ts,
$repeat_type, "return_array", $location["role_id"], $filter);
- }
+ if($level == 1){
+ // Fetches all controls for the components for a
location within time period
+ $filter = "bim_item.location_code = '$location_code' ";
+ $components_with_controls_array =
$so_control->get_controls_by_component($from_date_ts, $to_date_ts,
$repeat_type, "return_array", $location["role_id"], $filter);
+ }else
+ {
+ // Fetches all controls for the components for a
location within time period
+ $filter = "bim_item.location_code LIKE
'$location_code%' ";
+ $components_with_controls_array =
$so_control->get_controls_by_component($from_date_ts, $to_date_ts,
$repeat_type, "return_array", $location["role_id"], $filter);
+ }
- if( count($controls_loc) > 0 )
- {
- $my_controls[] = array( $location_code, 'location',
$controls_loc );
- }
+ if( count($controls_loc) > 0 )
+ {
+ $my_controls[] = array( $location_code, 'location',
$controls_loc );
+ }
- if( count($components_with_controls_array) > 0 )
- {
- foreach($components_with_controls_array as $component)
- {
- $my_controls[] = array( $location_code, 'component',
$component['controls_array'], $component );
- }
+ if( count($components_with_controls_array) > 0 )
+ {
+ foreach($components_with_controls_array as $component)
+ {
+ $my_controls[] = array( $location_code, 'component',
$component['controls_array'], $component );
}
+ }
}
$my_undone_controls = array();
@@ -487,25 +485,24 @@
if($control_type == "location")
{
- $check_list =
$so_check_list->get_check_list_for_control_by_date($my_control['id'],
$deadline_ts, null, $location_code, null, null, "location" );
+ $check_list =
$so_check_list->get_check_list_for_control_by_date($my_control['id'],
$deadline_ts, null, $location_code, null, null, "location" );
}
else if($control_type == "component")
{
$component = $container_arr[3];
-
$check_list =
$so_check_list->get_check_list_for_control_by_date($my_control['id'],
$deadline_ts, null, null, $component['location_id'], $component['id'],
"component" );
}
if($check_list == null)
{
- if($control_type == "location")
- {
- $my_undone_controls[] = array("add",
$deadline_ts, $my_control, "location", $location_code );
- }
+ if($control_type == "location")
+ {
+ $my_undone_controls[] =
array("add", $deadline_ts, $my_control, "location", $location_code );
+ }
else if($control_type == "component")
- {
- $component = $container_arr[3];
- $my_undone_controls[] = array("add",
$deadline_ts, $my_control, "component", $component['location_id'],
$component['id'] );
+ {
+ $component = $container_arr[3];
+ $my_undone_controls[] =
array("add", $deadline_ts, $my_control, "component", $component['location_id'],
$component['id'] );
}
}
else if($check_list->get_status() ==
controller_check_list::STATUS_NOT_DONE)
@@ -526,8 +523,8 @@
$my_control = $my_undone_control[2];
$cats = CreateObject('phpgwapi.categories', -1, 'controller',
'.control');
- $cats->supress_info = true;
- $control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','selected' => '','globals'
=> true,'use_acl' => $this->_category_acl));
+ $cats->supress_info = true;
+ $control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','selected' => '','globals'
=> true,'use_acl' => $this->_category_acl));
foreach($control_areas['cat_list'] as $area)
{
@@ -550,52 +547,50 @@
$location_name = $location_array["loc1_name"];
$portalbox2->data[] = array(
- 'text' => "<span
class='title'>{$location_name}</span><span
class='control-area'>{$control_area_name}</span> <span
class='control'>{$my_control['title']}</span> <span class='date'>Fristdato
{$date_str}</span>",
- 'link' => $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'controller.uicheck_list.add_check_list', 'type' =>
"location", 'control_id' => $my_control['id'], 'location_code' =>
$location_code, 'deadline_ts' => $deadline_ts))
- );
+ 'text' => "<div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div> <div
class='control'>{$my_control['title']}</div> <div class='date'>Fristdato
{$date_str}</div>",
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.add_check_list', 'type' => "location", 'control_id' =>
$my_control['id'], 'location_code' => $location_code, 'deadline_ts' =>
$deadline_ts))
+ );
}
else if($check_list_type == "component")
{
$location_id = $my_undone_control[4];
$component_id = $my_undone_control[5];
- $short_desc_arr =
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
+ $short_desc_arr =
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
$portalbox2->data[] = array(
- 'text' => "<span
class='title'>{$short_desc_arr}</span><span
class='control-area'>{$control_area_name}</span> <span
class='control'>{$my_control['title']}</span> <span class='date'>Fristdato
{$date_str}</span>",
- 'link' => $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'controller.uicheck_list.add_check_list', 'type' =>
"component", 'control_id' => $my_control['id'], 'location_id' => $location_id,
'component_id' => $component_id, 'deadline_ts' => $deadline_ts))
- );
+ 'text' => "<div
class='title'>{$short_desc_arr}</div><div
class='control-area'>{$control_area_name}</div> <div
class='control'>{$my_control['title']}</div> <div class='date'>Fristdato
{$date_str}</div>",
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.add_check_list', 'type' => "component", 'control_id'
=> $my_control['id'], 'location_id' => $location_id, 'component_id' =>
$component_id, 'deadline_ts' => $deadline_ts))
+ );
}
}
else if($check_list_status == "edit")
{
- $check_list_id = $my_undone_control[3];
- $location_code = $my_undone_control[4];
+ $check_list_id = $my_undone_control[3];
+ $location_code = $my_undone_control[4];
- $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
- $location_name = $location_array["loc1_name"];
+ $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
+ $location_name = $location_array["loc1_name"];
- $portalbox0->data[] = array(
- 'text' => "<span
class='title'>{$location_name}</span><span
class='control-area'>{$control_area_name}</span> <span
class='control'>{$my_control['title']}</span> <span class='date'>Fristdato
{$date_str}</span>",
- 'link' => $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'controller.uicheck_list.edit_check_list',
'check_list_id' => $check_list_id))
- );
- }
+ $portalbox0->data[] = array(
+ 'text' => "<div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div> <div
class='control'>{$my_control['title']}</div> <div class='date'>Fristdato
{$date_str}</div>",
+ 'link' => $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'controller.uicheck_list.edit_check_list',
'check_list_id' => $check_list_id))
+ );
+ }
}
echo "\n".'<!-- BEGIN checklist info -->'."\n <h2 class='heading'>Mine
tildelte kontroller</h2><div
class='home-box'>".$portalbox2->draw()."</div>\n".'<!-- END checklist info
-->'."\n";
-
// ============================== FUNKSJONER
================================
// Sort array on timestamp
function sort_cmp($a, $b)
{
- if ($a[1] == $b[1]) {
- return 0;
- }
+ if ($a[1] == $b[1])
+ {
+ return 0;
+ }
- return ($a[1] < $b[1]) ? -1 : 1;
- }
-
-
\ No newline at end of file
+ return ($a[1] < $b[1]) ? -1 : 1;
+ }
\ No newline at end of file
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-08-31 07:42:36 UTC
(rev 9942)
+++ trunk/controller/templates/base/css/base.css 2012-08-31 07:50:22 UTC
(rev 9943)
@@ -1108,14 +1108,15 @@
}
#control_plan .middle {
- background: none repeat scroll 0 0 #EDF5FF;
- border-color: #DBE5EF;
- border-style: solid solid none;
- border-width: 1px 1px 0;
- clear: both;
- margin-top: 1em;
- overflow: hidden;
- padding: 1em 1em 0;
+ background: none repeat scroll 0 0 #EDF5FF;
+ border-color: #DBE5EF;
+ border-radius: 4px 4px 4px 4px;
+ border-style: solid solid none;
+ border-width: 1px 1px 0;
+ clear: both;
+ margin-top: 1em;
+ overflow: hidden;
+ padding: 1em 1em 0;
}
#control_plan h2 {
@@ -1279,13 +1280,13 @@
}
#cal_wrp {
- background: none repeat scroll 0 0 #EDF5FF;
- border-top: none;
- border-style: solid;
- border-width: 0 1px 1px 1px;
- border-color: #DBE5EF;
- clear: both;
- padding: 0 1em 1em;
+ background: none repeat scroll 0 0 #EDF5FF;
+ border-color: #DBE5EF;
+ border-radius: 4px 4px 4px 4px;
+ border-style: solid;
+ border-width: 0 1px 1px;
+ clear: both;
+ padding: 0 1em 1em;
}
.control_details_wrp div {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9943],
Torstein <=