iqvoc 4.1.2 → 4.1.3

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

@@ -17,13 +17,13 @@
         <%= render "layouts/controls" %>
 
         <% unless @suppress_quicksearch %>
-        <%= form_tag alphabetical_concepts_path(:prefix => nil), :method => :get,
+<!--         <%= form_tag alphabetical_concepts_path(:prefix => nil), :method => :get,
                 :class => "navbar-search pull-right" do %>
           <%= search_field_tag "prefix", nil, :id => nil,
                   :class => "quicksearch search-query span2",
                   :autofocus => (autofocus rescue nil),
                   :placeholder => t("txt.views.navigation.quick_search") %>
-          <% end %>
+          <% end %> -->
         <% end %>
       </div>
 

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

@@ -0,0 +1,10 @@
+<%= form_tag(search_path, :method => :get, :class => 'form-horizontal', :id => 'search') do %>
+  <fieldset id="typecheck" class="">
+    <% Iqvoc.search_sections.each do |section| %>
+      <%= render "search_results/sections/#{section}" %>
+    <% end %>
+    <div class="form-actions">
+      <%= submit_tag t('txt.views.search_results.submit'), :class => 'btn btn-primary' %>
+    </div>
+  </fieldset>
+<% end %>

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

@@ -1,63 +1,8 @@
 <%= render 'header' %>
 <%= render 'sidebar', :results => @results %>
 
-<%= form_tag(search_path, :method => :get, :class => 'form-horizontal', :id => 'search') do %>
-  <fieldset id="typecheck" class="">
-    <%= input_block :label => t('txt.views.search_results.for'), :id => 't' do %>
-      <select name="t" id="t" class="search_type">
-        <%= options_for_select(Iqvoc.searchable_classes.map { |c|
-            [c.model_name.human(:count => 2), c.name.parameterize]
-          }, params[:t]) %>
-      </select>
-    <% end %>
-
-    <%= input_block :label => t('txt.views.search_results.mode'), :id => 'qt' do %>
-      <%= select_tag :qt, options_for_select([
-          [t('txt.views.search_results.contains'), 'contains'],
-          [t('txt.views.search_results.exact'), 'exact'],
-          [t('txt.views.search_results.ends_with'), 'ends_with'],
-          [t('txt.views.search_results.begins_with'), 'begins_with']
-        ], params[:qt]) %>
-    <% end %>
-
-    <%= input_block :label => t('txt.views.search_results.search_term'), :id => 'q' do %>
-      <% if Iqvoc.searchable_classes.detect {|c| c.supports_multi_query? } %>
-        <%= text_area_tag :q, params[:query] %>
-      <% else %>
-        <%= text_field_tag :q, params[:query] %>
-      <% end %>
-    <% end %>
-
-    <%= input_block :label => t('txt.views.search_results.for') do %>
-      <label for="for_concept" class="radio"><%= radio_button_tag 'for', 'concept', params[:for] == "concept" %> <%= Iqvoc::Concept.base_class.model_name.human(:count => 2) %></label>
-      <label for="for_collection" class="radio"><%= radio_button_tag 'for', 'collection', params[:for] == "collection" %> <%= Iqvoc::Collection.base_class.model_name.human(:count => 2) %></label>
-      <label for="for_all" class="radio"><%= radio_button_tag 'for', 'all', !%w(concept collection).include?(params[:for]) %> <%= t("txt.views.search_results.all") %></label>
-    <% end %>
-
-    <%= input_block :label => Iqvoc::Collection.base_class.model_name.human, :id => 'c' do %>
-      <%= select_tag 'c', options_for_select(@collections.sort { |a, b| a.pref_label.to_s <=> b.pref_label.to_s }.map { |c| [c.pref_label.to_s, c.origin] }, params[:c]), :include_blank => true %>
-    <% end %>
+<%= render 'form' %>
 
-    <%= input_block :label => t('txt.views.search_results.search_languages') do %>
-      <% @available_languages.sort.each do |lang_tag, label| %>
-        <label for="languages_<%= lang_tag %>" class="checkbox inline">
-          <%= check_box_tag "l[]", lang_tag, select_search_checkbox?(lang_tag), :id => "languages_#{lang_tag}", :class => 'lang_check' %><%= lang_tag %>
-        </label>
-      <% end %>
-      <div class="btn-group">
-        <button type="button" id="language_select_all" class="btn btn-mini">
-          <%= t('txt.views.search_results.all') %>
-        </button>
-        <button type="button" id="language_select_none" class="btn btn-mini">
-          <%= t('txt.views.search_results.none') %>
-        </button>
-      </div>
-    <% end %>
-    <div class="form-actions">
-      <%= submit_tag t('txt.views.search_results.submit'), :class => 'btn btn-primary' %>
-    </div>
-  </fieldset>
-<% end %>
 <% if @results %>
 <div class="panel">
   <%= results_header @results %>
@@ -65,11 +10,9 @@
   <dl id="search_results">
     <% @results.each do |result| %>
       <% if @klass %>
-        <%= render :partial => @klass.search_result_partial_name,
-                :locals => { :result => result } %>
+        <%= render @klass.search_result_partial_name, :result => result %>
       <% else %>
-        <%= render :partial => result.class.search_result_partial_name,
-                :locals => { :result => result } %>
+        <%= render result.class.search_result_partial_name, :result => result %>
       <% end %>
     <% end %>
   </dl>
@@ -77,6 +20,3 @@
   <%= paginate @results %>
 <% end %>
 </div>
-
-<%= content_for :sub_navigation do %>
-<% end %>

data/app/views/search_results/sections/_collection.html.erb

@@ -0,0 +1,3 @@
+<%= input_block :label => Iqvoc::Collection.base_class.model_name.human, :id => 'c' do %>
+  <%= select_tag 'c', options_for_select(@collections.sort { |a, b| a.pref_label.to_s <=> b.pref_label.to_s }.map { |c| [c.pref_label.to_s, c.origin] }, params[:c]), :include_blank => true %>
+<% end %>

data/app/views/search_results/sections/_klass.html.erb

@@ -0,0 +1,7 @@
+<%= input_block :label => t('txt.views.search_results.for'), :id => 't' do %>
+  <select name="t" id="t" class="search_type">
+    <%= options_for_select(Iqvoc.searchable_classes.map { |c|
+        [c.model_name.human(:count => 2), c.name.parameterize]
+      }, params[:t]) %>
+  </select>
+<% end %>

data/app/views/search_results/sections/_languages.html.erb

@@ -0,0 +1,15 @@
+<%= input_block :label => t('txt.views.search_results.search_languages') do %>
+  <% @available_languages.sort.each do |lang_tag, label| %>
+    <label for="languages_<%= lang_tag %>" class="checkbox inline">
+      <%= check_box_tag "l[]", lang_tag, select_search_checkbox?(lang_tag), :id => "languages_#{lang_tag}", :class => 'lang_check' %><%= lang_tag %>
+    </label>
+  <% end %>
+  <div class="btn-group">
+    <button type="button" id="language_select_all" class="btn btn-mini">
+      <%= t('txt.views.search_results.all') %>
+    </button>
+    <button type="button" id="language_select_none" class="btn btn-mini">
+      <%= t('txt.views.search_results.none') %>
+    </button>
+  </div>
+<% end %>

data/app/views/search_results/sections/_mode.html.erb

@@ -0,0 +1,8 @@
+<%= input_block :label => t('txt.views.search_results.mode'), :id => 'qt' do %>
+  <%= select_tag :qt, options_for_select([
+      [t('txt.views.search_results.contains'), 'contains'],
+      [t('txt.views.search_results.exact'), 'exact'],
+      [t('txt.views.search_results.ends_with'), 'ends_with'],
+      [t('txt.views.search_results.begins_with'), 'begins_with']
+    ], params[:qt]) %>
+<% end %>

data/app/views/search_results/sections/_terms.html.erb

@@ -0,0 +1,7 @@
+<%= input_block :label => t('txt.views.search_results.search_term'), :id => 'q' do %>
+  <% if Iqvoc.searchable_classes.detect {|c| c.supports_multi_query? } %>
+    <%= text_area_tag :q, params[:query] %>
+  <% else %>
+    <%= text_field_tag :q, params[:query] %>
+  <% end %>
+<% end %>

data/app/views/search_results/sections/_type.html.erb

@@ -0,0 +1,5 @@
+<%= input_block :label => t('txt.views.search_results.for') do %>
+  <label for="for_concept" class="radio"><%= radio_button_tag 'for', 'concept', params[:for] == "concept" %> <%= Iqvoc::Concept.base_class.model_name.human(:count => 2) %></label>
+  <label for="for_collection" class="radio"><%= radio_button_tag 'for', 'collection', params[:for] == "collection" %> <%= Iqvoc::Collection.base_class.model_name.human(:count => 2) %></label>
+  <label for="for_all" class="radio"><%= radio_button_tag 'for', 'all', !%w(concept collection).include?(params[:for]) %> <%= t("txt.views.search_results.all") %></label>
+<% end %>

data/config/engine.rb

@@ -11,6 +11,7 @@ require 'rails_autolink'
 require 'simple_form'
 require 'sass'
 require 'sass-rails'
+require 'bootstrap-sass'
 
 require 'iqvoc/controller_extensions'
 

data/config/initializers/iqvoc.rb

@@ -22,6 +22,7 @@ require 'iqvoc/versioning'
 require 'iqvoc/deep_cloning'
 require 'iqvoc/rankable'
 require 'iqvoc/ability'
+require 'iqvoc/navigation'
 
 ActiveRecord::Base.send :include, Iqvoc::DeepCloning
 

data/config/locales/de.yml

@@ -90,10 +90,14 @@ de:
          login: "Anmelden"
          logout: "Abmelden"
      instance_configuration:
-       caption: "Instanzkonfiguration"
+       caption: "Konfiguration"
+       groups:
+         common: allgemein
+         languages: Sprachen
+         triplestore: Triplestore
        settings:
          title: Titel
-         note_languages: Sprachen für Notes
+         languages_notes: Sprachen für Notes
          languages_pref_labeling: Sprachen für bevorzugte Labels
          languages_further_labelings_Labeling::SKOS::AltLabel: Sprachen für alternative Labels
          triplestore_url: Triplestore-URL
@@ -141,6 +145,11 @@ de:
        edit:
          header: "Notiz bearbeiten"
      navigation:
+       dashboard: "Dashboard"
+       scheme: "Schema"
+       concepts: "Konzepte"
+       administration: "Verwaltung"
+       extensions: "Erweiterungen"
        back_to_edit_versioned_object: "Zurück zur Bearbeitung"
        back_to_show: "Zurück zur Originalversion"
        back_to_preview: "Zurück zur Versionsvorschau"

data/config/locales/en.yml

@@ -90,10 +90,14 @@ en:
          notes: Notes
          matches: Concept mappings
      instance_configuration:
-       caption: "Instance Configuration"
+       caption: "Configuration"
+       groups:
+         common: common
+         languages: languages
+         triplestore: triplestore
        settings:
          title: site title
-         note_languages: languages for notes
+         languages_notes: languages for notes
          languages_pref_labeling: languages for preferred labels
          languages_further_labelings_Labeling::SKOS::AltLabel: languages for alternative labels
          triplestore_url: triplestore URL
@@ -149,6 +153,11 @@ en:
        edit:
          header: "Edit notes"
      navigation:
+       dashboard: "Dashboard"
+       scheme: "Scheme"
+       concepts: "Concepts"
+       administration: "Administration"
+       extensions: "Extensions"
        back_to_edit_versioned_object: "Back to editing"
        back_to_show: "Back to original version"
        back_to_preview: "Back to version preview"

data/config/locales/pt.yml

@@ -90,7 +90,7 @@ pt:
          notes: "Notas"
          matches: "Mapeamentos conceituais"
      instance_configuration:
-       caption: "Configuração da Instância"
+       caption: "Configuração"
        settings:
          title: "título do sítio"
          languages_pref_labeling: "idiomas para os rótulos preferenciais"
@@ -148,6 +148,11 @@ pt:
        edit:
          header: "Alterar notas"
      navigation:
+       dashboard: "Dashboard"
+       scheme: "Esquema"
+       concepts: "Conceitos"
+       administration: "Administração"
+       extensions: "Extensões"
        back_to_edit_versioned_object: "Retornar para edição"
        back_to_show: "Retornar para edição original"
        back_to_preview: "Retornar para a versão de pré-visualização"

data/db/migrate/20130502151221_fix_collection_member_types.rb

@@ -0,0 +1,8 @@
+class FixCollectionMemberTypes < ActiveRecord::Migration
+  def up
+    execute "UPDATE collection_members SET type ='Collection::Member::SKOS::Base' WHERE type = 'Collection::Member::Collection'"
+  end
+
+  def down
+  end
+end

data/db/migrate/20130508103137_adjust_note_languages_setting.rb

@@ -0,0 +1,17 @@
+class AdjustNoteLanguagesSetting < ActiveRecord::Migration
+
+  class ConfigSettings < ActiveRecord::Base
+    self.table_name = "configuration_settings"
+  end
+
+  def up
+    record = ConfigSettings.where("key" => "note_languages").first
+    record.update_attribute("key", "languages.notes") if record
+  end
+
+  def down
+    record = ConfigSettings.where("key" => "languages.notes").first
+    record.update_attribute("key", "note_languages") if record
+  end
+
+end

data/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130418093837) do
+ActiveRecord::Schema.define(:version => 20130508103137) do
 
   create_table "collection_members", :force => true do |t|
     t.integer "collection_id"

data/iqvoc.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rails_autolink'
   s.add_dependency 'simple_form'
   s.add_dependency 'sass-rails', '~> 3.2.5'
+  s.add_dependency 'bootstrap-sass'
   s.add_dependency 'iq_triplestorage'
 
   s.files = %w(LICENSE README.md CHANGELOG.md Gemfile Gemfile.lock Rakefile iqvoc.gemspec) +

data/lib/iqvoc/ability.rb

@@ -41,6 +41,8 @@ module Iqvoc
           can :import, ::Concept::Base
 
           can :update, Iqvoc::Concept.root_class.instance
+
+          can :use, :administration
         end
       else # no user
         can :create, UserSession

data/lib/iqvoc/configuration/core.rb

@@ -12,53 +12,14 @@ module Iqvoc
           :rdf_namespaces,
           :change_note_class_name,
           :first_level_class_configuration_modules,
-          :ability_class_name,
           :navigation_items,
+          :ability_class_name,
           :localized_routes,
-          :core_assets
+          :core_assets,
+          :search_sections
 
         self.localized_routes = [] # routing extensibility hook
 
-        self.navigation_items = [
-          {
-            :content => proc { link_to "Dashboard", dashboard_path },
-            :controller => "dashboard",
-            :authorized? => proc { can? :use, :dashboard }
-          }, {
-            :content => proc { link_to "Scheme", scheme_path },
-            :controller => "concepts/scheme",
-            :authorized? => proc { can? :read, Iqvoc::Concept.root_class.instance }
-          }, {
-            :content => proc { link_to ::Concept::Base.model_name.human(:count => 2),
-                hierarchical_concepts_path },
-            :controller => "concepts/hierarchical",
-            :active? => proc { %w(concepts/hierarchical concepts/alphabetical concepts/untranslated).include?(params[:controller]) }
-          }, {
-            :content => proc { link_to t("txt.views.navigation.collections"),
-                collections_path },
-            :controller => "collections"
-          }, {
-            :content => proc { link_to t("txt.views.navigation.search"), search_path },
-            :controller => "search_results"
-          }, {
-            :content => proc { link_to t("txt.views.navigation.users"), users_path },
-            :controller => "users",
-            :authorized? => proc { can? :manage, User }
-          }, {
-            :content => proc { link_to t("txt.views.navigation.instance_configuration"),
-                instance_configuration_path },
-            :controller => "instance_configuration",
-            :authorized? => proc { can? :manage, Iqvoc.config }
-          }, {
-            :content => proc { link_to t("txt.views.navigation.help"), help_path },
-            :controller => "pages",
-            :action => "help",
-            :authorized? => proc { can? :read, :help }
-          }, {
-            :content => proc { link_to t("txt.views.navigation.about"), "http://iqvoc.net/" }
-          }
-        ]
-
         self.core_assets = %w(
           manifest.css
           manifest.js
@@ -69,6 +30,60 @@ module Iqvoc
           html5.js
         )
 
+        self.navigation_items = [{
+          :text => "Dashboard",
+          :href => proc { dashboard_path },
+          :controller => "dashboard",
+          :authorized? => proc { can? :use, :dashboard }
+        }, {
+          :text => "Scheme",
+          :href => proc { scheme_path },
+          :controller => "concepts/scheme",
+          :authorized? => proc { can? :read, Iqvoc::Concept.root_class.instance }
+        }, {
+          :text => proc { ::Concept::Base.model_name.human(:count => 2) },
+          :href => proc { hierarchical_concepts_path },
+          :controller => "concepts/hierarchical",
+          :active? => proc {
+            %w(concepts/hierarchical concepts/alphabetical concepts/untranslated).
+                include?(params[:controller])
+          }
+        }, {
+          :text => proc { t("txt.views.navigation.collections") },
+          :href => proc { collections_path },
+          :controller => "collections"
+        }, {
+          :text => proc { t("txt.views.navigation.search") },
+          :href => proc { search_path },
+          :controller => "search_results"
+        }, {
+          :text => proc { t("txt.views.navigation.administration") },
+          :authorized? => proc { can? :use, :administration },
+          :items => [{
+            :text => proc { t("txt.views.navigation.users") },
+            :href => proc { users_path },
+            :controller => "users",
+            :authorized? => proc { can? :manage, User }
+          }, {
+            :text => proc { t("txt.views.navigation.instance_configuration") },
+            :href => proc { instance_configuration_path },
+            :controller => "instance_configuration",
+            :authorized? => proc { can? :manage, Iqvoc.config }
+          }]
+        }, {
+          :text => proc { t("txt.views.navigation.help") },
+          :items => [{
+            :text => proc { t("txt.views.navigation.help") },
+            :href => proc { help_path },
+            :controller => "pages",
+            :action => "help",
+            :authorized? => proc { can? :read, :help }
+          }, {
+            :text => proc { t("txt.views.navigation.about") },
+            :href => "http://iqvoc.net/"
+          }]
+        }]
+
         self.searchable_class_names = [
           'Labeling::SKOS::Base',
           'Labeling::SKOS::PrefLabel',
@@ -94,12 +109,14 @@ module Iqvoc
 
         self.ability_class_name = 'Iqvoc::Ability'
 
+        self.search_sections = ['klass', 'mode', 'terms', 'type', 'collection', 'languages']
+
         # initialize
         self.config.register_settings({
           "title" => "iQvoc",
           "languages.pref_labeling" => ["en", "de"],
           "languages.further_labelings.Labeling::SKOS::AltLabel" => ["en", "de"],
-          "note_languages" => ["en", "de"]
+          "languages.notes" => ["en", "de"]
         })
       end
 
@@ -151,15 +168,18 @@ module Iqvoc
         end
 
         def title
-          return config["title"]
+          config["title"]
         end
 
         def note_languages
-          return config["note_languages"]
+          config["languages.notes"]
         end
 
+        # returns a list of all languages selectable for labels and/or notes
         def all_languages
-          (Iqvoc::Concept.pref_labeling_languages + Iqvoc::Concept.further_labeling_class_names.values.flatten + note_languages).compact.map(&:to_s).uniq
+          (Iqvoc::Concept.pref_labeling_languages +
+              Iqvoc::Concept.further_labeling_class_names.values.flatten +
+              note_languages).compact.map(&:to_s).uniq
         end
 
         # @deprecated