diff --git a/www/i18n/locale-en-GB.json b/www/i18n/locale-en-GB.json
index 09e1800afbeaa62022f5632cf06eeddfa950f9bd..7020aae5d8959c3de2b326650ca1b85295b1cd89 100644
--- a/www/i18n/locale-en-GB.json
+++ b/www/i18n/locale-en-GB.json
@@ -451,10 +451,11 @@
"CURRENCY_CHANGE_UNIT": "This button allows to <b>switch the unit</b> to show amounts in <b>{{currency|capitalize}}</b>, undevided by the Universal Dividend (instead of in “<b>{{'COMMON.UD'|translate}}<sub>{{currency|abbreviate}}</sub></b>”).",
"CURRENCY_CHANGE_UNIT_TO_RELATIVE": "This button allows to <b>switch the unit</b> to show amounts in “<b>{{'COMMON.UD'|translate}}<sub>{{currency|abbreviate}}</sub></b>”, which is relative to the Universal Dividend (the amount co-produced by each member).",
"CURRENCY_RULES": "The <b>rules</b> of the currency determine its <b>exact and predictible</b> performance.<br/><br/>As a true DNA of the currency these rules make the monetary code <b>transparent and understandable</b>.",
- "CURRENCY_BLOCKCHAIN": "All monetary transactions are recoded in a <b>public and tamper proof</b> ledger, generally referred to as the <b>blockchain</b>.",
- "CURRENCY_PEERS": "The <b>peers</b> shown here correspond to <b>computers that update and check</b> the blockchain.<br/><br/>The more active peers there are, the more <b>decentralised</b> and therefore trustworhty the currency becomes.",
- "CURRENCY_PEERS_BLOCK_NUMBER": "This <b>number</b> indicates the peer's <b>latest validated block</b> (last page written in the ledger).<br/><br/>Green indicates that the block was equally validated by the <b>majority of other peers</b>.",
- "CURRENCY_PEERS_PARTICIPATE": "<b>Each member</b>, equiped with a computer with Internet, <b>can participate, adding a peer</b> simply by <b>installing the Duniter software</b> (free/libre). <a target=\"_new\" href=\"{{installDocUrl}}\">Read the installation manual >></a>.",
+ "MENU_BTN_NETWORK": "Menu <b>{{'MENU.NETWORK'|translate}}</b> allows discovery of <b>network's state<b>.",
+ "NETWORK_BLOCKCHAIN": "All monetary transactions are recoded in a <b>public and tamper proof</b> ledger, generally referred to as the <b>blockchain</b>.",
+ "NETWORK_PEERS": "The <b>peers</b> shown here correspond to <b>computers that update and check</b> the blockchain.<br/><br/>The more active peers there are, the more <b>decentralised</b> and therefore trustworhty the currency becomes.",
+ "NETWORK_PEERS_BLOCK_NUMBER": "This <b>number</b> indicates the peer's <b>latest validated block</b> (last page written in the ledger).<br/><br/>Green indicates that the block was equally validated by the <b>majority of other peers</b>.",
+ "NETWORK_PEERS_PARTICIPATE": "<b>Each member</b>, equiped with a computer with Internet, <b>can participate, adding a peer</b> simply by <b>installing the Duniter software</b> (free/libre). <a target=\"_new\" href=\"{{installDocUrl}}\">Read the installation manual >></a>.",
"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).",
diff --git a/www/i18n/locale-en.json b/www/i18n/locale-en.json
index ea7a7728a501b0c99b055bf23d3c9e82b841eb5e..5a54fb125667f79e362f1240f022206c31eb7a15 100644
--- a/www/i18n/locale-en.json
+++ b/www/i18n/locale-en.json
@@ -451,10 +451,11 @@
"CURRENCY_CHANGE_UNIT": "This button allows to <b>switch the unit</b> to show amounts in <b>{{currency|capitalize}}</b>, undevided by the Universal Dividend (instead of in “<b>{{'COMMON.UD'|translate}}<sub>{{currency|abbreviate}}</sub></b>”).",
"CURRENCY_CHANGE_UNIT_TO_RELATIVE": "This button allows to <b>switch the unit</b> to show amounts in “<b>{{'COMMON.UD'|translate}}<sub>{{currency|abbreviate}}</sub></b>”, which is relative to the Universal Dividend (the amount co-produced by each member).",
"CURRENCY_RULES": "The <b>rules</b> of the currency determine its <b>exact and predictible</b> performance.<br/><br/>As a true DNA of the currency these rules make the monetary code <b>transparent and understandable</b>.",
- "CURRENCY_BLOCKCHAIN": "All monetary transactions are recoded in a <b>public and tamper proof</b> ledger, generally referred to as the <b>blockchain</b>.",
- "CURRENCY_PEERS": "The <b>peers</b> shown here correspond to <b>computers that update and check</b> the blockchain.<br/><br/>The more active peers there are, the more <b>decentralised</b> and therefore trustworhty the currency becomes.",
- "CURRENCY_PEERS_BLOCK_NUMBER": "This <b>number</b> indicates the peer's <b>latest validated block</b> (last page written in the ledger).<br/><br/>Green indicates that the block was equally validated by the <b>majority of other peers</b>.",
- "CURRENCY_PEERS_PARTICIPATE": "<b>Each member</b>, equiped with a computer with Internet, <b>can participate, adding a peer</b> simply by <b>installing the Duniter software</b> (free/libre). <a target=\"_new\" href=\"{{installDocUrl}}\">Read the installation manual >></a>.",
+ "MENU_BTN_NETWORK": "Menu <b>{{'MENU.NETWORK'|translate}}</b> allows discovery of <b>network's state<b>.",
+ "NETWORK_BLOCKCHAIN": "All monetary transactions are recoded in a <b>public and tamper proof</b> ledger, generally referred to as the <b>blockchain</b>.",
+ "NETWORK_PEERS": "The <b>peers</b> shown here correspond to <b>computers that update and check</b> the blockchain.<br/><br/>The more active peers there are, the more <b>decentralised</b> and therefore trustworhty the currency becomes.",
+ "NETWORK_PEERS_BLOCK_NUMBER": "This <b>number</b> indicates the peer's <b>latest validated block</b> (last page written in the ledger).<br/><br/>Green indicates that the block was equally validated by the <b>majority of other peers</b>.",
+ "NETWORK_PEERS_PARTICIPATE": "<b>Each member</b>, equiped with a computer with Internet, <b>can participate, adding a peer</b> simply by <b>installing the Duniter software</b> (free/libre). <a target=\"_new\" href=\"{{installDocUrl}}\">Read the installation manual >></a>.",
"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).",
diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json
index 4c81171a30232efd39533f15bbdcf2c66b5bf4d2..0ff4393ae443caf4954d60cd80c82ffa329970bc 100644
--- a/www/i18n/locale-fr-FR.json
+++ b/www/i18n/locale-fr-FR.json
@@ -451,10 +451,11 @@
"CURRENCY_CHANGE_UNIT": "Ce bouton permet de <b>changer d'unité</b>, pour visualiser les montants <b>directement en {{currency|capitalize}}</b> (plutôt qu'en “<b>{{'COMMON.UD'|translate}}<sub>{{currency|abbreviate}}</sub></b>”).",
"CURRENCY_CHANGE_UNIT_TO_RELATIVE": "Ce bouton permet de <b>changer d'unité</b>, pour visualiser les montants en “<b>{{'COMMON.UD'|translate}}<sub>{{currency|abbreviate}}</sub></b>”, c'est à dire relativement au Dividende Universel (le montant co-produit par chaque membre).",
"CURRENCY_RULES": "Les <b>règles</b> de la monnaie fixent son fonctionnement <b>exact et prévisible</b>.<br/><br/>Véritable ADN de la monnaie, elles rendent son code monétaire <b>lisible et transparent</b>.",
- "CURRENCY_BLOCKCHAIN": "Toutes les opérations de la monnaie sont enregistrées dans un grand livre de compte <b>public et infalsifiable</b>, appellé aussi <b>chaine de blocs</b> (<em>BlockChain</em> en anglais).",
- "CURRENCY_PEERS": "Les <b>nœuds</b> visibles ici correspondent aux <b>ordinateurs qui actualisent et contrôlent</b> la chaine de blocs.<br/><br/>Plus il y a de nœuds, plus la monnaie à une gestion <b>décentralisée</b> et digne de confiance.",
- "CURRENCY_PEERS_BLOCK_NUMBER": "Ce <b>numéro</b> indique le <b>dernier bloc validé</b> pour ce nœud (dernière page écrite dans le grand livre de comptes).<br/><br/>La couleur verte indique que ce bloc est également validé par <b>la plupart des autres nœuds</b>.",
- "CURRENCY_PEERS_PARTICIPATE": "<b>Chaque membre</b>, équipé d'un ordinateur avec Internet, <b>peut participer en ajoutant un nœud</b>. Il suffit d'<b>installer le logiciel Duniter</b> (libre et gratuit). <a target=\"_new\" href=\"{{installDocUrl}}\">Voir le manuel d'installation >></a>.",
+ "MENU_BTN_NETWORK": "Le menu <b>{{'MENU.NETWORK'|translate}}</b> permet la consultation de l'état du réseau.",
+ "NETWORK_BLOCKCHAIN": "Toutes les opérations de la monnaie sont enregistrées dans un grand livre de compte <b>public et infalsifiable</b>, appellé aussi <b>chaine de blocs</b> (<em>BlockChain</em> en anglais).",
+ "NETWORK_PEERS": "Les <b>nœuds</b> visibles ici correspondent aux <b>ordinateurs qui actualisent et contrôlent</b> la chaine de blocs.<br/><br/>Plus il y a de nœuds, plus la monnaie à une gestion <b>décentralisée</b> et digne de confiance.",
+ "NETWORK_PEERS_BLOCK_NUMBER": "Ce <b>numéro</b> indique le <b>dernier bloc validé</b> pour ce nœud (dernière page écrite dans le grand livre de comptes).<br/><br/>La couleur verte indique que ce bloc est également validé par <b>la plupart des autres nœuds</b>.",
+ "NETWORK_PEERS_PARTICIPATE": "<b>Chaque membre</b>, équipé d'un ordinateur avec Internet, <b>peut participer en ajoutant un nœud</b>. Il suffit d'<b>installer le logiciel Duniter</b> (libre et gratuit). <a target=\"_new\" href=\"{{installDocUrl}}\">Voir le manuel d'installation >></a>.",
"MENU_BTN_ACCOUNT": "<b>{{'ACCOUNT.TITLE'|translate}}</b> permet l'accès au solde de votre compte et à l'historique de vos transactions.",
"MENU_BTN_ACCOUNT_MEMBER": "Consultez ici l'état de votre compte, l'historique de vos transactions et vos certifications.",
"WALLET_CERTIFICATIONS": "En cliquant ici, consultez le détail de vos certifications (reçues et émises).",
diff --git a/www/js/controllers/currency-controllers.js b/www/js/controllers/currency-controllers.js
index 48024dfe3995d9e83606ac36202b6a0ecdbee7d7..6e6be9721675f3b4fc761a66d4c2c2b9745c798d 100644
--- a/www/js/controllers/currency-controllers.js
+++ b/www/js/controllers/currency-controllers.js
@@ -82,6 +82,7 @@ angular.module('cesium.currency.controllers', ['cesium.services'])
.state('app.currency_view_name_lg', {
url: "/currency/lg/:name",
+ cache: false,
views: {
'menuContent': {
templateUrl: "templates/currency/view_currency_lg.html",
@@ -92,6 +93,7 @@ angular.module('cesium.currency.controllers', ['cesium.services'])
.state('app.currency_view_lg', {
url: "/currency/lg",
+ cache: false,
views: {
'menuContent': {
templateUrl: "templates/currency/view_currency_lg.html",
@@ -130,7 +132,7 @@ function CurrencyLookupController($scope, $state, UIUtils, csCurrency) {
// Called to navigate to the main app
$scope.selectCurrency = function(id) {
$scope.selectedCurrency = id;
- $state.go('app.currency_view', {name: id});
+ $state.go('app.currency_name', {name: id});
};
}
diff --git a/www/js/controllers/help-controllers.js b/www/js/controllers/help-controllers.js
index 9c01e4e2916828f1111ec96f966ba9b2978344ff..43fe4bdc5aff21f3409b98bd2c42c7426811583e 100644
--- a/www/js/controllers/help-controllers.js
+++ b/www/js/controllers/help-controllers.js
@@ -6,8 +6,9 @@ angular.module('cesium.help.controllers', ['cesium.services'])
$stateProvider
+
.state('app.help_tour', {
- url: "/help/tour",
+ url: "/tour",
views: {
'menuContent': {
templateUrl: "templates/home/home.html",
@@ -47,6 +48,9 @@ angular.module('cesium.help.controllers', ['cesium.services'])
.controller('HelpTipCtrl', HelpTipController)
+ .controller('HelpTourCtrl', HelpTourController)
+
+
;
@@ -152,6 +156,18 @@ function HelpTipController($scope, $rootScope, $state, $window, $ionicSideMenuDe
return $scope.continue;
})
+ // Network tour
+ .then(function(next){
+ if (!next) return false;
+ return $scope.startNetworkTour(0, true)
+ .then(function(endIndex){
+ if (!endIndex || $scope.cancelled) return false;
+ csSettings.data.helptip.network=endIndex;
+ csSettings.store();
+ return $scope.continue;
+ });
+ })
+
// Wot tour
.then(function(next){
if (!next) return false;
@@ -233,15 +249,9 @@ function HelpTipController($scope, $rootScope, $state, $window, $ionicSideMenuDe
*/
$scope.startCurrencyTour = function(startIndex, hasNext) {
- var showNetworkViewIsNeed = function() {
- if ($state.is('app.currency_view')) {
- // Select the second tabs
- $timeout(function () {
- var tabs = $window.document.querySelectorAll('ion-tabs .tabs a');
- if (tabs && tabs.length == 2) {
- angular.element(tabs[1]).triggerHandler('click');
- }
- }, 100);
+ var showWotTabIfNeed = function() {
+ if ($state.is('app.currency.tab_parameters')) {
+ $state.go('app.currency.tab_wot');
}
};
@@ -265,31 +275,19 @@ function HelpTipController($scope, $rootScope, $state, $window, $ionicSideMenuDe
if ($ionicSideMenuDelegate.isOpen()) {
$ionicSideMenuDelegate.toggleLeft(false);
}
- return $state.go(UIUtils.screen.isSmall() ? 'app.currency_view' : 'app.currency_view_lg')
+ return $state.go(UIUtils.screen.isSmall() ? 'app.currency' : 'app.currency_view_lg')
.then(function () {
- return $scope.showHelpTip('helptip-currency-newcomers', {
+ return $scope.showHelpTip('helptip-currency-mass-member', {
bindings: {
- content: 'HELP.TIP.CURRENCY_WOT',
+ content: 'HELP.TIP.CURRENCY_MASS',
icon: {
position: 'center'
}
- },
- timeout: 1200 // need for Firefox
+ }
});
});
},
- function () {
- return $scope.showHelpTip('helptip-currency-mass-member', {
- bindings: {
- content: 'HELP.TIP.CURRENCY_MASS',
- icon: {
- position: 'center'
- }
- }
- });
- },
-
function () {
if (!csSettings.data.useRelative) return true; //skip but continue
return $scope.showHelpTip('helptip-currency-mass-member-unit', {
@@ -341,24 +339,88 @@ function HelpTipController($scope, $rootScope, $state, $window, $ionicSideMenuDe
});
},
- function() {
- showNetworkViewIsNeed();
- return $scope.showHelpTip('helptip-currency-blockchain', {
+ function () {
+ showWotTabIfNeed();
+ return $scope.showHelpTip('helptip-currency-newcomers', {
bindings: {
- content: 'HELP.TIP.CURRENCY_BLOCKCHAIN',
+ content: 'HELP.TIP.CURRENCY_WOT',
icon: {
- position: 'center',
- glyph: 'ion-information-circled'
+ position: 'center'
+ }
+ },
+ timeout: 1200 // need for Firefox
+ });
+ }
+ ];
+
+ // Get currency parameters, with currentUD
+ return csCurrency.default().then(function(currency) {
+ contentParams = currency.parameters;
+ // Launch steps
+ return $scope.executeStep('currency', steps, startIndex);
+ });
+ };
+
+ /**
+ * Features tour on network
+ * @returns {*}
+ */
+ $scope.startNetworkTour = function(startIndex, hasNext) {
+
+ var showNetworkTabIfNeed = function() {
+ if ($state.is('app.currency')) {
+ // Select the second tabs
+ $timeout(function () {
+ var tabs = $window.document.querySelectorAll('ion-tabs .tabs a');
+ if (tabs && tabs.length == 3) {
+ angular.element(tabs[2]).triggerHandler('click');
+ }
+ }, 100);
+ }
+ };
+
+ var contentParams;
+
+ var steps = [
+
+ function(){
+ if (UIUtils.screen.isSmall()) return true; // skip but continue
+ $ionicSideMenuDelegate.toggleLeft(true);
+ return $scope.showHelpTip('helptip-menu-btn-network', {
+ bindings: {
+ content: 'HELP.TIP.MENU_BTN_NETWORK',
+ icon: {
+ position: 'left'
}
}
});
},
+ function () {
+ if ($ionicSideMenuDelegate.isOpen()) {
+ $ionicSideMenuDelegate.toggleLeft(false);
+ }
+ return $state.go(UIUtils.screen.isSmall() ? 'app.currency.tab_network' : 'app.network')
+ .then(function () {
+ showNetworkTabIfNeed();
+ return $scope.showHelpTip('helptip-network-peers', {
+ bindings: {
+ content: 'HELP.TIP.NETWORK_BLOCKCHAIN',
+ icon: {
+ position: 'center',
+ glyph: 'ion-information-circled'
+ }
+ },
+ timeout: 1200 // need for Firefox
+ });
+ });
+ },
+
function() {
- showNetworkViewIsNeed();
- return $scope.showHelpTip('helptip-currency-peer-0', {
+ showNetworkTabIfNeed();
+ return $scope.showHelpTip('helptip-network-peer-0', {
bindings: {
- content: 'HELP.TIP.CURRENCY_PEERS',
+ content: 'HELP.TIP.NETWORK_PEERS',
icon: {
position: 'center'
}
@@ -370,23 +432,24 @@ function HelpTipController($scope, $rootScope, $state, $window, $ionicSideMenuDe
function() {
- showNetworkViewIsNeed();
- return $scope.showHelpTip('helptip-currency-peer-0-block', {
+ showNetworkTabIfNeed();
+ return $scope.showHelpTip('helptip-network-peer-0-block', {
bindings: {
- content: 'HELP.TIP.CURRENCY_PEERS_BLOCK_NUMBER',
+ content: 'HELP.TIP.NETWORK_PEERS_BLOCK_NUMBER',
icon: {
- position: 'right'
+ position: 'right',
+ style: 'margin-right: 75px;'
}
}
});
},
function() {
- showNetworkViewIsNeed();
+ showNetworkTabIfNeed();
var locale = csSettings.data.locale.id;
- return $scope.showHelpTip('helptip-currency-peers', {
+ return $scope.showHelpTip('helptip-network-peers', {
bindings: {
- content: 'HELP.TIP.CURRENCY_PEERS_PARTICIPATE',
+ content: 'HELP.TIP.NETWORK_PEERS_PARTICIPATE',
contentParams: {
installDocUrl: (csConfig.helptip && csConfig.helptip.installDocUrl) ?
(csConfig.helptip.installDocUrl[locale] ? csConfig.helptip.installDocUrl[locale] : csConfig.helptip.installDocUrl) :
@@ -406,7 +469,7 @@ function HelpTipController($scope, $rootScope, $state, $window, $ionicSideMenuDe
return csCurrency.default().then(function(currency) {
contentParams = currency.parameters;
// Launch steps
- return $scope.executeStep('currency', steps, startIndex);
+ return $scope.executeStep('network', steps, startIndex);
});
};
@@ -874,7 +937,8 @@ function HelpTipController($scope, $rootScope, $state, $window, $ionicSideMenuDe
content: 'HELP.TIP.SETTINGS_CHANGE_UNIT',
contentParams: contentParams,
icon: {
- position: 'right'
+ position: 'right',
+ style: 'margin-right: 60px'
},
hasNext: hasNext
},
@@ -937,3 +1001,18 @@ function HelpTipController($scope, $rootScope, $state, $window, $ionicSideMenuDe
}
};
}
+
+/* ----------------------------
+ * Help Tip
+ * ---------------------------- */
+function HelpTourController($scope, $rootScope, $state, $window, $ionicSideMenuDelegate, $timeout, $q,
+ UIUtils, csConfig, csSettings, csCurrency, Device, csWallet) {
+
+ HelpTipController.call(this, $scope, $rootScope, $state, $window, $ionicSideMenuDelegate, $timeout, $q,
+ UIUtils, csConfig, csSettings, csCurrency, Device, csWallet)
+
+ $scope.$on('$ionicView.enter', function(e, state) {
+ $scope.startHelpTour();
+ });
+
+}
diff --git a/www/templates/common/popover_helptip.html b/www/templates/common/popover_helptip.html
index 1e7014c67e252521b84c650a0567837870ecbb25..df9f5c8e49dad59332ea633e2362a0a747f47d2d 100644
--- a/www/templates/common/popover_helptip.html
+++ b/www/templates/common/popover_helptip.html
@@ -2,7 +2,7 @@
<ion-content scroll="false" class="list">
<p >
<ng-if ng-if="icon.position && !icon.position.startsWith('bottom-')">
- <i class="{{icon.class}} icon-{{icon.position}}"></i>
+ <i class="{{icon.class}} icon-{{icon.position}}" style="{{icon.style}}"></i>
</ng-if>
<!-- close button-->
diff --git a/www/templates/currency/items_network.html b/www/templates/currency/items_network.html
index f096bfa8bcd04a7a8a4b50fa098c47c08d3c0880..f0b6bba62eba885f2693f59c098d88da29648a5c 100644
--- a/www/templates/currency/items_network.html
+++ b/www/templates/currency/items_network.html
@@ -1,5 +1,5 @@
- <ion-item id="helptip-currency-blockchain"
+ <ion-item id="helptip-network-blockchain"
class="item-icon-left item-text-wrap">
<i class="icon ion-clock"></i>
<span translate>CURRENCY.VIEW.MEDIAN_TIME</span>
@@ -29,7 +29,7 @@
<ng-controller ng-controller="NetworkLookupCtrl as ctrl">
- <div id="helptip-currency-peers"
+ <div id="helptip-network-peers"
class="item item-divider">
<div class="pull-left">
<span ng-if="search.type=='member'" translate>PEER.MEMBERS</span>
diff --git a/www/templates/currency/items_wot.html b/www/templates/currency/items_wot.html
index f802e3b78b5e8d503a0f8f69413a71e929e3090f..8fece4eaca1901f1584fe57ec4e4f9d9ed7cb254 100644
--- a/www/templates/currency/items_wot.html
+++ b/www/templates/currency/items_wot.html
@@ -7,7 +7,7 @@
<span class="badge badge-assertive" ng-if="!loading">{{formData.N | formatInteger}}</span>
</ion-item>
- <ion-item class="item-icon-left item-text-wrap">
+ <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)
diff --git a/www/templates/menu.html b/www/templates/menu.html
index 08e319179e1fd958a2c42dfcaf20f94976abfbad..17a81bbdeaa438f96136ffe0452cf77de14ecd13 100644
--- a/www/templates/menu.html
+++ b/www/templates/menu.html
@@ -90,6 +90,7 @@
</ion-item>
<ion-item menu-close
+ id="helptip-menu-btn-network"
class="item item-icon-left hidden-xs hidden-sm"
active-link="active"
active-link-path-prefix="#/app/network"
diff --git a/www/templates/network/items_peers.html b/www/templates/network/items_peers.html
index 88dc8c834073a1e101de5c95605b6021c75eba10..bb1c12c674d1b02148161c965c239adb3b25b38d 100644
--- a/www/templates/network/items_peers.html
+++ b/www/templates/network/items_peers.html
@@ -22,7 +22,7 @@
<div ng-repeat="peer in search.results track by peer.id"
class="item peer-item item-icon-left {{::ionItemClass}}"
ng-class="{ assertive: !peer.online, balanced: (peer.online && peer.hasMainConsensusBlock), energized: (peer.online && !peer.hasMainConsensusBlock)}"
- id="helptip-currency-peer-{{$index}}"
+ id="helptip-network-peer-{{$index}}"
ng-click="selectPeer(peer)">
<i class="icon ion-android-globe"></i>
@@ -55,7 +55,7 @@
<h4 class="hidden-sm hidden-xs hidden-md gray">v{{peer.version}}</h4>
</div>
<div class="col col-20 no-padding text-center">
- <span id="helptip-currency-peer-{{$index}}-block"
+ <span id="helptip-network-peer-{{$index}}-block"
class="badge" ng-class="{ 'badge-balanced': peer.hasMainConsensusBlock, 'badge-energized': peer.hasConsensusBlock }">{{peer.currentNumber}}</span>
</div>
</div>
diff --git a/www/templates/network/view_network.html b/www/templates/network/view_network.html
index 53619987b55c800c9de4b87282212eb698c0d0b3..5b732a27ab284df6ca76ed00bb8a6cfd73729490 100644
--- a/www/templates/network/view_network.html
+++ b/www/templates/network/view_network.html
@@ -13,8 +13,8 @@
<div class="list">
<div class="padding padding-xs" style="display: block; height: 60px;">
- <div class="pull-left">
- <h4>
+ <div class="pull-left" >
+ <h4 >
<span ng-if="enableFilter && search.type=='member'" translate>PEER.MEMBERS</span>
<span ng-if="enableFilter && search.type=='mirror'" translate>PEER.MIRRORS</span>
<span ng-if="enableFilter && search.type=='offline'" translate>PEER.OFFLINE</span>
@@ -63,6 +63,9 @@
</div>
</div>
+ <div id="helptip-network-blockchain" style="display: block"></div>
+ <div id="helptip-network-peers" style="display: block"></div>
+
<ng-include src="'templates/network/items_peers.html'"></ng-include>
</div>