iqvoc 4.3.3 → 4.4.0

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

@@ -1,17 +1,20 @@
 <% if @datasets.any? %>
-  <%= input_block :label => t('txt.views.search_results.datasets') do %>
-    <% @datasets.each do |dataset| %>
-      <label class="checkbox inline">
-        <%= check_box_tag "ds[]", dataset.name, search_dataset_selected?(dataset.name) %><%= dataset.name %>
-      </label>
-    <% end %>
-    <div class="btn-group">
-      <button type="button" class="btn btn-mini checkbox-select-all">
-        <%= t('txt.views.search_results.all') %>
-      </button>
-      <button type="button" class="btn btn-mini checkbox-select-none">
-        <%= t('txt.views.search_results.none') %>
-      </button>
+  <div class="form-group">
+    <%= label_tag 'ds', t('txt.views.search_results.datasets'), :class => 'col-sm-2 control-label' %>
+    <div class="col-sm-4">
+      <% @datasets.each do |dataset| %>
+        <label class="checkbox-inline">
+          <%= check_box_tag "ds[]", dataset.name, search_dataset_selected?(dataset.name) %><%= dataset.name %>
+        </label>
+      <% end %>
+      <div class="btn-group btn-group-xs">
+        <button type="button" class="btn btn-default checkbox-select-all">
+          <%= t('txt.views.search_results.all') %>
+        </button>
+        <button type="button" class="btn btn-default checkbox-select-none">
+          <%= t('txt.views.search_results.none') %>
+        </button>
+      </div>
     </div>
-  <% end %>
+  </div>
 <% end %>

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

@@ -1,7 +1,10 @@
-<%= 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_class_names.map { |klass, identifier|
-        [klass.constantize.model_name.human(:count => 2), identifier]
-      }, params[:t]) %>
-  </select>
-<% end %>
+<div class="form-group">
+  <%= label_tag 't', t('txt.views.search_results.for'), :class => 'col-sm-2 control-label' %>
+  <div class="col-sm-4">
+    <select name="t" id="t" class="search_type form-control">
+      <%= options_for_select(Iqvoc.searchable_class_names.map { |klass, identifier|
+          [klass.constantize.model_name.human(:count => 2), identifier]
+        }, params[:t]) %>
+    </select>
+  </div>
+</div>

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

@@ -1,15 +1,18 @@
-<%= 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, search_language_selected?(lang_tag) %><%= lang_tag %>
-    </label>
-  <% end %>
-  <div class="btn-group">
-    <button type="button" class="btn btn-mini checkbox-select-all">
-      <%= t('txt.views.search_results.all') %>
-    </button>
-    <button type="button" class="btn btn-mini checkbox-select-none">
-      <%= t('txt.views.search_results.none') %>
-    </button>
+<div class="form-group">
+  <%= label_tag 'ds', t('txt.views.search_results.language'), :class => 'col-sm-2 control-label' %>
+  <div class="col-sm-4">
+    <% @available_languages.sort.each do |lang_tag, label| %>
+      <label for="languages_<%= lang_tag %>" class="checkbox-inline">
+        <%= check_box_tag "l[]", lang_tag, search_language_selected?(lang_tag) %><%= lang_tag %>
+      </label>
+    <% end %>
+    <div class="btn-group btn-group-xs">
+      <button type="button" class="btn btn-default checkbox-select-all">
+        <%= t('txt.views.search_results.all') %>
+      </button>
+      <button type="button" class="btn btn-default checkbox-select-none">
+        <%= t('txt.views.search_results.none') %>
+      </button>
+    </div>
   </div>
-<% end %>
+</div>

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

@@ -1,8 +1,11 @@
-<%= 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 %>
+<div class="form-group">
+  <%= label_tag 'qt', t('txt.views.search_results.mode'), :class => 'col-sm-2 control-label' %>
+  <div class="col-sm-4">
+    <%= 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]), :class => 'form-control' %>
+  </div>
+</div>

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

@@ -1,7 +1,10 @@
-<%= 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 %>
+<div class="form-group">
+  <%= label_tag 'q', t('txt.views.search_results.search_term'), :class => 'col-sm-2 control-label' %>
+  <div class="col-sm-4">
+    <% if Iqvoc.searchable_classes.detect {|c| c.supports_multi_query? } %>
+      <%= text_area_tag :q, params[:query], :class => 'form-control' %>
+    <% else %>
+      <%= text_field_tag :q, params[:query], :class => 'form-control' %>
+    <% end %>
+  </div>
+</div>

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

@@ -1,5 +1,23 @@
-<%= 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 %>
+<div class="form-group">
+  <%= label_tag nil, t('txt.views.search_results.for'), :class => 'col-sm-2 control-label' %>
+  <div class="col-sm-4">
+    <div class="radio">
+      <label for="for_concept">
+        <%= radio_button_tag 'for', 'concept', params[:for] == "concept" %> <%= Iqvoc::Concept.base_class.model_name.human(:count => 2) %>
+      </label>
+    </div>
+
+    <div class="radio">
+      <label for="for_collection">
+        <%= radio_button_tag 'for', 'collection', params[:for] == "collection" %> <%= Iqvoc::Collection.base_class.model_name.human(:count => 2) %>
+      </label>
+    </div>
+
+    <div class="radio">
+      <label for="for_all">
+        <%= radio_button_tag 'for', 'all', !%w(concept collection).include?(params[:for]) %> <%= t("txt.views.search_results.all") %>
+      </label>
+    </div>
+  </div>
+</div>
+

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

@@ -12,8 +12,9 @@
     <% records.each do |record| %>
     <% # XXX: does not belong here -- also heavily over-engineered
       doc = IqRdf::Document.new(root_url(:lang => nil))
-      Iqvoc.default_rdf_namespace_helper_methods.each do |meth|
-        doc.namespaces(self.send(meth))
+      RdfNamespacesHelper.instance_methods.each do |meth|
+        namespaces = send(meth)
+        doc.namespaces(namespaces) if namespaces.is_a?(Hash)
       end
       uri = record.build_rdf_subject.full_uri # XXX: we actually just want path, plus HTML format
     %>

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

@@ -1,8 +1,8 @@
-<%= simple_form_for user_session, :url => user_session_path, :html => { :class => 'form-horizontal' } do |f| %>
+<%= bootstrap_form_for user_session, :url => user_session_path, :layout => :horizontal, :label_col => 'col-sm-2', :control_col => 'col-sm-6' do |f| %>
   <%= hidden_field_tag :back_to, params[:back_to].presence || @return_url %>
-  <%= f.input :email %>
-  <%= f.input :password %>
-  <div class="form-actions">
+  <%= f.email_field :email %>
+  <%= f.password_field :password %>
+  <%= f.form_group do %>
     <%= submit_tag t("txt.views.user_sessions.login"), :class => 'btn btn-primary' %>
-  </div>
+  <% end %>
 <% end %>

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

@@ -1,14 +1,17 @@
-<%= simple_form_for user, :html => { :class => 'form-horizontal' } do |f| %>
-  <%= f.input :forename %>
-  <%= f.input :surname %>
-  <%= f.input :email %>
-  <%= f.input :telephone_number %>
-  <%= f.input :password %>
-  <%= f.input :password_confirmation %>
-  <%= f.input :role, :collection => User::ROLES.map { |r| [r.humanize, r] } %>
-  <%= f.input :active %>
+<%= bootstrap_form_for user, :layout => :horizontal, :label_col => 'col-sm-3', :control_col => 'col-sm-9' do |f| %>
+  <%= f.text_field :forename %>
+  <%= f.text_field :surname %>
+  <%= f.email_field :email %>
+  <%= f.text_field :telephone_number %>
+  <%= f.password_field :password %>
+  <%= f.password_field :password_confirmation %>
+  <%= f.select :role, User::ROLES.map { |r| [r.humanize, r] } %>
+  <%= f.form_group do %>
+    <%= f.check_box :active, :label => User.human_attribute_name(:active) %>
+  <% end %>
 
-  <div class="form-actions">
+  <hr />
+  <div class="well">
     <%= submit_tag t('txt.common.save'), :class => 'btn btn-primary' %>
   </div>
 <% end %>

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

@@ -1,29 +1,32 @@
 <%= page_header :title => t('txt.views.users.index.header') %>
-<table class="table">
-  <thead>
-    <tr>
-      <th><%= t('txt.views.users.name') %></th>
-      <th><%= t('txt.views.users.email') %></th>
-      <th><%= t('txt.views.users.telephone_number') %></th>
-      <th><%= t('txt.views.users.role') %></th>
-      <th><%= t('txt.views.users.active') %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @users.each do |user| %>
+<div class="table-responsive">
+  <table class="table users-table">
+    <thead>
       <tr>
-        <td><%= user.name %></td>
-        <td><%= user.email %></td>
-        <td><%= user.telephone_number %></td>
-        <td><%= user.role.humanize %></td>
-        <td><%= user.active? ? glyph(:yes) : glyph(:no) %></td>
-        <td>
-          <%= link_to t('txt.views.users.edit_link'), edit_user_path(:id => user), :class => "btn" %>
-          <%= link_to t('txt.views.users.destroy_link'), user_path(:id => user), :confirm => t('txt.views.users.sure'), :method => :delete, :class => "btn btn-danger" %>
-        </td>
+        <th><%= t('txt.views.users.name') %></th>
+        <th><%= t('txt.views.users.email') %></th>
+        <th><%= t('txt.views.users.telephone_number') %></th>
+        <th><%= t('txt.views.users.role') %></th>
+        <th><%= t('txt.views.users.active') %></th>
+        <th></th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody>
+      <% @users.each do |user| %>
+        <tr class="users-table-row">
+          <td><%= user.name %></td>
+          <td><%= user.email %></td>
+          <td><%= user.telephone_number %></td>
+          <td><%= user.role.humanize %></td>
+          <td><%= icon(:check) if user.active? %></td>
+          <td>
+            <%= link_to t('txt.views.users.edit_link'), edit_user_path(:id => user), :class => 'btn btn-default' %>
+            <%= link_to t('txt.views.users.destroy_link'), user_path(:id => user), :confirm => t('txt.views.users.sure'), :method => :delete, :class => "btn btn-danger" %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
 
 <%= render 'sidebar' %>

data/config/application.rb

@@ -20,7 +20,7 @@ require 'rails/all'
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
-Bundler.require(:default, Rails.env)
+Bundler.require(*Rails.groups)
 
 module Iqvoc
   class Application < Rails::Application
@@ -28,39 +28,12 @@ module Iqvoc
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
     # 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)'
 
     # 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 = :en
-    # config.i18n.available_locales = [:de, :en]
-    # See: config/initializers/iqvoc.rb
-
-    # JavaScript files you want as :defaults (application.js is always included).
-    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
-
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password, :password_confirmation]
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
+    # config.i18n.default_locale = :de
   end
 end

data/config/boot.rb

@@ -17,4 +17,4 @@
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])

data/config/database.yml.mysql

@@ -6,7 +6,7 @@ development:
   pool: 5
   username: root
   password:
-  hostname: 127.0.0.1
+  host: 127.0.0.1
 
 test:
   adapter: mysql2
@@ -16,7 +16,7 @@ test:
   pool: 5
   username: root
   password:
-  hostname: 127.0.0.1
+  host: 127.0.0.1
 
 production:
   adapter: mysql2
@@ -26,4 +26,4 @@ production:
   pool: 5
   username: root
   password:
-  hostname: 127.0.0.1
+  host: 127.0.0.1

data/config/engine.rb

@@ -5,41 +5,40 @@ require 'rails'
 require 'cancan'
 require 'authlogic'
 require 'kaminari'
+require 'kaminari-bootstrap'
 require 'iq_rdf'
 require 'json'
 require 'rails_autolink'
-require 'simple_form'
 require 'sass'
 require 'sass-rails'
 require 'bootstrap-sass'
-require 'protected_attributes'
+require 'bootstrap_form'
 require 'font-awesome-rails'
 require 'uglifier'
 require 'apipie-rails'
 require 'database_cleaner'
 require 'delayed_job_active_record'
+require 'carrierwave'
 
 require 'iqvoc/controller_extensions'
 
 module Iqvoc
-
   class Engine < Rails::Engine
-    paths["lib/tasks"] << "lib/engine_tasks"
+    paths['lib/tasks'] << 'lib/engine_tasks'
 
-    initializer "iqvoc.mixin_controller_extensions" do |app|
+    initializer 'iqvoc.mixin_controller_extensions' do |app|
       if Kernel.const_defined?(:ApplicationController)
         ApplicationController.send(:include, Iqvoc::ControllerExtensions)
       end
     end
 
-    initializer "iqvoc.add_assets_to_precompilation" do |app|
+    initializer 'iqvoc.add_assets_to_precompilation' do |app|
       app.config.assets.precompile += Iqvoc.core_assets
     end
 
-    initializer "iqvoc.load_migrations" do |app|
+    initializer 'iqvoc.load_migrations' do |app|
       # Pull in all the migrations to the application embedding iqvoc
       app.config.paths['db/migrate'].concat(Iqvoc::Engine.paths['db/migrate'].existent)
     end
   end
-
 end

data/config/environments/heroku.rb

@@ -74,10 +74,6 @@ if Iqvoc.const_defined?(:Application)
     # Enable serving of images, stylesheets, and JavaScripts from an asset server.
     # config.action_controller.asset_host = "http://assets.example.com"
 
-    # Precompile additional assets.
-    # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-    # config.assets.precompile += %w( search.js )
-
     # Ignore bad email addresses and do not raise email delivery errors.
     # Set this to true and configure the email server for immediate delivery to raise delivery errors.
     # config.action_mailer.raise_delivery_errors = false
@@ -94,11 +90,5 @@ if Iqvoc.const_defined?(:Application)
 
     # Use default logging formatter so that PID and timestamp are not suppressed.
     config.log_formatter = ::Logger::Formatter.new
-
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = false
   end
 end

data/config/initializers/apipie.rb

@@ -1,11 +1,11 @@
-require "iqvoc"
-require "iqvoc/version"
+require 'iqvoc'
+require 'iqvoc/version'
 
 Apipie.configure do |config|
   config.default_version         = Iqvoc::VERSION
-  config.app_name                = "iQvoc"
-  config.api_base_url            = "/"
-  config.doc_base_url            = "/apidoc"
+  config.app_name                = 'iQvoc'
+  config.api_base_url            = '/'
+  config.doc_base_url            = '/apidoc'
   config.api_controllers_matcher = ["#{Iqvoc.root}/app/controllers/*.rb",
                                     "#{Iqvoc.root}/app/controllers/concepts/*.rb"]
   config.markup                  = Apipie::Markup::Markdown.new

data/config/initializers/assets.rb

@@ -0,0 +1,3 @@
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+Rails.application.config.assets.precompile += Iqvoc.core_assets