diff options
| author | Jim Hu <jimhu@users.sourceforge.net> | 2005-09-07 06:08:02 +0000 |
|---|---|---|
| committer | Jim Hu <jimhu@users.sourceforge.net> | 2005-09-07 06:08:02 +0000 |
| commit | 6eabeaeb9ff95f4f227c66e5293c0afdf0ac0ca4 (patch) | |
| tree | 56ac1f5ec08712c6636c8a58f76ddba5e8447dd1 | |
| parent | 5c46da23340dd0b15510f982d1ded7b4c8ef1aab (diff) | |
| download | phpicalendar-6eabeaeb9ff95f4f227c66e5293c0afdf0ac0ca4.tar.gz phpicalendar-6eabeaeb9ff95f4f227c66e5293c0afdf0ac0ca4.tar.bz2 phpicalendar-6eabeaeb9ff95f4f227c66e5293c0afdf0ac0ca4.zip | |
adjust date_functions.php, event.js, header.tpl to allow event popups to work with cpath multiple calendar directories
| -rw-r--r-- | admin/index.php | 4 | ||||
| -rw-r--r-- | functions/date_functions.php | 4 | ||||
| -rw-r--r-- | functions/event.js | 4 | ||||
| -rw-r--r-- | templates/default/header.tpl | 1 |
4 files changed, 6 insertions, 7 deletions
diff --git a/admin/index.php b/admin/index.php index c4f60bb..c4a0292 100644 --- a/admin/index.php +++ b/admin/index.php @@ -140,7 +140,3 @@ $page->draw_admin(); $page->output(); ?> - - - - diff --git a/functions/date_functions.php b/functions/date_functions.php index 6c524db..2b83c79 100644 --- a/functions/date_functions.php +++ b/functions/date_functions.php @@ -163,7 +163,7 @@ function chooseOffset($time) { } function openevent($event_date, $uid, $arr, $lines = 0, $length = 0, $link_class = '', $pre_text = '', $post_text = '') { - + global $cpath; $event_text = stripslashes(urldecode($arr["event_text"])); if (empty($start)) { $title = $event_text; @@ -193,7 +193,7 @@ function openevent($event_date, $uid, $arr, $lines = 0, $length = 0, $link_class static $popup_data_index = 0; $return = " <script language=\"Javascript\" type=\"text/javascript\"><!-- - var eventData = new EventData('$escaped_date', '$escaped_time', '$escaped_uid'); + var eventData = new EventData('$escaped_date', '$escaped_time', '$escaped_uid','$cpath'); document.popup_data[$popup_data_index] = eventData; // --></script>"; diff --git a/functions/event.js b/functions/event.js index 9f9f613..0072bd3 100644 --- a/functions/event.js +++ b/functions/event.js @@ -7,6 +7,7 @@ function openEventWindow(num) { form.elements.date.value = data.date; form.elements.time.value = data.time; form.elements.uid.value = data.uid; + form.elements.cpath.value = data.cpath; // open a new window var w = window.open('', 'Popup', 'scrollbars=yes,width=460,height=275'); @@ -14,10 +15,11 @@ function openEventWindow(num) { form.submit(); } -function EventData(date, time, uid) { +function EventData(date, time, uid, cpath) { this.date = date; this.time = time; this.uid = uid; + this.cpath = cpath; } function openTodoInfo(vtodo_array) { diff --git a/templates/default/header.tpl b/templates/default/header.tpl index a7ec486..1ac0920 100644 --- a/templates/default/header.tpl +++ b/templates/default/header.tpl @@ -15,4 +15,5 @@ <input type="hidden" name="date" id="date" value="" /> <input type="hidden" name="time" id="time" value="" /> <input type="hidden" name="uid" id="uid" value="" /> + <input type="hidden" name="cpath" id="cpath" value="" /> </form> |