- repair language strings in the header - issue #232

- disabled buttons with low opacity in the header - issue #33 - center the icons in the header
joomla · Jun 16, 2019 · fee7a60 · fee7a60
1 parent 6fb79a7
commit fee7a60
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 9 deletions.
diff --git a/administrator/language/en-GB/en-GB.mod_version.ini b/administrator/language/en-GB/en-GB.mod_version.ini
@@ -4,4 +4,5 @@
 ; Note : All ini files need to be saved as UTF-8
 
 MOD_VERSION="Joomla! Version Information"
-MOD_VERSION_XML_DESCRIPTION="This module displays the Joomla! version."
+MOD_VERSION_XML_DESCRIPTION="This module displays the Joomla! version."
+MOD_VERSION_JOOMLA="Joomla!"
diff --git a/administrator/modules/mod_status_frontend/tmpl/default.php b/administrator/modules/mod_status_frontend/tmpl/default.php
@@ -25,7 +25,7 @@
 
 <div class="header-item-content">
     <a class="footer-mobil-icon d-flex" href="<?php echo Uri::root(); ?>"
-        title="<?php echo Text::sprintf('MOD_STATUS_PREVIEW', $sitename); ?>"
+        title="<?php echo Text::sprintf('MOD_STATUS_FRONTEND_PREVIEW', $sitename); ?>"
         target="_blank">
         <div class="d-flex align-items-end mx-auto">
             <span class="fa fa-external-link-alt" aria-hidden="true"></span>

diff --git a/administrator/modules/mod_status_messages/tmpl/default.php b/administrator/modules/mod_status_messages/tmpl/default.php
@@ -24,7 +24,7 @@
 ?>
 
 		<div class="header-item-content">
-			<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'); ?>">
+			<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'); ?>">
                 <div class="d-flex align-items-end mx-auto">
                     <span class="fa fa-envelope" aria-hidden="true"></span>
                 </div>

diff --git a/administrator/modules/mod_version/tmpl/default.php b/administrator/modules/mod_version/tmpl/default.php
@@ -9,6 +9,14 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Helper\ModuleHelper;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Multilanguage;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\Uri\Uri;
+use Joomla\Module\Multilangstatus\Administrator\Helper\MultilangstatusAdminHelper;
 
 ?>
 <?php if (!empty($version)) :
@@ -22,7 +30,7 @@
             <span class="fab fa-joomla" aria-hidden="true"></span>
         </div>
         <div class="d-flex align-items-center tiny mx-auto">
-            <?php echo $versionName; ?>
+	        <?php echo Text::_('MOD_VERSION_JOOMLA'); ?>
         </div>
         <span class="badge badge-pill badge-success"><?php echo $versionNumber; ?></span>
     </div>

diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss
@@ -109,6 +109,7 @@ $border-radius-s:                  .2rem;
 $input-btn-padding-y:              .6rem;
 $input-btn-padding-x:              1rem;
 $input-max-width:                  15rem;
+$btn-disabled-opacity:             0.4;
 
 // Header
 $header-height:                    3.5rem;
@@ -154,7 +155,6 @@ $black-weight:                     900;
 // Text
 $body-color:                       var(--atum-text-dark); //only used in bootstrap, please use --atum-color-dark
 
-
 // Tables
 $table-bg:                         transparent;
 $table-bg-accent:                  rgba(0, 0, 0, .03);
@@ -205,8 +205,6 @@ $state-error-text:                 var(--error);
 $state-error-bg:                   lighten($red-dark, 70%);
 $state-error-border:               lighten($red-dark, 30%);
 
-
-
 // Badges
 $success-bg:                       #BAE0B7;
 $success-txt:                      #114B0C;

diff --git a/administrator/templates/atum/scss/blocks/_header.scss b/administrator/templates/atum/scss/blocks/_header.scss
@@ -103,6 +103,14 @@
           text-decoration: none;
           box-shadow: $atum-box-shadow;
         }
+        &.disabled,
+        &.disabled:hover,
+        &.disabled[aria-expanded="true"] {
+          background-color: transparent;
+          color: var(--atum-special-color);
+          box-shadow: none;
+          opacity: $btn-disabled-opacity;
+        }
       }
       .dropdown-toggle {
         // Overwrite default button styling
@@ -132,7 +140,6 @@
   }
 
   .fa, .fab {
-    width: 1.5rem;
     font-size: 1.2rem;
     vertical-align: middle;
     transition: all .2s ease-in-out;
@@ -155,7 +162,7 @@
     position: absolute;
     left: 50%;
     top: 0.9rem;
-    margin-left: -2rem;
+    margin-left: -1.6rem;
   }
 
   .align-items-end {