nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diaspora/diaspora_rails

Browse source
This commit is contained in:
danielvincent 2010-07-01 17:22:30 -07:00
commit 88f0244353
4 changed files with 37 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/views/layouts/session_wall.html.haml
View file

@ -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
<!--[if lt IE 8]>
<div style='border: 1px solid #F7941D; background: #FEEFDA; text-align: center; clear: both; height: 75px; position: relative;'>
<div style='position: absolute; right: 3px; top: 3px; font-family: courier new; font-weight: bold;'><a href='#' onclick='javascript:this.parentNode.parentNode.style.display="none"; return false;'><img src='http://www.ie6nomore.com/files/theme/ie6nomore-cornerx.jpg' style='border: none;' alt='Close this notice'/></a></div>
<div style='width: 640px; margin: 0 auto; text-align: left; padding: 0; overflow: hidden; color: black;'>
<div style='width: 75px; float: left;'><img src='http://www.ie6nomore.com/files/theme/ie6nomore-warning.jpg' alt='Warning!'/></div>
<div style='width: 275px; float: left; font-family: Arial, sans-serif;'>
<div style='font-size: 14px; font-weight: bold; margin-top: 12px;'>You are using an outdated browser</div>
<div style='font-size: 12px; margin-top: 6px; line-height: 12px;'>For a better experience using this site, please upgrade to a modern web browser.</div>
</div>
<div style='width: 75px; float: left;'><a href='http://www.firefox.com' target='_blank'><img src='http://www.ie6nomore.com/files/theme/ie6nomore-firefox.jpg' style='border: none;' alt='Get Firefox 3.5'/></a></div>
<div style='width: 75px; float: left;'><a href='http://www.browserforthebetter.com/download.html' target='_blank'><img src='http://www.ie6nomore.com/files/theme/ie6nomore-ie8.jpg' style='border: none;' alt='Get Internet Explorer 8'/></a></div>
<div style='width: 73px; float: left;'><a href='http://www.apple.com/safari/download/' target='_blank'><img src='http://www.ie6nomore.com/files/theme/ie6nomore-safari.jpg' style='border: none;' alt='Get Safari 4'/></a></div>
<div style='float: left;'><a href='http://www.google.com/chrome' target='_blank'><img src='http://www.ie6nomore.com/files/theme/ie6nomore-chrome.jpg' style='border: none;' alt='Get Google Chrome'/></a></div>
</div>
</div>
<![endif]-->
- flash.each do |name, msg|
= content_tag :div, msg, :id => "flash_#{name}"
- if User.first

4
config.ru
View file

@ -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

2
lib/chrome_frame.rb
View file

@ -25,7 +25,7 @@ module Rack
<body>
<div id="cf-placeholder"></div>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script>
<script>CFInstall.check({ node: "cf-placxeholder" #{', destination: "' + @options[:destination] + '" ' if @options[:destination]}});</script>
<script>CFInstall.check({ node: "cf-placx eholder" #{', destination: "' + @options[:destination] + '" ' if @options[:destination]}});</script>
</body>
</html>
HTML

37
public/javascripts/publisher.js
View file

@ -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);
}
});
}
});