From 0b6587f771741d75474d36a1a3169d5ba248e5c5 Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Thu, 9 Apr 2015 20:20:08 +1000 Subject: [PATCH] Fixes #1019 - prevents lock out of full screen mode Reorder system setting items --- modules/backend/ServiceProvider.php | 35 ++--- modules/backend/assets/css/october.css | 4 +- .../backend/assets/less/layout/mainmenu.less | 4 +- .../codeeditor/assets/css/codeeditor.css | 126 +++--------------- .../codeeditor/assets/less/codeeditor.less | 2 +- .../richeditor/assets/css/richeditor.css | 8 +- .../richeditor/assets/less/richeditor.less | 2 +- modules/cms/ServiceProvider.php | 2 +- modules/system/ServiceProvider.php | 58 ++++---- 9 files changed, 79 insertions(+), 162 deletions(-) diff --git a/modules/backend/ServiceProvider.php b/modules/backend/ServiceProvider.php index 4f23977b8..581f9dc26 100644 --- a/modules/backend/ServiceProvider.php +++ b/modules/backend/ServiceProvider.php @@ -101,14 +101,15 @@ class ServiceProvider extends ModuleServiceProvider 'permissions' => ['backend.manage_branding'], 'order' => 500 ], - 'editor' => [ - 'label' => 'backend::lang.editor.menu_label', - 'description' => 'backend::lang.editor.menu_description', + 'myaccount' => [ + 'label' => 'backend::lang.myaccount.menu_label', + 'description' => 'backend::lang.myaccount.menu_description', 'category' => SettingsManager::CATEGORY_MYSETTINGS, - 'icon' => 'icon-code', - 'url' => Backend::URL('backend/editorpreferences'), - 'order' => 600, - 'context' => 'mysettings' + 'icon' => 'icon-user', + 'url' => Backend::URL('backend/users/myaccount'), + 'order' => 500, + 'context' => 'mysettings', + 'keywords' => 'backend::lang.myaccount.menu_keywords' ], 'backend_preferences' => [ 'label' => 'backend::lang.backend_preferences.menu_label', @@ -116,18 +117,17 @@ class ServiceProvider extends ModuleServiceProvider 'category' => SettingsManager::CATEGORY_MYSETTINGS, 'icon' => 'icon-laptop', 'class' => 'Backend\Models\BackendPreferences', - 'order' => 500, + 'order' => 510, 'context' => 'mysettings' ], - 'myaccount' => [ - 'label' => 'backend::lang.myaccount.menu_label', - 'description' => 'backend::lang.myaccount.menu_description', + 'editor' => [ + 'label' => 'backend::lang.editor.menu_label', + 'description' => 'backend::lang.editor.menu_description', 'category' => SettingsManager::CATEGORY_MYSETTINGS, - 'icon' => 'icon-user', - 'url' => Backend::URL('backend/users/myaccount'), - 'order' => 400, - 'context' => 'mysettings', - 'keywords' => 'backend::lang.myaccount.menu_keywords' + 'icon' => 'icon-code', + 'url' => Backend::URL('backend/editorpreferences'), + 'order' => 520, + 'context' => 'mysettings' ], 'access_logs' => [ 'label' => 'backend::lang.access_log.menu_label', @@ -136,7 +136,7 @@ class ServiceProvider extends ModuleServiceProvider 'icon' => 'icon-lock', 'url' => Backend::url('backend/accesslogs'), 'permissions' => ['system.access_logs'], - 'order' => 800 + 'order' => 920 ] ]); }); @@ -183,6 +183,7 @@ class ServiceProvider extends ModuleServiceProvider $combiner->registerBundle('~/modules/backend/formwidgets/datepicker/assets/js/build.js'); $combiner->registerBundle('~/modules/backend/formwidgets/richeditor/assets/less/richeditor.less'); $combiner->registerBundle('~/modules/backend/formwidgets/richeditor/assets/js/build.js'); + $combiner->registerBundle('~/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less'); }); } diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css index aca75c1ba..eb5e9d595 100644 --- a/modules/backend/assets/css/october.css +++ b/modules/backend/assets/css/october.css @@ -2283,7 +2283,7 @@ nav#layout-mainmenu.navbar ul li.icon a{padding:14px} nav#layout-mainmenu.navbar ul li.power-off i,nav#layout-mainmenu.navbar ul li.preview i{font-size:20px} nav#layout-mainmenu.navbar ul li.power-off a,nav#layout-mainmenu.navbar ul li.preview a{padding:22px 20px 20px 20px} nav#layout-mainmenu.navbar ul li.account{margin-right:0;line-height:23px} -nav#layout-mainmenu.navbar ul li.account a{padding-right:20px;position:relative;z-index:900} +nav#layout-mainmenu.navbar ul li.account a{padding-right:20px;position:relative;z-index:590} nav#layout-mainmenu.navbar ul li.account img{width:25px;margin-right:7px;position:relative;top:-2px} nav#layout-mainmenu.navbar ul.nav{display:inline-block} nav#layout-mainmenu.navbar .menu-toggle{display:none} @@ -2293,7 +2293,7 @@ nav#layout-mainmenu.navbar .toolbar-item:before{left:-12px} nav#layout-mainmenu.navbar .toolbar-item:after{right:-12px} nav#layout-mainmenu.navbar .toolbar-item.scroll-active-before:before{color:#ffffff} nav#layout-mainmenu.navbar .toolbar-item.scroll-active-after:after{color:#ffffff} -nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu{position:fixed;top:63px;right:0;width:225px;background:#2b3e50;z-index:900;display:none} +nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu{position:fixed;top:63px;right:0;width:225px;background:#2b3e50;z-index:590;display:none} nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu.active{display:block} nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu:after{content:'';display:block;width:0;height:0;border-left:11px solid transparent;border-right:11px solid transparent;border-bottom:12px solid #2b3e50;right:40px;top:-12px;position:absolute} nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu ul{float:none;display:block} diff --git a/modules/backend/assets/less/layout/mainmenu.less b/modules/backend/assets/less/layout/mainmenu.less index 4c205f731..1a187b888 100644 --- a/modules/backend/assets/less/layout/mainmenu.less +++ b/modules/backend/assets/less/layout/mainmenu.less @@ -66,7 +66,7 @@ nav#layout-mainmenu.navbar { a { padding-right: 20px; position: relative; - z-index: 900; + z-index: 590; } img { @@ -100,7 +100,7 @@ nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu { right: 0; width: 225px; background: @color-accountmenu-bg; - z-index: 900; + z-index: 590; display: none; &.active { diff --git a/modules/backend/formwidgets/codeeditor/assets/css/codeeditor.css b/modules/backend/formwidgets/codeeditor/assets/css/codeeditor.css index 91ce203c6..48973735a 100644 --- a/modules/backend/formwidgets/codeeditor/assets/css/codeeditor.css +++ b/modules/backend/formwidgets/codeeditor/assets/css/codeeditor.css @@ -1,105 +1,21 @@ -.field-codeeditor { - width: 100%; - position: relative; - border: 2px solid #e0e0e0; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; -} -.field-codeeditor textarea { - opacity: 0; - filter: alpha(opacity=0); -} -.field-codeeditor.editor-focus { - border: 2px solid #808c8d; -} -.field-codeeditor.size-tiny { - min-height: 50px; -} -.field-codeeditor.size-small { - min-height: 100px; -} -.field-codeeditor.size-large { - min-height: 200px; -} -.field-codeeditor.size-huge { - min-height: 250px; -} -.field-codeeditor.size-giant { - min-height: 350px; -} -.field-codeeditor .ace_search { - font-family: 'Open Sans', Arial, sans-serif; - font-size: 14px; - color: #333333; - z-index: 153; -} -.field-codeeditor .editor-code { - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; -} -.field-codeeditor .editor-toolbar { - position: absolute; - top: 3px; - right: 3px; - z-index: 150; -} -.field-codeeditor .editor-toolbar > ul, -.field-codeeditor .editor-toolbar ul > li { - list-style-type: none; - padding: 0; - margin: 0; -} -.field-codeeditor .editor-toolbar > ul > li { - float: left; -} -.field-codeeditor .editor-toolbar > ul > li > a { - display: block; - height: 25px; - width: 25px; - color: #666; - font-size: 20px; - text-align: center; - text-decoration: none; -} -.field-codeeditor .editor-toolbar > ul > li > a > abbr { - position: absolute; - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} -.field-codeeditor .editor-toolbar > ul > li > a > i { - opacity: 0.4; - filter: alpha(opacity=40); - display: block; -} -.field-codeeditor .editor-toolbar > ul > li > a > i:before { - font-size: 14px; -} -.field-codeeditor .editor-toolbar > ul > li > a:hover > i, -.field-codeeditor .editor-toolbar > ul > li > a:focus > i { - opacity: 1; - filter: alpha(opacity=100); -} -.field-codeeditor.editor-fullscreen { - z-index: 151; - position: fixed!important; - top: 0; - left: 0; - height: 100%; - border-width: 0; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.field-codeeditor.editor-fullscreen .editor-code { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.field-codeeditor.editor-fullscreen .editor-toolbar { - z-index: 152; -} +.field-codeeditor{width:100%;position:relative;border:2px solid #e0e0e0;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px} +.field-codeeditor textarea{opacity:0;filter:alpha(opacity=0)} +.field-codeeditor.editor-focus{border:2px solid #808c8d} +.field-codeeditor.size-tiny{min-height:50px} +.field-codeeditor.size-small{min-height:100px} +.field-codeeditor.size-large{min-height:200px} +.field-codeeditor.size-huge{min-height:250px} +.field-codeeditor.size-giant{min-height:350px} +.field-codeeditor .ace_search{font-family:'Open Sans',Arial,sans-serif;font-size:14px;color:#333333;z-index:603} +.field-codeeditor .editor-code{-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px} +.field-codeeditor .editor-toolbar{position:absolute;top:3px;right:3px;z-index:600} +.field-codeeditor .editor-toolbar > ul,.field-codeeditor .editor-toolbar ul > li{list-style-type:none;padding:0;margin:0} +.field-codeeditor .editor-toolbar > ul > li{float:left} +.field-codeeditor .editor-toolbar > ul > li > a{display:block;height:25px;width:25px;color:#666;font-size:20px;text-align:center;text-decoration:none} +.field-codeeditor .editor-toolbar > ul > li > a > abbr{position:absolute;font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0} +.field-codeeditor .editor-toolbar > ul > li > a > i{opacity:0.4;filter:alpha(opacity=40);display:block} +.field-codeeditor .editor-toolbar > ul > li > a > i:before{font-size:14px} +.field-codeeditor .editor-toolbar > ul > li > a:hover > i,.field-codeeditor .editor-toolbar > ul > li > a:focus > i{opacity:1;filter:alpha(opacity=100)} +.field-codeeditor.editor-fullscreen{z-index:601;position:fixed !important;top:0;left:0;height:100%;border-width:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0} +.field-codeeditor.editor-fullscreen .editor-code{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0} +.field-codeeditor.editor-fullscreen .editor-toolbar{z-index:602} \ No newline at end of file diff --git a/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less b/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less index 0757ab7af..83528c6cf 100644 --- a/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less +++ b/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less @@ -1,6 +1,6 @@ @import "../../../../assets/less/core/boot.less"; -@codeeditor-zindex: 150; +@codeeditor-zindex: 600; .field-codeeditor { width: 100%; diff --git a/modules/backend/formwidgets/richeditor/assets/css/richeditor.css b/modules/backend/formwidgets/richeditor/assets/css/richeditor.css index a6961ba99..a0d61624d 100644 --- a/modules/backend/formwidgets/richeditor/assets/css/richeditor.css +++ b/modules/backend/formwidgets/richeditor/assets/css/richeditor.css @@ -173,7 +173,7 @@ to{background-position:0 0} .redactor-editor figure[data-type=quote] cite:before{content:"\2014\00a0"} .redactor-editor figure[data-type=quote] cite:empty:before{opacity:0.4;content:"\2014 Type to add citation (optional)"} .redactor-box figcaption:empty:before{opacity:.4;content:"Type to add caption (optional)"} -.redactor-box .oc-figure-controls{background:#2b3e50 !important;padding:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;position:absolute;display:none;white-space:nowrap;left:10px;top:-50px;margin:0 auto;font-family:'Open Sans',Arial,sans-serif;line-height:20px;font-style:normal;z-index:800;text-align:center} +.redactor-box .oc-figure-controls{background:#2b3e50 !important;padding:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;position:absolute;display:none;white-space:nowrap;left:10px;top:-50px;margin:0 auto;font-family:'Open Sans',Arial,sans-serif;line-height:20px;font-style:normal;z-index:1100;text-align:center} .redactor-box .oc-figure-controls:after{content:' ';left:0;position:absolute;display:block;height:10px;background:rgba(0,0,0,0.1);width:100%;bottom:-10px;opacity:0.1;filter:alpha(opacity=10);filter:alpha(opacity=0.1);-moz-opacity:0.001;opacity:0.001} .redactor-box .oc-figure-controls:before{content:'';display:block;width:0;height:0;border-left:8.5px solid transparent;border-right:8.5px solid transparent;border-top:9px solid #2b3e50;border-bottom-width:0;position:absolute;left:14px;bottom:-8px} .redactor-box figure:hover .oc-figure-controls{display:block} @@ -246,9 +246,9 @@ to{background-position:0 0} .field-richeditor.size-giant .redactor-editor{height:320px !important} .redactor-box{margin-bottom:0} .redactor-box iframe{border:none} -.redactor-box-fullscreen{z-index:415 !important} -.redactor-toolbar,.redactor-dropdown{z-index:410 !important} -#redactor-modal-overlay,#redactor-modal-box,#redactor-modal{z-index:420 !important} +.redactor-box-fullscreen{z-index:715 !important} +.redactor-toolbar,.redactor-dropdown{z-index:710 !important} +#redactor-modal-overlay,#redactor-modal-box,#redactor-modal{z-index:720 !important} .redactor-toolbar{background:#dddddd;-webkit-box-shadow:none;box-shadow:none} .redactor-toolbar li.redactor-btn-right{float:right;margin-right:2px} .redactor-toolbar li a{color:#404040;font-size:14px;width:20px;line-height:20px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none} diff --git a/modules/backend/formwidgets/richeditor/assets/less/richeditor.less b/modules/backend/formwidgets/richeditor/assets/less/richeditor.less index fc232449a..edd065d4b 100644 --- a/modules/backend/formwidgets/richeditor/assets/less/richeditor.less +++ b/modules/backend/formwidgets/richeditor/assets/less/richeditor.less @@ -1,7 +1,7 @@ @import "../../../../assets/less/core/boot.less"; @richeditor-toolbar-size: 30px; -@richeditor-zindex: 300; +@richeditor-zindex: 600; @richeditor-gutter: 20px; @import "_redactor.less"; diff --git a/modules/cms/ServiceProvider.php b/modules/cms/ServiceProvider.php index e604b993f..0bccb7a69 100644 --- a/modules/cms/ServiceProvider.php +++ b/modules/cms/ServiceProvider.php @@ -139,7 +139,7 @@ class ServiceProvider extends ModuleServiceProvider 'icon' => 'icon-picture-o', 'url' => Backend::URL('cms/themes'), 'permissions' => ['system.manage_themes'], - 'order' => 200 + 'order' => 300 ], 'maintenance_settings' => [ 'label' => 'cms::lang.maintenance.settings_menu', diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php index b38879fed..5acfa0157 100644 --- a/modules/system/ServiceProvider.php +++ b/modules/system/ServiceProvider.php @@ -238,15 +238,6 @@ class ServiceProvider extends ModuleServiceProvider */ SettingsManager::instance()->registerCallback(function ($manager) { $manager->registerSettingItems('October.System', [ - 'administrators' => [ - 'label' => 'backend::lang.user.menu_label', - 'description' => 'backend::lang.user.menu_description', - 'category' => SettingsManager::CATEGORY_SYSTEM, - 'icon' => 'icon-users', - 'url' => Backend::url('backend/users'), - 'permissions' => ['backend.manage_users'], - 'order' => 600 - ], 'updates' => [ 'label' => 'system::lang.updates.menu_label', 'description' => 'system::lang.updates.menu_description', @@ -254,25 +245,16 @@ class ServiceProvider extends ModuleServiceProvider 'icon' => 'icon-cloud-download', 'url' => Backend::url('system/updates'), 'permissions' => ['system.manage_updates'], - 'order' => 700 + 'order' => 300 ], - 'event_logs' => [ - 'label' => 'system::lang.event_log.menu_label', - 'description' => 'system::lang.event_log.menu_description', - 'category' => SettingsManager::CATEGORY_LOGS, - 'icon' => 'icon-exclamation-triangle', - 'url' => Backend::url('system/eventlogs'), - 'permissions' => ['system.access_logs'], - 'order' => 800 - ], - 'request_logs' => [ - 'label' => 'system::lang.request_log.menu_label', - 'description' => 'system::lang.request_log.menu_description', - 'category' => SettingsManager::CATEGORY_LOGS, - 'icon' => 'icon-file-o', - 'url' => Backend::url('system/requestlogs'), - 'permissions' => ['system.access_logs'], - 'order' => 800 + 'administrators' => [ + 'label' => 'backend::lang.user.menu_label', + 'description' => 'backend::lang.user.menu_description', + 'category' => SettingsManager::CATEGORY_SYSTEM, + 'icon' => 'icon-users', + 'url' => Backend::url('backend/users'), + 'permissions' => ['backend.manage_users'], + 'order' => 400 ], 'mail_settings' => [ 'label' => 'system::lang.mail.menu_label', @@ -281,7 +263,7 @@ class ServiceProvider extends ModuleServiceProvider 'icon' => 'icon-envelope', 'class' => 'System\Models\MailSettings', 'permissions' => ['system.manage_mail_settings'], - 'order' => 400 + 'order' => 600 ], 'mail_templates' => [ 'label' => 'system::lang.mail_templates.menu_label', @@ -290,7 +272,25 @@ class ServiceProvider extends ModuleServiceProvider 'icon' => 'icon-envelope-square', 'url' => Backend::url('system/mailtemplates'), 'permissions' => ['system.manage_mail_templates'], - 'order' => 500 + 'order' => 610 + ], + 'event_logs' => [ + 'label' => 'system::lang.event_log.menu_label', + 'description' => 'system::lang.event_log.menu_description', + 'category' => SettingsManager::CATEGORY_LOGS, + 'icon' => 'icon-exclamation-triangle', + 'url' => Backend::url('system/eventlogs'), + 'permissions' => ['system.access_logs'], + 'order' => 900 + ], + 'request_logs' => [ + 'label' => 'system::lang.request_log.menu_label', + 'description' => 'system::lang.request_log.menu_description', + 'category' => SettingsManager::CATEGORY_LOGS, + 'icon' => 'icon-file-o', + 'url' => Backend::url('system/requestlogs'), + 'permissions' => ['system.access_logs'], + 'order' => 910 ] ]); });