dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- minor UI improvements

Browse Source
This commit is contained in:
Exodus4D
2017-05-27 21:27:03 +02:00
parent 7633db995d
commit f126e07fdb
8 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/environment.ini
View File

@@ -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

1
js/app/login.js
View File

@@ -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

9
js/app/util.js
View File

@@ -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);

1
public/js/v1.2.3/app/login.js
View File

@@ -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

9
public/js/v1.2.3/app/util.js
View File

@@ -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);

6
public/templates/form/message.html
View File

@@ -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>

4
public/templates/modules/sso.html
View File

@@ -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>

6
public/templates/view/login.html
View File

@@ -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>