[geeklog-hg] geeklog: Updated Calendar Plugin to Version 1.1.5. Now uses stan...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Thu Feb 19 10:15:11 EST 2015
changeset 9577:d2ad6a1f6a74
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/d2ad6a1f6a74
user: Tom
date: Thu Feb 19 10:06:22 2015 -0500
description:
Updated Calendar Plugin to Version 1.1.5. Now uses standardized template and css file location functions
diffstat:
plugins/calendar/autoinstall.php | 4 +-
plugins/calendar/functions.inc | 40 +--
plugins/calendar/templates/addevent.thtml | 37 --
plugins/calendar/templates/addeventoption.thtml | 9 -
plugins/calendar/templates/addremoveevent.thtml | 1 -
plugins/calendar/templates/admin/batchdelete.thtml | 8 -
plugins/calendar/templates/admin/eventeditor.thtml | 129 --------
plugins/calendar/templates/calendar.thtml | 109 -------
plugins/calendar/templates/calendarday.thtml | 4 -
plugins/calendar/templates/calendarevent.thtml | 1 -
plugins/calendar/templates/calendarweek.thtml | 4 -
plugins/calendar/templates/dayview/column.thtml | 1 -
plugins/calendar/templates/dayview/dayview.thtml | 125 --------
plugins/calendar/templates/dayview/quickaddform.thtml | 55 ---
plugins/calendar/templates/dayview/singleevent.thtml | 1 -
plugins/calendar/templates/default/addevent.thtml | 37 ++
plugins/calendar/templates/default/addeventoption.thtml | 9 +
plugins/calendar/templates/default/addremoveevent.thtml | 1 +
plugins/calendar/templates/default/admin/batchdelete.thtml | 8 +
plugins/calendar/templates/default/admin/eventeditor.thtml | 129 ++++++++
plugins/calendar/templates/default/calendar.thtml | 109 +++++++
plugins/calendar/templates/default/calendarday.thtml | 4 +
plugins/calendar/templates/default/calendarevent.thtml | 1 +
plugins/calendar/templates/default/calendarweek.thtml | 4 +
plugins/calendar/templates/default/dayview/column.thtml | 1 +
plugins/calendar/templates/default/dayview/dayview.thtml | 125 ++++++++
plugins/calendar/templates/default/dayview/quickaddform.thtml | 55 +++
plugins/calendar/templates/default/dayview/singleevent.thtml | 1 +
plugins/calendar/templates/default/editpersonalevent.thtml | 124 ++++++++
plugins/calendar/templates/default/eventdetails.thtml | 26 +
plugins/calendar/templates/default/events.thtml | 6 +
plugins/calendar/templates/default/mastercalendaroption.thtml | 5 +
plugins/calendar/templates/default/personalcalendaroption.thtml | 5 +
plugins/calendar/templates/default/submitevent.thtml | 104 ++++++
plugins/calendar/templates/default/weekview/events.thtml | 1 +
plugins/calendar/templates/default/weekview/weekview.thtml | 70 ++++
plugins/calendar/templates/editpersonalevent.thtml | 124 --------
plugins/calendar/templates/eventdetails.thtml | 26 -
plugins/calendar/templates/events.thtml | 6 -
plugins/calendar/templates/mastercalendaroption.thtml | 5 -
plugins/calendar/templates/personalcalendaroption.thtml | 5 -
plugins/calendar/templates/submitevent.thtml | 104 ------
plugins/calendar/templates/weekview/events.thtml | 1 -
plugins/calendar/templates/weekview/weekview.thtml | 70 ----
public_html/admin/plugins/calendar/index.php | 2 +-
public_html/calendar/css/default/style.css | 155 ++++++++++
public_html/calendar/event.php | 6 +-
public_html/calendar/index.php | 6 +-
public_html/calendar/style.css | 155 ----------
49 files changed, 996 insertions(+), 1022 deletions(-)
diffs (truncated from 2304 to 300 lines):
diff -r e9ea3853a25e -r d2ad6a1f6a74 plugins/calendar/autoinstall.php
--- a/plugins/calendar/autoinstall.php Thu Feb 19 10:03:25 2015 -0500
+++ b/plugins/calendar/autoinstall.php Thu Feb 19 10:06:22 2015 -0500
@@ -44,8 +44,8 @@
$info = array(
'pi_name' => $pi_name,
'pi_display_name' => $pi_display_name,
- 'pi_version' => '1.1.4',
- 'pi_gl_version' => '2.1.0',
+ 'pi_version' => '1.1.5',
+ 'pi_gl_version' => '2.1.1',
'pi_homepage' => 'http://www.geeklog.net/'
);
diff -r e9ea3853a25e -r d2ad6a1f6a74 plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc Thu Feb 19 10:03:25 2015 -0500
+++ b/plugins/calendar/functions.inc Thu Feb 19 10:06:22 2015 -0500
@@ -671,7 +671,7 @@
// use the CSS only if we are on the plugin's pages
if (substr_count ($_SERVER['PHP_SELF'], '/calendar/') > 0) {
- $_SCRIPTS->setCSSFile('calendar', '/calendar/style.css', false);
+ $_SCRIPTS->setCSSFile('calendar', CTL_plugin_cssURL('calendar'), false);
}
}
@@ -757,7 +757,7 @@
$retval = '';
$retval .= COM_startBlock ($LANG_CAL_1[26], 'submitevent.html');
- $eventform = COM_newTemplate($_CONF['path'] . 'plugins/calendar/templates/');
+ $eventform = COM_newTemplate(CTL_plugin_templatePath('calendar'));
$eventform->set_file ('eventform', 'submitevent.thtml');
if ($mode != 'personal') {
$eventform->set_var ('explanation', $LANG_CAL_1[27]);
@@ -941,7 +941,7 @@
'text' => $LANG_ADMIN['admin_home'])
);
- $cal_templates = COM_newTemplate($_CONF['path'] . 'plugins/calendar/templates/admin');
+ $cal_templates = COM_newTemplate(CTL_plugin_templatePath('calendar', 'admin'));
$cal_templates->set_file(array('form' => 'batchdelete.thtml'));
$cal_templates->set_var('usr_time', $usr_time);
$cal_templates->set_var('lang_text_start', $LANG_CAL_ADMIN[28]);
@@ -1649,6 +1649,10 @@
$current_version = '1.1.4';
break;
+ case '1.1.4':
+
+ $current_version = '1.1.5';
+ break;
default:
$done = true;
break;
@@ -1738,36 +1742,6 @@
return $out;
}
-
-/**
-* Get path for the template files.
-*
-* @param string $path subdirectory within the base template path
-* @return string full path to template directory
-*
-*/
-function calendar_templatePath ($path = '')
-{
- global $_CONF;
-
- if (empty ($path)) {
- $layout_path = $_CONF['path_layout'] . calendar;
- } else {
- $layout_path = $_CONF['path_layout'] . calendar . '/' . $path;
- }
-
- if (is_dir ($layout_path)) {
- $retval = $layout_path;
- } else {
- $retval = $_CONF['path'] . 'plugins/calendar/templates';
- if (!empty ($path)) {
- $retval .= '/' . $path;
- }
- }
-
- return $retval;
-}
-
/**
* Returns the URL of the plugin's icon
*
diff -r e9ea3853a25e -r d2ad6a1f6a74 plugins/calendar/templates/addevent.thtml
--- a/plugins/calendar/templates/addevent.thtml Thu Feb 19 10:03:25 2015 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
- <table cellpadding="2" cellspacing="2">
- <tr>
- <td colspan="2">{intro_msg}</td>
- </tr>
- <tr>
- <td align="right"><b>{lang_event}:</b></td>
- <td>{event_title}</td>
- </tr>
- <tr>
- <td align="right"><b>{lang_starts}:</b></td>
- <td>{event_start}</td>
- </tr>
- <tr>
- <td align="right"><b>{lang_ends}:</b></td>
- <td>{event_end}</td>
- </tr>
- <tr>
- <td align="right" valign="top"><b>{lang_where}:</b></td>
- <td>{event_location}</td>
- </tr>
- <tr>
- <td align="right"><b>{lang_description}:</b></td>
- <td>{event_description}</td>
- </tr>
- <tr>
- <td colspan="2">
- <form name="userevent" method="post" action="{site_url}/calendar/event.php">
- <div>
- <input type="hidden" name="action" value="saveuserevent"{xhtml}>
- <input type="hidden" name="eid" value="{event_id}"{xhtml}>
- <input type="submit" value="{lang_addtomycalendar}"{xhtml}>
- <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
- </div>
- </form>
- </td>
- </tr>
- </table>
diff -r e9ea3853a25e -r d2ad6a1f6a74 plugins/calendar/templates/addeventoption.thtml
--- a/plugins/calendar/templates/addeventoption.thtml Thu Feb 19 10:03:25 2015 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
- <form method="post" action="{site_url}{addevent_formurl}">
- <div>
- <input type="submit" name="action" value="{lang_addevent}"{xhtml}>
- <input type="hidden" name="month" value="{cal_curmo_num}"{xhtml}>
- <input type="hidden" name="year" value="{cal_curyr_num}"{xhtml}>
- <input type="hidden" name="mode" value="{mode}"{xhtml}>
- <input type="hidden" name="view" value="addentry"{xhtml}>
- </div>
- </form>
diff -r e9ea3853a25e -r d2ad6a1f6a74 plugins/calendar/templates/addremoveevent.thtml
--- a/plugins/calendar/templates/addremoveevent.thtml Thu Feb 19 10:03:25 2015 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
- <span style="font-size:80%;">[{lang_addremovefromcal}]</span>
diff -r e9ea3853a25e -r d2ad6a1f6a74 plugins/calendar/templates/admin/batchdelete.thtml
--- a/plugins/calendar/templates/admin/batchdelete.thtml Thu Feb 19 10:03:25 2015 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<form style="display:inline" action="{site_admin_url}/plugins/calendar/index.php?mode=batchdelete" method="post">
- <div style="display: inline;">
- <input type="hidden" name="mode" value="batchdelete"{xhtml}>
- <input type="hidden" name="usr_time" value="{usr_time}"{xhtml}>
- {lang_text_start} <input class="aligncenter" type="text" name="usr_time" value="{usr_time}" size="3"{xhtml}>{lang_text_end}<br{xhtml}>
- <input type="submit" name="submit" value="{lang_updatelist}"{xhtml}>
- </div>
-</form>
diff -r e9ea3853a25e -r d2ad6a1f6a74 plugins/calendar/templates/admin/eventeditor.thtml
--- a/plugins/calendar/templates/admin/eventeditor.thtml Thu Feb 19 10:03:25 2015 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-
-<!-- plugins/calendar/templates/admin/eventeditor.thtml { -->
-
-<form action="{site_admin_url}/plugins/calendar/index.php" name="events" method="post" id="calendar-eventeditor" class="compact">
- <div class="admin_basic">
- <dl class="form_block">
- <dt><label for="calendar-eventeditor-title">{lang_eventtitle}</label></dt>
- <dd><input type="text" maxlength="128" name="title" value="{event_title}" id="calendar-eventeditor-title" class="size6"{xhtml}></dd>
-
- <dt><label for="calendar-eventeditor-event_type">{lang_eventtype}</label></dt>
- <dd><select name="event_type" id="calendar-eventeditor-event_type">
- <option value="">--</option>
- {type_options}
- </select></dd>
-
- <dt><label>{lang_eventstartdate}</label></dt>
- <dd><span dir="ltr">
- <select name="start_month">
- {startmonth_options}
- </select>
- /
- <select name="start_day">
- {startday_options}
- </select>
- /
- <select name="start_year">
- {startyear_options}
- </select>
- {lang_starttime}:
- <select name="start_hour">
- {starthour_options}
- </select>
- :
- <select name="start_minute">
- {startminute_options}
- </select>
- {startampm_selection}
- </span></dd>
-
- <dt><label>{lang_eventenddate}</label></dt>
- <dd><span dir="ltr">
- <select name="end_month">
- {endmonth_options}
- </select>
- /
- <select name="end_day">
- {endday_options}
- </select>
- /
- <select name="end_year">
- {endyear_options}
- </select>
- {lang_endtime}:
- <select name="end_hour">
- {endhour_options}
- </select>
- :
- <select name="end_minute">
- {endminute_options}
- </select>
- {endampm_selection}
- </span></dd>
-
- <dt><label for="calendar-eventeditor-allday">{lang_alldayevent}</label></dt>
- <dd><input type="checkbox" name="allday" id="calendar-eventeditor-allday" {allday_checked}{xhtml}></dd>
-
- <dt><label for="calendar-eventeditor-location">{lang_location}</label></dt>
- <dd><textarea name="location" cols="45" rows="2" id="calendar-eventeditor-location" class="size6">{event_location}</textarea></dd>
-
- <dt><label for="calendar-eventeditor-address1">{lang_addressline1}</label></dt>
- <dd><input type="text" name="address1" value="{event_address1}" id="calendar-eventeditor-address1" class="size6"{xhtml}></dd>
-
- <dt><label for="calendar-eventeditor-address2">{lang_addressline2}</label></dt>
- <dd><input type="text" name="address2" value="{event_address2}" id="calendar-eventeditor-address2" class="size6"{xhtml}></dd>
-
- <dt><label for="calendar-eventeditor-city">{lang_city}</label></dt>
- <dd><input type="text" name="city" maxlength="60" value="{event_city}" id="calendar-eventeditor-city" class="size6"{xhtml}></dd>
-
- <dt><label for="calendar-eventeditor-state">{lang_state}</label></dt>
- <dd><input type="text" name="state" value="{event_state}" id="calendar-eventeditor-state" class="size6"{xhtml}></dd>
-
- <dt><label for="calendar-eventeditor-zipcode">{lang_zipcode}</label></dt>
- <dd><input type="text" name="zipcode" maxlength="16" value="{event_zipcode}" id="calendar-eventeditor-zipcode" class="size1"{xhtml}></dd>
-
- <dt><label for="calendar-eventeditor-url">{lang_eventurl}</label></dt>
- <dd><input type="text" dir="ltr" name="url" maxlength="{max_url_length}" value="{event_url}" id="calendar-eventeditor-url" class="size6"{xhtml}> {lang_includehttp}</dd>
-
- <dt><label for="calendar-eventeditor-description">{lang_eventdescription}</label></dt>
- <dd><textarea name="description" cols="45" rows="8" id="calendar-eventeditor-description" class="wide">{event_description}</textarea></dd>
-
- <dt><label for="calendar-eventeditor-postmode">{lang_postmode}</label></dt>
- <dd><select name="postmode" id="calendar-eventeditor-postmode">
- {post_options}
- </select><br{xhtml}>{lang_allowed_html}</dd>
-
- <dt><label>{lang_hits}</label></dt>
- <dd>{hits}</dd>
- </dl>
-
- <fieldset>
- <legend>{lang_accessrights}</legend>
-
- <dl class="form_block">
- <dt>{lang_owner}</dt>
- <dd>{owner_name}<input type="hidden" name="owner_id" value="{owner_id}"{xhtml}></dd>
-
- <dt><label for="group_id">{lang_group}</label></dt>
- <dd>{group_dropdown}</dd>
-
- <dt><label for="admin-permissions">{lang_permissions}</label></dt>
- <dd>{permissions_editor}</dd>
- <dd class="description">{lang_perm_key}</dd>
- <dd class="description">{lang_permissions_msg}</dd>
- </dl>
- </fieldset>
-
- <div class="submit">
- <input type="submit" value="{lang_save}" name="mode" class="submit"{xhtml}>
- <input type="submit" value="{lang_cancel}" name="mode" class="submit"{xhtml}>
- <input type="hidden" name="eid" value="{event_id}"{xhtml}>
- <input type="hidden" name="hour_mode" value="{hour_mode}"{xhtml}>
- {delete_option}
- {submission_option}
- <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
- </div>
- </div>
-</form>
-
-<!-- } plugins/calendar/templates/admin/eventeditor.thtml -->
diff -r e9ea3853a25e -r d2ad6a1f6a74 plugins/calendar/templates/calendar.thtml
--- a/plugins/calendar/templates/calendar.thtml Thu Feb 19 10:03:25 2015 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
More information about the geeklog-cvs
mailing list