Conflicts: app/controllers/albums_controller.rb app/controllers/aspects_controller.rb app/controllers/photos_controller.rb app/controllers/registrations_controller.rb app/controllers/requests_controller.rb app/helpers/dashboards_helper.rb app/views/albums/show.html.haml app/views/aspects/manage.html.haml app/views/shared/_aspect_nav.haml app/views/shared/_sub_header.haml app/views/status_messages/_status_message.html.haml app/views/status_messages/show.html.haml config/locales/de.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml
22 lines
876 B
Text
22 lines
876 B
Text
-# Copyright (c) 2010, Diaspora Inc. This file is
|
|
-# licensed under the Affero General Public License version 3. See
|
|
-# the COPYRIGHT file.
|
|
|
|
|
|
#aspect_nav
|
|
%ul
|
|
- for aspect in @aspects
|
|
%li{:class => ("selected" if current_aspect?(aspect))}
|
|
= link_for_aspect aspect
|
|
|
|
%ul{ :style => "position:absolute;right:0;bottom:0.01em;"}
|
|
%li{:class => ("selected" if @aspect == :all)}
|
|
= link_to t('.all_aspects'), root_url
|
|
|
|
%li{ :style => "margin-right:0;", :class => ("selected" if @aspect == :manage)}
|
|
= link_to ( (@request_count == 0)? t('.manage') : "#{t('.manage')} (#{@request_count})"), {:controller => :aspects, :action => :manage}, :class => "edit_aspect_button", :class => new_request(@request_count), :title => t('.manage_your_aspects')
|
|
|
|
.yo{ :style => "display:none;"}
|
|
#add_aspect_pane
|
|
= render "aspects/new_aspect"
|
|
|