iqvoc 4.6.1 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 132a0771d607c401f8087bcab326829c6cd5d2af
-  data.tar.gz: 5009421fd2fd764c13ef72b863431ad3df2363ff
+  metadata.gz: 62e32b5022b6f198fa3467813f79ba4c194dec07
+  data.tar.gz: 6788219cc766f21ecc15bf19f00c2f046d319530
 SHA512:
-  metadata.gz: 8eea3290093190f8a3879501f72fb14291635ee0abac756fb5f15c31cc43424af6c3ffee8a41a35ef8fecf6712014ae23182d5eeea44b8734e9f10c16a899f02
-  data.tar.gz: 62625006312569ee9b214fd7475b9d7db70e5607019bd934e1ce186cbbd54d097c01548938869b0818882fff847825918822cb9f973dc83f31a6bf62200cacec
+  metadata.gz: 813ab3b2e08d4feea271510a2bd0dc9ba469d92c27fa29b9bfba49fd5d2f6b816c7c9c666abb9b00a0bebc8e5aa3a38cd8b60bd0c709f8ed2872f9b7b0bb00a9
+  data.tar.gz: 7e67f84f7c66d73611f17110fcc4c9755d359be26a92c5d4683efeabf5ee72bd3c9f9a11bd960b7f8e2a345899ae8e48c5b902f801860e367c1fd29dd1ea9ac8

data/Gemfile

@@ -37,12 +37,13 @@ gem 'uglifier'
 gem 'sass-rails', '~> 4.0.3'
 gem 'bootstrap-sass', '~> 3.3.1.0'
 gem 'bootstrap_form', '~> 2.2.0'
-gem 'font-awesome-rails'
+gem 'font-awesome-rails', '~> 4.2.0'
 gem 'apipie-rails'
 gem 'maruku', require: false
 gem 'database_cleaner'
 gem 'delayed_job_active_record', '~> 4.0.1'
 gem 'carrierwave'
+gem 'autoprefixer-rails'
 
 group :development do
   gem 'view_marker'

data/Gemfile.lock

@@ -43,6 +43,8 @@ GEM
       activerecord (>= 3.2)
       activesupport (>= 3.2)
       request_store (~> 1.0)
+    autoprefixer-rails (4.0.1)
+      execjs
     awesome_print (1.2.0)
     better_errors (1.1.0)
       coderay (>= 1.0.0)
@@ -96,7 +98,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.9.1)
       faraday (>= 0.7.4, < 0.10)
-    font-awesome-rails (4.1.0.0)
+    font-awesome-rails (4.2.0.0)
       railties (>= 3.2, < 5.0)
     haml (4.0.5)
       tilt
@@ -202,7 +204,7 @@ GEM
       activesupport (= 4.1.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.0)
+    rake (10.4.2)
     rdf (1.1.4.2)
     rdf-aggregate-repo (1.1.0)
       rdf (>= 1.1)
@@ -303,6 +305,7 @@ DEPENDENCIES
   activerecord-jdbcsqlite3-adapter
   apipie-rails
   authlogic (~> 3.4.2)
+  autoprefixer-rails
   awesome_print
   better_errors
   binding_of_caller
@@ -316,7 +319,7 @@ DEPENDENCIES
   delayed_job_active_record (~> 4.0.1)
   faraday
   faraday_middleware
-  font-awesome-rails
+  font-awesome-rails (~> 4.2.0)
   hirb-unicode
   iq_rdf (>= 0.1.15)
   iq_triplestorage

data/app/assets/javascripts/framework.js

@@ -5,6 +5,6 @@
 //= require tree.jquery.js
 //= require URI.js
 //= require storage
-//= require bootstrap/transition
 //= require bootstrap/collapse
 //= require bootstrap/tab
+//= require bootstrap/modal

data/app/assets/javascripts/iqvoc/entityselect.js.erb

@@ -11,11 +11,8 @@ var EntitySelector = function(node) {
   }
   this.el = $(node).hide(); // XXX: rename
   this.container = $('<div class="entity_select" />').data("widget", this);
-  this.bootstrapInputGroup = $('<div class="input-group" />');
-  this.indicator = $('<i class="spinner fa fa-refresh fa-spin" />');
-  this.indicatorWrapper = $('<span class="input-group-addon" />');
-  this.languageWrapper = $('<span class="input-group-addon" />');
-  this.language = this.el.data("language") || false;
+  this.indicator = $('<span class="indicator input-group-addon" />').
+    append('<i class="fa fa-refresh fa-spin" />');
   this.delimiter = ",";
   this.singular = this.el.data("singular") || false;
   this.entities = this.getSelection();
@@ -24,18 +21,16 @@ var EntitySelector = function(node) {
   var self = this;
   var noResultsMsg = this.el.data("no-results-msg");
 
-  this.indicator.css("visibility", "hidden");
-
   var selection = this.el.data("entities") || [];
   selection = $.map(selection, function(entity, i) {
     return self.createEntity(entity);
   });
   selection = $('<ul class="entity_list" />').append(selection);
 
-  this.input = $("<input />").autocomplete({
+  this.input = $('<input type="text" class="form-control" />').autocomplete({
     minLength: 3,
     source: $.proxy(this, "onInput"), // XXX: discards original `this` context
-    search: function(ev, ui) { self.indicator.css("visibility", "visible"); },
+    search: function(ev, ui) { self.indicator.addClass("active"); },
     focus: function(ev, ui) { return false; },
     select: this.onSelect,
     response: function(ev, ui) {
@@ -43,24 +38,26 @@ var EntitySelector = function(node) {
         ui.content.push({ label: noResultsMsg, value: "" });
       }
     }
-  }).on("keydown", function(ev){
+  }).on("keydown", function(ev) {
     if(ev.which === 13) { // Enter; prevent form submission
       ev.preventDefault();
     }
   });
 
-  this.input.attr("type", "text").addClass("form-control"); // for Bootstrap
-
-  this.container.append(this.bootstrapInputGroup.append(this.input).append(this.indicatorWrapper.append(this.indicator))).
-    append(selection).insertAfter(node).prepend(node);
+  var inputGroup = $('<div class="input-group" />').
+    append(this.input, this.indicator);
+  this.container.append(inputGroup, selection).
+    insertAfter(node).prepend(node);
 
-  if(this.language) {
-    this.bootstrapInputGroup.prepend(this.languageWrapper.append(this.language));
+  // XXX: does not belong here -- XXX: obsolete?
+  var lang = this.el.data("language");
+  if(lang) {
+    $('<span class="input-group-addon" />').append(lang).prependTo(inputGroup);
   }
 
   if(this.singular && this.entities.length) {
     this.input.hide();
-    this.indicatorWrapper.hide();
+    this.indicator.hide();
   }
 };
 // data transformations; target format is an array of objects with members
@@ -89,7 +86,7 @@ $.extend(EntitySelector.prototype, {
       data = self.processResponse(data);
       self.input.autocomplete("option", "autoFocus", data.length === 1);
       callback(data);
-      self.indicator.css("visibility", "hidden");
+      self.indicator.removeClass("active");
     };
 
     var sourceSelector = this.el.data("source-selector") || "default";
@@ -112,7 +109,7 @@ $.extend(EntitySelector.prototype, {
 
       if(widget.singular) {
         widget.input.hide();
-        widget.indicatorWrapper.hide();
+        widget.indicator.hide();
       }
     }
     return false;
@@ -125,7 +122,7 @@ $.extend(EntitySelector.prototype, {
     entity.remove();
     if(widget.singular && !widget.entities.length) {
       widget.input.show();
-      widget.indicatorWrapper.show();
+      widget.indicator.show();
     }
     ev.preventDefault();
   },

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

@@ -28,7 +28,8 @@ function FederatedConceptMapper(selector) {
   this.source = $("<select />").addClass("form-control").append(sources).
       insertBefore(this.input);
 
-  this.indicator = $("<i />").addClass("spinner fa fa-refresh fa-spin").css("visibility", "hidden");
+  this.indicator = $("<i />").addClass("fa fa-refresh fa-spin").
+    css("visibility", "hidden"); // TODO: use `.indicator[.active]` instead; cf. EntitySelector
   this.indicatorWrapper.append(this.indicator);
 
   var self = this;

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

@@ -29,6 +29,7 @@ function Treeview(container) {
         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')
       };
@@ -60,6 +61,10 @@ function Treeview(container) {
           link.addClass('published');
         }
 
+        if (typeof link[0] !== 'undefined') {
+          var teaserLink = buildTeaserLink(node, link[0]);
+        }
+
         if (dragabbleSupport) {
           // mark locked items
           if (typeof node.locked !== 'undefined' && node.locked) {
@@ -80,7 +85,8 @@ function Treeview(container) {
           $li.data('old-parent-node-id', node.old_parent_id);
           $li.data('new-parent-node-id', node.target_node_id);
           $li.data('old-previous-sibling-id', node.old_previous_sibling_id);
-          $li.data('update-url', node.update_url);
+          $li.data('update-url', node.update_url),
+          $li.data('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>');
@@ -214,7 +220,7 @@ function Treeview(container) {
   }
 
   function buildLink(url, label, additionalText) {
-    var link = $('<a>').attr('href', url).html(label);
+    var link = $('<a>').attr('href', url).addClass('tree-element-link').html(label);
 
     if (additionalText) {
       link = link.after(' ', additionalText);
@@ -222,6 +228,34 @@ function Treeview(container) {
     return link;
   }
 
+  function buildTeaserLink(node, link) {
+    if (typeof node.glance_url === 'undefined') {
+      return;
+    }
+
+    var teaserLink = $('<a/>')
+
+    teaserLink.addClass('tree-element-teaser-link')
+              .attr('href', node.glance_url)
+              .append($('<i class="fa fa-search-plus"/>'))
+
+    $(link).after(teaserLink);
+
+    teaserLink.click(function(ev) {
+      ev.preventDefault();
+
+      var modal = $("#concept-teaser-modal");
+      var target = $(this).attr("href");
+
+      $.get(target, function(data) {
+        modal.html(data);
+        modal.modal();
+      });
+    });
+
+    return teaserLink;
+  }
+
 }
 
 return function(selector) {

data/app/assets/stylesheets/{framework.css.scss → _framework.scss}

@@ -1,9 +1,10 @@
+@import 'iqvoc/settings/bootstrap-variables';
+
+@import 'bootstrap-sprockets';
+@import 'bootstrap';
+
 @import 'jquery-ui';
 @import 'jquery-ui.structure';
 @import 'jquery-ui.theme';
 
-@import 'bootstrap';
-body {
-  padding-top: 70px;
-}
 @import 'font-awesome';

data/app/assets/stylesheets/iqvoc/{manifest.css.scss → _manifest.scss}

@@ -1,6 +1,11 @@
-@import 'iqvoc/settings';
-@import 'iqvoc/hacks/bootstrap_extensions';
+@import 'iqvoc/mixins/mixins';
+
+@import 'iqvoc/settings/fonts';
+@import 'iqvoc/settings/variables';
+@import 'iqvoc/settings/bootstrap';
+
 @import 'iqvoc/hacks/jquery-ui_extensions';
+
 @import 'iqvoc/components/treeview';
 @import 'iqvoc/components/components';
 @import 'iqvoc/components/panels';
@@ -8,4 +13,7 @@
 @import 'iqvoc/components/forms';
 @import 'iqvoc/components/notes';
 @import 'iqvoc/components/entity_select';
+@import 'iqvoc/components/modals';
+@import 'iqvoc/components/label-list';
+
 @import 'iqvoc/hacks/hacks';

data/app/assets/stylesheets/iqvoc/components/{_components.css.scss → _components.scss}

@@ -1,3 +1,13 @@
+.indicator {
+  .fa {
+    visibility: hidden;
+  }
+
+  &.active .fa {
+    visibility: visible;
+  }
+}
+
 .onebox {
   padding-top: 80px;
   margin-top: 2em;
@@ -122,6 +132,10 @@ tr.highlightable {
 .lang-widget {
   padding: 0 15px 20px 15px;
 
+  h2 {
+    font-size: $font-size-h4;
+  }
+
   .lang-widget-item {
     white-space: nowrap;
 

data/app/assets/stylesheets/iqvoc/components/_label-list.scss

@@ -0,0 +1,35 @@
+.label-list {
+  @include list-unstyled;
+}
+
+.label-list-item {
+  display: inline-block;
+  margin-right: .5em;
+  margin-bottom: .5em;
+
+  &:last-child {
+    margin-right: 0;
+  }
+}
+
+.label-list-item-value {
+  background-color: $gray-lighter;
+  border: 1px solid darken($gray-lighter, 5%);
+  display: inline-block;
+  padding: .25em 1em;
+
+  &.attached {
+    border-right: 0;
+    border-top-left-radius: 3px;
+    border-bottom-left-radius: 3px;
+  }
+}
+
+.label-list-item-lang {
+  // color: $body-bg;
+  border: 1px solid darken($gray-lighter, 5%);
+  border-left: 0;
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
+  padding: .5em .75em;
+}

data/app/assets/stylesheets/iqvoc/components/_modals.scss

@@ -0,0 +1,21 @@
+.concept-teaser-header {
+  h1 {
+    font-size: $font-size-h3;
+  }
+}
+
+.concept-teaser-body {
+  padding-top: 0;
+
+  h2 {
+    font-size: $font-size-h4;
+  }
+
+  p {
+    margin-top: 0;
+  }
+
+  .alert {
+    margin-top: $line-height-computed;
+  }
+}

data/app/assets/stylesheets/iqvoc/components/{_treeview.css.scss.erb → _treeview.scss.erb}

@@ -117,3 +117,7 @@ span.jqtree-dragging {
 .reset-node-btn {
   margin: 0 3px;
 }
+
+.tree-element-teaser-link {
+  margin-left: .25em;
+}

data/app/assets/stylesheets/iqvoc/mixins/_mixins.scss

@@ -0,0 +1,13 @@
+@mixin interaction-font {
+  font-family: 'Fira Sans Light SC';
+  text-transform: lowercase;
+  // font-size: $font-size-small;
+}
+
+@mixin transitional($property: all, $duration: .25s) {
+  transition: $property $duration ease-in-out;
+}
+
+@mixin flat-box-shadow {
+  box-shadow: 2px 2px 0 rgba(0, 0, 0, 0.1);
+}