UI-Lion:
- BundleStitcherTest now working!
- Expand aliases in from lines.
- Added unit tests for parsing of from lines.
Change-Id: I65d343f1283fd60f46879431c37299c6ecd5a36e
diff --git a/web/gui/src/main/webapp/app/fw/util/lion.js b/web/gui/src/main/webapp/app/fw/util/lion.js
index b30e8bb..56c5db4 100644
--- a/web/gui/src/main/webapp/app/fw/util/lion.js
+++ b/web/gui/src/main/webapp/app/fw/util/lion.js
@@ -34,28 +34,33 @@
if (bundleKey === 'core.view.cluster') {
bundle = {
+ // grouped to match core.view.cluster.lioncfg
title_cluster_nodes: 'Cluster Nodes',
- total: 'Total',
- active: 'Active',
- started: 'Started',
+ k_esc_hint: 'Close the details panel',
+ k_click_hint: 'Select a row to show cluster node details',
+ k_scroll_down_hint: 'See available cluster nodes',
+
+ devices: 'Devices',
node_id: 'Node ID',
ip_address: 'IP Address',
tcp_port: 'TCP Port',
- last_updated: 'Last Updated',
- devices: 'Devices',
uri: 'URI',
+ protocol: 'Protocol',
+
type: 'Type',
chassis_id: 'Chassis ID',
vendor: 'Vendor',
hw_version: 'H/W Version',
sw_version: 'S/W Version',
- protocol: 'Protocol',
serial_number: 'Serial #',
- k_esc_hint: 'Close the details panel',
- k_click_hint: 'Select a row to show cluster node details',
- k_scroll_down_hint: 'See available cluster nodes',
- k_click: 'click',
- k_scroll_down: 'scroll down'
+
+ total: 'Total',
+ active: 'Active',
+ started: 'Started',
+ last_updated: 'Last Updated',
+
+ click: 'click',
+ scroll_down: 'scroll down'
};
}
diff --git a/web/gui/src/main/webapp/app/view/cluster/cluster.js b/web/gui/src/main/webapp/app/view/cluster/cluster.js
index b1e6608..f4d94f7 100644
--- a/web/gui/src/main/webapp/app/view/cluster/cluster.js
+++ b/web/gui/src/main/webapp/app/view/cluster/cluster.js
@@ -282,8 +282,8 @@
_helpFormat: ['esc']
});
ks.gestureNotes([
- [lion('k_click'), lion('k_click_hint')],
- [lion('k_scroll_down'), lion('k_scroll_down_hint')]
+ [lion('click'), lion('k_click_hint')],
+ [lion('scroll_down'), lion('k_scroll_down_hint')]
]);
// if the panelData changes
scope.$watch('panelData', function () {