iqvoc 4.12.0 → 4.13.2

data/app/assets/javascripts/iqvoc/treeview.js

@@ -1,272 +1,272 @@
+import 'jqtree/tree.jquery.js';
+
 /*jslint vars: true, browser: true, white: true */
 /*global jQuery, IQVOC */
 
-IQVOC.treeview = (function($) {
-
-"use strict";
-
-function Treeview(container) {
-  this.container = container.jquery ? container : $(container);
-
-  $(container).each(function() {
-    var url = $(this).data('url');
-    var container = this;
-
-    var dragabbleSupport = $(container).data('dragabble');
-    var polyhierarchySupport = $(container).data('polyhierarchy-support');
-    var saveLabel = $(container).data('save-label');
-    var copyLabel = $(container).data('copy-label');
-    var undoLabel = $(container).data('undo-label');
-
-    // build tree data from html markup
-    var data = $(this).children('li').map(function() {
-      var item = $(this);
-
-      return {
-        label: item.children('a').html(),
-        load_on_demand: item.data('has-children'),
-        locked: item.data('locked'),
-        id: item.attr('id'),
-        url: item.children('a').attr('href'),
-        update_url: item.data('update-url'),
-        glance_url: item.data('glance-url'),
-        published: item.data('published'),
-        additionalText: item.children('span.additional_info').html()
-      };
-    });
+(function($) {
+  "use strict";
+
+  function Treeview(container) {
+    this.container = container.jquery ? container : $(container);
+
+    $(container).each(function() {
+      var url = $(this).data('url');
+      var container = this;
+
+      var dragabbleSupport = $(container).data('dragabble');
+      var polyhierarchySupport = $(container).data('polyhierarchy-support');
+      var conceptModalPreviewEnabled = $(container).data('concept-modal-preview-enabled');
+      var saveLabel = $(container).data('save-label');
+      var copyLabel = $(container).data('copy-label');
+      var undoLabel = $(container).data('undo-label');
+
+      // build tree data from html markup
+      var data = $(this).children('li').map(function() {
+        var item = $(this);
+
+        return {
+          label: item.children('a').html(),
+          load_on_demand: item.data('has-children'),
+          locked: item.data('locked'),
+          id: item.attr('id'),
+          url: item.children('a').attr('href'),
+          update_url: item.data('update-url'),
+          glance_url: item.data('glance-url'),
+          published: item.data('published'),
+          additionalText: item.children('span.additional_info').html()
+        };
+      });
 
-    $(this).tree({
-      dragAndDrop: dragabbleSupport ? true : false,
-      autoEscape: false,
-      selectable: false,
-      useContextMenu: false,
-      closedIcon: $('<i class="fa fa-plus-square-o"></i>'),
-      openedIcon: $('<i class="fa fa-minus-square-o"></i>'),
-      data: data,
-      dataUrl: function(node) {
-        var uri = URI(url).addQuery('root', node.id);
-        return uri.normalize().toString();
-      },
-      onCreateLi: function(node, $li) {
-        var link = buildLink(node.url, node.name);
-        $li.find('.jqtree-title').replaceWith(link);
-
-        // add aditional info if present (e.g. for collections)
-        if (node.additionalText) {
-          link.after(' ', node.additionalText);
-        }
+      $(this).tree({
+        dragAndDrop: dragabbleSupport ? true : false,
+        autoEscape: false,
+        selectable: false,
+        useContextMenu: false,
+        closedIcon: $('<i class="fa fa-plus-square-o"></i>'),
+        openedIcon: $('<i class="fa fa-minus-square-o"></i>'),
+        data: data,
+        dataUrl: function(node) {
+          var uri = new URL(url, window.location.origin);
+          uri.searchParams.append('root', node.id);
+          return uri.toString();
+        },
+        onCreateLi: function(node, $li) {
+          var link = buildLink(node.url, node.name);
+          $li.find('.jqtree-title').replaceWith(link);
+
+          // add aditional info if present (e.g. for collections)
+          if (node.additionalText) {
+            link.after(' ', node.additionalText);
+          }
 
-        // mark published/unpublished items
-        if (typeof node.published !== 'undefined' && !node.published) {
-          // modify draft link
-          var href = URI(link.attr('href'));
-          link.attr('href', href.addQuery('published', 0));
-          link.addClass('unpublished');
-        } else {
-          link.addClass('published');
-        }
+          // mark published/unpublished items
+          if (typeof node.published !== 'undefined' && !node.published) {
+            link.addClass('unpublished');
+          } else {
+            link.addClass('published');
+          }
 
-        if (link[0]) {
-          var teaserLink = buildTeaserLink(node, link[0]);
-          $li.find('.jqtree-element').append(teaserLink);
-        }
+          if (link[0] && conceptModalPreviewEnabled) {
+            var teaserLink = buildTeaserLink(node, link[0]);
+            $li.find('.jqtree-element').append(teaserLink);
+          }
 
-        if (dragabbleSupport) {
-          // mark locked items
-          if (node && node.locked) {
-            // add icon only to the first element of the collection.
-            // the second one could be a nodelist for parents nodes.
-            $li.find('.jqtree-element').append(' <i class="fa fa-lock"/>');
+          if (dragabbleSupport) {
+            // mark locked items
+            if (node && node.locked) {
+              // add icon only to the first element of the collection.
+              // the second one could be a nodelist for parents nodes.
+              $li.find('.jqtree-element').append(' <i class="fa fa-lock"/>');
+            }
+
+            if (node && !node.locked) {
+              // add icon only to the first element of the collection.
+              // the second one could be a nodelist for parents nodes.
+              $li.find('.jqtree-element').append(' <i class="fa fa-arrows"/>');
+            }
           }
 
-          if (node && !node.locked) {
+          if(node.moved) {
+            $li.data({
+              'node-id': node.id,
+              'old-parent-node-id': node.old_parent_id,
+              'new-parent-node-id': node.target_node_id,
+              'old-previous-sibling-id': node.old_previous_sibling_id,
+              'update-url': node.update_url,
+              'glance-url': node.glance_url
+            });
+
+            var saveButton = $('<button type="button" class="btn btn-primary btn-xs node-btn" data-tree-action="move"><i class="fa fa-save"></i> ' + saveLabel + '</button>');
+            var copyButton = $('<button type="button" class="btn btn-primary btn-xs node-btn" data-tree-action="copy"><i class="fa fa-copy"></i> ' + copyLabel + '</button>');
+            var undoButton = $('<button type="button" class="btn btn-primary btn-xs reset-node-btn"><i class="fa fa-undo"></i> ' + undoLabel + '</button>');
+
             // add icon only to the first element of the collection.
             // the second one could be a nodelist for parents nodes.
-            $li.find('.jqtree-element').append(' <i class="fa fa-arrows"/>');
-          }
-        }
+            $li.find('.jqtree-element').append(saveButton, undoButton);
 
-        if(node.moved) {
-          $li.data({
-            'node-id': node.id,
-            'old-parent-node-id': node.old_parent_id,
-            'new-parent-node-id': node.target_node_id,
-            'old-previous-sibling-id': node.old_previous_sibling_id,
-            'update-url': node.update_url,
-            'glance-url': node.glance_url
-          });
-
-          var saveButton = $('<button type="button" class="btn btn-primary btn-xs node-btn" data-tree-action="move"><i class="fa fa-save"></i> ' + saveLabel + '</button>');
-          var copyButton = $('<button type="button" class="btn btn-primary btn-xs node-btn" data-tree-action="copy"><i class="fa fa-copy"></i> ' + copyLabel + '</button>');
-          var undoButton = $('<button type="button" class="btn btn-primary btn-xs reset-node-btn"><i class="fa fa-undo"></i> ' + undoLabel + '</button>');
-
-          // add icon only to the first element of the collection.
-          // the second one could be a nodelist for parents nodes.
-          $li.find('.jqtree-element').append(saveButton, undoButton);
-
-          if(polyhierarchySupport) {
-            saveButton.after(copyButton);
+            if(polyhierarchySupport) {
+              saveButton.after(copyButton);
+            }
+          }
+        },
+        onIsMoveHandle: function($element) {
+          // dom element which acts as move handle
+          return ($element.is('.fa-arrows'));
+        },
+        onCanMoveTo: function(moved_node, target_node, position){
+          // prevent node movement inside parent node
+          if (moved_node.parent === target_node.parent && position === 'after'){
+            return false;
+          }
+          // prevent locked node movement
+          else if (moved_node.locked === true || target_node.locked === true) {
+            return false;
+          }
+          // only drop node inside nodes, no ordering
+          else if (position === 'after') {
+            return false;
+          } else {
+            return true;
           }
         }
-      },
-      onIsMoveHandle: function($element) {
-        // dom element which acts as move handle
-        return ($element.is('.fa-arrows'));
-      },
-      onCanMoveTo: function(moved_node, target_node, position){
-        // prevent node movement inside parent node
-        if (moved_node.parent === target_node.parent && position === 'after'){
-          return false;
-        }
-        // prevent locked node movement
-        else if (moved_node.locked === true || target_node.locked === true) {
-          return false;
-        }
-        // only drop node inside nodes, no ordering
-        else if (position === 'after') {
-          return false;
-        } else {
-          return true;
-        }
-      }
+      });
     });
-  });
 
-  // mark moved nodes
-  $('#content > ul.hybrid-treeview').on('tree.move', function(event) {
-    var moved_node = event.move_info.moved_node;
+    // mark moved nodes
+    $('#content > ul.hybrid-treeview').on('tree.move', function(event) {
+      var moved_node = event.move_info.moved_node;
 
-    $(this).tree('updateNode', moved_node, {
-      moved: true,
-      target_node_id: event.move_info.target_node.id
-    });
+      $(this).tree('updateNode', moved_node, {
+        moved: true,
+        target_node_id: event.move_info.target_node.id
+      });
 
-    if (moved_node.getPreviousSibling() !== null) {
-      $(this).tree('updateNode', moved_node, {old_previous_sibling_id: moved_node.getPreviousSibling().id});
-    }
-    if (moved_node && moved_node.parent.id) {
-      $(this).tree('updateNode', moved_node, {old_parent_id: moved_node.parent.id});
-    }
-  });
+      if (moved_node.getPreviousSibling() !== null) {
+        $(this).tree('updateNode', moved_node, {old_previous_sibling_id: moved_node.getPreviousSibling().id});
+      }
+      if (moved_node && moved_node.parent.id) {
+        $(this).tree('updateNode', moved_node, {old_parent_id: moved_node.parent.id});
+      }
+    });
 
-  // save/copy moved node
-  $('#content > ul.hybrid-treeview').on('click', 'button.node-btn', function(event) {
-    var $tree = $('#content > ul.hybrid-treeview');
-    var treeAction = $(this).data('tree-action');
-    var updateUrl = $(this).closest('li').data('update-url');
-
-    var movedNodeId = $(this).closest('li').data('node-id');
-    var oldParentNodeId = $(this).closest('li').data('old-parent-node-id');
-    var oldPreviousSiblingId = $(this).closest('li').data('old-previous-sibling-id');
-    var newParentNodeId = $(this).closest('li').data('new-parent-node-id');
-
-    $.ajax({
-      url : updateUrl,
-      type : 'PATCH',
-      data : {
-        tree_action: treeAction,
-        moved_node_id: movedNodeId,
-        old_parent_node_id: oldParentNodeId,
-        new_parent_node_id: newParentNodeId
-      },
-      statusCode: {
-        200: function(response) {
-          // mark moved node to draft
-          var newNodeId = response.new_node_id;
-          setToDraft(movedNodeId, newNodeId, $tree);
-
-          // add node to old parent, necessary to see both node directly after movement,
-          // this is not necessary if you refresh the page
-          if (treeAction === 'copy') {
-            var node = $tree.tree('getNodeById', movedNodeId);
-            if (oldPreviousSiblingId) {
-              var old_previous_sibling = $tree.tree('getNodeById', oldPreviousSiblingId);
-              $tree.tree('addNodeAfter', node, old_previous_sibling);
-            } else if (oldParentNodeId) {
-              var old_parent_node = $tree.tree('getNodeById', oldParentNodeId);
-              $tree.tree('appendNode', node, old_parent_node);
+    // save/copy moved node
+    $('#content > ul.hybrid-treeview').on('click', 'button.node-btn', function(event) {
+      var $tree = $('#content > ul.hybrid-treeview');
+      var treeAction = $(this).data('tree-action');
+      var updateUrl = $(this).closest('li').data('update-url');
+
+      var movedNodeId = $(this).closest('li').data('node-id');
+      var oldParentNodeId = $(this).closest('li').data('old-parent-node-id');
+      var oldPreviousSiblingId = $(this).closest('li').data('old-previous-sibling-id');
+      var newParentNodeId = $(this).closest('li').data('new-parent-node-id');
+
+      $.ajax({
+        url : updateUrl,
+        type : 'PATCH',
+        data : {
+          tree_action: treeAction,
+          moved_node_id: movedNodeId,
+          old_parent_node_id: oldParentNodeId,
+          new_parent_node_id: newParentNodeId
+        },
+        statusCode: {
+          200: function(response) {
+            // mark moved node to draft
+            var newNodeId = response.new_node_id;
+            setToDraft(movedNodeId, newNodeId, $tree);
+
+            // add node to old parent, necessary to see both node directly after movement,
+            // this is not necessary if you refresh the page
+            if (treeAction === 'copy') {
+              var node = $tree.tree('getNodeById', movedNodeId);
+              if (oldPreviousSiblingId) {
+                var old_previous_sibling = $tree.tree('getNodeById', oldPreviousSiblingId);
+                $tree.tree('addNodeAfter', node, old_previous_sibling);
+              } else if (oldParentNodeId) {
+                var old_parent_node = $tree.tree('getNodeById', oldParentNodeId);
+                $tree.tree('appendNode', node, old_parent_node);
+              }
             }
           }
         }
-      }
+      });
     });
-  });
 
-  // reset moved node
-  $('#content > ul.hybrid-treeview').on('click', 'button.reset-node-btn', function(event) {
-    var $tree = $('#content > ul.hybrid-treeview');
-    var nodeId = $(this).closest('li').data('node-id');
-    var oldPreviousSiblingId = $(this).closest('li').data('old-previous-sibling-id');
-    var oldParentNodeId = $(this).closest('li').data('old-parent-node-id');
+    // reset moved node
+    $('#content > ul.hybrid-treeview').on('click', 'button.reset-node-btn', function(event) {
+      var $tree = $('#content > ul.hybrid-treeview');
+      var nodeId = $(this).closest('li').data('node-id');
+      var oldPreviousSiblingId = $(this).closest('li').data('old-previous-sibling-id');
+      var oldParentNodeId = $(this).closest('li').data('old-parent-node-id');
 
-    moveToOldPosition(nodeId, oldPreviousSiblingId, oldParentNodeId, $tree);
-  });
+      moveToOldPosition(nodeId, oldPreviousSiblingId, oldParentNodeId, $tree);
+    });
 
-  function setToDraft(nodeId, newNodeId, $tree) {
-    if (nodeId) {
-      var moved_node = $tree.tree('getNodeById', nodeId);
-      $tree.tree('updateNode', moved_node, {
-        id: newNodeId,
-        moved: false,
-        published: false
-      });
+    function setToDraft(nodeId, newNodeId, $tree) {
+      if (nodeId) {
+        var moved_node = $tree.tree('getNodeById', nodeId);
+        $tree.tree('updateNode', moved_node, {
+          id: newNodeId,
+          moved: false,
+          published: false
+        });
+      }
     }
-  }
 
-  function moveToOldPosition(nodeId, oldPreviousSiblingId, oldParentNodeId, $tree) {
-    var node = $tree.tree('getNodeById', nodeId);
+    function moveToOldPosition(nodeId, oldPreviousSiblingId, oldParentNodeId, $tree) {
+      var node = $tree.tree('getNodeById', nodeId);
 
-    if (oldPreviousSiblingId) {
-      var old_previous_sibling = $tree.tree('getNodeById', oldPreviousSiblingId);
-      $tree.tree('moveNode', node, old_previous_sibling, 'after');
-    }
-    else if (oldParentNodeId) {
-      var oldParentNode = $tree.tree('getNodeById', oldParentNodeId);
-      $tree.tree('moveNode', node, oldParentNode, 'inside');
+      if (oldPreviousSiblingId) {
+        var old_previous_sibling = $tree.tree('getNodeById', oldPreviousSiblingId);
+        $tree.tree('moveNode', node, old_previous_sibling, 'after');
+      }
+      else if (oldParentNodeId) {
+        var oldParentNode = $tree.tree('getNodeById', oldParentNodeId);
+        $tree.tree('moveNode', node, oldParentNode, 'inside');
+      }
+      $tree.tree('updateNode', node, {moved: false});
     }
-    $tree.tree('updateNode', node, {moved: false});
-  }
 
-  function buildLink(url, label) {
-    var link = $('<a/>')
+    function buildLink(url, label) {
+      var link = $('<a/>')
 
-    link.attr('href', url)
-        .addClass('tree-element-link')
-        .html(label);
+      link.attr('href', url)
+          .addClass('tree-element-link')
+          .html(label);
 
-    return link;
-  }
-
-  function buildTeaserLink(node, link) {
-    if (node && !node.glance_url) {
-      return;
+      return link;
     }
 
-    var teaserLink = $('<a/>')
+    function buildTeaserLink(node, link) {
+      if (node && !node.glance_url) {
+        return;
+      }
+
+      var teaserLink = $('<a aria-label="Open quicklook" />')
 
-    teaserLink.addClass('tree-element-teaser-link')
-              .attr('href', node.glance_url)
-              .append($('<i class="fa fa-search-plus"/>'))
+      teaserLink.addClass('tree-element-teaser-link')
+                .attr('href', node.glance_url)
+                .append($('<i class="fa fa-search-plus" aria-hidden="true" />'))
 
-    teaserLink.click(function(ev) {
-      ev.preventDefault();
+      teaserLink.on('click', function(ev) {
+        ev.preventDefault();
 
-      var modal = $("#concept-teaser-modal");
-      var target = $(this).attr("href");
+        var modal = $("#concept-teaser-modal");
+        var target = $(this).attr("href");
 
-      $.get(target, function(data) {
-        modal.html(data);
-        modal.modal();
+        $.get(target, function(data) {
+          modal.html(data);
+          modal.modal();
+        });
       });
-    });
-
-    return teaserLink;
-  }
 
-}
+      return teaserLink;
+    }
 
-return function(selector) {
-  return new Treeview(selector);
-};
+  }
 
+  $(function() {
+    // init treeview
+    new Treeview("ul.hybrid-treeview");
+  });
 }(jQuery));

data/app/assets/javascripts/manifest.js

@@ -1,2 +1,2 @@
-//= require framework
-//= require iqvoc/manifest
+import './framework'
+import './iqvoc/manifest'

data/app/assets/stylesheets/_framework.scss

@@ -1,5 +1,4 @@
-@import 'bootstrap-sass/assets/stylesheets/bootstrap-sprockets';
-@import 'bootstrap-sass/assets/stylesheets/bootstrap';
+@import 'bootstrap/scss/bootstrap';
 
-@import 'font-awesome';
-@import 'bootstrap-datepicker-1.6.4-dist/css/bootstrap-datepicker3'
+@import 'font-awesome/scss/font-awesome';
+@import 'bootstrap-datepicker/dist/css/bootstrap-datepicker3';

data/app/assets/stylesheets/iqvoc/{settings/_bootstrap.scss → _bootstrap_overrides.scss}

@@ -1,5 +1,5 @@
-body {
-  padding-top: 70px;
+body > .container {
+  padding-top: 5rem;
 }
 
 form#search {
@@ -9,9 +9,14 @@ form#search {
 }
 
 .page-header {
+  @extend .border-bottom;
   margin: 12px 0 18px 0;
 }
 
+small {
+  color: $secondary;
+}
+
 .navbar-default .navbar-nav > li > a {
   @extend %font-interaction;
   @include transitional(color);
@@ -44,8 +49,7 @@ form#search {
   }
 
   > .close {
-    font-size: $font-size-h3;
-    margin: 0;
+    font-size: $h3-font-size;
   }
 }
 
@@ -63,11 +67,55 @@ form#search {
   border-radius: 0;
 }
 
-label, th, dt, strong {
+th, dt, strong {
   @extend %font-bold;
 }
 
 .navbar-toggle {
-  color: $navbar-default-color;
+  color: $navbar-light-color;
   text-transform: uppercase;
 }
+
+/* input spinner */
+.form-control-with-icon-start,
+.form-control-with-icon-end {
+  position: relative;
+
+  > .form-control-icon {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    display: flex;
+    align-items: center;
+  }
+
+  > .spinner-grow,
+  > .spinner-border {
+    position: absolute;
+    top: calc(50% - #{$spinner-width-sm} / 2) ;
+  }
+}
+
+.form-control-with-icon-start {
+  > .form-control {
+    padding-left: 2rem;
+  }
+
+  > .form-control-icon,
+  > .spinner-grow,
+  > .spinner-border {
+    left: .5rem;
+  }
+}
+
+.form-control-with-icon-end {
+  > .form-control {
+    padding-right: 2rem;
+  }
+
+  > .form-control-icon,
+  > .spinner-grow,
+  > .spinner-border {
+    right: .5rem;
+  }
+}

data/app/assets/stylesheets/iqvoc/_manifest.scss

@@ -1,19 +1,17 @@
-@import 'iqvoc/mixins/mixins';
+@import 'bootstrap_overrides';
 
-@import 'iqvoc/settings/fonts';
-@import 'iqvoc/settings/variables';
-@import 'iqvoc/settings/bootstrap';
+@import 'components/treeview';
+@import 'components/components';
+@import 'components/panels';
+@import 'components/sidebars';
+@import 'components/simplete';
+@import 'components/forms';
+@import 'components/notes';
+@import 'components/entity_select';
+@import 'components/modals';
+@import 'components/label-list';
+@import 'components/typeahead';
+@import 'components/datepicker';
+@import 'components/onebox';
 
-@import 'iqvoc/components/treeview';
-@import 'iqvoc/components/components';
-@import 'iqvoc/components/panels';
-@import 'iqvoc/components/sidebars';
-@import 'iqvoc/components/forms';
-@import 'iqvoc/components/notes';
-@import 'iqvoc/components/entity_select';
-@import 'iqvoc/components/modals';
-@import 'iqvoc/components/label-list';
-@import 'iqvoc/components/typeahead';
-@import 'iqvoc/components/datepicker';
-
-@import 'iqvoc/hacks/hacks';
+@import 'hacks/hacks';