Added noscript message and <=IE9 warning; Closes #213

luyadev · May 15, 2019 · 85684c8 · 85684c8
1 parent 36e93b2
commit 85684c8
Show file tree

Hide file tree

Showing 25 changed files with 141 additions and 47 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -35,6 +35,7 @@ This release contains new migrations and requires to run the `migrate` command a
 
 ### Added
 
++ [#213](https://github.com/luyadev/luya-module-admin/issues/213) Added noscript message and <=IE9 warning.
 + [#288](https://github.com/luyadev/luya-module-admin/issues/288) Filemanager add file id in tooltip.
 + [#225](https://github.com/luyadev/luya-module-admin/issues/225) Added configuration for default behavior with inline disposition when uploading new files.
 + [#289](https://github.com/luyadev/luya-module-admin/issues/289) Added new input field methods checkbox, checkboxList, radioList, imageUpload, fileUpload, date and datetime picker.

diff --git a/src/assets/Login.php b/src/assets/Login.php
@@ -20,7 +20,7 @@ class Login extends \luya\web\Asset
  */
  public $css = [
  'dist/main.css',
- 'css/login.css',
+ 'dist/login.css',
  ];
 
  /**

diff --git a/src/messages/de/admin.php b/src/messages/de/admin.php
@@ -414,5 +414,6 @@
  'aw_requestinsight_toggle_error' => 'Error while enabling Request Insight.',
  'aw_requestinsight_cleared' => 'Data has been cleared.',
  'aw_requestinsight_default_label' => 'Request Insight',
-
+ 'login_noscript_error' => 'Sie müssen Javascript aktivieren um das LUYA CMS zu verwenden.',
+ 'login_browsehappy' => 'Sie verwenden einen <strong>veralteten</strong> Browser. Bitte <a href="https://browsehappy.com/?locale=de_de" target="_blank">aktualisieren Sie Ihren Browser</a> um Ihre Sicherheit zu erhöhen.',
 ];
diff --git a/src/messages/el/admin.php b/src/messages/el/admin.php
@@ -401,4 +401,6 @@
  'aw_requestinsight_toggle_error' => 'Error while enabling Request Insight.',
  'aw_requestinsight_cleared' => 'Data has been cleared.',
  'aw_requestinsight_default_label' => 'Request Insight',
+ 'login_noscript_error' => 'You have to activate Javascript to use the LUYA CMS.',
+ 'login_browsehappy' => 'You are using an <strong>outdated</strong> browser. Please <a href="https://browsehappy.com/" target="_blank">upgrade your browser</a> to improve your experience and security.',
 ];
diff --git a/src/messages/en/admin.php b/src/messages/en/admin.php
@@ -412,4 +412,6 @@
  'aw_requestinsight_toggle_error' => 'Error while enabling Request Insight.',
  'aw_requestinsight_cleared' => 'Data has been cleared.',
  'aw_requestinsight_default_label' => 'Request Insight',
+ 'login_noscript_error' => 'You have to activate Javascript to use the LUYA CMS.',
+ 'login_browsehappy' => 'You are using an <strong>outdated</strong> browser. Please <a href="https://browsehappy.com/" target="_blank">upgrade your browser</a> to improve your experience and security.',
 ];
diff --git a/src/messages/es/admin.php b/src/messages/es/admin.php
@@ -393,4 +393,6 @@
  'aw_requestinsight_toggle_error' => 'Error while enabling Request Insight.',
  'aw_requestinsight_cleared' => 'Data has been cleared.',
  'aw_requestinsight_default_label' => 'Request Insight',
+ 'login_noscript_error' => 'You have to activate Javascript to use the LUYA CMS.',
+ 'login_browsehappy' => 'You are using an <strong>outdated</strong> browser. Please <a href="https://browsehappy.com/" target="_blank">upgrade your browser</a> to improve your experience and security.',
 ];
diff --git a/src/messages/fa/admin.php b/src/messages/fa/admin.php
@@ -393,4 +393,6 @@
  'aw_requestinsight_toggle_error' => 'Error while enabling Request Insight.',
  'aw_requestinsight_cleared' => 'Data has been cleared.',
  'aw_requestinsight_default_label' => 'Request Insight',
+ 'login_noscript_error' => 'You have to activate Javascript to use the LUYA CMS.',
+ 'login_browsehappy' => 'You are using an <strong>outdated</strong> browser. Please <a href="https://browsehappy.com/" target="_blank">upgrade your browser</a> to improve your experience and security.',
 ];
diff --git a/src/messages/fr/admin.php b/src/messages/fr/admin.php
@@ -412,4 +412,6 @@
  'aw_requestinsight_toggle_error' => 'Erreur durant l\'activation de Request Insight.',
  'aw_requestinsight_cleared' => 'Données effacées.',
  'aw_requestinsight_default_label' => 'Request Insight',
+ 'login_noscript_error' => 'You have to activate Javascript to use the LUYA CMS.',
+ 'login_browsehappy' => 'You are using an <strong>outdated</strong> browser. Please <a href="https://browsehappy.com/" target="_blank">upgrade your browser</a> to improve your experience and security.',
 ];
diff --git a/src/messages/it/admin.php b/src/messages/it/admin.php
@@ -401,4 +401,6 @@
  'aw_requestinsight_toggle_error' => 'Error while enabling Request Insight.',
  'aw_requestinsight_cleared' => 'Data has been cleared.',
  'aw_requestinsight_default_label' => 'Request Insight',
+ 'login_noscript_error' => 'You have to activate Javascript to use the LUYA CMS.',
+ 'login_browsehappy' => 'You are using an <strong>outdated</strong> browser. Please <a href="https://browsehappy.com/" target="_blank">upgrade your browser</a> to improve your experience and security.',
 ];
diff --git a/src/messages/nl/admin.php b/src/messages/nl/admin.php
@@ -386,4 +386,6 @@
  'aw_requestinsight_toggle_error' => 'Error while enabling Request Insight.',
  'aw_requestinsight_cleared' => 'Data has been cleared.',
  'aw_requestinsight_default_label' => 'Request Insight',
+ 'login_noscript_error' => 'You have to activate Javascript to use the LUYA CMS.',
+ 'login_browsehappy' => 'You are using an <strong>outdated</strong> browser. Please <a href="https://browsehappy.com/" target="_blank">upgrade your browser</a> to improve your experience and security.',
 ];
diff --git a/src/messages/pl/admin.php b/src/messages/pl/admin.php
@@ -409,4 +409,6 @@
  'aw_requestinsight_toggle_error' => 'Error while enabling Request Insight.',
  'aw_requestinsight_cleared' => 'Data has been cleared.',
  'aw_requestinsight_default_label' => 'Request Insight',
+ 'login_noscript_error' => 'You have to activate Javascript to use the LUYA CMS.',
+ 'login_browsehappy' => 'You are using an <strong>outdated</strong> browser. Please <a href="https://browsehappy.com/" target="_blank">upgrade your browser</a> to improve your experience and security.',
 ];
diff --git a/src/messages/pt/admin.php b/src/messages/pt/admin.php
@@ -413,4 +413,6 @@
  'aw_requestinsight_toggle_error' => 'Error while enabling Request Insight.',
  'aw_requestinsight_cleared' => 'Data has been cleared.',
  'aw_requestinsight_default_label' => 'Request Insight',
+ 'login_noscript_error' => 'You have to activate Javascript to use the LUYA CMS.',
+ 'login_browsehappy' => 'You are using an <strong>outdated</strong> browser. Please <a href="https://browsehappy.com/" target="_blank">upgrade your browser</a> to improve your experience and security.',
 ];
diff --git a/src/messages/ru/admin.php b/src/messages/ru/admin.php
@@ -415,4 +415,6 @@
  'aw_requestinsight_toggle_error' => 'Ошибка при включении Insight запросов.',
  'aw_requestinsight_cleared' => 'Данные очищены.',
  'aw_requestinsight_default_label' => 'Insight запросов',
+ 'login_noscript_error' => 'You have to activate Javascript to use the LUYA CMS.',
+ 'login_browsehappy' => 'You are using an <strong>outdated</strong> browser. Please <a href="https://browsehappy.com/" target="_blank">upgrade your browser</a> to improve your experience and security.',
 ];
diff --git a/src/messages/tr/admin.php b/src/messages/tr/admin.php
@@ -412,4 +412,6 @@
  'aw_requestinsight_toggle_error' => 'Error while enabling Request Insight.',
  'aw_requestinsight_cleared' => 'Data has been cleared.',
  'aw_requestinsight_default_label' => 'Request Insight',
+ 'login_noscript_error' => 'You have to activate Javascript to use the LUYA CMS.',
+ 'login_browsehappy' => 'You are using an <strong>outdated</strong> browser. Please <a href="https://browsehappy.com/" target="_blank">upgrade your browser</a> to improve your experience and security.',
 ];
diff --git a/src/messages/ua/admin.php b/src/messages/ua/admin.php
@@ -413,4 +413,6 @@
  'aw_requestinsight_toggle_error' => 'Error while enabling Request Insight.',
  'aw_requestinsight_cleared' => 'Data has been cleared.',
  'aw_requestinsight_default_label' => 'Request Insight',
+ 'login_noscript_error' => 'You have to activate Javascript to use the LUYA CMS.',
+ 'login_browsehappy' => 'You are using an <strong>outdated</strong> browser. Please <a href="https://browsehappy.com/" target="_blank">upgrade your browser</a> to improve your experience and security.',
 ];
diff --git a/src/messages/vi/admin.php b/src/messages/vi/admin.php
@@ -412,4 +412,6 @@
  'aw_requestinsight_toggle_error' => 'Error while enabling Request Insight.',
  'aw_requestinsight_cleared' => 'Data has been cleared.',
  'aw_requestinsight_default_label' => 'Request Insight',
+ 'login_noscript_error' => 'You have to activate Javascript to use the LUYA CMS.',
+ 'login_browsehappy' => 'You are using an <strong>outdated</strong> browser. Please <a href="https://browsehappy.com/" target="_blank">upgrade your browser</a> to improve your experience and security.',
 ];
diff --git a/src/resources/css/login.css b/src/resources/css/login.css
diff --git a/src/resources/dist/login.css b/src/resources/dist/login.css
diff --git a/src/resources/dist/login.js b/src/resources/dist/login.js
diff --git a/src/resources/dist/login.unglue b/src/resources/dist/login.unglue
@@ -1,4 +1,7 @@
 {
+ "css": [
+ "../scss/login.scss"
+ ],
  "js": [
  "../js/login.js"
  ]

diff --git a/src/resources/dist/main.css b/src/resources/dist/main.css
diff --git a/src/resources/dist/main.js b/src/resources/dist/main.js
diff --git a/src/resources/scss/components/_login.scss b/src/resources/scss/components/_login.scss
@@ -40,10 +40,6 @@
  top: -100px;
  opacity: 1;
 
- @include media-breakpoint-up(sm) {
- top: -160px;
- }
-
  @media screen and (max-height: 450px) {
  top: -100px;
  }

diff --git a/src/resources/scss/login.scss b/src/resources/scss/login.scss
@@ -0,0 +1,93 @@
+// Custom styles / style-overrides for the login page
+
+@import 'variables/colors';
+
+.card {
+ margin-top: 100px;
+}
+
+.btn {
+ padding-left: 10px;
+ padding-right: 10px;
+}
+
+.preloader-wrapper.login__spinner {
+ height: 20px;
+ margin-left: 10px;
+ margin-right: 4px;
+ margin-top: 8px;
+ width: 20px;
+
+ .spinner-layer {
+ border-color: #fff !important;
+ }
+}
+
+.hidden {
+ display: none;
+}
+
+.login__success {
+ padding: 50px 0 44px 0;
+ text-align: center;
+}
+
+.login__success-icon {
+ font-size: 14rem;
+}
+
+form .row {
+ margin-bottom: 20px;
+}
+
+.login-noscript {
+ background-color: $luya;
+ color: $white;
+ left: 50%;
+ min-width: 320px;
+ padding: 125px 50px;
+ position: absolute;
+ top: 50%;
+ transform: translate(-50%, -50%);
+
+ @media (min-width: 593px) {
+ min-width: 593px;
+ }
+
+ p {
+ display: block;
+ font-size: 1.3rem;
+ margin: 0;
+ text-align: center;
+ }
+}
+
+.login-browsehappy {
+ display: none;
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ text-align: center;
+
+ p {
+ display: inline-block;
+ margin: 0;
+ padding: 25px;
+ background-color: #FFE65C;
+ }
+
+ a {
+ text-decoration: underline;
+ }
+
+ @media (min-width: 800px) and (min-height: 430px) {
+ display: block;
+ }
+ @media (min-width: 500px) and (min-height: 500px) {
+ display: block;
+ }
+ @media (max-width: 800px) and (min-height: 730px) {
+ display: block;
+ }
+}
diff --git a/src/views/login/index.php b/src/views/login/index.php
@@ -75,3 +75,13 @@
  </li>
  </ul>
 </div>
+
+<noscript>
+ <div class="login-noscript">
+ <p><?= Module::t('login_noscript_error');?></p>
+ </div>
+</noscript>
+
+<!--[if IE]>
+ <div class="login-browsehappy"><p><?= Module::t('login_browsehappy');?></p></div>
+<![endif]-->