Permalink
Browse files

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
  • Loading branch information...
tenderlove committed Jan 28, 2011
2 parents 58b078a + 831393a commit bc1b3200203199813e8ddc1352a7048a5ac398ef
Showing with 181 additions and 78 deletions.
  1. +1 −1 app/controllers/accounts_controller.rb
  2. +38 −70 app/views/accounts/_account.html.erb
  3. +2 −3 app/views/accounts/_service.html.erb
  4. +1 −1 app/views/accounts/_site.html.erb
  5. +7 −3 app/views/accounts/index.html.erb
  6. +9 −0 app/views/layouts/application.html.erb
  7. BIN public/fonts/munro_small.ttf
  8. BIN public/images/foo.jpg
  9. BIN public/images/foxes.png
  10. BIN public/images/header-bg.png
  11. BIN public/images/header.jpg
  12. BIN public/images/header2.jpg
  13. BIN public/images/line-bg.jpg
  14. BIN public/images/people/lines/aamine.png
  15. BIN public/images/people/lines/akira.png
  16. BIN public/images/people/lines/akr.png
  17. BIN public/images/people/lines/arton.png
  18. BIN public/images/people/lines/azav.png
  19. BIN public/images/people/lines/dave.png
  20. BIN public/images/people/lines/davidflanagan.png
  21. BIN public/images/people/lines/dblack.png
  22. BIN public/images/people/lines/drbrain.png
  23. BIN public/images/people/lines/duerst.png
  24. BIN public/images/people/lines/fox1.png
  25. BIN public/images/people/lines/fox2.png
  26. BIN public/images/people/lines/fox3.png
  27. BIN public/images/people/lines/gotoken.png
  28. BIN public/images/people/lines/gotoyuzo.png
  29. BIN public/images/people/lines/jeg2.png
  30. BIN public/images/people/lines/jim.png
  31. BIN public/images/people/lines/keiju.png
  32. BIN public/images/people/lines/knu.png
  33. BIN public/images/people/lines/ko1.png
  34. BIN public/images/people/lines/luislavena.png
  35. BIN public/images/people/lines/marcandre.png
  36. BIN public/images/people/lines/matz.png
  37. BIN public/images/people/lines/mrkn.png
  38. BIN public/images/people/lines/nobu.png
  39. BIN public/images/people/lines/seki.png
  40. BIN public/images/people/lines/shugo.png
  41. BIN public/images/people/lines/shyouhei.png
  42. BIN public/images/people/lines/takano32.png
  43. BIN public/images/people/lines/tenderlove.png
  44. BIN public/images/people/lines/wew.png
  45. BIN public/images/people/lines/why.png
  46. BIN public/images/people/lines/yugui.png
  47. BIN public/images/people/lines/zsombr.png
  48. BIN public/images/people/photos/aamine.jpg
  49. BIN public/images/people/photos/akira.jpg
  50. BIN public/images/people/photos/akr.jpg
  51. BIN public/images/people/photos/arton.jpg
  52. BIN public/images/people/photos/azav.jpg
  53. BIN public/images/people/photos/dave.jpg
  54. BIN public/images/people/photos/davidflanagan.jpg
  55. BIN public/images/people/photos/dblack.jpg
  56. BIN public/images/people/photos/drbrain.jpg
  57. BIN public/images/people/photos/duerst.jpg
  58. BIN public/images/people/photos/fox1.png
  59. BIN public/images/people/photos/fox2.png
  60. BIN public/images/people/photos/fox3.png
  61. BIN public/images/people/photos/gotoken.jpg
  62. BIN public/images/people/photos/gotoyuzo.jpg
  63. BIN public/images/people/photos/jeg2.jpg
  64. BIN public/images/people/photos/jim.jpg
  65. BIN public/images/people/photos/keiju.jpg
  66. BIN public/images/people/photos/knu.jpg
  67. BIN public/images/people/photos/ko1.jpg
  68. BIN public/images/people/photos/luislavena.jpg
  69. BIN public/images/people/photos/marcandre.jpg
  70. BIN public/images/people/photos/matz.jpg
  71. BIN public/images/people/photos/mrkn.jpg
  72. BIN public/images/people/photos/nobu.jpg
  73. BIN public/images/people/photos/seki.jpg
  74. BIN public/images/people/photos/shugo.jpg
  75. BIN public/images/people/photos/shyouhei.jpg
  76. BIN public/images/people/photos/takano32.jpg
  77. BIN public/images/people/photos/tenderlove.jpg
  78. BIN public/images/people/photos/wew.jpg
  79. BIN public/images/people/photos/why.jpg
  80. BIN public/images/people/photos/yugui.jpg
  81. BIN public/images/people/photos/zsombr.jpg
  82. BIN public/images/social/blinklist.png
  83. BIN public/images/social/brightkite.png
  84. BIN public/images/social/delicious.png
  85. BIN public/images/social/design_float.png
  86. BIN public/images/social/digg.png
  87. BIN public/images/social/dopplr.png
  88. BIN public/images/social/email.png
  89. BIN public/images/social/facebook.png
  90. BIN public/images/social/feed.png
  91. BIN public/images/social/flickr.png
  92. BIN public/images/social/friendfeed.png
  93. BIN public/images/social/furl.png
  94. BIN public/images/social/gamespot.png
  95. BIN public/images/social/github.png
  96. BIN public/images/social/iddy.png
  97. BIN public/images/social/lastfm.png
  98. BIN public/images/social/linkedin.png
  99. BIN public/images/social/magnolia.png
  100. BIN public/images/social/mixi.png
  101. BIN public/images/social/mixx.png
  102. BIN public/images/social/myspace.png
  103. BIN public/images/social/newsvine.png
  104. BIN public/images/social/posterous.png
  105. BIN public/images/social/reddit.png
  106. BIN public/images/social/sphere.png
  107. BIN public/images/social/sphinn.png
  108. BIN public/images/social/stumble.png
  109. BIN public/images/social/technorati.png
  110. BIN public/images/social/tripadvisor.png
  111. BIN public/images/social/tumblr.png
  112. BIN public/images/social/twitter.png
  113. BIN public/images/social/vimeo.png
  114. BIN public/images/social/youtube.png
  115. +114 −0 public/stylesheets/site.css
  116. +9 −0 script/switch.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
@@ -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>
@@ -1,3 +1,2 @@
-<li>
- <%= link_to_service service.name, service %>
-</li>
+<%= link_to_service image_tag("social/#{service.name}.png"), service %>
+
@@ -1 +1 @@
-<li><%= link_to site.title, site.url %></li>
+<%= link_to site.title, site.url %> &nbsp;
@@ -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>
@@ -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>
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
View
@@ -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;
+}
View
@@ -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`

0 comments on commit bc1b320

Please sign in to comment.