From 803c3af054d13d3250b992ff8c49fd9460f44812 Mon Sep 17 00:00:00 2001
From: Benoit Lavenier <benoit.lavenier@e-is.pro>
Date: Sat, 4 Jan 2020 11:55:00 +0100
Subject: [PATCH] [enh] Network: display Cesium+ network button ONLY in the
expert mode [fix] Network: display button for statistics (ES plugin)
---
.../es/js/controllers/network-controllers.js | 2 +-
...view_network.html => view_es_network.html} | 2 +-
.../network/view_network_extend.html | 2 +-
.../js/controllers/network-controllers.js | 22 ++++---------------
.../network/view_es_network_extend.html | 2 +-
.../network/view_network_extend.html | 2 +-
www/templates/network/view_network.html | 3 +++
7 files changed, 12 insertions(+), 23 deletions(-)
rename www/plugins/es/templates/network/{view_network.html => view_es_network.html} (97%)
diff --git a/www/plugins/es/js/controllers/network-controllers.js b/www/plugins/es/js/controllers/network-controllers.js
index 8d259a27a..c94988afb 100644
--- a/www/plugins/es/js/controllers/network-controllers.js
+++ b/www/plugins/es/js/controllers/network-controllers.js
@@ -32,7 +32,7 @@ angular.module('cesium.es.network.controllers', ['cesium.es.services'])
cache: false, // fix #766
views: {
'menuContent': {
- templateUrl: "plugins/es/templates/network/view_network.html",
+ templateUrl: "plugins/es/templates/network/view_es_network.html",
controller: 'ESNetworkLookupCtrl'
}
},
diff --git a/www/plugins/es/templates/network/view_network.html b/www/plugins/es/templates/network/view_es_network.html
similarity index 97%
rename from www/plugins/es/templates/network/view_network.html
rename to www/plugins/es/templates/network/view_es_network.html
index 21070d503..907960773 100644
--- a/www/plugins/es/templates/network/view_network.html
+++ b/www/plugins/es/templates/network/view_es_network.html
@@ -61,7 +61,7 @@
</a>
<!-- Allow extension here -->
- <cs-extension-point name="buttons"></cs-extension-point>
+ <cs-extension-point name="documents-buttons"></cs-extension-point>
<a class="button button-text button-small ink"
ui-sref="app.document_search({index: search.index, type: search.type})" >
diff --git a/www/plugins/es/templates/network/view_network_extend.html b/www/plugins/es/templates/network/view_network_extend.html
index 71ac0460c..2be4e29dd 100644
--- a/www/plugins/es/templates/network/view_network_extend.html
+++ b/www/plugins/es/templates/network/view_network_extend.html
@@ -1,6 +1,6 @@
<!-- Network: buttons section -->
<ng-if ng-if=":state:enable && extensionPoint === 'network-buttons'">
- <a class="button button-text button-small hidden-xs hidden-sm ink"
+ <a class="button button-text button-small hidden-xs hidden-sm ink" ng-if="::expertMode"
title="{{'NETWORK.VIEW.ENDPOINTS.ES_USER_API'|translate}}"
ui-sref="app.es_network" >
<i class="icon ion-image"></i>
diff --git a/www/plugins/graph/js/controllers/network-controllers.js b/www/plugins/graph/js/controllers/network-controllers.js
index 5ba4e0086..946e7fdce 100644
--- a/www/plugins/graph/js/controllers/network-controllers.js
+++ b/www/plugins/graph/js/controllers/network-controllers.js
@@ -10,9 +10,9 @@ angular.module('cesium.graph.network.controllers', ['chart.js', 'cesium.graph.se
PluginServiceProvider
.extendState('app.network', {
points: {
- 'buttons': {
+ 'blockchain-buttons': {
templateUrl: "plugins/graph/templates/network/view_network_extend.html",
- controller: 'GpNetworkViewExtendCtrl'
+ controller: 'ESExtensionCtrl'
}
}
})
@@ -28,9 +28,9 @@ angular.module('cesium.graph.network.controllers', ['chart.js', 'cesium.graph.se
.extendState('app.es_network', {
points: {
- 'buttons': {
+ 'documents-buttons': {
templateUrl: "plugins/graph/templates/network/view_es_network_extend.html",
- controller: 'GpNetworkViewExtendCtrl'
+ controller: 'ESExtensionCtrl'
}
}
})
@@ -49,24 +49,10 @@ angular.module('cesium.graph.network.controllers', ['chart.js', 'cesium.graph.se
}
})
- .controller('GpNetworkViewExtendCtrl', GpNetworkViewExtendController)
-
.controller('GpPeerViewExtendCtrl', GpPeerViewExtendController)
;
-
-function GpNetworkViewExtendController($scope, PluginService, esSettings) {
- 'ngInject';
-
- $scope.extensionPoint = PluginService.extensions.points.current.get();
- $scope.enable = esSettings.isEnable();
-
- esSettings.api.state.on.changed($scope, function(enable) {
- $scope.enable = enable;
- });
-}
-
function GpPeerViewExtendController($scope, $timeout, PluginService, esSettings, csCurrency, gpData) {
'ngInject';
diff --git a/www/plugins/graph/templates/network/view_es_network_extend.html b/www/plugins/graph/templates/network/view_es_network_extend.html
index e2e0544a7..727817ca4 100644
--- a/www/plugins/graph/templates/network/view_es_network_extend.html
+++ b/www/plugins/graph/templates/network/view_es_network_extend.html
@@ -1,5 +1,5 @@
<!-- Buttons section -->
-<ng-if ng-if=":state:enable && extensionPoint === 'buttons'">
+<ng-if ng-if=":state:enable && extensionPoint === 'documents-buttons'">
<a class="button button-text button-small ink"
ui-sref="app.doc_stats_lg" >
<i class="icon ion-stats-bars"></i>
diff --git a/www/plugins/graph/templates/network/view_network_extend.html b/www/plugins/graph/templates/network/view_network_extend.html
index 8b387b41d..1f63746f0 100644
--- a/www/plugins/graph/templates/network/view_network_extend.html
+++ b/www/plugins/graph/templates/network/view_network_extend.html
@@ -1,5 +1,5 @@
<!-- Buttons section -->
-<ng-if ng-if=":state:enable && extensionPoint === 'buttons'">
+<ng-if ng-if=":state:enable && extensionPoint === 'blockchain-buttons'">
<a class="button button-text button-small ink"
ui-sref="app.blockchain_stats" >
<i class="icon ion-stats-bars"></i>
diff --git a/www/templates/network/view_network.html b/www/templates/network/view_network.html
index dea800524..15c7f6d25 100644
--- a/www/templates/network/view_network.html
+++ b/www/templates/network/view_network.html
@@ -39,6 +39,7 @@
<a class="button button-text button-small hidden-xs hidden-sm ink"
ng-class="{'button-text-positive': search.type=='member'}"
+ title="{{'PEER.MEMBER_PEERS'|translate}}"
ng-click="toggleSearchType('member')">
<i class="icon ion-person-stalker"></i>
{{'PEER.MEMBERS'|translate}}
@@ -46,6 +47,7 @@
<a class="button button-text button-small hidden-xs hidden-sm ink"
ng-class="{'button-text-positive': search.type=='mirror'}"
+ title="{{'PEER.MIRROR_PEERS'|translate}}"
ng-click="toggleSearchType('mirror')" >
<i class="icon ion-radio-waves"></i>
{{'PEER.MIRRORS'|translate}}
@@ -53,6 +55,7 @@
<a class="button button-text button-small hidden-xs hidden-sm ink"
ng-class="{'button-text-positive': search.type=='offline', 'button-text-stable': search.type!='offline'}"
+ title="{{'PEER.OFFLINE_PEERS'|translate}}"
ng-click="toggleSearchType('offline')" >
<i class="icon ion-close-circled light-gray"></i>
<span>{{'PEER.OFFLINE'|translate}}</span>
--
GitLab