sibu 0.9.5 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed61a8ed060882bc3f4eaa48e90e2e91193e0af6
-  data.tar.gz: ff7bcbcb03080feee6786bfafdc8c26dac35373f
+  metadata.gz: 48f219f6b806e3d5d5fbd7ce2df9224fd2e65b8a
+  data.tar.gz: 56fcfd81852d1cb3a11f4c0b4a3754cbf0f261c7
 SHA512:
-  metadata.gz: a9c9f0cc63ef7b0df355d5dc02f3be1031b91e8f929c36b8c41cbbe80e5b969456a8a6f4c8718fef02f04db0d89f429e65695adf2906563e904b4e0050c33a4d
-  data.tar.gz: 9306934fc10e73c5f02960fe4d40bc0c2c9d148f542066dd27deff6e82ac54690dae7d051273056602c8f715076c7214d1a748d0d84d568a825f02314a10c8ec
+  metadata.gz: 10d19792d46338bd0bd7a3be61bad6547562e8e55edf252ee311727b7f02dfad823c95e66667f3e314ad6d3be30ca51a688028b0a1628f7d6ecfda46caf2e12d
+  data.tar.gz: 92ecb493f7f4f5986cb0c8f5936add93dd5d962fa7618c5eba06cbd40638bc73837ba0f9e94a6673968c3ec044685ac25fa5d2e37eb21cbd20c8e5b0eb41bad3

data/README.md

@@ -1,9 +1,13 @@
-# Sibu - A site builder engine for Ruby on Rails
-This is an engine for Ruby on Rails that enables creation of static
-websites in a simple & wysiwyg way.
+# Sibu
+Sibu is an engine to build websites. It focuses on :
+- Maintaining a simple data model, so it can be exported & imported in many formats
+- Increasing the productivity of web developers by using a Domain Specific Language for page edition
+- Providing non-technical users with a simple and accessible site administration interface
 
 ## Usage
-How to use my plugin.
+Sibu is currently implemented as a Ruby on Rails engine. Therefore its setup requires a host Ruby on Rails application, that can be created via :
+
+`rails new my_app`
 
 ## Installation
 Add this line to your application's Gemfile:
@@ -22,6 +26,79 @@ Or install it yourself as:
 $ gem install sibu
 ```
 
+Once the installation is complete, make sure that you copy the database migrations to your application :
+```bash
+rake sibu:install:migrations
+```
+
+And finally run the migrations to update your database model :
+```bash
+rake db:migrate
+```
+
+## Configuration
+Configuration is provided via the `sibu` key of the Rails application configuration. Typically, this would be done in a `sibu.rb` file in the `config/initializers` folder of your Rails application.
+The example below lists the configuration options available :
+```ruby
+Rails.application.config.sibu = {
+
+  # Title metatag of the admin interface
+  title: 'My website administration',
+
+  # Stylesheet to use to style the admin interface
+  stylesheet: 'my_user_css',
+
+  # Javascript to include in the admin interface
+  javascript: 'my_user_js',
+
+  # Path to the admin interface header partial
+  top_panel: 'shared/user/top_panel',
+
+  # Path to the main content edition partial - must include a yield to delegate content display to the Sibu engine
+  content_panel: 'shared/user/content_panel',
+
+  # Path to the admin interface footer partial
+  bottom_panel: 'shared/user/bottom_panel',
+
+  # Name of the method that will be used to authenticate admin users - this method must be available to Sibu controllers
+  auth_filter: :authenticate_user!,
+
+  # Name of the method that will retrieve the current user - this method must be available to Sibu controllers
+  current_user: 'current_user',
+
+  # A flag to indicate that the Sibu instance should offer a separate environment for each user
+  multi_user: true,
+
+  # A proc to identify super-admin users in a multi-users setup (optional)
+  admin_filter: Proc.new {|usr| usr.is_admin},
+
+  # When active, users will be able to override the colors and fonts of the sites templates (optional)
+  custom_styles: true,
+
+  # Lists of colors and fonts available for sites templates customization - Only used when custom_styles is set to true (optional)
+  primary_colors: ['#23527c', '#00B1BF', '#BECD00'],
+  secondary_colors: ['#E2007A', '#aaaaa1', '#be6432'],
+  primary_fonts: ['Intro', 'Lato', 'SourceSansPro'],
+  secondary_fonts: ['Aleo', 'Bodoni', 'Cinzel'],
+
+  # The domain name that will host the admin interface (should be different from the website domain name)
+  host: 'localhost',
+
+  # A partial for 404 error pages
+  not_found: 'shared/templates/not_found',
+
+  # Dimensions of the images to use in the website - Uploaded images will be automatically resized in the provided formats
+  images: {large: 1600, medium: 800, small: 320},
+
+  # Versions available for the created websites
+  versions: [['Français', 'fr'], ['Anglais', 'en']],
+
+  # A proc to override the default ordering of the sections when editing content (optional)
+  sections_ordering: Proc.new {|sections| sections.sort_by {|s| SECTIONS_TABS.index(s['category'])}}
+}
+```
+
+
 ## Improvements
   - Use a specific controller & helper for site display
   - Move page templates to SiteTemplate model

data/app/assets/javascripts/sibu/sibu.js.erb

@@ -1,5 +1,3 @@
-//= require rails-ujs
-//= require jquery
 //= require sibu/common
 //= require ../quill/quill
 //= require ../tabs/van11y-accessible-tab-panel-aria
@@ -140,7 +138,7 @@ function displayCurrentCenter(img, centerPos) {
 }
 
 function refreshAfterEdit(reload, sectionId) {
-    var baseUrl = window.location.href.split('?')[0];
+    var baseUrl = window.location.href.split('?')[0].replace(/#.+/, '');
     if (reload) {
         if (sectionId) {
             window.location.href = baseUrl + '?edit_section=' + sectionId;
@@ -152,6 +150,22 @@ function refreshAfterEdit(reload, sectionId) {
     }
 }
 
+function setLinkMode(elt) {
+    var selected = elt.value,
+        enabledElts = document.querySelector("#link_" + selected).querySelectorAll("#element_value, #element_target");
+    for (var i = 0; i < enabledElts.length; i++) {
+        enabledElts[i].removeAttribute("disabled");
+    }
+
+    var linkModes = document.querySelectorAll(".sibu_edit_form .link_mode");
+    for (var j = 0; j < linkModes.length; j++) {
+        if(linkModes[j].getAttribute("id") !== ("link_" + selected)) {
+            linkModes[j].querySelector("#element_value").setAttribute("disabled", "disabled");
+            linkModes[j].querySelector("#element_target").setAttribute("disabled", "disabled");
+        }
+    }
+}
+
 function initSectionsPanel() {
 
 }

data/app/assets/javascripts/tabs/van11y-accessible-tab-panel-aria.js

@@ -160,9 +160,10 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
      * @param  {Node} node Default document
      * @return {Array}
      */
+    // Note : patched to target only direct child nodes having .js-tabs class
     var $listTabs = function $listTabs() {
         var node = arguments.length <= 0 || arguments[0] === undefined ? doc : arguments[0];
-        return [].slice.call(node.querySelectorAll('.' + TABS_JS));
+        return [].slice.call(node.querySelectorAll(':scope > .' + TABS_JS));
     };
 
     /**
@@ -178,10 +179,10 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
             var hx = tabs_node.hasAttribute(TABS_DATA_HX) === true ? tabs_node.getAttribute(TABS_DATA_HX) : '';
             var hxGeneratedClass = tabs_node.hasAttribute(TABS_DATA_GENERATED_HX_CLASS) === true ? tabs_node.getAttribute(TABS_DATA_GENERATED_HX_CLASS) : TABS_HX_DEFAULT_CLASS;
             var existingHx = tabs_node.hasAttribute(TABS_DATA_EXISTING_HX) === true ? tabs_node.getAttribute(TABS_DATA_EXISTING_HX) : '';
-            var $tabList = [].slice.call(tabs_node.querySelectorAll('.' + TABS_JS_LIST));
-            var $tabListItems = [].slice.call(tabs_node.querySelectorAll('.' + TABS_JS_LISTITEM));
-            var $tabListLinks = [].slice.call(tabs_node.querySelectorAll('.' + TABS_JS_LISTLINK));
-            var $tabListPanels = [].slice.call(tabs_node.querySelectorAll('.' + TABS_JS_CONTENT));
+            var $tabList = [].slice.call(tabs_node.querySelectorAll(':scope > .' + TABS_JS_LIST));
+            var $tabListItems = [].slice.call(tabs_node.querySelectorAll(':scope > .' + TABS_JS_LIST + ' > .' + TABS_JS_LISTITEM));
+            var $tabListLinks = [].slice.call(tabs_node.querySelectorAll(':scope > .' + TABS_JS_LIST + ' > .' + TABS_JS_LISTITEM + ' > .' + TABS_JS_LISTLINK));
+            var $tabListPanels = [].slice.call(tabs_node.querySelectorAll(':scope > .' + TABS_JS_CONTENT));
             var noTabSelected = true;
 
             // container
@@ -300,35 +301,91 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
     };
 
     /* listeners */
-    var bindListeners = function() {
-        ['click', 'keydown'].forEach(function (eventName) {
-            //let isCtrl = false;
-
-            doc.body.addEventListener(eventName, function (e) {
+    ['click', 'keydown'].forEach(function (eventName) {
+        //let isCtrl = false;
+
+        doc.body.addEventListener(eventName, function (e) {
+
+            // click on a tab link or on something IN a tab link
+            var parentLink = searchParent(e.target, TABS_JS_LISTLINK);
+            if ((hasClass(e.target, TABS_JS_LISTLINK) === true || parentLink !== '') && eventName === 'click') {
+                var linkSelected = hasClass(e.target, TABS_JS_LISTLINK) === true ? e.target : findById(parentLink);
+                var parentTabId = searchParent(e.target, TABS_JS);
+                var parentTab = findById(parentTabId);
+                //let $parentListItems = [].slice.call(parentTab.querySelectorAll('.' + TABS_JS_LISTITEM));
+                var $parentListLinks = [].slice.call(parentTab.querySelectorAll('.' + TABS_JS_LISTLINK));
+                var $parentListContents = [].slice.call(parentTab.querySelectorAll('.' + TABS_JS_CONTENT));
+
+                // aria selected false on all links
+                unSelectLinks($parentListLinks);
+                // add aria-hidden on all tabs contents
+                unSelectContents($parentListContents);
+                // add aria selected on selected link + show linked panel
+                selectLink(linkSelected);
+
+                e.preventDefault();
+            }
 
-                // click on a tab link or on something IN a tab link
-                var parentLink = searchParent(e.target, TABS_JS_LISTLINK);
-                if ((hasClass(e.target, TABS_JS_LISTLINK) === true || parentLink !== '') && eventName === 'click') {
-                    var linkSelected = hasClass(e.target, TABS_JS_LISTLINK) === true ? e.target : findById(parentLink);
-                    var parentTabId = searchParent(e.target, TABS_JS);
-                    var parentTab = findById(parentTabId);
-                    //let $parentListItems = [].slice.call(parentTab.querySelectorAll('.' + TABS_JS_LISTITEM));
-                    var $parentListLinks = [].slice.call(parentTab.querySelectorAll('.' + TABS_JS_LISTLINK));
-                    var $parentListContents = [].slice.call(parentTab.querySelectorAll('.' + TABS_JS_CONTENT));
+            // Key down on tabs
+            if ((hasClass(e.target, TABS_JS_LISTLINK) === true || parentLink !== '') && eventName === 'keydown') {
+                //let linkSelected = hasClass( e.target, TABS_JS_LISTLINK) === true ? e.target : findById( parentLink );
+                var parentTabId = searchParent(e.target, TABS_JS);
+                var parentTab = findById(parentTabId);
+                var $parentListItems = [].slice.call(parentTab.querySelectorAll('.' + TABS_JS_LISTITEM));
+                var $parentListLinks = [].slice.call(parentTab.querySelectorAll('.' + TABS_JS_LISTLINK));
+                var $parentListContents = [].slice.call(parentTab.querySelectorAll('.' + TABS_JS_CONTENT));
+                var firstLink = $parentListItems[0].querySelector('.' + TABS_JS_LISTLINK);
+                var lastLink = $parentListItems[$parentListItems.length - 1].querySelector('.' + TABS_JS_LISTLINK);
+
+                // strike home on a tab => 1st tab
+                if (e.keyCode === 36) {
+                    unSelectLinks($parentListLinks);
+                    unSelectContents($parentListContents);
+                    selectLink(firstLink);
 
-                    // aria selected false on all links
+                    e.preventDefault();
+                }
+                // strike end on a tab => last tab
+                else if (e.keyCode === 35) {
                     unSelectLinks($parentListLinks);
-                    // add aria-hidden on all tabs contents
                     unSelectContents($parentListContents);
-                    // add aria selected on selected link + show linked panel
-                    selectLink(linkSelected);
+                    selectLink(lastLink);
 
                     e.preventDefault();
                 }
+                // strike up or left on the tab => previous tab
+                else if ((e.keyCode === 37 || e.keyCode === 38) && !e.ctrlKey) {
+                    if (firstLink.getAttribute(ATTR_SELECTED) === 'true') {
+                        unSelectLinks($parentListLinks);
+                        unSelectContents($parentListContents);
+                        selectLink(lastLink);
+
+                        e.preventDefault();
+                    } else {
+                        selectLinkInList($parentListItems, $parentListLinks, $parentListContents, 'prev');
+                        e.preventDefault();
+                    }
+                }
+                // strike down or right in the tab => next tab
+                else if ((e.keyCode === 40 || e.keyCode === 39) && !e.ctrlKey) {
+                    if (lastLink.getAttribute(ATTR_SELECTED) === 'true') {
+                        unSelectLinks($parentListLinks);
+                        unSelectContents($parentListContents);
+                        selectLink(firstLink);
+
+                        e.preventDefault();
+                    } else {
+                        selectLinkInList($parentListItems, $parentListLinks, $parentListContents, 'next');
+                        e.preventDefault();
+                    }
+                }
+            }
 
-                // Key down on tabs
-                if ((hasClass(e.target, TABS_JS_LISTLINK) === true || parentLink !== '') && eventName === 'keydown') {
-                    //let linkSelected = hasClass( e.target, TABS_JS_LISTLINK) === true ? e.target : findById( parentLink );
+            // Key down in tab panels
+            var parentTabPanelId = searchParent(e.target, TABS_JS_CONTENT);
+            if (parentTabPanelId !== '' && eventName === 'keydown') {
+                (function () {
+                    var linkSelected = findById(findById(parentTabPanelId).getAttribute(ATTR_LABELLEDBY));
                     var parentTabId = searchParent(e.target, TABS_JS);
                     var parentTab = findById(parentTabId);
                     var $parentListItems = [].slice.call(parentTab.querySelectorAll('.' + TABS_JS_LISTITEM));
@@ -337,130 +394,71 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
                     var firstLink = $parentListItems[0].querySelector('.' + TABS_JS_LISTLINK);
                     var lastLink = $parentListItems[$parentListItems.length - 1].querySelector('.' + TABS_JS_LISTLINK);
 
-                    // strike home on a tab => 1st tab
-                    if (e.keyCode === 36) {
-                        unSelectLinks($parentListLinks);
-                        unSelectContents($parentListContents);
-                        selectLink(firstLink);
-
+                    // strike up + ctrl => go to header
+                    if (e.keyCode === 38 && e.ctrlKey) {
+                        setTimeout(function () {
+                            linkSelected.focus();
+                        }, 0);
                         e.preventDefault();
                     }
-                    // strike end on a tab => last tab
-                    else if (e.keyCode === 35) {
-                        unSelectLinks($parentListLinks);
-                        unSelectContents($parentListContents);
-                        selectLink(lastLink);
-
+                    // strike pageup + ctrl => go to prev header
+                    if (e.keyCode === 33 && e.ctrlKey) {
+                        // go to header
+                        linkSelected.focus();
                         e.preventDefault();
-                    }
-                    // strike up or left on the tab => previous tab
-                    else if ((e.keyCode === 37 || e.keyCode === 38) && !e.ctrlKey) {
+                        // then previous
                         if (firstLink.getAttribute(ATTR_SELECTED) === 'true') {
                             unSelectLinks($parentListLinks);
                             unSelectContents($parentListContents);
                             selectLink(lastLink);
-
-                            e.preventDefault();
                         } else {
                             selectLinkInList($parentListItems, $parentListLinks, $parentListContents, 'prev');
-                            e.preventDefault();
                         }
                     }
-                    // strike down or right in the tab => next tab
-                    else if ((e.keyCode === 40 || e.keyCode === 39) && !e.ctrlKey) {
+                    // strike pagedown + ctrl => go to next header
+                    if (e.keyCode === 34 && e.ctrlKey) {
+                        // go to header
+                        linkSelected.focus();
+                        e.preventDefault();
+                        // then next
                         if (lastLink.getAttribute(ATTR_SELECTED) === 'true') {
                             unSelectLinks($parentListLinks);
                             unSelectContents($parentListContents);
                             selectLink(firstLink);
-
-                            e.preventDefault();
                         } else {
                             selectLinkInList($parentListItems, $parentListLinks, $parentListContents, 'next');
-                            e.preventDefault();
                         }
                     }
-                }
-
-                // Key down in tab panels
-                var parentTabPanelId = searchParent(e.target, TABS_JS_CONTENT);
-                if (parentTabPanelId !== '' && eventName === 'keydown') {
-                    (function () {
-                        var linkSelected = findById(findById(parentTabPanelId).getAttribute(ATTR_LABELLEDBY));
-                        var parentTabId = searchParent(e.target, TABS_JS);
-                        var parentTab = findById(parentTabId);
-                        var $parentListItems = [].slice.call(parentTab.querySelectorAll('.' + TABS_JS_LISTITEM));
-                        var $parentListLinks = [].slice.call(parentTab.querySelectorAll('.' + TABS_JS_LISTLINK));
-                        var $parentListContents = [].slice.call(parentTab.querySelectorAll('.' + TABS_JS_CONTENT));
-                        var firstLink = $parentListItems[0].querySelector('.' + TABS_JS_LISTLINK);
-                        var lastLink = $parentListItems[$parentListItems.length - 1].querySelector('.' + TABS_JS_LISTLINK);
-
-                        // strike up + ctrl => go to header
-                        if (e.keyCode === 38 && e.ctrlKey) {
-                            setTimeout(function () {
-                                linkSelected.focus();
-                            }, 0);
-                            e.preventDefault();
-                        }
-                        // strike pageup + ctrl => go to prev header
-                        if (e.keyCode === 33 && e.ctrlKey) {
-                            // go to header
-                            linkSelected.focus();
-                            e.preventDefault();
-                            // then previous
-                            if (firstLink.getAttribute(ATTR_SELECTED) === 'true') {
-                                unSelectLinks($parentListLinks);
-                                unSelectContents($parentListContents);
-                                selectLink(lastLink);
-                            } else {
-                                selectLinkInList($parentListItems, $parentListLinks, $parentListContents, 'prev');
-                            }
-                        }
-                        // strike pagedown + ctrl => go to next header
-                        if (e.keyCode === 34 && e.ctrlKey) {
-                            // go to header
-                            linkSelected.focus();
-                            e.preventDefault();
-                            // then next
-                            if (lastLink.getAttribute(ATTR_SELECTED) === 'true') {
-                                unSelectLinks($parentListLinks);
-                                unSelectContents($parentListContents);
-                                selectLink(firstLink);
-                            } else {
-                                selectLinkInList($parentListItems, $parentListLinks, $parentListContents, 'next');
-                            }
-                        }
-                    })();
-                }
-
-                // click on a tab link
-                var parentLinkToPanelId = searchParent(e.target, TABS_JS_LINK_TO_TAB);
-                if ((hasClass(e.target, TABS_JS_LINK_TO_TAB) === true || parentLinkToPanelId !== '') && eventName === 'click') {
-                    var panelSelectedId = hasClass(e.target, TABS_JS_LINK_TO_TAB) === true ? e.target.getAttribute('href').replace('#', '') : findById(parentLinkToPanelId).replace('#', '');
-                    var panelSelected = findById(panelSelectedId);
-                    var buttonPanelSelected = findById(panelSelected.getAttribute(ATTR_LABELLEDBY));
-                    var parentTabId = searchParent(e.target, TABS_JS);
-                    var parentTab = findById(parentTabId);
-                    //let $parentListItems = [].slice.call(parentTab.querySelectorAll('.' + TABS_JS_LISTITEM));
-                    var $parentListLinks = [].slice.call(parentTab.querySelectorAll('.' + TABS_JS_LISTLINK));
-                    var $parentListContents = [].slice.call(parentTab.querySelectorAll('.' + TABS_JS_CONTENT));
-
-                    unSelectLinks($parentListLinks);
-                    unSelectContents($parentListContents);
-                    selectLink(buttonPanelSelected);
+                })();
+            }
 
-                    e.preventDefault();
-                }
-            }, true);
-        });
-    };
+            // click on a tab link
+            var parentLinkToPanelId = searchParent(e.target, TABS_JS_LINK_TO_TAB);
+            if ((hasClass(e.target, TABS_JS_LINK_TO_TAB) === true || parentLinkToPanelId !== '') && eventName === 'click') {
+                var panelSelectedId = hasClass(e.target, TABS_JS_LINK_TO_TAB) === true ? e.target.getAttribute('href').replace('#', '') : findById(parentLinkToPanelId).replace('#', '');
+                var panelSelected = findById(panelSelectedId);
+                var buttonPanelSelected = findById(panelSelected.getAttribute(ATTR_LABELLEDBY));
+                var parentTabId = searchParent(e.target, TABS_JS);
+                var parentTab = findById(parentTabId);
+                //let $parentListItems = [].slice.call(parentTab.querySelectorAll('.' + TABS_JS_LISTITEM));
+                var $parentListLinks = [].slice.call(parentTab.querySelectorAll('.' + TABS_JS_LISTLINK));
+                var $parentListContents = [].slice.call(parentTab.querySelectorAll('.' + TABS_JS_CONTENT));
+
+                unSelectLinks($parentListLinks);
+                unSelectContents($parentListContents);
+                selectLink(buttonPanelSelected);
+
+                e.preventDefault();
+            }
+        }, true);
+    });
 
     var onLoad = function onLoad() {
         attach();
-        bindListeners();
         document.removeEventListener('DOMContentLoaded', onLoad);
     };
 
     document.addEventListener('DOMContentLoaded', onLoad);
 
-    window.van11yAccessibleTabPanelAria = attach;
+    window.sibuVan11yAccessibleTabPanelAria = attach;
 })(document);