Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Milan
diaspora
Commits
6ffc03a4
Commit
6ffc03a4
authored
Sep 25, 2010
by
Dorian
Committed by
Stephen Caudill
Sep 26, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Big clean up: delete trailing whitespace
parent
fd69f020
Changes
60
Hide whitespace changes
Inline
Side-by-side
Showing
60 changed files
with
273 additions
and
273 deletions
+273
-273
COPYRIGHT
COPYRIGHT
+3
-3
app/controllers/aspects_controller.rb
app/controllers/aspects_controller.rb
+1
-1
app/models/person.rb
app/models/person.rb
+3
-3
app/models/user.rb
app/models/user.rb
+5
-5
app/views/albums/_album.html.haml
app/views/albums/_album.html.haml
+1
-1
app/views/aspects/index.html.haml
app/views/aspects/index.html.haml
+1
-1
app/views/aspects/manage.html.haml
app/views/aspects/manage.html.haml
+4
-4
app/views/comments/_comment.html.haml
app/views/comments/_comment.html.haml
+1
-1
app/views/comments/_comments.html.haml
app/views/comments/_comments.html.haml
+1
-1
app/views/devise/sessions/new.html.haml
app/views/devise/sessions/new.html.haml
+2
-2
app/views/js/_websocket_js.haml
app/views/js/_websocket_js.haml
+10
-10
app/views/layouts/application.html.haml
app/views/layouts/application.html.haml
+5
-5
app/views/layouts/session_wall.html.haml
app/views/layouts/session_wall.html.haml
+5
-5
app/views/people/index.html.haml
app/views/people/index.html.haml
+1
-1
app/views/people/new.html.haml
app/views/people/new.html.haml
+2
-2
app/views/people/show.html.haml
app/views/people/show.html.haml
+1
-1
app/views/photos/_new_photo.haml
app/views/photos/_new_photo.haml
+3
-3
app/views/photos/_photo.haml
app/views/photos/_photo.haml
+2
-2
app/views/photos/show.html.haml
app/views/photos/show.html.haml
+1
-1
app/views/posts/_post.html.haml
app/views/posts/_post.html.haml
+2
-2
app/views/publics/hcard.erb
app/views/publics/hcard.erb
+40
-40
app/views/publics/host_meta.erb
app/views/publics/host_meta.erb
+2
-2
app/views/requests/_new_request.haml
app/views/requests/_new_request.haml
+1
-1
app/views/shared/_aspect_friends.haml
app/views/shared/_aspect_friends.haml
+3
-3
app/views/shared/_publisher.haml
app/views/shared/_publisher.haml
+1
-1
app/views/shared/_reshare.haml
app/views/shared/_reshare.haml
+1
-1
app/views/status_messages/_status_message.html.haml
app/views/status_messages/_status_message.html.haml
+4
-4
app/views/status_messages/index.html.haml
app/views/status_messages/index.html.haml
+1
-1
app/views/users/edit.html.haml
app/views/users/edit.html.haml
+1
-1
config/app_config.yml.example
config/app_config.yml.example
+1
-1
config/environments/production.rb
config/environments/production.rb
+1
-1
config/initializers/_load_app_config.rb
config/initializers/_load_app_config.rb
+1
-1
config/locales/devise/devise.cy.yml
config/locales/devise/devise.cy.yml
+36
-36
config/locales/devise/devise.fi.yml
config/locales/devise/devise.fi.yml
+1
-1
config/locales/devise/devise.sv.yml
config/locales/devise/devise.sv.yml
+1
-1
config/locales/diaspora/cy.yml
config/locales/diaspora/cy.yml
+1
-1
config/locales/diaspora/de.yml
config/locales/diaspora/de.yml
+3
-3
config/locales/diaspora/en.yml
config/locales/diaspora/en.yml
+1
-1
config/locales/diaspora/es.yml
config/locales/diaspora/es.yml
+3
-3
config/locales/diaspora/fr-informal.yml
config/locales/diaspora/fr-informal.yml
+1
-1
config/locales/diaspora/fr.yml
config/locales/diaspora/fr.yml
+1
-1
config/locales/diaspora/it.yml
config/locales/diaspora/it.yml
+1
-1
config/locales/diaspora/ro.yml
config/locales/diaspora/ro.yml
+1
-1
config/locales/diaspora/ru.yml
config/locales/diaspora/ru.yml
+1
-1
config/locales/diaspora/sv.yml
config/locales/diaspora/sv.yml
+1
-1
config/routes.rb
config/routes.rb
+1
-1
config/sprinkle/packages/ruby.rb
config/sprinkle/packages/ruby.rb
+1
-1
lib/diaspora/user/friending.rb
lib/diaspora/user/friending.rb
+2
-2
lib/tasks/db.rake
lib/tasks/db.rake
+5
-5
public/javascripts/aspect-edit.js
public/javascripts/aspect-edit.js
+10
-10
public/javascripts/view.js
public/javascripts/view.js
+4
-4
public/stylesheets/sass/application.sass
public/stylesheets/sass/application.sass
+22
-22
public/stylesheets/sass/sessions.sass
public/stylesheets/sass/sessions.sass
+2
-2
spec/fixtures/evan_hcard
spec/fixtures/evan_hcard
+1
-1
spec/fixtures/hcard_response
spec/fixtures/hcard_response
+40
-40
spec/fixtures/host_xrd
spec/fixtures/host_xrd
+1
-1
spec/misc_spec.rb
spec/misc_spec.rb
+1
-1
spec/models/request_spec.rb
spec/models/request_spec.rb
+1
-1
spec/models/user_spec.rb
spec/models/user_spec.rb
+1
-1
ubuntu-setup.bash
ubuntu-setup.bash
+18
-18
No files found.
COPYRIGHT
View file @
6ffc03a4
...
...
@@ -16,8 +16,8 @@ including the two.
You must obey the GNU Affero General Public License V3 or later in all respects
for all of the code used other than OpenSSL or the components mentioned
above. If you modify file(s) with this exception, you may extend this
exception to your version of the file(s), but you are not obligated to
above. If you modify file(s) with this exception, you may extend this
exception to your version of the file(s), but you are not obligated to
do so. If you do not wish to do so, delete this exception statement from your
version. If you delete this exception statement from all source files in the
version. If you delete this exception statement from all source files in the
program, then also delete it here.
app/controllers/aspects_controller.rb
View file @
6ffc03a4
...
...
@@ -33,7 +33,7 @@ class AspectsController < ApplicationController
begin
current_user
.
drop_aspect
@aspect
flash
[
:notice
]
=
i18n
.
t
'aspects.destroy.success'
,
:name
=>
@aspect
.
name
rescue
RuntimeError
=>
e
rescue
RuntimeError
=>
e
flash
[
:error
]
=
e
.
message
end
...
...
app/models/person.rb
View file @
6ffc03a4
...
...
@@ -78,7 +78,7 @@ class Person
def
self
.
by_webfinger
(
identifier
,
opts
=
{})
#need to check if this is a valid email structure, maybe should do in JS
local_person
=
Person
.
first
(
:diaspora_handle
=>
identifier
.
gsub
(
'acct:'
,
''
).
to_s
.
downcase
)
if
local_person
Rails
.
logger
.
info
(
"Do not need to webfinger, found a local person
#{
local_person
.
real_name
}
"
)
local_person
...
...
@@ -100,9 +100,9 @@ class Person
new_person
=
Person
.
new
public_key_entry
=
profile
.
links
.
select
{
|
x
|
x
.
rel
==
'diaspora-public-key'
}
return
nil
unless
public_key_entry
pubkey
=
public_key_entry
.
first
.
href
new_person
.
exported_key
=
Base64
.
decode64
pubkey
...
...
app/models/user.rb
View file @
6ffc03a4
...
...
@@ -66,7 +66,7 @@ class User
def
drop_aspect
(
aspect
)
if
aspect
.
people
.
size
==
0
aspect
.
destroy
else
else
raise
"Aspect not empty"
end
end
...
...
@@ -106,11 +106,11 @@ class User
intitial_post
(
class_name
,
aspect_ids
,
options
)
end
def
intitial_post
(
class_name
,
aspect_ids
,
options
=
{})
def
intitial_post
(
class_name
,
aspect_ids
,
options
=
{})
post
=
build_post
(
class_name
,
options
)
post
.
socket_to_uid
(
id
,
:aspect_ids
=>
aspect_ids
)
if
post
.
respond_to?
(
:socket_to_uid
)
push_to_aspects
(
post
,
aspect_ids
)
post
post
end
def
repost
(
post
,
options
=
{}
)
...
...
@@ -137,9 +137,9 @@ class User
end
aspect_ids
.
each
do
|
aspect_id
|
unless
self
.
aspects
.
find
(
aspect_id
)
unless
self
.
aspects
.
find
(
aspect_id
)
raise
ArgumentError
.
new
(
"Cannot post to an aspect you do not own."
)
end
end
end
aspect_ids
...
...
app/views/albums/_album.html.haml
View file @
6ffc03a4
...
...
@@ -15,4 +15,4 @@
%div
.image_cycle
-
for
photo
in
post
.
photos
[
0
..
3
]
=
link_to
(
image_tag
photo
.
url
(
:thumb_large
)),
album_path
(
post
,
:aspect
=>
@aspect
)
app/views/aspects/index.html.haml
View file @
6ffc03a4
...
...
@@ -5,7 +5,7 @@
-
content_for
:page_title
do
=
link_to
t
(
'.photos'
),
albums_path
(
:aspect
=>
@aspect
)
-
content_for
:left_pane
do
=
render
"shared/aspect_friends"
...
...
app/views/aspects/manage.html.haml
View file @
6ffc03a4
...
...
@@ -3,7 +3,7 @@
-# the COPYRIGHT file.
-
content_for
:head
do
-
content_for
:head
do
=
javascript_include_tag
'jquery-ui-1.8.4.custom.min.js'
=
javascript_include_tag
'aspect-edit.js'
...
...
@@ -34,7 +34,7 @@
%ul
#aspect_list
-
for
aspect
in
@aspects
%li
.aspect
.aspect_name
%span
.edit_name_field
%h1
{
:contenteditable
=>
true
}=
aspect
.
name
...
...
@@ -44,9 +44,9 @@
%li
=
link_to
t
(
'.add_a_new_friend'
),
"#add_request_pane_
#{
aspect
.
id
}
"
,
:class
=>
'add_request_button'
%li
=
link_to
t
(
'.show'
),
aspect_path
(
aspect
)
%li
!=
remove_link
(
aspect
)
%ul
.dropzone
{
:id
=>
aspect
.
id
}
-
if
aspect
.
people
.
size
<
1
%li
.grey
Drag to add people
...
...
app/views/comments/_comment.html.haml
View file @
6ffc03a4
...
...
@@ -3,7 +3,7 @@
-# the COPYRIGHT file.
%li
.comment
{
:id
=>
post
.
id
}
%li
.comment
{
:id
=>
post
.
id
}
=
person_image_tag
(
post
.
person
)
%span
.from
=
link_to
post
.
person
.
real_name
,
post
.
person
...
...
app/views/comments/_comments.html.haml
View file @
6ffc03a4
...
...
@@ -9,4 +9,4 @@
=
render
'comments/comment'
,
:post
=>
comment
%li
.comment.show
=
render
'comments/new_comment'
,
:post
=>
post
app/views/devise/sessions/new.html.haml
View file @
6ffc03a4
%h1
This is a technology preview, do not provide any private information.
%h3
your account may be deleted until we move into a more stable development period.
%h3
your account may be deleted until we move into a more stable development period.
%h3
USE AT YOUR OWN RISK!!
=
form_for
(
resource
,
:as
=>
resource_name
,
:url
=>
session_path
(
resource_name
))
do
|
f
|
...
...
app/views/js/_websocket_js.haml
View file @
6ffc03a4
...
...
@@ -19,18 +19,18 @@
if
(
obj
[
'
class
'
]
==
"
retractions
"
){
processRetraction
(
obj
[
'
post_id
'
]);
}
else
if
(
obj
[
'
class
'
]
==
"
comments
"
){
processComment
(
obj
[
'
post_id
'
],
obj
[
'
html
'
])
processComment
(
obj
[
'
post_id
'
],
obj
[
'
html
'
])
}
else
if
(
obj
[
'
class
'
]
==
'
photos
'
&&
onPageForClass
(
'
albums
'
)){
processPhotoInAlbum
(
obj
[
'
photo_hash
'
])
}
else
{
processPost
(
obj
[
'
class
'
],
obj
[
'
html
'
],
obj
[
'
aspect_ids
'
])
}
};
};
ws
.
onclose
=
function
()
{
debug
(
"
socket closed
"
);
};
ws
.
onopen
=
function
()
{
ws
.
send
(
location
.
pathname
);
...
...
@@ -66,7 +66,7 @@
$
(
html
).
fadeIn
(
"
fast
"
,
function
(){
$
(
"
#stream label:first
"
).
inFieldLabels
();
})
);
);
}
}
...
...
@@ -77,13 +77,13 @@
html
=
"
<div class=
\
'image_thumb
\
' id=
\
'
"
+
photoHash
[
'
id
'
]
+
"
\
' style=
\
'padding-right:3px;
\
'>
\
<a href=
\"
/photos/
"
+
photoHash
[
'
id
'
]
+
"
\"
>
\
<img alt=
\"
New thumbnail
\"
src=
\"
"
+
photoHash
[
'
thumb_url
'
]
+
"
\"
/>
\
</a> </div>
"
</a> </div>
"
$
(
"
#thumbnails
"
).
append
(
$
(
html
)
)
$
(
"
#
"
+
photoHash
[
'
id
'
]
+
"
img
"
).
load
(
function
()
{
$
(
this
).
fadeIn
(
"
slow
"
);
});
}
function
onPageForClass
(
className
){
return
(
location
.
href
.
indexOf
(
className
)
!=
-
1
);
}
...
...
@@ -100,9 +100,9 @@
}
function
onPageForAspect
(
aspectId
){
return
(
location
.
href
.
indexOf
(
aspectId
)
!=
-
1
)
return
(
location
.
href
.
indexOf
(
aspectId
)
!=
-
1
)
}
function
onPageOne
()
{
var
c
=
document
.
location
.
search
.
charAt
(
document
.
location
.
search
.
length
-
1
);
return
((
c
==
''
)
||
(
c
==
'
1
'
));
...
...
app/views/layouts/application.html.haml
View file @
6ffc03a4
...
...
@@ -10,24 +10,24 @@
=
"
#{
current_user
.
real_name
}
| diaspora"
if
current_user
%meta
{
"http-equiv"
=>
"Content-Type"
,
:content
=>
"text/html; charset=utf-8"
}
/
=
stylesheet_link_tag
"blueprint/screen"
,
:media
=>
'screen'
=
stylesheet_link_tag
"application"
,
"ui"
=
stylesheet_link_tag
"/../javascripts/fancybox/jquery.fancybox-1.3.1"
=
stylesheet_link_tag
"fileuploader"
=
stylesheet_link_tag
"/../javascripts/fancybox/jquery.fancybox-1.3.1"
=
stylesheet_link_tag
"fileuploader"
/= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
=
javascript_include_tag
'jquery-1.4.2.min'
,
'rails'
=
javascript_include_tag
'jquery.infieldlabel'
,
'jquery.cycle/jquery.cycle.min.js'
=
javascript_include_tag
'fancybox/jquery.fancybox-1.3.1.pack'
=
javascript_include_tag
'fileuploader'
=
javascript_include_tag
'view'
,
'image_picker'
,
'stream'
=
render
'js/websocket_js'
=
csrf_meta_tag
=
yield
(
:head
)
...
...
app/views/layouts/session_wall.html.haml
View file @
6ffc03a4
...
...
@@ -10,7 +10,7 @@
DIASPORA | login
%meta
{
"http-equiv"
=>
"Content-Type"
,
:content
=>
"text/html; charset=utf-8"
}
/
%meta
{
"http-equiv"
=>
"X-UA-Compatible"
,
:content
=>
"chrome=1"
}
=
stylesheet_link_tag
"sessions"
/= javascript_include_tag"http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
=
javascript_include_tag
'jquery142'
...
...
@@ -18,10 +18,10 @@
:javascript
$
(
document
).
ready
(
function
(){
$
(
"
#user_username
"
).
focus
();
$
(
"
#user_username
"
).
focus
();
$
(
"
label
"
).
inFieldLabels
();
});
=
csrf_meta_tag
=
yield
(
:head
)
...
...
@@ -44,11 +44,11 @@
</div>
</div>
<![endif]-->
-
flash
.
each
do
|
name
,
msg
|
=
content_tag
:div
,
msg
,
:id
=>
"flash_
#{
name
}
"
%div
#huge_text
DIASPORA*
=
yield
/= link_to "signup", "/signup"
app/views/people/index.html.haml
View file @
6ffc03a4
...
...
@@ -21,5 +21,5 @@
%ul
#stream
-
for
person
in
@people
=
render
'people/person'
,
:person
=>
person
=
will_paginate
@people
app/views/people/new.html.haml
View file @
6ffc03a4
...
...
@@ -15,13 +15,13 @@
=
f
.
label
:url
%br
=
f
.
text_field
:url
=
f
.
fields_for
:profile
do
|
p
|
%p
=
p
.
label
:first_name
%br
=
p
.
text_field
:first_name
%p
=
p
.
label
:last_name
%br
...
...
app/views/people/show.html.haml
View file @
6ffc03a4
...
...
@@ -28,7 +28,7 @@
=
link_to
t
(
'.remove_friend'
),
@person
,
:confirm
=>
t
(
'.are_you_sure'
),
:method
=>
:delete
,
:class
=>
"button"
.span-20.last
.span-19.last
-
if
@posts
%ul
#stream
...
...
app/views/photos/_new_photo.haml
View file @
6ffc03a4
...
...
@@ -4,14 +4,14 @@
:javascript
function
createUploader
(){
function
createUploader
(){
var
uploader
=
new
qq
.
FileUploader
({
element
:
document
.
getElementById
(
'
file-upload
'
),
params
:
{
'
album_id
'
:
"
#{
@album
.
id
}
"
},
allowedExtensions
:
[
'
jpg
'
,
'
jpeg
'
,
'
png
'
,
'
gif
'
],
action
:
"
#{
photos_path
}
"
});
});
}
window
.
onload
=
createUploader
;
window
.
onload
=
createUploader
;
#file-upload
app/views/photos/_photo.haml
View file @
6ffc03a4
...
...
@@ -17,9 +17,9 @@
%br
=
render
"albums/album"
,
:post
=>
post
.
album
,
:current_user
=>
current_user
=
link_to
(
image_tag
post
.
url
(
:thumb_medium
)),
object_path
(
post
)
.info
=
link_to
(
how_long_ago
(
post
),
photo_path
(
post
))
\--
=
link_to
"
#{
t
(
'.show_comments'
)
}
(
#{
post
.
comments
.
count
}
)"
,
'#'
,
:class
=>
"show_post_comments"
=
render
"comments/comments"
,
:post
=>
post
=
render
"comments/comments"
,
:post
=>
post
app/views/photos/show.html.haml
View file @
6ffc03a4
...
...
@@ -53,4 +53,4 @@
%h4
{
:class
=>
"show_post_comments"
}
=
"
#{
t
(
'.comments'
)
}
(
#{
@photo
.
comments
.
count
}
)"
=
render
"comments/comments"
,
:post
=>
@photo
app/views/posts/_post.html.haml
View file @
6ffc03a4
...
...
@@ -4,6 +4,6 @@
%ul
%h3
=
link_to
post
.
class
,
object_path
(
post
)
%h3
=
link_to
post
.
class
,
object_path
(
post
)
-
for
field
in
object_fields
(
post
)
%li
=
"
#{
field
}
:
#{
post
.
attributes
[
field
]
}
"
%li
=
"
#{
field
}
:
#{
post
.
attributes
[
field
]
}
"
app/views/publics/hcard.erb
View file @
6ffc03a4
<div
id=
"content"
>
<h1>
<%=
@person
.
real_name
%>
</h1>
<div
id=
"content_inner"
>
<div
id=
"i"
class=
"entity_profile vcard author"
>
<h2>
User profile
</h2>
<dl
class=
"entity_nickname"
>
<dt>
Nickname
</dt>
<dd>
<a
href=
"
<%=
@person
.
url
%>
"
rel=
"me"
class=
"nickname url uid"
>
<%=
@person
.
real_name
%>
</a>
</dd>
</dl>
<dl
class=
"entity_given_name"
>
<dt>
Full name
</dt>
<dd>
<span
class=
"given_name"
>
<%=
@person
.
profile
.
first_name
%>
</span>
</dd>
<div
id=
"content"
>
<h1>
<%=
@person
.
real_name
%>
</h1>
<div
id=
"content_inner"
>
<div
id=
"i"
class=
"entity_profile vcard author"
>
<h2>
User profile
</h2>
<dl
class=
"entity_nickname"
>
<dt>
Nickname
</dt>
<dd>
<a
href=
"
<%=
@person
.
url
%>
"
rel=
"me"
class=
"nickname url uid"
>
<%=
@person
.
real_name
%>
</a>
</dd>
</dl>
<dl
class=
"entity_given_name"
>
<dt>
Full name
</dt>
<dd>
<span
class=
"given_name"
>
<%=
@person
.
profile
.
first_name
%>
</span>
</dd>
</dl>
<dl
class=
"entity_family_name"
>
<dt>
Full name
</dt>
<dd>
<span
class=
"family_name"
>
<%=
@person
.
profile
.
last_name
%>
</span>
</dd>
<dl
class=
"entity_family_name"
>
<dt>
Full name
</dt>
<dd>
<span
class=
"family_name"
>
<%=
@person
.
profile
.
last_name
%>
</span>
</dd>
</dl>
<dl
class=
"entity_fn"
>
<dt>
Full name
</dt>
<dd>
<span
class=
"fn"
>
<%=
@person
.
real_name
%>
</span>
</dd>
</dl>
<dl
class=
"entity_url"
>
<dt>
URL
</dt>
<dd>
<a
href=
"
<%=
@person
.
url
%>
"
rel=
"me"
id=
"pod_location"
class=
"url"
>
<%=
@person
.
url
%>
</a>
</dd>
</dl>
<dl
class=
"entity_note"
>
<dt>
Note
</dt>
<dd
class=
"note"
>
Diaspora is awesome! vi is better than emacs!
</dd>
</dl>
</div>
</div>
</div>
<dl
class=
"entity_fn"
>
<dt>
Full name
</dt>
<dd>
<span
class=
"fn"
>
<%=
@person
.
real_name
%>
</span>
</dd>
</dl>
<dl
class=
"entity_url"
>
<dt>
URL
</dt>
<dd>
<a
href=
"
<%=
@person
.
url
%>
"
rel=
"me"
id=
"pod_location"
class=
"url"
>
<%=
@person
.
url
%>
</a>
</dd>
</dl>
<dl
class=
"entity_note"
>
<dt>
Note
</dt>
<dd
class=
"note"
>
Diaspora is awesome! vi is better than emacs!
</dd>
</dl>
</div>
</div>
</div>
app/views/publics/host_meta.erb
View file @
6ffc03a4
<?xml version='1.0' encoding='UTF-8'?>
<XRD
xmlns=
'http://docs.oasis-open.org/ns/xri/xrd-1.0'
<XRD
xmlns=
'http://docs.oasis-open.org/ns/xri/xrd-1.0'
xmlns:hm=
'http://host-meta.net/xrd/1.0'
>
<hm:Host>
<%=
terse_url
(
root_url
)
%>
</hm:Host>
<Link
rel=
'lrdd'
<Link
rel=
'lrdd'
template=
'
<%=
root_url
%>
webfinger?q={uri}'
>
<Title>
Resource Descriptor
</Title>
</Link>
...
...
app/views/requests/_new_request.haml
View file @
6ffc03a4
...
...
@@ -10,7 +10,7 @@
=
form_for
Request
.
new
do
|
f
|
=
f
.
error_messages
=
t
(
'.enter_a_diaspora_username'
)
=
t
(
'.enter_a_diaspora_username'
)
%br
%i
=
t
'.your_diaspora_username_is'
,
:diaspora_handle
=>
current_user
.
diaspora_handle
...
...
app/views/shared/_aspect_friends.haml
View file @
6ffc03a4
...
...
@@ -10,11 +10,11 @@
-
unless
@aspect
==
:all
=
link_to
(
image_tag
(
'add_friend_button.png'
,
:height
=>
"50px"
,
:width
=>
"50px"
)),
"#add_request_pane"
,
:id
=>
'add_request_button'
.yo
{
:style
=>
'display:none'
}
#add_request_pane
=
render
"requests/new_request"
,
:aspect
=>
@aspect
=
render
"requests/new_request"
,
:aspect
=>
@aspect
-
else
.clear
=
link_to
t
(
'.add_friends'
),
aspects_manage_path
=
link_to
t
(
'.add_friends'
),
aspects_manage_path
app/views/shared/_publisher.haml
View file @
6ffc03a4
...
...
@@ -18,5 +18,5 @@
%li
=
check_box_tag
(
"aspect_ids[]"
,
aspect
.
id
,
@aspect
==
:all
||
current_aspect?
(
aspect
)
)
=
aspect
.
name
=
f
.
submit
t
(
'.share'
)
app/views/shared/_reshare.haml
View file @
6ffc03a4
...
...
@@ -19,7 +19,7 @@
%ul
.reshare_box
-
for
aspect
in
current_user
.
aspects_with_post
(
post
.
id
)
%li
.currently_sharing
=
aspect
.
name
-
for
aspect
in
current_user
.
aspects
...
...
app/views/status_messages/_status_message.html.haml
View file @
6ffc03a4
...
...
@@ -9,17 +9,17 @@
.content
%span
.from
=
link_to
post
.
person
.
real_name
,
post
.
person
=
link_to
post
.
person
.
real_name
,
post
.
person
=
post
.
message
.info
%span
.time
=
link_to
(
how_long_ago
(
post
),
object_path
(
post
))
\--
=
link_to
"
#{
t
(
'.show_comments'
)
}
(
#{
post
.
comments
.
count
}
)"
,
'#'
,
:class
=>
"show_post_comments"
=
render
"comments/comments"
,
:post
=>
post
=
render
"comments/comments"
,
:post
=>
post
-
if
current_user
.
owns?
(
post
)
.destroy_link
=
link_to
t
(
'.delete'
),
status_message_path
(
post
),
:confirm
=>
t
(
'.are_you_sure'
),
:method
=>
:delete
,
:remote
=>
true
,
:class
=>
"delete"
=
render
"shared/reshare"
,
:post
=>
post
,
:current_user
=>
current_user
=
render
"shared/reshare"
,
:post
=>
post
,
:current_user
=>
current_user
app/views/status_messages/index.html.haml
View file @
6ffc03a4
...
...
@@ -6,7 +6,7 @@
%h1
.big_text
status messages
=
render
"status_messages/new_status_message"
,
:status_message
=>
@status_message
%ul
#stream
-
for
status_message
in
@status_messages
=
render
"status_message"
,
:post
=>
status_message
#pagination
...
...
app/views/users/edit.html.haml
View file @
6ffc03a4
...
...
@@ -49,7 +49,7 @@
=
p
.
label
:first_name
=
p
.
text_field
:first_name
,
:value
=>
@profile
.
first_name
%p
=
p
.
label
:last_name
=
p
.
label
:last_name
=
p
.
text_field
:last_name
,
:value
=>
@profile
.
last_name
#submit_block
...
...
config/app_config.yml.example
View file @
6ffc03a4
...
...
@@ -13,7 +13,7 @@ default:
pubsub_server: 'https://pubsubhubbub.appspot.com/'
mongo_host: 'localhost'
mongo_port: 27017
development:
test:
...
...
config/environments/production.rb
View file @
6ffc03a4
...
...
@@ -15,7 +15,7 @@ Diaspora::Application.configure do
# Specifies the header that your server uses for sending files
#config.action_dispatch.x_sendfile_header = "X-Sendfile"
config
.
active_support
.
deprecation
=
:notify
# For nginx:
...
...
config/initializers/_load_app_config.rb
View file @
6ffc03a4
...
...
@@ -20,7 +20,7 @@ else
APP_CONFIG
=
all_envs
[
'default'
].
symbolize_keys
end
APP_CONFIG
[
:terse_pod_url
]
=
APP_CONFIG
[
:pod_url
].
gsub
(
/(https?:|www\.)\/\//
,
''
)
APP_CONFIG
[
:terse_pod_url
]
=
APP_CONFIG
[
:pod_url
].
gsub
(
/(https?:|www\.)\/\//
,
''
)
APP_CONFIG
[
:terse_pod_url
].
chop!
if
APP_CONFIG
[
:terse_pod_url
][
-
1
,
1
]
==
'/'
puts
"WARNING: Please modify your app_config.yml to have a proper pod_url!"
if
APP_CONFIG
[
:terse_pod_url
]
==
"example.org"
&&
Rails
.
env
!=
:test
config/locales/devise/devise.cy.yml
View file @
6ffc03a4
# Copyright (c) 2010, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3. See
# the COPYRIGHT file.
# the COPYRIGHT file.
cy
:
errors
:
messages
:
not_found
:
"
ni
chanfuwyd"
already_confirmed
:
"
cadarnhawyd
eisioes"
not_locked
:
"
heb
ei
gloi"
devise
:
failure
:
cy
:
errors
:
messages
:
not_found
:
"
ni
chanfuwyd"
already_confirmed
:
"
cadarnhawyd
eisioes"