Permalink
Browse files

Small fixes 4.7.1

  • Loading branch information...
Theophilix
Theophilix committed Sep 8, 2018
1 parent f34bb2a commit f6aa96e935009515f39956e9293decb7a75672aa
View
@@ -71,6 +71,16 @@ Please post all feature requests in the issues tab.
## II Version history
**For version 4.7:**
[0] General:
- bugfix: differing page titles: https://github.com/Theophilix/event-table-edit/issues/121
[2]Appointment mode
- bugfix: Appointment tables: Bug with time / leading zero: https://github.com/Theophilix/event-table-edit/issues/120
**For version 4.7:**
[1] Normal Mode
@@ -146,7 +146,7 @@ COM_EVENTTABLEEDIT_CELLBREAK_DESC="Enter a number of characters, that should be
; Dropdowns
COM_EVENTTABLEEDIT_ERROR_ENTER_NAME="Please enter a name for the dropdown field."
COM_EVENTTABLEEDIT_ERROR_SAME_NAME="Dropdown fields must not have the same name. Please enter another name."
COM_EVENTTABLEEDIT_MANAGER_DROPDOWN="Dropdown dield"
COM_EVENTTABLEEDIT_MANAGER_DROPDOWN="Dropdown field"
COM_EVENTTABLEEDIT_NEW_DROPDOWN="New dropdown"
COM_EVENTTABLEEDIT_EDIT_DROPDOWN="Edit dropdown"
COM_EVENTTABLEEDIT_DELETE="Delete"
@@ -42,8 +42,10 @@ protected function addToolbar() {
$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $userId);
$canDo = eteHelper::getActions($this->state->get('filter'));
JToolBarHelper::title(JText::_('COM_EVENTTABLEEDIT_MANAGER_APPOINTMENTTABLE'), 'appointmenttable');
//JToolBarHelper::title(JText::_('COM_EVENTTABLEEDIT_MANAGER_APPOINTMENTTABLE'), 'appointmenttable');
$xml = JFactory::getXML(JPATH_COMPONENT_ADMINISTRATOR .'/eventtableedit.xml');
$currentversion = (string)$xml->version;
JToolBarHelper::title( JText::_( 'Event Table Edit '.$currentversion ) . ' - ' . JText::_( 'COM_EVENTTABLEEDIT_MANAGER_APPOINTMENTTABLE' ), 'etetables' );
// Built the actions for new and existing records.
if ($isNew) {
// For new records, check the create permission.
@@ -57,7 +57,7 @@ protected function addToolbar() {
$xml = JFactory::getXML(JPATH_COMPONENT_ADMINISTRATOR .'/eventtableedit.xml');
$currentversion = (string)$xml->version;
JToolBarHelper::title( JText::_( 'Event Table Edit (version: '.$currentversion.')' ), 'etetables' );
JToolBarHelper::title( JText::_( 'Event Table Edit '.$currentversion ) . ' - ' . JText::_( 'COM_EVENTTABLEEDIT_SUBMENU_APPOINTMENTTABLES' ), 'etetables' );
if ($canDo->get('core.create')) {
JToolBarHelper::addNew('appointmenttable.add','JTOOLBAR_NEW');
@@ -67,17 +67,21 @@ function display($tpl = null) {
}
protected function addDefaultToolbar() {
JToolBarHelper::title(JText::_('COM_EVENTTABLEEDIT_MANAGER_CSVEXPORT'), 'export');
//JToolBarHelper::title(JText::_('COM_EVENTTABLEEDIT_MANAGER_CSVEXPORT'), 'export');
$xml = JFactory::getXML(JPATH_COMPONENT_ADMINISTRATOR .'/eventtableedit.xml');
$currentversion = (string)$xml->version;
JToolBarHelper::title( JText::_( 'Event Table Edit '.$currentversion ) . ' - ' . JText::_( 'COM_EVENTTABLEEDIT_MANAGER_CSVEXPORT' ), 'etetables' );
JToolBarHelper::custom('csvexport.export', 'apply.png', '', 'COM_EVENTTABLEEDIT_EXPORT', false);
}
/**
* The Toolbar for showing the summary of the export
*/
protected function addSummaryToolbar() {
JToolBarHelper::title(JText::_('COM_EVENTTABLEEDIT_EXPORT_SUMMARY'), 'export');
//JToolBarHelper::title(JText::_('COM_EVENTTABLEEDIT_EXPORT_SUMMARY'), 'export');
$xml = JFactory::getXML(JPATH_COMPONENT_ADMINISTRATOR .'/eventtableedit.xml');
$currentversion = (string)$xml->version;
JToolBarHelper::title( JText::_( 'Event Table Edit '.$currentversion ) . ' - ' . JText::_( 'COM_EVENTTABLEEDIT_EXPORT_SUMMARY' ), 'etetables' );
JToolBarHelper::custom('csvexport.cancel', 'apply.png', '', 'COM_EVENTTABLEEDIT_OK', false);
JToolBarHelper::custom('csvexport.download', 'apply.png', '', 'COM_EVENTTABLEEDIT_DOWNLOAD_FILE', false);
@@ -126,8 +126,10 @@ public function createTableSelectList1() {
protected function addDefaultToolbar() {
$canDo = eteHelper::getActions();
JToolBarHelper::title(JText::_('COM_EVENTTABLEEDIT_MANAGER_CSVIMPORT'), 'import');
//JToolBarHelper::title(JText::_('COM_EVENTTABLEEDIT_MANAGER_CSVIMPORT'), 'import');
$xml = JFactory::getXML(JPATH_COMPONENT_ADMINISTRATOR .'/eventtableedit.xml');
$currentversion = (string)$xml->version;
JToolBarHelper::title( JText::_( 'Event Table Edit '.$currentversion ) . ' - ' . JText::_( 'COM_EVENTTABLEEDIT_MANAGER_CSVIMPORT' ), 'etetables' );
// For uploading, check the create permission.
if ($canDo->get('core.csv')) {
JToolBarHelper::custom('csvimport.upload', 'upload.png', '', 'COM_EVENTTABLEEDIT_UPLOAD', true);
@@ -140,8 +142,12 @@ protected function addDefaultToolbar() {
protected function addNewTableToolbar() {
$canDo = eteHelper::getActions();
JToolBarHelper::title(JText::_('COM_EVENTTABLEEDIT_IMPORT_NEW_TABLE'), 'import');
//JToolBarHelper::title(JText::_('COM_EVENTTABLEEDIT_IMPORT_NEW_TABLE'), 'import');
$xml = JFactory::getXML(JPATH_COMPONENT_ADMINISTRATOR .'/eventtableedit.xml');
$currentversion = (string)$xml->version;
JToolBarHelper::title( JText::_( 'Event Table Edit '.$currentversion ) . ' - ' . JText::_( 'COM_EVENTTABLEEDIT_IMPORT_NEW_TABLE' ), 'etetables' );
// For uploading, check the create permission.
if ($canDo->get('core.csv')) {
JToolBarHelper::custom('csvimport.newTable', 'apply.png', '', 'JTOOLBAR_APPLY', false);
@@ -153,8 +159,10 @@ protected function addNewTableToolbar() {
* The Toolbar for showing the summary of the import
*/
protected function addSummaryToolbar() {
JToolBarHelper::title(JText::_('COM_EVENTTABLEEDIT_IMPORT_SUMMARY'), 'import');
//JToolBarHelper::title(JText::_('COM_EVENTTABLEEDIT_IMPORT_SUMMARY'), 'import');
$xml = JFactory::getXML(JPATH_COMPONENT_ADMINISTRATOR .'/eventtableedit.xml');
$currentversion = (string)$xml->version;
JToolBarHelper::title( JText::_( 'Event Table Edit '.$currentversion ) . ' - ' . JText::_( 'COM_EVENTTABLEEDIT_IMPORT_SUMMARY' ), 'etetables' );
JToolBarHelper::custom('csvimport.cancel', 'apply.png', '', 'COM_EVENTTABLEEDIT_OK', false);
}
}
@@ -63,8 +63,10 @@ protected function addToolbar() {
$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $userId);
$canDo = eteHelper::getActions($this->state->get('filter'));
JToolBarHelper::title(JText::_('COM_EVENTTABLEEDIT_MANAGER_DROPDOWN'), 'dropdown.png');
//JToolBarHelper::title(JText::_('COM_EVENTTABLEEDIT_MANAGER_DROPDOWN'), 'dropdown.png');
$xml = JFactory::getXML(JPATH_COMPONENT_ADMINISTRATOR .'/eventtableedit.xml');
$currentversion = (string)$xml->version;
JToolBarHelper::title( JText::_( 'Event Table Edit '.$currentversion ) . ' - ' . JText::_( 'COM_EVENTTABLEEDIT_MANAGER_DROPDOWN' ), 'etetables' );
// Built the actions for new and existing records.
if ($isNew) {
// For new records, check the create permission.
@@ -55,7 +55,9 @@ protected function addToolbar() {
require_once JPATH_COMPONENT.'/helpers/ete.php';
$canDo = eteHelper::getActions();
JToolBarHelper::title( JText::_( 'COM_EVENTTABLEEDIT_DROPDOWNS' ), 'dropdowns' );
$xml = JFactory::getXML(JPATH_COMPONENT_ADMINISTRATOR .'/eventtableedit.xml');
$currentversion = (string)$xml->version;
JToolBarHelper::title( JText::_( 'Event Table Edit '.$currentversion ) . ' - ' . JText::_( 'COM_EVENTTABLEEDIT_DROPDOWNS' ), 'etetables' );
if ($canDo->get('core.create')) {
JToolBarHelper::addNew('dropdown.add','JTOOLBAR_NEW');
@@ -42,8 +42,10 @@ protected function addToolbar() {
$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $userId);
$canDo = eteHelper::getActions($this->state->get('filter'));
JToolBarHelper::title(JText::_('COM_EVENTTABLEEDIT_MANAGER_ETETABLE'), 'etetable');
//JToolBarHelper::title(JText::_('COM_EVENTTABLEEDIT_MANAGER_ETETABLE'), 'etetable');
$xml = JFactory::getXML(JPATH_COMPONENT_ADMINISTRATOR .'/eventtableedit.xml');
$currentversion = (string)$xml->version;
JToolBarHelper::title( JText::_( 'Event Table Edit '.$currentversion ) . ' - ' . JText::_( 'COM_EVENTTABLEEDIT_MANAGER_ETETABLE' ), 'etetables' );
// Built the actions for new and existing records.
if ($isNew) {
// For new records, check the create permission.
@@ -56,7 +56,7 @@ protected function addToolbar() {
$canDo = eteHelper::getActions();
$xml = JFactory::getXML(JPATH_COMPONENT_ADMINISTRATOR .'/eventtableedit.xml');
$currentversion = (string)$xml->version;
JToolBarHelper::title( JText::_( 'Event Table Edit '.$currentversion), 'etetables' );
JToolBarHelper::title( JText::_( 'Event Table Edit '.$currentversion ) . ' - ' . JText::_( 'COM_EVENTTABLEEDIT_SUBMENU_ETETABLES' ), 'etetables' );
if ($canDo->get('core.create')) {
JToolBarHelper::addNew('etetable.add','JTOOLBAR_NEW');
@@ -69,17 +69,21 @@ function display($tpl = null) {
}
protected function addDefaultToolbar() {
JToolBarHelper::title(JText::_('COM_EVENTTABLEEDIT_MANAGER_XMLEXPORT'), 'export');
//JToolBarHelper::title(JText::_('COM_EVENTTABLEEDIT_MANAGER_XMLEXPORT'), 'export');
$xml = JFactory::getXML(JPATH_COMPONENT_ADMINISTRATOR .'/eventtableedit.xml');
$currentversion = (string)$xml->version;
JToolBarHelper::title( JText::_( 'Event Table Edit '.$currentversion ) . ' - ' . JText::_( 'COM_EVENTTABLEEDIT_MANAGER_XMLEXPORT' ), 'etetables' );
JToolBarHelper::custom('xmlexport.export', 'apply.png', '', 'COM_EVENTTABLEEDIT_EXPORT', false);
}
/**
* The Toolbar for showing the summary of the export
*/
protected function addSummaryToolbar() {
JToolBarHelper::title(JText::_('COM_EVENTTABLEEDIT_EXPORT_SUMMARY'), 'export');
//JToolBarHelper::title(JText::_('COM_EVENTTABLEEDIT_EXPORT_SUMMARY'), 'export');
$xml = JFactory::getXML(JPATH_COMPONENT_ADMINISTRATOR .'/eventtableedit.xml');
$currentversion = (string)$xml->version;
JToolBarHelper::title( JText::_( 'Event Table Edit '.$currentversion ) . ' - ' . JText::_( 'COM_EVENTTABLEEDIT_EXPORT_SUMMARY' ), 'etetables' );
JToolBarHelper::custom('xmlexport.cancel', 'apply.png', '', 'COM_EVENTTABLEEDIT_OK', false);
JToolBarHelper::custom('xmlexport.download', 'apply.png', '', 'COM_EVENTTABLEEDIT_DOWNLOAD_FILE', false);
}
@@ -55,8 +55,10 @@ function display($tpl = null) {
protected function addDefaultToolbar() {
$canDo = eteHelper::getActions();
JToolBarHelper::title(JText::_('COM_EVENTTABLEEDIT_MANAGER_XMLIMPORT'), 'import');
//JToolBarHelper::title(JText::_('COM_EVENTTABLEEDIT_MANAGER_XMLIMPORT'), 'import');
$xml = JFactory::getXML(JPATH_COMPONENT_ADMINISTRATOR .'/eventtableedit.xml');
$currentversion = (string)$xml->version;
JToolBarHelper::title( JText::_( 'Event Table Edit '.$currentversion ) . ' - ' . JText::_( 'COM_EVENTTABLEEDIT_MANAGER_XMLIMPORT' ), 'etetables' );
// For uploading, check the create permission.
if ($canDo->get('core.csv')) {
JToolBarHelper::custom('xmlimport.upload', 'upload.png', '', 'COM_EVENTTABLEEDIT_UPLOAD', true);
View
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="component" version="4.7" method="upgrade">
<extension type="component" version="4.7.1" method="upgrade">
<name>com_eventtableedit</name>
<creationDate>28-08-2018</creationDate>
<author>Manuel Kaspar and Theophilix</author>
<license>GNU/GPL</license>
<copyright>2007 - 2018 Manuel Kaspar and Theophilix</copyright>
<authorEmail>webmaster@eventtableedit.com</authorEmail>
<authorUrl>http://www.eventtableedit.com</authorUrl>
<version>4.7</version>
<version>4.7.1</version>
<description>COM_EVENTTABLEEDIT_DESCRIPTION</description>
<scriptfile>script.php</scriptfile>
@@ -145,7 +145,7 @@ function save(){
}else{
$mintsendadd = '0'.$mintsend;
}
if($exp_etime[0] > 9){
if($exp_etime[0] >= 9){
$hoursends = $exp_etime[0] + 1;
}else{
$hoursends1 = $exp_etime[0] + 1;

This file was deleted.

Oops, something went wrong.
@@ -270,15 +270,15 @@ function goback1(){
if($mintplus >= 60){
$mintsend = $mintplus - 60;
if($mintsend > 9){
$mintsendadd = $mintsend;
}else{
$mintsendadd = '0'.$mintsend;
}
if($exp_etime[0] > 9){
if($exp_etime[0] >= 9){
$hoursends = $exp_etime[0] + 1;
}else{
$hoursends1 = $exp_etime[0] + 1;

0 comments on commit f6aa96e

Please sign in to comment.