qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eal...@apache.org
Subject [qpid-dispatch] branch master updated: DISPATCH-1357 Change name of Kill buttons to Close
Date Wed, 05 Jun 2019 16:29:00 GMT
This is an automated email from the ASF dual-hosted git repository.

eallen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git


The following commit(s) were added to refs/heads/master by this push:
     new 0bbba9f  DISPATCH-1357 Change name of Kill buttons to Close
0bbba9f is described below

commit 0bbba9f5083f16926e41c9c1a462ebd9cc89ad1e
Author: Ernest Allen <eallen@redhat.com>
AuthorDate: Wed Jun 5 12:28:18 2019 -0400

    DISPATCH-1357 Change name of Kill buttons to Close
---
 console/stand-alone/index.html                   |  6 +++---
 console/stand-alone/plugin/html/qdrList.html     |  2 +-
 console/stand-alone/plugin/html/qdrOverview.html |  7 ++++++-
 console/stand-alone/plugin/js/qdrList.js         |  6 +++---
 console/stand-alone/plugin/js/qdrOverview.js     | 16 ++++++++--------
 5 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/console/stand-alone/index.html b/console/stand-alone/index.html
index e745089..c4fb2ab 100644
--- a/console/stand-alone/index.html
+++ b/console/stand-alone/index.html
@@ -127,13 +127,13 @@ under the License.
 
     <script type="text/ng-template" id="confirmKill.html">
         <div class="modal-header">
-            <h3 class="modal-title">Confirm kill order for {{name}}</h3>
+            <h3 class="modal-title">Confirm close of {{name}}</h3>
         </div>
         <div class="modal-body">
-            Are you sure you want to kill this connection?
+            Are you sure you want to close this connection?
         </div>
         <div class="modal-footer">
-            <button class="btn btn-danger" type="button" ng-click="ok()">Kill</button>
+            <button class="btn btn-danger" type="button" ng-click="ok()">Close</button>
             <button class="btn btn-secondary" type="button" ng-click="cancel()">Cancel</button>
         </div>
     </script>
diff --git a/console/stand-alone/plugin/html/qdrList.html b/console/stand-alone/plugin/html/qdrList.html
index bac387a..76a5706 100644
--- a/console/stand-alone/plugin/html/qdrList.html
+++ b/console/stand-alone/plugin/html/qdrList.html
@@ -84,7 +84,7 @@ under the License.
                     ng-class="{active : isModeSelected(mode)}" title="{{mode.title}}" ng-bind-html="mode.content">
</li>
             </ul>
             <h4>{{selectedRecordName | to_trusted}} <span ng-if="isConnection(selectedEntity)"><button
-                        ng-click="killAConnection(selectedRecordName)" class="btn btn-danger">Kill</button></span></h4>
+                        ng-click="killAConnection(selectedRecordName)" class="btn btn-danger">Close</button></span></h4>
             <div ng-show="currentMode.id === 'attributes'" class="selectedItems">
                 <div ng-show="selectedRecordName === selectedEntity" class="no-content">There
are no
                     {{selectedEntity | safePlural | to_trusted}}</div>
diff --git a/console/stand-alone/plugin/html/qdrOverview.html b/console/stand-alone/plugin/html/qdrOverview.html
index dd94aac..a642fba 100644
--- a/console/stand-alone/plugin/html/qdrOverview.html
+++ b/console/stand-alone/plugin/html/qdrOverview.html
@@ -125,6 +125,11 @@ under the License.
         <div ng-if="anyAddresses()" id="topAddresses" class="grid" ui-grid="topAddressesGrid"
 ui-grid-selection ui-grid-auto-resize ui-grid-resize-columns ui-grid-save-state></div>
         <div ng-if="!anyAddresses()">There are no addresses to which messages are being
delivered.</div>
     </div>
+    <div ng-controller="QDR.DelayedDeliveriesController">
+        <h1>Links with delayed deliveries</h1>
+        <div ng-if="anyLinks()" id="delayedDeliveries" class="grid" ui-grid="delayedDeliverisGrid"
 ui-grid-selection ui-grid-auto-resize ui-grid-resize-columns ui-grid-save-state></div>
+        <div ng-if="!anyLinks()">There are no endpoint links that have delayed deliveries.</div>
+    </div>
 </script>
 
 <!-- the following scripts are content that gets loaded into the above div that has the
temple.url -->
@@ -203,7 +208,7 @@ under the License.
             <li ng-repeat="mode in gridModes" ng-click="selectMode(mode,'Connection')"
ng-class="{active : isModeSelected(mode,'Connection')}" title="{{mode.title}}" ng-bind-html="mode.content">
</li>
         </ul>
         <div ng-if="isModeVisible('Connection','attributes')" class="selectedItems">
-            <h3>Connection {{connection.title}} <span ng-if="isNormalConnection(connection)"
<button ng-click="killAConnection(connection)" class="btn btn-danger">Kill</button></h3>
+            <h3>Connection {{connection.title}} <span ng-if="isNormalConnection(connection)"
<button ng-click="killAConnection(connection)" class="btn btn-danger">Close</button></h3>
             <div class="grid noHighlight" ui-grid="connectionGrid" ui-grid-auto-resize
ui-grid-resize-columns ui-grid-save-state></div>
         </div>
         <div ng-if="isModeVisible('Connection','links')" class="selectedItems">
diff --git a/console/stand-alone/plugin/js/qdrList.js b/console/stand-alone/plugin/js/qdrList.js
index 53427f7..a331cf5 100644
--- a/console/stand-alone/plugin/js/qdrList.js
+++ b/console/stand-alone/plugin/js/qdrList.js
@@ -595,10 +595,10 @@ export class ListController {
             let statusCode = results.context.message.application_properties.statusCode;
             if (statusCode < 200 || statusCode >= 300) {
               QDRCore.notification('error', results.context.message.application_properties.statusDescription);
-              QDRLog.error(`Error when killing ${row.entity.name}: ${results.context.message.application_properties.statusDescription}`);
+              QDRLog.error(`Error when closing ${row.entity.name}: ${results.context.message.application_properties.statusDescription}`);
             } else {
-              QDRCore.notification('success', `Manually killed ${row.entity.name}`);
-              QDRLog.info(`Manually killed ${row.entity.name}`);
+              QDRCore.notification('success', `Manually closed ${row.entity.name}`);
+              QDRLog.info(`Manually closed ${row.entity.name}`);
             }
           });
           updateExpandedEntities();
diff --git a/console/stand-alone/plugin/js/qdrOverview.js b/console/stand-alone/plugin/js/qdrOverview.js
index be7d94e..18032c1 100644
--- a/console/stand-alone/plugin/js/qdrOverview.js
+++ b/console/stand-alone/plugin/js/qdrOverview.js
@@ -800,9 +800,9 @@ export class OverviewController {
           displayName: 'authentication'
         },
         {
-          field: 'Kill',
+          field: 'Close',
           width: '4%',
-          cellTemplate: '<div ng-if="row.entity.role === \'normal\'"><button class="btn
btn-danger" ng-click="grid.appScope.killConnection(row, $event)">Kill</button></div>'
+          cellTemplate: '<div ng-if="row.entity.role === \'normal\'"><button class="btn
btn-danger" ng-click="grid.appScope.killConnection(row, $event)">Close</button></div>'
         }
       ],
       enablePaging: true,
@@ -843,7 +843,7 @@ export class OverviewController {
       d.result.then(function (confirmed) {
         row.cancelEvent = false;
         if (confirmed) {
-          console.log(`confirmed kill of ${row.entity.name}`);
+          console.log(`confirmed close of ${row.entity.name}`);
           QDRService.management.connection.sendMethod(
             row.entity.routerId,
             "connection",
@@ -854,18 +854,18 @@ export class OverviewController {
             let statusCode = results.context.message.application_properties.statusCode;
             if (statusCode < 200 || statusCode >= 300) {
               QDRCore.notification('error', results.context.message.application_properties.statusDescription);
-              QDRLog.error(`Error when killing ${row.entity.name}: ${results.context.message.application_properties.statusDescription}`);
+              QDRLog.error(`Error when closing ${row.entity.name}: ${results.context.message.application_properties.statusDescription}`);
             } else {
-              QDRCore.notification('success', `Manually killed ${row.entity.name}`);
-              QDRLog.info(`Manually killed ${row.entity.name}`);
+              QDRCore.notification('success', `Manually closed ${row.entity.name}`);
+              QDRLog.info(`Manually closed ${row.entity.name}`);
             }
             updateExpanded();
           });
         }
         else
-          console.log(`cancelled kill order for ${row.entity.name}`);
+          console.log(`cancelled close order for ${row.entity.name}`);
       }, function () {
-        QDRLog.debug(`cancelled kill of ${row.entity.name}`);
+        QDRLog.debug(`cancelled close of ${row.entity.name}`);
       });
     }
     // get info for a all connections


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message