Updated Branches: refs/heads/4.2 ff803f413 -> d1ede5430 refs/heads/master 1e4ff7f45 -> 554c8b7ac
CLOUDSTACK-2340: Display service state for health-checked VMs Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/554c8b7a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/554c8b7a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/554c8b7a Branch: refs/heads/master Commit: 554c8b7ac110099cf93310660490e62ba2337f53 Parents: 1e4ff7f Author: Brian Federle <[email protected]> Authored: Mon Aug 5 11:42:25 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Mon Aug 5 11:42:46 2013 -0700 ---------------------------------------------------------------------- client/WEB-INF/classes/resources/messages.properties | 1 + ui/dictionary.jsp | 1 + ui/scripts/network.js | 5 +++++ ui/scripts/ui/widgets/multiEdit.js | 11 ++++++++--- 4 files changed, 15 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/554c8b7a/client/WEB-INF/classes/resources/messages.properties ---------------------------------------------------------------------- diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index 72c66c6..3920934 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -14,6 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +label.service.state=Service State label.egress.default.policy=Egress Default Policy label.routing=Routing label.about=About http://git-wip-us.apache.org/repos/asf/cloudstack/blob/554c8b7a/ui/dictionary.jsp ---------------------------------------------------------------------- diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp index 947ae7d..3f58c59 100644 --- a/ui/dictionary.jsp +++ b/ui/dictionary.jsp @@ -25,6 +25,7 @@ under the License. <% long now = System.currentTimeMillis(); %> <script language="javascript"> dictionary = { +'label.service.state': '<fmt:message key="label.service.state" />', 'label.egress.default.policy': '<fmt:message key="label.egress.default.policy" />', 'label.routing': '<fmt:message key="label.routing" />', 'message.validate.invalid.characters': '<fmt:message key="message.validate.invalid.characters" />', http://git-wip-us.apache.org/repos/asf/cloudstack/blob/554c8b7a/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index e5a52f7..fd4ad9f 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -3672,6 +3672,11 @@ $(lbInstances).each(function() { if (this.displayname.indexOf('AutoScale-LB-') > -1) //autoscale VM is not allowed to be deleted manually. So, hide destroy button this._hideActions = ['destroy']; + + if (this.servicestate) { + this._itemStateLabel = 'label.service.state'; + this._itemState = this.servicestate; + } }); }, error: function(data) { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/554c8b7a/ui/scripts/ui/widgets/multiEdit.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui/widgets/multiEdit.js b/ui/scripts/ui/widgets/multiEdit.js index 5e30d03..5d973aa 100755 --- a/ui/scripts/ui/widgets/multiEdit.js +++ b/ui/scripts/ui/widgets/multiEdit.js @@ -708,9 +708,14 @@ }); }); - var itemState = multiRule._itemState ? item[multiRule._itemState] : item.state; - var $itemState = $('<span>').html(_s(itemState)); - $tr.append($('<td>').addClass('state').appendTo($tr).append("Application State - ").append($itemState)); + var itemState = item._itemState ? item._itemState : item.state; + + $tr.append($('<td>').addClass('state').appendTo($tr).append( + $('<span>').text( + item._itemStateLabel ? _l(item._itemStateLabel) + ' - ' + itemState : + _l('label.state') + ' - ' + itemState + ) + )); if (itemActions) {
