[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9987] Formatting Netbeans
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9987] Formatting Netbeans |
|
Date: |
Tue, 11 Sep 2012 07:36:14 +0000 |
Revision: 9987
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9987
Author: vator
Date: 2012-09-11 07:36:14 +0000 (Tue, 11 Sep 2012)
Log Message:
-----------
Formatting Netbeans
Modified Paths:
--------------
trunk/controller/templates/base/calendar/calendar_filters.xsl
trunk/controller/templates/base/calendar/check_list_status_manager.xsl
trunk/controller/templates/base/calendar/icon_color_map.xsl
trunk/controller/templates/base/calendar/select_buildings_on_property.xsl
trunk/controller/templates/base/calendar/select_my_locations.xsl
trunk/controller/templates/base/calendar/view_calendar_month.xsl
trunk/controller/templates/base/calendar/view_calendar_year.xsl
Modified: trunk/controller/templates/base/calendar/calendar_filters.xsl
===================================================================
--- trunk/controller/templates/base/calendar/calendar_filters.xsl
2012-09-11 07:35:52 UTC (rev 9986)
+++ trunk/controller/templates/base/calendar/calendar_filters.xsl
2012-09-11 07:36:14 UTC (rev 9987)
@@ -1,85 +1,87 @@
<!-- $Id: view_calendar_month.xsl 9200 2012-04-21 20:05:34Z vator $ -->
<xsl:template name="calendar_filters" xmlns:php="http://php.net/xsl";>
-<xsl:param name="view_period" />
+ <xsl:param name="view_period" />
-<form id="cal-filters" class="select-box" method="post">
- <xsl:choose>
- <xsl:when test="$view_period = 'month'">
- <xsl:attribute
name="action">index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute
name="action">index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
+ <form id="cal-filters" class="select-box" method="post">
+ <xsl:choose>
+ <xsl:when test="$view_period = 'month'">
+ <xsl:attribute
name="action">index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute
name="action">index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
- <input type="hidden" name="year">
- <xsl:attribute name="value">
- <xsl:value-of select="current_year"/>
- </xsl:attribute>
- </input>
- <xsl:if test="$view_period = 'month'">
- <input type="hidden" name="month">
- <xsl:attribute name="value">
- <xsl:value-of select="current_month_nr"/>
- </xsl:attribute>
- </input>
- </xsl:if>
- <input type="hidden" name="location_code">
- <xsl:attribute name="value">
- <xsl:value-of select="current_location/location_code"/>
- </xsl:attribute>
- </input>
- <input type="hidden" name="repeat_type">
- <xsl:attribute name="value">
- <xsl:value-of select="current_repeat_type"/>
- </xsl:attribute>
- </input>
- <input type="hidden" name="role">
- <xsl:attribute name="value">
- <xsl:value-of select="current_role"/>
- </xsl:attribute>
- </input>
+ <input type="hidden" name="year">
+ <xsl:attribute name="value">
+ <xsl:value-of select="current_year"/>
+ </xsl:attribute>
+ </input>
+ <xsl:if test="$view_period = 'month'">
+ <input type="hidden" name="month">
+ <xsl:attribute name="value">
+ <xsl:value-of select="current_month_nr"/>
+ </xsl:attribute>
+ </input>
+ </xsl:if>
+ <input type="hidden" name="location_code">
+ <xsl:attribute name="value">
+ <xsl:value-of select="current_location/location_code"/>
+ </xsl:attribute>
+ </input>
+ <input type="hidden" name="repeat_type">
+ <xsl:attribute name="value">
+ <xsl:value-of select="current_repeat_type"/>
+ </xsl:attribute>
+ </input>
+ <input type="hidden" name="role">
+ <xsl:attribute name="value">
+ <xsl:value-of select="current_role"/>
+ </xsl:attribute>
+ </input>
- <div class="filter first">
- <label>Filtrer på rolle</label>
- <select id="filter-role">
- <xsl:for-each select="roles_array">
- <xsl:variable name="role_id"><xsl:value-of
select="id"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="$role_id =
//current_role">
- <option value="{$role_id}"
selected="selected">
- <xsl:value-of
disable-output-escaping="yes" select="name"/>
- </option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$role_id}">
- <xsl:value-of
disable-output-escaping="yes" select="name"/>
- </option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </select>
- </div>
- <div class="filter">
- <label>Filtrer på frekvenstype</label>
- <select id="filter-repeat_type" name="repeat_type">
- <option value="">Velg frekvenstype</option>
- <xsl:for-each select="repeat_type_array">
- <xsl:choose>
- <xsl:when test="id =
//current_repeat_type">
- <option value="{id}"
selected="selected">
- <xsl:value-of
disable-output-escaping="yes" select="value"/>
- </option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{id}">
- <xsl:value-of
disable-output-escaping="yes" select="value"/>
- </option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </select>
- </div>
-</form>
+ <div class="filter first">
+ <label>Filtrer på rolle</label>
+ <select id="filter-role">
+ <xsl:for-each select="roles_array">
+ <xsl:variable name="role_id">
+ <xsl:value-of select="id"/>
+ </xsl:variable>
+ <xsl:choose>
+ <xsl:when test="$role_id = //current_role">
+ <option value="{$role_id}" selected="selected">
+ <xsl:value-of disable-output-escaping="yes" select="name"/>
+ </option>
+ </xsl:when>
+ <xsl:otherwise>
+ <option value="{$role_id}">
+ <xsl:value-of disable-output-escaping="yes" select="name"/>
+ </option>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </select>
+ </div>
+ <div class="filter">
+ <label>Filtrer på frekvenstype</label>
+ <select id="filter-repeat_type" name="repeat_type">
+ <option value="">Velg frekvenstype</option>
+ <xsl:for-each select="repeat_type_array">
+ <xsl:choose>
+ <xsl:when test="id = //current_repeat_type">
+ <option value="{id}" selected="selected">
+ <xsl:value-of disable-output-escaping="yes" select="value"/>
+ </option>
+ </xsl:when>
+ <xsl:otherwise>
+ <option value="{id}">
+ <xsl:value-of disable-output-escaping="yes" select="value"/>
+ </option>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </select>
+ </div>
+ </form>
</xsl:template>
Modified: trunk/controller/templates/base/calendar/check_list_status_manager.xsl
===================================================================
--- trunk/controller/templates/base/calendar/check_list_status_manager.xsl
2012-09-11 07:35:52 UTC (rev 9986)
+++ trunk/controller/templates/base/calendar/check_list_status_manager.xsl
2012-09-11 07:36:14 UTC (rev 9987)
@@ -1,213 +1,219 @@
<!-- $Id: view_calendar_month.xsl 9200 2012-04-21 20:05:34Z vator $ -->
<xsl:template name="check_list_status_manager" xmlns:php="http://php.net/xsl";>
- <xsl:param name="location_code" />
+ <xsl:param name="location_code" />
- <xsl:choose>
- <xsl:when test="status = 'CONTROL_REGISTERED'">
- <a>
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
- <xsl:text>&deadline_ts=</xsl:text>
- <xsl:value-of
select="info/deadline_date_ts"/>
- <xsl:text>&control_id=</xsl:text>
- <xsl:value-of select="info/control_id"/>
- <xsl:text>&type=</xsl:text>
- <xsl:value-of select="info/type"/>
- <xsl:choose>
- <xsl:when test="info/type =
'component'">
-
<xsl:text>&location_id=</xsl:text>
- <xsl:value-of
select="info/location_id"/>
-
<xsl:text>&component_id=</xsl:text>
- <xsl:value-of
select="info/component_id"/>
- </xsl:when>
- <xsl:otherwise>
-
<xsl:text>&location_code=</xsl:text>
- <xsl:value-of
select="info/location_code"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <img height="15"
src="controller/images/status_icon_yellow_ring.png" />
- </a>
- </xsl:when>
- <xsl:when test="status = 'CONTROL_PLANNED'">
- <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>
- </xsl:when>
- <xsl:when test="status = 'CONTROL_NOT_DONE'">
- <a>
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
-
<xsl:text>&deadline_ts=</xsl:text>
- <xsl:value-of
select="info/deadline_date_ts"/>
-
<xsl:text>&control_id=</xsl:text>
- <xsl:value-of
select="info/control_id"/>
- <xsl:text>&type=</xsl:text>
- <xsl:value-of
select="info/type"/>
- <xsl:choose>
- <xsl:when test="info/type =
'component'">
-
<xsl:text>&location_id=</xsl:text>
- <xsl:value-of
select="info/location_id"/>
-
<xsl:text>&component_id=</xsl:text>
- <xsl:value-of
select="info/component_id"/>
- </xsl:when>
- <xsl:otherwise>
-
<xsl:text>&location_code=</xsl:text>
- <xsl:value-of
select="info/location_code"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <img height="15"
src="controller/images/status_icon_red_cross.png" />
- </a>
- </xsl:when>
- <xsl:when test="status = 'CONTROL_NOT_DONE_WITH_CHECKLIST'">
- <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_red_cross.png" />
- </a>
- </xsl:when>
- <xsl:when test="status = 'CONTROL_NOT_DONE_WITH_PLANNED_DATE'">
- <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_red_cross.png" />
- </a>
- </xsl:when>
- <xsl:when test="status = 'CONTROL_DONE_IN_TIME_WITHOUT_ERRORS'">
- <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 class="ext_info"><xsl:value-of
select="info/id"/></span>
- <img height="15"
src="controller/images/status_icon_dark_green.png" />
- </a>
- </xsl:when>
- <xsl:when test="status =
'CONTROL_DONE_OVER_TIME_WITHOUT_ERRORS'">
- <div class="info_box_wrp">
- <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
class="ext_info"><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 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 class="ext_info">
-
<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_CANCELED'">
- <img height="15"
src="controller/images/status_icon_red_cross.png" />
- </xsl:when>
- <xsl:when test="status = 'CONTROLS_DONE_WITH_ERRORS'">
- <div class="info_box_wrp">
- <div id="info_box"></div>
- <a class="view_info_box">
- <xsl:attribute name="href">
- <xsl:choose>
- <xsl:when
test="info/view = 'VIEW_LOCATIONS_FOR_CONTROL'">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
-
<xsl:text>&control_id=</xsl:text>
-
<xsl:value-of select="info/control_id"/>
- </xsl:when>
- <xsl:otherwise>
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
-
<xsl:text>&location_code=</xsl:text>
- <xsl:value-of
select="info/location_code"/>
- </xsl:otherwise>
- </xsl:choose>
-
<xsl:text>&year=</xsl:text>
- <xsl:value-of
select="//current_year"/>
-
<xsl:text>&month=</xsl:text>
- <xsl:number />
- </xsl:attribute>
- <span class="ext_info">
-
<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/agg_open_errors"/>
- </a>
- </div>
- </xsl:when>
- <xsl:when test="status = 'CONTROLS_NOT_DONE'">
- <a>
- <xsl:attribute name="href">
- <xsl:choose>
- <xsl:when
test="info/view = 'VIEW_LOCATIONS_FOR_CONTROL'">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
-
<xsl:text>&control_id=</xsl:text>
-
<xsl:value-of select="info/control_id"/>
- </xsl:when>
- <xsl:when
test="info/view = 'VIEW_CONTROLS_FOR_LOCATION'">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
-
<xsl:text>&location_code=</xsl:text>
- <xsl:value-of
select="info/location_code"/>
- </xsl:when>
- </xsl:choose>
- <xsl:text>&year=</xsl:text>
- <xsl:value-of
select="//current_year"/>
- <xsl:text>&month=</xsl:text>
- <xsl:number />
- </xsl:attribute>
- <img height="15"
src="controller/images/status_icon_red_cross.png" />
- </a>
- </xsl:when>
- <xsl:when test="status = 'CONTROLS_REGISTERED'">
- <a>
- <xsl:attribute name="href">
- <xsl:choose>
- <xsl:when
test="info/view = 'VIEW_LOCATIONS_FOR_CONTROL'">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
-
<xsl:text>&control_id=</xsl:text>
-
<xsl:value-of select="info/control_id"/>
- </xsl:when>
- <xsl:when
test="info/view = 'VIEW_CONTROLS_FOR_LOCATION'">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
-
<xsl:text>&location_code=</xsl:text>
- <xsl:value-of
select="info/location_code"/>
- </xsl:when>
- </xsl:choose>
- <xsl:text>&month=</xsl:text>
- <xsl:value-of select="info/month"/>
- <xsl:text>&year=</xsl:text>
- <xsl:value-of select="info/year"/>
- </xsl:attribute>
- <img height="15"
src="controller/images/status_icon_yellow_ring.png" />
- </a>
- </xsl:when>
- <xsl:otherwise>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="status = 'CONTROL_REGISTERED'">
+ <a>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
+ <xsl:text>&deadline_ts=</xsl:text>
+ <xsl:value-of select="info/deadline_date_ts"/>
+ <xsl:text>&control_id=</xsl:text>
+ <xsl:value-of select="info/control_id"/>
+ <xsl:text>&type=</xsl:text>
+ <xsl:value-of select="info/type"/>
+ <xsl:choose>
+ <xsl:when test="info/type = 'component'">
+ <xsl:text>&location_id=</xsl:text>
+ <xsl:value-of select="info/location_id"/>
+ <xsl:text>&component_id=</xsl:text>
+ <xsl:value-of select="info/component_id"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>&location_code=</xsl:text>
+ <xsl:value-of select="info/location_code"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ <img height="15" src="controller/images/status_icon_yellow_ring.png" />
+ </a>
+ </xsl:when>
+ <xsl:when test="status = 'CONTROL_PLANNED'">
+ <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>
+ </xsl:when>
+ <xsl:when test="status = 'CONTROL_NOT_DONE'">
+ <a>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
+ <xsl:text>&deadline_ts=</xsl:text>
+ <xsl:value-of select="info/deadline_date_ts"/>
+ <xsl:text>&control_id=</xsl:text>
+ <xsl:value-of select="info/control_id"/>
+ <xsl:text>&type=</xsl:text>
+ <xsl:value-of select="info/type"/>
+ <xsl:choose>
+ <xsl:when test="info/type = 'component'">
+ <xsl:text>&location_id=</xsl:text>
+ <xsl:value-of select="info/location_id"/>
+ <xsl:text>&component_id=</xsl:text>
+ <xsl:value-of select="info/component_id"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>&location_code=</xsl:text>
+ <xsl:value-of select="info/location_code"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ <img height="15" src="controller/images/status_icon_red_cross.png" />
+ </a>
+ </xsl:when>
+ <xsl:when test="status = 'CONTROL_NOT_DONE_WITH_CHECKLIST'">
+ <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_red_cross.png" />
+ </a>
+ </xsl:when>
+ <xsl:when test="status = 'CONTROL_NOT_DONE_WITH_PLANNED_DATE'">
+ <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_red_cross.png" />
+ </a>
+ </xsl:when>
+ <xsl:when test="status = 'CONTROL_DONE_IN_TIME_WITHOUT_ERRORS'">
+ <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 class="ext_info">
+ <xsl:value-of select="info/id"/>
+ </span>
+ <img height="15" src="controller/images/status_icon_dark_green.png" />
+ </a>
+ </xsl:when>
+ <xsl:when test="status = 'CONTROL_DONE_OVER_TIME_WITHOUT_ERRORS'">
+ <div class="info_box_wrp">
+ <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 class="ext_info">
+ <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 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 class="ext_info">
+ <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_CANCELED'">
+ <img height="15" src="controller/images/status_icon_red_cross.png" />
+ </xsl:when>
+ <xsl:when test="status = 'CONTROLS_DONE_WITH_ERRORS'">
+ <div class="info_box_wrp">
+ <div id="info_box"></div>
+ <a class="view_info_box">
+ <xsl:attribute name="href">
+ <xsl:choose>
+ <xsl:when test="info/view = 'VIEW_LOCATIONS_FOR_CONTROL'">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
+ <xsl:text>&control_id=</xsl:text>
+ <xsl:value-of select="info/control_id"/>
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+ <xsl:text>&location_code=</xsl:text>
+ <xsl:value-of select="info/location_code"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of select="//current_year"/>
+ <xsl:text>&month=</xsl:text>
+ <xsl:number />
+ </xsl:attribute>
+ <span class="ext_info">
+ <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/agg_open_errors"/>
+ </a>
+ </div>
+ </xsl:when>
+ <xsl:when test="status = 'CONTROLS_NOT_DONE'">
+ <a>
+ <xsl:attribute name="href">
+ <xsl:choose>
+ <xsl:when test="info/view = 'VIEW_LOCATIONS_FOR_CONTROL'">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
+ <xsl:text>&control_id=</xsl:text>
+ <xsl:value-of select="info/control_id"/>
+ </xsl:when>
+ <xsl:when test="info/view = 'VIEW_CONTROLS_FOR_LOCATION'">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+ <xsl:text>&location_code=</xsl:text>
+ <xsl:value-of select="info/location_code"/>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of select="//current_year"/>
+ <xsl:text>&month=</xsl:text>
+ <xsl:number />
+ </xsl:attribute>
+ <img height="15" src="controller/images/status_icon_red_cross.png" />
+ </a>
+ </xsl:when>
+ <xsl:when test="status = 'CONTROLS_REGISTERED'">
+ <a>
+ <xsl:attribute name="href">
+ <xsl:choose>
+ <xsl:when test="info/view = 'VIEW_LOCATIONS_FOR_CONTROL'">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
+ <xsl:text>&control_id=</xsl:text>
+ <xsl:value-of select="info/control_id"/>
+ </xsl:when>
+ <xsl:when test="info/view = 'VIEW_CONTROLS_FOR_LOCATION'">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+ <xsl:text>&location_code=</xsl:text>
+ <xsl:value-of select="info/location_code"/>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:text>&month=</xsl:text>
+ <xsl:value-of select="info/month"/>
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of select="info/year"/>
+ </xsl:attribute>
+ <img height="15" src="controller/images/status_icon_yellow_ring.png" />
+ </a>
+ </xsl:when>
+ <xsl:otherwise>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:template>
Modified: trunk/controller/templates/base/calendar/icon_color_map.xsl
===================================================================
--- trunk/controller/templates/base/calendar/icon_color_map.xsl 2012-09-11
07:35:52 UTC (rev 9986)
+++ trunk/controller/templates/base/calendar/icon_color_map.xsl 2012-09-11
07:36:14 UTC (rev 9987)
@@ -1,13 +1,31 @@
<!-- $Id: view_calendar_month.xsl 9200 2012-04-21 20:05:34Z vator $ -->
<xsl:template name="icon_color_map" xmlns:php="http://php.net/xsl";>
- <ul id="icon_color_map">
- <li><img height="15"
src="controller/images/status_icon_yellow_ring.png" /><span>Kontroll satt
opp</span></li>
- <li><img height="15" src="controller/images/status_icon_yellow.png"
/><span>Kontroll har planlagt dato</span></li>
- <li><img height="15" src="controller/images/status_icon_dark_green.png"
/><span>Kontroll gjennomført uten åpne saker før frist</span></li>
- <li><img height="15"
src="controller/images/status_icon_light_green.png" /><span>Kontroll
gjennomført uten åpne saker etter frist</span></li>
- <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>
+ <ul id="icon_color_map">
+ <li>
+ <img height="15" src="controller/images/status_icon_yellow_ring.png" />
+ <span>Kontroll satt opp</span>
+ </li>
+ <li>
+ <img height="15" src="controller/images/status_icon_yellow.png" />
+ <span>Kontroll har planlagt dato</span>
+ </li>
+ <li>
+ <img height="15" src="controller/images/status_icon_dark_green.png" />
+ <span>Kontroll gjennomført uten åpne saker før frist</span>
+ </li>
+ <li>
+ <img height="15" src="controller/images/status_icon_light_green.png" />
+ <span>Kontroll gjennomført uten åpne saker etter frist</span>
+ </li>
+ <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>
</xsl:template>
Modified:
trunk/controller/templates/base/calendar/select_buildings_on_property.xsl
===================================================================
--- trunk/controller/templates/base/calendar/select_buildings_on_property.xsl
2012-09-11 07:35:52 UTC (rev 9986)
+++ trunk/controller/templates/base/calendar/select_buildings_on_property.xsl
2012-09-11 07:36:14 UTC (rev 9987)
@@ -1,26 +1,28 @@
<!-- $Id: view_calendar_month.xsl 9200 2012-04-21 20:05:34Z vator $ -->
-<xsl:template name="select_buildings_on_property"
xmlns:php="http://php.net/xsl";>
+<xsl:template name="select_buildings_on_property">
-<form action="#">
- <input type="hidden" name="period_type" value="view_year" />
- <input type="hidden" name="year">
+ <form action="#">
+ <input type="hidden" name="period_type" value="view_year" />
+ <input type="hidden" name="year">
<xsl:attribute name="value">
- <xsl:value-of select="current_year"/>
+ <xsl:value-of select="current_year"/>
</xsl:attribute>
- </input>
+ </input>
- <select id="choose_building_on_property" class="selectLocation">
- <option>Velg bygg</option>
- <xsl:for-each select="buildings_on_property">
- <option>
- <xsl:if test="id =
//current_location/location_code">
- <xsl:attribute
name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:attribute name="value"><xsl:value-of
select="id"/></xsl:attribute>
- <xsl:value-of select="name" />
- </option>
- </xsl:for-each>
- </select>
-</form>
+ <select id="choose_building_on_property" class="selectLocation">
+ <option>Velg bygg</option>
+ <xsl:for-each select="buildings_on_property">
+ <option>
+ <xsl:if test="id = //current_location/location_code">
+ <xsl:attribute name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute name="value">
+ <xsl:value-of select="id"/>
+ </xsl:attribute>
+ <xsl:value-of select="name" />
+ </option>
+ </xsl:for-each>
+ </select>
+ </form>
</xsl:template>
Modified: trunk/controller/templates/base/calendar/select_my_locations.xsl
===================================================================
--- trunk/controller/templates/base/calendar/select_my_locations.xsl
2012-09-11 07:35:52 UTC (rev 9986)
+++ trunk/controller/templates/base/calendar/select_my_locations.xsl
2012-09-11 07:36:14 UTC (rev 9987)
@@ -1,26 +1,27 @@
<!-- $Id: view_calendar_month.xsl 9200 2012-04-21 20:05:34Z vator $ -->
<xsl:template name="select_my_locations" xmlns:php="http://php.net/xsl";>
-<form action="#">
- <input type="hidden" name="period_type" value="view_year" />
- <input type="hidden" name="year">
+ <form action="#">
+ <input type="hidden" name="period_type" value="view_year" />
+ <input type="hidden" name="year">
<xsl:attribute name="value">
- <xsl:value-of select="current_year"/>
+ <xsl:value-of select="current_year"/>
</xsl:attribute>
- </input>
+ </input>
- <select id="choose_my_location" class="selectLocation">
- <option>Velg bygg</option>
- <xsl:for-each select="my_locations">
- <option>
- <xsl:if test="location_code =
current_location/location_code">
- <xsl:attribute
name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:attribute name="value"><xsl:value-of
disable-output-escaping="yes" select="location_code"/></xsl:attribute>
- <xsl:value-of disable-output-escaping="yes"
select="loc1_name"/>
- </option>
- </xsl:for-each>
- </select>
-</form>
-
+ <select id="choose_my_location" class="selectLocation">
+ <option>Velg bygg</option>
+ <xsl:for-each select="my_locations">
+ <option>
+ <xsl:if test="location_code = current_location/location_code">
+ <xsl:attribute name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute name="value">
+ <xsl:value-of disable-output-escaping="yes"
select="location_code"/>
+ </xsl:attribute>
+ <xsl:value-of disable-output-escaping="yes" select="loc1_name"/>
+ </option>
+ </xsl:for-each>
+ </select>
+ </form>
</xsl:template>
Modified: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-09-11 07:35:52 UTC (rev 9986)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-09-11 07:36:14 UTC (rev 9987)
@@ -206,12 +206,19 @@
<xsl:attribute
name="class">even</xsl:attribute>
</xsl:otherwise>
</xsl:choose>
-
<td
class="title">
-
<span><xsl:value-of select="control/title"/></span>
+ <a class="show-control-details">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicontrol.get_control_details</xsl:text>
+
<xsl:text>&control_id=</xsl:text>
+
<xsl:value-of select="control/id"/>
+
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+
</xsl:attribute>
+
<xsl:value-of select="control/title"/>
+ </a>
</td>
<td
class="assigned">
-
<span><xsl:value-of select="control/responsibility_name"/></span>
+ <span><xsl:value-of
select="control/responsibility_name"/></span>
</td>
<td
class="frequency">
<span>
@@ -266,18 +273,24 @@
<xsl:for-each select="controls_calendar">
<xsl:variable
name="control_id"><xsl:value-of select="control/id"/></xsl:variable>
-
<tr>
<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: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>
<td
class="title">
-
<span><xsl:value-of select="control/title"/></span>
+ <a id="showControlDetails">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicontrol.get_control_details</xsl:text>
+
<xsl:text>&control_id=</xsl:text>
+
<xsl:value-of select="control/id"/>
+
</xsl:attribute>
+
<xsl:value-of select="control/title"/>
+ </a>
</td>
<td
class="assigned">
<span><xsl:value-of select="control/responsibility_name"/></span>
Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-09-11 07:35:52 UTC (rev 9986)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-09-11 07:36:14 UTC (rev 9987)
@@ -60,7 +60,6 @@
</script>
<div id="main_content">
-
<div id="control_plan">
<div class="top">
<xsl:choose>
@@ -176,8 +175,16 @@
</xsl:otherwise>
</xsl:choose>
<td class="title">
- <span><xsl:value-of
select="control/title"/></span>
- </td>
+ <a class="show-control-details">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicontrol.get_control_details</xsl:text>
+
<xsl:text>&control_id=</xsl:text>
+
<xsl:value-of select="control/id"/>
+
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+
</xsl:attribute>
+
<xsl:value-of select="control/title"/>
+ </a>
+ </td>
<td class="assigned">
<span><xsl:value-of
select="control/responsibility_name"/></span>
</td>
@@ -261,7 +268,15 @@
</xsl:otherwise>
</xsl:choose>
<td
class="title">
-
<span><xsl:value-of select="control/title"/></span>
+ <a class="show-control-details">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicontrol.get_control_details</xsl:text>
+
<xsl:text>&control_id=</xsl:text>
+
<xsl:value-of select="control/id"/>
+
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+
</xsl:attribute>
+
<xsl:value-of select="control/title"/>
+ </a>
</td>
<td
class="assigned">
<span><xsl:value-of select="control/responsibility_name"/></span>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9987] Formatting Netbeans,
Torstein <=