Move buttons in node's list

www/js/controllers/network-controllers.js

@@ -114,6 +114,7 @@ function NetworkModalController($scope, $q, $translate, $timeout, $ionicPopover,
   $scope.formData = {
     useRelative: csSettings.data.useRelative
   };
+
   $scope.enableFilter = true;
   $scope.display='members';
   $scope.screen = UIUtils.screen;
@@ -152,19 +153,19 @@ function NetworkModalController($scope, $q, $translate, $timeout, $ionicPopover,
         }
 
       });
-      $scope.$on('$destroy', function(){
+      $scope.$on('modal.hidden', function(){
         csNetwork.close();
       });
     }
   };
 
   $scope.refresh = function() {
-    // Network
     $scope.loadingPeers = true;
     csNetwork.loadPeers();
   };
 
   $scope.countMembersNodes = function(){
+    $scope.nbMembersPeers = 0;
     for(var i=0; i<$scope.peers.length; i++){
       if ($scope.peers[i].level){
         $scope.nbMembersPeers++;

www/templates/network/modal_network.html

@@ -2,50 +2,59 @@
   <ion-header-bar class="bar-positive">
     <button class="button button-clear" ng-click="closeModal()" translate>COMMON.BTN_CANCEL</button>
     <h1 class="title" translate>PEER.NODE_LIST</h1>
-    <ion-spinner class="pull-right button button-icon hidden-xs hidden-sm" icon="android" ng-if="loadingPeers"></ion-spinner>
-    <button class="pull-right button button-icon ion-loop button-clear hidden-xs hidden-sm" ng-if="!loadingPeers" ng-click="refresh()">
+    <div class="buttons buttons-right header-item">
+      <span class="secondary">
+        <button class="button button-clear icon ion-loop button-clear" ng-click="refresh()">
+
         </button>
         <button class="button button-icon button-clear icon ion-android-more-vertical visible-xs visible-sm"
                 ng-click="showActionsPopover($event)">
         </button>
+      </span>
+    </div>
   </ion-header-bar>
 
-  <ion-content scroll="true">
+  <ion-content>
     <div class="list">
       <div class="padding padding-xs" style="display: block; height: 60px;">
         <div id="helptip-currency-peers" class="pull-left">
             <h4 class="visible-xs visible-sm"
               ng-if="display=='allNodes'||!enableFilter">
-              {{'PEER.ALL_NODES' | translate}} ({{peers.length}}) :
+              {{'PEER.ALL_NODES' | translate}} <span ng-if="peers.length != 0">({{peers.length}})</span> :
             </h4>
             <h4 class="visible-xs visible-sm"
               ng-if="display=='members'">
-              {{'PEER.MEMBERS' | translate}} ({{nbMembersPeers}}) :
+              {{'PEER.MEMBERS' | translate}} <span ng-if="nbMembersPeers != 0">({{nbMembersPeers}})</span> :
             </h4>
-            <h4 class="hidden-xs hidden-sm"
-                ng-if="display=='allNodes'||!enableFilter">
-              {{'PEER.PEERS' | translate}} ({{peers.length}}) :
-            </h4>
-            <h4 class="hidden-xs hidden-sm"
-                ng-if="display=='members'">
-              {{'PEER.PEERS' | translate}} ({{nbMembersPeers}}) :
+            <h4 class="hidden-xs hidden-sm">
+              {{'PEER.PEERS' | translate}}
+              <span ng-if="peers.length != 0 && (display=='allNodes'||!enableFilter)">({{peers.length}})</span>
+              <span ng-if="nbMembersPeers != 0 && display=='members'">({{nbMembersPeers}})</span> :
             </h4>
           </div>
-          <div class="pull-right hidden-xs hidden-sm" ng-if="enableFilter">
-            <a class="button button-text button-small ink icon ion-android-people"
+
+          <div class="pull-right">
+            <ion-spinner class="icon" icon="android" ng-if="loadingPeers"></ion-spinner>
+            &nbsp;
+            <div class="pull-right">
+              <a class="button button-text button-small ink icon ion-android-people hidden-xs hidden-sm"
                  ng-class="{'button-text-positive': display=='members'}"
-               ng-click="changeDisplay('members')">
+                 ng-click="changeDisplay('members')"
+                 ng-if="enableFilter">
                 {{'PEER.MEMBERS' | translate}}
               </a>
               &nbsp;
-            <a class="button button-text button-small ink icon ion-ios-infinite"
+              <a class="button button-text button-small ink icon ion-ios-infinite hidden-xs hidden-sm"
                  ng-class="{'button-text-positive': display=='allNodes'}"
-               ng-click="changeDisplay('allNodes')">
+                 ng-click="changeDisplay('allNodes')"
+                 ng-if="enableFilter">
                 {{'PEER.ALL_NODES' | translate}}
               </a>
               &nbsp;
             </div>
           </div>
+        </div>
+
       <ng-click class="peer-item item item-icon-left"
          ng-repeat="peer in peers track by peer.server"
          id="helptip-currency-peer-{{$index}}"
@@ -71,6 +80,7 @@
       		</div>
     	  </div>
   	  </ng-click>
+
 	  </div>
   </ion-content>
 </ion-modal-view>