From 6a77d71095033e01e5a9b3815edec4b060f54899 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Tue, 3 Apr 2018 08:24:24 +0200 Subject: [PATCH] Fixed the import JCB packages link on dashboard, add frame to layout and template snippet display in related views --- README.md | 4 ++-- admin/README.txt | 4 ++-- admin/assets/css/custom_admin_view.css | 3 +++ admin/assets/css/layout.css | 3 +++ admin/assets/css/site_view.css | 3 +++ admin/assets/css/template.css | 3 +++ admin/controllers/joomla_components.php | 2 -- admin/models/ajax.php | 8 ++++---- admin/models/componentbuilder.php | 2 +- componentbuilder.xml | 2 +- 10 files changed, 22 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 80bef8a85..b072a7331 100644 --- a/README.md +++ b/README.md @@ -126,11 +126,11 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](http://joomlacomponentbuilder.com) + *First Build*: 30th April, 2015 -+ *Last Build*: 2nd April, 2018 ++ *Last Build*: 3rd April, 2018 + *Version*: 2.7.1 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **188537** ++ *Line count*: **188547** + *Field count*: **1011** + *File count*: **1197** + *Folder count*: **193** diff --git a/admin/README.txt b/admin/README.txt index 80bef8a85..b072a7331 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -126,11 +126,11 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](http://joomlacomponentbuilder.com) + *First Build*: 30th April, 2015 -+ *Last Build*: 2nd April, 2018 ++ *Last Build*: 3rd April, 2018 + *Version*: 2.7.1 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **188537** ++ *Line count*: **188547** + *Field count*: **1011** + *File count*: **1197** + *Folder count*: **193** diff --git a/admin/assets/css/custom_admin_view.css b/admin/assets/css/custom_admin_view.css index 3445a451e..9e77925ce 100644 --- a/admin/assets/css/custom_admin_view.css +++ b/admin/assets/css/custom_admin_view.css @@ -42,4 +42,7 @@ width: 100% !important; } .jform_dynamic_get_input_width { width: 90% !important; +} +.uk-scrollable-box { +height: 380px !important; } diff --git a/admin/assets/css/layout.css b/admin/assets/css/layout.css index f5a05bd9d..b055f1d8f 100644 --- a/admin/assets/css/layout.css +++ b/admin/assets/css/layout.css @@ -36,4 +36,7 @@ width: 100% !important; } .jform_dynamic_get_input_width { width: 90% !important; +} +.uk-scrollable-box { +height: 380px !important; } diff --git a/admin/assets/css/site_view.css b/admin/assets/css/site_view.css index bd7085f4e..99116870f 100644 --- a/admin/assets/css/site_view.css +++ b/admin/assets/css/site_view.css @@ -42,4 +42,7 @@ width: 100% !important; } .jform_dynamic_get_input_width { width: 90% !important; +} +.uk-scrollable-box { +height: 380px !important; } diff --git a/admin/assets/css/template.css b/admin/assets/css/template.css index ae1f3c92e..28a191f85 100644 --- a/admin/assets/css/template.css +++ b/admin/assets/css/template.css @@ -36,4 +36,7 @@ width: 100% !important; } .jform_dynamic_get_input_width { width: 90% !important; +} +.uk-scrollable-box { +height: 380px !important; } diff --git a/admin/controllers/joomla_components.php b/admin/controllers/joomla_components.php index 144ef1eac..a843fbc7c 100644 --- a/admin/controllers/joomla_components.php +++ b/admin/controllers/joomla_components.php @@ -111,8 +111,6 @@ class ComponentbuilderControllerJoomla_components extends JControllerAdmin public function smartImport() { - // Check for request forgeries - JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); // check if import is allowed for this user. $user = JFactory::getUser(); if ($user->authorise('joomla_component.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder')) diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 55a14cb8f..0c030cca6 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -1366,10 +1366,10 @@ class ComponentbuilderModelAjax extends JModelList $templateString[] = "".$result->name."<?php echo \$this->loadTemplate('".ComponentbuilderHelper::safeString($result->alias)."'); ?>"; } // build the table - $table = '

'.JText::_('COM_COMPONENTBUILDER_TEMPLATE_CODE_SNIPPETS').'

'; + $table = '

'.JText::_('COM_COMPONENTBUILDER_TEMPLATE_CODE_SNIPPETS').'

'; $table .= ''; $table .= ''; - $table .= ''.implode("",$templateString)."
'.JText::_('COM_COMPONENTBUILDER_TO_ADD_SIMPLY_COPY_AND_PAST_THE_SNIPPET_INTO_YOUR_CODE').'
'.JText::_('COM_COMPONENTBUILDER_NAME_OF_DYNAMICGET').''.JText::_('COM_COMPONENTBUILDER_SNIPPET').'
"; + $table .= ''.implode("",$templateString).""; } return $table; } @@ -1424,10 +1424,10 @@ class ComponentbuilderModelAjax extends JModelList } } // build the table - $table = '

'.JText::_('COM_COMPONENTBUILDER_LAYOUT_CODE_SNIPPETS').'

'; + $table = '

'.JText::_('COM_COMPONENTBUILDER_LAYOUT_CODE_SNIPPETS').'

'; $table .= ''; $table .= ''; - $table .= ''.implode("",$layoutString)."
'.JText::_('COM_COMPONENTBUILDER_TO_ADD_SIMPLY_COPY_AND_PAST_THE_SNIPPET_INTO_YOUR_CODE').'
'.JText::_('COM_COMPONENTBUILDER_NAME_OF_DYNAMICGET').''.JText::_('COM_COMPONENTBUILDER_SNIPPET').'
"; + $table .= ''.implode("",$layoutString).""; } return $table; } diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index fd9fc4ee5..6cd45720a 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -43,7 +43,7 @@ class ComponentbuilderModelComponentbuilder extends JModelList $icons = array(); // view groups array $viewGroups = array( - 'main' => array('png.compiler', 'png.joomla_component.add', 'png.joomla_components', 'png.admin_view.add', 'png.admin_views', 'png||importjcbpackages||index.php?option=com_componentbuilder&view=import_joomla_components&target=smartPackage', 'png.custom_admin_view.add', 'png.custom_admin_views', 'png.site_view.add', 'png.site_views', 'png.template.add', 'png.templates', 'png.layout.add', 'png.layouts', 'png.dynamic_get.add', 'png.dynamic_gets', 'png.custom_codes', 'png.libraries', 'png.snippets', 'png.get_snippets', 'png.validation_rules', 'png.field.add', 'png.fields', 'png.fields.catid', 'png.fieldtype.add', 'png.fieldtypes', 'png.fieldtypes.catid', 'png.language_translations', 'png.servers', 'png.help_documents') + 'main' => array('png.compiler', 'png.joomla_component.add', 'png.joomla_components', 'png.admin_view.add', 'png.admin_views', 'png||importjcbpackages||index.php?option=com_componentbuilder&view=joomla_components&task=joomla_components.smartImport', 'png.custom_admin_view.add', 'png.custom_admin_views', 'png.site_view.add', 'png.site_views', 'png.template.add', 'png.templates', 'png.layout.add', 'png.layouts', 'png.dynamic_get.add', 'png.dynamic_gets', 'png.custom_codes', 'png.libraries', 'png.snippets', 'png.get_snippets', 'png.validation_rules', 'png.field.add', 'png.fields', 'png.fields.catid', 'png.fieldtype.add', 'png.fieldtypes', 'png.fieldtypes.catid', 'png.language_translations', 'png.servers', 'png.help_documents') ); // view access array $viewAccess = array( diff --git a/componentbuilder.xml b/componentbuilder.xml index 5d3756726..52fd8121c 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,7 +1,7 @@ COM_COMPONENTBUILDER - 2nd April, 2018 + 3rd April, 2018 Llewellyn van der Merwe llewellyn@joomlacomponentbuilder.com http://joomlacomponentbuilder.com