diff --git a/livesupport/modules/htmlUI/var/templates/header.tpl b/livesupport/modules/htmlUI/var/templates/header.tpl index 0f204a514..4501933e1 100755 --- a/livesupport/modules/htmlUI/var/templates/header.tpl +++ b/livesupport/modules/htmlUI/var/templates/header.tpl @@ -7,6 +7,7 @@ {include file="script/basics.js.tpl"} {include file="script/contextMenue.js.tpl"} {include file="script/collector.js.tpl"} + {include file="script/mouseOver.js.tpl"} \ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl index 9b35f90fb..474c4ae71 100755 --- a/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl +++ b/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl @@ -1,47 +1,66 @@ {$SCHEDULER->buildWeek()} {assign var="_divisor" value=180} {assign var="_minwidth" value=20} +{assign var="_scale" value=$SCHEDULER->getDayTimingScale()} - - {foreach from=$SCHEDULER->Week item="_Weekday"} - + + {foreach from=$SCHEDULER->Week item="_Day"} + + {/foreach} + + + + + {foreach from=$SCHEDULER->Week item="_Day"} + {/foreach} - {foreach from=$SCHEDULER->Week item="_Day"} - + + + {/foreach} diff --git a/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl b/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl index 498d8c587..616a66934 100755 --- a/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl +++ b/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl @@ -3,22 +3,22 @@ // www.jjam.de - Kontextmenü mit JavaScript - Version 15.12.2002 // Nur für IE 5+ und NN 6+ -ie5=(document.getElementById && document.all && document.styleSheets)?1:0; -nn6=(document.getElementById && !document.all)?1:0; +ie5 = (document.getElementById && document.all && document.styleSheets) ? 1 : 0; +nn6 = (document.getElementById && !document.all) ? 1 : 0; menuStatus = 0; document.onmouseup = hideMenu; document.write(''); -menuWidth = 180, +menuWidth = 0, menuHeight = 0; function menu(param) { - var menuHeader = "
<< {$_Weekday.label.full}<< {$_Day.label.full}>>
+ {$_Day.day} + >>
- {$_Day.day} + {assign var="_oneday" value=$SCHEDULER->getDayTiming($_Day.year, $_Day.month, $_Day.day)} - {assign var="_oneday" value=$SCHEDULER->getDayTiming($_Day.year, $_Day.month, $_Day.day)} + + + {foreach from=$_scale item="_hour"} + + + + {/foreach} +
+
{$_hour|string_format:'%02d'}
+
+ 		{foreach from=$_oneday item="i"} - + {assign var = "_start" value = $i.entry.start|regex_replace:"/[0-9]+T/":""} + {assign var = "_end" value = $i.entry.end|regex_replace:"/[0-9]+T/":""} + {assign var = "_period" value = "$_start-$_end"} + {assign var = "_title" value = $i.entry.title} + {assign var = "_creator" value = $i.entry.creator} + + {if is_array($i.entry)} - + {else} + {/if} - {else} - + {/if} {/foreach}
{if $i.length/$_divisor > $_minwidth} - - {$i.entry.title} -
- {$i.entry.start|regex_replace:"/[0-9]+T/":""|truncate:5:""}-{$i.entry.end|regex_replace:"/[0-9]+T/":""|truncate:5:""} -
- {$i.entry.creator} - +
{$_title}
{$_period}
{$_creator}
 -
-
"; + var menuHeader = "
"; var menuFooter = "
"; var menuHtml = ''; var sp2 = "  "; - var sp5 = sp2+sp2+" "; // Leerzeichen als Abstandshalter (flexibler und code-sparender als eine aufwendige Tabellenkonstruktion) ; - var oF = "onfocus='if(this.blur)this.blur()'"; // Um hässlichen Linkrahmen in einigen Browsern zu vermeiden; + var sp5 = sp2 + sp2 + " "; // Leerzeichen als Abstandshalter (flexibler und code-sparender als eine aufwendige Tabellenkonstruktion) ; + var oF = "onfocus = 'if (this.blur) this.blur()'"; // Um hässlichen Linkrahmen in einigen Browsern zu vermeiden; var entry = new Array(); //menuStatus = 0; @@ -99,33 +99,35 @@ function menu(param) { function showMenu(e) { - if(ie5) { - if(event.clientX>menuWidth) xPos=event.clientX-menuWidth+document.body.scrollLeft; - else xPos=event.clientX+document.body.scrollLeft; - if (event.clientY>menuHeight) yPos=event.clientY-menuHeight+document.body.scrollTop; - else yPos=event.clientY+document.body.scrollTop; + if (ie5) { + if (event.clientX > menuWidth) xPos = event.clientX - menuWidth + document.body.scrollLeft; + else xPos = event.clientX + document.body.scrollLeft; + if (event.clientY > menuHeight) yPos = event.clientY - menuHeight + document.body.scrollTop; + else yPos = event.clientY + document.body.scrollTop; } else { - if(e.pageX>menuWidth+window.pageXOffset) xPos=e.pageX-menuWidth; - else xPos=e.pageX; - if(e.pageY>menuHeight+window.pageYOffset) yPos=e.pageY-menuHeight; - else yPos=e.pageY; + if (e.pageX > menuWidth + window.pageXOffset) xPos = e.pageX - menuWidth; + else xPos = e.pageX; + if (e.pageY > menuHeight + window.pageYOffset) yPos = e.pageY - menuHeight; + else yPos = e.pageY; } - document.getElementById("menu").style.left=xPos; - document.getElementById("menu").style.top=yPos; - menuStatus=1; + + document.getElementById("menu").style.left = xPos; + document.getElementById("menu").style.top = yPos; + menuStatus = 1; document.oncontextmenu = null; } function hideMenu(e) { - if (menuStatus==1) { - setTimeout("document.getElementById('menu').style.top=-250", 100); - menuStatus=0; + if (menuStatus == 1) { + setTimeout("document.getElementById('menu').style.top =- 250", 100); + menuStatus = 0; } } -var passed=false; +var passed = false; + function highlight() { //if (!passed) alert('try rightclick in lists...'); @@ -139,9 +141,9 @@ function darklight() {/literal} diff --git a/livesupport/modules/htmlUI/var/templates/script/mouseOver.js.tpl b/livesupport/modules/htmlUI/var/templates/script/mouseOver.js.tpl new file mode 100755 index 000000000..bc3766b96 --- /dev/null +++ b/livesupport/modules/htmlUI/var/templates/script/mouseOver.js.tpl @@ -0,0 +1,49 @@ +{literal} + +{/literal} \ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/ui_scheduler.class.php b/livesupport/modules/htmlUI/var/ui_scheduler.class.php index 9db9814e2..1ae1fb170 100755 --- a/livesupport/modules/htmlUI/var/ui_scheduler.class.php +++ b/livesupport/modules/htmlUI/var/ui_scheduler.class.php @@ -151,6 +151,17 @@ class uiScheduler extends uiCalendar } + function getDayTimingScale() + { + for ($n = 0; $n <= 23; $n++) { + $scale[] = $n; + } + #print_r($scale); + return $scale; + + } + + function _oneOrMore($in) { return $id < 1 ? ceil($in) : round($in);