diff --git a/www/i18n/locale-en-GB.json b/www/i18n/locale-en-GB.json
index 3be1863f914fcb69069562f151ae8b6579a2336d..169cf10011f7a5bb5cc2c41b444f9256844ae920 100644
--- a/www/i18n/locale-en-GB.json
+++ b/www/i18n/locale-en-GB.json
@@ -188,15 +188,15 @@
"MONEY_RULES_DIVIDER": "Rules of currency",
"C_RULE": "Growth",
"UD_RULE": "Universal dividend (formula)",
- "SIG_QTY_RULE": "Required number of certifications<br/>to become a member",
- "SIG_STOCK": "Maximum number of certifications<br/>sent by a member",
- "SIG_PERIOD": "Minimum delay between 2 certifications<br/>sent by one and the same issuer.",
- "SIG_WINDOW": "Maximum delay before a certification<br/>will be treated",
- "STEP_MAX": "Maximum distance between<br/>each WoT member and a newcomer.",
+ "SIG_QTY_RULE": "Required number of certifications to become a member",
+ "SIG_STOCK": "Maximum number of certifications sent by a member",
+ "SIG_PERIOD": "Minimum delay between 2 certifications sent by one and the same issuer.",
+ "SIG_WINDOW": "Maximum delay before a certification will be treated",
+ "STEP_MAX": "Maximum distance between a newcomer and each referring members.",
"WOT_RULES_DIVIDER": "Rules for web of trust",
- "SENTRIES": "Required number of certifications<br/>to become a sentries",
- "SENTRIES_FORMULA": "Required number of certifications<br/>to become a sentries (formula)",
- "XPERCENT":"Minimum percent of sentries<br />to reach to match the distance rule",
+ "SENTRIES": "Required number of certifications to become a referring member",
+ "SENTRIES_FORMULA": "Required number of certifications to become a referring member (formula)",
+ "XPERCENT":"Minimum percent of referring member to reach to match the distance rule",
"AVG_GEN_TIME": "The average time between 2 blocks",
"CURRENT": "current",
"MATH_CEILING": "CEILING"
@@ -306,7 +306,7 @@
"WAITING_CERTIFICATIONS": "You need {{needCertificationCount}} certification(s) to become a member",
"WILL_MISSING_CERTIFICATIONS": "You will <b>lack certifications</b> soon (at least {{willNeedCertificationCount}} more are needed)",
"WILL_NEED_RENEW_MEMBERSHIP": "Your membership <b>will expire {{membershipExpiresIn|formatDurationTo}}</b>. Remember to <a ng-click=\"doQuickFix('renew')\">renewing your membership</a> before then.",
- "CERTIFICATION_COUNT": "Certifications count",
+ "CERTIFICATION_COUNT": "Certifications<span class=\"hidden-xs\"> count</span>",
"SIG_STOCK": "Stock of certifications to give",
"BTN_RECEIVE_MONEY": "Receive",
"BTN_MEMBERSHIP_IN_DOTS": "Register as member...",
diff --git a/www/i18n/locale-en.json b/www/i18n/locale-en.json
index 1597ea5dbf925c4208c2129e7761a2c20794c7e6..d4cb6da38543736ecf5cbf63c7ee3016ec291202 100644
--- a/www/i18n/locale-en.json
+++ b/www/i18n/locale-en.json
@@ -188,15 +188,15 @@
"MONEY_RULES_DIVIDER": "Rules of currency",
"C_RULE": "Growth",
"UD_RULE": "Universal dividend (formula)",
- "SIG_QTY_RULE": "Required number of certifications<br/>to become a member",
- "SIG_STOCK": "Maximum number of certifications<br/>sent by a member",
- "SIG_PERIOD": "Minimum delay between 2 certifications<br/>sent by one and the same issuer.",
- "SIG_WINDOW": "Maximum delay before a certification<br/>will be treated",
- "STEP_MAX": "Maximum distance between<br/>each WoT member and a newcomer.",
+ "SIG_QTY_RULE": "Required number of certifications to become a member",
+ "SIG_STOCK": "Maximum number of certifications sent by a member",
+ "SIG_PERIOD": "Minimum delay between 2 certifications sent by one and the same issuer.",
+ "SIG_WINDOW": "Maximum delay before a certification will be treated",
+ "STEP_MAX": "Maximum distance between a newcomer and each referring members.",
"WOT_RULES_DIVIDER": "Rules for web of trust",
- "SENTRIES": "Required number of certifications<br/>to become a sentries",
- "SENTRIES_FORMULA": "Required number of certifications<br/>to become a sentries (formula)",
- "XPERCENT":"Minimum percent of sentries<br />to reach to match the distance rule",
+ "SENTRIES": "Required number of certifications to become a referring member",
+ "SENTRIES_FORMULA": "Required number of certifications to become a referring member (formula)",
+ "XPERCENT":"Minimum percent of referring member to reach to match the distance rule",
"AVG_GEN_TIME": "The average time between 2 blocks",
"CURRENT": "current",
"MATH_CEILING": "CEILING"
@@ -306,7 +306,7 @@
"WAITING_CERTIFICATIONS": "You need {{needCertificationCount}} certification(s) to become a member",
"WILL_MISSING_CERTIFICATIONS": "You will <b>lack certifications</b> soon (at least {{willNeedCertificationCount}} more are needed)",
"WILL_NEED_RENEW_MEMBERSHIP": "Your membership <b>will expire {{membershipExpiresIn|formatDurationTo}}</b>. Remember to <a ng-click=\"doQuickFix('renew')\">renewing your membership</a> before then.",
- "CERTIFICATION_COUNT": "Certifications count",
+ "CERTIFICATION_COUNT": "Certifications<span class=\"hidden-xs\"> count</span>",
"SIG_STOCK": "Stock of certifications to give",
"BTN_RECEIVE_MONEY": "Receive",
"BTN_MEMBERSHIP_IN_DOTS": "Register as member...",
diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json
index 6f6772107976b7d79c051b901bf7cff0efe8bc08..b8ff703d9fd24b3d5621a45cd46e533ac60a4aa4 100644
--- a/www/i18n/locale-fr-FR.json
+++ b/www/i18n/locale-fr-FR.json
@@ -188,15 +188,15 @@
"MONEY_RULES_DIVIDER": "Règles de la monnaie",
"C_RULE": "Croissance théorique",
"UD_RULE": "Dividende universel (formule)",
- "SIG_QTY_RULE": "Nombre de certifications requises<br/>pour devenir membre",
- "SIG_STOCK": "Nombre maximal de certifications émises<br/>par membre",
- "SIG_PERIOD": "Délai minimal d'attente entre 2 certifications<br/>successives émises par une même personne.",
- "SIG_WINDOW": "Délai maximal d'attente avant<br/>prise en compte d'une certification",
- "STEP_MAX": "Distance maximale dans la toile de confiance <br/> entre chaque membre et un nouvel entrant.",
+ "SIG_QTY_RULE": "Nombre de certifications requises pour devenir membre",
+ "SIG_STOCK": "Nombre maximal de certifications émises par membre",
+ "SIG_PERIOD": "Délai minimal d'attente entre 2 certifications successives émises par une même personne",
+ "SIG_WINDOW": "Délai limite de prise en compte d'une certification",
+ "STEP_MAX": "Distance maximale entre un nouvel entrant et les membres référents",
"WOT_RULES_DIVIDER": "Règles de la toile de confiance",
- "SENTRIES": "Nombre de certification requises<br/>pour être sentinelle",
- "SENTRIES_FORMULA": "Nombre de certification<br/>pour être sentinelle (formule)",
- "XPERCENT":"Pourcentage minimum de sentinelle<br/>à atteindre pour respecter la règle de distance",
+ "SENTRIES": "Nombre de certifications requises pour être membre référent",
+ "SENTRIES_FORMULA": "Nombre de certification requises pour être un membre référent (formule)",
+ "XPERCENT":"Pourcentage minimum de membres référents à atteindre pour la distance maximale",
"AVG_GEN_TIME": "Temps moyen entre deux blocs",
"CURRENT": "actuel",
"MATH_CEILING": "PLAFOND"
@@ -306,7 +306,7 @@
"WAITING_CERTIFICATIONS": "Vous devez obtenir {{needCertificationCount}} certification(s) pour devenir membre.",
"WILL_MISSING_CERTIFICATIONS": "Vous allez bientôt <b>manquer de certification</b> (au moins {{willNeedCertificationCount}} est nécessaire)",
"WILL_NEED_RENEW_MEMBERSHIP": "Votre adhésion comme membre <b>va expirer {{membershipExpiresIn|formatDurationTo}}</b>. Pensez à <a ng-click=\"doQuickFix('renew')\">renouveler votre adhésion</a> d'ici là .",
- "CERTIFICATION_COUNT": "Certifications reçues",
+ "CERTIFICATION_COUNT": "Certifications<span class=\"hidden-xs\"> reçues</span>",
"SIG_STOCK": "Certifications envoyées",
"BTN_RECEIVE_MONEY": "Encaisser",
"BTN_MEMBERSHIP_IN_DOTS": "Devenir membre...",
diff --git a/www/i18n/locale-nl-NL.json b/www/i18n/locale-nl-NL.json
index bd23a3d038b75dfe58df2fcf4c42415e7a482e0b..d95a93e2cbcbc87e8a8763a8bd09ef868f2a1345 100644
--- a/www/i18n/locale-nl-NL.json
+++ b/www/i18n/locale-nl-NL.json
@@ -146,13 +146,13 @@
"MONEY_RULES_DIVIDER": "Monetaire regels",
"C_RULE": "Toename",
"UD_RULE": "Universeel dividend (formule)",
- "SIG_QTY_RULE": "Benodigd aantal certificaties<br/>om lid te worden",
- "SIG_STOCK": "Maximum aantal certificaties<br/>te versturen per lid",
- "SIG_PERIOD": "Minimum vertraging tussen 2 certificaties<br/>verzonden door één en dezelfde persoon.",
- "SIG_WINDOW": "Maximum vertraging voor een certificatie<br/>in behandeling wordt genomen",
- "STEP_MAX": "Maximum afstand tussen<br/>elk WoT lid en een nieuw lid.",
+ "SIG_QTY_RULE": "Benodigd aantal certificaties om lid te worden",
+ "SIG_STOCK": "Maximum aantal certificaties te versturen per lid",
+ "SIG_PERIOD": "Minimum vertraging tussen 2 certificaties verzonden door één en dezelfde persoon.",
+ "SIG_WINDOW": "Maximum vertraging voor een certificatie in behandeling wordt genomen",
+ "STEP_MAX": "Maximum afstand tussen elk WoT lid en een nieuw lid.",
"WOT_RULES_DIVIDER": "Lidmaatschapseisen",
- "XPERCENT":"Minimum percentage schildwachten<br/>te bereiken om de afstandsregel te respecteren"
+ "XPERCENT":"Minimum percentage schildwachten te bereiken om de afstandsregel te respecteren"
}
},
"PEER": {
diff --git a/www/templates/currency/items_parameters.html b/www/templates/currency/items_parameters.html
index d8373f40fbbe5f079afc7a651d3218887f001e56..c3da80b2ea2bf5116b8ec02565bc4995cc0f57c5 100644
--- a/www/templates/currency/items_parameters.html
+++ b/www/templates/currency/items_parameters.html
@@ -1,77 +1,91 @@
+<div bind-notifier="{ rebind:formData.useRelative }">
- <div bind-notifier="{ rebind:formData.useRelative }">
-
- <ion-item class="item-icon-left">
- <i class="icon ion-android-bookmark"></i>
- <span translate>CURRENCY.VIEW.CURRENCY_NAME</span>
- <div class="item-note dark" ng-if="!loading">
- {{formData.currency}} (<span ng-bind-html=":rebind:formData.currency | currencySymbol:formData.useRelative"></span>)
- </div>
- </ion-item>
+ <ion-item class="item-icon-left item-text-wrap">
+ <i class="icon ion-android-bookmark"></i>
+ <span translate>CURRENCY.VIEW.CURRENCY_NAME</span>
+ <div class="item-note dark" ng-if="!loading">
+ {{formData.currency}} (<span ng-bind-html=":rebind:formData.currency | currencySymbol:formData.useRelative"></span>)
+ </div>
+ </ion-item>
- <ion-item class="item-icon-left">
- <i class="icon ion-record"></i>
- <span translate>CURRENCY.VIEW.MASS</span> (M<sub>t</sub>)
- <span class="badge badge-stable"
- ng-if="!loading"
- ng-bind-html=":rebind:formData.M | formatAmount:{currency: formData.currency, useRelative: formData.useRelative, currentUD: formData.currentUD}"></span>
- </ion-item>
+ <ion-item class="item-icon-left item-text-wrap">
+ <i class="icon ion-record"></i>
+ <div class="col col-60">
+ <span translate>CURRENCY.VIEW.MASS</span>
+ <span class="gray">(M<sub>t</sub>)</span>
+ </div>
+ <span class="badge badge-stable"
+ ng-if="!loading"
+ ng-bind-html=":rebind:formData.M | formatAmount:{currency: formData.currency, useRelative: formData.useRelative, currentUD: formData.currentUD}"></span>
+ </ion-item>
- <ion-item id="helptip-currency-mass-member" class="item-icon-left">
- <i class="icon ion-pie-graph"></i>
- {{'CURRENCY.VIEW.SHARE'|translate}} (M<sub>t</sub>/N<sub>t</sub>)
- <span id="helptip-currency-mass-member-unit"
- ng-if="!loading"
- class="badge badge-energized"
- ng-bind-html=":rebind:formData.MoverN | formatAmount:{currency: formData.currency, useRelative: formData.useRelative, currentUD: formData.currentUD}">
- </span>
- </ion-item>
+ <ion-item id="helptip-currency-mass-member" class="item-icon-left item-text-wrap">
+ <i class="icon ion-pie-graph"></i>
+ <div class="col col-60">
+ <span translate>CURRENCY.VIEW.SHARE</span>
+ <span class="gray">(M<sub>t</sub>/N<sub>t</sub>)</span>
+ </div>
+ <span id="helptip-currency-mass-member-unit"
+ ng-if="!loading"
+ class="badge badge-energized"
+ ng-bind-html=":rebind:formData.MoverN | formatAmount:{currency: formData.currency, useRelative: formData.useRelative, currentUD: formData.currentUD}">
+ </span>
+ </ion-item>
- <ion-item class="item-icon-left" ui-sref="app.currency_ud">
- <i class="icon ion-load-c"></i>
- <span translate>CURRENCY.VIEW.UD</span> ({{'COMMON.UD'|translate}}<sub>t</sub>)
- <div class="badge badge-royal" ng-if="!loading">
- <span ng-if="formData.useRelative">
- 1 <ng-bind-html ng-bind-html=":rebind:formData.currency| currencySymbol:true"></ng-bind-html>
- </span>
- <span ng-if="!formData.useRelative"
- ng-bind-html=":rebind:formData.currentUD | formatAmount:{currency: formData.currency, useRelative: formData.useRelative, currentUD: formData.currentUD}">
- </span>
- / {{formData.dt | formatPeriod}}
- </div>
- </ion-item>
+ <ion-item class="item-icon-left item-text-wrap">
+ <i class="icon ion-load-c"></i>
+ <div class="col col-60">
+ <span translate>CURRENCY.VIEW.UD</span>
+ <span class="gray">({{'COMMON.UD'|translate}}<sub>t</sub>)</span>
+ </div>
+ <div class="badge badge-royal" ng-if="!loading">
+ <span ng-if="formData.useRelative">
+ 1 <ng-bind-html ng-bind-html=":rebind:formData.currency| currencySymbol:true"></ng-bind-html>
+ </span>
+ <span ng-if="!formData.useRelative"
+ ng-bind-html=":rebind:formData.currentUD | formatAmount:{currency: formData.currency, useRelative: formData.useRelative, currentUD: formData.currentUD}">
+ </span>
+ / {{formData.dt | formatPeriod}}
+ </div>
+ </ion-item>
- <ion-item class="item-icon-left">
- <i class="icon ion-arrow-graph-up-right"></i>
- <span translate>CURRENCY.VIEW.C_ACTUAL</span> (c<sub>{{'CURRENCY.VIEW.CURRENT'|translate}}</sub>)
- <span class="badge badge-stable">{{formData.cactual | formatNumeral: '0,0.00'}} % / {{formData.dt | formatPeriod}}</span>
- </ion-item>
+ <ion-item class="item-icon-left item-text-wrap">
+ <i class="icon ion-arrow-graph-up-right"></i>
+ <div class="col col-60">
+ <span translate>CURRENCY.VIEW.C_ACTUAL</span>
+ <span class="gray">(c<sub>{{'CURRENCY.VIEW.CURRENT'|translate}}</sub>)</span>
+ </div>
+ <span class="badge badge-stable">{{formData.cactual | formatNumeral: '0,0.00'}} % / {{formData.dt | formatPeriod}}</span>
+ </ion-item>
- <div class="item item-toggle dark">
- <span translate>COMMON.BTN_RELATIVE_UNIT</span>
- <label class="toggle toggle-royal" id="helptip-currency-change-unit">
- <input type="checkbox" ng-model="formData.useRelative">
- <div class="track">
- <div class="handle"></div>
- </div>
- </label>
- </div>
+ <div class="item item-toggle dark">
+ <span translate>COMMON.BTN_RELATIVE_UNIT</span>
+ <label class="toggle toggle-royal" id="helptip-currency-change-unit">
+ <input type="checkbox" ng-model="formData.useRelative">
+ <div class="track">
+ <div class="handle"></div>
+ </div>
+ </label>
+ </div>
- <div id="helptip-currency-rules"
- class="item item-divider">
- <span translate>CURRENCY.VIEW.MONEY_RULES_DIVIDER</span>
- </div>
+ <div id="helptip-currency-rules"
+ class="item item-divider">
+ <span translate>CURRENCY.VIEW.MONEY_RULES_DIVIDER</span>
+ </div>
- <ion-item class="item-icon-left">
- <i class="icon ion-arrow-graph-up-right"></i>
- <span translate>CURRENCY.VIEW.C_RULE</span> (c)
- <span class="badge badge-stable" ng-if="!loading">{{formData.c*100 | formatNumeral: '0,0.00'}} % / {{formData.dt | formatPeriod}}</span>
- </ion-item>
+ <ion-item class="item-icon-left item-text-wrap">
+ <i class="icon ion-arrow-graph-up-right"></i>
+ <div class="col col-60">
+ <span translate>CURRENCY.VIEW.C_RULE</span>
+ <span class="gray">(c)</span>
+ </div>
+ <span class="badge badge-stable" ng-if="!loading">{{formData.c*100 | formatNumeral: '0,0.00'}} % / {{formData.dt | formatPeriod}}</span>
+ </ion-item>
- <ion-item class="item-icon-left">
- <i class="icon ion-load-c"></i>
- <span translate>CURRENCY.VIEW.UD_RULE</span>
- <span class="item-note dark" ng-if="!loading">{{'COMMON.UD'|translate}}<sub>t-1</sub> + c<sup>2</sup> * M<sub>t-1</sub>/N<sub>t-1</sub></span>
- </ion-item>
+ <ion-item class="item-icon-left item-text-wrap">
+ <i class="icon ion-load-c"></i>
+ <span class="col col-60" translate>CURRENCY.VIEW.UD_RULE</span>
+ <span class="item-note dark" ng-if="!loading">{{'COMMON.UD'|translate}}<sub>t-1</sub> + c<sup>2</sup> * M<sub>t-1</sub>/N<sub>t-1</sub></span>
+ </ion-item>
- </div>
+</div>
diff --git a/www/templates/currency/items_wot.html b/www/templates/currency/items_wot.html
index ed5219afa9d7a3c3a29e0bffdf836da6e39e7228..44143d323e3a5d80ca0e35a8f30a6dbff5aad99e 100644
--- a/www/templates/currency/items_wot.html
+++ b/www/templates/currency/items_wot.html
@@ -2,15 +2,20 @@
<ion-list bind-notifier="{ rebind:formData.useRelative }">
<ion-item class="item-icon-left item-text-wrap">
- <i class="icon ion-person-stalker"></i>
- <span translate>CURRENCY.VIEW.MEMBERS</span> (N<sub>{{'CURRENCY.VIEW.CURRENT'|translate}}</sub>)
- <span class="badge badge-assertive" ng-if="!loading">{{formData.N | formatInteger}}</span>
+ <i class="icon ion-person-stalker"></i>
+ <div class="col col-60">
+ <span translate>CURRENCY.VIEW.MEMBERS</span>
+ <span class="gray">(N<sub>{{'CURRENCY.VIEW.CURRENT'|translate}}</sub>)</span>
+ </div>
+ <span class="badge badge-assertive" ng-if="!loading">{{formData.N | formatInteger}}</span>
</ion-item>
<ion-item id="helptip-currency-newcomers" class="item-icon-left item-text-wrap">
<i class="icon ion-arrow-graph-up-right"></i>
- <span translate="CURRENCY.VIEW.MEMBERS_VARIATION" translate-values="{duration: formData.durationFromLastUD}"></span>
- (ΔN)
+ <div class="col col-75">
+ <span translate="CURRENCY.VIEW.MEMBERS_VARIATION" translate-values="{duration: formData.durationFromLastUD}"></span>
+ <span class="gray">(ΔN)</span>
+ </div>
<div class="badge badge-balanced" ng-if="!loading"
ng-class="{'badge-calm': formData.N < formData.Nprev}">
{{formData.N > formData.Nprev ? '+' : (formData.N == formData.Nprev ? '' : '-')}}{{formData.N - formData.Nprev}}
@@ -20,7 +25,7 @@
<ion-item class="item-icon-left item-text-wrap">
<i class="icon ion-ribbon-b"></i>
<b class="ion-star " style="color: yellow; position: absolute; font-size: 16px; left: 25px; bottom: 32px"></b>
- <span translate>CURRENCY.VIEW.SENTRIES</span>
+ <span class="col col-75" translate>CURRENCY.VIEW.SENTRIES</span>
<span class="badge badge-royal" ng-if="!loading">{{formData.sentries}}</span>
</ion-item>
@@ -38,7 +43,7 @@
<ion-item class="item-icon-left item-text-wrap">
<i class="icon ion-ribbon-b"></i>
<b class="ion-clock" style="position: absolute; font-size: 22px; left: 33px;"></b>
- <span class="col col-75" translate>CURRENCY.VIEW.SIG_WINDOW</span>
+ <span class="col col-60" translate>CURRENCY.VIEW.SIG_WINDOW</span>
<span class="badge badge-stable" ng-if="!loading">{{formData.sigWindow | formatDuration}}</span>
</ion-item>
@@ -57,14 +62,22 @@
<span class="badge badge-stable" ng-if="!loading">{{formData.sigPeriod | formatDuration}}</span>
</ion-item>
-
<ion-item class="item-icon-left item-text-wrap">
<i class="icon ion-steam"></i>
<b class="ion-person" style="position: absolute; font-size: 16px; left: 38px; top: 17px"></b>
- <span class="col col-75"><span ng-bind-html="'CURRENCY.VIEW.STEP_MAX'|translate"></span> (stepMax)</span>
+ <div class="col col-75">
+ <span ng-bind-html="'CURRENCY.VIEW.STEP_MAX'|translate"></span>
+ <span class="gray">(stepMax)</span>
+ </div>
<span class="badge badge-stable" ng-if="!loading">{{formData.stepMax}}</span>
</ion-item>
+ <ion-item class="item-icon-left item-text-wrap">
+ <i class="icon ion-pull-request"></i>
+ <span class="col col-75" translate>CURRENCY.VIEW.XPERCENT</span>
+ <span class="badge badge-stable" ng-if="!loading">{{formData.xpercent*100| formatNumeral: '0,0'}} %</span>
+ </ion-item>
+
<ion-item class="item-icon-left item-text-wrap">
<i class="icon ion-ribbon-b"></i>
<b class="ion-star " style="color: yellow; position: absolute; font-size: 16px; left: 25px; bottom: 32px"></b>
@@ -72,10 +85,5 @@
<span class="item-note dark" ng-if="!loading">{{'CURRENCY.VIEW.MATH_CEILING'| translate}}( N<sub>t</sub><sup>^ (1 / stepMax)</sup>)</span>
</ion-item>
- <ion-item class="item-icon-left item-text-wrap">
- <i class="icon ion-pull-request"></i>
- <span class="col col-75" translate>CURRENCY.VIEW.XPERCENT</span>
- <span class="badge badge-stable" ng-if="!loading">{{formData.xpercent*100| formatNumeral: '0,0'}} %</span>
- </ion-item>
</ion-list>