enable 'back to search' link

openSUSE · Mar 9, 2012 · f21f5dd · f21f5dd
1 parent 45b7bdf
commit f21f5dd
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 20 deletions.
diff --git a/app/controllers/package_controller.rb b/app/controllers/package_controller.rb
@@ -7,6 +7,7 @@ def show
     @pkgname = params[:package]
     raise MissingParameterError, "Invalid parameter package" unless valid_package_name? @pkgname
 
+    @search_term = params[:search_term]
     @base_appdata_project = "openSUSE:Factory"
 
     @packages = Seeker.prepare_result("\"#{@pkgname}\"", nil, nil, nil, nil)
@@ -41,7 +42,6 @@ def show
     end
 
     #TODO: get distro spezific screenshot, cache from debshots etc.
-    @screenshot_thumb = "http://screenshots.debian.net/thumbnail/" + @pkgname
     @screenshot = "http://screenshots.debian.net/screenshot/" + @pkgname
 
   end

diff --git a/app/views/package/show.html.erb b/app/views/package/show.html.erb
@@ -1,10 +1,10 @@
 <% @hide_side_box = true -%>
 <% @hide_search_box = true -%>
 
-  <% content_for :content_for_head do %>
-    <%= javascript_include_tag "slimbox2" %>
-    <%= stylesheet_link_tag "slimbox2/slimbox2.css" %>
-  <% end %>
+<% content_for :content_for_head do %>
+  <%= javascript_include_tag "slimbox2" %>
+  <%= stylesheet_link_tag "slimbox2/slimbox2.css" %>
+<% end %>
 
 <script type="text/javascript">
   function toggle_dist(distname){
@@ -22,8 +22,11 @@
 
 <div class="box box-shadow">
   <h2 class="box-header">
-    <a class="pkg-backlink" href="#">Back to search</a></h2>
+    <% unless @search_term.blank? %>
+      <%= link_to _("Back to search"), {:controller => :search, :action => :searchresult, :q => @search_term}, :class => "pkg-backlink" %>
+    <% end %>
     <span class="alignleft"><%= @page_title -%></span>
+  </h2>
   <div>
 
     <% if @packages.blank? %>
@@ -37,27 +40,27 @@
         <div id="pkg-description">
           <h1><%= @name || @pkgname %></h1>
           <% unless @description_package.blank? %>
-          
-          <% unless @appcategories.blank? %>
+
+            <% unless @appcategories.blank? %>
               <p id="pkg-categorie-note">
                 <strong><%=  @appcategories.size > 1 ? _("Categories") : _("Category") %>:</strong>
 
-            <% @appcategories.each do |cat| -%>
-              <%= link_to cat, "#" %>
+                <% @appcategories.each do |cat| -%>
+                  <%= link_to cat, "#" %>
+                <% end -%>
+              </p>
             <% end -%>
-            </p>
+
+            <h3><%=  @description_package.summary %></h3>
           <% end -%>
-
-          <h3><%=  @description_package.summary %></h3>
-           <% end -%>
           <div class="app-screenshot">
             <%= link_to( image_tag( screenshot_thumb_url( @pkgname ), :width => 160 ), @screenshot, { :rel => "lightbox", :title => "Screenshot of  #{@pkgname}" } ) %>
           </div>
           <% if @description_package.blank? %>
             <p>No description found...</p>
           <% else %>
             <p id="pkg-desc"><%= prepare_desc @description_package.description -%>
--             <!-- <i>(from <%= @description_package.project %>)</i> --></p>
+    -             <!-- <i>(from <%= @description_package.project %>)</i> --></p>
           <% end -%>
 
           <% unless @default_package.blank? %>
@@ -92,7 +95,7 @@
                     <% official_projects = @distributions.map{|d| d[:project]} %>
                     <% devel = @packages.select{|s| s.baseproject == distro[:project] } %>
                     <% devel = devel.reject{|s| official_projects.include?( s.project ) || s.project.match( /^home\:/ ) || s.project.match( /#{distro[:project]}\:Update/ ) ||
-                      s.project.match( /openSUSE\:Maintenance\:/ ) } %>
+                        s.project.match( /openSUSE\:Maintenance\:/ ) } %>
                     <%= render :partial => 'download_rows', :locals => {:packages => devel, :distro => distro} %>
 
 
@@ -101,10 +104,10 @@
                     <% unless home.blank? %>
                       <li><a class="trigger-show-more" href="#" onclick="$('#dist_home_<%= distro[:dist_id] %>').toggle(); return false;">Show user packages</a></li>
                     <% end -%>
-                    </ul>
-                    <ul class="pkg-options-details  hidden" id="dist_home_<%= distro[:dist_id] %>" >
-                      <%= render :partial => 'download_rows', :locals => {:packages => home, :distro => distro} %>
-                    </ul>
+                  </ul>
+                  <ul class="pkg-options-details  hidden" id="dist_home_<%= distro[:dist_id] %>" >
+                    <%= render :partial => 'download_rows', :locals => {:packages => home, :distro => distro} %>
+                  </ul>
 
                 </li>