iqvoc 4.8.1 → 4.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 038475af916c1873dc4eaa7f8ee52ee3d78cec08
-  data.tar.gz: 3005a742d1462b5a9491db6c4e10d3db96ca73e8
+  metadata.gz: 74d4ad4627df6096faa089820e3cc5d50d3e521e
+  data.tar.gz: 0aef8fd3a18b22433c6c9f9844219bc1feedf302
 SHA512:
-  metadata.gz: bbf91a5ef677366b2e2ce7aa6cbe44971344f825877ec4ed9f11d088b8645a9e4b7ee2191916312e10813855d5e77ba55767dbf1ccf34a1bdf8627f8360a0ba5
-  data.tar.gz: b0e8bff4c19e677ba5a41a8fe223b214d36b0331e4b8600c9f6ad2c79fd2b7966b15aea2c32203e9a2a19118ab575f35b815a084b792a9adab38f6920209a278
+  metadata.gz: 10ad806a74530673f716f5a87c0cdd3a6fbe07dcf04743a611033ca19c8d70bcc3e046883eff9a7bccb5b23e2e0a51c3b94dd013ef7201563a8d2acde016ede8
+  data.tar.gz: c5e5a0b1e7fed35ce81a55f9a51f8163e9ee2d3349a7114d8cea36fbe8c257742f6cbf1ff993f4a582d2f1833ca9d8f03cd63c82ec55f43821d9f8d6611960e9

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [4.8.2]
+
+  * Changed: We're now using [bower](http://bower.io/) for managing third
+    party frontend dependencies
+  * Changed: Sign-out link now shows the current user's name
+  * Fixed: Status labels in dashboard
+  * Fixed: Several permission checks
+  * Fixed: UI glitches
+
 ## [4.8.1]
 
   * Changed: New, responsive datepicker

data/Gemfile

@@ -34,9 +34,8 @@ gem 'nokogiri', '~> 1.6.0'
 gem 'linkeddata'
 gem 'uglifier'
 gem 'sass-rails', '~> 5.0.0'
-gem 'bootstrap-sass', '~> 3.3.1.0'
 gem 'bootstrap_form', '~> 2.2.0'
-gem 'font-awesome-rails', '~> 4.2.0'
+gem 'font-awesome-rails', '~> 4.3.0'
 gem 'apipie-rails'
 gem 'maruku', require: false
 gem 'database_cleaner'
@@ -46,7 +45,6 @@ gem 'autoprefixer-rails'
 
 group :development do
   gem 'view_marker'
-  gem 'quiet_assets'
 end
 
 group :development, :test do

data/Gemfile.lock

@@ -61,8 +61,6 @@ GEM
     awesome_print (1.2.0)
     binding_of_caller (0.7.3.pre1)
       debug_inspector (>= 0.0.1)
-    bootstrap-sass (3.3.1.0)
-      sass (~> 3.2)
     bootstrap_form (2.2.0)
     builder (3.2.2)
     byebug (1.8.2)
@@ -113,7 +111,7 @@ GEM
     ffi-compiler (0.1.3)
       ffi (>= 1.0.0)
       rake
-    font-awesome-rails (4.2.0.0)
+    font-awesome-rails (4.3.0.0)
       railties (>= 3.2, < 5.0)
     globalid (0.3.0)
       activesupport (>= 4.1.0)
@@ -134,8 +132,8 @@ GEM
     jdbc-mysql (5.1.33)
     jdbc-postgres (9.3.1101)
     jdbc-sqlite3 (3.8.7)
-    json (1.8.1)
-    json (1.8.1-java)
+    json (1.8.2)
+    json (1.8.2-java)
     json-ld (1.1.7)
       rdf (~> 1.1, >= 1.1.4)
     kaminari (0.16.1)
@@ -170,15 +168,15 @@ GEM
     maruku (0.7.2)
     method_source (0.8.2)
     mime-types (2.4.3)
-    mini_portile (0.6.1)
-    minitest (5.5.0)
+    mini_portile (0.6.2)
+    minitest (5.5.1)
     multi_json (1.10.1)
     multipart-post (2.0.0)
     mysql2 (0.3.17)
     net-http-persistent (2.9.4)
-    nokogiri (1.6.5)
+    nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    nokogiri (1.6.5-java)
+    nokogiri (1.6.6.2-java)
     parallel (1.3.3)
     pg (0.17.1)
     poltergeist (1.5.1)
@@ -203,10 +201,8 @@ GEM
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    quiet_assets (1.1.0)
-      railties (>= 3.1, < 5.0)
     rack (1.6.0)
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.0)
       actionmailer (= 4.2.0)
@@ -365,7 +361,6 @@ DEPENDENCIES
   autoprefixer-rails
   awesome_print
   binding_of_caller (= 0.7.3.pre1)
-  bootstrap-sass (~> 3.3.1.0)
   bootstrap_form (~> 2.2.0)
   cancancan
   cane
@@ -375,7 +370,7 @@ DEPENDENCIES
   delayed_job_active_record (~> 4.0.1)
   faraday
   faraday_middleware
-  font-awesome-rails (~> 4.2.0)
+  font-awesome-rails (~> 4.3.0)
   hirb-unicode
   iq_rdf (>= 0.1.15)
   iq_triplestorage
@@ -391,7 +386,6 @@ DEPENDENCIES
   pry-byebug (~> 1.1.2)
   pry-rails
   pry-remote
-  quiet_assets
   rails (~> 4.2.0)
   rails_12factor
   rails_autolink

data/app/assets/javascripts/framework.js

@@ -1,11 +1,11 @@
-//= require jquery-1.7.1
-//= require rails
-//= require pickadate/picker
-//= require pickadate/picker.date
-//= require tree.jquery.js
-//= require typeahead.jquery.js
-//= require URI.js
+//= require jquery/dist/jquery
+//= require jquery-ujs/src/rails
+//= require pickadate/lib/picker
+//= require pickadate/lib/picker.date
+//= require jqtree/tree.jquery.js
+//= require typeahead.js/dist/typeahead.jquery.js
+//= require URIjs/src/URI.js
 //= require storage
-//= require bootstrap/collapse
-//= require bootstrap/tab
-//= require bootstrap/modal
+//= require bootstrap-sass/assets/javascripts/bootstrap/collapse
+//= require bootstrap-sass/assets/javascripts/bootstrap/tab
+//= require bootstrap-sass/assets/javascripts/bootstrap/modal

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

@@ -86,7 +86,7 @@ jQuery(document).ready(function($) {
     el.append(label);
     return label[0];
   });
-  $("input:radio", langWidget).live("change", function(ev) {
+  $("input:radio", langWidget).on("change", function(ev) {
     window.location = $(this).closest("label").find("a").attr("href");
   });
   // secondary language
@@ -176,10 +176,10 @@ jQuery(document).ready(function($) {
 
   // Search
   $(".checkbox-select-all").click(function() {
-    $(this).closest('.language-controls').find("input:checkbox").attr("checked", true);
+    $(this).closest('.checkbox-controls').find("input:checkbox").attr("checked", true);
   });
   $(".checkbox-select-none").click(function() {
-    $(this).closest('.language-controls').find("input:checkbox").attr("checked", false);
+    $(this).closest('.checkbox-controls').find("input:checkbox").attr("checked", false);
   });
   $("select.search_type").change(function() {
     var result_type_filter = $(".result_type_filter");

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

@@ -13,7 +13,7 @@ var LanguageSelector = function(container, namespace) {
 	this.namespace = namespace;
 	this.langs = getSelection(namespace);
 	this.checkboxes = $("input:checkbox", container)
-		.live("change", this.onChange);
+		.on("change", this.onChange);
 
 	$(container).addClass("widget").data("widget", this);
 	this.init();

data/app/assets/stylesheets/_framework.scss

@@ -1,8 +1,8 @@
 @import 'iqvoc/settings/bootstrap-variables';
 
-@import 'bootstrap-sprockets';
-@import 'bootstrap';
+@import 'bootstrap-sass/assets/stylesheets/bootstrap-sprockets';
+@import 'bootstrap-sass/assets/stylesheets/bootstrap';
 
 @import 'font-awesome';
-@import 'pickadate/classic';
-@import 'pickadate/classic.date';
+@import 'pickadate/lib/themes/classic';
+@import 'pickadate/lib/themes/classic.date';

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

@@ -80,7 +80,6 @@ tr.highlightable {
   li {
     a {
       color: #bfbfbf;
-      font-weight: bold;
     }
     border-radius: 4px;
     display: inline-block;
@@ -121,7 +120,7 @@ tr.highlightable {
       margin: 0;
     }
     .concept-item-link {
-      font-weight: bold;
+      @extend %font-bold;
     }
     .concept-item-uri {
       color: green;
@@ -166,7 +165,7 @@ tr.highlightable {
 .search-result {
   margin-top: 10px;
   a {
-    font-weight: bold;
+    @extend %font-bold;
   }
 }
 
@@ -177,7 +176,6 @@ tr.highlightable {
 .search-result-key {
   float: left;
   margin-right: 5px;
-  // font-weight: normal;
   &:after {
     content: ':';
   }
@@ -269,3 +267,7 @@ tr.highlightable {
 a.unpublished {
   color: #bfbfbf;
 }
+
+.dashboard-table-item-state {
+  text-transform: uppercase;
+}

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

@@ -10,8 +10,8 @@
     width: auto;
   }
   a.remove_entity {
+    @extend %font-bold;
     margin-left: 5px;
-    font-weight: bold;
     color: #A6B3CF;
     cursor: pointer;
   }

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

@@ -43,10 +43,10 @@ dl.note_annotations {
   margin: 0;
   width: 100%;
   dt {
+    @extend %font-bold;
     width: 120px;
     clear: left;
     float: left;
-    font-weight: bold;
     margin-top: 0;
   }
   dd {

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

@@ -1,7 +1,11 @@
-@mixin interaction-font {
+%font-interaction {
   font-family: 'Fira Sans Light SC';
   text-transform: lowercase;
-  // font-size: $font-size-small;
+}
+
+%font-bold {
+  font-family: 'Fira Sans Bold';
+  font-weight: 700;
 }
 
 @mixin transitional($property: all, $duration: .25s) {

data/app/assets/stylesheets/iqvoc/settings/_bootstrap.scss

@@ -13,27 +13,27 @@ form#search {
 }
 
 .navbar-default .navbar-nav > li > a {
-  @include interaction-font();
+  @extend %font-interaction;
   @include transitional(color);
 }
 
 .btn {
-  @include interaction-font();
+  @extend %font-interaction;
   @include transitional();
 }
 
 .dropdown-menu > li > a {
-  @include interaction-font();
+  @extend %font-interaction;
   @include transitional(background-color);
 }
 
 .list-group-item {
-  @include interaction-font();
+  @extend %font-interaction;
   @include transitional(background-color);
 }
 
 .nav-tabs li > a {
-  @include interaction-font();
+  @extend %font-interaction;
   @include transitional(all);
 }
 
@@ -64,6 +64,5 @@ form#search {
 }
 
 label, th {
-  font-family: 'Fira Sans Bold';
-  font-weight: 700;
+  @extend %font-bold;
 }

data/app/models/ability.rb

@@ -15,12 +15,19 @@ class Ability
       can :use, :dashboard
       can :destroy, UserSession
 
+      if user.owns_role?(:reader)
+        can :read, [::Concept::Base, ::Collection::Base, ::Label::Base]
+      end
+
       if user.owns_role?(:editor) || user.owns_role?(:publisher) || user.owns_role?(:administrator) # Editors and above ...
         can :read, [::Concept::Base, ::Collection::Base, ::Label::Base]
         can :create, [::Concept::Base, ::Collection::Base, ::Label::Base]
         can [:update, :destroy, :unlock], [::Concept::Base, ::Collection::Base, ::Label::Base], locked_by: user.id, published_at: nil
         can :lock, [::Concept::Base, ::Collection::Base, ::Label::Base], locked_by: nil, published_at: nil
-        can [:check_consistency, :send_to_review], [::Concept::Base, ::Collection::Base, ::Label::Base], published_at: nil
+        can :check_consistency, [::Concept::Base, ::Collection::Base, ::Label::Base], published_at: nil
+        can :send_to_review, [::Concept::Base, ::Collection::Base, ::Label::Base] do |object|
+          !object.in_review? && object.locked_by == user.id
+        end
         can :branch, [::Concept::Base, ::Collection::Base, ::Label::Base], &@@if_published
       end
 
@@ -33,7 +40,9 @@ class Ability
       end
 
       if user.owns_role?(:publisher) || user.owns_role?(:administrator) # Publishers and above ...
-        can :merge, [::Concept::Base, ::Collection::Base, ::Label::Base], published_at: nil
+        can :merge, [::Concept::Base, ::Collection::Base, ::Label::Base] do |object|
+          !object.published? && (!object.locked? || object.locked_by == user.id)
+        end
       end
 
       if user.owns_role?(:administrator)

data/app/models/user.rb

@@ -3,4 +3,8 @@ class User < AbstractUser
 
   validates_inclusion_of :role, in: ROLES
   validates_length_of :forename, :surname, within: 2..255
+
+  def name
+    "#{forename} #{surname}"
+  end
 end

data/app/views/collections/show_unpublished.html.erb

@@ -9,32 +9,35 @@
 <% end %>
 
 <div class="editing_versioning_toolbar well">
-  <% if (not @collection.locked?) || @collection.locked_by == @current_user.id %>
+  <% if can?(:merge, @collection) %>
     <%= button_to t("txt.views.versioning.publishing"),
       collection_versions_merge_path(:origin => @collection.origin), :class => 'btn btn-primary' %>
   <% end %>
-  <%= button_to t("txt.views.versioning.consistency_check"),
-    collection_versions_consistency_check_path(:origin => @collection.origin), :class => 'btn btn-default', :method => :get %>
 
-  <% if (not @collection.in_review?) && @collection.locked_by == @current_user.id %>
+  <% if can?(:check_consistency, @collection) %>
+    <%= button_to t("txt.views.versioning.consistency_check"),
+      collection_versions_consistency_check_path(:origin => @collection.origin), :class => 'btn btn-default', :method => :get %>
+  <% end %>
+
+  <% if can?(:send_to_review, @collection) %>
     <%= button_to t("txt.common.to_review"),
       collection_versions_to_review_path(:origin => @collection.origin), :class => 'btn btn-default' %>
   <% end %>
 
-  <% unless @collection.locked? %>
-    <%= button_to t("txt.views.versioning.to_edit_mode"),
-      collection_versions_lock_path(:origin => @collection.origin), :class => 'btn btn-default' %>
-    <%= button_to t("txt.views.versioning.delete"),
-      collection_path(:published => 0, :id => @collection.origin),
-      :method => :delete,
-      :class => 'btn btn-danger',
-      :data => { :confirm => I18n.t("txt.views.versioning.delete_confirm") } if can?(:destroy, @collection) %>
-  <% else %>
+  <% if @collection.locked? %>
     <%= button_to t("txt.views.versioning.unlock"),
       collection_versions_unlock_path(:origin => @collection.origin), :class => 'btn btn-default' if can?(:unlock, @collection) %>
     <%= link_to t("txt.views.versioning.edit_mode"),
       edit_collection_path(:published => 0, :id => @collection.origin),
-      :class => 'btn btn-default' if can?(:update, @collection) %>
+        :class => 'btn btn-default' if can?(:update, @collection) %>
+    <% else %>
+      <%= button_to t("txt.views.versioning.to_edit_mode"),
+        collection_versions_lock_path(:origin => @collection.origin), :class => 'btn btn-default' if can?(:lock, @collection) %>
+    <%= button_to t("txt.views.versioning.delete"),
+      collection_path(:published => 0, :id => @collection.origin),
+        :method => :delete,
+        :class => 'btn btn-danger',
+        :data => { :confirm => I18n.t("txt.views.versioning.delete_confirm") } if can?(:destroy, @collection) %>
   <% end %>
 </div>
 

data/app/views/concepts/show_unpublished.html.erb

@@ -13,32 +13,35 @@
 <% end %>
 
 <div class="editing_versioning_toolbar well">
-  <% if (not @concept.locked?) || @concept.locked_by == @current_user.id %>
+  <% if can?(:merge, @concept) %>
     <%= button_to t("txt.views.versioning.publishing"),
       concept_versions_merge_path(:origin => @concept.origin), :class => 'btn btn-primary' %>
   <% end %>
+
+  <% if can?(:check_consistency, @concept) %>
   <%= button_to t("txt.views.versioning.consistency_check"),
     concept_versions_consistency_check_path(:origin => @concept.origin), :class => 'btn btn-default', :method => :get %>
+  <% end %>
 
-  <% if (not @concept.in_review?) && @concept.locked_by == @current_user.id %>
+  <% if can?(:send_to_review, @concept) %>
     <%= button_to t("txt.common.to_review"),
       concept_versions_to_review_path(:origin => @concept.origin), :class => 'btn btn-default' %>
   <% end %>
 
-  <% unless @concept.locked? %>
-    <%= button_to t("txt.views.versioning.to_edit_mode"),
-      concept_versions_lock_path(:origin => @concept.origin), :class => 'btn btn-default' %>
-    <%= button_to t("txt.views.versioning.delete"),
-      concept_path(:published => 0, :id => @concept.origin),
-      :method => :delete,
-      :class => 'btn btn-danger',
-      :data => { :confirm => I18n.t("txt.views.versioning.delete_confirm") } if can?(:destroy, @concept) %>
-  <% else %>
+  <% if @concept.locked? %>
     <%= button_to t("txt.views.versioning.unlock"),
       concept_versions_unlock_path(:origin => @concept.origin), :class => 'btn btn-default' if can?(:unlock, @concept) %>
     <%= link_to t("txt.views.versioning.edit_mode"),
       edit_concept_path(:published => 0, :id => @concept.origin),
       :class => 'btn btn-default' if can?(:update, @concept) %>
+  <% else %>
+    <%= button_to t("txt.views.versioning.to_edit_mode"),
+      concept_versions_lock_path(:origin => @concept.origin), :class => 'btn btn-default' if can?(:lock, @concept) %>
+    <%= button_to t("txt.views.versioning.delete"),
+      concept_path(:published => 0, :id => @concept.origin),
+        :method => :delete,
+        :class => 'btn btn-danger',
+        :data => { :confirm => I18n.t("txt.views.versioning.delete_confirm") } if can?(:destroy, @concept) %>
   <% end %>
 </div>