diff --git a/app/config.json b/app/config.json
index ea682c93256948d1839a676a0a464e067124e450..9d9d1a59aebc184e238737e7a21818ac092f5631 100644
--- a/app/config.json
+++ b/app/config.json
@@ -36,6 +36,43 @@
}
},
+ "g1": {
+ "cacheTimeMs": 60000,
+ "fallbackLanguage": "en",
+ "rememberMe": false,
+ "showUDHistory": false,
+ "timeout": 10000,
+ "timeWarningExpireMembership": 5184000,
+ "timeWarningExpire": 7776000,
+ "useLocalStorage": true,
+ "useRelative": true,
+ "initPhase": true,
+ "expertMode": false,
+ "decimalCount": 4,
+ "helptip": {
+ "enable": true,
+ "installDocUrl": "https://github.com/duniter/duniter/blob/master/doc/install-a-node.md"
+ },
+ "node": {
+ "host": "g1.duniter.org",
+ "port": 443
+ },
+ "plugins":{
+ "es": {
+ "enable": true,
+ "askEnable": false,
+ "host": "data.gtest.duniter.fr",
+ "port": 80,
+ "notifications": {
+ "txSent": true,
+ "txReceived": true,
+ "certSent": true,
+ "certReceived": true
+ }
+ }
+ }
+ },
+
"dev": {
"cacheTimeMs": 60000,
"fallbackLanguage": "fr-FR",
diff --git a/www/i18n/locale-en-GB.json b/www/i18n/locale-en-GB.json
index 8c8a77c38250e80c1d071f163e3ab2a26361a3ff..e43cbef60caf9c1fb48b900bbdc2aab429904749 100644
--- a/www/i18n/locale-en-GB.json
+++ b/www/i18n/locale-en-GB.json
@@ -121,7 +121,8 @@
"REMEMBER_ME": "Remember me",
"PLUGINS_SETTINGS": "Extensions",
"BTN_RESET": "Restore default values",
- "EXPERT_MODE": "Enable expert mode<span class=\"hidden-xs\">(display more details)</span>",
+ "EXPERT_MODE": "Enable expert mode",
+ "EXPERT_MODE_HELP": "Allow to see more details",
"POPUP_PEER": {
"TITLE" : "Duniter peer",
"HELP" : "Peer address:",
@@ -502,8 +503,8 @@
"MENU_BTN_ACCOUNT": "<b>{{'ACCOUNT.TITLE'|translate}}</b> allows access to your account balance and transaction history.",
"MENU_BTN_ACCOUNT_MEMBER": "Here you can consult your account status, transaction history and your certifications.",
"WALLET_CERTIFICATIONS": "Click here to reveiw the details of your certifications (given and received).",
- "WALLET_RECEIVED_CERTIFICATIONS": "Click here to reveiw the details of your <b>received</b> certifications.",
- "WALLET_GIVEN_CERTIFICATIONS": "Click here to reveiw the details of your <b>given</b> certifications.",
+ "WALLET_RECEIVED_CERTIFICATIONS": "Click here to reveiw the details of your <b>received certifications</b>.",
+ "WALLET_GIVEN_CERTIFICATIONS": "Click here to reveiw the details of your <b>given certifications</b>.",
"WALLET_BALANCE": "Your account <b>balance</b> is shown here.",
"WALLET_BALANCE_RELATIVE": "{{'HELP.TIP.WALLET_BALANCE'|translate}}<br/><br/>The used unit (“<b>{{'COMMON.UD'|translate}}<sub>{{currency|abbreviate}}</sub></b>”) signifies that the amount in {{currency|capitalize}} has been divided by the <b>Universal Dividend</b> (UD) co-created by each member.<br/>At this moment, 1 UD equals {{currentUD}} {{currency|capitalize}}.",
"WALLET_BALANCE_CHANGE_UNIT": "You can <b>change the unit</b> in which amounts are shown in <b><i class=\"icon ion-android-settings\"></i> {{'MENU.SETTINGS'|translate}}</b>.<br/><br/>For example, to display amounts <b>directly in {{currency|capitalize}}</b> instead of relative amounts.",
diff --git a/www/i18n/locale-en.json b/www/i18n/locale-en.json
index 21cc97f815bc275cfa39c7c2fa556ac9e996e132..dc3eb1a2815ba35f22eba8fd7114698738bf9fd7 100644
--- a/www/i18n/locale-en.json
+++ b/www/i18n/locale-en.json
@@ -121,7 +121,8 @@
"REMEMBER_ME": "Remember me",
"PLUGINS_SETTINGS": "Extensions",
"BTN_RESET": "Restore default values",
- "EXPERT_MODE": "Enable expert mode<span class=\"hidden-xs\">(display more details)</span>",
+ "EXPERT_MODE": "Enable expert mode",
+ "EXPERT_MODE_HELP": "Allow to see more details",
"POPUP_PEER": {
"TITLE" : "Duniter peer",
"HELP" : "Peer address:",
diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json
index 2b4323f67d8e1053c4c65d5d972eb6d3e16dd730..1cca03259838576fcecb75c3872a0b4abb183bac 100644
--- a/www/i18n/locale-fr-FR.json
+++ b/www/i18n/locale-fr-FR.json
@@ -114,14 +114,15 @@
"NETWORK_SETTINGS": "Réseau",
"PEER": "Adresse du nœud Duniter",
"USE_LOCAL_STORAGE": "Activer le stockage local",
- "ENABLE_HELPTIP": "Activer les bulles d'aide<span class=\"hidden-xs\"> contextuelles</span>",
+ "ENABLE_HELPTIP": "Activer les bulles d'aide contextuelles",
"HISTORY_SETTINGS": "Mon compte",
"DISPLAY_UD_HISTORY": "Afficher les dividendes produits ?",
"AUTHENTICATION_SETTINGS": "Authentification",
"REMEMBER_ME": "Se souvenir de moi",
"PLUGINS_SETTINGS": "Extensions",
"BTN_RESET": "Restaurer les valeurs par défaut",
- "EXPERT_MODE": "Activer le mode expert<span class=\"hidden-xs\">(affichage plus détaillé)</span>",
+ "EXPERT_MODE": "Activer le mode expert",
+ "EXPERT_MODE_HELP": "Permet un affichage plus détaillé",
"POPUP_PEER": {
"TITLE" : "NÅ“ud Duniter",
"HELP" : "Adresse du nœud :",
diff --git a/www/plugins/es/i18n/locale-en-GB.json b/www/plugins/es/i18n/locale-en-GB.json
index c404854f20440d79d5c80829cbce5c6f9358bd76..42af33dd47fff5d9c06351198c053ad34b8657c7 100644
--- a/www/plugins/es/i18n/locale-en-GB.json
+++ b/www/plugins/es/i18n/locale-en-GB.json
@@ -192,7 +192,7 @@
"CATEGORY": "Main activity",
"GENERAL_DIVIDER": "Basic information",
"LOCATION_DIVIDER": "Address",
- "SOCIAL_NETWORKS_DIVIDER": "Social networks and web site",
+ "SOCIAL_NETWORKS_DIVIDER": "Social networks, web sites",
"TECHNICAL_DIVIDER": "Technical data",
"BTN_NEW": "Add",
"SEARCH": {
@@ -286,10 +286,9 @@
}
},
"ES_SETTINGS": {
- "PLUGIN_NAME": "Cesium+: user profiles, notifications, private messages...",
+ "PLUGIN_NAME": "Cesium+",
+ "PLUGIN_NAME_HELP": "User profiles, notifications, private messages",
"ENABLE_TOGGLE": "Enable extension?",
- "ENABLE_MARKET_TOGGLE": "Enable market place?",
- "ENABLE_REGISTRY_TOGGLE": "Enable companies registry?",
"ENABLE_MESSAGE_TOGGLE": "Enable messages?",
"ENABLE_SETTINGS_TOGGLE": "Enable remote storage for settings?",
"PEER": "Data peer address",
diff --git a/www/plugins/es/i18n/locale-en.json b/www/plugins/es/i18n/locale-en.json
index f0577901c2cf6af13fa68396aa74598b8a40acf4..42af33dd47fff5d9c06351198c053ad34b8657c7 100644
--- a/www/plugins/es/i18n/locale-en.json
+++ b/www/plugins/es/i18n/locale-en.json
@@ -286,10 +286,9 @@
}
},
"ES_SETTINGS": {
- "PLUGIN_NAME": "Cesium+: user profiles, notifications, private messages...",
+ "PLUGIN_NAME": "Cesium+",
+ "PLUGIN_NAME_HELP": "User profiles, notifications, private messages",
"ENABLE_TOGGLE": "Enable extension?",
- "ENABLE_MARKET_TOGGLE": "Enable market place?",
- "ENABLE_REGISTRY_TOGGLE": "Enable companies registry?",
"ENABLE_MESSAGE_TOGGLE": "Enable messages?",
"ENABLE_SETTINGS_TOGGLE": "Enable remote storage for settings?",
"PEER": "Data peer address",
diff --git a/www/plugins/es/i18n/locale-fr-FR.json b/www/plugins/es/i18n/locale-fr-FR.json
index 96ab1fe77e855abeee19929a72c7e86eab845903..79081a55b34f03e5e401216380226f265eb02f50 100644
--- a/www/plugins/es/i18n/locale-fr-FR.json
+++ b/www/plugins/es/i18n/locale-fr-FR.json
@@ -286,10 +286,9 @@
}
},
"ES_SETTINGS": {
- "PLUGIN_NAME": "Cesium+ : profils et avatar, notifications, messages privés...",
+ "PLUGIN_NAME": "Cesium+",
+ "PLUGIN_NAME_HELP": "Profils, notifications, messages privés",
"ENABLE_TOGGLE": "Activer l'extension ?",
- "ENABLE_MARKET_TOGGLE": "Activer les annonces ?",
- "ENABLE_REGISTRY_TOGGLE": "Activer l'annuaire des pro ?",
"ENABLE_MESSAGE_TOGGLE": "Activer les messages privés ?",
"ENABLE_SETTINGS_TOGGLE": "Activer le stockage distant des paramètres ?",
"PEER": "Addresse du nœud de données",
diff --git a/www/plugins/es/i18n/locale-nl-NL.json b/www/plugins/es/i18n/locale-nl-NL.json
index 9f76ae871d3c6713656132fb36dda4343413ada7..86a25f7b5ede64534253e579e01191235c5e66c7 100644
--- a/www/plugins/es/i18n/locale-nl-NL.json
+++ b/www/plugins/es/i18n/locale-nl-NL.json
@@ -270,8 +270,6 @@
"ES_SETTINGS": {
"PLUGIN_NAME": "Cesium+",
"ENABLE_TOGGLE": "Uitbreiding inschakelen?",
- "ENABLE_MARKET_TOGGLE": "Marktplaats inschakelen?",
- "ENABLE_REGISTRY_TOGGLE": "Bedrijfsregister inschakelen?",
"ENABLE_MESSAGE_TOGGLE": "Berichten inschakelen?",
"ENABLE_SETTINGS_TOGGLE": "Globale opslag voor instellingen inschakelen?",
"PEER": "Adres dataknooppunt",
diff --git a/www/plugins/es/templates/settings/settings_extend.html b/www/plugins/es/templates/settings/settings_extend.html
index 4cdf3c353ff9ed7909db01e11eb4f27a994013b9..e4caca4651286077ea584cc657750c27c1302ccc 100644
--- a/www/plugins/es/templates/settings/settings_extend.html
+++ b/www/plugins/es/templates/settings/settings_extend.html
@@ -1,11 +1,11 @@
<span class="item item-divider" translate>SETTINGS.PLUGINS_SETTINGS</span>
-<div class="item ink" ui-sref="app.es_settings">
+<div class="item item-text-wrap ink" ui-sref="app.es_settings">
<div class="input-label ng-binding" translate>ES_SETTINGS.PLUGIN_NAME</div>
-
- <h3 class="item-note">
+ <h4 class="gray" translate>ES_SETTINGS.PLUGIN_NAME_HELP</h4>
+ <span class="badge item-note">
<span class="dark" ng-if="formData.plugins.es.enable" translate>COMMON.ENABLE</span>
<span ng-if="!formData.plugins.es.enable" translate>COMMON.DISABLE</span>
- </h3>
+ </span>
</div>
diff --git a/www/templates/settings/settings.html b/www/templates/settings/settings.html
index 45dd6e00b509f508c248ebe34abaa6c311138d56..e7da4e24d10b6097a98f5ef7089db7162c6661c4 100644
--- a/www/templates/settings/settings.html
+++ b/www/templates/settings/settings.html
@@ -50,7 +50,7 @@
</select>
</label>
- <div class="item item-toggle dark">
+ <div class="item item-text-wrap item-toggle dark">
<div class="input-label">
{{'SETTINGS.USE_LOCAL_STORAGE' | translate}}
</div>
@@ -62,7 +62,7 @@
</label>
</div>
- <div class="item item-toggle dark">
+ <div class="item item-toggle dark item-text-wrap">
<div class="input-label" ng-bind-html="'SETTINGS.ENABLE_HELPTIP' | translate">
</div>
<label class="toggle toggle-royal">
@@ -92,31 +92,33 @@
</label>
</div>
- <span class="item item-divider" translate>SETTINGS.HISTORY_SETTINGS</span>
+ <!-- FIXME see issue on UD history -->
+ <!--span class="item item-divider" translate>SETTINGS.HISTORY_SETTINGS</span>
<div class="item item-toggle dark">
- <div class="input-label" translate>SETTINGS.DISPLAY_UD_HISTORY</div>
+ <div class="col col-75 input-label" translate>SETTINGS.DISPLAY_UD_HISTORY</div>
<label class="toggle toggle-royal">
<input type="checkbox" ng-model="formData.showUDHistory" >
<div class="track">
<div class="handle"></div>
</div>
</label>
- </div>
+ </div-->
<!-- Allow extension here -->
<cs-extension-point name="history"></cs-extension-point>
<span class="item item-divider" translate>SETTINGS.NETWORK_SETTINGS</span>
- <div class="item ink" ng-click="changeNode()">
+ <div class="item ink item-text-wrap" ng-click="changeNode()">
<div class="input-label">
{{'SETTINGS.PEER' | translate}}
</div>
<span class="item-note dark">{{getServer()}}</ng-if></span>
</div>
- <div class="item item-toggle dark hidden-xs hidden-sm">
+ <div class="item item-text-wrap item-toggle dark hidden-xs hidden-sm">
<div class="input-label" ng-bind-html="'SETTINGS.EXPERT_MODE' | translate"></div>
+ <h4 class="gray" ng-bind-html="'SETTINGS.EXPERT_MODE_HELP' | translate"></h4>
<label class="toggle toggle-royal">
<input type="checkbox" ng-model="formData.expertMode" >
<div class="track">