Merge branch 'mnutt-master'

* mnutt-master: fallback font footer more css css fixes link styling add meta info; foxes newer header late night with the tablet
sorah · Jan 28, 2011 · bc1b320 · bc1b320
2 parents 58b078a + 831393a
commit bc1b320
Show file tree

Hide file tree

Showing 116 changed files with 181 additions and 78 deletions.
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
@@ -1,5 +1,5 @@
 class AccountsController < ApplicationController
   def index
-    @accounts = Account.find :all
+    @accounts = Account.includes([:names, :nicks, :sites, :services, :portraits]).all
   end
 end
diff --git a/app/views/accounts/_account.html.erb b/app/views/accounts/_account.html.erb
@@ -1,76 +1,44 @@
-<li>
-  <table>
-    <tr>
-      <td>Account:</td>
-      <td><%= account.username %></td>
-    </tr>
+<li class="account">
+  <div class="picture">
+    <div class="image-wrapper">
+      <% if File.exist?(Rails.root.join('public', 'images', 'people', 'lines', "#{account.username}.png").to_s) -%>
+        <%= image_tag "people/lines/#{account.username}.png", :onmouseover => "this.src = this.src.replace(/lines/, 'photos').replace(/png/, 'jpg');", :onmouseout => "this.src = this.src.replace(/photos/, 'lines').replace(/jpg/, 'png');" -%>
+      <% else -%>
+        <%= image_tag "people/lines/fox#{@fox_count}.png", :onmouseover => "this.src = this.src.replace(/lines/, 'photos')", :onmouseout => "this.src = this.src.replace(/photos/, 'lines')" -%>
+        <% @fox_count = @fox_count % 3 + 1 -%>
+      <% end -%>
+    </div>
+  </div>
 
-    <% unless account.names.empty? %>
-      <tr>
-        <td>Names:</td>
-        <td>
-          <ul>
-            <%= render :partial => 'name', :collection => account.names %>
-          </ul>
-        </td>
-      </tr>
-    <% end %>
+  <div class="name">
+      <span class="username"><%= account.username -%></span>
 
-    <% unless account.nicks.empty? %>
-      <tr>
-        <td>Nicknames:</td>
-        <td>
-          <ul>
-            <%= render :partial => 'name', :collection => account.nicks %>
-          </ul>
-        </td>
-      </tr>
-    <% end %>
+      <span class="nicknames">
+        <% [account.names, account.nicks].flatten.slice(0,5).each do |name| -%>
+          <span class="nick">
+            <small>AKA</small>
+            &ldquo;<%= name.value -%>&rdquo;
+          </span>
+        <% end -%>
+      </span>
+    </div>
+  </div>
 
-    <% unless account.sites.empty? %>
-      <tr>
-        <td>Sites:</td>
-        <td>
-          <ul>
-            <%= render :partial => 'site', :collection => account.sites %>
-          </ul>
-        </td>
-      </tr>
-    <% end %>
+  <div class="sites">
+    <%= render :partial => 'site', :collection => account.sites -%>
+    <span class="books">
+      <% if account.books.present? -%>
+        Books: &nbsp;
+        <% account.books.each_with_index do |book, i| %>
+          <a href="http://www.amazon.<%= book.key.match(/^4/) ? "co.jp":"com" %>/dp/<%= book.key %>"><%= i + 1 -%></a> &nbsp;
+        <% end %>
+      <% end -%>
+    </span>
+  </div>
 
-    <% unless account.services.empty? %>
-      <tr>
-        <td>Services:</td>
-        <td>
-          <ul>
-            <%= render :partial => 'service', :collection => account.services %>
-          </ul>
-        </td>
-      </tr>
-    <% end %>
+  <div class="services">
+    <%= render :partial => 'service', :collection => account.services -%>
+  </div>
 
-    <% unless account.portraits.empty? %>
-      <tr>
-        <td>Portraits:</td>
-        <td>
-          <ul>
-            <%= render :partial => 'portrait', :collection => account.portraits %>
-          </ul>
-        </td>
-      </tr>
-    <% end %>
-
-    <% unless account.books.empty? %>
-      <tr>
-        <td>Books:</td>
-        <td>
-          <ul>
-            <% account.books.each do |book| %>
-              <li><a href="http://www.amazon.<%= book.isbn.match(/^4/) ? "co.jp":"com" %>/dp/<%= book.isbn %>"><%= book.key %></a></li>
-            <% end %>
-          </ul>
-        </td>
-      </tr>
-    <% end %>
-  </table>
+  <div style="clear: both;"></div>
 </li>
diff --git a/app/views/accounts/_service.html.erb b/app/views/accounts/_service.html.erb
@@ -1,3 +1,2 @@
-<li>
-  <%= link_to_service service.name, service %>
-</li>
+<%= link_to_service image_tag("social/#{service.name}.png"), service %>
+
diff --git a/app/views/accounts/_site.html.erb b/app/views/accounts/_site.html.erb
@@ -1 +1 @@
-<li><%= link_to site.title, site.url %></li>
+<%= link_to site.title, site.url %> &nbsp;
diff --git a/app/views/accounts/index.html.erb b/app/views/accounts/index.html.erb
@@ -1,5 +1,9 @@
-<h1>Ruby Committers</h1>
-<%= link_to 'fork me on github', 'http://github.com/tenderlove/rubycommitters.org' %>
-<ul>
+<!-- <h1>Ruby Committers</h1>
+<%= link_to 'fork me on github',
+    'http://github.com/tenderlove/rubycommitters.org' %> -->
+
+<% @fox_count = 1 -%>
+
+<ul style="list-style: none; margin: 0; padding: 0; z-index: 10; position: relative;">
 <%= render :partial => 'account', :collection => @accounts %>
 </ul>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -9,7 +9,16 @@
 </head>
 <body>
 
+  <div id="header">
+    <div id="title">Ruby Committers</div>
+  </div>
+
 <%= yield %>
 
+  <div id="footer">
+    &copy; 2011 RubyCommitters.org <br/>
+    inspired by _why
+  </div>
+
 </body>
 </html>
diff --git a/public/fonts/munro_small.ttf b/public/fonts/munro_small.ttf
diff --git a/public/images/foo.jpg b/public/images/foo.jpg
diff --git a/public/images/foxes.png b/public/images/foxes.png
diff --git a/public/images/header-bg.png b/public/images/header-bg.png
diff --git a/public/images/header.jpg b/public/images/header.jpg
diff --git a/public/images/header2.jpg b/public/images/header2.jpg
diff --git a/public/images/line-bg.jpg b/public/images/line-bg.jpg
diff --git a/public/images/people/lines/aamine.png b/public/images/people/lines/aamine.png
diff --git a/public/images/people/lines/akira.png b/public/images/people/lines/akira.png
diff --git a/public/images/people/lines/akr.png b/public/images/people/lines/akr.png
diff --git a/public/images/people/lines/arton.png b/public/images/people/lines/arton.png
diff --git a/public/images/people/lines/azav.png b/public/images/people/lines/azav.png
diff --git a/public/images/people/lines/dave.png b/public/images/people/lines/dave.png
diff --git a/public/images/people/lines/davidflanagan.png b/public/images/people/lines/davidflanagan.png
diff --git a/public/images/people/lines/dblack.png b/public/images/people/lines/dblack.png
diff --git a/public/images/people/lines/drbrain.png b/public/images/people/lines/drbrain.png
diff --git a/public/images/people/lines/duerst.png b/public/images/people/lines/duerst.png
diff --git a/public/images/people/lines/fox1.png b/public/images/people/lines/fox1.png
diff --git a/public/images/people/lines/fox2.png b/public/images/people/lines/fox2.png
diff --git a/public/images/people/lines/fox3.png b/public/images/people/lines/fox3.png
diff --git a/public/images/people/lines/gotoken.png b/public/images/people/lines/gotoken.png
diff --git a/public/images/people/lines/gotoyuzo.png b/public/images/people/lines/gotoyuzo.png
diff --git a/public/images/people/lines/jeg2.png b/public/images/people/lines/jeg2.png
diff --git a/public/images/people/lines/jim.png b/public/images/people/lines/jim.png
diff --git a/public/images/people/lines/keiju.png b/public/images/people/lines/keiju.png
diff --git a/public/images/people/lines/knu.png b/public/images/people/lines/knu.png
diff --git a/public/images/people/lines/ko1.png b/public/images/people/lines/ko1.png
diff --git a/public/images/people/lines/luislavena.png b/public/images/people/lines/luislavena.png
diff --git a/public/images/people/lines/marcandre.png b/public/images/people/lines/marcandre.png
diff --git a/public/images/people/lines/matz.png b/public/images/people/lines/matz.png
diff --git a/public/images/people/lines/mrkn.png b/public/images/people/lines/mrkn.png
diff --git a/public/images/people/lines/nobu.png b/public/images/people/lines/nobu.png
diff --git a/public/images/people/lines/seki.png b/public/images/people/lines/seki.png
diff --git a/public/images/people/lines/shugo.png b/public/images/people/lines/shugo.png
diff --git a/public/images/people/lines/shyouhei.png b/public/images/people/lines/shyouhei.png
diff --git a/public/images/people/lines/takano32.png b/public/images/people/lines/takano32.png
diff --git a/public/images/people/lines/tenderlove.png b/public/images/people/lines/tenderlove.png
diff --git a/public/images/people/lines/wew.png b/public/images/people/lines/wew.png
diff --git a/public/images/people/lines/why.png b/public/images/people/lines/why.png
diff --git a/public/images/people/lines/yugui.png b/public/images/people/lines/yugui.png
diff --git a/public/images/people/lines/zsombr.png b/public/images/people/lines/zsombr.png
diff --git a/public/images/people/photos/aamine.jpg b/public/images/people/photos/aamine.jpg
diff --git a/public/images/people/photos/akira.jpg b/public/images/people/photos/akira.jpg
diff --git a/public/images/people/photos/akr.jpg b/public/images/people/photos/akr.jpg
diff --git a/public/images/people/photos/arton.jpg b/public/images/people/photos/arton.jpg
diff --git a/public/images/people/photos/azav.jpg b/public/images/people/photos/azav.jpg
diff --git a/public/images/people/photos/dave.jpg b/public/images/people/photos/dave.jpg
diff --git a/public/images/people/photos/davidflanagan.jpg b/public/images/people/photos/davidflanagan.jpg
diff --git a/public/images/people/photos/dblack.jpg b/public/images/people/photos/dblack.jpg
diff --git a/public/images/people/photos/drbrain.jpg b/public/images/people/photos/drbrain.jpg
diff --git a/public/images/people/photos/duerst.jpg b/public/images/people/photos/duerst.jpg
diff --git a/public/images/people/photos/fox1.png b/public/images/people/photos/fox1.png
diff --git a/public/images/people/photos/fox2.png b/public/images/people/photos/fox2.png
diff --git a/public/images/people/photos/fox3.png b/public/images/people/photos/fox3.png
diff --git a/public/images/people/photos/gotoken.jpg b/public/images/people/photos/gotoken.jpg
diff --git a/public/images/people/photos/gotoyuzo.jpg b/public/images/people/photos/gotoyuzo.jpg
diff --git a/public/images/people/photos/jeg2.jpg b/public/images/people/photos/jeg2.jpg
diff --git a/public/images/people/photos/jim.jpg b/public/images/people/photos/jim.jpg
diff --git a/public/images/people/photos/keiju.jpg b/public/images/people/photos/keiju.jpg
diff --git a/public/images/people/photos/knu.jpg b/public/images/people/photos/knu.jpg
diff --git a/public/images/people/photos/ko1.jpg b/public/images/people/photos/ko1.jpg
diff --git a/public/images/people/photos/luislavena.jpg b/public/images/people/photos/luislavena.jpg
diff --git a/public/images/people/photos/marcandre.jpg b/public/images/people/photos/marcandre.jpg
diff --git a/public/images/people/photos/matz.jpg b/public/images/people/photos/matz.jpg
diff --git a/public/images/people/photos/mrkn.jpg b/public/images/people/photos/mrkn.jpg
diff --git a/public/images/people/photos/nobu.jpg b/public/images/people/photos/nobu.jpg
diff --git a/public/images/people/photos/seki.jpg b/public/images/people/photos/seki.jpg
diff --git a/public/images/people/photos/shugo.jpg b/public/images/people/photos/shugo.jpg
diff --git a/public/images/people/photos/shyouhei.jpg b/public/images/people/photos/shyouhei.jpg
diff --git a/public/images/people/photos/takano32.jpg b/public/images/people/photos/takano32.jpg
diff --git a/public/images/people/photos/tenderlove.jpg b/public/images/people/photos/tenderlove.jpg
diff --git a/public/images/people/photos/wew.jpg b/public/images/people/photos/wew.jpg
diff --git a/public/images/people/photos/why.jpg b/public/images/people/photos/why.jpg
diff --git a/public/images/people/photos/yugui.jpg b/public/images/people/photos/yugui.jpg
diff --git a/public/images/people/photos/zsombr.jpg b/public/images/people/photos/zsombr.jpg
diff --git a/public/images/social/blinklist.png b/public/images/social/blinklist.png
diff --git a/public/images/social/brightkite.png b/public/images/social/brightkite.png
diff --git a/public/images/social/delicious.png b/public/images/social/delicious.png
diff --git a/public/images/social/design_float.png b/public/images/social/design_float.png
diff --git a/public/images/social/digg.png b/public/images/social/digg.png
diff --git a/public/images/social/dopplr.png b/public/images/social/dopplr.png
diff --git a/public/images/social/email.png b/public/images/social/email.png
diff --git a/public/images/social/facebook.png b/public/images/social/facebook.png
diff --git a/public/images/social/feed.png b/public/images/social/feed.png
diff --git a/public/images/social/flickr.png b/public/images/social/flickr.png
diff --git a/public/images/social/friendfeed.png b/public/images/social/friendfeed.png
diff --git a/public/images/social/furl.png b/public/images/social/furl.png
diff --git a/public/images/social/gamespot.png b/public/images/social/gamespot.png
diff --git a/public/images/social/github.png b/public/images/social/github.png
diff --git a/public/images/social/iddy.png b/public/images/social/iddy.png
diff --git a/public/images/social/lastfm.png b/public/images/social/lastfm.png
diff --git a/public/images/social/linkedin.png b/public/images/social/linkedin.png
diff --git a/public/images/social/magnolia.png b/public/images/social/magnolia.png
diff --git a/public/images/social/mixi.png b/public/images/social/mixi.png
diff --git a/public/images/social/mixx.png b/public/images/social/mixx.png
diff --git a/public/images/social/myspace.png b/public/images/social/myspace.png
diff --git a/public/images/social/newsvine.png b/public/images/social/newsvine.png
diff --git a/public/images/social/posterous.png b/public/images/social/posterous.png
diff --git a/public/images/social/reddit.png b/public/images/social/reddit.png
diff --git a/public/images/social/sphere.png b/public/images/social/sphere.png
diff --git a/public/images/social/sphinn.png b/public/images/social/sphinn.png
diff --git a/public/images/social/stumble.png b/public/images/social/stumble.png
diff --git a/public/images/social/technorati.png b/public/images/social/technorati.png
diff --git a/public/images/social/tripadvisor.png b/public/images/social/tripadvisor.png
diff --git a/public/images/social/tumblr.png b/public/images/social/tumblr.png
diff --git a/public/images/social/twitter.png b/public/images/social/twitter.png
diff --git a/public/images/social/vimeo.png b/public/images/social/vimeo.png
diff --git a/public/images/social/youtube.png b/public/images/social/youtube.png
diff --git a/public/stylesheets/site.css b/public/stylesheets/site.css
@@ -1,7 +1,121 @@
+@font-face {
+    font-family: "MunroSmall";
+    src: url(/fonts/munro_small.ttf);
+    font-weight:400;
+}
+
+body {
+ margin: 0;
+ padding: 0;
+ background-color: #181818;
+ background: #FFF url(/images/header-bg.png);
+ color: #FFF;
+ font-family: Helvetica, Arial, sans-serif;
+}
+
 .image-wrapper {
   height: 100px;
 }
 
 .image-wrapper img {
   height: 100%;
 }
+
+#header {
+  background: #FFF url(/images/header-bg.png);
+  height: 383px;
+  margin-bottom: -13px;
+}
+
+#title {
+  background: url(/images/header2.jpg) top left no-repeat;
+  width: 957px;
+  height: 413px;
+  text-indent: -10000px;
+}
+
+.services {
+  padding-top: 5px;
+  line-height: 2em;
+}
+
+.services img {
+  border: 0;
+}
+
+.sites a {
+  font-size: 0.6em;
+  line-height: 3.3em;
+  background-color: #EEE;
+  color: #000;
+  padding: 3px 6px;
+  border-radius: 9px;
+  -moz-border-radius: 9px;
+  -o-border-radius: 9px;
+  -webkit-border-radius: 9px;
+  text-decoration: none;
+  font-weight: bold;
+}
+
+.sites a:hover {
+  color: #FFF;
+  background-color: #562e8b;
+}
+
+.sites .books {
+  text-transform: uppercase;
+  font-size: 0.8em;
+  color: #888;
+}
+
+.sites .books a {
+  text-decoration: none;
+}
+
+.username {
+  font-family: "MunroSmall", Arial, Helvetica, sans-serif;
+  font-size: 2em;
+}
+
+.nick {
+  color: #AAA;
+  font-size: 0.6em;
+}
+
+.nick small {
+  font-size: 0.6em;
+}
+
+li.account {
+  max-width: 900px;
+  background-color: #222;
+  background: url(/images/foo.jpg);
+  margin: 20px;
+  padding: 10px;
+  list-style: none;
+  box-shadow: -5px 5px 0px #555;
+  -webkit-box-shadow: -5px 5px 0px #555;
+  -moz-box-shadow: -5px 5px 0px #555;
+}
+
+li.account div.picture {
+  float: right;
+}
+
+li.account div.name {
+  font-family: Helvetica, sans-serif;
+  line-height: 1.4em;
+  text-transform: uppercase;
+  font-size: 1.3em;
+}
+
+#footer {
+  margin-left: 20px;
+  height: 72px;
+  background: url(/images/foxes.png) bottom left no-repeat;);
+  padding: 65px 0 0 165px;
+  color: #666;
+  font-size: 0.55em;
+  font-weight: bold;
+  text-transform: uppercase;
+}
diff --git a/script/switch.rb b/script/switch.rb
@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+username = ARGV[0]
+`git checkout Gemfile.lock`
+puts `git remote add #{username} git://github.com/#{username}/rubycommitters.org`
+puts `git fetch #{username}`
+puts `git checkout #{username}/master`
+puts `bundle install`
+exec `script/rails server -p 3099`