You can subscribe to this list here.
2012 |
Jan
|
Feb
(214) |
Mar
(139) |
Apr
(198) |
May
(187) |
Jun
(151) |
Jul
(210) |
Aug
(169) |
Sep
(58) |
Oct
(53) |
Nov
(54) |
Dec
(301) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2013 |
Jan
(348) |
Feb
(178) |
Mar
(219) |
Apr
(154) |
May
(117) |
Jun
(194) |
Jul
(61) |
Aug
(132) |
Sep
(121) |
Oct
(110) |
Nov
(11) |
Dec
(18) |
2014 |
Jan
(34) |
Feb
(50) |
Mar
(82) |
Apr
(98) |
May
(39) |
Jun
(111) |
Jul
(67) |
Aug
(36) |
Sep
(33) |
Oct
(26) |
Nov
(53) |
Dec
(44) |
2015 |
Jan
(29) |
Feb
(47) |
Mar
(25) |
Apr
(19) |
May
(23) |
Jun
(20) |
Jul
(49) |
Aug
(7) |
Sep
(10) |
Oct
(10) |
Nov
(4) |
Dec
(25) |
2016 |
Jan
(8) |
Feb
(7) |
Mar
(1) |
Apr
|
May
(3) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(7) |
Dec
(5) |
2017 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(15) |
Jun
|
Jul
(18) |
Aug
(24) |
Sep
|
Oct
(14) |
Nov
|
Dec
|
2018 |
Jan
|
Feb
(22) |
Mar
|
Apr
(11) |
May
(1) |
Jun
(17) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(6) |
Nov
(5) |
Dec
|
2019 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
From: <txm...@us...> - 2012-06-16 09:31:27
|
Revision: 9652 http://xoops.svn.sourceforge.net/xoops/?rev=9652&view=rev Author: txmodxoops Date: 2012-06-16 09:31:20 +0000 (Sat, 16 Jun 2012) Log Message: ----------- Updated Modified Paths: -------------- XoopsModules/fullcalendar/trunk/fullcalendar/admin/delete_events.php XoopsModules/fullcalendar/trunk/fullcalendar/admin/events.php XoopsModules/fullcalendar/trunk/fullcalendar/admin/index.php XoopsModules/fullcalendar/trunk/fullcalendar/class/fullcalendar_events.php XoopsModules/fullcalendar/trunk/fullcalendar/include/functions.php XoopsModules/fullcalendar/trunk/fullcalendar/index.php XoopsModules/fullcalendar/trunk/fullcalendar/language/english/admin.php XoopsModules/fullcalendar/trunk/fullcalendar/language/english/modinfo.php XoopsModules/fullcalendar/trunk/fullcalendar/language/italian/admin.php XoopsModules/fullcalendar/trunk/fullcalendar/sql/mysql.sql XoopsModules/fullcalendar/trunk/fullcalendar/xoops_version.php Added Paths: ----------- XoopsModules/fullcalendar/trunk/fullcalendar/style.css Modified: XoopsModules/fullcalendar/trunk/fullcalendar/admin/delete_events.php =================================================================== --- XoopsModules/fullcalendar/trunk/fullcalendar/admin/delete_events.php 2012-06-16 08:16:22 UTC (rev 9651) +++ XoopsModules/fullcalendar/trunk/fullcalendar/admin/delete_events.php 2012-06-16 09:31:20 UTC (rev 9652) @@ -64,36 +64,57 @@ break; case "confirmbeforetoprune": - $events = $eventsHandler->get($_GET['event_id']); + $events = $eventsHandler->get($_GET['event_id']); + $eventlist = ''; + if(isset($_POST['pruned_events'])) { + $eventlist = implode(',',$_POST['pruned_events']); + } + $expired = 0; if(isset($_POST['onlyexpired'])) { $expired = intval($_POST['onlyexpired']); - } + } $criteria = new CriteriaCompo(); $criteria->add(new Criteria("event_id", $_GET['event_id'])); $criteria->add(new Criteria("event_end", $_GET['event_end'])); $count = $eventsHandler->getCount($criteria); $date = $_POST['prune_date']; - $timestamp = mktime(0,0,0,intval(substr($date,5,2)), intval(substr($date,8,2)), intval(substr($date,0,4))); + $timestamp = mktime( 0, 0, 0, intval(substr($date, 5, 2)), intval(substr($date, 8, 2)), intval(substr($date, 0, 4))); if($count) { $displaydate = formatTimestamp($timestamp); $msg = sprintf(_AM_FULLCALENDAR_PRUNE_CONFIRM, $displaydate, $count); - xoops_confirm(array( 'op' => 'delete_allevents', "event_id" => $_REQUEST["event_id"], 'prune_date' => $timestamp, 'ok' => 1), 'delete_events.php', $msg); - } else { - printf(_AM_FULLCALENDAR_NOTHING_PRUNE); + xoops_confirm(array( 'op' => 'delete_allevents', "event_id" => $_REQUEST["event_id"], 'expired' => $expired, 'pruned_events' => $eventlist, 'prune_date' => $timestamp, 'ok' => 1), 'delete_events.php', $msg); } - unset($story); + unset($events); break; - case "delete_allevents": + case "delete_allevents": + $events = $eventsHandler->get($_GET['event_id']); + $timestamp = intval($_POST['prune_date']); + $expired = intval($_POST['expired']); + $criteria = new CriteriaCompo(new Criteria("event_id", $_GET['event_id'])); + $eventlist = $eventsHandler->getAll($criteria); + if(isset($_POST['pruned_events'])) { + $eventlist=$_POST['pruned_events']; + } if( intval($_POST['ok']) == 1 ) { - $criteria = new CriteriaCompo(); - $criteria->add(new Criteria("event_id", 0, '>')); + $criteria = new CriteriaCompo(new Criteria("event_id", 0, '>')); $criteria->add(new Criteria("event_end", $_GET['event_end'])); $count = $eventsHandler->getCount($criteria); $msg = sprintf(_AM_FULLCALENDAR_PRUNE_DELETED,$count); - - redirect_header( 'delete_events.php', 3, $msg); - } + $events->DeleteBeforeDate($timestamp, $expired, $eventlist); + + if (isset($_REQUEST["ok"]) && $_REQUEST["ok"] == 1) { + if ( !$GLOBALS["xoopsSecurity"]->check() ) { + redirect_header("events.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors())); + } + if ($eventsHandler->delete($events)) { + redirect_header( 'delete_events.php', 3, $msg); + } else { + echo $obj->getHtmlErrors(); + } + } + unset($events); + } break; } include "admin_footer.php"; Modified: XoopsModules/fullcalendar/trunk/fullcalendar/admin/events.php =================================================================== --- XoopsModules/fullcalendar/trunk/fullcalendar/admin/events.php 2012-06-16 08:16:22 UTC (rev 9651) +++ XoopsModules/fullcalendar/trunk/fullcalendar/admin/events.php 2012-06-16 09:31:20 UTC (rev 9652) @@ -74,6 +74,7 @@ <th class='center'>"._AM_FULLCALENDAR_EVENT_DESCRIPTION."</th> <th class='center'>"._AM_FULLCALENDAR_EVENT_START."</th> <th class='center'>"._AM_FULLCALENDAR_EVENT_END."</th> + <th class='center'>"._AM_FULLCALENDAR_EVENT_ALLDAY."</th> <th class='center'>"._AM_FULLCALENDAR_EVENT_WEIGHT."</th> <th class='center'>"._AM_FULLCALENDAR_EVENT_DISPLAY."</th> <th align='center' width='10%'>"._AM_FULLCALENDAR_FORMACTION."</th> @@ -88,8 +89,11 @@ echo "<td class='center'>".$events_arr[$i]->getVar("event_title")."</td>"; echo "<td class='center'>".$events_arr[$i]->getVar("event_description")."</td>"; echo "<td class='center'>".formatTimeStamp($events_arr[$i]->getVar("event_start"))."</td>"; - echo "<td class='center'>".formatTimeStamp($events_arr[$i]->getVar("event_end"))."</td>"; - echo "<td class='center'>".$events_arr[$i]->getVar("event_weight")."</td>"; + echo "<td class='center'>".formatTimeStamp($events_arr[$i]->getVar("event_end"))."</td>"; + $fc_events_allday = $events_arr[$i]->getVar('event_allday'); + $fc_event_allday = ($fc_events_allday == 1) ? _YES : _NO; + echo "<td class='center'>".$fc_event_allday."</td>"; + echo "<td class='center'>".$events_arr[$i]->getVar("event_weight")."</td>"; if ( $events_arr[$i]->getVar("event_display") == 1 ) { echo "<td class='center'><a href='./events.php?op=update_display&event_id=".$i."&event_display=0'><img src='".$pathIcon16."/on.png' border='0' alt='"._AM_FULLCALENDAR_ONLINE."' title='"._AM_FULLCALENDAR_ONLINE."'></a></td>"; @@ -113,6 +117,7 @@ <th class='center'>"._AM_FULLCALENDAR_EVENT_DESCRIPTION."</th> <th class='center'>"._AM_FULLCALENDAR_EVENT_START."</th> <th class='center'>"._AM_FULLCALENDAR_EVENT_END."</th> + <th class='center'>"._AM_FULLCALENDAR_EVENT_ALLDAY."</th> <th class='center'>"._AM_FULLCALENDAR_EVENT_WEIGHT."</th> <th class='center'>"._AM_FULLCALENDAR_EVENT_DISPLAY."</th> <th align='center' width='10%'>"._AM_FULLCALENDAR_FORMACTION."</th> @@ -142,9 +147,11 @@ $obj =& $eventsHandler->create(); } //Form event_display + $verif_event_allday = ($_REQUEST["event_allday"] == 1) ? "1" : "0"; + //Form event_display $verif_event_display = ($_REQUEST["event_display"] == 1) ? "1" : "0"; //Form events - $obj->setVars(array("event_title" => $_POST["event_title"], "event_description" => $_POST["event_description"], "event_start" => fullcalendar_convertDateTime($_POST["event_start"]), "event_end" => fullcalendar_convertDateTime($_POST["event_end"]), "event_weight" => $_POST["event_weight"], "event_display" => $verif_event_display)); + $obj->setVars(array("event_title" => $_POST["event_title"], "event_description" => $_POST["event_description"], "event_start" => fullcalendar_convertDate($_POST["event_start"]), "event_end" => fullcalendar_convertDate($_POST["event_end"]), "event_url" => $_POST["event_url"], "event_allday" => $_POST["event_allday"], "event_weight" => $_POST["event_weight"], "event_display" => $verif_event_display)); if ($eventsHandler->insert($obj)) { redirect_header("events.php?op=list", 2, _AM_FULLCALENDAR_FORMOK); Modified: XoopsModules/fullcalendar/trunk/fullcalendar/admin/index.php =================================================================== --- XoopsModules/fullcalendar/trunk/fullcalendar/admin/index.php 2012-06-16 08:16:22 UTC (rev 9651) +++ XoopsModules/fullcalendar/trunk/fullcalendar/admin/index.php 2012-06-16 09:31:20 UTC (rev 9652) @@ -31,11 +31,15 @@ xoops_cp_header(); //count "total events" $count_events = $eventsHandler->getCount(); - $r = '#FF0000'; // Red - $g = '#00AA00'; // Green + //count "total expired events" + $criteria = new CriteriaCompo(new Criteria('event_end', date( _DATESTRING ), '<')); //time() + $count_expired_events = $eventsHandler->getCount($criteria); + $r = '#FF0000'; /* Red */ $g = '#00AA00'; // Green + $expired = ($count_events == 0) && ($count_expired_events == 0); // InfoBox events $adminMenu->addInfoBox(_AM_FULLCALENDAR_EVENTS); - $adminMenu->addInfoBoxLine(_AM_FULLCALENDAR_EVENTS,_AM_FULLCALENDAR_THEREARE_EVENTS, $count_events, ($count_events == 0) ? $r : $g); + $adminMenu->addInfoBoxLine(_AM_FULLCALENDAR_EVENTS,_AM_FULLCALENDAR_THEREARE_EVENTS, $count_events, ($count_events != 0) ? $g : $r); + $adminMenu->addInfoBoxLine(_AM_FULLCALENDAR_EVENTS,_AM_FULLCALENDAR_THEREARE_EXPIRED_EVENTS, $count_events, $expired ? $g : $r ); // Render Index echo $adminMenu->addNavigation("index.php"); echo $adminMenu->renderIndex(); Modified: XoopsModules/fullcalendar/trunk/fullcalendar/class/fullcalendar_events.php =================================================================== --- XoopsModules/fullcalendar/trunk/fullcalendar/class/fullcalendar_events.php 2012-06-16 08:16:22 UTC (rev 9651) +++ XoopsModules/fullcalendar/trunk/fullcalendar/class/fullcalendar_events.php 2012-06-16 09:31:20 UTC (rev 9652) @@ -42,6 +42,8 @@ $this->initVar("event_description", XOBJ_DTYPE_TXTAREA, 'Event Description', false); $this->initVar("event_start", XOBJ_DTYPE_LTIME, null, false); $this->initVar("event_end", XOBJ_DTYPE_LTIME, null, false); + $this->initVar("event_url", XOBJ_DTYPE_TXTBOX, 'http://www.txmodxoops.org', false, 255); + $this->initVar("event_allday", XOBJ_DTYPE_INT, '0', false, 1); $this->initVar("event_weight", XOBJ_DTYPE_INT, '0', false, 11); $this->initVar("event_display", XOBJ_DTYPE_INT, '0', false, 1); } @@ -70,34 +72,68 @@ $editor_configs=array(); $editor_configs["name"] ="event_description"; $editor_configs["value"] = $this->getVar("event_description", "e"); - $editor_configs["rows"] = 10; - $editor_configs["cols"] = 80; - $editor_configs["width"] = "100%"; - $editor_configs["height"] = "400px"; + $editor_configs["rows"] = 5; + $editor_configs["cols"] = 50; + $editor_configs["width"] = "50%"; + $editor_configs["height"] = "200px"; $editor_configs["editor"] = $GLOBALS["xoopsModuleConfig"]["fullcalendar_editor"]; $form->addElement( new XoopsFormEditor(_AM_FULLCALENDAR_EVENT_DESCRIPTION, "event_description", $editor_configs), false ); // event_start $form->addElement(new XoopsFormDateTime(_AM_FULLCALENDAR_EVENT_START, "event_start", 15, $this->getVar("event_start")), true); // event_end $form->addElement(new XoopsFormDateTime(_AM_FULLCALENDAR_EVENT_END, "event_end", 15, $this->getVar("event_end")), true); + // event_url + $form->addElement(new XoopsFormText(_AM_FULLCALENDAR_EVENT_URL, "event_url", 50, 255, $this->getVar("event_url")), false); // event_weight $form->addElement(new XoopsFormText(_AM_FULLCALENDAR_EVENT_WEIGHT, "event_weight", 5, 15, $this->getVar("event_weight")), true); - // event_display - $event_display = $this->isNew() ? 0 : $this->getVar("event_display"); - $check_event_display = new XoopsFormCheckBox(_AM_FULLCALENDAR_EVENT_DISPLAY, "event_display", $event_display); - $check_event_display->addOption(1, " "); - $form->addElement($check_event_display); - // event_event + // options_tray + $options_tray = new XoopsFormElementTray(_OPTIONS, '<br />'); + // event_allday + $event_allday = $this->isNew() ? 0 : $this->getVar("event_allday"); + $check_event_allday = new XoopsFormCheckBox(" ", "event_allday", $event_allday); + $check_event_allday->addOption(1, _AM_FULLCALENDAR_EVENT_ALLDAY); + $options_tray->addElement($check_event_allday); + // event_display + $event_display = $this->isNew() ? 0 : $this->getVar("event_display"); + $check_event_display = new XoopsFormCheckBox(" ", "event_display", $event_display); + $check_event_display->addOption(1, _AM_FULLCALENDAR_EVENT_DISPLAY); + $options_tray->addElement($check_event_display); + $form->addElement($options_tray); + + // save_event $form->addElement(new XoopsFormHidden("op", "save_event")); $form->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit")); return $form; } + + /** + * Delete events that were published before a given date + */ + function DeleteBeforeDate($timestamp, $expired, $eventslist='') + { + global $xoopsModule; + $mid= $xoopsModule->getVar('mid'); + $db =& XoopsDatabaseFactory::getDatabaseConnection(); + $prefix = $db->prefix('fullcalendar_events'); + $sql = 'SELECT event_id FROM '.$prefix.' WHERE event_start <=' . $timestamp; + if($expired) { + $sql .=' (AND event_end > 0 AND event_end <= '.time().')'; + } + if(strlen(trim($eventslist))>0) { + $sql .=' AND event_id IN ('.$eventslist.')'; + } + $result = $db->query($sql); + while ($myrow = $db->fetchArray($result)) { + $db->queryF('DELETE FROM '.$prefix.' WHERE event_id='.$myrow['event_id']); // Delete the event + } + return true; + } } class fullcalendarfullcalendar_eventsHandler extends XoopsPersistableObjectHandler { function __construct(&$db) { parent::__construct($db, "fullcalendar_events", "fullcalendar_events", "event_id", "event_title"); - } + } } ?> \ No newline at end of file Modified: XoopsModules/fullcalendar/trunk/fullcalendar/include/functions.php =================================================================== --- XoopsModules/fullcalendar/trunk/fullcalendar/include/functions.php 2012-06-16 08:16:22 UTC (rev 9651) +++ XoopsModules/fullcalendar/trunk/fullcalendar/include/functions.php 2012-06-16 09:31:20 UTC (rev 9652) @@ -58,7 +58,13 @@ } function fullcalendar_Events($title, $allDay = false, $editable = false ) { - // With JSON for external events + + $events_type = $eventsHandler->get($_GET['event_id']); + $criteria = new Criteria("event_id", $_GET['event_id']); + $criteria->setSort("event_start"); + $criteria->setOrder("ASC"); + $events = $eventsHandler->getAll($criteria); + // With JSON for external events $ret = "$(document).ready(function() { var date = new Date(); var d = date.getDate(); @@ -71,12 +77,30 @@ right: 'month,agendaWeek,agendaDay' }, editable: ".$editable.", - events: [ - { - title: 'Evento che dura tutto il giorno', - start: new Date(".$y.", ".$m.", 1) - }, - { + events: ["; + $ret = ""; + foreach($events as $event) { + if($events[$event]->getVar('event_display') == 1){ + $ret .= " { + id: ".$events[$event]->getVar('event_id').", + title: '".$events[$event]->getVar('event_title')."', + start: new Date(y, m, d+1, 19, 0), + end: new Date(y, m, d+1, 22, 30),"; + if($events[$event]->getVar('event_allday') != 1){ + $ret .= " allDay: false"; + } else { + $ret .= ""; + } + if($events[$event]->getVar('event_url') != ''){ + $ret .= " url: '".$events[$event]->getVar('event_url')."'"; + } else { + $ret .= ""; + } + $ret .= "},"; + } + } + + /* { title: 'Evento che dura piu giorni', start: new Date(y, m, d-5), end: new Date(y, m, d-2) @@ -88,7 +112,7 @@ allDay: false }, { - id: 999, + title: 'Evento ripetuto', start: new Date(y, m, d+4, 16, 0), allDay: false @@ -115,8 +139,8 @@ start: new Date(y, m, 28), end: new Date(y, m, 29), url: 'http://www.txmodxoops.org/' - } - ] + }*/ + $ret .= "] }); });"; @@ -153,7 +177,7 @@ * @param mixed $date * @return */ -function fullcalendar_convertDateTime($date) +function fullcalendar_convertDate($date) { if (strpos(_DATESTRING, "/")) { Modified: XoopsModules/fullcalendar/trunk/fullcalendar/index.php =================================================================== --- XoopsModules/fullcalendar/trunk/fullcalendar/index.php 2012-06-16 08:16:22 UTC (rev 9651) +++ XoopsModules/fullcalendar/trunk/fullcalendar/index.php 2012-06-16 09:31:20 UTC (rev 9652) @@ -42,6 +42,8 @@ $GLOBALS['xoTheme']->addScript( "modules/".$GLOBALS['xoopsModule']->getVar('dirname')."/js/jqinit.js", null ); // $GLOBALS['xoopsTpl']->assign('xoops_mpageurl', FULLCALENDAR_URL."/index.php"); +$GLOBALS['xoopsTpl']->assign('fbcomments_width', $GLOBALS['xoopsConfig']['fbcomments_width']); +// $GLOBALS['xoopsTpl']->assign('fullcalendar_url', FULLCALENDAR_URL); $GLOBALS['xoopsTpl']->assign('adv', $GLOBALS['xoopsModuleConfig']['advertise']); // Modified: XoopsModules/fullcalendar/trunk/fullcalendar/language/english/admin.php =================================================================== --- XoopsModules/fullcalendar/trunk/fullcalendar/language/english/admin.php 2012-06-16 08:16:22 UTC (rev 9651) +++ XoopsModules/fullcalendar/trunk/fullcalendar/language/english/admin.php 2012-06-16 09:31:20 UTC (rev 9652) @@ -30,14 +30,16 @@ //Index define("_AM_FULLCALENDAR_EVENTS","Events Statistics"); define("_AM_FULLCALENDAR_THEREARE_EVENTS","There are <span class='bold'>%s</span> Events in the Database"); +define("_AM_FULLCALENDAR_THEREARE_EXPIRED_EVENTS","There are <span class='bold'>%s</span> Expired Events"); //Buttons define("_AM_FULLCALENDAR_NEWEVENT","Add New Event"); define("_AM_FULLCALENDAR_EVENTSLIST","List Events"); //General define("_AM_FULLCALENDAR_FORMOK","Registered successfull"); define("_AM_FULLCALENDAR_FORMDELOK","Deleted successfull"); -define("_AM_FULLCALENDAR_FORMSUREDEL", "Are you sure you want to delete: <b><span style='color : Red'>%s</span></b>"); -define("_AM_FULLCALENDAR_FORMSURERENEW", "Are you sure you want renew: <b><span style='color : Red'>%s</span></b>"); +define("_AM_FULLCALENDAR_FORMSUREDEL", "Are you sure you want to delete: <b><span style='color : Red'>%s</span></b>?"); + +define("_AM_FULLCALENDAR_FORMSURERENEW", "Are you sure you want renew: <b><span style='color : Red'>%s</span></b>?"); define("_AM_FULLCALENDAR_FORMUPLOAD","Upload"); define("_AM_FULLCALENDAR_FORMIMAGE_PATH","File presents in %s"); define("_AM_FULLCALENDAR_FORMACTION","Action"); @@ -45,15 +47,27 @@ define("_AM_FULLCALENDAR_ONLINE","Online"); define("_AM_FULLCALENDAR_OFFLINE","Offline"); -define("_AM_FULLCALENDAR_EVENT_ADD","Add event"); -define("_AM_FULLCALENDAR_EVENT_EDIT","Edit event"); -define("_AM_FULLCALENDAR_EVENT_DELETE","Delete event"); +define("_AM_FULLCALENDAR_EVENT_ADD","Add Event"); +define("_AM_FULLCALENDAR_EVENT_EDIT","Edit Event"); +define("_AM_FULLCALENDAR_EVENT_DELETE","Delete Event"); +define("_AM_FULLCALENDAR_PRUNEEVENTS","Delete Events"); +define("_AM_FULLCALENDAR_PRUNE_BEFORE","Delete Events Before"); +define("_AM_FULLCALENDAR_PRUNE_CAPTIONEXPIREDONLY","Expired Only"); +define("_AM_FULLCALENDAR_PRUNE_EXPIREDONLY","Remove only Events who have expired"); +define("_AM_FULLCALENDAR_PRUNE_EVENTS","Limit to the following Events"); +define("_AM_FULLCALENDAR_EXPORT_PRUNE_DSC","If you don't check anything then all the events will be used +else only the selected events will be used"); +define("_AM_FULLCALENDAR_PRUNE_CONFIRM", "Are you sure you want to delete all events before: <b><span style='color : Red'>%s</span></b>?"); +define("_AM_FULLCALENDAR_PRUNE_DELETED", "All events have been successfully deleted"); + define("_AM_FULLCALENDAR_EVENT_ID","Id"); define("_AM_FULLCALENDAR_EVENT_TITLE","Title"); define("_AM_FULLCALENDAR_EVENT_DESCRIPTION","Description"); define("_AM_FULLCALENDAR_EVENT_START","Start"); define("_AM_FULLCALENDAR_EVENT_END","End"); +define("_AM_FULLCALENDAR_EVENT_URL","Url"); +define("_AM_FULLCALENDAR_EVENT_ALLDAY","AllDay"); define("_AM_FULLCALENDAR_EVENT_WEIGHT","Weight"); define("_AM_FULLCALENDAR_EVENT_DISPLAY","Display"); //Blocks.php Modified: XoopsModules/fullcalendar/trunk/fullcalendar/language/english/modinfo.php =================================================================== --- XoopsModules/fullcalendar/trunk/fullcalendar/language/english/modinfo.php 2012-06-16 08:16:22 UTC (rev 9651) +++ XoopsModules/fullcalendar/trunk/fullcalendar/language/english/modinfo.php 2012-06-16 09:31:20 UTC (rev 9652) @@ -32,8 +32,9 @@ define("_MI_FULLCALENDAR_DESC","Fullcalendar is a module for write your events, based on jquery and jquery ui"); //Menu define("_MI_FULLCALENDAR_ADMENU1","Home"); -define("_MI_FULLCALENDAR_ADMENU2","Events"); -define("_MI_FULLCALENDAR_ADMENU3","About"); +define("_MI_FULLCALENDAR_ADMENU2","Manage Events"); +define("_MI_FULLCALENDAR_ADMENU3","Delete Events"); +define("_MI_FULLCALENDAR_ADMENU4","About"); //Blocks define("_MI_FULLCALENDAR_EVENTS_BLOCK_RECENT","events recents"); define("_MI_FULLCALENDAR_EVENTS_BLOCK_DAY","events d'aujourdh'ui"); Modified: XoopsModules/fullcalendar/trunk/fullcalendar/language/italian/admin.php =================================================================== --- XoopsModules/fullcalendar/trunk/fullcalendar/language/italian/admin.php 2012-06-16 08:16:22 UTC (rev 9651) +++ XoopsModules/fullcalendar/trunk/fullcalendar/language/italian/admin.php 2012-06-16 09:31:20 UTC (rev 9652) @@ -30,15 +30,16 @@ //Index define("_AM_FULLCALENDAR_EVENTS","Events Statistics"); define("_AM_FULLCALENDAR_THEREARE_EVENTS","There are <span class='bold'>%s</span> Events in the Database"); +define("_AM_FULLCALENDAR_THEREARE_EXPIRED_EVENTS","There are <span class='bold'>%s</span> Expired Events"); //Buttons define("_AM_FULLCALENDAR_NEWEVENT","Add New Event"); define("_AM_FULLCALENDAR_EVENTSLIST","List Events"); //General define("_AM_FULLCALENDAR_FORMOK","Registered successfull"); define("_AM_FULLCALENDAR_FORMDELOK","Deleted successfull"); -define("_AM_FULLCALENDAR_FORMSUREDEL", "Are you sure you want to delete: <b><span style='color : Red'>%s</span></b>"); +define("_AM_FULLCALENDAR_FORMSUREDEL", "Are you sure you want to delete: <b><span style='color : Red'>%s</span></b>?"); -define("_AM_FULLCALENDAR_FORMSURERENEW", "Are you sure you want renew: <b><span style='color : Red'>%s</span></b>"); +define("_AM_FULLCALENDAR_FORMSURERENEW", "Are you sure you want renew: <b><span style='color : Red'>%s</span></b>?"); define("_AM_FULLCALENDAR_FORMUPLOAD","Upload"); define("_AM_FULLCALENDAR_FORMIMAGE_PATH","File presents in %s"); define("_AM_FULLCALENDAR_FORMACTION","Action"); @@ -57,7 +58,7 @@ define("_AM_FULLCALENDAR_PRUNE_EVENTS","Limit to the following Events"); define("_AM_FULLCALENDAR_EXPORT_PRUNE_DSC","If you don't check anything then all the events will be used else only the selected events will be used"); -define("_AM_FULLCALENDAR_PRUNE_CONFIRM", "Are you sure you want to delete all events: <b><span style='color : Red'>%s</span></b>"); +define("_AM_FULLCALENDAR_PRUNE_CONFIRM", "Are you sure you want to delete all events before: <b><span style='color : Red'>%s</span></b>?"); define("_AM_FULLCALENDAR_PRUNE_DELETED", "All events have been successfully deleted"); define("_AM_FULLCALENDAR_EVENT_ID","Id"); @@ -65,6 +66,8 @@ define("_AM_FULLCALENDAR_EVENT_DESCRIPTION","Description"); define("_AM_FULLCALENDAR_EVENT_START","Start"); define("_AM_FULLCALENDAR_EVENT_END","End"); +define("_AM_FULLCALENDAR_EVENT_URL","Url"); +define("_AM_FULLCALENDAR_EVENT_ALLDAY","AllDay"); define("_AM_FULLCALENDAR_EVENT_WEIGHT","Weight"); define("_AM_FULLCALENDAR_EVENT_DISPLAY","Display"); //Blocks.php Modified: XoopsModules/fullcalendar/trunk/fullcalendar/sql/mysql.sql =================================================================== --- XoopsModules/fullcalendar/trunk/fullcalendar/sql/mysql.sql 2012-06-16 08:16:22 UTC (rev 9651) +++ XoopsModules/fullcalendar/trunk/fullcalendar/sql/mysql.sql 2012-06-16 09:31:20 UTC (rev 9652) @@ -7,8 +7,10 @@ `event_id` int (8) unsigned NOT NULL auto_increment, `event_title` varchar (255) NOT NULL default '', `event_description` tinytext NOT NULL, -`event_start` int(20) NOT NULL default '0', -`event_end` int(20) NOT NULL default '0', +`event_start` int(10) NOT NULL default '0', +`event_end` int(10) NOT NULL default '0', +`event_url` varchar (255) NOT NULL default '', +`event_allday` tinyint (1) unsigned NOT NULL default '0', `event_weight` int (11) unsigned NOT NULL default '0', `event_display` tinyint (1) unsigned NOT NULL default '0', PRIMARY KEY (`event_id`) Added: XoopsModules/fullcalendar/trunk/fullcalendar/style.css =================================================================== --- XoopsModules/fullcalendar/trunk/fullcalendar/style.css (rev 0) +++ XoopsModules/fullcalendar/trunk/fullcalendar/style.css 2012-06-16 09:31:20 UTC (rev 9652) @@ -0,0 +1,61 @@ +/** + * **************************************************************************** + * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org ) + * **************************************************************************** + * @copyright TXMod Xoops (Timgno) ( http://www.txmodxoops.org ) + * @license GNU GPL see License + * @since 2.5.0 + * @package barsocials & fbcomments + * @author TXMod Xoops (Timgno) ( su...@tx... ) + * + * Version : 1.01 Mon 2012/06/11 19:23:28 : Timgno Exp $ + * **************************************************************************** + */ +div#bar-social { + margin: 0; + padding: 0; + width: 100%; + height: auto; + border: 1px solid #eee; + clear: both; +} + +ul.style-social { + width: auto; + margin: 2px 0 2px 0; + z-index: 10; +} + +ul.style-social > li { + display: inline; + background-image: url('../img/postbullets.png'); + background-repeat: no-repeat; + vertical-align: top; + border-left: 1px solid #ddd; + padding-left: 13px; + height: 10px; +} + +li.fb-like, li.fb-bsend, li.gl-button, li.send-email, li.pin-it, li.linke-in, li.tw-tweets { + margin: 2px; + padding: 2px 0 2px 0; + width: auto; +} + +element.style { + height:20px; + width:90px; +} + +div#fb-comments { + margin: 0; + padding: 0; + width: 100%; + border: 1px solid #eee; + clear: both; +} + +div.fb-comments { + margin: 0; + padding: 0; +} \ No newline at end of file Modified: XoopsModules/fullcalendar/trunk/fullcalendar/xoops_version.php =================================================================== --- XoopsModules/fullcalendar/trunk/fullcalendar/xoops_version.php 2012-06-16 08:16:22 UTC (rev 9651) +++ XoopsModules/fullcalendar/trunk/fullcalendar/xoops_version.php 2012-06-16 09:31:20 UTC (rev 9652) @@ -107,7 +107,7 @@ $modversion["config"][$i]["description"] = "_MI_FULLCALENDAR_EDITOR_DESC"; $modversion["config"][$i]["formtype"] = "select"; $modversion["config"][$i]["valuetype"] = "text"; -$modversion["config"][$i]["default"] = "dhtmltextarea"; +$modversion["config"][$i]["default"] = "textarea"; $modversion["config"][$i]["options"] = XoopsLists::getEditorList(); $modversion["config"][$i]["category"] = "global"; $i++; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dh...@us...> - 2012-06-16 08:16:30
|
Revision: 9651 http://xoops.svn.sourceforge.net/xoops/?rev=9651&view=rev Author: dhcst Date: 2012-06-16 08:16:22 +0000 (Sat, 16 Jun 2012) Log Message: ----------- merge trunk from Mamba Modified Paths: -------------- XoopsModules/newbb/branches/alfred/newbb/admin/index.php XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block.php XoopsModules/newbb/branches/alfred/newbb/class/forum.php XoopsModules/newbb/branches/alfred/newbb/class/post.php XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt XoopsModules/newbb/branches/alfred/newbb/header.php XoopsModules/newbb/branches/alfred/newbb/include/images.php XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php XoopsModules/newbb/branches/alfred/newbb/language/english/main.php XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php XoopsModules/newbb/branches/alfred/newbb/language/german/main.php XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index_menu.html XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum_menu.html XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html XoopsModules/newbb/branches/alfred/newbb/viewforum.php Modified: XoopsModules/newbb/branches/alfred/newbb/admin/index.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-06-15 21:21:45 UTC (rev 9650) +++ XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-06-16 08:16:22 UTC (rev 9651) @@ -39,7 +39,7 @@ { if (empty($path)) return false; if (@is_writable($path)) { - $path_status = _AM_NEWBB_AVAILABLE; + $path_status = ""; } elseif (!@is_dir($path)) { $path_status = _AM_NEWBB_NOTAVAILABLE." <a href=index.php?op=createdir&path=$path>"._AM_NEWBB_CREATETHEDIR.'</a>'; } else { @@ -168,20 +168,15 @@ $indexAdmin->addInfoBox(_AM_NEWBB_REPORT) ; $indexAdmin->addInfoBoxLine(_AM_NEWBB_REPORT, "<infolabel>" ._AM_NEWBB_REPORT_PENDING.': %s' . "</infolabel>" , $report_handler->getCount(new Criteria("report_result", 0)), 'Green') ; $indexAdmin->addInfoBoxLine(_AM_NEWBB_REPORT, "<infolabel>" ._AM_NEWBB_REPORT_PROCESSED.': %s' . "</infolabel>" , $report_handler->getCount(new Criteria("report_result", 1)), 'Green') ; -/* - $temp1 = "<div style='padding: 8px;'>" . _AM_NEWBB_ATTACHPATH . ": "; - $path_status1 = newbb_admin_getPathStatus($attach_path); - - $temp2 = "<br />" . _AM_NEWBB_THUMBPATH . ": "; - $path_status2 = newbb_admin_getPathStatus($thumb_path); - - $indexAdmin->addConfigBoxLine($attach_path . ' (' . $path_status1 . ')', ''); - $indexAdmin->addConfigBoxLine($thumb_path . ' (' . $path_status2 . ')', ''); -*/ - foreach (array_keys( $folder) as $i) { - $indexAdmin->addConfigBoxLine($folder[$i], 'folder'); + + foreach (array_keys($folder) as $i) { + if (!(newbb_admin_getPathStatus($folder[$i])) == '') { + $indexAdmin->addConfigBoxLine($folder[$i] . ' ' . newbb_admin_getPathStatus($folder[$i]), 'folder'); + } else { + $indexAdmin->addConfigBoxLine($folder[$i], 'folder'); + } $indexAdmin->addConfigBoxLine(array($folder[$i], '755'), 'chmod'); - } + } echo $indexAdmin->addNavigation('index.php'); echo $indexAdmin->renderIndex(); Modified: XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block.php 2012-06-15 21:21:45 UTC (rev 9650) +++ XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block.php 2012-06-16 08:16:22 UTC (rev 9651) @@ -95,7 +95,7 @@ if (!empty($newbbConfig['do_rewrite'])) { include_once XOOPS_ROOT_PATH."/modules/newbb/seo_url.php"; } else { - if (!defined('SEO_MODULE_NAME')) define('SEO_MODULE_NAME', 'modules/newbb'); + if (!defined('REAL_MODULE_NAME')) define('REAL_MODULE_NAME', 'modules/newbb'); } $query = 'SELECT'. @@ -166,8 +166,8 @@ } $topic['topic_poster'] = $topic_poster; $topic['topic_page_jump'] = $topic_page_jump; - $seo_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'">'.$topic['title'].'</a>'; - $seo_forum_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>'; + $seo_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'">'.$topic['title'].'</a>'; + $seo_forum_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>'; if (!empty($newbbConfig['do_rewrite'])) { $topic['seo_url'] = seo_urls($seo_url); $topic['seo_forum_url'] = seo_urls($seo_forum_url); @@ -179,11 +179,11 @@ $block['topics'][] = $topic; unset($topic); } - $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>'; + $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>'; $block['seo_top_allforums'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums; - $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/list.topic.php">'._MB_NEWBB_ALLTOPICS.'</a>'; + $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/list.topic.php">'._MB_NEWBB_ALLTOPICS.'</a>'; $block['seo_top_alltopics'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums; - $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>'; + $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>'; $block['seo_top_allposts'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums; $block['indexNav'] = intval($options[4]); @@ -243,7 +243,7 @@ if (!empty($newbbConfig['do_rewrite'])) { include_once XOOPS_ROOT_PATH."/modules/newbb/seo_url.php"; } else { - if (!defined('SEO_MODULE_NAME')) define('SEO_MODULE_NAME', 'modules/newbb'); + if (!defined('REAL_MODULE_NAME')) define('REAL_MODULE_NAME', 'modules/newbb'); } if (!isset($access_forums)) { @@ -322,8 +322,8 @@ } $topic['topic_poster'] = $topic_poster; $topic['topic_page_jump'] = $topic_page_jump; - $seo_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?topic_id='.$topic['id'].'">'.$topic['title'].'</a>'; - $seo_forum_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>'; + $seo_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewtopic.php?topic_id='.$topic['id'].'">'.$topic['title'].'</a>'; + $seo_forum_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>'; if (!empty($newbbConfig['do_rewrite'])) { $topic['seo_url'] = seo_urls($seo_url); @@ -336,9 +336,9 @@ $block['topics'][] = $topic; unset($topic); } - $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>'; + $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>'; $block['seo_top_allforums'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums; - $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>'; + $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>'; $block['seo_top_allposts'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums; $block['indexNav'] = intval($options[4]); @@ -394,7 +394,7 @@ if (!empty($newbbConfig['do_rewrite'])) { include_once XOOPS_ROOT_PATH."/modules/newbb/seo_url.php"; } else { - if (!defined('SEO_MODULE_NAME')) define('SEO_MODULE_NAME', 'modules/newbb'); + if (!defined('REAL_MODULE_NAME')) define('REAL_MODULE_NAME', 'modules/newbb'); } if (!empty($options[6])) { @@ -475,8 +475,8 @@ $topic['post_text'] = $post_text; } - $seo_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'">'.$topic['title'].'</a>'; - $seo_forum_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>'; + $seo_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'">'.$topic['title'].'</a>'; + $seo_forum_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>'; if (!empty($newbbConfig['do_rewrite'])) { $topic['seo_url'] = seo_urls($seo_url); @@ -490,9 +490,9 @@ $block['topics'][] = $topic; unset($topic); } - $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>'; + $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>'; $block['seo_top_allforums'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums; - $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>'; + $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>'; $block['seo_top_allposts'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums; $block['indexNav'] = intval($options[4]); Modified: XoopsModules/newbb/branches/alfred/newbb/class/forum.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-06-15 21:21:45 UTC (rev 9650) +++ XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-06-16 08:16:22 UTC (rev 9651) @@ -404,7 +404,8 @@ 'type_id' => $myrow['type_id'], 'type_text' => $topic_prefix, 'topic_title' => $topic_title, - 'topic_link' => XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $myrow['topic_id'], + //'topic_link' => XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $myrow['topic_id'], + 'topic_link' => 'viewtopic.php?topic_id=' . $myrow['topic_id'], 'rating_img' => $rating_img, 'topic_page_jump' => $topic_page_jump, 'topic_page_jump_icon' => $topic_page_jump_icon, Modified: XoopsModules/newbb/branches/alfred/newbb/class/post.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-06-15 21:21:45 UTC (rev 9650) +++ XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-06-16 08:16:22 UTC (rev 9651) @@ -497,7 +497,12 @@ $thread_action['social_facebook']['image'] = newbb_displayImage('facebook', _MD_SHARE_FACEBOOK); $thread_action['social_facebook']['link'] = "http://www.facebook.com/sharer.php?u=".$full_link; $thread_action['social_facebook']['name'] = _MD_SHARE_FACEBOOK; - $thread_action['social_facebook']['target'] = '_blank'; + $thread_action['social_facebook']['target'] = '_blank'; + + $thread_action['social_gplus']['image'] = newbb_displayImage('googleplus', _MD_SHARE_GOOGLEPLUS); + $thread_action['social_gplus']['link'] = "https://plusone.google.com/_/+1/confirm?hl=en&url=".$full_link; + $thread_action['social_gplus']['name'] = _MD_SHARE_GOOGLEPLUS; + $thread_action['social_gplus']['target'] = '_blank'; $thread_action['social_linkedin']['image'] = newbb_displayImage('linkedin', _MD_SHARE_LINKEDIN); $thread_action['social_linkedin']['link'] = "http://www.linkedin.com/shareArticle?mini=true&title=".$full_title."&url=".$full_link; Modified: XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-06-15 21:21:45 UTC (rev 9650) +++ XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-06-16 08:16:22 UTC (rev 9651) @@ -1,6 +1,6 @@ newBB Changelog 4.3 -03/17/2012 +06/16/2012 =========================================== 1 Fix Cache Config for SEO 2 Fix Typos in templates @@ -15,6 +15,9 @@ 11 New cache for Seo 12 New Social-Links in Threads 13 New advertising for topics +14 Fix Replaced Buzz with Google Plus (mamba) +15 Fix Added "Create" links for missing directories (mamba) +16 Fix Link to Blank.gif newBB Changelog 4.2 Modified: XoopsModules/newbb/branches/alfred/newbb/header.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/header.php 2012-06-15 21:21:45 UTC (rev 9650) +++ XoopsModules/newbb/branches/alfred/newbb/header.php 2012-06-16 08:16:22 UTC (rev 9651) @@ -18,7 +18,7 @@ if(((strpos(getenv('REQUEST_URI'), '.html') === false) && !empty($xoopsModuleConfig['do_rewrite']) && (!isset($_POST) || count($_POST) <= 0))) { $redir = false; - if ( strpos(getenv("REQUEST_URI"),"index.php?mark_read=") == true || strpos(getenv("REQUEST_URI"),"mark=") == true) { + if ( strpos(getenv("REQUEST_URI"),"mark_read=") == true || strpos(getenv("REQUEST_URI"),"mark=") == true) { // Mark Forums } else { if ( in_array(basename(getenv('SCRIPT_NAME')),$toseo_url) ) { Modified: XoopsModules/newbb/branches/alfred/newbb/include/images.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/include/images.php 2012-06-15 21:21:45 UTC (rev 9650) +++ XoopsModules/newbb/branches/alfred/newbb/include/images.php 2012-06-16 08:16:22 UTC (rev 9651) @@ -72,7 +72,7 @@ $forumImage['facebook'] = $forumImage['twitter'] = $forumImage['linkedin'] = -$forumImage['buzz'] = +$forumImage['googleplus'] = $forumImage['stumbleupon'] = $forumImage['friendfeed'] = $forumImage['digg'] = Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-06-15 21:21:45 UTC (rev 9650) +++ XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-06-16 08:16:22 UTC (rev 9651) @@ -53,7 +53,7 @@ define('_AM_NEWBB_GDLIB2','GD2 library:'); define('_AM_NEWBB_AUTODETECTED','Autodetected: '); define('_AM_NEWBB_AVAILABLE','Available'); -define('_AM_NEWBB_NOTAVAILABLE','<font color="red">Not available</font>'); +define('_AM_NEWBB_NOTAVAILABLE','<font color="red">is not available. </font>'); define('_AM_NEWBB_NOTWRITABLE','<font color="red">Not writable</font>'); define('_AM_NEWBB_IMAGEMAGICK','ImageMagicK:'); define('_AM_NEWBB_IMAGEMAGICK_NOTSET','Not set'); Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/main.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-06-15 21:21:45 UTC (rev 9650) +++ XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-06-16 08:16:22 UTC (rev 9651) @@ -467,7 +467,7 @@ define("_MD_ADVERTISING_USER","Advertisement"); define('_MD_SHARE_FACEBOOK', "Facebook"); define('_MD_SHARE_TWITTER', "Twitter"); -define('_MD_SHARE_BUZZ', "Google Buzz"); +define('_MD_SHARE_GOOGLEPLUS', "Google Plus"); define('_MD_SHARE_LINKEDIN', "Linkedin"); define('_MD_SHARE_STUMBLEUPON', "Stumbleupon"); define('_MD_SHARE_FRIENDFEED', "FriendFeed"); Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php 2012-06-15 21:21:45 UTC (rev 9650) +++ XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php 2012-06-16 08:16:22 UTC (rev 9651) @@ -256,4 +256,7 @@ define("_MI_ADVERTISING_DESC","shows a commercial break after the 2nd Thread"); define("_MI_USERATTACH_ENABLE","Display attachments only for registered users"); define("_MI_USERATTACH_DESC","shows attachments in the forum only after logging in."); + +define("_MI_MAX_IMG_HEIGHT","Maximum height of an image"); +define("_MI_MAX_IMG_HEIGHT_DESC", "Sets the maximum allowed height of an uploaded image."); ?> \ No newline at end of file Modified: XoopsModules/newbb/branches/alfred/newbb/language/german/main.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-06-15 21:21:45 UTC (rev 9650) +++ XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-06-16 08:16:22 UTC (rev 9651) @@ -472,7 +472,7 @@ define("_MD_ADVERTISING_USER","Werbung"); define('_MD_SHARE_FACEBOOK', "Facebook"); define('_MD_SHARE_TWITTER', "Twitter"); -define('_MD_SHARE_BUZZ', "Google Buzz"); +define('_MD_SHARE_GOOGLEPLUS', "Google Plus"); define('_MD_SHARE_LINKEDIN', "Linkedin"); define('_MD_SHARE_STUMBLEUPON', "Stumbleupon"); define('_MD_SHARE_FRIENDFEED', "FriendFeed"); Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html 2012-06-15 21:21:45 UTC (rev 9650) +++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html 2012-06-16 08:16:22 UTC (rev 9651) @@ -26,9 +26,9 @@ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/index.php" target="_self" title="<{$smarty.const._MD_ADMINCP}>"><{$smarty.const._MD_ADMINCP}></a> </div> <div style="clear:both;"></div> - </div> - <br style="clear: both;" /> + </div> <{/if}> +<br style="clear: both;" /> <div class="dropdown"> <{includeq file="db:newbb_index_menu.html"}> </div> @@ -301,8 +301,8 @@ <span style="padding: 2px;"><{$online.statistik}></span> <strong><{$smarty.const._MD_NEWBB_STATS}></strong> </div> - <div style="clear:both;"></div> - <div class="forum_stats odd" style="padding: 3px; line-height: 150%;"> + + <div class="forum_stats odd" style="padding: 5px; line-height: 150%;"> <div class="forum_stats_left odd"> <{$currenttime}><br /> <{$smarty.const._MD_TOTALTOPICSC}> @@ -329,7 +329,7 @@ </div> <br style="clear:both;"/> <{/if}> - +<br style="clear: both;" /> <{if $online}> <{includeq file="db:newbb_online.html"}> <{/if}> Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index_menu.html =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index_menu.html 2012-06-15 21:21:45 UTC (rev 9650) +++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index_menu.html 2012-06-16 08:16:22 UTC (rev 9651) @@ -1,6 +1,5 @@ <select name="mainoption" id="mainoption" - class="menu" onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.document.location=this.options[this.selectedIndex].value;}" > <option value=""><{$smarty.const._MD_MAINFORUMOPT}></option> Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html 2012-06-15 21:21:45 UTC (rev 9650) +++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html 2012-06-16 08:16:22 UTC (rev 9651) @@ -63,7 +63,7 @@ </div> <{else}> <div class="right" style="padding: 5px;"> - <{$forum_addpoll}> <{$forum_post_or_register}> + <{$forum_post_or_register}> </div> <{/if}> <div class="clear"></div> @@ -134,7 +134,7 @@ <{/if}> </td> <td width="4%" align="center"><{$topic.topic_icon}></td> - <td> <a href="<{$topic.topic_link}>" title="<{$topic.topic_excerpt}>"> + <td> <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/<{$topic.topic_link}>" title="<{$topic.topic_excerpt}>"> <{$topic.topic_title}></a><{$topic.attachment}> <{$topic.topic_page_jump}> </td> <td align="center" valign="middle"><{$topic.topic_poster}></td> Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum_menu.html =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum_menu.html 2012-06-15 21:21:45 UTC (rev 9650) +++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum_menu.html 2012-06-16 08:16:22 UTC (rev 9651) @@ -1,6 +1,6 @@ <select name="forumoption" id="forumoption" - class="menu" onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.location=this.options[this.selectedIndex].value;}" + onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.location=this.options[this.selectedIndex].value;}" > <option value=""><{$smarty.const._MD_FORUMOPTION}></option> <option value="<{$mark_read}>"><{$smarty.const._MD_MARK_ALL_TOPICS}> <{$smarty.const._MD_MARK_READ}></option> @@ -17,7 +17,7 @@ <{if $type_options}> <select name="type" id="type" - class="menu" onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.location=this.options[this.selectedIndex].value;}" + onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.location=this.options[this.selectedIndex].value;}" > <option value=""><{$smarty.const._MD_NEWBB_TYPE}></option> <{foreachq item=opt from=$type_options}> Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html 2012-06-15 21:21:45 UTC (rev 9650) +++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html 2012-06-16 08:16:22 UTC (rev 9651) @@ -100,7 +100,7 @@ <div> <div class="dropdown"> - <select name="topicoption" id="topicoption" class="menu" onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.document.location=this.options[this.selectedIndex].value;}" + <select name="topicoption" id="topicoption" onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.document.location=this.options[this.selectedIndex].value;}" > <option value=""><{$smarty.const._MD_TOPICOPTION}></option> <{if $viewer_level gt 1}> @@ -120,7 +120,6 @@ <{if $rating_enable}> <select name="rate" id="rate" - class="menu" onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.document.location=this.options[this.selectedIndex].value;}" > <option value=""><{$smarty.const._MD_RATE}></option> @@ -134,7 +133,7 @@ <select name="viewmode" id="viewmode" - class="menu" onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.location=this.options[this.selectedIndex].value;}" + onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.location=this.options[this.selectedIndex].value;}" > <option value=""><{$smarty.const._MD_VIEWMODE}></option> <{foreachq item=act from=$viewmode_options}> Modified: XoopsModules/newbb/branches/alfred/newbb/viewforum.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/viewforum.php 2012-06-15 21:21:45 UTC (rev 9650) +++ XoopsModules/newbb/branches/alfred/newbb/viewforum.php 2012-06-16 08:16:22 UTC (rev 9651) @@ -92,7 +92,7 @@ if ($forum_handler->getPermission($forum_obj, "post")) { $xoopsTpl->assign('forum_post_or_register', "<a href=\"".XOOPS_URL."/modules/newbb/newtopic.php?forum={$forum_id}\">".newbb_displayImage('t_new', _MD_POSTNEW)."</a>"); - if ($forum_handler->getPermission($forum_obj, "addpoll")) { + if ($forum_handler->getPermission($forum_obj, "addpoll") && $pollmodules) { $t_poll = newbb_displayImage('t_poll',_MD_ADDPOLL); $xoopsTpl->assign('forum_addpoll', "<a href=\"".XOOPS_URL."/modules/newbb/newtopic.php?op=add&forum={$forum_id}\">{$t_poll}</a>"); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dh...@us...> - 2012-06-15 21:21:52
|
Revision: 9650 http://xoops.svn.sourceforge.net/xoops/?rev=9650&view=rev Author: dhcst Date: 2012-06-15 21:21:45 +0000 (Fri, 15 Jun 2012) Log Message: ----------- Update Modified Paths: -------------- XoopsModules/newbb/branches/alfred/newbb/admin/index.php XoopsModules/newbb/branches/alfred/newbb/class/post.php XoopsModules/newbb/branches/alfred/newbb/class/user.php XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt XoopsModules/newbb/branches/alfred/newbb/include/images.php XoopsModules/newbb/branches/alfred/newbb/index.php XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php XoopsModules/newbb/branches/alfred/newbb/language/english/main.php XoopsModules/newbb/branches/alfred/newbb/language/german/main.php XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html XoopsModules/newbb/branches/alfred/newbb/viewtopic.php XoopsModules/newbb/branches/alfred/newbb/xoops_version.php Added Paths: ----------- XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/buzz.png Modified: XoopsModules/newbb/branches/alfred/newbb/admin/index.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-06-15 10:14:28 UTC (rev 9649) +++ XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-06-15 21:21:45 UTC (rev 9650) @@ -39,7 +39,7 @@ { if (empty($path)) return false; if (@is_writable($path)) { - $path_status = '';// directory available; + $path_status = _AM_NEWBB_AVAILABLE; } elseif (!@is_dir($path)) { $path_status = _AM_NEWBB_NOTAVAILABLE." <a href=index.php?op=createdir&path=$path>"._AM_NEWBB_CREATETHEDIR.'</a>'; } else { @@ -168,21 +168,25 @@ $indexAdmin->addInfoBox(_AM_NEWBB_REPORT) ; $indexAdmin->addInfoBoxLine(_AM_NEWBB_REPORT, "<infolabel>" ._AM_NEWBB_REPORT_PENDING.': %s' . "</infolabel>" , $report_handler->getCount(new Criteria("report_result", 0)), 'Green') ; $indexAdmin->addInfoBoxLine(_AM_NEWBB_REPORT, "<infolabel>" ._AM_NEWBB_REPORT_PROCESSED.': %s' . "</infolabel>" , $report_handler->getCount(new Criteria("report_result", 1)), 'Green') ; +/* + $temp1 = "<div style='padding: 8px;'>" . _AM_NEWBB_ATTACHPATH . ": "; + $path_status1 = newbb_admin_getPathStatus($attach_path); + + $temp2 = "<br />" . _AM_NEWBB_THUMBPATH . ": "; + $path_status2 = newbb_admin_getPathStatus($thumb_path); + + $indexAdmin->addConfigBoxLine($attach_path . ' (' . $path_status1 . ')', ''); + $indexAdmin->addConfigBoxLine($thumb_path . ' (' . $path_status2 . ')', ''); +*/ + foreach (array_keys( $folder) as $i) { + $indexAdmin->addConfigBoxLine($folder[$i], 'folder'); + $indexAdmin->addConfigBoxLine(array($folder[$i], '755'), 'chmod'); + } - - foreach (array_keys($folder) as $i) { - if (!(newbb_admin_getPathStatus($folder[$i])) == '') { - $indexAdmin->addConfigBoxLine($folder[$i] . ' ' . newbb_admin_getPathStatus($folder[$i]), 'folder'); - } else { - $indexAdmin->addConfigBoxLine($folder[$i], 'folder'); - } - $indexAdmin->addConfigBoxLine(array($folder[$i], '755'), 'chmod'); - } - - echo $indexAdmin->addNavigation('index.php'); - echo $indexAdmin->renderIndex(); - - } else { + echo $indexAdmin->addNavigation('index.php'); + echo $indexAdmin->renderIndex(); + + } else { // loadModuleAdminMenu(0, _MI_NEWBB_ADMENU_INDEX); Modified: XoopsModules/newbb/branches/alfred/newbb/class/post.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-06-15 10:14:28 UTC (rev 9649) +++ XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-06-15 21:21:45 UTC (rev 9650) @@ -497,13 +497,8 @@ $thread_action['social_facebook']['image'] = newbb_displayImage('facebook', _MD_SHARE_FACEBOOK); $thread_action['social_facebook']['link'] = "http://www.facebook.com/sharer.php?u=".$full_link; $thread_action['social_facebook']['name'] = _MD_SHARE_FACEBOOK; - $thread_action['social_facebook']['target'] = '_blank'; - - $thread_action['social_gplus']['image'] = newbb_displayImage('googleplus', _MD_SHARE_GOOGLEPLUS); - $thread_action['social_gplus']['link'] = "https://plusone.google.com/_/+1/confirm?hl=en&url=".$full_link; - $thread_action['social_gplus']['name'] = _MD_SHARE_GOOGLEPLUS; - $thread_action['social_gplus']['target'] = '_blank'; - + $thread_action['social_facebook']['target'] = '_blank'; + $thread_action['social_linkedin']['image'] = newbb_displayImage('linkedin', _MD_SHARE_LINKEDIN); $thread_action['social_linkedin']['link'] = "http://www.linkedin.com/shareArticle?mini=true&title=".$full_title."&url=".$full_link; $thread_action['social_linkedin']['name'] = _MD_SHARE_LINKEDIN; Modified: XoopsModules/newbb/branches/alfred/newbb/class/user.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/class/user.php 2012-06-15 10:14:28 UTC (rev 9649) +++ XoopsModules/newbb/branches/alfred/newbb/class/user.php 2012-06-15 21:21:45 UTC (rev 9650) @@ -77,10 +77,10 @@ return $level; } -class User { +class newbbUser { var $user = null; - - function user() + + function User() { } @@ -213,7 +213,7 @@ if (class_exists("User_language")) { $handler = new User_language(); } else { - $handler = new User(); + $handler = new newbbUser(); } foreach (array_keys($this->users) as $uid) { $this->userlist[$uid] = $handler->getInfo($this->users[$uid]); @@ -283,7 +283,7 @@ $ranks[$myrow['rank_id']] = $myrow; $ranks[$myrow['rank_id']]["rank_title"] = $myts->htmlspecialchars($ranks[$myrow['rank_id']]["rank_title"]); if (!empty($ranks[$myrow['rank_id']]['rank_image'])) { - $ranks[$myrow['rank_id']]['rank_image'] = "<img src='" . XOOPS_UPLOAD_URL . "/" . htmlspecialchars($ranks[$myrow['rank_id']]['rank_image'], ENT_QUOTES) . "' alt='' />"; + $ranks[$myrow['rank_id']]['rank_image'] = "<img src='" . XOOPS_UPLOAD_URL . "/ranks/" . htmlspecialchars($ranks[$myrow['rank_id']]['rank_image'], ENT_QUOTES) . "' alt='' />"; } } Modified: XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-06-15 10:14:28 UTC (rev 9649) +++ XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-06-15 21:21:45 UTC (rev 9650) @@ -15,11 +15,7 @@ 11 New cache for Seo 12 New Social-Links in Threads 13 New advertising for topics -14 Fix Replaced Buzz with Google Plus (mamba) -15 Fix Added "Create" links for missing directories (mamba) -16 Fix Link to Blank.gif - newBB Changelog 4.2 02/08/2012 Modified: XoopsModules/newbb/branches/alfred/newbb/include/images.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/include/images.php 2012-06-15 10:14:28 UTC (rev 9649) +++ XoopsModules/newbb/branches/alfred/newbb/include/images.php 2012-06-15 21:21:45 UTC (rev 9650) @@ -72,7 +72,7 @@ $forumImage['facebook'] = $forumImage['twitter'] = $forumImage['linkedin'] = -$forumImage['googleplus'] = +$forumImage['buzz'] = $forumImage['stumbleupon'] = $forumImage['friendfeed'] = $forumImage['digg'] = Modified: XoopsModules/newbb/branches/alfred/newbb/index.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/index.php 2012-06-15 10:14:28 UTC (rev 9649) +++ XoopsModules/newbb/branches/alfred/newbb/index.php 2012-06-15 21:21:45 UTC (rev 9650) @@ -53,7 +53,7 @@ /* rss feed */ if (!empty($xoopsModuleConfig['rss_enable'])) { $xoops_module_header .= ' - <link rel="alternate" type="application/rss+xml" title="'.$xoopsModule->getVar('name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/rss.php" /> + <link rel="alternate" type="application/rss+xml" title="'.$xoopsModule->getVar('name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/rss.php" /> '; } Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-06-15 10:14:28 UTC (rev 9649) +++ XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-06-15 21:21:45 UTC (rev 9650) @@ -53,7 +53,7 @@ define('_AM_NEWBB_GDLIB2','GD2 library:'); define('_AM_NEWBB_AUTODETECTED','Autodetected: '); define('_AM_NEWBB_AVAILABLE','Available'); -define('_AM_NEWBB_NOTAVAILABLE','<font color="red">is not available. </font>'); +define('_AM_NEWBB_NOTAVAILABLE','<font color="red">Not available</font>'); define('_AM_NEWBB_NOTWRITABLE','<font color="red">Not writable</font>'); define('_AM_NEWBB_IMAGEMAGICK','ImageMagicK:'); define('_AM_NEWBB_IMAGEMAGICK_NOTSET','Not set'); Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/main.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-06-15 10:14:28 UTC (rev 9649) +++ XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-06-15 21:21:45 UTC (rev 9650) @@ -467,7 +467,7 @@ define("_MD_ADVERTISING_USER","Advertisement"); define('_MD_SHARE_FACEBOOK', "Facebook"); define('_MD_SHARE_TWITTER', "Twitter"); -define('_MD_SHARE_GOOGLEPLUS', "Google Plus"); +define('_MD_SHARE_BUZZ', "Google Buzz"); define('_MD_SHARE_LINKEDIN', "Linkedin"); define('_MD_SHARE_STUMBLEUPON', "Stumbleupon"); define('_MD_SHARE_FRIENDFEED', "FriendFeed"); Modified: XoopsModules/newbb/branches/alfred/newbb/language/german/main.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-06-15 10:14:28 UTC (rev 9649) +++ XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-06-15 21:21:45 UTC (rev 9650) @@ -472,7 +472,7 @@ define("_MD_ADVERTISING_USER","Werbung"); define('_MD_SHARE_FACEBOOK', "Facebook"); define('_MD_SHARE_TWITTER', "Twitter"); -define('_MD_SHARE_GOOGLEPLUS', "Google Plus"); +define('_MD_SHARE_BUZZ', "Google Buzz"); define('_MD_SHARE_LINKEDIN', "Linkedin"); define('_MD_SHARE_STUMBLEUPON', "Stumbleupon"); define('_MD_SHARE_FRIENDFEED', "FriendFeed"); Added: XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/buzz.png =================================================================== (Binary files differ) Property changes on: XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/buzz.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html 2012-06-15 10:14:28 UTC (rev 9649) +++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html 2012-06-15 21:21:45 UTC (rev 9650) @@ -27,8 +27,8 @@ </div> <div style="clear:both;"></div> </div> + <br style="clear: both;" /> <{/if}> -<br style="clear: both;" /> <div class="dropdown"> <{includeq file="db:newbb_index_menu.html"}> </div> @@ -64,11 +64,11 @@ <{if $category.forums}> <tr class="head" align="center"> <td width="5%"> </td> - <{if $subforum_display == "expand"}> - <td colspan="2" width="37%" nowrap="nowrap" align="left"><{$smarty.const._MD_FORUM}></td> - <{else}> - <td width="37%" nowrap="nowrap" align="left"><{$smarty.const._MD_FORUM}></td> - <{/if}> + <{if $subforum_display == "expand"}> + <td colspan="2" width="37%" nowrap="nowrap" align="left"><{$smarty.const._MD_FORUM}></td> + <{else}> + <td width="37%" nowrap="nowrap" align="left"><{$smarty.const._MD_FORUM}></td> + <{/if}> <td width="9%" nowrap="nowrap"><{$smarty.const._MD_TOPICS}></td> <td width="9%" nowrap="nowrap"><{$smarty.const._MD_POSTS}></td> <td width="40%" nowrap="nowrap"><{$smarty.const._MD_LASTPOST}></td> @@ -269,11 +269,12 @@ </div> <{/foreach}> <!-- end forum categories --> -<div> +</div> <div style="float: left; text-align: left;"> <{$img_forum_new}> = <{$smarty.const._MD_NEWPOSTS}><br /> <{$img_forum}> = <{$smarty.const._MD_NONEWPOSTS}><br /> </div> +<br style="clear:both;"/> <div style="float: right; text-align: right;"> <form action="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php" method="post" name="search" id="search"> <input name="term" id="term" type="text" size="20" /> @@ -300,7 +301,8 @@ <span style="padding: 2px;"><{$online.statistik}></span> <strong><{$smarty.const._MD_NEWBB_STATS}></strong> </div> - <div class="forum_stats odd" style="padding: 5px; line-height: 150%;"> + <div style="clear:both;"></div> + <div class="forum_stats odd" style="padding: 3px; line-height: 150%;"> <div class="forum_stats_left odd"> <{$currenttime}><br /> <{$smarty.const._MD_TOTALTOPICSC}> @@ -325,9 +327,9 @@ </div> </div> </div> + <br style="clear:both;"/> <{/if}> -<br style="clear:both;"/> <{if $online}> <{includeq file="db:newbb_online.html"}> <{/if}> Modified: XoopsModules/newbb/branches/alfred/newbb/viewtopic.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/viewtopic.php 2012-06-15 10:14:28 UTC (rev 9649) +++ XoopsModules/newbb/branches/alfred/newbb/viewtopic.php 2012-06-15 21:21:45 UTC (rev 9650) @@ -44,6 +44,7 @@ } $page_query = htmlspecialchars(implode("&", array_values($query_array))); unset($query_array); + $topic_id = isset($_GET['topic_id']) ? intval($_GET['topic_id']) : 0; $post_id = !empty($_GET['post_id']) ? intval($_GET['post_id']) : 0; $forum_id = !empty($_GET['forum']) ? intval($_GET['forum']) : 0; @@ -60,6 +61,7 @@ $order = ($xoopsConfig['com_order']==1) ? 'DESC' : 'ASC'; } } + if ( !$topic_id && !$post_id ) { $redirect = empty($forum_id) ? XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/index.php" : XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/viewforum.php?forum={$forum_id}"; redirect_header($redirect, 2, _MD_ERRORTOPIC); @@ -113,7 +115,7 @@ $xoopsOption['template_main'] = 'newbb_viewtopic.html'; $postsArray = $topic_handler->getAllPosts($topic_obj, $order, $xoopsModuleConfig['posts_per_page'], $start, $post_id, $status); -//Threadersteller z\xE4hlt nicht +//Threadersteller zählt nicht if (!$xoopsUser || ($xoopsUser->getVar('uid') != $topic_obj->getVar('topic_poster')) ) { $topic_obj->incrementCounter(); } @@ -197,13 +199,14 @@ $viewtopic_users = array(); if (count($userid_array) > 0) { - require XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname", "n")."/class/user.php"; + require XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname", "n")."/class/user.php"; $user_handler = new NewbbUserHandler($xoopsModuleConfig['groupbar_enabled'], $xoopsModuleConfig['wol_enabled']); $user_handler->users = $users; $user_handler->online = $online; $viewtopic_users = $user_handler->getUsers(); } unset($users); + if ($xoopsModuleConfig['allow_require_reply'] && $require_reply) { if (!empty($xoopsModuleConfig['cache_enabled'])) { $viewtopic_posters = newbb_getsession("t".$topic_id, true); @@ -217,7 +220,8 @@ } else { $viewtopic_posters =array(); } -if ($xoopsModuleConfig['advertising']) { + +if ($xoopsModuleConfig['show_advertising']) { $i=0; $rank = xoops_getrank(); $image = @@ -241,7 +245,7 @@ ); } foreach ($postsArray as $eachpost) { - if ($xoopsModuleConfig['advertising']) { + if ($xoopsModuleConfig['show_advertising']) { if ($i == 2) $xoopsTpl->append('topic_posts', $post_werbung); $i++; } @@ -290,6 +294,7 @@ unset($postsArray); $xoopsTpl->assign('topic_print_link', "print.php?form=1&{$page_query}"); + $admin_actions = array(); $ad_merge = ""; Modified: XoopsModules/newbb/branches/alfred/newbb/xoops_version.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/xoops_version.php 2012-06-15 10:14:28 UTC (rev 9649) +++ XoopsModules/newbb/branches/alfred/newbb/xoops_version.php 2012-06-15 21:21:45 UTC (rev 9650) @@ -508,6 +508,7 @@ _MI_NEWBB_INFOBOX_SHOW => 2 ) ); + $modversion['config'][] = array( 'name' => 'show_sociallinks', 'title' => '_MI_SHOW_SOCIALLINKS', @@ -515,16 +516,15 @@ 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 1); - + $modversion['config'][] = array( - 'name' => 'advertising', + 'name' => 'show_advertising', 'title' => '_MI_ADVERTISING', 'description' => '_MI_ADVERTISING_DESC', 'formtype' => 'yesno', 'valuetype' => 'int', - 'default' => 0); + 'default' => 0); - $modversion['config'][] = array( 'name' => 'show_jump', 'title' => '_MI_SHOW_JUMPBOX', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dh...@us...> - 2012-06-15 10:14:37
|
Revision: 9649 http://xoops.svn.sourceforge.net/xoops/?rev=9649&view=rev Author: dhcst Date: 2012-06-15 10:14:28 +0000 (Fri, 15 Jun 2012) Log Message: ----------- fix path in admin to smilies and ranks Modified Paths: -------------- XoopsCore/trunk/htdocs/modules/system/admin/smilies/main.php XoopsCore/trunk/htdocs/modules/system/admin/userrank/main.php Modified: XoopsCore/trunk/htdocs/modules/system/admin/smilies/main.php =================================================================== --- XoopsCore/trunk/htdocs/modules/system/admin/smilies/main.php 2012-06-15 10:10:24 UTC (rev 9648) +++ XoopsCore/trunk/htdocs/modules/system/admin/smilies/main.php 2012-06-15 10:14:28 UTC (rev 9649) @@ -82,7 +82,7 @@ $smilies['emotion'] = $smilies_arr[$i]->getVar("emotion"); $smilies['display'] = $smilies_arr[$i]->getVar("display"); $smilies_img = ($smilies_arr[$i]->getVar("smile_url")) ? $smilies_arr[$i]->getVar("smile_url") : 'blank.gif'; - $smilies['image'] = '<img src="' . XOOPS_UPLOAD_URL . '/' . $smilies_img . '" alt="" />'; + $smilies['image'] = '<img src="' . XOOPS_UPLOAD_URL . '/smilies/' . $smilies_img . '" alt="" />'; $smilies['edit_delete'] = '<a href="admin.php?fct=smilies&op=edit_smilie&smilies_id=' . $smilies_id . '"> <img src="./images/icons/edit.png" border="0" alt="' . _AM_SYSTEM_SMILIES_EDIT . '" title="' . _AM_SYSTEM_SMILIES_EDIT . '"></a> <a href="admin.php?fct=smilies&op=smilies_delete&smilies_id=' . $smilies_id . '"> Modified: XoopsCore/trunk/htdocs/modules/system/admin/userrank/main.php =================================================================== --- XoopsCore/trunk/htdocs/modules/system/admin/userrank/main.php 2012-06-15 10:10:24 UTC (rev 9648) +++ XoopsCore/trunk/htdocs/modules/system/admin/userrank/main.php 2012-06-15 10:14:28 UTC (rev 9649) @@ -87,7 +87,7 @@ $userrank['rank_max'] = $userrank_arr[$i]->getVar("rank_max"); $userrank['rank_special'] = $userrank_arr[$i]->getVar("rank_special"); $rank_img = ($userrank_arr[$i]->getVar("rank_image")) ? $userrank_arr[$i]->getVar("rank_image") : 'blank.gif'; - $userrank['rank_image'] = '<img src="'.XOOPS_UPLOAD_URL.'/'.$rank_img.'" alt="" />'; + $userrank['rank_image'] = '<img src="'.XOOPS_UPLOAD_URL.'/ranks/'.$rank_img.'" alt="" />'; $xoopsTpl->append_by_ref( 'userrank', $userrank ); unset( $userrank ); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dh...@us...> - 2012-06-15 10:10:35
|
Revision: 9648 http://xoops.svn.sourceforge.net/xoops/?rev=9648&view=rev Author: dhcst Date: 2012-06-15 10:10:24 +0000 (Fri, 15 Jun 2012) Log Message: ----------- fix path to smilies Modified Paths: -------------- XoopsCore/trunk/htdocs/include/xoopscodes.php Modified: XoopsCore/trunk/htdocs/include/xoopscodes.php =================================================================== --- XoopsCore/trunk/htdocs/include/xoopscodes.php 2012-06-15 10:08:20 UTC (rev 9647) +++ XoopsCore/trunk/htdocs/include/xoopscodes.php 2012-06-15 10:10:24 UTC (rev 9648) @@ -50,7 +50,7 @@ $smiles = $myts->getSmileys(FALSE); $count = count($smiles); for($i = 0; $i < $count; $i ++) { - echo "<img src='" . XOOPS_UPLOAD_URL . "/" . htmlspecialchars($smiles[$i]['smile_url'], ENT_QUOTES) . "' border='0' alt='' onclick='xoopsCodeSmilie(\"{$textarea_id}\", \" " . $smiles[$i]['code'] . " \");' onmouseover='style.cursor=\"hand\"' />"; + echo "<img src='" . XOOPS_UPLOAD_URL . "/smilies/" . htmlspecialchars($smiles[$i]['smile_url'], ENT_QUOTES) . "' border='0' alt='' onclick='xoopsCodeSmilie(\"{$textarea_id}\", \" " . $smiles[$i]['code'] . " \");' onmouseover='style.cursor=\"hand\"' />"; } echo " [<a href='#moresmiley' onmouseover='style.cursor=\"hand\"' alt='' onclick='openWithSelfMain(\"" . XOOPS_URL . "/misc.php?action=showpopups&type=smilies&target={$textarea_id}\",\"smilies\",300,475);'>" . _MORE . "</a>]"; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dh...@us...> - 2012-06-15 10:08:31
|
Revision: 9647 http://xoops.svn.sourceforge.net/xoops/?rev=9647&view=rev Author: dhcst Date: 2012-06-15 10:08:20 +0000 (Fri, 15 Jun 2012) Log Message: ----------- fix cache from file Modified Paths: -------------- XoopsCore/trunk/htdocs/header.php Modified: XoopsCore/trunk/htdocs/header.php =================================================================== --- XoopsCore/trunk/htdocs/header.php 2012-06-15 10:01:25 UTC (rev 9646) +++ XoopsCore/trunk/htdocs/header.php 2012-06-15 10:08:20 UTC (rev 9647) @@ -82,10 +82,12 @@ // Sets cache time if (!empty($xoopsModule)) { - $xoTheme->contentCacheLifetime = @$xoopsConfig['module_cache'][$xoopsModule->getVar('mid', 'n')]; + if ( empty($xoopsConfig['theme_fromfile']) ) + $xoTheme->contentCacheLifetime = @$xoopsConfig['module_cache'][$xoopsModule->getVar('mid', 'n')]; // Tricky solution for setting cache time for homepage } else if (!empty($xoopsOption['template_main']) && $xoopsOption['template_main'] == 'db:system_homepage.html') { - $xoTheme->contentCacheLifetime = 604800; + if ( empty($xoopsConfig['theme_fromfile']) ) + $xoTheme->contentCacheLifetime = 604800; } $xoopsPreload->triggerEvent('core.header.checkcache'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dh...@us...> - 2012-06-15 10:01:34
|
Revision: 9646 http://xoops.svn.sourceforge.net/xoops/?rev=9646&view=rev Author: dhcst Date: 2012-06-15 10:01:25 +0000 (Fri, 15 Jun 2012) Log Message: ----------- Fix path Userrank Modified Paths: -------------- XoopsCore/trunk/htdocs/userinfo.php Modified: XoopsCore/trunk/htdocs/userinfo.php =================================================================== --- XoopsCore/trunk/htdocs/userinfo.php 2012-06-14 12:02:33 UTC (rev 9645) +++ XoopsCore/trunk/htdocs/userinfo.php 2012-06-15 10:01:25 UTC (rev 9646) @@ -156,7 +156,7 @@ } $userrank = $thisUser->rank(); if (isset($userrank['image']) && $userrank['image']) { - $xoopsTpl->assign('user_rankimage', '<img src="' . XOOPS_UPLOAD_URL . '/' . $userrank['image'] . '" alt="" />'); + $xoopsTpl->assign('user_rankimage', '<img src="' . XOOPS_UPLOAD_URL . '/ranks/' . $userrank['image'] . '" alt="" />'); } $xoopsTpl->assign('user_ranktitle', $userrank['title']); $date = $thisUser->getVar("last_login"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dj...@us...> - 2012-06-14 12:02:44
|
Revision: 9645 http://xoops.svn.sourceforge.net/xoops/?rev=9645&view=rev Author: djculex Date: 2012-06-14 12:02:33 +0000 (Thu, 14 Jun 2012) Log Message: ----------- - Change: Typos corrected (Defkon1) Modified Paths: -------------- XoopsModules/smallworld/trunk/smallworld/language/english/main.php Modified: XoopsModules/smallworld/trunk/smallworld/language/english/main.php =================================================================== --- XoopsModules/smallworld/trunk/smallworld/language/english/main.php 2012-06-12 18:15:44 UTC (rev 9644) +++ XoopsModules/smallworld/trunk/smallworld/language/english/main.php 2012-06-14 12:02:33 UTC (rev 9645) @@ -74,7 +74,7 @@ define("_SMALLWORLD_TOTALUSERRATINGS","Overall rating"); define("_SMALLWORLD_LASTLOGIN","Last login"); define("_SMALLWORLD_SIGNATURE","Signature"); -define("_SMALLWORLD_REPLY_NOTSPECIFIED","Not specifiyed"); +define("_SMALLWORLD_REPLY_NOTSPECIFIED","Not specified"); define("_SMALLWORLD_BIRTHDAY","Birthday"); define("_SMALLWORLD_AKA","aka"); define("_SMALLWORLD_BORN","born"); @@ -83,7 +83,7 @@ define("_SMALLWORLD_HE","He"); define("_SMALLWORLD_SHE","She"); define("_SMALLWORLD_HEORSHE","He/She"); -define("_SMALLWORLD_LIVINGIN","is currently livin in"); +define("_SMALLWORLD_LIVINGIN","is currently living in"); define("_SMALLWORLD_ISEMPLOYEDBY","is employed by"); define("_SMALLWORLD_ATTENDED","attended"); define("_SMALLWORLD_AND","and"); @@ -140,7 +140,7 @@ define("_SMALLWORLD_ISENGAGED","is engaged to"); define("_SMALLWORLD_ISCOMPLICATED","is very secret when it comes to personal relationship with "); define("_SMALLWORLD_OPENRELATIONSHIP","is in an open relationship with"); -define("_SMALLWORLD_ADDITIONALINFO","Aditional info about "); +define("_SMALLWORLD_ADDITIONALINFO","Additional info about "); define("_SMALLWORLD_HIS","His"); define("_SMALLWORLD_HER","her"); define("_SMALLWORLD_HISHER","his/her"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <txm...@us...> - 2012-06-12 18:15:59
|
Revision: 9644 http://xoops.svn.sourceforge.net/xoops/?rev=9644&view=rev Author: txmodxoops Date: 2012-06-12 18:15:44 +0000 (Tue, 12 Jun 2012) Log Message: ----------- New module based on Jquery and Jquery ui Added Paths: ----------- XoopsModules/fullcalendar/ XoopsModules/fullcalendar/branches/ XoopsModules/fullcalendar/releases/ XoopsModules/fullcalendar/releases/1.01/ XoopsModules/fullcalendar/releases/1.01/fullcalendar/ XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/ XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/about.php XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/admin_footer.php XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/admin_header.php XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/delete_events.php XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/events.php XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/index.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/index.php XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/menu.php XoopsModules/fullcalendar/releases/1.01/fullcalendar/blocks/ XoopsModules/fullcalendar/releases/1.01/fullcalendar/blocks/index.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/class/ XoopsModules/fullcalendar/releases/1.01/fullcalendar/class/fullcalendar_events.php XoopsModules/fullcalendar/releases/1.01/fullcalendar/class/index.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/css/ XoopsModules/fullcalendar/releases/1.01/fullcalendar/css/fullcalendar.css XoopsModules/fullcalendar/releases/1.01/fullcalendar/css/fullcalendar.print.css XoopsModules/fullcalendar/releases/1.01/fullcalendar/css/index.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/css/style.css XoopsModules/fullcalendar/releases/1.01/fullcalendar/docs/ XoopsModules/fullcalendar/releases/1.01/fullcalendar/docs/changelog.txt XoopsModules/fullcalendar/releases/1.01/fullcalendar/docs/credits.txt XoopsModules/fullcalendar/releases/1.01/fullcalendar/docs/index.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/docs/install.txt XoopsModules/fullcalendar/releases/1.01/fullcalendar/docs/lang_diff.txt XoopsModules/fullcalendar/releases/1.01/fullcalendar/docs/licence.txt XoopsModules/fullcalendar/releases/1.01/fullcalendar/docs/readme.txt XoopsModules/fullcalendar/releases/1.01/fullcalendar/events.php XoopsModules/fullcalendar/releases/1.01/fullcalendar/header.php XoopsModules/fullcalendar/releases/1.01/fullcalendar/images/ XoopsModules/fullcalendar/releases/1.01/fullcalendar/images/32/ XoopsModules/fullcalendar/releases/1.01/fullcalendar/images/32/addevent.png XoopsModules/fullcalendar/releases/1.01/fullcalendar/images/32/dashboard.png XoopsModules/fullcalendar/releases/1.01/fullcalendar/images/32/deleteallevents.png XoopsModules/fullcalendar/releases/1.01/fullcalendar/images/32/editevent.png XoopsModules/fullcalendar/releases/1.01/fullcalendar/images/32/index.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/images/default_slogo.png XoopsModules/fullcalendar/releases/1.01/fullcalendar/images/icons/ XoopsModules/fullcalendar/releases/1.01/fullcalendar/images/icons/index.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/images/icons/off.png XoopsModules/fullcalendar/releases/1.01/fullcalendar/images/icons/on.png XoopsModules/fullcalendar/releases/1.01/fullcalendar/images/index.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/images/menu/ XoopsModules/fullcalendar/releases/1.01/fullcalendar/images/menu/bg.png XoopsModules/fullcalendar/releases/1.01/fullcalendar/images/menu/index.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/images/menu/left_both.png XoopsModules/fullcalendar/releases/1.01/fullcalendar/images/menu/right_both.png XoopsModules/fullcalendar/releases/1.01/fullcalendar/images/txmodxoops_logo.png XoopsModules/fullcalendar/releases/1.01/fullcalendar/include/ XoopsModules/fullcalendar/releases/1.01/fullcalendar/include/config.php XoopsModules/fullcalendar/releases/1.01/fullcalendar/include/functions.php XoopsModules/fullcalendar/releases/1.01/fullcalendar/include/index.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/include/install.php XoopsModules/fullcalendar/releases/1.01/fullcalendar/index.php XoopsModules/fullcalendar/releases/1.01/fullcalendar/js/ XoopsModules/fullcalendar/releases/1.01/fullcalendar/js/fullcalendar.js XoopsModules/fullcalendar/releases/1.01/fullcalendar/js/fullcalendar.min.js XoopsModules/fullcalendar/releases/1.01/fullcalendar/js/gcal.js XoopsModules/fullcalendar/releases/1.01/fullcalendar/js/index.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/js/jqinit.js XoopsModules/fullcalendar/releases/1.01/fullcalendar/js/json-events.js XoopsModules/fullcalendar/releases/1.01/fullcalendar/json-events.php XoopsModules/fullcalendar/releases/1.01/fullcalendar/language/ XoopsModules/fullcalendar/releases/1.01/fullcalendar/language/english/ XoopsModules/fullcalendar/releases/1.01/fullcalendar/language/english/admin.php XoopsModules/fullcalendar/releases/1.01/fullcalendar/language/english/help/ XoopsModules/fullcalendar/releases/1.01/fullcalendar/language/english/help/help.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/language/english/help/index.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/language/english/index.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/language/english/main.php XoopsModules/fullcalendar/releases/1.01/fullcalendar/language/english/modinfo.php XoopsModules/fullcalendar/releases/1.01/fullcalendar/language/index.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/language/italian/ XoopsModules/fullcalendar/releases/1.01/fullcalendar/language/italian/admin.php XoopsModules/fullcalendar/releases/1.01/fullcalendar/language/italian/help/ XoopsModules/fullcalendar/releases/1.01/fullcalendar/language/italian/help/help.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/language/italian/help/index.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/language/italian/index.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/language/italian/main.php XoopsModules/fullcalendar/releases/1.01/fullcalendar/language/italian/modinfo.php XoopsModules/fullcalendar/releases/1.01/fullcalendar/sql/ XoopsModules/fullcalendar/releases/1.01/fullcalendar/sql/index.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/sql/mysql.sql XoopsModules/fullcalendar/releases/1.01/fullcalendar/templates/ XoopsModules/fullcalendar/releases/1.01/fullcalendar/templates/admin/ XoopsModules/fullcalendar/releases/1.01/fullcalendar/templates/admin/fullcalendar_admin_about.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/templates/admin/fullcalendar_admin_help.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/templates/admin/index.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/templates/blocks/ XoopsModules/fullcalendar/releases/1.01/fullcalendar/templates/blocks/index.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/templates/fullcalendar_events.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/templates/fullcalendar_footer.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/templates/fullcalendar_header.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/templates/fullcalendar_index.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/templates/index.html XoopsModules/fullcalendar/releases/1.01/fullcalendar/xoops_version.php XoopsModules/fullcalendar/trunk/ XoopsModules/fullcalendar/trunk/fullcalendar/ XoopsModules/fullcalendar/trunk/fullcalendar/admin/ XoopsModules/fullcalendar/trunk/fullcalendar/admin/about.php XoopsModules/fullcalendar/trunk/fullcalendar/admin/admin_footer.php XoopsModules/fullcalendar/trunk/fullcalendar/admin/admin_header.php XoopsModules/fullcalendar/trunk/fullcalendar/admin/delete_events.php XoopsModules/fullcalendar/trunk/fullcalendar/admin/events.php XoopsModules/fullcalendar/trunk/fullcalendar/admin/index.html XoopsModules/fullcalendar/trunk/fullcalendar/admin/index.php XoopsModules/fullcalendar/trunk/fullcalendar/admin/menu.php XoopsModules/fullcalendar/trunk/fullcalendar/blocks/ XoopsModules/fullcalendar/trunk/fullcalendar/blocks/index.html XoopsModules/fullcalendar/trunk/fullcalendar/class/ XoopsModules/fullcalendar/trunk/fullcalendar/class/fullcalendar_events.php XoopsModules/fullcalendar/trunk/fullcalendar/class/index.html XoopsModules/fullcalendar/trunk/fullcalendar/css/ XoopsModules/fullcalendar/trunk/fullcalendar/css/fullcalendar.css XoopsModules/fullcalendar/trunk/fullcalendar/css/fullcalendar.print.css XoopsModules/fullcalendar/trunk/fullcalendar/css/index.html XoopsModules/fullcalendar/trunk/fullcalendar/css/style.css XoopsModules/fullcalendar/trunk/fullcalendar/docs/ XoopsModules/fullcalendar/trunk/fullcalendar/docs/changelog.txt XoopsModules/fullcalendar/trunk/fullcalendar/docs/credits.txt XoopsModules/fullcalendar/trunk/fullcalendar/docs/index.html XoopsModules/fullcalendar/trunk/fullcalendar/docs/install.txt XoopsModules/fullcalendar/trunk/fullcalendar/docs/lang_diff.txt XoopsModules/fullcalendar/trunk/fullcalendar/docs/licence.txt XoopsModules/fullcalendar/trunk/fullcalendar/docs/readme.txt XoopsModules/fullcalendar/trunk/fullcalendar/events.php XoopsModules/fullcalendar/trunk/fullcalendar/header.php XoopsModules/fullcalendar/trunk/fullcalendar/images/ XoopsModules/fullcalendar/trunk/fullcalendar/images/32/ XoopsModules/fullcalendar/trunk/fullcalendar/images/32/addevent.png XoopsModules/fullcalendar/trunk/fullcalendar/images/32/dashboard.png XoopsModules/fullcalendar/trunk/fullcalendar/images/32/deleteallevents.png XoopsModules/fullcalendar/trunk/fullcalendar/images/32/editevent.png XoopsModules/fullcalendar/trunk/fullcalendar/images/32/index.html XoopsModules/fullcalendar/trunk/fullcalendar/images/default_slogo.png XoopsModules/fullcalendar/trunk/fullcalendar/images/icons/ XoopsModules/fullcalendar/trunk/fullcalendar/images/icons/index.html XoopsModules/fullcalendar/trunk/fullcalendar/images/icons/off.png XoopsModules/fullcalendar/trunk/fullcalendar/images/icons/on.png XoopsModules/fullcalendar/trunk/fullcalendar/images/index.html XoopsModules/fullcalendar/trunk/fullcalendar/images/menu/ XoopsModules/fullcalendar/trunk/fullcalendar/images/menu/bg.png XoopsModules/fullcalendar/trunk/fullcalendar/images/menu/index.html XoopsModules/fullcalendar/trunk/fullcalendar/images/menu/left_both.png XoopsModules/fullcalendar/trunk/fullcalendar/images/menu/right_both.png XoopsModules/fullcalendar/trunk/fullcalendar/images/txmodxoops_logo.png XoopsModules/fullcalendar/trunk/fullcalendar/include/ XoopsModules/fullcalendar/trunk/fullcalendar/include/config.php XoopsModules/fullcalendar/trunk/fullcalendar/include/functions.php XoopsModules/fullcalendar/trunk/fullcalendar/include/index.html XoopsModules/fullcalendar/trunk/fullcalendar/include/install.php XoopsModules/fullcalendar/trunk/fullcalendar/index.php XoopsModules/fullcalendar/trunk/fullcalendar/js/ XoopsModules/fullcalendar/trunk/fullcalendar/js/fullcalendar.js XoopsModules/fullcalendar/trunk/fullcalendar/js/fullcalendar.min.js XoopsModules/fullcalendar/trunk/fullcalendar/js/gcal.js XoopsModules/fullcalendar/trunk/fullcalendar/js/index.html XoopsModules/fullcalendar/trunk/fullcalendar/js/jqinit.js XoopsModules/fullcalendar/trunk/fullcalendar/js/json-events.js XoopsModules/fullcalendar/trunk/fullcalendar/json-events.php XoopsModules/fullcalendar/trunk/fullcalendar/language/ XoopsModules/fullcalendar/trunk/fullcalendar/language/english/ XoopsModules/fullcalendar/trunk/fullcalendar/language/english/admin.php XoopsModules/fullcalendar/trunk/fullcalendar/language/english/help/ XoopsModules/fullcalendar/trunk/fullcalendar/language/english/help/help.html XoopsModules/fullcalendar/trunk/fullcalendar/language/english/help/index.html XoopsModules/fullcalendar/trunk/fullcalendar/language/english/index.html XoopsModules/fullcalendar/trunk/fullcalendar/language/english/main.php XoopsModules/fullcalendar/trunk/fullcalendar/language/english/modinfo.php XoopsModules/fullcalendar/trunk/fullcalendar/language/index.html XoopsModules/fullcalendar/trunk/fullcalendar/language/italian/ XoopsModules/fullcalendar/trunk/fullcalendar/language/italian/admin.php XoopsModules/fullcalendar/trunk/fullcalendar/language/italian/help/ XoopsModules/fullcalendar/trunk/fullcalendar/language/italian/help/help.html XoopsModules/fullcalendar/trunk/fullcalendar/language/italian/help/index.html XoopsModules/fullcalendar/trunk/fullcalendar/language/italian/index.html XoopsModules/fullcalendar/trunk/fullcalendar/language/italian/main.php XoopsModules/fullcalendar/trunk/fullcalendar/language/italian/modinfo.php XoopsModules/fullcalendar/trunk/fullcalendar/sql/ XoopsModules/fullcalendar/trunk/fullcalendar/sql/index.html XoopsModules/fullcalendar/trunk/fullcalendar/sql/mysql.sql XoopsModules/fullcalendar/trunk/fullcalendar/templates/ XoopsModules/fullcalendar/trunk/fullcalendar/templates/admin/ XoopsModules/fullcalendar/trunk/fullcalendar/templates/admin/index.html XoopsModules/fullcalendar/trunk/fullcalendar/templates/blocks/ XoopsModules/fullcalendar/trunk/fullcalendar/templates/blocks/index.html XoopsModules/fullcalendar/trunk/fullcalendar/templates/fullcalendar_events.html XoopsModules/fullcalendar/trunk/fullcalendar/templates/fullcalendar_footer.html XoopsModules/fullcalendar/trunk/fullcalendar/templates/fullcalendar_header.html XoopsModules/fullcalendar/trunk/fullcalendar/templates/fullcalendar_index.html XoopsModules/fullcalendar/trunk/fullcalendar/templates/index.html XoopsModules/fullcalendar/trunk/fullcalendar/xoops_version.php Added: XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/about.php =================================================================== --- XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/about.php (rev 0) +++ XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/about.php 2012-06-12 18:15:44 UTC (rev 9644) @@ -0,0 +1,34 @@ +<?php +/** + * **************************************************************************** + * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org ) + * **************************************************************************** + * FULLCALENDAR - MODULE FOR XOOPS + * Copyright (c) 2007 - 2012 + * TXMod Xoops (Timgno) ( http://www.txmodxoops.org ) + * Created by TDMCreate version 1.37 + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting + * source code which is considered copyrighted (c) material of the + * original comment or credit authors. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * --------------------------------------------------------------------------- + * @copyright TXMod Xoops (Timgno) ( http://www.txmodxoops.org ) + * @license GNU GPL see License + * @since 2.5.0 + * @package fullcalendar + * @author TXMod Xoops (Timgno) ( su...@tx... ) + * + * Version : 1.01 Mon 2012/06/11 19:23:28 : Timgno Exp $ + * **************************************************************************** + */ +include "admin_header.php"; +xoops_cp_header(); +echo $adminMenu->addNavigation("about.php"); +echo $adminMenu->renderabout('25J998Y3QEDZW', false); +include "admin_footer.php"; \ No newline at end of file Added: XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/admin_footer.php =================================================================== --- XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/admin_footer.php (rev 0) +++ XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/admin_footer.php 2012-06-12 18:15:44 UTC (rev 9644) @@ -0,0 +1,35 @@ +<?php +/** + * **************************************************************************** + * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org ) + * **************************************************************************** + * FULLCALENDAR - MODULE FOR XOOPS + * Copyright (c) 2007 - 2012 + * TXMod Xoops (Timgno) ( http://www.txmodxoops.org ) + * Created by TDMCreate version 1.37 + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting + * source code which is considered copyrighted (c) material of the + * original comment or credit authors. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * --------------------------------------------------------------------------- + * @copyright TXMod Xoops (Timgno) ( http://www.txmodxoops.org ) + * @license GNU GPL see License + * @since 2.5.0 + * @package fullcalendar + * @author TXMod Xoops (Timgno) ( su...@tx... ) + * + * Version : 1.01 Mon 2012/06/11 19:23:28 : Timgno Exp $ + * **************************************************************************** + */ +echo "<div align='center'><a href='http://www.xoops.org' target='_blank'> + <img src='".$pathIcon32."/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a></div>"; +echo "<div class='center smallsmall italic pad5'> + <strong>" . $xoopsModule->getVar('name') . "</strong> "._AM_FULLCALENDAR_MAINTAINEDBY." + <a href='http://www.txmodxoops.org/modules/newbb' title='Visit TXMod Xoops Community' class='tooltip' rel='external'>TXMod Xoops Community</a></div>"; +xoops_cp_footer(); \ No newline at end of file Added: XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/admin_header.php =================================================================== --- XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/admin_header.php (rev 0) +++ XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/admin_header.php 2012-06-12 18:15:44 UTC (rev 9644) @@ -0,0 +1,68 @@ +<?php +/** + * **************************************************************************** + * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org ) + * **************************************************************************** + * FULLCALENDAR - MODULE FOR XOOPS + * Copyright (c) 2007 - 2012 + * TXMod Xoops (Timgno) ( http://www.txmodxoops.org ) + * Created by TDMCreate version 1.37 + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting + * source code which is considered copyrighted (c) material of the + * original comment or credit authors. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * --------------------------------------------------------------------------- + * @copyright TXMod Xoops (Timgno) ( http://www.txmodxoops.org ) + * @license GNU GPL see License + * @since 2.5.0 + * @package fullcalendar + * @author TXMod Xoops (Timgno) ( su...@tx... ) + * + * Version : 1.01 Mon 2012/06/11 19:23:28 : Timgno Exp $ + * **************************************************************************** + */ + +include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php'; +include_once XOOPS_ROOT_PATH . '/include/cp_header.php'; +include_once '../include/config.php'; +include_once '../include/functions.php'; + +$thisDirname = $GLOBALS['xoopsModule']->getVar('dirname'); + +$pathIcon16 = XOOPS_URL .'/'. $GLOBALS['xoopsModule']->getInfo('icons16'); +$pathIcon32 = XOOPS_URL .'/'. $GLOBALS['xoopsModule']->getInfo('icons32'); +$pathModuleAdmin = $GLOBALS['xoopsModule']->getInfo('dirmoduleadmin'); + +//load class +$eventsHandler=& xoops_getModuleHandler('fullcalendar_events', $thisDirname); + +$myts =& MyTextSanitizer::getInstance(); + +if (!isset($xoopsTpl) || !is_object($xoopsTpl)) { + include_once(XOOPS_ROOT_PATH."/class/template.php"); + $xoopsTpl = new XoopsTpl(); +} + +$xoopsTpl->assign('pathIcon16', $pathIcon16); +$xoopsTpl->assign('pathIcon32', $pathIcon32); +//xoops_cp_header(); + +//Load languages +xoops_loadLanguage('admin', $thisDirname); +xoops_loadLanguage('modinfo', $thisDirname); +xoops_loadLanguage('main', $thisDirname); + +// Locad admin menu class +if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){ + include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'); +}else{ + redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false); +} + +$adminMenu = new ModuleAdmin(); Added: XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/delete_events.php =================================================================== --- XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/delete_events.php (rev 0) +++ XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/delete_events.php 2012-06-12 18:15:44 UTC (rev 9644) @@ -0,0 +1,100 @@ +<?php +/** + * **************************************************************************** + * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org ) + * **************************************************************************** + * FULLCALENDAR - MODULE FOR XOOPS + * Copyright (c) 2007 - 2012 + * TXMod Xoops (Timgno) ( http://www.txmodxoops.org ) + * Created by TDMCreate version 1.37 + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting + * source code which is considered copyrighted (c) material of the + * original comment or credit authors. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * --------------------------------------------------------------------------- + * @copyright TXMod Xoops (Timgno) ( http://www.txmodxoops.org ) + * @license GNU GPL see License + * @since 2.5.0 + * @package fullcalendar + * @author TXMod Xoops (Timgno) ( su...@tx... ) + * + * Version : 1.01 Mon 2012/06/11 19:23:28 : Timgno Exp $ + * **************************************************************************** + */ +include "admin_header.php"; +xoops_cp_header(); +//It recovered the value of argument op in URL$ +$op = fullcalendar_CleanVars($_REQUEST, 'op', 'list', 'string'); +switch ($op) +{ + case "prune_events": + default: + include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php'; + echo $adminMenu->addNavigation('delete_events.php'); + echo '<br /><br /><br />'; + $sform = new XoopsThemeForm(_AM_FULLCALENDAR_PRUNEEVENTS, 'pruneform', $_SERVER["REQUEST_URI"], 'post'); + $sform->addElement(new XoopsFormTextDateSelect(_AM_FULLCALENDAR_PRUNE_BEFORE, 'prune_date',15,time()), true); + $onlyexpired = new xoopsFormCheckBox(_AM_FULLCALENDAR_PRUNE_CAPTIONEXPIREDONLY, 'onlyexpired'); + $onlyexpired->addOption(1, _AM_FULLCALENDAR_PRUNE_EXPIREDONLY); + $sform->addElement($onlyexpired, false); + $sform->addElement(new XoopsFormHidden('op', 'confirmbeforetoprune'), false); + $eventslist = new XoopsFormSelect(_AM_FULLCALENDAR_PRUNE_EVENTS, 'pruned_events','',5,true); + $criteria = new CriteriaCompo(); + $criteria->setSort("event_id ASC, event_title"); + $criteria->setOrder("ASC"); + $events_arr = $eventsHandler->getAll($criteria); + if(count($events_arr)) { + foreach ($events_arr as $oneevent) { + $eventslist->addOption($oneevent->getVar('event_id'),$oneevent->getVar('event_title')); + } + } + $eventslist->setDescription(_AM_FULLCALENDAR_EXPORT_PRUNE_DSC); + $sform->addElement($eventslist,false); + $button_tray = new XoopsFormElementTray('' ,''); + $submit_btn = new XoopsFormButton('', 'post', _SUBMIT, 'submit'); + $button_tray->addElement($submit_btn); + $sform->addElement($button_tray); + $sform->display(); + break; + + case "confirmbeforetoprune": + $events = $eventsHandler->get($_GET['event_id']); + if(isset($_POST['onlyexpired'])) { + $expired = intval($_POST['onlyexpired']); + } + $criteria = new CriteriaCompo(); + $criteria->add(new Criteria("event_id", $_GET['event_id'])); + $criteria->add(new Criteria("event_end", $_GET['event_end'])); + $count = $eventsHandler->getCount($criteria); + $date = $_POST['prune_date']; + $timestamp = mktime(0,0,0,intval(substr($date,5,2)), intval(substr($date,8,2)), intval(substr($date,0,4))); + if($count) { + $displaydate = formatTimestamp($timestamp); + $msg = sprintf(_AM_FULLCALENDAR_PRUNE_CONFIRM, $displaydate, $count); + xoops_confirm(array( 'op' => 'delete_allevents', "event_id" => $_REQUEST["event_id"], 'prune_date' => $timestamp, 'ok' => 1), 'delete_events.php', $msg); + } else { + printf(_AM_FULLCALENDAR_NOTHING_PRUNE); + } + unset($story); + break; + + case "delete_allevents": + if( intval($_POST['ok']) == 1 ) { + $criteria = new CriteriaCompo(); + $criteria->add(new Criteria("event_id", 0, '>')); + $criteria->add(new Criteria("event_end", $_GET['event_end'])); + $count = $eventsHandler->getCount($criteria); + $msg = sprintf(_AM_FULLCALENDAR_PRUNE_DELETED,$count); + + redirect_header( 'delete_events.php', 3, $msg); + } + break; +} +include "admin_footer.php"; +?> \ No newline at end of file Added: XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/events.php =================================================================== --- XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/events.php (rev 0) +++ XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/events.php 2012-06-12 18:15:44 UTC (rev 9644) @@ -0,0 +1,196 @@ +<?php +/** + * **************************************************************************** + * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org ) + * **************************************************************************** + * FULLCALENDAR - MODULE FOR XOOPS + * Copyright (c) 2007 - 2012 + * TXMod Xoops (Timgno) ( http://www.txmodxoops.org ) + * Created by TDMCreate version 1.37 + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting + * source code which is considered copyrighted (c) material of the + * original comment or credit authors. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * --------------------------------------------------------------------------- + * @copyright TXMod Xoops (Timgno) ( http://www.txmodxoops.org ) + * @license GNU GPL see License + * @since 2.5.0 + * @package fullcalendar + * @author TXMod Xoops (Timgno) ( su...@tx... ) + * + * Version : 1.01 Mon 2012/06/11 19:23:28 : Timgno Exp $ + * **************************************************************************** + */ +include "admin_header.php"; +xoops_cp_header(); +//It recovered the value of argument op in URL$ +$op = fullcalendar_CleanVars($_REQUEST, 'op', 'list', 'string'); +switch ($op) +{ + case "list": + default: + echo $adminMenu->addNavigation('events.php'); + $adminMenu->addItemButton(_AM_FULLCALENDAR_NEWEVENT, 'events.php?op=new_event', 'add'); + echo $adminMenu->renderButton(); + $criteria = new CriteriaCompo(); + $criteria->setSort("event_id ASC, event_title"); + $criteria->setOrder("ASC"); + $numrows = $eventsHandler->getCount(); + if (isset($_REQUEST['limit'])) { + $criteria->setLimit($_REQUEST['limit']); + $limit = $_REQUEST['limit']; + } else { + $criteria->setLimit($GLOBALS['xoopsModuleConfig']['adminperpage']); + $limit = $GLOBALS['xoopsModuleConfig']['adminperpage']; + } + if (isset($_REQUEST['start'])) { + $criteria->setStart($_REQUEST['start']); + $start = $_REQUEST['start']; + } else { + $criteria->setStart(0); + $start = 0; + } + $events_arr = $eventsHandler->getall($criteria); + if ( $numrows > $limit ) { + include_once XOOPS_ROOT_PATH . '/class/pagenav.php'; + $pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list&limit=' . $limit); + $pagenav = $pagenav->renderNav(4); + } else { + $pagenav = ''; + } + //Affichage du tableau + if ($numrows>0) + { + echo "<table width='100%' cellspacing='1' class='outer'> + <tr> + <th class='center'>"._AM_FULLCALENDAR_EVENT_ID."</th> + <th class='center'>"._AM_FULLCALENDAR_EVENT_TITLE."</th> + <th class='center'>"._AM_FULLCALENDAR_EVENT_DESCRIPTION."</th> + <th class='center'>"._AM_FULLCALENDAR_EVENT_START."</th> + <th class='center'>"._AM_FULLCALENDAR_EVENT_END."</th> + <th class='center'>"._AM_FULLCALENDAR_EVENT_WEIGHT."</th> + <th class='center'>"._AM_FULLCALENDAR_EVENT_DISPLAY."</th> + <th align='center' width='10%'>"._AM_FULLCALENDAR_FORMACTION."</th> + </tr>"; + + $class = "odd"; + foreach (array_keys($events_arr) as $i) + { + echo "<tr class='".$class."'>"; + $class = ($class == "even") ? "odd" : "even"; + echo "<td class='center'>".$i."</td>"; + echo "<td class='center'>".$events_arr[$i]->getVar("event_title")."</td>"; + echo "<td class='center'>".$events_arr[$i]->getVar("event_description")."</td>"; + echo "<td class='center'>".formatTimeStamp($events_arr[$i]->getVar("event_start"))."</td>"; + echo "<td class='center'>".formatTimeStamp($events_arr[$i]->getVar("event_end"))."</td>"; + echo "<td class='center'>".$events_arr[$i]->getVar("event_weight")."</td>"; + + if ( $events_arr[$i]->getVar("event_display") == 1 ) { + echo "<td class='center'><a href='./events.php?op=update_display&event_id=".$i."&event_display=0'><img src='".$pathIcon16."/on.png' border='0' alt='"._AM_FULLCALENDAR_ONLINE."' title='"._AM_FULLCALENDAR_ONLINE."'></a></td>"; + } else { + echo "<td class='center'><a href='./events.php?op=update_display&event_id=".$i."&event_display=1'><img src='".$pathIcon16."/off.png' border='0' alt='"._AM_FULLCALENDAR_OFFLINE."' title='"._AM_FULLCALENDAR_OFFLINE."'></a></td>"; + } + + echo "<td align='center' width='10%'> + <a href='events.php?op=edit_event&event_id=".$events_arr[$i]->getVar("event_id")."'><img src=".$pathIcon16."/edit.png alt='"._EDIT."' title='"._EDIT."'></a> + <a href='events.php?op=delete_event&event_id=".$events_arr[$i]->getVar("event_id")."'><img src=".$pathIcon16."/delete.png alt='"._DELETE."' title='"._DELETE."'></a> + </td>"; + echo "</tr>"; + } + echo "</table><br /><br />"; + echo "<div class='center'>".$pagenav."</div>"; + } else { + echo "<table width='100%' cellspacing='1' class='outer'> + <tr> + <th class='center'>"._AM_FULLCALENDAR_EVENT_ID."</th> + <th class='center'>"._AM_FULLCALENDAR_EVENT_TITLE."</th> + <th class='center'>"._AM_FULLCALENDAR_EVENT_DESCRIPTION."</th> + <th class='center'>"._AM_FULLCALENDAR_EVENT_START."</th> + <th class='center'>"._AM_FULLCALENDAR_EVENT_END."</th> + <th class='center'>"._AM_FULLCALENDAR_EVENT_WEIGHT."</th> + <th class='center'>"._AM_FULLCALENDAR_EVENT_DISPLAY."</th> + <th align='center' width='10%'>"._AM_FULLCALENDAR_FORMACTION."</th> + </tr>"; + echo "</table><br /><br />"; + } + + break; + + case "new_event": + echo $adminMenu->addNavigation("events.php"); + $adminMenu->addItemButton(_AM_FULLCALENDAR_EVENTSLIST, 'events.php?op=list', 'list'); + echo $adminMenu->renderButton(); + + $obj =& $eventsHandler->create(); + $form = $obj->getForm(); + $form->display(); + break; + + case "save_event": + if ( !$GLOBALS["xoopsSecurity"]->check() ) { + redirect_header("events.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors())); + } + if (isset($_REQUEST["event_id"])) { + $obj =& $eventsHandler->get($_REQUEST["event_id"]); + } else { + $obj =& $eventsHandler->create(); + } + //Form event_display + $verif_event_display = ($_REQUEST["event_display"] == 1) ? "1" : "0"; + //Form events + $obj->setVars(array("event_title" => $_POST["event_title"], "event_description" => $_POST["event_description"], "event_start" => fullcalendar_convertDateTime($_POST["event_start"]), "event_end" => fullcalendar_convertDateTime($_POST["event_end"]), "event_weight" => $_POST["event_weight"], "event_display" => $verif_event_display)); + + if ($eventsHandler->insert($obj)) { + redirect_header("events.php?op=list", 2, _AM_FULLCALENDAR_FORMOK); + } + + echo $obj->getHtmlErrors(); + $form =& $obj->getForm(); + $form->display(); + break; + + case "edit_event": + echo $adminMenu->addNavigation("events.php"); + $adminMenu->addItemButton(_AM_FULLCALENDAR_NEWEVENT, 'events.php?op=new_event', 'add'); + $adminMenu->addItemButton(_AM_FULLCALENDAR_EVENTSLIST, 'events.php?op=list', 'list'); + echo $adminMenu->renderButton(); + $obj = $eventsHandler->get($_REQUEST["event_id"]); + $form = $obj->getForm(); + $form->display(); + break; + + case "delete_event": + $obj =& $eventsHandler->get($_REQUEST["event_id"]); + if (isset($_REQUEST["ok"]) && $_REQUEST["ok"] == 1) { + if ( !$GLOBALS["xoopsSecurity"]->check() ) { + redirect_header("events.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors())); + } + if ($eventsHandler->delete($obj)) { + redirect_header("events.php", 3, _AM_FULLCALENDAR_FORMDELOK); + } else { + echo $obj->getHtmlErrors(); + } + } else { + xoops_confirm(array("ok" => 1, "event_id" => $_REQUEST["event_id"], "op" => "delete_event"), $_SERVER["REQUEST_URI"], sprintf(_AM_FULLCALENDAR_FORMSUREDEL, $obj->getVar("event_title"))); + } + break; + + case "update_display": + if (isset($_GET["event_id"])) { + $obj =& $eventsHandler->get($_GET["event_id"]); + } + $obj->setVar("event_display", $_REQUEST["event_display"]); + if ($eventsHandler->insert($obj)) { + redirect_header("events.php", 3, _AM_FULLCALENDAR_FORMOK); + } + echo $obj->getHtmlErrors(); + break; +} +include "admin_footer.php"; +?> \ No newline at end of file Added: XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/index.html =================================================================== --- XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/index.html (rev 0) +++ XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/index.html 2012-06-12 18:15:44 UTC (rev 9644) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/index.php =================================================================== --- XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/index.php (rev 0) +++ XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/index.php 2012-06-12 18:15:44 UTC (rev 9644) @@ -0,0 +1,43 @@ +<?php +/** + * **************************************************************************** + * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org ) + * **************************************************************************** + * FULLCALENDAR - MODULE FOR XOOPS + * Copyright (c) 2007 - 2012 + * TXMod Xoops (Timgno) ( http://www.txmodxoops.org ) + * Created by TDMCreate version 1.37 + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting + * source code which is considered copyrighted (c) material of the + * original comment or credit authors. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * --------------------------------------------------------------------------- + * @copyright TXMod Xoops (Timgno) ( http://www.txmodxoops.org ) + * @license GNU GPL see License + * @since 2.5.0 + * @package fullcalendar + * @author TXMod Xoops (Timgno) ( su...@tx... ) + * + * Version : 1.01 Mon 2012/06/11 19:23:28 : Timgno Exp $ + * **************************************************************************** + */ +include "admin_header.php"; +xoops_cp_header(); + //count "total events" + $count_events = $eventsHandler->getCount(); + $r = '#FF0000'; // Red + $g = '#00AA00'; // Green + // InfoBox events + $adminMenu->addInfoBox(_AM_FULLCALENDAR_EVENTS); + $adminMenu->addInfoBoxLine(_AM_FULLCALENDAR_EVENTS,_AM_FULLCALENDAR_THEREARE_EVENTS, $count_events, ($count_events == 0) ? $r : $g); + // Render Index + echo $adminMenu->addNavigation("index.php"); + echo $adminMenu->renderIndex(); +include "admin_footer.php"; +?> \ No newline at end of file Added: XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/menu.php =================================================================== --- XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/menu.php (rev 0) +++ XoopsModules/fullcalendar/releases/1.01/fullcalendar/admin/menu.php 2012-06-12 18:15:44 UTC (rev 9644) @@ -0,0 +1,47 @@ +<?php +/** + * **************************************************************************** + * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org ) + * **************************************************************************** + * FULLCALENDAR - MODULE FOR XOOPS + * Copyright (c) 2007 - 2012 + * TXMod Xoops (Timgno) ( http://www.txmodxoops.org ) + * Created by TDMCreate version 1.37 + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting + * source code which is considered copyrighted (c) material of the + * original comment or credit authors. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * --------------------------------------------------------------------------- + * @copyright TXMod Xoops (Timgno) ( http://www.txmodxoops.org ) + * @license GNU GPL see License + * @since 2.5.0 + * @package fullcalendar + * @author TXMod Xoops (Timgno) ( su...@tx... ) + * + * Version : 1.01 Mon 2012/06/11 19:23:28 : Timgno Exp $ + * **************************************************************************** + */ +$dirname = basename( dirname( dirname( __FILE__ ) ) ) ; +$module_handler =& xoops_gethandler("module"); +$xoopsModule =& XoopsModule::getByDirname($dirname); +$moduleInfo =& $module_handler->get($xoopsModule->getVar("mid")); +$pathImageAdmin = $moduleInfo->getInfo("icons32"); +$adminmenu = array(); $i = 1; +$adminmenu[$i]["title"] = _MI_FULLCALENDAR_ADMENU1; +$adminmenu[$i]["link"] = "admin/index.php"; +$adminmenu[$i]["icon"] = "images/32/dashboard.png"; $i++; +$adminmenu[$i]["title"] = _MI_FULLCALENDAR_ADMENU2; +$adminmenu[$i]["link"] = "admin/events.php"; +$adminmenu[$i]["icon"] = "images/32/addevent.png"; $i++; +$adminmenu[$i]["title"] = _MI_FULLCALENDAR_ADMENU3; +$adminmenu[$i]["link"] = "admin/delete_events.php"; +$adminmenu[$i]["icon"] = "images/32/deleteallevents.png"; $i++; +$adminmenu[$i]["title"] = _MI_FULLCALENDAR_ADMENU4; +$adminmenu[$i]["link"] = "admin/about.php"; +$adminmenu[$i]["icon"] = "../../".$pathImageAdmin."/about.png"; unset( $i ); \ No newline at end of file Added: XoopsModules/fullcalendar/releases/1.01/fullcalendar/blocks/index.html =================================================================== --- XoopsModules/fullcalendar/releases/1.01/fullcalendar/blocks/index.html (rev 0) +++ XoopsModules/fullcalendar/releases/1.01/fullcalendar/blocks/index.html 2012-06-12 18:15:44 UTC (rev 9644) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsModules/fullcalendar/releases/1.01/fullcalendar/class/fullcalendar_events.php =================================================================== --- XoopsModules/fullcalendar/releases/1.01/fullcalendar/class/fullcalendar_events.php (rev 0) +++ XoopsModules/fullcalendar/releases/1.01/fullcalendar/class/fullcalendar_events.php 2012-06-12 18:15:44 UTC (rev 9644) @@ -0,0 +1,103 @@ +<?php +/** + * **************************************************************************** + * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org ) + * **************************************************************************** + * FULLCALENDAR - MODULE FOR XOOPS + * Copyright (c) 2007 - 2012 + * TXMod Xoops (Timgno) ( http://www.txmodxoops.org ) + * Created by TDMCreate version 1.37 + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting + * source code which is considered copyrighted (c) material of the + * original comment or credit authors. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * --------------------------------------------------------------------------- + * @copyright TXMod Xoops (Timgno) ( http://www.txmodxoops.org ) + * @license GNU GPL see License + * @since 2.5.0 + * @package fullcalendar + * @author TXMod Xoops (Timgno) ( su...@tx... ) + * + * Version : 1.01 Mon 2012/06/11 19:23:28 : Timgno Exp $ + * **************************************************************************** + */ +if (!defined("XOOPS_ROOT_PATH")) { + die("XOOPS root path not defined"); +} + +class fullcalendar_events extends XoopsObject +{ + //Constructor + function __construct() + { + $this->XoopsObject(); + $this->initVar("event_id", XOBJ_DTYPE_INT, '0', false, 8); + $this->initVar("event_title", XOBJ_DTYPE_TXTBOX, 'Event Title', false, 255); + $this->initVar("event_description", XOBJ_DTYPE_TXTAREA, 'Event Description', false); + $this->initVar("event_start", XOBJ_DTYPE_LTIME, null, false); + $this->initVar("event_end", XOBJ_DTYPE_LTIME, null, false); + $this->initVar("event_weight", XOBJ_DTYPE_INT, '0', false, 11); + $this->initVar("event_display", XOBJ_DTYPE_INT, '0', false, 1); + } + + function fullcalendar_events() + { + $this->__construct(); + } + + function getForm($action = false) + { + global $xoopsDB, $xoopsModuleConfig; + + if ($action === false) { + $action = $_SERVER["REQUEST_URI"]; + } + + $title = $this->isNew() ? sprintf(_AM_FULLCALENDAR_EVENT_ADD) : sprintf(_AM_FULLCALENDAR_EVENT_EDIT); + + include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php"); + $form = new XoopsThemeForm($title, "form", $action, "post", true); + $form->setExtra('enctype="multipart/form-data"'); + // event_title + $form->addElement(new XoopsFormText(_AM_FULLCALENDAR_EVENT_TITLE, "event_title", 50, 255, $this->getVar("event_title")), true); + // event_description + $editor_configs=array(); + $editor_configs["name"] ="event_description"; + $editor_configs["value"] = $this->getVar("event_description", "e"); + $editor_configs["rows"] = 10; + $editor_configs["cols"] = 80; + $editor_configs["width"] = "100%"; + $editor_configs["height"] = "400px"; + $editor_configs["editor"] = $GLOBALS["xoopsModuleConfig"]["fullcalendar_editor"]; + $form->addElement( new XoopsFormEditor(_AM_FULLCALENDAR_EVENT_DESCRIPTION, "event_description", $editor_configs), false ); + // event_start + $form->addElement(new XoopsFormDateTime(_AM_FULLCALENDAR_EVENT_START, "event_start", 15, $this->getVar("event_start")), true); + // event_end + $form->addElement(new XoopsFormDateTime(_AM_FULLCALENDAR_EVENT_END, "event_end", 15, $this->getVar("event_end")), true); + // event_weight + $form->addElement(new XoopsFormText(_AM_FULLCALENDAR_EVENT_WEIGHT, "event_weight", 5, 15, $this->getVar("event_weight")), true); + // event_display + $event_display = $this->isNew() ? 0 : $this->getVar("event_display"); + $check_event_display = new XoopsFormCheckBox(_AM_FULLCALENDAR_EVENT_DISPLAY, "event_display", $event_display); + $check_event_display->addOption(1, " "); + $form->addElement($check_event_display); + // event_event + $form->addElement(new XoopsFormHidden("op", "save_event")); + $form->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit")); + return $form; + } +} +class fullcalendarfullcalendar_eventsHandler extends XoopsPersistableObjectHandler +{ + function __construct(&$db) + { + parent::__construct($db, "fullcalendar_events", "fullcalendar_events", "event_id", "event_title"); + } +} +?> \ No newline at end of file Added: XoopsModules/fullcalendar/releases/1.01/fullcalendar/class/index.html =================================================================== --- XoopsModules/fullcalendar/releases/1.01/fullcalendar/class/index.html (rev 0) +++ XoopsModules/fullcalendar/releases/1.01/fullcalendar/class/index.html 2012-06-12 18:15:44 UTC (rev 9644) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsModules/fullcalendar/releases/1.01/fullcalendar/css/fullcalendar.css =================================================================== --- XoopsModules/fullcalendar/releases/1.01/fullcalendar/css/fullcalendar.css (rev 0) +++ XoopsModules/fullcalendar/releases/1.01/fullcalendar/css/fullcalendar.css 2012-06-12 18:15:44 UTC (rev 9644) @@ -0,0 +1,618 @@ +/* + * FullCalendar v1.5.3 Stylesheet + * + * Copyright (c) 2011 Adam Shaw + * Dual licensed under the MIT and GPL licenses, located in + * MIT-LICENSE.txt and GPL-LICENSE.txt respectively. + * + * Date: Mon Feb 6 22:40:40 2012 -0800 + * + */ + + +.fc { + direction: ltr; + text-align: left; + } + +.fc table { + border-collapse: collapse; + border-spacing: 0; + } + +html .fc, +.fc table { + font-size: 1em; + } + +.fc td, +.fc th { + padding: 0; + vertical-align: top; + } + + + +/* Header +------------------------------------------------------------------------*/ + +.fc-header td { + white-space: nowrap; + } + +.fc-header-left { + width: 25%; + text-align: left; + } + +.fc-header-center { + text-align: center; + } + +.fc-header-right { + width: 25%; + text-align: right; + } + +.fc-header-title { + display: inline-block; + vertical-align: top; + } + +.fc-header-title h2 { + margin-top: 0; + white-space: nowrap; + } + +.fc .fc-header-space { + padding-left: 10px; + } + +.fc-header .fc-button { + margin-bottom: 1em; + vertical-align: top; + } + +/* buttons edges butting together */ + +.fc-header .fc-button { + margin-right: -1px; + } + +.fc-header .fc-corner-right { + margin-right: 1px; /* back to normal */ + } + +.fc-header .ui-corner-right { + margin-right: 0; /* back to normal */ + } + +/* button layering (for border precedence) */ + +.fc-header .fc-state-hover, +.fc-header .ui-state-hover { + z-index: 2; + } + +.fc-header .fc-state-down { + z-index: 3; + } + +.fc-header .fc-state-active, +.fc-header .ui-state-active { + z-index: 4; + } + + + +/* Content +------------------------------------------------------------------------*/ + +.fc-content { + clear: both; + } + +.fc-view { + width: 100%; /* needed for view switching (when view is absolute) */ + overflow: hidden; + } + + + +/* Cell Styles +------------------------------------------------------------------------*/ + +.fc-widget-header, /* <th>, usually */ +.fc-widget-content { /* <td>, usually */ + border: 1px solid #ccc; + } + +.fc-state-highlight { /* <td> today cell */ /* TODO: add .fc-today to <th> */ + background: #ffc; + } + +.fc-cell-overlay { /* semi-transparent rectangle while dragging */ + background: #9cf; + opacity: .2; + filter: alpha(opacity=20); /* for IE */ + } + + + +/* Buttons +------------------------------------------------------------------------*/ + +.fc-button { + position: relative; + display: inline-block; + cursor: pointer; + } + +.fc-state-default { /* non-theme */ + border-style: solid; + border-width: 1px 0; + } + +.fc-button-inner { + position: relative; + float: left; + overflow: hidden; + } + +.fc-state-default .fc-button-inner { /* non-theme */ + border-style: solid; + border-width: 0 1px; + } + +.fc-button-content { + position: relative; + float: left; + height: 1.9em; + line-height: 1.9em; + padding: 0 .6em; + white-space: nowrap; + } + +/* icon (for jquery ui) */ + +.fc-button-content .fc-icon-wrap { + position: relative; + float: left; + top: 50%; + } + +.fc-button-content .ui-icon { + position: relative; + float: left; + margin-top: -50%; + *margin-top: 0; + *top: -50%; + } + +/* gloss effect */ + +.fc-state-default .fc-button-effect { + position: absolute; + top: 50%; + left: 0; + } + +.fc-state-default .fc-button-effect span { + position: absolute; + top: -100px; + left: 0; + width: 500px; + height: 100px; + border-width: 100px 0 0 1px; + border-style: solid; + border-color: #fff; + background: #444; + opacity: .09; + filter: alpha(opacity=9); + } + +/* button states (determines colors) */ + +.fc-state-default, +.fc-state-default .fc-button-inner { + border-style: solid; + border-color: #ccc #bbb #aaa; + background: #F3F3F3; + color: #000; + } + +.fc-state-hover, +.fc-state-hover .fc-button-inner { + border-color: #999; + } + +.fc-state-down, +.fc-state-down .fc-button-inner { + border-color: #555; + background: #777; + } + +.fc-state-active, +.fc-state-active .fc-button-inner { + border-color: #555; + background: #777; + color: #fff; + } + +.fc-state-disabled, +.fc-state-disabled .fc-button-inner { + color: #999; + border-color: #ddd; + } + +.fc-state-disabled { + cursor: default; + } + +.fc-state-disabled .fc-button-effect { + display: none; + } + + + +/* Global Event Styles +------------------------------------------------------------------------*/ + +.fc-event { + border-style: solid; + border-width: 0; + font-size: .85em; + cursor: default; + } + +a.fc-event, +.fc-event-draggable { + cursor: pointer; + } + +a.fc-event { + text-decoration: none; + } + +.fc-rtl .fc-event { + text-align: right; + } + +.fc-event-skin { + border-color: #36c; /* default BORDER color */ + background-color: #36c; /* default BACKGROUND color */ + color: #fff; /* default TEXT color */ + } + +.fc-event-inner { + position: relative; + width: 100%; + height: 100%; + border-style: solid; + border-width: 0; + overflow: hidden; + } + +.fc-event-time, +.fc-event-title { + padding: 0 1px; + } + +.fc .ui-resizable-handle { /*** TODO: don't use ui-resizable anymore, change class ***/ + display: block; + position: absolute; + z-index: 99999; + overflow: hidden; /* hacky spaces (IE6/7) */ + font-size: 300%; /* */ + line-height: 50%; /* */ + } + + + +/* Horizontal Events +------------------------------------------------------------------------*/ + +.fc-event-hori { + border-width: 1px 0; + margin-bottom: 1px; + } + +/* resizable */ + +.fc-event-hori .ui-resizable-e { + top: 0 !important; /* importants override pre jquery ui 1.7 styles */ + right: -3px !important; + width: 7px !important; + height: 100% !important; + cursor: e-resize; + } + +.fc-event-hori .ui-resizable-w { + top: 0 !important; + left: -3px !important; + width: 7px !important; + height: 100% !important; + cursor: w-resize; + } + +.fc-event-hori .ui-resizable-handle { + _padding-bottom: 14px; /* IE6 had 0 height */ + } + + + +/* Fake Rounded Corners (for buttons and events) +------------------------------------------------------------*/ + +.fc-corner-left { + margin-left: 1px; + } + +.fc-corner-left .fc-button-inner, +.fc-corner-left .fc-event-inner { + margin-left: -1px; + } + +.fc-corner-right { + margin-right: 1px; + } + +.fc-corner-right .fc-button-inner, +.fc-corner-right .fc-event-inner { + margin-right: -1px; + } + +.fc-corner-top { + margin-top: 1px; + } + +.fc-corner-top .fc-event-inner { + margin-top: -1px; + } + +.fc-corner-bottom { + margin-bottom: 1px; + } + +.fc-corner-bottom .fc-event-inner { + margin-bottom: -1px; + } + + + +/* Fake Rounded Corners SPECIFICALLY FOR EVENTS +-----------------------------------------------------------------*/ + +.fc-corner-left .fc-event-inner { + border-left-width: 1px; + } + +.fc-corner-right .fc-event-inner { + border-right-width: 1px; + } + +.fc-corner-top .fc-event-inner { + border-top-width: 1px; + } + +.fc-corner-bottom .fc-event-inner { + border-bottom-width: 1px; + } + + + +/* Reusable Separate-border Table +------------------------------------------------------------*/ + +table.fc-border-separate { + border-collapse: separate; + } + +.fc-border-separate th, +.fc-border-separate td { + border-width: 1px 0 0 1px; + } + +.fc-border-separate th.fc-last, +.fc-border-separate td.fc-last { + border-right-width: 1px; + } + +.fc-border-separate tr.fc-last th, +.fc-border-separate tr.fc-last td { + border-bottom-width: 1px; + } + +.fc-border-separate tbody tr.fc-first td, +.fc-border-separate tbody tr.fc-first th { + border-top-width: 0; + } + + + +/* Month View, Basic Week View, Basic Day View +------------------------------------------------------------------------*/ + +.fc-grid th { + text-align: center; + } + +.fc-grid .fc-day-number { + float: right; + padding: 0 2px; + } + +.fc-grid .fc-other-month .fc-day-number { + opacity: 0.3; + filter: alpha(opacity=30); /* for IE */ + /* opacity with small font can sometimes look too faded + might want to set the 'color' property instead + making day-numbers bold also fixes the problem */ + } + +.fc-grid .fc-day-content { + clear: both; + padding: 2px 2px 1px; /* distance between events and day edges */ + } + +/* event styles */ + +.fc-grid .fc-event-time { + font-weight: bold; + } + +/* right-to-left */ + +.fc-rtl .fc-grid .fc-day-number { + float: left; + } + +.fc-rtl .fc-grid .fc-event-time { + float: right; + } + + + +/* Agenda Week View, Agenda Day View +------------------------------------------------------------------------*/ + +.fc-agenda table { + border-collapse: separate; + } + +.fc-agenda-days th { + text-align: center; + } + +.fc-agenda .fc-agenda-axis { + width: 50px; + padding: 0 4px; + vertical-align: middle; + text-align: right; + white-space: nowrap; + font-weight: normal; + } + +.fc-agenda .fc-day-content { + padding: 2px 2px 1px; + } + +/* make axis border take precedence */ + +.fc-agenda-days .fc-agenda-axis { + border-right-width: 1px; + } + +.fc-agenda-days .fc-col0 { + border-left-width: 0; + } + +/* all-day area */ + +.fc-agenda-allday th { + border-width: 0 1px; + } + +.fc-agenda-allday .fc-day-content { + min-height: 34px; /* TODO: doesnt work well in quirksmode */ + _height: 34px; + } + +/* divider (between all-day and slots) */ + +.fc-agenda-divider-inner { + height: 2px; + overflow: hidden; + } + +.fc-widget-header .fc-agenda-divider-inner { + background: #eee; + } + +/* slot rows */ + +.fc-agenda-slots th { + border-width: 1px 1px 0; + } + +.fc-agenda-slots td { + border-width: 1px 0 0; + background: none; + } + +.fc-agenda-slots td div { + height: 20px; + } + +.fc-agenda-slots tr.fc-slot0 th, +.fc-agenda-slots tr.fc-slot0 td { + border-top-width: 0; + } + +.fc-agenda-slots tr.fc-minor th, +.fc-agenda-slots tr.fc-minor td { + border-top-style: dotted; + } + +.fc-agenda-slots tr.fc-minor th.ui-widget-header { + *border-top-style: solid; /* doesn't work with background in IE6/7 */ + } + + + +/* Vertical Events +------------------------------------------------------------------------*/ + +.fc-event-vert { + border-width: 0 1px; + } + +.fc-event-vert .fc-event-head, +.fc-event-vert .fc-event-content { + position: relative; + z-index: 2; + width: 100%; + overflow: hidden; + } + +.fc-event-vert .fc-event-time { + white-space: nowrap; + font-size: 10px; + } + +.fc-event-vert .fc-event-bg { /* makes the event lighter w/ a semi-transparent overlay */ + position: absolute; + z-index: 1; + top: 0; + left: 0; + width: 100%; + height: 100%; + background: #fff; + opacity: .3; + filter: alpha(opacity=30); + } + +.fc .ui-draggable-dragging .fc-event-bg, /* TODO: something nicer like .fc-opacity */ +.fc-select-helper .fc-event-bg { + display: none\9; /* for IE6/7/8. nested opacity filters while dragging don't work */ + } + +/* resizable */ + +.fc-event-vert .ui-resizable-s { + bottom: 0 !important; /* importants override pre jquery ui 1.7 styles */ + width: 100% !important; + height: 8px !important; + overflow: hidden !important; + line-height: 8px !important; + font-size: 11px !important; + font-family: monospace; + text-align: center; + cursor: s-resize; + } + +.fc-agenda .ui-resizable-resizing { /* TODO: better selector */ + _overflow: hidden; + } + + Added: XoopsModules/fullcalendar/releases/1.01/fullcalendar/css/fullcalendar.print.css =================================================================== --- XoopsModules/fullcalendar/releases/1.01/fullcalendar/css/fullcalendar.print.css (rev 0) +++ XoopsModules/fullcalendar/releases/1.01/fullcalendar/css/fullcalendar.print.css 2012-06-12 18:15:44 UTC (rev 9644) @@ -0,0 +1,61 @@ +/* + * FullCalendar v1.5.3 Print Stylesheet + * + * Include this stylesheet on your page to get a more printer-friendly calendar. + * When including this stylesheet, use the media='print' attribute of the <link> tag. + * Make sure to include this stylesheet IN ADDITION to the regular fullcalendar.css. + * + * Copyright (c) 2011 Adam Shaw + * Dual licensed under the MIT and GPL licenses, located in + * MIT-LICENSE.txt and GPL-LICENSE.txt respectively. + * + * Date: Mon Feb 6 22:40:40 2012 -0800 + * + */ + + + /* Events +-----------------------------------------------------*/ + +.fc-event-skin { + background: none !important; + color: #000 !important; + } + +/* horizontal events */ + +.fc-event-hori { + border-width: 0 0 1px 0 !important; + border-bottom-style: dotted !important; + border-bottom-color: #000 !important; + padding: 1px 0 0 0 !important; + } + +.fc-event-hori .fc-event-inner { + border-width: 0 !important; + padding: 0 1px !important; + } + +/* vertical events */ + +.fc-event-vert { + border-width: 0 0 0 1px !important; + border-left-style: dotted !important; + border-left-color: #000 !important; + padding: 0 1px 0 0 !important; + } + +.fc-event-vert .fc-event-inner { + border-width: 0 !important; + padding: 1px 0 !important; + } + +.fc-event-bg { + display: none !important; + } + +.fc-event .ui-resizable-handle { + display: none !important; + } + + Added: XoopsModules/fullcalendar/releases/1.01/fullcalendar/css/index.html =================================================================== --- Xoo... [truncated message content] |
From: <dj...@us...> - 2012-06-12 14:59:28
|
Revision: 9643 http://xoops.svn.sourceforge.net/xoops/?rev=9643&view=rev Author: djculex Date: 2012-06-12 14:59:17 +0000 (Tue, 12 Jun 2012) Log Message: ----------- Updating change log to RC 8 Modified Paths: -------------- XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt Modified: XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt =================================================================== --- XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt 2012-06-12 14:54:18 UTC (rev 9642) +++ XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt 2012-06-12 14:59:17 UTC (rev 9643) @@ -1,4 +1,22 @@ ------------------------------ +Changelog v.1.15 RC 8 +------------------------------ +12 June 2012 Revision 9540 - 9642 + +- Bugfix: Updates were not embedded when submitting update +- Bugfix: Fixed wrong avatar showing in mail when replying comment / update +- Bugfix: Replaced icon_start.png to correct version +- Change: A bit of styling to upload screen +- Change: Added a jquery each using regex to filter all mp3 to be used in oembed -> showing audio player +- Change: Ajusted jquery for fileupload maxheight is 40% of screen +- Change: Wrote to new plugins for oembed so xoops news and mp3 files are automatic embedded in updates +- Change: Adjusted margin in download css/jquery.fileupload-ui.css +- Change: Adjusted height in download window +- Change: Adjusted credits +- change: Added height & innerHeight to show gallery +- Change: French translations (Cesag) + +------------------------------ Changelog v.1.15 RC 7 ------------------------------ 13 May 2012 Revision 9464 - 9502 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dj...@us...> - 2012-06-12 14:54:24
|
Revision: 9642 http://xoops.svn.sourceforge.net/xoops/?rev=9642&view=rev Author: djculex Date: 2012-06-12 14:54:18 +0000 (Tue, 12 Jun 2012) Log Message: ----------- - Change: A bit of styling to upload screen Modified Paths: -------------- XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_imgupload.html Modified: XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_imgupload.html =================================================================== --- XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_imgupload.html 2012-06-12 14:53:24 UTC (rev 9641) +++ XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_imgupload.html 2012-06-12 14:54:18 UTC (rev 9642) @@ -5,7 +5,7 @@ <{section name=i loop=$uploadform}> <{$uploadform[i]}> <{/section}> - <table class="files"> + <table style="height:500px" class="files"> <tr class="file_upload_template" style="display:none;"> <td class="file_upload_preview"></td> <td class="file_name"></td> @@ -14,11 +14,11 @@ <td class="file_upload_start"><button><{$smarty.const._SMALLWORLD_IMAGES_START}></button></td> <td class="file_upload_cancel"><button><{$smarty.const._SMALLWORLD_IMAGES_CANCEL}></button></td> </tr> - <tr class="file_download_template" style="display:none;"> - <td class="file_download_preview"></td> - <td class="file_name"><a></a></td> - <td class="file_size"></td> - <td class="file_download_delete" colspan="3"><button><{$smarty.const._SMALLWORLD_IMAGES_DELETE}></button></td> + <tr class="file_download_template" style="height:59px;display:none;"> + <td style="vertical-align: middle;" class="file_download_preview"></td> + <td style="vertical-align: middle;" class="file_name"><a></a></td> + <td style="vertical-align: middle;" class="file_size"></td> + <td style="vertical-align: middle;" class="file_download_delete" colspan="3"><button><{$smarty.const._SMALLWORLD_IMAGES_DELETE}></button></td> </tr> </table> <div class="file_upload_overall_progress"><div style="display:none;"></div></div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dj...@us...> - 2012-06-12 14:53:30
|
Revision: 9641 http://xoops.svn.sourceforge.net/xoops/?rev=9641&view=rev Author: djculex Date: 2012-06-12 14:53:24 +0000 (Tue, 12 Jun 2012) Log Message: ----------- - Bugfix: Updates were not embedded when submitting update Modified Paths: -------------- XoopsModules/smallworld/trunk/smallworld/templates/getlastmsg.html Modified: XoopsModules/smallworld/trunk/smallworld/templates/getlastmsg.html =================================================================== --- XoopsModules/smallworld/trunk/smallworld/templates/getlastmsg.html 2012-06-12 14:51:00 UTC (rev 9640) +++ XoopsModules/smallworld/trunk/smallworld/templates/getlastmsg.html 2012-06-12 14:53:24 UTC (rev 9641) @@ -1,13 +1,4 @@ <{foreach item=post from=$walldata}> - - <script type="text/javascript"> - xoops_smallworld(document).ready(function(){ - xoops_smallworld("#smallworld_stexpand<{$post.msg_id}>").oembed("<{$post.orimessage}>",{ - maxWidth: "100%", - maxHeight: "100%" - }); - }); - </script> <div class="smallworld_stbody" id="smallworld_stbody<{$post.msg_id}>"> <div class="smallworld_stimg"> @@ -119,5 +110,11 @@ xoops_smallworld(document).ready(function(){ smallworldCheckNumDivs(); attachAvatarOpen(); + + xoops_smallworld('#smallworld_stexpand<{$post.msg_id}>').oembed('<{$post.orimessage}>',{ + maxWidth: "100%", + maxHeight: "100%" + }); + }); </script> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dj...@us...> - 2012-06-12 14:51:09
|
Revision: 9640 http://xoops.svn.sourceforge.net/xoops/?rev=9640&view=rev Author: djculex Date: 2012-06-12 14:51:00 +0000 (Tue, 12 Jun 2012) Log Message: ----------- - Change: Added a jquery each using regex to filter all mp3 to be used in oembed -> showing audio player Modified Paths: -------------- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js Modified: XoopsModules/smallworld/trunk/smallworld/js/smallworld.js =================================================================== --- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-06-12 14:49:36 UTC (rev 9639) +++ XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-06-12 14:51:00 UTC (rev 9640) @@ -639,6 +639,28 @@ smallworldCheckNumDivs(); + + +xoops_smallworld('a').each(function(){ + if(xoops_smallworld(this).attr('href')!=undefined){ + match = xoops_smallworld(this).attr('href').match(/\.(mp3)/); + if (match!=null) { + href = xoops_smallworld(this).attr('href'); + text = xoops_smallworld(this).text(); + player = + '<object type="application/x-shockwave-flash" data="http://flash-mp3-player.net/medias/player_mp3_maxi.swf" width="200" height="20">' + + '<param name="movie" value="http://flash-mp3-player.net/medias/player_mp3_maxi.swf" />' + + '<param name="bgcolor" value="#ffffff" />' + + '<param name="FlashVars" value="mp3=' + href + '&showstop=1&showvolume=1" />'+ + '</object>'; + + p = xoops_smallworld(this).parent(); + // xoops_smallworld(this).remove(); + xoops_smallworld(p).append(player); + } + } +}); + }); // END OF DOCUMENT READY IN THE START This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dj...@us...> - 2012-06-12 14:49:47
|
Revision: 9639 http://xoops.svn.sourceforge.net/xoops/?rev=9639&view=rev Author: djculex Date: 2012-06-12 14:49:36 +0000 (Tue, 12 Jun 2012) Log Message: ----------- - Change: Ajusted jquery for fileupload maxheight is 40% of screen Modified Paths: -------------- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js Modified: XoopsModules/smallworld/trunk/smallworld/js/smallworld.js =================================================================== --- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-06-12 14:47:46 UTC (rev 9638) +++ XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-06-12 14:49:36 UTC (rev 9639) @@ -133,8 +133,11 @@ xoops_smallworld('#file_upload').show(); xoops_smallworld.fn.colorbox({ width:"auto", - height:"70%", + MaxHeight:"40%", inline:true, + onComplete: function() { + xoops_smallworld("#file_upload").css("max-height","200px"); + }, onCleanup:function() { xoops_smallworld('#file_upload').hide(); }, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dj...@us...> - 2012-06-12 14:47:57
|
Revision: 9638 http://xoops.svn.sourceforge.net/xoops/?rev=9638&view=rev Author: djculex Date: 2012-06-12 14:47:46 +0000 (Tue, 12 Jun 2012) Log Message: ----------- - Change: Wrote to new plugins for oembed so xoops news and mp3 files are automatic embedded in updates Modified Paths: -------------- XoopsModules/smallworld/trunk/smallworld/js/jquery.oembed.js Modified: XoopsModules/smallworld/trunk/smallworld/js/jquery.oembed.js =================================================================== --- XoopsModules/smallworld/trunk/smallworld/js/jquery.oembed.js 2012-06-12 14:46:29 UTC (rev 9637) +++ XoopsModules/smallworld/trunk/smallworld/js/jquery.oembed.js 2012-06-12 14:47:46 UTC (rev 9638) @@ -614,8 +614,21 @@ } } }), + + // Culex added pages + // Xoops news + new xoops_smallworld.fn.oembed.OEmbedProvider("xoopsnews", "rich", ["xoops.org/modules/news/article.php.storyid.\\d+"], null, + {yql:{xpath:'//div[@class="wox_news_item wox_news_single_item"]', from: 'htmlstring' + , datareturn:function(results){ + if(!results.result) return false; + return "<div class='xo-content'>"+results.result+"</div>"; + } + } + }), - + // Audio files to yahoo player + //.+/([0-9]+)([a-zA-Z]+)(.wav|.mp3|.mp4) + //<script type="text/javascript" src="http://webplayer.yahooapis.com/player.js"></script> //Use Open Graph Where applicable new xoops_smallworld.fn.oembed.OEmbedProvider("opengraph", "rich", [".*"], null, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dj...@us...> - 2012-06-12 14:46:38
|
Revision: 9637 http://xoops.svn.sourceforge.net/xoops/?rev=9637&view=rev Author: djculex Date: 2012-06-12 14:46:29 +0000 (Tue, 12 Jun 2012) Log Message: ----------- Replaced icon_start.png to correct version Modified Paths: -------------- XoopsModules/smallworld/trunk/smallworld/images/icon_start.png Modified: XoopsModules/smallworld/trunk/smallworld/images/icon_start.png =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dj...@us...> - 2012-06-12 14:45:41
|
Revision: 9636 http://xoops.svn.sourceforge.net/xoops/?rev=9636&view=rev Author: djculex Date: 2012-06-12 14:45:32 +0000 (Tue, 12 Jun 2012) Log Message: ----------- - Change: Adjusted margin in download css/jquery.fileupload-ui.css Modified Paths: -------------- XoopsModules/smallworld/trunk/smallworld/css/jquery.fileupload-ui.css Modified: XoopsModules/smallworld/trunk/smallworld/css/jquery.fileupload-ui.css =================================================================== --- XoopsModules/smallworld/trunk/smallworld/css/jquery.fileupload-ui.css 2012-06-12 14:44:38 UTC (rev 9635) +++ XoopsModules/smallworld/trunk/smallworld/css/jquery.fileupload-ui.css 2012-06-12 14:45:32 UTC (rev 9636) @@ -148,4 +148,8 @@ .file_upload .ui-widget { font-size: 0.8em; +} + +.file_download_template { +margin: 20px; } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dj...@us...> - 2012-06-12 14:44:49
|
Revision: 9635 http://xoops.svn.sourceforge.net/xoops/?rev=9635&view=rev Author: djculex Date: 2012-06-12 14:44:38 +0000 (Tue, 12 Jun 2012) Log Message: ----------- - Change: Adjusted height in download window Modified Paths: -------------- XoopsModules/smallworld/trunk/smallworld/css/galleriffic-5.css Modified: XoopsModules/smallworld/trunk/smallworld/css/galleriffic-5.css =================================================================== --- XoopsModules/smallworld/trunk/smallworld/css/galleriffic-5.css 2012-06-12 14:43:39 UTC (rev 9634) +++ XoopsModules/smallworld/trunk/smallworld/css/galleriffic-5.css 2012-06-12 14:44:38 UTC (rev 9635) @@ -302,8 +302,8 @@ margin-left: 33%; } div.photo-index { - - font-size:1.1em; + font-size:0.7em; + left:70%; } div.navigation a.prev { background-image: url('../images/prevPageArrow.gif'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dj...@us...> - 2012-06-12 14:43:49
|
Revision: 9634 http://xoops.svn.sourceforge.net/xoops/?rev=9634&view=rev Author: djculex Date: 2012-06-12 14:43:39 +0000 (Tue, 12 Jun 2012) Log Message: ----------- - Bug: Fixed wrong avatar showing in mail when replying comment / update Modified Paths: -------------- XoopsModules/smallworld/trunk/smallworld/class/mail.php Modified: XoopsModules/smallworld/trunk/smallworld/class/mail.php =================================================================== --- XoopsModules/smallworld/trunk/smallworld/class/mail.php 2012-06-12 14:42:37 UTC (rev 9633) +++ XoopsModules/smallworld/trunk/smallworld/class/mail.php 2012-06-12 14:43:39 UTC (rev 9634) @@ -111,7 +111,7 @@ - $owner = Smallworld_getOwnerFromComment ($data['msg_id_fk']); + $owner = Smallworld_getOwnerFromComment ($data['msg_id_fk']); $OwnerUser = new xoopsUser($owner); $Owner_avatar = $wall->Gravatar($owner); $Owner_avatarlink = "<img class='left' src='".XOOPS_URL."/uploads/".$Owner_avatar."' height='90px' width='90px'>"; @@ -129,7 +129,7 @@ $tpl->assign('sendnameurl',$SendNameUrl); $tpl->assign('sitename', $xoopsConfig['sitename']); $tpl->assign('ownermessage', $ownermessage); - $tpl->assign('from_avatarlink', $Owner_avatarlink); + $tpl->assign('from_avatarlink', $from_avatarlink); $tpl->assign('to_avatarlink', $Owner_avatarlink); $tpl->assign('itemtext', stripslashes($data['comment'])); $tpl->assign('itemtextdate',$date); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dj...@us...> - 2012-06-12 14:42:47
|
Revision: 9633 http://xoops.svn.sourceforge.net/xoops/?rev=9633&view=rev Author: djculex Date: 2012-06-12 14:42:37 +0000 (Tue, 12 Jun 2012) Log Message: ----------- - Change: Adjusted credits Modified Paths: -------------- XoopsModules/smallworld/trunk/smallworld/xoops_version.php Modified: XoopsModules/smallworld/trunk/smallworld/xoops_version.php =================================================================== --- XoopsModules/smallworld/trunk/smallworld/xoops_version.php 2012-06-10 18:18:42 UTC (rev 9632) +++ XoopsModules/smallworld/trunk/smallworld/xoops_version.php 2012-06-12 14:42:37 UTC (rev 9633) @@ -24,7 +24,7 @@ $modversion['description'] = _MI_SMALLWORLD_MODULE_DESC; $modversion['author'] = "Michael Albertsen"; $modversion['nickname'] = 'Culex'; -$modversion['credits'] = "Mariane, Mrsculex, Mamba, Rune, Zth, Cesag"; +$modversion['credits'] = "Mariane, Mrsculex, Mamba, Rune, Zth, Cesag, Flipse"; $modversion['module_website_name'] = 'www.culex.dk'; $modversion['module_website_url'] = 'www.culex.dk'; $modversion['license'] = 'GNU GPL'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ren...@us...> - 2012-06-10 18:18:48
|
Revision: 9632 http://xoops.svn.sourceforge.net/xoops/?rev=9632&view=rev Author: renetjuh Date: 2012-06-10 18:18:42 +0000 (Sun, 10 Jun 2012) Log Message: ----------- Updated NL language files News 1.67 Modified Paths: -------------- XoopsLanguages/dutch/modules/news/news 1.67/nederlands/admin.php Modified: XoopsLanguages/dutch/modules/news/news 1.67/nederlands/admin.php =================================================================== --- XoopsLanguages/dutch/modules/news/news 1.67/nederlands/admin.php 2012-06-10 18:06:21 UTC (rev 9631) +++ XoopsLanguages/dutch/modules/news/news 1.67/nederlands/admin.php 2012-06-10 18:18:42 UTC (rev 9632) @@ -227,4 +227,8 @@ define ("_AM_NEWS_THEREARE_STORIES_VOTEDATA", "Er zijn <span class='red bold'>%s</span> artikelen bekeken"); define ("_AM_NEWS_THEREARE_STORIES_IMPORTED", "Er zijn <span class='red bold'>%s</span> artikelen geimporteerd"); define ("_AM_NEWS_THEREARE_STORIES_EXPORTED", "Er zijn <span class='red bold'>%s</span> Stories exported"); +define ("_AM_NEWS_THEREARE_STORIES_EXPIRED", "Er zijn <span class='red bold'>%s</span> artikelen verlopen"); +define ("_AM_NEWS_THEREARE_STORIES_EXPIRED_SOON", "Er zijn <span class='red bold'>%s</span> artikelen bijna verlopen"); +define ("_AM_NEWS_THEREARE_STORIES_APPROVED", "Er zijn <span class='red bold'>%s</span> Goedgekeurde artikelen"); +define ("_AM_NEWS_THEREARE_STORIES_NEED_APPROVAL", "Er zijn <span class='red bold'>%s</span> artikelen voor goedkeuring"); ?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ren...@us...> - 2012-06-10 18:06:28
|
Revision: 9631 http://xoops.svn.sourceforge.net/xoops/?rev=9631&view=rev Author: renetjuh Date: 2012-06-10 18:06:21 +0000 (Sun, 10 Jun 2012) Log Message: ----------- Updated NL language files News 1.67 Modified Paths: -------------- XoopsLanguages/dutch/modules/news/news 1.67/nederlands/admin.php XoopsLanguages/dutch/modules/news/news 1.67/nederlands/blocks.php XoopsLanguages/dutch/modules/news/news 1.67/nederlands/mail_template/category_newstory_notify.tpl XoopsLanguages/dutch/modules/news/news 1.67/nederlands/mail_template/global_newcategory_notify.tpl XoopsLanguages/dutch/modules/news/news 1.67/nederlands/mail_template/global_newstory_notify.tpl XoopsLanguages/dutch/modules/news/news 1.67/nederlands/mail_template/global_storysubmit_notify.tpl XoopsLanguages/dutch/modules/news/news 1.67/nederlands/mail_template/story_approve_notify.tpl XoopsLanguages/dutch/modules/news/news 1.67/nederlands/mail_template/topic_newstory_notify.tpl XoopsLanguages/dutch/modules/news/news 1.67/nederlands/main.php XoopsLanguages/dutch/modules/news/news 1.67/nederlands/modinfo.php Modified: XoopsLanguages/dutch/modules/news/news 1.67/nederlands/admin.php =================================================================== --- XoopsLanguages/dutch/modules/news/news 1.67/nederlands/admin.php 2012-06-10 18:03:01 UTC (rev 9630) +++ XoopsLanguages/dutch/modules/news/news 1.67/nederlands/admin.php 2012-06-10 18:06:21 UTC (rev 9631) @@ -1,4 +1,7 @@ <?php +// +// Update vertaling 03-05-2012 By Ritchie for NLXOOPS.NL // +// // $Id: admin.php,v 1.18 2004/07/26 17:51:25 hthouzard Exp $ //%%%%%% Admin Module Name Articles %%%%% define("_AM_DBUPDATED","De Database is succesvol bijgewerkt!"); @@ -10,10 +13,10 @@ define("_AM_POSTER","Auteur"); define("_AM_PROGRAMMED","Ingestelde Datum/Tijd"); //Programmed Date/Time define("_AM_ACTION","Actie"); -define("_AM_EDIT","Bewerk"); +define("_AM_EDIT","Bewerken"); define("_AM_DELETE","Verwijder"); define("_AM_LAST10ARTS","Laatste %d Artikelen"); -define("_AM_PUBLISHED","Gepubliceerd"); // Published Date +define("_AM_PUBLISHED","Gepubliceerd op"); // Published Date define("_AM_GO","Ga!"); define("_AM_EDITARTICLE","Bewerk artikel"); define("_AM_POSTNEWARTICLE","Post Nieuw Artikel"); @@ -53,7 +56,7 @@ // Warning, changed from 40 to 255 characters. define("_AM_MAX40CHAR","(max: 255 karakters)"); define("_AM_TOPICIMG","Categorie Afbeelding"); -define("_AM_IMGNAEXLOC","naam afbeelding + extensie gelocaliseerd in %s"); +define("_AM_IMGNAEXLOC","naam afbeelding + extensie gevonden in %s"); define("_AM_FEXAMPLE","bijvoorbeeld: games.gif"); define("_AM_ADDSUBTOPIC","Voeg een SUB Categorie toe"); define("_AM_IN","in"); @@ -61,7 +64,7 @@ define("_AM_MODIFY","Modificeer"); define("_AM_PARENTTOPIC","Ouder Categorie"); define("_AM_SAVECHANGE","Wijzigingen opslaan"); -define("_AM_DEL","Delete"); +define("_AM_DEL","Verwijder"); define("_AM_CANCEL","Annuleren"); //Cancel define("_AM_WAYSYWTDTTAL","WAARSCHUWING: Weet je zeker dat je deze Categorie en al haar daarin gelegen Artikelen en Commenta(a)r(en) wilt verwijderen?"); @@ -70,7 +73,7 @@ define("_AM_TOPICSMNGR","Categoriebeheer"); define("_AM_PEARTICLES","Post/Bewerk Artikelen"); define("_AM_NEWSUB","Nieuwe Inzendingen"); //Submissions -define("_AM_POSTED","Gepost"); //Posted +define("_AM_POSTED","Gepost op"); //Posted define("_AM_GENERALCONF","Algemene Instellingen"); //Configuration // Added in RC2 @@ -83,7 +86,7 @@ define("_AM_EXPIRED","Verlopen"); //expired define("_AM_CHANGEEXPDATETIME","Wijzig de verloopdatum/-tijd"); define("_AM_SETEXPDATETIME","Stel de verloopdatum/-tijd in"); -define("_AM_NOWSETEXPTIME","Het is nu ingesteld op: %s"); +define("_AM_NOWSETEXPTIME","Deze is nu ingesteld op: %s"); // Added in RC3 define("_AM_ERRORTOPICNAME", "Je moet een categorienaam invoeren!"); //You must enter a topic name @@ -91,7 +94,7 @@ // Added 240304 (Mithrandir) define('_AM_GROUPPERM', 'Inzenden/Goedkeuren/Lees Permissies'); //Submit/Approve/View Permissions -define('_AM_SELFILE','Selecteer het bestand dat u je wilt uploaden'); //Selecteer file to upload +define('_AM_SELFILE','Selecteer het bestand dat je wilt uploaden'); //Selecteer file to upload // Added by Hervé define('_AM_UPLOAD_DBERROR_SAVE','FOUT: Kon dit artikel niet voorzien van de bijlage '); //Error while attaching file to the story @@ -105,7 +108,7 @@ define('_AM_VIEWFORM_DESC', 'Selecteer wie welke Categorieën mag lezen'); define('_AM_DELETE_SELFILES', 'Verwijder de geselcteerde bestanden'); define('_AM_TOPIC_PICTURE', 'Upload afbeelding'); -define('_AM_UPLOAD_WARNING', '<B>ATTENTIE, vergeet niet de juiste lees-/schrijfrechten (Chmodt) in te stellen voor de navolgende folder: %s</B>'); +define('_AM_UPLOAD_WARNING', '<B>ATTENTIE, vergeet niet de juiste lees-/schrijfrechten (Chmod) in te stellen voor de navolgende folder: %s</B>'); define('_AM_NEWS_UPGRADECOMPLETE', 'Upgrade Compleet'); define('_AM_NEWS_UPDATEMODULE', 'Update module templates en blokken'); @@ -127,9 +130,9 @@ define('_AM_NEWS_UPGRADEFAILED1', 'Niet mogelijk om de tabel stories_files aan te maken'); define('_AM_NEWS_UPGRADEFAILED2', "Niet mogelijk om de lengte van de onderwerptitel aan te passen"); define('_AM_NEWS_UPGRADEFAILED21', "Niet mogelijk om nieuwe velden aan de onderwerptabel toe te voegen"); -define('_AM_NEWS_UPGRADEFAILED3', "Niet mogelijk om omde tabel stories_votedata aan te maken"); +define('_AM_NEWS_UPGRADEFAILED3', "Niet mogelijk om om de tabel stories_votedata aan te maken"); define('_AM_NEWS_UPGRADEFAILED4', "Niet mogelijk om de twee velden 'cijfer' en 'stemmen' voor de 'story' tabel aan te maken"); -define('_AM_NEWS_UPGRADEFAILED0', "Please note the messages and try to correct the problems with phpMyadmin and the sql definition's file available in the 'sql' folder of the news module"); +define('_AM_NEWS_UPGRADEFAILED0', "Neem a.u.b notie van dit bericht en probeer het probleem te verhelpen met bijvoorbeeld phpMyadmin en het sql definitie bestand. Deze is beschikbaar in de map 'sql' van de nieuws module."); define('_AM_NEWS_UPGR_ACCESS_ERROR',"FOUT, om het upgrade script te gebruiken, moet u een admin van deze module zijn"); define('_AM_NEWS_PRUNE_BEFORE',"Artikelen opruimen die gepubliceerd zijn voor:"); //stories that were published before @@ -138,13 +141,13 @@ define('_AM_NEWS_PRUNE_TOPICS',"Geef categorieën aan"); //Limit to the following topics define('_AM_NEWS_PRUNENEWS', 'Opruimen nieuws'); define('_AM_NEWS_EXPORT_NEWS', 'Nieuws-artikelen Exporteren'); -define('_AM_NEWS_EXPORT_NOTHING', "Sorrie, maar er valt niets te exporteren. Svp controleer je criteria"); +define('_AM_NEWS_EXPORT_NOTHING', "Sorry, maar er valt niets te exporteren. Controleer je criteria"); define('_AM_NEWS_PRUNE_DELETED', '%d nieuws is verwijderd'); define('_AM_NEWS_PERM_WARNING', '<h4>ATTENTIE, er zijn drie afzonderlijke permissie formulieren. De permissie-instellingen moeten per formulier verstuurd worden </h4>'); //you have 3 forms so you have 3 submit buttons define('_AM_NEWS_EXPORT_BETWEEN', 'Exporteer nieuws gepubliceerd tussen'); define('_AM_NEWS_EXPORT_AND', ' en '); define('_AM_NEWS_EXPORT_PRUNE_DSC', "Als je geen Categorie(ën) aangeeft zal het opruimen op alle categorieën toegepast worden.<br/>In het andere geval alléén op de aangegeven categorieën."); -define('_AM_NEWS_EXPORT_INCTOPICS', 'Include Categorie Definities ?'); +define('_AM_NEWS_EXPORT_INCTOPICS', 'Inclusief Categorie Definities ?'); define('_AM_NEWS_EXPORT_ERROR', 'Error gedurende het creëeren van het bestand: %s. Operatie is gestopt.'); define('_AM_NEWS_EXPORT_READY', "Je xml export bestand is klaar om te downloaden. <br /><a href='%s'>Klik op deze link om het bestand te downloaden</a>.<br />Vergeet niet om het te <a href='%s'>verwijderen</a> zodra je klaar bent."); define('_AM_NEWS_RSS_URL', "URL van RSS feed"); @@ -168,9 +171,9 @@ define('_AM_NEWS_STATS11',"Artikel telling"); define('_AM_NEWS_HELP',"Help"); define("_AM_NEWS_MODULEADMIN","Module Admin"); -define("_AM_NEWS_GENERALSET", "Nieuws Module Settings" ); +define("_AM_NEWS_GENERALSET", "Nieuws Module Instellingen" ); define('_AM_NEWS_GOTOMOD','Ga naar nieuwsmodule'); -define('_AM_NEWS_NOTHING',"Sorrie, maar er valt niets te downloaden. Veririeër je criteria !"); +define('_AM_NEWS_NOTHING',"Sorry, maar er valt niets te downloaden. Verfieër je criteria !"); define('_AM_NEWS_NOTHING_PRUNE',"Sorry, maar er valt geen nieuws op te ruimen. Verifieër je criteria !"); define('_AM_NEWS_TOPIC_COLOR',"Categorie Kleur"); define('_AM_NEWS_COLOR',"Kleur"); @@ -213,4 +216,15 @@ define("_AM_NEWS_CONFIG_CHECK","Configuratiecontrole"); define("_AM_NEWS_CONFIG_PHP","Minimum PHP versie benodigd: %s (huidige versie is %s)"); define("_AM_NEWS_CONFIG_XOOPS","Minimum XOOPS versie benodigd: %s (huidige versie is %s)"); + +define ("_AM_NEWS_STATISTICS", "Nieuws Dashboard"); +define ("_AM_NEWS_THEREARE_STORIES", "Er zijn <span class='red bold'>%s</span> artikelen in de database"); +define ("_AM_NEWS_THEREARE_STORIES_ONLINE", "Er zijn <span class='red bold'>%s</span> artikelen Online"); +define ("_AM_NEWS_THEREARE_STORIES_FILES", "Er zijn <span class='red bold'>%s</span> Stories_files in de database"); +define ("_AM_NEWS_THEREARE_STORIES_FILES_ONLINE", "TEr zijn <span class='red bold'>%s</span> Stories_files online"); +define ("_AM_NEWS_THEREARE_TOPICS", "Er zijn <span class='red bold'>%s</span> categoriën in de database"); +define ("_AM_NEWS_THEREARE_TOPICS_ONLINE", "Er zijn <span class='red bold'>%s</span> categoriën Online"); +define ("_AM_NEWS_THEREARE_STORIES_VOTEDATA", "Er zijn <span class='red bold'>%s</span> artikelen bekeken"); +define ("_AM_NEWS_THEREARE_STORIES_IMPORTED", "Er zijn <span class='red bold'>%s</span> artikelen geimporteerd"); +define ("_AM_NEWS_THEREARE_STORIES_EXPORTED", "Er zijn <span class='red bold'>%s</span> Stories exported"); ?> \ No newline at end of file Modified: XoopsLanguages/dutch/modules/news/news 1.67/nederlands/blocks.php =================================================================== --- XoopsLanguages/dutch/modules/news/news 1.67/nederlands/blocks.php 2012-06-10 18:03:01 UTC (rev 9630) +++ XoopsLanguages/dutch/modules/news/news 1.67/nederlands/blocks.php 2012-06-10 18:06:21 UTC (rev 9631) @@ -1,7 +1,10 @@ <?php +// +// Update vertaling 03-05-2012 By Ritchie for NLXOOPS.NL // +// // $Id: blocks.php,v 1.16 2004/09/01 17:48:07 hthouzard Exp $ define("_MB_NEWS_NOTYET","Er is vandaag nog geen belangijkste artikel."); -define("_MB_NEWS_TMRSI","Vandaag meest gelezen artikel is:"); +define("_MB_NEWS_TMRSI","Meest gelezen artikel vandaag is:"); define("_MB_NEWS_ORDER","Sorteer op"); define("_MB_NEWS_DATE","Publicatie datum"); define("_MB_NEWS_HITS","Aantal keer bekeken"); @@ -14,8 +17,8 @@ define("_MB_POSTER", "Auteur"); define("_MB_ACTION", "Actie"); define("_MB_TOPIC", "Categorie"); -define("_MB_DELETE", "Delete"); -define("_MB_NEWS_RESTRICTTOPICS", "Restrict categorieën to viewable by user?"); +define("_MB_DELETE", "Verwijder"); +define("_MB_NEWS_RESTRICTTOPICS", "Beperk categorieën tot beschikbaar voor gebruiker?"); define("_MB_NEWS_TEASER", "Toon Teaser Lengte (0 voor geen teaser)"); define("_MB_NEWS_SPOTLIGHT", "Activeer Spotlight toepassing"); define("_MB_NEWS_FIRST", "--Eerste item--"); @@ -30,12 +33,12 @@ define("_MB_NEWS_VIEW_TYPE1", "Klassiek"); define("_MB_NEWS_VIEW_TYPE2", "Getabbed"); define("_MB_NEWS_TAB_COLOR1", "Kleurinstelling van de overzichtslijn (dit is de regel direct onder de tabknoppen)"); -define("_MB_NEWS_TAB_COLOR2", "Achtergrondkleur van de tab content");//Background color of the tab's content +define("_MB_NEWS_TAB_COLOR2", "Achtergrondkleur van de inhoud tab");//Background color of the tab's content define("_MB_NEWS_TAB_COLOR3", "Huidige tab header's kleur"); define("_MB_NEWS_TAB_COLOR4", "Kleur van de niet actieve (geselecteerde) tabs"); define("_MB_NEWS_TAB_COLOR5", "Header's hover kleur"); define("_MB_NEWS_WHAT_PUBLISH", "Wat wil je plaatsen<br />in de Spotlight ?"); -define("_MB_NEWS_RECENT_NEWS", "Recent nieuws (gebruik dan niet benedenstaande lijst)"); +define("_MB_NEWS_RECENT_NEWS", "Recent nieuws (gebruik dan niet onderstaande lijst)"); define("_MB_NEWS_RECENT_SPECIFIC", "Een specifiek nieuws-artikel (zie beneden)"); define("_MB_NEWS_DEFAULT_COLORS", "Laat de velden leeg om de standaard kleuren te gebruiken."); Modified: XoopsLanguages/dutch/modules/news/news 1.67/nederlands/mail_template/category_newstory_notify.tpl =================================================================== --- XoopsLanguages/dutch/modules/news/news 1.67/nederlands/mail_template/category_newstory_notify.tpl 2012-06-10 18:03:01 UTC (rev 9630) +++ XoopsLanguages/dutch/modules/news/news 1.67/nederlands/mail_template/category_newstory_notify.tpl 2012-06-10 18:06:21 UTC (rev 9631) @@ -1,4 +1,4 @@ -Hello {X_UNAME}, +Hallo {X_UNAME}, Een nieuw artikel "{STORY_NAME}" is geplaatst op {X_SITENAME}. @@ -7,9 +7,9 @@ ----------- -U ontvangt dit bericht omdat u heeft aangegeven berichten te willen ontvangen wanneer nieuwe events zijn toegevoegd aan de wesite. +U ontvangt deze e-mail omdat u heeft aangegeven bericht te willen ontvangen wanneer nieuwe berichten zijn toegevoegd aan de wesite. -Als dit een fout is of u dit bericht niet meer wenst te ontvangen, wijzig dan u instellingen voor het ontvangen van notificaties hier: +Als dit een fout is of u dit bericht niet meer wenst te ontvangen, wijzig dan uw instellingen voor het ontvangen van notificaties hier: {X_UNSUBSCRIBE_URL} Graag niet reageren op deze e-mail. Modified: XoopsLanguages/dutch/modules/news/news 1.67/nederlands/mail_template/global_newcategory_notify.tpl =================================================================== --- XoopsLanguages/dutch/modules/news/news 1.67/nederlands/mail_template/global_newcategory_notify.tpl 2012-06-10 18:03:01 UTC (rev 9630) +++ XoopsLanguages/dutch/modules/news/news 1.67/nederlands/mail_template/global_newcategory_notify.tpl 2012-06-10 18:06:21 UTC (rev 9631) @@ -1,4 +1,4 @@ -Hello {X_UNAME}, +Hallo {X_UNAME}, Een nieuwscategorie "{TOPIC_NAME}" is aangemaakt op {X_SITENAME}. @@ -7,9 +7,9 @@ ----------- -U ontvangt dit bericht omdat u heeft aangegeven berichten te willen ontvangen wanneer nieuwe events zijn toegevoegd aan de wesite. +U ontvangt deze e-mail omdat u heeft aangegeven bericht te willen ontvangen wanneer een nieuwe categorie is toegevoegd aan de wesite. -Als dit een fout is of u dit bericht niet meer wenst te ontvangen, wijzig dan u instellingen voor het ontvangen van notificaties hier: +Als dit een fout is of u dit bericht niet meer wenst te ontvangen, wijzig dan uw instellingen voor het ontvangen van notificaties hier: {X_UNSUBSCRIBE_URL} Graag niet reageren op deze e-mail. Modified: XoopsLanguages/dutch/modules/news/news 1.67/nederlands/mail_template/global_newstory_notify.tpl =================================================================== --- XoopsLanguages/dutch/modules/news/news 1.67/nederlands/mail_template/global_newstory_notify.tpl 2012-06-10 18:03:01 UTC (rev 9630) +++ XoopsLanguages/dutch/modules/news/news 1.67/nederlands/mail_template/global_newstory_notify.tpl 2012-06-10 18:06:21 UTC (rev 9631) @@ -1,4 +1,4 @@ -Hello {X_UNAME}, +Hallo {X_UNAME}, Een nieuw artikel "{STORY_NAME}" is aangemaakt op {X_SITENAME}. @@ -7,7 +7,7 @@ ----------- -U ontvangt dit bericht omdat u heeft aangegeven berichten te willen ontvangen wanneer nieuwe events zijn toegevoegd aan de wesite. +U ontvangt deze e-mail omdat u heeft aangegeven bericht te willen ontvangen wanneer nieuwe events zijn toegevoegd aan de wesite. Als dit een fout is of u dit bericht niet meer wenst te ontvangen, wijzig dan u instellingen voor het ontvangen van notificaties hier: {X_UNSUBSCRIBE_URL} Modified: XoopsLanguages/dutch/modules/news/news 1.67/nederlands/mail_template/global_storysubmit_notify.tpl =================================================================== --- XoopsLanguages/dutch/modules/news/news 1.67/nederlands/mail_template/global_storysubmit_notify.tpl 2012-06-10 18:03:01 UTC (rev 9630) +++ XoopsLanguages/dutch/modules/news/news 1.67/nederlands/mail_template/global_storysubmit_notify.tpl 2012-06-10 18:06:21 UTC (rev 9631) @@ -1,4 +1,4 @@ -Hello {X_UNAME}, +Hallo {X_UNAME}, Een nieuw artikel "{STORY_NAME}" is toegevoegd op {X_SITENAME} en wacht op goedkeuring. @@ -7,9 +7,9 @@ ----------- -U ontvangt dit bericht omdat u heeft aangegeven berichten te willen ontvangen wanneer nieuwe events zijn toegevoegd aan de wesite. +U ontvangt deze e-mail omdat u heeft aangegeven bericht te willen ontvangen wanneer nieuwe events zijn toegevoegd aan de wesite. -Als dit een fout is of u dit bericht niet meer wenst te ontvangen, wijzig dan u instellingen voor het ontvangen van notificaties hier: +Als dit een fout is of u dit bericht niet meer wenst te ontvangen, wijzig dan uw instellingen voor het ontvangen van notificaties hier: {X_UNSUBSCRIBE_URL} Graag niet reageren op deze e-mail. Modified: XoopsLanguages/dutch/modules/news/news 1.67/nederlands/mail_template/story_approve_notify.tpl =================================================================== --- XoopsLanguages/dutch/modules/news/news 1.67/nederlands/mail_template/story_approve_notify.tpl 2012-06-10 18:03:01 UTC (rev 9630) +++ XoopsLanguages/dutch/modules/news/news 1.67/nederlands/mail_template/story_approve_notify.tpl 2012-06-10 18:06:21 UTC (rev 9631) @@ -1,4 +1,4 @@ -Hello {X_UNAME}, +Hallo {X_UNAME}, Het toegevoegde artikel "{STORY_NAME}" is goedgekeurd op {X_SITENAME}. @@ -7,9 +7,9 @@ ----------- -U ontvangt dit bericht omdat u heeft aangegeven berichten te willen ontvangen wanneer nieuwe events zijn toegevoegd aan de wesite. +U ontvangt deze e-mail omdat u heeft aangegeven bericht te willen ontvangen wanneer nieuwe events zijn toegevoegd aan de wesite. -Als dit een fout is of u dit bericht niet meer wenst te ontvangen, wijzig dan u instellingen voor het ontvangen van notificaties hier: +Als dit een fout is of u dit bericht niet meer wenst te ontvangen, wijzig dan uw instellingen voor het ontvangen van notificaties hier: {X_UNSUBSCRIBE_URL} Graag niet reageren op deze e-mail. Modified: XoopsLanguages/dutch/modules/news/news 1.67/nederlands/mail_template/topic_newstory_notify.tpl =================================================================== --- XoopsLanguages/dutch/modules/news/news 1.67/nederlands/mail_template/topic_newstory_notify.tpl 2012-06-10 18:03:01 UTC (rev 9630) +++ XoopsLanguages/dutch/modules/news/news 1.67/nederlands/mail_template/topic_newstory_notify.tpl 2012-06-10 18:06:21 UTC (rev 9631) @@ -1,4 +1,4 @@ -Hello {X_UNAME}, +Hallo {X_UNAME}, Een nieuw artikel "{STORY_NAME}" is toegevoegd op {X_SITENAME} in {TOPIC_NAME}. @@ -7,9 +7,9 @@ ----------- -U ontvangt dit bericht omdat u heeft aangegeven berichten te willen ontvangen wanneer nieuwe events zijn toegevoegd aan de wesite. +U ontvangt deze e-mail omdat u heeft aangegeven bericht te willen ontvangen wanneer nieuwe events zijn toegevoegd aan de wesite. -Als dit een fout is of u dit bericht niet meer wenst te ontvangen, wijzig dan u instellingen voor het ontvangen van notificaties hier: +Als dit een fout is of u dit bericht niet meer wenst te ontvangen, wijzig dan uw instellingen voor het ontvangen van notificaties hier: {X_UNSUBSCRIBE_URL} Graag niet reageren op deze e-mail. Modified: XoopsLanguages/dutch/modules/news/news 1.67/nederlands/main.php =================================================================== --- XoopsLanguages/dutch/modules/news/news 1.67/nederlands/main.php 2012-06-10 18:03:01 UTC (rev 9630) +++ XoopsLanguages/dutch/modules/news/news 1.67/nederlands/main.php 2012-06-10 18:06:21 UTC (rev 9631) @@ -1,8 +1,11 @@ <?php +// +// Update vertaling 03-05-2012 By Ritchie for NLXOOPS.NL // +// // $Id: main.php,v 1.9 2004/07/26 17:51:25 hthouzard Exp $ //%%%%%% File Name index.php %%%%% define("_NW_PRINTER","Printvriendelijke pagina"); -define("_NW_SENDSTORY","Stuur dit nieuwsbercht naar een kennis"); +define("_NW_SENDSTORY","Stuur dit nieuwsbericht naar een kennis"); define("_NW_READMORE","Lees Verder..."); define("_NW_COMMENTS","Reactie(s))?"); define("_NW_ONECOMMENT","1 reactie"); @@ -17,12 +20,12 @@ define("_NW_TOPIC","Nieuwscategorie"); define("_NW_THESCOOP","Inleidende tekst"); define("_NW_NOTIFYPUBLISH","Notificeer mij per Email bij publicatie"); -define("_NW_POST","Verstuur"); //Post +define("_NW_POST","Versturen"); //Post define("_NW_GO","Ga!"); define("_NW_THANKS","Bedankt voor je inzending."); //submission of news article define("_NW_NOTIFYSBJCT","Nieuws voor mijn website"); // Notification mail subject -define("_NW_NOTIFYMSG","Dag! Je hebt een nieuws inzending voor je website."); // Notification mail message +define("_NW_NOTIFYMSG","Hallo! Je hebt een nieuws inzending voor je website."); // Notification mail message //%%%%%% File Name archive.php %%%%% define("_NW_NEWSARCHIVES","Nieuwsarchief"); @@ -35,8 +38,8 @@ define("_NW_THEREAREINTOTAL","Er bevinden zich in totaal %s artikelen"); // %s is your site name -define("_NW_INTARTICLE","Interessant Nieuwsartikel bij %s"); -define("_NW_INTARTFOUND","Hier is een interessant nieuwsbericht dat ik tegen kwam bij %s"); +define("_NW_INTARTICLE","Interessant Nieuwsartikel bij/op %s"); +define("_NW_INTARTFOUND","Hier is een interessant nieuwsbericht dat ik tegen kwam bij/op %s"); define("_NW_TOPICC","Onderwerp:"); define("_NW_URL","URL:"); @@ -53,7 +56,7 @@ define("_NW_ATTACHEDFILES","Bijlage(n):");//Attached Files define("_NW_ATTACHEDLIB","Dit artikel bevat bijlage(n)"); define("_NW_NEWSSAMEAUTHORLINK","Nieuws afkomstig van dezelfde auteur"); -define("_NW_NEWS_NO_TOPICS","Sorrie, er is geen onderwerp. Creëer deze voordat je nieuws inzendt"); //Sorry but actually there's no topics, please create one before to submit a news +define("_NW_NEWS_NO_TOPICS","Sorry, er is geen onderwerp. Creëer deze voordat je nieuws inzend"); //Sorry but actually there's no topics, please create one before to submit a news define("_NW_PREVIOUS_ARTICLE","Vorig artikel"); define("_NW_NEXT_ARTICLE","Volgend artikel"); define("_NW_OTHER_ARTICLES","Andere artikelen"); @@ -66,7 +69,7 @@ define("_NW_RATINGHTOL","Waardering (Hoogste naar laagste score)"); define("_NW_RATINGC","Cijfer: "); define("_NW_RATINGSCALE","De schaal is 1 - 10, waarvan 1 slecht is en 10 uitstekend."); -define("_NW_BEOBJECTIVE","Wees svp objectief. Als ieder artikel het cijfer 1 of 10 toegekend krijgt kan er weinig waarde worden gehecht aan de stemming."); +define("_NW_BEOBJECTIVE","Wees aub objectief. Als ieder artikel het cijfer 1 of 10 toegekend krijgt kan er weinig waarde worden gehecht aan de stemming."); define("_NW_DONOTVOTE","Stem niet op je eigen ingezonden artikel."); define("_NW_RATING","Waardering"); //Rating define("_NW_VOTE","Stem"); @@ -100,6 +103,7 @@ define("_NW_PAGE_AUTO_SUMMARY","Pagina %d : %s"); // Added in version 1.51 +define("_NW_BOOKMARK_TO_HYVES","Delen via Hyves"); define("_NW_BOOKMARK_TO_BLINKLIST","Delen via Blinklist"); define("_NW_BOOKMARK_TO_DELICIOUS","Delen via del.icio.us"); define("_NW_BOOKMARK_TO_DIGG","Delen via Digg"); @@ -131,4 +135,7 @@ define("_NW_DELETE", "Verwijderen"); define("_NW_EDIT", "Bewerken"); +define('_NW_SUBTITLE', "Subtitel: "); +define('_NW_SELECT_IMAGE_DESC', "Omschrijving bij de geselecteerde afbeelding: "); + ?> \ No newline at end of file Modified: XoopsLanguages/dutch/modules/news/news 1.67/nederlands/modinfo.php =================================================================== --- XoopsLanguages/dutch/modules/news/news 1.67/nederlands/modinfo.php 2012-06-10 18:03:01 UTC (rev 9630) +++ XoopsLanguages/dutch/modules/news/news 1.67/nederlands/modinfo.php 2012-06-10 18:06:21 UTC (rev 9631) @@ -1,4 +1,7 @@ <?php +// +// Update vertaling 03-05-2012 By Ritchie for NLXOOPS.NL // +// // $Id: modinfo.php,v 1.21 2004/09/01 17:48:07 hthouzard Exp $ // Module Info @@ -25,14 +28,14 @@ define('_MI_NEWS_ADMENU3', 'Post/bewerk Nieuws'); define('_MI_NEWS_GROUPPERMS', 'Permissies'); // Added by Hervé for prune option -define('_MI_NEWS_PRUNENEWS', 'Nieuws opruimen'); +define('_MI_NEWS_PRUNENEWS', 'Nieuws Opruimen'); // Added by Hervé define('_MI_NEWS_EXPORT', 'Nieuws Exporteren'); // Title of config items define('_MI_STORYHOME', 'Aantal nieuwsartikelen op nieuws Index pagina'); //top define('_MI_NOTIFYSUBMIT', 'Stuur notificatie naar de admin/webmaster bij nieuw artikel'); -define('_MI_DISPLAYNAV', 'Tonen navigatiebox'); +define('_MI_DISPLAYNAV', 'Toon navigatiebox'); define('_MI_AUTOAPPROVE','Nieuwsinzendingen automatisch goedkeuren.'); define("_MI_ALLOWEDSUBMITGROUPS", "Groepen die nieuws mogen inzenden"); define("_MI_ALLOWEDAPPROVEGROUPS", "Groepen die nieuwsinzendingen mogen goedkeuren"); @@ -40,18 +43,18 @@ define("_MI_NAMEDISPLAY","Auteursnaam"); define("_MI_COLUMNMODE","Kolommen"); define("_MI_STORYCOUNTADMIN","Aantal artikelen dat getoond moet worden in de admin sectie. (Deze instelling zal ook worden toegepast mbt het aantal te tonen onderwerpen en statistiekoverzicht in de adminsectie) : "); -define('_MI_UPLOADFILESIZE', 'MAX Filesize Upload (KB) 1048576 = 1 Meg'); +define('_MI_UPLOADFILESIZE', 'MAX Upload toegestaan in (KB) 1048576 = 1 Meg'); define("_MI_UPLOADGROUPS","Groepen die mogen uploaden"); //Authorized groups to upload // Description of each config items -define('_MI_STORYHOMEDSC', 'Selecteer het aantal nieuwsartikelen dat getoond moet worden op de nieuws Index pagina'); //top +define('_MI_STORYHOMEDSC', 'Selecteer het aantal nieuwsartikelen dat getoond moet worden op de nieuws Index pagina'); //top define('_MI_NOTIFYSUBMITDSC', 'Selecteer JA indien er bij een nieuwe inzending een notificatie naar de admin/webmaster gestuurd moet worden'); define('_MI_DISPLAYNAVDSC', 'Selecteer JA indien de navigatiebox op iedere nieuwspagina bovenaan getoond moet worden'); define('_MI_AUTOAPPROVEDSC', 'Nieuwsinzendingen automatisch goedkeuren. (zonder admin interventie)?'); define("_MI_ALLOWEDSUBMITGROUPSDESC", "De geselecteerde groepen mogen nieuws inzenden"); //The selected groups will be able to submit news items define("_MI_ALLOWEDAPPROVEGROUPSDESC", "De geselecteerde groepen mogen nieuws goedkeuren"); //The selected groups will be able to approve news items -define("_MI_NEWSDISPLAYDESC", "Classis toont all nieuws gesorteerd op publicatiedatum.>br />Nieuws tonen op onderwerp groeppeerd het nieuws op onderwerp, waarbij het laatste artikel volledig getoond wordt en de overige artikelen op alleen de titel"); //Classic shows all news ordered by date of publish. News by topic will group the news by topic with the latest story in full and the others with just the title +define("_MI_NEWSDISPLAYDESC", "Classic toont alle nieuws gesorteerd op publicatiedatum.>br />Nieuws tonen op onderwerp sorteed het nieuws op onderwerp, waarbij het laatste artikel volledig getoond wordt en de overige artikelen op alleen de titel"); //Classic shows all news ordered by date of publish. News by topic will group the news by topic with the latest story in full and the others with just the title define('_MI_ADISPLAYNAMEDSC', 'Selecteer hoe de auteursnaam getoond moet worden'); define("_MI_COLUMNMODE_DESC","Kies het aantal kolommen waarin de artikelen getoond dienen te worden"); //You can choose the number of columns to display articles list define("_MI_STORYCOUNTADMIN_DESC",""); @@ -113,8 +116,8 @@ define('_MI_NEWS_TOPICS_RSS_DESC',"Als deze instelling op JA staat dan zal de categorie inhoud als RSS feed beschikbaar zijn"); define('_MI_NEWS_DATEFORMAT', "Datum Formaat"); define('_MI_NEWS_DATEFORMAT_DESC',"Bekijk de PHP documentatie op (http://fr.php.net/manual/en/function.date.php) voor meer informatie over het te selecteren formaat. Attentie: Indien je geen instelling aangeeft dan zal het standaard datum formaat gebruikt worden. "); -define('_MI_NEWS_META_DATA', "Meta data mogelijk maken (keywords en beschrijving)?"); -define('_MI_NEWS_META_DATA_DESC', "Als de instelling op JA staat dan mogen de approvers de volgende meta data invoeren: keywords and beschrijving"); +define('_MI_NEWS_META_DATA', "Meta data mogelijk maken (sleutelwoorden en beschrijving)?"); +define('_MI_NEWS_META_DATA_DESC', "Als de instelling op JA staat dan mogen de gekozen gebruikers de volgende meta data invoeren: sleutelwoorden en beschrijving"); define('_MI_NEWS_BNAME8','Willekeurig nieuws'); define('_MI_NEWS_NEWSLETTER','Nieuwsbrief'); define('_MI_NEWS_STATS','Statistieken'); @@ -126,9 +129,9 @@ define("_MI_NEWS_FORM_FCK","FCK Editor"); define("_MI_NEWS_FORM_KOIVI","Koivi Editor"); define("_MI_NEWS_FORM_OPTIONS_DESC","Selecteer de editor die je wilt gebruiken. Als je een eenvoudige installatie hebt gedaan (bijv.: je hebt alleen de standaard xoops editor tot je beschikking), dan kun je alleen kiezen tussen: DHTML of Standaard Xoopseditor"); -define("_MI_NEWS_KEYWORDS_HIGH","Keywords highlighting gebruiken?"); +define("_MI_NEWS_KEYWORDS_HIGH","Sleutelwoorden benadrukken gebruiken?"); define("_MI_NEWS_KEYWORDS_HIGH_DESC","Als je van deze optie gebruik maakt, zullen de gezochte sleutelwoorden in de nieuwsartikel resultaten oplichten"); -define("_MI_NEWS_HIGH_COLOR","Kleur van highlight keywords ?"); +define("_MI_NEWS_HIGH_COLOR","Kleur van benadrukken sleutelwoorden ?"); define("_MI_NEWS_HIGH_COLOR_DES","Gebruik deze optie alléén als JA bij de vorige instelling is gekozen!"); define("_MI_NEWS_INFOTIPS","Lengte van Tooltips"); define("_MI_NEWS_INFOTIPS_DES","Als je van deze optie gebruik maakt zullen links gerelateerd naar het nieuwsartikel de eerste (n) karakters van het betreffende bericht tonen. Als je de waarde op 0 zet dan zal de infotips leeg zijn"); @@ -149,20 +152,20 @@ define('_MI_NEWS_BNAME9','Archieven'); define("_MI_NEWS_FORM_TINYEDITOR","TinyEditor"); define("_MI_NEWS_FOOTNOTES","Toon links in printbare versies van de artikelen ?"); -define("_MI_NEWS_DUBLINCORE","Ativeer Dublin Core Metadata ?"); -define("_MI_NEWS_DUBLINCORE_DSC","Voor meer informatie, <a href='http://dublincore.org/'>visit this link</a>"); +define("_MI_NEWS_DUBLINCORE","Ativeer Dublin Core Metadata?"); +define("_MI_NEWS_DUBLINCORE_DSC","Voor meer informatie, <a href='http://dublincore.org/'>bezoek deze link</a>"); define("_MI_NEWS_BOOKMARK_ME","'Bookmark dit artikel in deze sites blok weergeven?"); define("_MI_NEWS_BOOKMARK_ME_DSC","Dit blok zal zichtbaar zijn op de artikelen pagina"); define("_MI_NEWS_FF_MICROFORMAT","Activeer Firefox 2 Micro Summaries ?"); -define("_MI_NEWS_FF_MICROFORMAT_DSC","Voor meer informatie, zie <a href='http://wiki.mozilla.org/Microsummaries' target='_blank'>this page</a>"); +define("_MI_NEWS_FF_MICROFORMAT_DSC","Voor meer informatie, zie <a href='http://wiki.mozilla.org/Microsummaries' target='_blank'>deze pagina</a>"); define("_MI_NEWS_WHOS_WHO","Wie is Wie"); define("_MI_NEWS_METAGEN","Metagen"); define("_MI_NEWS_TOPICS_DIRECTORY","Onderwerp Directorie"); define("_MI_NEWS_ADVERTISEMENT","Advertentie"); -define("_MI_NEWS_ADV_DESCR","Plaats tekst of een javasscript code on te tonen in je artikelen"); -define("_MI_NEWS_MIME_TYPES","Enter authorized Mime Types for upload (scheiden door te beginnen op een nieuwe regel)"); -define("_MI_NEWS_ENHANCED_PAGENAV","Gebruik uitgebreide pagina navigator ?"); -define("_MI_NEWS_ENHANCED_PAGENAV_DSC","Met deze optie kun je de pagina scheiden met bijvoorbeeld : [pagebreak:Page Title], De links to the pagina's worden vervangen door een dropdownlijst en je kan [summary] gebruiken voor het maken van een automatische samenvatting van pagina's."); +define("_MI_NEWS_ADV_DESCR","Plaats tekst of een javasscript code om te tonen in je artikelen"); +define("_MI_NEWS_MIME_TYPES","Type toegestane Mime Types voor upload (scheiden door te beginnen op een nieuwe regel)"); +define("_MI_NEWS_ENHANCED_PAGENAV","Gebruik uitgebreide pagina navigator?"); +define("_MI_NEWS_ENHANCED_PAGENAV_DSC","Met deze optie kun je de pagina scheiden met bijvoorbeeld : [pagebreak:Page Title], De links naar de pagina's worden vervangen door een dropdownlijst en je kan [summary] gebruiken voor het maken van een automatische samenvatting van pagina's."); // Added in version 1.54 define('_MI_NEWS_CATEGORY_NOTIFY','Categorie'); @@ -171,14 +174,14 @@ define('_MI_NEWS_CATEGORY_STORYPOSTED_NOTIFY', 'Nieuw artikel geplaatst'); define('_MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYCAP', 'Notificeer mij wanneer een nieuw artikel is geplaatst in deze categorie.'); define('_MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYDSC', 'Ontvang notificatie wanneer een nieuw artikel is geplaatst in deze categorie.'); -define('_MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : Nieuw news artikel'); +define('_MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : Nieuw nieuws artikel'); // Added in version 1.63 define('_MI_NEWS_TAGS', "Gebruik het tags systeem?"); -define('_MI_NEWS_TAGS_DSC', "Dit is gebaseerd op de XOOPS module TAG from phppp"); +define('_MI_NEWS_TAGS_DSC', "Dit is gebaseerd op de XOOPS module TAG van phppp"); define("_MI_NEWS_BNAME10", "Tags Cloud"); define("_MI_NEWS_BNAME11", "Top Tags"); -define("_MI_NEWS_INTRO_TEXT", "Introducte tekst om te tonen op de submit pagina"); +define("_MI_NEWS_INTRO_TEXT", "Introductie tekst om te tonen op de submit pagina"); define("_MI_NEWS_IMAGE_MAX_WIDTH", "Maximale afbeeldingshoogte wanneer dit is aangepast"); define("_MI_NEWS_IMAGE_MAX_HEIGHT", "Maximale afbeeldingshoogte wanneer dit is aangepast"); //Added in 1.67 @@ -191,8 +194,10 @@ Met het ingebouwde permissiemanagement kunt u groepen rechten geven om artikelen in te dienen, groepen rechten geven om artikelen goed te keuren en bepalen welke groepen de artikelen mogen bekijken."); define("_MI_NEWS_SHARE_ME","Social media iconen weergeven ?"); -define("_MI_NEWS_SHARE_ME_DSC","Deel iconen naar facebook ,twitter , google buzz tonen onder elk artikel"); +define("_MI_NEWS_SHARE_ME_DSC","Deel iconen naar facebook, twitter, google buzz tonen onder elk artikel"); define("_MI_NEWS_SHOWICONS","Item iconen weergeven ?"); define("_MI_NEWS_SHOWICONS_DSC","Print, PDF and e-mail iconen weergeven onderaan elk artikel"); - +//1.67 +define("_MI_NEWS_FACEBOOKCOMMENTS","Gebruik Facebook reacties?"); +define("_MI_NEWS_FACEBOOKCOMMENTS_DSC","Laat de bezoekers gebruik maken van Facebook om reacties toe te voegen bij de artikelen"); ?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ren...@us...> - 2012-06-10 18:03:07
|
Revision: 9630 http://xoops.svn.sourceforge.net/xoops/?rev=9630&view=rev Author: renetjuh Date: 2012-06-10 18:03:01 +0000 (Sun, 10 Jun 2012) Log Message: ----------- Updated NL language files Extcal 2.37 Modified Paths: -------------- XoopsLanguages/dutch/modules/extcal/extcal 2.37/language/nederlands/main.php Modified: XoopsLanguages/dutch/modules/extcal/extcal 2.37/language/nederlands/main.php =================================================================== --- XoopsLanguages/dutch/modules/extcal/extcal 2.37/language/nederlands/main.php 2012-06-10 06:12:53 UTC (rev 9629) +++ XoopsLanguages/dutch/modules/extcal/extcal 2.37/language/nederlands/main.php 2012-06-10 18:03:01 UTC (rev 9630) @@ -70,7 +70,7 @@ define('_MD_EXTCAL_ETABLISSEMENT_ADRESSE', 'Adres'); define('_MD_EXTCAL_ETABLISSEMENT_ADRESSE2', 'Adres 2'); define('_MD_EXTCAL_ETABLISSEMENT_CATEGORIE', 'Categorie'); -define('_MD_EXTCAL_ETABLISSEMENT_CP', 'Postode'); +define('_MD_EXTCAL_ETABLISSEMENT_CP', 'Postcode'); define('_MD_EXTCAL_ETABLISSEMENT_DATE', 'Datum'); define('_MD_EXTCAL_ETABLISSEMENT_DEBUT', 'Start'); define('_MD_EXTCAL_ETABLISSEMENT_DELETE', 'Locatie verwijderen'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2012-06-10 06:13:00
|
Revision: 9629 http://xoops.svn.sourceforge.net/xoops/?rev=9629&view=rev Author: beckmi Date: 2012-06-10 06:12:53 +0000 (Sun, 10 Jun 2012) Log Message: ----------- Code cleanup Modified Paths: -------------- XoopsModules/news/branches/mamba/news/admin/index.php XoopsModules/news/branches/mamba/news/language/english/admin.php Modified: XoopsModules/news/branches/mamba/news/admin/index.php =================================================================== --- XoopsModules/news/branches/mamba/news/admin/index.php 2012-06-10 04:01:22 UTC (rev 9628) +++ XoopsModules/news/branches/mamba/news/admin/index.php 2012-06-10 06:12:53 UTC (rev 9629) @@ -1587,17 +1587,17 @@ $criteria->add(new Criteria("published", 0,'>')); $stories_published = $storiesHandler->getCount($criteria); - $storiesNeedApproval = $count_stories- $stories_published; + $stories_need_approval = $count_stories- $stories_published; $criteria = new CriteriaCompo(); $criteria->add(new Criteria("expired", 0,'>')); $criteria->add(new Criteria("expired", time(),'<')); $stories_expired = $storiesHandler->getCount($criteria); - $criteria = new CriteriaCompo(); - $criteria->add(new Criteria("expired", 0,'>')); - $criteria->add(new Criteria("expired", time(),'>')); - $storiesExpiredSoon = $storiesHandler->getCount($criteria); + $criteria = new CriteriaCompo(); + $criteria->add(new Criteria("expired", 0,'>')); + $criteria->add(new Criteria("expired", time(),'>')); + $stories_expired_soon = $storiesHandler->getCount($criteria); //compte "total" $count_topics = $topicsHandler->getCount(); @@ -1609,18 +1609,23 @@ $clr_count_stories = ($count_stories == 0) ? 'red': 'green'; $clr_count_topics = ($count_topics == 0) ? 'red': 'green'; $clr_ihome_stories = ($stories_ihome == 0) ? 'red': 'green'; - $clr_menu_topics = ($topics_menu == 0) ? 'red': 'green'; - + $clr_menu_topics = ($topics_menu == 0) ? 'red': 'green'; + + $clr_published_stories = ($stories_published == 0) ? 'red': 'green'; + $clr_need_approval_stories = ($stories_need_approval == 0) ? 'green': 'red'; + $clr_expired_stories = ($stories_expired == 0) ? 'red': 'green'; + $clr_need_expired_soon_stories = ($stories_expired_soon == 0) ? 'red': 'green'; + $indexAdmin->addInfoBox(_AM_NEWS_STATISTICS); $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_TOPICS, $count_topics, $clr_count_topics); $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_TOPICS_ONLINE, $topics_menu, $clr_menu_topics); $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES, $count_stories, $clr_count_stories); $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_ONLINE, $stories_ihome, $clr_ihome_stories); - $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_APPROVED, $stories_published, $clr_ihome_stories); - $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_NEED_APPROVAL, $storiesNeedApproval, 'red'); - $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_EXPIRED, $stories_expired, $clr_ihome_stories); - $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_EXPIRED_SOON, $storiesExpiredSoon, $clr_ihome_stories); + $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_APPROVED, $stories_published, $clr_ihome_stories); + $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_NEED_APPROVAL, $stories_need_approval, $clr_need_approval_stories); + $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_EXPIRED, $stories_expired, $clr_expired_stories); + $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_EXPIRED_SOON, $stories_expired_soon, $clr_need_expired_soon_stories); Modified: XoopsModules/news/branches/mamba/news/language/english/admin.php =================================================================== --- XoopsModules/news/branches/mamba/news/language/english/admin.php 2012-06-10 04:01:22 UTC (rev 9628) +++ XoopsModules/news/branches/mamba/news/language/english/admin.php 2012-06-10 06:12:53 UTC (rev 9629) @@ -223,6 +223,6 @@ define ("_AM_NEWS_THEREARE_STORIES_IMPORTED", "There are <span class='red bold'>%s</span> Imported Stories"); define ("_AM_NEWS_THEREARE_STORIES_EXPORTED", "There are <span class='red bold'>%s</span> Stories exported"); define ("_AM_NEWS_THEREARE_STORIES_EXPIRED", "There are <span class='red bold'>%s</span> Expired News"); -define ("_AM_NEWS_THEREARE_STORIES_EXPIRED_SOON", "There are <span class='red bold'>%s</span> News to be Expired soon"); +define ("_AM_NEWS_THEREARE_STORIES_EXPIRED_SOON", "There are <span class='red bold'>%s</span> News to Expire soon"); define ("_AM_NEWS_THEREARE_STORIES_APPROVED", "There are <span class='red bold'>%s</span> Approved News"); define ("_AM_NEWS_THEREARE_STORIES_NEED_APPROVAL", "There are <span class='red bold'>%s</span> News that need Approval"); \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2012-06-10 04:01:28
|
Revision: 9628 http://xoops.svn.sourceforge.net/xoops/?rev=9628&view=rev Author: beckmi Date: 2012-06-10 04:01:22 +0000 (Sun, 10 Jun 2012) Log Message: ----------- Fixing Statistics in Dashboard Modified Paths: -------------- XoopsModules/news/branches/mamba/news/admin/index.php XoopsModules/news/branches/mamba/news/class/news_stories.php XoopsModules/news/branches/mamba/news/class/news_topics.php XoopsModules/news/branches/mamba/news/language/english/admin.php Modified: XoopsModules/news/branches/mamba/news/admin/index.php =================================================================== --- XoopsModules/news/branches/mamba/news/admin/index.php 2012-06-10 03:09:41 UTC (rev 9627) +++ XoopsModules/news/branches/mamba/news/admin/index.php 2012-06-10 04:01:22 UTC (rev 9628) @@ -82,7 +82,7 @@ } else { echo " <a href='".XOOPS_URL."/modules/news/submit.php?returnside=1&op=edit&storyid=" . $newstory -> storyid() . "'>" . $title . "</a>\n"; } - echo "</td><td>" . $newstory->topic_title() . "</td><td align='center' class='nw'>" . formatTimestamp($newstory->created(),$dateformat) . "</td><td align='center'><a href='" . XOOPS_URL . "/userinfo.php?uid=" . $newstory->uid() . "'>" . $newstory->uname() . "</a></td><td align='center'><a href='".XOOPS_URL."/modules/news/admin/index.php?op=delete&storyid=" . $newstory->storyid() . "'><img src='" . $pathIcon16."/delete.png' title='"._AM_DELETE."'></a></td></tr>\n"; + echo "</td><td>" . $newstory->topic_title() . "</td><td align='center' class='nw'>" . formatTimestamp($newstory->created(),$dateformat) . "</td><td align='center'><a href='" . XOOPS_URL . "/userinfo.php?uid=" . $newstory->uid() . "'>" . $newstory->uname() . "</a></td><td align='center'><a href='".XOOPS_URL."/modules/news/submit.php?returnside=1&op=edit&storyid=" . $newstory->storyid() . "'><img src='" . $pathIcon16."/edit.png' title='"._AM_EDIT."'></a><a href='".XOOPS_URL."/modules/news/admin/index.php?op=delete&storyid=" . $newstory->storyid() . "'><img src='" . $pathIcon16."/delete.png' title='"._AM_DELETE."'></a></td></tr>\n"; } echo '</table></div>'; @@ -686,7 +686,7 @@ $submenu=$topics_arr[$tmpcpt]['menu'] ? _YES : _NO; $class = ($class == 'even') ? 'odd' : 'even'; - $output = $output . "<tr class='".$class."'><td>" . $topics_arr[$tmpcpt]['topic_id'] . "</td><td align='left'>" . $topics_arr[$tmpcpt]['prefix'] . $myts->displayTarea($topics_arr[$tmpcpt]['topic_title']) . "</td><td align='left'>" . $parent . "</td><td>" . $submenu . "</td><td>" . $action_edit . $action_delete ."</td></tr>"; + $output = $output . "<tr class='".$class."'><td>" . $topics_arr[$tmpcpt]['topic_id'] . "</td><td align='left'>" . $topics_arr[$tmpcpt]['prefix'] . $myts->displayTarea($topics_arr[$tmpcpt]['topic_title']) . "</td><td align='left'>" . $parent . "</td><td align='center'>" . $submenu . "</td><td align='center'>" . $action_edit . $action_delete ."</td></tr>"; @@ -1572,13 +1572,32 @@ XOOPS_ROOT_PATH . '/uploads/news/file', XOOPS_ROOT_PATH . '/uploads/news/image', ); - + + $topicsHandler=& xoops_getmodulehandler('news_topics','news'); + $storiesHandler=& xoops_getmodulehandler('news_stories','news'); + //compte "total" $count_stories = $storiesHandler->getCount(); //compte "attente" $criteria = new CriteriaCompo(); - $criteria->add(new Criteria("menu", 1)); + $criteria->add(new Criteria("ihome", 1)); $stories_ihome = $storiesHandler->getCount($criteria); + + $criteria = new CriteriaCompo(); + $criteria->add(new Criteria("published", 0,'>')); + $stories_published = $storiesHandler->getCount($criteria); + + $storiesNeedApproval = $count_stories- $stories_published; + + $criteria = new CriteriaCompo(); + $criteria->add(new Criteria("expired", 0,'>')); + $criteria->add(new Criteria("expired", time(),'<')); + $stories_expired = $storiesHandler->getCount($criteria); + + $criteria = new CriteriaCompo(); + $criteria->add(new Criteria("expired", 0,'>')); + $criteria->add(new Criteria("expired", time(),'>')); + $storiesExpiredSoon = $storiesHandler->getCount($criteria); //compte "total" $count_topics = $topicsHandler->getCount(); @@ -1598,7 +1617,13 @@ $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES, $count_stories, $clr_count_stories); $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_ONLINE, $stories_ihome, $clr_ihome_stories); + $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_APPROVED, $stories_published, $clr_ihome_stories); + $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_NEED_APPROVAL, $storiesNeedApproval, 'red'); + $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_EXPIRED, $stories_expired, $clr_ihome_stories); + $indexAdmin->addInfoBoxLine(_AM_NEWS_STATISTICS,_AM_NEWS_THEREARE_STORIES_EXPIRED_SOON, $storiesExpiredSoon, $clr_ihome_stories); + + foreach (array_keys( $folder) as $i) { $indexAdmin->addConfigBoxLine($folder[$i], 'folder'); $indexAdmin->addConfigBoxLine(array($folder[$i], '777'), 'chmod'); Modified: XoopsModules/news/branches/mamba/news/class/news_stories.php =================================================================== --- XoopsModules/news/branches/mamba/news/class/news_stories.php 2012-06-10 03:09:41 UTC (rev 9627) +++ XoopsModules/news/branches/mamba/news/class/news_stories.php 2012-06-10 04:01:22 UTC (rev 9628) @@ -83,7 +83,7 @@ { function __construct(&$db) { - parent::__construct($db, "news_stories", "stories", "storyid", "uid"); + parent::__construct($db, "stories", "news_stories", "storyid", "uid"); } } ?> \ No newline at end of file Modified: XoopsModules/news/branches/mamba/news/class/news_topics.php =================================================================== --- XoopsModules/news/branches/mamba/news/class/news_topics.php 2012-06-10 03:09:41 UTC (rev 9627) +++ XoopsModules/news/branches/mamba/news/class/news_topics.php 2012-06-10 04:01:22 UTC (rev 9628) @@ -66,7 +66,7 @@ { function __construct(&$db) { - parent::__construct($db, "news_topics", "topics", "topic_id", "topic_pid"); + parent::__construct($db, "topics", "news_topics", "topic_id", "topic_pid"); } } Modified: XoopsModules/news/branches/mamba/news/language/english/admin.php =================================================================== --- XoopsModules/news/branches/mamba/news/language/english/admin.php 2012-06-10 03:09:41 UTC (rev 9627) +++ XoopsModules/news/branches/mamba/news/language/english/admin.php 2012-06-10 04:01:22 UTC (rev 9628) @@ -212,15 +212,17 @@ define("_AM_NEWS_CONFIG_PHP","Minimum PHP required: %s (your version is %s)"); define("_AM_NEWS_CONFIG_XOOPS","Minimum XOOPS required: %s (your version is %s)"); -define ("_AM_NEWS_STATISTICS", "Statistics News"); +define ("_AM_NEWS_STATISTICS", "News Statistics"); define ("_AM_NEWS_THEREARE_STORIES", "There are <span class='red bold'>%s</span> News in the database"); -define ("_AM_NEWS_THEREARE_STORIES_ONLINE", "There are <span class='red bold'>%s</span> News Online"); +define ("_AM_NEWS_THEREARE_STORIES_ONLINE", "There are <span class='red bold'>%s</span> News published in Home"); define ("_AM_NEWS_THEREARE_STORIES_FILES", "There are <span class='red bold'>%s</span> Stories_files in the database"); define ("_AM_NEWS_THEREARE_STORIES_FILES_ONLINE", "There are <span class='red bold'>%s</span> Stories_files online"); define ("_AM_NEWS_THEREARE_TOPICS", "There are <span class='red bold'>%s</span> Categories in the database"); -define ("_AM_NEWS_THEREARE_TOPICS_ONLINE", "There are <span class='red bold'>%s</span> Categories Online"); +define ("_AM_NEWS_THEREARE_TOPICS_ONLINE", "There are <span class='red bold'>%s</span> Categories visible in Menu"); define ("_AM_NEWS_THEREARE_STORIES_VOTEDATA", "There are <span class='red bold'>%s</span> Stories Viewed"); define ("_AM_NEWS_THEREARE_STORIES_IMPORTED", "There are <span class='red bold'>%s</span> Imported Stories"); define ("_AM_NEWS_THEREARE_STORIES_EXPORTED", "There are <span class='red bold'>%s</span> Stories exported"); - -?> \ No newline at end of file +define ("_AM_NEWS_THEREARE_STORIES_EXPIRED", "There are <span class='red bold'>%s</span> Expired News"); +define ("_AM_NEWS_THEREARE_STORIES_EXPIRED_SOON", "There are <span class='red bold'>%s</span> News to be Expired soon"); +define ("_AM_NEWS_THEREARE_STORIES_APPROVED", "There are <span class='red bold'>%s</span> Approved News"); +define ("_AM_NEWS_THEREARE_STORIES_NEED_APPROVAL", "There are <span class='red bold'>%s</span> News that need Approval"); \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |