Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

crypsisb3: minor fixes on stats/whoisonline widgets #4650

Merged
merged 3 commits into from Oct 3, 2016
Merged

crypsisb3: minor fixes on stats/whoisonline widgets #4650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d78e01e
CrypsisB3: Update statistics widget
betteryouthanme Oct 3, 2016
2e6a3c9
CrypsisB3: Update Whoisonline widget
betteryouthanme Oct 3, 2016
b09b43e
Update default.php
betteryouthanme Oct 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
121 changes: 68 additions & 53 deletions src/components/com_kunena/template/crypsisb3/layouts/widget/statistics/default.php
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@
<div class="kfrontend">
<div class="btn-toolbar pull-right">
<div class="btn-group">
<div class="btn btn-default btn-small <?php echo KunenaIcons::collapse();?>" data-toggle="collapse" data-target="#kstats"></div>
<div class="btn btn-default btn-sm <?php echo KunenaIcons::collapse();?>" data-toggle="collapse" data-target="#kstats"></div>
</div>
</div>
<h2 class="btn-link">
Expand All @@ -26,57 +26,72 @@
<?php echo JText::_('COM_KUNENA_STATISTICS'); ?>
<?php endif; ?>
</h2>
<div class="row collapse in" id="kstats">
<div class="well-small">
<ul class="unstyled col-md-1 btn-link">
<?php echo KunenaIcons::stats(); ?>
</ul>
<ul class="unstyled col-md-3">
<li>
<?php echo JText::_('COM_KUNENA_STAT_TOTAL_MESSAGES'); ?>:
<strong><?php echo (int) $this->messageCount; ?></strong>
</li>
<li>
<?php echo JText::_('COM_KUNENA_STAT_TOTAL_SECTIONS'); ?>:
<strong><?php echo (int) $this->sectionCount; ?></strong>
</li>
<li>
<?php echo JText::_('COM_KUNENA_STAT_TODAY_OPEN_THREAD'); ?>:
<strong><?php echo (int) $this->todayTopicCount; ?></strong>
</li>
<li>
<?php echo JText::_('COM_KUNENA_STAT_TODAY_TOTAL_ANSWER'); ?>:
<strong><?php echo (int) $this->todayReplyCount; ?></strong>
</li>
</ul>
<ul class="unstyled col-md-3">
<li>
<?php echo JText::_('COM_KUNENA_STAT_TOTAL_SUBJECTS'); ?>:
<strong><?php echo (int) $this->topicCount; ?></strong>
</li>
<li>
<?php echo JText::_('COM_KUNENA_STAT_TOTAL_CATEGORIES'); ?>:
<strong><?php echo (int) $this->categoryCount; ?></strong>
</li>
<li>
<?php echo JText::_('COM_KUNENA_STAT_YESTERDAY_OPEN_THREAD'); ?>:
<strong><?php echo (int) $this->yesterdayTopicCount; ?></strong>
</li>
<li>
<?php echo JText::_('COM_KUNENA_STAT_YESTERDAY_TOTAL_ANSWER'); ?>:
<strong><?php echo (int) $this->yesterdayReplyCount; ?></strong>
</li>
</ul>
<ul class="unstyled col-md-3">
<li>
<?php echo JText::_('COM_KUNENA_STAT_TOTAL_USERS'); ?>:
<strong><?php echo $this->memberCount; ?></strong>
</li>
<li>
<?php echo JText::_('COM_KUNENA_STAT_LATEST_MEMBERS'); ?>:
<strong><?php echo $this->latestMemberLink; ?></strong>
</li>
</ul>
</div>
<div class="collapse in" id="kstats">
<div class="well well-sm">
<div class="container">
<div class="row">
<div class="col-md-1">
<ul class="list-unstyled">
<li class="btn-link text-center"><?php echo KunenaIcons::stats(); ?></li>
</ul>
</div>

<div class="col-md-3">
<ul class="list-unstyled">
<li>
<?php echo JText::_('COM_KUNENA_STAT_TOTAL_MESSAGES'); ?>:
<strong><?php echo (int) $this->messageCount; ?></strong>
</li>
<li>
<?php echo JText::_('COM_KUNENA_STAT_TOTAL_SECTIONS'); ?>:
<strong><?php echo (int) $this->sectionCount; ?></strong>
</li>
<li>
<?php echo JText::_('COM_KUNENA_STAT_TODAY_OPEN_THREAD'); ?>:
<strong><?php echo (int) $this->todayTopicCount; ?></strong>
</li>
<li>
<?php echo JText::_('COM_KUNENA_STAT_TODAY_TOTAL_ANSWER'); ?>:
<strong><?php echo (int) $this->todayReplyCount; ?></strong>
</li>
</ul>
</div>

<div class="col-md-3">
<ul class="list-unstyled">
<li>
<?php echo JText::_('COM_KUNENA_STAT_TOTAL_SUBJECTS'); ?>:
<strong><?php echo (int) $this->topicCount; ?></strong>
</li>
<li>
<?php echo JText::_('COM_KUNENA_STAT_TOTAL_CATEGORIES'); ?>:
<strong><?php echo (int) $this->categoryCount; ?></strong>
</li>
<li>
<?php echo JText::_('COM_KUNENA_STAT_YESTERDAY_OPEN_THREAD'); ?>:
<strong><?php echo (int) $this->yesterdayTopicCount; ?></strong>
</li>
<li>
<?php echo JText::_('COM_KUNENA_STAT_YESTERDAY_TOTAL_ANSWER'); ?>:
<strong><?php echo (int) $this->yesterdayReplyCount; ?></strong>
</li>
</ul>
</div>

<div class="col-md-3">
<ul class="list-unstyled">
<li>
<?php echo JText::_('COM_KUNENA_STAT_TOTAL_USERS'); ?>:
<strong><?php echo $this->memberCount; ?></strong>
</li>
<li>
<?php echo JText::_('COM_KUNENA_STAT_LATEST_MEMBERS'); ?>:
<strong><?php echo $this->latestMemberLink; ?></strong>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
</div>
104 changes: 58 additions & 46 deletions src/components/com_kunena/template/crypsisb3/layouts/widget/whoisonline/default.php
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@
<div class="kfrontend">
<div class="btn-toolbar pull-right">
<div class="btn-group">
<div class="btn btn-default btn-small <?php echo KunenaIcons::collapse();?>" data-toggle="collapse" data-target="#kwho"></div>
<div class="btn btn-default btn-sm <?php echo KunenaIcons::collapse();?>" data-toggle="collapse" data-target="#kwho"></div>
</div>
</div>
<h2 class="btn-link">
Expand All @@ -28,54 +28,66 @@
<?php endif; ?>
</h2>

<div class="row-fluid collapse in" id="kwho">
<div class="well-small">
<ul class="unstyled col-md-1 btn-link">
<?php echo KunenaIcons::members(); ?>
</ul>
<ul class="unstyled col-md-11">
<span>
<?php echo JText::sprintf('COM_KUNENA_VIEW_COMMON_WHO_TOTAL', $this->membersOnline); ?>
</span>
<?php
$template = KunenaTemplate::getInstance();
$direction = $template->params->get('whoisonlineName');
<div class="collapse in" id="kwho">
<div class="well well-sm">
<div class="container">
<div class="row">

<div class="col-md-1">
<ul class="list-unstyled">
<li class="btn-link">
<?php echo KunenaIcons::members(); ?>
</li>
</ul>
</div>

<div class="col-md-11">
<ul class="list-unstyled">
<span>
<?php echo JText::sprintf('COM_KUNENA_VIEW_COMMON_WHO_TOTAL', $this->membersOnline); ?>
</span>
<?php
$template = KunenaTemplate::getInstance();
$direction = $template->params->get('whoisonlineName');

if ($direction == 'both') : ?>
<div><?php echo $this->setLayout('both'); ?></div>
<?php
elseif ($direction == 'avatar') : ?>
<div><?php echo $this->setLayout('avatar'); ?></div>
<?php else : ?>
<div><?php echo $this->setLayout('name'); ?></div>
<?php
endif;
?>
if ($direction == 'both') : ?>
<div><?php echo $this->setLayout('both'); ?></div>
<?php
elseif ($direction == 'avatar') : ?>
<div><?php echo $this->setLayout('avatar'); ?></div>
<?php else : ?>
<div><?php echo $this->setLayout('name'); ?></div>
<?php
endif;
?>

<?php if (!empty($this->onlineList)) : ?>
<div>
<span><?php echo JText::_('COM_KUNENA_LEGEND'); ?>:</span>
<span class="kwho-admin">
<i class="icon icon-user"></i><?php echo JText::_('COM_KUNENA_COLOR_ADMINISTRATOR'); ?>
</span>
<span class="kwho-globalmoderator">
<i class="icon icon-user"></i><?php echo JText::_('COM_KUNENA_COLOR_GLOBAL_MODERATOR'); ?>
</span>
<span class="kwho-moderator">
<i class="icon icon-user"></i><?php echo JText::_('COM_KUNENA_COLOR_MODERATOR'); ?>
</span>
<span class="kwho-banned">
<i class="icon icon-user"></i><?php echo JText::_('COM_KUNENA_COLOR_BANNED'); ?>
</span>
<span class="kwho-user">
<i class="icon icon-user"></i><?php echo JText::_('COM_KUNENA_COLOR_USER'); ?>
</span>
<span class="kwho-guest">
<i class="icon icon-user"></i><?php echo JText::_('COM_KUNENA_COLOR_GUEST'); ?>
</span>
<?php if (!empty($this->onlineList)) : ?>
<div>
<span><?php echo JText::_('COM_KUNENA_LEGEND'); ?>:</span>
<span class="kwho-admin">
<?php echo KunenaIcons::user(); ?> <?php echo JText::_('COM_KUNENA_COLOR_ADMINISTRATOR'); ?>
</span>
<span class="kwho-globalmoderator">
<?php echo KunenaIcons::user(); ?> <?php echo JText::_('COM_KUNENA_COLOR_GLOBAL_MODERATOR'); ?>
</span>
<span class="kwho-moderator">
<?php echo KunenaIcons::user(); ?> <?php echo JText::_('COM_KUNENA_COLOR_MODERATOR'); ?>
</span>
<span class="kwho-banned">
<?php echo KunenaIcons::user(); ?> <?php echo JText::_('COM_KUNENA_COLOR_BANNED'); ?>
</span>
<span class="kwho-user">
<?php echo KunenaIcons::user(); ?> <?php echo JText::_('COM_KUNENA_COLOR_USER'); ?>
</span>
<span class="kwho-guest">
<?php echo KunenaIcons::user(); ?> <?php echo JText::_('COM_KUNENA_COLOR_GUEST'); ?>
</span>
</div>
<?php endif; ?>
</ul>
</div>
</div>
<?php endif; ?>
</ul>
</div>
</div>
</div>
</div>