diff --git a/src/assets/groups.json b/src/assets/groups.json index 0ee78244..c7b739fd 100644 --- a/src/assets/groups.json +++ b/src/assets/groups.json @@ -1,6 +1,6 @@ [{ "_hidden_node": { - "jqm_toolbars":["Header", "Footer", "Navbar"], + "jqm_toolbars":["Header", "CustomHeader", "Footer", "Navbar"], "jqm_input_boolean":["ToggleSwitch", "RadioButton", "RadioGroup", "Checkbox", "CheckboxGroup"], "jqm_other_inputs":[ { "Form": ["Form"], diff --git a/src/css/images/widgets/jqm_customheader.svg b/src/css/images/widgets/jqm_customheader.svg new file mode 100644 index 00000000..971804d9 --- /dev/null +++ b/src/css/images/widgets/jqm_customheader.svg @@ -0,0 +1,23 @@ + + + diff --git a/src/js/composer.js b/src/js/composer.js index b711783e..a29a87cd 100644 --- a/src/js/composer.js +++ b/src/js/composer.js @@ -542,6 +542,7 @@ $(function() { // Collapsible's items are under .ui-collapsible-content '> .ui-collapsible-content > .adm-node,' + '> ul > li.adm-node,' + + '> div > .adm-node,' + '> *.orig-adm-node:not(.ui-header,.ui-content,.ui-footer)', start: function(event, ui){ trackOffsets('start: ',ui,$(this).data('sortable')); diff --git a/src/js/widgets.js b/src/js/widgets.js index e97bde83..f467e860 100644 --- a/src/js/widgets.js +++ b/src/js/widgets.js @@ -331,7 +331,7 @@ var BWidgetRegistry = { { name: "top", cardinality: "1", - allow: "Header" + allow: ["Header", "CustomHeader"] }, { name: "content", @@ -389,6 +389,36 @@ var BWidgetRegistry = { ] }, + /** + * Represents a header object at the top of a page. Includes a "text" + * property that represents header text. Includes "left" and "right" zones + * for optional buttons, and "bottom" zone for an optional navbar. + */ + CustomHeader: { + parent: "Background", + allowIn: "Page", + dragHeader: true, + paletteImageName: "jqm_customheader.svg", + displayLabel: "Custom Header", + moveable: false, + template: '