nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor display setup for De/select_all aspects link

Browse source
This commit is contained in:
Gonzalo Rodriguez 2011-10-12 00:06:25 -02:00
parent c694b4aa4e
commit f655b12e98
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/views/aspects/_aspect_listings.haml
View file

@ -7,9 +7,11 @@
.root_element= link_to t('aspects.index.your_aspects'), aspects_path .root_element= link_to t('aspects.index.your_aspects'), aspects_path
%ul.sub_nav %ul.sub_nav
%a.toggle_selector{:href => '#'} - if defined?(stream)
%a.toggle_selector{:href => '#'}
= stream.for_all_aspects? ? t('.deselect_all') : t('.select_all')
- for aspect in all_aspects - for aspect in all_aspects
%li{:data => {:aspect_id => aspect.id}, :class => ("active" if defined?(selected_aspects) && selected_aspects.include?(aspect.id))} %li{:data => {:aspect_id => aspect.id}, :class => ("active" if defined?(stream) && stream.aspect_ids.include?(aspect.id))}
.edit .edit
= link_to image_tag("icons/pencil.svg", :height => 12, :title => t('.edit_aspect', :name => aspect.name)), edit_aspect_path(aspect), :rel => "facebox" = link_to image_tag("icons/pencil.svg", :height => 12, :title => t('.edit_aspect', :name => aspect.name)), edit_aspect_path(aspect), :rel => "facebox"

2
app/views/aspects/index.html.haml
View file

@ -19,7 +19,7 @@
= link_to "Welcome", getting_started_path, :class => "home_selector" = link_to "Welcome", getting_started_path, :class => "home_selector"
.section .section
= render 'aspects/aspect_listings', :selected_aspects => @stream.aspect_ids = render 'aspects/aspect_listings', :stream => @stream
.section .section
%ul.left_nav %ul.left_nav

2
config/locales/diaspora/en.yml
View file

@ -120,6 +120,8 @@ en:
or_featured: "Or you can share with %{link}" or_featured: "Or you can share with %{link}"
featured_users: "featured users" featured_users: "featured users"
aspect_listings: aspect_listings:
select_all: "Select all"
deselect_all: "Deselect all"
edit_aspect: "Edit %{name}" edit_aspect: "Edit %{name}"
add_an_aspect: "+ Add an aspect" add_an_aspect: "+ Add an aspect"
selected_contacts: selected_contacts:

1
public/javascripts/widgets/aspect-navigation.js
View file

@ -15,7 +15,6 @@
toggleSelector: aspectNavigation.find("a.toggle_selector") toggleSelector: aspectNavigation.find("a.toggle_selector")
}); });
self.calculateToggleText();
self.aspectSelectors.click(self.toggleAspect); self.aspectSelectors.click(self.toggleAspect);
self.toggleSelector.click(self.toggleAll); self.toggleSelector.click(self.toggleAll);
}); });