diff --git a/app/views/layouts/session_wall.html.haml b/app/views/layouts/session_wall.html.haml index f80d09afb..5bdf2d6ce 100644 --- a/app/views/layouts/session_wall.html.haml +++ b/app/views/layouts/session_wall.html.haml @@ -10,12 +10,33 @@ = stylesheet_link_tag "sessions" /= javascript_include_tag"http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" = javascript_include_tag 'jquery142' - + = 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.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/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 diff --git a/public/javascripts/publisher.js b/public/javascripts/publisher.js index dd5094aee..2238670e3 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("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)[0].classList[0]).css("display") == "none" ) { + $("#publisher_content_pickers .selected").removeClass("selected"); $("#publisher_form form").fadeOut(50); $(this).toggleClass("selected"); - $("#new_status_message").delay(50).fadeIn(200); + $("#new_" + $(this)[0].classList[0]).delay(50).fadeIn(200); } - }); - - $("#publisher_content_pickers .bookmark").click(function(){ - if( $("#new_bookmark").css("display") == "none" ) { - $("#publisher_content_pickers").children("li").removeClass("selected"); - $("#publisher_form form").fadeOut(50); - - $(this).toggleClass("selected"); - $("#new_bookmark").delay(50).fadeIn(200); - } - }); - - $("#publisher_content_pickers .blog").click(function(){ - if( $("#new_blog").css("display") == "none" ) { - $("#publisher_content_pickers").children("li").removeClass("selected"); - $("#publisher_form form").fadeOut(50); - - $(this).toggleClass("selected"); - $("#new_blog").delay(50).fadeIn(200); - } - }); + } });