Changeset 748 for trunk/expressoCalendar/js
- Timestamp:
- 04/17/09 15:39:30 (15 years ago)
- Location:
- trunk/expressoCalendar/js
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoCalendar/js/calendar_functions.js
r696 r748 157 157 { 158 158 var _this = this; 159 var div = document.getElementById(this.idEl); 159 160 try { 160 var xsl = XMLTools.load('xsl/view'+type+'.xsl?'+ Date.parse(new Date)); 161 var div = document.getElementById(this.idEl); 162 div.innerHTML = xtools.parse(data, xsl); 163 document.getElementById('divAppbox').style.height = "100%"; 161 var xsl = XMLTools.load('xsl/view'+type+'.xsl?'+ Date.parse(new Date)); 162 div.innerHTML = xtools.parse(data, xsl); 164 163 } 165 164 catch(e){ 166 165 alert(e); 167 166 } 167 document.getElementById('divAppbox').style.height = "100%"; 168 168 169 169 if (type == 'Week' || type == 'Month') … … 171 171 var trWeek = document.getElementById('tr_week'); 172 172 for (var i=0; i < trWeek.childNodes.length; i++) 173 trWeek.childNodes[i].innerHTML = get_lang(trWeek.childNodes[i].innerHTML) ;173 trWeek.childNodes[i].innerHTML = get_lang(trWeek.childNodes[i].innerHTML)+(type=='Week'?" "+id2String((trWeek.childNodes[i].id).substr(8)):""); 174 174 } 175 175 }; … … 318 318 eventDiv.style.width = widthValue+"px"; 319 319 320 var headerElement = document.getElementById('week Header_'+timeStamp2id(eventDiv.childNodes[1].id).substr(0,8));320 var headerElement = document.getElementById('weekday_'+timeStamp2id(eventDiv.childNodes[1].id).substr(0,8)); 321 321 if (currentPos > 1) 322 322 eventDiv.style.left = (10+(tempDate.getDay()*122)+(widthValue*currentPos))+"px"; -
trunk/expressoCalendar/js/common_functions.js
r665 r748 310 310 } 311 311 312 function id2String(id){ 313 if (id < 1) 314 return ""; 315 objDate = new Date(); 316 objDate.setHours(id.substr(8,2)); 317 objDate.setMinutes(id.substr(10,2)); 318 objDate.setYear(id.substr(0,4)); 319 objDate.setDate(id.substr(4,2)); 320 objDate.setMonth(id.substr(6,2)-1); 321 return objDate.getDate()+"/"+(objDate.getMonth()+1); 322 } 323 312 324 function get_lang(_key) 313 325 {
Note: See TracChangeset
for help on using the changeset viewer.