Skip to content
This repository was archived by the owner on Apr 19, 2019. It is now read-only.

Topbar improvements #250

Merged
merged 8 commits into from
Nov 29, 2016
Merged

Topbar improvements #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
601de23
Start on topbar improvements
C-Lodder Nov 25, 2016
99d51c5
Add number notification
C-Lodder Nov 25, 2016
2e43b3c
Integrate postinstallation messages and com_messages
C-Lodder Nov 28, 2016
5b2b67e
Load com_postinstall language file
C-Lodder Nov 28, 2016
56579cf
Remove post-installation alert
C-Lodder Nov 28, 2016
33a475d
Fix z-index stacking
C-Lodder Nov 28, 2016
6af824c
Add titles attribute to buttons
C-Lodder Nov 28, 2016
0fb18ff
No need to use variable
C-Lodder Nov 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions administrator/components/com_cpanel/views/cpanel/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,6 @@
$user = JFactory::getUser();
?>

<?php if ($user->authorise('core.manage', 'com_postinstall') && $this->postinstall_message_count) : ?>
<div class="row">
<div class="col-md-12">
<div class="alert alert-info">
<h4>
<?php echo JText::_('COM_CPANEL_MESSAGES_TITLE'); ?>
</h4>
<p>
<?php echo JText::_('COM_CPANEL_MESSAGES_BODY_NOCLOSE'); ?>
</p>
<p>
<?php echo JText::_('COM_CPANEL_MESSAGES_BODYMORE_NOCLOSE'); ?>
</p>
<p>
<a href="index.php?option=com_postinstall&amp;eid=700" class="btn btn-primary">
<?php echo JText::_('COM_CPANEL_MESSAGES_REVIEW'); ?>
</a>
</p>
</div>
</div>
</div>
<?php endif; ?>

<div class="row">

<?php $iconmodules = JModuleHelper::getModules('icon');
Expand Down
15 changes: 0 additions & 15 deletions administrator/components/com_cpanel/views/cpanel/view.html.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,21 +47,6 @@ public function display($tpl = null)
// Display the cpanel modules
$this->modules = JModuleHelper::getModules('cpanel');

try
{
$messages_model = FOFModel::getTmpInstance('Messages', 'PostinstallModel')->eid(700);
$messages = $messages_model->getItemList();
}
catch (RuntimeException $e)
{
$messages = array();

// Still render the error message from the Exception object
JFactory::getApplication()->enqueueMessage($e->getMessage(), 'danger');
}

$this->postinstall_message_count = count($messages);

parent::display($tpl);
}
}
3 changes: 3 additions & 0 deletions administrator/language/en-GB/en-GB.tpl_atum.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

ATUM="Atum Administrator template"
TPL_ATUM_CLEAR_CACHE="Clear Cache"
TPL_ATUM_EDIT_ACCOUNT="Edit Account"
TPL_ATUM_INSTALLER="Installer"
TPL_ATUM_ISFREESOFTWARE="Joomla is free software released under the GNU General Public License."
TPL_ATUM_LOGOUT="Logout"
Expand All @@ -13,3 +14,5 @@ TPL_ATUM_PREVIEW="Preview %s"
TPL_ATUM_TOOLBAR="Toolbar"
TPL_ATUM_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Atum is the Joomla 4 administrator template based on Bootstrap 4"
TPL_BACK_TO_CONTROL_PANEL="Back to Control Panel"
TPL_ATUM_POST_INSTALLATION_MESSAGES="Post-installation messages"
TPL_ATUM_PRIVATE_MESSAGES="Private Messages"
7 changes: 0 additions & 7 deletions administrator/modules/mod_menu/tmpl/default_enabled.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,10 +349,3 @@
$menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_SHOP'), 'https://community.joomla.org/the-joomla-shop.html', null, false, '_blank'));
$menu->getParent();
}

/**
* User Submenu
*/
$menu->addChild(new JMenuNode($user->username, '#', 'class:user fa-fw'), true);
$menu->addChild(new JMenuNode(JText::_('TPL_ATUM_LOGOUT'), JRoute::_('index.php?option=com_login&task=logout&' . JSession::getFormToken() . '=1')));
$menu->getParent();
2 changes: 2 additions & 0 deletions administrator/modules/mod_status/mod_status.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@

$db->setQuery($query);
$unread = (int) $db->loadResult();
// Set the unread message count as a session variable so we can access it in the template
JFactory::getSession()->set('messages.unread', $unread);

$count = 0;

Expand Down
224 changes: 126 additions & 98 deletions administrator/templates/atum/css/template.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6593,7 +6593,7 @@ a.text-gray-dark:focus, a.text-gray-dark:hover {
.fa-caret-square-o-left:before {
content: ""; }

.fa-dot-circle-o:before {
.fa-dot-circle-o:before, .icon-generic:before {
content: ""; }

.fa-wheelchair:before {
Expand Down Expand Up @@ -7714,10 +7714,11 @@ legend {
background: #fcfcfc;
border-bottom: 1px solid rgba(0, 0, 0, 0.17); }
.header .page-title {
margin: 0;
display: inline-block;
margin: 0 0 0 25px;
font-size: 1.25rem;
font-weight: normal;
line-height: 2.4rem;
line-height: 50px;
color: #27283a; }
.header .page-title .icon-list {
color: #27283a; }
Expand All @@ -7727,7 +7728,8 @@ legend {
display: inline-block;
float: none;
padding: 0;
line-height: 1;
font-size: 1rem;
line-height: 50px;
color: #27283a; }
.header .navbar-brand:hover, .header .navbar-brand:focus {
color: #27283a; }
Expand All @@ -7736,6 +7738,106 @@ legend {
.header .navbar-brand {
margin-right: 0;
margin-left: 10px; } }
.header .nav-item + .nav-item {
margin-left: -1px; }
.header .nav-link {
position: relative;
padding: 0 18px;
line-height: 50px;
border-left: 1px solid rgba(0, 0, 0, 0.125);
box-shadow: 1px 0 #fcfcfc inset; }
.header .nav-link .fa {
font-size: 1.4rem;
color: #55595c; }
.header .nav-link .tag {
position: absolute;
top: 5px;
right: 5px; }
.header .nav-link.dropdown-toggle::after {
display: none; }
.header .nav-item:last-child .nav-link {
border-right: 1px solid rgba(0, 0, 0, 0.125); }
.header .dropdown-notifications {
min-width: 280px;
padding: 0;
border: 0; }

.menu-collapse {
z-index: 1001;
float: left;
width: 40px;
height: 50px;
text-align: center; }
.menu-collapse .menu-text {
margin-right: 5px;
font-size: 16px;
line-height: 50px;
color: #27283a; }
@media (max-width: 767px) {
.menu-collapse .menu-text {
display: none; } }
.menu-collapse .menu-toggle {
position: relative;
display: inline-block;
width: 40px;
height: 50px;
padding: 0;
margin: 0;
overflow: hidden;
cursor: pointer;
transition: background 0.3s; }
.menu-collapse .menu-toggle span {
position: absolute;
top: 23px;
right: 5px;
left: 5px;
display: block;
height: 4px;
background: #27283a;
transition: transform 0.3s; }
.menu-collapse .menu-toggle span::before, .menu-collapse .menu-toggle span::after {
position: absolute;
left: 0;
display: block;
width: 100%;
height: 4px;
content: "";
background-color: #27283a; }
.menu-collapse .menu-toggle span::before {
top: -10px;
transition: transform 0.3s, width 0.3s, top 0.3s;
transform-origin: top left; }
@media (max-width: 767px) {
.menu-collapse .menu-toggle span::before {
transform-origin: top right; } }
.menu-collapse .menu-toggle span::after {
bottom: -10px;
transition: transform 0.3s, width 0.3s, bottom 0.3s;
transform-origin: bottom left; }
@media (max-width: 767px) {
.menu-collapse .menu-toggle span::after {
transform-origin: bottom right; } }
@media (max-width: 767px) {
.menu-collapse .menu-toggle {
float: none;
margin: 0 auto; } }
.menu-collapse .menu-toggle .active span {
transform: rotate(180deg); }
.menu-collapse .menu-toggle .active span::before, .menu-collapse .menu-toggle .active span::after {
width: 50%; }
.menu-collapse .menu-toggle .active span::before {
top: 0;
transform: translateX(-4px) translateY(2px) rotate(-45deg); }
@media (max-width: 767px) {
.menu-collapse .menu-toggle .active span::before {
transform: translateX(19px) translateY(2px) rotate(45deg); } }
.menu-collapse .menu-toggle .active span::after {
bottom: 0;
transform: translateX(-4px) translateY(-2px) rotate(45deg); }
@media (max-width: 767px) {
.menu-collapse .menu-toggle .active span::after {
bottom: 4px;
transform: translateX(19px) translateY(2px) rotate(-45deg); } }

.icon-back::before {
content: "\e008"; }
Expand Down Expand Up @@ -7992,82 +8094,6 @@ iframe {
.wrapper.closed .sidebar-wrapper .main-brand img {
max-width: 40px; }

.menu-collapse {
z-index: 1001;
width: 40px;
height: 50px;
text-align: center; }
.menu-collapse .menu-text {
margin-right: 5px;
font-size: 16px;
line-height: 50px;
color: #27283a; }
@media (max-width: 767px) {
.menu-collapse .menu-text {
display: none; } }
.menu-collapse .menu-toggle {
position: relative;
display: inline-block;
width: 40px;
height: 50px;
padding: 0;
margin: 0;
overflow: hidden;
cursor: pointer;
transition: background 0.3s; }
.menu-collapse .menu-toggle span {
position: absolute;
top: 23px;
right: 5px;
left: 5px;
display: block;
height: 4px;
background: #27283a;
transition: transform 0.3s; }
.menu-collapse .menu-toggle span::before, .menu-collapse .menu-toggle span::after {
position: absolute;
left: 0;
display: block;
width: 100%;
height: 4px;
content: "";
background-color: #27283a; }
.menu-collapse .menu-toggle span::before {
top: -10px;
transition: transform 0.3s, width 0.3s, top 0.3s;
transform-origin: top left; }
@media (max-width: 767px) {
.menu-collapse .menu-toggle span::before {
transform-origin: top right; } }
.menu-collapse .menu-toggle span::after {
bottom: -10px;
transition: transform 0.3s, width 0.3s, bottom 0.3s;
transform-origin: bottom left; }
@media (max-width: 767px) {
.menu-collapse .menu-toggle span::after {
transform-origin: bottom right; } }
@media (max-width: 767px) {
.menu-collapse .menu-toggle {
float: none;
margin: 0 auto; } }
.menu-collapse .menu-toggle .active span {
transform: rotate(180deg); }
.menu-collapse .menu-toggle .active span::before, .menu-collapse .menu-toggle .active span::after {
width: 50%; }
.menu-collapse .menu-toggle .active span::before {
top: 0;
transform: translateX(-4px) translateY(2px) rotate(-45deg); }
@media (max-width: 767px) {
.menu-collapse .menu-toggle .active span::before {
transform: translateX(19px) translateY(2px) rotate(45deg); } }
.menu-collapse .menu-toggle .active span::after {
bottom: 0;
transform: translateX(-4px) translateY(-2px) rotate(45deg); }
@media (max-width: 767px) {
.menu-collapse .menu-toggle .active span::after {
bottom: 4px;
transform: translateX(19px) translateY(2px) rotate(-45deg); } }

.main-nav {
width: 250px;
height: 100%;
Expand Down Expand Up @@ -8429,6 +8455,9 @@ iframe {
color: #55595c;
background-color: #fcfcfc; }

.dropdown-menu {
background-color: #fcfcfc; }

.list-group-item {
background-color: #fcfcfc; }

Expand Down Expand Up @@ -8672,6 +8701,22 @@ iframe {

.com_cpanel .card {
box-shadow: 0 0 3px rgba(0, 0, 0, 0.075); }
.com_cpanel .card .list-group {
margin-top: 0;
margin-right: -1.25rem;
margin-bottom: -1.25rem;
margin-left: -1.25rem; }
.com_cpanel .card .list-group > li {
padding: 0.7rem 1.25rem;
overflow: hidden; }
.com_cpanel .card .list-group > .published {
padding-left: .9rem;
border-left: 5px solid #5cb85c; }
.com_cpanel .card .list-group > .unpublished {
padding-left: .9rem;
border-left: 5px solid #d9534f; }
.com_cpanel .card .list-group:first-of-type {
border-top: 0; }
.com_cpanel .card .list-group-item:first-child {
border-top: 0;
border-top-left-radius: 0;
Expand All @@ -8683,10 +8728,10 @@ iframe {

.com_cpanel .card-title {
position: relative;
z-index: 1;
padding: 1.1em 1.25rem 0.75rem;
margin-top: -1.25rem;
margin-right: -1.25rem;
margin-bottom: 0;
margin-left: -1.25rem;
font-size: .85em;
line-height: 18px;
Expand All @@ -8698,23 +8743,6 @@ iframe {
border-radius: 0.25rem 0.25rem 0 0;
box-shadow: 0 1px #fcfcfc inset, 0 2px 3px -3px rgba(0, 0, 0, 0.15); }

.com_cpanel .list-group {
margin-top: -0.75rem;
margin-right: -1.25rem;
margin-bottom: -1.25rem;
margin-left: -1.25rem; }
.com_cpanel .list-group > li {
padding: 0.7rem 1.25rem;
overflow: hidden; }
.com_cpanel .list-group > li.published {
padding-left: .9rem;
border-left: 5px solid #5cb85c; }
.com_cpanel .list-group > li.unpublished {
padding-left: .9rem;
border-left: 5px solid #d9534f; }
.com_cpanel .list-group:first-of-type {
border-top: 0; }

.com_cpanel .module-dropdown {
position: absolute;
top: 0;
Expand Down
3 changes: 2 additions & 1 deletion administrator/templates/atum/css/template.css.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions administrator/templates/atum/css/template.min.css
View file
Open in desktop

Large diffs are not rendered by default.

Loading