iqvoc 4.12.0 → 4.13.2

data/app/models/note/base.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Note::Base < ActiveRecord::Base
+class Note::Base < ApplicationRecord
   self.table_name = 'notes'
 
   class_attribute :rdf_namespace, :rdf_predicate
@@ -23,27 +23,45 @@ class Note::Base < ActiveRecord::Base
 
   # ********** Validations
 
+  # FIXME: throws validation errors
+  # validates :position, uniqueness: { scope: [:owner_id, :owner_type] }
+  validates :position, numericality: { greater_than: 0 }
+
   # FIXME: None?? What about language and value?
 
   # ********** Associations
 
-  belongs_to :owner, polymorphic: true
+  belongs_to :owner,
+             polymorphic: true
+
   belongs_to :concept,
              class_name: Iqvoc::Concept.base_class_name,
-             foreign_key: 'owner_id'
+             foreign_key: 'owner_id',
+             optional: true
+
   belongs_to :collection,
              class_name: Iqvoc::Collection.base_class_name,
-             foreign_key: 'owner_id'
+             foreign_key: 'owner_id',
+             optional: true
 
   has_many :annotations,
            class_name: 'Note::Annotated::Base',
            foreign_key: :note_id,
-           dependent: :destroy
+           dependent: :destroy,
+           inverse_of: :note
 
   accepts_nested_attributes_for :annotations
 
   # ********** Scopes
 
+  default_scope { order(position: :asc) }
+
+  before_validation(on: :create) do
+    if position.blank?
+      self.position = (self&.owner&.send(Iqvoc.change_note_class_name.to_relation_name)&.maximum(:position) || 0).succ
+    end
+  end
+
   def self.by_language(lang_code)
     lang_code = Array.wrap(lang_code).flatten.compact
 

data/app/models/user_session.rb

@@ -15,7 +15,4 @@
 # limitations under the License.
 
 class UserSession < Authlogic::Session::Base
-  def to_key
-    new_record? ? nil : [ self.send(self.class.primary_key) ]
-  end
 end

data/app/services/rdf_sync_service.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-class RDFSyncService
+class RdfSyncService
   delegate :url_helpers, to: 'Rails.application.routes'
 
   ADAPTORS = { # XXX: inappropriate?
@@ -105,11 +105,11 @@ class RDFSyncService
   end
 end
 
-module RDFSyncService::Helper # TODO: rename -- XXX: does not belong here!?
+module RdfSyncService::Helper # TODO: rename -- XXX: does not belong here!?
   def triplestore_syncer
     base_url = root_url(lang: nil) # XXX: brittle in the face of future changes?
 
-    return RDFSyncService.new(base_url, Iqvoc.config['triplestore.url'],
+    return RdfSyncService.new(base_url, Iqvoc.config['triplestore.url'],
         username: Iqvoc.config['triplestore.username'].presence,
         password: Iqvoc.config['triplestore.password'].presence,
         view_context: view_context) # fugly, but necessary; cf. RDFSync#serialize

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

@@ -18,7 +18,14 @@
 </div>
 
 <div class="relation panel">
-  <h2><%= Iqvoc::Concept.base_class.model_name.human(:count => 2) %></h2>
+  <h2>
+    <%= Iqvoc::Concept.base_class.model_name.human(:count => 2) %>
+    <% if can?(:update, Iqvoc::Concept.base_class)%>
+      <small>
+        (<%= collection.concepts.size %>)
+      </small>
+    <% end %>
+  </h2>
   <div class="relation-body">
     <ul>
       <%- collection.concepts.sort {|a, b| a.pref_label.to_s <=> b.pref_label.to_s }.each do |concept| -%>
@@ -31,7 +38,14 @@
 </div>
 
 <div class="relation panel">
-  <h2><%= Iqvoc::Collection.base_class.model_name.human(:count => 2) %></h2>
+  <h2>
+    <%= Iqvoc::Collection.base_class.model_name.human(:count => 2) %>
+    <% if can?(:update, Iqvoc::Collection.base_class)%>
+    <small>
+      (<%= collection.subcollections.size %>)
+    </small>
+  <% end %>
+  </h2>
   <ul class="hybrid-treeview" data-url="<%= collections_path(:format => :json) %>">
     <%= render :partial => 'collection', :collection => collection.subcollections.sort {|a, b| a.pref_label <=> b.pref_label } %>
   </ul>

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

@@ -48,9 +48,9 @@
 </fieldset>
 
 <hr />
-<div class="well">
+<div class="mb-5">
   <%= f.submit t("txt.common.save"), :class => "btn btn-primary" %>
-  <%= link_to t("txt.common.cancel"), collection.new_record? ? dashboard_path : collection_path(collection, :published => 0), :class => "btn btn-default" %>
+  <%= link_to t("txt.common.cancel"), collection.new_record? ? dashboard_path : collection_path(collection, :published => 0), :class => "btn btn-outline-secondary" %>
 </div>
 
 <% end %>

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

@@ -1,12 +1,20 @@
 <%= sidebar do %>
-  <%= sidebar_header 'Links' %>
-  <%= sidebar_item :icon => :edit, :text => t("txt.views.collections.new"), :path => new_collection_path,
-    :perms => [:create, Iqvoc::Collection.base_class], :active => params[:action] == 'new' %>
   <% if defined?(collection) %>
-  <%= sidebar_header t('txt.common.representations') %>
-  <%= sidebar_item :icon => 'link', :text => 'HTML', :path => collection_url(collection.origin, :format => :html) %>
-  <%= sidebar_item :icon => 'link', :text => 'RDF/XML', :path => rdf_url(collection.origin, :format => :rdf, :lang => nil), :id => 'rdf_link_xml' %>
-  <%= sidebar_item :icon => 'link', :text => 'RDF/Turtle', :path => rdf_url(collection.origin, :format => :ttl, :lang => nil), :id => 'rdf_link_ttl' %>
-  <%= sidebar_item :icon => 'link', :text => 'RDF/NTriples', :path => rdf_url(collection.origin, :format => :nt, :lang => nil), :id => 'rdf_link_nt' %>
+    <%= sidebar_header t('txt.common.representations') %>
+    <%= sidebar_item :icon => 'share', :text => 'HTML', :path => collection_url(collection.origin, :format => :html) %>
+    <%= sidebar_item :icon => 'share', :text => 'RDF/XML', :path => rdf_url(collection.origin, :format => :rdf, :lang => nil), :id => 'rdf_link_xml' %>
+    <%= sidebar_item :icon => 'share', :text => 'RDF/Turtle', :path => rdf_url(collection.origin, :format => :ttl, :lang => nil), :id => 'rdf_link_ttl' %>
+    <%= sidebar_item :icon => 'share', :text => 'RDF/NTriples', :path => rdf_url(collection.origin, :format => :nt, :lang => nil), :id => 'rdf_link_nt' %>
+  <% end %>
+<% end %>
+
+<%= sidebar do %>
+  <% if defined?(collection) || can?(:create, Iqvoc::Collection.base_class) %>
+    <%= sidebar_header 'Links' %>
   <% end %>
+  <% if defined?(collection) %>
+    <%= sidebar_item :icon => 'link', :text => t('txt.models.collection.uri'), :path => rdf_url(collection.origin, :format => nil, :lang => nil) %>
+  <% end %>
+  <%= sidebar_item :icon => :edit, :text => t("txt.views.collections.new"), :path => new_collection_path,
+    :perms => [:create, Iqvoc::Collection.base_class] %>
 <% end %>

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

@@ -2,14 +2,14 @@
 <%= render 'sidebar', :collection => @collection %>
 
 <% if @new_collection_version.blank? && can?(:branch, @collection) %>
-    <div class="editing_versioning_toolbar well">
+    <div class="editing_versioning_toolbar">
       <%= button_to t("txt.views.versioning.versioning_mode"),
-        collection_versions_branch_path(:origin => @collection.origin), :class => "btn btn-default" %>
+        collection_versions_branch_path(:origin => @collection.origin), :class => "btn btn-outline-secondary" %>
     </div>
 <% elsif can?(:read, @new_collection_version) %>
-    <div class="editing_versioning_toolbar well">
+    <div class="editing_versioning_toolbar">
       <%= link_to t("txt.views.versioning.preview_new_version"),
-        collection_path(:published => 0, :id => @new_collection_version), :class => 'btn btn-default' %>
+        collection_path(:published => 0, :id => @new_collection_version), :class => 'btn btn-outline-secondary' %>
     </div>
 <% end %>
 

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

@@ -8,7 +8,7 @@
   <% end %>
 <% end %>
 
-<div class="editing_versioning_toolbar well">
+<div class="editing_versioning_toolbar">
   <% if can?(:merge, @collection) %>
     <%= button_to t("txt.views.versioning.publishing"),
       collection_versions_merge_path(:origin => @collection.origin), :class => 'btn btn-primary' %>
@@ -16,23 +16,23 @@
 
   <% 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 %>
+      collection_versions_consistency_check_path(:origin => @collection.origin), :class => 'btn btn-outline-secondary', :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' %>
+      collection_versions_to_review_path(:origin => @collection.origin), :class => 'btn btn-outline-secondary' %>
   <% end %>
 
   <% 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) %>
+      collection_versions_unlock_path(:origin => @collection.origin), :class => 'btn btn-outline-secondary' 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-outline-secondary' 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) %>
+        collection_versions_lock_path(:origin => @collection.origin), :class => 'btn btn-outline-secondary' if can?(:lock, @collection) %>
   <% end %>
 
   <% if can?(:destroy, @collection) %>

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

@@ -102,10 +102,9 @@
 
   <hr />
 
-  <div class="well">
+  <div class="mb-5">
     <%= f.submit t("txt.common.save"), :class => "btn btn-primary" %>
-
-    <%= link_to t("txt.common.cancel"), concept.new_record? ? dashboard_path : concept_path(:published => 0, :id => concept), :class => "btn btn-default" %>
+    <%= link_to t("txt.common.cancel"), concept.new_record? ? dashboard_path : concept_path(:published => 0, :id => concept), :class => "btn btn-outline-secondary" %>
   </div>
 
 <% end %>

data/app/views/concepts/alphabetical/_search_result.html.erb

@@ -1,16 +1,17 @@
 <li class="concept-item">
   <p>
-  <%= link_to result.label.to_s, rdf_path(result.concept, lang: nil, format: nil),
-    :alt => result.concept.origin, :data => { 'resource-path' => result.path, 'resource-url' => rdf_url(result.concept, lang: nil, format: nil) }, :class => 'concept-item-link' %>
-  <% if result.concept.additional_info.present? %>
-    <span class="additional_info">(<%= result.concept.additional_info %>)</span>
-  <% end %>
+    <%= link_to result.label.to_s, rdf_path(result.concept, lang: nil, format: nil),
+      alt: result.concept.origin, data: { 'resource-path': result.path, 'resource-url': rdf_url(result.concept, lang: nil, format: nil) }, class: 'concept-item-link' %>
+    <% if Iqvoc.concept_modal_preview_enabled? %>
+      <a href="<%= glance_concept_url(result.concept, format: :html) %>" class="dashboard-glance-link"><i class="fa fa-search-plus"></i></a>
+    <% end %>
+
+    <% if result.concept.additional_info.present? %>
+      <span class="additional_info">(<%= result.concept.additional_info %>)</span>
+    <% end %>
   </p>
 
-  <p class="concept-item-uri"><%= rdf_url(:id => result.concept.origin, :lang => nil, :format => nil) %></p>
-  <% if result.definition? %>
-    <p class="concept-item-definition" lang="<%= result.definition.language %>">
-      <%= result.definition.value %>
-    </p>
-  <% end %>
+  <p class="concept-item-uri">
+    <%= rdf_url(id: result.concept.origin, lang: nil, format: nil) %>
+  </p>
 </li>

data/app/views/concepts/alphabetical/index.html.erb

@@ -1,5 +1,10 @@
-<%= page_header :title => Iqvoc::Concept.base_class.model_name.human(:count => 2),
-  :desc => t('txt.views.navigation.alphabetical') %>
+<%
+  subtitle = t('txt.views.navigation.alphabetical')
+  if can?(:update, Iqvoc::Concept.base_class)
+    subtitle += " (#{number_with_delimiter(Iqvoc::Concept.base_class.not_expired.size)})"
+  end
+%>
+<%= page_header :title => Iqvoc::Concept.base_class.model_name.human(:count => 2), desc: subtitle %>
 <%= render 'concepts/sidebars/plural' %>
 
 <div class="panel">

data/app/views/concepts/expired/index.html.erb

@@ -1,16 +1,21 @@
-<%= page_header :title => Iqvoc::Concept.base_class.model_name.human(:count => 2), :desc => t('txt.views.navigation.expired') %>
+<%
+  subtitle = t('txt.views.navigation.expired')
+  if can?(:update, Iqvoc::Concept.base_class)
+    subtitle += " (#{number_with_delimiter(Iqvoc::Concept.base_class.expired.size)})"
+  end
+%>
+<%= page_header :title => Iqvoc::Concept.base_class.model_name.human(:count => 2), desc: subtitle %>
 <%= render 'concepts/sidebars/plural' %>
 
 <div class="panel">
   <div class="panel-header centered">
     <%= letter_selector(@letters) do |letter| %>
-        <% expired_concepts_path(:prefix => letter.to_s.downcase) %>
+      <% expired_concepts_path(:prefix => letter.to_s.downcase) %>
     <% end %>
   </div>
-  <ol class="concepts list-unstyled">
+  <ol class="concept-items list-unstyled">
     <% @search_results.each do |result| %>
-    <%= render :partial => 'concepts/alphabetical/search_result',
-        :locals => { :result => result } %>
+      <%= render :partial => result.partial_name, :locals => { :result => result } %>
     <% end %>
   </ol>
 </div>

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

@@ -1,12 +1,12 @@
 <!-- Modal -->
-<div class="modal-dialog concept-teaser-dialog">
+<div class="modal-dialog modal-lg concept-teaser-dialog" role="document">
   <div class="modal-content concept-teaser-content">
     <div class="modal-header concept-teaser-header">
-      <button type="button" class="close" data-dismiss="modal">
+      <h1 class="modal-title" id="concept-teaser-title"><%= @concept.pref_label %></h1>
+      <button type="button" class="close" data-dismiss="modal" aria-label="Close">
         <span aria-hidden="true">&times;</span>
         <span class="sr-only"><%= t('txt.views.concepts.teaser.close') %></span>
       </button>
-      <h1 class="modal-title" id="concept-teaser-title"><%= @concept.pref_label %></h1>
     </div>
     <div class="modal-body concept-teaser-body">
       <% if @view.no_content? %>
@@ -54,7 +54,8 @@
       <% end %>
     </div>
     <div class="modal-footer concept-teaser-footer">
-      <a href="<%= concept_path(@concept) %>" class="btn btn-default"><i class="fa fa-angle-double-right"></i> <%= t('txt.views.concepts.to_concept') %></a>
+      <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Close</button>
+      <a href="<%= concept_path(@concept) %>" class="btn btn-primary"><i class="fa fa-angle-double-right"></i> <%= t('txt.views.concepts.to_concept') %></a>
     </div>
   </div>
 </div>

data/app/views/concepts/hierarchical/_treeview.html.erb

@@ -3,11 +3,14 @@
 <ul class="hybrid-treeview" data-url="<%= hcpath %>"
   data-dragabble="true"
   data-polyhierarchy-support="<%= Iqvoc::Concept.root_class.instance.poly_hierarchy? %>"
+  data-concept-modal-preview-enabled="<%= Iqvoc.concept_modal_preview_enabled? %>"
   data-save-label="<%= t('txt.common.move') %>"
   data-copy-label="<%= t('txt.common.copy') %>"
   data-undo-label="<%= t('txt.common.reset') %>">
 <% else %>
-  <ul class="hybrid-treeview" data-url="<%= hcpath %>">
+  <ul class="hybrid-treeview"
+      data-url="<%= hcpath %>"
+      data-concept-modal-preview-enabled="<%= Iqvoc.concept_modal_preview_enabled? %>">
 <% end %>
   <% concepts.select { |c| can? :read, c }.each do |concept| %>
     <% if params[:published] == '0' %>

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

@@ -1,4 +1,5 @@
 <%= page_header :title => t("txt.views.concepts.new", :concept_class_name => Iqvoc::Concept.base_class.model_name.human(:count => 1)) %>
 
 <%= error_messages_for @concept %>
-<%= render 'concepts/form', :concept => @concept %>
+<%= render 'concepts/form', :concept => @concept %>
+<%= render 'concepts/sidebars/singular' %>

data/app/views/concepts/scheme/edit.html.erb

@@ -26,7 +26,7 @@
     <% end %>
   </fieldset>
   <hr />
-  <div class="well">
+  <div class="mb-5">
     <%= f.submit t("txt.common.save"), :class => "btn btn-primary" %>
   </div>
 <% end %>

data/app/views/concepts/scheme/show.html.erb

@@ -2,15 +2,13 @@
 <%= render 'sidebar', :scheme => @scheme %>
 
 <% if can? :update, @scheme %>
-  <div class="editing_versioning_toolbar well">
-    <%= link_to t('txt.common.edit'), edit_scheme_path, :class => 'btn btn-default' %>
+  <div class="editing_versioning_toolbar">
+    <%= link_to t('txt.common.edit'), edit_scheme_path, :class => 'btn btn-outline-secondary' %>
   </div>
 <% end %>
 
 <% Iqvoc::Concept.labeling_classes.each do |labeling_class, languages| %>
-  <% (languages || Iqvoc.available_languages).each do |lang| %>
-    <%= render labeling_class.partial_name(@scheme), klass: labeling_class, concept: @scheme, available_languages: languages || Iqvoc.available_languages %>
-  <% end %>
+  <%= render labeling_class.partial_name(@scheme), klass: labeling_class, concept: @scheme, available_languages: languages || Iqvoc.available_languages %>
 <% end %>
 
 <div class="relation panel">

data/app/views/concepts/scheme/show.iqrdf

@@ -3,9 +3,4 @@ RdfNamespacesHelper.instance_methods.each do |meth|
   document.namespaces(namespaces) if namespaces.is_a?(Hash)
 end
 
-document << Iqvoc::Concept.root_class.instance.build_rdf_subject do |scheme|
-  @top_concepts.each do |top_concept|
-    scheme.Skos::hasTopConcept IqRdf.build_uri(top_concept.origin)
-    render_concept(document, top_concept, true)
-  end
-end
+render_scheme(document, @scheme, @top_concepts)

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

@@ -5,14 +5,14 @@
   <% if @jobs && @jobs.any? %>
     <%= render partial: 'partials/concept/reverse_match_notice', locals: {concept: @concept, jobs: @jobs} %>
   <% end %>
-    <div class="editing_versioning_toolbar well">
+    <div class="editing_versioning_toolbar">
       <%= button_to t("txt.views.versioning.versioning_mode"),
-        concept_versions_branch_path(:origin => @concept.origin), :class => "btn btn-default" %>
+        concept_versions_branch_path(:origin => @concept.origin), :class => "btn btn-outline-secondary" %>
     </div>
 <% elsif can?(:read, @new_concept_version) %>
-    <div class="editing_versioning_toolbar well">
+    <div class="editing_versioning_toolbar">
       <%= link_to t("txt.views.versioning.preview_new_version"),
-        concept_path(:published => 0, :id => @new_concept_version), :class => 'btn btn-default' %>
+        concept_path(:published => 0, :id => @new_concept_version), :class => 'btn btn-outline-secondary' %>
     </div>
 <% end %>
 

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

@@ -12,7 +12,7 @@
   <%= render partial: 'partials/concept/reverse_match_notice', locals: {concept: @concept, jobs: @jobs} %>
 <% end %>
 
-<div class="editing_versioning_toolbar well">
+<div class="editing_versioning_toolbar">
   <% if can?(:merge, @concept) %>
     <%= button_to t("txt.views.versioning.publishing"),
       concept_versions_merge_path(:origin => @concept.origin), :class => 'btn btn-primary' %>
@@ -20,23 +20,23 @@
 
   <% 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 %>
+    concept_versions_consistency_check_path(:origin => @concept.origin), :class => 'btn btn-outline-secondary', :method => :get %>
   <% end %>
 
   <% 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' %>
+      concept_versions_to_review_path(:origin => @concept.origin), :class => 'btn btn-outline-secondary' %>
   <% end %>
 
   <% 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) %>
+      concept_versions_unlock_path(:origin => @concept.origin), :class => 'btn btn-outline-secondary' 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) %>
+      :class => 'btn btn-outline-secondary' if can?(:update, @concept) %>
   <% elsif can?(:lock, @concept) %>
     <%= button_to t("txt.views.versioning.to_edit_mode"),
-      concept_versions_lock_path(:origin => @concept.origin), :class => 'btn btn-default' %>
+      concept_versions_lock_path(:origin => @concept.origin), :class => 'btn btn-outline-secondary' %>
   <% end %>
 
   <% if can?(:destroy, @concept) %>

data/app/views/concepts/sidebars/_plural.html.erb

@@ -25,12 +25,18 @@
       :active => params[:controller] == 'concepts/untranslated',
       :id => 'untranslated' %>
   <% end %>
+<% end %>
 
+<%= sidebar do %>
   <% if can?(:create, Iqvoc::Concept.base_class) %>
     <%= sidebar_header 'Links'%>
-    <%= sidebar_item :icon => :edit, :text => t('txt.views.concepts.new', :concept_class_name => Iqvoc::Concept.base_class.model_name.human), :path => new_concept_path, :perms => [:create, Iqvoc::Concept.base_class], :active => params[:action] == 'new' %>
+    <% (Iqvoc.first_level_classes - [Collection::SKOS::Unordered]).each do |klass| %>
+      <%= sidebar_item { render(klass.new_link_partial_name) } %>
+    <% end %>
   <% end %>
+<% end %>
 
+<%= sidebar do %>
   <% if @loose_concepts.try(:any?) %>
     <%= sidebar_header t('txt.views.navigation.loose_concepts') %>
     <div class="box">
@@ -38,5 +44,4 @@
       <%= paginate @loose_concepts %>
     </div>
   <% end %>
-
 <% end %>

data/app/views/concepts/sidebars/_singular.html.erb

@@ -1,13 +1,22 @@
-<%- published_param = concept.published? ? nil : "0" -%>
+<%- published_param = concept.published? ? nil : "0" if defined?(concept) -%>
 
 <%= sidebar do %>
-  <%= sidebar_header t('txt.common.representations') %>
-  <%= sidebar_item :icon => 'link', :text => 'HTML', :path => concept_path(:id => concept, :format => :html, :published => published_param) %>
-  <%= sidebar_item :icon => 'link', :text => 'RDF/XML', :path => concept_path(:id => concept, :format => :rdf, :published => published_param), :id => 'rdf_link_xml' %>
-  <%= sidebar_item :icon => 'link', :text => 'RDF/Turtle', :path => concept_path(:id => concept, :format => :ttl, :published => published_param), :id => 'rdf_link_ttl' %>
-  <%= sidebar_item :icon => 'link', :text => 'RDF/NTriples', :path => concept_path(:id => concept, :format => :nt, :published => published_param), :id => 'rdf_link_nt' %>
-  <%= sidebar_header 'Links' if can?(:create, Iqvoc::Concept.base_class) %>
-  <%= sidebar_item :icon => 'link', :text => t('txt.models.concept.uri'), :path => rdf_url(concept.origin, :format => nil, :published => published_param, :lang => nil) %>
-  <%= sidebar_item :icon => :edit, :text => t('txt.views.concepts.new', :concept_class_name => Iqvoc::Concept.base_class.model_name.human), :path => new_concept_path,
-    :perms => [:create, Iqvoc::Concept.base_class], :active => params[:action] == 'new' %>
+  <% if defined?(concept) %>
+    <%= sidebar_header t('txt.common.representations') %>
+    <%= sidebar_item :icon => 'share', :text => 'HTML', :path => concept_path(:id => concept, :format => :html, :published => published_param) %>
+    <%= sidebar_item :icon => 'share', :text => 'RDF/XML', :path => concept_path(:id => concept, :format => :rdf, :published => published_param), :id => 'rdf_link_xml' %>
+    <%= sidebar_item :icon => 'share', :text => 'RDF/Turtle', :path => concept_path(:id => concept, :format => :ttl, :published => published_param), :id => 'rdf_link_ttl' %>
+    <%= sidebar_item :icon => 'share', :text => 'RDF/NTriples', :path => concept_path(:id => concept, :format => :nt, :published => published_param), :id => 'rdf_link_nt' %>
+  <% end %>
+<% end %>
+
+<%= sidebar do %>
+  <%= sidebar_header 'Links' %>
+  <% if defined?(concept) %>
+    <%= sidebar_item :icon => 'link', :text => t('txt.models.concept.uri'), :path => rdf_url(concept.origin, :format => nil, :published => published_param, :lang => nil) %>
+  <% end %>
+
+  <% (Iqvoc.first_level_classes - [Collection::SKOS::Unordered]).each do |klass| %>
+    <%= sidebar_item { render(klass.new_link_partial_name) } %>
+  <% end %>
 <% end %>

data/app/views/dashboard/_sidebar.html.erb

@@ -3,6 +3,9 @@
   <% Iqvoc.first_level_classes.each do |klass| %>
     <%= sidebar_item { render(klass.new_link_partial_name) } %>
   <% end %>
+<% end %>
+
+<%= sidebar do %>
   <%= sidebar_header 'Extras' %>
 
   <%= sidebar_item(:icon => :upload, :text => t('txt.views.dashboard.import'),

data/app/views/dashboard/_table.html.erb

@@ -1,8 +1,7 @@
-<table class="table table-hover dashboard-table">
+<table class="table table-hover dashboard-table table-responsive">
   <thead>
     <tr>
       <th><%= t("txt.views.dashboard.value") %><%= sorting_controls_for(:value) %></th>
-      <th></th>
       <th><%= t("txt.views.dashboard.locking_user") %><%= sorting_controls_for(:locking_user) %></th>
       <% unless @items.first.class == Iqvoc::Collection.base_class %>
         <th><%= t("txt.views.dashboard.follow_up") %><%= sorting_controls_for(:follow_up) %></th>
@@ -12,23 +11,35 @@
       <%- if params[:check_consistency] == "1" -%>
         <th><%= t("txt.views.dashboard.consistent") %>?</th>
       <%- else -%>
-        <th><%= link_to t("txt.views.dashboard.check_consistency"), params.merge(:check_consistency => 1) %></th>
+        <th><%= link_to t("txt.views.dashboard.check_consistency"), sorting_params.merge(:check_consistency => 1) %></th>
       <%- end -%>
     </tr>
   </thead>
   <tbody>
     <% @items.each do |item| -%>
       <tr class="highlightable dashboard-table-item" data-url="<%= link_to_dashboard_item(item) %>">
-        <td>
+        <td class="text-nowrap">
           <%= render item.class.edit_link_partial_name, :item => item %>
+          <a href="<%= dashboard_glance_path(type: item.class, origin: item.origin, published: item.published? ? 1 : 0) %>" class="dashboard-glance-link"><i class="fa fa-search-plus"></i></a>
+        </td>
+        <td>
+        <% if item.locking_user.present? %>
+          <span class="badge badge-info" data-toggle="tooltip" data-placement="top" title="<%= item.locking_user.name %>">
+            <%= item.locking_user.initials %>
+          </span>
+        <% end %>
         </td>
-        <th><a href="<%= dashboard_glance_path(type: item.class, origin: item.origin, published: item.published? ? 1 : 0) %>" class="dashboard-glance-link"><i class="fa fa-search-plus"></i></a</th>
-        <td class="text-nowrap"><%= item.locking_user.blank? ? "" : item.locking_user.name %></td>
         <% unless item.class == Iqvoc::Collection.base_class %>
-          <td class="<%= 'dashboard-activated-follow-up-column' if item.follow_up.present? %>"><%= l(item.follow_up) if item.follow_up.present? %></td>
+          <td class="<%= 'dashboard-activated-follow-up-column' if item.follow_up.present? %>">
+            <%= l(item.follow_up) if item.follow_up.present? %>
+          </td>
         <% end %>
-        <td class="text-nowrap"><%= l(item.updated_at, :format => :short) %></td>
-        <td><span class="label <%= !item.published? || item.in_review? ? 'label-danger' : 'label-default' %> dashboard-table-item-state"><%= item.state %></span></td>
+        <td class="text-nowrap">
+          <%= l(item.updated_at, :format => :short) %>
+        </td>
+        <td>
+          <span class="badge <%= !item.published? || item.in_review? ? 'badge-danger' : 'badge-secondary' %> dashboard-table-item-state"><%= item.state %></span>
+        </td>
         <td>
         <%- if params[:check_consistency] == "1" -%>
           <%= consistency_status(item) %>

data/app/views/dashboard/glance.html.erb

@@ -1,12 +1,12 @@
 <!-- Modal -->
-<div class="modal-dialog concept-teaser-dialog">
+<div class="modal-dialog modal-lg concept-teaser-dialog">
   <div class="modal-content concept-teaser-content">
     <div class="modal-header concept-teaser-header">
-      <button type="button" class="close" data-dismiss="modal">
+      <h1 class="modal-title" id="concept-teaser-title"><%= @title %></h1>
+      <button type="button" class="close" data-dismiss="modal" aria-label="Close">
         <span aria-hidden="true">&times;</span>
         <span class="sr-only"><%= t('txt.views.concepts.teaser.close') %></span>
       </button>
-      <h1 class="modal-title" id="concept-teaser-title"><%= @title %></h1>
     </div>
     <div class="modal-body concept-teaser-body">
       <h2><%= Note::SKOS::EditorialNote.model_name.human(count: 2) %></h2>
@@ -18,13 +18,14 @@
       <ul class="label-list">
         <% @editorial_notes.each do |note| %><!--
         --><li class="label-list-item">
-             <span class="label-list-item-value"><%= notes.value %></span>
+             <span class="label-list-item-value"><%= note.value %></span>
            </li><!--
         --><% end %>
       </ul>
     </div>
     <div class="modal-footer concept-teaser-footer">
-      <a href="<%= @path %>" class="btn btn-default"><i class="fa fa-angle-double-right"></i> <%= t('txt.views.show') %></a>
+      <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Close</button>
+      <a href="<%= @path %>" class="btn btn-primary"><i class="fa fa-angle-double-right"></i> <%= t('txt.views.show') %></a>
     </div>
   </div>
 </div>