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

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
maxwell 2010-09-13 15:48:50 -07:00
commit 3b1223c9dd
45 changed files with 701 additions and 681 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/albums_controller.rb
View file

@ -30,6 +30,7 @@ class AlbumsController < ApplicationController
def create def create
@album = current_user.post(:album, params[:album]) @album = current_user.post(:album, params[:album])
flash[:notice] = "You've created an album called #{@album.name}."
respond_with @album respond_with @album
end end
@ -40,6 +41,7 @@ class AlbumsController < ApplicationController
def destroy def destroy
@album = Album.find_by_id params[:id] @album = Album.find_by_id params[:id]
@album.destroy @album.destroy
flash[:notice] = "Album #{@album.name} deleted."
respond_with :location => albums_url respond_with :location => albums_url
end end
@ -58,7 +60,13 @@ class AlbumsController < ApplicationController
def update def update
@album = Album.find_params_by_id params[:id] @album = Album.find_params_by_id params[:id]
respond_with @album if @album.update_attributes params[:album]
flash[:notice] = "Album #{@album.name} successfully edited."
respond_with @album
else
flash[:error] = "Failed to edit album #{@album.name}."
render :action => :edit
end
end end
end end

9
app/controllers/aspects_controller.rb
View file

@ -30,6 +30,7 @@ class AspectsController < ApplicationController
def create def create
@aspect = current_user.aspect params[:aspect] @aspect = current_user.aspect params[:aspect]
flash[:notice] = "Click on the plus on the left side to tell Diaspora who can see your new aspect."
respond_with @aspect respond_with @aspect
end end
@ -40,6 +41,7 @@ class AspectsController < ApplicationController
def destroy def destroy
@aspect = Aspect.find_by_id params[:id] @aspect = Aspect.find_by_id params[:id]
@aspect.destroy @aspect.destroy
flash[:notice] = "You are no longer sharing the aspect called #{@aspect.name}."
respond_with :location => aspects_url respond_with :location => aspects_url
end end
@ -59,6 +61,7 @@ class AspectsController < ApplicationController
def update def update
@aspect = Aspect.find_by_id(params[:id]) @aspect = Aspect.find_by_id(params[:id])
@aspect.update_attributes(params[:aspect]) @aspect.update_attributes(params[:aspect])
flash[:notice] = "Your aspect, #{@aspect.name}, has been successfully edited."
respond_with @aspect respond_with @aspect
end end
@ -81,9 +84,11 @@ class AspectsController < ApplicationController
flash[:error] = "didn't work #{params.inspect}" flash[:error] = "didn't work #{params.inspect}"
end end
if aspect = Aspect.first(:id => params[:to][:to]) if aspect = Aspect.first(:id => params[:to][:to])
redirect_to aspect flash[:notice] = "You are now showing your friend a different aspect of yourself."
respond_with aspect
else else
redirect_to Person.first(:id => params[:friend_id]) flash[:notice] = "You are now showing your friend a different aspect of yourself."
respond_with Person.first(:id => params[:friend_id])
end end
end end
end end

11
app/controllers/photos_controller.rb
View file

@ -77,6 +77,7 @@ class PhotosController < ApplicationController
def destroy def destroy
@photo = Photo.find_by_id params[:id] @photo = Photo.find_by_id params[:id]
@photo.destroy @photo.destroy
flash[:notice] = "Photo deleted."
respond_with :location => @photo.album respond_with :location => @photo.album
end end
@ -96,8 +97,12 @@ class PhotosController < ApplicationController
def update def update
@photo = Photo.find_by_id params[:id] @photo = Photo.find_by_id params[:id]
@photo.update_attributes params[:photo] if @photo.update_attributes params[:photo]
flash[:notice] = "Photo successfully updated."
respond_with @photo respond_with @photo
else
flash[:error] = "Failed to edit photo."
render :action => :edit
end
end end
end end

22
app/controllers/requests_controller.rb
View file

@ -35,15 +35,16 @@ class RequestsController < ApplicationController
if params[:accept] if params[:accept]
if params[:aspect_id] if params[:aspect_id]
@friend = current_user.accept_and_respond( params[:id], params[:aspect_id]) @friend = current_user.accept_and_respond( params[:id], params[:aspect_id])
flash[:notice] = "you are now friends" flash[:notice] = "You are now friends."
respond_with :location => current_user.aspect_by_id(params[:aspect_id]) respond_with :location => current_user.aspect_by_id(params[:aspect_id])
else else
flash[:error] = "please select a aspect!" flash[:error] = "Please select an aspect!"
respond_with :location => requests_url respond_with :location => requests_url
end end
else else
current_user.ignore_friend_request params[:id] current_user.ignore_friend_request params[:id]
respond_with :location => requests_url, :notice => "Ignored friend request." flash[:notice] = "Ignored friend request."
respond_with :location => requests_url
end end
end end
@ -57,7 +58,8 @@ class RequestsController < ApplicationController
begin begin
rel_hash = relationship_flow(params[:request][:destination_url]) rel_hash = relationship_flow(params[:request][:destination_url])
rescue Exception => e rescue Exception => e
respond_with :location => aspect, :error => "No diaspora seed found with this email!" flash[:error] = "No diaspora seed found with this email!"
respond_with :location => aspect
return return
end end
@ -67,17 +69,17 @@ class RequestsController < ApplicationController
@request = current_user.send_friend_request_to(rel_hash[:friend], aspect) @request = current_user.send_friend_request_to(rel_hash[:friend], aspect)
rescue Exception => e rescue Exception => e
raise e unless e.message.include? "already friends" raise e unless e.message.include? "already friends"
message = "You are already friends with #{params[:request][:destination_url]}!" flash[:notice] = "You are already friends with #{params[:request][:destination_url]}!"
respond_with :location => aspect, :notice => message respond_with :location => aspect
return return
end end
if @request if @request
message = "A friend request was sent to #{@request.destination_url}." flash[:notice] = "A friend request was sent to #{@request.destination_url}."
respond_with :location => aspect, :notice => message respond_with :location => aspect
else else
message = "Something went horribly wrong." flash[:error] = "Something went horribly wrong."
respond_with :location => aspect, :error => message respond_with :location => aspect
end end
end end

34
app/views/albums/_album.html.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
.album{:id => post.id, :class => ("mine" if current_user.owns?(post))} .album{:id => post.id, :class => ("mine" if current_user.owns?(post))}

34
app/views/albums/_new_album.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
%h1 Add a new album %h1 Add a new album

34
app/views/albums/edit.html.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
.back= link_to "⇧ #{@album.name}", @album .back= link_to "⇧ #{@album.name}", @album

34
app/views/albums/index.html.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
- content_for :head do - content_for :head do

34
app/views/albums/show.html.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
:javascript :javascript

34
app/views/aspects/_new_aspect.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
%h1 Add a new aspect %h1 Add a new aspect

34
app/views/aspects/edit.html.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
- content_for :head do - content_for :head do

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

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
- content_for :page_title do - content_for :page_title do

34
app/views/aspects/new.html.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
%h1.big_text %h1.big_text

34
app/views/aspects/show.html.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
- content_for :page_title do - content_for :page_title do

34
app/views/comments/_comment.html.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
%li.comment{:id => post.id} %li.comment{:id => post.id}

34
app/views/comments/_comments.html.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
%div.comments %div.comments

34
app/views/comments/_new_comment.html.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
= form_for Comment.new, :remote => true do |f| = form_for Comment.new, :remote => true do |f|

34
app/views/js/_websocket_js.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
= javascript_include_tag 'FABridge', 'swfobject', 'web_socket' = javascript_include_tag 'FABridge', 'swfobject', 'web_socket'

34
app/views/people/index.html.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
%h1.big_text %h1.big_text

34
app/views/people/new.html.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
- title "New Person" - title "New Person"

34
app/views/people/show.html.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
- content_for :page_title do - content_for :page_title do

34
app/views/photos/_new_photo.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
:javascript :javascript

34
app/views/photos/_photo.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
%li.message{:id => post.id} %li.message{:id => post.id}

34
app/views/photos/edit.html.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
%h1.big_text %h1.big_text

34
app/views/photos/new.html.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
- title "New Photo" - title "New Photo"

34
app/views/photos/show.html.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
:javascript :javascript

34
app/views/posts/_debug.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
#debug_info #debug_info

34
app/views/posts/_post.html.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
%ul %ul

34
app/views/requests/_new_request.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
%h1 %h1

34
app/views/requests/_request.html.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
:javascript :javascript

34
app/views/requests/edit.html.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
- title "Edit Request" - title "Edit Request"

34
app/views/requests/index.html.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
%h1.big_text %h1.big_text

34
app/views/requests/show.html.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
- title "Request" - title "Request"

34
app/views/shared/_aspect_friends.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
#friend_pictures #friend_pictures

34
app/views/shared/_aspect_nav.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
#aspect_nav #aspect_nav

34
app/views/shared/_post_wrapper.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
%li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))} %li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))}

34
app/views/shared/_publisher.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
#publisher #publisher

34
app/views/shared/log.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
= @log.to_s = @log.to_s

34
app/views/status_messages/_new_status_message.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
= form_for StatusMessage.new, :remote => true do |f| = form_for StatusMessage.new, :remote => true do |f|

34
app/views/status_messages/_status_message.html.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
%li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))} %li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))}

34
app/views/status_messages/index.html.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
%h1.big_text status messages %h1.big_text status messages

34
app/views/status_messages/show.html.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
- title "Status Message" - title "Status Message"

34
app/views/users/edit.html.haml
View file

@ -1,20 +1,20 @@
/ Copyright 2010 Diaspora Inc. -# Copyright 2010 Diaspora Inc.
/ -#
/ This file is part of Diaspora. -# This file is part of Diaspora.
/ -#
/ Diaspora is free software: you can redistribute it and/or modify -# Diaspora is free software: you can redistribute it and/or modify
/ it under the terms of the GNU Affero General Public License as published by -# it under the terms of the GNU Affero General Public License as published by
/ the Free Software Foundation, either version 3 of the License, or -# the Free Software Foundation, either version 3 of the License, or
/ (at your option) any later version. -# (at your option) any later version.
/ -#
/ Diaspora is distributed in the hope that it will be useful, -# Diaspora is distributed in the hope that it will be useful,
/ but WITHOUT ANY WARRANTY; without even the implied warranty of -# but WITHOUT ANY WARRANTY; without even the implied warranty of
/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/ GNU Affero General Public License for more details. -# GNU Affero General Public License for more details.
/ -#
/ You should have received a copy of the GNU Affero General Public License -# You should have received a copy of the GNU Affero General Public License
/ along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
/ -#
%h1.big_text %h1.big_text

2
public/404.html
View file

@ -20,7 +20,7 @@
<!-- This file lives in public/404.html --> <!-- This file lives in public/404.html -->
<div class="dialog"> <div class="dialog">
<h1>The page you were looking for doesn't exist.</h1> <h1>The page you were looking for doesn't exist.</h1>
<p>You may have mistyped the address or the page may have moved.</p> <p>You should try going outside.</p>
</div> </div>
</body> </body>
</html> </html>

2
public/500.html
View file

@ -19,7 +19,7 @@
<body> <body>
<!-- This file lives in public/500.html --> <!-- This file lives in public/500.html -->
<div class="dialog"> <div class="dialog">
<h1>We're sorry, but something went wrong.</h1> <h1>Please, stop that.</h1>
<p>We've been notified about this issue and we'll take a look at it shortly.</p> <p>We've been notified about this issue and we'll take a look at it shortly.</p>
</div> </div>
</body> </body>