diff --git a/www/i18n/locale-en-GB.json b/www/i18n/locale-en-GB.json
index 7838efae923ce82a2be8c2b2c64d03f34a8241d5..10ea3f608ad7a8baab8d09534d87b838a286513d 100644
--- a/www/i18n/locale-en-GB.json
+++ b/www/i18n/locale-en-GB.json
@@ -301,7 +301,7 @@
"WOT": {
"SEARCH_HELP": "Search (member or public key)",
"SEARCH_INIT_PHASE_WARNING": "During the pre-registration phase, the search for pending registrations <b>may be long</b>. Please wait ...",
- "REGISTERED_SINCE": "Registration",
+ "REGISTERED_SINCE": "Registered on",
"REGISTERED_SINCE_BLOCK": "Registered since block #",
"NO_CERTIFICATION": "No validated certification",
"NO_GIVEN_CERTIFICATION": "No given certification",
diff --git a/www/i18n/locale-en.json b/www/i18n/locale-en.json
index 1a93070dba7a45e4c12bd9a1e26ed4974e271a99..8f0faae559c85ba170571904e5885f3ca075db54 100644
--- a/www/i18n/locale-en.json
+++ b/www/i18n/locale-en.json
@@ -301,7 +301,7 @@
"WOT": {
"SEARCH_HELP": "Search (member or public key)",
"SEARCH_INIT_PHASE_WARNING": "During the pre-registration phase, the search for pending registrations <b>may be long</b>. Please wait ...",
- "REGISTERED_SINCE": "Registration",
+ "REGISTERED_SINCE": "Registered on",
"REGISTERED_SINCE_BLOCK": "Registered since block #",
"NO_CERTIFICATION": "No validated certification",
"NO_GIVEN_CERTIFICATION": "No given certification",
diff --git a/www/i18n/locale-es-ES.json b/www/i18n/locale-es-ES.json
index 3d0511283a0d0d410c77fda6cd8da93b0a226379..636ddc2ceacbe36fd321fc3ce9f11aae7476a465 100644
--- a/www/i18n/locale-es-ES.json
+++ b/www/i18n/locale-es-ES.json
@@ -294,7 +294,7 @@
"WOT": {
"SEARCH_HELP": "Búsqueda (seudónimo o llave publica)",
"SEARCH_INIT_PHASE_WARNING": "Durante la etapa de preinscripción, la búsqueda de las inscripciónes en espera <b>puede ser largo</b>. Gracias por su paciencia...",
- "REGISTERED_SINCE": "Inscripción",
+ "REGISTERED_SINCE": "Registrado en",
"REGISTERED_SINCE_BLOCK": "Registrado al bloque #",
"NO_CERTIFICATION": "Ninguna certificación validada",
"NO_GIVEN_CERTIFICATION": "Ninguna certificación emitida",
diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json
index a205c838a916f3640a948af426afe698db8c23a1..2419cfa7551a9c324ff2f0e88b21d814f2609ed2 100644
--- a/www/i18n/locale-fr-FR.json
+++ b/www/i18n/locale-fr-FR.json
@@ -301,7 +301,7 @@
"WOT": {
"SEARCH_HELP": "Recherche (pseudo ou clé publique)",
"SEARCH_INIT_PHASE_WARNING": "Durant la phase de pré-inscription, la recherche des inscriptions en attente <b>peut-être longue</b>. Merci de patienter...",
- "REGISTERED_SINCE": "Inscription",
+ "REGISTERED_SINCE": "Inscrit le",
"REGISTERED_SINCE_BLOCK": "Inscrit au block #",
"NO_CERTIFICATION": "Aucune certification validée",
"NO_GIVEN_CERTIFICATION": "Aucune certification émise",
diff --git a/www/plugins/es/i18n/locale-en-GB.json b/www/plugins/es/i18n/locale-en-GB.json
index 3e4ee8c6c7fbc65f844399a23eefe7a53fb126e3..22c10e74ee6fc57a99ad5413ec385d7cb422a45c 100644
--- a/www/plugins/es/i18n/locale-en-GB.json
+++ b/www/plugins/es/i18n/locale-en-GB.json
@@ -275,6 +275,7 @@
},
"PROFILE": {
"PROFILE_DIVIDER": "Cesium+ profile",
+ "PROFILE_DIVIDER_HELP": "These are ancillary data, stored outside the currency network.",
"NO_PROFILE_DEFINED": "No Cesium+ profile",
"BTN_ADD": "Create my profile",
"BTN_EDIT": "Edit my profile",
@@ -322,7 +323,7 @@
"PROFILE_SAVED": "Profile saved"
},
"HELP": {
- "WARNING_PUBLIC_DATA": "Please note that the information published here <b>is public</b>: visible including by <b>not logged in people</b>."
+ "WARNING_PUBLIC_DATA": "Please note that the information published here <b>is public</b>: visible including by <b>not logged in people</b>.<br/>{{'PROFILE.PROFILE_DIVIDER_HELP'|translate}}"
}
},
"SUBSCRIPTION": {
diff --git a/www/plugins/es/i18n/locale-en.json b/www/plugins/es/i18n/locale-en.json
index 3e4ee8c6c7fbc65f844399a23eefe7a53fb126e3..22c10e74ee6fc57a99ad5413ec385d7cb422a45c 100644
--- a/www/plugins/es/i18n/locale-en.json
+++ b/www/plugins/es/i18n/locale-en.json
@@ -275,6 +275,7 @@
},
"PROFILE": {
"PROFILE_DIVIDER": "Cesium+ profile",
+ "PROFILE_DIVIDER_HELP": "These are ancillary data, stored outside the currency network.",
"NO_PROFILE_DEFINED": "No Cesium+ profile",
"BTN_ADD": "Create my profile",
"BTN_EDIT": "Edit my profile",
@@ -322,7 +323,7 @@
"PROFILE_SAVED": "Profile saved"
},
"HELP": {
- "WARNING_PUBLIC_DATA": "Please note that the information published here <b>is public</b>: visible including by <b>not logged in people</b>."
+ "WARNING_PUBLIC_DATA": "Please note that the information published here <b>is public</b>: visible including by <b>not logged in people</b>.<br/>{{'PROFILE.PROFILE_DIVIDER_HELP'|translate}}"
}
},
"SUBSCRIPTION": {
diff --git a/www/plugins/es/i18n/locale-es-ES.json b/www/plugins/es/i18n/locale-es-ES.json
index 2192a1268e2b983cc2e691164b183b73ba90bbb0..e681babdc099d25f605102c92dc7c0396bbde002 100644
--- a/www/plugins/es/i18n/locale-es-ES.json
+++ b/www/plugins/es/i18n/locale-es-ES.json
@@ -8,6 +8,7 @@
"BTN_PUBLISH": "Publicar",
"BTN_PICTURE_DELETE": "Suprimir",
"BTN_PICTURE_FAVORISE": "Principal",
+ "BTN_PICTURE_ROTATE": "Girar",
"BTN_ADD_PICTURE": "Añadir una foto",
"NOTIFICATIONS": {
"TITLE": "Notificaciónes",
@@ -49,6 +50,11 @@
"TITLE": "Solicitar certificaciónes",
"HELP": "Selectionar los destinatarios"
},
+ "SEARCH": {
+ "DIVIDER_PROFILE": "Cuentas",
+ "DIVIDER_PAGE": "Páginas",
+ "DIVIDER_GROUP": "Grupos"
+ },
"CONFIRM": {
"SUGGEST_CERTIFICATIONS": "Está usted segura/o querer <b>mandar estas sugerencia de certificatión</b> ?",
"ASK_CERTIFICATION": "Está usted segura/o querer <b>mandar una solicitud de certificación</b> ?",
@@ -204,6 +210,7 @@
"LOCATION_DIVIDER": "Dirección",
"SOCIAL_NETWORKS_DIVIDER": "Redes sociales y sitio web",
"TECHNICAL_DIVIDER": "Informaciónes técnicas",
+ "CREATED_TIME": "Creada {{creationTime|formatFromNow}}",
"NOTIFICATIONS": {
"TITLE": "Invitaciónes"
},
@@ -228,6 +235,10 @@
"MANAGED": "Grupo administrado"
}
},
+ "VIEW": {
+ "POPOVER_SHARE_TITLE": "{{title}}",
+ "MENU_TITLE": "Opciones"
+ },
"EDIT": {
"TITLE": "Grupo",
"TITLE_NEW": "Nuevo grupo",
@@ -304,11 +315,13 @@
"FAILED_REMOVE_COMMENT": "Fracaso durante la supresión del comentario",
},
"INFO": {
- "RECORD_REMOVED" : "Página suprimida"
+ "RECORD_REMOVED" : "Página suprimida",
+ "RECORD_SAVED": "Página guardada"
}
},
"PROFILE": {
"PROFILE_DIVIDER": "Perfil Cesium+",
+ "PROFILE_DIVIDER_HELP": "Estos son datos auxiliares, almacenados fuera de la red monetaria.",
"NO_PROFILE_DEFINED": "Ningún perfil Cesium+",
"BTN_ADD": "Ingresar mi perfil",
"BTN_EDIT": "Editar mi perfil",
@@ -356,7 +369,7 @@
"PROFILE_SAVED": "Perfil respaldado"
},
"HELP": {
- "WARNING_PUBLIC_DATA": "Las informaciónes informadas en su perfil <b>están públicas</b> : visibles también por personas <b>no conectadas</b>."
+ "WARNING_PUBLIC_DATA": "Las informaciónes informadas en su perfil <b>están públicas</b> : visibles también por personas <b>no conectadas</b>.<br/>{{'PROFILE.PROFILE_DIVIDER_HELP'|translate}}"
}
},
"SUBSCRIPTION": {
diff --git a/www/plugins/es/i18n/locale-fr-FR.json b/www/plugins/es/i18n/locale-fr-FR.json
index 50e803dd3cc44b108d5fac6b49cc93201e2d3952..8781037405c3fe503f679c1515ded8daff2d7981 100644
--- a/www/plugins/es/i18n/locale-fr-FR.json
+++ b/www/plugins/es/i18n/locale-fr-FR.json
@@ -253,7 +253,7 @@
"REMOVE_RECORD_FAILED": "Erreur de la suppression du groupe"
},
"INFO": {
- "RECORD_REMOVED" : "Group supprimé"
+ "RECORD_REMOVED" : "Groupe supprimé"
}
},
"REGISTRY": {
@@ -326,6 +326,7 @@
},
"PROFILE": {
"PROFILE_DIVIDER": "Profil Cesium+",
+ "PROFILE_DIVIDER_HELP": "Il s'agit de données annexes, stockées en dehors du réseau de la monnaie.",
"NO_PROFILE_DEFINED": "Aucun profil Cesium+",
"BTN_ADD": "Saisir mon profil",
"BTN_EDIT": "Editer mon profil",
@@ -373,7 +374,7 @@
"PROFILE_SAVED": "Profil sauvegardé"
},
"HELP": {
- "WARNING_PUBLIC_DATA": "Les informations renseignées dans votre profil <b>sont publiques</b> : visibles y compris par des personnes <b>non connectées</b>."
+ "WARNING_PUBLIC_DATA": "Les informations renseignées dans votre profil <b>sont publiques</b> : visibles y compris par des personnes <b>non connectées</b>.<br/>{{'PROFILE.PROFILE_DIVIDER_HELP'|translate}}"
}
},
"SUBSCRIPTION": {
diff --git a/www/plugins/es/templates/wallet/view_wallet_extend.html b/www/plugins/es/templates/wallet/view_wallet_extend.html
index 00926f0e1e611c60979fdcf3fdc89f87444f2d1d..f148efdf402dd16a16587fefe4dca664c4968fd6 100644
--- a/www/plugins/es/templates/wallet/view_wallet_extend.html
+++ b/www/plugins/es/templates/wallet/view_wallet_extend.html
@@ -10,6 +10,10 @@
</a>
</div>
+ <div class="item item-text-wrap positive item-small-height">
+ <small translate>PROFILE.PROFILE_DIVIDER_HELP</small>
+ </div>
+
<div class="double-padding-x padding-bottom">
<ng-include src="'plugins/es/templates/user/items_profile.html'" ng-init="showName=true;"></ng-include>
</div>
@@ -24,16 +28,20 @@
<span translate>SUBSCRIPTION.BTN_ADD</span>
</a>
</div>
- <div ng-if="!formData.subscriptions.count"
- class="item gray" translate>SUBSCRIPTION.NO_SUBSCRIPTION</div>
- <a class="item item-icon-left item-text-wrap item-icon-right ink"
- ng-if="formData.subscriptions.count"
- ui-sref="app.edit_subscriptions">
- <i class="icon ion-gear-a"></i>
- <span translate>SUBSCRIPTION.SUBSCRIPTION_COUNT</span>
- <span class="badge badge-positive">{{formData.subscriptions.count}}</span>
+ <div class="double-padding-x padding-bottom">
+
+ <div ng-if="!formData.subscriptions.count"
+ class="item gray" translate>SUBSCRIPTION.NO_SUBSCRIPTION</div>
- <i class="gray icon ion-ios-arrow-right"></i>
- </a>
+ <a class="item item-icon-left item-text-wrap item-icon-right ink"
+ ng-if="formData.subscriptions.count"
+ ui-sref="app.edit_subscriptions">
+ <i class="icon ion-gear-a"></i>
+ <span translate>SUBSCRIPTION.SUBSCRIPTION_COUNT</span>
+ <span class="badge badge-positive">{{formData.subscriptions.count}}</span>
+
+ <i class="gray icon ion-ios-arrow-right"></i>
+ </a>
+ </div>
</ng-if>
diff --git a/www/plugins/es/templates/wot/view_identity_extend.html b/www/plugins/es/templates/wot/view_identity_extend.html
index d4a8f7fdc363d1d3096b86e089943e39f2cfc61a..980aa8d6da09ee9a0374f1bd1b5d6065a586ea62 100644
--- a/www/plugins/es/templates/wot/view_identity_extend.html
+++ b/www/plugins/es/templates/wot/view_identity_extend.html
@@ -11,6 +11,10 @@
<span class="item item-divider item-divider-top-border" translate>PROFILE.PROFILE_DIVIDER</span>
+ <div class="item item-text-wrap positive item-small-height">
+ <small translate>PROFILE.PROFILE_DIVIDER_HELP</small>
+ </div>
+
<div class="double-padding-x padding-bottom">
<ng-include src="'plugins/es/templates/user/items_profile.html'" ng-init="showName=false;"></ng-include>
</div>
diff --git a/www/templates/wallet/view_wallet.html b/www/templates/wallet/view_wallet.html
index f5109ce168d145fec6aee7f503098c21d70564fa..98ef33f574de941374fd62897172d7e1fc3bd07d 100644
--- a/www/templates/wallet/view_wallet.html
+++ b/www/templates/wallet/view_wallet.html
@@ -95,6 +95,8 @@
<div class="list" ng-class="::motion.ionListClass" ng-hide="loading">
+ <span class="item item-divider" translate>WOT.GENERAL_DIVIDER</span>
+
<!-- Public key -->
<div id="helptip-wallet-pubkey"
class="item item-icon-left item-text-wrap ink"
@@ -105,6 +107,17 @@
<h4 id="pubkey" class="dark">{{:rebind:formData.pubkey}}</h4>
</div>
+ <!-- Uid + Registration date -->
+ <ion-item class="item-icon-left" ng-if=":rebind:formData.sigDate||formData.uid">
+ <i class="icon ion-calendar"></i>
+ <span translate>COMMON.UID</span>
+ <h5 class="dark" ng-if=":rebind:formData.sigDate">
+ <span translate>WOT.REGISTERED_SINCE</span>
+ {{:rebind:formData.sigDate | formatDate}}
+ </h5>
+ <span class="badge badge-stable">{{:rebind:formData.uid}}</span>
+ </ion-item>
+
<!-- Certifications -->
<a id="helptip-wallet-certifications"
class="item item-icon-left item-icon-right item-text-wrap ink"
@@ -129,14 +142,6 @@
<i class="gray icon ion-ios-arrow-right"></i>
</a>
- <!-- Registration date -->
- <ion-item class="item-icon-left" ng-if="formData.sigDate">
- <i class="icon ion-calendar"></i>
- <span>{{'WOT.REGISTERED_SINCE' | translate}}</span>
- <h5 class="dark">{{::formData.sigDate | formatDate}}</h5>
- <span class="badge badge-balanced">{{::formData.sigDate | formatFromNow}}</span>
- </ion-item>
-
<!-- Events -->
<span class="item item-divider" ng-if="formData.events.length">
{{:locale:'ACCOUNT.EVENTS' | translate}}
@@ -150,20 +155,17 @@
<span trust-as-html="event.message | translate:event.messageParams"></span>
</div>
- <cs-extension-point name="before-technical"></cs-extension-point>
+ <!-- Account transaction -->
+ <a class="item item-icon-left item-icon-right ink"
+ ng-if="!loading"
+ ui-sref="app.view_wallet_tx">
+ <i class="icon ion-card"></i>
+ <span translate>WOT.ACCOUNT_OPERATIONS</span>
+ <i class="gray icon ion-ios-arrow-right"></i>
+ </a>
- <span class="item item-divider"
- ng-if=":rebind:formData.uid"
- translate>WOT.TECHNICAL_DIVIDER</span>
+ <cs-extension-point name="before-technical"></cs-extension-point>
- <!-- Uid -->
- <span class="item item-icon-left item-text-wrap ink"
- ng-if=":rebind:formData.uid"
- on-hold="copy(formData.uid)"
- copy-on-click="{{:rebind:formData.uid}}">
- <span translate>COMMON.UID</span>
- <span class="badge badge-stable">{{:rebind:formData.uid}}</span>
- </span>
</div>
</div>
diff --git a/www/templates/wot/view_identity.html b/www/templates/wot/view_identity.html
index d6d52fdcc75430a589d906199aa48d6d3544cbb2..f257fc4e43caff33fe3ffc8734260565c10746e1 100644
--- a/www/templates/wot/view_identity.html
+++ b/www/templates/wot/view_identity.html
@@ -20,7 +20,7 @@
<h3 class="light" ng-if="::!formData.uid"><i class="ion-key"></i> {{::formData.pubkey | formatPubkey}}</h3>
</ng-if>
<h4 class="assertive">
- <ng-if ng-if="::(formData.name || formData.uid) && !formData.isMember && !revoked" translate>WOT.NOT_MEMBER_PARENTHESIS</ng-if>
+ <!--<ng-if ng-if="::(formData.name || formData.uid) && !formData.isMember && !revoked" translate>WOT.NOT_MEMBER_PARENTHESIS</ng-if>-->
<ng-if ng-if="::(formData.name || formData.uid) && !formData.isMember && revoked" translate>WOT.IDENTITY_REVOKED_PARENTHESIS</ng-if>
<ng-if ng-if="::(formData.name || formData.uid) && formData.isMember && revoked" translate>WOT.MEMBER_PENDING_REVOCATION_PARENTHESIS</ng-if>
</h4>
@@ -73,13 +73,32 @@
<span class="item item-divider" translate>WOT.GENERAL_DIVIDER</span>
+ <!-- Pubkey -->
+ <ion-item class="item-icon-left item-text-wrap ink"
+ copy-on-click="{{:rebind:formData.pubkey}}">
+ <i class="icon ion-key"></i>
+ <span translate>COMMON.PUBKEY</span>
+ <h4 id="pubkey" class="dark text-left">{{:rebind:formData.pubkey}}</h4>
+ </ion-item>
+
<div class="item item-icon-left item-text-wrap"
ng-if=":rebind:!formData.hasSelf">
- <i class="icon ion-card"></i>
+ <i class="icon ion-ios-help-outline positive"></i>
<span translate>WOT.NOT_MEMBER_ACCOUNT</span>
<h4 class="gray" translate>WOT.NOT_MEMBER_ACCOUNT_HELP</h4>
</div>
+ <!-- Uid + Registration date -->
+ <ion-item class="item-icon-left" ng-if=":rebind:formData.sigDate||formData.uid">
+ <i class="icon ion-calendar"></i>
+ <span translate>COMMON.UID</span>
+ <h5 class="dark" ng-if=":rebind:formData.sigDate">
+ <span translate>WOT.REGISTERED_SINCE</span>
+ {{:rebind:formData.sigDate | formatDate}}
+ </h5>
+ <span class="badge badge-stable">{{:rebind:formData.uid}}</span>
+ </ion-item>
+
<!-- Received certifications count -->
<a id="helptip-wot-view-certifications"
class="item item-icon-left item-text-wrap item-icon-right ink"
@@ -108,14 +127,6 @@
<i class="gray icon ion-ios-arrow-right"></i>
</a>
- <!-- Registration date -->
- <ion-item class="item-icon-left" ng-if=":rebind:formData.sigDate">
- <i class="icon ion-calendar"></i>
- <span>{{'WOT.REGISTERED_SINCE' | translate}}</span>
- <h5 class="dark">{{:rebind:formData.sigDate | formatDate}}</h5>
- <span class="badge badge-balanced">{{:rebind:formData.sigDate | formatFromNow}}</span>
- </ion-item>
-
<!-- Account transaction -->
<a class="item item-icon-left item-icon-right ink"
ng-if="!loading"
@@ -134,21 +145,6 @@
<cs-extension-point name="general"></cs-extension-point>
- <span class="item item-divider" translate>WOT.TECHNICAL_DIVIDER</span>
-
- <!-- Pubkey -->
- <ion-item class="item-icon-left item-text-wrap ink"
- copy-on-click="{{:rebind:formData.pubkey}}">
- <i class="icon ion-key"></i>
- <span translate>COMMON.PUBKEY</span>
- <h4 id="pubkey" class="dark text-left">{{:rebind:formData.pubkey}}</h4>
- </ion-item>
-
- <!-- Uid -->
- <ion-item class="item-icon-left" ng-if=":rebind:formData.uid">
- <span translate>COMMON.UID</span>
- <span class="badge badge-stable">{{:rebind:formData.uid}}</span>
- </ion-item>
</div>
<div class="col col-20 hidden-xs hidden-sm"> </div>