iqvoc 4.12.1 → 4.13.0

data/app/views/errors/access_denied.html.erb

@@ -1,6 +1,21 @@
-<h2><%= t("txt.views.errors.access_denied.header") %></h2>
+<div class="row">
 
-<p><%= t("txt.views.errors.access_denied.message") %></p>
+  <div class="col-md-6">
+    <h1 class="display-4 mb-3"><%= t('txt.common.ops') %></h1>
+
+    <h2 class="mt-3 mb-3"><%= t('txt.views.errors.access_denied.message') %></h2>
+    <h5 class="mb-3"><%= t('txt.views.errors.common.error_code') %> <%= @status %></h5>
+
+    <p><%= t('txt.views.errors.common.helpful_links') %></p>
+    <ul>
+      <li><%= link_to t('txt.views.navigation.home'), root_path %></li>
+      <% if can? :use, :dashboard %>
+      <li><%= link_to t('txt.views.navigation.dashboard'), dashboard_path %></li>
+      <% end %>
+      <li><%= link_to t('txt.views.navigation.search'), search_path %></li>
+    </ul>
+  </div>
+</div>
 
 <% if @status == 401 %>
   <%= render "user_sessions/form", :user_session => @user_session %>

data/app/views/errors/not_found.html.erb

@@ -1,5 +1,19 @@
-<h1><%= t("txt.views.errors.not_found.header") %></h1>
+<div class="row">
 
-<p><em><%= @exception.message %></em></p>
+  <div class="col-md-6">
+    <h1 class="display-4 mb-3"><%= t('txt.common.ops') %></h1>
 
-<p><%= raw t("txt.views.errors.not_found.tip", :link => link_to(t("txt.views.navigation.search"), search_path)) %></p>
+    <h2 class="mt-3 mb-3"><%= t('txt.views.errors.not_found.message') %></h2>
+    <h5 class="mb-3"><%= t('txt.views.errors.common.error_code') %> 404</h5>
+
+    <p><%= t('txt.views.errors.common.helpful_links') %></p>
+    <ul>
+      <li><%= link_to t('txt.views.navigation.home'), root_path %></li>
+      <% if can? :use, :dashboard %>
+      <li><%= link_to t('txt.views.navigation.dashboard'), dashboard_path %></li>
+      <% end %>
+      <li><%= link_to t('txt.views.navigation.search'), search_path %></li>
+    </ul>
+  </div>
+
+</div>

data/app/views/errors/server_error.html.erb

@@ -0,0 +1,38 @@
+<div class="row">
+
+  <div class="col-md-6">
+    <h1 class="display-4 mb-3"><%= t('txt.common.ops') %></h1>
+
+    <h2 class="mt-3 mb-3"><%= t('txt.views.errors.server_error.message') %></h2>
+    <h5 class="mb-3"><%= t('txt.views.errors.common.error_code') %> 500</h5>
+
+    <p><%= t('txt.views.errors.common.helpful_links') %></p>
+    <ul>
+      <li><%= link_to t('txt.views.navigation.home'), root_path %></li>
+      <% if can? :use, :dashboard %>
+      <li><%= link_to t('txt.views.navigation.dashboard'), dashboard_path %></li>
+      <% end %>
+      <li><%= link_to t('txt.views.navigation.search'), search_path %></li>
+    </ul>
+  </div>
+
+</div>
+
+<% if can? :see, :exception %>
+<%# only show error details for known, persisted users %>
+<div class="card">
+  <h5 class="card-header">
+    <%= t("txt.views.errors.common.error_message") %>
+  </h5>
+  <div class="card-body">
+    <h5 class="card-title">
+      <%= @exception.message %>
+    </h5>
+
+    <h6><%= @exception.class.name %></h6>
+    <pre>
+    <%= highlight @exception.backtrace.join("\n"), /#{Regexp.escape(Rails.root.to_s.force_encoding('utf-8'))}.*/ %>
+    </pre>
+  </div>
+</div>
+<% end %>

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

@@ -1,11 +1,32 @@
 <%= render 'title' %>
+
 <div class="onebox">
-  <%= form_tag search_path(:q => nil), :method => :get, :class => "onebox-form" do %>
+  <%= form_tag search_path(:q => nil), method: :get, class: 'onebox-form col-8 pl-0 pr-0' do %>
     <div class="onebox-input-wrapper">
-      <%= search_field_tag "q", nil, :id => nil,
-        :class => "form-control onebox-input",
-        :autofocus => true,
-        :placeholder => t("txt.views.frontpage.type_to_browse") %>
-  </div>
-<% end %>
+      <simplete-form min-length="2" query-delay="300">
+        <label for="query" class="sr-only">Suche</label>
+        <div class="form-control-with-icon-end">
+          <%= search_field_tag 'q', nil, id: 'search', class: 'form-control',
+            autofocus: true,
+            autocomplete: 'off',
+            placeholder: t('txt.views.frontpage.type_to_browse') %>
+          <%= hidden_field_tag :for, 'concept' %>
+          <div id="loading" class="spinner-border spinner-border-sm" role="status">
+            <span class="sr-only">Loading...</span>
+          </div>
+        </div>
+      </simplete-form>
+    </div>
+  <% end %>
+</div>
+
+<% if @recent_concepts.any? %>
+<div class="mt-5 text-center">
+  <p><%= t('txt.views.frontpage.recent_concepts') %></p>
+  <ul class="list-inline">
+    <% @recent_concepts.each do |c| %>
+      <li class="list-inline-item"><%= link_to c.pref_label, concept_path(c) %></li>
+    <% end %>
+  </ul>
 </div>
+<% end %>

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

@@ -1,12 +1,12 @@
 <%= page_header :title => t("txt.views.instance_configuration.caption").titleize %>
 
-<%= form_tag(instance_configuration_path, :method => :patch, :class => "form-horizontal") do %>
+<%= form_tag(instance_configuration_path, :method => :patch) do %>
   <% @settings_by_namespace.each do |namespace, settings| %>
     <fieldset>
       <legend><%= t("txt.views.instance_configuration.groups.#{namespace}").titleize %></legend>
       <% settings.each do |key, value| %>
-        <div class="form-group">
-            <label class="control-label col-sm-4">
+        <div class="form-group row">
+            <label class="col-form-label col-sm-4">
               <%= t("txt.views.instance_configuration.settings.#{key.gsub(".", "_")}") %>
             </label>
             <div class="col-sm-8">
@@ -17,7 +17,7 @@
     </fieldset>
   <% end %>
   <hr />
-  <div class="well">
+  <div class="mb-5">
     <%= submit_tag t("txt.common.save"), :class => "btn btn-primary" %>
   </div>
 <% end %>

data/app/views/kaminari/_first_page.html.erb

@@ -0,0 +1,13 @@
+<%# Link to the "First" page
+  - available local variables
+    url:           url to the first page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<% unless current_page.first? %>
+<li class="page-item">
+  <%= link_to raw(t 'views.pagination.first'), url, :class => 'page-link', :remote => remote %>
+</li>
+<% end %>

data/app/views/kaminari/_gap.html.erb

@@ -0,0 +1,10 @@
+<%# Non-link tag that stands for skipped pages...
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="page-item disabled">
+  <span class="page-link"><%= raw(t 'views.pagination.truncate') %></span>
+</li>

data/app/views/kaminari/_last_page.html.erb

@@ -0,0 +1,13 @@
+<%# Link to the "Last" page
+  - available local variables
+    url:           url to the last page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<% unless current_page.last? %>
+<li class="page-item">
+  <%= link_to raw(t 'views.pagination.last'), url, :class => 'page-link', :remote => remote %>
+</li>
+<% end %>

data/app/views/kaminari/_next_page.html.erb

@@ -0,0 +1,13 @@
+<%# Link to the "Next" page
+  - available local variables
+    url:           url to the next page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<% unless current_page.last? %>
+<li class="page-item">
+  <%= link_to raw(t 'views.pagination.next'), url, :rel => 'next', :class => 'page-link', :remote => remote %>
+</li>
+<% end %>

data/app/views/kaminari/_page.html.erb

@@ -0,0 +1,18 @@
+<%# Link showing page number
+  - available local variables
+    page:          a page object for "this" page
+    url:           url to this page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<% if page.current? %>
+<li class="page-item active">
+  <%= link_to page, url, opts = {:remote => remote, :class => 'page-link', :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+</li>
+<% else %>
+<li class="page-item">
+  <%= link_to page, url, opts = {:remote => remote, :class => 'page-link', :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+</li>
+<% end %>

data/app/views/kaminari/_paginator.html.erb

@@ -0,0 +1,25 @@
+<%# The container tag
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+    paginator:     the paginator that renders the pagination tags inside
+-%>
+<%= paginator.render do -%>
+  <nav>
+    <ul class="pagination">
+    <%= first_page_tag unless current_page.first? %>
+    <%= prev_page_tag unless current_page.first? %>
+    <% each_page do |page| -%>
+      <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
+        <%= page_tag page %>
+      <% elsif !page.was_truncated? -%>
+        <%= gap_tag %>
+      <% end -%>
+    <% end -%>
+    <%= next_page_tag unless current_page.last? %>
+    <%= last_page_tag unless current_page.last? %>
+    </ul>
+  </nav>
+<% end -%>

data/app/views/kaminari/_prev_page.html.erb

@@ -0,0 +1,13 @@
+<%# Link to the "Previous" page
+  - available local variables
+    url:           url to the previous page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<% unless current_page.first? %>
+<li class="page-item">
+  <%= link_to raw(t 'views.pagination.previous'), url, :rel => 'prev', :class => 'page-link', :remote => remote %>
+</li>
+<% end %>

data/app/views/layouts/_controls.html.erb

@@ -1,41 +1,44 @@
-<ul class="nav navbar-nav navbar-right">
-  <li class="divider-vertical"></li>
-  <li id="language_selection" class="dropdown">
-    <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+<ul class="nav navbar-nav ml-auto">
+  <li id="language_selection" class="nav-item dropdown">
+    <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
       <%= t("txt.views.lang_widget.caption") %>
-      <i class="fa fa-angle-down"></i>
     </a>
 
     <ul class="lang-widget dropdown-menu">
       <%- if Iqvoc::Concept.pref_labeling_languages.reject(&:nil?).any? -%>
-        <li class="lang-widget-header"><h2><%= t("txt.views.lang_widget.primary") %></h2></li>
+        <li class="lang-widget-header">
+          <h2><%= t("txt.views.lang_widget.primary") %></h2>
+        </li>
         <% Iqvoc::Concept.pref_labeling_languages.each do |lang| %>
           <li class="lang-widget-item">
-          <%= link_to t("languages.#{lang.presence || "-"}", :default => lang.presence || "-"), params.merge(:lang => lang || "none"),
-              :class => ("current" if lang == I18n.locale.to_s) %>
+            <%= link_to t("languages.#{lang.presence || "-"}", default: lang.presence || "-"), url_for(lang: lang || "none"), class: ("active" if lang == I18n.locale.to_s) %>
           </li>
-    <% end %>
-  <% end %>
+        <% end %>
+      <% end %>
 
-  <% secondary_languages = Iqvoc.all_languages.reject { |lang| lang == I18n.locale.to_s } %>
-  <% if secondary_languages.any? %>
-    <li class="lang-widget-header"><h2><%= t("txt.views.lang_widget.secondary") %></h2></li>
-    <% secondary_languages.each do |lang| %>
-      <li class="lang-widget-item">
-        <label>
-          <input type="checkbox" value="<%= lang %>"> <%= t("languages.#{lang.presence || "-"}", :default => lang.presence || "-") %>
-        </label>
-      </li>
-    <% end %>
-  <% end %>
-</ul>
-</li>
+      <% secondary_languages = Iqvoc.all_languages.reject { |lang| lang == I18n.locale.to_s } %>
+        <% if secondary_languages.any? %>
+          <div class="dropdown-divider"></div>
+
+          <li class="lang-widget-header">
+            <h2><%= t("txt.views.lang_widget.secondary") %></h2>
+          </li>
+          <% secondary_languages.each do |lang| %>
+            <li class="lang-widget-item">
+            <label>
+              <input type="checkbox" value="<%= lang %>"> <%= t("languages.#{lang.presence || "-"}", :default => lang.presence || "-") %>
+            </label>
+            </li>
+          <% end %>
+        <% end %>
+    </ul>
+  </li>
 
-<% if current_user %>
-  <%= render "layouts/user_navigation" %>
-<% else %>
+  <% if current_user %>
+    <%= render "layouts/user_navigation" %>
+  <% else %>
   <li>
-    <%= link_to t("txt.views.layouts.application.login"), new_user_session_path(:back_to => @return_url) %>
+    <%= link_to t("txt.views.layouts.application.login"), new_user_session_path(:back_to => @return_url), class: 'nav-link' %>
   </li>
 <% end %>
 </ul>

data/app/views/layouts/_navigation.html.erb

@@ -1,19 +1,19 @@
-<nav class="navbar navbar-default navbar-fixed-top">
-  <div class="container">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-        <span class="sr-only">Toggle navigation</span>
-        <i class="fa fa-bars"></i> <%= t('txt.common.menu') %>
-      </button>
+<header>
+  <nav class="navbar navbar-expand-lg navbar-light bg-light fixed-top">
+    <div class="container">
       <%= link_to Iqvoc.config["title"], localized_root_path, class: 'navbar-brand' %>
-    </div>
 
-    <div id="navbar" class="navbar-collapse collapse">
-      <ul class="nav navbar-nav">
-        <%= nav_items Iqvoc.navigation_items %>
-      </ul>
+      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span> <%= t('txt.common.menu') %>
+      </button>
+
+      <div class="collapse navbar-collapse" id="navbarNav">
+        <ul class="navbar-nav">
+          <%= nav_items Iqvoc.navigation_items %>
+        </ul>
 
-      <%= render "layouts/controls" %>
+        <%= render "layouts/controls" %>
+      </div>
     </div>
-  </div>
-</nav>
+  </nav>
+</header>

data/app/views/layouts/_sections.html.erb

@@ -1,7 +1,9 @@
 <div class="tabbable">
   <ul class="nav nav-tabs sections">
   <%- sections.select { |s| data[s] }.each_with_index do |section_key, index| -%>
-    <li id="tab-<%= section_key %>" class="<%= "active" if index == 0 %>"><a href="#<%= section_key %>" data-toggle="tab"><%= t("txt.views.layouts.sections.#{section_key}", :default => section_key.humanize) %></a></li>
+    <li id="tab-<%= section_key %>" class="nav-item">
+      <a href="#<%= section_key %>" class="nav-link<%= " active" if index == 0 %>" data-toggle="tab"><%= t("txt.views.layouts.sections.#{section_key}", :default => section_key.humanize) %></a>
+    </li>
   <%- end -%>
   </ul>
   <div class="tab-panels">

data/app/views/layouts/_user_navigation.html.erb

@@ -1,62 +1,52 @@
-<li class="dropdown">
-  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+<li class="nav-item dropdown">
+  <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
     <%= current_user.initials %>
-    <i class="fa fa-angle-down"></i>
   </a>
-  <ul class="user-widget dropdown-menu">
-    <li class="user-widget-header">
+  <div class="user-widget dropdown-menu dropdown-menu-right">
+    <div class="user-widget-header">
       <b class="fullname"><%= current_user.name %></b>
       <div class="email"><%= current_user.email %></div>
-    </li>
+    </div>
 
-    <li role="separator" class="divider"></li>
+    <div class="dropdown-divider"></div>
 
-    <li class="user-widget-item<%= ' active' if current_page? edit_user_path(current_user) %>">
-      <%= link_to t("txt.views.layouts.application.profile"), edit_user_path(current_user) %>
-    </li>
+    <% css_class = (current_page? edit_user_path(current_user)) ? 'dropdown-item active' : 'dropdown-item'  %>
+    <%= link_to t("txt.views.layouts.application.profile"), edit_user_path(current_user), class: css_class %>
 
     <% if can? :use, :administration %>
-    <li role="separator" class="divider"></li>
+      <div class="dropdown-divider"></div>
       <% if can? :manage, User %>
-        <li class="user-widget-item<%= ' active' if current_page? users_path %>">
-          <%= link_to t("txt.views.navigation.users"), users_path %>
-        </li>
+        <% css_class = (current_page? users_path) ? 'dropdown-item active' : 'dropdown-item'  %>
+        <%= link_to t("txt.views.navigation.users"), users_path, class: css_class %>
       <% end %>
 
       <% if can? :manage, Iqvoc.config %>
-        <li class="user-widget-item<%= ' active' if current_page? instance_configuration_path %>">
-          <%= link_to t("txt.views.navigation.instance_configuration"), instance_configuration_path %>
-        </li>
+        <% css_class = (current_page? instance_configuration_path) ? 'dropdown-item active' : 'dropdown-item'  %>
+        <%= link_to t("txt.views.navigation.instance_configuration"), instance_configuration_path, class: css_class %>
       <% end %>
 
       <% if can? :import, Concept::Base %>
-        <li class="user-widget-item<%= ' active' if current_page? imports_path %>">
-          <%= link_to t("txt.views.navigation.import"), imports_path %>
-        </li>
+        <% css_class = (current_page? imports_path) ? 'dropdown-item active' : 'dropdown-item'  %>
+        <%= link_to t("txt.views.navigation.import"), imports_path, class: css_class %>
       <% end %>
 
       <% if can? :export, Concept::Base %>
-        <li class="user-widget-item<%= ' active' if current_page? exports_path %>">
-          <%= link_to t("txt.views.navigation.export"), exports_path %>
-        </li>
+        <% css_class = (current_page? exports_path) ? 'dropdown-item active' : 'dropdown-item'  %>
+        <%= link_to t("txt.views.navigation.export"), exports_path, class: css_class %>
       <% end %>
 
       <% if can? :sync, :triplestore %>
-        <li class="user-widget-item<%= ' active' if current_page? triplestore_sync_path %>">
-          <%= link_to t("txt.views.navigation.sync"), triplestore_sync_path %>
-        </li>
+        <% css_class = (current_page? triplestore_sync_path) ? 'dropdown-item active' : 'dropdown-item'  %>
+        <%= link_to t("txt.views.navigation.sync"), triplestore_sync_path, class: css_class %>
       <% end %>
 
       <% if can? :reset, :thesaurus %>
-        <li class="user-widget-item<%= ' active' if current_page? reset_path %>">
-          <%= link_to t("txt.views.navigation.reset"), reset_path %>
-        </li>
+        <% css_class = (current_page? reset_path) ? 'dropdown-item active' : 'dropdown-item'  %>
+        <%= link_to t("txt.views.navigation.reset"), reset_path, class: css_class %>
       <% end %>
     <% end %>
 
-    <li role="separator" class="divider"></li>
-    <li class="user-widget-item">
-      <%= link_to t("txt.views.layouts.application.logout"), user_session_path,  method: :delete, class: 'logout' %>
-    </li>
-  </ul>
+    <div class="dropdown-divider"></div>
+    <%= link_to t("txt.views.layouts.application.logout"), user_session_path,  method: :delete, class: 'dropdown-item logout' %>
+  </div>
 </li>

data/app/views/layouts/application.html.erb

@@ -1,50 +1,50 @@
 <!DOCTYPE html>
 <html lang="<%= I18n.locale %>">
-<head>
-<meta charset="utf-8">
-<%= csrf_meta_tag %>
-<title><%= page_title %></title>
-<!-- HTML5 shim, for IE6-8 support of HTML elements -->
-<!--[if lt IE 9]>
-  <%= javascript_include_tag "html5shiv/dist/html5shiv" %>
-<![endif]-->
-<%= stylesheet_link_tag "manifest" %>
-<!--[if lte IE 8]>
-<%= stylesheet_link_tag "iqvoc/ie_fixes" %>
-<![endif]-->
-<%= yield :head %>
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-</head>
+  <head>
+    <title><%= page_title %></title>
+    <%= csrf_meta_tag %>
 
-<% if @datasets %> <%# XXX: special-casing matches federation %>
-<body data-datasets="<%= @datasets %>"
-    data-remote-label-path="<%= remote_label_path(:lang => nil, :format => :json) %>">
-<% else %>
-<body>
-<% end %>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta charset="utf-8">
 
-<%= render 'layouts/modals' %>
-<%= render 'layouts/navigation' %>
+    <%= stylesheet_link_tag "manifest" %>
+    <%= yield :head %>
+  </head>
 
-<div class="container">
-  <div class="row">
-    <div class="<%= content_for?(:sidebar) ? "col-md-9" : "col-md-12" %>" id="content">
-      <%= yield :page_header %>
-      <% flash.each do |type, messages| %>
-        <% Array.wrap(messages).each do |msg| %>
-          <%= alert(type) { msg } %>
+  <% if @datasets %> <%# XXX: special-casing matches federation %>
+  <body data-datasets="<%= @datasets %>" data-remote-label-path="<%= remote_label_path(lang: nil, format: :json) %>">
+  <% else %>
+  <body>
+  <% end %>
+
+  <%= render 'layouts/modals' %>
+  <%= render 'layouts/navigation' %>
+
+  <main class="container">
+    <div class="row">
+      <div class="<%= content_for?(:sidebar) ? "col-md-9" : "col-md-12" %>" id="content">
+        <%= yield :page_header %>
+        <% flash.each do |type, messages| %>
+          <% Array.wrap(messages).each do |msg| %>
+            <%= alert(type) { msg } %>
+          <% end %>
         <% end %>
+        <%= yield %>
+      </div>
+      <% if content_for?(:sidebar) %>
+      <div class="col-md-3">
+        <div id="sidebar">
+          <%= yield :sidebar %>
+        </div>
+      </div>
       <% end %>
-      <%= yield %>
-    </div>
-    <% if content_for?(:sidebar) %>
-    <div class="col-md-3" id="sidebar">
-      <%= yield :sidebar %>
     </div>
-    <% end %>
-  </div>
-</div>
-<%= javascript_include_tag "manifest" %>
-<%= yield :scripts %>
-</body>
+  </main>
+
+  <%= javascript_include_tag "jquery.js" %>
+  <%= javascript_include_tag "bootstrap.bundle.min.js" %>
+  <%= javascript_include_tag "manifest.js" %>
+  <%= yield :scripts %>
+
+  </body>
 </html>

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

@@ -56,31 +56,31 @@
 
   <legend>Matches</legend>
   <div class="form-group" style="display: none;">
-    <label class="col-sm-2 control-label" for="concept[inline_match_skos_close_matches]">Close Matches</label>
+    <label class="col-sm-2 col-form-label" for="concept[inline_match_skos_close_matches]">Close Matches</label>
     <div class="col-sm-10">
       <textarea name="concept[inline_match_skos_close_matches]" id="concept_inline_match_skos_close_matches" class="form-control" rows="4"></textarea>
     </div>
   </div>
   <div class="form-group" style="display: none;">
-    <label class="col-sm-2 control-label" for="concept[inline_match_skos_exact_matches]">Exact Matches</label>
+    <label class="col-sm-2 col-form-label" for="concept[inline_match_skos_exact_matches]">Exact Matches</label>
     <div class="col-sm-10">
       <textarea name="concept[inline_match_skos_exact_matches]" id="concept_inline_match_skos_exact_matches" class="form-control" rows="4"></textarea>
     </div>
   </div>
   <div class="form-group" style="display: none;">
-    <label class="col-sm-2 control-label" for="concept[inline_match_skos_related_matches]">Related Matches</label>
+    <label class="col-sm-2 col-form-label" for="concept[inline_match_skos_related_matches]">Related Matches</label>
     <div class="col-sm-10">
       <textarea name="concept[inline_match_skos_related_matches]" id="concept_inline_match_skos_related_matches" class="form-control" rows="4"></textarea>
     </div>
   </div>
   <div class="form-group" style="display: none;">
-    <label class="col-sm-2 control-label" for="concept[inline_match_skos_broad_matches]">Broader Matches</label>
+    <label class="col-sm-2 col-form-label" for="concept[inline_match_skos_broad_matches]">Broader Matches</label>
     <div class="col-sm-10">
       <textarea name="concept[inline_match_skos_broad_matches]" id="concept_inline_match_skos_broad_matches" class="form-control" rows="4"></textarea>
     </div>
   </div>
   <div class="form-group" style="display: none;">
-    <label class="col-sm-2 control-label" for="concept[inline_match_skos_narrow_matches]">Narrower Matches</label>
+    <label class="col-sm-2 col-form-label" for="concept[inline_match_skos_narrow_matches]">Narrower Matches</label>
     <div class="col-sm-10">
       <textarea name="concept[inline_match_skos_narrow_matches]" id="concept_inline_match_skos_narrow_matches" class="form-control" rows="4"></textarea>
     </div>