MS i had broke atom generation in my refactor. now it is fixed
This commit is contained in:
parent
9afb8beb25
commit
d73d36f162
5 changed files with 7 additions and 3 deletions
|
|
@ -1,4 +1,6 @@
|
||||||
class ApplicationController < ActionController::Base
|
class ApplicationController < ActionController::Base
|
||||||
|
require 'lib/diaspora/ostatus_generator'
|
||||||
|
|
||||||
protect_from_forgery :except => :receive
|
protect_from_forgery :except => :receive
|
||||||
layout 'application'
|
layout 'application'
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,5 +11,5 @@
|
||||||
|
|
||||||
%div.image_cycle
|
%div.image_cycle
|
||||||
- for photo in post.photos[0..3]
|
- for photo in post.photos[0..3]
|
||||||
= image_tag photo.image.url(:thumb_large)
|
= link_to (image_tag photo.image.url(:thumb_large)), album_path(post)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
= link_to 'albums', albums_path
|
= link_to 'albums', albums_path
|
||||||
>>
|
>>
|
||||||
= @album.name
|
= @album.name
|
||||||
|
%h5= "last updated: #{how_long_ago(@album)}"
|
||||||
-unless mine? @album
|
-unless mine? @album
|
||||||
%h4= 'by ' + @album.person.real_name
|
%h4= 'by ' + @album.person.real_name
|
||||||
-if mine? @album
|
-if mine? @album
|
||||||
|
|
@ -11,4 +12,4 @@
|
||||||
|
|
||||||
-if mine? @album
|
-if mine? @album
|
||||||
%p
|
%p
|
||||||
= link_to "Destroy", @album, :confirm => 'Are you sure?', :method => :delete
|
= link_to "Delete Album", @album, :confirm => 'Are you sure?', :method => :delete
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,7 @@ module Diaspora
|
||||||
def self.entries(objects)
|
def self.entries(objects)
|
||||||
xml = ""
|
xml = ""
|
||||||
if objects.respond_to? :each
|
if objects.respond_to? :each
|
||||||
objects.each {|x| xml << x.to_ostatus}
|
objects.each {|x| xml << x.to_activity}
|
||||||
else
|
else
|
||||||
xml << objects.to_activity
|
xml << objects.to_activity
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@
|
||||||
$("#publisher_content_pickers .photo").click(selectPublisherTab);
|
$("#publisher_content_pickers .photo").click(selectPublisherTab);
|
||||||
|
|
||||||
$("#new_status_message").submit(function() {
|
$("#new_status_message").submit(function() {
|
||||||
|
|
||||||
var new_status = $('#status_message_message').val() + " - just now";
|
var new_status = $('#status_message_message').val() + " - just now";
|
||||||
$('#latest_message').text( new_status );
|
$('#latest_message').text( new_status );
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue