From a70fbc6a4a41ad169aaa7223445c5c500cfb73d2 Mon Sep 17 00:00:00 2001 From: Raphael Date: Thu, 1 Jul 2010 16:54:12 -0700 Subject: [PATCH 1/4] Changed cap script --- public/javascripts/publisher.js | 37 +++++++++++---------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/public/javascripts/publisher.js b/public/javascripts/publisher.js index af783c84d..144ef8c84 100644 --- a/public/javascripts/publisher.js +++ b/public/javascripts/publisher.js @@ -1,33 +1,20 @@ $(document).ready( function() { - $("#publisher_content_pickers .status_message").click(function(){ - if( $("#new_status_message").css("display") == "none" ) { - $("#publisher_content_pickers").children("a").children("li").removeClass("selected"); + $("#publisher_content_pickers .status_message").click( selectPicker); + + $("#publisher_content_pickers .bookmark").click(selectPicker); + + $("#publisher_content_pickers .blog").click(selectPicker); + + function selectPicker(event){ + event.preventDefault(); + if( $("#new_" + this.className).css("display") == "none" ) { + $("#publisher_content_pickers .selected").removeClass("selected"); $("#publisher_form form").fadeOut(50); $(this).children("a > li").toggleClass("selected"); - $("#new_status_message").delay(50).fadeIn(200); + $("#new_" + this.className).delay(50).fadeIn(200); } - }); - - $("#publisher_content_pickers .bookmark").click(function(){ - if( $("#new_bookmark").css("display") == "none" ) { - $("#publisher_content_pickers").children("a").children("li").removeClass("selected"); - $("#publisher_form form").fadeOut(50); - - $(this).children("li").toggleClass("selected"); - $("#new_bookmark").delay(50).fadeIn(200); - } - }); - - $("#publisher_content_pickers .blog").click(function(){ - if( $("#new_blog").css("display") == "none" ) { - $("#publisher_content_pickers").children("a").children("li").removeClass("selected"); - $("#publisher_form form").fadeOut(50); - - $(this).children("li").toggleClass("selected"); - $("#new_blog").delay(50).fadeIn(200); - } - }); + } }); From 8e94fc5b4f1ffa765ba11631b993cbdbed4dd374 Mon Sep 17 00:00:00 2001 From: maxwell Date: Thu, 1 Jul 2010 17:05:14 -0700 Subject: [PATCH 2/4] added mean message --- app/views/layouts/session_wall.html.haml | 19 +++++++++++++++++++ config.ru | 4 ++-- config/routes.rb | 2 +- lib/chrome_frame.rb | 2 +- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/app/views/layouts/session_wall.html.haml b/app/views/layouts/session_wall.html.haml index f80d09afb..9cd944913 100644 --- a/app/views/layouts/session_wall.html.haml +++ b/app/views/layouts/session_wall.html.haml @@ -10,6 +10,25 @@ = stylesheet_link_tag "sessions" /= javascript_include_tag"http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" = javascript_include_tag 'jquery142' + + :plain + + = csrf_meta_tag = yield(:head) diff --git a/config.ru b/config.ru index 84859db97..ebd2f327f 100644 --- a/config.ru +++ b/config.ru @@ -2,6 +2,6 @@ require ::File.expand_path('../config/environment', __FILE__) #use Rack::FiberPool -require 'lib/chrome_frame' -use Rack::ChromeFrame +#require 'lib/chrome_frame' +#use Rack::ChromeFrame run Diaspora::Application diff --git a/config/routes.rb b/config/routes.rb index 09c43db14..ac8df8b0a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,4 @@ -Diaspora::Application.routes.draw do |map| +lsDiaspora::Application.routes.draw do |map| resources :blogs resources :bookmarks resources :friends diff --git a/lib/chrome_frame.rb b/lib/chrome_frame.rb index eeba58312..298427ee7 100644 --- a/lib/chrome_frame.rb +++ b/lib/chrome_frame.rb @@ -25,7 +25,7 @@ module Rack
- + HTML From 8d1ec57fa49b2bfdcb825c3cc82772d28697a042 Mon Sep 17 00:00:00 2001 From: maxwell Date: Thu, 1 Jul 2010 17:07:36 -0700 Subject: [PATCH 3/4] beefed it up to ie 7 --- app/views/layouts/session_wall.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/session_wall.html.haml b/app/views/layouts/session_wall.html.haml index 9cd944913..128849461 100644 --- a/app/views/layouts/session_wall.html.haml +++ b/app/views/layouts/session_wall.html.haml @@ -12,7 +12,7 @@ = javascript_include_tag 'jquery142' :plain - - - + = csrf_meta_tag = yield(:head) %body + .container + :plain + + + + - flash.each do |name, msg| = content_tag :div, msg, :id => "flash_#{name}" - if User.first diff --git a/config/routes.rb b/config/routes.rb index ac8df8b0a..09c43db14 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,4 @@ -lsDiaspora::Application.routes.draw do |map| +Diaspora::Application.routes.draw do |map| resources :blogs resources :bookmarks resources :friends diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index a374c9b41..b4830e60a 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -137,7 +137,6 @@ h1 { line-height: 36px; } h1 p.description, h1 span.description { font-weight: 200; - font-family: "helvetica neue", "lucida grande", "sans-serif"; color: #999999; padding: 0.1em; }