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:
Raphael 2010-09-13 15:21:38 -07:00
commit 35a4e0aaa1
39 changed files with 665 additions and 665 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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"

38
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
@ -35,11 +35,11 @@
= p.hidden_field :image_url, :value => @profile.image_url, :id => 'image_url_field' = p.hidden_field :image_url, :value => @profile.image_url, :id => 'image_url_field'
- for photo in @photos - for photo in @photos
- if photo.url(:thumb_medium) == @profile.image_url - if photo.url(:thumb_medium) == @profile.image_url
%div.small_photo{:id => photo.url(:thumb_medium), :class=>'selected'} %div.small_photo{:id => request.host + photo.url(:thumb_medium), :class=>'selected'}
= check_box_tag 'checked_photo', true, true = check_box_tag 'checked_photo', true, true
= link_to image_tag(photo.url(:thumb_medium)), "#" = link_to image_tag(photo.url(:thumb_medium)), "#"
- else - else
%div.small_photo{:id => photo.url(:thumb_medium)} %div.small_photo{:id => request.host + photo.url(:thumb_medium)}
= check_box_tag 'checked_photo' = check_box_tag 'checked_photo'
= link_to image_tag(photo.url(:thumb_medium)), "#" = link_to image_tag(photo.url(:thumb_medium)), "#"
=will_paginate @photos =will_paginate @photos