iqvoc 4.2.0 → 4.3.0

data/app/presenters/search_result_collection.rb

@@ -0,0 +1,8 @@
+class SearchResultCollection
+  extend Forwardable
+  def_delegators :@results, :size, :each, :[], :page, :current_page, :+, :sort
+
+  def initialize(results)
+    @results = results
+  end
+end

data/app/presenters/search_result_remote.rb

@@ -0,0 +1,52 @@
+class SearchResultRemote
+  class MetaInformation
+    attr_reader :key, :value
+
+    def initialize(key, value)
+      @key = key
+      @value = value
+    end
+  end
+
+  attr_reader :label, :host, :path, :meta
+  attr_accessor :body, :rdf_namespace, :rdf_predicate, :language
+
+  def initialize(host, path, label)
+    @host = host
+    @path = path
+    @label = label.to_s.squish
+    @meta = []
+  end
+
+  def add_meta_information(key, value)
+    @meta << MetaInformation.new(key, value)
+  end
+
+  def url
+    host + path
+  end
+
+  def search_result_partial_name
+    'search_results/search_result_remote'
+  end
+
+  def rdf_predicate_uri
+    rdf_namespace.try(:+, rdf_predicate)
+  end
+
+  def build_rdf(document, subject)
+    predicate = URI.parse(rdf_predicate_uri)
+    value = body || label
+
+    subject.build_full_uri_predicate(predicate, value, :lang => language)
+  end
+
+  def build_search_result_rdf(document, result)
+    result.Sdc::link(url)
+    build_rdf(document, result)
+  end
+
+  def to_s
+    @label
+  end
+end

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

@@ -4,8 +4,8 @@
     :perms => [:create, Iqvoc::Collection.base_class], :active => params[:action] == 'new' %>
   <% if defined?(collection) %>
   <%= sidebar_header t('txt.common.representations') %>
-  <%= sidebar_item :icon => 'share', :text => 'HTML', :path => collection_url(collection.origin, :format => :html) %>
-  <%= sidebar_item :icon => 'share', :text => 'RDF/XML', :path => rdf_url(collection.origin, :format => :rdf, :lang => nil), :id => 'rdf_link_xml' %>
-  <%= sidebar_item :icon => 'share', :text => 'RDF/Turtle', :path => rdf_url(collection.origin, :format => :ttl, :lang => nil), :id => 'rdf_link_ttl' %>
+  <%= sidebar_item :icon => 'link', :text => 'HTML', :path => collection_url(collection.origin, :format => :html) %>
+  <%= sidebar_item :icon => 'link', :text => 'RDF/XML', :path => rdf_url(collection.origin, :format => :rdf, :lang => nil), :id => 'rdf_link_xml' %>
+  <%= sidebar_item :icon => 'link', :text => 'RDF/Turtle', :path => rdf_url(collection.origin, :format => :ttl, :lang => nil), :id => 'rdf_link_ttl' %>
   <% end %>
 <% end %>

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

@@ -58,7 +58,7 @@
   <!-- / Concept relations -->
 
   <!-- Matches -->
-  <fieldset>
+  <fieldset class="matches" data-datasets="<%= @datasets %>" data-remote-proxy-url="<%= alphabetical_concepts_path %>" data-translation-other="<%= t('txt.common.other') %>">
     <legend><%= Match::Base.model_name.human(:count => 2) %></legend>
     <% Iqvoc::Concept.match_classes.each do |match_class| %>
       <%= render match_class.edit_partial_name(concept), :owner_klass => concept, :assoc_klass => match_class, :f => f %>

data/app/views/concepts/alphabetical/_search_result.html.erb

@@ -0,0 +1,16 @@
+<li class="concept-item">
+  <p>
+  <%= link_to result.label.to_s, result.path,
+    :alt => result.concept.origin, :data => { 'resource-path' => result.path }, :class => 'concept-item-link' %>
+  <% if result.concept.additional_info.present? %>
+  (<%= result.concept.additional_info %>)
+  <% end %>
+  </p>
+
+  <p class="concept-item-uri"><%= rdf_url(:id => result.concept.origin, :lang => nil, :format => nil) %></p>
+  <% if result.definition? %>
+    <p class="concept-item-definition" lang="<%= result.definition.language %>">
+      <%= result.definition.value %>
+    </p>
+  <% end %>
+</li>

data/app/views/concepts/alphabetical/_search_result_remote.html.erb

@@ -0,0 +1,14 @@
+<li class="concept-item">
+  <p>
+    <%= link_to result.label, result.path,
+      :data => { 'resource-url' => result.url },
+      :class => 'concept-item-link' %>
+  </p>
+
+  <p class="concept-item-uri"><%= result.url %></p>
+  <% if result.definition? %>
+    <p class="concept-item-definition" lang="<%= result.definition_language %>">
+      <%= result.definition %>
+    </p>
+  <% end %>
+</li>

data/app/views/concepts/alphabetical/index.html.erb

@@ -8,9 +8,11 @@
       <% alphabetical_concepts_path(:prefix => letter.to_s.downcase) %>
     <% end %>
   </div>
-  <ol class="concepts unstyled">
-    <%= render :partial => 'pref_labeling', :collection => @pref_labelings %>
+  <ol class="concept-items unstyled">
+    <% @search_results.each do |result| %>
+      <%= render :partial => result.partial_name, :locals => { :result => result } %>
+    <% end %>
   </ol>
 </div>
 
-<%= paginate @pref_labelings %>
+<%= paginate @search_results %>

data/app/views/concepts/expired/index.html.erb

@@ -9,8 +9,11 @@
     <% end %>
   </div>
   <ol class="concepts unstyled">
-    <%= render :partial => 'concepts/alphabetical/pref_labeling', :collection => @pref_labelings %>
+    <% @search_results.each do |result| %>
+    <%= render :partial => 'concepts/alphabetical/search_result',
+        :locals => { :result => result } %>
+    <% end %>
   </ol>
 </div>
 
-<%= paginate @pref_labelings %>
+<%= paginate @search_results %>

data/app/views/concepts/scheme/_sidebar.html.erb

@@ -1,6 +1,6 @@
 <%= sidebar do %>
   <%= sidebar_header t('txt.common.representations') %>
-  <%= sidebar_item :icon => 'share', :text => 'HTML', :path => scheme_path(:format => :html) %>
-  <%= sidebar_item :icon => 'share', :text => 'RDF/XML', :path => rdf_scheme_url(:format => :rdf, :lang => nil), :id => 'rdf_link_xml' %>
-  <%= sidebar_item :icon => 'share', :text => 'RDF/Turtle', :path => rdf_scheme_url(:format => :ttl, :lang => nil), :id => 'rdf_link_ttl' %>
+  <%= sidebar_item :icon => 'link', :text => 'HTML', :path => scheme_path(:format => :html) %>
+  <%= sidebar_item :icon => 'link', :text => 'RDF/XML', :path => rdf_scheme_url(:format => :rdf, :lang => nil), :id => 'rdf_link_xml' %>
+  <%= sidebar_item :icon => 'link', :text => 'RDF/Turtle', :path => rdf_scheme_url(:format => :ttl, :lang => nil), :id => 'rdf_link_ttl' %>
 <% end %>

data/app/views/concepts/sidebars/_singular.html.erb

@@ -1,12 +1,12 @@
 <%- published_param = concept.published? ? nil : "0" -%>
 
 <%= sidebar do %>
-  <%= sidebar_item :icon => 'share', :text => t('txt.models.concept.uri'), :path => rdf_url(concept.origin, :format => nil, :published => published_param, :lang => nil) %>
   <%= sidebar_header t('txt.common.representations') %>
-  <%= sidebar_item :icon => 'share', :text => 'HTML', :path => concept_path(:id => concept, :format => :html, :published => published_param) %>
-  <%= sidebar_item :icon => 'share', :text => 'RDF/XML', :path => concept_path(:id => concept, :format => :rdf, :published => published_param), :id => 'rdf_link_xml' %>
-  <%= sidebar_item :icon => 'share', :text => 'RDF/Turtle', :path => concept_path(:id => concept, :format => :ttl, :published => published_param), :id => 'rdf_link_ttl' %>
+  <%= sidebar_item :icon => 'link', :text => 'HTML', :path => concept_path(:id => concept, :format => :html, :published => published_param) %>
+  <%= sidebar_item :icon => 'link', :text => 'RDF/XML', :path => concept_path(:id => concept, :format => :rdf, :published => published_param), :id => 'rdf_link_xml' %>
+  <%= sidebar_item :icon => 'link', :text => 'RDF/Turtle', :path => concept_path(:id => concept, :format => :ttl, :published => published_param), :id => 'rdf_link_ttl' %>
   <%= sidebar_header 'Links' if can?(:create, Iqvoc::Concept.base_class) %>
+  <%= sidebar_item :icon => 'link', :text => t('txt.models.concept.uri'), :path => rdf_url(concept.origin, :format => nil, :published => published_param, :lang => nil) %>
   <%= sidebar_item :icon => :edit, :text => t('txt.views.concepts.new', :concept_class_name => Iqvoc::Concept.base_class.model_name.human), :path => new_concept_path,
     :perms => [:create, Iqvoc::Concept.base_class], :active => params[:action] == 'new' %>
 <% end %>

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

@@ -4,13 +4,16 @@
     <%= sidebar_item { render(klass.new_link_partial_name) } %>
   <% end %>
   <%= sidebar_header t('txt.views.dashboard.full_rdf_export') %>
-  <%= sidebar_item(:icon => :download, :text => "RDF/Turtle", :path => concepts_url(:format => :ttl),
+  <%= sidebar_item(:icon => 'cloud-download', :text => "RDF/Turtle", :path => concepts_url(:format => :ttl),
     :perms => [:full_export, Concept::Base]) %>
-  <%= sidebar_item(:icon => :download, :text => "RDF/XML", :path => concepts_url(:format => :rdf),
+  <%= sidebar_item(:icon => 'cloud-download', :text => "RDF/XML", :path => concepts_url(:format => :rdf),
     :perms => [:full_export, Concept::Base]) %>
   <%= sidebar_header 'Extras' %>
   <%= sidebar_item(:icon => :upload, :text => t('txt.views.dashboard.import'),
-    :path => import_url, :active => params[:controller] == 'import', :perms => [:import, Concept::Base]) %>
-  <%= sidebar_item(:icon => :repeat, :text => t('txt.views.triplestore_sync.caption'),
+    :path => imports_path, :active => params[:controller] == 'imports', :perms => [:import, Concept::Base]) %>
+  <%= sidebar_item(:icon => :eraser, :text => t('txt.views.dashboard.reset'),
+    :path => reset_path, :active => params[:action] == "reset",
+    :perms => [:reset, :thesaurus]) %>
+  <%= sidebar_item(:icon => :refresh, :text => t('txt.views.triplestore_sync.caption'),
     :path => triplestore_sync_path, :active => params[:controller] == "triplestore_sync") %>
 <% end %>

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

@@ -26,7 +26,7 @@
         <td><%= item.locking_user.blank? ? "" : item.locking_user.name %></td>
         <td><%= l(item.follow_up) if item.follow_up.present? %></td>
         <td><%= l(item.updated_at, :format => :short) %></td>
-        <td><%= item.state %></td>
+        <td><span class="label"><%= item.state %></span></td>
         <td>
         <%- if params[:check_consistency] == "1" -%>
           <%= consistency_status(item) %>

data/app/views/dashboard/reset.html.erb

@@ -0,0 +1,6 @@
+<%= page_header :title => t("txt.views.dashboard.reset") %>
+<%= render "dashboard/sidebar" %>
+
+<%= form_tag reset_path, :method => :post do %>
+  <%= submit_tag t("txt.views.dashboard.reset"), :class => "btn btn-danger" %>
+<% end %>

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

@@ -0,0 +1,44 @@
+<%= page_header :title => t('txt.views.import.title') %>
+<%= render 'dashboard/sidebar' %>
+
+<%= form_tag imports_path, :method => :post, :multipart => true , :class => "form-horizontal" do %>
+  <%= input_block :label => t('txt.views.import.file') do %>
+    <%= file_field_tag 'ntriples_file' %>
+  <% end %>
+
+  <%= input_block :label => t('txt.views.import.namespace') do %>
+    <%= text_field_tag 'default_namespace',
+      root_url(:format => nil, :lang => nil, :trailing_slash => true).gsub(/\/\/$/, "/")  %>
+  <% end %>
+
+  <%= input_block :label => t('txt.views.import.publish') do %>
+    <%= check_box_tag 'publish', '1', true %>
+  <% end %>
+
+  <div class="form-actions">
+    <%= submit_tag t('txt.views.import.title'), :class => 'btn btn-primary' %>
+  </div>
+<% end %>
+
+<table class="table">
+  <thead>
+    <tr>
+      <th>ID</th>
+      <th><%= Import.human_attribute_name(:user) %></th>
+      <th><%= Import.human_attribute_name(:created_at) %></th>
+      <th><%= Import.human_attribute_name(:finished_at) %></th>
+      <th><%= Import.human_attribute_name(:success) %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @imports.each do |import| %>
+      <tr>
+        <td><%= link_to import.id, import_path(:id => import) %></td>
+        <td><%= import.user %></td>
+        <td><%= l(import.created_at, :format => :short) %></td>
+        <td><%= import.finished_at? ? l(import.finished_at, :format => :short) : icon(:cog, 'fa-spin') %></td>
+        <td><%= icon('thumbs-o-up') if import.success? %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/app/views/imports/show.html.erb

@@ -0,0 +1,7 @@
+<%= page_header :title => "#{t('txt.views.import.title')} #{@import.id}" %>
+<%= render 'dashboard/sidebar' %>
+
+<div class="panel">
+  <h2><%= t('txt.views.import.output') %></h2>
+  <pre><%= @import.output %></pre>
+</div>

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

@@ -14,7 +14,13 @@
 <![endif]-->
 <%= 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/navigation' %>
 
 <div class="container">
@@ -22,7 +28,7 @@
     <div class="<%= content_for?(:sidebar) ? "span9" : "span12" %>" id="content">
       <%= yield :page_header %>
       <% flash.each do |type, messages| %>
-        <% (messages.is_a?(Array) ? messages : [messages]).each do |msg| %>
+        <% Array.wrap(messages).each do |msg| %>
           <%= alert(type) { msg } %>
         <% end %>
       <% end %>

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

@@ -1,17 +1,13 @@
-<%- if owner = result.owner -%>
-  <dt>
-    <% case owner.class.name %>
-    <% when Iqvoc::Concept.base_class_name %>
-      <%= link_to highlight_query(result.target.value, params[:query]), concept_path(:id => owner) %>
-    <% when Iqvoc::Collection.base_class_name %>
-      <%= link_to highlight_query(result.target.value, params[:query]), collection_path(:id => owner) %>
+<% if owner = result.owner %>
+<li class="search-result" data-rdf-namespace="<%= result.rdf_namespace %>" data-rdf-predicate="<%= result.rdf_predicate %>" data-rdf-value="<%= result.to_s %>" data-rdf-language="<%= result.language %>">
+  <%= link_to_object(owner, result.target.value, :class => 'search-result-link', :data => { 'resource-path' => rdf_path(owner.origin, :lang => nil, :format => nil) }) %> <% if owner.additional_info.present? %>(<%= owner.additional_info %>)<% end %>
+  <dl class="search-result-meta">
+    <dt class="search-result-key"><%= t('txt.views.search_results.type') %></dt>
+    <dd class="search-result-value" data-key="<%= t('txt.views.search_results.type') %>"><%= result.model_name.human %></dd>
+    <% if result.target.language %>
+    <dt class="search-result-key"><%= t('txt.views.search_results.language') %></dt>
+    <dd class="search-result-value" data-key="<%= t('txt.views.search_results.language') %>"><%= result.target.language %></dd>
     <% end %>
-    <%- if owner.additional_info.present? -%>
-      (<%= owner.additional_info %>)
-    <%- end -%>
-  </dt>
-  <dd><%= t('txt.views.search_results.type') %>: <%= result.class.model_name.human %></dd>
-  <%- if result.target.language -%>
-    <dd><%= t('txt.views.search_results.language') %>: <%= result.target.language %></dd>
-  <%- end -%>
-<%- end -%>
+  </dl>
+</li>
+<% end %>

data/app/views/partials/match/_edit_base.html.erb

@@ -1,5 +1,5 @@
 <%- fieldname = "concept[inline_#{assoc_klass.name.to_relation_name}]" -%>
 
-<%= f.input fieldname, :label => assoc_klass.model_name.human(:count => 2) do %>
+<%= f.input fieldname, :label => assoc_klass.model_name.human(:count => 2), :label_html => { :for => fieldname } do %>
   <%= text_area_tag fieldname, owner_klass.send("inline_#{assoc_klass.name.to_relation_name}"), :class => "span4", :rows => 4 %>
 <% end %>

data/app/views/partials/note/_search_result.html.erb

@@ -1,8 +1,11 @@
-<dt>
+<li class="search-result" data-rdf-namespace="<%= iqvoc_default_rdf_namespaces[result.rdf_namespace.try(:to_sym)] %>" data-rdf-predicate="<%= result.rdf_predicate %>" data-rdf-value="<%= result.to_s %>" data-rdf-language="<%= result.language %>">
   <% if result.owner.is_a?(Concept::Base) %>
-    <%= link_to highlight_query("#{result.owner.pref_label.to_s} (#{result.owner.origin})", params[:query]), concept_path(:id => result.owner) %><br>
+    <%= link_to "#{result.owner.pref_label.to_s} (#{result.owner.origin})", concept_path(:id => result.owner) %>
   <% elsif result.owner.is_a?(Label::Base) %>
-    <%= link_to highlight_query(result.owner.value, params[:query]), label_path(:id => result.owner) %><br>
+    <%= link_to result.owner.value, label_path(:id => result.owner), :property => result.class.rdf_predicate, :lang => result.language %>
   <% end %>
-</dt>
-<dd><%= t('txt.views.search_results.type') %>: <%= result.class.model_name.human %></dd>
+  <dl class="search-result-meta">
+    <dt class="search-result-key"><%= t('txt.views.search_results.type') %></dt>
+    <dd class="search-result-value"><%= result.class.model_name.human %></dd>
+  </dl>
+</li>

data/app/views/partials/note/skos/change_note/_search_result.html.erb

@@ -1,12 +1,9 @@
-<dt>
+<li class="search-result" data-rdf-namespace="<%= iqvoc_default_rdf_namespaces[result.rdf_namespace.try(:to_sym)] %>" data-rdf-predicate="<%= result.rdf_predicate %>" data-rdf-value="<%= result.to_s %>" data-rdf-language="<%= result.language %>">
   <% result.annotations.each do |annotation| %>
-    <% if result.owner.is_a?(Concept::Base) %>
-      <%= link_to highlight_query("#{annotation.predicate}: #{annotation.value}", params[:query]), concept_path(:id => result.owner) %><br>
-    <% elsif result.owner.is_a?(Label::Base) %>
-      <%= link_to highlight_query("#{annotation.predicate}: #{annotation.value}", params[:query]), label_path(:id => result.owner) %><br>
-    <% elsif result.owner.is_a?(Collection::Base) %>
-      <%= link_to highlight_query("#{annotation.predicate}: #{annotation.value}", params[:query]), collection_path(:id => result.owner) %><br>
-    <% end %>
+    <%= link_to_object(result.owner, "#{annotation.predicate}: #{annotation.value}" %><br/>
   <% end %>
-</dt>
-<dd><%= t('txt.views.search_results.type') %>: <%= result.class.model_name.human %></dd>
+  <dl class="search-result-meta">
+    <dt class="search-result-key"><%= t('txt.views.search_results.type') %></dt>
+    <dd class="search-result-value"><%= result.class.model_name.human %></dd>
+  </dl>
+</li>

data/app/views/partials/note/skos/definition/_search_result.html.erb

@@ -1,8 +1,8 @@
-<dt>
+<li class="search-result" data-rdf-namespace="<%= iqvoc_default_rdf_namespaces[result.rdf_namespace.try(:to_sym)] %>" data-rdf-predicate="<%= result.rdf_predicate %>" data-rdf-value="<%= result.to_s %>" data-rdf-language="<%= result.language %>">
   <% if result.owner.is_a?(Concept::Base) %>
-    <%= link_to "#{result.owner.pref_label.to_s} (#{result.owner.origin})", concept_path(:id => result.owner) %><br>
+    <%= link_to result.owner.pref_label.to_s, concept_path(:id => result.owner), :class => 'search-result-link', :data => { 'resource-path' => rdf_path(result.owner.origin, :lang => nil, :format => nil) } %>
   <% elsif result.owner.is_a?(Label::Base) %>
-    <%= link_to result.owner.value, label_path(:id => result.owner) %><br>
+    <%= link_to result.owner.value, label_path(:id => result.owner), :class => 'search-result-link', :data => { 'resource-path' => rdf_path(result.owner.origin, :lang => nil, :format => nil) } %>
   <% end %>
-</dt>
-<dd><%= highlight_query(excerpt(result.value, params[:query]), params[:query]) %></dd>
+  <p class="search-result-body"><%= highlight_query(excerpt(result.value, params[:query]), params[:query]) %></p>
+</li>

data/app/views/rdf/dataset.iqrdf

@@ -0,0 +1,9 @@
+Iqvoc.default_rdf_namespace_helper_methods.each do |meth|
+  document.namespaces(self.send(meth))
+end
+
+ns = IqRdf::Namespace.find_namespace_class(:void)
+
+document << IqRdf.build_uri(Iqvoc.config['title'].parameterize, ns.build_uri('Dataset')) do |dataset|
+  dataset.dct.title Iqvoc.config['title']
+end

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

@@ -0,0 +1,13 @@
+<li class="search-result" data-rdf-namespace="<%= iqvoc_default_rdf_namespaces[result.rdf_namespace.try(:to_sym)] %>" data-rdf-predicate="<%= result.rdf_predicate %>" data-rdf-value="<%= result.label %>" data-rdf-language="<%= result.language %>">
+  <%= link_to(result.label, result.url.to_s, :class => 'search-result-link') %>
+  <span class="search-result-uri"><%= result.url %></span>
+  <% if result.body.present? %>
+  <p class="search-result-body"><%= result.body %></p>
+  <% end %>
+  <dl class="search-result-meta">
+    <% result.meta.each do |meta_information| %>
+    <dt class="search-result-key"><%= meta_information.key %></dt>
+    <dd class="search-result-value" data-key="<%= meta_information.key %>"><%= meta_information.value %></dd>
+    <% end %>
+  </dl>
+</li>

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

@@ -1,7 +1,7 @@
 <% if results %>
   <%= sidebar do %>
     <%= sidebar_header t('txt.common.representations') %>
-    <%= sidebar_item :icon => 'share', :text => 'RDF/XML', :path => rdf_search_path(request.query_parameters.merge(:format => :rdf, :lang => nil, :page => results.current_page, :only_path => false)), :id => 'rdf_link_xml' %>
-    <%= sidebar_item :icon => 'share', :text => 'RDF/Turtle', :path => rdf_search_path(request.query_parameters.merge(:format => :ttl, :lang => nil, :page => @results.current_page, :only_path => false)), :id => 'rdf_link_ttl' %>
+    <%= sidebar_item :icon => 'link', :text => 'RDF/XML', :path => rdf_search_path(request.query_parameters.merge(:format => :rdf, :lang => nil, :page => results.current_page, :only_path => false)), :id => 'rdf_link_xml' %>
+    <%= sidebar_item :icon => 'link', :text => 'RDF/Turtle', :path => rdf_search_path(request.query_parameters.merge(:format => :ttl, :lang => nil, :page => @results.current_page, :only_path => false)), :id => 'rdf_link_ttl' %>
   <% end %>
-<% end %>
+<% end %>

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

@@ -7,16 +7,16 @@
 <div class="panel">
   <%= results_header @results %>
 
-  <dl id="search_results">
+  <ul class="search-results unstyled">
     <% @results.each do |result| %>
       <% if @klass %>
         <%= render @klass.search_result_partial_name, :result => result %>
       <% else %>
-        <%= render result.class.search_result_partial_name, :result => result %>
+        <%= render result.search_result_partial_name, :result => result %>
       <% end %>
     <% end %>
-  </dl>
+  </ul>
 
   <%= paginate @results %>
-<% end %>
 </div>
+<% end %>