\ No newline at end of file
diff --git a/modules/backend/controllers/groups/create.htm b/modules/backend/controllers/groups/create.htm
index 62f852781..3000b0d79 100644
--- a/modules/backend/controllers/groups/create.htm
+++ b/modules/backend/controllers/groups/create.htm
@@ -2,7 +2,7 @@
-
pageTitle) ?>
+
pageTitle)) ?>
@@ -37,6 +37,6 @@
-
fatalError) ?>
+
fatalError)) ?>
\ No newline at end of file
diff --git a/modules/backend/controllers/groups/index.htm b/modules/backend/controllers/groups/index.htm
index c3dccaf27..ee75b8527 100644
--- a/modules/backend/controllers/groups/index.htm
+++ b/modules/backend/controllers/groups/index.htm
@@ -1,7 +1,7 @@
\ No newline at end of file
diff --git a/modules/backend/controllers/users/create.htm b/modules/backend/controllers/users/create.htm
index 828987baa..bbbb4c83b 100644
--- a/modules/backend/controllers/users/create.htm
+++ b/modules/backend/controllers/users/create.htm
@@ -1,7 +1,7 @@
-
pageTitle) ?>
+
pageTitle)) ?>
@@ -54,7 +54,7 @@
-
fatalError) ?>
+
fatalError)) ?>
\ No newline at end of file
diff --git a/modules/backend/controllers/users/myaccount.htm b/modules/backend/controllers/users/myaccount.htm
index 32578229e..fe9641d1d 100644
--- a/modules/backend/controllers/users/myaccount.htm
+++ b/modules/backend/controllers/users/myaccount.htm
@@ -44,7 +44,7 @@
-
fatalError) ?>
+
fatalError)) ?>
\ No newline at end of file
diff --git a/modules/backend/controllers/users/update.htm b/modules/backend/controllers/users/update.htm
index aa3a486a9..54bb51a6f 100644
--- a/modules/backend/controllers/users/update.htm
+++ b/modules/backend/controllers/users/update.htm
@@ -1,7 +1,7 @@
-
pageTitle) ?>
+
pageTitle)) ?>
@@ -62,7 +62,7 @@
-
fatalError) ?>
+
fatalError)) ?>
\ No newline at end of file
diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php
index a8c67a703..b9e39b434 100644
--- a/modules/backend/lang/en/lang.php
+++ b/modules/backend/lang/en/lang.php
@@ -1,6 +1,9 @@
[
+ 'title' => 'Administration Area',
+ ],
'field' => [
'invalid_type' => 'Invalid field type used :type.',
'options_method_not_exists' => 'The model class :model must define a method :method() returning options for the ":field" form field.',
@@ -211,7 +214,7 @@ return [
'extension' => 'The PHP extension :name is not installed. Please install this library and activate the extension.'
],
'editor' => [
- 'menu_label' => 'Code Editor Preferences',
+ 'menu_label' => 'Code editor preferences',
'menu_description' => 'Customize your code editor preferences, such as font size and color scheme.',
'font_size' => 'Font size',
'tab_size' => 'Tab size',
@@ -231,23 +234,23 @@ return [
'menu_description' => 'Settings relate to your administration account',
],
'myaccount' => [
- 'menu_label' => 'My Account',
+ 'menu_label' => 'My account',
'menu_description' => 'Update your account details such as name, email address and password.',
'menu_keywords' => 'security login'
],
- 'backend_settings' => [
- 'menu_label' => 'Backend Settings',
- 'menu_description' => 'Customize the back-end area such as name, colors and logo.',
+ 'branding' => [
+ 'menu_label' => 'Customize back-end',
+ 'menu_description' => 'Customize the administration area such as name, colors and logo.',
],
'backend_preferences' => [
- 'menu_label' => 'Backend Preferences',
+ 'menu_label' => 'Back-end preferences',
'menu_description' => 'Manage your account preferences such as desired language.',
'locale' => 'Language',
'locale_comment' => 'Select your desired locale for language use.',
],
'access_log' => [
'hint' => 'This log displays a list of successful sign in attempts by administrators. Records are kept for a total of :days days.',
- 'menu_label' => 'Access Log',
+ 'menu_label' => 'Access log',
'menu_description' => 'View a list of successful back-end user sign ins.',
'created_at' => 'Date & Time',
'login' => 'Login',
diff --git a/modules/backend/layouts/_custom_styles.htm b/modules/backend/layouts/_custom_styles.htm
index 22d95d21d..902db3121 100644
--- a/modules/backend/layouts/_custom_styles.htm
+++ b/modules/backend/layouts/_custom_styles.htm
@@ -1,24 +1,8 @@
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/modules/backend/layouts/_footer.htm b/modules/backend/layouts/_footer.htm
index 97a3a97e8..870fac32c 100644
--- a/modules/backend/layouts/_footer.htm
+++ b/modules/backend/layouts/_footer.htm
@@ -3,7 +3,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/modules/backend/layouts/_head.htm b/modules/backend/layouts/_head.htm
index c790eb592..21215f8c1 100644
--- a/modules/backend/layouts/_head.htm
+++ b/modules/backend/layouts/_head.htm
@@ -2,8 +2,8 @@
-
- <?= $this->pageTitle ?> | October CMS
+<title data-title-template="<?= empty($this->pageTitleTemplate) ? '%s' : e($this->pageTitleTemplate) ?> | <?= e(Backend\Models\BrandSettings::get('app_name')) ?>">
+ <?= e(trans($this->pageTitle)) ?> | <?= e(Backend\Models\BrandSettings::get('app_name')) ?>
diff --git a/modules/backend/layouts/auth.htm b/modules/backend/layouts/auth.htm
index ba9058093..57040a8bb 100644
--- a/modules/backend/layouts/auth.htm
+++ b/modules/backend/layouts/auth.htm
@@ -3,7 +3,7 @@
- Administration Area
+ <?= e(trans('backend::lang.auth.title')) ?>
@@ -28,7 +28,7 @@
-
+
diff --git a/modules/backend/models/BackendSettings.php b/modules/backend/models/BackendSettings.php
deleted file mode 100644
index 7c2813386..000000000
--- a/modules/backend/models/BackendSettings.php
+++ /dev/null
@@ -1,82 +0,0 @@
- ['System\Models\File']
- ];
-
- /**
- * Validation rules
- */
- public $rules = [
- 'app_name' => 'required',
- 'app_motto' => 'required',
- ];
-
- public function initSettingsData()
- {
- $this->app_name = Lang::get('system::lang.app.name');
- $this->app_motto = Lang::get('system::lang.app.motto');
-
- // Carrot
- $this->primary_color_dark = '#d35400';
-
- // Pumpkin
- $this->primary_color_light = '#e67e22';
-
- // Midnight Blue
- $this->secondary_color_dark = '#2b3e50';
-
- // Wet Asphalt
- $this->secondary_color_light = '#34495e';
- }
-
- public static function getLogo()
- {
- $settings = self::instance();
- if (!$settings->logo)
- return null;
-
- return $settings->logo->getPath();
- }
-
- public function renderCss()
- {
- $parser = new Less_Parser(['compress' => true]);
-
- $parser->ModifyVars([
- 'logo-image' => "'".self::getLogo()."'",
- 'primary-color-light' => $this->primary_color_light,
- 'primary-color-dark' => $this->primary_color_dark,
- 'secondary-color-light' => $this->secondary_color_light,
- 'secondary-color-dark' => $this->secondary_color_dark,
- ]);
-
- $parser->parse(File::get(__DIR__.'/backendsettings/custom.less'));
-
- $css = $parser->getCss();
- return $css;
- }
-
-}
\ No newline at end of file
diff --git a/modules/backend/models/BrandSettings.php b/modules/backend/models/BrandSettings.php
new file mode 100644
index 000000000..95034ebcd
--- /dev/null
+++ b/modules/backend/models/BrandSettings.php
@@ -0,0 +1,87 @@
+ ['System\Models\File']
+ ];
+
+ // Pumpkin
+ const PRIMARY_LIGHT = '#e67e22';
+
+ // Carrot
+ const PRIMARY_DARK = '#d35400';
+
+ // Wet Asphalt
+ const SECONDARY_LIGHT = '#34495e';
+
+ // Midnight Blue
+ const SECONDARY_DARK = '#2b3e50';
+
+ /**
+ * Validation rules
+ */
+ public $rules = [
+ 'app_name' => 'required',
+ 'app_tagline' => 'required',
+ ];
+
+ public function initSettingsData()
+ {
+ $this->app_name = Lang::get('system::lang.app.name');
+ $this->app_tagline = Lang::get('system::lang.app.tagline');
+
+ $this->primary_color_light = self::PRIMARY_LIGHT;
+ $this->primary_color_dark = self::PRIMARY_DARK;
+ $this->secondary_color_light = self::SECONDARY_LIGHT;
+ $this->secondary_color_dark = self::SECONDARY_DARK;
+ }
+
+ public static function getLogo()
+ {
+ $settings = self::instance();
+ if (!$settings->logo)
+ return null;
+
+ return $settings->logo->getPath();
+ }
+
+ public static function renderCss()
+ {
+ $parser = new Less_Parser(['compress' => true]);
+
+ $parser->ModifyVars([
+ 'logo-image' => "'".self::getLogo()."'",
+ 'primary-color-light' => self::get('primary_color_light', self::PRIMARY_LIGHT),
+ 'primary-color-dark' => self::get('primary_color_dark', self::PRIMARY_DARK),
+ 'secondary-color-light' => self::get('secondary_color_light', self::SECONDARY_LIGHT),
+ 'secondary-color-dark' => self::get('secondary_color_dark', self::SECONDARY_DARK),
+ ]);
+
+ $parser->parse(File::get(__DIR__.'/brandsettings/custom.less'));
+ $css = $parser->getCss();
+
+ return $css;
+ }
+
+}
\ No newline at end of file
diff --git a/modules/backend/models/backendsettings/fields.yaml b/modules/backend/models/backendsettings/fields.yaml
deleted file mode 100644
index 1d66c081b..000000000
--- a/modules/backend/models/backendsettings/fields.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-# ===================================
-# Field Definitions
-# ===================================
-
-fields:
-
- logo:
- label: Logo
- type: fileupload
- commentAbove: Upload a custom logo to use in the back-end.
- mode: image
- imageHeight: 170
- imageWidth: 170
-
- app_name:
- label: App Name
- commentAbove: This name is shown in the title area of the back-end.
-
- app_motto:
- label: App Motto
- commentAbove: This name is shown on the sign in screen for the back-end.
-
- primary_color_light:
- label: Primary color light
- type: colorpicker
- span: auto
-
- primary_color_dark:
- label: Primary color dark
- type: colorpicker
- span: auto
-
- secondary_color_light:
- label: Secondary color light
- type: colorpicker
- span: auto
-
- secondary_color_dark:
- label: Secondary color dark
- type: colorpicker
- span: auto
-
-
diff --git a/modules/backend/models/backendsettings/custom.less b/modules/backend/models/brandsettings/custom.less
similarity index 75%
rename from modules/backend/models/backendsettings/custom.less
rename to modules/backend/models/brandsettings/custom.less
index 12d230307..d65485c92 100644
--- a/modules/backend/models/backendsettings/custom.less
+++ b/modules/backend/models/brandsettings/custom.less
@@ -39,27 +39,19 @@ body.outer .layout > .layout-row.layout-head {
// Side navigation bar
//
-//color-sidebarnav-bg: mix(white, saturate(@secondary-color, 6.25%), 5.75%);
@color-sidebarnav-bg: @secondary-color-light;
#layout-sidenav {
background-color: @color-sidebarnav-bg;
-
- ul li a {
- &, i { color: rgba(255, 255, 255, .35); }
- }
}
//
// Fancy layout
//
-//color-fancy-master-tabs-bg: mix(black, saturate(spin(@primary-color, -5.5), 100%), 17.25%);
-//color-fancy-form-inactive-tab: mix(black, saturate(spin(@primary-color-light, -4.25), 11.25%), 24%);
@color-fancy-form-tabless-fields-bg: @primary-color-light;
@color-fancy-master-tabs-bg: @primary-color-dark;
@color-fancy-form-inactive-tab: mix(black, desaturate(@primary-color-dark, 14.5%), 5%);
-
@tab-svg: escape('');
.fancy-layout {
@@ -80,7 +72,6 @@ body.outer .layout > .layout-row.layout-head {
&.master {
> div > div.tabs-container > ul.nav-tabs > li {
- a { color: rgba(255, 255, 255, .35); }
a > span.title {
background-color: @color-fancy-form-inactive-tab;
&:before, &:after {
@@ -88,21 +79,16 @@ body.outer .layout > .layout-row.layout-head {
}
}
&.active {
- a { color: #fff; }
a > span.title {
background-color: @color-fancy-form-tabless-fields-bg;
}
}
}
}
-
}
.form-tabless-fields {
background: @color-fancy-form-tabless-fields-bg;
- label {
- color: rgba(255, 255, 255, .5);
- }
}
}
@@ -124,8 +110,47 @@ div.control-componentlist {
// File List
//
+@color-list-active-border: @primary-color-light;
+
.control-filelist {
ul li.active a:after {
- background: @primary-color-light;
+ background: @color-list-active-border;
+ }
+}
+
+//
+// Sidenav Tree
+//
+
+@color-sidebarnav-bg: @secondary-color-light;
+@color-sidebarnav-tree-group-bg: @secondary-color-dark;
+@color-sidebarnav-tree-inactive-bg: mix(white, @secondary-color-light, 7%);
+@color-sidebarnav-tree-active-bg: @secondary-color-light;
+@color-sidebarnav-tree-active-marker: @primary-color-light;
+
+.sidenav-tree {
+ background: @color-sidebarnav-bg;
+
+ ul.top-level > li {
+ > div.group h3 {
+ background: @color-sidebarnav-tree-group-bg;
+ }
+
+ > ul li {
+ a {
+ background: @color-sidebarnav-tree-inactive-bg;
+ }
+ &.active a {
+ background: @color-sidebarnav-tree-active-bg;
+
+ &:before {
+ background: @color-sidebarnav-tree-active-marker;
+ }
+ }
+
+ &:hover a {
+ background: @color-sidebarnav-tree-active-bg;
+ }
+ }
}
}
\ No newline at end of file
diff --git a/modules/backend/models/brandsettings/fields.yaml b/modules/backend/models/brandsettings/fields.yaml
new file mode 100644
index 000000000..7f1e4ecfb
--- /dev/null
+++ b/modules/backend/models/brandsettings/fields.yaml
@@ -0,0 +1,58 @@
+# ===================================
+# Field Definitions
+# ===================================
+
+
+tabs:
+ fields:
+
+ logo:
+ label: Logo
+ type: fileupload
+ commentAbove: Upload a custom logo to use in the back-end.
+ mode: image
+ imageHeight: 170
+ imageWidth: 170
+ tab: Brand
+
+ app_name:
+ label: App Name
+ commentAbove: This name is shown in the title area of the back-end.
+ tab: Brand
+
+ app_tagline:
+ label: App Tagline
+ commentAbove: This name is shown on the sign in screen for the back-end.
+ tab: Brand
+
+ primary_color_light:
+ label: Primary (Light)
+ type: colorpicker
+ tab: Colors
+ availableColors: [#1abc9c, #2ecc71, #3498db, #9b59b6, #34495e, #f1c40f, #e67e22, #e74c3c, #ecf0f1, #95a5a6]
+
+ primary_color_dark:
+ label: Primary (Dark)
+ type: colorpicker
+ tab: Colors
+ availableColors: [#16a085, #27ae60, #2980b9, #8e44ad, #2b3e50, #f39c12, #d35400, #c0392b, #bdc3c7, #7f8c8d]
+
+ secondary_color_light:
+ label: Secondary (Light)
+ type: colorpicker
+ tab: Colors
+ availableColors: [#1abc9c, #2ecc71, #3498db, #9b59b6, #34495e, #f1c40f, #e67e22, #e74c3c, #ecf0f1, #95a5a6]
+
+ secondary_color_dark:
+ label: Secondary (Dark)
+ type: colorpicker
+ tab: Colors
+ availableColors: [#16a085, #27ae60, #2980b9, #8e44ad, #2b3e50, #f39c12, #d35400, #c0392b, #bdc3c7, #7f8c8d]
+
+ custom_css:
+ label: Custom stylesheet
+ type: codeeditor
+ tab: Styles
+ size: giant
+
+
diff --git a/modules/cms/controllers/Index.php b/modules/cms/controllers/Index.php
index 8800f20e1..311cfb096 100644
--- a/modules/cms/controllers/Index.php
+++ b/modules/cms/controllers/Index.php
@@ -101,8 +101,8 @@ class Index extends Controller
$this->addJs('/modules/backend/formwidgets/codeeditor/assets/vendor/ace/mode-'.$mode.'.js', 'core');
$this->bodyClass = 'compact-container side-panel-not-fixed';
- $this->pageTitle = Lang::get('cms::lang.cms.menu_label');
- $this->pageTitleTemplate = '%s CMS | October';
+ $this->pageTitle = 'cms::lang.cms.menu_label';
+ $this->pageTitleTemplate = '%s CMS';
}
public function index_onOpenTemplate()
diff --git a/modules/cms/controllers/Themes.php b/modules/cms/controllers/Themes.php
index a1c0b98fa..6e3e117a7 100644
--- a/modules/cms/controllers/Themes.php
+++ b/modules/cms/controllers/Themes.php
@@ -1,6 +1,5 @@
addCss('/modules/cms/assets/css/october.theme-selector.css', 'core');
- $this->pageTitle = Lang::get('cms::lang.theme.settings_menu');
+ $this->pageTitle = 'cms::lang.theme.settings_menu';
BackendMenu::setContext('October.System', 'system', 'settings');
SettingsManager::setContext('October.Cms', 'theme');
}
diff --git a/modules/cms/controllers/index/index.htm b/modules/cms/controllers/index/index.htm
index 08c9e7ac1..56aa5368d 100644
--- a/modules/cms/controllers/index/index.htm
+++ b/modules/cms/controllers/index/index.htm
@@ -28,6 +28,6 @@
-
fatalError) ?>
+
fatalError)) ?>
\ No newline at end of file
diff --git a/modules/system/behaviors/SettingsModel.php b/modules/system/behaviors/SettingsModel.php
index f4c7c30a8..9db0900ee 100644
--- a/modules/system/behaviors/SettingsModel.php
+++ b/modules/system/behaviors/SettingsModel.php
@@ -1,5 +1,6 @@
model->bindEvent('model.afterFetch', [$this, 'afterModelFetch']);
$this->model->bindEvent('model.beforeSave', [$this, 'beforeModelSave']);
+ $this->model->bindEvent('model.afterSave', [$this, 'afterModelSave']);
$this->model->bindEvent('model.setAttribute', [$this, 'setModelAttribute']);
$this->model->bindEvent('model.saveInternal', [$this, 'saveModelInternal']);
@@ -72,9 +74,7 @@ class SettingsModel extends ModelBehavior
if (isset(self::$instances[$this->recordCode]))
return self::$instances[$this->recordCode];
- $item = $this->model->where('item', $this->recordCode)->first();
-
- if (!$item) {
+ if (!$item = $this->getSettingsRecord()) {
$this->model->initSettingsData();
if (method_exists($this->model, 'forceSave'))
@@ -94,7 +94,21 @@ class SettingsModel extends ModelBehavior
*/
public function isConfigured()
{
- return $this->model->where('item', $this->recordCode)->count() > 0;
+ return $this->getSettingsRecord() !== null;
+ }
+
+ /**
+ * Returns the raw Model record that stores the settings.
+ * @return Model
+ */
+ public function getSettingsRecord()
+ {
+ $record = $this->model
+ ->where('item', $this->recordCode)
+ ->remember(1440, $this->getCacheKey())
+ ->first();
+
+ return $record ?: null;
}
/**
@@ -108,17 +122,17 @@ class SettingsModel extends ModelBehavior
}
/**
- * Helper for getValue, intended as a static method
+ * Helper for getSettingsValue, intended as a static method
*/
public function get($key, $default = null)
{
- return $this->instance()->getValue($key, $default);
+ return $this->instance()->getSettingsValue($key, $default);
}
/**
* Get a single setting value, or return a default value
*/
- public function getValue($key, $default = null)
+ public function getSettingsValue($key, $default = null)
{
if (array_key_exists($key, $this->fieldValues))
return $this->fieldValues[$key];
@@ -161,6 +175,15 @@ class SettingsModel extends ModelBehavior
$this->model->value = $this->fieldValues;
}
+ /**
+ * After the model is saved, clear the cached query entry.
+ * @return void
+ */
+ public function afterModelSave()
+ {
+ Cache::forget($this->getCacheKey());
+ }
+
/**
* Adulterate the model setter to use our field values instead.
*/
@@ -200,4 +223,12 @@ class SettingsModel extends ModelBehavior
{
return $this->fieldConfig;
}
+
+ /**
+ * Returns a cache key for this record.
+ */
+ protected function getCacheKey()
+ {
+ return 'system::settings.'.$this->recordCode;
+ }
}
diff --git a/modules/system/classes/Controller.php b/modules/system/classes/Controller.php
index 50053b15c..a49caa6f9 100644
--- a/modules/system/classes/Controller.php
+++ b/modules/system/classes/Controller.php
@@ -2,6 +2,7 @@
use Controller as BaseController;
use System\Classes\ApplicationException;
+use System\Classes\CombineAssets;
use Exception;
/**
diff --git a/modules/system/controllers/Settings.php b/modules/system/controllers/Settings.php
index 2db37def9..0e5e98601 100644
--- a/modules/system/controllers/Settings.php
+++ b/modules/system/controllers/Settings.php
@@ -37,7 +37,7 @@ class Settings extends Controller
public function index()
{
- $this->pageTitle = Lang::get('system::lang.settings.menu_label');
+ $this->pageTitle = 'system::lang.settings.menu_label';
$this->vars['items'] = SettingsManager::instance()->listItems('system');
$this->bodyClass = 'compact-container sidenav-tree-root';
}
@@ -45,7 +45,7 @@ class Settings extends Controller
public function mysettings()
{
BackendMenu::setContextSideMenu('mysettings');
- $this->pageTitle = Lang::get('backend::lang.mysettings.menu_label');
+ $this->pageTitle = 'backend::lang.mysettings.menu_label';
$this->vars['items'] = SettingsManager::instance()->listItems('mysettings');
$this->bodyClass = 'compact-container';
}
@@ -58,18 +58,19 @@ class Settings extends Controller
{
SettingsManager::setContext($author.'.'.$plugin, $code);
+ $this->vars['parentLink'] = Backend::url('system/settings');
+ $this->vars['parentLabel'] = Lang::get('system::lang.settings.menu_label');
+
try {
- $item = $this->findSettingItem($author, $plugin, $code);
+ if (!$item = $this->findSettingItem($author, $plugin, $code))
+ throw new ApplicationException(Lang::get('system::lang.settings.not_found'));
+
$this->pageTitle = $item->label;
if ($item->context == 'mysettings') {
$this->vars['parentLink'] = Backend::url('system/settings/mysettings');
$this->vars['parentLabel'] = Lang::get('backend::lang.mysettings.menu_label');
}
- else {
- $this->vars['parentLink'] = Backend::url('system/settings');
- $this->vars['parentLabel'] = Lang::get('system::lang.settings.menu_label');
- }
$model = $this->createModel($item);
$this->initWidgets($model);
diff --git a/modules/system/controllers/Updates.php b/modules/system/controllers/Updates.php
index 37890c3d5..a0996ab9b 100644
--- a/modules/system/controllers/Updates.php
+++ b/modules/system/controllers/Updates.php
@@ -67,7 +67,7 @@ class Updates extends Controller
*/
public function manage()
{
- $this->pageTitle = Lang::get('system::lang.plugins.manage');
+ $this->pageTitle = 'system::lang.plugins.manage';
PluginManager::instance()->clearDisabledCache();
return $this->asExtension('ListController')->index();
}
diff --git a/modules/system/controllers/eventlogs/preview.htm b/modules/system/controllers/eventlogs/preview.htm
index 82d865062..e44db1bc7 100644
--- a/modules/system/controllers/eventlogs/preview.htm
+++ b/modules/system/controllers/eventlogs/preview.htm
@@ -1,7 +1,7 @@
\ No newline at end of file
diff --git a/modules/system/controllers/updates/_execute.htm b/modules/system/controllers/updates/_execute.htm
index a1fa35d08..91a14471b 100644
--- a/modules/system/controllers/updates/_execute.htm
+++ b/modules/system/controllers/updates/_execute.htm
@@ -136,7 +136,7 @@