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

fixed a line break incorrectly escaped, added better description to new fields layout

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2017-10-14 20:07:23 +02:00
parent 5a14049afd
commit c2972c3e17
59 changed files with 248 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin/views/admin_view/submitbutton.js
View File

@ -9,7 +9,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 184 of this MVC
@version @update number 185 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

2
admin/views/admin_view/tmpl/edit.php
View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 184 of this MVC
@version @update number 185 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

2
admin/views/admin_view/view.html.php
View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 184 of this MVC
@version @update number 185 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

2
admin/views/admin_views/tmpl/default.php
View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 184 of this MVC
@version @update number 185 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

2
admin/views/admin_views/tmpl/default_batch_body.php
View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 184 of this MVC
@version @update number 185 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

2
admin/views/admin_views/tmpl/default_batch_footer.php
View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 184 of this MVC
@version @update number 185 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

2
admin/views/admin_views/tmpl/default_body.php
View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 184 of this MVC
@version @update number 185 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

2
admin/views/admin_views/tmpl/default_foot.php
View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 184 of this MVC
@version @update number 185 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

2
admin/views/admin_views/tmpl/default_head.php
View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 184 of this MVC
@version @update number 185 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

2
admin/views/admin_views/tmpl/default_toolbar.php
View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 184 of this MVC
@version @update number 185 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

2
admin/views/admin_views/view.html.php
View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 184 of this MVC
@version @update number 185 of this MVC
@build 14th October, 2017
@created 30th April, 2015
@package Component Builder

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

@ -70,8 +70,7 @@ class ComponentbuilderViewCompiler extends JViewLegacy
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("
", $errors), 500);
throw new Exception(implode("\n", $errors), 500);
}
parent::display($tpl);

2
admin/views/joomla_component/submitbutton.js
View File

@ -9,7 +9,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 388 of this MVC
@version @update number 389 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder

4
admin/views/joomla_component/tmpl/edit.php
View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 388 of this MVC
@version @update number 389 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder
@ -194,7 +194,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
<?php echo JHtml::_('bootstrap.endTab'); ?>
<?php endif; ?>
<?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 if ($this->canDo->get('joomla_component.delete') || $this->canDo->get('joomla_component.edit.created_by') || $this->canDo->get('joomla_component.edit.state') || $this->canDo->get('joomla_component.edit.created')) : ?>
<?php echo JHtml::_('bootstrap.addTab', 'joomla_componentTab', 'publishing', JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PUBLISHING', true)); ?>
<div class="row-fluid form-horizontal-desktop">
<div class="span6">

16
admin/views/joomla_component/view.html.php
View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 388 of this MVC
@version @update number 389 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder
@ -106,12 +106,12 @@ class ComponentbuilderViewJoomla_component extends JViewLegacy
// Built the actions for new and existing records.
if ($this->refid || $this->ref)
{
if ($this->canDo->get('core.create') && $isNew)
if ($this->canDo->get('joomla_component.create') && $isNew)
{
// We can create the record.
JToolBarHelper::save('joomla_component.save', 'JTOOLBAR_SAVE');
}
elseif ($this->canDo->get('core.edit'))
elseif ($this->canDo->get('joomla_component.edit'))
{
// We can save the record.
JToolBarHelper::save('joomla_component.save', 'JTOOLBAR_SAVE');
@ -132,7 +132,7 @@ class ComponentbuilderViewJoomla_component extends JViewLegacy
if ($isNew)
{
// For new records, check the create permission.
if ($this->canDo->get('core.create'))
if ($this->canDo->get('joomla_component.create'))
{
JToolBarHelper::apply('joomla_component.apply', 'JTOOLBAR_APPLY');
JToolBarHelper::save('joomla_component.save', 'JTOOLBAR_SAVE');
@ -142,24 +142,24 @@ class ComponentbuilderViewJoomla_component extends JViewLegacy
}
else
{
if ($this->canDo->get('core.edit'))
if ($this->canDo->get('joomla_component.edit'))
{
// We can save the new record
JToolBarHelper::apply('joomla_component.apply', 'JTOOLBAR_APPLY');
JToolBarHelper::save('joomla_component.save', 'JTOOLBAR_SAVE');
// We can save this record, but check the create permission to see
// if we can return to make a new one.
if ($this->canDo->get('core.create'))
if ($this->canDo->get('joomla_component.create'))
{
JToolBarHelper::custom('joomla_component.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
}
}
$canVersion = ($this->canDo->get('core.version') && $this->canDo->get('joomla_component.version'));
if ($this->state->params->get('save_history', 1) && $this->canDo->get('core.edit') && $canVersion)
if ($this->state->params->get('save_history', 1) && $this->canDo->get('joomla_component.edit') && $canVersion)
{
JToolbarHelper::versions('com_componentbuilder.joomla_component', $this->item->id);
}
if ($this->canDo->get('core.create'))
if ($this->canDo->get('joomla_component.create'))
{
JToolBarHelper::custom('joomla_component.save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false);
}

2
admin/views/joomla_components/tmpl/default.php
View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 388 of this MVC
@version @update number 389 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder

2
admin/views/joomla_components/tmpl/default_batch_body.php
View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 388 of this MVC
@version @update number 389 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder

2
admin/views/joomla_components/tmpl/default_batch_footer.php
View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 388 of this MVC
@version @update number 389 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder

10
admin/views/joomla_components/tmpl/default_body.php
View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 388 of this MVC
@version @update number 389 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder
@ -37,7 +37,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=jooml
?>
<tr class="row<?php echo $i % 2; ?>">
<td class="order nowrap center hidden-phone">
<?php if ($canDo->get('core.edit.state')): ?>
<?php if ($canDo->get('joomla_component.edit.state')): ?>
<?php
if ($this->saveOrder)
{
@ -60,7 +60,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=jooml
<?php endif; ?>
</td>
<td class="nowrap center">
<?php if ($canDo->get('core.edit')): ?>
<?php if ($canDo->get('joomla_component.edit')): ?>
<?php if ($item->checked_out) : ?>
<?php if ($canCheckin) : ?>
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
@ -75,7 +75,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=jooml
<?php endif; ?>
</td>
<td class="nowrap">
<?php if ($canDo->get('core.edit')): ?>
<?php if ($canDo->get('joomla_component.edit')): ?>
<div class="name">
<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->system_name); ?></a>
<?php if ($item->checked_out): ?>
@ -102,7 +102,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=jooml
<?php echo $this->escape($item->author); ?>
</td>
<td class="center">
<?php if ($canDo->get('core.edit.state')) : ?>
<?php if ($canDo->get('joomla_component.edit.state')) : ?>
<?php if ($item->checked_out) : ?>
<?php if ($canCheckin) : ?>
<?php echo JHtml::_('jgrid.published', $item->published, $i, 'joomla_components.', true, 'cb'); ?>

2
admin/views/joomla_components/tmpl/default_foot.php
View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 388 of this MVC
@version @update number 389 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder

2
admin/views/joomla_components/tmpl/default_head.php
View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 388 of this MVC
@version @update number 389 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder

2
admin/views/joomla_components/tmpl/default_toolbar.php
View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 388 of this MVC
@version @update number 389 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder

10
admin/views/joomla_components/view.html.php
View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 388 of this MVC
@version @update number 389 of this MVC
@build 14th October, 2017
@created 6th May, 2015
@package Component Builder
@ -56,10 +56,10 @@ class ComponentbuilderViewJoomla_components extends JViewLegacy
$this->saveOrder = $this->listOrder == 'ordering';
// get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('joomla_component');
$this->canEdit = $this->canDo->get('core.edit');
$this->canState = $this->canDo->get('core.edit.state');
$this->canCreate = $this->canDo->get('core.create');
$this->canDelete = $this->canDo->get('core.delete');
$this->canEdit = $this->canDo->get('joomla_component.edit');
$this->canState = $this->canDo->get('joomla_component.edit.state');
$this->canCreate = $this->canDo->get('joomla_component.create');
$this->canDelete = $this->canDo->get('joomla_component.delete');
$this->canBatch = $this->canDo->get('core.batch');
// We don't need toolbar in the modal window.