Permalink
Browse files

Code quality.

  • Loading branch information...
mbabker authored and infograf768 committed Sep 23, 2012
1 parent c4103b0 commit c61f1ee78b9514c29e932cb6439e8f0937c67f84
Showing with 4,323 additions and 4,302 deletions.
  1. +200 −200 administrator/components/com_banners/views/banners/tmpl/default.php
  2. +157 −157 administrator/components/com_banners/views/clients/tmpl/default.php
  3. +181 −181 administrator/components/com_categories/views/categories/tmpl/default.php
  4. +206 −206 administrator/components/com_contact/views/contacts/tmpl/default.php
  5. +202 −202 administrator/components/com_content/views/articles/tmpl/default.php
  6. +198 −198 administrator/components/com_content/views/featured/tmpl/default.php
  7. +118 −118 administrator/components/com_finder/views/filters/tmpl/default.php
  8. +115 −115 administrator/components/com_finder/views/index/tmpl/default.php
  9. +95 −95 administrator/components/com_finder/views/maps/tmpl/default.php
  10. +2 −2 administrator/components/com_installer/models/warnings.php
  11. +77 −77 administrator/components/com_installer/views/database/tmpl/default.php
  12. +2 −2 administrator/components/com_installer/views/default/view.php
  13. +80 −79 administrator/components/com_installer/views/languages/tmpl/default.php
  14. +2 −2 administrator/components/com_installer/views/manage/view.html.php
  15. +78 −78 administrator/components/com_installer/views/update/tmpl/default.php
  16. +25 −25 administrator/components/com_installer/views/warnings/tmpl/default.php
  17. +14 −12 administrator/components/com_joomlaupdate/controllers/update.php
  18. +28 −25 administrator/components/com_joomlaupdate/models/default.php
  19. +99 −100 administrator/components/com_languages/views/installed/tmpl/default.php
  20. +1 −1 administrator/components/com_languages/views/installed/view.html.php
  21. +74 −69 administrator/components/com_languages/views/language/view.html.php
  22. +144 −144 administrator/components/com_languages/views/languages/tmpl/default.php
  23. +0 −1 administrator/components/com_languages/views/languages/view.html.php
  24. +87 −87 administrator/components/com_languages/views/overrides/tmpl/default.php
  25. +1 −1 administrator/components/com_languages/views/overrides/view.html.php
  26. +220 −220 administrator/components/com_menus/views/items/tmpl/default.php
  27. +113 −113 administrator/components/com_menus/views/menus/tmpl/default.php
  28. +84 −84 administrator/components/com_messages/views/messages/tmpl/default.php
  29. +205 −206 administrator/components/com_modules/views/modules/tmpl/default.php
  30. +1 −1 administrator/components/com_modules/views/modules/view.html.php
  31. +195 −195 administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php
  32. +138 −140 administrator/components/com_plugins/views/plugins/tmpl/default.php
  33. +108 −103 administrator/components/com_plugins/views/plugins/view.html.php
  34. +100 −100 administrator/components/com_redirect/views/links/tmpl/default.php
  35. +35 −35 administrator/components/com_templates/views/styles/tmpl/default.php
  36. +1 −1 administrator/components/com_templates/views/templates/view.html.php
  37. +108 −108 administrator/components/com_users/views/debuggroup/tmpl/default.php
  38. +0 −1 administrator/components/com_users/views/debuggroup/view.html.php
  39. +108 −108 administrator/components/com_users/views/debuguser/tmpl/default.php
  40. +1 −1 administrator/components/com_users/views/debuguser/view.html.php
  41. +90 −90 administrator/components/com_users/views/groups/tmpl/default.php
  42. +0 −1 administrator/components/com_users/views/groups/view.html.php
  43. +102 −102 administrator/components/com_users/views/levels/tmpl/default.php
  44. +106 −106 administrator/components/com_users/views/notes/tmpl/default.php
  45. +138 −139 administrator/components/com_users/views/notes/view.html.php
  46. +154 −154 administrator/components/com_weblinks/views/weblinks/tmpl/default.php
  47. +2 −2 administrator/includes/toolbar.php
  48. +2 −2 administrator/templates/hathor/index.php
  49. +2 −2 administrator/templates/isis/index.php
  50. +11 −1 build/phpcs/Joomla/ruleset.xml
  51. +3 −3 components/com_contact/views/category/tmpl/default_items.php
  52. +2 −2 components/com_contact/views/contact/tmpl/default_address.php
  53. +5 −5 components/com_content/views/archive/tmpl/default_items.php
  54. +6 −6 components/com_content/views/article/tmpl/default.php
  55. +7 −7 components/com_content/views/category/tmpl/blog_item.php
  56. +5 −5 components/com_content/views/featured/tmpl/default_item.php
  57. +5 −5 components/com_search/models/search.php
  58. +2 −2 components/com_weblinks/views/category/tmpl/default_items.php
  59. +25 −22 libraries/cms/html/bootstrap.php
  60. +2 −1 libraries/cms/html/formbehavior.php
  61. +1 −1 libraries/cms/html/sidebar.php
  62. +11 −11 libraries/cms/schema/changeitem/postgresql.php
  63. +0 −1 modules/mod_menu/helper.php
  64. +1 −1 modules/mod_related_items/helper.php
  65. +21 −21 templates/beez3/html/com_contact/contact/default.php
  66. +1 −1 templates/beez3/html/com_contact/contact/default_form.php
  67. +3 −3 templates/beez3/html/com_contact/contact/default_links.php
  68. +2 −2 templates/beez3/html/com_contact/contact/default_profile.php
  69. +1 −1 templates/beez3/html/com_newsfeeds/category/default_items.php
  70. +2 −2 templates/beez3/html/com_weblinks/category/default_items.php
  71. +2 −2 templates/beez3/html/com_weblinks/form/edit.php
  72. +4 −4 templates/beez3/index.php
  73. +2 −2 templates/protostar/index.php

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -39,162 +39,162 @@
</script>
<form action="<?php echo JRoute::_('index.php?option=com_banners&view=clients'); ?>" method="post" name="adminForm" id="adminForm">
<?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">
- <?php endif;?>
- <div id="filter-bar" class="btn-toolbar">
- <div class="filter-search btn-group pull-left">
- <label for="filter_search" class="element-invisible"><?php echo JText::_('COM_BANNERS_SEARCH_IN_TITLE');?></label>
- <input type="text" name="filter_search" id="filter_search" placeholder="<?php echo JText::_('COM_BANNERS_SEARCH_IN_TITLE'); ?>" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_BANNERS_SEARCH_IN_TITLE'); ?>" />
- </div>
- <div class="btn-group pull-left">
- <button class="btn hasTooltip" type="submit" title="<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?>"><i class="icon-search"></i></button>
- <button class="btn hasTooltip" type="button" title="<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?>" onclick="document.id('filter_search').value='';this.form.submit();"><i class="icon-remove"></i></button>
- </div>
- <div class="btn-group pull-right hidden-phone">
- <label for="limit" class="element-invisible"><?php echo JText::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC');?></label>
- <?php echo $this->pagination->getLimitBox(); ?>
- </div>
- <div class="btn-group pull-right hidden-phone">
- <label for="directionTable" class="element-invisible"><?php echo JText::_('JFIELD_ORDERING_DESC');?></label>
- <select name="directionTable" id="directionTable" class="input-medium" onchange="Joomla.orderTable()">
- <option value=""><?php echo JText::_('JFIELD_ORDERING_DESC');?></option>
- <option value="asc" <?php if ($listDirn == 'asc') echo 'selected="selected"'; ?>><?php echo JText::_('JGLOBAL_ORDER_ASCENDING');?></option>
- <option value="desc" <?php if ($listDirn == 'desc') echo 'selected="selected"'; ?>><?php echo JText::_('JGLOBAL_ORDER_DESCENDING');?></option>
- </select>
- </div>
- <div class="btn-group pull-right">
- <label for="sortTable" class="element-invisible"><?php echo JText::_('JGLOBAL_SORT_BY');?></label>
- <select name="sortTable" id="sortTable" class="input-medium" onchange="Joomla.orderTable()">
- <option value=""><?php echo JText::_('JGLOBAL_SORT_BY');?></option>
- <?php echo JHtml::_('select.options', $sortFields, 'value', 'text', $listOrder);?>
- </select>
- </div>
- </div>
- <div class="clearfix"> </div>
- <table class="table table-striped">
- <thead>
- <tr>
- <th width="1%" class="hidden-phone">
- <input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
- </th>
- <th width="5%" class="center">
- <?php echo JHtml::_('grid.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
- </th>
- <th>
- <?php echo JText::_('COM_BANNERS_HEADING_CLIENT'); ?>
- </th>
- <th width="20%" class="hidden-phone">
- <?php echo JText::_('COM_BANNERS_HEADING_CONTACT'); ?>
- </th>
- <th width="5%" class="hidden-phone">
- <?php echo JText::_('COM_BANNERS_HEADING_ACTIVE'); ?>
- </th>
- <th width="10%" class="hidden-phone">
- <?php echo JText::_('COM_BANNERS_HEADING_PURCHASETYPE'); ?>
- </th>
- <th width="1%" class="nowrap hidden-phone">
- <?php echo JText::_('JGRID_HEADING_ID'); ?>
- </th>
- </tr>
- </thead>
- <tfoot>
- <tr>
- <td colspan="8">
- <?php echo $this->pagination->getListFooter(); ?>
- </td>
- </tr>
- </tfoot>
- <tbody>
- <?php foreach ($this->items as $i => $item) :
- $ordering = ($listOrder == 'ordering');
- $canCreate = $user->authorise('core.create', 'com_banners');
- $canEdit = $user->authorise('core.edit', 'com_banners');
- $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->get('id') || $item->checked_out == 0;
- $canChange = $user->authorise('core.edit.state', 'com_banners') && $canCheckin;
- ?>
- <tr class="row<?php echo $i % 2; ?>">
- <td class="center hidden-phone">
- <?php echo JHtml::_('grid.id', $i, $item->id); ?>
- </td>
- <td class="center">
- <?php echo JHtml::_('jgrid.published', $item->state, $i, 'clients.', $canChange);?>
- </td>
- <td class="nowrap has-context">
- <div class="pull-left">
- <?php if ($item->checked_out) : ?>
- <?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'clients.', $canCheckin); ?>
- <?php endif; ?>
- <?php if ($canEdit) : ?>
- <a href="<?php echo JRoute::_('index.php?option=com_banners&task=client.edit&id='.(int) $item->id); ?>">
- <?php echo $this->escape($item->name); ?></a>
- <?php else : ?>
- <?php echo $this->escape($item->name); ?>
- <?php endif; ?>
- </div>
- <div class="pull-left">
- <?php
- // Create dropdown items
- JHtml::_('dropdown.edit', $item->id, 'client.');
- JHtml::_('dropdown.divider');
- if ($item->state) :
- JHtml::_('dropdown.unpublish', 'cb' . $i, 'clients.');
- else :
- JHtml::_('dropdown.publish', 'cb' . $i, 'clients.');
- endif;
-
- JHtml::_('dropdown.divider');
-
- if ($archived) :
- JHtml::_('dropdown.unarchive', 'cb' . $i, 'clients.');
- else :
- JHtml::_('dropdown.archive', 'cb' . $i, 'clients.');
- endif;
-
- if ($item->checked_out) :
- JHtml::_('dropdown.checkin', 'cb' . $i, 'clients.');
- endif;
-
- if ($trashed) :
- JHtml::_('dropdown.untrash', 'cb' . $i, 'clients.');
- else :
- JHtml::_('dropdown.trash', 'cb' . $i, 'clients.');
- endif;
-
- // render dropdown list
- echo JHtml::_('dropdown.render');
- ?>
- </div>
- </td>
- <td class="small hidden-phone">
- <?php echo $item->contact;?>
- </td>
- <td class="center hidden-phone">
- <?php echo $item->nbanners; ?>
- </td>
- <td class="small hidden-phone">
- <?php if ($item->purchase_type < 0):?>
- <?php echo JText::sprintf('COM_BANNERS_DEFAULT', JText::_('COM_BANNERS_FIELD_VALUE_'.$params->get('purchase_type')));?>
- <?php else:?>
- <?php echo JText::_('COM_BANNERS_FIELD_VALUE_'.$item->purchase_type);?>
- <?php endif;?>
- </td>
- <td class="center hidden-phone">
- <?php echo $item->id; ?>
- </td>
- </tr>
- <?php endforeach; ?>
- </tbody>
- </table>
-
- <input type="hidden" name="task" value="" />
- <input type="hidden" name="boxchecked" value="0" />
- <input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
- <input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
- <?php echo JHtml::_('form.token'); ?>
+ <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="filter-bar" class="btn-toolbar">
+ <div class="filter-search btn-group pull-left">
+ <label for="filter_search" class="element-invisible"><?php echo JText::_('COM_BANNERS_SEARCH_IN_TITLE');?></label>
+ <input type="text" name="filter_search" id="filter_search" placeholder="<?php echo JText::_('COM_BANNERS_SEARCH_IN_TITLE'); ?>" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_BANNERS_SEARCH_IN_TITLE'); ?>" />
+ </div>
+ <div class="btn-group pull-left">
+ <button class="btn hasTooltip" type="submit" title="<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?>"><i class="icon-search"></i></button>
+ <button class="btn hasTooltip" type="button" title="<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?>" onclick="document.id('filter_search').value='';this.form.submit();"><i class="icon-remove"></i></button>
+ </div>
+ <div class="btn-group pull-right hidden-phone">
+ <label for="limit" class="element-invisible"><?php echo JText::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC');?></label>
+ <?php echo $this->pagination->getLimitBox(); ?>
+ </div>
+ <div class="btn-group pull-right hidden-phone">
+ <label for="directionTable" class="element-invisible"><?php echo JText::_('JFIELD_ORDERING_DESC');?></label>
+ <select name="directionTable" id="directionTable" class="input-medium" onchange="Joomla.orderTable()">
+ <option value=""><?php echo JText::_('JFIELD_ORDERING_DESC');?></option>
+ <option value="asc" <?php if ($listDirn == 'asc') echo 'selected="selected"'; ?>><?php echo JText::_('JGLOBAL_ORDER_ASCENDING');?></option>
+ <option value="desc" <?php if ($listDirn == 'desc') echo 'selected="selected"'; ?>><?php echo JText::_('JGLOBAL_ORDER_DESCENDING');?></option>
+ </select>
+ </div>
+ <div class="btn-group pull-right">
+ <label for="sortTable" class="element-invisible"><?php echo JText::_('JGLOBAL_SORT_BY');?></label>
+ <select name="sortTable" id="sortTable" class="input-medium" onchange="Joomla.orderTable()">
+ <option value=""><?php echo JText::_('JGLOBAL_SORT_BY');?></option>
+ <?php echo JHtml::_('select.options', $sortFields, 'value', 'text', $listOrder);?>
+ </select>
+ </div>
+ </div>
+ <div class="clearfix"> </div>
+ <table class="table table-striped">
+ <thead>
+ <tr>
+ <th width="1%" class="hidden-phone">
+ <input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+ </th>
+ <th width="5%" class="center">
+ <?php echo JHtml::_('grid.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
+ </th>
+ <th>
+ <?php echo JText::_('COM_BANNERS_HEADING_CLIENT'); ?>
+ </th>
+ <th width="20%" class="hidden-phone">
+ <?php echo JText::_('COM_BANNERS_HEADING_CONTACT'); ?>
+ </th>
+ <th width="5%" class="hidden-phone">
+ <?php echo JText::_('COM_BANNERS_HEADING_ACTIVE'); ?>
+ </th>
+ <th width="10%" class="hidden-phone">
+ <?php echo JText::_('COM_BANNERS_HEADING_PURCHASETYPE'); ?>
+ </th>
+ <th width="1%" class="nowrap hidden-phone">
+ <?php echo JText::_('JGRID_HEADING_ID'); ?>
+ </th>
+ </tr>
+ </thead>
+ <tfoot>
+ <tr>
+ <td colspan="8">
+ <?php echo $this->pagination->getListFooter(); ?>
+ </td>
+ </tr>
+ </tfoot>
+ <tbody>
+ <?php foreach ($this->items as $i => $item) :
+ $ordering = ($listOrder == 'ordering');
+ $canCreate = $user->authorise('core.create', 'com_banners');
+ $canEdit = $user->authorise('core.edit', 'com_banners');
+ $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->get('id') || $item->checked_out == 0;
+ $canChange = $user->authorise('core.edit.state', 'com_banners') && $canCheckin;
+ ?>
+ <tr class="row<?php echo $i % 2; ?>">
+ <td class="center hidden-phone">
+ <?php echo JHtml::_('grid.id', $i, $item->id); ?>
+ </td>
+ <td class="center">
+ <?php echo JHtml::_('jgrid.published', $item->state, $i, 'clients.', $canChange);?>
+ </td>
+ <td class="nowrap has-context">
+ <div class="pull-left">
+ <?php if ($item->checked_out) : ?>
+ <?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'clients.', $canCheckin); ?>
+ <?php endif; ?>
+ <?php if ($canEdit) : ?>
+ <a href="<?php echo JRoute::_('index.php?option=com_banners&task=client.edit&id='.(int) $item->id); ?>">
+ <?php echo $this->escape($item->name); ?></a>
+ <?php else : ?>
+ <?php echo $this->escape($item->name); ?>
+ <?php endif; ?>
+ </div>
+ <div class="pull-left">
+ <?php
+ // Create dropdown items
+ JHtml::_('dropdown.edit', $item->id, 'client.');
+ JHtml::_('dropdown.divider');
+ if ($item->state) :
+ JHtml::_('dropdown.unpublish', 'cb' . $i, 'clients.');
+ else :
+ JHtml::_('dropdown.publish', 'cb' . $i, 'clients.');
+ endif;
+
+ JHtml::_('dropdown.divider');
+
+ if ($archived) :
+ JHtml::_('dropdown.unarchive', 'cb' . $i, 'clients.');
+ else :
+ JHtml::_('dropdown.archive', 'cb' . $i, 'clients.');
+ endif;
+
+ if ($item->checked_out) :
+ JHtml::_('dropdown.checkin', 'cb' . $i, 'clients.');
+ endif;
+
+ if ($trashed) :
+ JHtml::_('dropdown.untrash', 'cb' . $i, 'clients.');
+ else :
+ JHtml::_('dropdown.trash', 'cb' . $i, 'clients.');
+ endif;
+
+ // render dropdown list
+ echo JHtml::_('dropdown.render');
+ ?>
+ </div>
+ </td>
+ <td class="small hidden-phone">
+ <?php echo $item->contact;?>
+ </td>
+ <td class="center hidden-phone">
+ <?php echo $item->nbanners; ?>
+ </td>
+ <td class="small hidden-phone">
+ <?php if ($item->purchase_type < 0):?>
+ <?php echo JText::sprintf('COM_BANNERS_DEFAULT', JText::_('COM_BANNERS_FIELD_VALUE_'.$params->get('purchase_type')));?>
+ <?php else:?>
+ <?php echo JText::_('COM_BANNERS_FIELD_VALUE_'.$item->purchase_type);?>
+ <?php endif;?>
+ </td>
+ <td class="center hidden-phone">
+ <?php echo $item->id; ?>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+
+ <input type="hidden" name="task" value="" />
+ <input type="hidden" name="boxchecked" value="0" />
+ <input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+ <input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+ <?php echo JHtml::_('form.token'); ?>
</div>
</form>
Oops, something went wrong.

0 comments on commit c61f1ee

Please sign in to comment.