2489f8503f
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
42 lines
1 KiB
Text
42 lines
1 KiB
Text
-# Copyright (c) 2010, Diaspora Inc. This file is
|
|
-# licensed under the Affero General Public License version 3. See
|
|
-# the COPYRIGHT file.
|
|
|
|
|
|
:javascript
|
|
$(document).ready(function(){
|
|
$(".image_thumb img").load( function() {
|
|
$(this).fadeIn("slow");
|
|
});
|
|
});
|
|
|
|
= content_for :page_title do
|
|
= link_to "◂ #{t('.albums')}", albums_path(:aspect => @aspect)
|
|
|
|
- content_for :left_pane do
|
|
= render "shared/aspect_friends"
|
|
|
|
- content_for :publish do
|
|
-if current_user.owns? @album
|
|
.right
|
|
=render 'photos/new_photo'
|
|
= link_to t('.edit_album'), edit_album_path(@album), :class => 'button'
|
|
%h1
|
|
= @album.name
|
|
="#{t('.updated')} #{how_long_ago(@album)}"
|
|
|
|
|
|
|
|
.album_id{:id => @album.id, :style => "display:hidden;"}
|
|
|
|
-unless current_user.owns? @album
|
|
%h4= "#{t('.by')} #{@album.person.real_name}"
|
|
|
|
#thumbnails
|
|
- for photo in @album_photos
|
|
.image_thumb
|
|
= link_to (image_tag photo.url(:thumb_medium)), object_path(photo)
|
|
|
|
#content_bottom
|
|
.back
|
|
= link_to "⇧ #{t('.albums')}", albums_path
|