cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [4/6] git commit: updated refs/heads/ui-restyle to c56e59f
Date Tue, 08 Oct 2013 20:56:45 GMT
Instance wizard: Add missing descriptions


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

Branch: refs/heads/ui-restyle
Commit: 93d41b92621f91bfd4657fe4bab27b6c6cd61ea1
Parents: 62551a9
Author: Brian Federle <brian.federle@citrix.com>
Authored: Tue Oct 8 13:56:00 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Tue Oct 8 13:56:00 2013 -0700

----------------------------------------------------------------------
 client/WEB-INF/classes/resources/messages.properties |  2 ++
 ui/dictionary.jsp                                    |  2 ++
 ui/index.jsp                                         | 14 ++++++++++++--
 3 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93d41b92/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 4b54acb..0cc7b52 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -14,6 +14,8 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+message.select.compute.offering=Please select a compute offering to associate with this instance.
+message.select.disk.offering=(Optional) Select an additional disk offering to attach to this
instance.
 label.home=Home
 label.use.default.language=Use default language
 label.delete.events=Delete events

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93d41b92/ui/dictionary.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index 2b07a2f..7d26332 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -25,6 +25,8 @@ under the License.
 <% long now = System.currentTimeMillis(); %>
 <script language="javascript">
 dictionary = {
+'message.select.compute.offering': '<fmt:message key="message.select.compute.offering"
/>',
+'message.select.disk.offering': '<fmt:message key="message.select.disk.offering" />',
 'label.home': '<fmt:message key="label.home" />',
 'label.use.default.language': '<fmt:message key="label.use.default.language" />',
 'label.delete.events': '<fmt:message key="label.delete.events" />',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93d41b92/ui/index.jsp
----------------------------------------------------------------------
diff --git a/ui/index.jsp b/ui/index.jsp
index f168cc9..60580a5 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -187,6 +187,9 @@ under the License.
 
             <!-- Step 3: Service Offering -->
             <div class="step service-offering" wizard-step-id="service-offering">
+                <div class="main-desc">
+                    <p><fmt:message key="message.select.compute.offering"/></p>
+                </div>
               <div class="content">
                 <div class="select-container">
                 </div>
@@ -195,7 +198,10 @@ under the License.
 
             <!-- Step 4: Data Disk Offering -->
             <div class="step data-disk-offering" wizard-step-id="data-disk-offering">
-              <div class="content">
+                <div class="main-desc">
+                    <p><fmt:message key="message.select.disk.offering"/></p>
+                </div>
+                <div class="content">
                 <div class="section no-thanks">
                   <input type="radio" name="diskofferingid" value="0" />
                   <label><fmt:message key="label.no.thanks"/></label>
@@ -222,7 +228,11 @@ under the License.
 
             <!-- Step 5: Affinity groups -->
             <div class="step affinity" wizard-step-id="affinity">
-              <div class="content">
+                <div class="main-desc">
+                    <p><fmt:message key="message.select.affinity.groups"/></p>
+                </div>
+
+                <div class="content">
                 <!-- Existing offerings -->
                 <div class="select-container"></div>
               </div>


Mime
View raw message