From ad94748d37c05c03096b1b474a2b69ec03262a1d Mon Sep 17 00:00:00 2001
From: Henne Vogelsang <hvogel@opensuse.org>
Date: Wed, 13 Feb 2013 14:54:00 +0100
Subject: [PATCH] [webui] Correct the footer links, fix owner search bug for
 binaries         which have no package container owner set

---
 src/webui/app/controllers/search_controller.rb   | 4 +++-
 src/webui/app/views/layouts/application.html.erb | 9 ++++-----
 src/webui/app/views/search/_results.html.erb     | 8 ++++----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/webui/app/controllers/search_controller.rb b/src/webui/app/controllers/search_controller.rb
index 3473a8c6817..6bee08fc210 100644
--- a/src/webui/app/controllers/search_controller.rb
+++ b/src/webui/app/controllers/search_controller.rb
@@ -81,7 +81,9 @@ def search
             end
           end
           project = find_cached(Project, result.project)
-          package = find_cached(Package, result.package, :project => project)
+          if result.package
+            package = find_cached(Package, result.package, :project => project)
+          end
           r << {:type => "owner", :data => result,
                 :users => users, :groups => groups,
                 :project => project, :package => package,
diff --git a/src/webui/app/views/layouts/application.html.erb b/src/webui/app/views/layouts/application.html.erb
index 1918902c348..f38c1ea6620 100644
--- a/src/webui/app/views/layouts/application.html.erb
+++ b/src/webui/app/views/layouts/application.html.erb
@@ -111,11 +111,10 @@
         <strong class="grey-medium spacer1">Help</strong>
         <ul>
           <% @helplinks = [
-            { 'Open Build Service Portal'  => 'http://en.opensuse.org/Portal:Build_Service' },
-            { 'Building Packages'  => 'http://en.opensuse.org/openSUSE:Build_Service_Tutorial' },
-            { 'Writing spec Files' => 'http://en.opensuse.org/openSUSE:Specfile_guidelines' },
-            { 'Reporting a Bug'   => 'http://en.opensuse.org/openSUSE:Submitting_bug_reports' },
-            { 'Forums'             => 'http://forums.opensuse.org/english/other-forums/development/open-build-service-obs/' } ]
+            { 'Open Build Service'  => 'http://openbuildservice.org/' },
+            { 'OBS Manuals'  => 'http://openbuildservice.org/help/manuals/' },
+            { 'openSUSEs OBS Portal' => 'http://en.opensuse.org/Portal:Build_service' },
+            { 'Reporting a Bug'   => 'http://openbuildservice.org/support/' } ]
 
           @helplinks.each do |helplink|
             for k in helplink.keys %>
diff --git a/src/webui/app/views/search/_results.html.erb b/src/webui/app/views/search/_results.html.erb
index 01ebbb7a7fc..f1fade7d4b6 100644
--- a/src/webui/app/views/search/_results.html.erb
+++ b/src/webui/app/views/search/_results.html.erb
@@ -30,10 +30,10 @@
     <% elsif result[:type] == 'owner' %>
       <div class="search_result">
       <h6>
-      Responsible for package
-      <%= link_to "#{result[:data].package}", { :controller => 'package', :action => :show, :package => result[:data].package, :project => result[:data].project }, class: 'package-link'-%>
-      for <%= result[:data].rootproject %> in project
-      <%= link_to "#{result[:data].project}", { :controller => 'project', :action => :show, :project => result[:data].project}, class: 'project-link' -%>
+      Responsible for package 
+      <%= params['search_text'] %>
+      for <%= result[:data].rootproject %> set in
+      <%= render :partial => 'shared/project_or_package_link', :locals => {:project => result[:data].project, :package => result[:data].package, :short => false} %>
       </h6>
       <p>
       <% if result[:users] %>