From 4ef3656169512ec7f3a2d555c5321b2362aaf5e6 Mon Sep 17 00:00:00 2001 From: DylanGuedes Date: Tue, 7 Jun 2016 12:28:06 -0300 Subject: [PATCH] Changes style of elasticsearch plugin, add variable to store search types. --- plugins/elasticsearch/controllers/elasticsearch_plugin_controller.rb | 15 ++++++++++----- plugins/elasticsearch/public/style.css | 27 +++++++++++++++++++++++++++ plugins/elasticsearch/views/elasticsearch_plugin/search.html.erb | 13 +++++++++++-- 3 files changed, 48 insertions(+), 7 deletions(-) diff --git a/plugins/elasticsearch/controllers/elasticsearch_plugin_controller.rb b/plugins/elasticsearch/controllers/elasticsearch_plugin_controller.rb index db11963..b4d69dc 100644 --- a/plugins/elasticsearch/controllers/elasticsearch_plugin_controller.rb +++ b/plugins/elasticsearch/controllers/elasticsearch_plugin_controller.rb @@ -1,12 +1,16 @@ class ElasticsearchPluginController < ApplicationController no_design_blocks - SEARCHABLE_TYPES = { :all => { label: "All Results" }, - :community => { label: "Communities"}, - :article => { label: "Articles"}, - :event => { label: "Events"}, - :person => { label: "People"} + SEARCHABLE_TYPES = { :all => { label: _("All Results")}, + :community => { label: _("Communities")}, + :article => { label: _("Articles")}, + :event => { label: _("Events")}, + :person => { label: _("People")} } + SEARCH_FILTERS = { :lexical => { label: _("Alphabetical Order")}, + :recent => { label: _("More Recent Order")}, + :access => { label: _("More accessed")} + } def index search() @@ -16,6 +20,7 @@ class ElasticsearchPluginController < ApplicationController def search @searchable_types = SEARCHABLE_TYPES @selected_type = selected_type params + @search_filter_types = SEARCH_FILTERS @query = params[:q] @results = [] diff --git a/plugins/elasticsearch/public/style.css b/plugins/elasticsearch/public/style.css index 7d0f365..c924ae9 100644 --- a/plugins/elasticsearch/public/style.css +++ b/plugins/elasticsearch/public/style.css @@ -9,4 +9,31 @@ flex: 1; } +.controller-elasticsearch_plugin ul { + list-style: none; + list-style-position: inside; + padding-left: 0px; +} +.controller-elasticsearch_plugin .select-search-type { + padding: 10px; + margin: 10px; + font-weight: 900; + font-family: arial; + border: 1px solid #ddd; + margin-top: 0px; + margin-bottom: 0px; +} +.controller-elasticsearch_plugin .select-search-type.active { + padding: 10px; + background: #ccc; + margin-left: 10px; + margin-right: 10px; + font-weight: 900; + font-family: arial; +} + +.controller-elasticsearch_plugin .select-search-type a { + text-decoration: none; + color: black; +} diff --git a/plugins/elasticsearch/views/elasticsearch_plugin/search.html.erb b/plugins/elasticsearch/views/elasticsearch_plugin/search.html.erb index d3791a3..c561be5 100644 --- a/plugins/elasticsearch/views/elasticsearch_plugin/search.html.erb +++ b/plugins/elasticsearch/views/elasticsearch_plugin/search.html.erb @@ -3,16 +3,25 @@
<%= form_tag controller: "elasticsearch_plugin", action: "search" do %> - <%= label_tag(:q, _("Search")) %> <%= text_field_tag(:q, @query) %> <%= submit_tag _("Send") %> -- libgit2 0.21.2