diff --git a/Block/Adminhtml/Login.php b/Block/Adminhtml/Login.php index c069911..2edafec 100644 --- a/Block/Adminhtml/Login.php +++ b/Block/Adminhtml/Login.php @@ -4,15 +4,12 @@ /** * Magenizr AdminBranding * - * @copyright Copyright (c) 2021 Magenizr (https://www.magenizr.com) + * @copyright Copyright (c) 2021 - 2023 Magenizr (https://www.magenizr.com) * @license https://www.magenizr.com/license Magenizr EULA */ namespace Magenizr\AdminBranding\Block\Adminhtml; -/** - * Class Dashboard - */ class Login extends \Magento\Framework\View\Element\Template { /** diff --git a/Helper/Data.php b/Helper/Data.php index d2878b9..574bd3f 100755 --- a/Helper/Data.php +++ b/Helper/Data.php @@ -4,7 +4,7 @@ /** * Magenizr AdminBranding * - * @copyright Copyright (c) 2021 Magenizr (https://www.magenizr.com) + * @copyright Copyright (c) 2021 - 2023 Magenizr (https://www.magenizr.com) * @license https://www.magenizr.com/license Magenizr EULA */ @@ -15,10 +15,10 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper { /* Section in core config data */ - const SECTION = 'admin/magenizr_adminbranding'; + private const SECTION = 'admin/magenizr_adminbranding'; /* Name of upload directory in ./media/ */ - const UPLOAD_DIR = 'magenizr_adminbranding'; + public const UPLOAD_DIR = 'magenizr_adminbranding'; /** * @var \Magento\Framework\App\Filesystem\DirectoryList @@ -36,7 +36,9 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper private $fileSystem; /** - * Data constructor. + * Init constructor + * + * @param \Magento\Framework\Filesystem\Driver\File $fileSystem * @param \Magento\Framework\App\Filesystem\DirectoryList $directoryList * @param \Magento\Store\Model\StoreManagerInterface $storeManager * @param \Magento\Framework\App\Helper\Context $context @@ -55,15 +57,17 @@ public function __construct( } /** - * @param $image - * @param $enabled - * @param $file + * Get path for new admin logo + * + * @param string $image + * @param boolean $enabled + * @param string $file * @return bool|string */ public function getAdminLogoSrc($image, $enabled, $file) { // Return default image if not enabled - if (!$this->isSetFlag($enabled) || !$this->isEnabled()) { + if (!$this->isSetFlag($enabled) || !$this->isEnabled() || !$this->getScopeConfig($file)) { return $image; } @@ -111,7 +115,7 @@ public function isEnabled() /** * Use isSetFlag to check boolean fields * - * @param $field + * @param string $field * @return mixed */ public function isSetFlag($field) @@ -125,7 +129,7 @@ public function isSetFlag($field) /** * Get module configuration values from core_config_data * - * @param $field + * @param string $field * @return mixed */ public function getScopeConfig($field) diff --git a/Model/Config/Backend/Image.php b/Model/Config/Backend/Image.php index 43fccb8..16f1ec2 100644 --- a/Model/Config/Backend/Image.php +++ b/Model/Config/Backend/Image.php @@ -4,16 +4,12 @@ /** * Magenizr AdminBranding * - * @copyright Copyright (c) 2021 Magenizr (https://www.magenizr.com) + * @copyright Copyright (c) 2021 - 2023 Magenizr (https://www.magenizr.com) * @license https://www.magenizr.com/license Magenizr EULA */ namespace Magenizr\AdminBranding\Model\Config\Backend; -/** - * Class Image - * - */ class Image extends \Magento\Config\Model\Config\Backend\Image { // @codingStandardsIgnoreStart diff --git a/README.md b/README.md index b9037e5..98352bc 100644 --- a/README.md +++ b/README.md @@ -5,32 +5,17 @@ Create a unique Magento admin login by adding your company logo or a custom text ## System Requirements - Magento 2.3.x, 2.4.x -- PHP 5.6.x, 7.x - -## Installation (Composer) - -1. Update your composer.json `composer require "magenizr/magento2-adminbranding":"1.0.1" --no-update` -2. Install dependencies and update your composer.lock `composer update --lock` - -``` -./composer.json has been updated -Loading composer repositories with package information -Updating dependencies (including require-dev) -Package operations: 1 install, 0 updates, 0 removals - - Installing magenizr/magento2-adminbranding (1.0.1): Downloading (100%) -Writing lock file -Generating autoload files -``` +- PHP 7.x ## Installation (Composer 2) -1. Update your composer.json `composer require "magenizr/magento2-adminbranding":"1.0.1" --no-update` +1. Update your composer.json `composer require "magenizr/magento2-adminbranding":"^1.0" --no-update` 2. Use `composer update magenizr/magento2-adminbranding --no-install` to update your composer.lock file. ``` Updating dependencies Lock file operations: 1 install, 1 update, 0 removals - - Locking magenizr/magento2-adminbranding (1.0.1) + - Locking magenizr/magento2-adminbranding (1.0.2) ``` 3. And then `composer install` to install the package. @@ -39,25 +24,23 @@ Lock file operations: 1 install, 1 update, 0 removals Installing dependencies from lock file (including require-dev) Verifying lock file contents can be installed on current platform. Package operations: 1 install, 0 update, 0 removals - - Installing magenizr/magento2-adminbranding (1.0.1): Extracting archive + - Installing magenizr/magento2-adminbranding (1.0.2): Extracting archive ``` 4. Enable the module and clear static content. ``` php bin/magento module:enable Magenizr_AdminBranding --clear-static-content -php bin/magento setup:upgrade ``` ## Installation (Manually) 1. Download the code. -2. Extract the downloaded tar.gz file. Example: `tar -xzf Magenizr_AdminBranding_1.0.1.tar.gz`. +2. Extract the downloaded tar.gz file. Example: `tar -xzf Magenizr_AdminBranding_1.0.2.tar.gz`. 3. Copy the code into `./app/code/Magenizr/AdminBranding/`. 4. Enable the module and clear static content. ``` php bin/magento module:enable Magenizr_AdminBranding --clear-static-content -php bin/magento setup:upgrade ``` ## Features @@ -69,7 +52,7 @@ php bin/magento setup:upgrade Go to `Stores > Configuration > Advanced > Admin > Admin Branding` and enable the module. Upload your company logo for the login form or above the sidebar. An additional text can be added and enabled below the login form. ## Support -If you experience any issues, don't hesitate to open an issue on [Github](https://github.com/magenizr/Magenizr_AdminBranding/issues). For a custom build, contact us on [Magento Marketplace](https://marketplace.magento.com/partner/magenizr). +If you experience any issues, don't hesitate to open an issue on [Github](https://github.com/magenizr/Magenizr_AdminBranding/issues). ## Purchase This module is available for free on [GitHub](https://github.com/magenizr). @@ -78,6 +61,13 @@ This module is available for free on [GitHub](https://github.com/magenizr). Follow us on [GitHub](https://github.com/magenizr), [Twitter](https://twitter.com/magenizr) and [Facebook](https://www.facebook.com/magenizr). ## History +===== 1.0.2 ===== +* 2.4.6 compatibility tested +* Fix styling to support small logos +* Code improvements +* Setup version removed from module.xml +* PHP 5.6.x compatibility removed + ===== 1.0.1 ===== * Cleanup various files to follow coding standard (EQP, ECG) diff --git a/composer.json b/composer.json index 03c41fe..8c58a45 100755 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "magenizr/magento2-adminbranding", "description": "Admin Branding allows you to replace the Magento® logo on the admin login page as well as on the dashboard. In addition to that, you can display a custom text and link your clients directly to your issue tracking plattform like JIRA or Zendesk.", "type": "magento2-module", - "version": "1.0.1", + "version": "1.0.2", "license": [ "OSL-3.0" ], diff --git a/etc/acl.xml b/etc/acl.xml index 43f8660..236761f 100755 --- a/etc/acl.xml +++ b/etc/acl.xml @@ -3,7 +3,7 @@ /** * Magenizr AdminBranding * - * @copyright Copyright (c) 2021 Magenizr (https://www.magenizr.com) + * @copyright Copyright (c) 2021 - 2023 Magenizr (https://www.magenizr.com) * @license https://www.magenizr.com/license Magenizr EULA */ --> diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index acc0728..a8ff0c7 100755 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -3,7 +3,7 @@ /** * Magenizr AdminBranding * - * @copyright Copyright (c) 2021 Magenizr (https://www.magenizr.com) + * @copyright Copyright (c) 2021 - 2023 Magenizr (https://www.magenizr.com) * @license https://www.magenizr.com/license Magenizr EULA */ --> diff --git a/etc/config.xml b/etc/config.xml index 9e3aa5c..7c48ad2 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -3,7 +3,7 @@ /** * Magenizr AdminBranding * - * @copyright Copyright (c) 2021 Magenizr (https://www.magenizr.com) + * @copyright Copyright (c) 2021 - 2023 Magenizr (https://www.magenizr.com) * @license https://www.magenizr.com/license Magenizr EULA */ --> @@ -15,6 +15,7 @@ 0 0 0 + 0 Your Company Ltd.]]> diff --git a/etc/module.xml b/etc/module.xml index 502e5f8..18b9fbc 100755 --- a/etc/module.xml +++ b/etc/module.xml @@ -3,13 +3,13 @@ /** * Magenizr AdminBranding * - * @copyright Copyright (c) 2021 Magenizr (https://www.magenizr.com) + * @copyright Copyright (c) 2021 - 2023 Magenizr (https://www.magenizr.com) * @license https://www.magenizr.com/license Magenizr EULA */ --> - + diff --git a/registration.php b/registration.php index 0d9b652..4fbe57a 100755 --- a/registration.php +++ b/registration.php @@ -2,7 +2,7 @@ /** * Magenizr AdminBranding * - * @copyright Copyright (c) 2021 Magenizr (https://www.magenizr.com) + * @copyright Copyright (c) 2021 - 2023 Magenizr (https://www.magenizr.com) * @license https://www.magenizr.com/license Magenizr EULA */ diff --git a/view/adminhtml/layout/admin_login.xml b/view/adminhtml/layout/admin_login.xml index a2b8878..d0e2647 100644 --- a/view/adminhtml/layout/admin_login.xml +++ b/view/adminhtml/layout/admin_login.xml @@ -3,7 +3,7 @@ /** * Magenizr AdminBranding * - * @copyright Copyright (c) 2021 Magenizr (https://www.magenizr.com) + * @copyright Copyright (c) 2021 - 2023 Magenizr (https://www.magenizr.com) * @license https://www.magenizr.com/license Magenizr EULA */ --> diff --git a/view/adminhtml/layout/adminhtml_auth_login.xml b/view/adminhtml/layout/adminhtml_auth_login.xml index c151dad..368b618 100755 --- a/view/adminhtml/layout/adminhtml_auth_login.xml +++ b/view/adminhtml/layout/adminhtml_auth_login.xml @@ -3,7 +3,7 @@ /** * Magenizr AdminBranding * - * @copyright Copyright (c) 2021 Magenizr (https://www.magenizr.com) + * @copyright Copyright (c) 2021 - 2023 Magenizr (https://www.magenizr.com) * @license https://www.magenizr.com/license Magenizr EULA */ --> diff --git a/view/adminhtml/layout/default.xml b/view/adminhtml/layout/default.xml index 0c87a8a..ebb9849 100644 --- a/view/adminhtml/layout/default.xml +++ b/view/adminhtml/layout/default.xml @@ -3,12 +3,15 @@ /** * Magenizr AdminBranding * - * @copyright Copyright (c) 2021 Magenizr (https://www.magenizr.com) + * @copyright Copyright (c) 2021 - 2023 Magenizr (https://www.magenizr.com) * @license https://www.magenizr.com/license Magenizr EULA */ --> + + + diff --git a/view/adminhtml/templates/login.phtml b/view/adminhtml/templates/login.phtml index 6e72465..c48a70f 100644 --- a/view/adminhtml/templates/login.phtml +++ b/view/adminhtml/templates/login.phtml @@ -2,12 +2,12 @@ /** * Magenizr AdminBranding * - * @copyright Copyright (c) 2021 Magenizr (https://www.magenizr.com) + * @copyright Copyright (c) 2021 - 2023 Magenizr (https://www.magenizr.com) * @license https://www.magenizr.com/license Magenizr EULA */ --> -isAdditionalTextEnabled() && $block->getHelper()->isEnabled()) : ?> +isAdditionalTextEnabled() && $block->getHelper()->isEnabled()): ?>

getAdditionalText(); ?>

diff --git a/view/adminhtml/web/css/style.less b/view/adminhtml/web/css/style.less index d78d024..f44c62e 100644 --- a/view/adminhtml/web/css/style.less +++ b/view/adminhtml/web/css/style.less @@ -1,7 +1,7 @@ /** * Magenizr AdminBranding * - * @copyright Copyright (c) 2021 Magenizr (https://www.magenizr.com) + * @copyright Copyright (c) 2021 - 2023 Magenizr (https://www.magenizr.com) * @license https://www.magenizr.com/license Magenizr EULA */ @@ -20,3 +20,19 @@ padding-top: 15px; } } + +.menu-wrapper { + + .logo { + .logo-img { + height: auto !important; + } + } +} + +.adminhtml-auth-login { + + .login-header { + text-align: center; + } +}