From 701b9836ca20d35d3089a02de3a9ea50f1c40a5c Mon Sep 17 00:00:00 2001 From: blavenie <benoit.lavenier@e-is.pro> Date: Thu, 12 Jan 2017 17:08:54 +0100 Subject: [PATCH] - Fix help tour - set id for wot certification count - Hide network menu entry --- www/js/controllers/help-controllers.js | 2 +- www/templates/common/badge_certification_count.html | 2 +- www/templates/menu.html | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/js/controllers/help-controllers.js b/www/js/controllers/help-controllers.js index 21db1203c..9c01e4e29 100644 --- a/www/js/controllers/help-controllers.js +++ b/www/js/controllers/help-controllers.js @@ -144,7 +144,7 @@ function HelpTipController($scope, $rootScope, $state, $window, $ionicSideMenuDe $scope.continue = true; // Currency tour - return $scope.startWotTour(0, true) + return $scope.startCurrencyTour(0, true) .then(function(endIndex){ if (!endIndex || $scope.cancelled) return false; csSettings.data.helptip.currency=endIndex; diff --git a/www/templates/common/badge_certification_count.html b/www/templates/common/badge_certification_count.html index 75397e966..06a3bd3f8 100644 --- a/www/templates/common/badge_certification_count.html +++ b/www/templates/common/badge_certification_count.html @@ -1,4 +1,4 @@ -<span id="{{$ctrl.id}}" +<span ng-attr-id="{{$ctrl.csId}}" class="badge badge-balanced" ng-class="{'badge-energized': $ctrl.requirements.willNeedCertificationCount || ($ctrl.requirements.needCertificationCount + $ctrl.requirements.pendingCertificationCount >= $ctrl.parameters.sigQty), 'badge-assertive': ($ctrl.requirements.needCertificationCount + $ctrl.requirements.pendingCertificationCount < $ctrl.parameters.sigQty)}"> diff --git a/www/templates/menu.html b/www/templates/menu.html index 685f5539b..f32cce99c 100644 --- a/www/templates/menu.html +++ b/www/templates/menu.html @@ -63,7 +63,7 @@ <span translate>MENU.CURRENCY</span> </ion-item> - <ion-item menu-close + <!--<ion-item menu-close id="helptip-menu-btn-network" class="item item-icon-left" active-link="active" @@ -71,7 +71,7 @@ href="#/app/network/view"> <i class="icon ion-android-globe"></i> <span translate>MENU.NETWORK</span> - </ion-item> + </ion-item>--> <!-- Allow extension here --> <cs-extension-point name="menu-discover"></cs-extension-point> -- GitLab