Skip to content
Snippets Groups Projects
Commit 21be3958 authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

[fix] Config: Increase timeout (to 300s as usally in web browser)

[fix] Config: remove unused properties
[enh] Login: use assertive color when enabling "remember me" option
parent aa99537e
No related branches found
No related tags found
No related merge requests found
{ {
"default": { "default": {
"cacheTimeMs": 60000, "cacheTimeMs": 300000,
"fallbackLanguage": "en", "fallbackLanguage": "en",
"rememberMe": false, "rememberMe": false,
"showUDHistory": false, "showUDHistory": false,
"timeout": 10000, "timeout": 300000,
"timeWarningExpireMembership": 5184000, "timeWarningExpireMembership": 5184000,
"timeWarningExpire": 7776000, "timeWarningExpire": 7776000,
"logoutIlde": 600, "logoutIlde": 600,
"useLocalStorage": true, "useLocalStorage": true,
"useRelative": false, "useRelative": false,
"initPhase": false,
"expertMode": false, "expertMode": false,
"decimalCount": 2, "decimalCount": 2,
"httpsMode": false, "httpsMode": false,
...@@ -53,17 +52,16 @@ ...@@ -53,17 +52,16 @@
}, },
"default_fr": { "default_fr": {
"cacheTimeMs": 60000, "cacheTimeMs": 300000,
"fallbackLanguage": "fr", "fallbackLanguage": "fr",
"rememberMe": false, "rememberMe": false,
"showUDHistory": false, "showUDHistory": false,
"timeout": 10000, "timeout": 300000,
"timeWarningExpireMembership": 5184000, "timeWarningExpireMembership": 5184000,
"timeWarningExpire": 7776000, "timeWarningExpire": 7776000,
"logoutIlde": 600, "logoutIlde": 600,
"useLocalStorage": true, "useLocalStorage": true,
"useRelative": false, "useRelative": false,
"initPhase": false,
"expertMode": false, "expertMode": false,
"decimalCount": 2, "decimalCount": 2,
"httpsMode": false, "httpsMode": false,
...@@ -105,11 +103,11 @@ ...@@ -105,11 +103,11 @@
}, },
"g1-test": { "g1-test": {
"cacheTimeMs": 60000, "cacheTimeMs": 300000,
"fallbackLanguage": "en", "fallbackLanguage": "en",
"rememberMe": false, "rememberMe": false,
"showUDHistory": false, "showUDHistory": false,
"timeout": 10000, "timeout": 300000,
"timeWarningExpireMembership": 5184000, "timeWarningExpireMembership": 5184000,
"timeWarningExpire": 7776000, "timeWarningExpire": 7776000,
"useLocalStorage": true, "useLocalStorage": true,
...@@ -147,12 +145,12 @@ ...@@ -147,12 +145,12 @@
}, },
"dev": { "dev": {
"cacheTimeMs": 60000, "cacheTimeMs": 300000,
"fallbackLanguage": "fr-FR", "fallbackLanguage": "fr-FR",
"defaultLanguage": "fr-FR", "defaultLanguage": "fr-FR",
"rememberMe": true, "rememberMe": true,
"showUDHistory": false, "showUDHistory": false,
"timeout": 6000, "timeout": 300000,
"timeWarningExpireMembership": 5184000, "timeWarningExpireMembership": 5184000,
"timeWarningExpire": 7776000, "timeWarningExpire": 7776000,
"useLocalStorage": true, "useLocalStorage": true,
...@@ -210,11 +208,11 @@ ...@@ -210,11 +208,11 @@
}, },
"dev_g1": { "dev_g1": {
"cacheTimeMs": 60000, "cacheTimeMs": 300000,
"fallbackLanguage": "en", "fallbackLanguage": "en",
"rememberMe": true, "rememberMe": true,
"showUDHistory": false, "showUDHistory": false,
"timeout": 10000, "timeout": 300000,
"timeWarningExpireMembership": 5184000, "timeWarningExpireMembership": 5184000,
"timeWarningExpire": 7776000, "timeWarningExpire": 7776000,
"useLocalStorage": true, "useLocalStorage": true,
......
...@@ -9,17 +9,16 @@ ...@@ -9,17 +9,16 @@
angular.module("cesium.config", []) angular.module("cesium.config", [])
.constant("csConfig", { .constant("csConfig", {
"cacheTimeMs": 60000, "cacheTimeMs": 300000,
"fallbackLanguage": "en", "fallbackLanguage": "en",
"rememberMe": false, "rememberMe": false,
"showUDHistory": false, "showUDHistory": false,
"timeout": 10000, "timeout": 300000,
"timeWarningExpireMembership": 5184000, "timeWarningExpireMembership": 5184000,
"timeWarningExpire": 7776000, "timeWarningExpire": 7776000,
"logoutIlde": 600, "logoutIlde": 600,
"useLocalStorage": true, "useLocalStorage": true,
"useRelative": false, "useRelative": false,
"initPhase": false,
"expertMode": false, "expertMode": false,
"decimalCount": 2, "decimalCount": 2,
"httpsMode": false, "httpsMode": false,
...@@ -60,7 +59,7 @@ angular.module("cesium.config", []) ...@@ -60,7 +59,7 @@ angular.module("cesium.config", [])
} }
}, },
"version": "0.13.0", "version": "0.13.0",
"build": "2017-06-21T15:20:40.770Z", "build": "2017-06-28T13:09:08.393Z",
"newIssueUrl": "https://github.com/duniter/cesium/issues/new?labels=bug" "newIssueUrl": "https://github.com/duniter/cesium/issues/new?labels=bug"
}) })
......
...@@ -114,10 +114,12 @@ angular.module('cesium.bma.services', ['ngApi', 'cesium.http.services', 'cesium. ...@@ -114,10 +114,12 @@ angular.module('cesium.bma.services', ['ngApi', 'cesium.http.services', 'cesium.
} }
function closeWs() { function closeWs() {
console.warn('[BMA] Closing all websockets...');
_.keys(that.cache.wsByPath).forEach(function(key) { _.keys(that.cache.wsByPath).forEach(function(key) {
var sock = that.cache.wsByPath[key]; var sock = that.cache.wsByPath[key];
sock.close(); sock.close();
}); });
that.cache.wsByPath = {};
} }
that.cleanCache = function() { that.cleanCache = function() {
......
...@@ -16,6 +16,9 @@ ...@@ -16,6 +16,9 @@
<div class="list" ng-init="setForm(loginForm)"> <div class="list" ng-init="setForm(loginForm)">
<!-- avoid web browser to fill password automatically -->
<input type="password" name="fake-password" style="visibility:hidden; position:absolute;"/>
<!-- salt (=username, to enable browser login cache) --> <!-- salt (=username, to enable browser login cache) -->
<label class="item item-input" <label class="item item-input"
ng-class="{ 'item-input-error': form.$submitted && form.username.$invalid}"> ng-class="{ 'item-input-error': form.$submitted && form.username.$invalid}">
...@@ -72,15 +75,20 @@ ...@@ -72,15 +75,20 @@
<!-- remember me --> <!-- remember me -->
<div class="item item-toggle dark hidden-xs"> <div class="item item-toggle hidden-xs">
<span translate>SETTINGS.REMEMBER_ME</span> <div class="input-label " translate>SETTINGS.REMEMBER_ME</div>
<label class="toggle toggle-calm"> <h4 class="gray text-wrap"
ng-class="{'assertive': formData.rememberMe}">
<i class="icon ion-alert-circled" ng-if="formData.rememberMe"></i>
<span ng-bind-html="'SETTINGS.REMEMBER_ME_HELP' | translate"></span>
</h4>
<label class="toggle toggle-assertive">
<input type="checkbox" ng-model="formData.rememberMe"> <input type="checkbox" ng-model="formData.rememberMe">
<div class="track"> <div class="track">
<div class="handle"></div> <div class="handle"></div>
</div> </div>
</label> </label>
</div> </span>
<!-- Show public key --> <!-- Show public key -->
...@@ -112,15 +120,19 @@ ...@@ -112,15 +120,19 @@
</button> </button>
</div> </div>
<br class="visible-xs"/>
<!-- Register ? --> <!-- Register ? -->
<div class="text-center no-padding"> <div class="text-center no-padding">
{{'LOGIN.NO_ACCOUNT_QUESTION'|translate}} {{'LOGIN.NO_ACCOUNT_QUESTION'|translate}}
<br class="visible-xs"> <br class="visible-xs"/>
<a ng-click="showJoinModal()" translate> <a ng-click="showJoinModal()" translate>
LOGIN.CREATE_ACCOUNT LOGIN.CREATE_ACCOUNT
</a> </a>
</div> </div>
<br class="visible-xs"/>
<div class="text-center no-padding"> <div class="text-center no-padding">
<a ng-click="showAccountSecurityModal()" translate> <a ng-click="showAccountSecurityModal()" translate>
LOGIN.FORGOTTEN_ID LOGIN.FORGOTTEN_ID
......
...@@ -92,7 +92,6 @@ ...@@ -92,7 +92,6 @@
{{'SETTINGS.AUTHENTICATION_SETTINGS' | translate}} {{'SETTINGS.AUTHENTICATION_SETTINGS' | translate}}
</span> </span>
<div class="item item-toggle" > <div class="item item-toggle" >
<div class="input-label" ng-class="{'gray': !formData.useLocalStorage}"> <div class="input-label" ng-class="{'gray': !formData.useLocalStorage}">
{{'SETTINGS.REMEMBER_ME' | translate}} {{'SETTINGS.REMEMBER_ME' | translate}}
...@@ -102,9 +101,9 @@ ...@@ -102,9 +101,9 @@
<i class="icon ion-alert-circled" ng-if="formData.rememberMe"></i> <i class="icon ion-alert-circled" ng-if="formData.rememberMe"></i>
<span ng-bind-html="'SETTINGS.REMEMBER_ME_HELP' | translate"></span> <span ng-bind-html="'SETTINGS.REMEMBER_ME_HELP' | translate"></span>
</h4> </h4>
<label class="toggle" ng-class="{'toggle-stable': !formData.useLocalStorage, 'toggle-royal': formData.useLocalStorage}">
<input type="checkbox" ng-model="formData.rememberMe" ng-disabled="!formData.useLocalStorage" <label class="toggle" ng-class="{'toggle-stable': !formData.useLocalStorage, 'toggle-assertive': formData.useLocalStorage}">
> <input type="checkbox" ng-model="formData.rememberMe" ng-disabled="!formData.useLocalStorage">
<div class="track"> <div class="track">
<div class="handle"></div> <div class="handle"></div>
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment