iqvoc_skosxl 2.0.0 → 2.0.1

data/app/assets/stylesheets/iqvoc_skosxl/entity_select.css

@@ -0,0 +1,3 @@
+.entity_select {
+  display: inline-block;
+}

data/app/assets/stylesheets/iqvoc_skosxl/manifest.css

@@ -0,0 +1,3 @@
+/*
+*= require iqvoc_skosxl/entity_select
+*/

data/app/helpers/iqvoc_skosxl_helper.rb

@@ -15,4 +15,11 @@ module IqvocSkosxlHelper
     end
   end
 
+  def search_result_label(label, concept)
+    str = ActiveSupport::SafeBuffer.new
+    str << label
+    str << " (#{concept.additional_info})" if concept.additional_info
+    str
+  end
+
 end

data/app/models/label/skosxl/base.rb

@@ -130,15 +130,6 @@ class Label::SKOSXL::Base < Label::Base
     "partials/label/skosxl/edit_link_base"
   end
 
-  def self.from_rdf(str)
-    h = Iqvoc::RdfHelper.split_literal(str)
-    self.new(:value => h[:value], :language => h[:language])
-  end
-
-  def self.from_rdf!(str)
-    self.from_rdf(str).save!
-  end
-
   def build_rdf_subject(document, controller, &block)
     ns = IqRdf::Namespace.find_namespace_class(self.rdf_namespace.to_sym)
     raise "Namespace '#{rdf_namespace}' is not defined in IqRdf document." unless ns
@@ -161,9 +152,9 @@ class Label::SKOSXL::Base < Label::Base
   end
 
   def from_rdf(str)
-    h = Iqvoc::RdfHelper.split_literal(str)
-    self.value    = h[:value]
-    self.language = h[:language]
+    raise "invalid rdf literal" unless str =~ /^"(.+)"(@(.+))$/
+    self.value = $1
+    self.language = $3
     self
   end
 

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

@@ -1,15 +1,19 @@
-<%= content_tag("li", { :class => "translation", :lang => language || nil }, true) do %>
-  <%= label_tag(klass.name.to_relation_name,
-          klass.model_name.human(:count => 2) + " (#{language})") %>
-  <%= text_field_tag "concept[labelings_by_id][#{klass.name.to_relation_name}][#{language}]",
-          concept.labelings_by_id(klass.name.to_relation_name, language),
-          :id => "#{klass.name.to_relation_name}_#{language}",
-          :class => "entity_select",
-          :"data-query-url" => labels_path(:format => :json, :language => language),
-          :"data-entity-uri" => label_path("{id}"),
-          :"data-entities" => Iqvoc::XLLabel.base_class.editor_selectable.
-              by_language(language).by_origin(concept.labelings_by_id(
-                  klass.name.to_relation_name, language).
-                  split(Iqvoc::InlineDataHelper::Splitter)).
-              map { |l| label_widget_data(l) }.to_json %>
-<%- end -%>
+<%= content_tag :div, :class => "translation", :lang => language || nil do %>
+  <%- fieldname = "concept[labelings_by_id][#{klass.name.to_relation_name}][#{language}]" -%>
+  <%- label = klass.model_name.human(:count => 2) -%>
+
+  <%= f.label label %>
+  <%= f.input fieldname, :wrapper => :prepend, :label => false do %>
+    <span class="add-on"><%= language %></span><%= text_field_tag "concept[labelings_by_id][#{klass.name.to_relation_name}][#{language}]",
+            concept.labelings_by_id(klass.name.to_relation_name, language),
+            :id => "#{klass.name.to_relation_name}_#{language}",
+            :class => "entity_select",
+            :"data-query-url" => labels_path(:format => :json, :language => language),
+            :"data-entity-uri" => label_path("{id}"),
+            :"data-entities" => Iqvoc::XLLabel.base_class.editor_selectable.
+                by_language(language).by_origin(concept.labelings_by_id(
+                    klass.name.to_relation_name, language).
+                    split(Iqvoc::InlineDataHelper::Splitter)).
+                map { |l| label_widget_data(l) }.to_json %>
+  <% end %>
+<% end %>

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

@@ -1,9 +1,9 @@
-<%- if concept = result.owner -%>
+<% if concept = result.owner %>
   <dt>
-    <%= link_to highlight_query(result.target.value, params[:query]), concept_path(:id => concept) %>
+    <%= link_to search_result_label(highlight_query(result.target.value, params[:query]), concept), concept_path(:id => concept) %>
   </dt>
   <dd><%= t('txt.views.search_results.type') %>: <%= result.class.model_name.human %></dd>
-  <%- if result.target.language -%>
+  <% if result.target.language %>
     <dd><%= t('txt.views.search_results.language') %>: <%= result.target.language %></dd>
-  <%- end -%>
-<%- end -%>
+  <% end %>
+<% end %>

data/config/locales/en.yml

@@ -3,7 +3,7 @@ en:
     views:
       layouts:
         sections:
-          concepts: Konzepte
+          concepts: Concepts
     models:
       label:
         origin_invalid: Origin contains invalid characters.

data/lib/iqvoc/skosxl/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc_skosxl
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iqvoc
-  requirement: &70351838150520 !ruby/object:Gem::Requirement
+  requirement: &70188584862520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 4.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70351838150520
+  version_requirements: *70188584862520
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70351838149880 !ruby/object:Gem::Requirement
+  requirement: &70188584878460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,7 +34,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70351838149880
+  version_requirements: *70188584878460
 description: ''
 email:
 - till.schulte-coerne@innoq.com
@@ -49,6 +49,7 @@ files:
 - iqvoc_skosxl.gemspec
 - app/assets/javascripts/iqvoc_skosxl/manifest.js
 - app/assets/javascripts/manifest.js
+- app/assets/stylesheets/iqvoc_skosxl/entity_select.css
 - app/assets/stylesheets/iqvoc_skosxl/manifest.css
 - app/assets/stylesheets/manifest.css
 - app/controllers/labels/versions_controller.rb