Skip to content

Commit 24edb00

Browse files
author
Jessica Wang
committed
cloudStack - merge UI change from 2.2.10 branch to master branch.
1 parent 0b06152 commit 24edb00

27 files changed

Lines changed: 1927 additions & 1196 deletions

‎client/WEB-INF/classes/resources/messages.properties‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44

55

66
#Labels
7+
network.rate=Network Rate
8+
9+
ICMP.type=ICMP Type
10+
ICMP.code=ICMP Code
11+
712
image.directory=Image Directory
813

914
label.action.create.template.from.vm=Create Template from VM

‎client/WEB-INF/classes/resources/messages_es.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55

66
#Labels
7+
ICMP.type=Tipo ICMP
8+
ICMP.code=ICMP Código
9+
710
image.directory=Directorio de la imagen
811

912
label.action.create.template.from.vm=Crear plantilla de VM

‎client/WEB-INF/classes/resources/messages_ja.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55

66
#Labels
7+
ICMP.type=ICMPタイプ
8+
ICMP.code=ICMPコード
9+
710
image.directory=画像ディレクトリ
811

912
label.action.create.template.from.vm=VMからのテンプレートを作成する

‎client/WEB-INF/classes/resources/messages_zh_CN.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55

66
#Labels
7+
ICMP.type=ICMP类型
8+
ICMP.code=ICMP代码
9+
710
image.directory=图片目录
811

912
label.action.create.template.from.vm=创建虚拟机模板

‎ui/jsp/host.jsp‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,18 @@ dictionary = {
111111
<div class="row_celltitles" id="state">
112112
</div>
113113
</div>
114-
</div>
114+
</div>
115115
<div class="grid_rows even">
116+
<div class="grid_row_cell" style="width: 20%;">
117+
<div class="row_celltitles">
118+
<fmt:message key="label.host.tags"/>:</div>
119+
</div>
120+
<div class="grid_row_cell" style="width: 79%;">
121+
<div class="row_celltitles" id="hosttags">
122+
</div>
123+
</div>
124+
</div>
125+
<div class="grid_rows odd">
116126
<div class="grid_row_cell" style="width: 20%;">
117127
<div class="row_celltitles">
118128
<fmt:message key="label.type"/>:</div>
@@ -122,7 +132,7 @@ dictionary = {
122132
</div>
123133
</div>
124134
</div>
125-
<div class="grid_rows odd">
135+
<div class="grid_rows even">
126136
<div class="grid_row_cell" style="width: 20%;">
127137
<div class="row_celltitles">
128138
<fmt:message key="label.zone"/>:</div>
@@ -132,7 +142,7 @@ dictionary = {
132142
</div>
133143
</div>
134144
</div>
135-
<div class="grid_rows even">
145+
<div class="grid_rows odd">
136146
<div class="grid_row_cell" style="width: 20%;">
137147
<div class="row_celltitles">
138148
<fmt:message key="label.pod"/>:</div>
@@ -142,7 +152,7 @@ dictionary = {
142152
</div>
143153
</div>
144154
</div>
145-
<div class="grid_rows odd">
155+
<div class="grid_rows even">
146156
<div class="grid_row_cell" style="width: 20%;">
147157
<div class="row_celltitles">
148158
<fmt:message key="label.cluster"/>:</div>
@@ -152,7 +162,7 @@ dictionary = {
152162
</div>
153163
</div>
154164
</div>
155-
<div class="grid_rows even">
165+
<div class="grid_rows odd">
156166
<div class="grid_row_cell" style="width: 20%;">
157167
<div class="row_celltitles">
158168
<fmt:message key="label.ip.address"/>:</div>
@@ -162,7 +172,7 @@ dictionary = {
162172
</div>
163173
</div>
164174
</div>
165-
<div class="grid_rows odd">
175+
<div class="grid_rows even">
166176
<div class="grid_row_cell" style="width: 20%;">
167177
<div class="row_celltitles">
168178
<fmt:message key="label.version"/>:</div>
@@ -172,7 +182,7 @@ dictionary = {
172182
</div>
173183
</div>
174184
</div>
175-
<div class="grid_rows even">
185+
<div class="grid_rows odd">
176186
<div class="grid_row_cell" style="width: 20%;">
177187
<div class="row_celltitles">
178188
<fmt:message key="label.os.preference"/>:</div>
@@ -182,7 +192,7 @@ dictionary = {
182192
</div>
183193
</div>
184194
</div>
185-
<div class="grid_rows odd">
195+
<div class="grid_rows even">
186196
<div class="grid_row_cell" style="width: 20%;">
187197
<div class="row_celltitles">
188198
<fmt:message key="label.last.disconnected"/>:</div>

‎ui/jsp/ipaddress.jsp‎

Lines changed: 219 additions & 64 deletions
Large diffs are not rendered by default.

‎ui/jsp/serviceoffering.jsp‎

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,16 @@ dictionary = {
125125
</div>
126126
</div>
127127
<div class="grid_rows odd">
128+
<div class="grid_row_cell" style="width: 20%;">
129+
<div class="row_celltitles">
130+
<fmt:message key="network.rate"/>:</div>
131+
</div>
132+
<div class="grid_row_cell" style="width: 79%;">
133+
<div class="row_celltitles" id="network_rate">
134+
</div>
135+
</div>
136+
</div>
137+
<div class="grid_rows even">
128138
<div class="grid_row_cell" style="width: 20%;">
129139
<div class="row_celltitles">
130140
<fmt:message key="label.offer.ha"/>:</div>
@@ -135,7 +145,7 @@ dictionary = {
135145
</div>
136146
</div>
137147

138-
<div class="grid_rows even">
148+
<div class="grid_rows odd">
139149
<div class="grid_row_cell" style="width: 20%;">
140150
<div class="row_celltitles">
141151
<fmt:message key="label.CPU.cap"/>:</div>
@@ -146,7 +156,7 @@ dictionary = {
146156
</div>
147157
</div>
148158

149-
<div class="grid_rows odd">
159+
<div class="grid_rows even">
150160
<div class="grid_row_cell" style="width: 20%;">
151161
<div class="row_celltitles">
152162
<fmt:message key="label.storage.tags"/>:</div>
@@ -157,7 +167,7 @@ dictionary = {
157167
</div>
158168
</div>
159169

160-
<div class="grid_rows even">
170+
<div class="grid_rows odd">
161171
<div class="grid_row_cell" style="width: 20%;">
162172
<div class="row_celltitles">
163173
<fmt:message key="label.host.tags"/>:</div>
@@ -168,7 +178,7 @@ dictionary = {
168178
</div>
169179
</div>
170180

171-
<div class="grid_rows odd">
181+
<div class="grid_rows even">
172182
<div class="grid_row_cell" style="width: 20%;">
173183
<div class="row_celltitles">
174184
<fmt:message key="label.domain"/>:</div>
@@ -181,7 +191,7 @@ dictionary = {
181191
</div>
182192
</div>
183193

184-
<div class="grid_rows even">
194+
<div class="grid_rows odd">
185195
<div class="grid_row_cell" style="width: 20%;">
186196
<div class="row_celltitles">
187197
<fmt:message key="label.created"/>:</div>
@@ -221,12 +231,12 @@ dictionary = {
221231
<form action="#" method="post" id="form_acquire">
222232
<ol>
223233
<li>
224-
<label for="user_name"><fmt:message key="label.name"/>:</label>
234+
<label><fmt:message key="label.name"/>:</label>
225235
<input class="text" type="text" name="add_service_name" id="add_service_name"/>
226236
<div id="add_service_name_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
227237
</li>
228238
<li>
229-
<label for="user_name"><fmt:message key="label.display.text"/>:</label>
239+
<label><fmt:message key="label.display.text"/>:</label>
230240
<input class="text" type="text" name="add_service_display" id="add_service_display"/>
231241
<div id="add_service_display_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
232242
</li>
@@ -238,20 +248,25 @@ dictionary = {
238248
</select>
239249
</li>
240250
<li>
241-
<label for="user_name"><fmt:message key="label.num.cpu.cores"/>:</label>
251+
<label><fmt:message key="label.num.cpu.cores"/>:</label>
242252
<input class="text" type="text" name="add_service_cpucore" id="add_service_cpucore"/>
243253
<div id="add_service_cpucore_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
244254
</li>
245255
<li>
246-
<label for="user_name"><fmt:message key="label.cpu.mhz"/>:</label>
256+
<label><fmt:message key="label.cpu.mhz"/>:</label>
247257
<input class="text" type="text" name="add_service_cpu" id="add_service_cpu"/>
248258
<div id="add_service_cpu_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
249259
</li>
250260
<li>
251-
<label for="user_name"><fmt:message key="label.memory.mb"/>:</label>
261+
<label><fmt:message key="label.memory.mb"/>:</label>
252262
<input class="text" type="text" name="add_service_memory" id="add_service_memory"/>
253263
<div id="add_service_memory_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
254-
</li>
264+
</li>
265+
<li>
266+
<label><fmt:message key="network.rate"/>:</label>
267+
<input class="text" type="text" id="network_rate"/>
268+
<div id="network_rate_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
269+
</li>
255270
<li id="add_service_offerha_container">
256271
<label><fmt:message key="label.offer.ha"/>:</label>
257272
<select class="select" id="add_service_offerha">

‎ui/scripts/cloud.core.account.js‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ function accountJsonToDetailsTab() {
384384
accountClearDetailsTab();
385385
return;
386386
}
387-
387+
388388
$.ajax({
389389
data: createURL("command=listAccounts&id="+jsonObj.id),
390390
dataType: "json",
@@ -614,14 +614,12 @@ var accountActionMap = {
614614
asyncJobResponse: "deleteaccountresponse",
615615
dialogBeforeActionFn : doDeleteAccount,
616616
inProcessText: "label.action.delete.account.processing",
617-
afterActionSeccessFn: function(json, $midmenuItem1, id) {
618-
$midmenuItem1.slideUp("slow", function() {
619-
$(this).remove();
620-
if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
621-
clearRightPanel();
622-
accountClearRightPanel();
623-
}
624-
});
617+
afterActionSeccessFn: function(json, $midmenuItem1, id) {
618+
$midmenuItem1.remove();
619+
if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
620+
clearRightPanel();
621+
accountClearRightPanel();
622+
}
625623
}
626624
}
627625
};

‎ui/scripts/cloud.core.cluster.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,12 @@ function clusterBuildActionMenu(jsonObj) {
9494
else if(jsonObj.allocationstate == "Enabled")
9595
buildActionLinkForTab("label.action.disable.cluster", clusterActionMap, $actionMenu, $midmenuItem1, $thisTab);
9696

97+
/*
9798
if(jsonObj.managedstate == "Managed")
9899
buildActionLinkForTab("label.action.unmanage.cluster", clusterActionMap, $actionMenu, $midmenuItem1, $thisTab);
99100
else //PrepareUnmanaged , PrepareUnmanagedError, Unmanaged
100101
buildActionLinkForTab("label.action.manage.cluster", clusterActionMap, $actionMenu, $midmenuItem1, $thisTab);
102+
*/
101103

102104
buildActionLinkForTab("label.action.delete.cluster", clusterActionMap, $actionMenu, $midmenuItem1, $thisTab);
103105
}
@@ -171,13 +173,11 @@ var clusterActionMap = {
171173
dialogBeforeActionFn : doDeleteCluster,
172174
inProcessText: "label.action.delete.cluster.processing",
173175
afterActionSeccessFn: function(json, $midmenuItem1, id) {
174-
$midmenuItem1.slideUp("slow", function() {
175-
$(this).remove();
176-
if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
177-
clearRightPanel();
178-
clusterClearRightPanel();
179-
}
180-
});
176+
$midmenuItem1.remove();
177+
if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
178+
clearRightPanel();
179+
clusterClearRightPanel();
180+
}
181181
}
182182
}
183183
}

‎ui/scripts/cloud.core.diskoffering.js‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -376,13 +376,11 @@ var diskOfferingActionMap = {
376376
dialogBeforeActionFn : doDeleteDiskOffering,
377377
inProcessText: "label.action.delete.disk.offering.processing",
378378
afterActionSeccessFn: function(json, $midmenuItem1, id) {
379-
$midmenuItem1.slideUp("slow", function() {
380-
$(this).remove();
381-
if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
382-
clearRightPanel();
383-
diskOfferingClearRightPanel();
384-
}
385-
});
379+
$midmenuItem1.remove();
380+
if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
381+
clearRightPanel();
382+
diskOfferingClearRightPanel();
383+
}
386384
}
387385
}
388386
}

0 commit comments

Comments
 (0)