|
| From: | Torstein |
| Subject: | [Fmsystem-commits] [8246] |
| Date: | Tue, 06 Dec 2011 12:33:06 +0000 |
Revision: 8246
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8246
Author: vator
Date: 2011-12-06 12:33:06 +0000 (Tue, 06 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/templates/base/common.xsl
trunk/controller/templates/base/view_agg_check_lists_for_location_month.xsl
trunk/controller/templates/base/view_agg_check_lists_for_location_year.xsl
trunk/controller/templates/base/view_check_lists_for_location.xsl
Modified: trunk/controller/templates/base/common.xsl
===================================================================
--- trunk/controller/templates/base/common.xsl 2011-12-06 12:32:34 UTC (rev
8245)
+++ trunk/controller/templates/base/common.xsl 2011-12-06 12:33:06 UTC (rev
8246)
@@ -225,8 +225,6 @@
//... check whether this action should be an
AJAX call
if( record.getData().ajax[task.index] ) {
- //var control_id =
YAHOO.util.Dom.get("control_id").value;
-
var alertStatus = false;
// Check if confirm box should be
displayed before request is executed
@@ -244,16 +242,26 @@
}
}
- var requestUrl =
record.getData().actions[ task.index ] + "&control_id=" + control_id;
- alert(requestUrl)
- var request =
YAHOO.util.Connect.asyncRequest(
- 'GET',
- requestUrl,
- {
- success:
ajaxResponseSuccess,
- success:
ajaxResponseFailure,
- args: table
- });
+ if(record.getData().labels[task.index]
== "Legg enhet til kontrollen"){
+ var control_id =
YAHOO.util.Dom.get("control_id").value;
+
+ if(control_id > 0){
+ var requestUrl =
record.getData().actions[ task.index ] + "&control_id=" + control_id;
+ }
+ }else{
+ var requestUrl =
record.getData().actions[ task.index ];
+ }
+
+ if(requestUrl){
+ var request =
YAHOO.util.Connect.asyncRequest(
+ 'GET',
+ requestUrl,
+ {
+ success:
ajaxResponseSuccess,
+ success:
ajaxResponseFailure,
+ args: table
+ });
+ }
} else {
window.location =
record.getData().actions[task.index];
}
Modified:
trunk/controller/templates/base/view_agg_check_lists_for_location_month.xsl
===================================================================
--- trunk/controller/templates/base/view_agg_check_lists_for_location_month.xsl
2011-12-06 12:32:34 UTC (rev 8245)
+++ trunk/controller/templates/base/view_agg_check_lists_for_location_month.xsl
2011-12-06 12:33:06 UTC (rev 8246)
@@ -9,76 +9,117 @@
<div>Periode: <xsl:value-of select="period"/></div>
</fieldset>
- <h2>Sjekklister</h2>
+ <h2 style="float:left;">Sjekklister</h2>
+ <div style="float:left;margin-top: 30px;margin-left: 585px;"><a
class="move_cal_right" href="#"><<</a></div>
+ <div style="float:left;margin-top: 30px;margin-left: 95px;"><a
class="move_cal_left" href="#">>></a></div>
-
+ <script>
+
+ $(document).ready(function() {
+
+ $(".move_cal_left").click(function(){
+
+ $("#days_view").animate({
+ left: '-=502'
+ }, 800);
+ });
+
+
+ $(".move_cal_right").click(function(){
+
+ $("#days_view").animate({
+ left: '+=502'
+ }, 800);
+ });
+
+
+
+ });
+
+ </script>
+
+
+
<xsl:choose>
<xsl:when
test="controls_calendar_array/child::node()">
- <ul class="calendar days">
- <li class="heading">
- <div class="id">ID</div><div
class="title">Tittel</div><div class="frequency">Frekvenstype</div><div
class="frequency">Frekvensintervall</div>
- <xsl:for-each select="heading_array">
- <div><xsl:value-of
select="."/></div>
+ <ul style="clear:left;" class="calendar info">
+ <li class="heading">
+ <div class="id">ID</div>
+ <div class="title">Tittel</div>
+ <div
class="frequency">Frekvenstype</div>
+ <div
class="frequency">Frekvensintervall</div>
+ </li>
+
+ <xsl:for-each
select="controls_calendar_array">
+ <li>
+ <div class="id">
+ <xsl:value-of
select="control/id"/>
+ </div>
+ <div class="title">
+ <xsl:value-of
select="control/title"/>
+ </div>
+ <div class="frequency">
+ <xsl:value-of
select="control/repeat_type"/>
+ </div>
+ <div class="frequency">
+ <xsl:value-of
select="control/repeat_interval"/>
+ </div>
+ </li>
</xsl:for-each>
- </li>
-
- <xsl:for-each select="controls_calendar_array">
- <li>
- <div class="id">
- <xsl:value-of
select="control/id"/>
- </div>
- <div class="title">
- <xsl:value-of
select="control/title"/>
- </div>
- <div class="frequency">
- <xsl:value-of
select="control/repeat_type"/>
- </div>
- <div class="frequency">
- <xsl:value-of
select="control/repeat_interval"/>
- </div>
- <xsl:for-each
select="calendar_array">
- <div>
- <xsl:choose>
- <xsl:when
test="calendar_array/child::node() = 1">
- <xsl:value-of
select="." />
- </xsl:when>
- <xsl:otherwise>
- <div
style="position:relative;">
- <div
id="info_box" style="position:absolute;display:none;">
- </div>
-
<xsl:choose>
-
<xsl:when test="id">
-
<xsl:variable name="status"><xsl:value-of
select="status"/></xsl:variable>
-
<xsl:choose>
-
<xsl:when test="status = 1">
-
<img height="15"
src="controller/images/status_icon_light_green.png" />
+ </ul>
+
+ <div id="days_wrp">
+
+ <ul id="days_view" class="calendar
days">
+ <li>
+ <xsl:for-each
select="heading_array">
+
<div><xsl:value-of select="."/></div>
+ </xsl:for-each>
+ </li>
+ <li>
+ <xsl:for-each
select="controls_calendar_array/calendar_array">
+ <div>
+ <xsl:choose>
+
<xsl:when test="calendar_array/child::node() = 1">
+
<xsl:value-of select="." />
+
</xsl:when>
+
<xsl:otherwise>
+
<div style="position:relative;">
+
<div id="info_box" style="position:absolute;display:none;">
+
</div>
+
<xsl:choose>
+
<xsl:when test="id">
+
<xsl:variable
name="status"><xsl:value-of select="status"/></xsl:variable>
+
<xsl:choose>
+
<xsl:when test="status = 1">
+
<img height="15"
src="controller/images/status_icon_light_green.png" />
+
</xsl:when>
+
<xsl:otherwise>
+
<a class="view_check_list">
+
<xsl:attribute
name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.get_check_list_info</xsl:text>
+
<xsl:text>&phpgw_return_as=json</xsl:text>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of
select="id"/>
+
</xsl:attribute>
+
<img height="15"
src="controller/images/status_icon_red.png" />
+
</a>
+
</xsl:otherwise>
+
</xsl:choose>
</xsl:when>
<xsl:otherwise>
-
<a class="view_list">
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.get_check_list_info</xsl:text>
-
<xsl:text>&phpgw_return_as=json</xsl:text>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="id"/>
-
</xsl:attribute>
-
<img height="15"
src="controller/images/status_icon_red.png" />
-
</a>
+
<img height="15"
src="controller/images/status_icon_yellow.png" />
</xsl:otherwise>
-
</xsl:choose>
-
</xsl:when>
-
<xsl:otherwise>
-
<img height="15"
src="controller/images/status_icon_yellow.png" />
-
</xsl:otherwise>
-
</xsl:choose>
-
</div>
- </xsl:otherwise>
- </xsl:choose>
- </div>
- </xsl:for-each>
- </li>
- </xsl:for-each>
- </ul>
+
</xsl:choose>
+
</div>
+
</xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </xsl:for-each>
+ </li>
+ </ul>
+ </div>
</xsl:when>
<xsl:otherwise>
<div>Ingen sjekklister for bygg i angitt
periode</div>
Modified:
trunk/controller/templates/base/view_agg_check_lists_for_location_year.xsl
===================================================================
--- trunk/controller/templates/base/view_agg_check_lists_for_location_year.xsl
2011-12-06 12:32:34 UTC (rev 8245)
+++ trunk/controller/templates/base/view_agg_check_lists_for_location_year.xsl
2011-12-06 12:33:06 UTC (rev 8246)
@@ -67,7 +67,7 @@
<img height="15"
src="controller/images/status_icon_light_green.png" />
</xsl:when>
<xsl:otherwise>
-
<a class="view_list">
+
<a class="view_check_list">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.get_check_list_info</xsl:text>
<xsl:text>&phpgw_return_as=json</xsl:text>
Modified: trunk/controller/templates/base/view_check_lists_for_location.xsl
===================================================================
--- trunk/controller/templates/base/view_check_lists_for_location.xsl
2011-12-06 12:32:34 UTC (rev 8245)
+++ trunk/controller/templates/base/view_check_lists_for_location.xsl
2011-12-06 12:33:06 UTC (rev 8246)
@@ -59,7 +59,7 @@
<img height="15"
src="controller/images/status_icon_light_green.png" />
</xsl:when>
<xsl:otherwise>
-
<a class="view_list">
+
<a class="view_check_list">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.get_check_list_info</xsl:text>
<xsl:text>&phpgw_return_as=json</xsl:text>
| [Prev in Thread] | Current Thread | [Next in Thread] |