From 352448ef2168b50154a8d47cb660b826a235e9fb Mon Sep 17 00:00:00 2001
From: Guo Yunhe <guoyunhebrave@gmail.com>
Date: Sat, 1 Jul 2017 00:46:04 +0300
Subject: [PATCH] Search result list

---
 app/assets/stylesheets/app.scss         | 17 ++++++++
 app/views/search/_find_results.html.erb | 58 ++++++++-----------------
 2 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/app/assets/stylesheets/app.scss b/app/assets/stylesheets/app.scss
index 0dfc32661..c9e11a191 100644
--- a/app/assets/stylesheets/app.scss
+++ b/app/assets/stylesheets/app.scss
@@ -6,4 +6,21 @@
         background-position: center;
         background-repeat: no-repeat;
     }
+
+    // Only one line text
+    .card-title {
+        height: 1.1em;
+        white-space: nowrap;
+        overflow: hidden;
+
+        mark {
+            padding: 0;
+        }
+    }
+
+    // Only two line text
+    .card-text {
+        height: 3em;
+        overflow: hidden;
+    }
 }
\ No newline at end of file
diff --git a/app/views/search/_find_results.html.erb b/app/views/search/_find_results.html.erb
index 524a396c1..d3fccd6f5 100644
--- a/app/views/search/_find_results.html.erb
+++ b/app/views/search/_find_results.html.erb
@@ -1,4 +1,4 @@
-<div id="search-result" class="py-5">
+<div id="search-result" class="py-3">
   <div class="container">
 
     <% if DEFAULT_SEARCHES[@search_term] %>
@@ -63,6 +63,9 @@
                   <p class="card-text"><%= highlight( summary, @search_term) %></p>
                 <% end -%>
 
+                <a href="<%= url_for :controller => :package, :action => :show, :package => package %>" class="btn btn-primary"><%= _("Get") %></a>
+
+                
                 <%
                 devel_pack_match = [package + "-devel", package + "-lang", package + "-debuginfo", package + "-debugsource", package + "-debuginfo-32bit",
                   package + "-debuginfo-x86", ]
@@ -71,53 +74,26 @@
                         name.start_with?("#{package}-") && @appdata[:apps].select{|a| a[:pkgname] == name}.blank? ) } -%>
 
                 <% unless devel_packages.blank? && sub_packages.blank? %>
-                  <p>
-                    <%= _("Show") %>
-                    <a href="#" onclick="$('#devel-packages-<%= package %>').slideToggle(); return false;">
-                      <%= devel_packages.size.to_s + " " + _("Development-") + " " if !devel_packages.blank? && !sub_packages.blank? -%>
-                      <%= devel_packages.size.to_s + " " + _("Development packages") + " " if !devel_packages.blank? && sub_packages.blank? -%>
-                    </a>
-                    <%= _(" and ") unless (devel_packages.blank? || sub_packages.blank?) -%>
-                    <a href="#" onclick="$('#sub-packages-<%= package %>').slideToggle(); return false;">
-                      <%= sub_packages.size.to_s + " " + _("Sub-Packages") + " " unless sub_packages.blank? -%>
-                    </a>
-                  </p>
-                <% end -%>
-
-                <% unless devel_packages.blank? %>
-                    <ul class="hidden extra-packages" id="devel-packages-<%= package %>">
-                      <% devel_packages.sort.each do |subpackage| %>
-                        <li><%= link_to subpackage.sub("#{package}-", ""), :controller => :package, :action => :show, :package => subpackage  %></li>
+                  <div class="dropdown d-inline-block">
+                    <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                      <%= _("Sub-Packages") %>
+                    </button>
+                    <div class="dropdown-menu">
+                      <% sub_packages.each do |subpackage| %>
+                        <%= link_to subpackage, { :controller => :package, :action => :show, :package => subpackage }, :class => 'dropdown-item' %>
                       <% end %>
-                    </ul>
-                  <% @packagenames.reject! {|r| devel_pack_match.include? r }  -%>
-                <% end -%>
-
-                <% unless sub_packages.blank? -%>
-                    <ul class="hidden extra-packages" id="sub-packages-<%= package %>">
-                    <% sub_packages.each do |subpackage| %>
-                      <li><%= link_to subpackage.sub("#{package}-", ""), :controller => :package, :action => :show, :package => subpackage  %></li>
-                    <% end %>
-                      </ul>
-                  <% @packagenames.reject! {|r| r.match(/^#{Regexp.escape( package )}-/)  && @appdata[:apps].select{|a| a[:pkgname] == r}.blank? }  -%>
+                      <h6 class="dropdown-header"><%= _("Development packages") %></h6>
+                      <% devel_packages.each do |subpackage| %>
+                        <%= link_to subpackage, { :controller => :package, :action => :show, :package => subpackage }, :class => 'dropdown-item' %>
+                      <% end %>
+                    </div>
+                  </div>
                 <% end -%>
-
               </div>
             </div>
           </div>
         <% end -%>
-        <div style="clear: both; "></div>
-
-
-        <% if @packagenames.size > 81 %>
-          <div id="show-more-button" class="rounded-corner hidden">
-            <p><a href="#"><%= _("Show more...") %></a></p>
-          </div>
-        <% end -%>
-
       </div>
-
     <% end %>
-
   </div>
 </div>