[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9354]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9354] |
|
Date: |
Thu, 10 May 2012 09:46:51 +0000 |
Revision: 9354
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9354
Author: vator
Date: 2012-05-10 09:46:50 +0000 (Thu, 10 May 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uicalendar.inc.php
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.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php 2012-05-10 08:50:40 UTC
(rev 9353)
+++ trunk/controller/inc/class.uicalendar.inc.php 2012-05-10 09:46:50 UTC
(rev 9354)
@@ -275,7 +275,7 @@
$year_calendar = new
year_calendar($control, $year);
$calendar_array =
$year_calendar->build_agg_calendar($agg_open_cases_pr_month_array);
- $locations_with_calendar_array[] =
array("location" => $curr_location_code, "calendar_array" => $calendar_array);
+ $locations_with_calendar_array[] =
array("location" => $location, "calendar_array" => $calendar_array);
}
}else if($control->get_repeat_type() > 1){
foreach($locations_for_control_array as
$location){
@@ -288,8 +288,8 @@
$year_calendar = new
year_calendar($control, $year);
$calendar_array =
$year_calendar->build_calendar( $check_lists_array );
-
- $locations_with_calendar_array[] =
array("location" => $curr_location_code, "calendar_array" => $calendar_array);
+
+ $locations_with_calendar_array[] =
array("location" => $location, "calendar_array" => $calendar_array);
}
}
@@ -357,8 +357,8 @@
$month_calendar = new month_calendar($control,
$year, $month);
$calendar_array =
$month_calendar->build_calendar( $check_lists_array );
-
- $locations_with_calendar_array[] =
array("location" => $curr_location_code, "calendar_array" => $calendar_array);
+
+ $locations_with_calendar_array[] =
array("location" => $location, "calendar_array" => $calendar_array);
}
$criteria = array
Modified: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-05-10 08:50:40 UTC (rev 9353)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-05-10 09:46:50 UTC (rev 9354)
@@ -123,7 +123,7 @@
</xsl:when>
<xsl:otherwise>
- <tr class="cal_info_msg"><td
colspan="10">Ingen sjekklister for bygg i angitt periode</td></tr>
+ <tr class="cal_info_msg"><td
colspan="3">Ingen sjekklister for bygg i angitt periode</td></tr>
</xsl:otherwise>
</xsl:choose>
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:50:40 UTC (rev 9353)
+++
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
2012-05-10 09:46:50 UTC (rev 9354)
@@ -32,25 +32,28 @@
<xsl:call-template name="icon_color_map" />
</div>
<div id="cal_wrp">
- <table id="calendar">
+ <table id="calendar" class="month">
<tr>
- <th class="control_details_wrp">
- <span
class="location">Lokasjon</span>
+ <th>
+ <span
class="location_code">Lokasjonskode</span>
</th>
- <xsl:for-each
select="heading_array">
- <th>
- <a>
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
-
<xsl:text>&year=</xsl:text>
-
<xsl:value-of select="$year"/>
-
<xsl:text>&month=</xsl:text>
-
<xsl:number/>
-
</xsl:attribute>
-
<xsl:value-of select="."/>
- </a>
- </th>
- </xsl:for-each>
+ <th>
+ <span
class="location_name">Lokasjonsnavn</span>
+ </th>
+ <xsl:for-each select="heading_array">
+ <th>
+ <a>
+ <xsl:attribute
name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
+
<xsl:text>&year=</xsl:text>
+
<xsl:value-of select="$year"/>
+
<xsl:text>&month=</xsl:text>
+
<xsl:number/>
+ </xsl:attribute>
+ <xsl:value-of
select="."/>
+ </a>
+ </th>
+ </xsl:for-each>
</tr>
<xsl:choose>
@@ -66,26 +69,24 @@
<xsl:attribute
name="class">even</xsl:attribute>
</xsl:otherwise>
</xsl:choose>
-
- <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>
+
+ <td>
+ <xsl:value-of
select="location/location_code"/>
+ </td>
+ <td class="location_name">
+ <xsl:value-of
select="location/loc1_name"/>
+ </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>
</tr>
</xsl:for-each>
</xsl:when>
<xsl:otherwise>
- <tr class="cal_info_msg"><td colspan="10">Ingen
sjekklister for bygg i angitt periode</td></tr>
+ <tr class="cal_info_msg"><td colspan="3">Ingen
sjekklister for bygg i angitt periode</td></tr>
</xsl:otherwise>
</xsl:choose>
</table>
Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-10 08:50:40 UTC (rev 9353)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-10 09:46:50 UTC (rev 9354)
@@ -101,7 +101,7 @@
</xsl:for-each>
</xsl:when>
<xsl:otherwise>
- <tr class="cal_info_msg"><td colspan="10">Ingen
sjekklister for bygg i angitt periode</td></tr>
+ <tr class="cal_info_msg"><td colspan="3">Ingen
sjekklister for bygg i angitt periode</td></tr>
</xsl:otherwise>
</xsl:choose>
</table>
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:50:40 UTC (rev 9353)
+++
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
2012-05-10 09:46:50 UTC (rev 9354)
@@ -35,28 +35,27 @@
<table id="calendar">
<tr>
<th>
- <span
class="location">Lokasjonskode</span>
+ <span
class="location_code">Lokasjonskode</span>
</th>
<th>
- <span
class="location">Lokasjonsnavn</span>
+ <span
class="location_name">Lokasjonsnavn</span>
</th>
- <th>
- <span
class="location">Adresse</span>
- </th>
- <xsl:for-each
select="heading_array">
- <th>
- <a>
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
-
<xsl:text>&year=</xsl:text>
-
<xsl:value-of select="$year"/>
-
<xsl:text>&month=</xsl:text>
-
<xsl:number/>
-
</xsl:attribute>
-
<xsl:value-of select="."/>
- </a>
- </th>
- </xsl:for-each>
+ <xsl:for-each select="heading_array">
+ <th>
+ <a>
+ <xsl:attribute
name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
+
<xsl:text>&year=</xsl:text>
+
<xsl:value-of select="$year"/>
+
<xsl:text>&month=</xsl:text>
+
<xsl:number/>
+
<xsl:text>&control_id=</xsl:text>
+
<xsl:value-of select="//control/id"/>
+ </xsl:attribute>
+ <xsl:value-of
select="."/>
+ </a>
+ </th>
+ </xsl:for-each>
</tr>
<xsl:choose>
@@ -73,25 +72,23 @@
</xsl:otherwise>
</xsl:choose>
- <td class="location">
- <xsl:value-of
select="location"/>
+ <td>
+ <xsl:value-of
select="location/location_code"/>
</td>
- <td class="location">
- <xsl:value-of
select="location"/>
+ <td class="location_name">
+ <xsl:value-of
select="location/loc1_name"/>
</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>
+
+ <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>
</tr>
</xsl:for-each>
</xsl:when>
<xsl:otherwise>
- <tr class="cal_info_msg"><td colspan="10">Ingen
sjekklister for bygg i angitt periode</td></tr>
+ <tr class="cal_info_msg"><td colspan="3">Ingen
sjekklister for bygg i angitt periode</td></tr>
</xsl:otherwise>
</xsl:choose>
</table>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-05-10 08:50:40 UTC
(rev 9353)
+++ trunk/controller/templates/base/css/base.css 2012-05-10 09:46:50 UTC
(rev 9354)
@@ -980,22 +980,8 @@
padding: 0 10px;
width: 100px;
}
-.control_details_wrp div.title {
- width: 200px;
-}
-ul.calendar div.location {
- text-align: left;
- width: 100px;
-}
-.control_details_wrp div.assigned {
- text-align: left;
- width: 115px;
-}
-.control_details_wrp div.frequency {
- width: 130x;
-}
-#calendar .title {
+#calendar .title, #calendar .location_name {
text-align: left;
}
#calendar .heading .title {
@@ -1005,7 +991,7 @@
margin-right: 10px;
width: 65px;
}
-.cal_info_msg{
+.cal_info_msg {
font-size: 16px;
padding: 40px 20px;
}
@@ -1026,7 +1012,7 @@
height: 15px;
position: relative;
text-align: center;
- width: 100%;
+ width: 15px;
}
#calendar.month a.view_info_box {
padding-left: 5px;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9354],
Torstein <=