From 940273beb45beeb2634f1c01c37148e8a9bd02a9 Mon Sep 17 00:00:00 2001
From: Álvaro Fernando <alvarofernandoms@gmail.com>
Date: Tue, 18 Aug 2015 10:56:41 -0300
Subject: [PATCH] Removing unnecessary html class and adapting JS

---
 public/lib/software-catalog-component.js   | 47 +----------------------------------------------
 public/views/search-software-catalog.js    |  6 ++----
 views/search/_catalog_filter.html.erb      | 42 +++++++++++++++++++-----------------------
 views/search/_catalog_result_list.html.erb |  2 +-
 4 files changed, 23 insertions(+), 74 deletions(-)

diff --git a/public/lib/software-catalog-component.js b/public/lib/software-catalog-component.js
index 736aac7..c16e343 100644
--- a/public/lib/software-catalog-component.js
+++ b/public/lib/software-catalog-component.js
@@ -3,39 +3,7 @@ modulejs.define('SoftwareCatalogComponent', ['jquery'], function($) {
 
   var dispatch_ajax_function;
 
-
-  function show_head_message() {
-    if ($("#filter-categories-select-catalog").text().length === 0){
-      $("#filter-categories-select-catalog").hide();
-      $("#filter-option-catalog-software").show();
-    }else{
-      $("#filter-categories-select-catalog").show();
-      $("#filter-option-catalog-software").hide();
-    }
-  }
-
-
-  function slideDowsCategoriesOptionAndHideOptionCatalog() {
-    $("#filter-categories-option").slideDown();
-    $("#filter-option-catalog-software").hide();
-  }
-
-
-  function slideDownCategoriesOptionAndHideCategoriesSelect() {
-    $("#filter-categories-option").slideDown();
-    $("#filter-categories-select-catalog").hide();
-  }
-
-
-  function slideUpCategoriesAndShowHeadMessage() {
-    $("#filter-categories-option").slideUp();
-    show_head_message();
-  }
-
-
   function clearCatalogCheckbox() {
-    $("#filter-categories-option").slideUp();
-    $("#filter-option-catalog-software").show();
     $("#group-categories input:checked").each(function() {
       $(this).prop('checked', false);
     });
@@ -45,39 +13,26 @@ modulejs.define('SoftwareCatalogComponent', ['jquery'], function($) {
 
 
   function selectCheckboxCategory(dispatch_ajax) {
-    $("#filter-categories-option").slideUp();
-    $("#filter-categories-select-catalog").show();
-    $("#filter-option-catalog-software").hide();
-
     dispatch_ajax_function(true);
   }
 
 
   function selectProjectSoftwareCheckbox() {
-    $("#filter-categories-option").slideUp();
-    $("#filter-categories-select-catalog").show();
-    $("#filter-option-catalog-software").hide();
-
     dispatch_ajax_function(true);
-    show_head_message();
   }
 
 
   function set_events() {
-    $("#filter-option-catalog-software").click(slideDowsCategoriesOptionAndHideOptionCatalog);
-    $("#filter-categories-select-catalog").click(slideDownCategoriesOptionAndHideCategoriesSelect);
-    $("#close-filter-catalog").click(slideUpCategoriesAndShowHeadMessage);
     $("#cleanup-filter-catalg").click(clearCatalogCheckbox);
     $(".categories-catalog").click(selectCheckboxCategory);
     $(".project-software").click(selectProjectSoftwareCheckbox);
   }
 
-
   return {
     init: function(dispatch_ajax) {
       dispatch_ajax_function = dispatch_ajax;
       set_events();
-      show_head_message();
     },
   }
 });
+
diff --git a/public/views/search-software-catalog.js b/public/views/search-software-catalog.js
index cb3bd01..09dc7ce 100644
--- a/public/views/search-software-catalog.js
+++ b/public/views/search-software-catalog.js
@@ -161,10 +161,8 @@ modulejs.define('SearchSoftwareCatalog', ['jquery', 'NoosferoRoot', 'SoftwareCat
     init: function() {
       set_events();
       catalog_message();
-
-      $("#filter-categories-option").hide();
-
       SoftwareCatalogComponent.init(dispatch_search_ajax);
     }
   }
-});
\ No newline at end of file
+});
+
diff --git a/views/search/_catalog_filter.html.erb b/views/search/_catalog_filter.html.erb
index 7ce8d23..9e1ca4d 100644
--- a/views/search/_catalog_filter.html.erb
+++ b/views/search/_catalog_filter.html.erb
@@ -1,29 +1,23 @@
 <div id="filter-catalog-software">
 
-  <div id="filter-option-catalog-software"><%= _("More options") %></div>
-    <!--Quando tiver filtros(categorias)selecionados mostrar esta opção: Opções selecionadas-->
-
-  <div id="filter-categories-select-catalog"><%= @message_selected_options %></div>
-
   <div id="filter-categories-option">
-
     <div id="filter-categories-catalog"><h4> <%= _("Categories") %> </h4></div>
-      <div id="group-categories">
-        <ul>
-          <% @categories_groupe_one.each do |category| %>
-            <li>
-              <%= check_box_tag("selected_categories_id[]", category.id, @selected_categories_id.include?(category.id), :class => "categories-catalog", @enabled_check_box[category] => "true") %>
-              <span><%= _("#{category.name}") %></span>
-            </li>
-          <% end %>
-          <% @categories_groupe_two.each do |category| %>
-            <li>
-              <%= check_box_tag("selected_categories_id[]", category.id, @selected_categories_id.include?(category.id), :class => "categories-catalog", @enabled_check_box[category] => "true") %>
-              <%= _("#{category.name}") %>
-            </li>
-          <% end %>
-        </ul>
-      </div>
+    <div id="group-categories">
+      <ul>
+        <% @categories_groupe_one.each do |category| %>
+        <li>
+          <%= check_box_tag("selected_categories_id[]", category.id, @selected_categories_id.include?(category.id), :class => "categories-catalog", @enabled_check_box[category] => "true") %>
+          <span><%= _("#{category.name}") %></span>
+        </li>
+        <% end %>
+        <% @categories_groupe_two.each do |category| %>
+        <li>
+          <%= check_box_tag("selected_categories_id[]", category.id, @selected_categories_id.include?(category.id), :class => "categories-catalog", @enabled_check_box[category] => "true") %>
+          <%= _("#{category.name}") %>
+        </li>
+        <% end %>
+      </ul>
+    </div>
 
     <div class="project-software"> <%= _("Software Projects:") %>
       <label>
@@ -32,7 +26,9 @@
       </label>
       <span class="doubts-catalog-software" title="<%= _('Include software development projects that are not yet officially Brazilian Public Software.') %>">?</span>
     </div>
+  </div>
+  <div id="filter-option-catalog-software"><%= _("More options") %></div>
+  <div id="filter-option-catalog-close">
     <%= button_tag _("Clean up"), :id => "cleanup-filter-catalg", :type => "button" %>
     <%= button_tag _("Close"), :id => "close-filter-catalog", :type => "button" %>
   </div>
-
diff --git a/views/search/_catalog_result_list.html.erb b/views/search/_catalog_result_list.html.erb
index 4e64576..57abb96 100644
--- a/views/search/_catalog_result_list.html.erb
+++ b/views/search/_catalog_result_list.html.erb
@@ -15,7 +15,7 @@
 
       <% display = display_filter(name, params[:display]) %>
 
-      <div class="search-results-innerbox search-results-type-<%= name.to_s.singularize %> <%= 'common-profile-list-block' if SearchHelper::COMMON_PROFILE_LIST_BLOCK.include?(name) %>">
+      <div class="search-results-innerbox <%= 'common-profile-list-block' if SearchHelper::COMMON_PROFILE_LIST_BLOCK.include?(name) %>">
         <ul>
           <% search[:results].each do |hit| %>
             <% partial = partial_for_class(hit.class, display) %>
--
libgit2 0.21.2