iqvoc_skosxl 2.9.1 → 2.11.4

data/app/views/{rdf/show_label.iqrdf → labels/show.iqrdf}

@@ -2,4 +2,4 @@ RdfNamespacesHelper.instance_methods.each do |meth|
   document.namespaces(self.send(meth))
 end
 
-render_label_rdf(document, @label)
+render_label_rdf(document, @label)

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

@@ -2,13 +2,15 @@
 <%= render 'sidebar', :label => @label %>
 
 <% if can?(:read, @new_label_version) || can?(:branch, @label) %>
-  <div class="editing_versioning_toolbar well">
+  <div class="editing_versioning_toolbar">
     <% if @new_label_version.blank? && can?(:branch, @label) %>
       <%= button_to t("txt.views.versioning.versioning_mode"),
-      label_versions_branch_path(:origin => @label.origin), :class => 'btn btn-default' %>
+      label_versions_branch_path(:origin => @label.origin), :class => 'btn btn-outline-secondary' %>
+      <%= link_to t("txt.views.versioning.duplicate"),
+      label_duplicate_path(origin: @label.origin), :class => 'btn btn-outline-secondary' %>
     <% elsif can?(:read, @new_label_version) %>
       <%= link_to t("txt.views.versioning.preview_new_version"),
-      label_path(:published => 0, :id => @new_label_version), :class => 'btn btn-default' %>
+      label_path(:published => 0, :id => @new_label_version), :class => 'btn btn-outline-secondary' %>
     <% end %>
   </div>
 <% end %>

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

@@ -3,41 +3,38 @@
 
 <%= alert :info, :header => t('txt.common.unpublished_version') + "." do %>
   <%= t("txt.views.versioning.current_revision", :rev => @label.rev) %>
-  <% if @label.locked? %>
-    <%= t("txt.views.versioning.in_ongoing_editing_by", :user => @label.locking_user.name) %>
-  <% end %>
 <% end %>
 
-<div class="editing_versioning_toolbar well">
-  <% if (not @label.locked?) || @label.locked_by == @current_user.id %>
+<div class="editing_versioning_toolbar">
+  <% if can?(:merge, @label) %>
     <%= button_to t("txt.views.versioning.publishing"),
-      label_versions_merge_path(:origin => @label.origin), :class => 'btn btn-primary' %>
+                  label_versions_merge_path(:origin => @label.origin), :class => 'btn btn-primary' %>
+  <% end %>
+
+  <% if can?(:check_consistency, @label) %>
+    <%= button_to t("txt.views.versioning.consistency_check"),
+      label_versions_consistency_check_path(:origin => @label.origin),
+      :method => :get, :class => 'btn btn-outline-secondary' %>
   <% end %>
-  <%= button_to t("txt.views.versioning.consistency_check"),
-    label_versions_consistency_check_path(:origin => @label.origin),
-    :method => :get, :class => 'btn btn-default' %>
 
-  <% if (not @label.in_review?) && @label.locked_by == @current_user.id %>
+  <% if can?(:send_to_review, @label) %>
     <%= button_to t("txt.common.to_review"),
     label_versions_to_review_path(:origin => @label.origin),
-    :class => 'btn btn-default' %>
+    :class => 'btn btn-outline-secondary' %>
   <% end %>
 
-  <% unless @label.locked? %>
-    <%= button_to t("txt.views.versioning.to_edit_mode"),
-      label_versions_lock_path(:origin => @label.origin), :class => 'btn btn-default' %>
-    <%= button_to t("txt.views.versioning.delete"),
+  <% if can?(:update, @label) %>
+    <%= link_to t("txt.views.versioning.edit_mode"),
+                edit_label_path(:published => 0, :id => @label.origin),
+                :class => 'btn btn-outline-secondary'  %>
+  <% end %>
+
+  <% if can?(:destroy, @label) %>
+    <%= button_to delete_button_text(@label),
       label_path(:published => 0, :id => @label.origin),
       :method => :delete,
       :confirm => I18n.t("txt.views.versioning.delete_confirm"),
       :class => 'btn btn-danger' %>
-  <% else %>
-    <%= button_to t("txt.views.versioning.unlock"),
-      label_versions_unlock_path(:origin => @label.origin),
-      :class => 'btn btn-default' if can?(:unlock, @label) %>
-    <%= link_to t("txt.views.versioning.edit_mode"),
-      edit_label_path(:published => 0, :id => @label.origin),
-      :class => 'btn btn-default' if can?(:update, @label) %>
   <% end %>
 </div>
 

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

@@ -0,0 +1,2 @@
+<div class="modal fade" id="label-in-concept-modal" tabindex="-1" role="dialog" aria-labelledby="label-in-concept-title" aria-hidden="true">
+</div>

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

@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html lang="<%= I18n.locale %>">
+  <head>
+    <title><%= page_title %></title>
+    <%= csrf_meta_tag %>
+
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta charset="utf-8">
+
+    <%= stylesheet_link_tag "manifest" %>
+    <%= yield :head %>
+  </head>
+
+  <% 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/label_in_concept_modal' %>
+  <%= 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 %>
+    </div>
+  </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/partials/_modal.html.erb

@@ -0,0 +1,17 @@
+<div class="modal fade" tabindex="-1" role="dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        <h4 class="modal-title">Modal title</h4>
+      </div>
+      <div class="modal-body">
+        <p>One fine body&hellip;</p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-primary">Save changes</button>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->

data/app/views/partials/label/skosxl/_inline_base.html.erb

@@ -0,0 +1 @@
+<%= link_to(label.value, label_path(:id => label, :published => ((!label.published? && !label.published_version_id) ? 0 : nil)), :class => label.published? ? '' : 'unpublished') %>

data/app/views/partials/label/skosxl/_new_link_base.html.erb

@@ -1 +1 @@
-<%= sidebar_item :icon => 'edit', :text => t('txt.views.labels.new'), :path => new_label_path(published: 0) %>
+<%= sidebar_item :icon => 'edit', :text => t('txt.views.labels.new'), :path => new_label_path(published: 0), :perms => [:create, Iqvoc::XLLabel.base_class] %>

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

@@ -1,15 +1,22 @@
-<%= content_tag :div, :class => "relation translation panel", :lang => (lang if defined?(concept)) do %>
+<%= content_tag :div, :class => "relation translation panel" do %>
   <% if defined?(concept) %>
-    <h2><%= klass.model_name.human(:count => 2) %> <small><%= "#{t("languages.#{lang}", :default => lang.to_s)}" %></small></h2>
+    <h2><%= klass.model_name.human(:count => 2) %></h2>
     <div class="relation-body">
-      <%-
-        items = concept.labels_for_labeling_class_and_language(klass, lang.to_s)
-        items = items.select { |item| can?(:read, item) }
-      -%>
-      <%= item_listing(items) do |label|
-        link_to label.value, label_path(:id => label), class: label.published? ? '' : 'unpublished'
-      end
-    %>
+    <% available_languages.each do |lang| %>
+      <div class="translation" lang="<%= lang %>">
+        <span class="language_flap"><%= lang %></span>
+        <div class="note_content">
+          <%-
+            items = concept.labels_for_labeling_class_and_language(klass, lang.to_s, false)
+            items = items.select { |item| can?(:read, item) }
+          -%>
+          <%= item_listing(items) do |label|
+            render(label.class.inline_partial_name, label: label)
+          end %>
+        </div>
+      </div>
+    <% end %>
+
     </div>
   <% elsif defined?(label) %>
     <h2><%= klass.model_name.human %> <%= t("txt.common.of") %></h2>
@@ -18,10 +25,10 @@
         items = label.concepts_for_labeling_class(klass)
         items = items.select { |item| can?(:read, item) }
       -%>
-      <%= item_listing(items) do |c|
-        link_to c.to_s, concept_path(:id => c), class: c.published? ? '' : 'unpublished'
+      <%= item_listing(items) do |concept|
+        render(concept.class.inline_partial_name, concept: concept)
       end
     %>
     </div>
   <% end %>
-<% end %>
+<% end %>

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

@@ -14,7 +14,8 @@
         :"data-entities" => Iqvoc::XLLabel.base_class.editor_selectable.
             by_language(language).by_origin(concept.labelings_by_id(
                 klass.name.to_relation_name, language).
-                split(InlineDataHelper::SPLITTER)).
-            map { |l| label_widget_data(l) }.to_json %>
+                split(InlineDataHelper::SPLITTER)).sort_by(&:value)
+            .map { |l| label_widget_data(l) }.to_json %>
+
   <% end %>
 <% end %>

data/config/application.rb

@@ -1,6 +1,18 @@
-require File.expand_path('../boot', __FILE__)
+require_relative "boot"
 
-require 'rails/all'
+# Pick the frameworks you want:
+require "active_model/railtie"
+require "active_job/railtie"
+require "active_record/railtie"
+require "active_storage/engine"
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "action_mailbox/engine"
+require "action_text/engine"
+require "action_view/railtie"
+require "action_cable/engine"
+# require "sprockets/railtie"
+require "rails/test_unit/railtie"
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
@@ -8,19 +20,19 @@ Bundler.require(*Rails.groups)
 
 module Iqvoc::SKOSXL
   class Application < Rails::Application
-    # This has to be here because iqvoc_skosxl.rb needs to know if it runs as app or as engine
-    require 'iqvoc_skosxl'
-
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 7.0
 
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
+    # Configuration for the application, engines, and railties goes here.
+    #
+    # These settings can be overridden in specific environments using the files
+    # in config/environments, which are processed later.
+    #
+    # config.time_zone = "Central Time (US & Canada)"
+    # config.eager_load_paths << Rails.root.join("extras")
+    #
 
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
+    # This has to be here because iqvoc_skosxl.rb needs to know if it runs as app or as engine
+    require 'iqvoc_skosxl'
   end
 end

data/config/boot.rb

@@ -1,4 +1,4 @@
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+require "bundler/setup" # Set up gems listed in the Gemfile.
+require "bootsnap/setup" # Speed up boot time by caching expensive operations.

data/config/cable.yml

@@ -0,0 +1,10 @@
+development:
+  adapter: async
+
+test:
+  adapter: test
+
+production:
+  adapter: redis
+  url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
+  channel_prefix: iqvoc/skosxl_production

data/config/database.yml

@@ -1,20 +1,26 @@
 development:
-  adapter: mysql2
-  database: iqvoc_skosxl_development
-  username: root
-  password:
-  encoding: utf8
+  adapter: postgresql
+  host: localhost
+  encoding: unicode
+  database: <%= ENV["POSTGRES_DB"] || 'iqvoc_skosxl_development' %>
+  pool: 5
+  username: <%= ENV["POSTGRES_USER"] || 'postgres' %>
+  password: <%= ENV["POSTGRES_PASSWORD"] || 'postgres' %>
 
 test:
-  adapter: mysql2
-  database: iqvoc_skosxl_test
-  username: root
-  password:
-  encoding: utf8
+  adapter: postgresql
+  host: localhost
+  encoding: unicode
+  database: <%= ENV["POSTGRES_DB"] || 'iqvoc_skosxl_test' %>
+  pool: 5
+  username: <%= ENV["POSTGRES_USER"] || 'postgres' %>
+  password: <%= ENV["POSTGRES_PASSWORD"] || 'postgres' %>
 
 production:
-  adapter: mysql2
-  database: iqvoc_skosxl_production
-  username: root
-  password:
-  encoding: utf8
+  adapter: postgresql
+  host: localhost
+  encoding: unicode
+  database: <%= ENV["POSTGRES_DB"] || 'iqvoc_skosxl_production' %>
+  pool: 5
+  username: <%= ENV["POSTGRES_USER"] || 'postgres' %>
+  password: <%= ENV["POSTGRES_PASSWORD"] || 'postgres' %>

data/config/database.yml.postgresql

@@ -1,23 +1,26 @@
 development:
   adapter: postgresql
+  host: localhost
   encoding: unicode
-  database: iqvoc_skosxl_development
+  database: <%= ENV["POSTGRES_DB"] || 'iqvoc_skosxl_development' %>
   pool: 5
-  username: postgres
-  password:
+  username: <%= ENV["POSTGRES_USER"] || 'postgres' %>
+  password: <%= ENV["POSTGRES_PASSWORD"] || 'postgres' %>
 
 test:
   adapter: postgresql
+  host: localhost
   encoding: unicode
-  database: iqvoc_skosxl_test
+  database: <%= ENV["POSTGRES_DB"] || 'iqvoc_skosxl_test' %>
   pool: 5
-  username: postgres
-  password:
+  username: <%= ENV["POSTGRES_USER"] || 'postgres' %>
+  password: <%= ENV["POSTGRES_PASSWORD"] || 'postgres' %>
 
 production:
   adapter: postgresql
+  host: localhost
   encoding: unicode
-  database: iqvoc_skosxl_production
+  database: <%= ENV["POSTGRES_DB"] || 'iqvoc_skosxl_production' %>
   pool: 5
-  username: postgres
-  password:
+  username: <%= ENV["POSTGRES_USER"] || 'postgres' %>
+  password: <%= ENV["POSTGRES_PASSWORD"] || 'postgres' %>

data/config/environment.rb

@@ -1,5 +1,5 @@
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require_relative "application"
 
 # Initialize the Rails application.
 Rails.application.initialize!

data/config/initializers/content_security_policy.rb

@@ -0,0 +1,25 @@
+# Be sure to restart your server when you modify this file.
+
+# Define an application-wide content security policy.
+# See the Securing Rails Applications Guide for more information:
+# https://guides.rubyonrails.org/security.html#content-security-policy-header
+
+# Rails.application.configure do
+#   config.content_security_policy do |policy|
+#     policy.default_src :self, :https
+#     policy.font_src    :self, :https, :data
+#     policy.img_src     :self, :https, :data
+#     policy.object_src  :none
+#     policy.script_src  :self, :https
+#     policy.style_src   :self, :https
+#     # Specify URI for violation reports
+#     # policy.report_uri "/csp-violation-report-endpoint"
+#   end
+#
+#   # Generate session nonces for permitted importmap and inline scripts
+#   config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
+#   config.content_security_policy_nonce_directives = %w(script-src)
+#
+#   # Report violations without enforcing the policy.
+#   # config.content_security_policy_report_only = true
+# end

data/config/initializers/filter_parameter_logging.rb

@@ -1,4 +1,8 @@
 # Be sure to restart your server when you modify this file.
 
-# Configure sensitive parameters which will be filtered from the log file.
-Rails.application.config.filter_parameters += [:password]
+# Configure parameters to be filtered from the log file. Use this to limit dissemination of
+# sensitive information. See the ActiveSupport::ParameterFilter documentation for supported
+# notations and behaviors.
+Rails.application.config.filter_parameters += [
+  :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
+]

data/config/initializers/inflections.rb

@@ -4,13 +4,13 @@
 # are locale specific, and you may define rules for as many different
 # locales as you wish. All of these examples are active by default:
 # ActiveSupport::Inflector.inflections(:en) do |inflect|
-#   inflect.plural /^(ox)$/i, '\1en'
-#   inflect.singular /^(ox)en/i, '\1'
-#   inflect.irregular 'person', 'people'
+#   inflect.plural /^(ox)$/i, "\\1en"
+#   inflect.singular /^(ox)en/i, "\\1"
+#   inflect.irregular "person", "people"
 #   inflect.uncountable %w( fish sheep )
 # end
 
 # These inflection rules are supported but not enabled by default:
 # ActiveSupport::Inflector.inflections(:en) do |inflect|
-#   inflect.acronym 'RESTful'
+#   inflect.acronym "RESTful"
 # end

data/config/initializers/iqvoc.rb

@@ -1,3 +1,5 @@
+require 'labels_helper'
+
 silence_warnings do
   Iqvoc::Label = nil
 end

data/config/initializers/permissions_policy.rb

@@ -0,0 +1,11 @@
+# Define an application-wide HTTP permissions policy. For further
+# information see https://developers.google.com/web/updates/2018/06/feature-policy
+#
+# Rails.application.config.permissions_policy do |f|
+#   f.camera      :none
+#   f.gyroscope   :none
+#   f.microphone  :none
+#   f.usb         :none
+#   f.fullscreen  :self
+#   f.payment     :self, "https://secure.example.com"
+# end

data/config/initializers/wrap_parameters.rb

@@ -5,10 +5,10 @@
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
+  wrap_parameters format: [:json]
 end
 
 # To enable root element in JSON for ActiveRecord objects.
 # ActiveSupport.on_load(:active_record) do
-#  self.include_root_in_json = true
+#   self.include_root_in_json = true
 # end

data/config/initializers/zeitwerk.rb

@@ -0,0 +1,7 @@
+# FIXME: custom auto loading inflections due class naming inconsistencies with acronyms
+if Rails.autoloaders.zeitwerk_enabled?
+  Rails.autoloaders.main.inflector.inflect(
+    'skosxl' => 'SKOSXL',
+    'xllabel' => 'XLLabel'
+  )
+end

data/config/locales/activerecord.de.yml

@@ -5,8 +5,8 @@ de:
         one: XL-Label
         other: XL-Labels
       label/relation/skosxl/base:
-        one: Label-Relation
-        other: Label-Relationen
+        one: Beziehung
+        other: Beziehungen
       labeling/skosxl/base:
         one: Label
         other: Labels
@@ -16,6 +16,9 @@ de:
       labeling/skosxl/alt_label:
         one: Alternatives Label
         other: Alternative Labels
+      labeling/skosxl/hidden_label:
+        one:   "Verstecktes Label"
+        other: "Versteckte Labels"
 
     attributes:
       label/skosxl/base:

data/config/locales/activerecord.en.yml

@@ -16,6 +16,9 @@ en:
       labeling/skosxl/alt_label:
         one: Alternative Label
         other: Alternative Labels
+      labeling/skosxl/hidden_label:
+        one:   Hidden label
+        other: Hidden labels
 
     attributes:
       label/skosxl/base:

data/config/locales/de.yml

@@ -1,15 +1,28 @@
 de:
   txt:
+    controllers:
+      label:
+        duplicate_error: Zum Duplizieren darf es keine unveröffentlichte Revision geben.
     views:
+      versioning:
+        duplicate: Duplizieren
       layouts:
         sections:
           concepts: Konzepte
       instance_configuration:
         settings:
           languages_further_labelings_Labeling::SKOSXL::AltLabel: Sprachen für alternative Labels
+          languages_further_labelings_Labeling::SKOSXL::HiddenLabel: Sprache für versteckte Labels
+          label_duplicate_check_mode: Label-Duplikatsprüfung Modus
     models:
       label:
+        copy: Kopie
         uri: Label-URI
         origin_invalid: enthält ungültige Zeichen.
         pref_label_language: "Es muss ein bevorzugtes Label in der Hauptsprache des Thesaurus vorliegen."
         referenced_concepts_invalid: Referenzierte Konzepte werden durch diese Änderung invalide. Bitte Labelzuordnung am Konzept aufheben.
+      concept:
+        no_pref_label_error: "Es muss mindestens ein veröffentlichtes, bevorzugtes Label angegeben werden."
+    common:
+      referenced_labels: "Einige referenzierte Labels befinden sich momentan in Bearbeitung."
+      duplicate_labels: "Es existieren bereits Label mit einer ähnlichen Vorlageform: "

data/config/locales/en.yml

@@ -1,15 +1,28 @@
 en:
   txt:
+    controllers:
+      label:
+        duplicate_error: There must not be any unpublished version for duplication.
     views:
+      versioning:
+        duplicate: Duplicate
       layouts:
         sections:
           concepts: Concepts
       instance_configuration:
         settings:
           languages_further_labelings_Labeling::SKOSXL::AltLabel: Languages for alternative labels
+          languages_further_labelings_Labeling::SKOSXL::HiddenLabel: Languages for hidden labels
+          label_duplicate_check_mode: Label duplicate check mode
     models:
       label:
+        copy: Copy
         uri: Label URI
         origin_invalid: Origin contains invalid characters.
         pref_label_language: There must be a prefered label in thesaurus main language.
         referenced_concepts_invalid: Some referenced concepts become invalid. Please remove label from referenced concepts first.
+      concept:
+        no_pref_label_error: "At least one published preferred label must be specified."
+    common:
+      referenced_labels: "Some referenced labels are currently being edited."
+      duplicate_labels: "There are labels with a similar value: "

data/config/routes.rb

@@ -2,17 +2,13 @@ Rails.application.routes.draw do
   scope ':lang', constraints: Iqvoc.routing_constraint do
     resources :labels
 
-    post 'labels/versions/:origin/branch' => 'labels/versions#branch',
-        :as => 'label_versions_branch'
-    post 'labels/versions/:origin/merge' => 'labels/versions#merge',
-        :as => 'label_versions_merge'
-    post 'labels/versions/:origin/lock' => 'labels/versions#lock',
-        :as => 'label_versions_lock'
-    post 'labels/versions/:origin/unlock' => 'labels/versions#unlock',
-        :as => 'label_versions_unlock'
-    post 'labels/versions/:origin/to_review' => 'labels/versions#to_review',
-        :as => 'label_versions_to_review'
-    get 'labels/versions/:origin/consistency_check' => 'labels/versions#consistency_check',
-        :as => 'label_versions_consistency_check'
+    post 'labels/versions/:origin/branch' => 'labels/versions#branch', :as => 'label_versions_branch'
+    post 'labels/versions/:origin/merge' => 'labels/versions#merge', :as => 'label_versions_merge'
+    post 'labels/versions/:origin/to_review' => 'labels/versions#to_review', :as => 'label_versions_to_review'
+    get 'labels/versions/:origin/consistency_check' => 'labels/versions#consistency_check', :as => 'label_versions_consistency_check'
+    get 'labels/:origin/duplicate' => 'labels#duplicate', :as => 'label_duplicate'
+    get 'label_dashboard' => 'xl_dashboard#label_index', as: 'label_dashboard'
+    get 'concept_new_label' => 'labels#new_from_concept', as: 'concept_new_label'
+    post 'concept_create_label' => 'labels#create_from_concept', as: 'concept_create_label'
   end
 end