codes****@googl*****
codes****@googl*****
2009年 2月 15日 (日) 03:30:19 JST
Author: dengenxp
Date: Sat Feb 14 10:29:12 2009
New Revision: 1183
Modified:
trunk/geeklog-1-jp/CHANGES.jp
trunk/geeklog-1-jp/plugins/calendarjp/functions.inc
trunk/geeklog-1-jp/plugins/calendarjp/language/japanese_utf-8.php
trunk/geeklog-1-jp/plugins/calendarjp/readme_jp.html
trunk/geeklog-1-jp/plugins/calendarjp/templates/addremoveevent.thtml
trunk/geeklog-1-jp/plugins/calendarjp/templates/admin/eventeditor.thtml
trunk/geeklog-1-jp/plugins/calendarjp/templates/admin/eventeditor_advanced.thtml
trunk/geeklog-1-jp/plugins/calendarjp/templates/calendar.thtml
trunk/geeklog-1-jp/plugins/calendarjp/templates/dayview/dayview.thtml
trunk/geeklog-1-jp/plugins/calendarjp/templates/editpersonalevent.thtml
trunk/geeklog-1-jp/plugins/calendarjp/templates/submitevent.thtml
trunk/geeklog-1-jp/plugins/calendarjp/templates/weekview/weekview.thtml
trunk/geeklog-1-jp/public_html/admin/plugins/calendarjp/index.php
trunk/geeklog-1-jp/public_html/admin/plugins/calendarjp/install.php
trunk/geeklog-1-jp/public_html/calendarjp/event.php
trunk/geeklog-1-jp/public_html/calendarjp/index.php
Log:
calendarjpプラグイン：r1182の変更をtrunk/geeklog-1-jpへ反映させます。
変更点をCHANGES.jpへ記載します。
Modified: trunk/geeklog-1-jp/CHANGES.jp
==============================================================================
--- trunk/geeklog-1-jp/CHANGES.jp (original)
+++ trunk/geeklog-1-jp/CHANGES.jp Sat Feb 14 10:29:12 2009
@@ -1,5 +1,15 @@
$Id$
+2009-02-15 Yoshinori Tahara <dengen>
+
+ * calendarjpプラグインをバージョン1.0.7に更新しました。
+ calendarプラグインのバージョン1.0.3の変更をマージしました。
+ ナビゲーションバーの操作で常に全体カレンダを表示してしまう問題を修正
+ しました。
+ カレンダでの年月日及び時間の選択が、イベントエディタにおいて初期値と
+ して入力されるようにしました。
+ HTMLコードの適正化を実施しました。
+
2009-02-12 Takahiro Kambe <tacahi>
* geeklog-1.5.2をマージし、日本語リリースのバージョンを0.0に
@@ -8,7 +18,7 @@
* geeklog-1.5.2rc1のマージからpublic_html/docs/changed-filesが
もれていたのを更新しました。
-2009-02-11 Yoshinori Tahara <dengenp>
+2009-02-11 Yoshinori Tahara <dengen>
* IE8で、ProfessionalCSSのカラムレイアウト変更ができない問題を修正
しました。
@@ -140,7 +150,7 @@
* テーマmobile,mobile_3gのheader.thtml：{welcome_msg}を日本語対応版
{welcome_msg_jp}へ変更しました。
-2008-10-23 Yoshinori Tahara <dengenp>
+2008-10-23 Yoshinori Tahara <dengen>
* calendarjpプラグインで、一般ユーザーが全体イベントを投稿する場合に、
calendarプラグインへ投稿されてしまう問題を修正しました。
Modified: trunk/geeklog-1-jp/plugins/calendarjp/functions.inc
==============================================================================
--- trunk/geeklog-1-jp/plugins/calendarjp/functions.inc (original)
+++ trunk/geeklog-1-jp/plugins/calendarjp/functions.inc Sat Feb 14 10:29:12
2009
@@ -10,7 +10,7 @@
// | API method and 2) implements all the common code needed by the
Calendarjp |
// | plugin' PHP
files. |
//
+---------------------------------------------------------------------------+
-// | Copyright (C) 2008 by dengen - taharaxp AT gmail DOT
com |
+// | Copyright (C) 2009 by dengen - taharaxp AT gmail DOT
com |
//
|
|
// | Calendarjp plugin is based on prior work
by: |
// | Authors: Tony Bibbs - tony AT tonybibbs DOT
com |
@@ -58,7 +58,7 @@
$_CAJP_CONF = $ca_config->get_config('calendarjp');
}
-$_CAJP_CONF['version'] = '1.0.6';
+$_CAJP_CONF['version'] = '1.0.7';
$_TABLES['eventsjp'] = $_DB_table_prefix . 'eventsjp';
$_TABLES['eventsubmissionjp'] =
$_DB_table_prefix . 'eventsubmissionjp';
@@ -730,18 +730,43 @@
$eventform->set_var('max_url_length', 255);
$eventform->set_var('lang_startdate', $LANG_CALJP_1[21]);
$eventform->set_var('lang_starttime', $LANG_CALJP_1[30]);
- if (empty ($month)) {
+
+// if (empty ($month)) {
+// $month = date ('m', time ());
+// }
+// if (empty ($day)) {
+// $day = date ('d', time ());
+// }
+// if (empty ($year)) {
+// $year = date ('Y', time ());
+// }
+
+// Added --------->
+ if (isset ($_REQUEST['year'])) {
+ $year = COM_applyFilter ($_REQUEST['year'], true);
+ } else {
+ $year = date ('Y', time ());
+ }
+ if (isset ($_REQUEST['month'])) {
+ $month = COM_applyFilter ($_REQUEST['month'], true);
+ } else {
$month = date ('m', time ());
}
- if (empty ($day)) {
+ if (isset ($_REQUEST['day'])) {
+ $day = COM_applyFilter ($_REQUEST['day'], true);
+ } else {
$day = date ('d', time ());
}
- if (empty ($year)) {
- $year = date ('Y', time ());
+ if (isset ($_REQUEST['hour'])) {
+ $hour = COM_applyFilter ($_REQUEST['hour'], true);
+ $cur_min = '0';
+ } else {
+ $hour = date ('H', time ());
+ $cur_min = '';
}
-// $eventform->set_var ('month_options', COM_getMonthFormOptions
($month));
- $eventform->set_var ('month_options', CALENDARJP_getMonthFormOptions
($month));
+// Added ---------<
+ $eventform->set_var ('month_options', CALENDARJP_getMonthFormOptions
($month));
$eventform->set_var ('day_options', COM_getDayFormOptions ($day));
$eventform->set_var ('year_options', COM_getYearFormOptions ($year));
@@ -775,7 +800,9 @@
$eventform->set_var ('hour_options',
COM_getHourFormOptions ($cur_hour));
}
- $cur_min = intval (date ('i') / 15) * 15;
+ if ($cur_min === '') {
+ $cur_min = intval (date ('i') / 15) * 15;
+ }
$eventform->set_var ('minute_options',
COM_getMinuteFormOptions ($cur_min, 15));
@@ -838,7 +865,7 @@
DB_delete($_TABLES['eventsjp'], 'eid', $eid);
DB_delete($_TABLES['personal_eventsjp'], 'eid', $eid);
- COM_rdfUpToDateCheck('geeklog', 'calendarjp', $eid);
+ COM_rdfUpToDateCheck('calendar');
return
COM_refresh($_CONF['site_admin_url'] . '/plugins/calendarjp/index.php?msg=18');
} elseif ($type == 'submission') {
Modified: trunk/geeklog-1-jp/plugins/calendarjp/language/japanese_utf-8.php
==============================================================================
--- trunk/geeklog-1-jp/plugins/calendarjp/language/japanese_utf-8.php
(original)
+++ trunk/geeklog-1-jp/plugins/calendarjp/language/japanese_utf-8.php Sat
Feb 14 10:29:12 2009
@@ -12,6 +12,8 @@
# Tranlated by Geeklog Japanese group SaY and Ivy
# Copyright (C) 2008 Takahiro Kambe
# Additional translation to Japanese by taca AT back-street DOT net
+# Copyright (C) 2006,2007,2008 Geeklog.jp group
+# Additional translation to Japanese by Geeklog.jp group info AT geeklog
DOT jp
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -28,7 +30,6 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA.
#
###############################################################################
-# Last Update 2008/06/02 by Geeklog.jp group - info AT geeklog DOT jp
global $LANG32, $LANG_postmodes;
Modified: trunk/geeklog-1-jp/plugins/calendarjp/readme_jp.html
==============================================================================
--- trunk/geeklog-1-jp/plugins/calendarjp/readme_jp.html (original)
+++ trunk/geeklog-1-jp/plugins/calendarjp/readme_jp.html Sat Feb 14
10:29:12 2009
@@ -116,9 +116,9 @@
</head>
<body>
<h1><a name="_top">Calendarjp プラグイン</a></h1>
- <h2>バージョン: 1.0.6</h2>
+ <h2>バージョン: 1.0.7</h2>
<h2>作成者: Yoshinori Tahara - dengen</h2>
- <h2>公開日: 2008.10.24</h2>
+ <h2>公開日: 2009.02.15</h2>
<h2>ライセンス: GPL</h2>
<h2>概要:</h2>
<ul>
@@ -207,6 +207,15 @@
<th>説明</th>
</tr>
+ <tr>
+ <td class="center">1.0.7</td>
+ <td class="center">2009.02.15</td>
+ <td><span class="fix">修正</span> calendarプラグインのバージョン
1.0.3の変更をマージしました。<br />
+ <span class="fix">修正</span> ナビゲーションバーの操作で常に
全体カレンダを表示してしまう問題を修正しました。<br />
+ <span class="fix">修正</span> カレンダでの年月日及び時間の選
択が、イベントエディタにおいて初期値として入力されるようにしました。<br />
+ <span class="fix">修正</span> HTMLコードの適正化を実施しまし
た。
+ </td>
+ </tr>
<tr>
<td class="center">1.0.6</td>
<td class="center">2008.10.24</td>
Modified:
trunk/geeklog-1-jp/plugins/calendarjp/templates/addremoveevent.thtml
==============================================================================
--- trunk/geeklog-1-jp/plugins/calendarjp/templates/addremoveevent.thtml
(original)
+++ trunk/geeklog-1-jp/plugins/calendarjp/templates/addremoveevent.thtml
Sat Feb 14 10:29:12 2009
@@ -1,2 +1,2 @@
- <font size="-2">[{lang_addremovefromcal}]</font>
+ <span style="font-size:80%;">[{lang_addremovefromcal}]</span>
Modified:
trunk/geeklog-1-jp/plugins/calendarjp/templates/admin/eventeditor.thtml
==============================================================================
--- trunk/geeklog-1-jp/plugins/calendarjp/templates/admin/eventeditor.thtml
(original)
+++ trunk/geeklog-1-jp/plugins/calendarjp/templates/admin/eventeditor.thtml
Sat Feb 14 10:29:12 2009
@@ -81,7 +81,7 @@
</td>
</tr>
<tr>
- <td align="right" nowrap="nowrap">{lang_zipcode}:</td>
+ <td align="right"
style="whight-space:nowrap">{lang_zipcode}:</td>
<td><input type="text" name="zipcode" size="8" maxlength="8"
value="{event_zipcode}"{xhtml}></td>
</tr>
<tr>
@@ -89,15 +89,15 @@
<td><input type="text" name="state" size="40"
value="{event_state}"{xhtml}></td>
</tr>
<tr>
- <td align="right" nowrap="nowrap">{lang_city}:</td>
+ <td align="right" style="whight-space:nowrap">{lang_city}:</td>
<td><input type="text" name="city" size="40" maxlength="60"
value="{event_city}"{xhtml}></td>
</tr>
<tr>
- <td align="right" nowrap="nowrap">{lang_addressline1}:</td>
+ <td align="right"
style="whight-space:nowrap">{lang_addressline1}:</td>
<td><input type="text" name="address1" size="40"
value="{event_address1}"{xhtml}></td>
</tr>
<tr>
- <td align="right" nowrap="nowrap">{lang_addressline2}:</td>
+ <td align="right"
style="whight-space:nowrap">{lang_addressline2}:</td>
<td><input type="text" name="address2" size="40"
value="{event_address2}"{xhtml}></td>
</tr>
<tr>
@@ -106,7 +106,7 @@
</tr>
<tr>
<td align="right" valign="top">{lang_eventdescription}:</td>
- <td><textarea name="description" style="width:100%" cols="50"
rows="10">{event_description}</textarea></td>
+ <td><textarea name="description" style="width:98%" cols="50"
rows="10">{event_description}</textarea></td>
</tr>
<tr valign="top">
<td align="right">{lang_postmode}:</td>
Modified:
trunk/geeklog-1-jp/plugins/calendarjp/templates/admin/eventeditor_advanced.thtml
==============================================================================
---
trunk/geeklog-1-jp/plugins/calendarjp/templates/admin/eventeditor_advanced.thtml
(original)
+++
trunk/geeklog-1-jp/plugins/calendarjp/templates/admin/eventeditor_advanced.thtml
Sat Feb 14 10:29:12 2009
@@ -85,7 +85,7 @@
</td>
</tr>
<tr>
- <td align="right" nowrap="nowrap">{lang_zipcode}:</td>
+ <td align="right"
style="whight-space:nowrap">{lang_zipcode}:</td>
<td><input type="text" name="zipcode" size="8" maxlength="8"
value="{event_zipcode}"{xhtml}></td>
</tr>
<tr>
@@ -93,15 +93,15 @@
<td><input type="text" name="state" size="40"
value="{event_state}"{xhtml}></td>
</tr>
<tr>
- <td align="right" nowrap="nowrap">{lang_city}:</td>
+ <td align="right" style="whight-space:nowrap">{lang_city}:</td>
<td><input type="text" name="city" size="40" maxlength="60"
value="{event_city}"{xhtml}></td>
</tr>
<tr>
- <td align="right" nowrap="nowrap">{lang_addressline1}:</td>
+ <td align="right"
style="whight-space:nowrap">{lang_addressline1}:</td>
<td><input type="text" name="address1" size="40"
value="{event_address1}"{xhtml}></td>
</tr>
<tr>
- <td align="right" nowrap="nowrap">{lang_addressline2}:</td>
+ <td align="right"
style="whight-space:nowrap">{lang_addressline2}:</td>
<td><input type="text" name="address2" size="40"
value="{event_address2}"{xhtml}></td>
</tr>
<tr>
@@ -114,7 +114,7 @@
<div id="text_editor" style="display:{show_texteditor}">
<img src="{layout_url}/images/expand.png"
title="{lang_expandhelp}" alt=""
onclick="changeTextAreaSize('text_description','larger');"{xhtml}>
<img src="{layout_url}/images/collapse.png"
title="{lang_reducehelp}" alt=""
onclick="changeTextAreaSize('text_description','smaller');"{xhtml}>
- <textarea id="text_description"
name="text_description" style="width:100%" cols="50"
rows="10">{event_description}</textarea>
+ <textarea id="text_description"
name="text_description" style="width:98%" cols="50"
rows="10">{event_description}</textarea>
</div>
<div id="html_editor" style="display:{show_htmleditor}">
@@ -128,7 +128,7 @@
<option value="Default">{toolbar5}</option>
</select>
</span>
- <textarea id="html_description"
name="html_description" style="width:100%" cols="50"
rows="10">{event_description}</textarea>
+ <textarea id="html_description"
name="html_description" style="width:98%" cols="50"
rows="10">{event_description}</textarea>
</div>
</td>
</tr>
Modified: trunk/geeklog-1-jp/plugins/calendarjp/templates/calendar.thtml
==============================================================================
--- trunk/geeklog-1-jp/plugins/calendarjp/templates/calendar.thtml
(original)
+++ trunk/geeklog-1-jp/plugins/calendarjp/templates/calendar.thtml Sat Feb
14 10:29:12 2009
@@ -19,7 +19,7 @@
<td class="cal-month" valign="top">
{previous_months_calendar}
</td>
- <td width="100%" class="cal-month" align="center">
+ <td style="width:100%" class="cal-month"
align="center">
<table border="0" cellpadding="5" cellspacing="0">
<tr>
<td colspan="2" align="center">
@@ -58,17 +58,17 @@
</tr>
<tr>
<td class="cal-weekpointers"> </td>
- <td width="15%" class="cal-day">{lang_sunday}</td>
- <td width="14%" class="cal-day">{lang_monday}</td>
- <td width="14%" class="cal-day">{lang_tuesday}</td>
- <td width="14%" class="cal-day">{lang_wednesday}</td>
- <td width="14%" class="cal-day">{lang_thursday}</td>
- <td width="14%" class="cal-day">{lang_friday}</td>
- <td width="15%" class="cal-day">{lang_saturday}</td>
+ <td style="width:15%" class="cal-day">{lang_sunday}</td>
+ <td style="width:14%" class="cal-day">{lang_monday}</td>
+ <td style="width:14%" class="cal-day">{lang_tuesday}</td>
+ <td style="width:14%" class="cal-day">{lang_wednesday}</td>
+ <td style="width:14%" class="cal-day">{lang_thursday}</td>
+ <td style="width:14%" class="cal-day">{lang_friday}</td>
+ <td style="width:14%" class="cal-day">{lang_saturday}</td>
</tr>
{cal_week}
</table>
-<table align="center">
+<div style="mergin:auto;"><table style="margin-left:auto;
margin-right:auto;">
<tr>
<td>
<form method="post" action="index.php">
@@ -98,5 +98,5 @@
</form>
</td>
</tr>
-</table>
+</table></div>
<!-- End Calendar -->
Modified:
trunk/geeklog-1-jp/plugins/calendarjp/templates/dayview/dayview.thtml
==============================================================================
--- trunk/geeklog-1-jp/plugins/calendarjp/templates/dayview/dayview.thtml
(original)
+++ trunk/geeklog-1-jp/plugins/calendarjp/templates/dayview/dayview.thtml
Sat Feb 14 10:29:12 2009
@@ -26,104 +26,104 @@
<br{xhtml}>
<table cellpadding="2" cellspacing="1" border="0" width="100%"
class="cal-dayx-body">
<tr>
- <td width="1%" class="cal-dayx-weekevent" nowrap="nowrap"><div
align="right">{lang_week} {week_num}</div></td>
+ <td style="width:1%; whight-space:nowrap;"
class="cal-dayx-weekevent"><div class="alignright">{lang_week}
{week_num}</div></td>
<td>{allday_events}</td>
</tr>
<tr>
- <td width="1%" valign="top" class="cal-dayx-times"><div
align="right"><a
href="{site_url}/submit.php?type=calendarjp&mode={mode}&month={month}&day={day}&year={year}&hour=0">{0_hour}</a></div></td>
+ <td style="width:1%; vertical-align:top;"
class="cal-dayx-times"><div class="alignright"><a
href="{site_url}/{editor}?mode={mode}&month={month}&day={day}&year={year}&hour=0{option}">{0_hour}</a></div></td>
{0_cols}
</tr>
<tr>
- <td width="1%" valign="top" class="cal-dayx-times"><div
align="right"><a
href="{site_url}/submit.php?type=calendarjp&mode={mode}&month={month}&day={day}&year={year}&hour=1">{1_hour}</a></div></td>
+ <td style="width:1%; vertical-align:top;"
class="cal-dayx-times"><div class="alignright"><a
href="{site_url}/{editor}?mode={mode}&month={month}&day={day}&year={year}&hour=1{option}">{1_hour}</a></div></td>
{1_cols}
</tr>
<tr>
- <td width="1%" valign="top" class="cal-dayx-times"><div
align="right"><a
href="{site_url}/submit.php?type=calendarjp&mode={mode}&month={month}&day={day}&year={year}&hour=2">{2_hour}</a></div></td>
+ <td style="width:1%; vertical-align:top;"
class="cal-dayx-times"><div class="alignright"><a
href="{site_url}/{editor}?mode={mode}&month={month}&day={day}&year={year}&hour=2{option}">{2_hour}</a></div></td>
{2_cols}
</tr>
<tr>
- <td width="1%" valign="top" class="cal-dayx-times"><div
align="right"><a
href="{site_url}/submit.php?type=calendarjp&mode={mode}&month={month}&day={day}&year={year}&hour=3">{3_hour}</a></div></td>
+ <td style="width:1%; vertical-align:top;"
class="cal-dayx-times"><div class="alignright"><a
href="{site_url}/{editor}?mode={mode}&month={month}&day={day}&year={year}&hour=3{option}">{3_hour}</a></div></td>
{3_cols}
</tr>
<tr>
- <td width="1%" valign="top" class="cal-dayx-times"><div
align="right"><a
href="{site_url}/submit.php?type=calendarjp&mode={mode}&month={month}&day={day}&year={year}&hour=4">{4_hour}</a></div></td>
+ <td style="width:1%; vertical-align:top;"
class="cal-dayx-times"><div class="alignright"><a
href="{site_url}/{editor}?mode={mode}&month={month}&day={day}&year={year}&hour=4{option}">{4_hour}</a></div></td>
{4_cols}
</tr>
<tr>
- <td width="1%" valign="top" class="cal-dayx-times"><div
align="right"><a
href="{site_url}/submit.php?type=calendarjp&mode={mode}&month={month}&day={day}&year={year}&hour=5">{5_hour}</a></div></td>
+ <td style="width:1%; vertical-align:top;"
class="cal-dayx-times"><div class="alignright"><a
href="{site_url}/{editor}?mode={mode}&month={month}&day={day}&year={year}&hour=5{option}">{5_hour}</a></div></td>
{5_cols}
</tr>
<tr>
- <td width="1%" valign="top" class="cal-dayx-times"><div
align="right"><a
href="{site_url}/submit.php?type=calendarjp&mode={mode}&month={month}&day={day}&year={year}&hour=6">{6_hour}</a></div></td>
+ <td style="width:1%; vertical-align:top;"
class="cal-dayx-times"><div class="alignright"><a
href="{site_url}/{editor}?mode={mode}&month={month}&day={day}&year={year}&hour=6{option}">{6_hour}</a></div></td>
{6_cols}
</tr>
<tr>
- <td width="1%" valign="top" class="cal-dayx-times"><div
align="right"><a
href="{site_url}/submit.php?type=calendarjp&mode={mode}&month={month}&day={day}&year={year}&hour=7">{7_hour}</a></div></td>
+ <td style="width:1%; vertical-align:top;"
class="cal-dayx-times"><div class="alignright"><a
href="{site_url}/{editor}?mode={mode}&month={month}&day={day}&year={year}&hour=7{option}">{7_hour}</a></div></td>
{7_cols}
</tr>
<tr>
- <td width="1%" valign="top" class="cal-dayx-times"><div
align="right"><a
href="{site_url}/submit.php?type=calendarjp&mode={mode}&month={month}&day={day}&year={year}&hour=8">{8_hour}</a></div></td>
+ <td style="width:1%; vertical-align:top;"
class="cal-dayx-times"><div class="alignright"><a
href="{site_url}/{editor}?mode={mode}&month={month}&day={day}&year={year}&hour=8{option}">{8_hour}</a></div></td>
{8_cols}
</tr>
<tr>
- <td width="1%" valign="top" class="cal-dayx-times"><div
align="right"><a
href="{site_url}/submit.php?type=calendarjp&mode={mode}&month={month}&day={day}&year={year}&hour=9">{9_hour}</a></div></td>
+ <td style="width:1%; vertical-align:top;"
class="cal-dayx-times"><div class="alignright"><a
href="{site_url}/{editor}?mode={mode}&month={month}&day={day}&year={year}&hour=9{option}">{9_hour}</a></div></td>
{9_cols}
</tr>
<tr>
- <td width="1%" valign="top" class="cal-dayx-times"><div
align="right"><a
href="{site_url}/submit.php?type=calendarjp&mode={mode}&month={month}&day={day}&year={year}&hour=10">{10_hour}</a></div></td>
+ <td style="width:1%; vertical-align:top;"
class="cal-dayx-times"><div class="alignright"><a
href="{site_url}/{editor}?mode={mode}&month={month}&day={day}&year={year}&hour=10{option}">{10_hour}</a></div></td>
{10_cols}
</tr>
<tr>
- <td width="1%" valign="top" class="cal-dayx-times"><div
align="right"><a
href="{site_url}/submit.php?type=calendarjp&mode={mode}&month={month}&day={day}&year={year}&hour=11">{11_hour}</a></div></td>
+ <td style="width:1%; vertical-align:top;"
class="cal-dayx-times"><div class="alignright"><a
href="{site_url}/{editor}?mode={mode}&month={month}&day={day}&year={year}&hour=11{option}">{11_hour}</a></div></td>
{11_cols}
</tr>
<tr>
- <td width="1%" valign="top" class="cal-dayx-times"><div
align="right"><a
href="{site_url}/submit.php?type=calendarjp&mode={mode}&month={month}&day={day}&year={year}&hour=12">{12_hour}</a></div></td>
+ <td style="width:1%; vertical-align:top;"
class="cal-dayx-times"><div class="alignright"><a
href="{site_url}/{editor}?mode={mode}&month={month}&day={day}&year={year}&hour=12{option}">{12_hour}</a></div></td>
{12_cols}
</tr>
<tr>
- <td width="1%" valign="top" class="cal-dayx-times"><div
align="right"><a
href="{site_url}/submit.php?type=calendarjp&mode={mode}&month={month}&day={day}&year={year}&hour=13">{13_hour}</a></div></td>
+ <td style="width:1%; vertical-align:top;"
class="cal-dayx-times"><div class="alignright"><a
href="{site_url}/{editor}?mode={mode}&month={month}&day={day}&year={year}&hour=13{option}">{13_hour}</a></div></td>
{13_cols}
</tr>
<tr>
- <td width="1%" valign="top" class="cal-dayx-times"><div
align="right"><a
href="{site_url}/submit.php?type=calendarjp&mode={mode}&month={month}&day={day}&year={year}&hour=14">{14_hour}</a></div></td>
+ <td style="width:1%; vertical-align:top;"
class="cal-dayx-times"><div class="alignright"><a
href="{site_url}/{editor}?mode={mode}&month={month}&day={day}&year={year}&hour=14{option}">{14_hour}</a></div></td>
{14_cols}
</tr>
<tr>
- <td width="1%" valign="top" class="cal-dayx-times"><div
align="right"><a
href="{site_url}/submit.php?type=calendarjp&mode={mode}&month={month}&day={day}&year={year}&hour=15">{15_hour}</a></div></td>
+ <td style="width:1%; vertical-align:top;"
class="cal-dayx-times"><div class="alignright"><a
href="{site_url}/{editor}?mode={mode}&month={month}&day={day}&year={year}&hour=15{option}">{15_hour}</a></div></td>
{15_cols}
</tr>
<tr>
- <td width="1%" valign="top" class="cal-dayx-times"><div
align="right"><a
href="{site_url}/submit.php?type=calendarjp&mode={mode}&month={month}&day={day}&year={year}&hour=16">{16_hour}</a></div></td>
+ <td style="width:1%; vertical-align:top;"
class="cal-dayx-times"><div class="alignright"><a
href="{site_url}/{editor}?mode={mode}&month={month}&day={day}&year={year}&hour=16{option}">{16_hour}</a></div></td>
{16_cols}
</tr>
<tr>
- <td width="1%" valign="top" class="cal-dayx-times"><div
align="right"><a
href="{site_url}/submit.php?type=calendarjp&mode={mode}&month={month}&day={day}&year={year}&hour=17">{17_hour}</a></div></td>
+ <td style="width:1%; vertical-align:top;"
class="cal-dayx-times"><div class="alignright"><a
href="{site_url}/{editor}?mode={mode}&month={month}&day={day}&year={year}&hour=17{option}">{17_hour}</a></div></td>
{17_cols}
</tr>
<tr>
- <td width="1%" valign="top" class="cal-dayx-times"><div
align="right"><a
href="{site_url}/submit.php?type=calendarjp&mode={mode}&month={month}&day={day}&year={year}&hour=18">{18_hour}</a></div></td>
+ <td style="width:1%; vertical-align:top;"
class="cal-dayx-times"><div class="alignright"><a
href="{site_url}/{editor}?mode={mode}&month={month}&day={day}&year={year}&hour=18{option}">{18_hour}</a></div></td>
{18_cols}
</tr>
<tr>
- <td width="1%" valign="top" class="cal-dayx-times"><div
align="right"><a
href="{site_url}/submit.php?type=calendarjp&mode={mode}&month={month}&day={day}&year={year}&hour=19">{19_hour}</a></div></td>
+ <td style="width:1%; vertical-align:top;"
class="cal-dayx-times"><div class="alignright"><a
href="{site_url}/{editor}?mode={mode}&month={month}&day={day}&year={year}&hour=19{option}">{19_hour}</a></div></td>
{19_cols}
</tr>
<tr>
- <td width="1%" valign="top" class="cal-dayx-times"><div
align="right"><a
href="{site_url}/submit.php?type=calendarjp&mode={mode}&month={month}&day={day}&year={year}&hour=20">{20_hour}</a></div></td>
+ <td style="width:1%; vertical-align:top;"
class="cal-dayx-times"><div class="alignright"><a
href="{site_url}/{editor}?mode={mode}&month={month}&day={day}&year={year}&hour=20{option}">{20_hour}</a></div></td>
{20_cols}
</tr>
<tr>
- <td width="1%" valign="top" class="cal-dayx-times"><div
align="right"><a
href="{site_url}/submit.php?type=calendarjp&mode={mode}&month={month}&day={day}&year={year}&hour=21">{21_hour}</a></div></td>
+ <td style="width:1%; vertical-align:top;"
class="cal-dayx-times"><div class="alignright"><a
href="{site_url}/{editor}?mode={mode}&month={month}&day={day}&year={year}&hour=21{option}">{21_hour}</a></div></td>
{21_cols}
</tr>
<tr>
- <td width="1%" valign="top" class="cal-dayx-times"><div
align="right"><a
href="{site_url}/submit.php?type=calendarjp&mode={mode}&month={month}&day={day}&year={year}&hour=22">{22_hour}</a></div></td>
+ <td style="width:1%; vertical-align:top;"
class="cal-dayx-times"><div class="alignright"><a
href="{site_url}/{editor}?mode={mode}&month={month}&day={day}&year={year}&hour=22{option}">{22_hour}</a></div></td>
{22_cols}
</tr>
<tr>
- <td width="1%" valign="top" class="cal-dayx-times"><div
align="right"><a
href="{site_url}/submit.php?type=calendarjp&mode={mode}&month={month}&day={day}&year={year}&hour=23">{23_hour}</a></div></td>
+ <td style="width:1%; vertical-align:top;"
class="cal-dayx-times"><div class="alignright"><a
href="{site_url}/{editor}?mode={mode}&month={month}&day={day}&year={year}&hour=23{option}">{23_hour}</a></div></td>
{23_cols}
</tr>
</table>
Modified:
trunk/geeklog-1-jp/plugins/calendarjp/templates/editpersonalevent.thtml
==============================================================================
--- trunk/geeklog-1-jp/plugins/calendarjp/templates/editpersonalevent.thtml
(original)
+++ trunk/geeklog-1-jp/plugins/calendarjp/templates/editpersonalevent.thtml
Sat Feb 14 10:29:12 2009
@@ -81,7 +81,7 @@
</td>
</tr>
<tr>
- <td align="right" nowrap="nowrap">{lang_zipcode}:</td>
+ <td align="right"
style="whight-space:nowrap">{lang_zipcode}:</td>
<td><input type="text" name="zipcode" size="8" maxlength="8"
value="{event_zipcode}"{xhtml}></td>
</tr>
<tr>
@@ -89,15 +89,15 @@
<td><input type="text" name="state" size="40"
value="{event_state}"{xhtml}></td>
</tr>
<tr>
- <td align="right" nowrap="nowrap">{lang_city}:</td>
+ <td align="right" style="whight-space:nowrap">{lang_city}:</td>
<td><input type="text" name="city" size="40" maxlength="60"
value="{event_city}"{xhtml}></td>
</tr>
<tr>
- <td align="right" nowrap="nowrap">{lang_addressline1}:</td>
+ <td align="right"
style="whight-space:nowrap">{lang_addressline1}:</td>
<td><input type="text" name="address1" size="40"
value="{event_address1}"{xhtml}></td>
</tr>
<tr>
- <td align="right" nowrap="nowrap">{lang_addressline2}:</td>
+ <td align="right"
style="whight-space:nowrap">{lang_addressline2}:</td>
<td><input type="text" name="address2" size="40"
value="{event_address2}"{xhtml}></td>
</tr>
<tr>
@@ -106,7 +106,7 @@
</tr>
<tr>
<td align="right" valign="top">{lang_description}:</td>
- <td><textarea name="description" style="width:100%" cols="50"
rows="10">{event_description}</textarea><br{xhtml}>
+ <td><textarea name="description" style="width:98%" cols="50"
rows="10">{event_description}</textarea><br{xhtml}>
{lang_htmlnotallowed}</td>
</tr>
<tr>
Modified: trunk/geeklog-1-jp/plugins/calendarjp/templates/submitevent.thtml
==============================================================================
--- trunk/geeklog-1-jp/plugins/calendarjp/templates/submitevent.thtml
(original)
+++ trunk/geeklog-1-jp/plugins/calendarjp/templates/submitevent.thtml Sat
Feb 14 10:29:12 2009
@@ -82,7 +82,7 @@
</td>
</tr>
<tr>
- <td align="right" nowrap="nowrap">{lang_zipcode}:</td>
+ <td align="right"
style="whight-space:nowrap">{lang_zipcode}:</td>
<td><input type="text" name="zipcode" size="8"
maxlength="8"{xhtml}></td>
</tr>
<tr>
@@ -90,15 +90,15 @@
<td><input type="text" name="state" size="40"{xhtml}></td>
</tr>
<tr>
- <td align="right" nowrap="nowrap">{lang_city}:</td>
+ <td align="right" style="whight-space:nowrap">{lang_city}:</td>
<td><input type="text" name="city" size="40"
maxlength="60"{xhtml}></td>
</tr>
<tr>
- <td align="right" nowrap="nowrap">{lang_addressline1}:</td>
+ <td align="right"
style="whight-space:nowrap">{lang_addressline1}:</td>
<td><input type="text" name="address1" size="40"{xhtml}></td>
</tr>
<tr>
- <td align="right" nowrap="nowrap">{lang_addressline2}:</td>
+ <td align="right"
style="whight-space:nowrap">{lang_addressline2}:</td>
<td><input type="text" name="address2" size="40"{xhtml}></td>
</tr>
<tr>
@@ -107,7 +107,7 @@
</tr>
<tr>
<td align="right" valign="top">{lang_description}:</td>
- <td><textarea name="description" style="width:100%" cols="50"
rows="10"></textarea><br{xhtml}>
+ <td><textarea name="description" style="width:98%" cols="50"
rows="10"></textarea><br{xhtml}>
{lang_htmnotallowed}</td>
</tr>
<tr>
Modified:
trunk/geeklog-1-jp/plugins/calendarjp/templates/weekview/weekview.thtml
==============================================================================
--- trunk/geeklog-1-jp/plugins/calendarjp/templates/weekview/weekview.thtml
(original)
+++ trunk/geeklog-1-jp/plugins/calendarjp/templates/weekview/weekview.thtml
Sat Feb 14 10:29:12 2009
@@ -28,8 +28,8 @@
<td colspan="2"> </td>
</tr>
<tr class="{class1}">
- <td width="80%" class="cal-weekview-dayformat">{day1}</td>
- <td align="right" class="cal-weekview-addevent"
nowrap="nowrap">{langlink_addevent1}</td>
+ <td style="width:80%;" class="cal-weekview-dayformat">{day1}</td>
+ <td align="right" class="cal-weekview-addevent"
style="whight-space:nowrap">{langlink_addevent1}</td>
</tr>
<tr>
<td colspan="2" valign="bottom"
class="cal-dayview-times">{events_day1}</td>
@@ -37,7 +37,7 @@
<tr><td colspan="2"> </td></tr>
<tr class="{class2}">
<td class="cal-weekview-dayformat">{day2}</td>
- <td align="right" class="cal-weekview-addevent"
nowrap="nowrap">{langlink_addevent2}</td>
+ <td align="right" class="cal-weekview-addevent"
style="whight-space:nowrap">{langlink_addevent2}</td>
</tr>
<tr>
<td colspan="2" class="cal-dayview-times">{events_day2}</td>
@@ -45,7 +45,7 @@
<tr><td colspan="2"> </td></tr>
<tr class="{class3}">
<td class="cal-weekview-dayformat">{day3}</td>
- <td align="right" class="cal-weekview-addevent"
nowrap="nowrap">{langlink_addevent3}</td>
+ <td align="right" class="cal-weekview-addevent"
style="whight-space:nowrap">{langlink_addevent3}</td>
</tr>
<tr>
<td colspan="2" class="cal-dayview-times">{events_day3}</td>
@@ -53,7 +53,7 @@
<tr><td colspan="2"> </td></tr>
<tr class="{class4}">
<td class="cal-weekview-dayformat">{day4}</td>
- <td align="right" class="cal-weekview-addevent"
nowrap="nowrap">{langlink_addevent4}</td>
+ <td align="right" class="cal-weekview-addevent"
style="whight-space:nowrap">{langlink_addevent4}</td>
</tr>
<tr>
<td colspan="2" class="cal-dayview-times">{events_day4}</td>
@@ -61,7 +61,7 @@
<tr><td colspan="2"> </td></tr>
<tr class="{class5}">
<td class="cal-weekview-dayformat">{day5}</td>
- <td align="right" class="cal-weekview-addevent"
nowrap="nowrap">{langlink_addevent5}</td>
+ <td align="right" class="cal-weekview-addevent"
style="whight-space:nowrap">{langlink_addevent5}</td>
</tr>
<tr>
<td colspan="2" class="cal-dayview-times">{events_day5}</td>
@@ -69,7 +69,7 @@
<tr><td colspan="2"> </td></tr>
<tr class="{class6}">
<td class="cal-weekview-dayformat">{day6}</td>
- <td align="right" class="cal-weekview-addevent"
nowrap="nowrap">{langlink_addevent6}</td>
+ <td align="right" class="cal-weekview-addevent"
style="whight-space:nowrap">{langlink_addevent6}</td>
</tr>
<tr>
<td colspan="2" class="cal-dayview-times">{events_day6}</td>
@@ -77,7 +77,7 @@
<tr><td colspan="2"> </td></tr>
<tr class="{class7}">
<td class="cal-weekview-dayformat">{day7}</td>
- <td align="right" class="cal-weekview-addevent"
nowrap="nowrap">{langlink_addevent7}</td>
+ <td align="right" class="cal-weekview-addevent"
style="whight-space:nowrap">{langlink_addevent7}</td>
</tr>
<tr>
<td colspan="2" class="cal-dayview-times">{events_day7}</td>
Modified: trunk/geeklog-1-jp/public_html/admin/plugins/calendarjp/index.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/admin/plugins/calendarjp/index.php
(original)
+++ trunk/geeklog-1-jp/public_html/admin/plugins/calendarjp/index.php Sat
Feb 14 10:29:12 2009
@@ -239,13 +239,22 @@
// Combine date/time for easier manipulation
$A['datestart'] = trim ($A['datestart'] . ' ' . $A['timestart']);
if (empty ($A['datestart'])) {
- $start_stamp = time ();
+// ------------------------------>>
+// $start_stamp = time ();
+// ------------------------------||
+ if (!empty($A['month']) && !empty($A['day']) && !empty($A['year'])
&& !empty($A['hour'])) {
+ $start_stamp = mktime($A['hour'], 0, 0, $A['month'],
$A['day'], $A['year']);
+ } else {
+ $start_stamp = time ();
+ }
+// ------------------------------<<
} else {
$start_stamp = strtotime ($A['datestart']);
}
$A['dateend'] = trim ($A['dateend'] . ' ' . $A['timeend']);
if (empty ($A['dateend'])) {
- $end_stamp = time ();
+// $end_stamp = time ();
+ $end_stamp = $start_stamp;
} else {
$end_stamp = strtotime ($A['dateend']);
}
@@ -752,6 +761,26 @@
if (isset ($_REQUEST['timestart'])) {
$A['timestart'] = COM_applyFilter ($_REQUEST['timestart']);
}
+
+// Added ------------------------>>
+ $A['hour'] = '';
+ $A['month'] = '';
+ $A['day'] = '';
+ $A['year'] = '';
+ if (isset ($_REQUEST['hour'])) {
+ $A['hour'] = COM_applyFilter ($_REQUEST['hour'],true);
+ }
+ if (isset ($_REQUEST['month'])) {
+ $A['month'] = COM_applyFilter ($_REQUEST['month'],true);
+ }
+ if (isset ($_REQUEST['day'])) {
+ $A['day'] = COM_applyFilter ($_REQUEST['day'],true);
+ }
+ if (isset ($_REQUEST['year'])) {
+ $A['year'] = COM_applyFilter ($_REQUEST['year'],true);
+ }
+// Added ------------------------<<
+
} else {
$result = DB_query ("SELECT * FROM {$_TABLES['eventsjp']} WHERE
eid ='$eid'");
$A = DB_fetchArray ($result);
Modified:
trunk/geeklog-1-jp/public_html/admin/plugins/calendarjp/install.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/admin/plugins/calendarjp/install.php
(original)
+++ trunk/geeklog-1-jp/public_html/admin/plugins/calendarjp/install.php Sat
Feb 14 10:29:12 2009
@@ -9,7 +9,7 @@
// | This file installs and removes the data structures for
the |
// | Calendarjp plugin for
Geeklog. |
//
+---------------------------------------------------------------------------+
-// | Copyright (C) 2008 by dengen - taharaxp AT gmail DOT
com |
+// | Copyright (C) 2008-2009 by dengen - taharaxp AT gmail DOT
com |
//
|
|
// | Calendarjp plugin is based on prior work
by: |
// | Authors: Tony Bibbs - tony AT tonybibbs DOT
com |
@@ -43,7 +43,7 @@
//
$pi_display_name = 'Calendarjp';
$pi_name = 'calendarjp';
-$pi_version = '1.0.6';
+$pi_version = '1.0.7';
$gl_version = '1.5.0';
$pi_url = 'http://www.geeklog.jp/';
Modified: trunk/geeklog-1-jp/public_html/calendarjp/event.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/calendarjp/event.php (original)
+++ trunk/geeklog-1-jp/public_html/calendarjp/event.php Sat Feb 14 10:29:12
2009
@@ -554,6 +554,7 @@
$event_title = stripslashes($A['title']);
if (!empty($A['url'])) {
$event_title = COM_createLink($event_title, $A['url']);
+ $cal_templates->set_var('event_url', $A['url']);
}
$cal_templates->set_var('event_title', $event_title);
if (($_CAJP_CONF['personalcalendars'] == 1)
Modified: trunk/geeklog-1-jp/public_html/calendarjp/index.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/calendarjp/index.php (original)
+++ trunk/geeklog-1-jp/public_html/calendarjp/index.php Sat Feb 14 10:29:12
2009
@@ -380,18 +380,18 @@
return array($newmonth, $newday, $newyear);
}
-// NAVBAR
-$navbar = new navbar;
-$navbar->add_menuitem($LANG_CALJP_2[39],
$this_script . '?mode=$mode&view=day');
-$navbar->add_menuitem($LANG_CALJP_2[40],
$this_script . '?mode=$mode&view=week');
-$navbar->add_menuitem($LANG_CALJP_2[41], $this_script . '?mode=$mode');
-
// MAIN
$mode = '';
if (isset ($_REQUEST['mode'])) {
$mode = COM_applyFilter ($_REQUEST['mode']);
}
+// NAVBAR
+$navbar = new navbar;
+$navbar->add_menuitem($LANG_CALJP_2[39],
$this_script . "?mode=$mode&view=day");
+$navbar->add_menuitem($LANG_CALJP_2[40],
$this_script . "?mode=$mode&view=week");
+$navbar->add_menuitem($LANG_CALJP_2[41], $this_script . "?mode=$mode");
+
if ($mode != 'personal' && $mode != 'quickadd') {
$mode = '';
}
@@ -642,6 +642,25 @@
} else {
$cal_templates->set_var('quickadd_form','');
}
+
+// Added --------->
+ if ($mode == 'personal') {
+ $cal_templates->set_var('editor','calendarjp/index.php');
+ $cal_templates->set_var('option','&view=addentry');
+ $cal_templates->set_var('mode','personal');
+ } else {
+ if (SEC_hasRights('calendarjp.edit')) {
+
$cal_templates->set_var('editor','admin/plugins/calendarjp/index.php');
+ $cal_templates->set_var('option','');
+ $cal_templates->set_var('mode','edit');
+ } else {
+ $cal_templates->set_var('editor','submit.php');
+ $cal_templates->set_var('option','&type=calendarjp');
+ $cal_templates->set_var('mode', $mode);
+ }
+ }
+// Added ---------<
+
$display .= $cal_templates->parse('output', 'dayview');
$display .= COM_siteFooter();
break;
@@ -871,12 +890,12 @@
$smallcal_prev = getSmallCalendar ($prevmonth, $prevyear, $mode);
$cal_templates->set_var ('previous_months_calendar', $smallcal_prev);
$cal_templates->set_var ('previous_months_cal',
- '<font size="-2">' . LB .
$smallcal_prev . '</font>');
+ '<div style="font-size:80%;">' . LB .
$smallcal_prev . '</div>');
$smallcal_next = getSmallCalendar ($nextmonth, $nextyear, $mode);
$cal_templates->set_var ('next_months_calendar', $smallcal_next);
$cal_templates->set_var ('next_months_cal',
- '<font size="-2">' . LB .
$smallcal_next . '</font>');
+ '<div style="font-size:80%;">' . LB .
$smallcal_next . '</div>');
$cal_templates->set_var('cal_prevmo_num', $prevmonth);
$cal_templates->set_var('cal_prevyr_num', $prevyear);