iqvoc 4.12.1 → 4.13.0

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

@@ -1,79 +1,79 @@
 @font-face {
   font-family: 'Fira Sans Light SC';
-  src: font-url('FiraSans-Light-SC.eot');
-  src: font-url('FiraSans-Light-SC.eot') format('embedded-opentype'),
-  font-url('FiraSans-Light-SC.woff2') format('woff2'),
-  font-url('FiraSans-Light-SC.woff') format('woff'),
-  font-url('FiraSans-Light-SC.ttf') format('truetype');
+  src: asset-url('FiraSans-Light-SC.eot');
+  src: asset-url('FiraSans-Light-SC.eot') format('embedded-opentype'),
+  asset-url('FiraSans-Light-SC.woff2') format('woff2'),
+  asset-url('FiraSans-Light-SC.woff') format('woff'),
+  asset-url('FiraSans-Light-SC.ttf') format('truetype');
   font-style: normal;
 }
 
 @font-face {
   font-family: 'Fira Sans ExtraLight';
-  src: font-url('FiraSans-ExtraLight.eot');
-  src: font-url('FiraSans-ExtraLight.eot') format('embedded-opentype'),
-  font-url('FiraSans-ExtraLight.woff') format('woff'),
-  font-url('FiraSans-ExtraLight.ttf') format('truetype');
+  src: asset-url('FiraSans-ExtraLight.eot');
+  src: asset-url('FiraSans-ExtraLight.eot') format('embedded-opentype'),
+  asset-url('FiraSans-ExtraLight.woff') format('woff'),
+  asset-url('FiraSans-ExtraLight.ttf') format('truetype');
   font-style: normal;
 }
 
 @font-face {
   font-family: 'Fira Sans Regular';
-  src: font-url('FiraSans-Regular.eot');
-  src: font-url('FiraSans-Regular.eot') format('embedded-opentype'),
-  font-url('FiraSans-Regular.woff') format('woff'),
-  font-url('FiraSans-Regular.ttf') format('truetype');
+  src: asset-url('FiraSans-Regular.eot');
+  src: asset-url('FiraSans-Regular.eot') format('embedded-opentype'),
+  asset-url('FiraSans-Regular.woff') format('woff'),
+  asset-url('FiraSans-Regular.ttf') format('truetype');
   font-weight: 400;
   font-style: normal;
 }
 
 @font-face {
   font-family: 'Fira Sans Regular Italic';
-  src: font-url('FiraSans-Italic.eot');
-  src: font-url('FiraSans-Italic.eot') format('embedded-opentype'),
-  font-url('FiraSans-Italic.woff') format('woff'),
-  font-url('FiraSans-Italic.ttf') format('truetype');
+  src: asset-url('FiraSans-Italic.eot');
+  src: asset-url('FiraSans-Italic.eot') format('embedded-opentype'),
+  asset-url('FiraSans-Italic.woff') format('woff'),
+  asset-url('FiraSans-Italic.ttf') format('truetype');
   font-weight: 400;
   font-style: italic;
 }
 
 @font-face {
   font-family: 'Fira Sans Bold';
-  src: font-url('FiraSans-Bold.eot');
-  src: font-url('FiraSans-Bold.eot') format('embedded-opentype'),
-  font-url('FiraSans-Bold.woff') format('woff'),
-  font-url('FiraSans-Bold.ttf') format('truetype');
+  src: asset-url('FiraSans-Bold.eot');
+  src: asset-url('FiraSans-Bold.eot') format('embedded-opentype'),
+  asset-url('FiraSans-Bold.woff') format('woff'),
+  asset-url('FiraSans-Bold.ttf') format('truetype');
   font-weight: 700;
   font-style: normal;
 }
 
 @font-face {
   font-family: 'Fira Sans Bold Italic';
-  src: font-url('FiraSans-BoldItalic.eot');
-  src: font-url('FiraSans-BoldItalic.eot') format('embedded-opentype'),
-  font-url('FiraSans-BoldItalic.woff') format('woff'),
-  font-url('FiraSans-BoldItalic.ttf') format('truetype');
+  src: asset-url('FiraSans-BoldItalic.eot');
+  src: asset-url('FiraSans-BoldItalic.eot') format('embedded-opentype'),
+  asset-url('FiraSans-BoldItalic.woff') format('woff'),
+  asset-url('FiraSans-BoldItalic.ttf') format('truetype');
   font-weight: 700;
   font-style: italic;
 }
 
 @font-face {
   font-family: 'Fira Mono Regular';
-  src: font-url('FiraMono-Regular.eot');
-  src: font-url('FiraMono-Regular.eot') format('embedded-opentype'),
-  font-url('FiraMono-Regular.woff') format('woff'),
-  font-url('FiraMono-Regular.ttf') format('truetype');
+  src: asset-url('FiraMono-Regular.eot');
+  src: asset-url('FiraMono-Regular.eot') format('embedded-opentype'),
+  asset-url('FiraMono-Regular.woff') format('woff'),
+  asset-url('FiraMono-Regular.ttf') format('truetype');
   font-weight: 400;
   font-style: normal;
 }
 
-/* @font-face {
+@font-face {
   font-family: 'Fira Sans Light';
-  src: font-url('FiraSans-Light.eot');
+  src: asset-url('FiraSans-Light.eot');
   src: local('Fira Sans Light'),
-  font-url('FiraSans-Light.eot') format('embedded-opentype'),
-  font-url('FiraSans-Light.woff') format('woff'),
-  font-url('FiraSans-Light.ttf') format('truetype');
+  asset-url('FiraSans-Light.eot') format('embedded-opentype'),
+  asset-url('FiraSans-Light.woff') format('woff'),
+  asset-url('FiraSans-Light.ttf') format('truetype');
   font-weight: 300;
   font-style: normal;
-} */
+}

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

@@ -0,0 +1,4 @@
+@import 'mixins';
+@import 'fonts';
+@import 'bootstrap-variables';
+@import 'variables';

data/app/assets/stylesheets/iqvoc/{mixins → settings}/_mixins.scss

@@ -8,6 +8,10 @@
   font-weight: 700;
 }
 
+%font-light {
+  font-family: 'Fira Sans Light';
+}
+
 @mixin transitional($property: all, $duration: .25s) {
   transition: $property $duration ease-in-out;
 }

data/app/assets/stylesheets/{manifest.css.scss → manifest.scss}

@@ -1,3 +1,3 @@
-@import 'iqvoc/settings/bootstrap-variables';
+@import 'iqvoc/settings/manifest';
 @import 'framework';
 @import 'iqvoc/manifest';

data/app/controllers/collections_controller.rb

@@ -35,12 +35,15 @@ class CollectionsController < ApplicationController
         response = if params[:root].present?
           collections = Iqvoc::Collection.base_class.with_pref_labels.published.by_parent_id(params[:root])
           collections.map do |collection|
-            { id: collection.id,
+            res = {
+              id: collection.id,
               url: collection_path(id: collection, format: :html),
               name: CGI.escapeHTML(collection.pref_label.to_s),
-              load_on_demand: collection.subcollections.any?,
-              additionalText: " (#{collection.additional_info})"
+              load_on_demand: collection.subcollections.any?
             }
+            res[:additionalText] = " (#{collection.additional_info})" if collection.additional_info
+
+            res
           end
         else
           collections = Iqvoc::Collection.base_class.with_pref_labels.published.merge(Label::Base.by_query_value("#{params[:query]}%"))

data/app/controllers/concepts/alphabetical_controller.rb

@@ -33,17 +33,19 @@ class Concepts::AlphabeticalController < ConceptsController
       @search_results = dataset.alphabetical_search(query, I18n.locale) || []
       @search_results = Kaminari.paginate_array(@search_results).page(params[:page])
     else
-      @search_results = find_labelings
-
       # When in single query mode, AR handles ALL includes to be loaded by that
       # one query. We don't want that! So let's do it manually :-)
       includes = Iqvoc::Concept.base_class.default_includes
       if Iqvoc::Concept.note_classes.include?(Note::SKOS::Definition)
         includes << Note::SKOS::Definition.name.to_relation_name
       end
-      ActiveRecord::Associations::Preloader.new.preload(@search_results, owner: includes)
 
-      @search_results.to_a.map! { |pl| AlphabeticalSearchResult.new(pl) }
+      search_results_size = find_labelings.count
+      search_results = find_labelings.page(params[:page])
+      ActiveRecord::Associations::Preloader.new.preload(search_results, owner: includes)
+
+      @search_results = search_results.to_a.map { |pl| AlphabeticalSearchResult.new(pl) }
+      @search_results = Kaminari.paginate_array(@search_results, total_count: search_results_size).page(params[:page])
     end
 
     respond_to do |format|
@@ -58,18 +60,18 @@ class Concepts::AlphabeticalController < ConceptsController
   end
 
   def find_labelings
-    query = (params[:prefix] || @letters.first || 'a').mb_chars.downcase.to_s
+    letter = (@letters.include?('A')) ? 'a' : @letters.first
+    query = (params[:prefix] || letter).mb_chars.downcase.to_s
 
-    Iqvoc::Concept.pref_labeling_class.
-      concept_published.
-      concept_not_expired.
-      label_begins_with(query).
-      by_label_language(I18n.locale).
-      includes(:target).
-      order("LOWER(#{Label::Base.table_name}.value)").
-      joins(:owner).
-      where(concepts: { type: Iqvoc::Concept.base_class_name }).
-      references(:concepts, :labels, :labelings).
-      page(params[:page])
+    Iqvoc::Concept.pref_labeling_class
+      .concept_published
+      .concept_not_expired
+      .label_begins_with(query)
+      .by_label_language(I18n.locale)
+      .includes(:target)
+      .order(Arel.sql("LOWER(#{Label::Base.table_name}.value)"))
+      .joins(:owner)
+      .where(concepts: { type: Iqvoc::Concept.base_class_name })
+      .references(:concepts, :labels, :labelings)
   end
 end

data/app/controllers/concepts/expired_controller.rb

@@ -24,15 +24,14 @@ class Concepts::ExpiredController < Concepts::AlphabeticalController
   def find_labelings
     query = (params[:prefix] || @letters.first || 'a').mb_chars.downcase.to_s
 
-    Iqvoc::Concept.pref_labeling_class.
-      concept_expired.
-      label_begins_with(query).
-      by_label_language(I18n.locale).
-      includes(:target).
-      order("LOWER(#{Label::Base.table_name}.value)").
-      joins(:owner).
-      where(concepts: { type: Iqvoc::Concept.base_class_name }).
-      references(:concepts, :labels, :labelings).
-      page(params[:page])
+    Iqvoc::Concept.pref_labeling_class
+      .concept_expired
+      .label_begins_with(query)
+      .by_label_language(I18n.locale)
+      .includes(:target)
+      .order(Arel.sql("LOWER(#{Label::Base.table_name}.value)"))
+      .joins(:owner)
+      .where(concepts: { type: Iqvoc::Concept.base_class_name })
+      .references(:concepts, :labels, :labelings)
   end
 end

data/app/controllers/concepts/hierarchical_controller.rb

@@ -22,7 +22,7 @@ class Concepts::HierarchicalController < ConceptsController
       authorize! :read, Iqvoc::Concept.base_class
     end
 
-    scope = Iqvoc::Concept.base_class
+    scope = Iqvoc::Concept.base_class.includes(:pref_labels).order('labels.value')
     scope = params[:published] == '0' ? scope.published_with_newer_versions : scope.published
 
     # unrelated concepts for sidebar
@@ -55,8 +55,6 @@ class Concepts::HierarchicalController < ConceptsController
     ActiveRecord::Associations::Preloader.new.preload(@concepts,
         Iqvoc::Concept.base_class.default_includes + [:pref_labels])
 
-    @concepts.to_a.sort_by! {|c| c.pref_label }
-
     respond_to do |format|
       format.html
       format.json do # Treeview data

data/app/controllers/concepts/scheme_controller.rb

@@ -39,7 +39,10 @@ class Concepts::SchemeController < ApplicationController
     @scheme = Iqvoc::Concept.root_class.instance
     authorize! :read, @scheme
 
-    @top_concepts = Iqvoc::Concept.base_class.tops.published.sort_by {|c| c.pref_label }
+    @top_concepts = Iqvoc::Concept.base_class
+                        .preload(:pref_labels)
+                        .tops
+                        .published.sort_by {|c| c.pref_label }
 
     respond_to do |format|
       format.html

data/app/controllers/concepts/untranslated_controller.rb

@@ -30,7 +30,7 @@ class Concepts::UntranslatedController < ConceptsController
       @labels = []
       flash.now[:error] = I18n.t('txt.views.untranslated_concepts.unavailable')
     else
-      @labels = scope.order('LOWER(labels.value)').page(params[:page])
+      @labels = scope.order(Arel.sql('LOWER(labels.value)')).page(params[:page])
     end
   end
 end

data/app/controllers/concepts/versions_controller.rb

@@ -73,6 +73,7 @@ class Concepts::VersionsController < ApplicationController
         Iqvoc.change_note_class.create! do |note|
           note.owner = new_version
           note.language = I18n.locale.to_s
+          note.position = (current_concept.send(Iqvoc.change_note_class_name.to_relation_name).maximum(:position) || 0).succ
           note.annotations_attributes = [
             { namespace: 'dct', predicate: 'creator', value: current_user.name },
             { namespace: 'dct', predicate: 'modified', value: DateTime.now.to_s }

data/app/controllers/concepts_controller.rb

@@ -24,6 +24,9 @@ class ConceptsController < ApplicationController
     authorize! :read, Concept::Base
 
     respond_to do |format|
+      format.html do
+        redirect_to hierarchical_concepts_url
+      end
       format.json do # Search for widget
         scope = Iqvoc::Concept.base_class.editor_selectable.with_pref_labels.
             merge(Label::Base.by_query_value("%#{params[:query]}%"))
@@ -124,6 +127,7 @@ class ConceptsController < ApplicationController
     @concept.send(Iqvoc::change_note_class_name.to_relation_name).new do |change_note|
       change_note.value = I18n.t('txt.views.versioning.initial_version')
       change_note.language = I18n.locale.to_s
+      change_note.position = 1
       change_note.annotations_attributes = [
         { namespace: 'dct', predicate: 'creator', value: current_user.name },
         { namespace: 'dct', predicate: 'created', value: DateTime.now.to_s }

data/app/controllers/concerns/controller_extensions.rb

@@ -6,13 +6,16 @@ module ControllerExtensions
   included do
     prepend_before_action :set_locale
     before_action :ensure_extension
+    before_action :initialize_profiler
 
     helper :all
     helper_method :current_user_session, :current_user, :concept_widget_data, :collection_widget_data, :label_widget_data
 
+    rescue_from Exception, with: :handle_server_error
     rescue_from ActiveRecord::RecordNotFound, with: :handle_not_found
     rescue_from CanCan::AccessDenied, with: :handle_access_denied
     rescue_from ActionController::ParameterMissing, with: :handle_bad_request
+    rescue_from ActionController::UnknownFormat, with: :handle_unknown_format
   end
 
   protected
@@ -25,8 +28,11 @@ module ControllerExtensions
   # Force an extension to every url. (LOD)
   def ensure_extension
     unless params[:format] || !request.get?
+      # FIXME: convert to whitelist
+      safe_params = params.except(:host, :port, :protocol, :domain, :subdomain).permit!
+
       flash.keep
-      redirect_to url_for(params.merge(format: (request.format && request.format.symbol) || :html))
+      redirect_to url_for(safe_params.merge(format: (request.format && request.format.symbol) || :html))
     end
   end
 
@@ -59,6 +65,25 @@ module ControllerExtensions
     end
   end
 
+  def handle_server_error(exception)
+    Rails.logger.error(exception)
+    Rails.logger.error(exception.backtrace.join("\n"))
+    @exception = exception
+
+    respond_to do |format|
+      format.html { render template: 'errors/server_error', status: 500 }
+      format.any  { head 500 }
+    end
+  end
+
+  def handle_unknown_format(exception)
+    @exception = exception
+
+    respond_to do |format|
+      format.any  { head 406 }
+    end
+  end
+
   def set_locale
     if params[:lang].present? && Iqvoc::Concept.pref_labeling_languages.include?(params[:lang])
       I18n.locale = params[:lang]
@@ -98,14 +123,23 @@ module ControllerExtensions
   end
 
   def current_user_session
-    @current_user_session ||= UserSession.find
+    return @current_user_session if defined?(@current_user_session)
+    @current_user_session = UserSession.find
   end
 
   def current_user
-    @current_user ||= current_user_session && current_user_session.user
+    return @current_user if defined?(@current_user)
+    request.session_options[:skip] = true unless current_user_session
+    @current_user = current_user_session && current_user_session.user
   end
 
   def with_layout?
     !params[:layout]
   end
+
+  def initialize_profiler
+    if can? :profile, :system
+      Rack::MiniProfiler.authorize_request
+    end
+  end
 end

data/app/controllers/errors_controller.rb

@@ -0,0 +1,8 @@
+class ErrorsController < ApplicationController
+  def not_found
+    respond_to do |format|
+      format.html { render template: 'errors/not_found', status: 404 }
+      format.any  { head 404 }
+    end
+  end
+end

data/app/controllers/exports_controller.rb

@@ -61,6 +61,6 @@ class ExportsController < ApplicationController
   private
 
   def export_params
-    params.require(:export).except!(:user_id, :user).permit!
+    params.require(:export).permit(:file_type, :default_namespace)
   end
 end

data/app/controllers/frontpage_controller.rb

@@ -16,6 +16,13 @@
 
 class FrontpageController < ApplicationController
   def index
-    @suppress_quicksearch = true
+    @recent_concepts = Iqvoc::Concept.base_class.recent
+
+    respond_to do |format|
+      format.html
+      format.any(:ttl, :rdf, :nt) do
+        redirect_to scheme_url
+      end
+    end
   end
 end

data/app/controllers/hierarchy_controller.rb

@@ -141,7 +141,7 @@ class HierarchyController < ApplicationController
     # caching -- NB: invalidated on any in-scope concept modifications
     latest = scope.maximum(:updated_at)
     response.cache_control[:public] = !include_unpublished # XXX: this should not be necessary!?
-    return unless stale?(etag: [latest, params], last_modified: latest,
+    return unless stale?(etag: [latest, hierarchy_params.to_h], last_modified: latest,
         public: !include_unpublished)
 
     # NB: order matters due to the `where` clause below
@@ -196,4 +196,10 @@ class HierarchyController < ApplicationController
       rel.target.narrower_relations.map { |rel| rel.target } # XXX: expensive
     end.flatten.uniq.sort { |a, b| a.pref_label <=> b.pref_label }
   end
+
+  private
+
+  def hierarchy_params
+    params.permit(:lang, :format, :root, :dir, :depth, :siblings, :published)
+  end
 end

data/app/controllers/imports_controller.rb

@@ -46,6 +46,6 @@ class ImportsController < ApplicationController
 
   private
   def import_params
-    params.require(:import).except!(:user_id, :user).permit!
+    params.require(:import).permit(:import_file, :default_namespace, :publish)
   end
 end

data/app/controllers/rdf_controller.rb

@@ -55,6 +55,9 @@ class RdfController < ApplicationController
     if stale?(etag: @title)
       respond_to do |format|
         format.any(:rdf, :ttl, :nt)
+        format.html do
+          redirect_to root_path
+        end
       end
     end
   end

data/app/controllers/search_results_controller.rb

@@ -148,7 +148,13 @@ class SearchResultsController < ApplicationController
       @results = @results.page(params[:page])
 
       respond_to do |format|
-        format.html { render :index, layout: with_layout? }
+        format.html {
+          if request.headers['Accept'] == 'text/html; fragment=true'
+            render template: 'search_results/_result_list', layout: false
+          else
+            render :index, layout: with_layout?
+          end
+        }
         format.any(:ttl, :rdf, :nt)
       end
     end

data/app/controllers/user_sessions_controller.rb

@@ -15,18 +15,19 @@
 # limitations under the License.
 
 class UserSessionsController < ApplicationController
-  skip_before_action :require_user, only: [:new, :create]
-
   def new
     authorize! :create, UserSession
 
     @user_session = UserSession.new
+    request.session_options[:skip] = false
   end
 
   def create
     authorize! :create, UserSession
 
     @user_session = UserSession.new(user_session_params.to_h)
+    request.session_options[:skip] = false
+
     if @user_session.save
       @current_ability = nil
       flash[:success] = I18n.t('txt.controllers.user_sessions.login_success')
@@ -46,10 +47,11 @@ class UserSessionsController < ApplicationController
 
     current_user_session.destroy
     flash[:success] = I18n.t('txt.controllers.user_sessions.logout_success')
-    redirect_to root_path
+    redirect_to new_user_session_path
   end
 
   private
+
   def user_session_params
     params.require(:user_session).permit(:email, :password)
   end

data/app/controllers/users_controller.rb

@@ -48,7 +48,7 @@ class UsersController < ApplicationController
 
     # strip out role and active params so that a non admin
     # could not change his own role and permissions
-    params = can?(:manage, User) ? user_params : user_params.except(:active, :role)
+    params = can?(:manage, User) ? user_params : user_params.except(:active, :role, :comment)
 
     if @user.update_attributes(params)
       flash[:success] = I18n.t('txt.controllers.users.successfully_updated')
@@ -72,6 +72,6 @@ class UsersController < ApplicationController
   def user_params
     params.require(:user).permit(:forename, :surname, :email, :password,
                                  :password_confirmation, :active, :role,
-                                 :telephone_number)
+                                 :telephone_number, :comment)
   end
 end

data/app/helpers/application_helper.rb

@@ -30,7 +30,7 @@ module ApplicationHelper
 
   # Formats a list of items or returns a remark if no items where given
   def item_listing(items, &block)
-    return nil if items.empty?
+    return ' '.html_safe if items.empty?
 
     content_tag :ul, class: 'entity_list' do
       items.map do |item|

data/app/helpers/concepts_helper.rb

@@ -36,7 +36,8 @@ module ConceptsHelper
   end
 
   def letter_selector(letters = ('A'..'Z').to_a, &block)
-    highlighted_letter = params[:prefix] || letters.first || 'a'
+    fallback = (@letters&.include?('A')) ? 'a' : @letters&.first
+    highlighted_letter = params[:prefix] || fallback || 'a'
     content_tag :ul, class: 'letter-selector list-unstyled' do
       letters.map do |letter|
         content_tag :li, link_to(letter, yield(letter)),

data/app/helpers/dashboard_helper.rb

@@ -18,9 +18,9 @@ module DashboardHelper
   def sorting_controls_for(name)
     content_tag :div, class: 'sorting-controls' do
       link_to(icon('arrow-circle-o-up', 'sorting-arrow'),
-        params.merge({ sort: "#{name} ASC" })) +
+        sorting_params.merge({ sort: "#{name} ASC" })) +
       link_to(icon('arrow-circle-o-down', 'sorting-arrow'),
-        params.merge({ sort: "#{name} DESC" }))
+        sorting_params.merge({ sort: "#{name} DESC" }))
     end
   end
 
@@ -43,4 +43,8 @@ module DashboardHelper
       item.published? ? concept_path(id: item.origin) : concept_path(published: 0, id: item.origin)
     end
   end
+
+  def sorting_params
+    sorting_params = params.permit(:sort, :check_consistency)
+  end
 end

data/app/helpers/form_helper.rb

@@ -25,7 +25,7 @@ module FormHelper
     id = options.delete(:id)
 
     label = if label_text
-      label_tag(id, label_text, class: 'control-label')
+      label_tag(id, label_text, class: 'col-form-label')
     else
       ActiveSupport::SafeBuffer.new # empty safe string
     end

data/app/helpers/navigation_helper.rb

@@ -28,13 +28,16 @@ module NavigationHelper
     items.map do |item|
       if !item.has_key?(:authorized?) || instance_eval(&item[:authorized?])
         if item[:items]
-          content_tag :li, class: 'dropdown' do
+          content_tag :li, class: 'nav-item dropdown' do
             raw(link_to(element_value(item[:text]).html_safe +
-                    content_tag(:i, nil, class: 'fa fa-fw fa-angle-down'), '#',
-                    class: 'dropdown-toggle',
+                    content_tag(:i), '#',
+                    class: 'nav-link dropdown-toggle',
+                    role: 'button',
+                    'aria-haspopup': true,
+                    'aria-expanded': false,
                     data: { toggle: 'dropdown' }) +
-                content_tag(:ul,
-                    item[:items].map { |i| nav_item(i) }.join.html_safe,
+                content_tag(:div,
+                    item[:items].map { |i| dropdown_nav_item(i) }.join.html_safe,
                     class: 'dropdown-menu'))
           end
         else
@@ -55,7 +58,7 @@ module NavigationHelper
   end
 
   def sidebar_header(text)
-    content_tag :h4, text, class: 'sidebar-header'
+    content_tag :h3, text, class: 'sidebar-header'
   end
 
   def sidebar_item(opts = {}, &block)
@@ -64,7 +67,7 @@ module NavigationHelper
     end
 
     opts[:class] = '' if opts[:class].blank?
-    opts[:class] += ' list-group-item'
+    opts[:class] += ' list-group-item list-group-item-action'
     opts[:class] += ' active' if opts.delete(:active)
 
     content = if block_given?
@@ -85,8 +88,16 @@ module NavigationHelper
 
   def nav_item(item)
     active = item[:active?] ? instance_eval(&item[:active?]) : (item[:controller] ? params[:controller] == item[:controller] : false)
-    css = active ? 'active' : nil
-    content_tag :li, link_to(element_value(item[:text]), element_value(item[:href])), class: css
+    css = 'nav-item'
+    css << ' active' if active
+    content_tag :li, link_to(element_value(item[:text]), element_value(item[:href]), class: 'nav-link'), class: css
+  end
+
+  def dropdown_nav_item(item)
+    active = item[:active?] ? instance_eval(&item[:active?]) : (item[:controller] ? params[:controller] == item[:controller] : false)
+    css = 'dropdown-item'
+    css << ' active' if active
+    link_to(element_value(item[:text]), element_value(item[:href]), class: css)
   end
 
   def nav_item_authorized?(item)