Skip to content

Commit

Permalink
Merge branch '4.0-dev' into noresults_round1
Browse files Browse the repository at this point in the history
  • Loading branch information
@infograf768
infograf768 committed Jan 16, 2018
2 parents 1f485ee + 57a4fde commit 4b41965
Show file tree
Hide file tree
Showing 448 changed files with 18,837 additions and 16,242 deletions.
4 changes: 2 additions & 2 deletions Gruntfile.js
View file
Expand Up @@ -759,7 +759,7 @@ module.exports = function(grunt) {
grunt.registerTask('compile:site', 'Compiles the stylesheets files for the site template', function() {
grunt.task.run([
'uglify:templates',
'scsslint:site',
//'scsslint:site',
'sass:site',
'postcss:site',
'cssmin:site',
Expand All @@ -771,7 +771,7 @@ module.exports = function(grunt) {
grunt.registerTask('compile:admin', 'Compiles the stylesheets files for the admin template', function() {
grunt.task.run([
'uglify:templates',
'scsslint:admin',
//'scsslint:admin',
'sass:admin',
'postcss:admin',
'cssmin:admin',
Expand Down
56 changes: 0 additions & 56 deletions administrator/components/com_admin/postinstall/joomla40checks.php
View file

This file was deleted.

8 changes: 4 additions & 4 deletions administrator/components/com_associations/tmpl/associations/default.php
View file
Expand Up @@ -63,11 +63,11 @@
</th>
<?php endif; ?>
<?php if (!empty($this->typeFields['access'])) : ?>
<th style="width:5%" class="nowrap hidden-sm-down">
<th style="width:5%" class="nowrap d-none d-md-table-cell">
<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); $colSpan++; ?>
</th>
<?php endif; ?>
<th style="width:1%" class="nowrap hidden-sm-down text-center">
<th style="width:1%" class="nowrap d-none d-md-table-cell text-center">
<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'id', $listDirn, $listOrder); ?>
</th>
</tr>
Expand Down Expand Up @@ -132,11 +132,11 @@
</td>
<?php endif; ?>
<?php if (!empty($this->typeFields['access'])) : ?>
<td class="small hidden-sm-down">
<td class="small d-none d-md-table-cell">
<?php echo $this->escape($item->access_level); ?>
</td>
<?php endif; ?>
<td class="hidden-sm-down text-center">
<td class="d-none d-md-table-cell text-center">
<?php echo $item->id; ?>
</td>
</tr>
Expand Down
8 changes: 4 additions & 4 deletions administrator/components/com_associations/tmpl/associations/modal.php
View file
Expand Up @@ -76,11 +76,11 @@
</th>
<?php endif; ?>
<?php if (!empty($this->typeSupports['acl'])) : ?>
<th style="width:5%" class="nowrap hidden-xs-down">
<th style="width:5%" class="nowrap d-none d-sm-table-cell">
<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); $colSpan++; ?>
</th>
<?php endif; ?>
<th style="width:1%" class="nowrap hidden-xs-down">
<th style="width:1%" class="nowrap d-none d-sm-table-cell">
<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'id', $listDirn, $listOrder); ?>
</th>
</tr>
Expand Down Expand Up @@ -144,11 +144,11 @@
</td>
<?php endif; ?>
<?php if (!empty($this->typeSupports['acl'])) : ?>
<td class="small hidden-xs-down">
<td class="small d-none d-sm-table-cell">
<?php echo $this->escape($item->access_level); ?>
</td>
<?php endif; ?>
<td class="hidden-xs-down">
<td class="d-none d-sm-table-cell">
<?php echo $item->id; ?>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_banners/Field/ClicksField.php
View file
Expand Up @@ -40,7 +40,7 @@ protected function getInput()

return '<div class="input-group"><input class="form-control type="text" name="' . $this->name . '" id="' . $this->id . '" value="'
. htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '" readonly="readonly">'
. '<span class="input-group-btn"><a class="btn btn-secondary" ' . $onclick . '>'
. '<span class="input-group-append"><a class="btn btn-secondary" ' . $onclick . '>'
. '<span class="icon-refresh" aria-hidden="true"></span> ' . \JText::_('COM_BANNERS_RESET_CLICKS') . '</a></span></div>';
}
}
2 changes: 1 addition & 1 deletion administrator/components/com_banners/Field/ImpmadeField.php
View file
Expand Up @@ -40,7 +40,7 @@ protected function getInput()

return '<div class="input-group"><input class="form-control" type="text" name="' . $this->name . '" id="' . $this->id . '" value="'
. htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '" readonly="readonly">'
. '<span class="input-group-btn"><a class="btn btn-secondary" ' . $onclick . '>'
. '<span class="input-group-append"><a class="btn btn-secondary" ' . $onclick . '>'
. '<span class="icon-refresh" aria-hidden="true"></span> ' . \JText::_('COM_BANNERS_RESET_IMPMADE') . '</a></span></div>';
}
}
6 changes: 3 additions & 3 deletions administrator/components/com_banners/Table/BannerTable.php
View file
Expand Up @@ -235,7 +235,7 @@ public function store($updateNulls = false)
{
// Get the old row
/** @var Banner $oldrow */
$oldrow = Table::getInstance('Banner', __NAMESPACE__ . '\\');
$oldrow = Table::getInstance('BannerTable', __NAMESPACE__ . '\\');

if (!$oldrow->load($this->id) && $oldrow->getError())
{
Expand All @@ -244,7 +244,7 @@ public function store($updateNulls = false)

// Verify that the alias is unique
/** @var Banner $table */
$table = Table::getInstance('Banner', __NAMESPACE__ . '\\');
$table = Table::getInstance('BannerTable', __NAMESPACE__ . '\\');

if ($table->load(array('alias' => $this->alias, 'catid' => $this->catid)) && ($table->id != $this->id || $this->id == 0))
{
Expand Down Expand Up @@ -307,7 +307,7 @@ public function stick($pks = null, $state = 1, $userId = 0)

// Get an instance of the table
/** @var Banner $table */
$table = Table::getInstance('Banner', __NAMESPACE__ . '\\');
$table = Table::getInstance('BannerTable', __NAMESPACE__ . '\\');

// For all keys
foreach ($pks as $pk)
Expand Down
28 changes: 14 additions & 14 deletions administrator/components/com_banners/tmpl/banners/default.php
View file
Expand Up @@ -43,7 +43,7 @@
<table class="table table-striped" id="articleList">
<thead>
<tr>
<th style="width:1%" class="nowrap text-center hidden-sm-down">
<th style="width:1%" class="nowrap text-center d-none d-md-table-cell">
<?php echo JHtml::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
</th>
<th style="width:1%" class="text-center">
Expand All @@ -55,24 +55,24 @@
<th>
<?php echo JHtml::_('searchtools.sort', 'COM_BANNERS_HEADING_NAME', 'a.name', $listDirn, $listOrder); ?>
</th>
<th style="width:10%" class="nowrap text-center hidden-sm-down">
<th style="width:10%" class="nowrap text-center d-none d-md-table-cell">
<?php echo JHtml::_('searchtools.sort', 'COM_BANNERS_HEADING_STICKY', 'a.sticky', $listDirn, $listOrder); ?>
</th>
<th style="width:10%" class="nowrap hidden-sm-down text-center">
<th style="width:10%" class="nowrap d-none d-md-table-cell text-center">
<?php echo JHtml::_('searchtools.sort', 'COM_BANNERS_HEADING_CLIENT', 'client_name', $listDirn, $listOrder); ?>
</th>
<th style="width:10%" class="nowrap hidden-sm-down text-center">
<th style="width:10%" class="nowrap d-none d-md-table-cell text-center">
<?php echo JHtml::_('searchtools.sort', 'COM_BANNERS_HEADING_IMPRESSIONS', 'impmade', $listDirn, $listOrder); ?>
</th>
<th style="width:10%" class="nowrap hidden-sm-down text-center">
<th style="width:10%" class="nowrap d-none d-md-table-cell text-center">
<?php echo JHtml::_('searchtools.sort', 'COM_BANNERS_HEADING_CLICKS', 'clicks', $listDirn, $listOrder); ?>
</th>
<?php if (JLanguageMultilang::isEnabled()) : ?>
<th style="width:10%" class="nowrap hidden-sm-down text-center">
<th style="width:10%" class="nowrap d-none d-md-table-cell text-center">
<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'a.language', $listDirn, $listOrder); ?>
</th>
<?php endif; ?>
<th style="width:5%" class="nowrap hidden-sm-down text-center">
<th style="width:5%" class="nowrap d-none d-md-table-cell text-center">
<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
</th>
</tr>
Expand All @@ -94,7 +94,7 @@
$canChange = $user->authorise('core.edit.state', 'com_banners.category.' . $item->catid) && $canCheckin;
?>
<tr class="row<?php echo $i % 2; ?>" data-dragable-group="<?php echo $item->catid; ?>">
<td class="order nowrap text-center hidden-sm-down">
<td class="order nowrap text-center d-none d-md-table-cell">
<?php
$iconClass = '';

Expand Down Expand Up @@ -143,25 +143,25 @@
</div>
</div>
</td>
<td class="text-center hidden-sm-down text-center">
<td class="text-center d-none d-md-table-cell text-center">
<?php echo JHtml::_('banner.pinned', $item->sticky, $i, $canChange); ?>
</td>
<td class="small hidden-sm-down text-center">
<td class="small d-none d-md-table-cell text-center">
<?php echo $item->client_name; ?>
</td>
<td class="small hidden-sm-down text-center">
<td class="small d-none d-md-table-cell text-center">
<?php echo JText::sprintf('COM_BANNERS_IMPRESSIONS', $item->impmade, $item->imptotal ?: JText::_('COM_BANNERS_UNLIMITED')); ?>
</td>
<td class="small hidden-sm-down text-center">
<td class="small d-none d-md-table-cell text-center">
<?php echo $item->clicks; ?> -
<?php echo sprintf('%.2f%%', $item->impmade ? 100 * $item->clicks / $item->impmade : 0); ?>
</td>
<?php if (JLanguageMultilang::isEnabled()) : ?>
<td class="small nowrap hidden-sm-down text-center">
<td class="small nowrap d-none d-md-table-cell text-center">
<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
</td>
<?php endif; ?>
<td class="hidden-sm-down text-center">
<td class="d-none d-md-table-cell text-center">
<?php echo $item->id; ?>
</td>
</tr>
Expand Down
28 changes: 14 additions & 14 deletions administrator/components/com_banners/tmpl/clients/default.php
View file
Expand Up @@ -54,33 +54,33 @@
<th>
<?php echo JHtml::_('searchtools.sort', 'COM_BANNERS_HEADING_CLIENT', 'a.name', $listDirn, $listOrder); ?>
</th>
<th style="width:15%" class="hidden-sm-down text-center">
<th style="width:15%" class="d-none d-md-table-cell text-center">
<?php echo JHtml::_('searchtools.sort', 'COM_BANNERS_HEADING_CONTACT', 'a.contact', $listDirn, $listOrder); ?>
</th>
<th style="width:3%" class="nowrap text-center hidden-sm-down">
<th style="width:3%" class="nowrap text-center d-none d-md-table-cell">
<span class="icon-publish hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_BANNERS_COUNT_PUBLISHED_ITEMS'); ?>">
<span class="sr-only"><?php echo JText::_('COM_BANNERS_COUNT_PUBLISHED_ITEMS'); ?></span>
</span>
</th>
<th style="width:3%" class="nowrap text-center hidden-sm-down">
<th style="width:3%" class="nowrap text-center d-none d-md-table-cell">
<span class="icon-unpublish hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_BANNERS_COUNT_UNPUBLISHED_ITEMS'); ?>">
<span class="sr-only"><?php echo JText::_('COM_BANNERS_COUNT_UNPUBLISHED_ITEMS'); ?></span>
</span>
</th>
<th style="width:3%" class="nowrap text-center hidden-sm-down">
<th style="width:3%" class="nowrap text-center d-none d-md-table-cell">
<span class="icon-archive hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_BANNERS_COUNT_ARCHIVED_ITEMS'); ?>">
<span class="sr-only"><?php echo JText::_('COM_BANNERS_COUNT_ARCHIVED_ITEMS'); ?></span>
</span>
</th>
<th style="width:3%" class="nowrap text-center hidden-sm-down">
<th style="width:3%" class="nowrap text-center d-none d-md-table-cell">
<span class="icon-trash hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_BANNERS_COUNT_TRASHED_ITEMS'); ?>">
<span class="sr-only"><?php echo JText::_('COM_BANNERS_COUNT_TRASHED_ITEMS'); ?></span>
</span>
</th>
<th style="width:10%" class="nowrap hidden-sm-down text-center">
<th style="width:10%" class="nowrap d-none d-md-table-cell text-center">
<?php echo JHtml::_('searchtools.sort', 'COM_BANNERS_HEADING_PURCHASETYPE', 'a.purchase_type', $listDirn, $listOrder); ?>
</th>
<th style="width:3%" class="nowrap hidden-sm-down text-center">
<th style="width:3%" class="nowrap d-none d-md-table-cell text-center">
<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
</th>
</tr>
Expand Down Expand Up @@ -122,33 +122,33 @@
<?php endif; ?>
</div>
</td>
<td class="small hidden-sm-down text-center">
<td class="small d-none d-md-table-cell text-center">
<?php echo $item->contact; ?>
</td>
<td class="center btns hidden-md-down">
<td class="center btns d-none d-lg-table-cell">
<a class="badge <?php if ($item->count_published > 0) echo 'badge-success'; ?>" href="<?php echo JRoute::_('index.php?option=com_banners&view=banners&filter[client_id]=' . (int) $item->id . '&filter[published]=1'); ?>">
<?php echo $item->count_published; ?></a>
</td>
<td class="center btns hidden-md-down">
<td class="center btns d-none d-lg-table-cell">
<a class="badge <?php if ($item->count_unpublished > 0) echo 'badge-important'; ?>" href="<?php echo JRoute::_('index.php?option=com_banners&view=banners&filter[client_id]=' . (int) $item->id . '&filter[published]=0'); ?>">
<?php echo $item->count_unpublished; ?></a>
</td>
<td class="center btns hidden-md-down">
<td class="center btns d-none d-lg-table-cell">
<a class="badge <?php if ($item->count_archived > 0) echo 'badge-info'; ?>" href="<?php echo JRoute::_('index.php?option=com_banners&view=banners&filter[client_id]=' . (int) $item->id . '&filter[published]=2'); ?>">
<?php echo $item->count_archived; ?></a>
</td>
<td class="center btns hidden-md-down">
<td class="center btns d-none d-lg-table-cell">
<a class="badge <?php if ($item->count_trashed > 0) echo 'badge-inverse'; ?>" href="<?php echo JRoute::_('index.php?option=com_banners&view=banners&filter[client_id]=' . (int) $item->id . '&filter[published]=-2'); ?>">
<?php echo $item->count_trashed; ?></a>
</td>
<td class="small hidden-sm-down text-center">
<td class="small d-none d-md-table-cell text-center">
<?php if ($item->purchase_type < 0) : ?>
<?php echo JText::sprintf('COM_BANNERS_DEFAULT', JText::_('COM_BANNERS_FIELD_VALUE_' . $purchaseTypes[$params->get('purchase_type')])); ?>
<?php else : ?>
<?php echo JText::_('COM_BANNERS_FIELD_VALUE_' . $purchaseTypes[$item->purchase_type]); ?>
<?php endif; ?>
</td>
<td class="hidden-sm-down text-center">
<td class="d-none d-md-table-cell text-center">
<?php echo $item->id; ?>
</td>
</tr>
Expand Down
12 changes: 6 additions & 6 deletions administrator/components/com_banners/tmpl/tracks/default.php
View file
Expand Up @@ -32,13 +32,13 @@
<th style="width:20%" class="nowrap">
<?php echo JHtml::_('searchtools.sort', 'COM_BANNERS_HEADING_CLIENT', 'cl.name', $listDirn, $listOrder); ?>
</th>
<th style="width:10%" class="nowrap hidden-sm-down">
<th style="width:10%" class="nowrap d-none d-md-table-cell">
<?php echo JHtml::_('searchtools.sort', 'COM_BANNERS_HEADING_TYPE', 'a.track_type', $listDirn, $listOrder); ?>
</th>
<th style="width:10%" class="nowrap hidden-sm-down">
<th style="width:10%" class="nowrap d-none d-md-table-cell">
<?php echo JHtml::_('searchtools.sort', 'COM_BANNERS_HEADING_COUNT', 'a.count', $listDirn, $listOrder); ?>
</th>
<th style="width:10%" class="nowrap hidden-sm-down">
<th style="width:10%" class="nowrap d-none d-md-table-cell">
<?php echo JHtml::_('searchtools.sort', 'JDATE', 'a.track_date', $listDirn, $listOrder); ?>
</th>
</tr>
Expand All @@ -62,13 +62,13 @@
<td>
<?php echo $item->client_name; ?>
</td>
<td class="small hidden-sm-down">
<td class="small d-none d-md-table-cell">
<?php echo $item->track_type == 1 ? JText::_('COM_BANNERS_IMPRESSION') : JText::_('COM_BANNERS_CLICK'); ?>
</td>
<td class="hidden-sm-down">
<td class="d-none d-md-table-cell">
<?php echo $item->count; ?>
</td>
<td class="hidden-sm-down">
<td class="d-none d-md-table-cell">
<?php echo JHtml::_('date', $item->track_date, JText::_('DATE_FORMAT_LC4') . ' H:i'); ?>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_categories/Field/Modal/CategoryField.php
View file
Expand Up @@ -135,7 +135,7 @@ function jSelectCategory_" . $this->id . "(id, title, object) {

if ($allowSelect || $allowNew || $allowEdit || $allowClear)
{
$html .= '<span class="input-group-btn">';
$html .= '<span class="input-group-append">';
}

// Select category button.
Expand Down

0 comments on commit 4b41965

Please sign in to comment.