[geeklog-hg] geeklog: Merged with upstream
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Sat Jul 13 13:42:44 EDT 2013
changeset 9191:aa58b8ec9c48
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/aa58b8ec9c48
user: Tom <websitemaster at cogeco.net>
date: Sat Jul 13 13:42:01 2013 -0400
description:
Merged with upstream
diffstat:
plugins/calendar/templates/addremoveevent.thtml | 2 +-
plugins/calendar/templates/eventdetails.thtml | 19 +++++-------
plugins/calendar/templates/events.thtml | 7 +++-
public_html/admin/story.php | 2 +-
public_html/lib-common.php | 38 ++++++++++++------------
system/lib-admin.php | 2 +-
6 files changed, 35 insertions(+), 35 deletions(-)
diffs (138 lines):
diff -r 36ec7e9cfbbb -r aa58b8ec9c48 plugins/calendar/templates/addremoveevent.thtml
--- a/plugins/calendar/templates/addremoveevent.thtml Sat Jul 13 13:39:23 2013 -0400
+++ b/plugins/calendar/templates/addremoveevent.thtml Sat Jul 13 13:42:01 2013 -0400
@@ -1,1 +1,1 @@
- <font size="-2">[{lang_addremovefromcal}]</font>
+ <span style="font-size:80%;">[{lang_addremovefromcal}]</span>
diff -r 36ec7e9cfbbb -r aa58b8ec9c48 plugins/calendar/templates/eventdetails.thtml
--- a/plugins/calendar/templates/eventdetails.thtml Sat Jul 13 13:39:23 2013 -0400
+++ b/plugins/calendar/templates/eventdetails.thtml Sat Jul 13 13:42:01 2013 -0400
@@ -1,20 +1,17 @@
+
+ <h3 class="cal-event-title">{event_title}</h3>
<table cellspacing="0" cellpadding="3" border="0" width="100%">
- <tr>
- <td colspan="2">
- <h1 class="summary">{event_title}</h1>
- </td>
- </tr>
<tr valign="top">
- <td align="right"><b>{lang_when}:</b></td>
- <td width="100%">{event_start} - {event_end}</td>
+ <td align="right" style="width:8em"><b>{lang_when}:</b></td>
+ <td>{event_start} - {event_end}</td>
</tr>
<tr valign="top">
<td align="right"><b>{lang_event_type}:</b></td>
- <td width="100%">{event_type}</td>
+ <td>{event_type}</td>
</tr>
<tr valign="top">
<td align="right"><b>{lang_where}:</b></td>
- <td width="100%" class="location">
+ <td class="location">
{event_location}{br0}
{event_address1}{br1}
{event_address2}{br2}
@@ -23,7 +20,7 @@
</tr>
<tr valign="top">
<td align="right"><b>{lang_description}:</b></td>
- <td width="100%" class="description">{event_description}</td>
+ <td class="description">{event_description}</td>
</tr>
<tr><td colspan="2">{addremove_event} {edit_icon}</td></tr>
- </table><br{xhtml}><br{xhtml}>
+ </table><br{xhtml}>
\ No newline at end of file
diff -r 36ec7e9cfbbb -r aa58b8ec9c48 plugins/calendar/templates/events.thtml
--- a/plugins/calendar/templates/events.thtml Sat Jul 13 13:39:23 2013 -0400
+++ b/plugins/calendar/templates/events.thtml Sat Jul 13 13:42:01 2013 -0400
@@ -1,3 +1,6 @@
- [ <a href="{site_url}/submit.php?type=calendar{calendar_mode}">{lang_addevent}</a> ][ <a href="{site_url}/calendar/index.php{calendar_mode}">{lang_backtocalendar}</a> ]<br{xhtml}><br{xhtml}>
- <h1>{lang_month} {event_year}</h1>
+
+ <div style="margin-bottom:2em">
+ [ <a href="{site_url}/submit.php?type=calendar{calendar_mode}">{lang_addevent}</a> ][ <a href="{site_url}/calendar/index.php{calendar_mode}">{lang_backtocalendar}</a> ]
+ </div>
+ <h2 class="cal-event-date">{lang_month} {event_year}</h2>
{event_details}
diff -r 36ec7e9cfbbb -r aa58b8ec9c48 public_html/admin/story.php
--- a/public_html/admin/story.php Sat Jul 13 13:39:23 2013 -0400
+++ b/public_html/admin/story.php Sat Jul 13 13:42:01 2013 -0400
@@ -171,7 +171,7 @@
$header_arr[] = array('text' => $LANG24[7], 'field' => 'username', 'sort' => true); // author
}
$header_arr[] = array('text' => $LANG24[15], 'field' => 'unixdate', 'sort' => true); // date
- $header_arr[] = array('text' => $LANG_ADMIN['topic'], 'field' => 'topic_ids', 'sort' => true);
+ $header_arr[] = array('text' => $LANG_ADMIN['topic'], 'field' => 'tid', 'sort' => true);
$header_arr[] = array('text' => $LANG24[32], 'field' => 'featured', 'sort' => true);
if (SEC_hasRights ('story.ping') && ($_CONF['trackback_enabled'] ||
diff -r 36ec7e9cfbbb -r aa58b8ec9c48 public_html/lib-common.php
--- a/public_html/lib-common.php Sat Jul 13 13:39:23 2013 -0400
+++ b/public_html/lib-common.php Sat Jul 13 13:42:01 2013 -0400
@@ -221,25 +221,6 @@
require_once( $_CONF['path_system'] . 'lib-topic.php' );
/**
-* Retrieve new topic if found
-*
-*/
-
-if (isset($_GET['topic'])) {
- $topic = COM_applyFilter($_GET['topic']);
-} elseif (isset($_POST['topic'])) {
- $topic = COM_applyFilter($_POST['topic']);
-} else {
- $topic = '';
-}
-// See if user has access to view topic
-if ($topic != '') {
- if ($topic != DB_getItem($_TABLES['topics'], 'tid', "tid = '$topic' " . COM_getPermSQL('AND'))) {
- $topic = '';
- }
-}
-
-/**
* This is the block library used to manage blocks.
*
*/
@@ -280,6 +261,25 @@
}
/**
+* Retrieve new topic if found
+*
+*/
+
+if (isset($_GET['topic'])) {
+ $topic = COM_applyFilter($_GET['topic']);
+} elseif (isset($_POST['topic'])) {
+ $topic = COM_applyFilter($_POST['topic']);
+} else {
+ $topic = '';
+}
+// See if user has access to view topic
+if ($topic != '') {
+ if ($topic != DB_getItem($_TABLES['topics'], 'tid', "tid = '$topic' " . COM_getPermSQL('AND'))) {
+ $topic = '';
+ }
+}
+
+/**
* Multibyte functions
*
*/
diff -r 36ec7e9cfbbb -r aa58b8ec9c48 system/lib-admin.php
--- a/system/lib-admin.php Sat Jul 13 13:39:23 2013 -0400
+++ b/system/lib-admin.php Sat Jul 13 13:42:01 2013 -0400
@@ -1049,7 +1049,7 @@
}
break;
- case 'topic_ids':
+ case 'tid':
$retval = TOPIC_getTopicAdminColumn('article', $A['sid']);
break;
More information about the geeklog-cvs
mailing list