diff --git a/CHANGELOG.md b/CHANGELOG.md index 340643df1..e9a6d3270 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ +* **Build 162** (2014-11-10) + - Fixes an issue where the *Pages* tab is shown in the CMS when permission is denied. + - Updates are no longer shown on the Dashboard if permission is denied. + - Added Maintenance mode settings to the front-end, available via Settings > CMS. + * **Build 160** (2014-11-01) - Various fixes to the Backend Brand settings page. - When `cms.disableCoreUpdates` is set to **true** the Backend will no longer display updates for the core. + - Partials can support using Components (see CMS > Partials docs). * **Build 158** (2014-10-23) - Fixes an issue where new Themes attached to a project were not being installed on update. diff --git a/modules/cms/ServiceProvider.php b/modules/cms/ServiceProvider.php index 0970d1983..86ec3e1d2 100644 --- a/modules/cms/ServiceProvider.php +++ b/modules/cms/ServiceProvider.php @@ -36,39 +36,44 @@ class ServiceProvider extends ModuleServiceProvider 'sideMenu' => [ 'pages' => [ - 'label' => 'cms::lang.page.menu_label', - 'icon' => 'icon-copy', - 'url' => 'javascript:;', - 'attributes' => ['data-menu-item'=>'pages'], - 'permissions' => ['cms.manage_pages'] + 'label' => 'cms::lang.page.menu_label', + 'icon' => 'icon-copy', + 'url' => 'javascript:;', + 'attributes' => ['data-menu-item'=>'pages'], + 'permissions' => ['cms.manage_pages'], + 'counterLabel' => 'cms::lang.page.unsaved_label', ], 'partials' => [ - 'label' => 'cms::lang.partial.menu_label', - 'icon' => 'icon-tags', - 'url' => 'javascript:;', - 'attributes' => ['data-menu-item'=>'partials'], - 'permissions' => ['cms.manage_partials'] + 'label' => 'cms::lang.partial.menu_label', + 'icon' => 'icon-tags', + 'url' => 'javascript:;', + 'attributes' => ['data-menu-item'=>'partials'], + 'permissions' => ['cms.manage_partials'], + 'counterLabel' => 'cms::lang.partial.unsaved_label', ], 'layouts' => [ - 'label' => 'cms::lang.layout.menu_label', - 'icon' => 'icon-th-large', - 'url' => 'javascript:;', - 'attributes' => ['data-menu-item'=>'layouts'], - 'permissions' => ['cms.manage_layouts'] + 'label' => 'cms::lang.layout.menu_label', + 'icon' => 'icon-th-large', + 'url' => 'javascript:;', + 'attributes' => ['data-menu-item'=>'layouts'], + 'permissions' => ['cms.manage_layouts'], + 'counterLabel' => 'cms::lang.layout.unsaved_label', ], 'content' => [ - 'label' => 'cms::lang.content.menu_label', - 'icon' => 'icon-file-text-o', - 'url' => 'javascript:;', - 'attributes' => ['data-menu-item'=>'content'], - 'permissions' => ['cms.manage_content'] + 'label' => 'cms::lang.content.menu_label', + 'icon' => 'icon-file-text-o', + 'url' => 'javascript:;', + 'attributes' => ['data-menu-item'=>'content'], + 'permissions' => ['cms.manage_content'], + 'counterLabel' => 'cms::lang.content.unsaved_label', ], 'assets' => [ - 'label' => 'cms::lang.asset.menu_label', - 'icon' => 'icon-picture-o', - 'url' => 'javascript:;', - 'attributes' => ['data-menu-item'=>'assets'], - 'permissions' => ['cms.manage_assets'] + 'label' => 'cms::lang.asset.menu_label', + 'icon' => 'icon-picture-o', + 'url' => 'javascript:;', + 'attributes' => ['data-menu-item'=>'assets'], + 'permissions' => ['cms.manage_assets'], + 'counterLabel' => 'cms::lang.asset.unsaved_label', ], 'components' => [ 'label' => 'cms::lang.component.menu_label', @@ -116,7 +121,15 @@ class ServiceProvider extends ModuleServiceProvider 'icon' => 'icon-picture-o', 'url' => Backend::URL('cms/themes'), 'order' => 200 - ] + ], + 'maintenance_settings' => [ + 'label' => 'cms::lang.maintenance.settings_menu', + 'description' => 'cms::lang.maintenance.settings_menu_description', + 'category' => SettingsManager::CATEGORY_CMS, + 'icon' => 'icon-plug', + 'class' => 'Cms\Models\MaintenanceSettings', + 'order' => 400, + ], ]); }); diff --git a/modules/cms/lang/en/lang.php b/modules/cms/lang/en/lang.php index 6a8c05e08..5793028ed 100644 --- a/modules/cms/lang/en/lang.php +++ b/modules/cms/lang/en/lang.php @@ -28,6 +28,12 @@ return [ 'activate_button' => 'Activate', 'active_button' => 'Activate', ], + 'maintenance' => [ + 'settings_menu' => 'Maintenance mode', + 'settings_menu_description' => 'Configure the maintenance mode page and toggle the setting.', + 'is_enabled' => 'Enable maintenance mode', + 'is_enabled_comment' => 'When activated website visitors will see the page chosen below.', + ], 'page' => [ 'not_found' => [ 'label' => "Page not found", @@ -38,6 +44,7 @@ return [ 'help' => "We're sorry, but something went wrong and the page cannot be displayed.", ], 'menu_label' => 'Pages', + 'unsaved_label' => 'Unsaved page(s)', 'no_list_records' => 'No pages found', 'new' => 'New page', 'invalid_url' => 'Invalid URL format. The URL should start with the forward slash symbol and can contain digits, Latin letters and the following symbols: ._-[]:?|/+*', @@ -48,6 +55,7 @@ return [ 'layout' => [ 'not_found' => "The layout ':name' is not found", 'menu_label' => 'Layouts', + 'unsaved_label' => 'Unsaved layout(s)', 'no_list_records' => 'No layouts found', 'new' => 'New layout', 'delete_confirm_multiple' => 'Do you really want to delete selected layouts?', @@ -57,6 +65,7 @@ return [ 'invalid_name' => "Invalid partial name: :name.", 'not_found' => "The partial ':name' is not found.", 'menu_label' => 'Partials', + 'unsaved_label' => 'Unsaved partial(s)', 'no_list_records' => 'No partials found', 'delete_confirm_multiple' => 'Do you really want to delete selected partials?', 'delete_confirm_single' => 'Do you really want delete this partial?', @@ -65,6 +74,7 @@ return [ 'content' => [ 'not_found' => "The content file ':name' is not found.", 'menu_label' => 'Content', + 'unsaved_label' => 'Unsaved content', 'no_list_records' => 'No content files found', 'delete_confirm_multiple' => 'Do you really want to delete selected content files or directories?', 'delete_confirm_single' => 'Do you really want delete this content file?', @@ -103,6 +113,7 @@ return [ ], 'asset' => [ 'menu_label' => "Assets", + 'unsaved_label' => 'Unsaved asset(s)', 'drop_down_add_title' => 'Add...', 'drop_down_operation_title' => 'Action...', 'upload_files' => 'Upload file(s)', diff --git a/modules/system/models/mailtemplate/fields.yaml b/modules/system/models/mailtemplate/fields.yaml index 7a2ee8873..3f7d8d75d 100644 --- a/modules/system/models/mailtemplate/fields.yaml +++ b/modules/system/models/mailtemplate/fields.yaml @@ -7,8 +7,7 @@ fields: layout: label: system::lang.mail_templates.layout type: relation - options: - emptyOption: -- No layout -- + emptyOption: -- No layout -- code: label: system::lang.mail_templates.code