From 504c31680b30eaba80f24be96d3ab0aed6ae4454 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Sun, 2 Dec 2012 20:24:47 +0100
Subject: [PATCH] SONAR-3825 reload favourite filters in the management console

---
 .../WEB-INF/app/controllers/measures_controller.rb   |  7 ++++++-
 .../WEB-INF/app/views/measures/_favourites.html.erb  | 12 ++++++++++++
 .../WEB-INF/app/views/measures/_sidebar.html.erb     | 11 +----------
 .../WEB-INF/app/views/measures/manage.html.erb       |  3 ++-
 sonar-server/src/main/webapp/stylesheets/layout.css  |  2 +-
 5 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 sonar-server/src/main/webapp/WEB-INF/app/views/measures/_favourites.html.erb

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb
index 100abce9db2..f446186095d 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb
@@ -90,7 +90,7 @@ class MeasuresController < ApplicationController
   # GET /measures/manage
   def manage
     access_denied unless logged_in?
-    add_breadcrumbs(ROOT_BREADCRUMB, message('measure_filter.manage'))
+    add_breadcrumbs(ROOT_BREADCRUMB, message('measure_filter.manage_filters'))
     @filter = MeasureFilter.new
     @shared_filters = MeasureFilter.find(:all,
                                          :include => :user,
@@ -164,6 +164,11 @@ class MeasuresController < ApplicationController
     redirect_to :action => 'manage'
   end
 
+  def favourites
+    verify_ajax_request
+    render :partial => 'measures/favourites'
+  end
+
   # POST /measures/toggle_fav/<filter id>
   def toggle_fav
     access_denied unless logged_in?
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_favourites.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_favourites.html.erb
new file mode 100644
index 00000000000..fa6492a1e3b
--- /dev/null
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_favourites.html.erb
@@ -0,0 +1,12 @@
+<div id="sidebar-favourites">
+<% if logged_in? %>
+  <li class="sidebar-title">Favourite Filters</li>
+  <% current_user.favourited_measure_filters.each do |filter| %>
+    <li <%= "class='active'" if @filter && filter.id==@filter.id -%>>
+      <a href="<%= ApplicationController.root_context -%>/measures/filter/<%= filter.id -%>"><%= h filter.name -%></a>
+    </li>
+  <% end %>
+  <li><a href="<%= ApplicationController.root_context -%>/measures/manage" class="link-action"><%= message('manage') %></a></li>
+  <li class="spacer"></li>
+<% end %>
+</div>
\ No newline at end of file
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_sidebar.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_sidebar.html.erb
index 8625a0c55de..a94295e3871 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_sidebar.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_sidebar.html.erb
@@ -57,16 +57,7 @@
   </script>
 <% end %>
 <ul class="sidebar gray-sidebar">
-  <% if logged_in? %>
-    <li class="sidebar-title">Favourite Filters</li>
-    <% current_user.favourited_measure_filters.each do |filter| %>
-      <li <%= "class='active'" if filter.id==@filter.id -%>>
-        <a href="<%= ApplicationController.root_context -%>/measures/filter/<%= filter.id -%>"><%= h filter.name -%></a>
-      </li>
-    <% end %>
-    <li><a href="<%= ApplicationController.root_context -%>/measures/manage" class="link-action"><%= message('manage') %></a></li>
-    <li class="spacer"></li>
-  <% end %>
+  <%= render :partial => 'measures/favourites' -%>
 
   <form id="search-form" method="GET" action="<%= ApplicationController.root_context -%>/measures/search">
     <% if @filter.id %>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/manage.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/manage.html.erb
index d54bf068d18..d4d3773f017 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/manage.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/manage.html.erb
@@ -16,6 +16,7 @@
               star.removeClass('fav').addClass('notfav');
               star.attr('title', '<%= escape_javascript message('click_to_add_to_favourites') -%>');
             }
+            $j('#sidebar-favourites').load(baseUrl + '/measures/favourites');
           }
         });
       });
@@ -52,7 +53,7 @@
               <td>
                 <%= link_to h(filter.name), :action => 'filter', :id => filter.id -%>
                 <% if filter.description %>
-                  <div><%= h filter.description -%></div>
+                  <div class="note"><%= h filter.description -%></div>
                 <% end %>
               </td>
               <td>
diff --git a/sonar-server/src/main/webapp/stylesheets/layout.css b/sonar-server/src/main/webapp/stylesheets/layout.css
index 30fae43d0db..1f6f21b27ed 100644
--- a/sonar-server/src/main/webapp/stylesheets/layout.css
+++ b/sonar-server/src/main/webapp/stylesheets/layout.css
@@ -290,13 +290,13 @@ ul.sidebar select, ul.sidebar input {
 
 .page-split-left {
   min-width: 200px;
+  max-width: 200px;
   width: 200px;
   margin: 0;
   display: table-cell;
   vertical-align: top;
   border-top: none;
   border-left: none;
-  padding-left: 10px;
 }
 
 .page-split-right {
-- 
2.39.5