feature #1664: Fix several css issues and improve images-tab extended info

This commit is contained in:
Daniel Molina committed 2013-02-22 01:18:34 +01:00
1 parent 1399f44786
commit fa039a153b
9 files changed
+191 -141

No files matched your search

+56 -36
View File
@@ -6222,39 +6222,41 @@ div.button-bar {
border-top: none;
}
/* line 221, ../sass/app.scss */
#navigation > li:not(.subTab).navigation-active-li > a {
/* line 222, ../sass/app.scss */
#navigation > li:not(.subTab).navigation-active-li > a,
#navigation > li:not(.subTab).active > a {
background: #f2f2f2;
border: none;
color: #555;
}
/* line 231, ../sass/app.scss */
/* line 232, ../sass/app.scss */
#navigation i {
margin-right: 3px;
}
/* line 236, ../sass/app.scss */
/* line 237, ../sass/app.scss */
#navigation li.subTab > a {
background: #fdfdfd;
color: #555;
border: none;
padding: 10px 25px;
padding: 10px 11px 10px 25px;
}
/* line 243, ../sass/app.scss */
/* line 244, ../sass/app.scss */
#navigation li.subsubTab {
padding-left: 35px;
}
/* line 247, ../sass/app.scss */
#navigation li:hover, .navigation-active-li {
/* line 249, ../sass/app.scss */
#navigation li:hover, #navigation .navigation-active-li,
#navigation li:hover {
font-weight: bold;
border-left: 3px solid #555555 !important;
}
/* top menu css */
/* line 309, ../sass/app.scss */
/* line 311, ../sass/app.scss */
#menutop_container {
margin: 0px 171px;
color: #FFFFFF;
@@ -6262,14 +6264,14 @@ div.button-bar {
font-weight: bold;
}
/* line 315, ../sass/app.scss */
/* line 317, ../sass/app.scss */
#menutop_navbar {
float: left;
height: 25px;
font-size: 13px;
}
/* line 320, ../sass/app.scss */
/* line 322, ../sass/app.scss */
#menutop_navbar ul {
float: left;
height: 25px;
@@ -6278,12 +6280,12 @@ div.button-bar {
padding-left: 1px;
}
/* line 327, ../sass/app.scss */
/* line 329, ../sass/app.scss */
#menutop_navbar ul {
background-color: #4d4d4d;
}
/* line 330, ../sass/app.scss */
/* line 332, ../sass/app.scss */
#menutop_navbar ul li {
float: left;
min-width: 72px;
@@ -6300,18 +6302,18 @@ div.button-bar {
color: white;
}
/* line 346, ../sass/app.scss */
/* line 348, ../sass/app.scss */
#menutop_navbar ul li:hover {
background-color: #ffffff;
}
/* end top menu css */
/* line 357, ../sass/app.scss */
/* line 359, ../sass/app.scss */
.ui-layout-pane {
border: none;
}
/* line 362, ../sass/app.scss */
/* line 364, ../sass/app.scss */
.button.small {
font-size: 12px;
padding: 6px 12px 6px;
@@ -6319,117 +6321,135 @@ div.button-bar {
height: 28px;
}
/* line 369, ../sass/app.scss */
/* line 371, ../sass/app.scss */
.button.tiny {
box-shadow: none;
}
/* line 373, ../sass/app.scss */
/* line 375, ../sass/app.scss */
.panel {
padding: 0px;
background: #f2f2f2;
}
/* line 378, ../sass/app.scss */
/* line 380, ../sass/app.scss */
.tabs.vertical li a {
padding: 15px 11px;
}
/* line 382, ../sass/app.scss */
/* line 384, ../sass/app.scss */
input[type="text"] {
height: 28px !important;
margin: 0px;
}
/* line 386, ../sass/app.scss */
/* line 389, ../sass/app.scss */
.right {
float: right;
}
/* line 390, ../sass/app.scss */
/* line 393, ../sass/app.scss */
.ui-layout-pane {
background: #fdfdfd;
}
/* line 397, ../sass/app.scss */
/* line 400, ../sass/app.scss */
tr.odd:hover td {
background-color: #2ba6cb !important;
cursor: pointer;
color: white !important;
}
/* line 403, ../sass/app.scss */
/* line 406, ../sass/app.scss */
tr.even:hover td {
background-color: #2ba6cb !important;
cursor: pointer;
color: white !important;
}
/* line 409, ../sass/app.scss */
/* line 412, ../sass/app.scss */
tr {
border-bottom: 1px solid #e6e6e6;
}
/* line 415, ../sass/app.scss */
/* line 418, ../sass/app.scss */
table thead tr th, table tfoot tr td {
padding: 5px 10px 5px;
line-height: 16px;
}
/* line 420, ../sass/app.scss */
/* line 423, ../sass/app.scss */
table {
border-collapse: collapse;
border-spacing: 0;
}
/* Growl */
/* line 426, ../sass/app.scss */
/* line 429, ../sass/app.scss */
.jGrowl-notification h1 {
font-size: 1.2em;
}
/* line 430, ../sass/app.scss */
/* line 433, ../sass/app.scss */
.jGrowl-notification, .jGrowl-notify-submit {
border: 2px #444444 solid;
background-color: #F3F3F3!important;
color: #666666;
}
/* line 436, ../sass/app.scss */
/* line 439, ../sass/app.scss */
.jGrowl-notify-error {
border: 2px #660000 solid;
background-color: #F39999!important;
color: #660000;
}
/* line 442, ../sass/app.scss */
/* line 445, ../sass/app.scss */
.jGrowl-notify-error table td.key_error {
text-transform: capitalize;
width: 100%;
font-weight: bold;
}
/* line 448, ../sass/app.scss */
/* line 451, ../sass/app.scss */
.jGrowl-notify-error table td.key_error:after {
content: ":";
}
/* line 455, ../sass/app.scss */
/* line 458, ../sass/app.scss */
.markrow {
background-color: #cdebf5 !important;
}
/* line 456, ../sass/app.scss */
/* line 459, ../sass/app.scss */
.markrowselected {
background-color: #2ba6cb !important;
color: #FFF;
}
/* line 457, ../sass/app.scss */
/* line 460, ../sass/app.scss */
.markrowchecked {
background-color: #cdebf5;
}
/* line 460, ../sass/app.scss */
/* line 463, ../sass/app.scss */
.hidden {
display: none;
}
/* line 472, ../sass/app.scss */
#navigation li.topTab span.plusIcon,
#navigation li.subTab span.plusIcon {
display: none;
float: right;
}
/* line 477, ../sass/app.scss */
span.plusIcon {
color: #d0d0d0;
}
/* line 481, ../sass/app.scss */
span.plusIcon:hover {
color: #555;
}
+5 -4
View File
@@ -104,10 +104,11 @@ function setupTabs(){
//hide subtabs and reset icon to + position, since all subsubtabs
//are hidden
subtabs.fadeToggle('fast');
$('span',subtabs).removeClass('ui-icon-circle-minus');
$('span',subtabs).addClass('ui-icon-circle-plus');
$(this).removeClass('active');
$('span',subtabs).removeClass(' icon-caret-down');
$('span',subtabs).addClass(' icon-caret-left');
//toggle icon on this tab
$('span',this).toggleClass('ui-icon-circle-plus ui-icon-circle-minus');
$('span',this).toggleClass(' icon-caret-left icon-caret-down');
};
//if we are clicking on the icon only, do not show the tab
if ($(e.target).is('span')) return false;
@@ -135,7 +136,7 @@ $(document).ready(function () {
applyDefaultStyles: false
, center__paneSelector: ".outer-center"
, west__paneSelector: ".outer-west"
, west__size: 220
, west__size: 245
, north__size: 26
, south__size: 26
, spacing_open: 0 // ALL panes
+41 -45
View File
@@ -24,7 +24,7 @@ var host_datatable_table_tmpl='<thead>\
<th>' + tr("ID") + '</th>\
<th>' + tr("Name") + '</th>\
<th>' + tr("Cluster") + '</th>\
<th>' + tr("Running VMs") + '</th>\
<th>' + tr("RVMs") + '</th>\
<th>' + tr("Real CPU") + '</th>\
<th>' + tr("Allocated CPU") + '</th>\
<th>' + tr("Real MEM") + '</th>\
@@ -48,7 +48,7 @@ var vnet_datatable_table_tmpl='<thead>\
<th>'+tr("Cluster")+'</th>\
<th>'+tr("Type")+'</th>\
<th>'+tr("Bridge")+'</th>\
<th>'+tr("Total Leases")+'</th>\
<th>'+tr("Leases")+'</th>\
</tr>\
</thead>\
<tbody id="tbodyvnetworks">\
@@ -73,67 +73,63 @@ var datastore_datatable_table_tmpl='<thead>\
var create_cluster_tmpl ='<div id="cluster_create_tabs">\
<fieldset>\
<form class="custom">\
<label for="name">' + tr("Name") + ':</label><input type="text" name="name" id="name" />\
</fieldset>\
<dl class="tabs">\
<dd><a href="#tab-hosts">'+tr("HOSTs")+'</a></dd>\
<dd class="active"><a href="#tab-hosts">'+tr("HOSTs")+'</a></dd>\
<dd><a href="#tab-vnets">'+tr("VIRTUAL NETWORKs")+'</a></dd>\
<dd><a href="#tab-datastores">'+tr("DATASTOREs")+'</a></dd>\
</dl>\
<ul class="tabs-content">\
<li id="tab-hostsTab">\
<fieldset>\
<li id="tab-hostsTab" class="active">\
<div class="row">\
<div class="five columns push-seven">\
<input id="cluster_hosts_search" type="text" placeholder="Search"/>\
</div>\
</div>\
<div id="datatable_cluster_hosts_div">\
<h3>' +
tr("Select Hosts for this Cluster") +
'<button id="refresh_host_table_button_class" class="icon-refresh action_button" value="ClusterHost.list" style="float:right;"></h3>\
<hr>\
<table id="datatable_cluster_hosts" class="display">' + host_datatable_table_tmpl + '</table></div>\
<table id="datatable_cluster_hosts" class="table twelve">' + host_datatable_table_tmpl + '</table></div>\
<div id="selected_hosts_div"></div>\
</fieldset>\
<div class="form_buttons">\
<button class="button" type="" value="" id="tf_btn_hosts_next">'+tr("VIRTUAL NETWORKs >")+'</button>\
</div>\
</li>\
<li id="tab-vnetsTab">\
<fieldset>\
<div class="row">\
<div class="five columns push-seven">\
<input id="cluster_vnets_search" type="text" placeholder="Search"/>\
</div>\
</div>\
<div id="datatable_cluster_vnets_div">\
<h3>' +
tr("Select Virtual Networks for this Cluster") +
'<button id="refresh_vnet_table_button_class" class="icon-refresh action_button" value="ClusterVN.list" style="float:right;"></h3>\
<hr>\
<table id="datatable_cluster_vnets" class="display">' + vnet_datatable_table_tmpl + '</table></div>\
<table id="datatable_cluster_vnets" class="table twelve">' + vnet_datatable_table_tmpl + '</table></div>\
<div id="selected_vnets_div"></div>\
</fieldset>\
<div class="form_buttons">\
<button class="button" type="" value="" id="tf_btn_vnets_back">'+tr("< HOSTs")+'</button>\
</div>\
<div class="form_buttons">\
<button class="button" type="" value="" id="tf_btn_vnets_next">'+tr("DATASTOREs >")+'</button>\
</div>\
</li>\
<li id="tab-datastoresTab">\
<fieldset>\
<div class="row">\
<div class="five columns push-seven">\
<input id="cluster_datastores_search" type="text" placeholder="Search"/>\
</div>\
</div>\
<div id="datatable_cluster_datastores_div">\
<h3>' +
tr("Select Datastores for this Cluster") +
'<button id="refresh_datastore_table_button_class" class="icon-refresh action_button" value="ClusterDS.list" style="float:right;"></h3>\
<hr>\
<table id="datatable_cluster_datastores" class="display">' + datastore_datatable_table_tmpl + '</table></div>\
<table id="datatable_cluster_datastores" class="table twelve">' + datastore_datatable_table_tmpl + '</table></div>\
<div id="selected_datastores_div"></div>\
</fieldset>\
<div class="form_buttons">\
<button class="button" type="" value="" id="tf_btn_datastores_back">'+tr("< VIRTUAL NETWORKS")+'</button>\
</div>\
</li>\
<fieldset>\
<hr>\
<div class="form_buttons">\
<button class="button" type="submit" id="create_cluster_submit" value="OpenNebula.Cluster.create">' + tr("Create") + '</button>\
<button class="button" type="submit" id="update_cluster_submit">' + tr("Update") + '</button>\
<button class="button" type="reset" value="reset">' + tr("Reset") + '</button>\
</div>\
</fieldset>\
</form>\
</div>';
// Common utils for datatatables
@@ -160,21 +156,17 @@ function setupCreateClusterDialog(datatable_filter){
// height: height,
// width: 'auto'
//});
dialog.addClass("reveal-modal");
dialog.addClass("reveal-modal xlarge");
//Enable tabs
//$('#cluster_create_tabs',dialog).tabs({});
// ------- Create the dialog datatables ------------
dataTable_cluster_hosts = $("#datatable_cluster_hosts", dialog).dataTable({
"bJQueryUI": true,
"bSortClasses": false,
"sDom" : '<"H"lfrC>t<"F"ip>',
"sDom" : "<'H'>t<'row'<'six columns'i><'six columns'p>>",
"oColVis": { //exclude checkbox column
"aiExclude": [ 0 ]
},
"bAutoWidth":false,
"sPaginationType": "full_numbers",
"aoColumnDefs": [
{ "bSortable": false, "aTargets": ["check"] },
{ "sWidth": "60px", "aTargets": [0,4] },
@@ -189,6 +181,10 @@ function setupCreateClusterDialog(datatable_filter){
} : ""
});
$('#cluster_hosts_search', dialog).keyup(function(){
dataTable_cluster_hosts.fnFilter( $(this).val() );
})
//preload it
//dataTable_cluster_hosts.fnClearTable();
@@ -198,14 +194,10 @@ function setupCreateClusterDialog(datatable_filter){
// '','','','','','','','','','','',''],dataTable_cluster_hosts);
dataTable_cluster_vnets = $("#datatable_cluster_vnets", dialog).dataTable({
"bJQueryUI": true,
"bSortClasses": false,
"bAutoWidth":false,
"sDom" : '<"H"lfrC>t<"F"ip>',
"sDom" : "<'H'>t<'row'<'six columns'i><'six columns'p>>",
"oColVis": {
"aiExclude": [ 0 ]
},
"sPaginationType": "full_numbers",
"aoColumnDefs": [
{ "bSortable": false, "aTargets": ["check"] },
{ "sWidth": "60px", "aTargets": [0,6,7,8] },
@@ -220,6 +212,10 @@ function setupCreateClusterDialog(datatable_filter){
});
$('#cluster_vnets_search', dialog).keyup(function(){
dataTable_cluster_hosts.fnFilter( $(this).val() );
})
//preload it
//dataTable_cluster_vnets.fnClearTable();
//dataTable_cluster_vnets.fnFilter( datatable_filter, 5, true); // Only show no assigned resources
@@ -228,14 +224,10 @@ function setupCreateClusterDialog(datatable_filter){
// '','','','','','','','','','','',''],dataTable_cluster_vnets);
dataTable_cluster_datastores = $("#datatable_cluster_datastores", dialog).dataTable({
"bJQueryUI": true,
"bSortClasses": false,
"sDom" : '<"H"lfrC>t<"F"ip>',
"sDom" : "<'H'>t<'row'<'six columns'i><'six columns'p>>",
"oColVis": {
"aiExclude": [ 0 ]
},
"sPaginationType": "full_numbers",
"bAutoWidth":false,
"aoColumnDefs": [
{ "bSortable": false, "aTargets": ["check"] },
{ "sWidth": "60px", "aTargets": [0] },
@@ -250,6 +242,10 @@ function setupCreateClusterDialog(datatable_filter){
});
$('#cluster_datastores_search', dialog).keyup(function(){
dataTable_cluster_hosts.fnFilter( $(this).val() );
})
//preload it
//dataTable_cluster_datastores.fnClearTable();
//dataTable_cluster_datastores.fnFilter( datatable_filter, 5, true); // Only show no assigned resources
+33 -20
View File
@@ -550,82 +550,95 @@ function updateImageInfo(request,img){
var info_tab = {
title: tr("Information"),
content:
'<table id="info_img_table" class="info_table">\
'<div class="row">\
<div class="six columns">\
<table id="info_img_table" class="twelve datatable">\
<thead>\
<tr><th colspan="2">'+tr("Image")+' "'+img_info.NAME+'" '+
<tr><th colspan="3">'+tr("Image")+' "'+img_info.NAME+'" '+
tr("information")+'</th></tr>\
</thead>\
<tr>\
<td class="key_td">'+tr("ID")+'</td>\
<td class="value_td">'+img_info.ID+'</td>\
<td></td>\
</tr>\
<tr>\
<td class="key_td">'+tr("Name")+'</td>\
<td class="value_td_rename">'+img_info.NAME+'</td>\
<td><div id="div_edit_rename">\
<a id="div_edit_rename_link" class="edit_e" href="#">e</a>\
<a id="div_edit_rename_link" class="edit_e" href="#"><i class="icon-edit right"/></a>\
</div>\
</td>\
</tr>\
<tr>\
<td class="key_td">'+tr("Datastore")+'</td>\
<td class="value_td">'+img_info.DATASTORE+'</td>\
<td></td>\
</tr>\
<tr>\
<td class="key_td">'+tr("Type")+'</td>\
<td class="value_td_type">'+OpenNebula.Helper.image_type(img_info.TYPE)+'</td>\
<td><div id="div_edit_chg_type">\
<a id="div_edit_chg_type_link" class="edit_e" href="#">e</a>\
<a id="div_edit_chg_type_link" class="edit_e" href="#"><i class="icon-edit right"/></a>\
</div>\
</td>\
</tr>\
<tr>\
<td class="key_td">'+tr("Register time")+'</td>\
<td class="value_td">'+pretty_time(img_info.REGTIME)+'</td>\
<td></td>\
</tr>\
<tr>\
<td class="key_td">'+tr("Persistent")+'</td>\
<td class="value_td_persistency">'+(parseInt(img_info.PERSISTENT) ? tr("yes") : tr("no"))+'</td>\
<td><div id="div_edit_persistency">\
<a id="div_edit_persistency_link" class="edit_e" href="#">e</a>\
<a id="div_edit_persistency_link" class="edit_e" href="#"><i class="icon-edit right"/></a>\
</div>\
</td>\
</tr>\
<tr>\
<td class="key_td">'+tr("Source")+'</td>\
<td class="value_td">'+(typeof img_info.SOURCE === "string" ? img_info.SOURCE : "--")+'</td>\
</tr>\
<tr>\
<td class="key_td">'+tr("Path")+'</td>\
<td class="value_td">'+(typeof img_info.PATH === "string" ? img_info.PATH : "--")+'</td>\
<td></td>\
</tr>\
<tr>\
<td class="key_td">'+tr("Filesystem type")+'</td>\
<td class="value_td">'+(typeof img_info.FSTYPE === "string" ? img_info.FSTYPE : "--")+'</td>\
<td></td>\
</tr>\
<tr>\
<td class="key_td">'+tr("Size (Mb)")+'</td>\
<td class="value_td">'+img_info.SIZE+'</td>\
<td></td>\
</tr>\
<tr>\
<td class="key_td">'+tr("State")+'</td>\
<td class="value_td">'+OpenNebula.Helper.resource_state("image",img_info.STATE)+'</td>\
<td></td>\
</tr>\
<tr>\
<td class="key_td">'+tr("Running #VMS")+'</td>\
<td class="value_td">'+img_info.RUNNING_VMS+'</td>\
<td></td>\
</tr>\
</table>' +
insert_extended_template_table(img_info.TEMPLATE,
"Image",
img_info.ID) +
insert_permissions_table("Image",
img_info.ID,
img_info.UNAME,
img_info.GNAME,
img_info.UID,
img_info.GID)
</table>\
</div>\
<div class="six columns">\
<div class="row">'
+ insert_permissions_table("Image",
img_info.ID,
img_info.UNAME,
img_info.GNAME,
img_info.UID,
img_info.GID) +
'</div>\
<div class="row">'
+ insert_extended_template_table(img_info.TEMPLATE,
"Image",
img_info.ID) +
'</div>\
</div>\
</div>'
}
$("#div_edit_rename_link").die();
+1 -1
View File
@@ -238,7 +238,7 @@ var user_actions = {
success: updateUsersView,
error: onError
});
}
}
},
"User.update_password" : {
+25 -27
View File
@@ -1327,10 +1327,10 @@ function convert_template_to_string(template_json,unshown_values)
// Create the extended template table (with listeners)
function insert_extended_template_table(template_json,resource_type,resource_id,unshown_values)
{
var str = '<table id="'+resource_type.toLowerCase()+'_template_table" class="info_table">\
var str = '<table id="'+resource_type.toLowerCase()+'_template_table" class="info_table twelve datatable">\
<thead>\
<tr>\
<th colspan="2">' +
<th colspan="4">' +
tr("Extended Template") +
'</th>\
</tr>\
@@ -1338,7 +1338,7 @@ function insert_extended_template_table(template_json,resource_type,resource_id,
<tr>\
<td class="key_td"><input type="text" name="new_key" id="new_key" /></td>\
<td class="value_td"><input type="text" name="new_value" id="new_value" /></td>\
<td class=""><button id="button_add_value">'+tr("Add")+'</button>\</td>\
<td colspan="2" class=""><button id="button_add_value" class="button small secondary">'+tr("Add")+'</button>\</td>\
</tr>' + fromJSONtoHTMLTable(template_json,
resource_type,
resource_id) +
@@ -1646,12 +1646,12 @@ function fromJSONtoHTMLRow(field,value,resource_type,resource_id, vectorial_key,
<td class="value_vectorial_td"></td>\
<td>\
<div id="div_add_vectorial">\
<a id="div_add_vectorial_'+field+'" class="add_vectorial_a ocurrence_'+it+' vectorial_key_'+field+'" href="#">a</a>\
<a id="div_add_vectorial_'+field+'" class="add_vectorial_a ocurrence_'+it+' vectorial_key_'+field+'" href="#"><i class="icon-plus-sign"/></a>\
</div>\
</td>\
<td>\
<td>\
<div id="div_minus">\
<a id="div_minus_'+field+'" class="remove_vectorial_x ocurrence_'+it+'" href="#">x</a>\
<a id="div_minus_'+field+'" class="remove_vectorial_x ocurrence_'+it+'" href="#"><i class="icon-edit"/><i class="icon-trash"/></a>\
</div>\
</td>'
@@ -1688,12 +1688,12 @@ function fromJSONtoHTMLRow(field,value,resource_type,resource_id, vectorial_key,
<td class="value_td value_vectorial_td value_td_input_'+field+ocurrence_str+' vectorial_key_'+vectorial_key+'" id="value_td_input_'+field+'">'+value+'</td>\
<td>\
<div id="div_edit_vectorial">\
<a id="div_edit_'+field+'" class="edit_e'+ocurrence_str+' vectorial_key_'+vectorial_key+'" href="#">e</a>\
<a id="div_edit_'+field+'" class="edit_e'+ocurrence_str+' vectorial_key_'+vectorial_key+'" href="#"><i class="icon-edit"/></a>\
</div>\
</td>\
<td>\
<div id="div_minus_vectorial">\
<a id="div_minus_'+field+'" class="remove_x'+ocurrence_str+' vectorial_key_'+vectorial_key+'" href="#">x</a>\
<a id="div_minus_'+field+'" class="remove_x'+ocurrence_str+' vectorial_key_'+vectorial_key+'" href="#"><i class="icon-trash"/></a>\
</div>\
</td>\
</tr>';
@@ -1708,12 +1708,12 @@ function fromJSONtoHTMLRow(field,value,resource_type,resource_id, vectorial_key,
<td class="value_vectorial_td"></td>\
<td>\
<div id="div_add_vectorial">\
<a id="div_add_vectorial_'+field+'" class="add_vectorial_a'+ocurrence_str+' vectorial_key_'+field+'" href="#">a</a>\
<a id="div_add_vectorial_'+field+'" class="add_vectorial_a'+ocurrence_str+' vectorial_key_'+field+'" href="#"><i class="icon-plus-sign"/></a>\
</div>\
</td>\
<td>\
<td>\
<div id="div_minus">\
<a id="div_minus_'+field+'" class="remove_vectorial_x'+ocurrence_str+'" href="#">x</a>\
<a id="div_minus_'+field+'" class="remove_vectorial_x'+ocurrence_str+'" href="#"><i class="icon-trash"/></a>\
</div>\
</td>'
str += fromJSONtoHTMLTable(value,
@@ -1729,12 +1729,12 @@ function fromJSONtoHTMLRow(field,value,resource_type,resource_id, vectorial_key,
<td class="value_td" id="value_td_input_'+field+'">'+value+'</td>\
<td>\
<div id="div_edit">\
<a id="div_edit_'+field+'" class="edit_e'+ocurrence_str+'" href="#">e</a>\
<a id="div_edit_'+field+'" class="edit_e'+ocurrence_str+'" href="#"><i class="icon-edit"/></a>\
</div>\
</td>\
<td>\
<div id="div_minus">\
<a id="div_minus_'+field+'" class="remove_x'+ocurrence_str+'" href="#">x</a>\
<a id="div_minus_'+field+'" class="remove_x'+ocurrence_str+'" href="#"><i class="icon-trash"/></a>\
</div>\
</td>\
</tr>';
@@ -1780,12 +1780,12 @@ function buildOctet(permTable){
// Returns HTML with listeners to control permissions
function insert_permissions_table(resource_type,resource_id, owner, group, vm_uid, vm_gid){
var str ='<table class="'+resource_type.toLowerCase()+'_permissions_table" style="padding:0 10px;">\
var str ='<table class="'+resource_type.toLowerCase()+'_permissions_table twelve datatable">\
<thead><tr>\
<td style="width:130px">'+tr("Permissions")+':</td>\
<td style="width:40px;text-align:center;">'+tr("Use")+'</td>\
<td style="width:40px;text-align:center;">'+tr("Manage")+'</td>\
<td style="width:40px;text-align:center;">'+tr("Admin")+'</td></tr></thead>\
<th style="width:130px">'+tr("Permissions")+':</th>\
<th style="width:40px;text-align:center;">'+tr("Use")+'</th>\
<th style="width:40px;text-align:center;">'+tr("Manage")+'</th>\
<th style="width:40px;text-align:center;">'+tr("Admin")+'</th></tr></thead>\
<tr>\
<td>'+tr("Owner")+'</td>\
<td style="text-align:center"><input type="checkbox" class="permission_check owner_u" /></td>\
@@ -1807,22 +1807,20 @@ function insert_permissions_table(resource_type,resource_id, owner, group, vm_ui
if (mustBeAdmin())
{
str += '<tr><td style="width:130px">'+tr("Ownership")+'</td>\</tr>\
str += '<thead><tr><th colspan="4" style="width:130px">'+tr("Ownership")+'</th>\</tr></thead>\
<tr>\
<td>'+tr("Owner")+'</td>\
<td></td>\
<td id="value_td_owner">'+owner+'</td>\
<td colspan="2" id="value_td_owner">'+owner+'</td>\
<td><div id="div_edit_chg_owner">\
<a id="div_edit_chg_owner_link" class="edit_e" href="#">e</a>\
<a id="div_edit_chg_owner_link" class="edit_e" href="#"><i class="icon-edit right"/></a>\
</div>\
</td>\
</tr>\
<tr>\
<td>'+tr("Group")+'</td>\
<td></td>\
<td id="value_td_group">'+group+'</td>\
<td colspan="2" id="value_td_group">'+group+'</td>\
<td><div id="div_edit_chg_group">\
<a id="div_edit_chg_group_link" class="edit_e" href="#">e</a>\
<a id="div_edit_chg_group_link" class="edit_e" href="#"><i class="icon-edit right"/></a>\
</div>\
</td>\
</tr>\
@@ -1835,7 +1833,7 @@ function insert_permissions_table(resource_type,resource_id, owner, group, vm_ui
// Listener for key,value pair edit action
$("#div_edit_chg_owner_link").live("click", function() {
var value_str = $("#value_td_owner").text();
var select_str='<select style="margin: 10px 0;" id="user_confirm_select">';
var select_str='<select id="user_confirm_select">';
select_str += makeSelectOptions(dataTable_users,1,2,[],[],true);
select_str+="</select>";
$("#value_td_owner").html(select_str);
@@ -1858,7 +1856,7 @@ function insert_permissions_table(resource_type,resource_id, owner, group, vm_ui
// Listener for key,value pair edit action
$("#div_edit_chg_group_link").live("click", function() {
var value_str = $("#value_td_group").text();
var select_str='<select style="margin: 10px 0;" id="group_confirm_select">';
var select_str='<select id="group_confirm_select">';
select_str += makeSelectOptions(dataTable_groups,1,2,[],[],true);
select_str+="</select>";
$("#value_td_group").html(select_str);
+1 -1
View File
@@ -479,7 +479,7 @@ function insertTab(tab_name){
$('div#'+tab_name,main_tabs_context).html(tab_info.content);
var li_item = '<li id="li_'+tab_name+'" class="'+tabClass+' '+parent+'"><a href="#">'+tab_info.title+'<span class="ui-icon ui-icon-circle-plus plusIcon"></span></a></li>';
var li_item = '<li id="li_'+tab_name+'" class="'+tabClass+' '+parent+'"><a href="#">'+tab_info.title+'<span class="icon-caret-left icon-large plusIcon right"></span></a></li>';
//if this is a submenu...
if (parent.length) {
+20 -3
View File
@@ -218,7 +218,8 @@ div.button-bar {
border-top: none;
}
#navigation > li:not(.subTab).navigation-active-li > a {
#navigation > li:not(.subTab).navigation-active-li > a,
#navigation > li:not(.subTab).active > a {
background: #f2f2f2;
border:none;
color: #555;
@@ -237,14 +238,15 @@ div.button-bar {
background: #fdfdfd;
color: #555;
border:none;
padding: 10px 25px;
padding: 10px 11px 10px 25px;
}
#navigation li.subsubTab {
padding-left: 35px;
}
#navigation li:hover, .navigation-active-li {
#navigation li:hover, #navigation .navigation-active-li,
#navigation li:hover, {
font-weight: bold;
border-left: 3px solid #555 !important;
}
@@ -381,6 +383,7 @@ div.button-bar {
input[type="text"] {
height: 28px !important;
margin: 0px;
}
.right {
@@ -465,3 +468,17 @@ table {
#navigation li.topTab span.plusIcon,
#navigation li.subTab span.plusIcon {
display : none;
float: right;
}
span.plusIcon {
color: #d0d0d0;
}
span.plusIcon:hover {
color: #555;
}
@@ -63,10 +63,15 @@
});
// Positioning the Flyout List
var normalButtonHeight = $('.button.dropdown:not(.large):not(.small):not(.tiny):visible', this).outerHeight() - 1,
largeButtonHeight = $('.button.large.dropdown:visible', this).outerHeight() - 1,
smallButtonHeight = $('.button.small.dropdown:visible', this).outerHeight() - 1,
tinyButtonHeight = $('.button.tiny.dropdown:visible', this).outerHeight() - 1;
//var normalButtonHeight = $('.button.dropdown:not(.large):not(.small):not(.tiny):visible', this).outerHeight() - 1,
// largeButtonHeight = $('.button.large.dropdown:visible', this).outerHeight() - 1,
// smallButtonHeight = $('.button.small.dropdown:visible', this).outerHeight() - 1,
// tinyButtonHeight = $('.button.tiny.dropdown:visible', this).outerHeight() - 1;
var normalButtonHeight = $('.button.dropdown:not(.large):not(.small):not(.tiny)', this).outerHeight() - 1,
largeButtonHeight = $('.button.large.dropdown', this).outerHeight() - 1,
smallButtonHeight = $('.button.small.dropdown', this).outerHeight() - 1,
tinyButtonHeight = $('.button.tiny.dropdown', this).outerHeight() - 1;
$('.button.dropdown:not(.large):not(.small):not(.tiny) > ul', this).css('top', normalButtonHeight);
$('.button.dropdown.large > ul', this).css('top', largeButtonHeight);