incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [1/7] git commit: CS-15892: Tier detail view: Show 'tier details' instead of 'details'
Date Tue, 07 Aug 2012 23:03:11 GMT
Updated Branches:
  refs/heads/master a617ccc89 -> 989ae4609
  refs/heads/vpc 629556c70 -> b5e1c5313


CS-15892: Tier detail view: Show 'tier details' instead of 'details'

Conflicts:
	ui/index.jsp


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b5e1c531
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b5e1c531
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b5e1c531

Branch: refs/heads/vpc
Commit: b5e1c5313782f8e0929a4c9dd0fbd8efbffa1bd1
Parents: 7de225b
Author: Brian Federle <brian.federle@citrix.com>
Authored: Tue Aug 7 15:09:45 2012 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Tue Aug 7 16:02:07 2012 -0700

----------------------------------------------------------------------
 .../WEB-INF/classes/resources/messages.properties  |    1 +
 ui/index.jsp                                       |    3 +--
 ui/scripts/vpc.js                                  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b5e1c531/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 b987dcd..13517ab 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -17,6 +17,7 @@
 
 
 #new labels (begin) **********************************************************************************************
+label.tier.details=Tier details
 label.edit.tags=Edit tags
 label.action.enable.physical.network=Enable physical network
 label.action.disable.physical.network=Disable physical network

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b5e1c531/ui/index.jsp
----------------------------------------------------------------------
diff --git a/ui/index.jsp b/ui/index.jsp
index 2323186..2d8b8d6 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -23,7 +23,6 @@ under the License.
 </c:if>
 <fmt:setBundle basename="resources/messages"/>
 <% long now = System.currentTimeMillis(); %>
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -35,7 +34,6 @@ under the License.
     <c:if test="${!empty cookie.lang && cookie.lang.value != 'en'}">
       <link type="text/css" rel="stylesheet" href="css/cloudstack3.${cookie.lang.value}.css"
/>
     </c:if>
-
     <!--[if IE 7]>
     <link type="text/css" rel="stylesheet" href="css/cloudstack3-ie7.css" />
     <![endif]-->
@@ -1641,6 +1639,7 @@ under the License.
 <script language="javascript">
 dictionary = {
 'label.edit.tags': '<fmt:message key="label.edit.tags"/>',  
+'label.tier.details': '<fmt:message key="label.tier.details"/>',
 'label.action.enable.physical.network': '<fmt:message key="label.action.enable.physical.network"/>',
 'label.action.disable.physical.network': '<fmt:message key="label.action.disable.physical.network"/>',
 'message.action.enable.physical.network': '<fmt:message key="message.action.enable.physical.network"/>',

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b5e1c531/ui/scripts/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 00bd65e..3c9f9f5 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -1399,7 +1399,7 @@
         isMaximized: true,
         tabs: {
           details: {
-            title: 'label.details',
+            title: 'label.tier.details',
             preFilter: function(args) {
               var hiddenFields = [];
               var zone;


Mime
View raw message