shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-23 17:33:56 +03:00
Code Releases Wiki Activity

Fix textarea style

Browse Source
This commit is contained in:
Daniel Molina 2014-03-07 17:27:56 +01:00
parent 246ace7072
commit b6213869c8
4 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sunstone/public/css/app.css
View File

File diff suppressed because one or more lines are too long

33
src/sunstone/public/js/plugins/vms-tab.js
View File

@ -1633,8 +1633,8 @@ function updateVMInfo(request,vm){
title: tr("Template"),
icon: "fa-file-o",
content:
'<div class="large-12 columns">\
<table id="vm_template_table" class="info_table transparent_table" style="width:80%">'+
'<div class="large-9 columns">\
<table id="vm_template_table" class="info_table dataTable">'+
prettyPrintJSON(vm_info.TEMPLATE)+
'</table>\
</div>'
@ -1749,29 +1749,6 @@ function printActionsTable(vm_info)
$("#add_scheduling_action").attr("disabled", "disabled");
//$("#scheduling_actions_table").append('<tr><td></td>\
// <td class="action_row"><select id="select_new_action" class="select_new_action" name="select_action">\
// <option value="shutdown">' + tr("shutdown") + '</option>\
// <option value="hold">' + tr("hold") + '</option>\
// <option value="release">' + tr("release") + '</option>\
// <option value="stop">' + tr("stop") + '</option>\
// <option value="cancel">' + tr("cancel") + '</option>\
// <option value="suspend">' + tr("suspend") + '</option>\
// <option value="resume">' + tr("resume") + '</option>\
// <option value="restart">' + tr("restart") + '</option>\
// <option value="resubmit">' + tr("resubmit") + '</option>\
// <option value="reboot">' + tr("reboot") + '</option>\
// <option value="reset">' + tr("reset") + '</option>\
// <option value="poweroff">' + tr("poweroff") + '</option>\
// <option value="snapshot-create">' + tr("snapshot-create") + '</option>\
// </select>\
// </td>\
// <td class="time_row"><input id="date_time_input"><a class="date_time_picker_add_link">t</a></td>\
// <td>\
// <button id="submit_scheduling_action" class="button small secondary radius" >' + tr("Add") +'</button>\
// </td>\
// </tr>');
$("#scheduling_actions_table").append('<tr><td></td>\
<td class="columns"><select id="select_new_action" class="select_new_action" name="select_action">\
<option value="shutdown">' + tr("shutdown") + '</option>\
@ -1795,7 +1772,7 @@ function printActionsTable(vm_info)
</td>\
<td>\
<input id="date_input" class="jdpicker" type="text" placeholder="2013/12/30"/>\
<input id="time_input" class="timepicker" type="text" placeholder="12:30"/>\
<input id="time_input" type="text" placeholder="12:30"/>\
</td>\
<td>\
<button id="submit_scheduling_action" class="button small secondary radius" >' + tr("Add") +'</button>\
@ -1804,8 +1781,6 @@ function printActionsTable(vm_info)
</tr>');
$("#date_input").jdPicker();
$("#time_input").timePicker();
return false;
});
@ -2520,7 +2495,7 @@ function printCapacity(vm_info){
<form id="tab_capacity_form" vmid="'+vm_info.ID+'" >'
html += '\
<div class="row">\
<div class="">\
<div class="large-12 columns">\
<table class="info_table dataTable extended_table">\
<thead>\

4
src/sunstone/public/js/sunstone.js
View File

@ -1303,7 +1303,7 @@ function prettyPrintJSON(template_json,padding,weight, border_bottom,padding_top
if (!template_json){ return "Not defined";}
if (!padding) {padding=10};
if (!weight) {weight="bold";}
if (!border_bottom) {border_bottom = "1px solid #CCCCCC";}
if (!border_bottom) {border_bottom = "1px solid #efefef";}
if (!padding_top_bottom) {padding_top_bottom=6;}
var field = null;
@ -2589,7 +2589,7 @@ function convert_template_to_string(template_json,unshown_values)
$.each(template_json, function(key, value)
{
// value can be an array
if (!value)
if (!value)
{
template_str=template_str+key+"=\n";
}

10
src/sunstone/public/scss/app.scss
View File

@ -112,6 +112,16 @@ table.dataTable {
input[type="checkbox"] {
margin: 3px 0.5ex !important;
}
textarea {
min-height: 33px !important;
height: 33px;
padding: 5px 10px;
margin: 0px !important;
}
input[type="text"] {
margin: 0px !important;
padding: 5px 10px;
}
}