Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[10611] XoopsModules/extcal/trunk/modules/extcal
|
From: <be...@us...> - 2012-12-30 14:38:50
|
Revision: 10611
http://sourceforge.net/p/xoops/svn/10611
Author: beckmi
Date: 2012-12-30 14:38:47 +0000 (Sun, 30 Dec 2012)
Log Message:
-----------
- fixed: Recent Activities showing all events, instead of only the particular user (sabahan/mamba)
- fixed: don't show empty Price and Organizer fields (sabahan/mamba)
- fixed: removed double edit icons (sabahan/mamba)
Modified Paths:
--------------
XoopsModules/extcal/trunk/modules/extcal/admin/event.php
XoopsModules/extcal/trunk/modules/extcal/class/event.php
XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
XoopsModules/extcal/trunk/modules/extcal/include/search.inc.php
XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php
XoopsModules/extcal/trunk/modules/extcal/templates/blocks/extcal_block_day.html
XoopsModules/extcal/trunk/modules/extcal/templates/blocks/extcal_block_new.html
XoopsModules/extcal/trunk/modules/extcal/templates/extcal_event.html
Modified: XoopsModules/extcal/trunk/modules/extcal/admin/event.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/admin/event.php 2012-12-30 12:11:53 UTC (rev 10610)
+++ XoopsModules/extcal/trunk/modules/extcal/admin/event.php 2012-12-30 14:38:47 UTC (rev 10611)
@@ -334,6 +334,7 @@
echo '<th>' . _AM_EXTCAL_CATEGORY . '</th>';
echo '<th>' . _AM_EXTCAL_TITLE . '</th>';
echo '<th>' . _AM_EXTCAL_START_DATE . '</th>';
+ echo '<th>' . _AM_EXTCAL_END_DATE . '</th>';
echo '<th>' . _AM_EXTCAL_RECURRENT . '</th>';
echo '<th>' . _AM_EXTCAL_START_RULES . '</th>';
echo '<th>' . _AM_EXTCAL_ACTION . '</th>';
@@ -369,6 +370,7 @@
echo '<td>' . $event['formated_event_start'] . '</td>';
+ echo '<td>' . $event['formated_event_end'] . '</td>';
echo '<td align="center">' . (($event['event_isrecur']==1)?_YES:_NO) . '</td>';
if(!isset($event['formated_reccur_rule'])){
$event['formated_reccur_rule'] = '';
Modified: XoopsModules/extcal/trunk/modules/extcal/class/event.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/event.php 2012-12-30 12:11:53 UTC (rev 10610)
+++ XoopsModules/extcal/trunk/modules/extcal/class/event.php 2012-12-30 14:38:47 UTC (rev 10611)
@@ -2227,7 +2227,7 @@
}
- function getSearchEventzzz(
+ function getSearchEvent3(
$queryarray, $andor, $limit, $offset, $userId, $user, $criteresPlus = '', $xoopsSearch = true
)
{
Modified: XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt 2012-12-30 12:11:53 UTC (rev 10610)
+++ XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt 2012-12-30 14:38:47 UTC (rev 10611)
@@ -1,11 +1,14 @@
2012/04/02: Version 2.37 RC2
===================================
-- fixed: attachment bug (mamba)
-- fixed: past events not being visible (mamba)
-- fixed: displaying the correct week in Week view when the first day of the week is Monday
-- updated: Highslide JS from version 4.1.8 to 4.1.13
-- added: end date to blocks
-- fixed: pagination for events in Admin
+- fixed: attachment bug (JammerPro/mamba)
+- fixed: past events not being visible consistently, when selected by user in Preferences (mamba)
+- fixed: displaying the correct week in Week view when the first day of the week is Monday (mamba)
+- updated: Highslide JS from version 4.1.8 to 4.1.13 (mamba)
+- added: end date to blocks (sabahan/mamba)
+- fixed: pagination for events in Admin (sabahan/mamba)
+- fixed: Recent Activities showing all events, instead of only the particular user (sabahan/mamba)
+- fixed: don't show empty Price and Organizer fields (sabahan/mamba)
+- fixed: removed double edit icons (sabahan/mamba)
2012/04/02: Version 2.37 Beta 4
===================================
Modified: XoopsModules/extcal/trunk/modules/extcal/include/search.inc.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/include/search.inc.php 2012-12-30 12:11:53 UTC (rev 10610)
+++ XoopsModules/extcal/trunk/modules/extcal/include/search.inc.php 2012-12-30 14:38:47 UTC (rev 10611)
@@ -10,7 +10,6 @@
$eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
- return $eventHandler->getSearchEvent($queryarray, $andor, $limit, $offset, $userid, $xoopsUser);
+ return $eventHandler->getSearchEvent3($queryarray, $andor, $limit, $offset, $userid, $xoopsUser);
-}
-?>
+}
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php 2012-12-30 12:11:53 UTC (rev 10610)
+++ XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php 2012-12-30 14:38:47 UTC (rev 10611)
@@ -118,4 +118,8 @@
define('_AM_EXTCAL_NO_PENDING_EVENT','No pending Event');
define('_AM_EXTCAL_ICONE','Icon');
//ModuleAdmin
-define('_AM_EXTCAL_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)');
\ No newline at end of file
+define('_AM_EXTCAL_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)');
+
+//2.37
+
+define('_AM_EXTCAL_END_DATE','End Date');
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/templates/blocks/extcal_block_day.html
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/templates/blocks/extcal_block_day.html 2012-12-30 12:11:53 UTC (rev 10610)
+++ XoopsModules/extcal/trunk/modules/extcal/templates/blocks/extcal_block_day.html 2012-12-30 14:38:47 UTC (rev 10611)
@@ -5,7 +5,11 @@
<td>
<a href="<{$xoops_url}>/modules/extcal/event.php?event=<{$event.event_id}>"
title="<{$event.event_title}>"><{$event.event_title}></a></td>
- <td><{$event.formated_event_start}></td>
+ <td><{$event.formated_event_start}>
+ <{if $event.formated_event_start != $event.formated_event_end}>
+ - <{$event.formated_event_end}>
+ <{/if}>
+ </td>
</tr>
<{/foreach}>
</table>
Modified: XoopsModules/extcal/trunk/modules/extcal/templates/blocks/extcal_block_new.html
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/templates/blocks/extcal_block_new.html 2012-12-30 12:11:53 UTC (rev 10610)
+++ XoopsModules/extcal/trunk/modules/extcal/templates/blocks/extcal_block_new.html 2012-12-30 14:38:47 UTC (rev 10611)
@@ -5,7 +5,8 @@
<td>
<a href="<{$xoops_url}>/modules/extcal/event.php?event=<{$event.event_id}>"
title="<{$event.event_title}>"><{$event.event_title}></a></td>
- <td><{$event.formated_event_start}> <{if $event.formated_event_start != $event.formated_event_end}>
+ <td><{$event.formated_event_start}>
+ <{if $event.formated_event_start != $event.formated_event_end}>
- <{$event.formated_event_end}>
<{/if}>
</td>
Modified: XoopsModules/extcal/trunk/modules/extcal/templates/extcal_event.html
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/templates/extcal_event.html 2012-12-30 12:11:53 UTC (rev 10610)
+++ XoopsModules/extcal/trunk/modules/extcal/templates/extcal_event.html 2012-12-30 14:38:47 UTC (rev 10611)
@@ -1,34 +1,33 @@
-
<script src='<{$smarty.const.XOOPS_URL}>/modules/extcal/js/extcal_highslide.js' type="text/javascript"></script>
<table class="outer">
+ <tr>
+ <th colspan="3" style="font-size:1.2em;">
+ <div style="float:left;">
+ <table>
+ <tr>
+ <td class="head" style="background-color:#<{$event.cat.cat_color}>; width:5px;"></td>
+ <td style="width:200px;"><{$event.cat.cat_name}></td>
+ </tr>
+ </table>
+ </div>
+ <!--<div style="text-align:right;">-->
+ <!--<a href="<{$xoops_url}>/modules/extcal/print.php?event=<{$event.event_id}>">-->
+ <!--<img src="<{$smarty.const._EXTCAL_PATH_ICONS16}>/printer.png"/>-->
+ <!--</a>-->
+ <!--<{if $isAdmin || $canEdit}>-->
+ <!--<a href="edit_event.php?event=<{$event.event_id}>">-->
+ <!--<img src="<{$smarty.const._EXTCAL_PATH_ICONS16}>/edit.png"/>-->
+ <!--</a><{/if}>-->
+ <!--<{if $isAdmin}>-->
+ <!--<a href="admin/event.php?op=delete&event_id=<{$event.event_id}>">-->
+ <!--<img src="<{$smarty.const._EXTCAL_PATH_ICONS16}>/delete.png"/>-->
+ <!--</a>-->
+ <!--<{/if}>-->
+ <!--</div>-->
+ </th>
+ </tr>
<tr>
- <th colspan="3" style="font-size:1.2em;">
- <div style="float:left;">
- <table>
- <tr>
- <td class="head" style="background-color:#<{$event.cat.cat_color}>; width:5px;"></td>
- <td style="width:200px;"><{$event.cat.cat_name}></td>
- </tr>
- </table>
- </div>
- <div style="text-align:right;">
- <a href="<{$xoops_url}>/modules/extcal/print.php?event=<{$event.event_id}>">
- <img src="<{$smarty.const._EXTCAL_PATH_ICONS16}>/printer.png" />
- </a>
- <{if $isAdmin || $canEdit}>
- <a href="edit_event.php?event=<{$event.event_id}>">
- <img src="<{$smarty.const._EXTCAL_PATH_ICONS16}>/edit.png" />
- </a><{/if}>
- <{if $isAdmin}>
- <a href="admin/event.php?op=delete&event_id=<{$event.event_id}>">
- <img src="<{$smarty.const._EXTCAL_PATH_ICONS16}>/delete.png" />
- </a>
- <{/if}>
- </div>
- </th>
- </tr>
- <tr>
<td colspan="3" class="odd">
<{if $event.event_picture1}>
@@ -117,8 +116,10 @@
<tr>
<td width="50%" class="odd" colspan='2'>
- <u><strong><{$smarty.const._MD_EXTCAL_ORGANISATEUR}></strong></u><br />
- <{if $event.event_organisateur}><{$event.event_organisateur}><br /><{/if}>
+
+ <{if $event.event_organisateur}>
+ <u><strong><{$smarty.const._MD_EXTCAL_ORGANISATEUR}></strong></u><br />
+ <{$event.event_organisateur}><br /><{/if}>
<{if $event.event_contact}><{$event.event_contact}><br /><{/if}>
<{if $event.event_email}><A href="mailto:<{$event.event_email}>"><{$event.event_email}></A><br /><{/if}>
<{if $event.event_url}><a href="<{$event.event_url}>" target="_blank"><{$event.event_url}></a><br /><{/if}>
@@ -127,9 +128,15 @@
</tr>
<tr>
- <td width="50%" class="odd"><br />
- <u><strong><{$smarty.const._MD_EXTCAL_ETABLISSEMENT_TARIFS}> :</strong></u><br /><{$event.event_price}> <{$smarty.const._MD_EXTCAL_DEVISE2}>
- </td>
+
+ <{if $event.event_price}>
+ <td width="50%" class="odd"><br />
+ <u><strong><{$smarty.const._MD_EXTCAL_ETABLISSEMENT_TARIFS}> :</strong></u><br />
+ <{$event.event_price}>
+ <{$smarty.const._MD_EXTCAL_DEVISE2}>
+ </td>
+ <{/if}>
+
<td class="odd"><br />
<u><strong><{$smarty.const._MD_EXTCAL_START}></strong></u> <{$event.formated_event_start}><br />
<u><strong><{$smarty.const._MD_EXTCAL_END}></strong></u> <{$event.formated_event_end}><br />
|
