|
| From: | Torstein |
| Subject: | [Fmsystem-commits] [9200] |
| Date: | Sat, 21 Apr 2012 20:05:34 +0000 |
Revision: 9200
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9200
Author: vator
Date: 2012-04-21 20:05:34 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uicalendar.inc.php
trunk/controller/inc/class.uicontrol.inc.php
trunk/controller/js/controller/ajax.js
trunk/controller/setup/tables_current.inc.php
trunk/controller/templates/base/calendar/view_calendar_month.xsl
trunk/controller/templates/base/calendar/view_calendar_year.xsl
trunk/controller/templates/base/css/base.css
Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php 2012-04-21 19:40:39 UTC
(rev 9199)
+++ trunk/controller/inc/class.uicalendar.inc.php 2012-04-21 20:05:34 UTC
(rev 9200)
@@ -61,6 +61,13 @@
{
parent::__construct();
+ $read =
$GLOBALS['phpgw']->acl->check('.control', PHPGW_ACL_READ, 'controller');//1
+ $add =
$GLOBALS['phpgw']->acl->check('.control', PHPGW_ACL_ADD, 'controller');//2
+ $edit =
$GLOBALS['phpgw']->acl->check('.control', PHPGW_ACL_EDIT, 'controller');//4
+ $delete = $GLOBALS['phpgw']->acl->check('.control',
PHPGW_ACL_DELETE, 'controller');//8
+
+ $manage = $GLOBALS['phpgw']->acl->check('.control',
16, 'controller');//16
+
$this->so = CreateObject('controller.socheck_list');
$this->so_control =
CreateObject('controller.socontrol');
$this->so_control_group =
CreateObject('controller.socontrol_group');
@@ -180,18 +187,26 @@
$from_date_ts = strtotime("01/01/$year");
$to_year = $year + 1;
$to_date_ts = strtotime("01/01/$to_year");
-
- $criteria = array
- (
- 'user_id' =>
$GLOBALS['phpgw_info']['user']['account_id'],
- 'type_id' => 1,
- 'role_id' => 0, // For å begrense til en
bestemt rolle - ellers listes alle roller for brukeren
- 'allrows' => false
- );
+ $manage=false;
+ if($manage)
+ {
+ $locations = execMethod('property.solocation.get_children',
$location_code);
+
+ }else{
+ $criteria = array
+ (
+ 'user_id' =>
$GLOBALS['phpgw_info']['user']['account_id'], //
+ 'type_id' => 1, // Nivå i
bygningsregisteret 1:eiendom
+ 'role_id' => 0, // For å begrense til
en bestemt rolle - ellers listes alle roller for brukeren
+ 'allrows' => false
+ );
- $location_finder = new location_finder();
- $my_locations = $location_finder->get_responsibilities(
$criteria );
+ $location_finder = new location_finder();
+ $my_locations =
$location_finder->get_responsibilities( $criteria );
+ }
+
+ //print_r($my_locations);
if(empty($location_code)){
$location_code =
$my_locations[0]["location_code"];
}
Modified: trunk/controller/inc/class.uicontrol.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol.inc.php 2012-04-21 19:40:39 UTC
(rev 9199)
+++ trunk/controller/inc/class.uicontrol.inc.php 2012-04-21 20:05:34 UTC
(rev 9200)
@@ -78,6 +78,17 @@
{
parent::__construct();
+ $read =
$GLOBALS['phpgw']->acl->check('.control', PHPGW_ACL_READ, 'controller');//1
+ $add =
$GLOBALS['phpgw']->acl->check('.control', PHPGW_ACL_ADD, 'controller');//2
+ $edit =
$GLOBALS['phpgw']->acl->check('.control', PHPGW_ACL_EDIT, 'controller');//4
+ $delete = $GLOBALS['phpgw']->acl->check('.control',
PHPGW_ACL_DELETE, 'controller');//8
+
+ $manage = $GLOBALS['phpgw']->acl->check('.control',
16, 'controller');//16
+
+ //if(!$manage)
+
+
+
$this->so = CreateObject('controller.socontrol');
$this->bo = CreateObject('property.boevent',true);
$this->so_procedure =
CreateObject('controller.soprocedure');
Modified: trunk/controller/js/controller/ajax.js
===================================================================
--- trunk/controller/js/controller/ajax.js 2012-04-21 19:40:39 UTC (rev
9199)
+++ trunk/controller/js/controller/ajax.js 2012-04-21 20:05:34 UTC (rev
9200)
@@ -565,7 +565,7 @@
// Checking that required fields (fields with class required)
is not null
$required_input_fields.each(function() {
- // User has selected a vlaue from select list
+ // User has selected a value from select list
if( $(this).is("select") & $(this).val() == 0 ){
var nextElem = $(this).next();
Modified: trunk/controller/setup/tables_current.inc.php
===================================================================
--- trunk/controller/setup/tables_current.inc.php 2012-04-21 19:40:39 UTC
(rev 9199)
+++ trunk/controller/setup/tables_current.inc.php 2012-04-21 20:05:34 UTC
(rev 9200)
@@ -14,7 +14,7 @@
'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),
- 'location_code' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
+ //'location_code' => array('type' => 'varchar',
'precision' => 30, '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)
Modified: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-04-21 19:40:39 UTC (rev 9199)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-04-21 20:05:34 UTC (rev 9200)
@@ -6,12 +6,10 @@
<div id="main_content">
<div id="control_plan">
- <div class="col_1">
+ <div class="top">
<h1><xsl:value-of
select="location_array/loc1_name"/></h1>
<h3 style="margin:0;font-size:19px;">Kalenderoversikt
for <xsl:value-of select="period"/><span style="margin-left:5px;"><xsl:value-of
select="year"/></span></h3>
- </div>
- <div class="col_2">
<form action="#">
<input type="hidden" name="period_type"
value="view_year" />
<input type="hidden" name="year">
@@ -38,6 +36,10 @@
</xsl:for-each>
</select>
</form>
+ </div>
+
+ <div class="middle">
+
<ul id="icon_color_map">
<li><img height="15"
src="controller/images/status_icon_yellow_ring.png" /><span>Kontroll satt
opp</span></li>
@@ -47,45 +49,7 @@
<li><img height="15"
src="controller/images/status_icon_red_empty.png" /><span>Kontroll gjennomført
med åpne saker</span></li>
<li><img height="15"
src="controller/images/status_icon_red_cross.png" /><span>Kontroll ikke
gjennomført</span></li>
</ul>
- </div>
-
- <div id="cal_wrp">
- <script>
- $(document).ready(function() {
- $(".move_left").click(function(){
- var leftStrVal =
$("#days_view").css("left");
- var leftNumVal =
leftStrVal.substring(0, leftStrVal.indexOf('px'));
-
- if(leftNumVal == -417){
- $("#days_view").stop().animate({
- left: '-=93'
- }, 800);
- }else if(leftNumVal > -417){
- $("#days_view").stop().animate({
- left: '-=417'
- }, 800);
- }
- });
-
- $(".move_right").click(function(){
- var leftStrVal =
$("#days_view").css("left");
- var leftNumVal =
leftStrVal.substring(0, leftStrVal.indexOf('px'));
-
- if( leftNumVal != 0 ){
- if(leftNumVal == -93){
-
$("#days_view").stop().animate({
- left: '+=93'
- }, 800);
- }else if( leftNumVal >= -510 ){
-
$("#days_view").stop().animate({
- left: '+=417'
- }, 800);
- }
- }
- });
- });
- </script>
-
+
<a style="font-weight: bold;font-size:
14px;float:left;">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
@@ -96,210 +60,191 @@
</xsl:attribute>
Årsoversikt
</a>
-
- <!-- ========================= NAVIGATION BETWEEN
FIRST AND LAST 14 DAYS IN DAYS CALENDAR
============================================================= -->
- <div class="nav">
- <a class="move_left" href="#"><img
src="controller/images/arrow_right.png" width="16"/></a>
- <a class="move_right" href="#"><img
src="controller/images/arrow_left.png" width="16"/></a>
- </div>
+ </div>
+
+
+ <div id="cal_wrp">
+
<ul class="calendar month">
<li class="heading">
- <div class="id">ID</div>
- <div class="title">Tittel</div>
- <div class="assigned">Tildelt</div>
- <div class="date">Startdato</div>
- <div class="date">Sluttdato</div>
- <div
class="frequency">Frekvenstype</div>
- <div
class="frequency">Frekvensintervall</div>
+ <div class="control_details_wrp">
+ <div class="title">Tittel</div>
+ <div
class="assigned">Tildelt</div>
+ <div
class="frequency">Frekvens</div>
+ </div>
+ <div class="days_wrp">
+ <xsl:for-each
select="heading_array">
+ <div><xsl:value-of
select="."/></div>
+ </xsl:for-each>
+ </div>
</li>
<xsl:choose>
<xsl:when
test="controls_calendar_array/child::node()">
<xsl:for-each select="controls_calendar_array">
- <li>
- <div class="id">
- <xsl:value-of
select="control/id"/>
- </div>
+
+ <li>
+ <xsl:choose>
+ <xsl:when test="(position() mod 2) !=
1">
+ <xsl:attribute
name="class">odd</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute
name="class">even</xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ <div class="control_details_wrp">
<div class="title">
<xsl:value-of
select="control/title"/>
</div>
<div class="assigned">
<xsl:value-of
select="control/responsibility_name"/>
</div>
- <div class="date">
- <xsl:value-of
select="php:function('date', $date_format, number(control/start_date))"/>
- </div>
- <div class="date">
- <xsl:choose>
- <xsl:when
test="control/end_date != 0">
- <xsl:value-of
select="php:function('date', $date_format, number(control/end_date))"/>
- </xsl:when>
- <xsl:otherwise>
- Løpende
- </xsl:otherwise>
- </xsl:choose>
- </div>
<div class="frequency">
<xsl:value-of
select="control/repeat_type"/>
- </div>
- <div class="frequency">
<xsl:value-of
select="control/repeat_interval"/>
- </div>
- </li>
+ </div>
+
+ </div>
+ <div class="days_wrp">
+ <xsl:for-each select="calendar_array">
+ <xsl:choose>
+ <xsl:when test="status
= 'CONTROL_REGISTERED'">
+ <div>
+ <a>
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
+
<xsl:text>&date=</xsl:text>
+
<xsl:value-of select="info/date"/>
+
<xsl:text>&control_id=</xsl:text>
+
<xsl:value-of select="info/control_id"/>
+
<xsl:text>&location_code=</xsl:text>
+
<xsl:value-of select="$location_code"/>
+
</xsl:attribute>
+ <img
height="15" src="controller/images/status_icon_yellow_ring.png" />
+ </a>
+ </div>
+ </xsl:when>
+ <xsl:when test="status
= 'CONTROL_PLANNED'">
+ <div>
+ <a>
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="info/check_list_id"/>
+
</xsl:attribute>
+ <img
height="15" src="controller/images/status_icon_yellow.png" />
+ </a>
+ </div>
+ </xsl:when>
+ <xsl:when test="status
= 'CONTROL_NOT_DONE_WITH_PLANNED_DATE'">
+ <div>
+ <a>
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="info/check_list_id"/>
+
</xsl:attribute>
+ <img
height="15" src="controller/images/status_red_cross.png" />
+ </a>
+ </div>
+ </xsl:when>
+ <xsl:when test="status
= 'CONTROL_DONE_IN_TIME_WITHOUT_ERRORS'">
+ <div>
+ <a>
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.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:value-of select="info/id"/></span>
+
<img height="15" src="controller/images/status_icon_dark_green.png" />
+ </a>
+ </div>
+ </xsl:when>
+ <xsl:when test="status
= 'CONTROL_DONE_OVER_TIME_WITHOUT_ERRORS'">
+ <div
style="position:relative;">
+ <div
id="info_box"></div>
+ <a>
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.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:value-of select="info/id"/></span>
+
<img height="15" src="controller/images/status_icon_light_green.png" />
+ </a>
+ </div>
+ </xsl:when>
+ <xsl:when test="status
= 'control_accomplished_with_errors'">
+ <div
style="position:relative;background:
url(controller/images/status_icon_red_empty.png) no-repeat 50% 50%;">
+ <div
id="info_box"></div>
+ <a
class="view_check_list">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.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>
+
<xsl:value-of select="info/num_open_cases"/>
+ </a>
+ </div>
+ </xsl:when>
+ <xsl:when test="status
= 'control_not_accomplished_with_info'">
+ <div
style="position:relative;">
+ <div
id="info_box"></div>
+ <a>
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.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:value-of select="info/id"/></span>
+
<img height="15" src="controller/images/status_icon_red_cross.png" />
+ </a>
+ </div>
+ </xsl:when>
+ <xsl:when test="status
= 'control_not_accomplished'">
+ <div>
+ <a>
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
+
<xsl:text>&date=</xsl:text>
+
<xsl:value-of select="info/date"/>
+
<xsl:text>&control_id=</xsl:text>
+
<xsl:value-of select="info/control_id"/>
+
<xsl:text>&location_code=</xsl:text>
+
<xsl:value-of select="$location_code"/>
+
</xsl:attribute>
+
<img height="15" src="controller/images/status_icon_red_cross.png" />
+ </a>
+ </div>
+ </xsl:when>
+ <xsl:when test="status
= 'control_canceled'">
+ <div>
+ <img
height="15" src="controller/images/status_icon_red_cross.png" />
+ </div>
+ </xsl:when>
+ <xsl:otherwise>
+ <div></div>
+ </xsl:otherwise>
+ </xsl:choose>
+
</xsl:for-each>
+ </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">
- <ul id="days_view" class="calendar days">
- <li class="heading">
- <xsl:for-each
select="heading_array">
- <div
class="cell"><xsl:value-of select="."/></div>
- </xsl:for-each>
- </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">
- <xsl:choose>
-
<xsl:when test="status = 'CONTROL_REGISTERED'">
-
<div class="cell">
-
<a>
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
-
<xsl:text>&date=</xsl:text>
-
<xsl:value-of select="info/date"/>
-
<xsl:text>&control_id=</xsl:text>
-
<xsl:value-of select="info/control_id"/>
-
<xsl:text>&location_code=</xsl:text>
-
<xsl:value-of select="$location_code"/>
-
</xsl:attribute>
-
<img height="15"
src="controller/images/status_icon_yellow_ring.png" />
-
</a>
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'CONTROL_PLANNED'">
-
<div class="cell">
-
<a>
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="info/check_list_id"/>
-
</xsl:attribute>
-
<img height="15" src="controller/images/status_icon_yellow.png"
/>
-
</a>
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'CONTROL_NOT_DONE_WITH_PLANNED_DATE'">
-
<div class="cell">
-
<a>
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="info/check_list_id"/>
-
</xsl:attribute>
-
<img height="15" src="controller/images/status_red_cross.png" />
-
</a>
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'CONTROL_DONE_IN_TIME_WITHOUT_ERRORS'">
-
<div class="cell">
-
<a>
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.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:value-of
select="info/id"/></span>
-
<img height="15"
src="controller/images/status_icon_dark_green.png" />
-
</a>
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'CONTROL_DONE_OVER_TIME_WITHOUT_ERRORS'">
-
<div class="cell" style="position:relative;">
-
<div id="info_box"></div>
-
<a>
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.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:value-of
select="info/id"/></span>
-
<img height="15"
src="controller/images/status_icon_light_green.png" />
-
</a>
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'control_accomplished_with_errors'">
-
<div class="cell" style="position:relative;background:
url(controller/images/status_icon_red_empty.png) no-repeat 50% 50%;">
-
<div id="info_box"></div>
-
<a class="view_check_list">
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.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>
-
<xsl:value-of select="info/num_open_cases"/>
-
</a>
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'control_not_accomplished_with_info'">
-
<div class="cell" style="position:relative;">
-
<div id="info_box"></div>
-
<a>
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.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:value-of
select="info/id"/></span>
-
<img height="15"
src="controller/images/status_icon_red_cross.png" />
-
</a>
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'control_not_accomplished'">
-
<div class="cell">
-
<a>
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
-
<xsl:text>&date=</xsl:text>
-
<xsl:value-of select="info/date"/>
-
<xsl:text>&control_id=</xsl:text>
-
<xsl:value-of select="info/control_id"/>
-
<xsl:text>&location_code=</xsl:text>
-
<xsl:value-of select="$location_code"/>
-
</xsl:attribute>
-
<img height="15"
src="controller/images/status_icon_red_cross.png" />
-
</a>
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'control_canceled'">
-
<div class="cell">
-
<img height="15"
src="controller/images/status_icon_red_cross.png" />
-
</div>
-
</xsl:when>
-
<xsl:otherwise>
-
<div class="cell"></div>
-
</xsl:otherwise>
-
</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>
+ </ul>
</div>
+ </div>
</div>
-</div>
</xsl:template>
Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-04-21 19:40:39 UTC (rev 9199)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-04-21 20:05:34 UTC (rev 9200)
@@ -7,7 +7,7 @@
<div id="main_content">
<div id="control_plan">
- <div class="col_1">
+ <div class="top">
<xsl:choose>
<xsl:when test="show_location">
<h1><xsl:value-of
select="control_name"/></h1>
@@ -17,9 +17,6 @@
</xsl:otherwise>
</xsl:choose>
<h3 style="margin:0;font-size:19px;">Kalenderoversikt
for <xsl:value-of select="period"/></h3>
- </div>
-
- <div class="col_2">
<xsl:choose>
<xsl:when test="show_location"> </xsl:when>
<xsl:otherwise>
@@ -51,6 +48,10 @@
</form>
</xsl:otherwise>
</xsl:choose>
+ </div>
+
+ <div class="middle">
+
<ul id="icon_color_map">
<li><img height="15"
src="controller/images/status_icon_yellow_ring.png" /><span>Kontroll satt
opp</span></li>
@@ -61,18 +62,18 @@
<li><img height="15"
src="controller/images/status_icon_red_cross.png" /><span>Kontroll ikke
gjennomført</span></li>
</ul>
</div>
-
+ <div id="cal_wrp">
<ul class="calendar">
<li class="heading">
+ <div class="control_details_wrp">
<xsl:if test="show_location">
<div
class="location">Lokasjon</div>
</xsl:if>
<div class="title">Tittel</div>
<div class="assigned">Tildelt</div>
- <div class="date">Start dato</div>
- <div class="date">Slutt dato</div>
<div class="frequency">Frekvens</div>
- <div class="months">
+ </div>
+ <div class="months_wrp">
<xsl:for-each select="heading_array">
<div>
<a>
@@ -97,7 +98,18 @@
<xsl:for-each select="controls_calendar_array">
<xsl:variable
name="control_id"><xsl:value-of select="control/id"/></xsl:variable>
- <li>
+
+ <li>
+ <xsl:choose>
+ <xsl:when test="(position() mod 2) !=
1">
+ <xsl:attribute
name="class">odd</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute
name="class">even</xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ <div class="control_details_wrp">
<xsl:if test="//show_location">
<div class="location">
<xsl:value-of
select="control/location_name"/>
@@ -109,23 +121,12 @@
<div class="assigned">
<xsl:value-of
select="control/responsibility_name"/>
</div>
- <div class="date">
- <xsl:value-of
select="php:function('date', $date_format, number(control/start_date))"/>
- </div>
- <div class="date">
- <xsl:choose>
- <xsl:when
test="control/end_date != 0">
- <xsl:value-of
select="php:function('date', $date_format, number(control/end_date))"/>
- </xsl:when>
- <xsl:otherwise>
- Løpende
- </xsl:otherwise>
- </xsl:choose>
- </div>
+
<div class="frequency">
<xsl:value-of
select="control/repeat_type_label"/>
- </div>
- <div class="months">
+ </div>
+ </div>
+ <div class="months_wrp">
<xsl:for-each
select="calendar_array">
<xsl:choose>
<xsl:when test="status = 'CONTROL_REGISTERED'">
@@ -254,6 +255,7 @@
</xsl:otherwise>
</xsl:choose>
</ul>
+ </div>
</div>
</div>
</xsl:template>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-04-21 19:40:39 UTC
(rev 9199)
+++ trunk/controller/templates/base/css/base.css 2012-04-21 20:05:34 UTC
(rev 9200)
@@ -908,104 +908,119 @@
}
/* ====================== CALENDAR ========================== */
+#control_plan .top {
+ overflow: hidden;
+}
-#control_plan .col_1 {
- float: left;
- height: 240px;
- width: 600px;
+#control_plan .top h3{
+ float:left;
}
+#control_plan .top form{
+ float:right;
+}
+#control_plan .middle {
+ border: 1px solid #DBE5EF;
+ background: none repeat scroll 0 0 #EDF5FF;
+ clear: both;
+ margin-top: 1em;
+ overflow: hidden;
+ padding: 1em;
+}
+/* === COLOR MAP === */
-#control_plan .col_2 {
+ul#icon_color_map {
+ background: none repeat scroll 0 0 #F4EDE3;
+ border: 1px solid #F2E4CF;
+ border-radius: 5px 5px 5px 5px;
float: right;
- margin-top: 40px;
- width: 330px;
+ padding: 5px;
}
+ul#icon_color_map li {
+ font-size: 12px;
+ padding: 3px 10px;
+}
+ul#icon_color_map span{
+ margin-left: 10px;
+}
+
+
+
+
+
ul.calendar li{
clear:left;
}
-ul.calendar li.heading div {
+ul.calendar li.heading {
font-weight: bold;
- font-size:16px;
+ font-size:15px;
}
-ul.calendar {
- clear: both;
- float: left;
- margin-top: 30px;
- width: 100%;
+.control_details_wrp div{
+ width: 100px;
+ float:left;
}
-ul.calendar.month {
- margin-top: 0;
- width: 60%;
-}
-ul.calendar li div {
+.days_wrp div {
float: left;
- width: 30px;
- padding: 3px;
+ font-size: 13px;
+ height: 30px;
text-align: center;
+ width: 21px;
}
-#cal_wrp {
- clear: both;
+.months_wrp div {
float: left;
- margin-top: 30px;
- width: 100%;
+ height: 30px;
+ text-align: center;
+ width: 52px;
}
-#cal_wrp .nav{
- padding: 1% 0;
+ul.calendar li {
+ height: 30px;
+ padding: 7px 0;
}
-a.move_left{
- float: right;
+
+ul.calendar li.even {
+ background: none repeat scroll 0 0 #DEEAF8;
}
-a.move_right {
- float: right;
- margin-right: 34%;
+#cal_wrp {
+ border: 1px solid #DBE5EF;
+ background: none repeat scroll 0 0 #EDF5FF;
+ border-top: none;
+ clear: both;
+ padding: 1em;
}
-#days_wrp {
- float: right;
- height: 800px;
- overflow-x: hidden;
- position: relative;
- width: 37%;
+.control_details_wrp div{
+ float:left;
}
-ul.calendar.days li div.cell {
- height: 17px;
- width: 24px;
+.control_details_wrp div {
+ float: left;
+ height: 30px;
+ padding: 0 10px;
}
-ul.calendar.days {
- position: absolute;
- width: 1120px;
- margin-top:0;
+.control_details_wrp div.title {
+ width: 200px;
}
-ul.calendar li div.date, ul.calendar.info div.date {
- width: 80px;
-}
-ul.calendar div.title, ul.calendar.info div.title {
- width: 200px;
-}
-ul.calendar div.title {
- width: 150px;
-}
ul.calendar div.location {
width: 150px;
text-align: left;
}
-ul.calendar div.assigned {
- width: 80px;
- text-align: left;
+.control_details_wrp div.assigned {
+ text-align: left;
+ width: 115px;
}
-ul.calendar div.id, ul.calendar.info div.id {
- width: 20px;
+.control_details_wrp div.frequency {
+ width: 130x;
}
+
ul.calendar div.title{
text-align: left;
}
ul.calendar .heading div.title{
text-align: center;
}
-ul.calendar div.frequency, ul.calendar.info div.frequency {
- width: 100px;
+ul.calendar div.frequency {
+ margin-right: 10px;
+ width: 65px;
}
-.months a.view_check_list {
+.months_wrp a.view_check_list {
width: 30px;
}
.cal_info_msg{
@@ -1013,20 +1028,7 @@
padding: 40px 20px;
}
-/* ====================== CALENDAR COLOR MAP ========================== */
-ul#icon_color_map {
- border: 1px solid #DDDDDD;
- padding: 5px;
- margin-top: 40px;
-}
-ul#icon_color_map li {
- font-size: 12px;
- padding: 3px 10px;
-}
-ul#icon_color_map span{
- margin-left: 10px;
-}
/* ====================== CALENDAR DATES ========================== */
@@ -1166,18 +1168,7 @@
.check_items.expand_list h4{
font-size: 15px;
}
-#days_view div{
- font-weight:bold;
-}
-.calendar .months {
- margin-left: 20px;
- width: 440px;
- padding:0;
-}
-.calendar .heading a{
- text-decoration: none;
- color:#000;
-}
+
.not_active{
opacity:0.5;
}
@@ -1292,12 +1283,29 @@
z-index: 2;
background:#aaa;
}
-#curtain{
- display:none;
- position:absolute;
+#curtain {
+ background: none repeat scroll 0 0 #000000;
+ display: none;
+ height: 100%;
+ left: 0;
+ opacity: 0.5;
+ position: absolute;
+ top: 0;
+ width: 100%;
z-index: 1;
}
+#popupBox {
+ background: none repeat scroll 0 0 #fff;
+ display: none;
+ height: 300px;
+ left: 300px;
+ position: absolute;
+ top: 200px;
+ width: 300px;
+ z-index: 2;
+}
+
/* ================================== CHECK LIST
================================== */
#main_content.medium {
| [Prev in Thread] | Current Thread | [Next in Thread] |