iqvoc_skosxl 1.2.3 → 2.0.0

data/Gemfile

@@ -1,13 +1,14 @@
 source "http://rubygems.org"
 
-gem 'rails', '3.2.1'
-gem 'iqvoc', '~> 3.5.5'
+gem 'rails', '3.2.3'
+gem 'iqvoc', '~> 4.0.0'
 
 group :development do
   gem 'awesome_print'
 end
 
 group :assets do
+  gem 'sass-rails', '~> 3.2.5'
   gem 'uglifier', '>= 1.0.3'
 end
 

data/Gemfile.lock

@@ -1,26 +1,26 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.1)
-      actionpack (= 3.2.1)
-      mail (~> 2.4.0)
-    actionpack (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
+    actionmailer (3.2.3)
+      actionpack (= 3.2.3)
+      mail (~> 2.4.4)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.1)
       rack (~> 1.4.0)
-      rack-cache (~> 1.1)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
     activerecord-jdbc-adapter (1.2.2)
     activerecord-jdbcmysql-adapter (1.2.2)
@@ -30,13 +30,14 @@ GEM
       activerecord-jdbc-adapter (~> 1.2.2)
       jdbc-sqlite3 (~> 3.7.2)
     activerecord-oracle_enhanced-adapter (1.4.1)
-    activeresource (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-    activesupport (3.2.1)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (3.0.0)
+    addressable (2.2.8)
+    arel (3.0.2)
     authlogic (3.1.0)
       activerecord (>= 3.0.7)
       activerecord (>= 3.0.7)
@@ -50,26 +51,26 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.3.0)
+    childprocess (0.3.2)
       ffi (~> 1.0.6)
-    database_cleaner (0.7.1)
+    database_cleaner (0.7.2)
     erubis (2.7.0)
-    execjs (1.3.0)
+    execjs (1.3.2)
       multi_json (~> 1.0)
-    factory_girl (2.5.0)
-      activesupport
-    factory_girl_rails (1.6.0)
-      factory_girl (~> 2.5.0)
+    factory_girl (3.2.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (3.2.0)
+      factory_girl (~> 3.2.0)
       railties (>= 3.0.0)
-    fastercsv (1.5.4)
+    fastercsv (1.5.5)
     ffi (1.0.11)
     ffi (1.0.11-java)
     hike (1.2.1)
     i18n (0.6.0)
-    iq_rdf (0.1.2)
+    iq_rdf (0.1.5)
       builder
       bundler
-    iqvoc (3.5.5)
+    iqvoc (4.0.0)
       authlogic
       bundler
       cancan
@@ -79,45 +80,49 @@ GEM
       kaminari
       rails (~> 3.2.1)
       rails_autolink
+      sass-rails (~> 3.2.5)
+      simple_form
     jdbc-mysql (5.1.13)
     jdbc-sqlite3 (3.7.2)
-    journey (1.0.1)
-    json (1.6.5)
-    json (1.6.5-java)
+    journey (1.0.3)
+    json (1.7.1)
+    json (1.7.1-java)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    mail (2.4.1)
+    libwebsocket (0.1.3)
+      addressable
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.0.4)
+    mime-types (1.18)
+    multi_json (1.3.4)
     mysql2 (0.3.11)
-    nokogiri (1.5.0)
-    nokogiri (1.5.0-java)
+    nokogiri (1.5.2)
+    nokogiri (1.5.2-java)
     polyglot (0.3.3)
     rack (1.4.1)
-    rack-cache (1.1)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.1)
-      actionmailer (= 3.2.1)
-      actionpack (= 3.2.1)
-      activerecord (= 3.2.1)
-      activeresource (= 3.2.1)
-      activesupport (= 3.2.1)
+    rails (3.2.3)
+      actionmailer (= 3.2.3)
+      actionpack (= 3.2.3)
+      activerecord (= 3.2.3)
+      activeresource (= 3.2.3)
+      activesupport (= 3.2.3)
       bundler (~> 1.0)
-      railties (= 3.2.1)
-    rails_autolink (1.0.5)
+      railties (= 3.2.3)
+    rails_autolink (1.0.9)
       rails (~> 3.1)
-    railties (3.2.1)
-      actionpack (= 3.2.1)
-      activesupport (= 3.2.1)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -125,25 +130,34 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    rubyzip (0.9.5)
-    selenium-webdriver (2.18.0)
+    rubyzip (0.9.8)
+    sass (3.1.18)
+    sass-rails (3.2.5)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    selenium-webdriver (2.21.2)
       childprocess (>= 0.2.5)
-      ffi (~> 1.0.9)
-      multi_json (~> 1.0.4)
+      ffi (~> 1.0)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
       rubyzip
-    sprockets (2.1.2)
+    simple_form (2.0.2)
+      actionpack (~> 3.0)
+      activemodel (~> 3.0)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
-    test-unit (2.4.7)
+    sqlite3 (1.3.6)
+    test-unit (2.4.8)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-    uglifier (1.2.3)
+    tzinfo (0.3.33)
+    uglifier (1.2.4)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
     xpath (0.1.4)
@@ -161,10 +175,11 @@ DEPENDENCIES
   capybara
   database_cleaner
   factory_girl_rails
-  iqvoc (~> 3.5.5)
+  iqvoc (~> 4.0.0)
   mysql2
   nokogiri (~> 1.5.0)
-  rails (= 3.2.1)
+  rails (= 3.2.3)
+  sass-rails (~> 3.2.5)
   sqlite3
   test-unit
   uglifier (>= 1.0.3)

data/app/controllers/labels/versions_controller.rb

@@ -20,7 +20,7 @@ class Labels::VersionsController < ApplicationController
             handle_virtuoso_exception(e.message)
           end
           if new_version.has_concept_or_label_relations?
-            flash[:notice] = t("txt.controllers.versioning.published")
+            flash[:success] = t("txt.controllers.versioning.published")
             redirect_to label_path(:id => new_version)
           else
             flash[:error] = t("txt.controllers.versioning.published_with_warning")
@@ -47,7 +47,7 @@ class Labels::VersionsController < ApplicationController
       new_version = current_label.branch(current_user)
       new_version.save!
     end
-    flash[:notice] = t("txt.controllers.versioning.branched")
+    flash[:success] = t("txt.controllers.versioning.branched")
     redirect_to edit_label_path(:published => 0, :id => new_version, :check_associations_in_editing_mode => true)
   end
 
@@ -61,7 +61,7 @@ class Labels::VersionsController < ApplicationController
     new_version.lock_by_user(current_user.id)
     new_version.save!
 
-    flash[:notice] = t("txt.controllers.versioning.locked")
+    flash[:success] = t("txt.controllers.versioning.locked")
     redirect_to edit_label_path(:published => 0, :id => new_version)
   end
 
@@ -75,7 +75,7 @@ class Labels::VersionsController < ApplicationController
     new_version.unlock
     new_version.save!
 
-    flash[:notice] = t("txt.controllers.versioning.unlocked")
+    flash[:success] = t("txt.controllers.versioning.unlocked")
     redirect_to label_path(:published => 0, :id => new_version)
   end
 
@@ -86,7 +86,7 @@ class Labels::VersionsController < ApplicationController
     authorize! :check_consistency, label
 
     if label.valid_with_full_validation?
-      flash[:notice] = t("txt.controllers.versioning.consistency_check_success")
+      flash[:success] = t("txt.controllers.versioning.consistency_check_success")
       redirect_to label_path(:published => 0, :id => label)
     else
       flash[:error] = t("txt.controllers.versioning.consistency_check_error")
@@ -102,7 +102,7 @@ class Labels::VersionsController < ApplicationController
 
     label.to_review
     label.save!
-    flash[:notice] = t("txt.controllers.versioning.to_review_success")
+    flash[:success] = t("txt.controllers.versioning.to_review_success")
     redirect_to label_path(:published => 0, :id => label)
   end
 

data/app/controllers/labels_controller.rb

@@ -61,7 +61,7 @@ class LabelsController < ApplicationController
     @label = Iqvoc::XLLabel.base_class.new(params[:label])
     if @label.valid?
       if @label.save
-        flash[:notice] = I18n.t("txt.controllers.versioned_label.success")
+        flash[:success] = I18n.t("txt.controllers.versioned_label.success")
         redirect_to label_path(:published => 0, :id => @label.origin)
       else
         flash.now[:error] = I18n.t("txt.controllers.versioned_label.error")
@@ -103,7 +103,7 @@ class LabelsController < ApplicationController
       format.html do
         raise ActiveRecord::RecordNotFound unless @label
         if @label.update_attributes(params[:label])
-          flash[:notice] = I18n.t("txt.controllers.versioned_label.update_success")
+          flash[:success] = I18n.t("txt.controllers.versioned_label.update_success")
           redirect_to label_path(:published => 0, :id => @label)
         else
           flash.now[:error] = I18n.t("txt.controllers.versioned_label.update_error")
@@ -119,10 +119,10 @@ class LabelsController < ApplicationController
     authorize! :destroy, @new_label
 
     if @new_label.destroy
-      flash[:notice] = I18n.t("txt.controllers.label_versions.delete")
+      flash[:success] = I18n.t("txt.controllers.label_versions.delete")
       redirect_to dashboard_path
     else
-      flash[:notice] = I18n.t("txt.controllers.label_versions.delete_error")
+      flash[:error] = I18n.t("txt.controllers.label_versions.delete_error")
       redirect_to label_path(:published => 0, :id => @new_label)
     end
   end

data/app/helpers/labels_helper.rb

@@ -22,14 +22,6 @@ module LabelsHelper
           additional_object.build_rdf(document, c)
         end
       end
-
-=begin
-      concept.matches.each do |match|
-        match.build_rdf(document, c)
-      end
-
-
-=end
     end
   end
 
@@ -65,4 +57,16 @@ module LabelsHelper
     res
   end
 
+  def label_header(label)
+    desc = label.class.model_name.human
+
+    if label.expired_at
+      desc += " #{t('txt.views.concepts.expired_at', :date => l(label.expired_at, :format => :long))} "
+    end
+
+    title = label.origin
+
+    page_header :title => title.to_s, :desc => desc.html_safe
+  end
+
 end

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

@@ -0,0 +1,46 @@
+<%= simple_form_for label,
+  :as => :label,
+  :url => label.new_record? ? labels_path : label_path(:id => label, :published => 0),
+  :html => { :class => "form-horizontal" } do |f| %>
+
+  <fieldset id="label_base_data">
+    <legend><%= t("txt.common.attributes") %></legend>
+    <%= f.input :value %>
+    <%= f.input :language do %>
+      <%= @label.language %>
+      <span><%= f.hidden_field :language %></span>
+    <% end %>
+
+    <% if Iqvoc::XLLabel.has_additional_base_data %>
+      <%= render 'partials/label/additional_base_data', :f => f %>
+    <% end %>
+
+    <%= f.input :follow_up, :as => :string, :input_html => { :class => 'datepicker' } %>
+    <%= f.input :expired_at, :as => :string, :input_html => { :class => 'datepicker' } %>
+  </fieldset>
+
+  <fieldset>
+    <legend><%= Label::Relation::SKOSXL::Base.model_name.human(:count => 2) %></legend>
+      <% Iqvoc::XLLabel.relation_classes.each do |relation_class| %>
+        <%= render relation_class.edit_partial_name(label), :f => f, :label => label, :klass => relation_class %>
+      <% end %>
+  </fieldset>
+
+  <% Iqvoc::XLLabel.additional_association_classes.keys.each do |association_class| %>
+    <fieldset>
+      <legend><%= association_class.model_name.human(:count => 2) %></legend>
+      <%= render association_class.edit_partial_name(label), :label => label, :klass => association_class, :f => f %>
+    </fieldset>
+  <% end %>
+
+
+  <% unless label.new_record? %>
+    <% Iqvoc::XLLabel.note_classes.each do |note_class| %>
+      <%= render note_class.edit_partial_name(label), :owner_klass => label, :assoc_klass => note_class, :f => f %>
+    <% end %>
+  <% end %>
+
+  <div class="form-actions">
+    <%= f.submit t("txt.common.save"), :class => 'btn btn-primary' %>
+  </div>
+<% end # form %>

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

@@ -0,0 +1,7 @@
+<% published_param = label.published? ? nil : 0 %>
+<%= content_for :head do %>
+  <link href="<%= rdf_url(label.origin, :format => :ttl, :published => published_param, :lang => nil) %>" type="text/turtle" rel="alternate" title=""/>
+  <link href="<%= rdf_url(label.origin, :format => :rdf, :published => published_param, :lang => nil) %>" type="application/rdf+xml" rel="alternate" title=""/>
+<% end %>
+
+<%= label_header(label) %>

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

@@ -0,0 +1,11 @@
+<% published_param = label.published? ? nil : 0 %>
+
+<%= sidebar do %>
+  <%= sidebar_header t('txt.common.representations') %>
+  <%= sidebar_item :icon => 'share', :text => 'HTML', :path => rdf_url(label.origin, :format => :html, :published => published_param, :lang => nil) %>
+  <%= sidebar_item :icon => 'share', :text => 'RDF/XML', :path => rdf_url(label.origin, :format => :rdf, :published => published_param, :lang => nil), :id => 'rdf_link_xml' %>
+  <%= sidebar_item :icon => 'share', :text => 'RDF/Turtle', :path => rdf_url(label.origin, :format => :ttl, :published => published_param, :lang => nil), :id => 'rdf_link_ttl' %>
+  <%= sidebar_header 'Links' %>
+  <%#= sidebar_item :icon => 'zoom-in', :text => 'Visualization', :path => '#visualization', :'data-toggle' => 'modal' %>
+  <%= render Iqvoc::XLLabel.base_class.new_link_partial_name %>
+<% end %>

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

@@ -1,9 +1,9 @@
-<h4><%= t("txt.views.labels.template_form") %></h4>
-<div class="relation">
-  <%=  label.value %>
+<div class="panel">
+  <h2><%= t("txt.views.labels.template_form") %></h2>
+  <%= label.value %>
 </div>
 
-<h4><%= t("txt.views.labels.language") %></h4>
-<div class="relation">
+<div class="panel">
+  <h2><%= t("txt.views.labels.language") %></h2>
   <%= label.language %>
-</div>
+</div

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

@@ -1,22 +1,9 @@
-<%= error_messages_for @label %>
-
-<h2><%= t("txt.views.labels.edit.header") %> <strong><%=h @label.value %></strong></h2>
-
-<% if @association_objects_in_editing_mode.present? %>
+<%= render 'header', :label => @label %>
+<%= render 'sidebar', :label => @label %>
 
-  <% if @association_objects_in_editing_mode[:label_relations].present? %>
-    <h4><%= t("txt.common.referenced_labels") %></h4>
-    <%  @association_objects_in_editing_mode[:label_relations].each do |label_relation| %>
-      <%= label_relation.type.demodulize + ': ' + link_to(label_relation.range.value, label_path(:published => 0, :id => label_relation.range)) + user_and_phone_number(t("txt.common.editor"), label_relation.range.locking_user.name, label_relation.range.locking_user.telephone_number) %><br />
-    <% end %>
-  <% end %>
-
-<% end %>
+<%= error_messages_for @label %>
 
-<%= render :partial => "labels/base_data" %>
+<%= render 'labels/notifications/referenced_labels',
+  :association_objects_in_editing_mode => @association_objects_in_editing_mode %>
 
-<%= content_for :sub_navigation do %>
-  <ul>
-    <li><%= link_to t('txt.views.navigation.back_to_preview'), label_path(:published => 0, :id => @label), :class => 'back' %></li>
-  </ul>
-<% end %>
+<%= render 'form', :label => @label %>

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

@@ -1,3 +1,4 @@
-<h2><%= t("txt.views.labels.new") %></h2>
+<%= page_header :title => t("txt.views.labels.new") %>
+
 <%= error_messages_for @label %>
-<%= render :partial => "labels/base_data" %>
+<%= render 'form', :label => @label %>

data/app/views/labels/notifications/_referenced_labels.html.erb

@@ -0,0 +1,14 @@
+<% if association_objects_in_editing_mode && association_objects_in_editing_mode[:label_relations].any? %>
+  <%= alert(:notice, :header => t("txt.common.referenced_labels")) do %>
+    <ul>
+      <% association_objects_in_editing_mode[:label_relations].each do |label_relation| %>
+        <li>
+          <%= label_relation.class.model_name.human %>
+          <%= link_to(label_relation.range.value,
+            label_path(:published => 0, :id => label_relation.range)) %>
+          <%= t("txt.common.editor") %> <%= user_details(concept_relation.target.locking_user) %>
+        </li>
+      <% end %>
+    </ul>
+  <% end # alert %>
+<% end # if %>

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

@@ -1,11 +1,14 @@
-<%= render 'show_head' %>
+<%= render 'header', :label => @label %>
+<%= render 'sidebar', :label => @label %>
 
 <% if can?(:read, @new_label_version) || can?(:branch, @label) %>
-  <div class="editing_versioning_toolbar ui-corner-all ui-widget ui-widget-content">
+  <div class="editing_versioning_toolbar well">
     <% if @new_label_version.blank? && can?(:branch, @label) %>
-      <%= button_to t("txt.views.versioning.versioning_mode"), label_versions_branch_path(:origin => @label.origin) %>
+      <%= button_to t("txt.views.versioning.versioning_mode"),
+      label_versions_branch_path(:origin => @label.origin), :class => 'btn' %>
     <% elsif can?(:read, @new_label_version) %>
-      <%= link_to t("txt.views.versioning.preview_new_version"), label_path(:published => 0, :id => @new_label_version) %>
+      <%= link_to t("txt.views.versioning.preview_new_version"),
+      label_path(:published => 0, :id => @new_label_version), :class => 'btn' %>
     <% end %>
   </div>
 <% end %>

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

@@ -1,35 +1,43 @@
-<%= render 'show_head' %>
+<%= render 'header', :label => @label %>
+<%= render 'sidebar', :label => @label %>
 
-<p class="flash_notice">
-  <%= t("txt.views.versioning.current_revision") %> <%= @label.rev %><% if @label.locked? %> <%= t("txt.views.versioning.in_ongoing_editing_by") %> <%= @label.locking_user.name %><% end %>
-</p>
-
-<div class="editing_versioning_toolbar ui-corner-all ui-widget ui-widget-content">
+<%= 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 %>
     <%= button_to t("txt.views.versioning.publishing"),
-      label_versions_merge_path(:origin => @label.origin) %>
+      label_versions_merge_path(:origin => @label.origin), :class => 'btn btn-primary' %>
   <% end %>
   <%= button_to t("txt.views.versioning.consistency_check"),
-    label_versions_consistency_check_path(:origin => @label.origin), :method => :get %>
+    label_versions_consistency_check_path(:origin => @label.origin),
+    :method => :get, :class => 'btn' %>
 
   <% if (not @label.in_review?) && @label.locked_by == @current_user.id %>
-    <%= button_to t("txt.common.to_review"), label_versions_to_review_path(:origin => @label.origin) %>
+    <%= button_to t("txt.common.to_review"),
+    label_versions_to_review_path(:origin => @label.origin),
+    :class => 'btn' %>
   <% end %>
 
   <% unless @label.locked? %>
     <%= button_to t("txt.views.versioning.to_edit_mode"),
-      label_versions_lock_path(:origin => @label.origin) %>
+      label_versions_lock_path(:origin => @label.origin), :class => 'btn' %>
     <%= button_to t("txt.views.versioning.delete"),
       label_path(:published => 0, :id => @label.origin),
       :method => :delete,
-      :confirm => I18n.t("txt.views.versioning.delete_confirm") %>
+      :confirm => I18n.t("txt.views.versioning.delete_confirm"),
+      :class => 'btn' %>
   <% else %>
     <%= button_to t("txt.views.versioning.unlock"),
-      label_versions_unlock_path(:origin => @label.origin) if can?(:unlock, @label) %>
+      label_versions_unlock_path(:origin => @label.origin),
+      :class => 'btn' if can?(:unlock, @label) %>
     <%= link_to t("txt.views.versioning.edit_mode"),
       edit_label_path(:published => 0, :id => @label.origin),
-      :class => "button" if can?(:update, @label) %>
+      :class => 'btn' if can?(:update, @label) %>
   <% end %>
 </div>
 

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

@@ -1,5 +1,5 @@
-<div class="relation">
-  <h4><%= klass.model_name.human(:count => 2) %></h4>
+<div class="relation panel">
+  <h2><%= klass.model_name.human(:count => 2) %></h2>
   <div class="relation-body">
     <%= item_listing(label.related_labels_for_relation_class(klass)) do |label|
       link_to label.value, label_path(:id => label)

data/app/views/partials/label/relation/_edit_base.html.erb

@@ -1,13 +1,11 @@
-<li>
-  <%= label_tag(klass.name.to_relation_name,
-          klass.model_name.human(:count => 2)) %>
-  <%= text_field_tag "label[inline_#{klass.name.to_relation_name}]",
-          label.send("inline_#{klass.name.to_relation_name}"),
-          :id => "#{klass.name.to_relation_name}",
-          :class => "entity_select",
-          :"data-query-url" => labels_path(:format => :json),
-          :"data-entity-uri" => label_path("{id}"),
-          :"data-entities" => Iqvoc::XLLabel.base_class.editor_selectable.
-              by_origin(label.send("inline_#{klass.name.to_relation_name}")).
-              map { |l| label_widget_data(l) }.to_json %>
-</li>
+<% fieldname = "label[inline_#{klass.name.to_relation_name}]" %>
+<%= f.input fieldname, :label => klass.model_name.human(:count => 2) do %>
+  <%= text_field_tag fieldname, label.send("inline_#{klass.name.to_relation_name}"),
+    :id => klass.name.to_relation_name,
+    :class => "entity_select",
+    :"data-query-url" => labels_path(:format => :json),
+    :"data-entity-uri" => label_path("{id}"),
+    :"data-entities" => Iqvoc::XLLabel.base_class.editor_selectable.
+        by_origin(label.send("inline_#{klass.name.to_relation_name}")).
+        map { |l| label_widget_data(l) }.to_json %>
+<% end %>

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

@@ -1,7 +1,5 @@
-<%- if can?(:create, Iqvoc::XLLabel.base_class) -%>
-  <%= t("txt.views.labels.new") %>
-  (<%- Iqvoc::Concept::labeling_class_names.values.flatten.map(&:to_s).uniq.each do |language| -%>
-    <%= link_to language.to_s,
-            new_label_path(:published => 0, :language => language) %>
-  <%- end -%>)
-<%- end -%>
+<%= sidebar_item :path => new_label_path, :perms => [:create, Iqvoc::XLLabel.base_class], :active => params[:action] == 'new' do %>
+  <%= icon(:edit) + " " + t('txt.views.labels.new') %> (<% Iqvoc::Concept::labeling_class_names.values.flatten.map(&:to_s).uniq.each do |language| %>
+    <%= link_to language.to_s, new_label_path(:published => 0, :language => language), :class => 'inline-language-selector' %>
+  <% end %>)
+<% end %>

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

@@ -1,19 +1,19 @@
-<%= content_tag("div", { :class => "relation translation", :lang => defined?(concept) ? lang || nil : nil }, true) do %>
-  <%- if defined?(concept) -%>
-    <h4><%= klass.model_name.human(:count => 2) %> (<%= lang %>)</h4>
+<%= content_tag :div, :class => "relation translation panel", :lang => (lang if defined?(concept)) do %>
+  <% if defined?(concept) %>
+    <h2><%= klass.model_name.human(:count => 2) %> <small><%= "#{t("languages.#{lang}", :default => lang.to_s)}" %></small></h2>
     <div class="relation-body">
       <%= item_listing(concept.labels_for_labeling_class_and_language(klass, lang.to_s)) do |label|
         link_to label.value, label_path(:id => label)
       end
     %>
     </div>
-  <%- elsif defined?(label) -%>
-    <h4><%= klass.model_name.human %> <%= t("txt.common.of") %></h4>
+  <% elsif defined?(label) %>
+    <h2><%= klass.model_name.human %> <%= t("txt.common.of") %></h2>
     <div class="relation">
       <%= item_listing(label.concepts_for_labeling_class(klass)) do |c|
         link_to c.to_s, concept_path(:id => c)
       end
     %>
     </div>
-  <%- end -%>
-<%- end -%>
+  <% end %>
+<% end %>

data/config/database.mysql.yml

@@ -0,0 +1,20 @@
+development:
+  adapter: mysql2
+  database: iqvoc_skosxl_development
+  username: root
+  password:
+  encoding: utf8
+
+test:
+  adapter: mysql2
+  database: iqvoc_skosxl_test
+  username: root
+  password:
+  encoding: utf8
+
+production:
+  adapter: mysql2
+  database: iqvoc_skosxl_production
+  username: root
+  password:
+  encoding: utf8

data/config/database.sqlite.yml

@@ -0,0 +1,17 @@
+development:
+  adapter: sqlite3
+  database: db/development.sqlite
+  timeout: 5000
+  pool: 5
+
+test:
+  adapter: sqlite3
+  database: db/test.sqlite
+  timeout: 5000
+  pool: 5
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite
+  timeout: 5000
+  pool: 5

data/config/locales/activerecord.de.yml

@@ -4,7 +4,7 @@ de:
       label/skosxl/base:
         one: XL-Label
         other: XL-Labels
-      label/skosxl/relation/base:
+      label/relation/skosxl/base:
         one: Label-Relation
         other: Label-Relationen
       labeling/skosxl/base:
@@ -16,3 +16,7 @@ de:
       labeling/skosxl/alt_label:
         one: Alternatives Label
         other: Alternative Labels
+
+    attributes:
+      label/skosxl/base:
+        value: Vorlageform

data/config/locales/activerecord.en.yml

@@ -4,7 +4,7 @@ en:
       label/skosxl/base:
         one: XL Label
         other: XL Labels
-      label/skosxl/relation/base:
+      label/relation/skosxl/base:
         one: Label Relation
         other: Label Relations
       labeling/skosxl/base:
@@ -16,3 +16,7 @@ en:
       labeling/skosxl/alt_label:
         one: Alternative Label
         other: Alternative Labels
+
+    attributes:
+      label/skosxl/base:
+        value: Value

data/config/locales/de.yml

@@ -1,5 +1,9 @@
 de:
   txt:
+    views:
+      layouts:
+        sections:
+          concepts: Konzepte
     models:
       label:
         origin_invalid: enthält ungültige Zeichen.

data/config/locales/en.yml

@@ -1,5 +1,9 @@
 en:
   txt:
+    views:
+      layouts:
+        sections:
+          concepts: Konzepte
     models:
       label:
         origin_invalid: Origin contains invalid characters.

data/iqvoc_skosxl.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary     = "iQvoc SKOS-XL extension"
   s.description = ""
 
-  s.add_dependency "iqvoc", "~> 3.5.1"
+  s.add_dependency "iqvoc", "~> 4.0.0"
   s.add_dependency "bundler"
 
   s.files = %w(README.md Gemfile Gemfile.lock Rakefile iqvoc_skosxl.gemspec) + Dir.glob("{app,config,db,public,lib,test}/**/*")

data/lib/iqvoc/skosxl/version.rb

@@ -1,5 +1,5 @@
 module Iqvoc
   module SKOSXL
-    VERSION = "1.2.3"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc_skosxl
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,22 +11,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000 Z
+date: 2012-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iqvoc
-  requirement: &70213534282900 !ruby/object:Gem::Requirement
+  requirement: &70351838150520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 4.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70213534282900
+  version_requirements: *70351838150520
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70213534297700 !ruby/object:Gem::Requirement
+  requirement: &70351838149880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,7 +34,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70213534297700
+  version_requirements: *70351838149880
 description: ''
 email:
 - till.schulte-coerne@innoq.com
@@ -64,17 +64,13 @@ files:
 - app/models/labeling/skosxl/base.rb
 - app/models/labeling/skosxl/hidden_label.rb
 - app/models/labeling/skosxl/pref_label.rb
-- app/views/labels/_base_data.html.erb
-- app/views/labels/_change_note.html.erb
-- app/views/labels/_details.html.erb
-- app/views/labels/_label_relation.html.erb
-- app/views/labels/_labeling.html.erb
-- app/views/labels/_note.html.erb
-- app/views/labels/_show_head.html.erb
+- app/views/labels/_form.html.erb
+- app/views/labels/_header.html.erb
+- app/views/labels/_sidebar.html.erb
 - app/views/labels/_value_and_language.html.erb
 - app/views/labels/edit.html.erb
 - app/views/labels/new.html.erb
-- app/views/labels/show.ttl.erb
+- app/views/labels/notifications/_referenced_labels.html.erb
 - app/views/labels/show_published.html.erb
 - app/views/labels/show_unpublished.html.erb
 - app/views/partials/label/relation/_base.html.erb
@@ -87,6 +83,8 @@ files:
 - app/views/rdf/show_label.iqrdf
 - config/application.rb
 - config/boot.rb
+- config/database.mysql.yml
+- config/database.sqlite.yml
 - config/database.template.yml
 - config/database.yml
 - config/engine.rb
@@ -119,7 +117,6 @@ files:
 - test/integration/labels_order_test.rb
 - test/integration_test_helper.rb
 - test/test_helper.rb
-- test/unit/hygiene_test.rb
 - test/unit/label_test.rb
 homepage: http://innoq.com
 licenses: []
@@ -141,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: iQvoc SKOS-XL extension
@@ -153,5 +150,4 @@ test_files:
 - test/integration/labels_order_test.rb
 - test/integration_test_helper.rb
 - test/test_helper.rb
-- test/unit/hygiene_test.rb
 - test/unit/label_test.rb

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

@@ -1,62 +0,0 @@
-<h3><%= Label::Base.model_name.human %></h3>
-
-<%= form_for @label, :as => 'label', :url => @label.new_record? ? labels_path : label_path(:id => @label, :published => 0), :html => {:class => "form"} do |f| %>
-  <fieldset id="label_base_data">
-    <legend><%= t("txt.common.attributes") %></legend>
-    <ol>
-      <li>
-        <label><%= t("txt.views.labels.template_form") %></label>
-        <%= f.text_field :value %>
-      </li>
-      <li>
-        <%= f.label :language %>
-        <%= @label.language %>
-        <%= f.hidden_field :language %>
-      </li>
-
-      <%- if Iqvoc::XLLabel.has_additional_base_data -%>
-        <%= render :partial => 'partials/label/additional_base_data', :locals => { :f => f } %>
-      <%- end -%>
-
-      <li>
-        <%= f.label :follow_up %>
-        <%= f.text_field :follow_up, :class => "datepicker" %>
-      </li>
-      <li>
-        <%= f.label :expired_at %>
-        <%= f.text_field :expired_at, :class => "datepicker" %>
-      </li>
-    </ol>
-  </fieldset>
-
-  <fieldset>
-    <legend>Relations</legend>
-    <ol>
-      <%- Iqvoc::XLLabel.relation_classes.each do |relation_class| -%>
-        <%= render relation_class.edit_partial_name(@label), :label => @label, :klass => relation_class %>
-      <%- end -%>
-    </ol>
-  </fieldset>
-
-  <%- Iqvoc::XLLabel.additional_association_classes.keys.each do |association_class| -%>
-    <fieldset>
-      <legend><%= association_class.model_name.human(:count => 2) %></legend>
-      <ol>
-        <%= render association_class.edit_partial_name(@label), :label => @label, :klass => association_class, :f => f %>
-      </ol>
-    </fieldset>
-  <%- end -%>
-
-
-  <% unless @label.new_record? %>
-    <% Iqvoc::XLLabel.note_classes.each do |note_class| %>
-      <%= render note_class.edit_partial_name(@label), :owner_klass => @label, :assoc_klass => note_class, :f => f %>
-    <% end %>
-  <% end %>
-
-  <%= f.submit t("txt.common.save") %>
-
-  <% unless controller.action_name == "new" || controller.action_name == "create" %>
-    <%= link_to t("txt.common.reset"), nil, :class => "button" %>
-  <% end %>
-<% end %>

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

@@ -1,46 +0,0 @@
-<fieldset id="label_umt_change_note_data" class="note_relation">
-  <legend><%= t("txt.common.umt_change_note", :count => 2) %></legend>
-  <ol>
-    <% change_notes = @label.umt_change_notes.sort {|a,b| a.created_at <=> b.created_at } %>
-    <% change_notes.each do |note| %>
-    <li class="inline_note<%= " new" if note.new_record? %>">
-      <%= f.fields_for :umt_change_notes, note do |note_form| %>
-        <% if note == change_notes.last %>
-        <%= note_form.label :value, t("txt.common.umt_change_note", :count => 1) %>
-        <%= note_form.text_area :value, :rows => 5, :cols => 40 %>
-
-        <br />
-
-        <label><%= t("txt.common.note_annotation", :count => 2) %></label>
-        <textarea disabled="true" rows="3" cols="40">
-          <%= note.annotations.map { |na| "#{na.identifier} #{na.value}" }.join("\n") %>
-        </textarea>
-
-        <br />
-
-        <%= note_form.label :language, t("txt.common.language") %>
-        <%= note_form.select :language, options_for_language_select(note.new_record? ? @label.language : note.language) %>
-
-        <br />
-        <% else %>
-
-        <label><%= t("txt.common.value") %></label>
-        <span><%= note.value %></span>
-        <br/>
-
-        <% note.annotations.each do |na| %>
-        <label><%= na.identifier %></label>
-        <span><%= na.value %></span>
-        <br/>
-        <% end %>
-
-        <% end %>
-
-        <%#= note_form.check_box :"_destroy" %>
-        <%#= note_form.label :"_destroy", t("txt.views.labels.edit.delete") %>
-      <% end %>
-    </li>
-    <% end %>
-  </ol>
-  <input type="button" value="<%= t("txt.common.add_note") %>">
-</fieldset>

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

@@ -1,6 +0,0 @@
-<%- if label.expired_at -%>
-  <h4><%= t("txt.views.labels.expired_at") %></h4>
-  <div class="relation">
-    <%= l(label.expired_at)%>
-  </div>
-<%- end -%>

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

@@ -1,7 +0,0 @@
-<li>
-  <%= link_to(label_relation.range.value, label_path(:id => label_relation.range)) %>
-  <%= link_to(image_tag("note_edit.png"), edit_label_relation_path(:id => label_relation)) %>
-  <%= link_to(image_tag("note_delete.png"), label_relation_path(:id => label_relation),
-    :method => :delete,
-    :confirm => t("txt.views.labels.edit.delete_confirm")) %>
-</li>

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

@@ -1,3 +0,0 @@
-<li>
-  <%= link_to labeling.owner.pref_label, concept_path(:id => labeling.owner) %>
-</li>

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

@@ -1,33 +0,0 @@
-<fieldset id="label_<%= klass %>_data" class="note_relation">
-  <legend><%= t("txt.common.#{klass}", :count => 2) %></legend>
-  <ol>
-    <% @label.send(klass.pluralize).each do |note| %>
-    <li class="inline_note<%= " new" if note.new_record? %>">
-      <%= f.fields_for :"#{klass.pluralize}", note do |note_form| %>
-        <%= note_form.label :value, t("txt.common.#{klass}", :count => 1) %>
-        <%= note_form.text_area :value, :rows => 5, :cols => 40 %>
-
-        <br />
-
-        <% if klass == "umt_change_note" %>
-        <label><%= t("txt.common.note_annotation", :count => 2) %></label>
-        <textarea disabled="true" rows="3" cols="40">
-          <%= note.annotations.map { |na| "#{na.identifier} #{na.value}" }.join("\n") %>
-        </textarea>
-
-        <br />
-        <% end %>
-
-        <%= note_form.label :language, t("txt.common.language") %>
-        <%= note_form.select :language, options_for_language_select(note.new_record? ? @label.language : note.language) %>
-
-        <br />
-
-        <%= note_form.check_box :"_destroy" %>
-        <%= note_form.label :"_destroy", t("txt.common.delete") %>
-      <% end %>
-    </li>
-    <% end %>
-  </ol>
-  <input type="button" value="<%= t("txt.common.add_note") %>">
-</fieldset>

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

@@ -1,22 +0,0 @@
-<%- published_param = @label.published? ? nil : 0 %>
-<%= content_for :head do -%>
-  <link href="<%= rdf_url(@label.origin, :format => :ttl, :published => published_param, :lang => nil) %>" type="text/turtle" rel="alternate" title=""/>
-  <link href="<%= rdf_url(@label.origin, :format => :rdf, :published => published_param, :lang => nil) %>" type="application/rdf+xml" rel="alternate" title=""/>
-<% end -%>
-
-<h2><%= @label.class.model_name.human %>:
-  <%= @label.origin %>
-  <%- if !@label.published? %>
-    (<%= t('txt.common.unpublished_version') %>)
-  <%- end -%>
-</h2>
-
-<div id="abstract_uri">
-  <%= rdf_url(@label.origin, :format => nil, :published => published_param, :lang => nil) %>
-  (<%= link_to "Turtle", rdf_url(@label.origin, :format => :ttl, :published => published_param, :lang => nil) %>,
-  <%= link_to "RDF/XML", rdf_url(@label.origin, :format => :rdf, :published => published_param, :lang => nil) %>)
-</div>
-
-<%- if @label.expired_at -%>
-  <h4><%= t('txt.views.concepts.expired_at', :date => l(@label.expired_at, :format => :long)) %></h4>
-<%- end -%>

data/app/views/labels/show.ttl.erb

@@ -1 +0,0 @@
-<%= render_ttl_for_label(@label) %>

data/test/unit/hygiene_test.rb

@@ -1,4 +0,0 @@
-# encoding: UTF-8
-
-require Iqvoc::Engine.find_root_with_flag("app").join("test").join("unit").
-    join("hygiene_test")