Changeset 961 for trunk/expressoCalendar

Timestamp:

06/08/09 11:12:33 (15 years ago)

Author:

amuller

Message:

Ticket #88 - Melhorias no módulo calendário novo

Location:

trunk/expressoCalendar

Files:

• index.php (modified) (2 diffs)
• js/calendar_functions.js (modified) (4 diffs)
• templates/default/index.tpl (modified) (1 diff)

trunk/expressoCalendar/index.php

@@ -44 +44 @@
 
 $template_1 = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
-$template_1->set_file(Array('expressoCalendar' => 'index.tpl'));
+$template_1->set_var("viewType",$_GET['viewType']);
+$template_1->set_var("timeStamp",$_GET['datetime']);
 $template_1->set_var('cat_options',$optionCategories);
 $template_1->set_var('cal_options',$optionCals);
+$template_1->set_file(Array('expressoCalendar' => 'index.tpl'));
 $template_1->set_block('expressoCalendar','index');
 $template_1->pfp('out','index');
@@ -64 +66 @@
 ."<script language='JavaScript' type='text/javascript' src='js/drag_area.js'></script>"
 ."<script language='JavaScript' type='text/javascript' src='js/MOFX.js'></script>"
-."<script language='JavaScript' type='text/javascript' src='js/common_functions.js'></script>";
+."<script language='JavaScript' type='text/javascript' src='js/common_functions.js'></script>"
+."<script language='JavaScript' type='text/javascript'>calendar.getView('div_main');</script>";
+
 
 $GLOBALS['phpgw']->common->phpgw_exit();

trunk/expressoCalendar/js/calendar_functions.js

@@ -79 +79 @@
 Calendar.prototype.getView = function(idEl, type, viewTime)
 {
-        if (typeof(type) == 'undefined')
-                return false;
-        if (typeof(viewTime) == 'undefined')
+        if (typeof(type) == 'undefined'){
+                type = document.getElementById('calViewType').value;
+                if (type.length < 1)
+                        return false;
+                }
+        if (typeof(viewTime) == 'undefined'){
+                if (document.getElementById('calDateTime').value.length > 0)
+                        calendar.currentTime.setTime(document.getElementById('calDateTime').value*1000);
                 viewTime = calendar.currentTime.getTime();
+        }
+
         if (type == 'Year'){
                 var handler = function (data) {
@@ -128 +135 @@
                                 document.getElementById("l_date").innerHTML += calendar.parseDate(id2timeStamp(document.getElementById('day').firstChild.id));
                         if (viewType == "Month")
-                                document.getElementById("l_date").innerHTML += calendar.parseMonth(id2timeStamp(document.getElementById('day').firstChild.id));
+                                document.getElementById("l_date").innerHTML += 
+                                "<a href='"+window.location+
+                                "?viewType=Month"+
+                                "&datetime="+parseInt(id2timeStamp(document.getElementById('day').firstChild.id)/1000)+
+                                "'>"+calendar.parseMonth(id2timeStamp(document.getElementById('day').firstChild.id))+"</a>";
                         document.getElementById("l_date").innerHTML += "<a href=\"javascript:calendar.getView('div_main','"+viewType+"',this.nextView);\">&nbsp;\>\></a>";
 
@@ -335 +346 @@
                 eventDiv.style.width = "60px";
                 eventDiv.style.height = "30px";
-                eventDiv.onmouseover = function () { if (this.childNodes[2].length > 12) { this.style.width = "120px"; this.style.height = "auto"; }  this.style.zIndex = 2; };
+                eventDiv.onmouseover = function () { if (this.childNodes[2].length > 20) { this.style.width = "120px"; this.style.height = "auto"; }  this.style.zIndex = 2; };
                 eventDiv.onmouseout = function () { this.style.height = "30px"; this.style.width = "60px"; this.style.zIndex = 1; };
                 eventDiv.onclick = function () { calendar.getView('div_main','Day',eventDiv.childNodes[1].id); };
@@ -375 +386 @@
         }
 }
-
-

trunk/expressoCalendar/templates/default/index.tpl

@@ -1 +1 @@
 <!-- BEGIN index -->
+<input type="hidden" value="{viewType}" id="calViewType">
+<input type="hidden" value="{timeStamp}" id="calDateTime">
 <table id="calendar_head_table" class="calendar_head_table" border="0" width="100%" cols="3" cellpadding="0" cellspacing="0">
 <tbody>