iqvoc 4.12.0 → 4.13.2

data/app/views/pages/version.html.erb

@@ -1,21 +1,19 @@
-<h1>Version</h1>
+<%= page_header title: 'Version' %>
 
-<dl class="dl-horizontal">
-  <dt>iQvoc version:</dt>
-  <dd><%= Iqvoc::VERSION %></dd>
+<dl class="row">
+  <% if Iqvoc.host_version %>
+  <dt class="col-md-2">Application version:</dt>
+  <dd class="col-md-10"><%= "#{Iqvoc.host_namespace} #{Iqvoc.host_version}" %></dd>
+  <% end %>
 
-  <dt>iQvoc revision</dt>
   <% if File.exists?(Rails.root.join('headrev.txt')) %>
-    <dd><%= File.read(Rails.root.join('headrev.txt')) %></dd>
-  <% else %>
-    <dd>-</dd>
+    <dt class="col-md-2">Revision</dt>
+    <dd class="col-md-10"><%= File.read(Rails.root.join('headrev.txt')) %></dd>
   <% end %>
 
-  <% if Iqvoc.host_version %>
-  <dt>iQvoc version:</dt>
-  <dd><%= "#{Iqvoc.host_namespace} #{Iqvoc.host_version}" %></dd>
-  <% end %>
+  <dt class="col-md-2">iQvoc core version:</dt>
+  <dd class="col-md-10"><%= Iqvoc::VERSION %></dd>
 
-  <dt>RAILS_ENV:</dt>
-  <dd><%= Rails.env %></dd>
+  <dt class="col-md-2">RAILS_ENV:</dt>
+  <dd class="col-md-10"><%= Rails.env %></dd>
 </dl>

data/app/views/partials/collection/_member.html.erb

@@ -1,4 +1,4 @@
-<div class="relation panel" id="assigned_collections">
+<div class="relation panel" id="<%= klass.name.to_relation_name %>">
   <h2><%= klass.model_name.human(:count => 2) %></h2>
   <div class="relation-body">
     <%- if concept.collections.any? -%>

data/app/views/partials/collection/_new_link_base.html.erb

@@ -1,3 +1,5 @@
-<%= link_to(icon(:edit) + " " +
-  t("txt.views.collections.new"),
-  new_collection_path, :class => 'list-group-item') %>
+<%= sidebar_item icon: 'edit',
+  text: t('txt.views.collections.new', :concept_class_name => Iqvoc::Collection.base_class.model_name.human(:count => 1)),
+  path: new_collection_path(published: 0),
+  perms: [:create, Iqvoc::Collection.base_class]
+%>

data/app/views/partials/concept/_new_link_base.html.erb

@@ -1,3 +1,5 @@
-<%= link_to(icon(:edit) + " " +
-  t("txt.views.concepts.new", :concept_class_name => Iqvoc::Concept.base_class.model_name.human(:count => 1)),
-  new_concept_path(:published => 0), :class => 'list-group-item') %>
+<%= sidebar_item icon: 'edit',
+  text: t('txt.views.concepts.new', :concept_class_name => Iqvoc::Concept.base_class.model_name.human(:count => 1)),
+  path: new_concept_path(published: 0),
+  perms: [:create, Iqvoc::Concept.base_class]
+%>

data/app/views/partials/concept/relation/_base.html.erb

@@ -1,12 +1,12 @@
 <div class="relation panel" id="<%= klass.model_name.to_s.to_relation_name %>">
   <h2><%= klass.model_name.human(:count => 2) %></h2>
   <div class="relation-body">
-    <%-
+    <%
       items = concept.related_concepts_for_relation_class(klass, params[:published] != "0")
       items = items.select { |item| can?(:read, item) }
     -%>
-    <%= item_listing(items) do |c|
-      link_to(c.pref_label, concept_path(:id => c))
-    end %>
+    <%= item_listing(items) do |concept| %>
+      <%= render(concept.class.inline_partial_name, concept: concept) %>
+    <% end %>
   </div>
 </div>

data/app/views/partials/concept/relation/skos/_narrower.html.erb

@@ -1,4 +1,4 @@
-<div class="relation panel">
+<div class="relation panel" id="<%= Iqvoc::Concept.broader_relation_class.narrower_class.name.to_relation_name %>">
   <h2><%= Iqvoc::Concept.broader_relation_class.narrower_class.model_name.human(:count => 2) %></h2>
   <div class="relation-body">
     <% if concept.narrower_relations.any? %>

data/app/views/partials/concept/relation/skos/broader/_mono.html.erb

@@ -1,8 +1,8 @@
-<div class="relation <%= Iqvoc::Concept.broader_relation_class.name.to_relation_name %> panel">
+<div class="relation panel" id="<%= Iqvoc::Concept.broader_relation_class.name.to_relation_name %>">
   <h2><%= Iqvoc::Concept.broader_relation_class.model_name.human(:count => 2) %></h2>
   <div class="relation-body">
     <% if concept.top_term? %>
-      <strong><%= concept.class.human_attribute_name("top_term") %></strong>
+      <%= concept.class.human_attribute_name("top_term") %>
     <% end %>
 
     <%-

data/app/views/partials/concept/relation/skos/broader/_poly.html.erb

@@ -1,8 +1,8 @@
-<div class="relation panel">
+<div class="relation panel" id="<%= Iqvoc::Concept.broader_relation_class.name.to_relation_name %>">
   <h2><%= Iqvoc::Concept.broader_relation_class.model_name.human(:count => 2) %></h2>
   <div class="relation-body block">
     <% if concept.top_term? %>
-      <strong><%= concept.class.human_attribute_name("top_term") %></strong>
+      <%= concept.class.human_attribute_name("top_term") %>
     <% end %>
 
     <% if concept.related_concepts_for_relation_class(

data/app/views/partials/labeling/skos/_base.html.erb

@@ -1,4 +1,4 @@
-<%= content_tag :div, :class => "relation translation panel" do %>
+<%= content_tag :div, class: "relation translation panel", id: klass.name.to_relation_name do %>
   <% if defined?(concept) %>
     <h2><%= klass.model_name.human(:count => 2) %></h2>
     <div class="relation-body">

data/app/views/partials/labeling/skos/_edit_base.html.erb

@@ -1,8 +1,11 @@
 <%= content_tag :div, :class => "translation", :lang => language || nil do %>
     <%= f.form_group :labelings_by_text, :label => {:text => klass.model_name.human(:count => 2)} do %>
       <div class="input-group">
-        <span class="input-group-addon"><%= language %></span>
-        <%= text_field_tag "concept[labelings_by_text][#{klass.name.to_relation_name}][#{language}]", concept.labelings_by_text(klass.name.to_relation_name, language), :class => 'form-control' %>
+        <div class="input-group-prepend">
+          <span class="input-group-text"><%= language %></span>
+        </div>
+        <%= text_field_tag "concept[labelings_by_text][#{klass.name.to_relation_name}][#{language}]", concept.labelings_by_text(klass.name.to_relation_name, language),
+                           class: 'form-control', autocomplete: 'off' %>
       </div>
     <% end %>
 <% end %>

data/app/views/partials/labeling/skos/_search_result.html.erb

@@ -4,6 +4,9 @@
   <% if owner.additional_info.present? %>
     <span class="additional_info">(<%= owner.additional_info %>)</span>
   <% end %>
+  <% if owner.expired? %>
+    <span class="badge badge-info"><%= t('txt.views.concepts.expired_at', date: l(owner.expired_at, format: :long)) %></span>
+  <% end %>
   <dl class="search-result-meta">
     <dt class="search-result-key"><%= t('txt.views.search_results.type') %></dt>
     <dd class="search-result-value" data-key="<%= t('txt.views.search_results.type') %>"><%= result.model_name.human %></dd>

data/app/views/partials/match/_edit_base.html.erb

@@ -1,7 +1,7 @@
 <%- fieldname = "concept[inline_#{assoc_klass.name.to_relation_name}]" -%>
 
 <div class="form-group">
-  <label class="col-sm-2 control-label" for="<%= fieldname %>"><%= assoc_klass.model_name.human(:count => 2) %></label>
+  <label class="col-sm-2 col-form-label" for="<%= fieldname %>"><%= assoc_klass.model_name.human(:count => 2) %></label>
   <div class="col-sm-10">
   <%= text_area_tag fieldname, owner_klass.send("inline_#{assoc_klass.name.to_relation_name}"),
         :class => "form-control",

data/app/views/partials/match/_panel.html.erb

@@ -1,5 +1,5 @@
-<div class="relation panel">
-    <h2 class=""><%= t('txt.views.layouts.sections.matches') %></h2>
+<div class="relation panel" id="<%= klass.model_name.to_s.to_relation_name %>">
+  <h2><%= klass.model_name.human(:count => 2) %></h2>
   <div class="panel-body match">
     <%= body.html_safe %>
   </div>

data/app/views/partials/notation/_base.html.erb

@@ -1,4 +1,4 @@
-<div class="relation panel">
+<div class="relation panel" id="<%= klass.model_name.to_s.to_relation_name %>">
   <h2><%= klass.model_name.human(:count => 2) %></h2>
   <div class="relation-body">
     <%= item_listing(concept.notations_for_class(klass)) do |notation|

data/app/views/partials/notation/_edit_base.html.erb

@@ -14,5 +14,5 @@
       <% end %>
     <% end %>
   </ol>
-  <input type="button" value="<%= t("txt.common.add_note") %>" class="btn btn-default pull-right">
+  <input type="button" value="<%= t("txt.common.add_note") %>" class="btn btn-outline-secondary pull-right">
 </fieldset>

data/app/views/partials/note/_edit_base.html.erb

@@ -4,14 +4,27 @@
     <% owner_klass.send(assoc_klass.name.to_relation_name).select{|n| n.class == assoc_klass}.each do |note| %>
       <%= content_tag(:li, :class => "inline_note translation #{" new" if note.new_record?}", :lang => note.language || nil) do %>
         <%= f.fields_for assoc_klass.name.to_relation_name, note do |note_form| %>
-          <%= note_form.text_area :value %>
-          <%= note_form.select :language, Iqvoc.note_languages.map { |l| [l, l]}, :label => t("txt.common.language") %>
-          <% if note.persisted? %>
-            <%= note_form.check_box :"_destroy", :label => t("txt.common.delete") %>
+          <div class="row">
+            <div class="col-sm-10">
+              <%= note_form.text_area :value, rows: 10 %>
+            </div>
+            <div class="col-sm-2">
+              <%= note_form.select :language, Iqvoc.note_languages.map { |l| [l, l]}, :label => t("txt.common.language") %>
+
+              <% if note.persisted? %>
+                <%= note_form.number_field :position %>
+              <% else %>
+                <%= note_form.number_field :position, value: 1 %>
+              <% end %>
+
+              <% if note.persisted? %>
+                <%= note_form.check_box :"_destroy", :label => t("txt.common.delete") %>
+              <% end %>
+            </div>
           <% end %>
+          </div>
         <% end %>
       <% end %>
-    <% end %>
   </ol>
-  <input type="button" value="<%= t("txt.common.add_note") %>" class="btn btn-default pull-right">
+  <input type="button" value="<%= t("txt.common.add_note") %>" class="btn btn-outline-secondary pull-right">
 </fieldset>

data/app/views/partials/note/_note.html.erb

@@ -3,7 +3,7 @@
     <span class="language_flap"><%= note.language %></span>
     <div class="note_content">
       <% if note.value %>
-        <p><%= auto_link(note.value, :html => { :target => '_blank' }) %></p>
+        <%= auto_link(simple_format(note.value), :html => { :target => '_blank' }) %>
       <% end %>
 
       <% if note.annotations.any? %>

data/app/views/partials/note/_search_result.html.erb

@@ -4,5 +4,5 @@
   <% elsif result.owner.is_a?(Label::Base) %>
     <%= link_to result.owner.value, label_path(:id => result.owner), :lang => result.language %>
   <% end %>
-  <span class="label label-info"><%= result.model_name.human %></span>
+  <span class="badge badge-info"><%= result.model_name.human %></span>
 </li>

data/app/views/partials/note/skos/_edit_change_note.html.erb

@@ -10,6 +10,7 @@
         :label => t("txt.common.language"),
         :include_blank => false %>
 
+        <%= note_form.hidden_field :position %>
         <%= note_form.fields_for :annotations do |na| %>
           <%= na.hidden_field :namespace %>
           <%= na.hidden_field :predicate %>

data/app/views/partials/note/skos/change_note/_search_result.html.erb

@@ -4,5 +4,5 @@
   <% elsif result.owner.is_a?(Label::Base) %>
     <%= link_to result.owner.value, label_path(:id => result.owner), :lang => result.language %>
   <% end %>
-  <span class="label label-info"><%= result.model_name.human %></span>
+  <span class="badge badge-info"><%= result.model_name.human %></span>
 </li>

data/app/views/partials/note/skos/definition/_search_result.html.erb

@@ -4,6 +4,6 @@
   <% elsif result.owner.is_a?(Label::Base) %>
     <%= link_to result.owner.value, label_path(:id => result.owner), :class => 'search-result-link', :data => { 'resource-path' => rdf_path(result.owner.origin, :lang => nil, :format => nil) } %>
   <% end %>
-  <span class="label label-info"><%= result.model_name.human %></span>
+  <span class="badge badge-info"><%= result.model_name.human %></span>
   <p class="search-result-body"><%= highlight_query(excerpt(result.value, params[:query]), params[:query]) %></p>
 </li>

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

@@ -1,10 +1,10 @@
-<%= form_tag(search_path, :method => :get, :class => 'form-horizontal', :id => 'search', :role => 'form') do |f| %>
+<%= form_tag(search_path, method: :get, id:'search', role: 'form', class: 'mb-4') do |f| %>
   <% Iqvoc.search_sections.each do |section| %>
     <%= render "search_results/sections/#{section}" %>
   <% end %>
 
   <hr />
-  <div class="well">
-    <%= submit_tag t('txt.views.search_results.submit'), :class => 'btn btn-primary' %>
-  </div>
+
+  <%= submit_tag t('txt.views.search_results.submit'), :class => 'btn btn-primary' %>
+
 <% end %>

data/app/views/search_results/_result_list.html.erb

@@ -0,0 +1,15 @@
+<ul class="search-results list-unstyled">
+  <% if @results.any? %>
+    <% @results.each do |result| %>
+      <% if @klass %>
+        <%= render @klass.search_result_partial_name, :result => result %>
+      <% else %>
+        <%= render result.search_result_partial_name, :result => result %>
+      <% end %>
+    <% end %>
+  <% else %>
+    <li class="p-2">
+      <%= t('txt.views.search_results.no_results_found') %>
+    </li>
+  <% end %>
+</ul>

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

@@ -1,8 +1,15 @@
-<% if results %>
-  <%= sidebar do %>
+<%= sidebar do %>
+  <% if results %>
     <%= sidebar_header t('txt.common.representations') %>
     <%= sidebar_item :icon => 'link', :text => 'RDF/XML', :path => rdf_search_path({:lang => nil, :page => results.current_page, :format => :rdf}.merge(request.query_parameters)), :id => 'rdf_link_xml' %>
     <%= sidebar_item :icon => 'link', :text => 'RDF/Turtle', :path => rdf_search_path({:lang => nil, :page => @results.current_page, :format => :ttl}.merge(request.query_parameters)), :id => 'rdf_link_ttl' %>
     <%= sidebar_item :icon => 'link', :text => 'RDF/NTriples', :path => rdf_search_path({:lang => nil, :page => @results.current_page, :format => :nt}.merge(request.query_parameters)), :id => 'rdf_link_nt' %>
   <% end %>
 <% end %>
+
+<%= sidebar do %>
+  <%= sidebar_header 'Links' if can?(:create, Iqvoc::Concept.base_class) %>
+  <% (Iqvoc.first_level_classes - [Collection::SKOS::Unordered]).each do |klass| %>
+    <%= sidebar_item { render(klass.new_link_partial_name) } %>
+  <% end %>
+<% end %>

data/app/views/search_results/index.html.erb

@@ -6,17 +6,7 @@
 <% if @results %>
 <div class="panel">
   <%= results_header @results %>
-
-  <ul class="search-results list-unstyled">
-    <% @results.each do |result| %>
-      <% if @klass %>
-        <%= render @klass.search_result_partial_name, :result => result %>
-      <% else %>
-        <%= render result.search_result_partial_name, :result => result %>
-      <% end %>
-    <% end %>
-  </ul>
-
+    <%= render 'result_list' %>
   <%= paginate @results %>
 </div>
 <% end %>

data/app/views/search_results/index.iqrdf

@@ -13,7 +13,7 @@ document << IqRdf.build_full_uri_subject(URI.parse(url_for(request.query_paramet
   query.Sdc::itemsPerPage(@results.limit_value)
   query.Sdc::searchTerms(params[:query])
   query.Sdc::first(URI.parse(url_for(request.query_parameters.merge(:page => 1, :lang => nil, :only_path => false))))
-  query.Sdc::last(URI.parse(url_for(request.query_parameters.merge(:page => @results.num_pages, :lang => nil, :only_path => false))))
+  query.Sdc::last(URI.parse(url_for(request.query_parameters.merge(:page => @results.total_pages, :lang => nil, :only_path => false))))
   i = 0
   @results.each do
     query.Sdc::result(IqRdf::Search::build_uri("result#{i+=1}"))
@@ -23,7 +23,7 @@ end
 document << IqRdf.build_full_uri_subject(URI.parse(url_for(request.query_parameters.merge(:page => @results.current_page, :lang => nil, :only_path => false))), IqRdf::Sdc::build_uri('Page')) do |page|
   page.Sdc::startIndex((@results.current_page - 1) * @results.limit_value + 1)
   page.Sdc::previous(URI.parse(url_for(request.query_parameters.merge(:page => @results.current_page - 1, :lang => nil, :only_path => false)))) if @results.current_page > 1
-  page.Sdc::next(URI.parse(url_for(request.query_parameters.merge(:page => @results.current_page + 1, :lang => nil, :only_path => false)))) if @results.current_page < @results.num_pages
+  page.Sdc::next(URI.parse(url_for(request.query_parameters.merge(:page => @results.current_page + 1, :lang => nil, :only_path => false)))) if @results.current_page < @results.total_pages
 end
 
 i = 0

data/app/views/search_results/sections/_change_note.html.erb

@@ -1,26 +1,26 @@
-<div class="form-group">
-  <label class="col-sm-2 control-label">
+<div class="form-group row">
+  <label class="col-sm-2 col-form-label">
     <%= t('txt.views.search_results.change_note.date') %>
   </label>
 
   <div class="col-sm-10">
     <div class="form-inline">
       <label for="change_note_type" class="sr-only"><%= t('txt.views.search_results.change_note.type') %></label>
-      <%= select_tag :change_note_type, options_for_select([[t('txt.views.search_results.change_note.created'), :created], [t('txt.views.search_results.change_note.modified'), :modified]], params[:change_note_type]), :include_blank => true, class: 'form-control' %>
+      <%= select_tag :change_note_type, options_for_select([[t('txt.views.search_results.change_note.created'), :created], [t('txt.views.search_results.change_note.modified'), :modified]], params[:change_note_type]), :prompt => t('txt.views.search_results.all'), class: 'form-control col-sm-3' %>
 
       <div class="input-group date datepicker">
         <label for="change_note_date_from" class="sr-only"><%= t('txt.views.search_results.change_note.date_from') %></label>
         <%= text_field_tag :change_note_date_from, params[:change_note_date_from], placeholder: 'z.B.: 2010-05-14', class: 'form-control', style: 'border-radius: 4px 0px 0px 4px;' %>
-        <div class="input-group-addon">
-            <i class="fa fa-calendar" aria-hidden="true"></i>
+        <div class="input-group-append">
+          <span class="input-group-text"><i class="fa fa-calendar" aria-hidden="true"></i></span>
         </div>
       </div>
 
       <div class="input-group date datepicker">
-        <label for="change_note_date_from" class="sr-only"><%= t('txt.views.search_results.change_note.date_to') %></label>
+        <label for="change_note_date_to" class="sr-only"><%= t('txt.views.search_results.change_note.date_to') %></label>
         <%= text_field_tag :change_note_date_to, params[:change_note_date_to], placeholder: 'z.B.: 2010-05-14', class: 'form-control', style: 'border-radius: 4px 0px 0px 4px;' %>
-        <div class="input-group-addon">
-            <i class="fa fa-calendar" aria-hidden="true"></i>
+        <div class="input-group-append">
+          <span class="input-group-text"><i class="fa fa-calendar" aria-hidden="true"></i></span>
         </div>
       </div>
     </div>

data/app/views/search_results/sections/_collection.html.erb

@@ -1,5 +1,5 @@
-<div class="form-group result_type_filter">
-  <%= label_tag 'c', Iqvoc::Collection.base_class.model_name.human, :class => 'col-sm-2 control-label' %>
+<div class="form-group row result_type_filter">
+  <%= label_tag 'c', Iqvoc::Collection.base_class.model_name.human, :class => 'col-sm-2 col-form-label' %>
   <div class="col-sm-4">
     <%= select_tag 'c', options_from_collection_for_select(@collections, 'origin', 'status', params[:c]), :class => 'form-control', :prompt => t('txt.views.search_results.all') %>
   </div>

data/app/views/search_results/sections/_datasets.html.erb

@@ -1,17 +1,20 @@
 <% if @datasets.any? %>
-  <div class="form-group">
-    <%= label_tag 'ds', t('txt.views.search_results.datasets'), :class => 'col-sm-2 control-label' %>
+  <div class="form-group row">
+    <%= label_tag 'ds', t('txt.views.search_results.datasets'), :class => 'col-sm-2 col-form-label' %>
     <div class="checkbox-controls col-sm-6">
       <% @datasets.each do |dataset| %>
+      <div class="form-check form-check-inline">
         <label class="checkbox-inline">
-          <%= check_box_tag "ds[]", dataset.name, search_dataset_selected?(dataset.name) %><%= dataset.name %>
+          <%= check_box_tag "ds[]", dataset.name, search_dataset_selected?(dataset.name),  class: 'form-check-input' %>
+          <%= dataset.name %>
         </label>
+      </div>
       <% end %>
-      <div class="btn-group btn-group-xs">
-        <button type="button" class="btn btn-default checkbox-select-all">
+      <div class="btn-group btn-group-sm">
+        <button type="button" class="btn btn-outline-secondary checkbox-select-all">
           <%= t('txt.views.search_results.all') %>
         </button>
-        <button type="button" class="btn btn-default checkbox-select-none">
+        <button type="button" class="btn btn-outline-secondary checkbox-select-none">
           <%= t('txt.views.search_results.none') %>
         </button>
       </div>

data/app/views/search_results/sections/_klass.html.erb

@@ -1,5 +1,5 @@
-<div class="form-group">
-  <%= label_tag 't', t('txt.views.search_results.for'), :class => 'col-sm-2 control-label' %>
+<div class="form-group row">
+  <%= label_tag 't', t('txt.views.search_results.for'), :class => 'col-sm-2 col-form-label' %>
   <div class="col-sm-3">
     <select name="t" id="t" class="search_type form-control">
       <%= options_for_select(Iqvoc.searchable_class_names.map { |klass, identifier|

data/app/views/search_results/sections/_languages.html.erb

@@ -1,16 +1,19 @@
-<div class="form-group">
-  <%= label_tag 'ds', t('txt.views.search_results.language'), :class => 'col-sm-2 control-label' %>
+<div class="form-group row">
+  <%= label_tag 'ds', t('txt.views.search_results.language'), :class => 'col-sm-2 col-form-label' %>
   <div class="checkbox-controls col-sm-4">
     <% @available_languages.sort.each do |lang_tag, label| %>
-      <label for="languages_<%= lang_tag %>" class="checkbox-inline">
-        <%= check_box_tag "l[]", lang_tag, search_language_selected?(lang_tag) %><%= lang_tag %>
-      </label>
+      <div class="form-check form-check-inline">
+        <label for="languages_<%= lang_tag %>" class="form-check-label">
+          <%= check_box_tag "l[]", lang_tag, search_language_selected?(lang_tag), class: 'form-check-input', id: "languages_#{lang_tag}" %>
+          <%= lang_tag %>
+        </label>
+      </div>
     <% end %>
-    <div class="btn-group btn-group-xs">
-      <button type="button" class="btn btn-default checkbox-select-all">
+    <div class="btn-group btn-group-sm">
+      <button type="button" class="btn btn-outline-secondary checkbox-select-all">
         <%= t('txt.views.search_results.all') %>
       </button>
-      <button type="button" class="btn btn-default checkbox-select-none">
+      <button type="button" class="btn btn-outline-secondary checkbox-select-none">
         <%= t('txt.views.search_results.none') %>
       </button>
     </div>

data/app/views/search_results/sections/_mode.html.erb

@@ -1,5 +1,5 @@
-<div class="form-group">
-  <%= label_tag 'qt', t('txt.views.search_results.mode'), :class => 'col-sm-2 control-label' %>
+<div class="form-group row">
+  <%= label_tag 'qt', t('txt.views.search_results.mode'), :class => 'col-sm-2 col-form-label' %>
   <div class="col-sm-3">
     <%= select_tag :qt, options_for_select([
         [t('txt.views.search_results.contains'), 'contains'],

data/app/views/search_results/sections/_note.html.erb

@@ -1,5 +1,5 @@
 <div class="form-group">
-  <%= label_tag nil, t('txt.views.search_results.note'), :class => 'col-sm-2 control-label' %>
+  <%= label_tag nil, t('txt.views.search_results.note'), :class => 'col-sm-2 col-form-label' %>
   <div class="col-sm-4">
     <%= text_field_tag :note, params[:note], :class => 'form-control' %>
   </div>

data/app/views/search_results/sections/_options.html.erb

@@ -0,0 +1,10 @@
+<div class="form-group row result_type_filter">
+  <div class="col-sm-8 offset-sm-2">
+    <div class="form-check form-check-inline">
+      <label for="include_expired" class="form-check-label">
+        <%= check_box_tag :include_expired, true, params[:include_expired] == true, class: 'form-check-input' %>
+        <%= t('txt.views.search_results.expired') %>
+      </label>
+    </div>
+  </div>
+</div>

data/app/views/search_results/sections/_terms.html.erb

@@ -1,13 +1,12 @@
-<div class="form-group has-feedback">
-  <%= label_tag 'q', t('txt.views.search_results.search_term'), :class => 'col-sm-2 control-label' %>
-  <div class="col-sm-4">
-    <% if Iqvoc.searchable_class_names.key(params[:t]).constantize.supports_multi_query? %>
-      <%= text_area_tag :q, params[:query], :class => 'form-control', autofocus: true %>
-    <% else %>
-      <%= text_field_tag :q, params[:query], :class => 'form-control', autofocus: true %>
-      <span class="form-control-feedback" aria-hidden="true">
-        <i class="fa fa-search"></i>
-      </span>
-    <% end %>
+<div class="form-group has-feedback row">
+  <%= label_tag 'q', t('txt.views.search_results.search_term'), :class => 'col-sm-2 col-form-label' %>
+  <div class="col-sm-6">
+    <div class="input-group">
+      <% if Iqvoc.searchable_class_names.key(params[:t]).constantize.supports_multi_query? %>
+        <%= text_area_tag :q, params[:query], :class => 'form-control', autofocus: true %>
+      <% else %>
+        <%= text_field_tag :q, params[:query], :class => 'form-control', autofocus: true, autocomplete: 'off'  %>
+      <% end %>
+      </div>
   </div>
 </div>

data/app/views/search_results/sections/_type.html.erb

@@ -1,21 +1,24 @@
-<div class="form-group result_type_filter">
-  <%= label_tag nil, t('txt.views.search_results.for'), :class => 'col-sm-2 control-label' %>
+<div class="form-group result_type_filter row">
+  <%= label_tag nil, t('txt.views.search_results.in'), :class => 'col-sm-2 col-form-label' %>
   <div class="col-sm-4">
-    <div class="radio-inline">
-      <label for="for_concept">
-        <%= radio_button_tag 'for', 'concept', params[:for] == "concept" %> <%= Iqvoc::Concept.base_class.model_name.human(:count => 2) %>
+    <div class="form-check">
+      <%= radio_button_tag 'for', 'concept', params[:for] == "concept", class: 'form-check-input' %>
+      <label for="for_concept" class="form-check-label">
+        <%= Iqvoc::Concept.base_class.model_name.human(:count => 2) %>
       </label>
     </div>
 
-    <div class="radio-inline">
-      <label for="for_collection">
-        <%= radio_button_tag 'for', 'collection', params[:for] == "collection" %> <%= Iqvoc::Collection.base_class.model_name.human(:count => 2) %>
+    <div class="form-check">
+      <%= radio_button_tag 'for', 'collection', params[:for] == "collection", class: 'form-check-input' %>
+      <label for="for_collection" class="form-check-label">
+        <%= Iqvoc::Collection.base_class.model_name.human(:count => 2) %>
       </label>
     </div>
 
-    <div class="radio-inline">
-      <label for="for_all">
-        <%= radio_button_tag 'for', 'all', !%w(concept collection).include?(params[:for]) %> <%= t("txt.views.search_results.all") %>
+    <div class="form-check">
+      <%= radio_button_tag 'for', 'all', !%w(concept collection).include?(params[:for]), class: 'form-check-input' %>
+      <label for="for_all" class="form-check-label">
+        <%= t("txt.views.search_results.all") %>
       </label>
     </div>
   </div>

data/app/views/triplestore_sync/index.html.erb

@@ -6,7 +6,7 @@
 <% end %>
 
 <% @candidates.each do |records| %>
-  <% klass = records.table.engine %>
+  <% klass = records.klass %>
   <h3><%= klass.model_name.human(:count => 2) %></h3>
   <ul>
     <% records.each do |record| %>

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

@@ -7,13 +7,15 @@
   <%= f.password_field :password_confirmation %>
   <% if can?(:manage, User) %>
     <%= f.select :role, User::ROLES.map { |r| [r.humanize, r] } %>
+    <%= f.text_area :comment, rows: 4 %>
     <%= f.form_group do %>
       <%= f.check_box :active, :label => User.human_attribute_name(:active) %>
     <% end %>
   <% end %>
 
   <hr />
-  <div class="well">
+  <div class="mb-5">
     <%= submit_tag t('txt.common.save'), :class => 'btn btn-primary' %>
+    <%= link_to t("txt.common.cancel"), users_path, :class => "btn btn-outline-secondary" %>
   </div>
 <% end %>