mirror of https://github.com/apache/cloudstack.git
new UI - implement ISO page.
This commit is contained in:
Jessica Wang
parent
11169a8bb9
commit
b86382c385
|
|
@ -52,6 +52,8 @@ long milliseconds = new Date().getTime();
|
|||
|
||||
<script type="text/javascript" src="scripts/cloud.core2.template.js?t=<%=milliseconds%>"></script>
|
||||
|
||||
<script type="text/javascript" src="scripts/cloud.core2.iso.js?t=<%=milliseconds%>"></script>
|
||||
|
||||
<title>Cloud.com CloudStack</title>
|
||||
</head>
|
||||
<body>
|
||||
|
|
@ -471,7 +473,7 @@ long milliseconds = new Date().getTime();
|
|||
</div>
|
||||
</div>
|
||||
<div id="leftmenu_template_filter_container">
|
||||
<div class="leftmenu_content" id="leftmenu_submenu_myTemplate">
|
||||
<div class="leftmenu_content" id="leftmenu_submenu_my_template">
|
||||
<div class="leftmenu_thirdindent">
|
||||
<div class="leftmenu_list_icons">
|
||||
<img src="images/templates_leftmenuicon.png" /></div>
|
||||
|
|
@ -479,7 +481,7 @@ long milliseconds = new Date().getTime();
|
|||
My Templates</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="leftmenu_content" id="leftmenu_submenu_featuredTemplate">
|
||||
<div class="leftmenu_content" id="leftmenu_submenu_featured_template">
|
||||
<div class="leftmenu_thirdindent">
|
||||
<div class="leftmenu_list_icons">
|
||||
<img src="images/templates_leftmenuicon.png" /></div>
|
||||
|
|
@ -487,7 +489,7 @@ long milliseconds = new Date().getTime();
|
|||
Featured</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="leftmenu_content" id="leftmenu_submenu_communityTemplate">
|
||||
<div class="leftmenu_content" id="leftmenu_submenu_community_template">
|
||||
<div class="leftmenu_thirdindent">
|
||||
<div class="leftmenu_list_icons">
|
||||
<img src="images/templates_leftmenuicon.png" /></div>
|
||||
|
|
@ -506,7 +508,7 @@ long milliseconds = new Date().getTime();
|
|||
</div>
|
||||
</div>
|
||||
<div id="leftmenu_iso_filter_container">
|
||||
<div class="leftmenu_content" id="leftmenu_submenu_myISO">
|
||||
<div class="leftmenu_content" id="leftmenu_submenu_my_iso">
|
||||
<div class="leftmenu_thirdindent">
|
||||
<div class="leftmenu_list_icons">
|
||||
<img src="images/templates_leftmenuicon.png" /></div>
|
||||
|
|
@ -514,7 +516,7 @@ long milliseconds = new Date().getTime();
|
|||
My ISOs</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="leftmenu_content" id="leftmenu_submenu_featuredISO">
|
||||
<div class="leftmenu_content" id="leftmenu_submenu_featured_iso">
|
||||
<div class="leftmenu_thirdindent">
|
||||
<div class="leftmenu_list_icons">
|
||||
<img src="images/templates_leftmenuicon.png" /></div>
|
||||
|
|
@ -522,7 +524,7 @@ long milliseconds = new Date().getTime();
|
|||
Featured</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="leftmenu_content" id="leftmenu_submenu_communityISO">
|
||||
<div class="leftmenu_content" id="leftmenu_submenu_community_iso">
|
||||
<div class="leftmenu_thirdindent">
|
||||
<div class="leftmenu_list_icons">
|
||||
<img src="images/templates_leftmenuicon.png" /></div>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,125 @@
|
|||
<!--
|
||||
<script type="text/javascript" src="scripts/cloud.core.event.js"></script>
|
||||
-->
|
||||
|
||||
<%@ page import="java.util.*" %>
|
||||
<%@ page import="com.cloud.utils.*" %>
|
||||
|
||||
<%
|
||||
|
||||
Locale browserLocale = request.getLocale();
|
||||
CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale);
|
||||
%>
|
||||
|
||||
<!-- ISO detail panel (begin) -->
|
||||
<div class="main_title" id="right_panel_header">
|
||||
<!--
|
||||
<div class="main_titleicon">
|
||||
<img src="images/instancetitle_icons.gif" alt="Instance" /></div>
|
||||
-->
|
||||
<h1>ISO
|
||||
</h1>
|
||||
</div>
|
||||
<div class="contentbox" id="right_panel_content">
|
||||
<div class="info_detailbox errorbox" id="after_action_info_container" style="display:none">
|
||||
<p id="after_action_info"></p>
|
||||
</div>
|
||||
<div class="tabbox" style="margin-top:15px;">
|
||||
<div class="content_tabs on">
|
||||
<%=t.t("Details")%></div>
|
||||
</div>
|
||||
<div class="grid_container">
|
||||
<div class="grid_rows odd">
|
||||
<div class="grid_row_cell" style="width: 20%;">
|
||||
<div class="row_celltitles">
|
||||
<%=t.t("ID")%>:</div>
|
||||
</div>
|
||||
<div class="grid_row_cell" style="width: 79%;">
|
||||
<div class="row_celltitles" id="id">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_rows odd">
|
||||
<div class="grid_row_cell" style="width: 20%;">
|
||||
<div class="row_celltitles">
|
||||
<%=t.t("Zone")%>:</div>
|
||||
</div>
|
||||
<div class="grid_row_cell" style="width: 79%;">
|
||||
<div class="row_celltitles" id="zonename">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_rows odd">
|
||||
<div class="grid_row_cell" style="width: 20%;">
|
||||
<div class="row_celltitles">
|
||||
<%=t.t("Name")%>:</div>
|
||||
</div>
|
||||
<div class="grid_row_cell" style="width: 79%;">
|
||||
<div class="row_celltitles" id="name">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_rows odd">
|
||||
<div class="grid_row_cell" style="width: 20%;">
|
||||
<div class="row_celltitles">
|
||||
<%=t.t("Display.Text")%>:</div>
|
||||
</div>
|
||||
<div class="grid_row_cell" style="width: 79%;">
|
||||
<div class="row_celltitles" id="displaytext">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_rows odd">
|
||||
<div class="grid_row_cell" style="width: 20%;">
|
||||
<div class="row_celltitles">
|
||||
<%=t.t("Status")%>:</div>
|
||||
</div>
|
||||
<div class="grid_row_cell" style="width: 79%;">
|
||||
<div class="row_celltitles" id="status">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_rows odd">
|
||||
<div class="grid_row_cell" style="width: 20%;">
|
||||
<div class="row_celltitles">
|
||||
<%=t.t("Bootable")%>:</div>
|
||||
</div>
|
||||
<div class="grid_row_cell" style="width: 79%;">
|
||||
<div class="row_celltitles" id="bootable">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_rows odd">
|
||||
<div class="grid_row_cell" style="width: 20%;">
|
||||
<div class="row_celltitles">
|
||||
<%=t.t("Account")%>:</div>
|
||||
</div>
|
||||
<div class="grid_row_cell" style="width: 79%;">
|
||||
<div class="row_celltitles" id="account">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_rows odd">
|
||||
<div class="grid_row_cell" style="width: 20%;">
|
||||
<div class="row_celltitles">
|
||||
<%=t.t("Created")%>:</div>
|
||||
</div>
|
||||
<div class="grid_row_cell" style="width: 79%;">
|
||||
<div class="row_celltitles" id="created">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_rows odd">
|
||||
<div class="grid_row_cell" style="width: 20%;">
|
||||
<div class="row_celltitles">
|
||||
<%=t.t("Size")%>:</div>
|
||||
</div>
|
||||
<div class="grid_row_cell" style="width: 79%;">
|
||||
<div class="row_celltitles" id="size">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<!-- ISO detail panel (end) -->
|
||||
|
|
@ -89,11 +89,14 @@ $(document).ready(function() {
|
|||
listMidMenuItems("leftmenu_snapshot", "listSnapshots", "listsnapshotsresponse", "snapshot", "jsp/snapshot.jsp", afterLoadSnapshotJSP, snapshotToMidmenu, snapshotToRigntPanel);
|
||||
listMidMenuItems("leftmenu_ip", "listPublicIpAddresses", "listpublicipaddressesresponse", "publicipaddress", "jsp/ip_address.jsp", afterLoadIpJSP, ipToMidmenu, ipToRigntPanel);
|
||||
|
||||
listMidMenuItems("leftmenu_submenu_myTemplate", "listTemplates&templatefilter=self", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRigntPanel);
|
||||
listMidMenuItems("leftmenu_submenu_featuredTemplate", "listTemplates&templatefilter=featured", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRigntPanel);
|
||||
listMidMenuItems("leftmenu_submenu_communityTemplate", "listTemplates&templatefilter=community", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRigntPanel);
|
||||
|
||||
listMidMenuItems("leftmenu_submenu_my_template", "listTemplates&templatefilter=self", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRigntPanel);
|
||||
listMidMenuItems("leftmenu_submenu_featured_template", "listTemplates&templatefilter=featured", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRigntPanel);
|
||||
listMidMenuItems("leftmenu_submenu_community_template", "listTemplates&templatefilter=community", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRigntPanel);
|
||||
|
||||
listMidMenuItems("leftmenu_submenu_my_iso", "listIsos&isofilter=self", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRigntPanel);
|
||||
listMidMenuItems("leftmenu_submenu_featured_iso", "listIsos&isofilter=featured", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRigntPanel);
|
||||
listMidMenuItems("leftmenu_submenu_community_iso", "listIsos&isofilter=community", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRigntPanel);
|
||||
|
||||
$("#leftmenu_instance_group_header").bind("click", function(event) {
|
||||
clearMidMenu();
|
||||
var $arrowIcon = $(this).find("#arrow_icon");
|
||||
|
|
|
|||
|
|
@ -0,0 +1,45 @@
|
|||
function afterLoadIsoJSP() {
|
||||
|
||||
}
|
||||
|
||||
function isoToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) {
|
||||
$midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id));
|
||||
$midmenuItem1.data("jsonObj", jsonObj);
|
||||
|
||||
/*
|
||||
var iconContainer = $midmenuItem1.find("#icon_container").show();
|
||||
if(jsonObj.level == "INFO")
|
||||
iconContainer.find("#icon").attr("src", "images/midmenuicon_events_info.png");
|
||||
else if(jsonObj.level == "ERROR")
|
||||
iconContainer.find("#icon").attr("src", "images/midmenuicon_events_error.png");
|
||||
else if(jsonObj.level == "WARN")
|
||||
iconContainer.find("#icon").attr("src", "images/midmenuicon_events_warning.png");
|
||||
*/
|
||||
|
||||
$midmenuItem1.find("#first_row").text(jsonObj.name.substring(0,25));
|
||||
$midmenuItem1.find("#second_row").text(jsonObj.zonename.substring(0,25));
|
||||
$midmenuItem1.data("toRightPanelFn", toRightPanelFn);
|
||||
|
||||
}
|
||||
|
||||
function isoToRigntPanel($midmenuItem) {
|
||||
var jsonObj = $midmenuItem.data("jsonObj");
|
||||
|
||||
var $rightPanelContent = $("#right_panel_content");
|
||||
$rightPanelContent.find("#id").text(fromdb(jsonObj.id));
|
||||
$rightPanelContent.find("#zonename").text(fromdb(jsonObj.zonename));
|
||||
$rightPanelContent.find("#name").text(fromdb(jsonObj.name));
|
||||
$rightPanelContent.find("#displaytext").text(fromdb(jsonObj.displaytext));
|
||||
$rightPanelContent.find("#account").text(fromdb(jsonObj.account));
|
||||
|
||||
if(jsonObj.size != null)
|
||||
$rightPanelContent.find("#size").text(convertBytes(parseInt(jsonObj.size)));
|
||||
|
||||
var status = "Ready";
|
||||
if (jsonObj.isready == "false")
|
||||
status = jsonObj.isostatus;
|
||||
$rightPanelContent.find("#status").text(status);
|
||||
|
||||
setBooleanField(jsonObj.bootable, $rightPanelContent.find("#bootable"));
|
||||
setDateField(jsonObj.created, $rightPanelContent.find("#created"));
|
||||
}
|
||||
Loading…
Reference in New Issue