+ data-control="flyout"
+ data-flyout-width="400"
+ data-flyout-toggle="#layout-sidenav"
+
+ >
+
+
+
makeLayoutPartial('sidenav') ?>
diff --git a/modules/system/assets/ui/js/drag.sort.js b/modules/system/assets/ui/js/drag.sort.js
index 17017abd3..fc9df56ac 100644
--- a/modules/system/assets/ui/js/drag.sort.js
+++ b/modules/system/assets/ui/js/drag.sort.js
@@ -28,13 +28,37 @@
Sortable.prototype.init = function() {
this.$el.one('dispose-control', this.proxy(this.dispose))
- var sortableOptions = {
- onDragStart: this.proxy(this.onDragStart),
- onDrag: this.proxy(this.onDrag),
- onDrop: this.proxy(this.onDrop)
+ var
+ self = this,
+ sortableOverrides = {},
+ sortableDefaults = {
+ onDragStart: this.proxy(this.onDragStart),
+ onDrag: this.proxy(this.onDrag),
+ onDrop: this.proxy(this.onDrop)
+ }
+
+ /*
+ * Override _super object for each option/event
+ */
+ if (this.options.onDragStart) {
+ sortableOverrides.onDragStart = function ($item, container, _super, event) {
+ self.options.onDragStart($item, container, sortableDefaults.onDragStart, event)
+ }
}
- this.$el.jqSortable($.extend(sortableOptions, this.options))
+ if (this.options.onDrag) {
+ sortableOverrides.onDrag = function ($item, position, _super, event) {
+ self.options.onDrag($item, position, sortableDefaults.onDrag, event)
+ }
+ }
+
+ if (this.options.onDrop) {
+ sortableOverrides.onDrop = function ($item, container, _super, event) {
+ self.options.onDrop($item, container, sortableDefaults.onDrop, event)
+ }
+ }
+
+ this.$el.jqSortable($.extend({}, sortableDefaults, this.options, sortableOverrides))
}
Sortable.prototype.dispose = function() {
@@ -47,24 +71,6 @@
BaseProto.dispose.call(this)
}
- Sortable.prototype.onDrag = function ($item, position, _super, event) {
- if (this.cursorAdjustment) {
- /*
- * Relative cursor position
- */
- $item.css({
- left: position.left - this.cursorAdjustment.left,
- top: position.top - this.cursorAdjustment.top
- })
- }
- else {
- /*
- * Default behavior
- */
- $item.css(position)
- }
- }
-
Sortable.prototype.onDragStart = function ($item, container, _super, event) {
/*
* Relative cursor position
@@ -109,6 +115,24 @@
}
}
+ Sortable.prototype.onDrag = function ($item, position, _super, event) {
+ if (this.cursorAdjustment) {
+ /*
+ * Relative cursor position
+ */
+ $item.css({
+ left: position.left - this.cursorAdjustment.left,
+ top: position.top - this.cursorAdjustment.top
+ })
+ }
+ else {
+ /*
+ * Default behavior
+ */
+ $item.css(position)
+ }
+ }
+
Sortable.prototype.onDrop = function ($item, container, _super, event) {
$item.removeClass('dragged').removeAttr('style')
$('body').removeClass('dragging')
diff --git a/modules/system/assets/ui/js/input.preset.js b/modules/system/assets/ui/js/input.preset.js
index 428ed85b7..64d43284a 100644
--- a/modules/system/assets/ui/js/input.preset.js
+++ b/modules/system/assets/ui/js/input.preset.js
@@ -225,7 +225,17 @@
})
}
+ InputPreset.prototype.formatNamespace = function() {
+ var value = toCamel(this.$src.val())
+
+ return value.substr(0, 1).toUpperCase() + value.substr(1)
+ }
+
InputPreset.prototype.formatValue = function() {
+ if (this.options.inputPresetType == 'namespace') {
+ return this.formatNamespace()
+ }
+
if (this.options.inputPresetType == 'camel')
var value = toCamel(this.$src.val())
else {
diff --git a/modules/system/assets/ui/less/toolbar.less b/modules/system/assets/ui/less/toolbar.less
index 591c40f9e..07b940c83 100644
--- a/modules/system/assets/ui/less/toolbar.less
+++ b/modules/system/assets/ui/less/toolbar.less
@@ -104,7 +104,7 @@
overflow: hidden;
}
-#layout-side-panel {
+#layout-side-panel, .panel-contents {
.control-toolbar {
padding: 20px 0 20px 20px;
}
diff --git a/modules/system/classes/PluginBase.php b/modules/system/classes/PluginBase.php
index ea7d5c0ad..830b6120a 100644
--- a/modules/system/classes/PluginBase.php
+++ b/modules/system/classes/PluginBase.php
@@ -1,6 +1,9 @@
getConfigurationFromYaml(sprintf('Plugin configuration file plugin.yaml is not '.
+ 'found for the plugin class %s. Create the file or override pluginDetails() '.
+ 'method in the plugin class.', $thisClass));
+
+ if (!array_key_exists('plugin', $configuration)) {
+ throw new SystemException('The plugin configuration file plugin.yaml should contain the "plugin" section: %s.', $thisClass);
+ }
+
+ return $configuration['plugin'];
+ }
/**
* Register method, called when the plugin is first registered.
@@ -147,4 +165,31 @@ abstract class PluginBase extends ServiceProviderBase
$this->commands($key);
}
+
+ protected function getConfigurationFromYaml($exceptionMessage = null)
+ {
+ if ($this->loadedYamlConfigration !== false) {
+ return $this->loadedYamlConfigration;
+ }
+
+ $reflection = new ReflectionClass(get_class($this));
+ $yamlFilePath = dirname($reflection->getFileName()).'/plugin.yaml';
+
+ if (!file_exists($yamlFilePath)) {
+ if ($exceptionMessage) {
+ throw new SystemException($exceptionMessage);
+ }
+ else {
+ $this->loadedYamlConfigration = [];
+ }
+ }
+ else {
+ $this->loadedYamlConfigration = Yaml::parse(file_get_contents($yamlFilePath));
+ if (!is_array($this->loadedYamlConfigration)) {
+ throw new SystemException('Invalid format of the plugin configuration file: %s. The file should define an array.', $filePath);
+ }
+ }
+
+ return $this->loadedYamlConfigration;
+ }
}