Further improved #37 to ensure language strings are set and reversed, also add extra buttons to the compiler page. Major restructure of custom code implementation to make it more stable. Resolved #40 by updating the default field sql values.
This commit is contained in:
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 11 of this MVC
|
||||
@build 2nd February, 2017
|
||||
@version @update number 17 of this MVC
|
||||
@build 13th February, 2017
|
||||
@created 1st February, 2017
|
||||
@package Component Builder
|
||||
@subpackage default.php
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 11 of this MVC
|
||||
@build 2nd February, 2017
|
||||
@version @update number 17 of this MVC
|
||||
@build 13th February, 2017
|
||||
@created 1st February, 2017
|
||||
@package Component Builder
|
||||
@subpackage view.html.php
|
||||
@@ -84,8 +84,8 @@ class ComponentbuilderViewCompiler extends JViewLegacy
|
||||
|
||||
$radio1 = JFormHelper::loadFieldType('radio',true);
|
||||
// start building add to sales folder xml field
|
||||
$xml = '<field label="Add to Backup Folder & Sales Server <small>(if set)</small>" description="" name="backup" type="radio" class="btn-group btn-group-yesno" default="0">';
|
||||
$xml .= '<option value="1">Yes</option> <option value="0">No</option>';
|
||||
$xml = '<field label="'.JText::_('COM_COMPONENTBUILDER_ADD_TO_BACKUP_FOLDER_AMP_SALES_SERVER_LTSMALLGTIF_SETLTSMALLGT').'" description="'.JText::_('COM_COMPONENTBUILDER_SHOULD_THE_ZIPPED_PACKAGE_OF_THE_COMPONENT_BE_MOVED_TO_THE_LOCAL_BACKUP_AND_REMOTE_SALES_SERVER_THIS_IS_ONLY_APPLICABLE_IF_THIS_COMPONENT_HAS_THOSE_VALUES_SET').'" name="backup" type="radio" class="btn-group btn-group-yesno" default="0">';
|
||||
$xml .= '<option value="1">'.JText::_('COM_COMPONENTBUILDER_YES').'</option> <option value="0">'.JText::_('COM_COMPONENTBUILDER_NO').'</option>';
|
||||
$xml .= "</field>";
|
||||
// prepare the xml
|
||||
$sales = new SimpleXMLElement($xml);
|
||||
@@ -94,18 +94,38 @@ class ComponentbuilderViewCompiler extends JViewLegacy
|
||||
|
||||
$radio2 = JFormHelper::loadFieldType('radio',true);
|
||||
// start building add to git folder xml field
|
||||
$xml = '<field label="Add to Git Folder" description="" name="git" type="radio" class="btn-group btn-group-yesno" default="1">';
|
||||
$xml .= '<option value="1">Yes</option> <option value="0">No</option>';
|
||||
$xml = '<field label="'.JText::_('COM_COMPONENTBUILDER_ADD_TO_GIT_FOLDER').'" description="'.JText::_('COM_COMPONENTBUILDER_SHOULD_THE_COMPONENT_BE_MOVED_TO_YOUR_LOCAL_GIT_FOLDER').'" name="git" type="radio" class="btn-group btn-group-yesno" default="1">';
|
||||
$xml .= '<option value="1">'.JText::_('COM_COMPONENTBUILDER_YES').'</option> <option value="0">'.JText::_('COM_COMPONENTBUILDER_NO').'</option>';
|
||||
$xml .= "</field>";
|
||||
// prepare the xml
|
||||
$git = new SimpleXMLElement($xml);
|
||||
// set components to form
|
||||
$radio2->setup($git,1);
|
||||
|
||||
$radio3 = JFormHelper::loadFieldType('radio',true);
|
||||
// start building add to git folder xml field
|
||||
$xml = '<field label="'.JText::_('COM_COMPONENTBUILDER_ADD_CUSTOM_CODE_PLACEHOLDERS').'" description="'.JText::_('COM_COMPONENTBUILDER_SHOULD_JCB_INSERT_THE_CUSTOM_CODE_PLACEHOLDERS_THIS_IS_ONLY_APPLICABLE_IF_THIS_COMPONENT_HAS_CUSTOM_CODE').'" name="placeholders" type="radio" class="btn-group btn-group-yesno" default="2">';
|
||||
$xml .= '<option value="2">'.JText::_('COM_COMPONENTBUILDER_GLOBAL').'</option> <option value="1">'.JText::_('COM_COMPONENTBUILDER_YES').'</option> <option value="0">'.JText::_('COM_COMPONENTBUILDER_NO').'</option>';
|
||||
$xml .= "</field>";
|
||||
// prepare the xml
|
||||
$placeholder = new SimpleXMLElement($xml);
|
||||
// set components to form
|
||||
$radio3->setup($placeholder,2);
|
||||
|
||||
$radio4 = JFormHelper::loadFieldType('radio',true);
|
||||
// start building add to git folder xml field
|
||||
$xml = '<field label="'.JText::_('COM_COMPONENTBUILDER_DEBUG_LINE_NUMBERS').'" description="'.JText::_('COM_COMPONENTBUILDER_ADD_CORRESPONDING_LINE_NUMBERS_TO_THE_DYNAMIC_COMMENTS_SO_TO_SEE_WHERE_IN_THE_COMPILER_THE_LINES_OF_CODE_WAS_BUILD_THIS_WILL_HELP_IF_YOU_NEED_TO_GET_MORE_TECHNICAL_WITH_AN_ISSUE_ON_GITHUB').'" name="debuglinenr" type="radio" class="btn-group btn-group-yesno" default="2">';
|
||||
$xml .= '<option value="2">'.JText::_('COM_COMPONENTBUILDER_GLOBAL').'</option> <option value="1">'.JText::_('COM_COMPONENTBUILDER_YES').'</option> <option value="0">'.JText::_('COM_COMPONENTBUILDER_NO').'</option>';
|
||||
$xml .= "</field>";
|
||||
// prepare the xml
|
||||
$debug_linenr = new SimpleXMLElement($xml);
|
||||
// set components to form
|
||||
$radio4->setup($debug_linenr,2);
|
||||
|
||||
$list = JFormHelper::loadFieldType('list',true);
|
||||
// start building componet xml field
|
||||
$xml = '<field label="Components" description="" name="component" type="list" class="btn-group" required="true">';
|
||||
$xml .= '<option value="">- Select Component -</option>';
|
||||
$xml = '<field label="'.JText::_('COM_COMPONENTBUILDER_COMPONENTS').'" description="'.JText::_('COM_COMPONENTBUILDER_SELECT_THE_COMPONENT_TO_COMPILE').'" name="component" type="list" class="btn-group" required="true">';
|
||||
$xml .= '<option value="">'.JText::_('COM_COMPONENTBUILDER__SELECT_COMPONENT_').'</option>';
|
||||
foreach($this->Components as $componet){
|
||||
$xml .= '<option value="'.$componet->id.'">'.$this->escape($componet->name).'</option>';
|
||||
}
|
||||
@@ -115,7 +135,7 @@ class ComponentbuilderViewCompiler extends JViewLegacy
|
||||
// set components to form
|
||||
$list->setup($componets,0);
|
||||
|
||||
return array($radio1,$radio2,$list);
|
||||
return array($radio1,$radio2,$radio3,$radio4,$list);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@@ -10,7 +10,7 @@
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 81 of this MVC
|
||||
@build 3rd February, 2017
|
||||
@build 13th February, 2017
|
||||
@created 6th May, 2015
|
||||
@package Component Builder
|
||||
@subpackage submitbutton.js
|
||||
|
@@ -11,7 +11,7 @@
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 81 of this MVC
|
||||
@build 3rd February, 2017
|
||||
@build 13th February, 2017
|
||||
@created 6th May, 2015
|
||||
@package Component Builder
|
||||
@subpackage edit.php
|
||||
|
@@ -11,7 +11,7 @@
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 81 of this MVC
|
||||
@build 3rd February, 2017
|
||||
@build 13th February, 2017
|
||||
@created 6th May, 2015
|
||||
@package Component Builder
|
||||
@subpackage view.html.php
|
||||
@@ -196,7 +196,9 @@ class ComponentbuilderViewComponent extends JViewLegacy
|
||||
$isNew = ($this->item->id < 1);
|
||||
$document = JFactory::getDocument();
|
||||
$document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_EDIT'));
|
||||
$document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component.css");
|
||||
$document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component.css");
|
||||
// Add Ajax Token
|
||||
$document->addScriptDeclaration("var token = '".JSession::getFormToken()."';");
|
||||
|
||||
// Add the CSS for Footable
|
||||
$document->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css');
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.3.2
|
||||
@build 11th February, 2017
|
||||
@version 2.3.4
|
||||
@build 13th February, 2017
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
@subpackage default.php
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.3.2
|
||||
@build 11th February, 2017
|
||||
@version 2.3.4
|
||||
@build 13th February, 2017
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
@subpackage default_closed_issues_the_closed_issues_on_github.php
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.3.2
|
||||
@build 11th February, 2017
|
||||
@version 2.3.4
|
||||
@build 13th February, 2017
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
@subpackage default_main.php
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.3.2
|
||||
@build 11th February, 2017
|
||||
@version 2.3.4
|
||||
@build 13th February, 2017
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
@subpackage default_open_issues_the_open_issues_on_github.php
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.3.2
|
||||
@build 11th February, 2017
|
||||
@version 2.3.4
|
||||
@build 13th February, 2017
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
@subpackage default_readme_information.php
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.3.2
|
||||
@build 11th February, 2017
|
||||
@version 2.3.4
|
||||
@build 13th February, 2017
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
@subpackage default_vast_development_method_notice_board.php
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.3.2
|
||||
@build 11th February, 2017
|
||||
@version 2.3.4
|
||||
@build 13th February, 2017
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
@subpackage default_vdm.php
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.3.2
|
||||
@build 11th February, 2017
|
||||
@version 2.3.4
|
||||
@build 13th February, 2017
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
@subpackage view.html.php
|
||||
|
@@ -11,7 +11,7 @@
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 81 of this MVC
|
||||
@build 3rd February, 2017
|
||||
@build 13th February, 2017
|
||||
@created 6th May, 2015
|
||||
@package Component Builder
|
||||
@subpackage default.php
|
||||
|
@@ -11,7 +11,7 @@
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 81 of this MVC
|
||||
@build 3rd February, 2017
|
||||
@build 13th February, 2017
|
||||
@created 6th May, 2015
|
||||
@package Component Builder
|
||||
@subpackage default_batch_body.php
|
||||
|
@@ -11,7 +11,7 @@
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 81 of this MVC
|
||||
@build 3rd February, 2017
|
||||
@build 13th February, 2017
|
||||
@created 6th May, 2015
|
||||
@package Component Builder
|
||||
@subpackage default_batch_footer.php
|
||||
|
@@ -11,7 +11,7 @@
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 81 of this MVC
|
||||
@build 3rd February, 2017
|
||||
@build 13th February, 2017
|
||||
@created 6th May, 2015
|
||||
@package Component Builder
|
||||
@subpackage default_body.php
|
||||
|
@@ -11,7 +11,7 @@
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 81 of this MVC
|
||||
@build 3rd February, 2017
|
||||
@build 13th February, 2017
|
||||
@created 6th May, 2015
|
||||
@package Component Builder
|
||||
@subpackage default_foot.php
|
||||
|
@@ -11,7 +11,7 @@
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 81 of this MVC
|
||||
@build 3rd February, 2017
|
||||
@build 13th February, 2017
|
||||
@created 6th May, 2015
|
||||
@package Component Builder
|
||||
@subpackage default_head.php
|
||||
|
@@ -11,7 +11,7 @@
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 81 of this MVC
|
||||
@build 3rd February, 2017
|
||||
@build 13th February, 2017
|
||||
@created 6th May, 2015
|
||||
@package Component Builder
|
||||
@subpackage default_toolbar.php
|
||||
|
@@ -11,7 +11,7 @@
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 81 of this MVC
|
||||
@build 3rd February, 2017
|
||||
@build 13th February, 2017
|
||||
@created 6th May, 2015
|
||||
@package Component Builder
|
||||
@subpackage view.html.php
|
||||
|
@@ -9,8 +9,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 35 of this MVC
|
||||
@build 10th February, 2017
|
||||
@version @update number 55 of this MVC
|
||||
@build 13th February, 2017
|
||||
@created 11th October, 2016
|
||||
@package Component Builder
|
||||
@subpackage submitbutton.js
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 35 of this MVC
|
||||
@build 10th February, 2017
|
||||
@version @update number 55 of this MVC
|
||||
@build 13th February, 2017
|
||||
@created 11th October, 2016
|
||||
@package Component Builder
|
||||
@subpackage edit.php
|
||||
@@ -224,9 +224,24 @@ jQuery('#adminForm').on('change', '#jform_target',function (e)
|
||||
});
|
||||
|
||||
|
||||
var ide = jQuery('#jform_id').val();
|
||||
if (ide > 0) {
|
||||
jQuery('#jcb-placeholder').html('<code> [CUSTO'+'MCODE='+ide+'] </code>');
|
||||
jQuery('#jcb-placeholder-arg').html('<code> [CUSTO'+'MCODE='+ide+'+value1,value2] </code>');
|
||||
}
|
||||
jQuery('#adminForm').on('change', '#jform_function_name',function (e)
|
||||
{
|
||||
e.preventDefault();
|
||||
var target = jQuery("#jform_target input[type='radio']:checked").val();
|
||||
if (target == 2) {
|
||||
var functioName = jQuery('#jform_function_name').val();
|
||||
// check if this function name is taken
|
||||
checkFunctionName(functioName);
|
||||
}
|
||||
});
|
||||
jQuery('#adminForm').on('change', '#jform_target',function (e)
|
||||
{
|
||||
e.preventDefault();
|
||||
var target = jQuery("#jform_target input[type='radio']:checked").val();
|
||||
if (target == 2) {
|
||||
var functioName = jQuery('#jform_function_name').val();
|
||||
// check if this function name is taken
|
||||
checkFunctionName(functioName);
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 35 of this MVC
|
||||
@build 10th February, 2017
|
||||
@version @update number 55 of this MVC
|
||||
@build 13th February, 2017
|
||||
@created 11th October, 2016
|
||||
@package Component Builder
|
||||
@subpackage view.html.php
|
||||
@@ -192,9 +192,17 @@ class ComponentbuilderViewCustom_code extends JViewLegacy
|
||||
$isNew = ($this->item->id < 1);
|
||||
$document = JFactory::getDocument();
|
||||
$document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_CUSTOM_CODE_NEW' : 'COM_COMPONENTBUILDER_CUSTOM_CODE_EDIT'));
|
||||
$document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/custom_code.css");
|
||||
$document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/custom_code.css");
|
||||
// Add Ajax Token
|
||||
$document->addScriptDeclaration("var token = '".JSession::getFormToken()."';");
|
||||
$document->addScript(JURI::root() . $this->script);
|
||||
$document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/custom_code/submitbutton.js");
|
||||
$document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/custom_code/submitbutton.js");
|
||||
// add JavaScripts
|
||||
$document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit/js/uikit.min.js' );
|
||||
$document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit/js/components/notify.min.js', 'text/javascript', true);
|
||||
// add the style sheets
|
||||
$document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit/css/uikit.gradient.min.css' );
|
||||
$document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit/css/components/notify.gradient.min.css' );
|
||||
JText::script('view not acceptable. Error');
|
||||
}
|
||||
}
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 35 of this MVC
|
||||
@build 10th February, 2017
|
||||
@version @update number 55 of this MVC
|
||||
@build 13th February, 2017
|
||||
@created 11th October, 2016
|
||||
@package Component Builder
|
||||
@subpackage default.php
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 35 of this MVC
|
||||
@build 10th February, 2017
|
||||
@version @update number 55 of this MVC
|
||||
@build 13th February, 2017
|
||||
@created 11th October, 2016
|
||||
@package Component Builder
|
||||
@subpackage default_batch_body.php
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 35 of this MVC
|
||||
@build 10th February, 2017
|
||||
@version @update number 55 of this MVC
|
||||
@build 13th February, 2017
|
||||
@created 11th October, 2016
|
||||
@package Component Builder
|
||||
@subpackage default_batch_footer.php
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 35 of this MVC
|
||||
@build 10th February, 2017
|
||||
@version @update number 55 of this MVC
|
||||
@build 13th February, 2017
|
||||
@created 11th October, 2016
|
||||
@package Component Builder
|
||||
@subpackage default_body.php
|
||||
@@ -95,6 +95,9 @@ $edit = "index.php?option=com_componentbuilder&view=custom_codes&task=custom_cod
|
||||
<td class="hidden-phone">
|
||||
<?php echo JText::_($item->type); ?>
|
||||
</td>
|
||||
<td class="hidden-phone">
|
||||
<?php echo JText::_($item->comment_type); ?>
|
||||
</td>
|
||||
<td class="center">
|
||||
<?php if ($canDo->get('custom_code.edit.state')) : ?>
|
||||
<?php if ($item->checked_out) : ?>
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 35 of this MVC
|
||||
@build 10th February, 2017
|
||||
@version @update number 55 of this MVC
|
||||
@build 13th February, 2017
|
||||
@created 11th October, 2016
|
||||
@package Component Builder
|
||||
@subpackage default_foot.php
|
||||
@@ -28,5 +28,5 @@ defined('_JEXEC') or die('Restricted access');
|
||||
|
||||
?>
|
||||
<tr>
|
||||
<td colspan="8"><?php echo $this->pagination->getListFooter(); ?></td>
|
||||
<td colspan="9"><?php echo $this->pagination->getListFooter(); ?></td>
|
||||
</tr>
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 35 of this MVC
|
||||
@build 10th February, 2017
|
||||
@version @update number 55 of this MVC
|
||||
@build 13th February, 2017
|
||||
@created 11th October, 2016
|
||||
@package Component Builder
|
||||
@subpackage default_head.php
|
||||
@@ -55,6 +55,9 @@ defined('_JEXEC') or die('Restricted access');
|
||||
<th class="nowrap hidden-phone" >
|
||||
<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_CUSTOM_CODE_TYPE_LABEL', 'type', $this->listDirn, $this->listOrder); ?>
|
||||
</th>
|
||||
<th class="nowrap hidden-phone" >
|
||||
<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_LABEL', 'comment_type', $this->listDirn, $this->listOrder); ?>
|
||||
</th>
|
||||
<?php if ($this->canState): ?>
|
||||
<th width="10" class="nowrap center" >
|
||||
<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_CUSTOM_CODE_STATUS', 'published', $this->listDirn, $this->listOrder); ?>
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 35 of this MVC
|
||||
@build 10th February, 2017
|
||||
@version @update number 55 of this MVC
|
||||
@build 13th February, 2017
|
||||
@created 11th October, 2016
|
||||
@package Component Builder
|
||||
@subpackage default_toolbar.php
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 35 of this MVC
|
||||
@build 10th February, 2017
|
||||
@version @update number 55 of this MVC
|
||||
@build 13th February, 2017
|
||||
@created 11th October, 2016
|
||||
@package Component Builder
|
||||
@subpackage view.html.php
|
||||
@@ -266,6 +266,28 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy
|
||||
JHtml::_('select.options', $this->typeOptions, 'value', 'text')
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// Set Comment Type Selection
|
||||
$this->comment_typeOptions = $this->getTheComment_typeSelections();
|
||||
if ($this->comment_typeOptions)
|
||||
{
|
||||
// Comment Type Filter
|
||||
JHtmlSidebar::addFilter(
|
||||
'- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_LABEL').' -',
|
||||
'filter_comment_type',
|
||||
JHtml::_('select.options', $this->comment_typeOptions, 'value', 'text', $this->state->get('filter.comment_type'))
|
||||
);
|
||||
|
||||
if ($this->canBatch && $this->canCreate && $this->canEdit)
|
||||
{
|
||||
// Comment Type Batch Selection
|
||||
JHtmlBatch_::addListSelection(
|
||||
'- Keep Original '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_LABEL').' -',
|
||||
'batch[comment_type]',
|
||||
JHtml::_('select.options', $this->comment_typeOptions, 'value', 'text')
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -313,6 +335,7 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy
|
||||
'a.path' => JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_PATH_LABEL'),
|
||||
'a.target' => JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_LABEL'),
|
||||
'a.type' => JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_TYPE_LABEL'),
|
||||
'a.comment_type' => JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_LABEL'),
|
||||
'a.id' => JText::_('JGRID_HEADING_ID')
|
||||
);
|
||||
}
|
||||
@@ -387,5 +410,41 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy
|
||||
return $_filter;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
protected function getTheComment_typeSelections()
|
||||
{
|
||||
// Get a db connection.
|
||||
$db = JFactory::getDbo();
|
||||
|
||||
// Create a new query object.
|
||||
$query = $db->getQuery(true);
|
||||
|
||||
// Select the text.
|
||||
$query->select($db->quoteName('comment_type'));
|
||||
$query->from($db->quoteName('#__componentbuilder_custom_code'));
|
||||
$query->order($db->quoteName('comment_type') . ' ASC');
|
||||
|
||||
// Reset the query using our newly populated query object.
|
||||
$db->setQuery($query);
|
||||
|
||||
$results = $db->loadColumn();
|
||||
|
||||
if ($results)
|
||||
{
|
||||
// get model
|
||||
$model = $this->getModel();
|
||||
$results = array_unique($results);
|
||||
$_filter = array();
|
||||
foreach ($results as $comment_type)
|
||||
{
|
||||
// Translate the comment_type selection
|
||||
$text = $model->selectionTranslation($comment_type,'comment_type');
|
||||
// Now add the comment_type and its text to the options array
|
||||
$_filter[] = JHtml::_('select.option', $comment_type, JText::_($text));
|
||||
}
|
||||
return $_filter;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
@@ -71,7 +71,7 @@ class ComponentbuilderViewField extends JViewLegacy
|
||||
}
|
||||
|
||||
// Get Linked view data
|
||||
$this->vzvlinked_admin_views = $this->get('Vzvlinked_admin_views');
|
||||
$this->vzwlinked_admin_views = $this->get('Vzwlinked_admin_views');
|
||||
|
||||
// Set the toolbar
|
||||
$this->addToolBar();
|
||||
|
@@ -71,7 +71,7 @@ class ComponentbuilderViewFieldtype extends JViewLegacy
|
||||
}
|
||||
|
||||
// Get Linked view data
|
||||
$this->vzwfields = $this->get('Vzwfields');
|
||||
$this->vzxfields = $this->get('Vzxfields');
|
||||
|
||||
// Set the toolbar
|
||||
$this->addToolBar();
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.3.2
|
||||
@build 11th February, 2017
|
||||
@version 2.3.4
|
||||
@build 13th February, 2017
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
@subpackage default.php
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version 2.3.2
|
||||
@build 11th February, 2017
|
||||
@version 2.3.4
|
||||
@build 13th February, 2017
|
||||
@created 30th April, 2015
|
||||
@package Component Builder
|
||||
@subpackage view.html.php
|
||||
|
@@ -9,8 +9,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 66 of this MVC
|
||||
@build 3rd February, 2017
|
||||
@version @update number 67 of this MVC
|
||||
@build 11th February, 2017
|
||||
@created 18th May, 2015
|
||||
@package Component Builder
|
||||
@subpackage submitbutton.js
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 66 of this MVC
|
||||
@build 3rd February, 2017
|
||||
@version @update number 67 of this MVC
|
||||
@build 11th February, 2017
|
||||
@created 18th May, 2015
|
||||
@package Component Builder
|
||||
@subpackage edit.php
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 66 of this MVC
|
||||
@build 3rd February, 2017
|
||||
@version @update number 67 of this MVC
|
||||
@build 11th February, 2017
|
||||
@created 18th May, 2015
|
||||
@package Component Builder
|
||||
@subpackage view.html.php
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 66 of this MVC
|
||||
@build 3rd February, 2017
|
||||
@version @update number 67 of this MVC
|
||||
@build 11th February, 2017
|
||||
@created 18th May, 2015
|
||||
@package Component Builder
|
||||
@subpackage default.php
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 66 of this MVC
|
||||
@build 3rd February, 2017
|
||||
@version @update number 67 of this MVC
|
||||
@build 11th February, 2017
|
||||
@created 18th May, 2015
|
||||
@package Component Builder
|
||||
@subpackage default_batch_body.php
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 66 of this MVC
|
||||
@build 3rd February, 2017
|
||||
@version @update number 67 of this MVC
|
||||
@build 11th February, 2017
|
||||
@created 18th May, 2015
|
||||
@package Component Builder
|
||||
@subpackage default_batch_footer.php
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 66 of this MVC
|
||||
@build 3rd February, 2017
|
||||
@version @update number 67 of this MVC
|
||||
@build 11th February, 2017
|
||||
@created 18th May, 2015
|
||||
@package Component Builder
|
||||
@subpackage default_body.php
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 66 of this MVC
|
||||
@build 3rd February, 2017
|
||||
@version @update number 67 of this MVC
|
||||
@build 11th February, 2017
|
||||
@created 18th May, 2015
|
||||
@package Component Builder
|
||||
@subpackage default_foot.php
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 66 of this MVC
|
||||
@build 3rd February, 2017
|
||||
@version @update number 67 of this MVC
|
||||
@build 11th February, 2017
|
||||
@created 18th May, 2015
|
||||
@package Component Builder
|
||||
@subpackage default_head.php
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 66 of this MVC
|
||||
@build 3rd February, 2017
|
||||
@version @update number 67 of this MVC
|
||||
@build 11th February, 2017
|
||||
@created 18th May, 2015
|
||||
@package Component Builder
|
||||
@subpackage default_toolbar.php
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|_|
|
||||
/-------------------------------------------------------------------------------------------------------------------------------/
|
||||
|
||||
@version @update number 66 of this MVC
|
||||
@build 3rd February, 2017
|
||||
@version @update number 67 of this MVC
|
||||
@build 11th February, 2017
|
||||
@created 18th May, 2015
|
||||
@package Component Builder
|
||||
@subpackage view.html.php
|
||||
|
Reference in New Issue
Block a user