From f2333b646308ba2e603ac7dd8d5ec2af04edd68b Mon Sep 17 00:00:00 2001
From: Benoit Lavenier <benoit.lavenier@e-is.pro>
Date: Sat, 4 Jan 2020 00:28:15 +0100
Subject: [PATCH] [fix] Network: add button to show Cesium+ network
---
www/js/services/network-services.js | 2 +-
.../es/js/controllers/network-controllers.js | 6 +++++-
.../es/templates/network/view_network.html | 3 ++-
.../es/templates/network/view_network_extend.html | 15 +++++++++++++--
www/templates/network/view_network.html | 5 +++--
5 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/www/js/services/network-services.js b/www/js/services/network-services.js
index dbf0b26c..a6a578d9 100644
--- a/www/js/services/network-services.js
+++ b/www/js/services/network-services.js
@@ -682,7 +682,7 @@ angular.module('cesium.network.services', ['ngApi', 'cesium.currency.services',
}
// Raise event on new main block
- if (updateMainBuid && mainBlock.buid && (!data.mainBlock || data.mainBlock.buid !== mainBlock.buid)) {
+ if (updateMainBuid && mainBlock && mainBlock.buid && (!data.mainBlock || data.mainBlock.buid !== mainBlock.buid)) {
data.mainBlock = mainBlock;
api.data.raise.mainBlockChanged(mainBlock);
}
diff --git a/www/plugins/es/js/controllers/network-controllers.js b/www/plugins/es/js/controllers/network-controllers.js
index ebaf126b..8d259a27 100644
--- a/www/plugins/es/js/controllers/network-controllers.js
+++ b/www/plugins/es/js/controllers/network-controllers.js
@@ -8,7 +8,11 @@ angular.module('cesium.es.network.controllers', ['cesium.es.services'])
if (enable) {
PluginServiceProvider.extendState('app.network', {
points: {
- 'buttons': {
+ 'network-buttons': {
+ templateUrl: "plugins/es/templates/network/view_network_extend.html",
+ controller: 'ESExtensionCtrl'
+ },
+ 'blockchain-buttons': {
templateUrl: "plugins/es/templates/network/view_network_extend.html",
controller: 'ESExtensionCtrl'
}
diff --git a/www/plugins/es/templates/network/view_network.html b/www/plugins/es/templates/network/view_network.html
index d2c29d8c..21070d50 100644
--- a/www/plugins/es/templates/network/view_network.html
+++ b/www/plugins/es/templates/network/view_network.html
@@ -1,6 +1,7 @@
<ion-view>
<ion-nav-title>
- <span translate>MENU.NETWORK</span>
+ <span translate>MENU.NETWORK</span>
+ <span translate>ES_SETTINGS.PLUGIN_NAME</span>
</ion-nav-title>
<ion-nav-buttons side="secondary">
diff --git a/www/plugins/es/templates/network/view_network_extend.html b/www/plugins/es/templates/network/view_network_extend.html
index 82470990..71ac0460 100644
--- a/www/plugins/es/templates/network/view_network_extend.html
+++ b/www/plugins/es/templates/network/view_network_extend.html
@@ -1,8 +1,19 @@
-<!-- Buttons section -->
-<ng-if ng-if=":state:enable">
+<!-- Network: buttons section -->
+<ng-if ng-if=":state:enable && extensionPoint === 'network-buttons'">
+ <a class="button button-text button-small hidden-xs hidden-sm ink"
+ title="{{'NETWORK.VIEW.ENDPOINTS.ES_USER_API'|translate}}"
+ ui-sref="app.es_network" >
+ <i class="icon ion-image"></i>
+ <span>{{'ES_SETTINGS.PLUGIN_NAME'|translate}}</span>
+ </a>
+</ng-if>
+
+<!-- Blockchain: buttons section -->
+<ng-if ng-if=":state:enable && extensionPoint === 'blockchain-buttons'">
<a class="button button-text button-small ink"
ui-sref="app.blockchain_search" >
<i class="icon ion-android-search"></i>
<span>{{'COMMON.BTN_SEARCH'|translate}}</span>
</a>
</ng-if>
+
diff --git a/www/templates/network/view_network.html b/www/templates/network/view_network.html
index 3a87285b..dea80052 100644
--- a/www/templates/network/view_network.html
+++ b/www/templates/network/view_network.html
@@ -59,7 +59,8 @@
</a>
<!-- Allow extension here -->
- <cs-extension-point name="filter-buttons"></cs-extension-point>
+ <cs-extension-point name="network-buttons"></cs-extension-point>
+
</div>
</div>
</div>
@@ -86,7 +87,7 @@
</a>
<!-- Allow extension here -->
- <cs-extension-point name="buttons"></cs-extension-point>
+ <cs-extension-point name="blockchain-buttons"></cs-extension-point>
</div>
</div>
--
GitLab