iqvoc 4.2.0 → 4.3.0

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

@@ -164,11 +164,11 @@ jQuery(document).ready(function($) {
     });
 
   // Search
-  $("button#language_select_all").click(function() {
-    $("input[type=checkbox].lang_check").attr("checked", true);
+  $(".checkbox-select-all").click(function() {
+    $(this).closest('.controls').find("input:checkbox").attr("checked", true);
   });
-  $("button#language_select_none").click(function() {
-    $("input[type=checkbox].lang_check").attr("checked", false);
+  $(".checkbox-select-none").click(function() {
+    $(this).closest('.controls').find("input:checkbox").attr("checked", false);
   });
   $("select.search_type").change(function() {
     var result_type_filter = $(".result_type_filter");
@@ -201,4 +201,16 @@ jQuery(document).ready(function($) {
   $(".tab-panels").addClass("tab-content"); // the latter is for Bootstrap Tabs
 
   IQVOC.onebox(".onebox");
+  new IQVOC.FederatedConceptMapper(".matches");
+  // XXX: inelegant
+  if($("textarea:first").length) { // edit mode
+    new IQVOC.ConceptMappingManager(".matches", true);
+  } else { // view mode
+    new IQVOC.ConceptMappingManager("#matches", false);
+  }
+
+  IQVOC.labelResolver();
+  $(document.body).on("concept-label", function(ev, container) {
+    IQVOC.labelResolver(container);
+  })
 });

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

@@ -0,0 +1,23 @@
+IQVOC.labelResolver = (function($) {
+
+"use strict";
+
+return function(context) {
+	$("a.unlabeled", context).each(processNode);
+};
+
+function retrieveLabel(conceptURL, el, callback) {
+  var proxy = $("body").data("remote-label-path");
+	$.get(proxy, { concept_url: conceptURL }, function(data, status, xhr) {
+		el.text(data.label);
+		el.removeClass("unlabeled");
+	});
+}
+
+function processNode(i, node) {
+	var el = $(node);
+	var uri = el.attr("href");
+	retrieveLabel(uri, el);
+}
+
+}(jQuery))

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

@@ -4,3 +4,7 @@
 //= require iqvoc/langselect
 //= require iqvoc/entityselect
 //= require iqvoc/entityselect_qualified
+//= require iqvoc/concept_mapper
+//= require iqvoc/federated_concept_mapper
+//= require iqvoc/concept_mapping_manager
+//= require iqvoc/label_resolver

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

@@ -10,9 +10,8 @@ function OneBox(form) {
   this.input = $(".onebox-input", this.form); // TODO: document
   this.container = this.form.removeClass("onebox").
       wrap('<div class="onebox" />').parent(); // TODO: document
-  this.results = $('<ol class="results concepts unstyled" />');
-  this.spinner = $("<img />").
-      attr("src", "<%= asset_path('spinner_24x24.gif') %>").
+  this.results = $('<ol class="results concept-items unstyled" />');
+  this.spinner = $('<i class="fa fa-refresh fa-spin fa-3x" />').
       appendTo(this.container).hide();
 
   this.form.on("submit", $.proxy(this, "onSubmit"));
@@ -23,7 +22,7 @@ OneBox.prototype.reset = function() {
 };
 OneBox.prototype.renderResults = function(html) {
   var doc = $("<div />").append(html);
-  var items = $(".concepts > li", doc);
+  var items = $(".concept-items > li", doc);
   var pagination = $(".pagination", doc);
 
   this.reset();
@@ -50,6 +49,7 @@ OneBox.prototype.getConcepts = function() {
   });
 };
 OneBox.prototype.onResults = function(html, status, xhr) {
+  // TODO request resource with layout=0
   // disable scripts (adapted from jQuery#load)
   var rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi;
   html = html.replace(rscript, "");

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

@@ -38,7 +38,7 @@ function extractConcepts(html) {
   var rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi;
   var html = html.replace(rscript, "");
 
-  var concepts = $("<div />").append(html).find("ol.concepts li");
+  var concepts = $("<div />").append(html).find(".concept-items .concept-item");
   concepts = concepts.map(function(i, node) {
     var el = $("a", node);
     return {

data/app/assets/stylesheets/framework.css.scss

@@ -1,8 +1,9 @@
 @import 'jquery.treeview';
-@import 'jquery-ui-1.8.23.custom';
+@import 'jquery-ui-1.10.3.custom';
 
 @import 'bootstrap';
 body {
   padding-top: 60px;
 }
 @import 'bootstrap-responsive';
+@import 'font-awesome';

data/app/assets/stylesheets/iqvoc/_settings.css.scss

@@ -0,0 +1,12 @@
+// Colors
+$background-color: #fff;
+
+$widget-border-color-dark: #eee;
+$widget-background-color-dark: #f5f5f5;
+$widget-highlight-color: #d9edf7;
+$widget-highlight-background-color: #3a87ad;
+
+$muted-color: #999;
+
+// Dimensions
+$border-radius-default: 4px;

data/app/assets/stylesheets/iqvoc/components/_components.css.scss

@@ -0,0 +1,237 @@
+.navbar {
+  .quicksearch {
+  }
+}
+
+.onebox {
+  padding-top: 80px;
+  margin-top: 2em;
+  text-align: center;
+
+  background: asset-url("iqvoc_logo.svg") top center no-repeat;
+
+  .logo {
+    margin: 2em 0 1em 0;
+  }
+
+  input {
+    min-width: 60%;
+  }
+
+  ol {
+    margin-left: 0;
+    list-style: none;
+    text-align: left;
+  }
+
+  .pagination {
+    text-align: left;
+  }
+}
+
+tr.highlightable {
+  cursor: pointer;
+}
+
+.alert {
+  p {
+    margin: 0 0 10px 0;
+  }
+  ul {
+    margin-left: 30px;
+    margin-bottom: 0px;
+  }
+}
+
+.sorting-controls {
+  margin-left: 5px;
+  > * {
+    margin-right: 2px;
+    color: inherit;
+  }
+}
+
+.spinner {
+  position: absolute;
+  margin: 8px 0 0 -20px;
+}
+
+.arrow_down {
+  margin-top: 3px;
+}
+
+.arrow_up {
+  margin-top: 2px;
+}
+
+.letter-selector {
+  $active: white;
+  margin: 0;
+  li {
+    a {
+      color: #BFBFBF;
+      font-weight: bold;
+    }
+    border-radius: 4px;
+    display: inline-block;
+    margin-right: 2px;
+    padding: 2px 6px;
+    &:last-child {
+      margin-right: 0;
+    }
+    &.active {
+      background-color: $active;
+    }
+  }
+}
+
+.translation {
+  margin-bottom: 15px;
+}
+
+.nav-list {
+  li {
+    a {
+      &.inline-language-selector {
+        display: inline;
+        margin: inherit;
+        padding: inherit;
+        &:hover {
+          background: inherit;
+        }
+      }
+    }
+  }
+}
+
+.concept-items {
+  .concept-item {
+    margin-bottom: 15px;
+    p {
+      margin: 0;
+    }
+    .concept-item-link {
+      font-weight: bold;
+    }
+    .concept-item-uri {
+      color: green;
+    }
+  }
+}
+
+.lang-widget {
+  padding: 0 15px 20px 15px;
+
+  .lang-widget-item {
+    white-space: nowrap;
+
+    label {
+      margin: 0;
+      padding: 2px 10px;
+
+      input {
+        margin-top: -2px;
+        margin-right: 0.5em;
+        display: inline;
+      }
+
+      a {
+        padding-left: 0;
+        display: inline;
+      }
+    }
+  }
+
+  .lang-widget-header {
+    margin-top: 10px;
+    margin-bottom: 0;
+    font-size: 18px;
+  }
+}
+
+.search-result {
+  margin-top: 10px;
+  a {
+    font-weight: bold;
+  }
+}
+
+.search-result-meta {
+  margin-top: 0;
+}
+
+.search-result-key {
+  float: left;
+  margin-right: 5px;
+  // font-weight: normal;
+  &:after {
+    content: ':';
+  }
+}
+
+.search-result-link {}
+
+.search-result-uri {
+  display: block;
+  color: green;
+}
+
+.search-result-value {}
+
+.search-result-body {
+  margin-top: 0;
+}
+
+.concept-mapper {
+  margin-bottom: 25px;
+  > * { margin-right: 10px; }
+}
+
+.concept-mapper-indicator {
+  position: absolute;
+  margin: 8px 0 0 -30px;
+}
+
+.concept-mappings { margin-left: 0; }
+
+.concept-mapping {
+  %padded { padding: 7px 10px; }
+
+  display: inline-block;
+  float: left;
+  clear: left;
+  overflow: hidden;
+  margin-right: 10px;
+  margin-bottom: 5px;
+  padding: 5px 0;
+
+  border-radius: $border-radius-default;
+  background-color: $widget-background-color-dark;
+
+  .concept-mapping-link {
+    @extend %padded;
+    background-color: $widget-highlight-color;
+    color: $widget-highlight-background-color;
+  }
+
+  .concept-mapping-dataset, .concept-mapping-match-type {
+    @extend %padded;
+    color: $muted-color;
+  }
+
+  .concept-mapping-dataset {
+    @extend %padded;
+    background-color: $widget-border-color-dark;
+  }
+
+  .concept-mapping-match-type {
+    @extend %padded;
+    font-style: italic;
+  }
+
+  .concept-mapping-remove {
+    padding-right: 10px;
+    cursor: pointer;
+    color: $muted-color;
+  }
+}

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

@@ -4,8 +4,6 @@
     padding: 5px 8px;
     border: 1px solid #CCD5E4;
     border-radius: 5px;
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
 //    font-size: 11px;
     color: #000;
     background-color: #EFF2F7;

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

@@ -5,10 +5,6 @@
   padding: 5px 10px 5px 10px;
   background-color: #f5f5f5;
   border: 1px solid #eee;
-  -webkit-border-top-left-radius: 4px;
-  -webkit-border-bottom-left-radius: 4px;
-  -moz-border-radius-topleft: 4px;
-  -moz-border-radius-bottomleft: 4px;
   border-top-left-radius: 4px;
   border-bottom-left-radius: 4px;
   border-right: 0;
@@ -34,12 +30,8 @@
   background-image: -ms-linear-gradient(-90deg , rgb(255,255,255) 0%, rgb(251,251,251) 100%);
   background-image: linear-gradient(-90deg , rgb(255,255,255) 0%, rgb(251,251,251) 100%);
 
-  -webkit-border-bottom-left-radius: 4px;
-     -moz-border-radius-bottomleft: 4px;
-          border-bottom-left-radius: 4px;
-  -webkit-border-bottom-right-radius: 4px;
-     -moz-border-radius-bottomright: 4px;
-          border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 4px;
 
   p {
     margin: 0 0 20px 0;

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

@@ -3,16 +3,14 @@
   padding: 0 19px 19px 19px;
   margin-bottom: 20px;
   background-color: #fff;
-  border: 1px solid #eee;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
+  border: 1px solid $widget-border-color-dark;
+  border-radius: $border-radius-default;
   h1, h2, h3, h4, h5, .panel-header {
     border-bottom: 1px solid #eee;
     margin: 0 -19px 0 -19px;
     padding: 5px 10px;
     margin-bottom: 25px;
-    background-color: #f5f5f5;
+    background-color: $widget-background-color-dark;
     &.centered {
       text-align: center;
     }

data/app/assets/stylesheets/iqvoc/manifest.css.scss

@@ -1,10 +1,10 @@
-@import 'iqvoc/bootstrap_extensions';
-@import 'iqvoc/jquery-ui_extensions';
-@import 'iqvoc/layout';
-@import 'iqvoc/components';
-@import 'iqvoc/panel';
-@import 'iqvoc/sidebar';
-@import 'iqvoc/forms';
-@import 'iqvoc/note';
-@import 'iqvoc/entity_select';
-@import 'iqvoc/hacks';
+@import 'iqvoc/settings';
+@import 'iqvoc/hacks/bootstrap_extensions';
+@import 'iqvoc/hacks/jquery-ui_extensions';
+@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/hacks/hacks';