Permalink
Browse files

#[#29274] Fix code style and unclear doc blocks from 29050. Thanks

Michael
  • Loading branch information...
1 parent 354cbd9 commit 31690e9eb316bb2904df8b096fdd0708f3e599aa @mbabker mbabker committed with infograf768 Sep 22, 2012
@@ -585,9 +585,7 @@ public static function preferences($component, $height = '550', $width = '875',
*
* @package Joomla.Administrator
* @since 1.5
- *
- * @deprecated 3.1 Use JHtmlSidebar instead.
- *
+ * @deprecated 4.0 Use JHtmlSidebar instead.
*/
abstract class JSubMenuHelper
{
@@ -596,6 +594,7 @@ public static function preferences($component, $height = '550', $width = '875',
*
* @var array
* @since 3.0
+ * @deprecated 4.0
*/
protected static $entries = array();
@@ -604,6 +603,7 @@ public static function preferences($component, $height = '550', $width = '875',
*
* @var array
* @since 3.0
+ * @deprecated 4.0
*/
protected static $filters = array();
@@ -612,6 +612,7 @@ public static function preferences($component, $height = '550', $width = '875',
*
* @var string
* @since 3.0
+ * @deprecated 4.0
*/
protected static $action = '';
@@ -624,28 +625,26 @@ public static function preferences($component, $height = '550', $width = '875',
*
* @return void
*
- * @deprecated 3.1 Use JHtmlSidebar::addEntry() instead.
- *
* @since 1.5
+ * @deprecated 4.0 Use JHtmlSidebar::addEntry() instead.
*/
public static function addEntry($name, $link = '', $active = false)
{
- JLog::add('JSubMenuHelper::addEntry() is deprecated. Use JHtmlSidebar::addEntry() instead.', JLog::WARNING, 'deprecated');
- array_push(self::$entries, array($name, $link, $active));
+ JLog::add('JSubMenuHelper::addEntry() is deprecated. Use JHtmlSidebar::addEntry() instead.', JLog::WARNING, 'deprecated');
+ array_push(self::$entries, array($name, $link, $active));
}
/**
* Returns an array of all submenu entries
*
* @return array
- *
- * @deprecated 3.1 Use JHtmlSidebar::getEntries() instead.
*
* @since 3.0
+ * @deprecated 4.0 Use JHtmlSidebar::getEntries() instead.
*/
public static function getEntries()
{
- JLog::add('JSubMenuHelper::getEntries() is deprecated. Use JHtmlSidebar::getEntries() instead.', JLog::WARNING, 'deprecated');
+ JLog::add('JSubMenuHelper::getEntries() is deprecated. Use JHtmlSidebar::getEntries() instead.', JLog::WARNING, 'deprecated');
return self::$entries;
}
@@ -658,59 +657,57 @@ public static function getEntries()
* @param bool $noDefault Don't the label as the empty option
*
* @return void
- *
- * @deprecated 3.1 Use JHtmlSidebar::addFilter() instead.
*
* @since 3.0
+ * @deprecated 4.0 Use JHtmlSidebar::addFilter() instead.
*/
public static function addFilter($label, $name, $options, $noDefault = false)
{
- JLog::add('JSubMenuHelper::addFilter() is deprecated. Use JHtmlSidebar::addFilter() instead.', JLog::WARNING, 'deprecated');
- array_push(self::$filters, array('label' => $label, 'name' => $name, 'options' => $options, 'noDefault' => $noDefault));
+ JLog::add('JSubMenuHelper::addFilter() is deprecated. Use JHtmlSidebar::addFilter() instead.', JLog::WARNING, 'deprecated');
+ array_push(self::$filters, array('label' => $label, 'name' => $name, 'options' => $options, 'noDefault' => $noDefault));
}
/**
* Returns an array of all filters
*
* @return array
- *
- * @deprecated 3.1 Use JHtmlSidebar::getFilters() instead.
*
* @since 3.0
+ * @deprecated 4.0 Use JHtmlSidebar::getFilters() instead.
*/
public static function getFilters()
{
- JLog::add('JSubMenuHelper::getFilters() is deprecated. Use JHtmlSidebar::getFilters() instead.', JLog::WARNING, 'deprecated');
+ JLog::add('JSubMenuHelper::getFilters() is deprecated. Use JHtmlSidebar::getFilters() instead.', JLog::WARNING, 'deprecated');
return self::$filters;
}
/**
* Set value for the action attribute of the filter form
*
+ * @param string $action Value for the action attribute of the form
+ *
* @return void
- *
- * @deprecated 3.1 Use JHtmlSidebar::setAction() instead.
*
* @since 3.0
+ * @deprecated 4.0 Use JHtmlSidebar::setAction() instead.
*/
public static function setAction($action)
{
- JLog::add('JSubMenuHelper::setAction() is deprecated. Use JHtmlSidebar::setAction() instead.', JLog::WARNING, 'deprecated');
- self::$action = $action;
+ JLog::add('JSubMenuHelper::setAction() is deprecated. Use JHtmlSidebar::setAction() instead.', JLog::WARNING, 'deprecated');
+ self::$action = $action;
}
/**
* Get value for the action attribute of the filter form
*
- * @return string
- *
- * @deprecated 3.1 Use JHtmlSidebar::getAction() instead.
+ * @return string Value for the action attribute of the form
*
* @since 3.0
+ * @deprecated 4.0 Use JHtmlSidebar::getAction() instead.
*/
public static function getAction()
{
- JLog::add('JSubMenuHelper::getAction() is deprecated. Use JHtmlSidebar::getAction() instead.', JLog::WARNING, 'deprecated');
+ JLog::add('JSubMenuHelper::getAction() is deprecated. Use JHtmlSidebar::getAction() instead.', JLog::WARNING, 'deprecated');
return self::$action;
}
}
View
@@ -37,7 +37,8 @@ $ -> Language fix or change
+$ Adding installation languages: ar-AA, az-AZ, ckb-IQ, fi-FI
# Correcting double translation
# Correcting lang string typo
- # [#29050] Page Navigation in Extension Manager not working. Thanks yannick
+ # [#29050] Page Navigation in Extension Manager not working. Thanks Yannick
+ #[#29274] Fix code style and unclear doc blocks from 29050. Thanks Michael
21-Sep-2012 Jean-Marie Simonet
+$ Adding installation languages: km-KH, sv-SE
@@ -10,29 +10,25 @@
defined('JPATH_BASE') or die;
?>
-
<div id="sidebar">
<div class="sidebar-nav">
<?php if ($displayData->displayMenu) : ?>
<ul id="submenu" class="nav nav-list">
- <?php foreach ($displayData->list as $item) : ?>
- <?php if (isset ($item[2]) && $item[2] == 1) :
- ?><li class="active"><?php
- else :
- ?><li><?php
- endif;
- ?>
- <?php
- if ($displayData->hide) :
- ?><a class="nolink"><?php echo $item[0]; ?><?php
- else :
- if(strlen($item[1])) :
- ?><a href="<?php echo JFilterOutput::ampReplace($item[1]); ?>"><?php echo $item[0]; ?></a><?php
- else :
- ?><?php echo $item[0]; ?><?php
- endif;
- endif;
- ?>
+ <?php foreach ($displayData->list as $item) :
+ if (isset ($item[2]) && $item[2] == 1) : ?>
+ <li class="active">
+ <?php else : ?>
+ <li>
+ <?php endif;
+ if ($displayData->hide) : ?>
+ <a class="nolink"><?php echo $item[0]; ?>
+ <?php else :
+ if(strlen($item[1])) : ?>
+ <a href="<?php echo JFilterOutput::ampReplace($item[1]); ?>"><?php echo $item[0]; ?></a>
+ <?php else : ?>
+ <?php echo $item[0]; ?>
+ <?php endif;
+ endif; ?>
</li>
<?php endforeach; ?>
</ul>
@@ -43,17 +39,17 @@
<?php if ($displayData->displayFilters) : ?>
<div class="filter-select hidden-phone">
<h4 class="page-header"><?php echo JText::_('JSEARCH_FILTER_LABEL');?></h4>
- <?php foreach ($displayData->filters as $filter) : ?>
- <label for="<?php echo $filter['name']; ?>" class="element-invisible"><?php echo $filter['label']; ?></label>
- <select name="<?php echo $filter['name']; ?>" id="<?php echo $filter['name']; ?>" class="span12 small" onchange="this.form.submit()">
- <?php if (!$filter['noDefault']) : ?>
- <option value=""><?php echo $filter['label']; ?></option>
- <?php endif; ?>
- <?php echo $filter['options']; ?>
- </select>
- <hr class="hr-condensed" />
- <?php endforeach; ?>
+ <?php foreach ($displayData->filters as $filter) : ?>
+ <label for="<?php echo $filter['name']; ?>" class="element-invisible"><?php echo $filter['label']; ?></label>
+ <select name="<?php echo $filter['name']; ?>" id="<?php echo $filter['name']; ?>" class="span12 small" onchange="this.form.submit()">
+ <?php if (!$filter['noDefault']) : ?>
+ <option value=""><?php echo $filter['label']; ?></option>
+ <?php endif; ?>
+ <?php echo $filter['options']; ?>
+ </select>
+ <hr class="hr-condensed" />
+ <?php endforeach; ?>
</div>
<?php endif; ?>
</div>
-</div>
+</div>
Oops, something went wrong.

0 comments on commit 31690e9

Please sign in to comment.