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

-Add G1 config

- Fix settings help text and size
parent 36c0d759
No related branches found
No related tags found
No related merge requests found
...@@ -36,6 +36,43 @@ ...@@ -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": { "dev": {
"cacheTimeMs": 60000, "cacheTimeMs": 60000,
"fallbackLanguage": "fr-FR", "fallbackLanguage": "fr-FR",
......
...@@ -121,7 +121,8 @@ ...@@ -121,7 +121,8 @@
"REMEMBER_ME": "Remember me", "REMEMBER_ME": "Remember me",
"PLUGINS_SETTINGS": "Extensions", "PLUGINS_SETTINGS": "Extensions",
"BTN_RESET": "Restore default values", "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": { "POPUP_PEER": {
"TITLE" : "Duniter peer", "TITLE" : "Duniter peer",
"HELP" : "Peer address:", "HELP" : "Peer address:",
...@@ -502,8 +503,8 @@ ...@@ -502,8 +503,8 @@
"MENU_BTN_ACCOUNT": "<b>{{'ACCOUNT.TITLE'|translate}}</b> allows access to your account balance and transaction history.", "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.", "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_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_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</b> certifications.", "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": "Your account <b>balance</b> is shown here.",
"WALLET_BALANCE_RELATIVE": "{{'HELP.TIP.WALLET_BALANCE'|translate}}<br/><br/>The used unit (&ldquo;<b>{{'COMMON.UD'|translate}}<sub>{{currency|abbreviate}}</sub></b>&rdquo;) 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_RELATIVE": "{{'HELP.TIP.WALLET_BALANCE'|translate}}<br/><br/>The used unit (&ldquo;<b>{{'COMMON.UD'|translate}}<sub>{{currency|abbreviate}}</sub></b>&rdquo;) 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>&nbsp;{{'MENU.SETTINGS'|translate}}</b>.<br/><br/>For example, to display amounts <b>directly in {{currency|capitalize}}</b> instead of relative amounts.", "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>&nbsp;{{'MENU.SETTINGS'|translate}}</b>.<br/><br/>For example, to display amounts <b>directly in {{currency|capitalize}}</b> instead of relative amounts.",
......
...@@ -121,7 +121,8 @@ ...@@ -121,7 +121,8 @@
"REMEMBER_ME": "Remember me", "REMEMBER_ME": "Remember me",
"PLUGINS_SETTINGS": "Extensions", "PLUGINS_SETTINGS": "Extensions",
"BTN_RESET": "Restore default values", "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": { "POPUP_PEER": {
"TITLE" : "Duniter peer", "TITLE" : "Duniter peer",
"HELP" : "Peer address:", "HELP" : "Peer address:",
......
...@@ -114,14 +114,15 @@ ...@@ -114,14 +114,15 @@
"NETWORK_SETTINGS": "Réseau", "NETWORK_SETTINGS": "Réseau",
"PEER": "Adresse du nœud Duniter", "PEER": "Adresse du nœud Duniter",
"USE_LOCAL_STORAGE": "Activer le stockage local", "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", "HISTORY_SETTINGS": "Mon compte",
"DISPLAY_UD_HISTORY": "Afficher les dividendes produits ?", "DISPLAY_UD_HISTORY": "Afficher les dividendes produits ?",
"AUTHENTICATION_SETTINGS": "Authentification", "AUTHENTICATION_SETTINGS": "Authentification",
"REMEMBER_ME": "Se souvenir de moi", "REMEMBER_ME": "Se souvenir de moi",
"PLUGINS_SETTINGS": "Extensions", "PLUGINS_SETTINGS": "Extensions",
"BTN_RESET": "Restaurer les valeurs par défaut", "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": { "POPUP_PEER": {
"TITLE" : "Nœud Duniter", "TITLE" : "Nœud Duniter",
"HELP" : "Adresse du nœud :", "HELP" : "Adresse du nœud :",
......
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
"CATEGORY": "Main activity", "CATEGORY": "Main activity",
"GENERAL_DIVIDER": "Basic information", "GENERAL_DIVIDER": "Basic information",
"LOCATION_DIVIDER": "Address", "LOCATION_DIVIDER": "Address",
"SOCIAL_NETWORKS_DIVIDER": "Social networks and web site", "SOCIAL_NETWORKS_DIVIDER": "Social networks, web sites",
"TECHNICAL_DIVIDER": "Technical data", "TECHNICAL_DIVIDER": "Technical data",
"BTN_NEW": "Add", "BTN_NEW": "Add",
"SEARCH": { "SEARCH": {
...@@ -286,10 +286,9 @@ ...@@ -286,10 +286,9 @@
} }
}, },
"ES_SETTINGS": { "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_TOGGLE": "Enable extension?",
"ENABLE_MARKET_TOGGLE": "Enable market place?",
"ENABLE_REGISTRY_TOGGLE": "Enable companies registry?",
"ENABLE_MESSAGE_TOGGLE": "Enable messages?", "ENABLE_MESSAGE_TOGGLE": "Enable messages?",
"ENABLE_SETTINGS_TOGGLE": "Enable remote storage for settings?", "ENABLE_SETTINGS_TOGGLE": "Enable remote storage for settings?",
"PEER": "Data peer address", "PEER": "Data peer address",
......
...@@ -286,10 +286,9 @@ ...@@ -286,10 +286,9 @@
} }
}, },
"ES_SETTINGS": { "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_TOGGLE": "Enable extension?",
"ENABLE_MARKET_TOGGLE": "Enable market place?",
"ENABLE_REGISTRY_TOGGLE": "Enable companies registry?",
"ENABLE_MESSAGE_TOGGLE": "Enable messages?", "ENABLE_MESSAGE_TOGGLE": "Enable messages?",
"ENABLE_SETTINGS_TOGGLE": "Enable remote storage for settings?", "ENABLE_SETTINGS_TOGGLE": "Enable remote storage for settings?",
"PEER": "Data peer address", "PEER": "Data peer address",
......
...@@ -286,10 +286,9 @@ ...@@ -286,10 +286,9 @@
} }
}, },
"ES_SETTINGS": { "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_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_MESSAGE_TOGGLE": "Activer les messages privés ?",
"ENABLE_SETTINGS_TOGGLE": "Activer le stockage distant des paramètres ?", "ENABLE_SETTINGS_TOGGLE": "Activer le stockage distant des paramètres ?",
"PEER": "Addresse du nœud de données", "PEER": "Addresse du nœud de données",
......
...@@ -270,8 +270,6 @@ ...@@ -270,8 +270,6 @@
"ES_SETTINGS": { "ES_SETTINGS": {
"PLUGIN_NAME": "Cesium+", "PLUGIN_NAME": "Cesium+",
"ENABLE_TOGGLE": "Uitbreiding inschakelen?", "ENABLE_TOGGLE": "Uitbreiding inschakelen?",
"ENABLE_MARKET_TOGGLE": "Marktplaats inschakelen?",
"ENABLE_REGISTRY_TOGGLE": "Bedrijfsregister inschakelen?",
"ENABLE_MESSAGE_TOGGLE": "Berichten inschakelen?", "ENABLE_MESSAGE_TOGGLE": "Berichten inschakelen?",
"ENABLE_SETTINGS_TOGGLE": "Globale opslag voor instellingen inschakelen?", "ENABLE_SETTINGS_TOGGLE": "Globale opslag voor instellingen inschakelen?",
"PEER": "Adres dataknooppunt", "PEER": "Adres dataknooppunt",
......
<span class="item item-divider" translate>SETTINGS.PLUGINS_SETTINGS</span> <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> <div class="input-label ng-binding" translate>ES_SETTINGS.PLUGIN_NAME</div>
<h4 class="gray" translate>ES_SETTINGS.PLUGIN_NAME_HELP</h4>
<h3 class="item-note"> <span class="badge item-note">
<span class="dark" ng-if="formData.plugins.es.enable" translate>COMMON.ENABLE</span> <span class="dark" ng-if="formData.plugins.es.enable" translate>COMMON.ENABLE</span>
<span ng-if="!formData.plugins.es.enable" translate>COMMON.DISABLE</span> <span ng-if="!formData.plugins.es.enable" translate>COMMON.DISABLE</span>
</h3> </span>
</div> </div>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</select> </select>
</label> </label>
<div class="item item-toggle dark"> <div class="item item-text-wrap item-toggle dark">
<div class="input-label"> <div class="input-label">
{{'SETTINGS.USE_LOCAL_STORAGE' | translate}} {{'SETTINGS.USE_LOCAL_STORAGE' | translate}}
</div> </div>
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</label> </label>
</div> </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 class="input-label" ng-bind-html="'SETTINGS.ENABLE_HELPTIP' | translate">
</div> </div>
<label class="toggle toggle-royal"> <label class="toggle toggle-royal">
...@@ -92,31 +92,33 @@ ...@@ -92,31 +92,33 @@
</label> </label>
</div> </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="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"> <label class="toggle toggle-royal">
<input type="checkbox" ng-model="formData.showUDHistory" > <input type="checkbox" ng-model="formData.showUDHistory" >
<div class="track"> <div class="track">
<div class="handle"></div> <div class="handle"></div>
</div> </div>
</label> </label>
</div> </div-->
<!-- Allow extension here --> <!-- Allow extension here -->
<cs-extension-point name="history"></cs-extension-point> <cs-extension-point name="history"></cs-extension-point>
<span class="item item-divider" translate>SETTINGS.NETWORK_SETTINGS</span> <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"> <div class="input-label">
{{'SETTINGS.PEER' | translate}} {{'SETTINGS.PEER' | translate}}
</div> </div>
<span class="item-note dark">{{getServer()}}</ng-if></span> <span class="item-note dark">{{getServer()}}</ng-if></span>
</div> </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> <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"> <label class="toggle toggle-royal">
<input type="checkbox" ng-model="formData.expertMode" > <input type="checkbox" ng-model="formData.expertMode" >
<div class="track"> <div class="track">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment