joomla/Component-Builder
40
26
Fork 12
Code Issues 79 Pull Requests 2 Projects 4 Wiki Activity

Added (Linked To) back in related areas, so we can see where what is linked. Added ajax fields to the custom admin view. Added some backward compatibility to stylesheets and scripts being added, resolved gh-217. Fixed gh-212 no access lang string. Added the site CSS area to Joomla Component view resolved gh-216.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2018-01-15 17:54:05 +02:00
parent 423df415fa
commit 98510ae504
144 changed files with 6453 additions and 5362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
admin/views/site_view/tmpl/edit.php
View File

@@ -116,6 +116,16 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
</div>
<?php echo JHtml::_('bootstrap.endTab'); ?>
<?php echo JHtml::_('bootstrap.addTab', 'site_viewTab', 'linked_components', JText::_('COM_COMPONENTBUILDER_SITE_VIEW_LINKED_COMPONENTS', true)); ?>
<div class="row-fluid form-horizontal-desktop">
</div>
<div class="row-fluid form-horizontal-desktop">
<div class="span12">
<?php echo JLayoutHelper::render('site_view.linked_components_fullwidth', $this); ?>
</div>
</div>
<?php echo JHtml::_('bootstrap.endTab'); ?>
<?php if ($this->canDo->get('core.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('core.edit.state') || $this->canDo->get('core.edit.created')) : ?>
<?php echo JHtml::_('bootstrap.addTab', 'site_viewTab', 'publishing', JText::_('COM_COMPONENTBUILDER_SITE_VIEW_PUBLISHING', true)); ?>
<div class="row-fluid form-horizontal-desktop">
@@ -166,168 +176,168 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
<script type="text/javascript">
// #jform_add_php_view listeners for add_php_view_vvvvvyj function
// #jform_add_php_view listeners for add_php_view_vvvvvyl function
jQuery('#jform_add_php_view').on('keyup',function()
{
var add_php_view_vvvvvyj = jQuery("#jform_add_php_view input[type='radio']:checked").val();
vvvvvyj(add_php_view_vvvvvyj);
var add_php_view_vvvvvyl = jQuery("#jform_add_php_view input[type='radio']:checked").val();
vvvvvyl(add_php_view_vvvvvyl);
});
jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
{
e.preventDefault();
var add_php_view_vvvvvyj = jQuery("#jform_add_php_view input[type='radio']:checked").val();
vvvvvyj(add_php_view_vvvvvyj);
var add_php_view_vvvvvyl = jQuery("#jform_add_php_view input[type='radio']:checked").val();
vvvvvyl(add_php_view_vvvvvyl);
});
// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyk function
// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvym function
jQuery('#jform_add_php_jview_display').on('keyup',function()
{
var add_php_jview_display_vvvvvyk = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
vvvvvyk(add_php_jview_display_vvvvvyk);
var add_php_jview_display_vvvvvym = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
vvvvvym(add_php_jview_display_vvvvvym);
});
jQuery('#adminForm').on('change', '#jform_add_php_jview_display',function (e)
{
e.preventDefault();
var add_php_jview_display_vvvvvyk = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
vvvvvyk(add_php_jview_display_vvvvvyk);
var add_php_jview_display_vvvvvym = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
vvvvvym(add_php_jview_display_vvvvvym);
});
// #jform_add_php_jview listeners for add_php_jview_vvvvvyl function
// #jform_add_php_jview listeners for add_php_jview_vvvvvyn function
jQuery('#jform_add_php_jview').on('keyup',function()
{
var add_php_jview_vvvvvyl = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
vvvvvyl(add_php_jview_vvvvvyl);
var add_php_jview_vvvvvyn = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
vvvvvyn(add_php_jview_vvvvvyn);
});
jQuery('#adminForm').on('change', '#jform_add_php_jview',function (e)
{
e.preventDefault();
var add_php_jview_vvvvvyl = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
vvvvvyl(add_php_jview_vvvvvyl);
var add_php_jview_vvvvvyn = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
vvvvvyn(add_php_jview_vvvvvyn);
});
// #jform_add_php_document listeners for add_php_document_vvvvvym function
// #jform_add_php_document listeners for add_php_document_vvvvvyo function
jQuery('#jform_add_php_document').on('keyup',function()
{
var add_php_document_vvvvvym = jQuery("#jform_add_php_document input[type='radio']:checked").val();
vvvvvym(add_php_document_vvvvvym);
var add_php_document_vvvvvyo = jQuery("#jform_add_php_document input[type='radio']:checked").val();
vvvvvyo(add_php_document_vvvvvyo);
});
jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
{
e.preventDefault();
var add_php_document_vvvvvym = jQuery("#jform_add_php_document input[type='radio']:checked").val();
vvvvvym(add_php_document_vvvvvym);
var add_php_document_vvvvvyo = jQuery("#jform_add_php_document input[type='radio']:checked").val();
vvvvvyo(add_php_document_vvvvvyo);
});
// #jform_add_css_document listeners for add_css_document_vvvvvyn function
// #jform_add_css_document listeners for add_css_document_vvvvvyp function
jQuery('#jform_add_css_document').on('keyup',function()
{
var add_css_document_vvvvvyn = jQuery("#jform_add_css_document input[type='radio']:checked").val();
vvvvvyn(add_css_document_vvvvvyn);
var add_css_document_vvvvvyp = jQuery("#jform_add_css_document input[type='radio']:checked").val();
vvvvvyp(add_css_document_vvvvvyp);
});
jQuery('#adminForm').on('change', '#jform_add_css_document',function (e)
{
e.preventDefault();
var add_css_document_vvvvvyn = jQuery("#jform_add_css_document input[type='radio']:checked").val();
vvvvvyn(add_css_document_vvvvvyn);
var add_css_document_vvvvvyp = jQuery("#jform_add_css_document input[type='radio']:checked").val();
vvvvvyp(add_css_document_vvvvvyp);
});
// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyo function
// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyq function
jQuery('#jform_add_javascript_file').on('keyup',function()
{
var add_javascript_file_vvvvvyo = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
vvvvvyo(add_javascript_file_vvvvvyo);
var add_javascript_file_vvvvvyq = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
vvvvvyq(add_javascript_file_vvvvvyq);
});
jQuery('#adminForm').on('change', '#jform_add_javascript_file',function (e)
{
e.preventDefault();
var add_javascript_file_vvvvvyo = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
vvvvvyo(add_javascript_file_vvvvvyo);
var add_javascript_file_vvvvvyq = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
vvvvvyq(add_javascript_file_vvvvvyq);
});
// #jform_add_js_document listeners for add_js_document_vvvvvyp function
// #jform_add_js_document listeners for add_js_document_vvvvvyr function
jQuery('#jform_add_js_document').on('keyup',function()
{
var add_js_document_vvvvvyp = jQuery("#jform_add_js_document input[type='radio']:checked").val();
vvvvvyp(add_js_document_vvvvvyp);
var add_js_document_vvvvvyr = jQuery("#jform_add_js_document input[type='radio']:checked").val();
vvvvvyr(add_js_document_vvvvvyr);
});
jQuery('#adminForm').on('change', '#jform_add_js_document',function (e)
{
e.preventDefault();
var add_js_document_vvvvvyp = jQuery("#jform_add_js_document input[type='radio']:checked").val();
vvvvvyp(add_js_document_vvvvvyp);
var add_js_document_vvvvvyr = jQuery("#jform_add_js_document input[type='radio']:checked").val();
vvvvvyr(add_js_document_vvvvvyr);
});
// #jform_add_css listeners for add_css_vvvvvyq function
// #jform_add_css listeners for add_css_vvvvvys function
jQuery('#jform_add_css').on('keyup',function()
{
var add_css_vvvvvyq = jQuery("#jform_add_css input[type='radio']:checked").val();
vvvvvyq(add_css_vvvvvyq);
var add_css_vvvvvys = jQuery("#jform_add_css input[type='radio']:checked").val();
vvvvvys(add_css_vvvvvys);
});
jQuery('#adminForm').on('change', '#jform_add_css',function (e)
{
e.preventDefault();
var add_css_vvvvvyq = jQuery("#jform_add_css input[type='radio']:checked").val();
vvvvvyq(add_css_vvvvvyq);
var add_css_vvvvvys = jQuery("#jform_add_css input[type='radio']:checked").val();
vvvvvys(add_css_vvvvvys);
});
// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyr function
// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyt function
jQuery('#jform_add_php_ajax').on('keyup',function()
{
var add_php_ajax_vvvvvyr = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
vvvvvyr(add_php_ajax_vvvvvyr);
var add_php_ajax_vvvvvyt = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
vvvvvyt(add_php_ajax_vvvvvyt);
});
jQuery('#adminForm').on('change', '#jform_add_php_ajax',function (e)
{
e.preventDefault();
var add_php_ajax_vvvvvyr = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
vvvvvyr(add_php_ajax_vvvvvyr);
var add_php_ajax_vvvvvyt = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
vvvvvyt(add_php_ajax_vvvvvyt);
});
// #jform_add_custom_button listeners for add_custom_button_vvvvvys function
// #jform_add_custom_button listeners for add_custom_button_vvvvvyu function
jQuery('#jform_add_custom_button').on('keyup',function()
{
var add_custom_button_vvvvvys = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
vvvvvys(add_custom_button_vvvvvys);
var add_custom_button_vvvvvyu = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
vvvvvyu(add_custom_button_vvvvvyu);
});
jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
{
e.preventDefault();
var add_custom_button_vvvvvys = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
vvvvvys(add_custom_button_vvvvvys);
var add_custom_button_vvvvvyu = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
vvvvvyu(add_custom_button_vvvvvyu);
});
// #jform_button_position listeners for button_position_vvvvvyt function
// #jform_button_position listeners for button_position_vvvvvyv function
jQuery('#jform_button_position').on('keyup',function()
{
var button_position_vvvvvyt = jQuery("#jform_button_position").val();
vvvvvyt(button_position_vvvvvyt);
var button_position_vvvvvyv = jQuery("#jform_button_position").val();
vvvvvyv(button_position_vvvvvyv);
});
jQuery('#adminForm').on('change', '#jform_button_position',function (e)
{
e.preventDefault();
var button_position_vvvvvyt = jQuery("#jform_button_position").val();
vvvvvyt(button_position_vvvvvyt);
var button_position_vvvvvyv = jQuery("#jform_button_position").val();
vvvvvyv(button_position_vvvvvyv);
});
@@ -425,5 +435,18 @@ jQuery(document).ready(function() {
});
// some lang strings
var select_a_snippet = '<?php echo JText::_('COM_COMPONENTBUILDER_SELECT_A_SNIPPET'); ?>';
var create_a_snippet = '<?php echo JText::_('COM_COMPONENTBUILDER_CREATE_A_SNIPPET'); ?>';
var create_a_snippet = '<?php echo JText::_('COM_COMPONENTBUILDER_CREATE_A_SNIPPET'); ?>';
// nice little dot trick :)
jQuery(document).ready( function($) {
var x=0;
setInterval(function() {
var dots = "";
x++;
for (var y=0; y < x%8; y++) {
dots+=".";
}
$(".loading-dots").text(dots);
} , 500);
});
</script>

17
admin/views/site_view/view.html.php
View File

@@ -194,11 +194,22 @@ class ComponentbuilderViewSite_view extends JViewLegacy
$this->document = JFactory::getDocument();
}
$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_SITE_VIEW_NEW' : 'COM_COMPONENTBUILDER_SITE_VIEW_EDIT'));
$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/site_view.css", array('version' => 'auto'));
$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/site_view.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
// Add Ajax Token
$this->document->addScriptDeclaration("var token = '".JSession::getFormToken()."';");
$this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/site_view/submitbutton.js", array('version' => 'auto'));
$this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/site_view/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
// add the Uikit v2 style sheets
$this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/uikit.gradient.min.css' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
$this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/components/notify.gradient.min.css' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
// add Uikit v2 JavaScripts
$this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/uikit.min.js' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
$this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);
$this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/notify.min.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);
// add var key
$this->document->addScriptDeclaration("var vastDevMod = '".$this->get('VDM')."';");
JText::script('view not acceptable. Error');
}
}