diff --git a/web/css/styles.min.css b/web/css/styles.min.css index c1eddece..3dae45c8 100644 --- a/web/css/styles.min.css +++ b/web/css/styles.min.css @@ -658,12 +658,14 @@ input[type="checkbox"] { .l-logo { background-image: url("/images/sprite.png?1446554103"); background-position: -117px -7px; +/* background-position: -125px -478px; */ background-repeat: no-repeat; display: inline-block; float: left; height: 22px; margin-top: 4px; width: 73px; +/* width: 42px; */ margin-left: -2px; } @@ -716,6 +718,11 @@ input[type="checkbox"] { text-decoration: underline; color: #5edad0; } +.l-menu.active .l-menu__item.focus a:hover { + background-color: #f79b44; + color: #fff; +} + .lang-ua .l-menu__item a, .lang-nl .l-menu__item a, @@ -1281,13 +1288,25 @@ div.l-content > div.l-separator:nth-of-type(4) { } .units .l-unit { border-bottom: 1px solid #ddd; + border-left: 2px solid #fff; } +.units .l-unit.l-unit--starred { + border-left: 2px solid #ff6701; +} +.units.active .l-unit.focus { + border-left: 2px solid #5edad0; +} +.units.active .l-unit.focus .l-unit__name { + color: #36b3a9; +} +.units.active .l-unit.focus .l-unit-toolbar__col--right { + display: block; +} + .units > div:last-child { border-bottom: none; } - - .l-unit-ftl { color: #929292; padding: 0 0 0 15px; @@ -1296,10 +1315,6 @@ div.l-content > div.l-separator:nth-of-type(4) { .l-unit:hover .l-unit-toolbar__col--right { display: block; } -.l-unit--starred { - border-left: 2px solid #ff6701; - padding-left: 13px; -} .l-unit--blue { border-left: 2px solid #55c9c0; } @@ -1370,8 +1385,9 @@ div.l-content > div.l-separator:nth-of-type(4) { background-color: #d1eddc; } .l-unit-toolbar{ - height: 38px; + height: 39px; } + .l-unit label { margin-bottom: 20px; } @@ -1382,6 +1398,7 @@ div.l-content > div.l-separator:nth-of-type(4) { .l-unit__col { display: table-cell; padding-top: 1px; + vertical-align: top; } .l-unit__col--left { width: 124px; @@ -1395,6 +1412,14 @@ div.l-content > div.l-separator:nth-of-type(4) { padding-left: 30px; } +.l-unit__col--right.total { + padding-left: 16px; +} + +.l-unit__col--right.back { + padding-left: 78px +} + .l-sort-toolbar .step-left { padding-left: 40px; } @@ -1405,7 +1430,7 @@ div.l-content > div.l-separator:nth-of-type(4) { .l-unit__date { font-size: 12px; letter-spacing: 1px; - margin-top: -13px; + margin-top: 10px; padding-bottom: 30px; } @@ -1566,6 +1591,41 @@ div.l-content > div.l-separator:nth-of-type(4) { display: none; } +.l-unit-toolbar .shortcut { + display: none; +} + +.units.active .l-unit.focus .l-unit-toolbar .shortcut { + display: block; + background-color: #c8c7c6; + border-radius: 13px; + color: #fff; + cursor: pointer; + display: block; + font-size: 12px; + font-weight: 700; + line-height: 25px; + padding-left: 7px; + padding-right: 9px; + position: absolute; + right: 3px; + top: 3px; +} +.units.active .l-unit.focus .l-unit-toolbar .shortcut.delete { + font-size: 10px; + padding-left: 2px; + padding-right: 5px; + text-transform: capitalize; +} +.units.active .l-unit.focus .l-unit-toolbar .shortcut.enter { + font-size: 17px; + padding-left: 1px; + padding-right: 7px; +} +.units.active .l-unit.focus .l-unit-toolbar i { + background: none; +} + .l-unit__stat-col.volume { font-size: 12px; line-height: 17px; @@ -2609,6 +2669,26 @@ td.hint { border: 1px solid #D1D70D; background-color: #D1D70D; } + +.ui-dialog button.cancel { + color: #000; + border: 1px solid #555; + background-color: #555; +} +/* +.ui-dialog button.cancel:hover { + color: #fff; + border: 1px solid #999; + background-color: #999; +} +.ui-dialog button.cancel:active { + border: 1px solid #D1D70D; + background-color: #D1D70D; +} +*/ + + + .ui-button span { color: #fff; } @@ -2628,6 +2708,9 @@ td.hint { color: #fff; } +.ui-dialog button.cancel span { + color: #ccc; +} .unlim-trigger { @@ -3045,4 +3128,6 @@ form#vstobjects.suspended { font-size: 12px; } - +.ui-dialog .ui-dialog-content { + padding: 10px 26px 30px !important; +} diff --git a/web/images/sprite.png b/web/images/sprite.png index 05535f56..4a3aeffc 100644 Binary files a/web/images/sprite.png and b/web/images/sprite.png differ diff --git a/web/images/vesta_logo.png b/web/images/vesta_logo.png index 2e4793bb..35eeea85 100644 Binary files a/web/images/vesta_logo.png and b/web/images/vesta_logo.png differ diff --git a/web/inc/main.php b/web/inc/main.php index 68fbe272..738c811d 100644 --- a/web/inc/main.php +++ b/web/inc/main.php @@ -286,6 +286,11 @@ function display_error_block() { Ok: function() { $( this ).dialog( "close" ); } + }, + create:function () { + $(this).closest(".ui-dialog") + .find(".ui-button:first") + .addClass("submit"); } }); }); diff --git a/web/js/events.js b/web/js/events.js index c038e8fd..40593312 100644 --- a/web/js/events.js +++ b/web/js/events.js @@ -108,10 +108,12 @@ VE.callbacks.click.do_delete = function(evt, elm) { * @param custom_config Custom configuration parameters passed to dialog initialization (optional) */ VE.helpers.createConfirmationDialog = function(elm, dialog_title, confirmed_location_url, custom_config) { + var custom_config = !custom_config ? {} : custom_config; var config = { modal: true, - autoOpen: true, + //autoOpen: true, + resizable: false, width: 360, title: dialog_title, close: function() { @@ -121,15 +123,27 @@ VE.helpers.createConfirmationDialog = function(elm, dialog_title, confirmed_loca "OK": function(event, ui) { location.href = confirmed_location_url; }, - "Cancel": function() { + Cancel: function() { $(this).dialog("close"); - $(this).dialog("destroy"); } + }, + create:function () { + $(this).closest(".ui-dialog") + .find(".ui-button:first") + .addClass("submit"); + $(this).closest(".ui-dialog") + .find(".ui-button") + .eq(1) // the first button + .addClass("cancel"); } } + + + var reference_copied = $(elm[0]).clone(); + console.log(reference_copied); config = $.extend(config, custom_config); - var reference_copied = $(elm).clone(); $(reference_copied).dialog(config); + } /* @@ -141,7 +155,7 @@ VE.helpers.warn = function(msg) { VE.helpers.extendPasswordFields = function() { var references = ['.password']; - + $(document).ready(function() { $(references).each(function(i, ref) { VE.helpers.initAdditionalPasswordFieldElements(ref); @@ -234,70 +248,30 @@ VE.helpers.refresh_timer = { } VE.navigation.enter_focused = function() { - if($(VE.navigation.state.menu_selector + '.focus a').attr('href')){ - location.href=($(VE.navigation.state.menu_selector + '.focus a').attr('href')); - } -} - -/* -VE.navigation.move_focus_left = function(){ - var index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_selector+'.focus'))); - if(index == -1) - index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_active_selector))); - if(index > 0){ - $(VE.navigation.state.menu_selector).removeClass('focus'); - $($(VE.navigation.state.menu_selector)[index-1]).addClass('focus'); + if($('.units').hasClass('active')){ + location.href=($('.units.active .l-unit.focus .actions-panel__col.actions-panel__edit a').attr('href')); } else { - $($(VE.navigation.state.menu_selector)[0]).addClass('focus'); - } - - -} - -VE.navigation.move_focus_right = function(){ - var max_index = $(VE.navigation.state.menu_selector).length-1; - var index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_selector+'.focus'))); - if(index == -1) - index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_active_selector))) || 0; - - if(index < max_index){ - $(VE.navigation.state.menu_selector).removeClass('focus'); - $($(VE.navigation.state.menu_selector)[index+1]).addClass('focus'); + if($(VE.navigation.state.menu_selector + '.focus a').attr('href')){ + location.href=($(VE.navigation.state.menu_selector + '.focus a').attr('href')); + } } } -VE.navigation.switch_menu = function(){ - if(VE.navigation.state.active_menu == 0){ - VE.navigation.state.active_menu = 1; - VE.navigation.state.menu_selector = '.l-stat__col'; - VE.navigation.state.menu_active_selector = '.l-stat__col--active'; - $('.l-menu').removeClass('active'); - $('.l-stat').addClass('active'); - } else { - VE.navigation.state.active_menu = 0; - VE.navigation.state.menu_selector = '.l-menu__item'; - VE.navigation.state.menu_active_selector = '.l-menu__item--active'; - $('.l-menu').addClass('active'); - $('.l-stat').removeClass('active'); - } - - - var index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_selector+'.focus'))); - if(index == -1){ - index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_active_selector))) || 0; - if(index == -1) - index = 0; - $($(VE.navigation.state.menu_selector)[index]).addClass('focus'); - } -} -*/ - - VE.navigation.move_focus_left = function(){ var index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_selector+'.focus'))); if(index == -1) index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_active_selector))); + if($('.units').hasClass('active')){ + $('.units').removeClass('active'); + if(VE.navigation.state.active_menu == 0){ + $('.l-menu').addClass('active'); + } else { + $('.l-stat').addClass('active'); + } + index++; + } + $(VE.navigation.state.menu_selector).removeClass('focus'); if(index > 0){ @@ -312,9 +286,18 @@ VE.navigation.move_focus_right = function(){ var index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_selector+'.focus'))); if(index == -1) index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_active_selector))) || 0; - $(VE.navigation.state.menu_selector).removeClass('focus'); + if($('.units').hasClass('active')){ + $('.units').removeClass('active'); + if(VE.navigation.state.active_menu == 0){ + $('.l-menu').addClass('active'); + } else { + $('.l-stat').addClass('active'); + } + index--; + } + if(index < max_index){ $($(VE.navigation.state.menu_selector)[index+1]).addClass('focus'); } else { @@ -322,6 +305,53 @@ VE.navigation.move_focus_right = function(){ } } +VE.navigation.move_focus_down = function(){ + var max_index = $('.units .l-unit:not(.header)').length-1; + var index = parseInt($('.units .l-unit').index($('.units .l-unit.focus'))); + + if($('.l-menu').hasClass('active') || $('.l-stat').hasClass('active')){ + $('.l-menu').removeClass('active'); + $('.l-stat').removeClass('active'); + $('.units').addClass('active'); + index--; + + if(index == -2) + index = -1; + } + + if(index < max_index){ + $('.units .l-unit.focus').removeClass('focus'); + $($('.units .l-unit:not(.header)')[index+1]).addClass('focus'); + + $('html, body').animate({ + scrollTop: $('.units .l-unit.focus').offset().top - 200 + }, 80); + } +} + +VE.navigation.move_focus_up = function(){ + var index = parseInt($('.units .l-unit:not(.header)').index($('.units .l-unit.focus'))); + + if(index == -1) + index = 0; + + if($('.l-menu').hasClass('active') || $('.l-stat').hasClass('active')){ + $('.l-menu').removeClass('active'); + $('.l-stat').removeClass('active'); + $('.units').addClass('active'); + index++; + } + + if(index > 0){ + $('.units .l-unit.focus').removeClass('focus'); + $($('.units .l-unit:not(.header)')[index-1]).addClass('focus'); + + $('html, body').animate({ + scrollTop: $('.units .l-unit.focus').offset().top - 200 + }, 80); + } +} + VE.navigation.switch_menu = function(position){ position = position || 'first'; // last @@ -405,8 +435,6 @@ VE.notifications.mark_seen = function(id){ } - - VE.navigation.init = function(){ if($('.l-menu__item.l-menu__item--active').length){ // VE.navigation.switch_menu(); @@ -420,6 +448,18 @@ VE.navigation.init = function(){ } } +VE.navigation.shortcut = function(elm){ + var action = elm.attr('key-action'); + + if(action == 'js'){ + var e = elm.find('.data-controls'); + VE.core.dispatch(true, e, 'click'); + } + if(action == 'href') { + location.href=elm.find('a').attr('href'); + } +} + VE.helpers.extendPasswordFields(); diff --git a/web/templates/admin/add_dns_rec.html b/web/templates/admin/add_dns_rec.html index af105041..76964b4c 100644 --- a/web/templates/admin/add_dns_rec.html +++ b/web/templates/admin/add_dns_rec.html @@ -31,6 +31,7 @@ ?>
+
diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html index 9b68b403..2dd8c78d 100644 --- a/web/templates/admin/add_mail_acc.html +++ b/web/templates/admin/add_mail_acc.html @@ -31,6 +31,7 @@ ?> +