Skip to content

Commit

Permalink
RTL general styling
Browse files Browse the repository at this point in the history
  • Loading branch information
ciar4n committed Jun 9, 2017
1 parent b8de81f commit 75c5bd3
Show file tree
Hide file tree
Showing 25 changed files with 751 additions and 394 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
</div>
</td>
<td class="nowrap has-context">
<div class="float-left">
<div>
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'banners.', $canCheckin); ?>
<?php endif; ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
</div>
</td>
<td class="nowrap has-context">
<div class="float-left">
<div>
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'clients.', $canCheckin); ?>
<?php endif; ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
</div>
</td>
<td class="nowrap has-context">
<div class="float-left">
<div>
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'contacts.', $canCheckin); ?>
<?php endif; ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
</div>
</td>
<td class="has-context">
<div class="float-left break-word">
<div class="break-word">
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'articles.', $canCheckin); ?>
<?php endif; ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
</div>
</td>
<td class="has-context">
<div class="float-left break-word">
<div class="break-word">
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'articles.', $canCheckin); ?>
<?php endif; ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
</div>
</td>
<td>
<div class="float-left break-word">
<div class="break-word">
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'fields.', $canCheckin); ?>
<?php endif; ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
</div>
</td>
<td class="has-context">
<div class="float-left">
<div>
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'modules.', $canCheckin); ?>
<?php endif; ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
</div>
</td>
<td class="nowrap has-context">
<div class="float-left">
<div>
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'newsfeeds.', $canCheckin); ?>
<?php endif; ?>
Expand Down
30 changes: 16 additions & 14 deletions administrator/modules/mod_latest/tmpl/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,23 @@
<?php if (count($list)) : ?>
<?php foreach ($list as $i => $item) : ?>
<li class="d-flex justify-content-start list-group-item <?php echo $item->state == 1 ? 'published' : 'unpublished'; ?>">
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time); ?>
<?php endif; ?>
<strong class="row-title break-word mr-2" title="<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>">
<?php if ($item->link) : ?>
<a href="<?php echo $item->link; ?>">
<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?></a>
<?php else : ?>
<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>
<div class="fg-1">
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time); ?>
<?php endif; ?>
</strong>
<small class="hasTooltip" title="<?php echo JHtml::_('tooltipText', 'MOD_LATEST_CREATED_BY'); ?>">
<?php echo $item->author_name; ?>
</small>
<span class="badge badge-default badge-pill ml-auto">
<strong class="row-title break-word mr-2" title="<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>">
<?php if ($item->link) : ?>
<a href="<?php echo $item->link; ?>">
<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?></a>
<?php else : ?>
<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>
<?php endif; ?>
</strong>
<small class="hasTooltip" title="<?php echo JHtml::_('tooltipText', 'MOD_LATEST_CREATED_BY'); ?>">
<?php echo $item->author_name; ?>
</small>
</div>
<span class="badge badge-default badge-pill">
<span class="small">
<span class="icon-calendar" aria-hidden="true"></span>
<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC5')); ?>
Expand Down
44 changes: 23 additions & 21 deletions administrator/modules/mod_logged/tmpl/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,30 @@
<ul class="list-group list-group-flush">
<?php foreach ($users as $user) : ?>
<li class="d-flex justify-content-start list-group-item">
<?php if ($user->client_id == 0) : ?>
<a title="<?php echo JHtml::_('tooltipText', 'MOD_LOGGED_LOGOUT'); ?>" href="<?php echo $user->logoutLink; ?>" class="mr-2 btn btn-danger btn-xs hasTooltip">
<span class="icon-remove icon-white" aria-hidden="true"><span class="sr-only"><?php echo JText::_('JLOGOUT'); ?>"></span></span>
</a>
<?php endif; ?>
<strong class="mr-2 row-title">
<?php if (isset($user->editLink)) : ?>
<a href="<?php echo $user->editLink; ?>" class="hasTooltip" title="<?php echo JHtml::_('tooltipText', 'JGRID_HEADING_ID'); ?> : <?php echo $user->id; ?>">
<?php echo $user->name; ?></a>
<?php else : ?>
<?php echo $user->name; ?>
<div class="fg-1">
<?php if ($user->client_id == 0) : ?>
<a title="<?php echo JHtml::_('tooltipText', 'MOD_LOGGED_LOGOUT'); ?>" href="<?php echo $user->logoutLink; ?>" class="mr-2 btn btn-danger btn-xs hasTooltip">
<span class="icon-remove icon-white" aria-hidden="true"><span class="sr-only"><?php echo JText::_('JLOGOUT'); ?>"></span></span>
</a>
<?php endif; ?>
</strong>
<small class="mr-2 small hasTooltip" title="<?php echo JHtml::_('tooltipText', 'JCLIENT'); ?>">
<?php if ($user->client_id === null) : ?>
<?php // Don't display a client ?>
<?php elseif ($user->client_id) : ?>
<?php echo JText::_('JADMINISTRATION'); ?>
<?php else : ?>
<?php echo JText::_('JSITE'); ?>
<?php endif; ?>
</small>
<strong class="mr-2 row-title">
<?php if (isset($user->editLink)) : ?>
<a href="<?php echo $user->editLink; ?>" class="hasTooltip" title="<?php echo JHtml::_('tooltipText', 'JGRID_HEADING_ID'); ?> : <?php echo $user->id; ?>">
<?php echo $user->name; ?></a>
<?php else : ?>
<?php echo $user->name; ?>
<?php endif; ?>
</strong>
<small class="mr-2 small hasTooltip" title="<?php echo JHtml::_('tooltipText', 'JCLIENT'); ?>">
<?php if ($user->client_id === null) : ?>
<?php // Don't display a client ?>
<?php elseif ($user->client_id) : ?>
<?php echo JText::_('JADMINISTRATION'); ?>
<?php else : ?>
<?php echo JText::_('JSITE'); ?>
<?php endif; ?>
</small>
</div>
<span class="badge badge-default badge-pill ml-auto hasTooltip" title="<?php echo JHtml::_('tooltipText', 'MOD_LOGGED_LAST_ACTIVITY'); ?>">
<span class="small">
<span class="icon-calendar" aria-hidden="true"></span>
Expand Down
26 changes: 14 additions & 12 deletions administrator/modules/mod_popular/tmpl/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,21 @@
<?php $hits = (int) $item->hits; ?>
<?php $hits_class = ($hits >= 10000 ? 'danger' : ($hits >= 1000 ? 'warning' : ($hits >= 100 ? 'info' : 'default'))); ?>
<li class="d-flex justify-content-start list-group-item">
<span class="mr-2 badge badge-<?php echo $hits_class; ?> hasTooltip" title="<?php echo JHtml::_('tooltipText', 'JGLOBAL_HITS'); ?>"><?php echo $item->hits; ?></span>
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time); ?>
<?php endif; ?>
<strong class="row-title break-word">
<?php if ($item->link) : ?>
<a href="<?php echo $item->link; ?>">
<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?></a>
<?php else : ?>
<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>
<div class="fg-1">
<span class="mr-2 badge badge-<?php echo $hits_class; ?> hasTooltip" title="<?php echo JHtml::_('tooltipText', 'JGLOBAL_HITS'); ?>"><?php echo $item->hits; ?></span>
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time); ?>
<?php endif; ?>
</strong>
<span class="badge badge-default badge-pill ml-auto">
<strong class="row-title break-word">
<?php if ($item->link) : ?>
<a href="<?php echo $item->link; ?>">
<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?></a>
<?php else : ?>
<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>
<?php endif; ?>
</strong>
</div>
<span class="badge badge-default badge-pill">
<span class="small">
<span class="icon-calendar" aria-hidden="true"></span>
<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC5')); ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/modules/mod_stats_admin/tmpl/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
?>
<ul class="list-group list-group-flush stats-module<?php echo $moduleclass_sfx ?>">
<?php foreach ($list as $item) : ?>
<li class="list-group-item"><span class="mr-2 icon-<?php echo $item->icon; ?>" title="<?php echo $item->title; ?>" aria-hidden="true"></span> <?php echo $item->title; ?> <?php echo $item->data; ?></li>
<li class="list-group-item"><span class="mr-2 ml-2 icon-<?php echo $item->icon; ?>" title="<?php echo $item->title; ?>" aria-hidden="true"></span> <?php echo $item->title; ?> <?php echo $item->data; ?></li>
<?php endforeach; ?>
</ul>
6 changes: 3 additions & 3 deletions administrator/modules/mod_status/tmpl/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
if ($params->get('show_loggedin_users', 1))
{
$output[] = '<li class="px-2">'
. '<span class="mr-1 badge badge-pill badge-default">' . $total_users . '</span>'
. '<span class="mr-1 ml-1 badge badge-pill badge-default">' . $total_users . '</span>'
. JText::plural('MOD_STATUS_TOTAL_USERS', $total_users)
. '</li>';
}
Expand All @@ -31,7 +31,7 @@
if ($params->get('show_loggedin_users', 1))
{
$output[] = '<li class="px-2">'
. '<span class="mr-1 badge badge-pill badge-default">' . $online_num . '</span>'
. '<span class="mr-1 ml-1 badge badge-pill badge-default">' . $online_num . '</span>'
. JText::plural('MOD_STATUS_USERS', $online_num)
. '</li>';
}
Expand All @@ -40,7 +40,7 @@
if ($params->get('show_loggedin_users_admin', 1))
{
$output[] = '<li class="px-2">'
. '<span class="mr-1 badge badge-pill badge-default">' . $count . '</span>'
. '<span class="mr-1 ml-1 badge badge-pill badge-default">' . $count . '</span>'
. JText::plural('MOD_STATUS_BACKEND_USERS', $count)
. '</li>';
}
Expand Down

0 comments on commit 75c5bd3

Please sign in to comment.