Skip to content
This repository has been archived by the owner on Feb 4, 2021. It is now read-only.

Commit

Permalink
#360: Fixes for com:finder
Browse files Browse the repository at this point in the history
  • Loading branch information
robinpoort committed Jun 1, 2018
1 parent 28d51e4 commit f8b3147
Show file tree
Hide file tree
Showing 6 changed files with 156 additions and 1 deletion.
64 changes: 64 additions & 0 deletions web/administrator/templates/elysio/css/admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -10716,6 +10716,68 @@ html {
border-left-color: #fff;
bottom: -10px; }

@-webkit-keyframes progress-bar-stripes {
from {
background-position: 40px 0; }
to {
background-position: 0 0; } }

@keyframes progress-bar-stripes {
from {
background-position: 40px 0; }
to {
background-position: 0 0; } }

.progress {
overflow: hidden;
height: 18px;
margin-bottom: 18px;
background-color: #f5f5f5;
border-radius: 4px;
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); }

.progress-bar {
float: left;
width: 0%;
height: 100%;
font-size: 11px;
line-height: 18px;
color: #fff;
text-align: center;
background-color: #337ab7;
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
transition: width 0.6s ease; }

.progress-striped .progress-bar,
.progress-bar-striped {
background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
background-size: 40px 40px; }

.progress.active .progress-bar,
.progress-bar.active {
-webkit-animation: progress-bar-stripes 2s linear infinite;
animation: progress-bar-stripes 2s linear infinite; }

.progress-bar-success {
background-color: #5cb85c; }
.progress-striped .progress-bar-success {
background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); }

.progress-bar-info {
background-color: #5bc0de; }
.progress-striped .progress-bar-info {
background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); }

.progress-bar-warning {
background-color: #f0ad4e; }
.progress-striped .progress-bar-warning {
background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); }

.progress-bar-danger {
background-color: #d9534f; }
.progress-striped .progress-bar-danger {
background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); }

.tooltip {
position: absolute;
z-index: 1070;
Expand Down Expand Up @@ -14750,11 +14812,13 @@ div.modal {
outline: 0;
margin: 0;
padding: 0;
/* This breaks the modals for com:search
position: absolute;
top: 15px;
right: 15px;
bottom: 15px;
left: 15px;
*/
width: calc(100% - 30px);
max-height: calc(100% - 30px) !important; }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this), null, array('debug' => false)); ?>

<!-- Onboarding -->
<?php echo JLayoutHelper::render('elysio.onboarding', array('text' => JText::_('COM_FINDER_INDEX_NO_CONTENT'), 'displayButton' => false)); ?>
<?php echo JLayoutHelper::render('elysio.onboarding', array('items' => $this->items, 'text' => JText::_('COM_FINDER_INDEX_NO_CONTENT'), 'displayButton' => false)); ?>

<!-- Table -->
<div class="k-table-container<?php echo (!$this->items) ? ' k-hidden' : '' ?>">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php
/**
* @package Joomla.Administrator
* @subpackage com_finder
*
* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

defined('_JEXEC') or die;

JHtml::_('behavior.keepalive');
JHtml::_('behavior.core');
JHtml::_('jquery.framework');
JHtml::_('script', 'com_finder/indexer.js', false, true);
JFactory::getDocument()->addScriptDeclaration('var msg = "' . JText::_('COM_FINDER_INDEXER_MESSAGE_COMPLETE') . '";');
?>


<div id="finder-indexer-container">
<h1 id="finder-progress-header"><?php echo JText::_('COM_FINDER_INDEXER_HEADER_INIT'); ?></h1>

<p id="finder-progress-message"><?php echo JText::_('COM_FINDER_INDEXER_MESSAGE_INIT'); ?></p>

<div id="progress" class="progress progress-striped active">
<div id="progress-bar" class="bar bar-success" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
</div>

<input id="finder-indexer-token" type="hidden" name="<?php echo JFactory::getSession()->getFormToken(); ?>" value="1" />
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?php
/**
* @package Joomla.Administrator
* @subpackage com_finder
*
* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/

defined('_JEXEC') or die;
?>

<div class="k-heading">
<?php echo JText::_('COM_FINDER_STATISTICS_TITLE') ?>
</div>

<p><?php echo JText::sprintf('COM_FINDER_STATISTICS_STATS_DESCRIPTION', number_format($this->data->term_count, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR')), number_format($this->data->link_count, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR')), number_format($this->data->taxonomy_node_count, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR')), number_format($this->data->taxonomy_branch_count, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR'))); ?></p>

<div class="k-table-container">
<div class="k-table">
<table>
<thead>
<tr>
<th>
<?php echo JText::_('COM_FINDER_STATISTICS_LINK_TYPE_HEADING');?>
</th>
<th>
<?php echo JText::_('COM_FINDER_STATISTICS_LINK_TYPE_COUNT');?>
</th>
</tr>
</thead>
<tbody>
<?php foreach ($this->data->type_list as $type) :?>
<tr>
<td>
<?php
$lang_key = 'PLG_FINDER_STATISTICS_' . str_replace(' ', '_', $type->type_title);
$lang_string = JText::_($lang_key);
echo ($lang_string == $lang_key) ? $type->type_title : $lang_string;
?>
</td>
<td>
<span class="badge badge-info"><?php echo number_format($type->link_count, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR'));?></span>
</td>
</tr>
<?php endforeach; ?>
<tr>
<td>
<strong><?php echo JText::_('COM_FINDER_STATISTICS_LINK_TYPE_TOTAL'); ?></strong>
</td>
<td>
<span class="badge badge-info"><?php echo number_format($this->data->link_count, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR')); ?></span>
</td>
</tr>
</tbody>
</table>
</div>
</div>
1 change: 1 addition & 0 deletions web/administrator/templates/elysio/scss/admin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ $k-icon-path: '../fonts';
@import "bootstrap-sass/assets/stylesheets/bootstrap/variables";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins";
@import "bootstrap-sass/assets/stylesheets/bootstrap/popovers";
@import "bootstrap-sass/assets/stylesheets/bootstrap/progress-bars";
@import "bootstrap-sass/assets/stylesheets/bootstrap/tooltip";

// Koowa namespaced styling
Expand Down
2 changes: 2 additions & 0 deletions web/administrator/templates/elysio/scss/bootstrap/_modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,13 @@ div.modal {
outline: 0;
margin: 0;
padding: 0;
/* This breaks the modals for com:search
position: absolute;
top: 15px;
right: 15px;
bottom: 15px;
left: 15px;
*/
width: calc(100% - 30px);
max-height: calc(100% - 30px) !important;
}
Expand Down

0 comments on commit f8b3147

Please sign in to comment.