apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Issue #: 5785 - support non-ascii character like euro character

Browse Source
This commit is contained in:
jessica 2010-08-25 15:48:08 -07:00
parent 3ab4651cf0
commit 3c92e52886
2 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ui/scripts/cloud.core.configuration.js
View File

@ -1244,7 +1244,7 @@ function showConfigurationTab() {
dialogEditService.find("#service_name").text(svcName); dialogEditService.find("#service_name").text(svcName);
dialogEditService.find("#edit_service_name").val(svcName); dialogEditService.find("#edit_service_name").val(svcName);
dialogEditService.find("#edit_service_display").val(template.find("#service_display").text()); dialogEditService.find("#edit_service_display").val(template.find("#service_displaytext").text());
dialogEditService.find("#edit_service_offerha").val(toBooleanValue(template.find("#service_offerha").text())); dialogEditService.find("#edit_service_offerha").val(toBooleanValue(template.find("#service_offerha").text()));
dialogEditService dialogEditService
@ -1260,9 +1260,9 @@ function showConfigurationTab() {
var moreCriteria = []; var moreCriteria = [];
var name = trim(thisDialog.find("#edit_service_name").val()); var name = trim(thisDialog.find("#edit_service_name").val());
moreCriteria.push("&name="+encodeURIComponent(name)); moreCriteria.push("&name="+encodeURIComponent(escape(name)));
var displaytext = trim(thisDialog.find("#edit_service_display").val()); var displaytext = trim(thisDialog.find("#edit_service_display").val());
moreCriteria.push("&displayText="+encodeURIComponent(displaytext)); moreCriteria.push("&displayText="+encodeURIComponent(escape(displaytext)));
var offerha = trim(thisDialog.find("#edit_service_offerha").val()); var offerha = trim(thisDialog.find("#edit_service_offerha").val());
moreCriteria.push("&offerha="+offerha); moreCriteria.push("&offerha="+offerha);
@ -1316,17 +1316,17 @@ function showConfigurationTab() {
function serviceJSONToTemplate(json, template) { function serviceJSONToTemplate(json, template) {
template.attr("id", "service_"+json.id); template.attr("id", "service_"+json.id);
(index++ % 2 == 0)? template.addClass("smallrow_even"): template.addClass("smallrow_odd"); (index++ % 2 == 0)? template.addClass("smallrow_even"): template.addClass("smallrow_odd");
template.data("svcId", json.id).data("svcName", sanitizeXSS(json.name)); template.data("svcId", json.id).data("svcName", sanitizeXSS(unescape(json.name)));
template.find("#service_id").text(json.id); template.find("#service_id").text(json.id);
template.find("#service_name").text(json.name); template.find("#service_name").text(unescape(json.name));
template.find("#service_displaytext").text(json.displaytext); template.find("#service_displaytext").text(unescape(json.displaytext));
template.find("#service_storagetype").text(json.storagetype); template.find("#service_storagetype").text(json.storagetype);
template.find("#service_cpu").text(json.cpunumber + " x " + convertHz(json.cpuspeed)); template.find("#service_cpu").text(json.cpunumber + " x " + convertHz(json.cpuspeed));
template.find("#service_memory").text(convertBytes(parseInt(json.memory)*1024*1024)); template.find("#service_memory").text(convertBytes(parseInt(json.memory)*1024*1024));
template.find("#service_offerha").text(toBooleanText(json.offerha)); template.find("#service_offerha").text(toBooleanText(json.offerha));
template.find("#service_networktype").text(toNetworkType(json.usevirtualnetwork)); template.find("#service_networktype").text(toNetworkType(json.usevirtualnetwork));
template.find("#service_tags").text(json.tags); template.find("#service_tags").text(unescape(json.tags));
setDateField(json.created, template.find("#service_created")); setDateField(json.created, template.find("#service_created"));
} }
@ -1454,10 +1454,10 @@ function showConfigurationTab() {
var array1 = []; var array1 = [];
var name = trim(thisDialog.find("#add_service_name").val()); var name = trim(thisDialog.find("#add_service_name").val());
array1.push("&name="+encodeURIComponent(name)); array1.push("&name="+encodeURIComponent(escape(name)));
var display = trim(thisDialog.find("#add_service_display").val()); var display = trim(thisDialog.find("#add_service_display").val());
array1.push("&displayText="+encodeURIComponent(display)); array1.push("&displayText="+encodeURIComponent(escape(display)));
var storagetype = trim(thisDialog.find("#add_service_storagetype").val()); var storagetype = trim(thisDialog.find("#add_service_storagetype").val());
array1.push("&storageType="+storagetype); array1.push("&storageType="+storagetype);
@ -1480,7 +1480,7 @@ function showConfigurationTab() {
var tags = trim(thisDialog.find("#add_service_tags").val()); var tags = trim(thisDialog.find("#add_service_tags").val());
if(tags != null && tags.length > 0) if(tags != null && tags.length > 0)
array1.push("&tags="+encodeURIComponent(tags)); array1.push("&tags="+encodeURIComponent(escape(tags)));
thisDialog.dialog("close"); thisDialog.dialog("close");
$.ajax({ $.ajax({
@ -1544,17 +1544,17 @@ function showConfigurationTab() {
var array1 = []; var array1 = [];
var name = trim(thisDialog.find("#add_disk_name").val()); var name = trim(thisDialog.find("#add_disk_name").val());
array1.push("&name="+encodeURIComponent(name)); array1.push("&name="+encodeURIComponent(escape(name)));
var description = trim(thisDialog.find("#add_disk_description").val()); var description = trim(thisDialog.find("#add_disk_description").val());
array1.push("&displaytext="+encodeURIComponent(description)); array1.push("&displaytext="+encodeURIComponent(escape(description)));
var disksize = trim(thisDialog.find("#add_disk_disksize").val()); var disksize = trim(thisDialog.find("#add_disk_disksize").val());
array1.push("&disksize="+disksize); array1.push("&disksize="+disksize);
var tags = trim(thisDialog.find("#add_disk_tags").val()); var tags = trim(thisDialog.find("#add_disk_tags").val());
if(tags != null && tags.length > 0) if(tags != null && tags.length > 0)
array1.push("&tags="+encodeURIComponent(tags)); array1.push("&tags="+encodeURIComponent(escape(tags)));
thisDialog.dialog("close"); thisDialog.dialog("close");
$.ajax({ $.ajax({
@ -1649,7 +1649,7 @@ function showConfigurationTab() {
var dialogBox = $(this); var dialogBox = $(this);
dialogBox.dialog("close"); dialogBox.dialog("close");
$.ajax({ $.ajax({
data: createURL("command=updateDiskOffering&name="+encodeURIComponent(name)+"&displayText="+encodeURIComponent(display)+"&id="+diskId+"&response=json"), data: createURL("command=updateDiskOffering&name="+encodeURIComponent(escape(name))+"&displayText="+encodeURIComponent(escape(display))+"&id="+diskId+"&response=json"),
dataType: "json", dataType: "json",
success: function(json) { success: function(json) {
template.find("#disk_description").text(display); template.find("#disk_description").text(display);
@ -1699,15 +1699,14 @@ function showConfigurationTab() {
} else { } else {
template.addClass("smallrow_odd"); template.addClass("smallrow_odd");
} }
template.data("diskId", json.id).data("diskName", sanitizeXSS(json.name)); template.data("diskId", json.id).data("diskName", sanitizeXSS(unescape(json.name)));
template.find("#disk_id").text(json.id); template.find("#disk_id").text(json.id);
template.find("#disk_name").text(json.name); template.find("#disk_name").text(unescape(json.name));
template.find("#disk_description").text(json.displaytext); template.find("#disk_description").text(unescape(json.displaytext));
template.find("#disk_disksize").text(convertBytes(json.disksize)); template.find("#disk_disksize").text(convertBytes(json.disksize));
template.find("#disk_tags").text(json.tags); template.find("#disk_tags").text(unescape(json.tags));
template.find("#disk_domain").text(json.domain); template.find("#disk_domain").text(unescape(json.domain));
template.find("#disk_ismirrored").text(json.ismirrored);
} }
function listDiskOfferings() { function listDiskOfferings() {

12
ui/scripts/cloud.core.instances.js
View File

@ -576,7 +576,7 @@ function showInstancesTab(p_domainId, p_account) {
if (offerings != null && offerings.length > 0) { if (offerings != null && offerings.length > 0) {
for (var i = 0; i < offerings.length; i++) { for (var i = 0; i < offerings.length; i++) {
var option = $("<option value='" + offerings[i].id + "'>" + sanitizeXSS(offerings[i].displaytext) + "</option>").data("name", offerings[i].name); var option = $("<option value='" + offerings[i].id + "'>" + sanitizeXSS(unescape(offerings[i].displaytext)) + "</option>").data("name", sanitizeXSS(unescape(offerings[i].name)));
offeringSelect.append(option); offeringSelect.append(option);
} }
} }
@ -611,7 +611,7 @@ function showInstancesTab(p_domainId, p_account) {
vmInstance.find(".row_loading").show(); vmInstance.find(".row_loading").show();
vmInstance.find(".loadingmessage_container .loadingmessage_top p").html("Your virtual instance has been upgraded. Please restart your virtual instance for the new service offering to take effect."); vmInstance.find(".loadingmessage_container .loadingmessage_top p").html("Your virtual instance has been upgraded. Please restart your virtual instance for the new service offering to take effect.");
vmInstance.find(".loadingmessage_container").fadeIn("slow"); vmInstance.find(".loadingmessage_container").fadeIn("slow");
vmInstance.find("#vm_service").html("<strong>Service:</strong> " + sanitizeXSS(result.virtualmachine[0].serviceofferingname)); vmInstance.find("#vm_service").html("<strong>Service:</strong> " + sanitizeXSS(unescape(result.virtualmachine[0].serviceofferingname)));
if (result.virtualmachine[0].haenable =='true') { if (result.virtualmachine[0].haenable =='true') {
vmInstance.find("#vm_ha").html("<strong>HA:</strong> Enabled"); vmInstance.find("#vm_ha").html("<strong>HA:</strong> Enabled");
vmInstance.find("#vm_action_ha").text("Disable HA"); vmInstance.find("#vm_action_ha").text("Disable HA");
@ -1109,7 +1109,7 @@ function showInstancesTab(p_domainId, p_account) {
instanceTemplate.find("#vm_ip_address").html("<strong>IP Address:</strong> " + instanceJSON.ipaddress); instanceTemplate.find("#vm_ip_address").html("<strong>IP Address:</strong> " + instanceJSON.ipaddress);
instanceTemplate.find("#vm_zone").html("<strong>Zone:</strong> " + sanitizeXSS(instanceJSON.zonename)); instanceTemplate.find("#vm_zone").html("<strong>Zone:</strong> " + sanitizeXSS(instanceJSON.zonename));
instanceTemplate.find("#vm_template").html("<strong>Template:</strong> " + sanitizeXSS(instanceJSON.templatename)); instanceTemplate.find("#vm_template").html("<strong>Template:</strong> " + sanitizeXSS(instanceJSON.templatename));
instanceTemplate.find("#vm_service").html("<strong>Service:</strong> " + sanitizeXSS(instanceJSON.serviceofferingname)); instanceTemplate.find("#vm_service").html("<strong>Service:</strong> " + sanitizeXSS(unescape(instanceJSON.serviceofferingname)));
if (instanceJSON.haenable =='true') { if (instanceJSON.haenable =='true') {
instanceTemplate.find("#vm_ha").html("<strong>HA:</strong> Enabled"); instanceTemplate.find("#vm_ha").html("<strong>HA:</strong> Enabled");
instanceTemplate.find("#vm_action_ha").text("Disable HA"); instanceTemplate.find("#vm_action_ha").text("Disable HA");
@ -1277,7 +1277,7 @@ function showInstancesTab(p_domainId, p_account) {
continue; continue;
var checked = "checked"; var checked = "checked";
if (first == false) checked = ""; if (first == false) checked = "";
var listItem = $("<li><input class='radio' type='radio' name='service' id='service' value='"+offerings[i].id+"'" + checked + "/><label style='width:500px;font-size:11px;' for='service'>"+sanitizeXSS(offerings[i].displaytext)+"</label></li>"); var listItem = $("<li><input class='radio' type='radio' name='service' id='service' value='"+offerings[i].id+"'" + checked + "/><label style='width:500px;font-size:11px;' for='service'>"+sanitizeXSS(unescape(offerings[i].displaytext))+"</label></li>");
$("#wizard_service_offering").append(listItem); $("#wizard_service_offering").append(listItem);
first = false; first = false;
} }
@ -1306,14 +1306,14 @@ function showInstancesTab(p_domainId, p_account) {
var html = var html =
"<li>" "<li>"
+"<input class='radio' type='radio' name='rootdisk' id='rootdisk' value='"+offerings[i].id+"'" + ((i==0)?"checked":"") + "/>" +"<input class='radio' type='radio' name='rootdisk' id='rootdisk' value='"+offerings[i].id+"'" + ((i==0)?"checked":"") + "/>"
+"<label style='width:500px;font-size:11px;' for='disk'>"+sanitizeXSS(offerings[i].displaytext)+"</label>" +"<label style='width:500px;font-size:11px;' for='disk'>"+sanitizeXSS(unescape(offerings[i].displaytext))+"</label>"
+"</li>"; +"</li>";
$("#wizard_root_disk_offering").append(html); $("#wizard_root_disk_offering").append(html);
var html2 = var html2 =
"<li>" "<li>"
+"<input class='radio' type='radio' name='datadisk' id='datadisk' value='"+offerings[i].id+"'" + "/>" +"<input class='radio' type='radio' name='datadisk' id='datadisk' value='"+offerings[i].id+"'" + "/>"
+"<label style='width:500px;font-size:11px;' for='disk'>"+sanitizeXSS(offerings[i].displaytext)+"</label>" +"<label style='width:500px;font-size:11px;' for='disk'>"+sanitizeXSS(unescape(offerings[i].displaytext))+"</label>"
+"</li>"; +"</li>";
$("#wizard_data_disk_offering").append(html2); $("#wizard_data_disk_offering").append(html2);
} }