From f7b168d7629e88a9605cabbca053b911959b4886 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Fri, 13 Oct 2017 05:51:56 +0200 Subject: [PATCH] Fixed tab line-up so the linked component in the admin_view will show again --- README.md | 4 +- admin/README.txt | 4 +- .../en-GB/en-GB.com_componentbuilder.ini | 1 + .../admin_view/custom_import_fullwidth.php | 128 +++------------- .../linked_components_fullwidth.php | 138 ++++++++++++++++++ admin/models/admin_view.php | 2 +- admin/views/admin_view/tmpl/edit.php | 12 +- admin/views/admin_view/view.html.php | 2 +- 8 files changed, 179 insertions(+), 112 deletions(-) create mode 100644 admin/layouts/admin_view/linked_components_fullwidth.php diff --git a/README.md b/README.md index b7f6a6663..ed38754aa 100644 --- a/README.md +++ b/README.md @@ -114,8 +114,8 @@ Component Builder is mapped as a component in itself on my local development env + *Version*: 2.5.8 + *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*: **123911** -+ *File count*: **741** ++ *Line count*: **123978** ++ *File count*: **742** + *Folder count*: **129** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). diff --git a/admin/README.txt b/admin/README.txt index b7f6a6663..ed38754aa 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -114,8 +114,8 @@ Component Builder is mapped as a component in itself on my local development env + *Version*: 2.5.8 + *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*: **123911** -+ *File count*: **741** ++ *Line count*: **123978** ++ *File count*: **742** + *Folder count*: **129** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index 1fc25c5b8..51b712f06 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -532,6 +532,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_LABEL="Child Key" COM_COMPONENTBUILDER_ADMIN_VIEW_LAMP="Lamp" COM_COMPONENTBUILDER_ADMIN_VIEW_LAST="Last" COM_COMPONENTBUILDER_ADMIN_VIEW_LINK="Link" +COM_COMPONENTBUILDER_ADMIN_VIEW_LINKED_COMPONENTS="Linked - Components" COM_COMPONENTBUILDER_ADMIN_VIEW_LIST="List" COM_COMPONENTBUILDER_ADMIN_VIEW_LIST_TWO="List 2" COM_COMPONENTBUILDER_ADMIN_VIEW_LOCATION="Location" diff --git a/admin/layouts/admin_view/custom_import_fullwidth.php b/admin/layouts/admin_view/custom_import_fullwidth.php index 197d3d232..cc59ec308 100644 --- a/admin/layouts/admin_view/custom_import_fullwidth.php +++ b/admin/layouts/admin_view/custom_import_fullwidth.php @@ -27,112 +27,30 @@ defined('_JEXEC') or die('Restricted access'); -// set the defaults -$items = $displayData->vxzcustom_import; -$user = JFactory::getUser(); -$id = $displayData->item->id; -$edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; +$form = $displayData->getForm(); + +$fields = $displayData->get('fields') ?: array( + 'note_beginner_import', + 'note_advanced_import', + 'add_custom_import', + 'php_import_display', + 'html_import_view', + 'php_import', + 'php_import_setdata', + 'php_import_save', + 'php_import_ext' +); ?>
- - - - - - - - - - - - - - - - $item): ?> - authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0; - $userChkOut = JFactory::getUser($item->checked_out); - $canDo = ComponentbuilderHelper::getActions('joomla_component',$item,'joomla_components'); - ?> - - - - - - - - published == 1):?> - - published == 0):?> - - published == 2):?> - - published == -2):?> - - - - - - -
- - - - - - - - - - - - - - - -
- get('core.edit')): ?> - escape($item->system_name); ?> - checked_out): ?> - name, $item->checked_out_time, 'joomla_components.', $canCheckin); ?> - - -
escape($item->system_name); ?>
- - 		- escape($item->name_code); ?> - - escape($item->component_version); ?> - - escape($item->short_description); ?> - - escape($item->companyname); ?> - - escape($item->author); ?> - - - - - - - - - - - - - - - - - - id; ?> -
- -
- -
- + +
+
+ getLabel($field); ?> +
+
+ getInput($field); ?> +
+
+
diff --git a/admin/layouts/admin_view/linked_components_fullwidth.php b/admin/layouts/admin_view/linked_components_fullwidth.php new file mode 100644 index 000000000..7a64979a0 --- /dev/null +++ b/admin/layouts/admin_view/linked_components_fullwidth.php @@ -0,0 +1,138 @@ + + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file + +defined('_JEXEC') or die('Restricted access'); + +// set the defaults +$items = $displayData->vxzlinked_components; +$user = JFactory::getUser(); +$id = $displayData->item->id; +$edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; + +?> +
+ + + + + + + + + + + + + + + + $item): ?> + authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0; + $userChkOut = JFactory::getUser($item->checked_out); + $canDo = ComponentbuilderHelper::getActions('joomla_component',$item,'joomla_components'); + ?> + + + + + + + + published == 1):?> + + published == 0):?> + + published == 2):?> + + published == -2):?> + + + + + + +
+ + + + + + + + + + + + + + + +
+ get('core.edit')): ?> + escape($item->system_name); ?> + checked_out): ?> + name, $item->checked_out_time, 'joomla_components.', $canCheckin); ?> + + +
escape($item->system_name); ?>
+ + 		+ escape($item->name_code); ?> + + escape($item->component_version); ?> + + escape($item->short_description); ?> + + escape($item->companyname); ?> + + escape($item->author); ?> + + + + + + + + + + + + + + + + + + id; ?> +
+ +
+ +
+ +
diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index 94beb47e6..85b2da546 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -383,7 +383,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVxzcustom_import() + public function getVxzlinked_components() { // Get the user object. $user = JFactory::getUser(); diff --git a/admin/views/admin_view/tmpl/edit.php b/admin/views/admin_view/tmpl/edit.php index 142428597..4cda93677 100644 --- a/admin/views/admin_view/tmpl/edit.php +++ b/admin/views/admin_view/tmpl/edit.php @@ -157,6 +157,17 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder'); canDo->get('joomla_component.access')) : ?> + +
+
+
+
+ +
+
+ + +
@@ -166,7 +177,6 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder'); - canDo->get('admin_view.delete') || $this->canDo->get('admin_view.edit.created_by') || $this->canDo->get('admin_view.edit.state') || $this->canDo->get('admin_view.edit.created')) : ?> diff --git a/admin/views/admin_view/view.html.php b/admin/views/admin_view/view.html.php index de0fd5bd6..8ebd9e7d1 100644 --- a/admin/views/admin_view/view.html.php +++ b/admin/views/admin_view/view.html.php @@ -71,7 +71,7 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy } // Get Linked view data - $this->vxzcustom_import = $this->get('Vxzcustom_import'); + $this->vxzlinked_components = $this->get('Vxzlinked_components'); // Set the toolbar $this->addToolBar();