Improve indexing / remove style attributes

Author: KieranHayes

.gitignore

@@ -8,6 +8,7 @@
 /test/tmp/
 /test/version_tmp/
 /tmp/
+rubocop.html
 
 ## Specific to RubyMotion:
 .dat*

.rubocop.yml

@@ -29,7 +29,8 @@ AllCops:
     - 'vendor/**/*'
   # By default, the rails cops are not run. Override in project or home
   # directory .rubocop.yml files, or by giving the -R/--rails option.
-  RunRailsCops: false
+  Rails:
+    Enabled: true
   # Cop names are not displayed in offense messages by default. Change behavior
   # by overriding DisplayCopNames, or by giving the -D/--display-cop-names
   # option.
@@ -629,9 +630,8 @@ Style/SpaceAroundEqualsInParameterDefault:
     - no_space
 
 Style/SpaceAroundOperators:
-  MultiSpaceAllowedForOperators:
-    - '='
-    - '=>'
+  AllowForAlignment: true
+
 
 Style/SpaceBeforeBlockBraces:
   EnforcedStyle: space
@@ -674,7 +674,7 @@ Style/TrailingBlankLines:
     - final_newline
     - final_blank_line
 
-Style/TrailingComma:
+Style/TrailingCommaInLiteral:
   # If EnforcedStyleForMultiline is comma, the cop requires a comma after the
   # last item of a list, but only for lists where each item is on its own line.
   # If EnforcedStyleForMultiline is consistent_comma, the cop requires a comma

Gemfile

@@ -1,13 +1,11 @@
-source 'https://rubygems.org/'
-
-gem 'sunspot_rails'
-gem 'rsolr'
-gem 'will_paginate'
+gem 'sunspot_rails', '2.2.2'
+gem 'rsolr', '~> 1.0.7'
+gem 'will_paginate', '3.0.7'
 
 group :development do
-  gem 'sunspot_solr'
+  gem 'sunspot_solr', '2.2.0'
 end
 
 group :integration_develop, :testing_develop, :development do
-  gem 'progress_bar'
+  gem 'progress_bar', '1.0.3'
 end

README.md

@@ -1,6 +1,4 @@
-Redsun
+redsun
 ======
 
 Red Sun - Apache Solr Search Integration for Redmine based on Sunspot
-
-Read more about it here: http://dkd.github.io/redsun/

app/controllers/redsun_search_controller.rb

@@ -53,6 +53,7 @@ def index
         highlight :name
         highlight :notes
         highlight :id
+        highlight :title
       end
 
       any_of do
@@ -134,11 +135,7 @@ def index
       order_by(:score, :desc)
     end
     @searchstring = searchstring
-  
-  # Accessing results will trigger a NoMethodError if the Solr server is gone
-  @search.results.present?
-  rescue NoMethodError
-    render 'connection_refused'
+
   rescue Errno::ECONNREFUSED
     render 'connection_refused'
   rescue RSolr::Error::Http

app/views/redsun_search/_class_name_facet.html.erb

@@ -8,7 +8,7 @@
       </li>
       <% results.facet(facet.to_sym).rows.each do |result| %>
         <li>
-            <%= link_to "#{t('redsun.facets.values.'+result.value.to_s.downcase.tr(" ", "_"), default: result.value)} (#{result.count})",
+            <%= link_to "#{t('redsun.facets.values.'+result.value.to_s.downcase.tr(" ", "_"), default: result.value)} (#{number_with_delimiter(result.count, delimiter: '.')})",
             url_for(search_form: {facet.to_sym => result.value}.reverse_merge(params[:search_form])), class: params[:search_form][facet.to_sym].blank? ? "" : "selected"
             %>
         </li>

app/views/redsun_search/_results.html.erb

@@ -1,18 +1,18 @@
 <br><%= page_entries_info @search.results, {model: "record"} %>
-<div style="text-align:center;margin-bottom: 2em">
+<div class="redsun-pagination-top">
   <%= will_paginate @search.results %>
 </div>
 
 <%= facet(:class_name, @search, :class_name, "class_name_facet") %>
 
 <% @search.each_hit_with_result do |hit, record| %>
-  <div style="background: <%= !record.active? ? "red" : "" %>" class="redsun-result">
-    <div style="float:left; width: 70%" class="redsun-result-item">
+  <div class="redsun-result <%=record.active?  ? "" : "redsun-inactive"%>">
+    <div class="redsun-result-item">
       <%= render "redsun_search/results/#{hit.class_name.underscore}_result", hit: hit, record: record %>
     </div>
     <div style="float:right;padding-top: 2em">
       <% if !record.active? %>
-        <span style="background: red; color:white; padding: 1em;border-radius: 10px">
+        <span class="redsun-label-inactive">
           <%= t "redsun.inactive" %>
         </span>
       <% end %>
@@ -21,36 +21,9 @@
 
 <% end %>
 
-<div style="text-align:center; clear: both;margin-top: 1em">
+<div class="redsun-pagination-bottom">
  <%= will_paginate @search.results %>
 </div>
-    <style>
-      .redsun-result {
-        display: table; 
-        width: 100%;
-        border-bottom: 1px solid #e9e9e9; 
-        clear: left;
-        background: white;
-      }
-      .redsun-result:hover {
-        background: #f4f4f4;
-      }
-      ul.facets {
-        max-height: 200px;
-        overflow: scroll;
-      }
-      .redsun-result-item .redsun-highlight {
-        background: #FDBF8D;
-        padding: 2px;
-        border-radius: 2px;
-        -webkit-transition: background 2000ms ease-in-out;
-        -moz-transition: background 2000ms ease-in-out;
-        -ms-transition: background 2000ms ease-in-out;
-        -o-transition: background 2000ms ease-in-out;
-        transition: background 2000ms ease-in-out;
-      }
-    </style>
-    
 <% content_for :sidebar do %>
   <%= facet(:project_name, @search, :project_name) %>
   <%= facet(:active, @search, :active) %>

app/views/redsun_search/index.html.erb

@@ -1,13 +1,94 @@
-<h2><%= t "redsun.header"%></h2>
-<%= form_for("search_form", :url => @redsun_path,
-                                      :html => { :style => "border: 1px solid #e9e9e9; padding: 1em; background: #f4f4f4; display: block", :method => :get }) do |f| %>
-  <%= f.label t("redsun.searchstring")%>
-  <%= f.text_field(:searchstring, :value => @searchstring, :title => "Search ...", :class => "toggle") %>
+    <style type="text/css">
+      .redsun-label-inactive{
+        background-color: red;
+        color: #fff;
+        padding: 10px;
+        border-radius: 3px;
+        margin-right: 10px;
+      }
+
+      #redsun-search-form {
+        border: 1px solid #e9e9e9;
+        padding: 1em;
+        background: #FFD;
+        display: block;
+        border-radius: 3px;
+        position: relative;
+      }
+      #redsun-search-form .redsun-search-button {
+        padding: 6px;
+        font-weight: bold;
+        margin-left: 5px;
+      }
+      #redsun-search-form #search_form_searchstring {
+        padding: 6px 3px;
+        width: 200px;
+      }
+      #redsun-search-form #search_form_scope {
+        margin-right: 5px;
+      }
+      .redsun-logo {
+        width: 100px;
+        position: absolute;
+        right: 10px;
+        top: 10px;
+      }
+      .redsun-pagination-top {
+        text-align:center; 
+        margin-bottom: 2em;
+      }
+      .redsun-pagination-bottom {
+        text-align:center; 
+        clear: both;
+        margin-top: 1em;
+      }
+      .redsun-result {
+        display: table; 
+        width: 100%;
+        border-bottom: 1px solid #e9e9e9; 
+        clear: left;
+        background-color: #fff;
+      }
+      .redsun-highlight {
+        background-color: #fdbf8d;
+        padding: 0px;
+        box-shadow: 0.25em 0 0 #fdbf8d, -0.25em 0 0 #fdbf8d;
+        border-radius: 3px;
+      }
+      ul.facets {
+        max-height: 200px;
+        overflow: scroll;
+      }
+      .redsun-result-item {
+        padding-left: 10px;
+        float: left;
+        width: 80%;
+      }
+      .redsun-result:hover {
+        background: #f4f4f4;
+        -webkit-transition: background-color 100ms ease-in-out;
+        -moz-transition: background-color 100ms ease-in-out;
+        -ms-transition: background-color 100ms ease-in-out;
+        -o-transition: background-color 100ms ease-in-out;
+        transition: background-color 100ms ease-in-out;
+      }
+      .redsun-hints {
+        margin-top: 4px;
+        font-size: 0.8em;
+        opacity: 0.8;
+      }
+ 
+    </style>
+    
+
+<%= form_for("search_form", url: @redsun_path, html: { id: 'redsun-search-form', method: :get }) do |f| %>
+  <%= f.label t("redsun.searchstring") %>
+  <%= f.text_field(:searchstring, value: @searchstring, title: 'Search ...', :class => "toggle") %>
   <%= f.select :scope, @scope_selector, {:selected => @scope}, { class: "select2"}  %>
   <%= f.label t("redsun.order") %>
   <%= f.select :sort_field, Issue::SORT_FIELDS.collect { |o| [t("field_#{o}"), o]}, {:selected => @sort_field }, { class: "select2"} %>
   <%= f.select :sort_order, Issue::SORT_ORDER.collect {|o| [I18n.translate(o[1]), o.first]}, {:selected => @sort_order}, { class: "select2"}  %>
-  <%= f.submit t("redsun.search_button") %>
+  <%= f.submit t("redsun.search_button"), class: 'redsun-search-button' %>
 
   <%= link_to t("redsun.reset"), url_for(:controller => "redsun_search", :action => :index, :project_id => params[:project_id])%>
   <%= f.hidden_field(:author_id, value: params[:search_form][:author_id]) if params[:search_form][:author_id].present? %>
@@ -20,6 +101,8 @@
   <%= f.hidden_field(:active, value: params[:search_form][:active]) if params[:search_form][:active].present? %>
   <%= f.hidden_field(:project_name, value: params[:search_form][:project_name]) if params[:search_form][:project_name].present? %>
   <%= f.hidden_field(:project_id, value: @project.id) if @project %>
+  <div class="redsun-hints"><%=t('redsun.hints')%></div>
+  <%= image_tag 'RedSun_Logo_red_on_white.svg', plugin: 'redmine_redsun', class: 'redsun-logo'  %>
 <% end -%>
 
 <% if @search.results.present? %>

app/views/redsun_search/results/_wiki_page_result.html.erb

@@ -1,5 +1,5 @@
 <h5><%= t "label_wiki_page" %> in <%= link_to record.try(:project).try(:name), record.try(:project) %></h5>
-<h3><%= link_to highlighter_for(:title, hit, record).gsub(/_/, " "), record %></h3>
+<h3><%= link_to highlighter_for(:title, hit, record).html_safe, record %></h3>
 <% if record.content.updated_on && record.content.author %>
 <h5>
   <%= avatar(record.content.author, :size => "16") %><%= authoring(record.content.updated_on, record.content.author, label: :label_updated_time_by)%>