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 16:25:11 -07:00
commit b25880f04a
4 changed files with 54 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/views/js/_google_a_js.haml
View file

@ -1,11 +0,0 @@
:javascript
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-17207587-1']);
_gaq.push(['_setDomainName', '#{root_url}']);
_gaq.push(['_trackPageview']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();

3
app/views/layouts/application.html.haml
View file

@ -10,9 +10,8 @@
= stylesheet_link_tag "blueprint/screen", :media => 'screen'
= stylesheet_link_tag "application"
/= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
= javascript_include_tag 'jquery142', 'rails', 'view', 'publisher'
= javascript_include_tag 'jquery142', 'rails', 'view', 'publisher', 'http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js', 'google_a'
= javascript_include_tag 'tiny_mce/tiny_mce', 'jquery.infieldlabel'
= render 'js/google_a_js'
= render 'js/websocket_js'
= csrf_meta_tag

40
db/seeds/backer.rb
View file

@ -48,10 +48,46 @@ def create(backer_number, password)
["Lyndon B.", "Johnson"],
["Richard", "Nixon"]
]
pin =[5072,
3742,
7782,
2691,
6133,
7558,
8670,
1559,
5404,
6431,
1957,
5323,
8784,
4267,
8891,
2324,
6948,
8176,
6928,
5677,
7966,
2893,
6828,
2982,
6756,
6658,
3551,
3088,
8379,
7493,
2759,
1029,
4013,
8507,
1508,
5258]
# Create seed user
email = names[backer_number][1].gsub(/ /,'').downcase
user = User.create( :email => "#{email}@joindiaspora.com", :password => "#{password}", :profile => Profile.create( :first_name => names[backer_number][0], :last_name => names[backer_number][1] ))
user = User.create( :email => "#{email}@joindiaspora.com", :password => "#{email+pin[backer_number].to_s}", :profile => Profile.create( :first_name => names[backer_number][0], :last_name => names[backer_number][1] ))
# Make friends with Diaspora Tom
Friend.create( :email => "tom@joindiaspora.com", :url => "http://tom.joindiaspora.com/", :profile => Profile.create(:first_name => "Diaspora", :last_name => "Tom"))

15
public/javascripts/google.js Normal file
View file

@ -0,0 +1,15 @@
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-17207587-1']);
_gaq.push(['_setDomainName', '.joindiaspora.com']);
_gaq.push(['_trackPageview']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
CFInstall.check({
mode: "overlay",
destination: "http://www.waikiki.com"
});