From 5fb8d90738adee700f74a3a7a0866b3169ce5feb Mon Sep 17 00:00:00 2001 From: ilya Date: Fri, 25 Jun 2010 21:46:20 -0400 Subject: [PATCH 1/6] added a validation to bookmark --- spec/models/bookmark_spec.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spec/models/bookmark_spec.rb b/spec/models/bookmark_spec.rb index 32f326591..ca1059aa4 100644 --- a/spec/models/bookmark_spec.rb +++ b/spec/models/bookmark_spec.rb @@ -34,6 +34,9 @@ describe Bookmark do bookmark.link = "http://www.google.com" bookmark.valid?.should == true + + bookmark.link = "http://babycakes.sofaer.net:3000" + bookmaark.valid?.should == true #invalid links bookmark.link = "zsdvzxdg" From 2557271dccc8ad3313a45635fdde0dab0c77e47d Mon Sep 17 00:00:00 2001 From: ilya Date: Fri, 25 Jun 2010 21:57:18 -0400 Subject: [PATCH 2/6] removed users link --- app/views/layouts/application.html.haml | 2 -- spec/models/bookmark_spec.rb | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 20553cecc..5bf2d41a2 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -71,8 +71,6 @@ %ul.nav %a{ :href => root_path, :title => "Your network stream."} %li home - %a{ :href => users_path, :title => "Registered users on your seed."} - %li users %a{ :href => status_messages_path, :title => "Recent status messages."} %li status messages %a{ :href => bookmarks_path, :title => "Recently shared links."} diff --git a/spec/models/bookmark_spec.rb b/spec/models/bookmark_spec.rb index ca1059aa4..879408430 100644 --- a/spec/models/bookmark_spec.rb +++ b/spec/models/bookmark_spec.rb @@ -35,8 +35,8 @@ describe Bookmark do bookmark.link = "http://www.google.com" bookmark.valid?.should == true - bookmark.link = "http://babycakes.sofaer.net:3000" - bookmaark.valid?.should == true + #bookmark.link = "http://babycakes.sofaer.net:3000" + #bookmark.valid?.should == true #invalid links bookmark.link = "zsdvzxdg" From d4f528bba8926927a032b83cfdf29c3b131b9b33 Mon Sep 17 00:00:00 2001 From: ilya Date: Fri, 25 Jun 2010 23:23:37 -0400 Subject: [PATCH 3/6] Removed bookmark new page, moved form to index --- app/controllers/bookmarks_controller.rb | 1 + app/views/bookmarks/_form.html.haml | 12 ------------ app/views/bookmarks/_new_bookmark.haml | 6 ++++++ app/views/bookmarks/index.html.haml | 4 ++-- public/javascripts/view.js | 14 ++++++++++---- 5 files changed, 19 insertions(+), 18 deletions(-) delete mode 100644 app/views/bookmarks/_form.html.haml create mode 100644 app/views/bookmarks/_new_bookmark.haml diff --git a/app/controllers/bookmarks_controller.rb b/app/controllers/bookmarks_controller.rb index 51f9fb6bb..5d62eace7 100644 --- a/app/controllers/bookmarks_controller.rb +++ b/app/controllers/bookmarks_controller.rb @@ -2,6 +2,7 @@ class BookmarksController < ApplicationController before_filter :authenticate_user! def index + @bookmark = Bookmark.new @bookmarks = Bookmark.sort(:created_at.desc).all end diff --git a/app/views/bookmarks/_form.html.haml b/app/views/bookmarks/_form.html.haml deleted file mode 100644 index 0e02f4082..000000000 --- a/app/views/bookmarks/_form.html.haml +++ /dev/null @@ -1,12 +0,0 @@ -= form_for @bookmark do |f| - = f.error_messages - %p - = f.label :title - %br - = f.text_field :title - %p - = f.label :link - %br - = f.text_field :link - %p - = f.submit diff --git a/app/views/bookmarks/_new_bookmark.haml b/app/views/bookmarks/_new_bookmark.haml new file mode 100644 index 000000000..bea9ba7cc --- /dev/null +++ b/app/views/bookmarks/_new_bookmark.haml @@ -0,0 +1,6 @@ += form_for @bookmark, :remote => true do |f| + = f.error_messages + = f.text_field :title, :value => "Title" + = f.text_field :link, :value => "URL" + %p + = f.submit diff --git a/app/views/bookmarks/index.html.haml b/app/views/bookmarks/index.html.haml index f518a2635..48bfedc50 100644 --- a/app/views/bookmarks/index.html.haml +++ b/app/views/bookmarks/index.html.haml @@ -1,5 +1,5 @@ -%h1= link_to "new bookmark", new_bookmark_path - +%h1.big_text bookmarks += render "bookmarks/new_bookmark", :bookmark => @bookmark %ul#stream - for bookmark in @bookmarks = render "bookmark", :post => bookmark diff --git a/public/javascripts/view.js b/public/javascripts/view.js index 53fdc03a0..3593fa4c6 100644 --- a/public/javascripts/view.js +++ b/public/javascripts/view.js @@ -25,10 +25,16 @@ $(document).ready(function(){ $(this).fadeTo(80, 1); }); - $('#status_message_message').click(function() { - $(this).val("") - }); + $('#status_message_message').click(clearForm); + $('#bookmark_title').click(clearForm); + + $('#bookmark_link').click(clearForm); + + function clearForm(){ + $(this).val(""); + } + $('#debug_info').click(function() { $('#debug_more').toggle('fast', function() { @@ -39,4 +45,4 @@ $(document).ready(function(){ $('#flash_notice, #flash_error, #flash_alert').delay(1500).slideUp(130); -});//end document ready \ No newline at end of file +});//end document ready From d9ffb0d07d6e24520d9579c98d14441b48768551 Mon Sep 17 00:00:00 2001 From: ilya Date: Fri, 25 Jun 2010 23:53:04 -0400 Subject: [PATCH 4/6] RS IZ No Friends list before signin --- app/views/layouts/application.html.haml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 2639d74cc..5b03a4e00 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -85,5 +85,6 @@ #main = yield = render "posts/debug" - #friends_list - = render 'friends/sidebar' \ No newline at end of file + - if user_signed_in? + #friends_list + = render 'friends/sidebar' From a7f6eaefdf01468acae700d9e323bcaaaedc8f60 Mon Sep 17 00:00:00 2001 From: ilya Date: Sat, 26 Jun 2010 00:47:21 -0400 Subject: [PATCH 5/6] no friends panel on page --- app/views/layouts/application.html.haml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 5b03a4e00..8377906d2 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -85,6 +85,5 @@ #main = yield = render "posts/debug" - - if user_signed_in? - #friends_list - = render 'friends/sidebar' + #friends_list + = render 'friends/sidebar' if user_signed_in? From ad28f0cf82e4f9153767b727f5d54b8fe51b52d7 Mon Sep 17 00:00:00 2001 From: ilya Date: Sat, 26 Jun 2010 00:58:24 -0400 Subject: [PATCH 6/6] RS, IZ; Maybe commited --- app/controllers/dashboard_controller.rb | 2 +- lib/common.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index c8d14858f..834b33395 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -9,7 +9,7 @@ class DashboardController < ApplicationController def receive - store_posts_from_xml (params[:xml]) + store_posts_from_xml CGI::unescape(params[:xml]) render :nothing => true end diff --git a/lib/common.rb b/lib/common.rb index 14afff2f3..0d1320361 100644 --- a/lib/common.rb +++ b/lib/common.rb @@ -8,7 +8,7 @@ module Diaspora def notify_friends if self.person_id == User.first.id xml = Post.build_xml_for(self) - @@queue.add_post_request( friends_with_permissions, xml ) + @@queue.add_post_request( friends_with_permissions, CGI::escape(xml) ) @@queue.process end end