renamed home to all aspects in header, made clicking aspect names on right trigger filtering
This commit is contained in:
parent
43315e14f9
commit
b9b9d7e07d
5 changed files with 8 additions and 3 deletions
|
|
@ -45,7 +45,7 @@ module ApplicationHelper
|
||||||
if !link
|
if !link
|
||||||
str << link_to(aspect.name, "#", 'data-guid' => aspect.id, :class => 'hard_aspect_link').html_safe
|
str << link_to(aspect.name, "#", 'data-guid' => aspect.id, :class => 'hard_aspect_link').html_safe
|
||||||
else
|
else
|
||||||
str << link_for_aspect(aspect, 'data-guid' => aspect.id, :class => 'hard_aspect_link').html_safe
|
str << link_for_aspect(aspect).html_safe
|
||||||
end
|
end
|
||||||
str << "</span>"
|
str << "</span>"
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,9 @@ module AspectsHelper
|
||||||
opts[:params] ||= {}
|
opts[:params] ||= {}
|
||||||
params ||= {}
|
params ||= {}
|
||||||
opts[:params] = opts[:params].merge("a_ids[]" => aspect.id, :created_at => params[:created_at])
|
opts[:params] = opts[:params].merge("a_ids[]" => aspect.id, :created_at => params[:created_at])
|
||||||
|
opts[:class] ||= ""
|
||||||
|
opts[:class] << " hard_aspect_link"
|
||||||
|
opts['data-guid'] = aspect.id
|
||||||
|
|
||||||
link_to aspect.name, aspects_path( opts[:params] ), opts
|
link_to aspect.name, aspects_path( opts[:params] ), opts
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,8 @@
|
||||||
%b
|
%b
|
||||||
= link_to t('contacts', :count => contacts.size), edit_aspect_path(aspect), :rel => 'facebox'
|
= link_to t('contacts', :count => contacts.size), edit_aspect_path(aspect), :rel => 'facebox'
|
||||||
%b
|
%b
|
||||||
= link_to aspect.name, edit_aspect_path(aspect), :rel => 'facebox', :class => 'name'
|
/= link_to aspect.name, aspect_path(aspect), :rel => 'facebox', :class => 'name'
|
||||||
|
= link_for_aspect(aspect, :class => 'hard_aspect_link')
|
||||||
%br
|
%br
|
||||||
|
|
||||||
- if contacts.length > 0
|
- if contacts.length > 0
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@
|
||||||
-unless @landing_page
|
-unless @landing_page
|
||||||
%ul#aspect_nav
|
%ul#aspect_nav
|
||||||
%li{:class => ('selected' if @aspect == :all)}
|
%li{:class => ('selected' if @aspect == :all)}
|
||||||
= link_to t('_home'), aspects_path, :class => 'home_selector'
|
= link_to t('all_aspects'), aspects_path, :class => 'home_selector'
|
||||||
|
|
||||||
- for aspect in @all_aspects
|
- for aspect in @all_aspects
|
||||||
%li{:data=>{:guid=>aspect.id}, :class => ("selected" if @object_aspect_ids.include?(aspect.id))}
|
%li{:data=>{:guid=>aspect.id}, :class => ("selected" if @object_aspect_ids.include?(aspect.id))}
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,7 @@ en:
|
||||||
next: "next"
|
next: "next"
|
||||||
previous: "previous"
|
previous: "previous"
|
||||||
_comments: "Comments"
|
_comments: "Comments"
|
||||||
|
all_aspects: "All aspects"
|
||||||
|
|
||||||
|
|
||||||
#for reference translation, the real activerecord english transations are actually
|
#for reference translation, the real activerecord english transations are actually
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue