Permalink
Browse files

Big clean up: delete trailing whitespace

  • Loading branch information...
1 parent fd69f02 commit 6ffc03a4c92fed1d533921269ab503d2d10ab45f @Dorian Dorian committed with voxdolo Sep 25, 2010
Showing with 273 additions and 273 deletions.
  1. +3 −3 COPYRIGHT
  2. +1 −1 app/controllers/aspects_controller.rb
  3. +3 −3 app/models/person.rb
  4. +5 −5 app/models/user.rb
  5. +1 −1 app/views/albums/_album.html.haml
  6. +1 −1 app/views/aspects/index.html.haml
  7. +4 −4 app/views/aspects/manage.html.haml
  8. +1 −1 app/views/comments/_comment.html.haml
  9. +1 −1 app/views/comments/_comments.html.haml
  10. +2 −2 app/views/devise/sessions/new.html.haml
  11. +10 −10 app/views/js/_websocket_js.haml
  12. +5 −5 app/views/layouts/application.html.haml
  13. +5 −5 app/views/layouts/session_wall.html.haml
  14. +1 −1 app/views/people/index.html.haml
  15. +2 −2 app/views/people/new.html.haml
  16. +1 −1 app/views/people/show.html.haml
  17. +3 −3 app/views/photos/_new_photo.haml
  18. +2 −2 app/views/photos/_photo.haml
  19. +1 −1 app/views/photos/show.html.haml
  20. +2 −2 app/views/posts/_post.html.haml
  21. +40 −40 app/views/publics/hcard.erb
  22. +2 −2 app/views/publics/host_meta.erb
  23. +1 −1 app/views/requests/_new_request.haml
  24. +3 −3 app/views/shared/_aspect_friends.haml
  25. +1 −1 app/views/shared/_publisher.haml
  26. +1 −1 app/views/shared/_reshare.haml
  27. +4 −4 app/views/status_messages/_status_message.html.haml
  28. +1 −1 app/views/status_messages/index.html.haml
  29. +1 −1 app/views/users/edit.html.haml
  30. +1 −1 config/app_config.yml.example
  31. +1 −1 config/environments/production.rb
  32. +1 −1 config/initializers/_load_app_config.rb
  33. +36 −36 config/locales/devise/devise.cy.yml
  34. +1 −1 config/locales/devise/devise.fi.yml
  35. +1 −1 config/locales/devise/devise.sv.yml
  36. +1 −1 config/locales/diaspora/cy.yml
  37. +3 −3 config/locales/diaspora/de.yml
  38. +1 −1 config/locales/diaspora/en.yml
  39. +3 −3 config/locales/diaspora/es.yml
  40. +1 −1 config/locales/diaspora/fr-informal.yml
  41. +1 −1 config/locales/diaspora/fr.yml
  42. +1 −1 config/locales/diaspora/it.yml
  43. +1 −1 config/locales/diaspora/ro.yml
  44. +1 −1 config/locales/diaspora/ru.yml
  45. +1 −1 config/locales/diaspora/sv.yml
  46. +1 −1 config/routes.rb
  47. +1 −1 config/sprinkle/packages/ruby.rb
  48. +2 −2 lib/diaspora/user/friending.rb
  49. +5 −5 lib/tasks/db.rake
  50. +10 −10 public/javascripts/aspect-edit.js
  51. +4 −4 public/javascripts/view.js
  52. +22 −22 public/stylesheets/sass/application.sass
  53. +2 −2 public/stylesheets/sass/sessions.sass
  54. +1 −1 spec/fixtures/evan_hcard
  55. +40 −40 spec/fixtures/hcard_response
  56. +1 −1 spec/fixtures/host_xrd
  57. +1 −1 spec/misc_spec.rb
  58. +1 −1 spec/models/request_spec.rb
  59. +1 −1 spec/models/user_spec.rb
  60. +18 −18 ubuntu-setup.bash
View
@@ -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.
@@ -33,7 +33,7 @@ def destroy
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
View
@@ -78,7 +78,7 @@ def exported_key= new_key
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 @@ def self.from_webfinger_profile( identifier, profile)
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
View
@@ -66,7 +66,7 @@ def aspect( opts = {} )
def drop_aspect( aspect )
if aspect.people.size == 0
aspect.destroy
- else
+ else
raise "Aspect not empty"
end
end
@@ -106,11 +106,11 @@ def post(class_name, options = {})
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 @@ def validate_aspect_permissions(aspect_ids)
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
@@ -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)
-
+
@@ -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"
@@ -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
@@ -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
@@ -9,4 +9,4 @@
= render 'comments/comment', :post => comment
%li.comment.show
= render 'comments/new_comment', :post => post
-
+
@@ -1,7 +1,7 @@
%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|
@@ -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'));
@@ -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)
@@ -10,18 +10,18 @@
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'
= javascript_include_tag 'jquery.infieldlabel'
: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"
@@ -21,5 +21,5 @@
%ul#stream
- for person in @people
= render 'people/person', :person => person
-
+
= will_paginate @people
@@ -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
@@ -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
@@ -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
@@ -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
@@ -53,4 +53,4 @@
%h4{:class => "show_post_comments"}
= "#{t('.comments')} (#{@photo.comments.count})"
= render "comments/comments", :post => @photo
-
+
@@ -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]}"
Oops, something went wrong.

0 comments on commit 6ffc03a

Please sign in to comment.