joomla/Component-Builder
39
25
Fork 11
Code Issues 78 Pull Requests Projects 4 Wiki Activity

Bug fixes, error on compilation when using view date & version was fixed, headercheck file missing was fixed. Added swithces to controle custom import placeholders and if view version and date should be used

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2017-02-02 13:54:07 +02:00
parent 1a79b92b07
commit 655708cfa3
211 changed files with 1401 additions and 895 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
admin/views/compiler/tmpl/default.php
View File

@ -10,9 +10,9 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.2.9
@build 1st February, 2017
@created 30th April, 2015
@version @update number 11 of this MVC
@build 2nd February, 2017
@created 1st February, 2017
@package Component Builder
@subpackage default.php
@author Llewellyn van der Merwe <http://vdm.bz/component-builder>
@ -24,16 +24,21 @@
/-----------------------------------------------------------------------------------------------------------------------------*/
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
defined('_JEXEC') or die('Restricted access');
$this->app->input->set('hidemainmenu', false);
JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
JHtml::_('behavior.tooltip');
JHtml::_('behavior.formvalidation');
JHtml::_('formbehavior.chosen', 'select');
JHtml::_('behavior.keepalive');
JHtml::_('jquery.framework');
?>
<?php if ($this->canDo->get('compiler.access')): ?>
<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=compiler'); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
<input type="hidden" name="task" value="" />
<?php echo JHtml::_('form.token'); ?>
</form>
<script type="text/javascript">
Joomla.submitbutton = function(task)
{
@ -64,7 +69,6 @@ Joomla.submitbutton = function(task)
}
}
}
// Add spindle-wheel for importations:
jQuery(document).ready(function($) {
var outerDiv = $('body');
@ -84,16 +88,16 @@ jQuery(document).ready(function($) {
});
</script>
<?php if(!empty( $this->sidebar)): ?>
<div id="j-sidebar-container" class="span2">
<?php echo $this->sidebar; ?>
</div>
<div id="j-main-container" class="span10">
<?php else: ?>
<div id="j-main-container">
<div id="j-sidebar-container" class="span2">
<?php echo $this->sidebar; ?>
</div>
<div id="j-main-container" class="span10">
<?php else : ?>
<div id="j-main-container">
<?php endif; ?>
<div id="form">
<h1>Ready to compile your component</h1>
<form action="index.php?option=com_componentbuilder&view=compiler" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
<form action="index.php?option=com_componentbuilder&view=compiler" method="post" name="compilerForm" id="compilerForm" class="form-validate" enctype="multipart/form-data">
<div>
<span class="notice" style="display:none; color:red;">You must select a component!</span><br />
<?php if ($this->form): ?>
@ -126,7 +130,7 @@ jQuery(document).ready(function($) {
</div>
</div>
<script>
jQuery('#adminForm').on('change', '#component',function (e)
jQuery('#compilerForm').on('change', '#component',function (e)
{
var component = jQuery('#component').val();
if(component == ""){
@ -150,3 +154,6 @@ jQuery(document).ready( function($) {
} , 500);
});
</script>
<?php else: ?>
<h1><?php echo JText::_('COM_COMPONENTBUILDER_NO_ACCESS_GRANTED'); ?></h1>
<?php endif; ?>

195
admin/views/compiler/view.html.php
View File

@ -10,9 +10,9 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.2.9
@build 1st February, 2017
@created 30th April, 2015
@version @update number 11 of this MVC
@build 2nd February, 2017
@created 1st February, 2017
@package Component Builder
@subpackage view.html.php
@author Llewellyn van der Merwe <http://vdm.bz/component-builder>
@ -30,64 +30,53 @@ defined('_JEXEC') or die('Restricted access');
jimport('joomla.application.component.view');
/**
* Componentbuilder Compiler View
* Componentbuilder View class for the Compiler
*/
class ComponentbuilderViewCompiler extends JViewLegacy
{
/**
* Componentbuilder view display method
* @return void
*/
function display($tpl = null)
// Overwriting JView display method
function display($tpl = null)
{
// Check for errors.
if (count($errors = $this->get('Errors'))){
JError::raiseError(500, implode('<br />', $errors));
return false;
};
$this->Components = $this->get('Components');
$this->form = $this->setForm();
// We don't need toolbar in the modal window.
// get component params
$this->params = JComponentHelper::getParams('com_componentbuilder');
// get the application
$this->app = JFactory::getApplication();
// get the user object
$this->user = JFactory::getUser();
// get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('compiler');
// Initialise variables.
$this->items = $this->get('Items');
// Check for errors.
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode("\n", $errors));
return false;
}
if ($this->getLayout() !== 'modal')
{
// Include helper submenu
ComponentbuilderHelper::addSubmenu('compiler');
$this->addToolbar();
JHtmlSidebar::setAction('index.php?option=com_componentbuilder&view=compiler');
$this->sidebar = JHtmlSidebar::render();
}
// Display the template
$this->Components = $this->get('Components');
$this->form = $this->setForm();
// We don't need toolbar in the modal window.
if ($this->getLayout() !== 'modal')
{
// add the tool bar
$this->addToolBar();
}
// set the document
$this->setDocument();
parent::display($tpl);
// Set the document
$this->setDocument();
}
/**
* Setting the toolbar
*/
protected function addToolBar()
{
$canDo = ComponentbuilderHelper::getActions('compiler');
JToolBarHelper::title(JText::_('Compiler'), 'cogs');
if($canDo->get('core.admin') || $canDo->get('core.options'))
{
JToolBarHelper::custom('compiler.clearTmp', 'purge', '', 'Clear tmp', false);
JToolBarHelper::divider();
JToolBarHelper::preferences('com_componentbuilder');
}
// set help url for this view if found
$help_url = ComponentbuilderHelper::getHelpUrl('compiler');
if (ComponentbuilderHelper::checkString($help_url))
{
JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url);
}
}
}
public function setForm()
{
if(ComponentbuilderHelper::checkArray($this->Components)){
@ -131,17 +120,98 @@ class ComponentbuilderViewCompiler extends JViewLegacy
return false;
}
/**
* Method to set up the document properties
*
*
* @return void
/**
* Prepares the document
*/
protected function setDocument()
protected function setDocument()
{
// always make sure jquery is loaded.
JHtml::_('jquery.framework');
// Load the header checker class.
require_once( JPATH_COMPONENT_ADMINISTRATOR.'/helpers/headercheck.php' );
// Initialize the header checker.
$HeaderCheck = new HeaderCheck;
// Load uikit options.
$uikit = $this->params->get('uikit_load');
// Set script size.
$size = $this->params->get('uikit_min');
// Set css style.
$style = $this->params->get('uikit_style');
// The uikit css.
if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
{
$this->document->addStyleSheet(JURI::root(true) .'/media/com_componentbuilder/uikit/css/uikit'.$style.$size.'.css');
}
// The uikit js.
if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
{
$this->document->addScript(JURI::root(true) .'/media/com_componentbuilder/uikit/js/uikit'.$size.'.js');
}
// Load the needed uikit components in this view.
$uikitComp = $this->get('UikitComp');
if ($uikit != 2 && isset($uikitComp) && ComponentbuilderHelper::checkArray($uikitComp))
{
// load just in case.
jimport('joomla.filesystem.file');
// loading...
foreach ($uikitComp as $class)
{
foreach (ComponentbuilderHelper::$uk_components[$class] as $name)
{
// check if the CSS file exists.
if (JFile::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit/css/components/'.$name.$style.$size.'.css'))
{
// load the css.
$this->document->addStyleSheet(JURI::root(true) .'/media/com_componentbuilder/uikit/css/components/'.$name.$style.$size.'.css');
}
// check if the JavaScript file exists.
if (JFile::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit/js/components/'.$name.$size.'.js'))
{
// load the js.
$this->document->addScript(JURI::root(true) .'/media/com_componentbuilder/uikit/js/components/'.$name.$size.'.js', 'text/javascript', true);
}
}
}
}
// add the document default css file
$this->document->addStyleSheet(JURI::root(true) .'/administrator/components/com_componentbuilder/assets/css/compiler.css');
}
/**
* Setting the toolbar
*/
protected function addToolBar()
{
$document = JFactory::getDocument();
$document->setTitle(JText::_('The Compiler'));
// hide the main menu
$this->app->input->set('hidemainmenu', true);
// add title to the page
JToolbarHelper::title(JText::_('COM_COMPONENTBUILDER_COMPILER'),'cogs');
// add the back button
// JToolBarHelper::custom('compiler.back', 'undo-2', '', 'COM_COMPONENTBUILDER_BACK', false);
// add cpanel button
JToolBarHelper::custom('compiler.dashboard', 'grid-2', '', 'COM_COMPONENTBUILDER_DASH', false);
if ($this->canDo->get('compiler.clear_tmp'))
{
// add Clear tmp button.
JToolBarHelper::custom('compiler.clearTmp', 'purge', '', 'COM_COMPONENTBUILDER_CLEAR_TMP', false);
}
// set help url for this view if found
$help_url = ComponentbuilderHelper::getHelpUrl('compiler');
if (ComponentbuilderHelper::checkString($help_url))
{
JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url);
}
// add the options comp button
if ($this->canDo->get('core.admin') || $this->canDo->get('core.options'))
{
JToolBarHelper::preferences('com_componentbuilder');
}
}
/**
@ -153,12 +223,7 @@ class ComponentbuilderViewCompiler extends JViewLegacy
*/
public function escape($var)
{
if(strlen($var) > 50)
{
// use the helper htmlEscape method instead and shorten the string
return ComponentbuilderHelper::htmlEscape($var, $this->_charset, true);
}
// use the helper htmlEscape method instead.
return ComponentbuilderHelper::htmlEscape($var, $this->_charset);
}
}
}