|
| From: | Torstein |
| Subject: | [Fmsystem-commits] [8330] |
| Date: | Thu, 15 Dec 2011 13:47:16 +0000 |
Revision: 8330
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8330
Author: vator
Date: 2011-12-15 13:47:16 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/inc/component/class.calendar_builder.inc.php
trunk/controller/templates/base/view_calendar_month.xsl
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2011-12-15 13:12:36 UTC
(rev 8329)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2011-12-15 13:47:16 UTC
(rev 8330)
@@ -192,7 +192,7 @@
public function get_check_list_info()
{
$check_list_id = phpgw::get_var('check_list_id');
- $check_list =
$this->so_check_list->get_single_with_control_items($check_list_id);
+ $check_list =
$this->so_check_list->get_single_with_check_items($check_list_id);
return json_encode( $check_list );
}
Modified: trunk/controller/inc/component/class.calendar_builder.inc.php
===================================================================
--- trunk/controller/inc/component/class.calendar_builder.inc.php
2011-12-15 13:12:36 UTC (rev 8329)
+++ trunk/controller/inc/component/class.calendar_builder.inc.php
2011-12-15 13:47:16 UTC (rev 8330)
@@ -79,10 +79,7 @@
$controls_calendar_array[] = array("control" =>
$control->toArray(), "calendar_array" => $calendar_array);
}
-
-
- print_r( $controls_calendar_array );
-
+
return $controls_calendar_array;
}
Modified: trunk/controller/templates/base/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/view_calendar_month.xsl 2011-12-15
13:12:36 UTC (rev 8329)
+++ trunk/controller/templates/base/view_calendar_month.xsl 2011-12-15
13:47:16 UTC (rev 8330)
@@ -15,46 +15,41 @@
<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(){
+ var leftStrVal =
$("#days_view").css("left");
+ var leftNumVal =
leftStrVal.substring(0, leftStrVal.indexOf('px'));
+
+ if(leftNumVal == -502){
+ $("#days_view").animate({
+ left: '-=118'
+ }, 800);
+ }else if(leftNumVal > -502){
+ $("#days_view").animate({
+ left: '-=502'
+ }, 800);
+ }
+ });
+
+ $(".move_cal_right").click(function(){
- $(document).ready(function() {
-
- $(".move_cal_left").click(function(){
- var leftStrVal = $("#days_view").css("left");
- var leftNumVal = leftStrVal.substring(0,
leftStrVal.indexOf('px'));
-
- if(leftNumVal == -502){
- $("#days_view").animate({
- left: '-=118'
- }, 800);
- }else if(leftNumVal > -502){
- $("#days_view").animate({
- left: '-=502'
- }, 800);
- }
- });
-
-
- $(".move_cal_right").click(function(){
-
- var leftStrVal = $("#days_view").css("left");
- var leftNumVal = leftStrVal.substring(0,
leftStrVal.indexOf('px'));
-
- if(leftNumVal == -118){
- $("#days_view").animate({
- left: '+=118'
- }, 800);
- }else if(-502 > leftNumVal){
- $("#days_view").animate({
- left: '+=502'
- }, 800);
- }
- });
-
-
-
- });
-
+ var leftStrVal =
$("#days_view").css("left");
+ var leftNumVal =
leftStrVal.substring(0, leftStrVal.indexOf('px'));
+
+ if(leftNumVal == -118){
+ $("#days_view").animate({
+ left: '+=118'
+ }, 800);
+ }else if(-502 > leftNumVal){
+ $("#days_view").animate({
+ left: '+=502'
+ }, 800);
+ }
+ });
+ });
</script>
+
<xsl:choose>
<xsl:when test="controls_calendar_array/child::node()">
@@ -100,65 +95,55 @@
</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:for-each
select="controls_calendar_array">
+ <li>
+ <xsl:for-each
select="calendar_array">
<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>
-
<span
style="display:none"><xsl:value-of select="id"/></span>
-
<img height="15"
src="controller/images/status_icon_red.png" />
-
</a>
-
</xsl:otherwise>
-
</xsl:choose>
-
</xsl:when>
-
<xsl:when test="date">
-
<a>
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.add_check_list_for_location</xsl:text>
-
<xsl:text>&date=</xsl:text>
-
<xsl:value-of select="date"/>
-
<xsl:text>&control_id=</xsl:text>
-
<xsl:value-of select="//control/id"/>
-
<xsl:text>&location_code=</xsl:text>
-
<xsl:value-of
select="//location_array/location_code"/>
-
</xsl:attribute>
-
<img height="15"
src="controller/images/status_icon_yellow.png" />
-
</a>
-
</xsl:when>
-
</xsl:choose>
+
<xsl:when test="status = 0">
+
<div>
+
<a>
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.add_check_list_for_location</xsl:text>
+
<xsl:text>&date=</xsl:text>
+
<xsl:value-of select="info/date"/>
+
<xsl:text>&control_id=</xsl:text>
+
<xsl:value-of select="//control/id"/>
+
<xsl:text>&location_code=</xsl:text>
+
<xsl:value-of select="//location_array/location_code"/>
+
</xsl:attribute>
+
<img height="15" src="controller/images/status_icon_yellow.png" />
+
</a>
</div>
- </xsl:otherwise>
- </xsl:choose>
- </div>
- </xsl:for-each>
- </li>
+
</xsl:when>
+
<xsl:when test="status = 1">
+
<div style="position:relative;">
+
<div id="info_box" style="position:absolute;display:none;"></div>
+
<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="info/id"/>
+
</xsl:attribute>
+
<span style="display:none"><xsl:value-of
select="info/id"/></span>
+
<img height="15" src="controller/images/status_icon_red.png" />
+
</a>
+
</div>
+
</xsl:when>
+
<xsl:otherwise>
+
<div></div>
+
</xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </li>
+ </xsl:for-each>
</ul>
</div>
</xsl:when>
| [Prev in Thread] | Current Thread | [Next in Thread] |