Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/joomla/joomla-cms
Browse files Browse the repository at this point in the history 
# By Rouven Weßling (14) and others
# Via Rouven Weßling
* 'master' of https://github.com/joomla/joomla-cms: (30 commits)
  Update the code style ruleset for phpcs 1.3.6.
  Fix an error when generating cover coverage.
  Fix a typo from the last commit.
  Add unit tests for JAdministratorHelper.
  Fix an E_STRICT warning in com_banners. Thanks Elin.
  Remove unused variables found by phpmd.
  Make sure the build process works without error.
  Fix failing unit tests.
  Test the Feed package
  Add the following sniffs but only apply them to select folders: Generic.Files.LineLength PEAR.Functions.ValidDefaultValue Squiz.Operators.IncrementDecrementUsage Joomla.Classes.MethodScope Joomla.Commenting.FunctionComment Joomla.Commenting.SingleComment Joomla.Commenting.ClassComment Joomla.WhiteSpace.ConcatenationSpacing Joomla.ControlStructures.ControlSignature Joomla.ControlStructures.InlineControlStructure Joomla.ControlStructures.MultiLineCondition
  Code quality for beez3.
  Fix CRLF in beez3.
  Fix codestyle errors introduced in 69fdccd
  Beez3 fixing some files that were lost in various merges
  # [#29079] Move jquery chosen call from template to components. Thanks Viet Vu
  # [#29072] Contact view to use plain, tabbed, and slider outputs from Bootstrap JHTML library. Thanks Dave
  # [#29126] Admin Template: Accordion fieldsets for template and category options like com_menus. Thanks Reinhard
  # [#29099] Drop the unused #__update_categories table. Thanks Rouven
  # [#29062] Remove unnecessary table creations from testing sampledata. Thanks Rouven
  # [#29077] Restore popup button behavior, add button for new slider behavior, implement it. Thanks Michael
  ...
  • Loading branch information
@andergmartins
andergmartins committed Sep 9, 2012
2 parents b0b2608 + 22560aa commit 9c8e01f
Show file tree
Hide file tree
Showing 305 changed files with 14,424 additions and 9,262 deletions.
2 changes: 0 additions & 2 deletions administrator/components/com_admin/models/profile.php
View file
Expand Up @@ -30,8 +30,6 @@ class AdminModelProfile extends UsersModelUser
*/
public function getForm($data = array(), $loadData = true)
{
$app = JFactory::getApplication();

// Get the form.
$form = $this->loadForm('com_admin.profile', 'profile', array('control' => 'jform', 'load_data' => $loadData));
if (empty($form)) {
Expand Down
4 changes: 4 additions & 0 deletions administrator/components/com_admin/sql/updates/mysql/3.0.0.sql
View file
Expand Up @@ -2,6 +2,9 @@
ALTER TABLE `#__users` DROP KEY `usertype`;
ALTER TABLE `#__session` DROP KEY `whosonline`;

# Remove unused table
DROP TABLE IF EXISTS `#__update_categories`;

# Remove unused columns
ALTER TABLE `#__contact_details` DROP `imagepos`;
ALTER TABLE `#__content` DROP COLUMN `title_alias`;
Expand All @@ -16,6 +19,7 @@ ALTER TABLE `#__weblinks` DROP COLUMN `approved`;
ALTER TABLE `#__menu` DROP COLUMN `ordering`;
ALTER TABLE `#__session` DROP COLUMN `usertype`;
ALTER TABLE `#__users` DROP COLUMN `usertype`;
ALTER TABLE `#__updates` DROP COLUMN `categoryid`;

# Unprotect a number of extensions
UPDATE `#__extensions` SET protected = 0 WHERE
Expand Down
1 change: 0 additions & 1 deletion administrator/components/com_banners/controllers/banners.php
View file
Expand Up @@ -56,7 +56,6 @@ public function sticky_publish()
// Check for request forgeries.
JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));

$user = JFactory::getUser();
$ids = $this->input->get('cid', array(), 'array');
$values = array('sticky_publish' => 1, 'sticky_unpublish' => 0);
$task = $this->getTask();
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_banners/controllers/tracks.raw.php
View file
Expand Up @@ -33,7 +33,7 @@ class BannersControllerTracks extends JControllerLegacy
* @return JModel
* @since 1.6
*/
public function getModel($name = 'Tracks', $prefix = 'BannersModel')
public function getModel($name = 'Tracks', $prefix = 'BannersModel', $config = array())
{
$model = parent::getModel($name, $prefix, array('ignore_request' => true));
return $model;
Expand Down
3 changes: 0 additions & 3 deletions administrator/components/com_banners/models/tracks.php
View file
Expand Up @@ -89,9 +89,6 @@ protected function populateState($ordering = null, $direction = null)
*/
protected function getListQuery()
{
// Get the application object
$app = JFactory::getApplication();

require_once JPATH_COMPONENT.'/helpers/banners.php';

// Create a new query object.
Expand Down
1 change: 1 addition & 0 deletions administrator/components/com_banners/views/banner/tmpl/edit.php
View file
Expand Up @@ -12,6 +12,7 @@
JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
JHtml::_('behavior.tooltip');
JHtml::_('behavior.formvalidation');
JHtml::_('jquery.chosen');
?>
<script type="text/javascript">
Joomla.submitbutton = function(task)
Expand Down
1 change: 1 addition & 0 deletions administrator/components/com_banners/views/banners/tmpl/default.php
View file
Expand Up @@ -13,6 +13,7 @@
JHtml::_('bootstrap.tooltip');
JHtml::_('behavior.multiselect');
JHtml::_('dropdown.init');
JHtml::_('jquery.chosen');

$user = JFactory::getUser();
$userId = $user->get('id');
Expand Down
2 changes: 2 additions & 0 deletions administrator/components/com_banners/views/client/tmpl/edit.php
View file
Expand Up @@ -12,6 +12,8 @@
JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
JHtml::_('behavior.tooltip');
JHtml::_('behavior.formvalidation');
JHtml::_('jquery.chosen');

$canDo = BannersHelper::getActions();
?>
<script type="text/javascript">
Expand Down
1 change: 1 addition & 0 deletions administrator/components/com_banners/views/clients/tmpl/default.php
View file
Expand Up @@ -13,6 +13,7 @@
JHtml::_('behavior.tooltip');
JHtml::_('behavior.multiselect');
JHtml::_('dropdown.init');
JHtml::_('jquery.chosen');

$user = JFactory::getUser();
$userId = $user->get('id');
Expand Down
1 change: 1 addition & 0 deletions administrator/components/com_banners/views/tracks/tmpl/default.php
View file
Expand Up @@ -13,6 +13,7 @@
JHtml::_('behavior.tooltip');
JHtml::_('behavior.multiselect');
JHtml::_('behavior.modal', 'a.modal');
JHtml::_('jquery.chosen');

$user = JFactory::getUser();
$userId = $user->get('id');
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_banners/views/tracks/view.html.php
View file
Expand Up @@ -60,7 +60,7 @@ protected function addToolbar()
JToolbarHelper::title(JText::_('COM_BANNERS_MANAGER_TRACKS'), 'banners-tracks.png');

$bar = JToolBar::getInstance('toolbar');
$bar->appendButton('Popup', 'export', 'JTOOLBAR_EXPORT', 'index.php?option=com_banners&amp;view=download&amp;tmpl=component', 600, 300);
$bar->appendButton('Slider', 'export', 'JTOOLBAR_EXPORT', 'index.php?option=com_banners&amp;view=download&amp;tmpl=component', 600, 300);
$document = JFactory::getDocument();
$app = JFactory::getApplication();
if ($canDo->get('core.delete')) {
Expand Down
2 changes: 0 additions & 2 deletions administrator/components/com_cache/models/cache.php
View file
Expand Up @@ -48,8 +48,6 @@ class CacheModelCache extends JModelList
*/
protected function populateState($ordering = null, $direction = null)
{
$app = JFactory::getApplication();

$clientId = $this->getUserStateFromRequest($this->context.'.filter.client_id', 'filter_client_id', 0, 'int');
$this->setState('clientId', $clientId == 1 ? 1 : 0);

Expand Down
2 changes: 2 additions & 0 deletions administrator/components/com_cache/views/cache/tmpl/default.php
View file
Expand Up @@ -9,6 +9,8 @@

defined('_JEXEC') or die;

JHtml::_('jquery.chosen');

$listOrder = $this->escape($this->state->get('list.ordering'));
$listDirn = $this->escape($this->state->get('list.direction'));
?>
Expand Down
1 change: 1 addition & 0 deletions administrator/components/com_categories/views/categories/tmpl/default.php
View file
Expand Up @@ -13,6 +13,7 @@
JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
JHtml::_('behavior.tooltip');
JHtml::_('behavior.multiselect');
JHtml::_('jquery.chosen');

$user = JFactory::getUser();
$userId = $user->get('id');
Expand Down
2 changes: 2 additions & 0 deletions administrator/components/com_categories/views/categories/tmpl/default_batch.php
View file
Expand Up @@ -9,6 +9,8 @@

defined('_JEXEC') or die;

JHtml::_('jquery.chosen');

$options = array(
JHtml::_('select.option', 'c', JText::_('JLIB_HTML_BATCH_COPY')),
JHtml::_('select.option', 'm', JText::_('JLIB_HTML_BATCH_MOVE'))
Expand Down
129 changes: 89 additions & 40 deletions administrator/components/com_categories/views/category/tmpl/edit.php
View file
Expand Up @@ -18,6 +18,8 @@
JHtml::_('behavior.tooltip');
JHtml::_('behavior.formvalidation');
JHtml::_('behavior.keepalive');
JHtml::_('jquery.chosen');

?>

<script type="text/javascript">
Expand Down Expand Up @@ -68,8 +70,6 @@
<?php echo $this->form->getInput('description'); ?>
</div>
</div>
</div>
<div class="tab-pane" id="options">
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('extension'); ?>
Expand All @@ -78,46 +78,94 @@
<?php echo $this->form->getInput('extension'); ?>
</div>
</div>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('parent_id'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('parent_id'); ?>
</div>
</div>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('published'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('published'); ?>
</div>
</div>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('access'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('access'); ?>
</div>
</div>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('language'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('language'); ?>
</div>
</div>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('id'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('id'); ?>

<div class="row-fluid">
<h4><?php echo JText::_('JDETAILS');?></h4>
<hr />

<div class="span6">
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('parent_id'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('parent_id'); ?>
</div>
</div>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('published'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('published'); ?>
</div>
</div>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('access'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('access'); ?>
</div>
</div>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('language'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('language'); ?>
</div>
</div>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('id'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('id'); ?>
</div>
</div>
</div>
<div class="span6">
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('created_user_id'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('created_user_id'); ?>
</div>
</div>
<?php if (intval($this->item->created_time)) : ?>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('created_time'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('created_time'); ?>
</div>
</div>
<?php endif; ?>
<?php if ($this->item->modified_user_id) : ?>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('modified_user_id'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('modified_user_id'); ?>
</div>
</div>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('modified_time'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('modified_time'); ?>
</div>
</div>
<?php endif; ?>
</div>
</div>
</div>
<div class="tab-pane" id="options">
<?php echo $this->loadTemplate('options'); ?>
</div>
<div class="tab-pane" id="metadata">
Expand All @@ -130,6 +178,7 @@
<?php endif; ?>
</div>
</fieldset>

<input type="hidden" name="task" value="" />
<?php echo JHtml::_('form.token'); ?>
</form>

0 comments on commit 9c8e01f

Please sign in to comment.