Merge remote-tracking branch 'origin/new_design_2017' into new_design…

…_2017
openSUSE · Aug 4, 2017 · 56c072e · 56c072e
2 parents 35a0502 + 0381e87
commit 56c072e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -14,7 +14,6 @@
 //= require jquery.ui.all
 //= require jquery_ujs
 //
-//= require bento/global-navigation.js
 //= require jquery.cookie
 //= require jquery.pjax
 

diff --git a/app/assets/javascripts/bento/global-navigation.js b/app/assets/javascripts/bento/global-navigation.js
diff --git a/app/views/package/show.html.erb b/app/views/package/show.html.erb
@@ -74,15 +74,23 @@
         <%= render :partial => 'package/download_rows', :locals => {:packages => stable, :distro => distro, :oneclick => true, :type => 'official'} %>
 
         <%
+        slug = distro[:project].downcase.strip.gsub('_', '-').gsub('/', '-').gsub(':', '-').gsub(/[^\w-]/, '')
         home, pkgs = pkgs.partition{|s| s.project.match( /^home\:/ )}
         devel = pkgs.reject{|s| @official_projects.include?( s.project ) || s.project.match( /^home\:/ ) || s.project.match( /#{distro[:project]}\:Update/ ) ||
             s.project.match( /#{distro[:project]}\:NonFree/ ) || s.project.match( /openSUSE\:Maintenance\:/ ) } %>
 
+        <p>
+          <button class="btn btn-sm btn-warning" type="button" data-toggle="collapse" data-target="#<%= slug %>-experimental-packages"><%= _("Show experimental packages") %></button>
+          <button class="btn btn-sm btn-danger" type="button" data-toggle="collapse" data-target="#<%= slug %>-community-packages"><%= _("Show community packages") %></button>
+        </p>
         <!-- experimental packages -->
-        <%= render :partial => 'package/download_rows', :locals => {:packages => devel, :distro => distro, :oneclick => true, :type => 'experimental' } %>
-
+        <div id="<%= slug %>-experimental-packages" class="collapse">
+          <%= render :partial => 'package/download_rows', :locals => {:packages => devel, :distro => distro, :oneclick => true, :type => 'experimental' } %>
+        </div>
         <!-- community packages -->
-        <%= render :partial => 'package/download_rows', :locals => {:packages => home, :distro => distro, :oneclick => true, :type => 'community'} %>
+        <div id="<%= slug %>-community-packages" class="collapse">
+          <%= render :partial => 'package/download_rows', :locals => {:packages => home, :distro => distro, :oneclick => true, :type => 'community'} %>
+        </div>
       <% end -%>
     <% end -%>