[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9353]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9353] |
|
Date: |
Thu, 10 May 2012 08:50:40 +0000 |
Revision: 9353
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9353
Author: vator
Date: 2012-05-10 08:50:40 +0000 (Thu, 10 May 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.socontrol_group.inc.php
trunk/controller/inc/class.uicalendar.inc.php
trunk/controller/inc/component/class.month_calendar.inc.php
trunk/controller/templates/base/calendar/check_list_status_checker.xsl
trunk/controller/templates/base/calendar/view_calendar_month.xsl
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
trunk/controller/templates/base/calendar/view_calendar_year.xsl
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
trunk/controller/templates/base/css/base.css
Modified: trunk/controller/inc/class.socontrol_group.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_group.inc.php 2012-05-10 08:31:06 UTC
(rev 9352)
+++ trunk/controller/inc/class.socontrol_group.inc.php 2012-05-10 08:50:40 UTC
(rev 9353)
@@ -103,7 +103,6 @@
'building_part_id = ' .
$this->marshal($control_group->get_building_part_id(), 'string')
);
- //var_dump('UPDATE activity_activity SET ' . join(',',
$values) . " WHERE id=$id");
$result = $this->db->query('UPDATE
controller_control_group SET ' . join(',', $values) . " WHERE id=$id",
__LINE__,__FILE__);
return isset($result);
@@ -121,7 +120,6 @@
$joins = " {$this->left_join} fm_building_part ON
(p.building_part_id = fm_building_part.id)";
$joins .= " {$this->left_join} controller_procedure
ON (p.procedure_id = controller_procedure.id)";
- //$joins .= " {$this->left_join}
controller_control_area ON (p.control_area_id = controller_control_area.id)";
$sql = "SELECT p.*, fm_building_part.descr AS
building_part_descr, controller_procedure.title as procedure_title FROM
controller_control_group p {$joins} WHERE p.id = " . $id;
$this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
@@ -134,7 +132,6 @@
$control_group->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
$category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id', 'int')));
$control_group->set_control_area_name($category[0]['name']);
-
//$control_group->set_control_area_name($this->unmarshal($this->db->f('control_area_name'),
'string'));
$control_group->set_building_part_id($this->unmarshal($this->db->f('building_part_id'),
'string'));
$control_group->set_building_part_descr($this->unmarshal($this->db->f('building_part_descr'),
'string'));
Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php 2012-05-10 08:31:06 UTC
(rev 9352)
+++ trunk/controller/inc/class.uicalendar.inc.php 2012-05-10 08:50:40 UTC
(rev 9353)
@@ -90,18 +90,9 @@
$year = intval( $year );
$from_month = intval( $month );
- $from_date_ts = strtotime("$from_month/01/$year");
-
- if(($from_month + 1) > 12){
- $to_month = 1;
- $to_year = $year + 1;
- }else{
- $to_month = $from_month + 1;
- $to_year = $year;
- }
-
- $to_date_ts = strtotime("$to_month/01/$to_year");
-
+ $from_date_ts =
month_calendar::get_start_month_date_ts($year, $month);
+ $to_date_ts =
month_calendar::get_end_month_date_ts($year, $month);
+
$criteria = array
(
'user_id' =>
$GLOBALS['phpgw_info']['user']['account_id'],
@@ -342,7 +333,7 @@
{
$locations_for_control_array =
$this->so_control->get_locations_for_control($control_id);
}
-
+
if(empty($year)){
$year = intval( date("Y") );
}
@@ -351,20 +342,9 @@
$month = date("n");
}
- $from_month = $month;
+ $from_date_ts =
month_calendar::get_start_month_date_ts($year, $month);
+ $to_date_ts =
month_calendar::get_end_month_date_ts($year, $month);
- $from_date_ts = strtotime("$from_month/01/$year");
-
- if(($from_month + 1) > 12){
- $to_month = 1;
- $to_year = $year + 1;
- }else{
- $to_month = $from_month + 1;
- $to_year = $year;
- }
-
- $to_date_ts = strtotime("$to_month/01/$to_year");
-
$locations_with_calendar_array = array();
foreach($locations_for_control_array as $location){
Modified: trunk/controller/inc/component/class.month_calendar.inc.php
===================================================================
--- trunk/controller/inc/component/class.month_calendar.inc.php 2012-05-10
08:31:06 UTC (rev 9352)
+++ trunk/controller/inc/component/class.month_calendar.inc.php 2012-05-10
08:50:40 UTC (rev 9353)
@@ -69,6 +69,19 @@
}
}
+ public function build_calendar( $check_lists_array ){
+
+ foreach($check_lists_array as $check_list){
+ $check_list_status_manager = new
check_list_status_manager( $check_list );
+ $check_list_status_info =
$check_list_status_manager->get_status_for_check_list();
+
+ $this->calendar_array[ date("j",
$check_list->get_deadline()) ]["status"] =
$check_list_status_info->get_status();
+ $this->calendar_array[ date("j",
$check_list->get_deadline()) ]["info"] = $check_list_status_info->serialize();
+ }
+
+ return $this->calendar_array;
+ }
+
public static function get_heading_array($year, $month){
$num_days_in_month = cal_days_in_month(CAL_GREGORIAN, $month,
$year);
$heading_array = array();
@@ -80,24 +93,28 @@
return $heading_array;
}
+ public static function get_start_month_date_ts($year, $from_month){
+ return strtotime("$from_month/01/$year");
+ }
+
+ public static function get_end_month_date_ts($year, $from_month){
+ if(($from_month + 1) > 12){
+ $to_month = 1;
+ $to_year = $year + 1;
+ }else{
+ $to_month = $from_month + 1;
+ $to_year = $year;
+ }
+
+ $to_date_ts = strtotime("$to_month/01/$to_year");
+
+ return $to_date_ts;
+ }
+
public static function get_month_name($month){
$month_array = array("Januar", "Februar", "Mars", "April",
"Mai", "Juni", "Juli", "August", "September", "Oktober", "November",
"Desember");
return $month_array[$month];
}
-
- // Function that puts checklists into a twelve months array for
displaying a year or a days array for displaying a month
- public function build_calendar( $check_lists_array ){
-
- foreach($check_lists_array as $check_list){
- $check_list_status_manager = new
check_list_status_manager( $check_list );
- $check_list_status_info =
$check_list_status_manager->get_status_for_check_list();
-
- $this->calendar_array[ date("j",
$check_list->get_deadline()) ]["status"] =
$check_list_status_info->get_status();
- $this->calendar_array[ date("j",
$check_list->get_deadline()) ]["info"] = $check_list_status_info->serialize();
- }
-
- return $this->calendar_array;
- }
}
\ No newline at end of file
Modified: trunk/controller/templates/base/calendar/check_list_status_checker.xsl
===================================================================
--- trunk/controller/templates/base/calendar/check_list_status_checker.xsl
2012-05-10 08:31:06 UTC (rev 9352)
+++ trunk/controller/templates/base/calendar/check_list_status_checker.xsl
2012-05-10 08:50:40 UTC (rev 9353)
@@ -6,7 +6,7 @@
<xsl:choose>
<xsl:when test="status = 'CONTROL_REGISTERED'">
- <div>
+ <td>
<a>
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
@@ -19,10 +19,10 @@
</xsl:attribute>
<img height="15"
src="controller/images/status_icon_yellow_ring.png" />
</a>
- </div>
+ </td>
</xsl:when>
<xsl:when test="status = 'CONTROL_PLANNED'">
- <div>
+ <td>
<a>
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
@@ -31,10 +31,10 @@
</xsl:attribute>
<img height="15"
src="controller/images/status_icon_yellow.png" />
</a>
- </div>
+ </td>
</xsl:when>
<xsl:when test="status = 'CONTROL_NOT_DONE'">
- <div>
+ <td>
<a>
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
@@ -47,10 +47,10 @@
</xsl:attribute>
<img height="15"
src="controller/images/status_icon_red_cross.png" />
</a>
- </div>
+ </td>
</xsl:when>
<xsl:when test="status =
'CONTROL_NOT_DONE_WITH_PLANNED_DATE'">
- <div>
+ <td>
<a>
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
@@ -59,10 +59,10 @@
</xsl:attribute>
<img height="15"
src="controller/images/status_icon_red_cross.png" />
</a>
- </div>
+ </td>
</xsl:when>
<xsl:when test="status =
'CONTROL_DONE_IN_TIME_WITHOUT_ERRORS'">
- <div>
+ <td>
<a>
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
@@ -72,63 +72,70 @@
<span
style="display:none"><xsl:value-of select="info/id"/></span>
<img height="15"
src="controller/images/status_icon_dark_green.png" />
</a>
- </div>
+ </td>
</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_DONE_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_info_box">
- <xsl:attribute name="href">
+ <td>
+ <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: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>
+ <span
style="display:none"><xsl:value-of select="info/id"/></span>
+ <img height="15"
src="controller/images/status_icon_light_green.png" />
+ </a>
+ </div>
+ </td>
</xsl:when>
+ <xsl:when test="status = 'CONTROL_DONE_WITH_ERRORS'">
+ <td>
+ <div class="info_box_wrp">
+ <div id="info_box"></div>
+ <a class="view_info_box">
+ <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>
+ </td>
+ </xsl:when>
<xsl:when test="status = 'CONTROLS_DONE_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_info_box">
- <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"/>
- </a>
- </div>
+ <td>
+ <div class="info_box_wrp">
+ <div id="info_box"></div>
+ <a class="view_info_box">
+ <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"/>
+ </a>
+ </div>
+ </td>
</xsl:when>
<xsl:when test="status = 'CONTROL_CANCELED'">
- <div>
+ <td>
<img height="15"
src="controller/images/status_icon_red_cross.png" />
- </div>
+ </td>
</xsl:when>
<xsl:otherwise>
- <div></div>
+ <td></td>
</xsl:otherwise>
</xsl:choose>
Modified: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-05-10 08:31:06 UTC (rev 9352)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-05-10 08:50:40 UTC (rev 9353)
@@ -75,24 +75,20 @@
<div id="cal_wrp">
- <ul class="calendar month">
- <li class="heading">
- <div class="control_details_wrp">
- <div
class="title"><span>Tittel</span></div>
- <div
class="assigned"><span>Tildelt</span></div>
- <div
class="frequency"><span>Frekvens</span></div>
- </div>
- <div class="days_wrp">
+ <table id="calendar" class="month">
+ <tr class="heading">
+ <th
class="title"><span>Tittel</span></th>
+ <th
class="assigned"><span>Tildelt</span></th>
+ <th
class="frequency"><span>Frekvens</span></th>
<xsl:for-each
select="heading_array">
-
<div><span><xsl:value-of select="."/></span></div>
+ <th><span><xsl:value-of
select="."/></span></th>
</xsl:for-each>
- </div>
- </li>
+ </tr>
<xsl:choose>
<xsl:when
test="controls_calendar_array/child::node()">
<xsl:for-each select="controls_calendar_array">
- <li>
+ <tr>
<xsl:choose>
<xsl:when test="(position() mod 2) !=
1">
<xsl:attribute
name="class">odd</xsl:attribute>
@@ -102,22 +98,19 @@
</xsl:otherwise>
</xsl:choose>
- <div class="control_details_wrp">
- <div class="title">
+ <td class="title">
<span><xsl:value-of
select="control/title"/></span>
- </div>
- <div class="assigned">
+ </td>
+ <td class="assigned">
<span><xsl:value-of
select="control/responsibility_name"/></span>
- </div>
- <div class="frequency">
+ </td>
+ <td class="frequency">
<span>
<xsl:value-of
select="control/repeat_type_label"/>
<xsl:value-of
select="control/repeat_interval"/>
</span>
- </div>
+ </td>
- </div>
- <div class="days_wrp">
<xsl:for-each select="calendar_array">
<xsl:call-template
name="check_list_status_checker" >
@@ -125,17 +118,16 @@
</xsl:call-template>
</xsl:for-each>
- </div>
- </li>
+ </tr>
</xsl:for-each>
</xsl:when>
<xsl:otherwise>
- <div class="cal_info_msg">Ingen
sjekklister for bygg i angitt periode</div>
+ <tr class="cal_info_msg"><td
colspan="10">Ingen sjekklister for bygg i angitt periode</td></tr>
</xsl:otherwise>
</xsl:choose>
- </ul>
+ </table>
</div>
</div>
</div>
Modified:
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
===================================================================
---
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
2012-05-10 08:31:06 UTC (rev 9352)
+++
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
2012-05-10 08:50:40 UTC (rev 9353)
@@ -32,14 +32,13 @@
<xsl:call-template name="icon_color_map" />
</div>
<div id="cal_wrp">
- <ul class="calendar">
- <li class="heading">
- <div class="control_details_wrp">
- <div
class="location">Lokasjon</div>
- </div>
- <div class="days_wrp">
+ <table id="calendar">
+ <tr>
+ <th class="control_details_wrp">
+ <span
class="location">Lokasjon</span>
+ </th>
<xsl:for-each
select="heading_array">
- <div>
+ <th>
<a>
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
@@ -50,16 +49,15 @@
</xsl:attribute>
<xsl:value-of select="."/>
</a>
- </div>
+ </th>
</xsl:for-each>
- </div>
- </li>
+ </tr>
<xsl:choose>
<xsl:when
test="locations_with_calendar_array/child::node()">
<xsl:for-each
select="locations_with_calendar_array">
- <li>
+ <tr>
<xsl:choose>
<xsl:when test="(position() mod
2) != 1">
<xsl:attribute
name="class">odd</xsl:attribute>
@@ -69,26 +67,28 @@
</xsl:otherwise>
</xsl:choose>
- <div class="control_details_wrp">
- <div class="location">
- <xsl:value-of
select="location"/>
- </div>
- </div>
- <div class="days_wrp">
+ <th>
+ <span
class="location">Lokasjonskode</span>
+ </th>
+ <th>
+ <span
class="location">Lokasjonsnavn</span>
+ </th>
+ <th>
+ <span
class="location">Adresse</span>
+ </th>
<xsl:for-each
select="calendar_array">
<xsl:call-template name="check_list_status_checker" >
<xsl:with-param name="location_code"><xsl:value-of
select="//location"/></xsl:with-param>
</xsl:call-template>
</xsl:for-each>
- </div>
- </li>
+ </tr>
</xsl:for-each>
</xsl:when>
<xsl:otherwise>
- <div class="cal_info_msg">Ingen sjekklister for
bygg i angitt periode</div>
+ <tr class="cal_info_msg"><td colspan="10">Ingen
sjekklister for bygg i angitt periode</td></tr>
</xsl:otherwise>
</xsl:choose>
- </ul>
+ </table>
</div>
</div>
</div>
Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-10 08:31:06 UTC (rev 9352)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-10 08:50:40 UTC (rev 9353)
@@ -45,16 +45,13 @@
</div>
<div id="cal_wrp">
- <ul class="calendar">
- <li class="heading">
- <div class="control_details_wrp">
- <div
class="title"><span>Tittel</span></div>
- <div
class="assigned"><span>Tildelt</span></div>
- <div
class="frequency"><span>Frekvens</span></div>
- </div>
- <div class="months_wrp">
+ <table id="calendar">
+ <tr class="heading">
+ <th
class="title"><span>Tittel</span></th>
+ <th
class="assigned"><span>Tildelt</span></th>
+ <th
class="frequency"><span>Frekvens</span></th>
<xsl:for-each select="heading_array">
- <div>
+ <th>
<a>
<xsl:attribute
name="href">
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
@@ -67,10 +64,9 @@
</xsl:attribute>
<xsl:value-of
select="."/>
</a>
- </div>
+ </th>
</xsl:for-each>
- </div>
- </li>
+ </tr>
<xsl:choose>
<xsl:when
test="controls_calendar_array/child::node()">
@@ -78,7 +74,7 @@
<xsl:for-each select="controls_calendar_array">
<xsl:variable
name="control_id"><xsl:value-of select="control/id"/></xsl:variable>
- <li>
+ <tr>
<xsl:choose>
<xsl:when test="(position() mod
2) != 1">
<xsl:attribute
name="class">odd</xsl:attribute>
@@ -87,38 +83,28 @@
<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"/>
- </div>
- </xsl:if>
- <div class="title">
+ <td class="title">
<span><xsl:value-of
select="control/title"/></span>
- </div>
- <div class="assigned">
+ </td>
+ <td class="assigned">
<span><xsl:value-of
select="control/responsibility_name"/></span>
- </div>
- <div class="frequency">
+ </td>
+ <td class="frequency">
<span><xsl:value-of
select="control/repeat_type_label"/></span>
- </div>
- </div>
- <div class="months_wrp">
+ </td>
<xsl:for-each
select="calendar_array">
<xsl:call-template name="check_list_status_checker" >
<xsl:with-param name="location_code"><xsl:value-of
select="$view_location_code"/></xsl:with-param>
</xsl:call-template>
</xsl:for-each>
- </div>
- </li>
+ </tr>
</xsl:for-each>
</xsl:when>
<xsl:otherwise>
- <div class="cal_info_msg">Ingen sjekklister for
bygg i angitt periode</div>
+ <tr class="cal_info_msg"><td colspan="10">Ingen
sjekklister for bygg i angitt periode</td></tr>
</xsl:otherwise>
</xsl:choose>
- </ul>
+ </table>
</div>
</div>
</div>
Modified:
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
===================================================================
---
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
2012-05-10 08:31:06 UTC (rev 9352)
+++
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
2012-05-10 08:50:40 UTC (rev 9353)
@@ -32,14 +32,19 @@
<xsl:call-template name="icon_color_map" />
</div>
<div id="cal_wrp">
- <ul class="calendar">
- <li class="heading">
- <div class="control_details_wrp">
- <div
class="location">Lokasjon</div>
- </div>
- <div class="months_wrp">
+ <table id="calendar">
+ <tr>
+ <th>
+ <span
class="location">Lokasjonskode</span>
+ </th>
+ <th>
+ <span
class="location">Lokasjonsnavn</span>
+ </th>
+ <th>
+ <span
class="location">Adresse</span>
+ </th>
<xsl:for-each
select="heading_array">
- <div>
+ <th>
<a>
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
@@ -50,16 +55,15 @@
</xsl:attribute>
<xsl:value-of select="."/>
</a>
- </div>
+ </th>
</xsl:for-each>
- </div>
- </li>
+ </tr>
<xsl:choose>
<xsl:when
test="locations_with_calendar_array/child::node()">
<xsl:for-each
select="locations_with_calendar_array">
- <li>
+ <tr>
<xsl:choose>
<xsl:when test="(position() mod
2) != 1">
<xsl:attribute
name="class">odd</xsl:attribute>
@@ -69,26 +73,28 @@
</xsl:otherwise>
</xsl:choose>
- <div class="control_details_wrp">
- <div class="location">
- <xsl:value-of
select="location"/>
- </div>
- </div>
- <div class="months_wrp">
+ <td class="location">
+ <xsl:value-of
select="location"/>
+ </td>
+ <td class="location">
+ <xsl:value-of
select="location"/>
+ </td>
+ <td class="location">
+ <xsl:value-of
select="location"/>
+ </td>
<xsl:for-each
select="calendar_array">
<xsl:call-template name="check_list_status_checker" >
<xsl:with-param name="location_code"><xsl:value-of
select="//location"/></xsl:with-param>
</xsl:call-template>
</xsl:for-each>
- </div>
- </li>
+ </tr>
</xsl:for-each>
</xsl:when>
<xsl:otherwise>
- <div class="cal_info_msg">Ingen sjekklister for
bygg i angitt periode</div>
+ <tr class="cal_info_msg"><td colspan="10">Ingen
sjekklister for bygg i angitt periode</td></tr>
</xsl:otherwise>
</xsl:choose>
- </ul>
+ </table>
</div>
</div>
</div>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-05-10 08:31:06 UTC
(rev 9352)
+++ trunk/controller/templates/base/css/base.css 2012-05-10 08:50:40 UTC
(rev 9353)
@@ -949,42 +949,22 @@
ul#icon_color_map span{
margin-left: 10px;
}
-
-
-
-
-
-
-ul.calendar li{
- clear:left;
+#calendar {
+ width: 100%
}
-ul.calendar li.heading {
+#calendar th {
font-weight: bold;
font-size:15px;
+ background:none;
}
-.days_wrp div {
- float: left;
- font-size: 13px;
- height: 30px;
+#calendar th, #calendar td {
+ padding: 10px;
text-align: center;
- width: 21px;
}
-.months_wrp div {
- float: left;
- height: 30px;
- text-align: center;
- width: 40px;
+#calendar.month th, #calendar.month td {
+ padding: 5px;
}
-.months_wrp div a, .days_wrp div a, .control_details_wrp span, .days_wrp div
span {
- display: block;
- padding: 8px 0;
-}
-ul.calendar li {
- height: 30px;
- padding: 7px 0;
-}
-
-ul.calendar li.even {
+#calendar .even {
background: none repeat scroll 0 0 #DEEAF8;
}
#cal_wrp {
@@ -1015,13 +995,13 @@
width: 130x;
}
-ul.calendar div.title {
+#calendar .title {
text-align: left;
}
-ul.calendar .heading div.title {
+#calendar .heading .title {
text-align: center;
}
-ul.calendar div.frequency {
+#calendar .frequency {
margin-right: 10px;
width: 65px;
}
@@ -1037,8 +1017,20 @@
display: block;
font-size: 10px;
font-weight: bold;
+ padding-left: 3px;
+ text-align: center;
text-decoration: none;
}
+.info_box_wrp {
+ background: url("../../../images/status_icon_red_empty.png") no-repeat
scroll 50% 50% transparent;
+ height: 15px;
+ position: relative;
+ text-align: center;
+ width: 100%;
+}
+#calendar.month a.view_info_box {
+ padding-left: 5px;
+}
.days_wrp a.view_info_box {
left: 8px;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9353],
Torstein <=