apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

new UI - system VM page - add view console template.

Browse Source
This commit is contained in:
Jessica Wang 2010-10-20 19:14:57 -07:00
parent 04cfb46b54
commit 656c933891
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/new/jsp/resource.jsp
View File

@ -1156,6 +1156,15 @@
</div> </div>
<!-- secondary storage tab template (end) --> <!-- secondary storage tab template (end) -->
<!-- view console template (begin) -->
<div id="view_console_template" style="display:none">
<div class="vm_consolebox" id="box0">
</div>
<div class="vm_consolebox" id="box1" style="display: none">
</div>
</div>
<!-- view console template (end) -->
<!-- dialogs --> <!-- dialogs -->
<div id="dialog_confirmation_enable_maintenance" title="Confirmation" style="display: none"> <div id="dialog_confirmation_enable_maintenance" title="Confirmation" style="display: none">
<p> <p>
@ -1181,7 +1190,7 @@
</p> </p>
</div> </div>
<!-- Update OS Pref Dialog --> <!-- Update OS Preference Dialog -->
<div id="dialog_update_os" title="Update OS Preference" style="display:none"> <div id="dialog_update_os" title="Update OS Preference" style="display:none">
<p> <p>
<%=t.t("Please.choose.a.OS.preference.for.this.host..Virtual.machines.will.always.be.allocated.to.hosts.with.an.OS.preference.that.matches.with.the.OS.type.of.the.template.chosen.for.the.virtual.machine.before.choosing.other.hosts.")%> <%=t.t("Please.choose.a.OS.preference.for.this.host..Virtual.machines.will.always.be.allocated.to.hosts.with.an.OS.preference.that.matches.with.the.OS.type.of.the.template.chosen.for.the.virtual.machine.before.choosing.other.hosts.")%>

2
ui/new/scripts/cloud.core2.resource.js
View File

@ -670,7 +670,7 @@ function systemvmJsonToDetailsTab(jsonObj) {
var $detailsTab = $("#systemvm_page").find("#tab_content_details"); var $detailsTab = $("#systemvm_page").find("#tab_content_details");
$detailsTab.data("jsonObj", jsonObj); $detailsTab.data("jsonObj", jsonObj);
//resetViewConsoleAction(jsonObj, $detailsTab); resetViewConsoleAction(jsonObj, $detailsTab);
setVmStateInRightPanel(jsonObj.state, $detailsTab.find("#state")); setVmStateInRightPanel(jsonObj.state, $detailsTab.find("#state"));
$detailsTab.find("#ipAddress").text(jsonObj.publicip); $detailsTab.find("#ipAddress").text(jsonObj.publicip);