Skip to content

Commit fee7a60

Browse files
committed
- repair language strings in the header - issue joomla#232
- disabled buttons with low opacity in the header - issue #33 - center the icons in the header
1 parent 6fb79a7 commit fee7a60

File tree

6 files changed

+23
-9
lines changed

6 files changed

+23
-9
lines changed

administrator/language/en-GB/en-GB.mod_version.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
; Note : All ini files need to be saved as UTF-8
55

66
MOD_VERSION="Joomla! Version Information"
7-
MOD_VERSION_XML_DESCRIPTION="This module displays the Joomla! version."
7+
MOD_VERSION_XML_DESCRIPTION="This module displays the Joomla! version."
8+
MOD_VERSION_JOOMLA="Joomla!"

administrator/modules/mod_status_frontend/tmpl/default.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<div class="header-item-content">
2727
<a class="footer-mobil-icon d-flex" href="<?php echo Uri::root(); ?>"
28-
title="<?php echo Text::sprintf('MOD_STATUS_PREVIEW', $sitename); ?>"
28+
title="<?php echo Text::sprintf('MOD_STATUS_FRONTEND_PREVIEW', $sitename); ?>"
2929
target="_blank">
3030
<div class="d-flex align-items-end mx-auto">
3131
<span class="fa fa-external-link-alt" aria-hidden="true"></span>

administrator/modules/mod_status_messages/tmpl/default.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
?>
2525

2626
<div class="header-item-content">
27-
<a class="d-flex align-items-stretch <?php echo ($hideLinks ? 'disabled' : 'dropdown-toggle'); ?>" <?php echo ($hideLinks ? '' : 'href="' . Route::_('index.php?option=com_messages') . '"'); ?> title="<?php echo Text::_('MOD_STATUS_PRIVATE_MESSAGES'); ?>">
27+
<a class="d-flex align-items-stretch <?php echo ($hideLinks ? 'disabled' : 'dropdown-toggle'); ?>" <?php echo ($hideLinks ? '' : 'href="' . Route::_('index.php?option=com_messages') . '"'); ?> title="<?php echo Text::_('MOD_STATUS_MESSAGES_PRIVATE_MESSAGES'); ?>">
2828
<div class="d-flex align-items-end mx-auto">
2929
<span class="fa fa-envelope" aria-hidden="true"></span>
3030
</div>

administrator/modules/mod_version/tmpl/default.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@
99

1010
defined('_JEXEC') or die;
1111

12+
use Joomla\CMS\Helper\ModuleHelper;
13+
use Joomla\CMS\HTML\HTMLHelper;
14+
use Joomla\CMS\Language\Multilanguage;
15+
use Joomla\CMS\Language\Text;
16+
use Joomla\CMS\Router\Route;
17+
use Joomla\CMS\Session\Session;
18+
use Joomla\CMS\Uri\Uri;
19+
use Joomla\Module\Multilangstatus\Administrator\Helper\MultilangstatusAdminHelper;
1220

1321
?>
1422
<?php if (!empty($version)) :
@@ -22,7 +30,7 @@
2230
<span class="fab fa-joomla" aria-hidden="true"></span>
2331
</div>
2432
<div class="d-flex align-items-center tiny mx-auto">
25-
<?php echo $versionName; ?>
33+
<?php echo Text::_('MOD_VERSION_JOOMLA'); ?>
2634
</div>
2735
<span class="badge badge-pill badge-success"><?php echo $versionNumber; ?></span>
2836
</div>

administrator/templates/atum/scss/_variables.scss

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ $border-radius-s: .2rem;
109109
$input-btn-padding-y: .6rem;
110110
$input-btn-padding-x: 1rem;
111111
$input-max-width: 15rem;
112+
$btn-disabled-opacity: 0.4;
112113

113114
// Header
114115
$header-height: 3.5rem;
@@ -154,7 +155,6 @@ $black-weight: 900;
154155
// Text
155156
$body-color: var(--atum-text-dark); //only used in bootstrap, please use --atum-color-dark
156157

157-
158158
// Tables
159159
$table-bg: transparent;
160160
$table-bg-accent: rgba(0, 0, 0, .03);
@@ -205,8 +205,6 @@ $state-error-text: var(--error);
205205
$state-error-bg: lighten($red-dark, 70%);
206206
$state-error-border: lighten($red-dark, 30%);
207207

208-
209-
210208
// Badges
211209
$success-bg: #BAE0B7;
212210
$success-txt: #114B0C;

administrator/templates/atum/scss/blocks/_header.scss

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,14 @@
103103
text-decoration: none;
104104
box-shadow: $atum-box-shadow;
105105
}
106+
&.disabled,
107+
&.disabled:hover,
108+
&.disabled[aria-expanded="true"] {
109+
background-color: transparent;
110+
color: var(--atum-special-color);
111+
box-shadow: none;
112+
opacity: $btn-disabled-opacity;
113+
}
106114
}
107115
.dropdown-toggle {
108116
// Overwrite default button styling
@@ -132,7 +140,6 @@
132140
}
133141

134142
.fa, .fab {
135-
width: 1.5rem;
136143
font-size: 1.2rem;
137144
vertical-align: middle;
138145
transition: all .2s ease-in-out;
@@ -155,7 +162,7 @@
155162
position: absolute;
156163
left: 50%;
157164
top: 0.9rem;
158-
margin-left: -2rem;
165+
margin-left: -1.6rem;
159166
}
160167

161168
.align-items-end {

0 commit comments

Comments
 (0)