From efca5ea283e58cf4c02dc74d776fbb2edbecd18a Mon Sep 17 00:00:00 2001 From: Mateus Rambo Strey <mars11@inf.ufpr.br> Date: Mon, 28 Sep 2015 18:45:31 -0300 Subject: [PATCH] change search sidebar --- app/assets/javascripts/application/search.js | 20 +++++++++++++ .../stylesheets/application/search.scss | 7 +++++ app/views/search/index.html.erb | 29 ++----------------- 3 files changed, 30 insertions(+), 26 deletions(-) create mode 100644 app/assets/javascripts/application/search.js diff --git a/app/assets/javascripts/application/search.js b/app/assets/javascripts/application/search.js new file mode 100644 index 000000000..ed6954101 --- /dev/null +++ b/app/assets/javascripts/application/search.js @@ -0,0 +1,20 @@ +$(document).ready(function () { + $(".select-tag-container").select2(); + + var runDropdown = function (element) { + if ($(element).next().is(':hidden')) { + $('> .caret', element).addClass('caret-up'); + $(element).next().slideDown(); + } + else { + $('> .caret', element).removeClass('caret-up'); + $(element).next().slideUp(); + } + }; + + runDropdown($('.nestedAccordion .dropdown')); + + $('.nestedAccordion .dropdown').click(function () { + runDropdown(this); + }); +}); diff --git a/app/assets/stylesheets/application/search.scss b/app/assets/stylesheets/application/search.scss index 1e0bc46ea..71452e6b0 100644 --- a/app/assets/stylesheets/application/search.scss +++ b/app/assets/stylesheets/application/search.scss @@ -7,6 +7,13 @@ } } +.nestedAccordion { + .dropdown { + margin-top: 10px !important; + margin-bottom: 10px !important; + } +} + .select2-container { width: 100% !important; } diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb index 46f39ee39..ec3d57d73 100644 --- a/app/views/search/index.html.erb +++ b/app/views/search/index.html.erb @@ -1,26 +1,3 @@ -<script type="text/javascript"> - $(document).ready(function () { - $(".select-tag-container").select2(); - - var runDropdown = function (element) { - if ($(element).next().is(':hidden')) { - $('> .caret', element).addClass('caret-up'); - $(element).next().slideDown(); - } - else { - $('> .caret', element).removeClass('caret-up'); - $(element).next().slideUp(); - } - }; - - runDropdown($('#nestedAccordion .dropdown')); - - $('#nestedAccordion .dropdown').click(function () { - runDropdown(this); - }); - }); -</script> - <div class="row"> <div class="col-sm-4 search-sidebar"> <!-- <h2>Busca Avançada</h2> --> @@ -34,7 +11,7 @@ </div> </div> --> - <div id="nestedAccordion"> + <div class="nestedAccordion"> <h3 class="dropdown open">Matérias<span class="caret caret-align-right"/></h3> <div class="dropdown-element"> @@ -293,9 +270,9 @@ <input type="text" name="ano2" size="8"> - <input type="text" name="ano2" size="8"> </div> </div> - <!-- fim div id="nestedAccordion"--> + <!-- fim div class="nestedAccordion"--> - <div id="nestedAccordion"> + <div class="nestedAccordion"> <h3 class="dropdown">Pesquisa Avançada<span class="caret caret-align-right"/></h3> <form method="get"> -- GitLab