diff --git a/.gitignore b/.gitignore
index 4e64023d2..8ab9484f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -167,3 +167,4 @@ pip-log.txt
#############
/build.config
/build.number
+
diff --git a/3rd/AcyMailingPlugin/tagjem/tagjem.php b/3rd/AcyMailingPlugin/tagjem/tagjem.php
index ee36f40e2..2b6064dee 100644
--- a/3rd/AcyMailingPlugin/tagjem/tagjem.php
+++ b/3rd/AcyMailingPlugin/tagjem/tagjem.php
@@ -60,7 +60,7 @@ public function acymailingtagjem_show()
$pageInfo->filter->order->dir = $app->getUserStateFromRequest($paramBase.".filter_order_Dir", 'filter_order_Dir', 'desc', 'word');
if(strtolower($pageInfo->filter->order->dir) !== 'desc') $pageInfo->filter->order->dir = 'asc';
$pageInfo->search = $app->getUserStateFromRequest($paramBase.".search", 'search', '', 'string');
- $pageInfo->search = JString::strtolower($pageInfo->search);
+ $pageInfo->search = \Joomla\String\StringHelper::strtolower($pageInfo->search);
$pageInfo->filter_cat = $app->getUserStateFromRequest($paramBase.".filter_cat", 'filter_cat', '', 'int');
$pageInfo->featured = $app->getUserStateFromRequest($paramBase.".featured", 'featured', $this->params->get('show_featured', 0), 'int');
$pageInfo->opendates = '0';
diff --git a/README.md b/README.md
index 18084a65c..cdd1486f0 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
+# Egnarts94/JEM-Project Responsive JEM
+Forked from jemproject/JEM-Project
-
-
-This version includes:
+## This version includes:
- Import/Export view
- Multicategory support
- Parent category
@@ -14,6 +14,29 @@ This version includes:
Tips, suggestions are very welcome..
+Project Homepage: https://www.joomlaeventmanager.net/
+
+Translation via: https://www.transifex.com/projects/p/JEM/
+
+## So, whats different?
+- There is a simple way for installation: Just use this update package - no template overrides anymore!
+- Some additional, simple settings in the backend for switching to JEM Responsive
+- The original JEM can now be used with modern icons (FontAwesome available for old JEM)
+- and many many more...
+
+## Known Problems:
+- You can not automatically update your JEM installation via the Joomla updater. If the default JEM releases an update and you install this, JEM-Responsive is removed automatically
+- All new settings are in english?!?! - Yes, because I did not update all language packs.
+## How do I install and enable it?
+1. Download this package (or copy just download url)
+2. Install it as a normal extension in Joomla
+3. In Joomla Backend, go to Components -> JEM -> Settings -> Basic Settings, there you find a new entry called "Style". There are the global settings for enabling JEM Responsive. Set "Layout Style" to "Modern Responsive Style" and "Use Icon Font" to "Yes"
+4. If you used the template override previously, delete all overrides from you template, they are not required anymore.
+## What can I do with JEM-Responsive?
+If you want a demo, take a look here: jem-test.lkgchemnitz.de
+After installation, go to your Backend->Components->JEM->Help->JEM Responsive, where you can find a documentation of JEM Responsive. Let me know if you miss something!
+## Why do you use already module-class suffix?
+Because the default JEM does not support some settings of JEM-Responsive. And so, only expert users, that know what they do can change the behaviour of JEM Responsive.
diff --git a/admin/controllers/attendee.php b/admin/controllers/attendee.php
index 83aac934e..c30dbd366 100644
--- a/admin/controllers/attendee.php
+++ b/admin/controllers/attendee.php
@@ -50,11 +50,7 @@ public function cancel()
JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
$attendee = JTable::getInstance('jem_register', '');
- if (version_compare(JVERSION, '3.2', 'lt')) {
- $attendee->bind(JRequest::get('post')); // before Joomla! 3.2.0 there is no good way to get them all from JInput :(
- } else {
- $attendee->bind(JFactory::getApplication()->input->post->getArray(/*get them all*/));
- }
+ $attendee->bind(JFactory::getApplication()->input->post->getArray(/*get them all*/));
$attendee->checkin();
$this->setRedirect('index.php?option=com_jem&view=attendees&eventid='.JFactory::getApplication()->input->getInt('event', 0));
@@ -78,11 +74,7 @@ public function save()
$task = $jinput->getCmd('task');
// Retrieving $post
- if (version_compare(JVERSION, '3.2', 'lt')) {
- $post = JRequest::get('post'); // before Joomla! 3.2.0 we must and can use JRequest
- } else {
- $post = $jinput->post->getArray(/*get them all*/);
- }
+ $post = $jinput->post->getArray(/*get them all*/);
// Retrieving email-setting
$sendemail = $jinput->getInt('sendemail','0');
@@ -125,7 +117,7 @@ public function save()
}
// but show warning if mailer is disabled
if (!JPluginHelper::isEnabled('jem', 'mailer')) {
- JError::raiseNotice(100, JText::_('COM_JEM_GLOBAL_MAILERPLUGIN_DISABLED'));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_('COM_JEM_GLOBAL_MAILERPLUGIN_DISABLED'), 'notice');
}
}
diff --git a/admin/controllers/attendees.php b/admin/controllers/attendees.php
index bba535c88..07ce2bc49 100644
--- a/admin/controllers/attendees.php
+++ b/admin/controllers/attendees.php
@@ -51,7 +51,7 @@ public function remove()
$eventid = $jinput->getInt('eventid');
if (!is_array($cid) || count($cid) < 1) {
- JError::raiseError(500, JText::_('COM_JEM_SELECT_ITEM_TO_DELETE'));
+ throw new Exception(JText::_('COM_JEM_SELECT_ITEM_TO_DELETE'), 500);
}
$total = count($cid);
@@ -123,9 +123,9 @@ public function toggleStatus()
$task = $this->getTask();
if (empty($pks)) {
- JError::raiseWarning(500, JText::_('JERROR_NO_ITEMS_SELECTED'));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_('JERROR_NO_ITEMS_SELECTED'), 'warning');
} else {
- JArrayHelper::toInteger($pks);
+ \Joomla\Utilities\ArrayHelper::toInteger($pks);
$model = $this->getModel('attendee');
JPluginHelper::importPlugin('jem');
@@ -205,12 +205,12 @@ public function setStatus()
$ids = $app->input->get('cid', array(), 'array');
$values = array('setWaitinglist' => 2, 'setAttending' => 1, 'setInvited' => 0, 'setNotAttending' => -1);
$task = $this->getTask();
- $value = JArrayHelper::getValue($values, $task, 0, 'int');
+ $value = \Joomla\Utilities\ArrayHelper::getValue($values, $task, 0, 'int');
if (empty($ids))
{
$message = JText::_('JERROR_NO_ITEMS_SELECTED');
- JError::raiseWarning(500, $message);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($message, 'warning');
}
else
{
@@ -222,7 +222,7 @@ public function setStatus()
{
$message = $model->getError();
JemHelper::addLogEntry($message, __METHOD__, JLog::ERROR);
- JError::raiseWarning(500, $message);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($message, 'warning');
}
else
{
diff --git a/admin/controllers/categories.php b/admin/controllers/categories.php
index 94ea7adb0..c4d118f46 100644
--- a/admin/controllers/categories.php
+++ b/admin/controllers/categories.php
@@ -95,7 +95,7 @@ public function deleteDisabled()
if (!is_array($cid) || count($cid) < 1)
{
- JError::raiseWarning(500, JText::_($this->text_prefix . '_NO_ITEM_SELECTED'));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_($this->text_prefix . '_NO_ITEM_SELECTED'), 'warning');
}
else
{
@@ -104,7 +104,7 @@ public function deleteDisabled()
// Make sure the item ids are integers
jimport('joomla.utilities.arrayhelper');
- JArrayHelper::toInteger($cid);
+ \Joomla\Utilities\ArrayHelper::toInteger($cid);
// Remove the items.
if ($model->delete($cid))
@@ -135,7 +135,7 @@ public function remove()
$cid= JFactory::getApplication()->input->post->get('cid', array(), 'array');
if (!is_array($cid) || count($cid) < 1) {
- JError::raiseWarning(500, JText::_('COM_JEM_SELECT_ITEM_TO_DELETE'));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_('COM_JEM_SELECT_ITEM_TO_DELETE'), 'warning');
}
$model = $this->getModel('category');
diff --git a/admin/controllers/event.php b/admin/controllers/event.php
index c4c03e49c..15fb3d849 100644
--- a/admin/controllers/event.php
+++ b/admin/controllers/event.php
@@ -63,7 +63,7 @@ protected function _postSaveHook($model, $validData = array())
// but show warning if mailer is disabled
if (!JPluginHelper::isEnabled('jem', 'mailer')) {
- JError::raiseNotice(100, JText::_('COM_JEM_GLOBAL_MAILERPLUGIN_DISABLED'));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_('COM_JEM_GLOBAL_MAILERPLUGIN_DISABLED'), 'notice');
}
}
}
\ No newline at end of file
diff --git a/admin/controllers/events.php b/admin/controllers/events.php
index 9b808e675..428356959 100644
--- a/admin/controllers/events.php
+++ b/admin/controllers/events.php
@@ -50,7 +50,7 @@ public function featured()
$ids = JFactory::getApplication()->input->get('cid', array(), 'array');
$values = array('featured' => 1, 'unfeatured' => 0);
$task = $this->getTask();
- $value = JArrayHelper::getValue($values, $task, 0, 'int');
+ $value = \Joomla\Utilities\ArrayHelper::getValue($values, $task, 0, 'int');
$glob_auth = $user->can('publish', 'event'); // general permission for all events
@@ -60,12 +60,12 @@ public function featured()
if (!$glob_auth && !$user->can('publish', 'event', (int)$id)) {
// Prune items that you can't change.
unset($ids[$i]);
- JError::raiseNotice(403, JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'), 'notice');
}
}
if (empty($ids)) {
- JError::raiseWarning(500, JText::_('JERROR_NO_ITEMS_SELECTED'));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_('JERROR_NO_ITEMS_SELECTED'), 'warning');
}
else {
// Get the model.
@@ -73,7 +73,7 @@ public function featured()
// Publish the items.
if (!$model->featured($ids, $value)) {
- JError::raiseWarning(500, $model->getError());
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($model->getError(), 'warning');
}
}
diff --git a/admin/controllers/groups.php b/admin/controllers/groups.php
index 38907c97c..71d7b77da 100644
--- a/admin/controllers/groups.php
+++ b/admin/controllers/groups.php
@@ -51,7 +51,7 @@ public function remove()
$cid = $jinput->get('cid', 0, 'array');
if (!is_array($cid) || count($cid) < 1) {
- JError::raiseError(500, JText::_('COM_JEM_SELECT_ITEM_TO_DELETE'));
+ throw new Exception(JText::_('COM_JEM_SELECT_ITEM_TO_DELETE'), 500);
}
$total = count($cid);
diff --git a/admin/controllers/imagehandler.php b/admin/controllers/imagehandler.php
index 36cd29c71..4d1597107 100644
--- a/admin/controllers/imagehandler.php
+++ b/admin/controllers/imagehandler.php
@@ -83,10 +83,10 @@ public function uploadimage()
//upload the image
if (!JFile::upload($file['tmp_name'], $filepath)) {
- echo "\n";
+ echo "\n";
$app->close();
} else {
- echo "\n";
+ echo "\n";
$app->close();
}
}
@@ -115,7 +115,7 @@ public function delete()
if (count($images)) {
foreach ($images as $image) {
if ($image !== JFilterInput::getInstance()->clean($image, 'path')) {
- JError::raiseWarning(100, JText::_('COM_JEM_UNABLE_TO_DELETE').' '.htmlspecialchars($image, ENT_COMPAT, 'UTF-8'));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_('COM_JEM_UNABLE_TO_DELETE').' '.htmlspecialchars($image, ENT_COMPAT, 'UTF-8'), 'warning');
continue;
}
diff --git a/admin/controllers/import.php b/admin/controllers/import.php
index c3bab18b4..2a6e0b86b 100644
--- a/admin/controllers/import.php
+++ b/admin/controllers/import.php
@@ -61,6 +61,9 @@ private function CsvImport($type, $dbname)
$replace = JFactory::getApplication()->input->post->getInt('replace_'.$type, 0);
$object = JTable::getInstance('jem_'.$dbname, '');
$object_fields = get_object_vars($object);
+ $jemconfig = JemConfig::getInstance()->toRegistry();
+ $separator = $jemconfig->get('csv_separator', ';');
+ $delimiter = $jemconfig->get('csv_delimiter', '"');
if ($type === 'events') {
// add additional fields
@@ -96,11 +99,12 @@ private function CsvImport($type, $dbname)
// get fields, on first row of the file
$fields = array();
- if (($data = fgetcsv($handle, 1000, ';')) !== false) {
+ if (($data = fgetcsv($handle, 1000, $separator, $delimiter)) !== false) {
$numfields = count($data);
// convert from ansi to utf-8 if required
if ($convert) {
+ $msg .= "".JText::_('COM_JEM_IMPORT_BOM_NOT_FOUND')."
\n";
array_walk($data, 'jem_convert_ansi2utf8');
}
@@ -129,7 +133,7 @@ private function CsvImport($type, $dbname)
$records = array();
$row = 1;
- while (($data = fgetcsv($handle, 10000, ';')) !== FALSE) {
+ while (($data = fgetcsv($handle, 10000, $separator, $delimiter)) !== FALSE) {
$num = count($data);
if ($numfields != $num) {
diff --git a/admin/controllers/settings.php b/admin/controllers/settings.php
index 0978475f0..fb420561a 100644
--- a/admin/controllers/settings.php
+++ b/admin/controllers/settings.php
@@ -80,13 +80,13 @@ public function save()
// Access check.
if (!$this->allowSave()) {
- return JError::raiseWarning(403, JText::_('JERROR_SAVE_NOT_PERMITTED'));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_('JERROR_SAVE_NOT_PERMITTED'), 'warning');
}
// Validate the posted data.
$form = $model->getForm();
if (!$form) {
- JError::raiseError(500, $model->getError());
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($model->getError(), 'error');
return false;
}
diff --git a/admin/controllers/source.php b/admin/controllers/source.php
index e88f7cb6d..3c4969d07 100644
--- a/admin/controllers/source.php
+++ b/admin/controllers/source.php
@@ -91,12 +91,12 @@ public function edit()
$context = 'com_jem.edit.source';
if (preg_match('#\.\.#', base64_decode($recordId))) {
- return JError::raiseError(500, JText::_('COM_JEM_CSSMANAGER_ERROR_SOURCE_FILE_NOT_FOUND'));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_('COM_JEM_CSSMANAGER_ERROR_SOURCE_FILE_NOT_FOUND'), 'warning');
}
// Access check.
if (!$this->allowEdit()) {
- return JError::raiseWarning(403, JText::_('JLIB_APPLICATION_ERROR_EDIT_NOT_PERMITTED'));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_('JLIB_APPLICATION_ERROR_EDIT_NOT_PERMITTED'), 'warning');
}
// Check-out succeeded, push the new record id into the session.
@@ -152,19 +152,19 @@ public function save()
// Access check.
if (!$this->allowSave()) {
- return JError::raiseWarning(403, JText::_('JERROR_SAVE_NOT_PERMITTED'));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_('JERROR_SAVE_NOT_PERMITTED'), 'warning');
}
// Match the stored id's with the submitted.
if (empty($data['filename']) || ($data['filename'] != $file)) {
- return JError::raiseError(500, JText::_('COM_JEM_CSSMANAGER_ERROR_SOURCE_ID_FILENAME_MISMATCH'));
+ throw new Exception(JText::_('COM_JEM_CSSMANAGER_ERROR_SOURCE_ID_FILENAME_MISMATCH'), 500);
}
// Validate the posted data.
$form = $model->getForm();
if (!$form)
{
- JError::raiseError(500, $model->getError());
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($model->getError(), 'error');
return false;
}
diff --git a/admin/controllers/venue.php b/admin/controllers/venue.php
index 1f5d22d1a..f6f116eff 100644
--- a/admin/controllers/venue.php
+++ b/admin/controllers/venue.php
@@ -55,7 +55,7 @@ protected function _postSaveHook($model, $validData = array())
// but show warning if mailer is disabled
if (!JPluginHelper::isEnabled('jem', 'mailer')) {
- JError::raiseNotice(100, JText::_('COM_JEM_GLOBAL_MAILERPLUGIN_DISABLED'));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_('COM_JEM_GLOBAL_MAILERPLUGIN_DISABLED'), 'notice');
}
}
diff --git a/admin/controllers/venues.php b/admin/controllers/venues.php
index 7cb82c545..561960587 100644
--- a/admin/controllers/venues.php
+++ b/admin/controllers/venues.php
@@ -47,12 +47,12 @@ public function remove()
$cid = $jinput->get('cid',array(),'array');
if (!is_array( $cid ) || count( $cid ) < 1) {
- JError::raiseError(500, JText::_( 'COM_JEM_SELECT_AN_ITEM_TO_DELETE' ) );
+ throw new Exception(JText::_('COM_JEM_SELECT_AN_ITEM_TO_DELETE'), 500);
} else {
$model = $this->getModel('venue');
jimport('joomla.utilities.arrayhelper');
- JArrayHelper::toInteger($cid);
+ \Joomla\Utilities\ArrayHelper::toInteger($cid);
// trigger delete function in the model
$result = $model->delete($cid);
diff --git a/admin/help/en-GB/modernlayout.html b/admin/help/en-GB/modernlayout.html
new file mode 100644
index 000000000..b40c1fc15
--- /dev/null
+++ b/admin/help/en-GB/modernlayout.html
@@ -0,0 +1,145 @@
+
+
+
+ JEM Responsive
+ JEM Responsive
+
+How to activate
+
+
+
JEM Responsive started as an override to enable mobile usage for JEM because the old table layout is static. So JEM Responsive started with the vision that it should integrate as much as possible to the design of your template and should be responsive as possible for better mobile usage. After some releases of the override we decided to integrate it officially to JEM.
+
How to activate
+
+To activate the modern layout, called JEM Responsive, go to Components → JEM → Settings → Basic Settings → Style and select "Modern responsive style" and enable "Use icon font".
+
+
+Features - Special Functionality
+
+
+
Caused that JEM Responsive started as an override, it does not have full support for all settings of JEM and some features have to be configured via module or page class suffix.
+
+
+
Some of the settings for JEM do not yet work for JEM-Responsive. We are working on it...
+
+
View: Simplelist (and similar list-views)
+
JEM Responsive introduces two new layouts to the Simplelist view. One layout tries to rebuild the default table but as responsive as possible. The other layout is a complete new layout that looks modern and is also responsive. Both layouts are shown in the picture below: table rebuild on the left, new layout on the right site.
+
+
You can change between both layouts in the settings: Go to Components → JEM → Settings → Layout → "Table Width in %" . If this field is empty, the modern look is used if you input some percentage value like "100" then the table-like layout is used and you can change the width of the table. Only if you use the table-like layout, the other "Column Width" -fields will take an effect. If you use the modern layout, you can only turn columns on and off (no width setting). A word to the column widths: by default (all width fields empty) JEM Responsive uses automatic column widths in the table-like layout but you can change that using those "Column Width"-fields. You can also just set one column fixed (e.g. 100px) and all other fields empty and it would work.
+
+
Module and Page Class Suffix
+
As written at the beginning, some settings have to be used via page or module class suffix. In the following table you can see where you can use which page or module class suffix.
+
+
+
+ Suffix
+ JEM List-Views
+ JEM Teaser Module
+ JEM Wide Module
+ JEM Banner Module
+ JEM Basic Module
+ JEM Calendar Module
+
+
+ jem-imagewidth<width>px
+ yes
+ yes
+ yes
+ yes
+ -
+ -
+
+
+ jem-filterbelow
+ yes
+ -
+ -
+ -
+ -
+ -
+
+
+ jem-tablestyle
+ -
+ -
+ yes
+ -
+ -
+ -
+
+
+ jem-notitle etc.
+ -
+ yes
+ yes
+ -
+ -
+ -
+
+
+ jem-horizontal
+ -
+ -
+ -
+ yes
+ -
+ -
+
+
+ jem-imagetop
+ -
+ -
+ -
+ yes
+ -
+ -
+
+
+
Description:
+
jem-imagewidth<width>px and jem-imageheight<height>px : Use that suffix at a menue item at a module to resize the images in list views. With just jem-imagewidth<width>px the image has automatic height. Example for page suffix: "jem-imagewidth200px" remains in 200px width images. Or you use percentage values: "jem-imagewidth100%".
+
jem-filterbelow, jem-hidefilter and jem-showfilter : Use that page suffix to force hiding/showing filter and to set the filter below the eventlist per page.
+
jem-tablestyle : Use this module class suffix to use the table-like layout in the module instead of the modern list view.
+
jem-notitle, jem-novenue, jem-nocity, jem-nostate, jem-nocats, jem-noimageevent, jem-noimagevenue : Add one of the tags to module class suffix to hide the related item. Not all tags work in the modern layout but in the table-like layout and also not in all modules... Just try :)
+
jem-horizontal : Switch between a horizontal and vertical layout (default is vertical).
+
jem-imagetop : You can move the image at the top of the banner module (if no calendar is shown, otherwhise its below calendar) via module suffix "jem-imagetop".
+
JEM Teaser Module
+
+
+
The JEM Teaser Module has another special functionality. If you set maximum description length to 1208, the Teaser Module will not filter your Event description. The whole description will be shown as you have been written. You can use the read more functionality of Joomla to show more text in the event detail view.
+
Description
-
Navigation
To access this screen use:
@@ -60,7 +59,6 @@
Toolbar Icons
Help:
Opens this help screen.
-
Settings: Basic Settings:
Display
@@ -108,11 +105,9 @@ Display
the following code '%H' shows '16'. More Information php strftime manual .
-
Store IP:
-
Event Handling
Handle Old Events:
Event Handling
Number of Days:
-
Image Handling:
Allowed Image Files:
Image Handling:
Lightbox Effect:
-
If you define an image width of more than the width of 20% of the content area, you have to modify the jem.css accordingly.
-
Meta Options
Edit Keywords:
Meta Options
Don't use inverted commas or quotation marks in the description, because this will cause HTML errors
-
Event Page:
Events
@@ -218,7 +209,6 @@ Events
If set to Show, the event Introtext will be shown.
If set to Hide, only the part of the event description after the "Read More" break will show.
-
Venues
@@ -280,7 +270,6 @@
General Layout Settings:
If "Show time in date column" is set to No/Hide the only difference is the second, empty line on Two lines layout.
So you should show time values for best results.
-
Columns
City Column:
Columns
If yes, type in the width of the column. The column title will be displayed
at the head of the column.
-
Custom Stylesheets
Choose if you want to use custom stylesheets for various parts of JEM. You can set if you are using a custom stylesheet for:
@@ -350,7 +338,6 @@
Font Color
Choose a custom Font Color for various parts of JEM.
-
Global Parameters:
Global Parameters:
@@ -383,7 +370,6 @@
Global Parameters:
Show Time:
-
Display User Name:
@@ -410,7 +396,6 @@
Global Parameters:
should be removed from database if you uninstall JEM.
Be warned: If set to Yes and you uninstall JEM all data like events, venues, or atteendances get lost!
-
Editevent:
Owned Venues:
Editevent:
Choose the maximum number of Custom Fields that are allowed when entering / editing an Event.
Please note this only takes effect in the Frontend.
-
Advanced Parameters:
Max ICS Events:
Advanced Parameters:
When entering a new venue the country is then set to the default chosen here, to save handling.
CSV Separator:
+ Choose if comma or semicolon should be used as separator between fields on CSV Imports/Exports (e.g. attendee lists).
+
+
CSV Delimiter:
+
+
Insert BOM for UTF-8 handling:
Venues:
@@ -478,7 +468,6 @@
Venues:
Other Venues settings under "Event Page" tab affect the Event detail view.
Display Venue Description:
@@ -509,8 +498,6 @@ Editvenue:
Choose the maximum number of Custom Fields that are allowed when entering / editing a Venue.
Please note this only takes effect in the Frontend.
-
-
User Control:
User Control
@@ -520,14 +507,12 @@ User Control
of the description is too long, the description will be stripped
and the note [stripped] will be added.
-
Image Uploads:
Attachement Uploads:
-
AC - Events
Create Events:
AC - Events
Allow user to edit his submitted events even if he hasn't
the required access level for editing events.
-
Registration
Allow Event Registration:
Registration
Allow Comments:
-
AC - Venues
Create Venues:
Configinfo
The Configinfo schreen displays a summary of all JEM and JEM-related configuration and version information.
-
diff --git a/admin/help/images/tablemodern.jpg b/admin/help/images/tablemodern.jpg
new file mode 100644
index 000000000..538116178
Binary files /dev/null and b/admin/help/images/tablemodern.jpg differ
diff --git a/admin/helpers/html/jemhtml.php b/admin/helpers/html/jemhtml.php
index 952718ae2..87c09c6c6 100644
--- a/admin/helpers/html/jemhtml.php
+++ b/admin/helpers/html/jemhtml.php
@@ -1,8 +1,8 @@
array(
'disabled.png',
+ 'fa-star-o', //'fa-circle-o',
'events.featured',
'COM_JEM_EVENTS_UNFEATURED',
'COM_JEM_EVENTS_TOGGLE_TO_FEATURE'
),
1 => array(
'featured.png',
+ 'fa-star', //'fa-circle',
'events.unfeatured',
'COM_JEM_EVENTS_FEATURED',
'COM_JEM_EVENTS_TOGGLE_TO_UNFEATURE'
)
);
- $state = JArrayHelper::getValue($states, (int) $value, $states[1]);
- $html = JHtml::_('image', 'com_jem/' . $state[0], JText::_($state[2]), NULL, true);
+ $state = \Joomla\Utilities\ArrayHelper::getValue($states, (int) $value, $states[1]);
+ $no_iconfont = (bool)JFactory::getApplication()->isAdmin(); // requires font and css loaded which isn't yet on backend
+ $html = JHtml::_('jemhtml.icon', 'com_jem/'.$state[0], 'fa fa-fw fa-lg '.$state[1].' jem-featured-'.$state[1], $state[3], null, $no_iconfont);
if ($canChange) {
- $html = '' . $html . ' ';
+ $html = '' . $html . ' ';
}
return $html;
@@ -58,30 +61,99 @@ static public function toggleStatus($value = 0, $i, $canChange = true)
JemHelper::addLogEntry('Use of this function is deprecated. Use JemHekper::toggleAttendanceStatus() instead.', __METHOD__, JLog::WARNING);
}
- // Array of image, task, title, action
+ // Array of image, iconfont, task, title, action
$states = array(
0 => array(
'tick.png',
+ 'fa-check-circle',
'attendees.OnWaitinglist',
'COM_JEM_ATTENDING',
'COM_JEM_ATTENDING'
),
1 => array(
'publish_y.png',
+ 'fa-hourglass-half', //'fa-exclamation-circle',
'attendees.OffWaitinglist',
'COM_JEM_ON_WAITINGLIST',
'COM_JEM_ON_WAITINGLIST'
)
);
- $state = JArrayHelper::getValue($states, (int) $value, $states[1]);
- $html = JHtml::_('image', 'com_jem/' . $state[0], JText::_($state[2]), NULL, true);
+ $state = \Joomla\Utilities\ArrayHelper::getValue($states, (int) $value, $states[1]);
+ $no_iconfont = (bool)JFactory::getApplication()->isAdmin(); // requires font and css loaded which isn't yet on backend
+ $html = JHtml::_('jemhtml.icon', 'com_jem/'.$state[0], 'fa fa-fw fa-lg '.$state[1].' jem-attendance-status-'.$state[1], $state[3], null, $no_iconfont);
if ($canChange) {
- $html = '' . $html . ' ';
+ $html = '' . $html . ' ';
}
return $html;
}
+ /**
+ * Returns text of attendance status, maybe incl. hint to toggle this status.
+ *
+ * @param int $value status value
+ * @param int $i registration record id
+ * @param bool $canChange current user is allowed to modify the status
+ * @param bool $print if true show icon AND text for printing
+ * @return string The html snippet.
+ */
+ static public function getAttendanceStatusText($value = 0, $i, $canChange = true, $print = false)
+ {
+ // Array of image, iconfont, task, alt-text, alt-text edit, tooltip
+ $states = array(
+ -99 => array( // fallback on wrong status value
+ 'disabled.png',
+ 'fa-circle-o',
+ '',
+ 'COM_JEM_STATUS_UNKNOWN',
+ 'COM_JEM_STATUS_UNKNOWN',
+ 'COM_JEM_ATTENDEES_STATUS_UNKNOWN'
+ ),
+ -1 => array( // not attending, no toggle
+ 'publish_r.png',
+ 'fa-times-circle',
+ '',
+ 'COM_JEM_NOT_ATTENDING',
+ 'COM_JEM_NOT_ATTENDING',
+ 'COM_JEM_ATTENDEES_NOT_ATTENDING'
+ ),
+ 0 => array( // invited, no toggle
+ 'invited.png',
+ 'fa-question-circle',
+ '',
+ 'COM_JEM_INVITED',
+ 'COM_JEM_INVITED',
+ 'COM_JEM_ATTENDEES_INVITED'
+ ),
+ 1 => array( // attending, toggle: waiting list
+ 'tick.png',
+ 'fa-check-circle',
+ 'attendees.OnWaitinglist',
+ 'COM_JEM_ATTENDING',
+ 'COM_JEM_ATTENDING_MOVE_TO_WAITINGLIST',
+ 'COM_JEM_ATTENDEES_ATTENDING'
+ ),
+ 2 => array( // on waiting list, toggle: list of attendees
+ 'publish_y.png',
+ 'fa-hourglass-half', //'fa-exclamation-circle',
+ 'attendees.OffWaitinglist',
+ 'COM_JEM_ON_WAITINGLIST',
+ 'COM_JEM_ON_WAITINGLIST_MOVE_TO_ATTENDING',
+ 'COM_JEM_ATTENDEES_ON_WAITINGLIST'
+ )
+ );
+
+ $state = \Joomla\Utilities\ArrayHelper::getValue($states, (int) $value, $states[-99]);
+
+ if ($print) {
+ $result = JText::_($state[5]);
+ } else {
+ $result = JText::_($state[$canChange ? 4 : 3]);
+ }
+
+ return $result;
+ }
+
/**
* Creates html code to show attendance status, maybe incl. link to toggle this status.
*
@@ -93,10 +165,11 @@ static public function toggleStatus($value = 0, $i, $canChange = true)
*/
static public function toggleAttendanceStatus($value = 0, $i, $canChange = true, $print = false)
{
- // Array of image, task, alt-text, tooltip
+ // Array of image, iconfont, task, alt-text, alt-text edit, tooltip
$states = array(
-99 => array( // fallback on wrong status value
'disabled.png',
+ 'fa-circle-o',
'',
'COM_JEM_STATUS_UNKNOWN',
'COM_JEM_STATUS_UNKNOWN',
@@ -104,6 +177,7 @@ static public function toggleAttendanceStatus($value = 0, $i, $canChange = true,
),
-1 => array( // not attending, no toggle
'publish_r.png',
+ 'fa-times-circle',
'',
'COM_JEM_NOT_ATTENDING',
'COM_JEM_NOT_ATTENDING',
@@ -111,6 +185,7 @@ static public function toggleAttendanceStatus($value = 0, $i, $canChange = true,
),
0 => array( // invited, no toggle
'invited.png',
+ 'fa-question-circle',
'',
'COM_JEM_INVITED',
'COM_JEM_INVITED',
@@ -118,6 +193,7 @@ static public function toggleAttendanceStatus($value = 0, $i, $canChange = true,
),
1 => array( // attending, toggle: waiting list
'tick.png',
+ 'fa-check-circle',
'attendees.OnWaitinglist',
'COM_JEM_ATTENDING',
'COM_JEM_ATTENDING_MOVE_TO_WAITINGLIST',
@@ -125,6 +201,7 @@ static public function toggleAttendanceStatus($value = 0, $i, $canChange = true,
),
2 => array( // on waiting list, toggle: list of attendees
'publish_y.png',
+ 'fa-hourglass-half', //fa-exclamation-circle',
'attendees.OffWaitinglist',
'COM_JEM_ON_WAITINGLIST',
'COM_JEM_ON_WAITINGLIST_MOVE_TO_ATTENDING',
@@ -133,34 +210,62 @@ static public function toggleAttendanceStatus($value = 0, $i, $canChange = true,
);
$backend = (bool)JFactory::getApplication()->isAdmin();
- $state = JArrayHelper::getValue($states, (int) $value, $states[-99]);
+ $state = \Joomla\Utilities\ArrayHelper::getValue($states, (int) $value, $states[-99]);
if (version_compare(JVERSION, '3.3', 'lt')) {
// on Joomla! 2.5/3.2 we use good old tooltips
JHtml::_('behavior.tooltip');
- $attr = 'class="hasTip" title="'.JText::_('COM_JEM_STATUS').'::'.JText::_($state[$canChange ? 3 : 2]).'"';
+ $attr = 'class="hasTip" title="'.JText::_('COM_JEM_STATUS').'::'.JText::_($state[$canChange ? 4 : 3]).'"';
} else {
// on Joomla! 3.3+ we must use the new tooltips
JHtml::_('bootstrap.tooltip');
- $attr = 'class="hasTooltip" title="'.JHtml::tooltipText(JText::_('COM_JEM_STATUS'), JText::_($state[$canChange ? 3 : 2]), 0).'"';
+ $attr = 'class="hasTooltip" title="'.JHtml::tooltipText(JText::_('COM_JEM_STATUS'), JText::_($state[$canChange ? 4 : 3]), 0).'"';
}
if ($print) {
- $html = JHtml::_('image', 'com_jem/' . $state[0], '', 'class="icon-inline-left"', true);
- $html .= JText::_($state[4]);
- } elseif ($canChange && !empty($state[1])) {
- $html = JHtml::_('image', 'com_jem/' . $state[0], JText::_($state[2]), NULL, true);
+ $html = JHtml::_('jemhtml.icon', 'com_jem/'.$state[0], 'fa fa-fw fa-lg '.$state[1].' jem-attendance-status-'.$state[1], $state[3], 'class="icon-inline-left"', $backend);
+ $html .= JText::_($state[5]);
+ } elseif ($canChange && !empty($state[2])) {
+ $html = JHtml::_('jemhtml.icon', 'com_jem/'.$state[0], 'fa fa-fw fa-lg '.$state[1].' jem-attendance-status-'.$state[1], $state[3], null, $backend);
if ($backend) {
- $attr .= ' onclick="return listItemTask(\'cb' . $i . '\',\'' . $state[1] . '\')"';
+ $attr .= ' onclick="return listItemTask(\'cb' . $i . '\',\'' . $state[2] . '\')"';
$url = '#';
} else {
$url = JRoute::_('index.php?option=com_jem&view=attendees&task=attendees.attendeetoggle&id='.$i.'&'.JSession::getFormToken().'=1');
}
$html = JHtml::_('link', $url, $html, $attr);
} else {
- $html = JHtml::_('image', 'com_jem/' . $state[0], JText::_($state[2]), $attr, true);
+ $html = JHtml::_('jemhtml.icon', 'com_jem/'.$state[0], 'fa fa-fw fa-lg '.$state[1].' jem-attendance-status-'.$state[1], $state[3], $attr, $backend);
+ }
+
+ return $html;
+ }
+
+ /**
+ * Creates html code to show an icon, using image or icon font depending on configuration.
+ * Call JHtml::_('jemhtml.icon', $image, $icon, $alt, $attribs, $no_iconfont, $relative)
+ *
+ * @param string $value status value
+ * @param string $image The relative or absolute URL to use for the `` element
+ * @param boolean $no_iconfont Flag if configuration should be ignored and images should be used always (e.g. on backend).
+ * @param boolean $relative Flag if the path to the file is relative to the /media folder (and searches in template).
+ * @return string The html snippet.
+ */
+ static public function icon($image, $icon, $alt, $attribs = null, $no_iconfont = false, $relative = true)
+ {
+ $useiconfont = !$no_iconfont && (JemHelper::config()->useiconfont == 1);
+
+ if (!$useiconfont) {
+ $html = JHtml::_('image', $image, JText::_($alt), $attribs, $relative);
+ } elseif (!empty($attribs)) {
+ $html = 'Example: If file is accessable as "_QQ_"www.mysite.com/media/my/css/mystyle.css"_QQ_" type in here "_QQ_"/media/my/css/mystyle.css"_QQ_"."
COM_JEM_SETTINGS_FIELD_CSS_COLORPICKER_USECUSTOM="colorpicker.css"
@@ -585,9 +588,17 @@ COM_JEM_SETTINGS_SUNDAY="Sunday"
COM_JEM_SETTINGS_TAB_CONFIGINFO="Configinfo"
COM_JEM_SETTINGS_TITLE="Settings"
COM_JEM_SETTINGS_CSV_SEPARATOR="CSV Separator"
-COM_JEM_SETTINGS_CSV_SEPARATOR_DESC="Separator to use in csv files, e.g. on attendee export. Please note: "_QQ_"Export Data"_QQ_" and "_QQ_"Import Data"_QQ_" on backend always use semicolon."
+COM_JEM_SETTINGS_CSV_SEPARATOR_DESC="Separator to use in csv files for import/export and attendees export."
COM_JEM_SETTINGS_CSV_SEPARATOR_COMMA=", (comma)"
COM_JEM_SETTINGS_CSV_SEPARATOR_SEMICOLON="; (semicolon)"
+COM_JEM_SETTINGS_CSV_SEPARATOR_TAB="\t (tab)"
+COM_JEM_SETTINGS_CSV_DELIMITER="CSV Delimiter"
+COM_JEM_SETTINGS_CSV_DELIMITER_DESC="Delimiter to embrace fields in csv files for import/export and attendees export."
+COM_JEM_SETTINGS_CSV_DELIMITER_NONE=" (nothing)"
+COM_JEM_SETTINGS_CSV_DELIMITER_QUOTE="' (single quote)"
+COM_JEM_SETTINGS_CSV_DELIMITER_DQUOTE="\" (double quote)"
+COM_JEM_SETTINGS_CSV_BOM="Insert BOM for conversion to UTF-8 on export"
+COM_JEM_SETTINGS_CSV_BOM_DESC="Insert BOM (Byte Order Mark) as first char to help spreadsheet software (i.e. Excel) to properly import data as UTF-8 encoded."
; UPDATECHECK-View
COM_JEM_UPDATECHECK_CHANGES="Changes"
@@ -842,6 +853,14 @@ COM_JEM_HOUR_STRFTIME_DESC="Hour format using the PHP strftime format, for examp
COM_JEM_HOUR_STRFTIME="Format Hour"
COM_JEM_TIME_NAME_DESC="This will be shown behind the time on the frontend. Fill in "_QQ_"h"_QQ_" or "_QQ_"Uhr"_QQ_", for example, or leave blank if you don't need it."
COM_JEM_TIME_NAME="Time Suffix"
+COM_JEM_LAYOUT_STYLE_SETTINGS="Style"
+COM_JEM_SHOW_LAYOUT_STYLE="Layout Style"
+COM_JEM_SHOW_LAYOUT_STYLE_DESC="Choose style the frontend should be shown. Select between old table style or a modern responsive style."
+COM_JEM_SHOW_LAYOUT_STYLE_LEGACY="Legacy (Table Style)"
+COM_JEM_SHOW_LAYOUT_STYLE_RESPONSIVE="Default (Responsive Style)"
+COM_JEM_SHOW_LAYOUT_STYLE_ALTERNATIVE="Alternative (Responsive Style)"
+COM_JEM_INCLUDE_ICON_FONT="Use Icon Font"
+COM_JEM_INCLUDE_ICON_FONT_DESC="Use icon font instead of images for print icons etc."
COM_JEM_EVENT_HANDLING="Event Handling"
COM_JEM_OLD_EVENTS_DESC="Archive, Trash or completely Delete old events automatically."
COM_JEM_OLD_EVENTS="Handle Old Events"
@@ -911,6 +930,8 @@ COM_JEM_COM_SOL_DESC="Choose the Community Solution you use. Community Builder f
COM_JEM_COM_SOL="Select Community Solution"
COM_JEM_DONT_USE_COM_SOL="Do not use any Community Solution"
COM_JEM_COMBUILDER="CB"
+COM_JEM_REG_SHOW_MORE_ATTENDEEDETAILS="Show all related users"
+COM_JEM_REG_SHOW_MORE_ATTENDEEDETAILS_DESC="If enabled also waiting list, invited and not attending users are shown."
COM_JEM_REG_SHOW_ATTENDEENAMES_TO="Show Attendee Names to"
COM_JEM_REG_SHOW_ATTENDEENAMES_TO_DESC="Select who is allowed to see the names of all attendees."
COM_JEM_ATTENTION="Attention!"
@@ -939,6 +960,8 @@ COM_JEM_DISPLAY_EVENT_DESCRIPT="Display Event Description"
COM_JEM_DISPLAY_EVENT_TITLE_DESC="Display event title on the event page."
COM_JEM_DISPLAY_EVENT_TITLE="Display Event Title"
COM_JEM_GENERAL_LAYOUT_SETTINGS="General Layout Settings"
+COM_JEM_DISPLAY_FEATUREDONLY="Featured only"
+COM_JEM_DISPLAY_FEATUREDONLY_DESC="Show only featured events"
COM_JEM_DISPLAY_INTROTEXT_DESC="Display the introtext on the frontend."
COM_JEM_DISPLAY_INTROTEXT="Show Introtext"
COM_JEM_DISPLAY_TIME_FRONT_DESC="Display time on the frontend."
@@ -1158,8 +1181,8 @@ COM_JEM_ADD="Add"
COM_JEM_LATITUDE="Latitude"
COM_JEM_LONGITUDE="Longitude"
COM_JEM_UPLOAD="Upload"
-COM_JEM_ERROR_ATTACHEMENT_EXTENSION_NOT_ALLOWED="Extension not allowed"
-COM_JEM_ERROR_ATTACHEMENT_FILE_TOO_BIG="Size of attachment is too big"
+COM_JEM_ERROR_ATTACHEMENT_EXTENSION_NOT_ALLOWED="File extension not allowed."
+COM_JEM_ERROR_ATTACHEMENT_FILE_TOO_BIG="Size of attachment is too big."
COM_JEM_ERROR_ATTACHMENT_SAVING_TO_DB="Error storing attachment information."
COM_JEM_ERROR_ATTACHMENT_UPDATING_RECORD="Error updating attachment information."
COM_JEM_ERROR_COULD_NOT_CREATE_FOLDER="Couldn't create folder."
diff --git a/admin/models/attendee.php b/admin/models/attendee.php
index d9a3d23e9..da46639b5 100644
--- a/admin/models/attendee.php
+++ b/admin/models/attendee.php
@@ -184,7 +184,7 @@ public function store($data)
// bind it to the table
if (!$row->bind($data)) {
- JError::raiseError(500, $this->_db->getErrorMsg());
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_db->getErrorMsg(), 'error');
return false;
}
@@ -205,7 +205,7 @@ public function store($data)
$cnt = $db->loadResult();
if ($cnt > 0) {
- JError::raiseWarning(0, JText::_('COM_JEM_ERROR_USER_ALREADY_REGISTERED'));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_('COM_JEM_ERROR_USER_ALREADY_REGISTERED'), 'warning');
return false;
}
@@ -254,7 +254,7 @@ public function store($data)
if ($register->booked >= $event->maxplaces)
{
if (!$event->waitinglist) {
- JError::raiseWarning(0, JText::_('COM_JEM_ERROR_REGISTER_EVENT_IS_FULL'));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_('COM_JEM_ERROR_REGISTER_EVENT_IS_FULL'), 'warning');
return false;
} else {
$row->waiting = 1;
@@ -271,7 +271,7 @@ public function store($data)
// Store it in the db
if (!$row->store()) {
- JError::raiseError(500, $this->_db->getErrorMsg());
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_db->getErrorMsg(), 'error');
return false;
}
@@ -289,7 +289,7 @@ public function setStatus($pks, $value = 1)
{
// Sanitize the ids.
$pks = (array)$pks;
- JArrayHelper::toInteger($pks);
+ \Joomla\Utilities\ArrayHelper::toInteger($pks);
if (empty($pks)) {
$this->setError(JText::_('JERROR_NO_ITEMS_SELECTED'));
diff --git a/admin/models/attendees.php b/admin/models/attendees.php
index 8b3142384..2d678c131 100644
--- a/admin/models/attendees.php
+++ b/admin/models/attendees.php
@@ -184,7 +184,7 @@ public function remove($cid = array())
{
if (is_array($cid) && count($cid))
{
- JArrayHelper::toInteger($cid);
+ \Joomla\Utilities\ArrayHelper::toInteger($cid);
$user = implode(',', $cid);
$db = JFactory::getDbo();
@@ -196,7 +196,7 @@ public function remove($cid = array())
// TODO: use exception handling
if ($db->execute() === false) {
- JError::raiseError(500, $db->getErrorMsg());
+ throw new Exception($db->getErrorMsg(), 500);
}
}
return true;
@@ -209,7 +209,9 @@ public function remove($cid = array())
public function getCsv()
{
$jemconfig = JemConfig::getInstance()->toRegistry();
- $sep = $jemconfig->get('csv_separator', ';');
+ $separator = $jemconfig->get('csv_separator', ';');
+ $delimiter = $jemconfig->get('csv_delimiter', '"');
+ $csv_bom = $jemconfig->get('csv_bom', '1');
$comments = $jemconfig->get('regallowcomments', 0);
$event = $this->getEvent();
@@ -218,7 +220,6 @@ public function getCsv()
$waitinglist = isset($event->waitinglist) ? $event->waitinglist : false;
$csv = fopen('php://output', 'w');
- fputcsv($csv, array('sep='.$sep), $sep, '"');
$header = array(
JText::_('COM_JEM_NAME'),
@@ -232,7 +233,7 @@ public function getCsv()
}
$header[] = JText::_('COM_JEM_ATTENDEES_REGID');
- fputcsv($csv, $header, $sep, '"');
+ fputcsv($csv, $header, $separator, $delimiter);
foreach ($items as $item)
{
@@ -258,7 +259,7 @@ public function getCsv()
}
$data[] = $item->uid;
- fputcsv($csv, $data, $sep, '"');
+ fputcsv($csv, $data, $separator, $delimiter);
}
return fclose($csv);
diff --git a/admin/models/category.php b/admin/models/category.php
index ea4563b52..8821d404d 100644
--- a/admin/models/category.php
+++ b/admin/models/category.php
@@ -400,7 +400,7 @@ protected function batchCopy($value, $pks, $contexts)
{
// $value comes as {parent_id}.{extension}
$parts = explode('.', $value);
- $parentId = (int) JArrayHelper::getValue($parts, 0, 1);
+ $parentId = (int) \Joomla\Utilities\ArrayHelper::getValue($parts, 0, 1);
$table = $this->getTable();
$db = $this->getDbo();
@@ -664,7 +664,7 @@ protected function batchMove($value, $pks, $contexts)
if (!empty($children)) {
// Remove any duplicates and sanitize ids.
$children = array_unique($children);
- JArrayHelper::toInteger($children);
+ \Joomla\Utilities\ArrayHelper::toInteger($children);
// Check for a database error.
if ($db->getErrorNum()) {
@@ -715,8 +715,8 @@ protected function generateNewTitle($parent_id, $alias, $title)
// Alter the title & alias
$table = $this->getTable();
while ($table->load(array('alias' => $alias, 'parent_id' => $parent_id))) {
- $title = JString::increment($title);
- $alias = JString::increment($alias, 'dash');
+ $title = \Joomla\String\StringHelper::increment($title);
+ $alias = \Joomla\String\StringHelper::increment($alias, 'dash');
}
return array($title, $alias);
@@ -752,7 +752,7 @@ public function getGroups()
*/
public function delete(&$cids)
{
- JArrayHelper::toInteger($cids);
+ \Joomla\Utilities\ArrayHelper::toInteger($cids);
// Add all children to the list
foreach ($cids as $id) {
@@ -762,7 +762,7 @@ public function delete(&$cids)
$cids = implode(',', $cids);
if (strlen($cids) == 0) {
- JError::raiseError(500, $this->_db->stderr());
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_db->stderr(), 'error');
return false;
}
@@ -773,7 +773,7 @@ public function delete(&$cids)
$this->_db->setQuery($query);
if (!($rows = $this->_db->loadObjectList())) {
- JError::raiseError(500, $this->_db->stderr());
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_db->stderr(), 'error');
return false;
}
diff --git a/admin/models/categoryelement.php b/admin/models/categoryelement.php
index 1ecc8cd4a..a80806ccf 100644
--- a/admin/models/categoryelement.php
+++ b/admin/models/categoryelement.php
@@ -72,7 +72,7 @@ public function getData()
$filter_order_Dir = $app->getUserStateFromRequest('com_jem.categoryelement.filter_order_Dir', 'filter_order_Dir', '', 'word');
$filter_state = $app->getUserStateFromRequest('com_jem.categoryelement.'.$itemid.'.filter_state', 'filter_state', '', 'string');
$search = $app->getUserStateFromRequest('com_jem.categoryelement.'.$itemid.'.filter_search', 'filter_search', '', 'string');
- $search = $db->escape(trim(JString::strtolower($search)));
+ $search = $db->escape(trim(\Joomla\String\StringHelper::strtolower($search)));
$filter_order = JFilterInput::getinstance()->clean($filter_order, 'cmd');
$filter_order_Dir = JFilterInput::getinstance()->clean($filter_order_Dir, 'word');
@@ -112,7 +112,7 @@ public function getData()
// Check for a database error.
if ($db->getErrorNum()) {
- JError::raiseNotice(500, $db->getErrorMsg());
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($db->getErrorMsg(), 'notice');
}
if (!$mitems) {
diff --git a/admin/models/contactelement.php b/admin/models/contactelement.php
index 737c429c4..9e754fc82 100644
--- a/admin/models/contactelement.php
+++ b/admin/models/contactelement.php
@@ -89,7 +89,7 @@ protected function buildQuery()
$filter_type = $app->getUserStateFromRequest('com_jem.contactelement.filter_type','filter_type',0,'int');
$search = $app->getUserStateFromRequest('com_jem.contactelement.filter_search','filter_search','','string');
- $search = $this->_db->escape( trim(JString::strtolower( $search ) ) );
+ $search = $this->_db->escape( trim(\Joomla\String\StringHelper::strtolower( $search ) ) );
// start query
$db = JFactory::getDBO();
diff --git a/admin/models/event.php b/admin/models/event.php
index d9b84bec0..31a45c5cc 100644
--- a/admin/models/event.php
+++ b/admin/models/event.php
@@ -572,7 +572,7 @@ public function featured($pks, $value = 0)
{
// Sanitize the ids.
$pks = (array)$pks;
- JArrayHelper::toInteger($pks);
+ \Joomla\Utilities\ArrayHelper::toInteger($pks);
if (empty($pks)) {
$this->setError(JText::_('COM_JEM_EVENTS_NO_ITEM_SELECTED'));
diff --git a/admin/models/eventelement.php b/admin/models/eventelement.php
index 4f4f1f410..b70ee62de 100644
--- a/admin/models/eventelement.php
+++ b/admin/models/eventelement.php
@@ -180,7 +180,7 @@ protected function _buildContentWhere()
$published = $app->getUserStateFromRequest('com_jem.eventelement.'.$itemid.'.filter_state', 'filter_state', '', 'string');
$filter_type = $app->getUserStateFromRequest('com_jem.eventelement.'.$itemid.'.filter_type', 'filter_type', 0, 'int');
$filter_search = $app->getUserStateFromRequest('com_jem.eventelement.'.$itemid.'.filter_search', 'filter_search', '', 'string');
- $filter_search = $this->_db->escape(trim(JString::strtolower($filter_search)));
+ $filter_search = $this->_db->escape(trim(\Joomla\String\StringHelper::strtolower($filter_search)));
$where = array();
diff --git a/admin/models/export.php b/admin/models/export.php
index 9dc26f969..897128489 100644
--- a/admin/models/export.php
+++ b/admin/models/export.php
@@ -95,7 +95,7 @@ protected function getListQuery()
// check if specific category's have been selected
if (! empty($cats)) {
- JArrayHelper::toInteger($cats);
+ \Joomla\Utilities\ArrayHelper::toInteger($cats);
$query->where(' c.id IN (' . implode(',', $cats) . ')');
}
@@ -117,10 +117,16 @@ public function getCsv()
$jinput = JFactory::getApplication()->input;
$includecategories = $jinput->get('categorycolumn', 0, 'int');
- $csv = fopen('php://output', 'w');
$db = $this->getDbo();
-
- fputs($csv, $bom =( chr(0xEF) . chr(0xBB) . chr(0xBF) ));
+ $jemconfig = JemConfig::getInstance()->toRegistry();
+ $separator = $jemconfig->get('csv_separator', ';');
+ $delimiter = $jemconfig->get('csv_delimiter', '"');
+ $csv_bom = $jemconfig->get('csv_bom', '1');
+ $csv = fopen('php://output', 'w');
+ if ($csv_bom ==1 ) {
+ //add BOM to fix UTF-8 in Excel
+ fputs($csv, $bom =( chr(0xEF) . chr(0xBB) . chr(0xBF) ));
+ }
if ($includecategories == 1) {
$events = array_keys($db->getTableColumns('#__jem_events'));
@@ -128,7 +134,7 @@ public function getCsv()
$categories[] = "categories";
$header = array_merge($events, $categories);
- fputcsv($csv, $header, ';');
+ fputcsv($csv, $header, $separator, $delimiter);
$query = $this->getListQuery();
$items = $this->_getList($query);
@@ -138,13 +144,13 @@ public function getCsv()
}
} else {
$header = array_keys($db->getTableColumns('#__jem_events'));
- fputcsv($csv, $header, ';');
+ fputcsv($csv, $header, $separator, $delimiter);
$query = $this->getListQuery();
$items = $this->_getList($query);
}
foreach ($items as $lines) {
- fputcsv($csv, (array) $lines, ';', '"');
+ fputcsv($csv, (array) $lines, $separator, $delimiter);
}
return fclose($csv);
@@ -176,19 +182,24 @@ protected function getListQuerycats()
public function getCsvcats()
{
$this->populateState();
-
+ $jemconfig = JemConfig::getInstance()->toRegistry();
+ $separator = $jemconfig->get('csv_separator', ';');
+ $delimiter = $jemconfig->get('csv_delimiter', '"');
+ $csv_bom = $jemconfig->get('csv_bom', '1');
$csv = fopen('php://output', 'w');
- fputs($csv, $bom =( chr(0xEF) . chr(0xBB) . chr(0xBF) ));
-
+ if ($csv_bom ==1 ) {
+ //add BOM to fix UTF-8 in Excel
+ fputs($csv, $bom =( chr(0xEF) . chr(0xBB) . chr(0xBF) ));
+ }
$db = $this->getDbo();
$header = array_keys($db->getTableColumns('#__jem_categories'));
- fputcsv($csv, $header, ';');
+ fputcsv($csv, $header, $separator, $delimiter);
$db->setQuery($this->getListQuerycats());
$items = $db->loadObjectList();
foreach ($items as $lines) {
- fputcsv($csv, (array) $lines, ';', '"');
+ fputcsv($csv, (array) $lines, $separator, $delimiter);
}
return fclose($csv);
@@ -219,18 +230,24 @@ protected function getListQueryvenues()
public function getCsvvenues()
{
$this->populateState();
-
+ $jemconfig = JemConfig::getInstance()->toRegistry();
+ $separator = $jemconfig->get('csv_separator', ';');
+ $delimiter = $jemconfig->get('csv_delimiter', '"');
+ $csv_bom = $jemconfig->get('csv_bom', '1');
$csv = fopen('php://output', 'w');
- fputs($csv, $bom =( chr(0xEF) . chr(0xBB) . chr(0xBF) ));
+ if ($csv_bom ==1 ) {
+ //add BOM to fix UTF-8 in Excel
+ fputs($csv, $bom =( chr(0xEF) . chr(0xBB) . chr(0xBF) ));
+ }
$db = $this->getDbo();
$header = array_keys($db->getTableColumns('#__jem_venues'));
- fputcsv($csv, $header, ';');
+ fputcsv($csv, $header, $separator, $delimiter);
$db->setQuery($this->getListQueryvenues());
$items = $db->loadObjectList();
foreach ($items as $lines) {
- fputcsv($csv, (array) $lines, ';', '"');
+ fputcsv($csv, (array) $lines, $separator, $delimiter);
}
return fclose($csv);
@@ -261,18 +278,24 @@ protected function getListQuerycatsevents()
public function getCsvcatsevents()
{
$this->populateState();
-
+ $jemconfig = JemConfig::getInstance()->toRegistry();
+ $separator = $jemconfig->get('csv_separator', ';');
+ $delimiter = $jemconfig->get('csv_delimiter', '"');
+ $csv_bom = $jemconfig->get('csv_bom', '1');
$csv = fopen('php://output', 'w');
- fputs($csv, $bom =( chr(0xEF) . chr(0xBB) . chr(0xBF) ));
+ if ($csv_bom ==1 ) {
+ //add BOM to fix UTF-8 in Excel
+ fputs($csv, $bom =( chr(0xEF) . chr(0xBB) . chr(0xBF) ));
+ }
$db = $this->getDbo();
$header = array_keys($db->getTableColumns('#__jem_cats_event_relations'));
- fputcsv($csv, $header, ';');
+ fputcsv($csv, $header, $separator, $delimiter);
$db->setQuery($this->getListQuerycatsevents());
$items = $db->loadObjectList();
foreach ($items as $lines) {
- fputcsv($csv, (array) $lines, ';', '"');
+ fputcsv($csv, (array) $lines, $separator, $delimiter);
}
return fclose($csv);
@@ -294,7 +317,7 @@ public function getCategories()
// Check for a database error.
if ($db->getErrorNum()){
- JError::raiseNotice(500, $db->getErrorMsg());
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($db->getErrorMsg(), 'notice');
}
if (!$mitems) {
diff --git a/admin/models/fields/calendarjem.php b/admin/models/fields/calendarjem.php
index 221fabe5e..c97fc2ed2 100644
--- a/admin/models/fields/calendarjem.php
+++ b/admin/models/fields/calendarjem.php
@@ -43,7 +43,7 @@ protected function getLayoutData()
}
// add hint regarding date/time format accepted in edit field
- $exampleTimestamp = strtotime("12/31/2017 23:59");
+ $exampleTimestamp = strtotime("NOW");
$hint = JText::sprintf('COM_JEM_DATEFIELD_HINT', strftime($this->format, $exampleTimestamp));
$extraData = array(
@@ -77,7 +77,7 @@ protected function getInput()
if (empty($this->hint)) {
// add hint regarding date/time format accepted in edit field
- $exampleTimestamp = strtotime("12/31/2017 23:59");
+ $exampleTimestamp = strtotime("NOW");
$this->hint = JText::sprintf('COM_JEM_DATEFIELD_HINT', strftime($this->format, $exampleTimestamp));
}
@@ -85,4 +85,4 @@ protected function getInput()
}
}
-}
\ No newline at end of file
+}
diff --git a/admin/models/fields/categories.php b/admin/models/fields/categories.php
index 13b0d0594..b58b0458d 100644
--- a/admin/models/fields/categories.php
+++ b/admin/models/fields/categories.php
@@ -57,7 +57,7 @@ protected function getInput()
$category = $db->loadResult();
if ($error = $db->getErrorMsg()) {
- JError::raiseWarning(500, $error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($error, 'warning');
}
if (empty($category)) {
diff --git a/admin/models/fields/categoryedit.php b/admin/models/fields/categoryedit.php
index 24296cdc4..8086bbec2 100644
--- a/admin/models/fields/categoryedit.php
+++ b/admin/models/fields/categoryedit.php
@@ -93,7 +93,7 @@ protected function getOptions()
}
elseif (is_array($published) && count($published))
{
- JArrayHelper::toInteger($published);
+ \Joomla\Utilities\ArrayHelper::toInteger($published);
$query->where('a.published IN (' . implode(',', $published) . ')');
}
@@ -113,12 +113,12 @@ protected function getOptions()
// Check for a database error.
if ($db->getErrorNum()) {
- JError::raiseWarning(500, $db->getErrorMsg());
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($db->getErrorMsg(), 'warning');
}
}
catch (RuntimeException $e)
{
- JError::raiseWarning(500, $e->getMessage);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($e->getErrorMsg(), 'warning');
}
// Pad the option text with spaces using depth level as a multiplier.
diff --git a/admin/models/fields/categoryparent.php b/admin/models/fields/categoryparent.php
index d6c2bff60..bb8bc583b 100644
--- a/admin/models/fields/categoryparent.php
+++ b/admin/models/fields/categoryparent.php
@@ -89,7 +89,7 @@ protected function getOptions()
// Check for a database error.
if ($db->getErrorNum()) {
- JError::raiseWarning(500, $db->getErrorMsg());
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($db->getErrorMsg(), 'warning');
}
// Pad the option text with spaces using depth level as a multiplier.
diff --git a/admin/models/fields/event.php b/admin/models/fields/event.php
index 1c825aa92..b85e0368a 100644
--- a/admin/models/fields/event.php
+++ b/admin/models/fields/event.php
@@ -59,7 +59,7 @@ protected function getInput()
$title = $db->loadResult();
if ($error = $db->getErrorMsg()) {
- JError::raiseWarning(500, $error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($error, 'warning');
}
if (empty($title)) {
diff --git a/admin/models/fields/modal/contact.php b/admin/models/fields/modal/contact.php
index f9ca24de4..a02268411 100644
--- a/admin/models/fields/modal/contact.php
+++ b/admin/models/fields/modal/contact.php
@@ -54,7 +54,7 @@ protected function getInput()
$contact = $db->loadResult();
if ($error = $db->getErrorMsg()) {
- JError::raiseWarning(500, $error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($error, 'warning');
}
if (empty($contact)) {
diff --git a/admin/models/fields/modal/venue.php b/admin/models/fields/modal/venue.php
index d36a4e707..3063f6f8a 100644
--- a/admin/models/fields/modal/venue.php
+++ b/admin/models/fields/modal/venue.php
@@ -56,7 +56,7 @@ protected function getInput()
$venue = $db->loadResult();
if ($error = $db->getErrorMsg()) {
- JError::raiseWarning(500, $error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($error, 'warning');
}
if (empty($venue)) {
diff --git a/admin/models/fields/venue.php b/admin/models/fields/venue.php
index e32c83d63..2847d0829 100644
--- a/admin/models/fields/venue.php
+++ b/admin/models/fields/venue.php
@@ -59,7 +59,7 @@ protected function getInput()
$title = $db->loadResult();
if ($error = $db->getErrorMsg()) {
- JError::raiseWarning(500, $error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($error, 'warning');
}
if (empty($title)) {
diff --git a/admin/models/fields/venueoptions.php b/admin/models/fields/venueoptions.php
index 4e931c5cc..11eb551cf 100644
--- a/admin/models/fields/venueoptions.php
+++ b/admin/models/fields/venueoptions.php
@@ -47,7 +47,7 @@ protected function getOptions()
}
elseif (is_array($published))
{
- JArrayHelper::toInteger($published);
+ \Joomla\Utilities\ArrayHelper::toInteger($published);
$query->where('l.published IN (' . implode(',', $published) . ')');
}
@@ -63,7 +63,7 @@ protected function getOptions()
}
catch (RuntimeException $e)
{
- JError::raiseWarning(500, $e->getMessage);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($e->getMessage, 'warning');
}
// Merge any additional options in the XML definition.
diff --git a/admin/models/forms/settings.xml b/admin/models/forms/settings.xml
index e6e94e0ef..d18dd231f 100644
--- a/admin/models/forms/settings.xml
+++ b/admin/models/forms/settings.xml
@@ -90,6 +90,9 @@
label="COM_JEM_SETTINGS_SELECT_DEFAULT_COUNTRY"
description="COM_JEM_SETTINGS_SELECT_DEFAULT_COUNTRY_DESC"
/>
+
COM_JEM_SETTINGS_CSV_SEPARATOR_COMMA
COM_JEM_SETTINGS_CSV_SEPARATOR_SEMICOLON
+ COM_JEM_SETTINGS_CSV_SEPARATOR_TAB
+
+
+ COM_JEM_SETTINGS_CSV_DELIMITER_NONE
+ COM_JEM_SETTINGS_CSV_DELIMITER_QUOTE
+ COM_JEM_SETTINGS_CSV_DELIMITER_DQUOTE
+
+
+ JYES
+ JNO
+
+
+
+ COM_JEM_SHOW_LAYOUT_STYLE_LEGACY
+ COM_JEM_SHOW_LAYOUT_STYLE_RESPONSIVE
+ COM_JEM_SHOW_LAYOUT_STYLE_ALTERNATIVE
+
+
+ JYES
+ JNO
+
+
+
@@ -1108,6 +1160,16 @@
+
+ JYES
+ JNO
+
-
\ No newline at end of file
+
diff --git a/admin/models/group.php b/admin/models/group.php
index da8a3aff8..3c65354bc 100644
--- a/admin/models/group.php
+++ b/admin/models/group.php
@@ -137,7 +137,7 @@ protected function _prepareTable($table)
// Store data
if (!$table->store(true)) {
- JError::raiseError(500, $table->getError());
+ throw new Exception($table->getError(), 500);
}
$members = $app->input->get('maintainers', array(), 'array');
diff --git a/admin/models/groups.php b/admin/models/groups.php
index 982041622..91c2b01c0 100644
--- a/admin/models/groups.php
+++ b/admin/models/groups.php
@@ -151,7 +151,7 @@ public function delete($cid = array())
{
if (is_array($cid) && count($cid))
{
- JArrayHelper::toInteger($cid);
+ \Joomla\Utilities\ArrayHelper::toInteger($cid);
$cids = implode(',', $cid);
$query = 'DELETE FROM #__jem_groups'
diff --git a/admin/models/housekeeping.php b/admin/models/housekeeping.php
index 27f293af9..7093e972b 100644
--- a/admin/models/housekeeping.php
+++ b/admin/models/housekeeping.php
@@ -64,7 +64,7 @@ public function delete($type)
foreach ($images as $image)
{
if ($image !== JFilterInput::getInstance()->clean($image, 'path')) {
- JError::raiseWarning(100, JText::_('COM_JEM_UNABLE_TO_DELETE').' '.htmlspecialchars($image, ENT_COMPAT, 'UTF-8'));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_('COM_JEM_UNABLE_TO_DELETE').' '.htmlspecialchars($image, ENT_COMPAT, 'UTF-8'), 'warning');
$fail++;
continue;
}
diff --git a/admin/models/imagehandler.php b/admin/models/imagehandler.php
index c54a8dfa7..0d14a852e 100644
--- a/admin/models/imagehandler.php
+++ b/admin/models/imagehandler.php
@@ -48,7 +48,7 @@ public function __construct()
$limitstart = $app->getUserStateFromRequest($option.'imageselect'.$task.'limitstart', 'limitstart', 0, 'int');
$limitstart = $limit ? (int)(floor($limitstart / $limit) * $limit) : 0;
$search = $app->getUserStateFromRequest($option.'.filter_search', 'filter_search', '', 'string');
- $search = trim(JString::strtolower($search));
+ $search = trim(\Joomla\String\StringHelper::strtolower($search));
$this->setState('limit', $limit);
$this->setState('limitstart', $limitstart);
diff --git a/admin/models/import.php b/admin/models/import.php
index a58abd73f..29214f91d 100644
--- a/admin/models/import.php
+++ b/admin/models/import.php
@@ -551,10 +551,6 @@ public function getTablesCount($tables, $prefix)
$db->setQuery($query);
- // Set legacy to false to be able to catch DB errors.
- $legacyValue = JError::$legacy;
- JError::$legacy = false;
-
try {
$tables[$table] = $db->loadResult();
// Don't count the root category
@@ -565,7 +561,6 @@ public function getTablesCount($tables, $prefix)
$tables[$table] = null;
}
- JError::$legacy = $legacyValue;
}
return $tables;
@@ -1143,7 +1138,7 @@ private function _rootkey()
// Check for DB error.
if ($error = $db->getErrorMsg()) {
- JError::raiseWarning(500, $error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($error, 'warning');
return false;
}
else {
diff --git a/admin/models/sampledata.php b/admin/models/sampledata.php
index 5b8552ce0..cc6144f0a 100644
--- a/admin/models/sampledata.php
+++ b/admin/models/sampledata.php
@@ -58,7 +58,7 @@ public function __construct()
public function loadData()
{
if ($this->checkForJemData()) {
- JError::raiseWarning(100, JText::_('COM_JEM_SAMPLEDATA_DATA_ALREADY_INSTALLED'));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_('COM_JEM_SAMPLEDATA_DATA_ALREADY_INSTALLED'), 'warning');
return false;
}
@@ -89,7 +89,7 @@ public function loadData()
// delete temporary extraction folder
if (!$this->deleteTmpFolder()) {
- JError::raiseWarning('SOME ERROR CODE', JText::_('COM_JEM_SAMPLEDATA_UNABLE_TO_DELETE_TMP_FOLDER'));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_('COM_JEM_SAMPLEDATA_UNABLE_TO_DELETE_TMP_FOLDER'), 'warning');
}
return true;
@@ -117,7 +117,7 @@ private function unpack()
$result = JArchive::extract($archive, $extractdir);
if ($result === false) {
- JError::raiseWarning('SOME ERROR CODE', JText::_('COM_JEM_SAMPLEDATA_UNABLE_TO_EXTRACT_ARCHIVE'));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_('COM_JEM_SAMPLEDATA_UNABLE_TO_EXTRACT_ARCHIVE'), 'warning');
return false;
}
diff --git a/admin/models/userelement.php b/admin/models/userelement.php
index 66feea17d..1d6b176cf 100644
--- a/admin/models/userelement.php
+++ b/admin/models/userelement.php
@@ -87,7 +87,7 @@ protected function buildQuery()
$filter_order_Dir = JFilterInput::getInstance()->clean($filter_order_Dir, 'word');
$search = $app->getUserStateFromRequest('com_jem.userelement.filter_search', 'filter_search', '', 'string' );
- $search = $this->_db->escape( trim(JString::strtolower( $search ) ) );
+ $search = $this->_db->escape( trim(\Joomla\String\StringHelper::strtolower( $search ) ) );
// start query
$db = JFactory::getDBO();
diff --git a/admin/models/users.php b/admin/models/users.php
index 990b30d2c..734e5e5a0 100644
--- a/admin/models/users.php
+++ b/admin/models/users.php
@@ -165,7 +165,7 @@ protected function _buildContentWhere()
$app = JFactory::getApplication();
$search = $app->getUserStateFromRequest( 'com_jem.users.search', 'search', '', 'string' );
- $search = $this->_db->escape( trim(JString::strtolower( $search ) ) );
+ $search = $this->_db->escape( trim(\Joomla\String\StringHelper::strtolower( $search ) ) );
$where = array();
diff --git a/admin/models/venue.php b/admin/models/venue.php
index 636ecc16b..326d25d7e 100644
--- a/admin/models/venue.php
+++ b/admin/models/venue.php
@@ -258,7 +258,7 @@ public function save($data)
//uppercase needed by mapservices
if ($data['country']) {
- $data['country'] = JString::strtoupper($data['country']);
+ $data['country'] = \Joomla\String\StringHelper::strtoupper($data['country']);
}
// Save the venue
diff --git a/admin/models/venueelement.php b/admin/models/venueelement.php
index bfab7550b..d0db9f5f5 100644
--- a/admin/models/venueelement.php
+++ b/admin/models/venueelement.php
@@ -97,7 +97,7 @@ protected function buildQuery()
$filter_type = $app->getUserStateFromRequest('com_jem.venueelement.'.$itemid.'.filter_type', 'filter_type', 0, 'int' );
$search = $app->getUserStateFromRequest('com_jem.venueelement.'.$itemid.'.filter_search', 'filter_search', '', 'string' );
- $search = $this->_db->escape(trim(JString::strtolower($search)));
+ $search = $this->_db->escape(trim(\Joomla\String\StringHelper::strtolower($search)));
// Query
$db = JFactory::getDBO();
diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql
index c8e194da8..8bac87c06 100644
--- a/admin/sql/install.mysql.utf8.sql
+++ b/admin/sql/install.mysql.utf8.sql
@@ -237,9 +237,9 @@ INSERT IGNORE INTO #__jem_config (`keyname`, `value`) VALUES
('tablewidth', '100%'),
('datewidth', '20%'),
('datemode', '1'),
-('titlewidth', '40%'),
-('locationwidth', '20%'),
-('citywidth', ''),
+('titlewidth', '20%'),
+('locationwidth', '15%'),
+('citywidth', '15%'),
('formatdate', 'D, j. F Y'),
('formatShortDate', 'd.m.y'),
('formattime', '%H:%M'),
@@ -253,7 +253,7 @@ INSERT IGNORE INTO #__jem_config (`keyname`, `value`) VALUES
('deliverlocsyes', '-2'),
('autopublocate', '-2'),
('showcat', '1'),
-('catfrowidth', ''),
+('catfrowidth', '15%'),
('image_filetypes', 'jpg,gif,png'),
('sizelimit', '100'),
('imagehight', '100'),
@@ -273,7 +273,7 @@ INSERT IGNORE INTO #__jem_config (`keyname`, `value`) VALUES
('meta_description', 'The event titled [title] starts on [dates]!'),
('showstate', '1'),
('showeventimage', '0'),
-('statewidth', '0'),
+('statewidth', '15%'),
('storeip', '0'),
('lastupdate', '0'),
('tableeventimagewidth', '10%'),
@@ -290,10 +290,14 @@ INSERT IGNORE INTO #__jem_config (`keyname`, `value`) VALUES
('ical_max_items', '100'),
('defaultCountry', ''),
('csv_separator', ';'),
+('csv_delimiter', '"'),
+('csv_bom', '1'),
('globalattribs', ''),
('css', ''),
('regallowcomments', '0'),
-('regallowinvitation', '0');
+('regallowinvitation', '0'),
+('layoutstyle', '1'),
+('useiconfont', '0');
INSERT IGNORE INTO `#__jem_countries` (`id`, `continent`, `iso2`, `iso3`, `un`, `name`) VALUES
(1, 'AS', 'AF', 'AFG', 4, 'Afghanistan, Islamic Republic of'),
diff --git a/admin/sql/updates/2.2.3-dev3.sql b/admin/sql/updates/2.2.3-dev3.sql
index 3e7917ccd..198706896 100644
--- a/admin/sql/updates/2.2.3-dev3.sql
+++ b/admin/sql/updates/2.2.3-dev3.sql
@@ -1,3 +1,3 @@
-- insert new config values
INSERT IGNORE INTO `#__jem_config` (`keyname`, `value`)
- VALUES ('image_filetypes', 'jpg,gif,png');
+ VALUES ('image_filetypes', 'jpg,gif,png'), ('csv_delimiter', '"'), ('csv_bom', '1');
diff --git a/admin/sql/updates/2.3.0-beta2.sql b/admin/sql/updates/2.3.0-beta2.sql
new file mode 100644
index 000000000..7f1ca3b05
--- /dev/null
+++ b/admin/sql/updates/2.3.0-beta2.sql
@@ -0,0 +1,3 @@
+-- insert new config values
+INSERT IGNORE INTO `#__jem_config` (`keyname`, `value`)
+ VALUES ('layoutstyle', '1'), ('useiconfont', '0');
\ No newline at end of file
diff --git a/admin/sql/updates/2.3.0-dev1.sql b/admin/sql/updates/2.3.0-dev1.sql
new file mode 100644
index 000000000..21b5584f7
--- /dev/null
+++ b/admin/sql/updates/2.3.0-dev1.sql
@@ -0,0 +1,3 @@
+-- insert new config values
+INSERT IGNORE INTO `#__jem_config` (`keyname`, `value`)
+ VALUES ('layoutstyle', '1'), ('useiconfont', '0');
diff --git a/admin/tables/category.php b/admin/tables/category.php
index 3140fbce4..070eb5ac7 100644
--- a/admin/tables/category.php
+++ b/admin/tables/category.php
@@ -244,7 +244,7 @@ public function storeCsvImport($updateNulls = false)
// If the store failed return false.
if (!$stored) {
- $e = new JException(JText::sprintf('JLIB_DATABASE_ERROR_STORE_FAILED', get_class($this), $this->_db->getErrorMsg()));
+ $e = JText::sprintf('JLIB_DATABASE_ERROR_STORE_FAILED', get_class($this), $this->_db->getErrorMsg());
$this->setError($e);
return false;
}
diff --git a/admin/tables/event.php b/admin/tables/event.php
index b32020918..03cf460c7 100644
--- a/admin/tables/event.php
+++ b/admin/tables/event.php
@@ -340,7 +340,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
$k = $this->_tbl_key;
// Sanitize input.
- JArrayHelper::toInteger($pks);
+ \Joomla\Utilities\ArrayHelper::toInteger($pks);
$userId = (int) $userId;
$state = (int) $state;
diff --git a/admin/tables/group.php b/admin/tables/group.php
index 1ecf9054e..638224477 100644
--- a/admin/tables/group.php
+++ b/admin/tables/group.php
@@ -78,7 +78,7 @@ function publish($pks = null, $state = 1, $userId = 0)
$k = $this->_tbl_key;
// Sanitize input.
- JArrayHelper::toInteger($pks);
+ \Joomla\Utilities\ArrayHelper::toInteger($pks);
$userId = (int) $userId;
$state = (int) $state;
diff --git a/admin/tables/jem_categories.php b/admin/tables/jem_categories.php
index 86ddba1d9..e7ced03ec 100644
--- a/admin/tables/jem_categories.php
+++ b/admin/tables/jem_categories.php
@@ -76,7 +76,7 @@ public function check()
// Not typed in a category name?
if (trim($this->catname) == '') {
$this->_error = JText::_('COM_JEM_ADD_NAME_CATEGORY');
- JError::raiseWarning('SOME_ERROR_CODE', $this->_error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_error, 'warning');
return false;
}
@@ -93,7 +93,7 @@ public function check()
$xid = intval($this->_db->loadResult());
if ($xid && $xid != intval($this->id)) {
- JError::raiseWarning('SOME_ERROR_CODE', JText::sprintf('COM_JEM_CATEGORY_NAME_ALREADY_EXIST', $this->catname));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::sprintf('COM_JEM_CATEGORY_NAME_ALREADY_EXIST', $this->catname), 'warning');
return false;
}
*/
diff --git a/admin/tables/jem_events.php b/admin/tables/jem_events.php
index bac2a1a03..0297d65d2 100644
--- a/admin/tables/jem_events.php
+++ b/admin/tables/jem_events.php
@@ -128,7 +128,7 @@ public function check($jemsettings = null)
if (preg_match("/^:[0-5][0-9](:[0-5][0-9])?$/", $this->times)) {
$this->_error = JText::_('WRONGSTARTTIMEFORMAT'.': '.$this->times);
- JError::raiseWarning('SOME_ERROR_CODE', $this->_error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_error, 'warning');
return false;
}
if (empty($this->times) || preg_match("/^:[0-5][0-9](:[0-5][0-9])?$/", $this->times)) {
@@ -136,7 +136,7 @@ public function check($jemsettings = null)
}
if (preg_match("/^:[0-5][0-9](:[0-5][0-9])?$/", $this->endtimes)) {
$this->_error = JText::_('WRONGENDTIMEFORMAT'.': '.$this->endtimes);
- JError::raiseWarning('SOME_ERROR_CODE', $this->_error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_error, 'warning');
return false;
}
if (empty($this->endtimes) || empty($this->times) || preg_match("/^:[0-5][0-9](:[0-5][0-9])?$/", $this->endtimes)
@@ -146,17 +146,17 @@ public function check($jemsettings = null)
}
$this->title = strip_tags(trim($this->title));
- $titlelength = JString::strlen($this->title);
+ $titlelength = \Joomla\String\StringHelper::strlen($this->title);
if ($this->title == '') {
$this->_error = JText::_('COM_JEM_ADD_TITLE');
- JError::raiseWarning('SOME_ERROR_CODE', $this->_error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_error, 'warning');
return false;
}
if ($titlelength > 100) {
$this->_error = JText::_('COM_JEM_ERROR_TITLE_LONG');
- JError::raiseWarning('SOME_ERROR_CODE', $this->_error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_error, 'warning');
return false;
}
@@ -168,14 +168,14 @@ public function check($jemsettings = null)
if ($this->dates && !preg_match("/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$/", $this->dates)) {
$this->_error = JText::_('COM_JEM_DATE_WRONG');
- JError::raiseWarning('SOME_ERROR_CODE', $this->_error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_error, 'warning');
return false;
}
if (isset($this->enddates)) {
if (!preg_match("/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$/", $this->enddates)) {
$this->_error = JText::_('COM_JEM_ENDDATE_WRONG_FORMAT');
- JError::raiseWarning('SOME_ERROR_CODE', $this->_error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_error, 'warning');
return false;
}
}
@@ -183,7 +183,7 @@ public function check($jemsettings = null)
/* if (isset($this->recurrence_limit_date)) {
if (!preg_match("/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$/", $this->recurrence_limit_date)) {
$this->_error = JText::_('COM_JEM_WRONGRECURRENCEDATEFORMAT');
- JError::raiseWarning('SOME_ERROR_CODE', $this->_error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_error, 'warning');
return false;
}
}
@@ -192,7 +192,7 @@ public function check($jemsettings = null)
if (isset($this->times) && $this->times) {
if (!preg_match("/^[0-2][0-9]:[0-5][0-9](:[0-5][0-9])?$/", $this->times)) {
$this->_error = JText::_('WRONGSTARTTIMEFORMAT'.': '.$this->times);
- JError::raiseWarning('SOME_ERROR_CODE', $this->_error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_error, 'warning');
return false;
}
}
@@ -200,7 +200,7 @@ public function check($jemsettings = null)
if (isset($this->endtimes) && $this->endtimes) {
if (!preg_match("/^[0-2][0-9]:[0-5][0-9](:[0-5][0-9])?$/", $this->endtimes)) {
$this->_error = JText::_('COM_JEM_WRONGENDTIMEFORMAT');
- JError::raiseWarning('SOME_ERROR_CODE', $this->_error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_error, 'warning');
return false;
}
}
@@ -208,7 +208,7 @@ public function check($jemsettings = null)
//No venue or category choosen?
//if ($this->locid == '') {
// $this->_error = JText::_('COM_JEM_VENUE_EMPTY');
- // JError::raiseWarning('SOME_ERROR_CODE', $this->_error);
+ // \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_error, 'warning');
// return false;
//}
diff --git a/admin/tables/jem_groups.php b/admin/tables/jem_groups.php
index a4d8bf76e..c4398fc78 100644
--- a/admin/tables/jem_groups.php
+++ b/admin/tables/jem_groups.php
@@ -43,7 +43,7 @@ public function check()
// Not typed in a category name?
if (trim($this->name) == '') {
$this->_error = JText::_('COM_JEM_ADD_GROUP_NAME');
- JError::raiseWarning('SOME_ERROR_CODE', $this->_error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_error, 'warning');
return false;
}
@@ -53,7 +53,7 @@ public function check()
$xid = intval($this->_db->loadResult());
if ($xid && $xid != intval($this->id)) {
- JError::raiseWarning('SOME_ERROR_CODE', JText::sprintf('COM_JEM_GROUP_NAME_ALREADY_EXIST', $this->name));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::sprintf('COM_JEM_GROUP_NAME_ALREADY_EXIST', $this->name), 'warning');
return false;
}
diff --git a/admin/tables/jem_venues.php b/admin/tables/jem_venues.php
index be0716039..6224b9c58 100644
--- a/admin/tables/jem_venues.php
+++ b/admin/tables/jem_venues.php
@@ -88,7 +88,7 @@ public function check()
// not typed in a venue name
if (!trim($this->venue)) {
$this->_error = JText::_('COM_JEM_ADD_VENUE');
- JError::raiseWarning('SOME_ERROR_CODE', $this->_error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_error, 'warning');
return false;
}
@@ -102,7 +102,7 @@ public function check()
if (!trim($this->street) || !trim($this->city) || !trim($this->country) || !trim($this->postalCode)) {
if ((!trim($this->latitude) && !trim($this->longitude))) {
$this->_error = JText::_('COM_JEM_ERROR_ADDRESS');
- JError::raiseWarning('SOME_ERROR_CODE', $this->_error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_error, 'warning');
return false;
}
}
@@ -110,7 +110,7 @@ public function check()
if (JFilterInput::checkAttribute(array ('href', $this->url))) {
$this->_error = JText::_('COM_JEM_ERROR_URL_WRONG_FORMAT');
- JError::raiseWarning('SOME_ERROR_CODE', $this->_error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_error, 'warning');
return false;
}
@@ -119,49 +119,49 @@ public function check()
if (strlen($this->url) > 199) {
$this->_error = JText::_('COM_JEM_ERROR_URL_LONG');
- JError::raiseWarning('SOME_ERROR_CODE', $this->_error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_error, 'warning');
return false;
}
if (!preg_match('/^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}'
.'((:[0-9]{1,5})?\/.*)?$/i' , $this->url)) {
$this->_error = JText::_('COM_JEM_ERROR_URL_WRONG_FORMAT');
- JError::raiseWarning('SOME_ERROR_CODE', $this->_error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_error, 'warning');
return false;
}
}
$this->street = strip_tags($this->street);
- if (JString::strlen($this->street) > 50) {
+ if (\Joomla\String\StringHelper::strlen($this->street) > 50) {
$this->_error = JText::_('COM_JEM_ERROR_STREET_LONG');
- JError::raiseWarning('SOME_ERROR_CODE', $this->_error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_error, 'warning');
return false;
}
$this->postalCode = strip_tags($this->postalCode);
- if (JString::strlen($this->postalCode) > 10) {
+ if (\Joomla\String\StringHelper::strlen($this->postalCode) > 10) {
$this->_error = JText::_('COM_JEM_ERROR_ZIP_LONG');
- JError::raiseWarning('SOME_ERROR_CODE', $this->_error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_error, 'warning');
return false;
}
$this->city = strip_tags($this->city);
- if (JString::strlen($this->city) > 50) {
+ if (\Joomla\String\StringHelper::strlen($this->city) > 50) {
$this->_error = JText::_('COM_JEM_ERROR_CITY_LONG');
- JError::raiseWarning('SOME_ERROR_CODE', $this->_error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_error, 'warning');
return false;
}
$this->state = strip_tags($this->state);
- if (JString::strlen($this->state) > 50) {
+ if (\Joomla\String\StringHelper::strlen($this->state) > 50) {
$this->_error = JText::_('COM_JEM_ERROR_STATE_LONG');
- JError::raiseWarning('SOME_ERROR_CODE', $this->_error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_error, 'warning');
return false;
}
$this->country = strip_tags($this->country);
- if (JString::strlen($this->country) > 2) {
+ if (\Joomla\String\StringHelper::strlen($this->country) > 2) {
$this->_error = JText::_('COM_JEM_ERROR_COUNTRY_LONG');
- JError::raiseWarning('SOME_ERROR_CODE', $this->_error);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($this->_error, 'warning');
return false;
}
@@ -172,7 +172,7 @@ public function check()
$xid = intval($this->_db->loadResult());
if ($xid && $xid != intval($this->id)) {
- JError::raiseWarning('SOME_ERROR_CODE', JText::sprintf('COM_JEM_VENUE_NAME_ALREADY_EXIST', $this->venue));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::sprintf('COM_JEM_VENUE_NAME_ALREADY_EXIST', $this->venue), 'warning');
return false;
}
*/
diff --git a/admin/tables/venue.php b/admin/tables/venue.php
index 410771169..dc9ce28ec 100644
--- a/admin/tables/venue.php
+++ b/admin/tables/venue.php
@@ -79,32 +79,32 @@ public function check()
}
$this->street = strip_tags($this->street);
- $streetlength = JString::strlen($this->street);
+ $streetlength = \Joomla\String\StringHelper::strlen($this->street);
if ($streetlength > 50) {
$this->setError(JText::_('COM_JEM_VENUE_ERROR_STREET'));
return false;
}
$this->postalCode = strip_tags($this->postalCode);
- if (JString::strlen($this->postalCode) > 10) {
+ if (\Joomla\String\StringHelper::strlen($this->postalCode) > 10) {
$this->setError(JText::_('COM_JEM_VENUE_ERROR_POSTALCODE'));
return false;
}
$this->city = strip_tags($this->city);
- if (JString::strlen($this->city) > 50) {
+ if (\Joomla\String\StringHelper::strlen($this->city) > 50) {
$this->setError(JText::_('COM_JEM_VENUE_ERROR_CITY'));
return false;
}
$this->state = strip_tags($this->state);
- if (JString::strlen($this->state) > 50) {
+ if (\Joomla\String\StringHelper::strlen($this->state) > 50) {
$this->setError(JText::_('COM_JEM_VENUE_ERROR_STATE'));
return false;
}
$this->country = strip_tags($this->country);
- if (JString::strlen($this->country) > 2) {
+ if (\Joomla\String\StringHelper::strlen($this->country) > 2) {
$this->setError(JText::_('COM_JEM_VENUE_ERROR_COUNTRY'));
return false;
}
@@ -292,7 +292,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
$k = $this->_tbl_key;
// Sanitize input.
- JArrayHelper::toInteger($pks);
+ \Joomla\Utilities\ArrayHelper::toInteger($pks);
$userId = (int) $userId;
$state = (int) $state;
diff --git a/admin/views/attendees/tmpl/default.php b/admin/views/attendees/tmpl/default.php
index 478856119..211cb6946 100644
--- a/admin/views/attendees/tmpl/default.php
+++ b/admin/views/attendees/tmpl/default.php
@@ -1,8 +1,8 @@
addScriptDeclaration('
+ function submitName(node) {
+ node.parentNode.previousElementSibling.childNodes[0].checked = true;
+ Joomla.submitbutton("attendees.edit");
+ }
+');
?>
-
\ No newline at end of file
+
diff --git a/modules/mod_jem_wide/tmpl/alternative/default.php b/modules/mod_jem_wide/tmpl/alternative/default.php
new file mode 100644
index 000000000..75547a171
--- /dev/null
+++ b/modules/mod_jem_wide/tmpl/alternative/default.php
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ eventlink) : ?>
+
+ title; ?>
+
+
+
+ title; ?>
+
+
+ date; ?>
+ time && $params->get('datemethod', 1) == 1) :
+ ?>
+ time; ?>
+
+
+
+
+ catname)) : ?>
+ catname; ?>
+
+
+
+
+ venue)) : ?>
+ venuelink) : ?>
+ venue; ?> venue; ?>
+
+
+
+
+
+ get('use_modal')) : ?>
+ eventimageorig) {
+ $image = $item->eventimageorig;
+ } else {
+ $image = '';
+ } ?>
+
+
+
+
+
+
+
+ get('use_modal')) : ?>
+
+
+
+
+
+
+
+
+
+
+
+
+ catname)) : ?>
catname; ?>
+
- venue) : ?>
+ venue)) : ?>
venuelink) : ?>
venue; ?> ';
+if (count($list)) {
+ if (JemHelper::jemStringContains($params->get('moduleclass_sfx'), 'jem-tablestyle')) {
+ include('default_jem_eventslist_small.php'); // Similar to the old table-layout
+ } else {
+ include("default_jem_eventslist.php"); // The new layout
+ }
+} else {
+ echo JText::_('MOD_JEM_WIDE_NO_EVENTS');
+}
+echo '
';
+
+?>
\ No newline at end of file
diff --git a/modules/mod_jem_wide/tmpl/responsive/default_jem_eventslist.php b/modules/mod_jem_wide/tmpl/responsive/default_jem_eventslist.php
new file mode 100644
index 000000000..3e37c17c2
--- /dev/null
+++ b/modules/mod_jem_wide/tmpl/responsive/default_jem_eventslist.php
@@ -0,0 +1,188 @@
+
+
+
+
+
+ . It covers the links to location and category etc.
+ // This detects the browser and just writes the onclick attribute if the broswer is not Safari.
+ $isSafari = false;
+ if (strpos($_SERVER['HTTP_USER_AGENT'], 'Safari') && !strpos($_SERVER['HTTP_USER_AGENT'], 'Chrome')) {
+ $isSafari = true;
+ }
+ ?>
+
+ featured)) : ?>
+ get('linkevent') == 1 && (!$isSafari)) : echo 'onclick=location.href="'.$item->eventlink.'"'; endif; ?> >
+
+ get('linkevent') == 1 && (!$isSafari)) : echo 'onclick=location.href="'.$item->eventlink.'"'; endif; ?> >
+
+
+ get('linkevent') == 1) : // Display title as title of jem-event with link ?>
+
+ title; ?>
+
+
+ featured)) :?>
+
+
+ get('linkevent') == 0) : //Display title as title of jem-event without link ?>
+
+ title . JemOutput::recurrenceicon($item) . JemOutput::publishstateicon($item); ?>
+ featured)) :?>
+
+
+
+
+
+
+ date && $params->get('datemethod', 1) == 2) :?>
+
+
+ date && $params->get('datemethod', 1) == 1) : ?>
+
+
+
+
+ venue) && (!JemHelper::jemStringContains($params->get('moduleclass_sfx'), 'jem-novenue'))) : ?>
+
+
+
+
+ get('moduleclass_sfx'), 'jem-nocity')) && (!empty($item->city))) : ?>
+
+
+
+
+ get('moduleclass_sfx'), 'jem-nostate')) && (!empty($item->state))): ?>
+
+
+
+
+ get('moduleclass_sfx'), 'jem-nocats')) : ?>
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mod_jem_wide/tmpl/responsive/default_jem_eventslist_small.php b/modules/mod_jem_wide/tmpl/responsive/default_jem_eventslist_small.php
new file mode 100644
index 000000000..96ea57274
--- /dev/null
+++ b/modules/mod_jem_wide/tmpl/responsive/default_jem_eventslist_small.php
@@ -0,0 +1,126 @@
+
+
+
+
+
+ get('moduleclass_sfx'), 'jem-notitle')) : ?>
+
+
+ get('moduleclass_sfx'), 'jem-novenue')) : ?>
+
+
+ get('moduleclass_sfx'), 'jem-nocity')) : ?>
+
+
+ get('moduleclass_sfx'), 'jem-nostate')) : ?>
+
+
+ get('moduleclass_sfx'), 'jem-nocats')) : ?>
+
+
+
+
+ . It covers the links to location and category etc.
+ // This detects the browser and just writes the onclick attribute if the broswer is not Safari.
+ $isSafari = false;
+ if (strpos($_SERVER['HTTP_USER_AGENT'], 'Safari') && !strpos($_SERVER['HTTP_USER_AGENT'], 'Chrome')) {
+ $isSafari = true;
+ }
+ ?>
+
+ featured)) : ?>
+ get('linkevent') == 1 && (!$isSafari)) : echo 'onclick=location.href="'.$item->eventlink.'"'; endif; ?> >
+
+ get('linkevent') == 1 && (!$isSafari)) : echo 'onclick=location.href="'.$item->eventlink.'"'; endif; ?> >
+
+
+
+
+ get('moduleclass_sfx'), 'jem-notitle')) : ?>
+
+
+ get('linkevent') == 1) : ?>
+
+ title; ?>
+
+
+ title; ?>
+
+ featured)) :?>
+
+
+
+
+
+
+
+
+
+ get('moduleclass_sfx'), 'jem-nocity')) : ?>
+ city)) : ?>
+
+
+
+
+
+
+
+ get('moduleclass_sfx'), 'jem-nostate')) : ?>
+ state)) : ?>
+
+
+
+
+
+
+
+ get('moduleclass_sfx'), 'jem-nocats')) : ?>
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mod_jem_wide/tmpl/responsive/mod_jem_wide.css b/modules/mod_jem_wide/tmpl/responsive/mod_jem_wide.css
new file mode 100644
index 000000000..65121342d
--- /dev/null
+++ b/modules/mod_jem_wide/tmpl/responsive/mod_jem_wide.css
@@ -0,0 +1,274 @@
+/**
+ * @version 2.3.0
+ * @package JEM
+ * @subpackage JEM Latest Events Wide Module
+ * @copyright (C) 2013-2019 joomlaeventmanager.net
+ * @copyright (C) 2005-2009 Christoph Lukes
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
+ */
+
+/* Hoftix for SqueezeBox Modal overlay destroying images on mobile phones */
+#sbox-overlay {
+ width: 100% !important;
+}
+#sbox-window {
+ height: auto !important;
+}
+#sbox-content {
+ height: auto !important;
+ width: auto !important;
+ max-height: 100%;
+ max-width: 100%;
+}
+body.body-overlayed {
+ overflow: auto;
+}
+/* ----- */
+
+#jemmodulewide .jem-row {
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+ justify-content: space-between;
+}
+
+#jemmodulewide .jem-sort {
+ -ms-hyphens: auto;
+ -webkit-hyphens: auto;
+ hyphens: auto;
+}
+
+#jemmodulewide .jem-wrap-reverse {
+ flex-wrap: wrap-reverse;
+}
+
+#jemmodulewide .jem-nowrap {
+ flex-wrap: nowrap;
+}
+
+#jemmodulewide .jem-justify-start {
+ justify-content: flex-start;
+}
+
+#jemmodulewide .jem-dl:after {
+ clear: both;
+}
+
+#jemmodulewide .jem-dl {
+ margin: 0;
+}
+
+#jemmodulewide .jem-dl dt {
+ float: left;
+ width: 160px;
+ overflow: hidden;
+ clear: left;
+ text-align: left;
+ font-weight: bold;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ padding-top: 5px;
+ padding-bottom: 5px;
+}
+
+#jemmodulewide .jem-dl dd {
+ margin-left: 170px;
+ padding-top: 5px;
+ padding-bottom: 5px;
+}
+
+#jemmodulewide .jem-img {
+ text-align: center;
+}
+
+#jemmodulewide .jem-img img {
+ max-width: 100%;
+}
+
+#jemmodulewide .jem-catimg {
+ float: right;
+}
+
+#jemmodulewide .jem-readmore {
+ margin-top: 10px;
+ margin-bottom: 10px;
+}
+
+#jemmodulewide .jem-date .input-append {
+ display: flex;
+ flex-direction: row;
+ flex-wrap: nowrap;
+ justify-content: flex-start;
+}
+
+#jemmodulewide .jem-limit-smallist{
+ display: flex;
+ flex-direction: row;
+ flex-wrap: nowrap;
+ justify-content: flex-end;
+ padding: 10px;
+}
+
+#jemmodulewide img.icon-inline {
+ display: none;
+}
+
+#jemmodulewide .jem-event {
+ cursor:pointer;
+ border-bottom: 1px solid #ddd;
+ border-left: 1px solid #ddd;
+ border-right: 1px solid #ddd;
+ align-items: center;
+}
+
+#jemmodulewide .jem-event:first-child {
+ border-top: 1px solid #ddd;
+}
+
+#jemmodulewide .jem-list-img {
+ flex-shrink: 1;
+ margin-left: 10px;
+}
+
+#jemmodulewide .jem-event-details {
+ flex: 1;
+}
+
+#jemmodulewide .jem-event-details h4 {
+ margin-top: 0px;
+ margin-bottom: 10px;
+ line-height: 110%;
+}
+
+#jemmodulewide .jem-event-details h4 a {
+ font-weight: bold;
+}
+
+#jemmodulewide .jem-list-row {
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+ justify-content: flex-start;
+}
+
+#jemmodulewide .jem-small-list {
+ padding: 10px;
+}
+
+
+#jemmodulewide .jem-small-list div {
+ flex: 1;
+}
+
+#jemmodulewide .jem-event-info {
+ margin-right: 15px;
+}
+
+#jemmodulewide .jem-event-info:last-child {
+ margin-right: 0;
+}
+
+#jemmodulewide .jem-event-info-small {
+ padding-right: 10px;
+ word-break: keep-all;
+}
+
+#jemmodulewide .jem-event-info-small:last-child {
+ margin-right: 0;
+}
+
+#jemmodulewide .eventlist {
+ margin: 0;
+ padding: 0;
+ list-style-type: none;
+ -ms-hyphens: auto;
+ -webkit-hyphens: auto;
+ hyphens: auto;
+}
+
+#jemmodulewide .eventlist li {
+ padding: 10px;
+}
+
+#jemmodulewide .eventlist li:nth-child(odd) {
+ background-color: #f9f9f9;
+}
+
+#jemmodulewide .eventlist li:last-child {
+ margin-bottom: 0;
+}
+
+#jemmodulewide .eventlist li:hover {
+ background-color: #e0e0e0;
+}
+
+
+@media only all and (max-width: 59.938rem) and (min-width: 48rem) {
+ #jemmodulewide .jem-event-info-small {
+ flex-basis: 45% !important;
+ }
+}
+
+@media not print {
+ @media only all and (max-width: 47.938rem) {
+ #jemmodulewide .jem-list-img {
+ margin-right: 10px;
+ margin-top: 10px;
+ margin-left: 0;
+ }
+
+ #jemmodulewide .jem-sort-small .jem-small-list div {
+ flex-basis: 30%;
+ }
+
+ #jemmodulewide .jem-event-info-small {
+ flex-basis: 100% !important;
+ }
+ }
+}
+
+@media print {
+ #main a:link, #main a:visited {
+ text-decoration: none;
+ color: inherit;
+ }
+
+ div#jem {
+ border: 0px;
+ }
+
+ div#jem h2 {
+ border: none;
+ }
+
+ div#jem .flyerimage {
+ border: none !important;
+ }
+
+ a[href]:after {
+ content: none !important;
+ }
+
+ div#jem .buttons {
+ display: none;
+ }
+
+ abbr[title]:after {
+ content: none;
+ }
+
+ .ir a:after,
+ a[href^="javascript:"]:after,
+ a[href^="#"]:after {
+ content: none;
+ }
+
+ a:link:after, a:visited:after {
+ content: none;
+ }
+
+
+ div#jem .flyerimage {
+ border: none;
+ }
+}
\ No newline at end of file
diff --git a/modules/mod_jem_wide/tmpl/responsive/mod_jem_wide_iconfont.css b/modules/mod_jem_wide/tmpl/responsive/mod_jem_wide_iconfont.css
new file mode 100644
index 000000000..f210028c9
--- /dev/null
+++ b/modules/mod_jem_wide/tmpl/responsive/mod_jem_wide_iconfont.css
@@ -0,0 +1,10 @@
+/**
+ * @version 2.3.0
+ * @package JEM
+ * @subpackage JEM Latest Events Wide Module
+ * @copyright (C) 2013-2019 joomlaeventmanager.net
+ * @copyright (C) 2005-2009 Christoph Lukes
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
+ */
+
+/* This template uses images in any case, so keep this empty file to prevent legacy fallback. */
diff --git a/modules/mod_jem_wide/tmpl/responsive/mod_jem_wide_iconimg.css b/modules/mod_jem_wide/tmpl/responsive/mod_jem_wide_iconimg.css
new file mode 100644
index 000000000..f210028c9
--- /dev/null
+++ b/modules/mod_jem_wide/tmpl/responsive/mod_jem_wide_iconimg.css
@@ -0,0 +1,10 @@
+/**
+ * @version 2.3.0
+ * @package JEM
+ * @subpackage JEM Latest Events Wide Module
+ * @copyright (C) 2013-2019 joomlaeventmanager.net
+ * @copyright (C) 2005-2009 Christoph Lukes
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
+ */
+
+/* This template uses images in any case, so keep this empty file to prevent legacy fallback. */
diff --git a/package/pkg_jem.xml b/package/pkg_jem.xml
index 7bd5c442d..f8e36bd25 100644
--- a/package/pkg_jem.xml
+++ b/package/pkg_jem.xml
@@ -2,14 +2,14 @@
pkg_jem
jem
- February 2018
- Copyright (C) 2013-2018 joomlaeventmanager.net
+ August 2019
+ Copyright (C) 2013-2019 joomlaeventmanager.net
https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
JEM Community
info@joomlaeventmanager.net
http://www.joomlaeventmanager.net
- 2.2.3
+ 2.3.0-beta3
PKG_JEM_INSTALLATION_DESCRIPTION
http://www.joomlaeventmanager.net/
JEM Community
diff --git a/plugins/plg_content_jem/jem.xml b/plugins/plg_content_jem/jem.xml
index 88d1b4539..e015aa189 100644
--- a/plugins/plg_content_jem/jem.xml
+++ b/plugins/plg_content_jem/jem.xml
@@ -4,10 +4,10 @@
JEM Community
info@joomlaeventmanager.net
http://www.joomlaeventmanager.net
- December 2014
- copyright (C) 2013-2018 joomlaeventmanager.net
+ August 2019
+ copyright (C) 2013-2019 joomlaeventmanager.net
https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
- 2.2.3
+ 2.3.0-beta3
PLG_CONTENT_JEM_XML_DESCRIPTION
diff --git a/plugins/plg_content_jemlistevents/jemlistevents.php b/plugins/plg_content_jemlistevents/jemlistevents.php
index 2656c22a4..5b9b8f3fa 100644
--- a/plugins/plg_content_jemlistevents/jemlistevents.php
+++ b/plugins/plg_content_jemlistevents/jemlistevents.php
@@ -15,7 +15,7 @@
// No, it's part of JEM package yet.
//// Check if JEM is installed.
//if (!JComponentHelper::isEnabled('com_jem', true)) {
-// return JError::raiseError(JText::_('ERROR'), JText::_('Listevents for JEM works only if JoomlaEventManager (JEM) is installed: www.joomlaeventmanager.net '));
+// throw new Exception(JText::_('Listevents for JEM works only if JoomlaEventManager (JEM) is installed: www.joomlaeventmanager.net '), 500);
// die();
//}
@@ -123,7 +123,7 @@ public function onContentPrepare($context, &$row, &$params, $page = 0)
}
// simple performance check to determine whether the bot should process further
- if (!isset($row->text) || JString::strpos($row->text, 'jemlistevents') === false) {
+ if (!isset($row->text) || \Joomla\String\StringHelper::strpos($row->text, 'jemlistevents') === false) {
return true;
}
diff --git a/plugins/plg_content_jemlistevents/jemlistevents.xml b/plugins/plg_content_jemlistevents/jemlistevents.xml
index 5acf21493..b6f6edcc7 100644
--- a/plugins/plg_content_jemlistevents/jemlistevents.xml
+++ b/plugins/plg_content_jemlistevents/jemlistevents.xml
@@ -1,13 +1,13 @@
plg_content_jemlistevents
- December 2017
+ August 2019
JEM Community
info@joomlaeventmanager.net
www.joomlaeventmanager.net
- copyright (C) 2013-2018 joomlaeventmanager.net
+ copyright (C) 2013-2019 joomlaeventmanager.net
https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
- 2.2.3
+ 2.3.0-beta3
PLG_CONTENT_JEMLISTEVENTS_XML_DESCRIPTION
diff --git a/plugins/plg_finder_jem/jem.xml b/plugins/plg_finder_jem/jem.xml
index 64d841a2a..e6eac6244 100644
--- a/plugins/plg_finder_jem/jem.xml
+++ b/plugins/plg_finder_jem/jem.xml
@@ -1,13 +1,13 @@
plg_finder_jem
- January 2015
+ August 2019
JEM Community
info@joomlaeventmanager.net
http://www.joomlaeventmanager.net
- copyright (C) 2013-2018 joomlaeventmanager.net
+ copyright (C) 2013-2019 joomlaeventmanager.net
https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
- 2.2.3
+ 2.3.0-beta3
PLG_FINDER_JEM_XML_DESCRIPTION
diff --git a/plugins/plg_jem_comments/comments.xml b/plugins/plg_jem_comments/comments.xml
index b714b0047..b0252ddc8 100644
--- a/plugins/plg_jem_comments/comments.xml
+++ b/plugins/plg_jem_comments/comments.xml
@@ -1,13 +1,13 @@
plg_jem_comments
- December 2014
+ August 2019
JEM Community
info@joomlaeventmanager.net
http://www.joomlaeventmanager.net
- copyright (C) 2013-2018 joomlaeventmanager.net
+ copyright (C) 2013-2019 joomlaeventmanager.net
https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
- 2.2.3
+ 2.3.0-beta3
PLG_JEM_COMMENTS_XML_DESCRIPTION
diff --git a/plugins/plg_jem_mailer/mailer.php b/plugins/plg_jem_mailer/mailer.php
index c13326f84..07809b7a4 100644
--- a/plugins/plg_jem_mailer/mailer.php
+++ b/plugins/plg_jem_mailer/mailer.php
@@ -593,6 +593,9 @@ public function onEventEdited($event_id, $is_new)
$recipients = $this->_getRecipients($send_to, array('user'), $event->id, ($event->created_by != $userid) ? $event->created_by : 0, $userid);
+ if ($event->modified == 0) { //when state switches modified date is not updated
+ $event->modified = 'now'; //set to now to avoid confusing e-mail message
+ }
#####################
## SENDMAIL - USER ##
#####################
@@ -703,7 +706,9 @@ public function onVenueEdited($venue_id, $is_new)
$text_description = JFilterOutput::cleanText($venue->locdescription);
$recipients = $this->_getRecipients($send_to, array('user'), 0, ($venue->created_by != $userid) ? $venue->created_by : 0, $userid, $venue_id);
-
+ if ($venue->modified == 0) { //when state switches modified date is not updated
+ $venue->modified = 'now'; //set to now to avoid confusing e-mail message
+ }
#####################
## SENDMAIL - USER ##
#####################
@@ -1117,7 +1122,7 @@ private function Adminlist()
$db->setQuery($query);
if ($db->execute() === false) {
- JError::raiseError(500, $db->stderr(true));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($db->stderr(true), 'error');
return;
}
diff --git a/plugins/plg_jem_mailer/mailer.xml b/plugins/plg_jem_mailer/mailer.xml
index e02e892a3..f216e0baa 100644
--- a/plugins/plg_jem_mailer/mailer.xml
+++ b/plugins/plg_jem_mailer/mailer.xml
@@ -1,13 +1,13 @@
plg_jem_mailer
- September 2017
+ August 2019
JEM Community
info@joomlaeventmanager.net
http://www.joomlaeventmanager.net
- copyright (C) 2013-2018 joomlaeventmanager.net
+ copyright (C) 2013-2019 joomlaeventmanager.net
https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
- 2.2.3
+ 2.3.0-beta3
PLG_JEM_MAILER_XML_DESCRIPTION
diff --git a/plugins/plg_quickicon_jem/jemquickicon.xml b/plugins/plg_quickicon_jem/jemquickicon.xml
index fa6ef7259..12c58ca03 100644
--- a/plugins/plg_quickicon_jem/jemquickicon.xml
+++ b/plugins/plg_quickicon_jem/jemquickicon.xml
@@ -1,13 +1,13 @@
Quick Icon - JEM
- August 2015
+ August 2019
JEM Community
info@joomlaeventmanager.net
http://www.joomlaeventmanager.net
- copyright (C) 2013-2016 joomlaeventmanager.net
+ copyright (C) 2013-2019 joomlaeventmanager.net
http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
- 2.2.0
+ 2.3.0-beta3
JEM Quick Icon
diff --git a/plugins/plg_search_jem/jem.xml b/plugins/plg_search_jem/jem.xml
index 54df76eb2..7bc09c542 100644
--- a/plugins/plg_search_jem/jem.xml
+++ b/plugins/plg_search_jem/jem.xml
@@ -4,10 +4,10 @@
JEM Community
info@joomlaeventmanager.net
http://www.joomlaeventmanager.net
- June 2015
- copyright (C) 2013-2018 joomlaeventmanager.net
+ August 2019
+ copyright (C) 2013-2019 joomlaeventmanager.net
https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
- 2.2.3
+ 2.3.0-beta3
PLG_SEARCH_JEM_XML_DESCRIPTION
diff --git a/script.php b/script.php
index 3aafe9249..c62ee3f16 100644
--- a/script.php
+++ b/script.php
@@ -1,8 +1,8 @@
"0",
"event_comunsolution"=>"0",
"event_show_attendeenames"=>"2",
+ "event_show_more_attendeedetails"=>"0",
"event_show_author"=>"1",
"event_lg"=>"",
"event_link_author"=>"1",
@@ -214,12 +215,12 @@ function preflight($type, $parent)
{
// Are we installing in J2.5?
$jversion = new JVersion();
- if (version_compare(JVERSION, '4.0', 'ge') || // J! 4.x NOT supported!
+ if (version_compare(JVERSION, '4.0.1', 'ge') || // J! 4.x NOT supported, but allow alpha/beta
!(($jversion->RELEASE >= '3.4' && $jversion->DEV_LEVEL >= '0') ||
($jversion->RELEASE == '3.3' && $jversion->DEV_LEVEL >= '3') ||
($jversion->RELEASE == '3.2' && $jversion->DEV_LEVEL >= '7') ||
($jversion->RELEASE == '2.5' && $jversion->DEV_LEVEL >= '24'))) {
- Jerror::raiseWarning(100, JText::_('COM_JEM_PREFLIGHT_WRONG_JOOMLA_VERSION'));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_('COM_JEM_PREFLIGHT_WRONG_JOOMLA_VERSION'), 'warning');
return false;
}
@@ -228,7 +229,7 @@ function preflight($type, $parent)
// Abort if PHP release is older than required version
if(version_compare(PHP_VERSION, $minPhpVersion, '<')) {
- Jerror::raiseWarning(100, JText::sprintf('COM_JEM_PREFLIGHT_WRONG_PHP_VERSION', $minPhpVersion, PHP_VERSION));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::sprintf('COM_JEM_PREFLIGHT_WRONG_PHP_VERSION', $minPhpVersion, PHP_VERSION), 'warning');
return false;
}
@@ -236,7 +237,7 @@ function preflight($type, $parent)
if (version_compare(phpversion(), '5.4', '<') ) {
if (function_exists('get_magic_quotes_gpc')) {
if(get_magic_quotes_gpc()) {
- Jerror::raiseWarning(100, JText::_('COM_JEM_PREFLIGHT_MAGIC_QUOTES_ENABLED'));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_('COM_JEM_PREFLIGHT_MAGIC_QUOTES_ENABLED'), 'warning');
return false;
}
}
@@ -248,7 +249,7 @@ function preflight($type, $parent)
// abort if the current Joomla release is older than required version
$jversion = new JVersion();
if(version_compare($jversion->getShortVersion(), $minJoomlaVersion, '<')) {
- Jerror::raiseWarning(100, JText::sprintf('COM_JEM_PREFLIGHT_OLD_JOOMLA_VERSION', $minJoomlaVersion));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::sprintf('COM_JEM_PREFLIGHT_OLD_JOOMLA_VERSION', $minJoomlaVersion), 'warning');
return false;
}
@@ -261,7 +262,7 @@ function preflight($type, $parent)
$this->newRelease = $parent->get('manifest')->version;
if (version_compare($this->newRelease, $this->oldRelease, 'lt')) {
- Jerror::raiseWarning(100, JText::sprintf('COM_JEM_PREFLIGHT_INCORRECT_VERSION_SEQUENCE', $this->oldRelease, $this->newRelease));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::sprintf('COM_JEM_PREFLIGHT_INCORRECT_VERSION_SEQUENCE', $this->oldRelease, $this->newRelease), 'warning');
return false;
}
diff --git a/site/classes/attachment.class.php b/site/classes/attachment.class.php
index b490d01b3..ef37e8a40 100644
--- a/site/classes/attachment.class.php
+++ b/site/classes/attachment.class.php
@@ -58,12 +58,12 @@ static public function postUpload($post_files, $object)
// check if the filetype is valid
$fileext = strtolower(JFile::getExt($file));
if (!in_array($fileext, $allowed)) {
- JError::raiseWarning(0, JText::_('COM_JEM_ERROR_ATTACHEMENT_EXTENSION_NOT_ALLOWED').': '.$file);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_('COM_JEM_ERROR_ATTACHEMENT_EXTENSION_NOT_ALLOWED').': '.$file, 'warning');
continue;
}
// check size
if ($rec['size'] > $maxsizeinput) {
- JError::raiseWarning(0, JText::sprintf('COM_JEM_ERROR_ATTACHEMENT_FILE_TOO_BIG', $file, $rec['size'], $maxsizeinput));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::sprintf('COM_JEM_ERROR_ATTACHEMENT_FILE_TOO_BIG', $file, $rec['size'], $maxsizeinput), 'warning');
continue;
}
@@ -71,7 +71,7 @@ static public function postUpload($post_files, $object)
// try to create it
$res = JFolder::create($path);
if (!$res) {
- JError::raiseWarning(0, JText::_('COM_JEM_ERROR_COULD_NOT_CREATE_FOLDER').': '.$path);
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_('COM_JEM_ERROR_COULD_NOT_CREATE_FOLDER').': '.$path, 'warning');
return false;
}
}
@@ -108,7 +108,7 @@ static public function postUpload($post_files, $object)
$table->added_by = $user->get('id');
if (!($table->check() && $table->store())) {
- JError::raiseWarning(0, JText::_('COM_JEM_ERROR_ATTACHMENT_SAVING_TO_DB').': '.$table->getError());
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_('COM_JEM_ERROR_ATTACHMENT_SAVING_TO_DB').': '.$table->getError(), 'warning');
}
} // foreach
@@ -130,7 +130,7 @@ static public function update($attach)
$table->bind($attach);
if (!($table->check() && $table->store())) {
- JError::raiseWarning(0, JText::_('COM_JEM_ERROR_ATTACHMENT_UPDATING_RECORD').': '.$table->getError());
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_('COM_JEM_ERROR_ATTACHMENT_UPDATING_RECORD').': '.$table->getError(), 'warning');
return false;
}
@@ -210,16 +210,16 @@ static public function getAttachmentPath($id)
$res = $db->loadObject();
if (!$res) {
- JError::raiseError(404, JText::_('COM_JEM_FILE_NOT_FOUND'));
+ throw new Exception(JText::_('COM_JEM_FILE_NOT_FOUND'), 404);
}
if (!in_array($res->access, $levels)) {
- JError::raiseError(403, JText::_('COM_JEM_NO_ACCESS'));
+ throw new Exception(JText::_('COM_JEM_NO_ACCESS'), 403);
}
$path = JPATH_SITE.'/'.$jemsettings->attachments_path.'/'.$res->object.'/'.$res->file;
if (!file_exists($path)) {
- JError::raiseError(404, JText::_('COM_JEM_FILE_NOT_FOUND'));
+ throw new Exception(JText::_('COM_JEM_FILE_NOT_FOUND'), 404);
}
return $path;
diff --git a/site/classes/calendar.class.php b/site/classes/calendar.class.php
index 7b01139d3..9970bc579 100644
--- a/site/classes/calendar.class.php
+++ b/site/classes/calendar.class.php
@@ -1,8 +1,8 @@
getWeekday($var) == 6) && $this->crSatClass) {
$cssClass[] = $this->cssSaturday;
}
- $out = "".$htmlNewEventLink.$linktext.'
'.$eventContent."getMonthName()."\" jem-dayname=\"".$this->getDayName($this->getWeekday($var))."\">".$htmlNewEventLink.$linktext.'
'.$eventContent."'
if (stristr($xss_check, '<'.$tag.' ') || stristr($xss_check, '<'.$tag.'>')) {
- JError::raiseWarning(100, JText::_('COM_JEM_WARN_IE_XSS'));
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(JText::_('COM_JEM_WARN_IE_XSS'), 'warning');
return false;
}
}
diff --git a/site/classes/output.class.php b/site/classes/output.class.php
index 1cc32646a..56ddd38ff 100644
--- a/site/classes/output.class.php
+++ b/site/classes/output.class.php
@@ -1,8 +1,8 @@
get('global_show_icons',1)) {
- $image = JHtml::_('image', 'com_jem/submitevent.png', JText::_('COM_JEM_DELIVER_NEW_EVENT'), NULL, true);
+ $image = JHtml::_('jemhtml.icon', 'com_jem/submitevent.png', 'fa fa-fw fa-lg fa-calendar-plus-o jem-submitbutton', JText::_('COM_JEM_DELIVER_NEW_EVENT'), NULL, !$app->isSite());
} else {
$image = JText::_('COM_JEM_DELIVER_NEW_EVENT');
}
@@ -198,7 +200,7 @@ static public function addvenuebutton($addvenuelink, $params, $settings2)
JHtml::_('behavior.tooltip');
if ($settings->get('global_show_icons',1)) {
- $image = JHtml::_('image', 'com_jem/addvenue.png', JText::_('COM_JEM_DELIVER_NEW_VENUE'), NULL, true);
+ $image = JHtml::_('jemhtml.icon', 'com_jem/addvenue.png', 'fa fa-fw fa-lg fa-plus-square-o jem-addvenuebutton', JText::_('COM_JEM_DELIVER_NEW_VENUE'), NULL, !$app->isSite());
} else {
$image = JText::_('COM_JEM_DELIVER_NEW_VENUE');
}
@@ -212,7 +214,7 @@ static public function addvenuebutton($addvenuelink, $params, $settings2)
}
/**
- * Writes addvenuebutton
+ * Writes addusersbutton
*
* @param int $addvenuelink Access of user
* @param int $eventid id of corresponding event
@@ -236,7 +238,7 @@ static public function addusersbutton($adduserslink, $eventid)
JHtml::_('behavior.tooltip');
if ($settings->get('global_show_icons',1)) {
- $image = JHtml::_('image', 'com_jem/icon-16-new.png', JText::_('COM_JEM_ADD_USER_REGISTRATIONS'), NULL, true);
+ $image = JHtml::_('jemhtml.icon', 'com_jem/icon-16-new.png', 'fa fa-fw fa-lg fa-user-plus jem-addusersbutton', JText::_('COM_JEM_ADD_USER_REGISTRATIONS'), NULL, !$app->isSite());
} else {
$image = JText::_('COM_JEM_ADD_USER_REGISTRATIONS');
}
@@ -249,6 +251,24 @@ static public function addusersbutton($adduserslink, $eventid)
}
}
+ /**
+ * Creates a remove button
+ *
+ * @param int $text alternative text
+ * @param array $attributes additional attributes
+ *
+ * Active in views:
+ *
+ **/
+ static public function removebutton($text, $attributes = array())
+ {
+ $app = JFactory::getApplication();
+
+ $output = JHtml::_('jemhtml.icon', 'com_jem/publish_r.png', 'fa fa-lg fa-times-circle jem-removebutton', $text, $attributes, !$app->isSite());
+
+ return $output;
+ }
+
/**
* Prepares addeventbutton for calendar days.
*
@@ -303,7 +323,7 @@ static public function archivebutton($params, $task = NULL, $id = NULL)
if ($task == 'archive') {
if ($settings->get('global_show_icons',1)) {
- $image = JHtml::_('image', 'com_jem/el.png', JText::_('COM_JEM_SHOW_EVENTS'), NULL, true);
+ $image = JHtml::_('jemhtml.icon', 'com_jem/el.png', 'fa fa-fw fa-lg fa-calendar jem-archivebutton-return', JText::_('COM_JEM_SHOW_EVENTS'), NULL, !$app->isSite());
} else {
$image = JText::_('COM_JEM_SHOW_EVENTS');
}
@@ -319,7 +339,7 @@ static public function archivebutton($params, $task = NULL, $id = NULL)
}
} else {
if ($settings->get('global_show_icons',1)) {
- $image = JHtml::_('image', 'com_jem/archive_front.png', JText::_('COM_JEM_SHOW_ARCHIVE'), NULL, true);
+ $image = JHtml::_('jemhtml.icon', 'com_jem/archive_front.png', 'fa fa-fw fa-lg fa-archive jem-archivebutton', JText::_('COM_JEM_SHOW_ARCHIVE'), NULL, !$app->isSite());
} else {
$image = JText::_('COM_JEM_SHOW_ARCHIVE');
}
@@ -388,7 +408,7 @@ static public function editbutton($item, $params, $attribs, $allowedtoedit, $vie
}
if ($showIcon) {
- $image = JHtml::_('image', 'com_jem/calendar_edit.png', JText::_('COM_JEM_EDIT_EVENT'), NULL, true);
+ $image = JHtml::_('jemhtml.icon', 'com_jem/calendar_edit.png', 'fa fa-fw fa-pencil-square-o jem-editbutton', JText::_('COM_JEM_EDIT_EVENT'), NULL, !$app->isSite());
} else {
$image = JText::_('COM_JEM_EDIT_EVENT');
}
@@ -407,7 +427,7 @@ static public function editbutton($item, $params, $attribs, $allowedtoedit, $vie
}
if ($showIcon) {
- $image = JHtml::_('image', 'com_jem/calendar_edit.png', JText::_('COM_JEM_EDIT_VENUE'), NULL, true);
+ $image = JHtml::_('jemhtml.icon', 'com_jem/calendar_edit.png', 'fa fa-fw fa-pencil-square-o jem-editbutton', JText::_('COM_JEM_EDIT_VENUE'), NULL, !$app->isSite());
} else {
$image = JText::_('COM_JEM_EDIT_VENUE');
}
@@ -426,7 +446,7 @@ static public function editbutton($item, $params, $attribs, $allowedtoedit, $vie
}
if ($showIcon) {
- $image = JHtml::_('image', 'com_jem/calendar_edit.png', JText::_('COM_JEM_EDIT_VENUE'), NULL, true);
+ $image = JHtml::_('jemhtml.icon', 'com_jem/calendar_edit.png', 'fa fa-fw fa-pencil-square-o jem-editbutton', JText::_('COM_JEM_EDIT_VENUE'), NULL, !$app->isSite());
} else {
$image = JText::_('COM_JEM_EDIT_VENUE');
}
@@ -482,7 +502,7 @@ static public function copybutton($item, $params, $attribs, $allowedtoadd, $view
{
case 'editevent':
if ($showIcon) {
- $image = JHtml::_('image', 'com_jem/calendar_copy.png', JText::_('COM_JEM_COPY_EVENT'), NULL, true);
+ $image = JHtml::_('jemhtml.icon', 'com_jem/calendar_copy.png', 'fa fa-fw fa-files-o jem-copybutton', JText::_('COM_JEM_COPY_EVENT'), NULL, !$app->isSite());
} else {
$image = JText::_('COM_JEM_COPY_EVENT');
}
@@ -494,7 +514,7 @@ static public function copybutton($item, $params, $attribs, $allowedtoadd, $view
case 'editvenue':
if ($showIcon) {
- $image = JHtml::_('image', 'com_jem/calendar_copy.png', JText::_('COM_JEM_COPY_VENUE'), NULL, true);
+ $image = JHtml::_('jemhtml.icon', 'com_jem/calendar_copy.png', 'fa fa-fw fa-files-o jem-copybutton', JText::_('COM_JEM_COPY_VENUE'), NULL, !$app->isSite());
} else {
$image = JText::_('COM_JEM_COPY_VENUE');
}
@@ -506,7 +526,7 @@ static public function copybutton($item, $params, $attribs, $allowedtoadd, $view
case 'venue':
if ($showIcon) {
- $image = JHtml::_('image', 'com_jem/calendar_copy.png', JText::_('COM_JEM_COPY_VENUE'), NULL, true);
+ $image = JHtml::_('jemhtml.icon', 'com_jem/calendar_copy.png', 'fa fa-fw fa-files-o jem-copybutton', JText::_('COM_JEM_COPY_VENUE'), NULL, !$app->isSite());
} else {
$image = JText::_('COM_JEM_COPY_VENUE');
}
@@ -544,7 +564,7 @@ static public function printbutton($print_link, $params)
$status = 'status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no';
if ($settings->get('global_show_icons',1)) {
- $image = JHtml::_('image','system/printButton.png', JText::_('JGLOBAL_PRINT'), NULL, true);
+ $image = JHtml::_('jemhtml.icon', 'com_jem/printButton.png', 'fa fa-fw fa-lg fa-print jem-printbutton', JText::_('JGLOBAL_PRINT'), NULL, !$app->isSite());
} else {
$image = JText::_('COM_JEM_PRINT');
}
@@ -601,7 +621,7 @@ static public function mailbutton($slug, $view, $params)
$status = 'width=400,height=350,menubar=yes,resizable=yes';
if ($settings->get('global_show_icons')) {
- $image = JHtml::_('image','system/emailButton.png', JText::_('JGLOBAL_EMAIL'), NULL, true);
+ $image = JHtml::_('jemhtml.icon', 'com_jem/emailButton.png', 'fa fa-fw fa-lg fa-envelope-o jem-mailbutton', JText::_('JGLOBAL_EMAIL'), NULL, !$app->isSite());
} else {
$image = JText::_('COM_JEM_EMAIL');
}
@@ -634,7 +654,7 @@ static public function icalbutton($slug, $view)
JHtml::_('behavior.tooltip');
if ($settings->get('global_show_icons','0')==1) {
- $image = JHtml::_('image', 'com_jem/iCal2.0.png', JText::_('COM_JEM_EXPORT_ICS'), NULL, true);
+ $image = JHtml::_('jemhtml.icon', 'com_jem/iCal2.0.png', 'fa fa-fw fa-lg fa-calendar-check-o jem-icalbutton', JText::_('COM_JEM_EXPORT_ICS'), NULL, !$app->isSite());
} else {
$image = JText::_('COM_JEM_EXPORT_ICS');
}
@@ -666,7 +686,7 @@ static public function publishbutton($prefix)
// button in view
JHtml::_('behavior.tooltip');
- $image = JHtml::_('image', 'com_jem/publish.png', JText::_('COM_JEM_PUBLISH'), NULL, true);
+ $image = JHtml::_('jemhtml.icon', 'com_jem/publish.png', 'fa fa-fw fa-lg fa-check-circle jem-publishbutton', JText::_('COM_JEM_PUBLISH'), NULL, !$app->isSite());
$overlib = JText::_('COM_JEM_PUBLISH_DESC');
$text = JText::_('COM_JEM_PUBLISH');
@@ -694,7 +714,7 @@ static public function trashbutton($prefix)
// button in view
JHtml::_('behavior.tooltip');
- $image = JHtml::_('image', 'com_jem/trash.png', JText::_('COM_JEM_TRASH'), NULL, true);
+ $image = JHtml::_('jemhtml.icon', 'com_jem/trash.png', 'fa fa-fw fa-lg fa-trash jem-trashbutton', JText::_('COM_JEM_TRASH'), NULL, !$app->isSite());
$overlib = JText::_('COM_JEM_TRASH_DESC');
$text = JText::_('COM_JEM_TRASH');
@@ -722,7 +742,7 @@ static public function unpublishbutton($prefix)
// button in view
JHtml::_('behavior.tooltip');
- $image = JHtml::_('image', 'com_jem/unpublish.png', JText::_('COM_JEM_UNPUBLISH'), NULL, true);
+ $image = JHtml::_('jemhtml.icon', 'com_jem/unpublish.png', 'fa fa-fw fa-lg fa-eye-slash jem-unpublishbutton', JText::_('COM_JEM_UNPUBLISH'), NULL, !$app->isSite());
$overlib = JText::_('COM_JEM_UNPUBLISH_DESC');
$text = JText::_('COM_JEM_UNPUBLISH');
@@ -745,7 +765,7 @@ static public function exportbutton($eventid)
JHtml::_('behavior.tooltip');
- $image = JHtml::_('image', 'com_jem/export_excel.png', JText::_('COM_JEM_EXPORT'), NULL, true);
+ $image = JHtml::_('jemhtml.icon', 'com_jem/export_excel.png', 'fa fa-fw fa-lg fa-download jem-exportbutton', JText::_('COM_JEM_EXPORT'), NULL, !$app->isSite());
if ($app->input->get('print','','int')) {
//button in popup
@@ -776,7 +796,7 @@ static public function backbutton($backlink, $view)
JHtml::_('behavior.tooltip');
- $image = JHtml::_('image', 'com_jem/icon-16-back.png', JText::_('COM_JEM_BACK'), NULL, true);
+ $image = JHtml::_('jemhtml.icon', 'com_jem/icon-16-back.png', 'fa fa-fw fa-lg fa-chevron-circle-left jem-backbutton', JText::_('COM_JEM_BACK'), NULL, !$app->isSite());
if ($app->input->get('print','','int')) {
//button in popup
@@ -849,13 +869,13 @@ static public function mapicon($data, $view = false, $params)
}
//Link to map
- $mapimage = JHtml::_('image', 'com_jem/map_icon.png', JText::_('COM_JEM_MAP'), NULL, true);
+ $mapimage = JHtml::_('jemhtml.icon', 'com_jem/map_icon.png', 'fa fa-map', JText::_('COM_JEM_MAP'), 'class="jem-mapicon"');
//set var
$output = null;
$attributes = null;
- $data->country = JString::strtoupper($data->country);
+ $data->country = \Joomla\String\StringHelper::strtoupper($data->country);
if ($data->latitude == 0.000000) {
$data->latitude = null;
@@ -886,7 +906,7 @@ static public function mapicon($data, $view = false, $params)
$url = 'https://maps.google.com/maps?q=loc:'.$data->latitude.',+'.$data->longitude.'&ie=UTF8&t=m&z=14&iwloc=B&output=embed';
}
- $output = '
';
+ $output = '
';
break;
case 3:
@@ -929,7 +949,9 @@ static public function mapicon($data, $view = false, $params)
*/
static public function recurrenceicon($event, $showinline = true, $showtitle = true)
{
+ $app = JFactory::getApplication();
$settings = JemHelper::globalattribs();
+ $settings2 = JemHelper::config();
$item = empty($event->recurr_bak) ? $event : $event->recurr_bak;
//stop if disabled
@@ -939,9 +961,12 @@ static public function recurrenceicon($event, $showinline = true, $showtitle = t
$first = !empty($item->recurrence_type) && empty($item->recurrence_first_id);
$image = $first ? 'com_jem/icon-32-recurrence-first.png' : 'com_jem/icon-32-recurrence.png';
+ /* F1DA: fa-history, F0E2: fa-undo/fa-rotate-left, F01E: fa-repeat/fa-rotate-right, F021: fa-refresh */
+ $icon = $first ? 'fa fa-fw fa-refresh jem-recurrencefirsticon' : 'fa fa-fw fa-refresh jem-recurrenceicon';
+ $showinline &= !($settings2->useiconfont == 1 && $app->isSite());
$attr_class = $showinline ? ('class="icon-inline" ') : '';
$attr_title = $showtitle ? ('title="' . JText::_($first ? 'COM_JEM_RECURRING_FIRST_EVENT_DESC' : 'COM_JEM_RECURRING_EVENT_DESC') . '"') : '';
- $output = JHtml::_('image', $image, JText::_('COM_JEM_RECURRING_EVENT'), $attr_class . $attr_title, true);
+ $output = JHtml::_('jemhtml.icon', $image, $icon, JText::_('COM_JEM_RECURRING_EVENT'), $attr_class . $attr_title, !$app->isSite());
return $output;
}
@@ -957,6 +982,7 @@ static public function recurrenceicon($event, $showinline = true, $showtitle = t
static public function publishstateicon($item, $ignorestates = array(-2, 1, 2), $showinline = true, $showtitle = true)
{
//$settings = JemHelper::globalattribs(); /// @todo use global setting to influence visibility of publish state icon?
+ $app = JFactory::getApplication();
// early return
if (is_object($item)) {
@@ -973,18 +999,22 @@ static public function publishstateicon($item, $ignorestates = array(-2, 1, 2),
switch ($published) {
case -2: // trashed
$image = 'com_jem/trash.png';
+ $icon = 'fa fa-fw fa-lg fa-trash jem-publishstateicon-trashed';
$alt = JText::_('JTRASHED');
break;
- case 0: // unpublished
+ case 0: // unpublished F10C: fa-circle-o F070: fa-eye-slash, F192: fa-dot-circle-o
$image = 'com_jem/publish_x.png';
+ $icon = 'fa fa-fw fa-lg fa-eye-slash jem-publishstateicon-unpublished';
$alt = JText::_('JUNPUBLISHED');
break;
- case 1: // published
+ case 1: // published F06E: fa-eye
$image = 'com_jem/publish.png';
+ $icon = 'fa fa-fw fa-lg fa-check-circle jem-publishstateicon-published';
$alt = JText::_('JPUBLISHED');
break;
case 2: // archived
$image = 'com_jem/archive_front.png';
+ $icon = 'fa fa-fw fa-lg fa-archive jem-publishstateicon-archived';
$alt = JText::_('JARCHIVED');
break;
default: // unknown state - abort!
@@ -1000,7 +1030,7 @@ static public function publishstateicon($item, $ignorestates = array(-2, 1, 2),
$attributes['title'] = $alt;
}
- $output = JHtml::_('image', $image, $alt, $attributes, true);
+ $output = JHtml::_('jemhtml.icon', $image, $icon, $alt, $attributes, !$app->isSite());
return $output;
}
diff --git a/site/classes/user.class.php b/site/classes/user.class.php
index 37e92bf30..ad936f463 100644
--- a/site/classes/user.class.php
+++ b/site/classes/user.class.php
@@ -1,8 +1,8 @@
quoteName($v);'), $db);
+ array_walk($asset, function(&$v, $k, $db) { $v = $db->quoteName($v); }, $db);
$field = ' AND (' . implode(' > 0 OR ', $asset) . ' > 0)';
} else {
$field = empty($asset) ? '' : ' AND ' . $db->quoteName($asset) . ' > 0';
diff --git a/site/classes/view.class.php b/site/classes/view.class.php
index 0249219f9..a12e82f37 100644
--- a/site/classes/view.class.php
+++ b/site/classes/view.class.php
@@ -1,8 +1,8 @@
_layoutStyleSuffix = $suffix;
+ if (is_dir($this->_basePath . '/view')) {
+ $this->addTempltePath($this->_basePath . '/view/' . $this->getName() . '/tmpl/' . $suffix);
+ }
+ else {
+ $this->addTemplatePath($this->_basePath . '/views/' . $this->getName() . '/tmpl/' . $suffix);
+ }
+ $this->addTemplatePath(JPATH_THEMES . '/' . JFactory::getApplication()->getTemplate() . '/html/com_jem/' . $this->getName() . '/' . $suffix);
+ }
+ }
+
/**
* Adds a row to data indicating even/odd row number
*
@@ -43,6 +69,11 @@ protected function addCommonTemplatePath()
// additional path for list part + corresponding override path
$this->addTemplatePath(JPATH_COMPONENT.'/common/views/tmpl');
$this->addTemplatePath(JPATH_THEMES . '/' . JFactory::getApplication()->getTemplate() . '/html/com_jem/common');
+
+ if (!empty($this->_layoutStyleSuffix)) {
+ $this->addTemplatePath(JPATH_COMPONENT.'/common/views/tmpl/'.$this->_layoutStyleSuffix);
+ $this->addTemplatePath(JPATH_THEMES . '/' . JFactory::getApplication()->getTemplate() . '/html/com_jem/common/'.$this->_layoutStyleSuffix);
+ }
}
/**
@@ -81,4 +112,4 @@ protected function prepareDocument()
// TODO: Metadata
$this->document->setMetadata('keywords', $this->params->get('page_title'));
}
-}
\ No newline at end of file
+}
diff --git a/site/common/views/tmpl/alternative/default_events_table.php b/site/common/views/tmpl/alternative/default_events_table.php
new file mode 100644
index 000000000..748b961df
--- /dev/null
+++ b/site/common/views/tmpl/alternative/default_events_table.php
@@ -0,0 +1,235 @@
+
+
+
+
+
+
+jemsettings->showtitle == 1) {
+ $sort_by[] = JHtml::_('select.option', 'a.title ASC', JText::_('COM_JEM_TITLE') . ' ' . JText::_('COM_JEM_ORDER_ASCENDING'));
+ $sort_by[] = JHtml::_('select.option', 'a.title DESC', JText::_('COM_JEM_TITLE') . ' ' . JText::_('COM_JEM_ORDER_DESCENDING'));
+ }
+ if ($this->jemsettings->showlocate == 1) {
+ $sort_by[] = JHtml::_('select.option', 'l.venue ASC', JText::_('COM_JEM_VENUE') . ' ' . JText::_('COM_JEM_ORDER_ASCENDING'));
+ $sort_by[] = JHtml::_('select.option', 'l.venue DESC', JText::_('COM_JEM_VENUE') . ' ' . JText::_('COM_JEM_ORDER_DESCENDING'));
+ }
+ if ($this->jemsettings->showcity == 1) {
+ $sort_by[] = JHtml::_('select.option', 'l.city ASC', JText::_('COM_JEM_CITY') . ' ' . JText::_('COM_JEM_ORDER_ASCENDING'));
+ $sort_by[] = JHtml::_('select.option', 'l.city DESC', JText::_('COM_JEM_CITY') . ' ' . JText::_('COM_JEM_ORDER_DESCENDING'));
+ }
+ if ($this->jemsettings->showstate == 1) {
+ $sort_by[] = JHtml::_('select.option', 'l.state ASC', JText::_('COM_JEM_STATE') . ' ' . JText::_('COM_JEM_ORDER_ASCENDING'));
+ $sort_by[] = JHtml::_('select.option', 'l.state DESC', JText::_('COM_JEM_STATE') . ' ' . JText::_('COM_JEM_ORDER_DESCENDING'));
+ }
+ if ($this->jemsettings->showcat == 1) {
+ $sort_by[] = JHtml::_('select.option', 'c.catname ASC', JText::_('COM_JEM_CATEGORY') . ' ' . JText::_('COM_JEM_ORDER_ASCENDING'));
+ $sort_by[] = JHtml::_('select.option', 'c.catname DESC', JText::_('COM_JEM_CATEGORY') . ' ' . JText::_('COM_JEM_ORDER_DESCENDING'));
+ }
+ $this->lists['sort_by'] = JHtml::_('select.genericlist', $sort_by, 'sort_by', array('size'=>'1','class'=>'inputbox','onchange'=>'fullOrdering(\'sort_by\', \'\');'), 'value', 'text', $this->lists['order'] . ' ' . $this->lists['order_Dir']);
+?>
+
+settings->get('global_show_filter',1) || $this->settings->get('global_display',1)) : ?>
+
+ settings->get('global_show_filter',1)) : ?>
+
+
+
+
+ settings->get('global_display',1)) : ?>
+
+
+
+
+
+
+ rows)) : ?>
+
+
+ rows as $row) : ?>
+ featured)) : ?>
+
+
+
+
+
+
+ dates, $row->times, $row->enddates, $row->endtimes, $this->jemsettings->showtime);
+ echo JemOutput::formatSchemaOrgDateTime($row->dates, $row->times, $row->enddates, $row->endtimes);
+ ?>
+
+
+
+
+ jemsettings->showeventimage == 1) && !empty($row->datimage)) : ?>
+
+ datimage, 'event'), 'event'); ?>
+
+
+ jemsettings->showdetails == 1) : ?>
+
+
+
+ escape($row->title) . JemOutput::recurrenceicon($row) . JemOutput::publishstateicon($row); ?>
+
+
+
+
+
+
+
+ jemsettings->showlocate == 1) {
+ if (!empty($row->venue)) {
+ if (($this->jemsettings->showlinkvenue == 1) && !empty($row->venueslug)) {
+ $venue[] = "
".$this->escape($row->venue)." ";
+ } else {
+ $venue[] = $this->escape($row->venue);
+ }
+ } else {
+ $venue[] = '-';
+ }
+ }
+ // if no city skip if also no state, else add hyphen
+ if (($this->jemsettings->showcity == 1) && (!empty($row->city) || !empty($row->state))) {
+ $venue[] = !empty($row->city) ? $this->escape($row->city) : '-';
+ }
+ if (($this->jemsettings->showstate == 1) && !empty($row->state)) {
+ $venue[] = $this->escape($row->state);
+ }
+ echo implode(', ', $venue);
+ ?>
+
+
+
+
+
+ categories, $this->jemsettings->catlinklist)); ?>
+
+
+
+
+
+ regCount) ? $this->escape($row->regCount) : '-'; ?>
+
+
+
+
+
+
+
diff --git a/site/common/views/tmpl/default_attachments_edit.php b/site/common/views/tmpl/default_attachments_edit.php
index a6e6d5424..525541052 100644
--- a/site/common/views/tmpl/default_attachments_edit.php
+++ b/site/common/views/tmpl/default_attachments_edit.php
@@ -1,8 +1,8 @@
access, 'attached-access[]', array('class'=>'inputbox','style'=>'width:100px;','size'=>'3'), 'value', 'text', $file->access); ?>
- 'attach-remove'.$file->id.':'.JSession::getFormToken(),'class' => 'attach-remove','title'=>JText::_('COM_JEM_GLOBAL_REMOVE_ATTACHEMENT')),true); ?>
+ 'attach-remove'.$file->id.':'.JSession::getFormToken(),'class' => 'attach-remove','title'=>JText::_('COM_JEM_GLOBAL_REMOVE_ATTACHEMENT'))); ?>
diff --git a/site/common/views/tmpl/default_events_table.php b/site/common/views/tmpl/default_events_table.php
index f2a8994a6..45fec16be 100644
--- a/site/common/views/tmpl/default_events_table.php
+++ b/site/common/views/tmpl/default_events_table.php
@@ -1,189 +1,190 @@
+
settings->get('global_show_filter',1) || $this->settings->get('global_display',1)) : ?>
-
- settings->get('global_show_filter',1)) : ?>
-
- '.JText::_('COM_JEM_FILTER').' ';
- echo $this->lists['filter'].' ';
- ?>
-
-
- settings->get('global_display',1)) : ?>
-
- '.JText::_('COM_JEM_DISPLAY_NUM').' ';
- echo $this->pagination->getLimitBox();
- ?>
-
-
+
+ settings->get('global_show_filter',1)) : ?>
+
+
+
+
+ settings->get('global_display',1)) : ?>
+
+
+
+
-
-
- jemsettings->showeventimage == 1) : ?>
+
+
+
+ jemsettings->showeventimage == 1) : ?>
+
+
-
-
- jemsettings->showeventimage == 1) : ?>
+
+
+ jemsettings->showeventimage == 1) : ?>
-
+
- jemsettings->showtitle == 1) : ?>
+ jemsettings->showtitle == 1) : ?>
-
- jemsettings->showlocate == 1) : ?>
+
+ jemsettings->showlocate == 1) : ?>
-
- jemsettings->showcity == 1) : ?>
+
+ jemsettings->showcity == 1) : ?>
-
- jemsettings->showstate == 1) : ?>
+
+ jemsettings->showstate == 1) : ?>
-
- jemsettings->showcat == 1) : ?>
+
+ jemsettings->showcat == 1) : ?>
-
- jemsettings->showatte == 1) : ?>
+
+ jemsettings->showatte == 1) : ?>
-
-
-
-
-
- noevents == 1) : ?>
-
-
-
+
+
- jemsettings->showeventimage == 1) : ?>
-
- datimage)) : ?>
+
+ rows)) : ?>
+
+
+
+
+
+ jemsettings->showeventimage == 1) : ?>
+
+ datimage)) : ?>
+ datimage, 'event');
+ echo JemOutput::flyer($row, $dimage, 'event');
+ ?>
+
+
+
+
+
datimage, 'event');
- echo JemOutput::flyer($row, $dimage, 'event');
+ echo JemOutput::formatShortDateTime($row->dates, $row->times, $row->enddates, $row->endtimes, $this->jemsettings->showtime);
+ echo JemOutput::formatSchemaOrgDateTime($row->dates, $row->times, $row->enddates, $row->endtimes);
?>
-
-
-
+
-
- dates, $row->times,
- $row->enddates, $row->endtimes, $this->jemsettings->showtime);
- echo JemOutput::formatSchemaOrgDateTime($row->dates, $row->times,
- $row->enddates, $row->endtimes);
- ?>
-
-
- jemsettings->showtitle == 1) && ($this->jemsettings->showdetails == 1)) : ?>
-
-
- escape($row->title) . JemOutput::recurrenceicon($row); ?>
-
-
-
+ jemsettings->showtitle == 1) && ($this->jemsettings->showdetails == 1)) : ?>
+
+
+ escape($row->title) . JemOutput::recurrenceicon($row); ?>
+
+
+
- jemsettings->showtitle == 1) && ($this->jemsettings->showdetails == 0)) : ?>
-
- escape($row->title) . JemOutput::recurrenceicon($row) . JemOutput::publishstateicon($row); ?>
-
-
+ jemsettings->showtitle == 1) && ($this->jemsettings->showdetails == 0)) : ?>
+
+ escape($row->title) . JemOutput::recurrenceicon($row) . JemOutput::publishstateicon($row); ?>
+
+
- jemsettings->showlocate == 1) : ?>
-
- venue)) :
- if (($this->jemsettings->showlinkvenue == 1) && !empty($row->venueslug)) :
- echo "".$this->escape($row->venue)." ";
+ jemsettings->showlocate == 1) : ?>
+
+ venue)) :
+ if (($this->jemsettings->showlinkvenue == 1) && !empty($row->venueslug)) :
+ echo "".$this->escape($row->venue)." ";
+ else :
+ echo $this->escape($row->venue);
+ endif;
else :
- echo $this->escape($row->venue);
+ echo '-';
endif;
- else :
- echo '-';
- endif;
- ?>
-
-
+ ?>
+
+
- jemsettings->showcity == 1) : ?>
-
- city) ? $this->escape($row->city) : '-'; ?>
-
-
+ jemsettings->showcity == 1) : ?>
+
+ city) ? $this->escape($row->city) : '-'; ?>
+
+
- jemsettings->showstate == 1) : ?>
-
- state) ? $this->escape($row->state) : '-'; ?>
-
-
+ jemsettings->showstate == 1) : ?>
+
+ state) ? $this->escape($row->state) : '-'; ?>
+
+
- jemsettings->showcat == 1) : ?>
-
- categories, $this->jemsettings->catlinklist)); ?>
-
-
+ jemsettings->showcat == 1) : ?>
+
+ categories, $this->jemsettings->catlinklist)); ?>
+
+
- jemsettings->showatte == 1) : ?>
-
- regCount) ? $this->escape($row->regCount) : '-'; ?>
-
-
-
-
-
-
-
\ No newline at end of file
+ jemsettings->showatte == 1) : ?>
+
+ regCount) ? $this->escape($row->regCount) : '-'; ?>
+
+
+
+
+
+
+
+
+ attachments) > 1) : ?>
+
+
+
+
+
+ attachments as $index=>$file) : ?>
+ :
+
+ escape($file->file);
+ if (!empty($file->name)) {
+ $overlib .= '>
+ escape($file->name ? $file->name : $file->file);
+ $image = $filename.'
+
+
+
+
+
+ '.JText::_('COM_JEM_FILTER').''; ?>
+
+
+ lists['filter']; ?>
+
+
+
+
+
+
+
+
+
+ jemsettings->showlocate == 1) : ?>
+
+
+ jemsettings->showcity == 1) : ?>
+
+
+ jemsettings->showstate == 1) : ?>
+
+
+ jemsettings->showcat == 1) : ?>
+
+
+ jemsettings->showatte == 1) : ?>
+
+
+
+
+ settings->get('global_display',1)) : ?>
+
+ '.JText::_('COM_JEM_DISPLAY_NUM').' ';
+ //echo ''.JText::_('COM_JEM_DISPLAY_NUM').' ';
+ echo $this->pagination->getLimitBox();
+ ?>
+
+
+
+ noevents == 1) : ?>
+ jemsettings->showdetails == 1 && (!$isSafari)) : echo 'onclick=location.href="'.JRoute::_(JemHelperRoute::getEventRoute($row->slug)).'"'; endif; ?> >
+
+ jemsettings->showdetails == 1 && (!$isSafari)) : echo 'onclick=location.href="'.JRoute::_(JemHelperRoute::getEventRoute($row->slug)).'"'; endif; ?> >
+
+
+ jemsettings->showeventimage == 1) : ?>
+
+ datimage)) : ?>
+ datimage, 'event');
+ echo JemOutput::flyer($row, $dimage, 'event');
+ ?>
+
+
+
+
+
+
+ jemsettings->showtitle == 1) && ($this->jemsettings->showdetails == 1)) : // Display title as title of jem-event with link ?>
+
+
+ jemsettings->showtitle == 1) && ($this->jemsettings->showdetails == 0)) : //Display title as title of jem-event without link ?>
+
+ escape($row->title) . JemOutput::recurrenceicon($row) . JemOutput::publishstateicon($row); ?>
+ featured)) :?>
+
+
+ jemsettings->showtitle == 0) && ($this->jemsettings->showdetails == 1)) : // Display date as title of jem-event with link ?>
+
+
+
+
+ dates, $row->times,
+ $row->enddates, $row->endtimes, $this->jemsettings->showtime);
+ echo JemOutput::formatSchemaOrgDateTime($row->dates, $row->times,
+ $row->enddates, $row->endtimes);
+ ?>
+
+
+ featured)) :?>
+
+
+
+
+
+ jemsettings->showtitle == 1) : ?>
+
+
+
+
+ jemsettings->showtitle == 0) : ?>
+
+
+ escape($row->title); ?>
+
+
+
+ jemsettings->showlocate == 1) && (!empty($row->locid))) : ?>
+
+
+
+
+ jemsettings->showcity == 1) && (!empty($row->city))) : ?>
+
+
+
+
+ jemsettings->showstate == 1) && (!empty($row->state))): ?>
+
+
+
+
+ jemsettings->showcat == 1) : ?>
+
categories, $this->jemsettings->catlinklist))); ?>">
+
+
+
+ jemsettings->showatte == 1) && (!empty($row->regCount))) : ?>
+
+
+
+
+
+ locid)) : ?>
+
+
+
+
+
+
+params->get('pageclass_sfx'), 'jem-filterbelow')) : ?>
+
+
+ '.JText::_('COM_JEM_FILTER').''; ?>
+
+
+ lists['filter']; ?>
+
+
+
+
+
+ '.JText::_('COM_JEM_FILTER').''; ?>
+
+
+ lists['filter']; ?>
+
+
+
+
+
+
+ jemsettings->showtitle == 1) : ?>
+
+
+ jemsettings->showlocate == 1) : ?>
+
+
+ jemsettings->showcity == 1) : ?>
+
+
+ jemsettings->showstate == 1) : ?>
+
+
+ jemsettings->showcat == 1) : ?>
+
+
+ jemsettings->showatte == 1) : ?>
+
+
+
+
+ noevents == 1) : ?>
+ jemsettings->showdetails == 1 && (!$isSafari)) : echo 'onclick=location.href="'.JRoute::_(JemHelperRoute::getEventRoute($row->slug)).'"'; endif; ?> >
+
+ jemsettings->showdetails == 1 && (!$isSafari)) : echo 'onclick=location.href="'.JRoute::_(JemHelperRoute::getEventRoute($row->slug)).'"'; endif; ?> >
+
+
+
+
+ jemsettings->showtitle == 1) : ?>
+
+
+
+
+ jemsettings->showlocate == 1) : ?>
+ locid)) : ?>
+
+
+
+
+
+
+
+
+ jemsettings->showcity == 1) : ?>
+ city)) : ?>
+
+
+
+
+
+
+
+ jemsettings->showstate == 1) : ?>
+ state)) : ?>
+
+
+
+
+
+
+
+ jemsettings->showcat == 1) : ?>
+ categories, $this->jemsettings->catlinklist))); ?>">
+
+
+
+ jemsettings->showatte == 1) : ?>
+ regCount)) : ?>
+
+
+
+
+
+
+
+
+ locid)) : ?>
+
+
+
+
+
+
+
+
+ params->get('pageclass_sfx'), 'jem-filterbelow')): ?>
+
+
+ '.JText::_('COM_JEM_FILTER').''; ?>
+
+
+ lists['filter']; ?>
+
+
+
+
+
+
+
+ settings->get('global_display',1)) : ?>
+
+ '.JText::_('COM_JEM_DISPLAY_NUM').' ';
+ //echo ''.JText::_('COM_JEM_DISPLAY_NUM').' ';
+ echo $this->pagination->getLimitBox();
+ ?>
+
+
+
getUserStateFromRequest('com_jem.myattendances.filter', 'filter', 0, 'int');
$search = $app->getUserStateFromRequest('com_jem.myattendances.filter_search', 'filter_search', '', 'string');
- $search = $this->_db->escape(trim(JString::strtolower($search)));
+ $search = $this->_db->escape(trim(\Joomla\String\StringHelper::strtolower($search)));
$where = array();
// First thing we need to do is to select only needed events
diff --git a/site/models/myevents.php b/site/models/myevents.php
index 01c088fef..9a4d8d10b 100644
--- a/site/models/myevents.php
+++ b/site/models/myevents.php
@@ -143,7 +143,7 @@ public function publish($cid = array(), $publish = 1)
$userid = (int) $user->get('id');
if (is_array($cid) && count($cid)) {
- JArrayHelper::toInteger($cid);
+ \Joomla\Utilities\ArrayHelper::toInteger($cid);
$cids = implode(',', $cid);
$query = 'UPDATE #__jem_events'
@@ -284,7 +284,7 @@ protected function _buildWhere()
$filter = $app->getUserStateFromRequest('com_jem.myevents.filter', 'filter', 0, 'int');
$search = $app->getUserStateFromRequest('com_jem.myevents.filter_search', 'filter_search', '', 'string');
- $search = $this->_db->escape(trim(JString::strtolower($search)));
+ $search = $this->_db->escape(trim(\Joomla\String\StringHelper::strtolower($search)));
$where = array();
// First thing we need to do is to select only needed events
@@ -305,7 +305,7 @@ protected function _buildWhere()
if ($excluded_cats != '') {
$cats_excluded = explode(',', $excluded_cats);
- JArrayHelper::toInteger($cats_excluded);
+ \Joomla\Utilities\ArrayHelper::toInteger($cats_excluded);
$where[] = ' c.id NOT IN (' . implode(',', $cats_excluded) . ')';
}
// === END Excluded categories add === //
diff --git a/site/models/myvenues.php b/site/models/myvenues.php
index 52e0501ee..22ac2a768 100644
--- a/site/models/myvenues.php
+++ b/site/models/myvenues.php
@@ -157,7 +157,7 @@ public function publish($cid = array(), $publish = 1)
}
// simple checks, good enough here
if (is_array($cid) && count($cid) && ($publish >= -2) && ($publish <= 2)) {
- JArrayHelper::toInteger($cid);
+ \Joomla\Utilities\ArrayHelper::toInteger($cid);
$cids = implode(',', $cid);
$query = 'UPDATE #__jem_venues'
@@ -242,7 +242,7 @@ protected function _buildVenuesWhere()
$filter = $app->getUserStateFromRequest('com_jem.myvenues.filter', 'filter', 0, 'int');
$search = $app->getUserStateFromRequest('com_jem.myvenues.filter_search', 'filter_search', '', 'string');
- $search = $this->_db->escape(trim(JString::strtolower($search)));
+ $search = $this->_db->escape(trim(\Joomla\String\StringHelper::strtolower($search)));
$where = array();
diff --git a/site/models/search.php b/site/models/search.php
index 98a6565e7..45cbc239a 100644
--- a/site/models/search.php
+++ b/site/models/search.php
@@ -246,9 +246,9 @@ protected function _buildWhere()
if ($filter) {
// clean filter variables
- $filter = JString::strtolower($filter);
+ $filter = \Joomla\String\StringHelper::strtolower($filter);
$filter = $this->_db->Quote('%'.$this->_db->escape($filter, true).'%', false);
- $filter_type = JString::strtolower($filter_type);
+ $filter_type = \Joomla\String\StringHelper::strtolower($filter_type);
switch ($filter_type) {
case 'title' :
@@ -411,7 +411,7 @@ public function getCategoryTree()
// Check for a database error.
if ($db->getErrorNum())
{
- JError::raiseNotice(500, $db->getErrorMsg());
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage($db->getErrorMsg(), 'notice');
}
if (!$mitems) {
diff --git a/site/models/venue.php b/site/models/venue.php
index 2a869f789..f5cd701c8 100644
--- a/site/models/venue.php
+++ b/site/models/venue.php
@@ -204,7 +204,6 @@ public function getVenue()
$_venue = $db->loadObject();
if (empty($_venue)) {
- //return JError::raiseError(404, JText::_('COM_JEM_VENUE_NOTFOUND'));
$this->setError(JText::_('COM_JEM_VENUE_ERROR_VENUE_NOT_FOUND'));
return false;
}
diff --git a/site/models/venues.php b/site/models/venues.php
index 7be088218..8ed501775 100644
--- a/site/models/venues.php
+++ b/site/models/venues.php
@@ -279,7 +279,7 @@ public function getCategories($id)
$query->where('c.id '.$type.(int) $categoryId);
}
elseif (is_array($categoryId) && count($categoryId)) {
- JArrayHelper::toInteger($categoryId);
+ \Joomla\Utilities\ArrayHelper::toInteger($categoryId);
$categoryId = implode(',', $categoryId);
$type = $this->getState('filter.category_id.include', true) ? 'IN' : 'NOT IN';
$query->where('c.id '.$type.' ('.$categoryId.')');
diff --git a/site/views/attendees/tmpl/addusers.php b/site/views/attendees/tmpl/addusers.php
index d800351c9..8c799fe72 100644
--- a/site/views/attendees/tmpl/addusers.php
+++ b/site/views/attendees/tmpl/addusers.php
@@ -1,8 +1,8 @@
event->waitinglist ? 10 : 9);
+
+$detaillink = JRoute::_(JemHelperRoute::getEventRoute($this->event->id.':'.$this->event->alias));
+
+$namefield = $this->settings->get('global_regname', '1') ? 'name' : 'username';
+$namelabel = $this->settings->get('global_regname', '1') ? 'COM_JEM_NAME' : 'COM_JEM_USERNAME';
+?>
+
+
+
+
+settings->get('global_regname', '1')) {
+ $sort_by[] = JHtml::_('select.option', 'u.name ASC', JText::_('COM_JEM_NAME') . ' ' . JText::_('COM_JEM_ORDER_ASCENDING'));
+ $sort_by[] = JHtml::_('select.option', 'u.name DESC', JText::_('COM_JEM_NAME') . ' ' . JText::_('COM_JEM_ORDER_DESCENDING'));
+} else {
+ $sort_by[] = JHtml::_('select.option', 'u.username ASC', JText::_('COM_JEM_USERNAME') . ' ' . JText::_('COM_JEM_ORDER_ASCENDING'));
+ $sort_by[] = JHtml::_('select.option', 'u.username DESC', JText::_('COM_JEM_USERNAME') . ' ' . JText::_('COM_JEM_ORDER_DESCENDING'));
+}
+$sort_by[] = JHtml::_('select.option', 'r.uregdate ASC', JText::_('COM_JEM_REGDATE') . ' ' . JText::_('COM_JEM_ORDER_ASCENDING'));
+$sort_by[] = JHtml::_('select.option', 'r.uregdate DESC', JText::_('COM_JEM_REGDATE') . ' ' . JText::_('COM_JEM_ORDER_DESCENDING'));
+$sort_by[] = JHtml::_('select.option', 'r.status ASC', JText::_('COM_JEM_STATUS') . ' ' . JText::_('COM_JEM_ORDER_ASCENDING'));
+$sort_by[] = JHtml::_('select.option', 'r.status DESC', JText::_('COM_JEM_STATUS') . ' ' . JText::_('COM_JEM_ORDER_DESCENDING'));
+
+$this->lists['sort_by'] = JHtml::_('select.genericlist', $sort_by, 'sort_by', array('size'=>'1','class'=>'inputbox','onchange'=>'fullOrdering(\'sort_by\', \'\');'), 'value', 'text', $this->lists['order'] . ' ' . $this->lists['order_Dir']);
+?>
+
+
+
+ canAddUsers = true;
+ $btn_params = array('print_link' => $this->print_link, 'id' => $this->event->id);
+ echo JemOutput::createButtonBar($this->getName(), $permissions, $btn_params);
+ ?>
+
+
+ params->get('show_page_heading', 1)) : ?>
+
+ escape($this->params->get('page_heading')); ?>
+
+
+
+
+
+ params->get('showintrotext')) : ?>
+
+ params->get('introtext'); ?>
+
+
+
+
escape($this->event->title); ?>
+
+
+
+
+
+
+
+
+
escape($this->event->title); ?>
+
+
+ rows) */ ?>
+
-
-
-
- lists['order_Dir'], $this->lists['order'] ); ?>
- enableemailaddress == 1) {?>
- lists['order_Dir'], $this->lists['order'] ); ?>
- lists['order_Dir'], $this->lists['order'] ); ?>
- jemsettings->regallowcomments)) : ?>
-
-
-
- event->id.(!empty($this->item->id)?'&Itemid='.$this->item->id:'').'&'.JSession::getFormToken().'=1'; ?>
- rows as $i => $row) : ?>
-
- pagination->getRowOffset($i); ?>
-
- $namefield; ?>
- enableemailaddress == 1) {?>
- email; ?> uregdate)) { echo JHtml::_('date', $row->uregdate, JText::_('DATE_FORMAT_LC2')); } ?>
-
- status;
- if ($status === 1 && $row->waiting == 1) { $status = 2; }
- echo JHtml::_('jemhtml.toggleAttendanceStatus', $status, $row->id, true);
- ?>
-
- jemsettings->regallowcomments)) : ?>
- comment) > 16) ? (JString::substr($row->comment, 0, 14).'…') : $row->comment; ?>
- comment, null, null, $cmnt, null, null); } ?>
-
- JText::_('COM_JEM_ATTENDEES_DELETE'), 'class' => (version_compare(JVERSION, '3.3', 'lt')) ? 'hasTip' : 'hasTooltip'), true); ?>
-
-
-
-
+ event->id.(!empty($this->item->id)?'&Itemid='.$this->item->id:'').'&'.JSession::getFormToken().'=1'; ?>
+
+
+
+
+
+ lists['order_Dir'], $this->lists['order'] ); ?>
+ enableemailaddress == 1) : ?>
+ lists['order_Dir'], $this->lists['order'] ); ?>
+ lists['order_Dir'], $this->lists['order'] ); ?>
+ jemsettings->regallowcomments)) : ?>
+
+
+
+ rows as $i => $row) : ?>
+
+ pagination->getRowOffset($i); ?>
+
+ $namefield; ?>
+ enableemailaddress == 1) : ?>
+ email; ?> uregdate)) { echo JHtml::_('date', $row->uregdate, JText::_('DATE_FORMAT_LC2')); } ?>
+
+ status;
+ if ($status === 1 && $row->waiting == 1) { $status = 2; }
+ echo JHtml::_('jemhtml.toggleAttendanceStatus', $status, $row->id, true);
+ ?>
+
+ jemsettings->regallowcomments)) : ?>
+ comment) > 16) ? (\Joomla\String\StringHelper::substr($row->comment, 0, 14).'…') : $row->comment; ?>
+ comment, null, null, $cmnt, null, null); } ?>
+
+ JText::_('COM_JEM_ATTENDEES_DELETE'), 'class' => (version_compare(JVERSION, '3.3', 'lt')) ? 'hasTip' : 'hasTooltip'), true); ?>
+
+
+
+
+
-
+
diff --git a/site/views/attendees/tmpl/print.php b/site/views/attendees/tmpl/print.php
index dc3ae4a8d..f8bf7f1d9 100644
--- a/site/views/attendees/tmpl/print.php
+++ b/site/views/attendees/tmpl/print.php
@@ -1,8 +1,8 @@
-
settings->get('global_regname', '1');
$k = 0;
+ $i = 0;
foreach ($this->rows as $row) :
?>
">
+ name : $row->username; ?>
- uregdate)) { echo JHtml::_('date', $row->uregdate, JText::_('DATE_FORMAT_LC2')); } ?>
enableemailaddress == 1) : ?>
email; ?>
+ uregdate)) { echo JHtml::_('date', $row->uregdate, JText::_('DATE_FORMAT_LC2')); } ?>
status) :
case -1: // explicitely unregistered
diff --git a/site/views/attendees/tmpl/responsive/addusers.php b/site/views/attendees/tmpl/responsive/addusers.php
new file mode 100644
index 000000000..b3bbfeb28
--- /dev/null
+++ b/site/views/attendees/tmpl/responsive/addusers.php
@@ -0,0 +1,155 @@
+input->getCmd('function', 'jSelectUsers');
+$checked = 0;
+
+JHtml::addIncludePath(JPATH_COMPONENT_ADMINISTRATOR.'/helpers/html');
+
+// Get the form.
+JForm::addFormPath(JPATH_COMPONENT . '/models/forms');
+$form = JForm::getInstance('com_jem.addusers', 'addusers');
+
+if (empty($form)) {
+ return false;
+}
+?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ canAddUsers = true;
+ $btn_params = array('print_link' => $this->print_link, 'id' => $this->event->id);
+ echo JemOutput::createButtonBar($this->getName(), $permissions, $btn_params);
+ ?>
+
+
+ params->get('show_page_heading', 1)) : ?>
+
+ escape($this->params->get('page_heading')); ?>
+
+
+
+
+
+ params->get('showintrotext')) : ?>
+
+ params->get('introtext'); ?>
+
+
+
+
escape($this->event->title); ?>
+
+
+
+
+ '.JText::_('COM_JEM_DISPLAY_NUM').' ';
+ echo $this->pagination->getLimitBox();
+ ?>
+
+
+
+
+
+
+
+
+
+ escape($this->event->title); ?> event->dates, $this->event->times,
+ $this->event->enddates, $this->event->endtimes, $this->settings->get('global_show_timedetails', 1)); ?>
+
+
+
+
+
+
+
+
+ settings->get('global_regname', '1');
+ $k = 0;
+ $i = 0;
+ foreach ($this->rows as $row) :
+ ?>
+ ">
+ name : $row->username; ?>
+ enableemailaddress == 1) : ?>
+ email; ?>
+
+ uregdate)) { echo JHtml::_('date', $row->uregdate, JText::_('DATE_FORMAT_LC2')); } ?>
+ status) :
+ case -1: // explicitely unregistered
+ $text = 'COM_JEM_ATTENDEES_NOT_ATTENDING';
+ break;
+ case 0: // invited, not answered yet
+ $text = 'COM_JEM_ATTENDEES_INVITED';
+ break;
+ case 1: // registered
+ $text = $row->waiting ? 'COM_JEM_ATTENDEES_ON_WAITINGLIST' : 'COM_JEM_ATTENDEES_ATTENDING';
+ break;
+ default: // oops...
+ $text = 'COM_JEM_ATTENDEES_STATUS_UNKNOWN';
+ break;
+ endswitch; ?>
+ comment) > 256) ? (substr($row->comment, 0, 254).'…') : $row->comment; ?>
+
+
+
+
+
+
+
+
+
diff --git a/site/views/attendees/view.html.php b/site/views/attendees/view.html.php
index 0bc7e1c91..67e2d525f 100644
--- a/site/views/attendees/view.html.php
+++ b/site/views/attendees/view.html.php
@@ -1,30 +1,33 @@
get('id')) {
$app->enqueueMessage(JText::_('COM_JEM_NEED_LOGGED_IN'), 'error');
return false;
}
+ $this->settings = JemHelper::globalattribs();
+ $this->jemsettings = JemHelper::config();
+
if ($this->getLayout() == 'print') {
$this->_displayprint($tpl);
return;
@@ -37,9 +40,6 @@ public function display($tpl = null)
}
//initialise variables
- $this->settings = JemHelper::globalattribs();
- $this->jemsettings = JemHelper::config();
-
$document = JFactory::getDocument();
$settings = $this->settings;
$params = $app->getParams();
@@ -87,7 +87,11 @@ public function display($tpl = null)
$pathway = $app->getPathWay();
if($menuitem) {
- $pathway->setItemName(1, $menuitem->title);
+ //https://www.joomlaeventmanager.net/forum/jem-2-2-x-on-joomla-3/10474-category-name-doubled-in-breadcrumb
+ $pathwayKeys = array_keys($pathway->getPathway()); //
+ $lastPathwayEntryIndex = end($pathwayKeys);
+ $pathway->setItemName($lastPathwayEntryIndex, $menuitem->title);
+ //$pathway->setItemName(1, $menuitem->title);
}
$pathway->addItem('Att:'.$event->title);
@@ -149,7 +153,6 @@ protected function _displayprint($tpl = null)
$document = JFactory::getDocument();
$app = JFactory::getApplication();
$params = $app->getParams();
- $settings = JEMHelper::globalattribs();
// Load css
JemHelper::loadCss('backend');
@@ -169,7 +172,6 @@ protected function _displayprint($tpl = null)
$this->rows = $rows;
$this->event = $event;
$this->enableemailaddress = $enableemailaddress;
- $this->settings = $settings;
parent::display($tpl);
}
@@ -181,7 +183,6 @@ protected function _displayaddusers($tpl)
{
$app = JFactory::getApplication();
$jinput = $app->input;
- $jemsettings = JemHelper::config();
// $db = JFactory::getDBO();
$document = JFactory::getDocument();
$model = $this->getModel();
@@ -193,7 +194,7 @@ protected function _displayaddusers($tpl)
$filter_type = '';
$search = $app->getUserStateFromRequest('com_jem.selectusers.filter_search', 'filter_search', '', 'string');
// $limitstart = $jinput->get('limitstart', '0', 'int');
- // $limit = $app->getUserStateFromRequest('com_jem.selectusers.limit', 'limit', $jemsettings->display_num, 'int');
+ // $limit = $app->getUserStateFromRequest('com_jem.selectusers.limit', 'limit', $this->jemsettings->display_num, 'int');
// $eventId = !empty($event->id) ? $event->id : 0;
JHtml::_('behavior.tooltip');
@@ -231,4 +232,4 @@ protected function _displayaddusers($tpl)
parent::display($tpl);
}
}
-?>
\ No newline at end of file
+?>
diff --git a/site/views/calendar/tmpl/default.php b/site/views/calendar/tmpl/default.php
index 976899529..e49e33ae3 100644
--- a/site/views/calendar/tmpl/default.php
+++ b/site/views/calendar/tmpl/default.php
@@ -1,8 +1,8 @@
+
+
+
+
+
+ $this->print_link);
+ echo JemOutput::createButtonBar($this->getName(), $this->permissions, $btn_params);
+ ?>
+
+
+ params->get('show_page_heading', 1)): ?>
+
+ escape($this->params->get('page_heading')); ?>
+
+
+
+ params->get('showintrotext')) : ?>
+
+ params->get('introtext'); ?>
+
+
+
+
+ params->get('daylimit', 10);
+ $evbg_usecatcolor = $this->params->get('eventbg_usecatcolor', 0);
+ $showtime = $this->settings->get('global_show_timedetails', 1);
+
+ foreach ($this->rows as $row) :
+ if (!JemHelper::isValidDate($row->dates)) {
+ continue; // skip, open date !
+ }
+
+ //get event date
+ $year = strftime('%Y', strtotime($row->dates));
+ $month = strftime('%m', strtotime($row->dates));
+ $day = strftime('%d', strtotime($row->dates));
+
+ @$countperday[$year.$month.$day]++;
+ if ($countperday[$year.$month.$day] == $limit+1) {
+ $var1a = JRoute::_('index.php?option=com_jem&view=day&id='.$year.$month.$day . $this->param_topcat);
+ $var1b = JText::_('COM_JEM_AND_MORE');
+ $var1c = "
".$var1b." ";
+ $id = 'eventandmore';
+
+ $this->cal->setEventContent($year, $month, $day, $var1c, null, $id);
+ continue;
+ } elseif ($countperday[$year.$month.$day] > $limit+1) {
+ continue;
+ }
+
+ //for time in tooltip
+ $timehtml = '';
+
+ if ($showtime) {
+ $start = JemOutput::formattime($row->times);
+ $end = JemOutput::formattime($row->endtimes);
+
+ if ($start != '') {
+ $timehtml = '
'.JText::_('COM_JEM_TIME_SHORT').': ';
+ $timehtml .= $start;
+ if ($end != '') {
+ $timehtml .= ' - '.$end;
+ }
+ $timehtml .= '
';
+ }
+ }
+
+ $eventname = '
'.JText::_('COM_JEM_TITLE_SHORT').': '.$this->escape($row->title).'
';
+ $detaillink = JRoute::_(JemHelperRoute::getEventRoute($row->slug));
+
+ //initialize variables
+ $multicatname = '';
+ $colorpic = '';
+ $nr = is_array($row->categories) ? count($row->categories) : 0;
+ $ix = 0;
+ $content = '';
+ $contentend = '';
+ $catcolor = array();
+
+ //walk through categories assigned to an event
+ foreach((array)$row->categories AS $category) {
+ //Currently only one id possible...so simply just pick one up...
+ $detaillink = JRoute::_(JemHelperRoute::getEventRoute($row->slug));
+
+ //wrap a div for each category around the event for show hide toggler
+ $content .= '
';
+ $contentend .= '
';
+
+ //attach category color if any in front of the catname
+ if ($category->color) {
+ $multicatname .= '
'.$category->catname;
+ } else {
+ $multicatname .= $category->catname;
+ }
+
+ $ix++;
+ if ($ix != $nr) {
+ $multicatname .= ', ';
+ }
+
+ //attach category color if any in front of the event title in the calendar overview
+ if (isset($category->color) && $category->color) {
+ $colorpic .= '
';
+ $catcolor[$category->color] = $category->color; // we need to list all different colors of this event
+ }
+
+ //count occurence of the category
+ if (!isset($row->multi) || ($row->multi == 'first')) {
+ if (!array_key_exists($category->id, $countcatevents)) {
+ $countcatevents[$category->id] = 1;
+ } else {
+ $countcatevents[$category->id]++;
+ }
+ }
+ }
+
+ $color = '
';
+ $color .= $colorpic;
+ $color .= '
';
+
+ // multiday
+ $multi_mode = 0; // single day
+ $multi_icon = '';
+ if (isset($row->multi)) {
+ switch ($row->multi) {
+ case 'first': // first day
+ $multi_mode = 1;
+ $multi_icon = '
';
+ break;
+ case 'middle': // middle day
+ $multi_mode = 2;
+ $multi_icon = '
';
+ break;
+ case 'zlast': // last day
+ $multi_mode = 3;
+ $multi_icon = '
';
+ break;
+ }
+ }
+
+ //for time in calendar
+ $timetp = '';
+
+ if ($showtime) {
+ $start = JemOutput::formattime($row->times,'',false);
+ $end = JemOutput::formattime($row->endtimes,'',false);
+
+ switch ($multi_mode) {
+ case 1:
+ $timetp .= $multi_icon . ' ' . $start . '
';
+ break;
+ case 2:
+ $timetp .= $multi_icon . '
';
+ break;
+ case 3:
+ $timetp .= $multi_icon . ' ' . $end . '
';
+ break;
+ default:
+ if ($start != '') {
+ $timetp .= $start;
+ if ($end != '') {
+ $timetp .= ' - '.$end;
+ }
+ $timetp .= '
';
+ }
+ break;
+ }
+ } else {
+ if (!empty($multi_icon)) {
+ $timetp .= $multi_icon . ' ';
+ }
+ }
+
+ $catname = '
'.$multicatname.'
';
+
+ $eventdate = !empty($row->multistartdate) ? JemOutput::formatdate($row->multistartdate) : JemOutput::formatdate($row->dates);
+ if (!empty($row->multienddate)) {
+ $eventdate .= ' - ' . JemOutput::formatdate($row->multienddate);
+ } else if ($row->enddates && $row->dates < $row->enddates) {
+ $eventdate .= ' - ' . JemOutput::formatdate($row->enddates);
+ }
+
+ //venue
+ if ($this->jemsettings->showlocate == 1) {
+ $venue = '
'.JText::_('COM_JEM_VENUE_SHORT').': ';
+ $venue .= !empty($row->venue) ? $this->escape($row->venue) : '-';
+ $venue .= '
';
+ } else {
+ $venue = '';
+ }
+
+ // state if unpublished
+ $statusicon = '';
+ if (isset($row->published) && ($row->published != 1)) {
+ $statusicon = JemOutput::publishstateicon($row);
+ $eventstate = '
'.JText::_('JSTATUS').': ';
+ switch ($row->published) {
+ case 1: $eventstate .= JText::_('JPUBLISHED'); break;
+ case 0: $eventstate .= JText::_('JUNPUBLISHED'); break;
+ case 2: $eventstate .= JText::_('JARCHIVED'); break;
+ case -2: $eventstate .= JText::_('JTRASHED'); break;
+ }
+ $eventstate .= '
';
+ } else {
+ $eventstate = '';
+ }
+
+ //date in tooltip
+ $multidaydate = '
'.JText::_('COM_JEM_DATE').': ';
+ switch ($multi_mode) {
+ case 1: // first day
+ $multidaydate .= JemOutput::formatShortDateTime($row->dates, $row->times, $row->enddates, $row->endtimes, $showtime);
+ $multidaydate .= JemOutput::formatSchemaOrgDateTime($row->dates, $row->times, $row->enddates, $row->endtimes);
+ break;
+ case 2: // middle day
+ $multidaydate .= JemOutput::formatShortDateTime($row->multistartdate, $row->times, $row->multienddate, $row->endtimes, $showtime);
+ $multidaydate .= JemOutput::formatSchemaOrgDateTime($row->multistartdate, $row->times, $row->multienddate, $row->endtimes);
+ break;
+ case 3: // last day
+ $multidaydate .= JemOutput::formatShortDateTime($row->multistartdate, $row->times, $row->multienddate, $row->endtimes, $showtime);
+ $multidaydate .= JemOutput::formatSchemaOrgDateTime($row->multistartdate, $row->times, $row->multienddate, $row->endtimes);
+ break;
+ default: // single day
+ $multidaydate .= JemOutput::formatShortDateTime($row->dates, $row->times, $row->enddates, $row->endtimes, $showtime);
+ $multidaydate .= JemOutput::formatSchemaOrgDateTime($row->dates, $row->times, $row->enddates, $row->endtimes);
+ break;
+ }
+ $multidaydate .= '
';
+
+ //create little Edit and/or Copy icon on top right corner of event if user is allowed to edit and/or create
+ $editicon = '';
+ if (!$this->print) {
+ $btns = array();
+ if ($this->params->get('show_editevent_icon', 0) && $row->params->get('access-edit', false)) {
+ $btns[] = JemOutput::editbutton($row, null, null, true, 'editevent');
+ }
+ if ($this->params->get('show_copyevent_icon', 0) && $this->permissions->canAddEvent) {
+ $btns[] = JemOutput::copybutton($row, null, null, true, 'editevent');
+ }
+ if (!empty($btns)) {
+ $editicon .= '
';
+ $editicon .= join(' ', $btns);
+ $editicon .= '
';
+ }
+ }
+
+ //generate the output
+ // if we have exact one color from categories we can use this as background color of event
+ if (!empty($evbg_usecatcolor) && (count($catcolor) == 1)) {
+ $content .= '
';
+ $content .= $editicon;
+ $content .= JemHelper::caltooltip($catname.$eventname.$timehtml.$venue.$eventstate, $eventdate, $row->title . $statusicon, $detaillink, 'editlinktip hasTip', $timetp, $category->color);
+ $content .= $contentend . '
';
+ } else {
+ $content .= '
' . $colorpic;
+ $content .= $editicon;
+ $content .= JemHelper::caltooltip($catname.$eventname.$timehtml.$venue.$eventstate, $eventdate, $row->title . $statusicon, $detaillink, 'editlinktip hasTip', $timetp, $category->color);
+ $content .= $contentend . '
';
+ }
+
+ $this->cal->setEventContent($year, $month, $day, $content);
+ endforeach;
+
+ // enable little icon right beside day number to allow event creation
+ if (!$this->print && $this->params->get('show_addevent_icon', 0) && !empty($this->permissions->canAddEvent)) {
+ $html = JemOutput::prepareAddEventButton();
+ $this->cal->enableNewEventLinks($html);
+ }
+
+ $displayLegend = (int)$this->params->get('displayLegend', 1);
+ if ($displayLegend == 2) : ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ params->get('displayLegend')) {
+
+ ##############
+ ## FOR EACH ##
+ ##############
+
+ $counter = array();
+
+ # walk through events
+ foreach ($this->rows as $row) {
+ foreach ($row->categories as $cat) {
+
+ # sort out dupes for the counter (catid-legend)
+ if (!in_array($cat->id, $counter)) {
+ # add cat id to cat counter
+ $counter[] = $cat->id;
+
+ # build legend
+ if (array_key_exists($cat->id, $countcatevents)) {
+ ?>
+
+ color) && $cat->color) {
+ echo '
+
+
+
+
+
+ cal->showMonth();
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ rows as $row) {
+ foreach ($row->categories as $cat) {
+
+ # sort out dupes for the counter (catid-legend)
+ if (!in_array($cat->id, $counter)) {
+ # add cat id to cat counter
+ $counter[] = $cat->id;
+
+ # build legend
+ if (array_key_exists($cat->id, $countcatevents)) {
+ ?>
+
+ color) && $cat->color) {
+ echo '
+
+
+
+
+
+
+
+
+
+
+
+
+
+ catrow->events)) : ?>
+
+
+ catrow->events as $row) : ?>
+ featured)) : ?>
+
+
+
+
+
+
+ dates, $row->times, $row->enddates, $row->endtimes, $this->jemsettings->showtime);
+ echo JemOutput::formatSchemaOrgDateTime($row->dates, $row->times, $row->enddates, $row->endtimes);
+ ?>
+
+
+
+
+ jemsettings->showeventimage == 1) && !empty($row->datimage)) : ?>
+
+ datimage, 'event'), 'event'); ?>
+
+
+ jemsettings->showdetails == 1) : ?>
+
+
+
+ escape($row->title) . JemOutput::recurrenceicon($row) . JemOutput::publishstateicon($row); ?>
+
+
+
+
+
+
+
+ jemsettings->showlocate == 1) {
+ if (!empty($row->venue)) {
+ if (($this->jemsettings->showlinkvenue == 1) && !empty($row->venueslug)) {
+ $venue[] = "
".$this->escape($row->venue)." ";
+ } else {
+ $venue[] = $this->escape($row->venue);
+ }
+ } else {
+ $venue[] = '-';
+ }
+ }
+ // if no city skip if also no state, else add hyphen
+ if (($this->jemsettings->showcity == 1) && (!empty($row->city) || !empty($row->state))) {
+ $venue[] = !empty($row->city) ? $this->escape($row->city) : '-';
+ }
+ if (($this->jemsettings->showstate == 1) && !empty($row->state)) {
+ $venue[] = $this->escape($row->state);
+ }
+ echo implode(', ', $venue);
+ ?>
+
+
+
+
+
+ categories, $this->jemsettings->catlinklist)); ?>
+
+
+
+
+
+ regCount) ? $this->escape($row->regCount) : '-'; ?>
+
+
+
+
+
+
+
diff --git a/site/views/categories/tmpl/default.php b/site/views/categories/tmpl/default.php
index 894feaf88..f8db2fd20 100644
--- a/site/views/categories/tmpl/default.php
+++ b/site/views/categories/tmpl/default.php
@@ -1,8 +1,8 @@
catrow->events)) { return; }
?>
-
-
+
+
+
-
-
-
-
jemsettings->showtitle == 1) : ?>
-
+
-
+
-
- catrow->events)) : ?>
-
-
-
- dates, $row->times,
- $row->enddates, $row->endtimes, $this->jemsettings->showtime);
- echo JemOutput::formatSchemaOrgDateTime($row->dates, $row->times,
- $row->enddates, $row->endtimes);
- ?>
-
-
- jemsettings->showtitle == 1) && ($this->jemsettings->showdetails == 1)) : ?>
-
-
- escape($row->title) . JemOutput::recurrenceicon($row); ?>
-
-
+
+
+
+ jemsettings->showtitle == 1) : ?>
+
-
- jemsettings->showtitle == 1) && ($this->jemsettings->showdetails == 0)) : ?>
-
- escape($row->title) . JemOutput::recurrenceicon($row) . JemOutput::publishstateicon($row); ?>
-
-
-
jemsettings->showlocate == 1) : ?>
-
- venue)) :
- if (($this->jemsettings->showlinkvenue == 1) && !empty($row->venueslug)) :
- echo "".$this->escape($row->venue)." ";
- else :
- echo $this->escape($row->venue);
- endif;
- else :
- echo '-';
- endif;
- ?>
-
+
-
jemsettings->showcity == 1) : ?>
-
- city) ? $this->escape($row->city) : '-'; ?>
-
+
-
jemsettings->showstate == 1) : ?>
-
- state) ? $this->escape($row->state) : '-'; ?>
-
+
-
jemsettings->showcat == 1) : ?>
-
- categories, $this->jemsettings->catlinklist)); ?>
-
+
-
-
-
-
-
+
+
+
+ catrow->events)) : ?>
+
+
+
+
+
+
+ dates, $row->times, $row->enddates, $row->endtimes, $this->jemsettings->showtime);
+ echo JemOutput::formatSchemaOrgDateTime($row->dates, $row->times, $row->enddates, $row->endtimes);
+ ?>
+
+
+ jemsettings->showtitle == 1) && ($this->jemsettings->showdetails == 1)) : ?>
+
+
+ escape($row->title) . JemOutput::recurrenceicon($row); ?>
+
+
+
+
+ jemsettings->showtitle == 1) && ($this->jemsettings->showdetails == 0)) : ?>
+
+ escape($row->title) . JemOutput::recurrenceicon($row) . JemOutput::publishstateicon($row); ?>
+
+
+
+ jemsettings->showlocate == 1) : ?>
+
+ venue)) :
+ if (($this->jemsettings->showlinkvenue == 1) && !empty($row->venueslug)) :
+ echo "".$this->escape($row->venue)." ";
+ else :
+ echo $this->escape($row->venue);
+ endif;
+ else :
+ echo '-';
+ endif;
+ ?>
+
+
+
+ jemsettings->showcity == 1) : ?>
+
+ city) ? $this->escape($row->city) : '-'; ?>
+
+
+
+ jemsettings->showstate == 1) : ?>
+
+ state) ? $this->escape($row->state) : '-'; ?>
+
+
+
+ jemsettings->showcat == 1) : ?>
+
+ categories, $this->jemsettings->catlinklist)); ?>
+
+
+
+
+
+
+
+
+
+
+ $this->id, 'task' => $this->task, 'print_link' => $this->print_link);
+ echo JemOutput::createButtonBar($this->getName(), $this->permissions, $btn_params);
+ ?>
+
+
+ params->get('show_page_heading', 1)) : ?>
+
+ escape($this->params->get('page_heading')); ?>
+
+
+
+ rows as $row) : ?>
+
+ linktarget), $this->escape($row->catname)); ?>
+
+
+ jemsettings->discatheader) && (!empty($row->image))) : ?>
+
+ image, 'category'); ?>
+
+
+
+
+
+ description; ?>
+ subcats)) : ?>
+
+
+
+
+ subcats as $sub) : ?>
+
+
+ escape($sub->catname); ?>
+ assignedevents != null ? $sub->assignedevents : 0) . (--$i ? '),' : ')'); ?>
+
+
+
+
+
+
+
+
+
+ params->get('detcat_nr', 0) > 0) {
+ $this->catrow = $row;
+ echo '
'.JTEXT::_('COM_JEM_EVENTS').' ';
+ if (empty($this->jemsettings->tablewidth)) :
+ echo $this->loadTemplate('jem_eventslist'); // The new layout
+ else :
+ echo $this->loadTemplate('jem_eventslist_small'); // Similar to the old table-layout
+ endif;
+ }
+ ?>
+
+
+ rows)) :
+ echo '
';
+ endif;
+ ?>
+
+
+
+
+
+
+
+
+
+
+ catrow->events)) : ?>
+ jemsettings->showdetails == 1 && (!$isSafari)) : echo 'onclick=location.href="'.JRoute::_(JemHelperRoute::getEventRoute($row->slug)).'"'; endif; ?> >
+
+ jemsettings->showdetails == 1 && (!$isSafari)) : echo 'onclick=location.href="'.JRoute::_(JemHelperRoute::getEventRoute($row->slug)).'"'; endif; ?> >
+
+
+ jemsettings->showeventimage == 1) && (!empty($row->datimage))): ?>
+
+ datimage, 'event');
+ echo JemOutput::flyer($row, $dimage, 'event');
+ ?>
+
+
+
+ jemsettings->showtitle == 1) && ($this->jemsettings->showdetails == 1)) : // Display title as title of jem-event with link ?>
+
+
+ jemsettings->showtitle == 1) && ($this->jemsettings->showdetails == 0)) : // Display title as title of jem-event without link ?>
+
+ escape($row->title) . JemOutput::recurrenceicon($row) . JemOutput::publishstateicon($row); ?>
+ featured)) :?>
+
+
+ jemsettings->showtitle == 0) && ($this->jemsettings->showdetails == 1)) : // Display date as title of jem-event with link ?>
+
+
+
+
+ dates, $row->times,
+ $row->enddates, $row->endtimes, $this->jemsettings->showtime);
+ echo JemOutput::formatSchemaOrgDateTime($row->dates, $row->times,
+ $row->enddates, $row->endtimes);
+ ?>
+
+
+ featured)) :?>
+
+
+
+
+
+ jemsettings->showtitle == 1) : ?>
+
+
+
+
+ jemsettings->showtitle == 0) : ?>
+
+
+ escape($row->title); ?>
+
+
+
+ jemsettings->showlocate == 1) && (!empty($row->locid))) : ?>
+
+
+
+
+ jemsettings->showcity == 1) && (!empty($row->city))) : ?>
+
+
+
+
+ jemsettings->showstate == 1) && (!empty($row->state))): ?>
+
+
+
+
+ jemsettings->showcat == 1) : ?>
+
categories, $this->jemsettings->catlinklist))); ?>">
+
+
+
+ jemsettings->showatte == 1) && (!empty($row->regCount))) : ?>
+
+
+
+
+
+ locid)) : ?>
+
+
+
+
+
+
\ No newline at end of file
diff --git a/site/views/categories/tmpl/responsive/default_jem_eventslist_small.php b/site/views/categories/tmpl/responsive/default_jem_eventslist_small.php
new file mode 100644
index 000000000..80cedd15a
--- /dev/null
+++ b/site/views/categories/tmpl/responsive/default_jem_eventslist_small.php
@@ -0,0 +1,228 @@
+catrow->events)) { return; }
+?>
+
+
+
+
+
+
+ jemsettings->showtitle == 1) : ?>
+
+
+ jemsettings->showlocate == 1) : ?>
+
+
+ jemsettings->showcity == 1) : ?>
+
+
+ jemsettings->showstate == 1) : ?>
+
+
+ jemsettings->showcat == 1) : ?>
+
+
+
+
+ catrow->events)) : ?>
+ jemsettings->showdetails == 1 && (!$isSafari)) : echo 'onclick=location.href="'.JRoute::_(JemHelperRoute::getEventRoute($row->slug)).'"'; endif; ?> >
+
+ jemsettings->showdetails == 1 && (!$isSafari)) : echo 'onclick=location.href="'.JRoute::_(JemHelperRoute::getEventRoute($row->slug)).'"'; endif; ?> >
+
+
+
+
+
+ jemsettings->showtitle == 1) : ?>
+
+
+
+ jemsettings->showlocate == 1) : ?>
+ locid)) : ?>
+
+
+
+
+
+
+
+ jemsettings->showcity == 1) : ?>
+ city)) : ?>
+
+
+
+
+
+
+
+ jemsettings->showstate == 1) : ?>
+ state)) : ?>
+
+
+
+
+
+
+
+ jemsettings->showcat == 1) : ?>
+ categories, $this->jemsettings->catlinklist))); ?>">
+
+
+
+
+ locid)) : ?>
+
+
+
+
+
+
\ No newline at end of file
diff --git a/site/views/categories/tmpl/responsive/index.html b/site/views/categories/tmpl/responsive/index.html
new file mode 100644
index 000000000..2efb97f31
--- /dev/null
+++ b/site/views/categories/tmpl/responsive/index.html
@@ -0,0 +1 @@
+
+
+ $this->category->slug, 'slug' => $this->category->slug, 'task' => $this->task, 'print_link' => $this->print_link);
+ echo JemOutput::createButtonBar($this->getName(), $this->permissions, $btn_params);
+ ?>
+
+
+ params->get('show_page_heading', 1)) : ?>
+
+ escape($this->params->get('page_heading')); ?>
+
+
+
+ escape($this->params->get('page_heading')) != $this->escape($this->category->title)) : ?>
+ params->get('show_page_heading', 1)) : ?>
+
+ escape($this->category->title);?>
+
+
+
+ escape($this->category->title);?>
+
+
+
+
+
+
+ jemsettings->discatheader) && (!empty($this->category->image))) : ?>
+
+ category, $this->cimage, 'category'); ?>
+
+
+
+
+
+
+
+
+
+ showsubcats && $this->maxLevel != 0 && !empty($this->category->id) && !empty($this->children[$this->category->id])) :
+ $countsubcats = 0;
+ foreach ($this->children[$this->category->id] as $id => $child) :
+ // Do we have any non-empty subcategory or should generally show empty subcategories?
+ // Note: We also show empty subcategories if they have at least one non-empty subsubcategory.
+ if ($this->showemptysubcats || ($child->getNumItems(true) > 0)) :
+ ++$countsubcats;
+ endif;
+ endforeach;
+ if ($countsubcats) :
+ ?>
+
+ params->get('show_category_heading_title_text', 1) == 1) : ?>
+
+
+
+
+ loadTemplate('subcategories'); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ category->id, 'category'); ?>
+
+
+
+
+
+
+
+ settings->get('global_show_filter',1)) : ?>
+
+
+
+
+ settings->get('global_display',1)) : ?>
+
+
+
+
+
+
+ rows)) : ?>
+
+
+ rows as $row) : ?>
+ featured)) : ?>
+
+
+
+
+
+
+ dates, $row->times, $row->enddates, $row->endtimes, $this->jemsettings->showtime);
+ echo JemOutput::formatSchemaOrgDateTime($row->dates, $row->times, $row->enddates, $row->endtimes);
+ ?>
+
+
+
+
+ jemsettings->showeventimage == 1) && !empty($row->datimage)) : ?>
+
+ datimage, 'event'), 'event'); ?>
+
+
+ jemsettings->showdetails == 1) : ?>
+
+
+
+ escape($row->title) . JemOutput::recurrenceicon($row) . JemOutput::publishstateicon($row); ?>
+
+
+
+
+
+
+
+ jemsettings->showlocate == 1) {
+ if (!empty($row->venue)) {
+ if (($this->jemsettings->showlinkvenue == 1) && !empty($row->venueslug)) {
+ $venue[] = "
".$this->escape($row->venue)." ";
+ } else {
+ $venue[] = $this->escape($row->venue);
+ }
+ } else {
+ $venue[] = '-';
+ }
+ }
+ // if no city skip if also no state, else add hyphen
+ if (($this->jemsettings->showcity == 1) && (!empty($row->city) || !empty($row->state))) {
+ $venue[] = !empty($row->city) ? $this->escape($row->city) : '-';
+ }
+ if (($this->jemsettings->showstate == 1) && !empty($row->state)) {
+ $venue[] = $this->escape($row->state);
+ }
+ echo implode(', ', $venue);
+ ?>
+
+
+
+
+
+ categories, $this->jemsettings->catlinklist)); ?>
+
+
+
+
+
+ regCount) ? $this->escape($row->regCount) : '-'; ?>
+
+
+
+
+
+
+
diff --git a/site/views/day/tmpl/default.php b/site/views/day/tmpl/default.php
index 2b0b74bd8..c2dc9242b 100644
--- a/site/views/day/tmpl/default.php
+++ b/site/views/day/tmpl/default.php
@@ -1,8 +1,8 @@
+
-settings->get('global_show_filter') || $this->settings->get('global_display')) : ?>
+settings->get('global_show_filter',1) || $this->settings->get('global_display',1)) : ?>
- settings->get('global_show_filter')) : ?>
+ settings->get('global_show_filter',1)) : ?>
- '.JText::_('COM_JEM_FILTER').' ';
- echo $this->lists['filter'].' ';
- ?>
+
- settings->get('global_display')) : ?>
+ settings->get('global_display',1)) : ?>
- '.JText::_('COM_JEM_DISPLAY_NUM').' ';
- echo $this->pagination->getLimitBox();
- ?>
+
-
-
-
-
-
-
-
+
+
+
+
-
- noevents == 1) : ?>
-
-
-
- dates, $row->times,
- $row->enddates, $row->endtimes, $this->jemsettings->showtime);
- echo JemOutput::formatSchemaOrgDateTime($row->dates, $row->times,
- $row->enddates, $row->endtimes);
- ?>
-
-
- jemsettings->showtitle == 1) && ($this->jemsettings->showdetails == 1)) : ?>
-
-
- escape($row->title) . JemOutput::recurrenceicon($row); ?>
-
-
+
+
+
+ jemsettings->showtitle == 1) : ?>
+
-
- jemsettings->showtitle == 1) && ($this->jemsettings->showdetails == 0)) : ?>
-
- escape($row->title) . JemOutput::recurrenceicon($row) . JemOutput::publishstateicon($row); ?>
-
-
-
jemsettings->showlocate == 1) : ?>
-
- venue)) :
- if (($this->jemsettings->showlinkvenue == 1) && !empty($row->venueslug)) :
- echo "".$this->escape($row->venue)." ";
- else :
- echo $this->escape($row->venue);
- endif;
- else :
- echo '-';
- endif;
- ?>
-
+
-
jemsettings->showcity == 1) : ?>
-
- city ? $this->escape($row->city) : '-'; ?>
-
+
-
jemsettings->showstate == 1) : ?>
-
- state ? $this->escape($row->state) : '-'; ?>
-
+
-
jemsettings->showcat == 1) : ?>
-
- categories, $this->jemsettings->catlinklist)); ?>
-
+
-
-
-
-
\ No newline at end of file
+
+
+
+ rows)) : ?>
+
+
+
+
+
+
+ dates, $row->times, $row->enddates, $row->endtimes, $this->jemsettings->showtime);
+ echo JemOutput::formatSchemaOrgDateTime($row->dates, $row->times, $row->enddates, $row->endtimes);
+ ?>
+
+
+ jemsettings->showtitle == 1) && ($this->jemsettings->showdetails == 1)) : ?>
+
+
+ escape($row->title) . JemOutput::recurrenceicon($row); ?>
+
+
+
+
+ jemsettings->showtitle == 1) && ($this->jemsettings->showdetails == 0)) : ?>
+
+ escape($row->title) . JemOutput::recurrenceicon($row) . JemOutput::publishstateicon($row); ?>
+
+
+
+ jemsettings->showlocate == 1) : ?>
+
+ venue)) :
+ if (($this->jemsettings->showlinkvenue == 1) && !empty($row->venueslug)) :
+ echo "".$this->escape($row->venue)." ";
+ else :
+ echo $this->escape($row->venue);
+ endif;
+ else :
+ echo '-';
+ endif;
+ ?>
+
+
+
+ jemsettings->showcity == 1) : ?>
+
+ city) ? $this->escape($row->city) : '-'; ?>
+
+
+
+ jemsettings->showstate == 1) : ?>
+
+ state) ? $this->escape($row->state) : '-'; ?>
+
+
+
+ jemsettings->showcat == 1) : ?>
+
+ categories, $this->jemsettings->catlinklist)); ?>
+
+
+
+
+
+
+
+
+
+ $this->task, 'print_link' => $this->print_link);
+ echo JemOutput::createButtonBar($this->getName(), $this->permissions, $btn_params);
+ ?>
+
+
+ params->get('show_page_heading', 1)) : ?>
+
+ escape($this->params->get('page_heading')); ?>
+
+
+
+
+
+ showdaydate)) : ?>
+
+ daydate; ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
- 'attach-remove'.$file->id.':'.JSession::getFormToken(),'class' => 'attach-remove','title'=>JText::_('COM_JEM_GLOBAL_REMOVE_ATTACHEMENT')),true); ?>
+ 'attach-remove'.$file->id.':'.JSession::getFormToken(),'class' => 'attach-remove','title'=>JText::_('COM_JEM_GLOBAL_REMOVE_ATTACHEMENT'))); ?>
diff --git a/site/views/editevent/tmpl/edit_other.php b/site/views/editevent/tmpl/edit_other.php
index 9584360be..4d701922d 100644
--- a/site/views/editevent/tmpl/edit_other.php
+++ b/site/views/editevent/tmpl/edit_other.php
@@ -1,8 +1,8 @@
input->getCmd('function', 'jSelectContact');
+?>
+
+
+
+
\ No newline at end of file
diff --git a/site/views/editevent/tmpl/responsive/chooseusers.php b/site/views/editevent/tmpl/responsive/chooseusers.php
new file mode 100644
index 000000000..befcf2d30
--- /dev/null
+++ b/site/views/editevent/tmpl/responsive/chooseusers.php
@@ -0,0 +1,147 @@
+input->getCmd('function', 'jSelectUsers');
+$checked = 0;
+
+JHtml::addIncludePath(JPATH_COMPONENT_ADMINISTRATOR.'/helpers/html');
+?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ get('show_page_heading')) : ?>
+
+ escape($params->get('page_heading')); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/site/views/editevent/tmpl/responsive/edit_extended.php b/site/views/editevent/tmpl/responsive/edit_extended.php
new file mode 100644
index 000000000..caa2ac896
--- /dev/null
+++ b/site/views/editevent/tmpl/responsive/edit_extended.php
@@ -0,0 +1,203 @@
+
+
+
+
+
+
+ form->getLabel('recurrence_type'); ?>
+ form->getInput('recurrence_type'); ?>
+
+
+
+
+ form->getLabel('recurrence_limit_date'); ?>
+ form->getInput('recurrence_limit_date'); ?>
+
+
+ jemsettings->recurrence_anticipation;
+ $limitdate = new JDate('now +' . $anticipation . 'days');
+ $limitdate = JemOutput::formatLongDateTime($limitdate->format('Y-m-d'), '');
+ echo JText::sprintf(JText::_('COM_JEM_EDITEVENT_NOTICE_GENSHIELD'), $limitdate);
+ ?>
+
+
+
+
+
+
+
+
+
+
+ form->getLabel('contactid'); ?>
+ form->getInput('contactid'); ?>
+
+
+
+
+
+
+ jemsettings->showfroregistra == 0) : ?>
+ form->getLabel('registra'); ?>
+ form->getLabel('registra'); ?>
+ form->getLabel('registra'); ?>
+ form->getInput('registra'); ?>
+
+ jemsettings->regallowinvitation == 1) : ?>
+ form->getLabel('reginvitedonly'); ?>
+ form->getInput('reginvitedonly'); ?>
+
+ form->getLabel('unregistra'); ?>
+ form->getInput('unregistra'); ?>
+ form->getInput('unregistra_until'); ?>
+ form->getLabel('maxplaces'); ?>
+ form->getInput('maxplaces'); ?> form->getLabel('waitinglist'); ?>
+ form->getInput('waitinglist'); ?>
+ jemsettings->regallowinvitation == 1) : ?>
+ form->getLabel('invited'); ?>
+ form->getInput('invited'); ?>
+
+ form->getLabel('booked'); ?>
+
+ form->getInput('booked'); ?>
+ item->maxplaces) : ?>
+ form->getLabel('avplaces'); ?>
+ form->getInput('avplaces'); ?>
+
+
+
+
\ No newline at end of file
diff --git a/site/views/editevent/tmpl/responsive/edit_other.php b/site/views/editevent/tmpl/responsive/edit_other.php
new file mode 100644
index 000000000..8e950bf46
--- /dev/null
+++ b/site/views/editevent/tmpl/responsive/edit_other.php
@@ -0,0 +1,37 @@
+settings->get('global_editevent_maxnumcustomfields', -1); // default to All
+?>
+
+
+
+
+
+ form->getFieldset('custom');
+ if ($max_custom_fields < 0) :
+ $max_custom_fields = count($fields);
+ endif;
+ $cnt = 0;
+ foreach ($fields as $field) :
+ if (++$cnt <= $max_custom_fields) :
+ ?>
+ label; ?>
+ input; ?>
+
+
+
+
\ No newline at end of file
diff --git a/site/views/editevent/tmpl/responsive/edit_publish.php b/site/views/editevent/tmpl/responsive/edit_publish.php
new file mode 100644
index 000000000..0afc0249a
--- /dev/null
+++ b/site/views/editevent/tmpl/responsive/edit_publish.php
@@ -0,0 +1,89 @@
+
+
+
+
+ form->getLabel('featured'); ?>
+ form->getInput('featured'); ?>
+ form->getLabel('published'); ?>
+ form->getInput('published'); ?>
+ form->getLabel('access'); ?>
+ access,
+ 'jform[access]',
+ array('list.attr' => ' class="inputbox" size="1"', 'list.select' => $this->item->access, 'option.attr' => 'disabled', 'id' => 'access')
+ );
+ ?>
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/site/views/editevent/tmpl/responsive/index.html b/site/views/editevent/tmpl/responsive/index.html
new file mode 100644
index 000000000..2efb97f31
--- /dev/null
+++ b/site/views/editevent/tmpl/responsive/index.html
@@ -0,0 +1 @@
+
- 'attach-remove'.$file->id.':'.JSession::getFormToken(),'class' => 'attach-remove','title'=>JText::_('COM_JEM_GLOBAL_REMOVE_ATTACHEMENT')),true); ?>
+ 'attach-remove'.$file->id.':'.JSession::getFormToken(),'class' => 'attach-remove','title'=>JText::_('COM_JEM_GLOBAL_REMOVE_ATTACHEMENT'))); ?>
diff --git a/site/views/editvenue/tmpl/responsive/edit.php b/site/views/editvenue/tmpl/responsive/edit.php
new file mode 100644
index 000000000..ede5de1a0
--- /dev/null
+++ b/site/views/editvenue/tmpl/responsive/edit.php
@@ -0,0 +1,351 @@
+item->params;
+//$settings = json_decode($this->item->attribs);
+
+$options = array(
+ 'onActive' => 'function(title, description){
+ description.setStyle("display", "block");
+ title.addClass("open").removeClass("closed");
+ }',
+ 'onBackground' => 'function(title, description){
+ description.setStyle("display", "none");
+ title.addClass("closed").removeClass("open");
+ }',
+ 'startOffset' => 0, // 0 starts on the first tab, 1 starts the second, etc...
+ 'useCookie' => true, // this must not be a string. Don't use quotes.
+);
+
+# defining values for centering default-map
+$location = JemHelper::defineCenterMap($this->form);
+?>
+
+
+
+
+
+
+ get('show_page_heading')) : ?>
+
+ escape($params->get('page_heading')); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/site/views/editvenue/tmpl/responsive/edit_extended.php b/site/views/editvenue/tmpl/responsive/edit_extended.php
new file mode 100644
index 000000000..572c2c115
--- /dev/null
+++ b/site/views/editvenue/tmpl/responsive/edit_extended.php
@@ -0,0 +1,51 @@
+
+
+
+
+item->locimage || $this->jemsettings->imageenabled != 0) : ?>
+
+
+ form->getLabel('userfile'); ?>
+ item->locimage) : ?>
+
+ item, $this->limage, 'venue', 'locimage'); ?>
+
+
+
+ form->getInput('userfile'); ?>
+
+ 'userfile-remove', 'data-id' => $this->item->id, 'data-type' => 'venues', 'title' => JText::_('COM_JEM_REMOVE_IMAGE'), 'class' =>'btn')); ?>
+
+
+
+
+
+
+
+
+
+ form->getLabel('url'); ?>
+ form->getInput('url'); ?>
+
+
+
\ No newline at end of file
diff --git a/site/views/editvenue/tmpl/responsive/edit_other.php b/site/views/editvenue/tmpl/responsive/edit_other.php
new file mode 100644
index 000000000..08e61bcc4
--- /dev/null
+++ b/site/views/editvenue/tmpl/responsive/edit_other.php
@@ -0,0 +1,37 @@
+settings->get('global_editvenue_maxnumcustomfields', -1); // default to All
+?>
+
+
+
+
+
+ form->getFieldset('custom');
+ if ($max_custom_fields < 0) :
+ $max_custom_fields = count($fields);
+ endif;
+ $cnt = 0;
+ foreach ($fields as $field) :
+ if (++$cnt <= $max_custom_fields) :
+ ?>
+ label; ?>
+ input; ?>
+
+
+
+
\ No newline at end of file
diff --git a/site/views/editvenue/tmpl/responsive/edit_publish.php b/site/views/editvenue/tmpl/responsive/edit_publish.php
new file mode 100644
index 000000000..5b8f9cc44
--- /dev/null
+++ b/site/views/editvenue/tmpl/responsive/edit_publish.php
@@ -0,0 +1,34 @@
+settings->get('global_editvenue_maxnumcustomfields', -1); // default to All
+?>
+
+
+
+ form->getLabel('published'); ?>
+ form->getInput('published'); ?>
+
+
+
+
+
+
+ form->getFieldset('meta') as $field) : ?>
+
+ label; ?>
+ input; ?>
+
+
+
\ No newline at end of file
diff --git a/site/views/editvenue/tmpl/responsive/index.html b/site/views/editvenue/tmpl/responsive/index.html
new file mode 100644
index 000000000..2efb97f31
--- /dev/null
+++ b/site/views/editvenue/tmpl/responsive/index.html
@@ -0,0 +1 @@
+
+
+
+
+
+
+ $this->item->slug, 'print_link' => $this->print_link);
+ echo JemOutput::createButtonBar($this->getName(), $this->permissions, $btn_params);
+ ?>
+
+
+ params->get('show_page_heading', 1)) : ?>
+
+ escape($this->params->get('page_heading')).' '.JemOutput::editbutton($this->item, $params, $attribs, $this->permissions->canEditEvent, 'editevent').' '.JemOutput::copybutton($this->item, $params, $attribs, $this->permissions->canAddEvent, 'editevent');
+ ?>
+
+
+
+
+
+
+
+
+ get('event_show_detailstitle',1)) : ?>
+ :
+ escape($this->item->title); ?>
+
+ :
+
+ item->dates, $this->item->times,$this->item->enddates, $this->item->endtimes);
+ echo JemOutput::formatSchemaOrgDateTime($this->item->dates, $this->item->times,$this->item->enddates, $this->item->endtimes);
+ ?>
+
+ item->locid != 0) : ?>
+ :
+ get('event_show_detlinkvenue') == 1) && (!empty($this->item->url))) :
+ ?>escape($this->item->venue); ?> get('event_show_detlinkvenue') == 2) && (!empty($this->item->venueslug))) :
+ ?>item->venue; ?> get('event_show_detlinkvenue') == 0)*/ :
+ echo $this->escape($this->item->venue);
+ endif;
+
+ # will show "venue" or "venue - city" or "venue - city, state" or "venue, state"
+ $city = $this->escape($this->item->city);
+ $state = $this->escape($this->item->state);
+ if ($city) { echo ' - ' . $city; }
+ if ($state) { echo ', ' . $state; }
+ ?>
+
+ categories) ? count($this->categories) : 0;
+ ?>
+
+
+ :
+
+
+ categories as $category) :
+ ?>escape($category->catname); ?>
+
+
+ item->{'custom'.$cr};
+ if (preg_match('%^http(s)?://%', $currentRow)) {
+ $currentRow = ''.$this->escape($currentRow).' ';
+ }
+ if ($currentRow) {
+ ?>
+ :
+ :
+ item->hits); ?>
+
+
+
+
+ get('event_show_author') && !empty($this->item->author)) : ?>
+ :
+
+ item->created_by_alias ? $this->item->created_by_alias : $this->item->author; ?>
+ item->contactid2) && $params->get('event_link_author') == true) :
+ $needle = 'index.php?option=com_contact&view=contact&id=' . $this->item->contactid2;
+ $menu = JFactory::getApplication()->getMenu();
+ $item = $menu->getItems('link', $needle, true);
+ $cntlink = !empty($item) ? $needle . '&Itemid=' . $item->id : $needle;
+ echo JText::sprintf('COM_JEM_EVENT_CREATED_BY', JHtml::_('link', JRoute::_($cntlink), $author));
+ else :
+ echo JText::sprintf('COM_JEM_EVENT_CREATED_BY', $author);
+ endif;
+ ?>
+
+
+
+
+ showeventstate) && isset($this->item->published)) : ?>
+ :
+
+ item->published) {
+ case 1: echo JText::_('JPUBLISHED'); break;
+ case 0: echo JText::_('JUNPUBLISHED'); break;
+ case 2: echo JText::_('JARCHIVED'); break;
+ case -2: echo JText::_('JTRASHED'); break;
+ } ?>
+
+
+
+
+
+
+ item, $this->dimage, 'event'); ?>
+
+
+
+
+ get('event_show_description','1') && ($this->item->fulltext != '' && $this->item->fulltext != '
' || $this->item->introtext != '' && $this->item->introtext != '
')) { ?>
+
+
+
+
+
+ get('event_show_contact') && !empty($this->item->conid )) : ?>
+
+
+
+
+ :
+
+ item->conname;
+ if ($params->get('event_link_contact') == true) :
+ $needle = 'index.php?option=com_contact&view=contact&id=' . $this->item->conid;
+ $menu = JFactory::getApplication()->getMenu();
+ $item = $menu->getItems('link', $needle, true);
+ $cntlink2 = !empty($item) ? $needle . '&Itemid=' . $item->id : $needle;
+ echo JText::sprintf('COM_JEM_EVENT_CONTACT', JHtml::_('link', JRoute::_($cntlink2), $contact));
+ else :
+ echo JText::sprintf('COM_JEM_EVENT_CONTACT', $contact);
+ endif;
+ ?>
+
+
+ item->contelephone) : ?>
+ :
+
+ escape($this->item->contelephone); ?>
+
+
+
+
+
+ attachments = $this->item->attachments; ?>
+ loadTemplate('attachments'); ?>
+
+
+ item->locid != 0) && !empty($this->item->venue)) : ?>
+
+
+
+
+
+ item ? $this->item->id : 0 ; ?>
+
+ item, $params, $attribs, $this->permissions->canEditVenue, 'editvenue').' '.JemOutput::copybutton($this->item, $params, $attribs, $this->permissions->canAddVenue, 'editvenue');
+ ?>
+
+
+
+ get('event_show_detailsadress', '1')) : ?>
+
+
+ :
+
+ get('event_show_detlinkvenue') == 1) && (!empty($this->item->url))) :
+ echo '' . $this->escape($this->item->venue) . ' ';
+ elseif (($params->get('event_show_detlinkvenue') == 2) && (!empty($this->item->venueslug))) :
+ echo '' . $this->escape($this->item->venue) . ' ';
+ else/*if ($params->get('event_show_detlinkvenue') == 0)*/ :
+ echo $this->escape($this->item->venue);
+ endif;
+ ?>
+
+ item->street) : ?>
+ :
+
+ escape($this->item->street); ?>
+
+
+
+ item->postalCode) : ?>
+ :
+
+ escape($this->item->postalCode); ?>
+
+
+
+ item->city) : ?>
+ :
+
+ escape($this->item->city); ?>
+
+
+
+ item->state) : ?>
+ :
+
+ escape($this->item->state); ?>
+
+
+
+ item->country) : ?>
+ :
+
+ item->countryimg ? $this->item->countryimg : $this->item->country; ?>
+
+
+
+
+ showvenuestate) && isset($this->item->locpublished)) : ?>
+ :
+
+ item->locpublished) {
+ case 1: echo JText::_('JPUBLISHED'); break;
+ case 0: echo JText::_('JUNPUBLISHED'); break;
+ case 2: echo JText::_('JARCHIVED'); break;
+ case -2: echo JText::_('JTRASHED'); break;
+ } ?>
+
+
+
+ item->{'venue'.$cr};
+ if (preg_match('%^http(s)?://%', $currentRow)) {
+ $currentRow = '' . $this->escape($currentRow) . ' ';
+ }
+ if ($currentRow) {
+ ?>
+ :
+
+
+
+
+ item, $this->limage, 'venue'); ?>
+
+ get('event_show_detailsadress', '1') == 0 ?>
+
+
+
+ item, $this->limage, 'venue'); ?>
+
+
+
+
+ get('event_show_mapserv');
+ if ($event_show_mapserv == 2 || $event_show_mapserv == 3) : ?>
+
+
+ item, 'event', $params); ?>
+
+
+
+
+
+
+ get('event_show_locdescription', '1') && $this->item->locdescription != ''
+ && $this->item->locdescription != '
') : ?>
+
+
+ item->locdescription; ?>
+
+
+
+ attachments = $this->item->vattachments; ?>
+ loadTemplate('attachments'); ?>
+
+
+
+
+
+ showAttendees) : ?>
+
+
+ loadTemplate('attendees'); ?>
+
+
+ item->pluginevent->onEventEnd)) : ?>
+
+ item->pluginevent->onEventEnd; ?>
+
+
+
+
+
+
+
+ item->maxplaces; ?>
+ item->booked; ?>
+ 0) : ?>
+ :
+ :
+
+ permissions->canEditAttendees)) : ?>
+
+
+ item->booked; ?>
+
+
+
+ 0) : ?>
+ :
+ :
+
+
+ settings->get('event_comunsolution', '0') == 1) :
+ if ($this->settings->get('event_comunoption', '0') == 1) :
+ //$cparams = JComponentHelper::getParams('com_media');
+ //$imgpath = $cparams->get('image_path'); // mostly 'images'
+ $imgpath = 'images'; // CB does NOT respect path set in Media Manager, so we have to ignore this too
+ if (JFile::exists(JPATH_ROOT . '/components/com_comprofiler/plugin/templates/default/images/avatar/tnnophoto_n.png')) {
+ $noimg = 'components/com_comprofiler/plugin/templates/default/images/avatar/tnnophoto_n.png';
+ } elseif (JFile::exists(JPATH_ROOT . '/components/com_comprofiler/images/english/tnnophoto.jpg')) {
+ $noimg = 'components/com_comprofiler/images/english/tnnophoto.jpg';
+ } else {
+ $noimg = '';
+ }
+ endif;
+ endif;
+
+ if(!function_exists("jem_getStatusIcon")) {
+ if ($this->settings->get('event_show_more_attendeedetails', '0')) {
+ function jem_getStatusIcon($status) {
+ switch($status) {
+ case 2: // waiting list
+ return ' ' . jem_getStatusIcon($register->status);
+ $text = '';
+ // is a plugin catching this ?
+ if ($res = $this->dispatcher->trigger('onAttendeeDisplay', array($register->uid, &$text))) :
+ echo $text;
+ endif;
+ // if CB
+ if ($this->settings->get('event_comunsolution', '0') == 1) :
+ if ($this->settings->get('event_comunoption', '0') == 1) :
+ // User has avatar
+ if (!empty($register->avatar)) :
+ if (JFile::exists(JPATH_ROOT . '/' . $imgpath . '/comprofiler/tn' . $register->avatar)) {
+ $useravatar = JHtml::image($imgpath . '/comprofiler/tn' . $register->avatar, $register->name);
+ } elseif (JFile::exists(JPATH_ROOT . '/' . $imgpath . '/comprofiler/' . $register->avatar)) {
+ $useravatar = JHtml::image($imgpath . '/comprofiler/' . $register->avatar, $register->name);
+ } else {
+ $useravatar = empty($noimg) ? '' : JHtml::image($noimg, $register->name);
+ }
+ echo '' . $useravatar . ' ' . $register->name . ' ';
+
+ // User has no avatar
+ else :
+ $nouseravatar = empty($noimg) ? '' : JHtml::image($noimg, $register->name);
+ echo '' . $nouseravatar . ' ' . $register->name . ' ';
+ endif;
+ else :
+ // only show the username with link to profile
+ echo '' . $register->name . ' ' . $register->name . ' ';
+ endif;
+
+ echo ' ';
+ // end loop through attendees
+ endforeach;
+ ?>
+
+
+
+
+
+ print == 0) : ?>
+
+ :
+
+ item->published != 1) {
+ echo JText::_('COM_JEM_WRONG_STATE_FOR_REGISTER');
+ } elseif (!$this->showRegForm) {
+ echo JText::_('COM_JEM_NOT_ALLOWED_TO_REGISTER');
+ } else {
+ switch ($this->formhandler) {
+ case 0:
+ echo JText::_('COM_JEM_TOO_LATE_UNREGISTER');
+ break;
+ case 1:
+ echo JText::_('COM_JEM_TOO_LATE_REGISTER');
+ break;
+ case 2:
+ echo JText::_('COM_JEM_LOGIN_FOR_REGISTER');
+ break;
+ case 3:
+ case 4:
+ echo $this->loadTemplate('regform');
+ break;
+ }
+ }
+ ?>
+
+
+
+
-
+ JYES
+ JNO
+
+ JYES
JNO
- COM_JEM_SHOW_OPENDATES_TOO
COM_JEM_SHOW_OPENDATES_ONLY
-
+
+
+ $this->task, 'print_link' => $this->print_link);
+ $btn_params = array('task' => $this->task, 'print_link' => JRoute::_('index.php?option=com_jem&view=eventslist&layout=print&task=print&tmpl=component&print=1'));
+
+ echo JemOutput::createButtonBar($this->getName(), $this->permissions, $btn_params);
+ ?>
+
+
+ params->get('show_page_heading', 1)) : ?>
+
+ escape($this->params->get('page_heading')); ?>
+
+
+
+
+
+ params->get('showintrotext')) : ?>
+
+ params->get('introtext'); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+ params->get('showfootertext')) : ?>
+
+ params->get('footertext'); ?>
+
+
+
+
+
+
+
+
+
+
+
+ '.JText::_('COM_JEM_DISPLAY_NUM').' ';
+ //echo ''.JText::_('COM_JEM_DISPLAY_NUM').' ';
+ echo $this->attending_pagination->getLimitBox();
+ ?>
+
+
+
+
\ No newline at end of file
diff --git a/site/views/myattendances/tmpl/responsive/index.html b/site/views/myattendances/tmpl/responsive/index.html
new file mode 100644
index 000000000..2efb97f31
--- /dev/null
+++ b/site/views/myattendances/tmpl/responsive/index.html
@@ -0,0 +1 @@
+
+
+
+
+
+
+
+
+ '.JText::_('COM_JEM_DISPLAY_NUM').' ';
+ //echo ''.JText::_('COM_JEM_DISPLAY_NUM').' ';
+ echo $this->events_pagination->getLimitBox();
+ ?>
+
+
+
+
\ No newline at end of file
diff --git a/site/views/myevents/tmpl/responsive/index.html b/site/views/myevents/tmpl/responsive/index.html
new file mode 100644
index 000000000..2efb97f31
--- /dev/null
+++ b/site/views/myevents/tmpl/responsive/index.html
@@ -0,0 +1 @@
+
+
+ $this->task, 'print_link' => $this->print_link);
+ echo JemOutput::createButtonBar($this->getName(), $this->permissions, $btn_params);
+ ?>
+
+
+ params->get('show_page_heading', 1)) : ?>
+
+ escape($this->params->get('page_heading')); ?>
+
+
+
+
+ loadTemplate('venues');?>
+
+
+
+
+
+
+ '.JText::_('COM_JEM_DISPLAY_NUM').'';
+ //echo ''.JText::_('COM_JEM_DISPLAY_NUM').' ';
+ echo $this->venues_pagination->getLimitBox();
+ ?>
+
+
+
+
\ No newline at end of file
diff --git a/site/views/myvenues/tmpl/responsive/index.html b/site/views/myvenues/tmpl/responsive/index.html
new file mode 100644
index 000000000..2efb97f31
--- /dev/null
+++ b/site/views/myvenues/tmpl/responsive/index.html
@@ -0,0 +1 @@
+
+
+
+
+
+
+ lists['filter_types']; ?>
+
+
+
+
+
+
+
+ lists['categories']; ?>
+
+
+
+
+
+
+
+
lists['date_from'];?>
+
lists['date_to'];?>
+
+
+
+
+
+
+
+ lists['continents'];?>
+
+
+
+ filter_continent): ?>
+
+
+
+
+ lists['countries'];?>
+
+
+
+
+ filter_continent && $this->filter_country): ?>
+
+
+
+
+ lists['cities'];?>
+
+
+
+
+
+
+
+ settings->get('global_display',1)) : ?>
+
+
+
+
+
+
+ rows)) : ?>
+
+
+ rows as $row) : ?>
+ featured)) : ?>
+
+
+
+
+
+
+ dates, $row->times, $row->enddates, $row->endtimes, $this->jemsettings->showtime);
+ echo JemOutput::formatSchemaOrgDateTime($row->dates, $row->times, $row->enddates, $row->endtimes);
+ ?>
+
+
+
+
+ jemsettings->showeventimage == 1) && !empty($row->datimage)) : ?>
+
+ datimage, 'event'), 'event'); ?>
+
+
+ jemsettings->showdetails == 1) : ?>
+
+
+
+ escape($row->title) . JemOutput::recurrenceicon($row) . JemOutput::publishstateicon($row); ?>
+
+
+
+
+
+
+
+ jemsettings->showlocate == 1) {
+ if (!empty($row->venue)) {
+ if (($this->jemsettings->showlinkvenue == 1) && !empty($row->venueslug)) {
+ $venue[] = "
".$this->escape($row->venue)." ";
+ } else {
+ $venue[] = $this->escape($row->venue);
+ }
+ } else {
+ $venue[] = '-';
+ }
+ }
+ // if no city skip if also no state, else add hyphen
+ if (($this->jemsettings->showcity == 1) && (!empty($row->city) || !empty($row->state))) {
+ $venue[] = !empty($row->city) ? $this->escape($row->city) : '-';
+ }
+ if (($this->jemsettings->showstate == 1) && !empty($row->state)) {
+ $venue[] = $this->escape($row->state);
+ }
+ echo implode(', ', $venue);
+ ?>
+
+
+
+
+
+ categories, $this->jemsettings->catlinklist)); ?>
+
+
+
+
+
+
+
diff --git a/site/views/search/tmpl/default.php b/site/views/search/tmpl/default.php
index 7fc198c1d..0e741363a 100644
--- a/site/views/search/tmpl/default.php
+++ b/site/views/search/tmpl/default.php
@@ -1,8 +1,8 @@
+
@@ -27,7 +29,7 @@ function tableOrdering(order, dir, view)
- lists['filter_types']; ?>
+ lists['filter_types']; ?>
- '.JText::_('COM_JEM_DISPLAY_NUM').' ';
- echo $this->pagination->getLimitBox();
- ?>
+
-
-
-
-
-
-
-
+
+
+
+
- noevents == 1) : ?>
-
-
- dates, $row->times,
- $row->enddates, $row->endtimes, $this->jemsettings->showtime);
- echo JemOutput::formatSchemaOrgDateTime($row->dates, $row->times,
- $row->enddates, $row->endtimes);
- ?>
-
-
- jemsettings->showtitle == 1) && ($this->jemsettings->showdetails == 1)) : ?>
-
-
- escape($row->title) . JemOutput::recurrenceicon($row); ?>
-
-
-
+
- jemsettings->showtitle == 1) && ($this->jemsettings->showdetails == 0)) : ?>
-
- escape($row->title) . JemOutput::recurrenceicon($row); ?>
-
+
+
+
+ jemsettings->showtitle == 1) : ?>
+
-
jemsettings->showlocate == 1) : ?>
-
- venue)) :
- if (($this->jemsettings->showlinkvenue == 1) && !empty($row->venueslug)) :
- echo "".$this->escape($row->venue)." ";
- else :
- echo $this->escape($row->venue);
- endif;
- else :
- echo '-';
- endif;
- ?>
-
+
-
jemsettings->showcity == 1) : ?>
-
- city) ? $this->escape($row->city) : '-'; ?>
-
+
-
jemsettings->showstate == 1) : ?>
-
- state) ? $this->escape($row->state) : '-'; ?>
-
+
-
jemsettings->showcat == 1) : ?>
-
- categories, $this->jemsettings->catlinklist)); ?>
-
+
-
-
-
-
\ No newline at end of file
+
+
+
+ rows)) : ?>
+
+
+
+
+
+
+ dates, $row->times, $row->enddates, $row->endtimes, $this->jemsettings->showtime);
+ echo JemOutput::formatSchemaOrgDateTime($row->dates, $row->times, $row->enddates, $row->endtimes);
+ ?>
+
+
+ jemsettings->showtitle == 1) && ($this->jemsettings->showdetails == 1)) : ?>
+
+
+ escape($row->title) . JemOutput::recurrenceicon($row); ?>
+
+
+
+
+ jemsettings->showtitle == 1) && ($this->jemsettings->showdetails == 0)) : ?>
+
+ escape($row->title) . JemOutput::recurrenceicon($row) . JemOutput::publishstateicon($row); ?>
+
+
+
+ jemsettings->showlocate == 1) : ?>
+
+ venue)) :
+ if (($this->jemsettings->showlinkvenue == 1) && !empty($row->venueslug)) :
+ echo "".$this->escape($row->venue)." ";
+ else :
+ echo $this->escape($row->venue);
+ endif;
+ else :
+ echo '-';
+ endif;
+ ?>
+
+
+
+ jemsettings->showcity == 1) : ?>
+
+ city) ? $this->escape($row->city) : '-'; ?>
+
+
+
+ jemsettings->showstate == 1) : ?>
+
+ state) ? $this->escape($row->state) : '-'; ?>
+
+
+
+ jemsettings->showcat == 1) : ?>
+
+ categories, $this->jemsettings->catlinklist)); ?>
+
+
+
+
+
+
+
+
diff --git a/site/views/search/tmpl/responsive/default.php b/site/views/search/tmpl/responsive/default.php
new file mode 100644
index 000000000..41b926ab5
--- /dev/null
+++ b/site/views/search/tmpl/responsive/default.php
@@ -0,0 +1,56 @@
+
+
+
+ params->get('show_page_heading', 1)) : ?>
+
+ escape($this->params->get('page_heading')); ?>
+
+
+
+
+
+ params->get('showintrotext')) : ?>
+
+ params->get('introtext'); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ lists['filter_types'].' '; ?>
+
+
+ '.JText::_('COM_JEM_CATEGORY').''; ?>
+
+
+ lists['categories']; ?>
+
+
+ '.JText::_('COM_JEM_SEARCH_DATE').''; ?>
+
+
+ lists['date_from'];?>
+ lists['date_to'];?>
+
+
+ '.JText::_('COM_JEM_CONTINENT').''; ?>
+
+
+ lists['continents'];?>
+
+ filter_continent): ?>
+
+ '.JText::_('COM_JEM_COUNTRY').''; ?>
+
+
+ lists['countries'];?>
+
+
+ filter_continent && $this->filter_country): ?>
+
+ '.JText::_('COM_JEM_CITY').'';?>
+
+
+ lists['cities'];?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ jemsettings->showlocate == 1) : ?>
+
+
+ jemsettings->showcity == 1) : ?>
+
+
+ jemsettings->showstate == 1) : ?>
+
+
+ jemsettings->showcat == 1) : ?>
+
+
+ jemsettings->showatte == 1) : ?>
+
+
+
+
+ settings->get('global_display',1)) : ?>
+
+ '.JText::_('COM_JEM_DISPLAY_NUM').' ';
+ echo $this->pagination->getLimitBox();
+ ?>
+
+
+
+
+
+
+ lists['filter_types']; ?>
+
+
+ '.JText::_('COM_JEM_CATEGORY').''; ?>
+
+
+ lists['categories']; ?>
+
+
+ '.JText::_('COM_JEM_SEARCH_DATE').''; ?>
+
+
+ lists['date_from'];?>
+ lists['date_to'];?>
+
+
+ '.JText::_('COM_JEM_CONTINENT').''; ?>
+
+
+ lists['continents'];?>
+
+ filter_continent): ?>
+
+ '.JText::_('COM_JEM_COUNTRY').''; ?>
+
+
+ lists['countries'];?>
+
+
+ filter_continent && $this->filter_country): ?>
+
+ '.JText::_('COM_JEM_CITY').'';?>
+
+
+ lists['cities'];?>
+
+
+
+
+
+
+
+
+
+
+ jemsettings->showtitle == 1) : ?>
+
+
+ jemsettings->showlocate == 1) : ?>
+
+
+ jemsettings->showcity == 1) : ?>
+
+
+ jemsettings->showstate == 1) : ?>
+
+
+ jemsettings->showcat == 1) : ?>
+
+
+
+
+ noevents == 1) : ?>
+ jemsettings->showdetails == 1 && (!$isSafari)) : echo 'onclick=location.href="'.JRoute::_(JemHelperRoute::getEventRoute($row->slug)).'"'; endif; ?> >
+
+ jemsettings->showdetails == 1 && (!$isSafari)) : echo 'onclick=location.href="'.JRoute::_(JemHelperRoute::getEventRoute($row->slug)).'"'; endif; ?> >
+
+
+
+
+
+ jemsettings->showtitle == 1) : ?>
+
+
+
+ jemsettings->showlocate == 1) : ?>
+ venue)) : ?>
+
+
+
+
+
+
+
+
+ jemsettings->showcity == 1) : ?>
+ city)) : ?>
+
+
+
+
+
+
+
+ jemsettings->showstate == 1) : ?>
+ state)) : ?>
+
+
+
+
+
+
+
+ jemsettings->showcat == 1) : ?>
+ categories, $this->jemsettings->catlinklist))); ?>">
+
+
+
+
+ locid)) : ?>
+
+
+
+
+
+
+
+settings->get('global_display',1)) : ?>
+
+ '.JText::_('COM_JEM_DISPLAY_NUM').' ';
+ //echo ''.JText::_('COM_JEM_DISPLAY_NUM').' ';
+ echo $this->pagination->getLimitBox();
+ ?>
+
+
\ No newline at end of file
diff --git a/site/views/search/tmpl/responsive/default_table.php b/site/views/search/tmpl/responsive/default_table.php
new file mode 100644
index 000000000..c9c81b9bb
--- /dev/null
+++ b/site/views/search/tmpl/responsive/default_table.php
@@ -0,0 +1,19 @@
+
+
+jemsettings->tablewidth)) :
+ echo $this->loadTemplate('jem_eventslist'); // The new layout
+else :
+ echo $this->loadTemplate('jem_eventslist_small'); // Similar to the old table-layout
+endif;
+?>
\ No newline at end of file
diff --git a/site/views/search/view.html.php b/site/views/search/view.html.php
index 18b35f608..676dfb4e5 100644
--- a/site/views/search/view.html.php
+++ b/site/views/search/view.html.php
@@ -1,15 +1,13 @@
def('page_title', $menuitem ? $menuitem->title : JText::_('COM_JEM_SEARCH'));
$pageheading = $params->def('page_heading', $pagetitle);
- $pathway->setItemName(1, $menuitem->title);
+ $pathwayKeys = array_keys($pathway->getPathway());
+ $lastPathwayEntryIndex = end($pathwayKeys);
+ $pathway->setItemName($lastPathwayEntryIndex, $menuitem->title);
+ //$pathway->setItemName(1, $menuitem->title);
} else {
$pagetitle = JText::_('COM_JEM_SEARCH');
$pageheading = $pagetitle;
diff --git a/site/views/venue/tmpl/default.php b/site/views/venue/tmpl/default.php
index 40b8c98f8..2c8ed7ad3 100644
--- a/site/views/venue/tmpl/default.php
+++ b/site/views/venue/tmpl/default.php
@@ -1,13 +1,14 @@
