# 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,
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?
--- /dev/null
+<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
</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 %>
star.removeClass('fav').addClass('notfav');
star.attr('title', '<%= escape_javascript message('click_to_add_to_favourites') -%>');
}
+ $j('#sidebar-favourites').load(baseUrl + '/measures/favourites');
}
});
});
<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>
.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 {