From ca9d8d802cb9e2a02d43050cb2b04889ae4338cd Mon Sep 17 00:00:00 2001
From: Fabio Teixeira <fabio1079@gmail.com>
Date: Thu, 5 Feb 2015 09:50:10 -0200
Subject: [PATCH] Adjust show and sort position on software catalog

---
 public/style.css                        | 52 +++++++++++++++++++---------------------------------
 views/search/_mpog_search_form.html.erb | 10 +++++-----
 2 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/public/style.css b/public/style.css
index 2676827..112f8d7 100644
--- a/public/style.css
+++ b/public/style.css
@@ -354,11 +354,6 @@ input.button.with-text.icon-search.submit{
   padding: 15px 10px;
 }
 
-/*#filter-categories{
-  margin:10px 5px;
-  color:#ffffff;
-}*/
-
 #filter-categories-catalog h4{
   margin:10px 5px;
   color:#000;
@@ -424,38 +419,29 @@ input.button.with-text.icon-search.submit{
   padding: 5px;
 
 }
-/*
-#close-filter-catalog:hover{
-  background:#2B65CD;
-  border-radius: 4px;
-  margin-top: 5px;
-  color: #FFF;
-  text-transform: uppercase;
-  border-radius: 4px;
-  border: 1px solid #2B65CD;
-  padding: 5px;
-}
-
-#close-filter-catalog:after{
-    content:"︿";
-    padding-left: 7px;
-    padding-right: 4px;
-    color: #172857;
-    background: none repeat scroll 0% 0% #EEE;
-    border-radius: 4px;
-    font-size: 15px;
-    line-height: 20px;
-    text-align: center;
-    position: relative;
-    margin-left: 5px;
-    top: 2px;
-    margin-right: 15px;
-}
-*/
 
 input[type=checkbox] {
   border:1px solid #000;
   margin:8px;
   cursor:pointer;
 }
+
+#catalog-display-options {
+  position: relative;
+  width: 100%;
+}
+
+#catalog-display-options-count, #catalog-display-options-show-and-sort {
+  position: relative;
+  float: left;
+  width: 50%;
+}
+
+#catalog-display-options-show, #catalog-display-options-sort {
+  position: relative;
+  float: left;
+  width: 50%;
+  text-align: right;
+}
+
 /* End software catalog definitions */
\ No newline at end of file
diff --git a/views/search/_mpog_search_form.html.erb b/views/search/_mpog_search_form.html.erb
index a2d1d60..4152800 100644
--- a/views/search/_mpog_search_form.html.erb
+++ b/views/search/_mpog_search_form.html.erb
@@ -18,20 +18,20 @@
     <%= render :partial => 'catalog_filter' %>
 
     <!-- #display-options sera substituido pelo html passado pela equipe de design -->
-    <div id="display-options" class="">
-      <div id="software-count">
+    <div id="catalog-display-options">
+      <div id="catalog-display-options-count">
         <strong><%= "#{@software_count} Software(s)" %> </strong>
       </div>
 
-      <div>
-        <div>
+      <div id="catalog-display-options-show-and-sort">
+        <div id="catalog-display-options-show">
           Show:
           <%= select_tag("software_display",
             options_for_select(['15', '30', '90', 'All'], :selected=>params[:display])
           ) %>
         </div>
 
-        <div>
+        <div id="catalog-display-options-sort">
           Sort by:
           <%= select_tag("sort",
             options_for_select(
--
libgit2 0.21.2