-//
+//
+//
//
//
* WidgetManager::registerFormWidgets(function($manager){
- * $manager->registerFormWidget('Backend\FormWidgets\CodeEditor', 'codeeditor');
- * $manager->registerFormWidget('Backend\FormWidgets\RichEditor', 'richeditor');
+ * $manager->registerFormWidget('Backend\FormWidgets\CodeEditor', [
+ * 'name' => 'Code editor',
+ * 'code' => 'codeeditor'
+ * ]);
* });
*
*/
@@ -172,9 +165,9 @@ class WidgetManager
}
/**
- * Returns a class name from a form widget alias
- * Normalizes a class name or converts an alias to it's class name.
- * @param string $name Class name or form widget alias.
+ * Returns a class name from a form widget code
+ * Normalizes a class name or converts an code to it's class name.
+ * @param string $name Class name or form widget code.
* @return string The class name resolved, or the original name.
*/
public function resolveFormWidget($name)
@@ -183,10 +176,10 @@ class WidgetManager
$this->listFormWidgets();
}
- $aliases = $this->formWidgetAliases;
+ $hints = $this->formWidgetHints;
- if (isset($aliases[$name])) {
- return $aliases[$name];
+ if (isset($hints[$name])) {
+ return $hints[$name];
}
$_name = Str::normalizeClassName($name);
diff --git a/modules/backend/formwidgets/CodeEditor.php b/modules/backend/formwidgets/CodeEditor.php
index a12a9ad71..605f3d2b5 100644
--- a/modules/backend/formwidgets/CodeEditor.php
+++ b/modules/backend/formwidgets/CodeEditor.php
@@ -88,7 +88,7 @@ class CodeEditor extends FormWidgetBase
}
/**
- * Prepares the list data
+ * Prepares the widget data
*/
public function prepareVars()
{
diff --git a/modules/backend/formwidgets/Datepicker.php b/modules/backend/formwidgets/DatePicker.php
similarity index 100%
rename from modules/backend/formwidgets/Datepicker.php
rename to modules/backend/formwidgets/DatePicker.php
diff --git a/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js b/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js
index bf5073c9e..78ee0615a 100644
--- a/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js
+++ b/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js
@@ -267,6 +267,21 @@
$.fn.codeEditor.Constructor = CodeEditor
+ if ($.oc === undefined)
+ $.oc = {}
+
+ $.oc.codeEditorExtensionModes = {
+ 'htm': 'html',
+ 'html': 'html',
+ 'md': 'markdown',
+ 'txt': 'plain_text',
+ 'js': 'javascript',
+ 'less': 'less',
+ 'scss': 'scss',
+ 'sass': 'sass',
+ 'css': 'css'
+ }
+
// CODEEDITOR NO CONFLICT
// =================
diff --git a/modules/backend/formwidgets/richeditor/assets/css/richeditor.css b/modules/backend/formwidgets/richeditor/assets/css/richeditor.css
index fde1cb191..df4d6abf6 100644
--- a/modules/backend/formwidgets/richeditor/assets/css/richeditor.css
+++ b/modules/backend/formwidgets/richeditor/assets/css/richeditor.css
@@ -1303,12 +1303,12 @@ body .redactor-box-fullscreen {
}
.redactor-toolbar,
.redactor-dropdown {
- z-index: 1350 !important;
+ z-index: 410 !important;
}
#redactor-modal-overlay,
#redactor-modal-box,
#redactor-modal {
- z-index: 1351 !important;
+ z-index: 420 !important;
}
.redactor-toolbar {
background: #dddddd;
diff --git a/modules/backend/formwidgets/richeditor/assets/js/richeditor.js b/modules/backend/formwidgets/richeditor/assets/js/richeditor.js
index a3b8ef3be..5ae2a4ee0 100644
--- a/modules/backend/formwidgets/richeditor/assets/js/richeditor.js
+++ b/modules/backend/formwidgets/richeditor/assets/js/richeditor.js
@@ -99,7 +99,7 @@
return
if (this.$el.hasClass('stretch')) {
- var height = $toolbar.height()
+ var height = $toolbar.outerHeight(true)
$editor.css('top', height+1)
$codeEditor.css('top', height)
}
diff --git a/modules/backend/formwidgets/richeditor/assets/less/richeditor.less b/modules/backend/formwidgets/richeditor/assets/less/richeditor.less
index 5386d532f..bb2838a78 100644
--- a/modules/backend/formwidgets/richeditor/assets/less/richeditor.less
+++ b/modules/backend/formwidgets/richeditor/assets/less/richeditor.less
@@ -51,12 +51,12 @@
}
.redactor-toolbar,
.redactor-dropdown {
- z-index: @richeditor-zindex + 1050 !important;
+ z-index: @richeditor-zindex + 110 !important;
}
#redactor-modal-overlay,
#redactor-modal-box,
#redactor-modal {
- z-index: @richeditor-zindex + 1051 !important;
+ z-index: @richeditor-zindex + 120 !important;
}
.redactor-toolbar {
diff --git a/modules/backend/models/BrandSettings.php b/modules/backend/models/BrandSettings.php
index 961491a51..3367f2648 100644
--- a/modules/backend/models/BrandSettings.php
+++ b/modules/backend/models/BrandSettings.php
@@ -83,7 +83,7 @@ class BrandSettings extends Model
'secondary-color-dark' => self::get('secondary_color_dark', self::SECONDARY_DARK),
]);
- $parser->parse(File::get(__DIR__.'/brandsettings/custom.less').self::get('custom_css'));
+ $parser->parse(File::get(PATH_BASE.'/modules/backend/models/brandsettings/custom.less').self::get('custom_css'));
$css = $parser->getCss();
return $css;
diff --git a/modules/backend/models/brandsettings/custom.less b/modules/backend/models/brandsettings/custom.less
index d65485c92..ad62d9387 100644
--- a/modules/backend/models/brandsettings/custom.less
+++ b/modules/backend/models/brandsettings/custom.less
@@ -45,6 +45,16 @@ body.outer .layout > .layout-row.layout-head {
background-color: @color-sidebarnav-bg;
}
+//
+// Breadcrumb
+//
+
+@color-breadcrumb-background: mix(rgb(43,43,43), @secondary-color-dark, 50%);
+
+.control-breadcrumb {
+ background-color: @color-breadcrumb-background;
+}
+
//
// Fancy layout
//
diff --git a/modules/cms/assets/js/october.cmspage.js b/modules/cms/assets/js/october.cmspage.js
index ccf903e0d..2a12c3f76 100644
--- a/modules/cms/assets/js/october.cmspage.js
+++ b/modules/cms/assets/js/october.cmspage.js
@@ -389,16 +389,7 @@
parts = fileName.split('.'),
extension = 'txt',
mode = 'plain_text',
- modes = {
- 'htm': 'html',
- 'md': 'markdown',
- 'txt': 'plain_text',
- 'js': 'javascript',
- 'less': 'less',
- 'scss': 'scss',
- 'sass': 'sass',
- 'css': 'css'
- },
+ modes = $.oc.codeEditorExtensionModes,
editor = $('[data-control=codeeditor]', pane)
if (parts.length >= 2)
diff --git a/modules/cms/classes/CmsCompoundObject.php b/modules/cms/classes/CmsCompoundObject.php
index 872780919..ad9275c4c 100644
--- a/modules/cms/classes/CmsCompoundObject.php
+++ b/modules/cms/classes/CmsCompoundObject.php
@@ -8,6 +8,10 @@ use October\Rain\Support\ValidationException;
use Cms\Classes\ViewBag;
use Cache;
use Config;
+use Twig_Environment;
+use System\Twig\Extension as SystemTwigExtension;
+use Cms\Twig\Extension as CmsTwigExtension;
+use Cms\Twig\Loader as TwigLoader;
/**
* This is a base class for CMS objects that have multiple sections - pages, partials and layouts.
@@ -56,6 +60,8 @@ class CmsCompoundObject extends CmsObject
protected $viewBagCache = false;
+ protected $originalData = [];
+
protected static $objectComponentPropertyMap = null;
/**
@@ -79,6 +85,10 @@ class CmsCompoundObject extends CmsObject
$obj->code = $parsedData['code'];
$obj->markup = $parsedData['markup'];
+ $obj->originalData['settings'] = $obj->settings;
+ $obj->originalData['code'] = $obj->code;
+ $obj->originalData['markup'] = $obj->markup;
+
$obj->parseComponentSettings();
$obj->parseSettings();
@@ -213,11 +223,14 @@ class CmsCompoundObject extends CmsObject
}
if ($this->code) {
- $code = preg_replace('/^\<\?php/', '', $this->code);
- $code = preg_replace('/^\<\?/', '', $code);
- $code = preg_replace('/\?>$/', '', $code);
+ if ($this->wrapCodeToPhpTags() && $this->originalData['code'] != $this->code) {
+ $code = preg_replace('/^\<\?php/', '', $this->code);
+ $code = preg_replace('/^\<\?/', '', $code);
+ $code = preg_replace('/\?>$/', '', $code);
- $content[] = 'code.PHP_EOL.'?>';
+ $content[] = 'code.PHP_EOL.'?>';
+ } else {
+ $content[] = $this->code;
}
$content[] = $this->markup;
@@ -371,6 +384,26 @@ class CmsCompoundObject extends CmsObject
Cache::forget($key);
}
+ /**
+ * Returns Twig node tree generated from the object's markup.
+ * This method is used by the system internally and shouldn't
+ * participate in the front-end request processing.
+ * @link http://twig.sensiolabs.org/doc/internals.html Twig internals
+ * @param mixed $markup Specifies the markup content.
+ * Use FALSE to load the content from the markup section.
+ * @return Twig_Node_Module A node tree
+ */
+ public function getTwigNodeTree($markup = false)
+ {
+ $loader = new TwigLoader();
+ $twig = new Twig_Environment($loader, []);
+ $twig->addExtension(new CmsTwigExtension());
+ $twig->addExtension(new SystemTwigExtension);
+
+ $stream = $twig->tokenize($markup === false ? $this->markup : $markup, 'getTwigNodeTree');
+ return $twig->parse($stream);
+ }
+
/**
* Parses the settings array.
* Child classes can override this method in order to update
@@ -429,4 +462,13 @@ class CmsCompoundObject extends CmsObject
}
}
}
+
+ /**
+ * Determines if the content of the code section should be wrapped to PHP tags.
+ * @return boolean
+ */
+ protected function wrapCodeToPhpTags()
+ {
+ return true;
+ }
}
diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php
index 78a2a0872..f2f79c142 100644
--- a/modules/cms/classes/Controller.php
+++ b/modules/cms/classes/Controller.php
@@ -269,11 +269,17 @@ class Controller extends BaseController
/*
* Render the page
*/
- CmsException::mask($this->page, 400);
- $this->loader->setObject($this->page);
- $template = $this->twig->loadTemplate($this->page->getFullPath());
- $this->pageContents = $template->render($this->vars);
- CmsException::unmask();
+ Event::fire('cms.page.beforeTwigRender', [$page, $this->loader, $this->twig], true);
+
+ $apiResult = Event::fire('cms.page.getRenderedContents', [$this->page], true);
+ if (!strlen($apiResult)) {
+ CmsException::mask($this->page, 400);
+ $this->loader->setObject($this->page);
+ $template = $this->twig->loadTemplate($this->page->getFullPath());
+ $this->pageContents = $template->render($this->vars);
+ CmsException::unmask();
+ } else
+ $this->pageContents = $apiResult;
/*
* Render the layout
diff --git a/modules/cms/classes/Page.php b/modules/cms/classes/Page.php
index c6811a910..bf8df9ed6 100644
--- a/modules/cms/classes/Page.php
+++ b/modules/cms/classes/Page.php
@@ -13,6 +13,11 @@ use Lang;
*/
class Page extends CmsCompoundObject
{
+ /**
+ * @var array The API bag allows the API handler code to bind arbitrary data to the page object.
+ */
+ public $apiBag = [];
+
protected $settingsValidationRules = [
'title' => 'required',
'url' => ['required', 'regex:/^\/[a-z0-9\/\:_\-\*\[\]\+\?\|\.]*$/i']
@@ -141,8 +146,8 @@ class Page extends CmsCompoundObject
}
$result = [
- 'references' => $references,
- 'nesting' => false,
+ 'references' => $references,
+ 'nesting' => false,
'dynamicItems' => false
];
}
diff --git a/modules/cms/controllers/Index.php b/modules/cms/controllers/Index.php
index 6e5732534..a182ae002 100644
--- a/modules/cms/controllers/Index.php
+++ b/modules/cms/controllers/Index.php
@@ -123,7 +123,7 @@ class Index extends Controller
return [
'tabTitle' => $this->getTabTitle($type, $template),
- 'tab' => $this->makePartial('form_page', [
+ 'tab' => $this->makePartial('form_page', [
'form' => $widget,
'templateType' => $type,
'templateTheme' => $this->theme->getDirName(),
diff --git a/modules/cms/controllers/themes/_theme_list.htm b/modules/cms/controllers/themes/_theme_list.htm
index 45f0fdce9..3fe0fcb7b 100644
--- a/modules/cms/controllers/themes/_theme_list.htm
+++ b/modules/cms/controllers/themes/_theme_list.htm
@@ -2,48 +2,50 @@
$themes = Cms\Classes\Theme::all();
$activeTheme = Cms\Classes\Theme::getActiveTheme();
$cnt = count($themes);
-
- foreach ($themes as $index=>$theme):
+?>
+ $theme): ?>
+ getDirName() == $theme->getDirName();
$author = $theme->getConfigValue('author');
-?>
-
-
-  ?>)
-
-
-
getConfigValue('name', $theme->getDirName())) ?>
- - - -getConfigValue('description', 'The theme description is not provided.')) ?>
-
-
-
-
-
+ ?>
+
+
+
-
+
+
+
+
getConfigValue('name', $theme->getDirName())) ?>
+ + +getConfigValue('description', 'The theme description is not provided.')) ?>
+
+
+
+
+
+
+
-
+
diff --git a/modules/cms/twig/Extension.php b/modules/cms/twig/Extension.php
index 66158ce41..41a07c089 100644
--- a/modules/cms/twig/Extension.php
+++ b/modules/cms/twig/Extension.php
@@ -28,7 +28,7 @@ class Extension extends Twig_Extension
* Creates the extension instance.
* @param \Cms\Classes\Controller $controller The CMS controller object.
*/
- public function __construct(Controller $controller)
+ public function __construct(Controller $controller = null)
{
$this->controller = $controller;
}
@@ -201,7 +201,7 @@ class Extension extends Twig_Extension
public function displayBlock($name, $default = null)
{
if (($result = Block::placeholder($name)) === null) {
- return null;
+ return $default;
}
$result = str_replace('', trim($default), $result);
diff --git a/modules/cms/twig/PlaceholderNode.php b/modules/cms/twig/PlaceholderNode.php
index 26c5c04f1..0ee714890 100644
--- a/modules/cms/twig/PlaceholderNode.php
+++ b/modules/cms/twig/PlaceholderNode.php
@@ -12,14 +12,16 @@ use Twig_NodeInterface;
*/
class PlaceholderNode extends Twig_Node
{
- public function __construct($name, $body, $lineno, $tag = 'placeholder')
+ public function __construct($name, $paramValues, $body, $lineno, $tag = 'placeholder')
{
$nodes = [];
if ($body) {
$nodes['default'] = $body;
}
+ $attributes = $paramValues;
+ $attributes['name'] = $name;
- parent::__construct($nodes, ['name'=>$name], $lineno, $tag);
+ parent::__construct($nodes, $attributes, $lineno, $tag);
}
/**
@@ -47,15 +49,27 @@ class PlaceholderNode extends Twig_Node
->raw("] = ob_get_clean();");
}
+ $isText = $this->hasAttribute('type') && $this->getAttribute('type') == 'text';
+
+ $compiler->addDebugInfo($this);
+ if (!$isText) {
+ $compiler->write("echo \$this->env->getExtension('CMS')->displayBlock(");
+ } else {
+ $compiler->write("echo twig_escape_filter(\$this->env, \$this->env->getExtension('CMS')->displayBlock(");
+ }
+
$compiler
- ->addDebugInfo($this)
- ->write("echo \$this->env->getExtension('CMS')->displayBlock(")
->raw("'".$this->getAttribute('name')."', ")
->raw("\$context[")
->raw("'".$varId."'")
->raw("]")
- ->raw(");\n")
- ;
+ ->raw(")");
+
+ if (!$isText) {
+ $compiler->raw(";\n");
+ } else {
+ $compiler->raw(");\n");
+ }
$compiler
->addDebugInfo($this)
diff --git a/modules/cms/twig/PlaceholderTokenParser.php b/modules/cms/twig/PlaceholderTokenParser.php
index 37eff2435..ba4518ef7 100644
--- a/modules/cms/twig/PlaceholderTokenParser.php
+++ b/modules/cms/twig/PlaceholderTokenParser.php
@@ -1,7 +1,9 @@
parser->getStream();
$name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
$body = null;
+ $params = [];
if ($stream->test(Twig_Token::NAME_TYPE, 'default')) {
$stream->next();
- $stream->expect(Twig_Token::BLOCK_END_TYPE);
+ $params = $this->loadParams($stream);
+
$body = $this->parser->subparse([$this, 'decidePlaceholderEnd'], true);
$stream->expect(Twig_Token::BLOCK_END_TYPE);
- } else {
- $stream->expect(Twig_Token::BLOCK_END_TYPE);
- }
+ } else
+ $params = $this->loadParams($stream);
- return new PlaceholderNode($name, $body, $token->getLine(), $this->getTag());
+ return new PlaceholderNode($name, $params, $body, $token->getLine(), $this->getTag());
}
public function decidePlaceholderEnd(Twig_Token $token)
@@ -51,6 +54,35 @@ class PlaceholderTokenParser extends Twig_TokenParser
return $token->test('endplaceholder');
}
+ protected function loadParams($stream)
+ {
+ $params = [];
+
+ $end = false;
+ while (!$end) {
+ $current = $stream->next();
+
+ switch ($current->getType()) {
+ case Twig_Token::NAME_TYPE:
+ $paramName = $current->getValue();
+ $stream->expect(Twig_Token::OPERATOR_TYPE, '=');
+ $current = $stream->next();
+ $params[$paramName] = $current->getValue();
+ break;
+
+ case Twig_Token::BLOCK_END_TYPE:
+ $end = true;
+ break;
+
+ default:
+ throw new Twig_Error_Syntax(sprintf('Invalid syntax in the placeholder tag. Line %s', $lineno), $stream->getCurrent()->getLine(), $stream->getFilename());
+ break;
+ }
+ }
+
+ return $params;
+ }
+
/**
* Gets the tag name associated with this token parser.
*
diff --git a/modules/cms/widgets/TemplateList.php b/modules/cms/widgets/TemplateList.php
index 7ba791d9b..453b660da 100644
--- a/modules/cms/widgets/TemplateList.php
+++ b/modules/cms/widgets/TemplateList.php
@@ -58,6 +58,16 @@ class TemplateList extends WidgetBase
*/
public $itemType;
+ /**
+ * @var string Extra CSS class name to apply to the control.
+ */
+ public $controlClass = null;
+
+ /**
+ * @var string A list of directories to suppress / hide.
+ */
+ public $suppressDirectories = [];
+
/*
* Public methods
*/
@@ -137,6 +147,15 @@ class TemplateList extends WidgetBase
$normalizedItems = [];
foreach ($items as $item) {
+ if ($this->suppressDirectories) {
+ $filelName = $item->getBaseFileName();
+ $dir = dirname($filelName);
+
+ if (in_array($dir, $this->suppressDirectories)) {
+ continue;
+ }
+ }
+
$normalizedItems[] = $this->normalizeItem($item);
}
@@ -206,13 +225,13 @@ class TemplateList extends WidgetBase
}
$result = [
- 'title' => $this->getItemTitle($item),
- 'fileName' => $item->getFileName(),
- 'description' => $description,
+ 'title' => $this->getItemTitle($item),
+ 'fileName' => $item->getFileName(),
+ 'description' => $description,
'descriptions' => $descriptions
];
- return (object)$result;
+ return (object) $result;
}
protected function getItemTitle($item)
@@ -220,10 +239,10 @@ class TemplateList extends WidgetBase
$titleProperty = $this->titleProperty;
if ($titleProperty) {
- return $item->$titleProperty ?: $item->getFileName();
+ return $item->$titleProperty ?: basename($item->getFileName());
}
- return $item->getFileName();
+ return basename($item->getFileName());
}
protected function setSearchTerm($term)
diff --git a/modules/cms/widgets/templatelist/partials/_items.htm b/modules/cms/widgets/templatelist/partials/_items.htm
index 1a37e578f..d7b15c31a 100644
--- a/modules/cms/widgets/templatelist/partials/_items.htm
+++ b/modules/cms/widgets/templatelist/partials/_items.htm
@@ -8,14 +8,15 @@
makePartial('items', ['items'=>$item->items, 'nested'=>true]) ?>
-
+ itemType.'-'.$this->theme->getDirName().'-'.$item->fileName;
?>
title) ?>
- descriptions as $title=>$value): ?>
+ descriptions as $title => $value): ?>
:
@@ -23,16 +24,17 @@
description) ?>
+
fileName) ?>
- isTemplateSelected($item) ? 'checked' : null ?>
+ name="template[fileName) ?>]"
+ isTemplateSelected($item) ? 'checked' : null ?>
data-request="getEventHandler('onSelect') ?>"
value="1">
diff --git a/modules/cms/widgets/templatelist/partials/_templates.htm b/modules/cms/widgets/templatelist/partials/_templates.htm
index 12609a2b2..4809055db 100644
--- a/modules/cms/widgets/templatelist/partials/_templates.htm
+++ b/modules/cms/widgets/templatelist/partials/_templates.htm
@@ -1,6 +1,6 @@