diff --git a/www/js/controllers/help-controllers.js b/www/js/controllers/help-controllers.js
index 89ddac5d78863d0311502062f4b75d8108778d18..6b6f7963c3f9b0d852d683e4f96086bde8470351 100644
--- a/www/js/controllers/help-controllers.js
+++ b/www/js/controllers/help-controllers.js
@@ -328,36 +328,36 @@ function HelpTipController($scope, $state, $window, $ionicSideMenuDelegate, $tim
});
},
- function () {
- if (!csSettings.data.useRelative) return true; //skip but continue
- return $scope.showHelpTip('helptip-currency-change-unit', {
- bindings: {
- content: 'HELP.TIP.CURRENCY_CHANGE_UNIT',
- contentParams: contentParams,
- icon: {
- position: UIUtils.screen.isSmall() ? 'right' : undefined
- }
- }
- });
- },
-
- function () {
- if (csSettings.data.useRelative) return true; //skip but continue
- return $scope.showHelpTip('helptip-currency-change-unit', {
- bindings: {
- content: 'HELP.TIP.CURRENCY_CHANGE_UNIT_TO_RELATIVE',
- contentParams: contentParams,
- icon: {
- position: UIUtils.screen.isSmall() ? 'right' : undefined
- }
- }
- });
- },
+ // function () {
+ // if (!csSettings.data.useRelative) return true; //skip but continue
+ // $anchorScroll('helptip-currency-change-unit');
+ // return $scope.showHelpTip('helptip-currency-change-unit', {
+ // bindings: {
+ // content: 'HELP.TIP.CURRENCY_CHANGE_UNIT',
+ // contentParams: contentParams,
+ // icon: {
+ // position: UIUtils.screen.isSmall() ? 'right' : undefined
+ // }
+ // }
+ // });
+ // },
+ //
+ // function () {
+ // if (csSettings.data.useRelative) return true; //skip but continue
+ // $anchorScroll('helptip-currency-change-unit');
+ // return $scope.showHelpTip('helptip-currency-change-unit', {
+ // bindings: {
+ // content: 'HELP.TIP.CURRENCY_CHANGE_UNIT_TO_RELATIVE',
+ // contentParams: contentParams,
+ // icon: {
+ // position: UIUtils.screen.isSmall() ? 'right' : undefined
+ // }
+ // }
+ // });
+ // },
function () {
- if (UIUtils.screen.isSmall()) {
- $anchorScroll('helptip-currency-rules-anchor');
- }
+ $anchorScroll('helptip-currency-rules-anchor');
return $scope.showHelpTip('helptip-currency-rules', {
bindings: {
content: 'HELP.TIP.CURRENCY_RULES',
@@ -371,6 +371,7 @@ function HelpTipController($scope, $state, $window, $ionicSideMenuDelegate, $tim
function () {
showWotTabIfNeed();
+ $anchorScroll('helptip-currency-newcomers-anchor');
return $scope.showHelpTip('helptip-currency-newcomers', {
bindings: {
content: 'HELP.TIP.CURRENCY_WOT',
diff --git a/www/js/controllers/network-controllers.js b/www/js/controllers/network-controllers.js
index a44be75aa8adaa5ebc907c7562e05cb41165821b..d56bc70e179b22795f5a10354051893cd2151f8d 100644
--- a/www/js/controllers/network-controllers.js
+++ b/www/js/controllers/network-controllers.js
@@ -64,6 +64,7 @@ function NetworkLookupController($scope, $state, $location, $ionicPopover, $win
sort : undefined,
asc: true
};
+ $scope.helptipPrefix = 'helptip-network';
$scope.eanbleLocationHref = true; // can be overrided by sub-controler (e.g. popup)
/**
@@ -327,6 +328,7 @@ function NetworkLookupModalController($scope, $controller, parameters) {
$scope.expertMode = angular.isDefined(parameters.expertMode) ? parameters.expertMode : $scope.expertMode;
$scope.ionItemClass = parameters.ionItemClass || 'item-border-large';
$scope.eanbleLocationHref = false;
+ $scope.helptipPrefix = '';
$scope.selectPeer = function(peer) {
$scope.closeModal(peer);
@@ -357,6 +359,7 @@ function NetworkLookupPopoverController($scope, $controller) {
$scope.search.endpointFilter = angular.isDefined(parameters.endpointFilter) ? parameters.endpointFilter : $scope.search.endpointFilter;
$scope.expertMode = angular.isDefined(parameters.expertMode) ? parameters.expertMode : $scope.expertMode;
$scope.ionItemClass = parameters.ionItemClass || 'item-border-large';
+ $scope.helptipPrefix = '';
$scope.selectPeer = function(peer) {
$scope.closePopover(peer);
diff --git a/www/templates/currency/items_parameters.html b/www/templates/currency/items_parameters.html
index 633cbb51d632f4df6084266b5147a4f57149c281..8d852dc36c5e497902e29566f89dca346baaa071 100644
--- a/www/templates/currency/items_parameters.html
+++ b/www/templates/currency/items_parameters.html
@@ -8,6 +8,7 @@
</div>
</ion-item>
+
<ion-item class="item-icon-left item-text-wrap">
<i class="icon ion-record"></i>
<div class="col col-60">
@@ -19,18 +20,6 @@
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-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>
-
- <!-- Allow extension here -->
- <cs-extension-point name="parameters-actual"></cs-extension-point>
-
<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">
@@ -44,6 +33,21 @@
</span>
</ion-item>
+
+ <!-- Allow extension here -->
+ <cs-extension-point name="parameters-actual"></cs-extension-point>
+
+
+ <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>
+
+
<ion-item class="item-icon-left item-text-wrap">
<i class="icon ion-load-c"></i>
<div class="col col-60">
diff --git a/www/templates/currency/items_wot.html b/www/templates/currency/items_wot.html
index 62683fb651cc6acc080d91f5b45a26b720a8ea44..4840d5f491a5aa5270b2838ca511892ef7f85390 100644
--- a/www/templates/currency/items_wot.html
+++ b/www/templates/currency/items_wot.html
@@ -1,6 +1,7 @@
<div bind-notifier="{ rebind:formData.useRelative }">
+ <a name="helptip-currency-newcomers-anchor"></a>
<ion-item class="item-icon-left item-text-wrap">
<i class="icon ion-person-stalker"></i>
<div class="col col-60">
diff --git a/www/templates/menu.html b/www/templates/menu.html
index e08e9427e5c3f54b8a74010d5281780d4c4c06ff..1731f5993fd0cbcc0ee80848e7334b4b5eb1feba 100644
--- a/www/templates/menu.html
+++ b/www/templates/menu.html
@@ -93,7 +93,6 @@
</ion-item>
<a menu-close
- id="helptip-menu-btn-currency"
class="item item-icon-left"
active-link="active"
active-link-path-prefix="#/app/currency"
@@ -101,9 +100,9 @@
<i class="icon ion-ios-world-outline"></i>
{{:locale:'MENU.CURRENCY'|translate}}
</a>
+ <a id="helptip-menu-btn-currency"></a>
<a 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"
@@ -111,6 +110,7 @@
<i class="icon ion-cloud"></i>
{{:locale:'MENU.NETWORK'|translate}}
</a>
+ <a id="helptip-menu-btn-network"></a>
<!-- Allow extension here -->
<cs-extension-point name="menu-discover"></cs-extension-point>