diff --git a/install.sh b/install.sh index be8f00b846..5db567dd3b 100755 --- a/install.sh +++ b/install.sh @@ -1178,7 +1178,10 @@ SUNSTONE_PUBLIC_CSS_FILES="src/sunstone/public/css/application.css \ SUNSTONE_PUBLIC_VENDOR_DATATABLES="\ src/sunstone/public/vendor/dataTables/jquery.dataTables.min.js \ + src/sunstone/public/vendor/dataTables/ColVis.min.js \ + src/sunstone/public/vendor/dataTables/ColReorderWithResize.js \ src/sunstone/public/vendor/dataTables/demo_table_jui.css \ + src/sunstone/public/vendor/dataTables/ColVis.css \ src/sunstone/public/vendor/dataTables/BSD-LICENSE.txt \ src/sunstone/public/vendor/dataTables/NOTICE" @@ -1188,7 +1191,7 @@ SUNSTONE_PUBLIC_VENDOR_JGROWL="\ src/sunstone/public/vendor/jGrowl/NOTICE" SUNSTONE_PUBLIC_VENDOR_JQUERY="\ - src/sunstone/public/vendor/jQuery/jquery-1.7.1.min.js \ + src/sunstone/public/vendor/jQuery/jquery-1.7.2.min.js \ src/sunstone/public/vendor/jQuery/MIT-LICENSE.txt \ src/sunstone/public/vendor/jQuery/NOTICE" @@ -1253,10 +1256,15 @@ SUNSTONE_PUBLIC_IMAGES_FILES="src/sunstone/public/images/ajax-loader.gif \ src/sunstone/public/images/yellow_bullet.png \ src/sunstone/public/images/green_bullet.png \ src/sunstone/public/images/vnc_off.png \ - src/sunstone/public/images/vnc_on.png" + src/sunstone/public/images/vnc_on.png \ + src/sunstone/public/images/network_icon.png \ + src/sunstone/public/images/system_icon.png \ + src/sunstone/public/images/server_icon.png \ +" SUNSTONE_PUBLIC_LOCALE_EN_US="\ src/sunstone/public/locale/en_US/en_US.js \ +src/sunstone/public/locale/en_US/en_datatable.txt \ " SUNSTONE_PUBLIC_LOCALE_RU=" diff --git a/src/ozones/Server/lib/OZones.rb b/src/ozones/Server/lib/OZones.rb index cd44f87203..d0313ea7d9 100644 --- a/src/ozones/Server/lib/OZones.rb +++ b/src/ozones/Server/lib/OZones.rb @@ -29,6 +29,8 @@ require 'OZones/AggregatedUsers' require 'OZones/AggregatedClusters' require 'OZones/AggregatedDatastores' require 'OZones/AggregatedTemplates' +require 'OZones/AggregatedClusters' +require 'OZones/AggregatedDatastores' require 'openssl' require 'digest/sha1' diff --git a/src/sunstone/public/css/application.css b/src/sunstone/public/css/application.css index c4fca87454..964b4a86f2 100644 --- a/src/sunstone/public/css/application.css +++ b/src/sunstone/public/css/application.css @@ -39,8 +39,13 @@ select, button { h2 { float:left; font-size:20px; - margin-bottom: 5px; - padding-bottom: 0} + margin-bottom: 2px; + margin-top: 8px; + padding-bottom: 2px; + width:400px; + color: #636663; + border-bottom: 3px solid; +} h3 { border-bottom: 1px solid #CCCCCC; @@ -236,6 +241,10 @@ label{ text-align:left; } +.dataTables_wrapper { + min-height: 0; +} + .dataTables_wrapper label { float: none; width: auto; @@ -340,10 +349,12 @@ tr.odd td, tr.even td{ tr.odd:hover{ background-color: #E69138 !important; + cursor: pointer; } tr.even:hover{ background-color: #E69138 !important; + cursor: pointer; } .show_hide label{ @@ -587,4 +598,25 @@ ul.action_list li a:hover{ .ui-layout-resizer-open-hover, /* hover-color to 'resize' */ .ui-layout-resizer-dragging { background: #EEE; +} + +.dataTables_length { + width: auto; +} + +.ColVis { + margin: 0 10px 0 10px; + float: left; +} + +.ColVis_Button { + padding: 5px; + font-size: 1em; +} + +.legend { + color: #636663; + margin-left: 10px; + margin-top: 5px; + font-style: italic; } \ No newline at end of file diff --git a/src/sunstone/public/images/network_icon.png b/src/sunstone/public/images/network_icon.png new file mode 100644 index 0000000000..3f234ac4b9 Binary files /dev/null and b/src/sunstone/public/images/network_icon.png differ diff --git a/src/sunstone/public/images/server_icon.png b/src/sunstone/public/images/server_icon.png new file mode 100644 index 0000000000..265b10e594 Binary files /dev/null and b/src/sunstone/public/images/server_icon.png differ diff --git a/src/sunstone/public/images/system_icon.png b/src/sunstone/public/images/system_icon.png new file mode 100644 index 0000000000..2a55d06ce4 Binary files /dev/null and b/src/sunstone/public/images/system_icon.png differ diff --git a/src/sunstone/public/js/plugins/acls-tab.js b/src/sunstone/public/js/plugins/acls-tab.js index 98045c0e7c..a61ca0082d 100644 --- a/src/sunstone/public/js/plugins/acls-tab.js +++ b/src/sunstone/public/js/plugins/acls-tab.js @@ -18,8 +18,9 @@ var dataTable_acls; var $create_acl_dialog; -var acls_tab_content = -'
'; var create_acl_tmpl = @@ -287,7 +292,8 @@ function aclElementArray(acl_json){ acl_array[0], acl_array[1], acl_array[2], - acl_array[3] + acl_array[3], + acl.STRING ] } @@ -480,12 +486,17 @@ $(document).ready(function(){ dataTable_acls = $("#datatable_acls",main_tabs_context).dataTable({ "bJQueryUI": true, "bSortClasses": false, + "sDom" : '<"H"lfrC>t<"F"ip>', + "oColVis": { + "aiExclude": [ 0 ] + }, "sPaginationType": "full_numbers", "bAutoWidth":false, "aoColumnDefs": [ { "bSortable": false, "aTargets": ["check"] }, { "sWidth": "60px", "aTargets": [0] }, - { "sWidth": "35px", "aTargets": [1] } + { "sWidth": "35px", "aTargets": [1] }, + { "bVisible": false, "aTargets": [6]} ], "oLanguage": (datatable_lang != "") ? { @@ -495,7 +506,7 @@ $(document).ready(function(){ dataTable_acls.fnClearTable(); addElement([ spinner, - '','','','',''],dataTable_acls); + '','','','','',''],dataTable_acls); Sunstone.runAction("Acl.list"); diff --git a/src/sunstone/public/js/plugins/clusters-tab.js b/src/sunstone/public/js/plugins/clusters-tab.js index 7cb41a21cd..f08e6ab9ad 100644 --- a/src/sunstone/public/js/plugins/clusters-tab.js +++ b/src/sunstone/public/js/plugins/clusters-tab.js @@ -17,15 +17,16 @@ /*Cluster tab plugin*/ -var clusters_tab_content = -''; +\ +'; var config_actions = { "Config.list" : { diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js index ad4ecbdc49..996a85ba3c 100644 --- a/src/sunstone/public/js/plugins/datastores-tab.js +++ b/src/sunstone/public/js/plugins/datastores-tab.js @@ -17,8 +17,9 @@ /*Datastore tab plugin*/ -var datastores_tab_content = -'