diff --git a/src/sunstone/public/css/app.css b/src/sunstone/public/css/app.css index f6660358d9..2f3e3d33a2 100644 --- a/src/sunstone/public/css/app.css +++ b/src/sunstone/public/css/app.css @@ -2792,7 +2792,7 @@ ul.flyout li.active a, .nav-bar li ul li.active a { position: absolute; top: 0; left: -20px; - background: url('/images/foundation/orbit/rotator-black.png?1361268291') no-repeat; + background: url('/images/foundation/orbit/rotator-black.png?1361316417') no-repeat; z-index: 3; } /* line 27, ../../../../../../../../../var/lib/gems/1.9.1/gems/zurb-foundation-3.2.5/scss/foundation/components/modules/_orbit.scss */ @@ -2814,7 +2814,7 @@ ul.flyout li.active a, .nav-bar li ul li.active a { .orbit-wrapper span.mask.move { width: 40px; left: 0; - background: url('/images/foundation/orbit/timer-black.png?1361268291') repeat 0 0; + background: url('/images/foundation/orbit/timer-black.png?1361316417') repeat 0 0; } /* line 32, ../../../../../../../../../var/lib/gems/1.9.1/gems/zurb-foundation-3.2.5/scss/foundation/components/modules/_orbit.scss */ .orbit-wrapper span.pause { @@ -2824,13 +2824,13 @@ ul.flyout li.active a, .nav-bar li ul li.active a { position: absolute; top: 0; left: 0; - background: url('/images/foundation/orbit/pause-black.png?1361268291') no-repeat; + background: url('/images/foundation/orbit/pause-black.png?1361316417') no-repeat; z-index: 4; opacity: 0; } /* line 33, ../../../../../../../../../var/lib/gems/1.9.1/gems/zurb-foundation-3.2.5/scss/foundation/components/modules/_orbit.scss */ .orbit-wrapper span.pause.active { - background: url('/images/foundation/orbit/pause-black.png?1361268291') no-repeat 0 -40px; + background: url('/images/foundation/orbit/pause-black.png?1361316417') no-repeat 0 -40px; } /* line 35, ../../../../../../../../../var/lib/gems/1.9.1/gems/zurb-foundation-3.2.5/scss/foundation/components/modules/_orbit.scss */ .orbit-wrapper .timer:hover span.pause, .orbit-wrapper .timer:focus span.pause, .orbit-wrapper span.pause.active { @@ -2877,24 +2877,24 @@ ul.flyout li.active a, .nav-bar li ul li.active a { } /* line 48, ../../../../../../../../../var/lib/gems/1.9.1/gems/zurb-foundation-3.2.5/scss/foundation/components/modules/_orbit.scss */ .orbit-wrapper .slider-nav span.right { - background: url('/images/foundation/orbit/right-arrow.png?1361268291'); + background: url('/images/foundation/orbit/right-arrow.png?1361316417'); background-size: 100%; right: 0; } /* line 49, ../../../../../../../../../var/lib/gems/1.9.1/gems/zurb-foundation-3.2.5/scss/foundation/components/modules/_orbit.scss */ .orbit-wrapper .slider-nav span.left { - background: url('/images/foundation/orbit/left-arrow.png?1361268291'); + background: url('/images/foundation/orbit/left-arrow.png?1361316417'); background-size: 100%; left: 0; } /* line 54, ../../../../../../../../../var/lib/gems/1.9.1/gems/zurb-foundation-3.2.5/scss/foundation/components/modules/_orbit.scss */ .lt-ie9 .orbit-wrapper .slider-nav span.right { - background: url('/images/foundation/orbit/right-arrow-small.png?1361268291'); + background: url('/images/foundation/orbit/right-arrow-small.png?1361316417'); } /* line 55, ../../../../../../../../../var/lib/gems/1.9.1/gems/zurb-foundation-3.2.5/scss/foundation/components/modules/_orbit.scss */ .lt-ie9 .orbit-wrapper .slider-nav span.left { - background: url('/images/foundation/orbit/left-arrow-small.png?1361268291'); + background: url('/images/foundation/orbit/left-arrow-small.png?1361316417'); } /* Bullet Nav ---------------------- */ @@ -2915,7 +2915,7 @@ ul.orbit-bullets li { cursor: pointer; color: #999999; text-indent: -9999px; - background: url('/images/foundation/orbit/bullets.jpg?1361268291') no-repeat 4px 0; + background: url('/images/foundation/orbit/bullets.jpg?1361316417') no-repeat 4px 0; width: 13px; height: 12px; overflow: hidden; @@ -6295,83 +6295,84 @@ div.button-bar { /* line 346, ../sass/app.scss */ .button.small { - font-size: 14px; + font-size: 12px; padding: 6px 12px 6px; box-shadow: none; + height: 28px; } -/* line 352, ../sass/app.scss */ +/* line 353, ../sass/app.scss */ .panel { padding: 0px; background: #f2f2f2; } -/* line 357, ../sass/app.scss */ +/* line 358, ../sass/app.scss */ .tabs.vertical li a { padding: 15px 11px; } -/* line 361, ../sass/app.scss */ +/* line 362, ../sass/app.scss */ input[type="text"] { height: 28px !important; } -/* line 365, ../sass/app.scss */ +/* line 366, ../sass/app.scss */ .right { float: right; } -/* line 369, ../sass/app.scss */ +/* line 370, ../sass/app.scss */ .ui-layout-pane { background: #fdfdfd; } -/* line 376, ../sass/app.scss */ +/* line 377, ../sass/app.scss */ tr.odd:hover { background-color: #e69138 !important; cursor: pointer; } -/* line 381, ../sass/app.scss */ +/* line 382, ../sass/app.scss */ tr.even:hover { background-color: #e69138 !important; cursor: pointer; } -/* line 389, ../sass/app.scss */ +/* line 390, ../sass/app.scss */ table thead tr th, table tfoot tr td { padding: 5px 10px 5px; line-height: 16px; } /* Growl */ -/* line 395, ../sass/app.scss */ +/* line 396, ../sass/app.scss */ .jGrowl-notification h1 { font-size: 1.2em; } -/* line 399, ../sass/app.scss */ +/* line 400, ../sass/app.scss */ .jGrowl-notification, .jGrowl-notify-submit { border: 2px #444444 solid; background-color: #F3F3F3!important; color: #666666; } -/* line 405, ../sass/app.scss */ +/* line 406, ../sass/app.scss */ .jGrowl-notify-error { border: 2px #660000 solid; background-color: #F39999!important; color: #660000; } -/* line 411, ../sass/app.scss */ +/* line 412, ../sass/app.scss */ .jGrowl-notify-error table td.key_error { text-transform: capitalize; width: 100%; font-weight: bold; } -/* line 417, ../sass/app.scss */ +/* line 418, ../sass/app.scss */ .jGrowl-notify-error table td.key_error:after { content: ":"; } diff --git a/src/sunstone/public/js/plugins/groups-tab.js b/src/sunstone/public/js/plugins/groups-tab.js index f6a69230f7..9af7299c78 100644 --- a/src/sunstone/public/js/plugins/groups-tab.js +++ b/src/sunstone/public/js/plugins/groups-tab.js @@ -39,11 +39,26 @@ var group_acct_graphs = [ ]; var groups_tab_content = '\ -

'+tr("Groups")+'

\ -
\ -
\ +\ +
\ +
\ +

'+tr("Groups")+'

\ +
\ +
\ +
\ +
\ +
\
\ -\ +
\ + \ +
\ +
\ +
\ +\ +\ +
\ +
\ +
\ \ \ \ @@ -80,6 +95,7 @@ var create_group_tmpl = \ \ \ + ×\ '; var group_quotas_tmpl = '\ @@ -259,12 +275,12 @@ var group_actions = { var group_buttons = { "Group.refresh" : { type: "action", - text: '', + layout: "refresh", alwaysActive: true }, "Group.create_dialog" : { type: "create_dialog", - text: tr("+ New Group"), + layout: "create", condition: mustBeAdmin }, // "Group.chown" : { @@ -277,18 +293,20 @@ var group_buttons = { "Group.quotas_dialog" : { type : "action", text : tr("Update quotas"), + layout: "more_select", condition: mustBeAdmin }, "Group.delete" : { type: "confirm", text: tr("Delete"), + layout: "del", condition: mustBeAdmin }, - "Group.help" : { - type: "action", - text: '?', - alwaysActive: true - } + //"Group.help" : { + // type: "action", + // text: '?', + // alwaysActive: true + //} }; var group_info_panel = { @@ -564,25 +582,26 @@ function setupCreateGroupDialog(){ var dialog = $create_group_dialog; dialog.html(create_group_tmpl); - dialog.dialog({ - autoOpen: false, - modal: true, - width: 400 - }); + //dialog.dialog({ + // autoOpen: false, + // modal: true, + // width: 400 + //}); + dialog.addClass("reveal-modal"); - $('button',dialog).button(); + //$('button',dialog).button(); $('#create_group_form',dialog).submit(function(){ var name=$('#name',this).val(); var group_json = { "group" : { "name" : name }}; Sunstone.runAction("Group.create",group_json); - $create_group_dialog.dialog('close'); + $create_group_dialog.trigger("reveal:close"); return false; }); } function popUpCreateGroupDialog(){ - $create_group_dialog.dialog('open'); + $create_group_dialog.trigger("reveal:close") return false; } @@ -613,11 +632,7 @@ function setGroupAutorefresh(){ $(document).ready(function(){ dataTable_groups = $("#datatable_groups",main_tabs_context).dataTable({ - "bJQueryUI": true, - "bSortClasses": false, - "sDom" : '<"H"lfrC>t<"F"ip>', - "sPaginationType": "full_numbers", - "bAutoWidth":false, + "sDom" : "<'H'>t<'row'<'six columns'i><'six columns'p>>", "aoColumnDefs": [ { "bSortable": false, "aTargets": ["check"] }, { "sWidth": "60px", "aTargets": [0] }, diff --git a/src/sunstone/public/js/plugins/users-tab.js b/src/sunstone/public/js/plugins/users-tab.js index 40068d1ff6..d7a8dc080f 100644 --- a/src/sunstone/public/js/plugins/users-tab.js +++ b/src/sunstone/public/js/plugins/users-tab.js @@ -928,6 +928,10 @@ $(document).ready(function(){ // spinner, // '','','','','','','',''],dataTable_users); + $('#user_search').keyup(function(){ + dataTable_users.fnFilter( $(this).val() ); + }) + Sunstone.runAction("User.list"); setupCreateUserDialog(); diff --git a/src/sunstone/public/sass/app.scss b/src/sunstone/public/sass/app.scss index 2bc1b97326..3d75177b95 100644 --- a/src/sunstone/public/sass/app.scss +++ b/src/sunstone/public/sass/app.scss @@ -344,9 +344,10 @@ div.button-bar { .button.small { - font-size: 14px; + font-size: 12px; padding: 6px 12px 6px; box-shadow: none; + height:28px; } .panel {