From f126e07fdb835c2bbbedaa4565de9cf1a37d40c2 Mon Sep 17 00:00:00 2001
From: Exodus4D <exodus4d@gmail.com>
Date: Sat, 27 May 2017 21:27:03 +0200
Subject: [PATCH] - minor UI improvements

---
 app/environment.ini                | 2 +-
 js/app/login.js                    | 1 +
 js/app/util.js                     | 9 +++++----
 public/js/v1.2.3/app/login.js      | 1 +
 public/js/v1.2.3/app/util.js       | 9 +++++----
 public/templates/form/message.html | 6 ++++--
 public/templates/modules/sso.html  | 4 ++--
 public/templates/view/login.html   | 6 +++---
 8 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/app/environment.ini b/app/environment.ini
index 64c0e6ec..8dc3624e 100644
--- a/app/environment.ini
+++ b/app/environment.ini
@@ -11,7 +11,7 @@ SERVER                      =   DEVELOP
 ; -> e.g. set /pathfinder if your URL looks like https://www.[YOUR_DOMAIN]/pathfinder (subfolder)
 BASE                        =
 ; deployment URL (e.g. http://localhost)
-URL                         =   http://pathfinder.local
+URL                         =   http://local.pathfinder
 ; level of debug/error stack trace
 DEBUG                       =   3
 ; main db
diff --git a/js/app/login.js b/js/app/login.js
index f639fed4..8d0f5f77 100644
--- a/js/app/login.js
+++ b/js/app/login.js
@@ -663,6 +663,7 @@ define([
                         responseData.error.length > 0
                     ){
                         $('.' + config.dynamicMessageContainerClass).showMessage({
+                            dismissible: false,
                             type: responseData.error[0].type,
                             title: 'Character verification failed',
                             text: responseData.error[0].message
diff --git a/js/app/util.js b/js/app/util.js
index 9a20b59c..15b3e754 100644
--- a/js/app/util.js
+++ b/js/app/util.js
@@ -763,14 +763,15 @@ define([
                     break;
             }
 
-            let data = {
-                title: config.title,
-                text: config.text,
+            let defaultOptions = {
+                dismissible: true,
                 messageTypeClass: messageTypeClass,
                 messageTextClass: messageTextClass
             };
 
-            let content = Mustache.render(template, data);
+            defaultOptions = $.extend(defaultOptions, config);
+
+            let content = Mustache.render(template, defaultOptions);
 
             containerElement.html(content);
 
diff --git a/public/js/v1.2.3/app/login.js b/public/js/v1.2.3/app/login.js
index f639fed4..8d0f5f77 100644
--- a/public/js/v1.2.3/app/login.js
+++ b/public/js/v1.2.3/app/login.js
@@ -663,6 +663,7 @@ define([
                         responseData.error.length > 0
                     ){
                         $('.' + config.dynamicMessageContainerClass).showMessage({
+                            dismissible: false,
                             type: responseData.error[0].type,
                             title: 'Character verification failed',
                             text: responseData.error[0].message
diff --git a/public/js/v1.2.3/app/util.js b/public/js/v1.2.3/app/util.js
index 9a20b59c..15b3e754 100644
--- a/public/js/v1.2.3/app/util.js
+++ b/public/js/v1.2.3/app/util.js
@@ -763,14 +763,15 @@ define([
                     break;
             }
 
-            let data = {
-                title: config.title,
-                text: config.text,
+            let defaultOptions = {
+                dismissible: true,
                 messageTypeClass: messageTypeClass,
                 messageTextClass: messageTextClass
             };
 
-            let content = Mustache.render(template, data);
+            defaultOptions = $.extend(defaultOptions, config);
+
+            let content = Mustache.render(template, defaultOptions);
 
             containerElement.html(content);
 
diff --git a/public/templates/form/message.html b/public/templates/form/message.html
index 0901e6d0..3e07652a 100644
--- a/public/templates/form/message.html
+++ b/public/templates/form/message.html
@@ -1,5 +1,7 @@
-<div style="display: hidden;" class="alert {{messageTypeClass}} alert-dismissible" >
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close"><i class="fa fa-close"></i></button>
+<div style="display: none;" class="alert {{messageTypeClass}} alert-dismissible" >
+    {{#dismissible}}
+        <button type="button" class="close" data-dismiss="alert" aria-label="Close"><i class="fa fa-close"></i></button>
+    {{/dismissible}}
     <span class="txt-color {{messageTextClass}}">{{title}}</span>
     <small>{{text}}</small>
 </div>
\ No newline at end of file
diff --git a/public/templates/modules/sso.html b/public/templates/modules/sso.html
index badce752..c23a87f3 100644
--- a/public/templates/modules/sso.html
+++ b/public/templates/modules/sso.html
@@ -1,7 +1,7 @@
 <check if="{{ @SESSION.SSO.ERROR }}">
     <div class="container-fluid">
-        <div class="row ">
-            <div class="col-sm-8 col-sm-offset-2">
+        <div class="row">
+            <div class="col-xs-12 col-md-8 col-md-offset-2">
                 <div class="alert alert-danger" >
                     <span class="txt-color txt-color-danger">Access denied</span>
                     <small>{{ @SESSION.SSO.ERROR }}</small>
diff --git a/public/templates/view/login.html b/public/templates/view/login.html
index 15acbffe..addb321d 100644
--- a/public/templates/view/login.html
+++ b/public/templates/view/login.html
@@ -70,10 +70,10 @@
         <check if="{{ array_key_exists('/setup', @ROUTES) && @PATHFINDER.SHOW_SETUP_WARNING }}">
             <div class="container-fluid">
                 <div class="row">
-                    <div class="col-sm-8 col-sm-offset-2">
+                    <div class="col-xs-12 col-md-8 col-md-offset-2">
                         <div class="alert alert-warning" >
                             <span class="txt-color txt-color-warning">Setup mode active</span>
-                            <small>Disable setup route in routes.ini on production environment! <a href="{{ 'setup' | alias }}">Setup</a></small>
+                            <small>Disable '/setup' route in routes.ini on production environment! <a href="{{ 'setup' | alias }}">Setup</a></small>
                         </div>
                     </div>
                 </div>
@@ -92,7 +92,7 @@
                 {* dynamic message container *}
                 <div class="container-fluid">
                     <div class="row ">
-                        <div class="col-sm-8 col-sm-offset-2 pf-dynamic-message-container">
+                        <div class="col-xs-12 col-md-8 col-md-offset-2 pf-dynamic-message-container">
                             {* client side message e.g. ajax errors *}
                         </div>
                     </div>