Changeset 961
- Timestamp:
- 06/08/09 11:12:33 (15 years ago)
- Location:
- trunk/expressoCalendar
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoCalendar/index.php
r696 r961 44 44 45 45 $template_1 = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); 46 $template_1->set_file(Array('expressoCalendar' => 'index.tpl')); 46 $template_1->set_var("viewType",$_GET['viewType']); 47 $template_1->set_var("timeStamp",$_GET['datetime']); 47 48 $template_1->set_var('cat_options',$optionCategories); 48 49 $template_1->set_var('cal_options',$optionCals); 50 $template_1->set_file(Array('expressoCalendar' => 'index.tpl')); 49 51 $template_1->set_block('expressoCalendar','index'); 50 52 $template_1->pfp('out','index'); … … 64 66 ."<script language='JavaScript' type='text/javascript' src='js/drag_area.js'></script>" 65 67 ."<script language='JavaScript' type='text/javascript' src='js/MOFX.js'></script>" 66 ."<script language='JavaScript' type='text/javascript' src='js/common_functions.js'></script>"; 68 ."<script language='JavaScript' type='text/javascript' src='js/common_functions.js'></script>" 69 ."<script language='JavaScript' type='text/javascript'>calendar.getView('div_main');</script>"; 70 67 71 68 72 $GLOBALS['phpgw']->common->phpgw_exit(); -
trunk/expressoCalendar/js/calendar_functions.js
r920 r961 79 79 Calendar.prototype.getView = function(idEl, type, viewTime) 80 80 { 81 if (typeof(type) == 'undefined') 82 return false; 83 if (typeof(viewTime) == 'undefined') 81 if (typeof(type) == 'undefined'){ 82 type = document.getElementById('calViewType').value; 83 if (type.length < 1) 84 return false; 85 } 86 if (typeof(viewTime) == 'undefined'){ 87 if (document.getElementById('calDateTime').value.length > 0) 88 calendar.currentTime.setTime(document.getElementById('calDateTime').value*1000); 84 89 viewTime = calendar.currentTime.getTime(); 90 } 91 85 92 if (type == 'Year'){ 86 93 var handler = function (data) { … … 128 135 document.getElementById("l_date").innerHTML += calendar.parseDate(id2timeStamp(document.getElementById('day').firstChild.id)); 129 136 if (viewType == "Month") 130 document.getElementById("l_date").innerHTML += calendar.parseMonth(id2timeStamp(document.getElementById('day').firstChild.id)); 137 document.getElementById("l_date").innerHTML += 138 "<a href='"+window.location+ 139 "?viewType=Month"+ 140 "&datetime="+parseInt(id2timeStamp(document.getElementById('day').firstChild.id)/1000)+ 141 "'>"+calendar.parseMonth(id2timeStamp(document.getElementById('day').firstChild.id))+"</a>"; 131 142 document.getElementById("l_date").innerHTML += "<a href=\"javascript:calendar.getView('div_main','"+viewType+"',this.nextView);\"> \>\></a>"; 132 143 … … 335 346 eventDiv.style.width = "60px"; 336 347 eventDiv.style.height = "30px"; 337 eventDiv.onmouseover = function () { if (this.childNodes[2].length > 12) { this.style.width = "120px"; this.style.height = "auto"; } this.style.zIndex = 2; };348 eventDiv.onmouseover = function () { if (this.childNodes[2].length > 20) { this.style.width = "120px"; this.style.height = "auto"; } this.style.zIndex = 2; }; 338 349 eventDiv.onmouseout = function () { this.style.height = "30px"; this.style.width = "60px"; this.style.zIndex = 1; }; 339 350 eventDiv.onclick = function () { calendar.getView('div_main','Day',eventDiv.childNodes[1].id); }; … … 375 386 } 376 387 } 377 378 -
trunk/expressoCalendar/templates/default/index.tpl
r920 r961 1 1 <!-- BEGIN index --> 2 <input type="hidden" value="{viewType}" id="calViewType"> 3 <input type="hidden" value="{timeStamp}" id="calDateTime"> 2 4 <table id="calendar_head_table" class="calendar_head_table" border="0" width="100%" cols="3" cellpadding="0" cellspacing="0"> 3 5 <tbody>
Note: See TracChangeset
for help on using the changeset viewer.