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' +); ?>
- - | -- - | -- - | -- - | -- - | -- - | -- - | -- - | -||
---|---|---|---|---|---|---|---|---|---|
- 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); ?> - | - 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); ?> + | + published == 1):?> ++ + + + | + published == 0):?> ++ + + + | + published == 2):?> ++ + + + | + published == -2):?> ++ + + + | + + +