diff --git a/src/sunstone/public/css/app.css b/src/sunstone/public/css/app.css index fb11c5cd95..eb47f03afb 100644 --- a/src/sunstone/public/css/app.css +++ b/src/sunstone/public/css/app.css @@ -6151,78 +6151,79 @@ div.button-bar { /* line 161, ../sass/app.scss */ #logo { - padding-top: 6px; font-weight: bold; color: white; margin: 10%; + margin-top: 15%; + margin-bottom: 15%; } -/* line 168, ../sass/app.scss */ +/* line 169, ../sass/app.scss */ #login-info { padding-top: 4px; float: right; padding-right: 5px; } -/* line 174, ../sass/app.scss */ +/* line 175, ../sass/app.scss */ #links { padding-top: 4px; margin-right: 40px; float: right; } -/* line 180, ../sass/app.scss */ +/* line 181, ../sass/app.scss */ #login-info, #login-info a, #links, #links a { color: white; } -/* line 184, ../sass/app.scss */ +/* line 185, ../sass/app.scss */ #login-info, #login-info a { font-weight: bold; } -/* line 187, ../sass/app.scss */ +/* line 188, ../sass/app.scss */ .sunstone-color { color: #2ba6cb; } -/* line 191, ../sass/app.scss */ +/* line 192, ../sass/app.scss */ #logo-wrapper { float: right; margin-top: 0px; margin-right: 20px; } -/* line 197, ../sass/app.scss */ +/* line 198, ../sass/app.scss */ #menu { padding-right: 0; padding-left: 0; border: 0; } -/* line 203, ../sass/app.scss */ +/* line 204, ../sass/app.scss */ #tabs_content { box-shadow: -8px -8px 11px -11px black; z-index: 2 !important; } -/* line 208, ../sass/app.scss */ +/* line 209, ../sass/app.scss */ #navigation { margin: 8%; box-shadow: 0 0 1px 0px black; } -/* line 213, ../sass/app.scss */ +/* line 214, ../sass/app.scss */ .tabs.vertical li { border-left: none; } -/* line 217, ../sass/app.scss */ +/* line 218, ../sass/app.scss */ .tabs.vertical li.active { border-top: none; } -/* line 222, ../sass/app.scss */ +/* line 223, ../sass/app.scss */ #navigation > li:not(.subTab).navigation-active-li > a, #navigation > li:not(.subTab).active > a { background: #f2f2f2; @@ -6230,12 +6231,12 @@ div.button-bar { color: #555; } -/* line 232, ../sass/app.scss */ +/* line 233, ../sass/app.scss */ #navigation i { margin-right: 3px; } -/* line 237, ../sass/app.scss */ +/* line 238, ../sass/app.scss */ #navigation li.subTab > a { background: #fdfdfd; color: #555; @@ -6243,12 +6244,12 @@ div.button-bar { padding: 10px 11px 10px 25px; } -/* line 244, ../sass/app.scss */ +/* line 245, ../sass/app.scss */ #navigation li.subsubTab { padding-left: 35px; } -/* line 249, ../sass/app.scss */ +/* line 250, ../sass/app.scss */ #navigation li:hover, #navigation .navigation-active-li, #navigation li:hover { font-weight: bold; @@ -6256,7 +6257,7 @@ div.button-bar { } /* top menu css */ -/* line 311, ../sass/app.scss */ +/* line 312, ../sass/app.scss */ #menutop_container { margin: 0px 171px; color: #FFFFFF; @@ -6264,14 +6265,14 @@ div.button-bar { font-weight: bold; } -/* line 317, ../sass/app.scss */ +/* line 318, ../sass/app.scss */ #menutop_navbar { float: left; height: 25px; font-size: 13px; } -/* line 322, ../sass/app.scss */ +/* line 323, ../sass/app.scss */ #menutop_navbar ul { float: left; height: 25px; @@ -6280,12 +6281,12 @@ div.button-bar { padding-left: 1px; } -/* line 329, ../sass/app.scss */ +/* line 330, ../sass/app.scss */ #menutop_navbar ul { background-color: #4d4d4d; } -/* line 332, ../sass/app.scss */ +/* line 333, ../sass/app.scss */ #menutop_navbar ul li { float: left; min-width: 72px; @@ -6302,18 +6303,18 @@ div.button-bar { color: white; } -/* line 348, ../sass/app.scss */ +/* line 349, ../sass/app.scss */ #menutop_navbar ul li:hover { background-color: #ffffff; } /* end top menu css */ -/* line 359, ../sass/app.scss */ +/* line 360, ../sass/app.scss */ .ui-layout-pane { border: none; } -/* line 364, ../sass/app.scss */ +/* line 365, ../sass/app.scss */ .button.small { font-size: 12px; padding: 6px 12px 6px; @@ -6321,205 +6322,229 @@ div.button-bar { height: 28px; } -/* line 371, ../sass/app.scss */ +/* line 372, ../sass/app.scss */ .button { box-shadow: none; } -/* line 375, ../sass/app.scss */ +/* line 376, ../sass/app.scss */ .button.tiny { box-shadow: none; } -/* line 379, ../sass/app.scss */ +/* line 380, ../sass/app.scss */ .panel { padding: 0px; background: #f2f2f2; } -/* line 384, ../sass/app.scss */ +/* line 385, ../sass/app.scss */ .tabs.vertical li a { padding: 15px 11px; } -/* line 388, ../sass/app.scss */ +/* line 389, ../sass/app.scss */ input[type="text"] { height: 28px !important; } -/* line 392, ../sass/app.scss */ +/* line 393, ../sass/app.scss */ .right { float: right; } -/* line 396, ../sass/app.scss */ +/* line 397, ../sass/app.scss */ .ui-layout-pane { background: #fdfdfd; } -/* line 403, ../sass/app.scss */ +/* line 404, ../sass/app.scss */ tr.odd:hover td { background-color: #2ba6cb !important; cursor: pointer; color: white !important; } -/* line 409, ../sass/app.scss */ +/* line 410, ../sass/app.scss */ tr.even:hover td { background-color: #2ba6cb !important; cursor: pointer; color: white !important; } -/* line 415, ../sass/app.scss */ +/* line 416, ../sass/app.scss */ tr { border-bottom: 1px solid #e6e6e6; } -/* line 421, ../sass/app.scss */ +/* line 422, ../sass/app.scss */ table thead tr th, table tfoot tr td { padding: 5px 10px 5px; line-height: 16px; } -/* line 426, ../sass/app.scss */ +/* line 427, ../sass/app.scss */ table { border-collapse: collapse; border-spacing: 0; } /* Growl */ -/* line 432, ../sass/app.scss */ +/* line 433, ../sass/app.scss */ .jGrowl-notification h1 { font-size: 1.2em; } -/* line 436, ../sass/app.scss */ +/* line 437, ../sass/app.scss */ .jGrowl-notification, .jGrowl-notify-submit { border: 2px #444444 solid; background-color: #F3F3F3!important; color: #666666; } -/* line 442, ../sass/app.scss */ +/* line 443, ../sass/app.scss */ .jGrowl-notify-error { border: 2px #660000 solid; background-color: #F39999!important; color: #660000; } -/* line 448, ../sass/app.scss */ +/* line 449, ../sass/app.scss */ .jGrowl-notify-error table td.key_error { text-transform: capitalize; width: 100%; font-weight: bold; } -/* line 454, ../sass/app.scss */ +/* line 455, ../sass/app.scss */ .jGrowl-notify-error table td.key_error:after { content: ":"; } -/* line 461, ../sass/app.scss */ +/* line 462, ../sass/app.scss */ .markrow { background-color: #cdebf5 !important; } -/* line 462, ../sass/app.scss */ +/* line 463, ../sass/app.scss */ .markrowselected { background-color: #2ba6cb !important; color: #FFF; } -/* line 463, ../sass/app.scss */ +/* line 464, ../sass/app.scss */ .markrowchecked { background-color: #cdebf5; } -/* line 466, ../sass/app.scss */ +/* line 467, ../sass/app.scss */ .hidden { display: none; } -/* line 475, ../sass/app.scss */ +/* line 476, ../sass/app.scss */ #navigation li.topTab span.plusIcon, #navigation li.subTab span.plusIcon { display: none; float: right; } -/* line 480, ../sass/app.scss */ +/* line 481, ../sass/app.scss */ span.plusIcon { color: #d0d0d0; } -/* line 484, ../sass/app.scss */ +/* line 485, ../sass/app.scss */ span.plusIcon:hover { color: #555; } -/* line 491, ../sass/app.scss */ +/* line 492, ../sass/app.scss */ table.extended_table tbody tr td { padding: 3px 10px; } -/* line 498, ../sass/app.scss */ +/* line 499, ../sass/app.scss */ .reveal-modal { top: 50px; } -/* line 503, ../sass/app.scss */ +/* line 504, ../sass/app.scss */ .ui-layout-resizer-open-hover, .ui-layout-resizer-dragging { background: #EEE; } -/* line 508, ../sass/app.scss */ +/* line 509, ../sass/app.scss */ .reveal-modal .panel { margin-left: -30px; margin-right: -30px; margin-bottom: 30px; } -/* line 514, ../sass/app.scss */ +/* line 515, ../sass/app.scss */ .reveal-modal.xlarge { padding-top: 0px; width: 80%; + margin-left: -40%; } -/* line 519, ../sass/app.scss */ +/* line 521, ../sass/app.scss */ .reveal-modal { padding-top: 0px; } -/* line 523, ../sass/app.scss */ +/* line 525, ../sass/app.scss */ .reveal-modal h3 { margin-left: 30px; margin-bottom: 7px !important; } -/* line 528, ../sass/app.scss */ +/* line 530, ../sass/app.scss */ .reveal-modal .close-reveal-modal:not(.button) { top: 13px; } -/* line 532, ../sass/app.scss */ +/* line 534, ../sass/app.scss */ .reveal-modal .close-reveal-modal:not(.button):hover { color: #222; } -/* line 536, ../sass/app.scss */ +/* line 538, ../sass/app.scss */ fieldset { - margin: 0px; + margin: 0px 10px; } -/* line 542, ../sass/app.scss */ +/* line 544, ../sass/app.scss */ .graph_table table { border: 0px; margin: 0px; } -/* line 547, ../sass/app.scss */ +/* line 549, ../sass/app.scss */ .graph_table table tr { border: 0px; } + +/* line 554, ../sass/app.scss */ +.ui-layout-pane { + padding: 0px; +} + +/* line 558, ../sass/app.scss */ +.reveal-modal .columns { + padding: 0 8px; +} + +/* line 562, ../sass/app.scss */ +select { + width: auto; +} + +/* line 567, ../sass/app.scss */ +form.creation { + max-height: 450px; + overflow-y: auto; + overflow-x: hidden; + padding: 5px; +} diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js index f69175abfd..5a313e9d28 100644 --- a/src/sunstone/public/js/plugins/datastores-tab.js +++ b/src/sunstone/public/js/plugins/datastores-tab.js @@ -66,78 +66,206 @@ var datastores_tab_content = '\ '; var create_datastore_tmpl = -'
\ -
\ - \ - \ -
\ - \ -
\ - \ -
\ - \ - \ - \ - \ -
\ - \ -
\ - \ -
\ - \ -
\ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ -
\ -
\ -
\ -
\ -
\ +'
\ +
\ +

\ + '+tr("Create Datastore")+'\ +

\ +
\ + \ +
\ +
\ + \ +
\ +
\ + \ +
\ +
\ +
\
\ -
\ -
'; +
\ +
\ +
\ + \ +
\ +
\ + \ +
\ +
\ +
\ +
\ +
\ +
\ + \ +
\ +
\ + \ +
\ +
\ +
\ +
\ +
\ +
\ +
\ +
\ +
\ + ' + tr("Type") + '\ +
\ + \ +
\ +
\ + \ +
\ +
\ + \ +
\ +
\ +
\ +
\ +
\ +
\ + \ +
\ +
\ + \ +
\ +
\ +
\ +
\ +
\ +
\ +
\ +
\ + ' + tr("Managers") + '\ +
\ +
\ + \ +
\ +
\ + \ +
\ +
\ +
\ +
\ +
\ +
\ + \ +
\ +
\ + \ +
\ +
\ +
\ +
\ +
\ +
\ +
\ +
\ +
\ +
\ + \ +
\ +
\ + \ +
\ +
\ +
\ +
\ +
\ +
\ + \ +
\ +
\ + \ +
\ +
\ +
\ +
\ +
\ +
\ + \ +
\ +
\ + \ +
\ +
\ +
\ +
\ +
\ +
\ + \ +
\ +
\ + \ +
\ +
\ +
\ +
\ + \ +
\ +
\ + \ +
\ +
\ +
\ +
\ +
\ +
\ + \ +
\ +
\ + \ +
\ +
\ +
\ +
\ +
\ +
\ + \ +
\ +
\ + \ +
\ +
\ +
\ +
\ + \ +
\ +
\ + \ + \ + \ +
\ + ×\ +'; var datastore_image_table_tmpl='\ \ @@ -649,35 +777,11 @@ function setupCreateDatastoreDialog(){ // modal: true, // width: 400 //}); - dialog.addClass("reveal-modal"); + dialog.addClass("reveal-modal large"); //$('button',dialog).button(); setupTips(dialog); - $('#sys_ds').click(function(){ - if ($(this).is(':checked')) - { - $('label[for="ds_mad"],select#ds_mad,br[name="ds_mad"]',$(this).parent()).fadeOut(); - $('label[for="files_ds"],input#files_ds',$(this).parent()).fadeOut(); - } - else - { - $('label[for="ds_mad"],select#ds_mad,br[name="ds_mad"]',$(this).parent()).fadeIn(); - $('label[for="files_ds"],input#files_ds',$(this).parent()).fadeIn(); - } - }); - - $('#files_ds').click(function(){ - if ($(this).is(':checked')) - { - $('label[for="system"],input#sys_ds',$(this).parent()).fadeOut(); - } - else - { - $('label[for="system"],input#sys_ds',$(this).parent()).fadeIn(); - } - }); - $('#ds_type').change(function(){ hide_all($(this).parent()); var choice_str = $(this).val(); diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js index 858c2a04cb..b5f2a68595 100644 --- a/src/sunstone/public/js/plugins/hosts-tab.js +++ b/src/sunstone/public/js/plugins/hosts-tab.js @@ -200,7 +200,7 @@ var create_host_tmpl =
\ \ \ - \ + \
\ ×\ '; diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js index 88169e2dd0..0d49ca37aa 100644 --- a/src/sunstone/public/js/plugins/images-tab.js +++ b/src/sunstone/public/js/plugins/images-tab.js @@ -86,9 +86,7 @@ var create_image_tmpl =
\ \
\ -
\ -
'+tr("Name that the Image will get. Every image must have a unique name.")+'
\ -
\ +
'+tr("Name that the Image will get. Every image must have a unique name.")+'
\ \
\
\ @@ -137,12 +135,11 @@ var create_image_tmpl =
\
\ '+tr("Image location")+':\ -
\ -
\ +
\
\ '+ tr("Provide a path")+' \
\ -
\ +
\ '+tr("Upload")+'\
\ \
\
\
\ diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index 5a3d097568..f06d5cf81b 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -75,7 +75,7 @@ var create_template_tmpl = '
'+ ''+ '
'+ '
'+ - '
'+ + ''+ '
    '+ '
'+ '
'+ @@ -86,6 +86,7 @@ var create_template_tmpl = '
'+ ''+ ''+ ''+ + ''+ //''+ //''+ '
'+ diff --git a/src/sunstone/public/sass/app.scss b/src/sunstone/public/sass/app.scss index 480ed088aa..8fddece7aa 100644 --- a/src/sunstone/public/sass/app.scss +++ b/src/sunstone/public/sass/app.scss @@ -159,10 +159,11 @@ div.button-bar { #logo { - padding-top: 6px; font-weight: bold; color: white; margin:10%; + margin-top: 15%; + margin-bottom: 15%; } #login-info { @@ -514,6 +515,7 @@ table.extended_table tbody tr td { .reveal-modal.xlarge { padding-top: 0px; width: 80%; + margin-left: -40% } .reveal-modal { @@ -534,7 +536,7 @@ table.extended_table tbody tr td { } fieldset { - margin: 0px; + margin: 0px 10px; } @@ -546,4 +548,25 @@ fieldset { .graph_table table tr { border: 0px; +} + + +.ui-layout-pane { + padding: 0px; +} + +.reveal-modal .columns { + padding: 0 8px; +} + +select { + width: auto; +} + + +form.creation { + max-height: 450px; + overflow-y: auto; + overflow-x: hidden; + padding: 5px; } \ No newline at end of file