From b8e774f153002b1498788a9c96693c4008ec178f Mon Sep 17 00:00:00 2001
From: DylanGuedes <djmgguedes@gmail.com>
Date: Mon, 20 Jun 2016 11:00:03 -0300
Subject: [PATCH] Elasticsearch: Fixed views and translations

---
 plugins/elasticsearch/public/style.css                                       | 56 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 plugins/elasticsearch/views/elasticsearch_plugin/_community_display.html.erb |  4 ++--
 plugins/elasticsearch/views/elasticsearch_plugin/_event_display.html.erb     |  4 ++--
 plugins/elasticsearch/views/elasticsearch_plugin/_person_display.html.erb    |  4 ++--
 plugins/elasticsearch/views/elasticsearch_plugin/search.html.erb             | 34 ++++++++++++++++++++++------------
 5 files changed, 76 insertions(+), 26 deletions(-)

diff --git a/plugins/elasticsearch/public/style.css b/plugins/elasticsearch/public/style.css
index bf8dceb..27e5bea 100644
--- a/plugins/elasticsearch/public/style.css
+++ b/plugins/elasticsearch/public/style.css
@@ -3,11 +3,17 @@
 }
 
 .controller-elasticsearch_plugin .sidebar {
-  width: 150px;
+  width: 175px;
+}
+
+.controller-elasticsearch_plugin .sidebar ul {
+  margin-top: 0px;
 }
 
 .controller-elasticsearch_plugin .search_form {
+  margin-top: 5px;
   flex: 1;
+  margin-left: 15px;
 }
 
 .controller-elasticsearch_plugin .search_form .search_field {
@@ -21,7 +27,6 @@
 .controller-elasticsearch_plugin .results-count {
   margin-top: 7px;
   margin-right: 15px;
-  text-align: right;
 }
 
 .controller-elasticsearch_plugin ul {
@@ -30,7 +35,19 @@
   padding-left: 0px;
 }
 
+.controller-elasticsearch_plugin #content h3.box-title {
+  background: #ccc;
+  color: black;
+  padding: 10px;
+  border: 1px solid #948b8b;
+  margin-left: 10px;
+  margin-right: 10px;
+  margin-bottom: 0px;
+}
+
+.controller-elasticsearch_plugin .search-filter ul li,
 .controller-elasticsearch_plugin .select-search-type {
+  text-decoration: none;
   padding: 10px;
   margin: 10px;
   font-weight: 900;
@@ -39,13 +56,19 @@
   margin-top: 0px;
   margin-bottom: 0px;
 }
+
+.controller-elasticsearch_plugin .search-filter ul li a {
+  text-decoration: none;
+  color: black;
+}
+
 .controller-elasticsearch_plugin .select-search-type.active {
   padding: 10px;
-  background: #ccc;
+  background: black;
   margin-left: 10px;
   margin-right: 10px;
   font-weight: 900;
-  font-family: arial;
+  border: 1px solid #000;
 }
 
 .controller-elasticsearch_plugin .select-search-type a {
@@ -53,6 +76,10 @@
   color: black;
 }
 
+.controller-elasticsearch_plugin .select-search-type.active a {
+  color: white;
+}
+
 .controller-elasticsearch_plugin .search-item .model-label {
   background: #ddd;
   color: black;
@@ -61,8 +88,10 @@
 }
 
 .controller-elasticsearch_plugin .search-item {
-  margin-bottom: 25px;
-  margin-top: 25px;
+  padding: 10px;
+  margin-bottom: 15px;
+  margin-top: 15px;
+  padding-left: 0px;
 }
 
 .controller-elasticsearch_plugin .search-item .person-item {
@@ -74,6 +103,17 @@
 }
 
 .controller-elasticsearch_plugin .left-side {
-  margin-left: 25px;
-  width: 100px;
+  width: 80px;
+}
+
+.controller-elasticsearch_plugin .search-item .body {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 600px;
 }
+
+.controller-elasticsearch_plugin .search-item .body h2 a {
+  color: #888a85;
+  text-decoration: none;
+}
+
diff --git a/plugins/elasticsearch/views/elasticsearch_plugin/_community_display.html.erb b/plugins/elasticsearch/views/elasticsearch_plugin/_community_display.html.erb
index 8f273b4..f9d1e4b 100644
--- a/plugins/elasticsearch/views/elasticsearch_plugin/_community_display.html.erb
+++ b/plugins/elasticsearch/views/elasticsearch_plugin/_community_display.html.erb
@@ -1,7 +1,7 @@
 <div class="community-header">
-  <%= community.created_at.strftime("%d %B %Y at %H:%M") %> - <span class="model-label">COMUNIDADE</span>
+  <%= community.created_at.strftime("%d %B %Y at %H:%M") %> - <span class="model-label"><%= _("Community") %></span>
 </div>
 <div class="body">
-  <h2><%= community.name %></h2>
+  <h2><%= link_to community.name, community.url %></h2>
   <p><%= community.description %></p>
 </div>
diff --git a/plugins/elasticsearch/views/elasticsearch_plugin/_event_display.html.erb b/plugins/elasticsearch/views/elasticsearch_plugin/_event_display.html.erb
index ef54cf3..1019640 100644
--- a/plugins/elasticsearch/views/elasticsearch_plugin/_event_display.html.erb
+++ b/plugins/elasticsearch/views/elasticsearch_plugin/_event_display.html.erb
@@ -1,8 +1,8 @@
 <div class="event-header">
-  <%= event.created_at.strftime("%d %B %Y at %H:%M") %> - <span class="model-label">EVENT</span>
+  <%= event.created_at.strftime("%d %B %Y at %H:%M") %> - <span class="model-label"><%= _("Event") %></span>
 </div>
 
 <div class="body">
-   <h2><%= event.name %></h2>
+   <h2><%= link_to event.name, event.url %></h2>
    <p><%= event.body %></p>
 </div>
diff --git a/plugins/elasticsearch/views/elasticsearch_plugin/_person_display.html.erb b/plugins/elasticsearch/views/elasticsearch_plugin/_person_display.html.erb
index e709282..42d48e0 100644
--- a/plugins/elasticsearch/views/elasticsearch_plugin/_person_display.html.erb
+++ b/plugins/elasticsearch/views/elasticsearch_plugin/_person_display.html.erb
@@ -3,9 +3,9 @@
     <%= profile_image person %>
   </div>
   <div class="right-side">
-    <%= person.created_at.strftime("%d %B %Y at %H:%M") %> - <%= person.name %> <span class="model-label"><%= _("PERSON") %></span>
+    <%= person.created_at.strftime("%d %B %Y at %H:%M") %> - <%= person.name %> <span class="model-label"><%= _("Person") %></span>
     <div class="body">
-      <h2><%= person.name %></h2>
+      <h2><%= link_to person.name, person.url %></h2>
       <p><%= person.description %></p>
     </div>
   </div>
diff --git a/plugins/elasticsearch/views/elasticsearch_plugin/search.html.erb b/plugins/elasticsearch/views/elasticsearch_plugin/search.html.erb
index c9c0c60..391d43d 100644
--- a/plugins/elasticsearch/views/elasticsearch_plugin/search.html.erb
+++ b/plugins/elasticsearch/views/elasticsearch_plugin/search.html.erb
@@ -1,9 +1,7 @@
 <div class="wrapper">
 
   <div class="sidebar">
-    <div class="results-count">
-      <%= @results.total %> <%= _(" results by") %> :
-    </div>
+    <h3 class="box-title"><%= _("Results") %></h3>
     <ul>
       <% for type,value in @searchable_types %>
         <li class="select-search-type <%= "active" if type == @selected_type %>">
@@ -13,7 +11,7 @@
     </ul>
 
     <div class="search-filter">
-      <h3><%= _("Filter by") %></h3>
+      <h3 class="box-title"><%= _("Sort by") %></h3>
       <ul>
         <% for type in @search_filter_types.values %>
           <li><a href="#"><%= type[:label] %></a></li>
@@ -23,14 +21,26 @@
   </div>
 
   <div class="search_form">
-      <div class="search_field">
-        <%= form_tag '/plugin/elasticsearch/search', method: :get  do %>
-            <%= hidden_field_tag  "selected_type", @selected_type %>
-            <%= hidden_field_tag  "selected_filter_field", @selected_filter_field  %>
-            <%= text_field_tag :query, @query %>
-            <%= submit_tag _("Send") %>
-        <% end %>
-      </div>
+    <div class="search_field">
+      <%= form_tag '/plugin/elasticsearch/search', method: :get  do %>
+        <%= hidden_field_tag  "selected_type", @selected_type %>
+        <%= hidden_field_tag  "selected_filter_field", @selected_filter_field  %>
+        <%= text_field_tag :query, @query %>
+        <%= submit_tag _("Send") %>
+      <% end %>
+    </div>
+    <div class="results-count">
+      <% if not @query.blank? %>
+        <p>
+          <strong><%= @results.total %></strong><%= _(" results for ") %><%= @query %>
+      </p>
+      <% else %>
+        <p>
+        <strong><%= @results.total %></strong><%= _(" total results") %>
+        </p>
+      <% end %>
+    </div>
+
 
     <div class="results">
       <% for result in @results.to_a %>
--
libgit2 0.21.2