Permalink
Browse files

well..

  • Loading branch information...
Melissa Voegeli
Melissa Voegeli committed Jan 19, 2011
1 parent 87251dc commit ac0e869e16d6425e7e60ce38d180d0aebed9abc9
@@ -2,21 +2,21 @@ module AccountsHelper
def link_to_service name, service
case service.name
when 'twitter'
- link_to name, 'http://twitter.com/' + service.key
+ link_to image_tag("Twitter.png"), 'http://twitter.com/' + service.key
when 'friendfeed'
- link_to name, 'http://friendfeed.com/' + service.key
+ link_to image_tag("Friendfeed.png"), 'http://friendfeed.com/' + service.key
when 'mixi'
- link_to name, 'http://mixi.jp/show_friend.pl?id=' + service.key
+ link_to image_tag("Mixi.png"), 'http://mixi.jp/show_friend.pl?id=' + service.key
when 'github'
- link_to name, 'http://github.com/' + service.key
+ link_to image_tag("Github.png"), 'http://github.com/' + service.key
when 'facebook'
if service.key =~ /^\s*\d+$/
- link_to name, 'http://www.facebook.com/profile.php?id=' + service.key
+ link_to image_tag("Facebook.png"), 'http://www.facebook.com/profile.php?id=' + service.key
else
- link_to name, 'http://www.facebook.com/' + service.key
+ link_to image_tag("Facebook.png"), 'http://www.facebook.com/' + service.key
end
when 'iddy'
- link_to name, 'http://iddy.jp/profile/' + service.key
+ link_to image_tag("Iddy.png"), 'http://iddy.jp/profile/' + service.key
end
end
@@ -1,63 +1,55 @@
-<li class="account">
- <table>
- <tr>
- <td class="first title">Account:</td>
- <td class="username"><%= account.username %></td>
- </tr>
-
+ <tr>
+
<% unless account.portraits.empty? %>
- <tr>
- <td class="first portraits">
+
+ <td>
<ul>
<%= render :partial => 'portrait', :collection => account.portraits %>
</ul>
+
<% unless account.names.empty? %>
- <td>
- <ul>
- <%= render :partial => 'name', :collection => account.names, :locals => { :is_nickname => false } %>
- <%= render :partial => 'name', :collection => account.nicks, :locals => { :is_nickname => true } unless account.nicks.empty? %>
- </ul>
- </td>
- <% end %>
- </td>
- </tr>
+ <ul>
+ <div class='image-wrapper'>
+ <%= render :partial => 'name', :collection => account.names, :locals => { :is_nickname => false } %>
+ <%= render :partial => 'name', :collection => account.nicks, :locals => { :is_nickname => true } unless account.nicks.empty? %>
+ <%= account.username %>
+ </div>
+</ul>
<% end %>
+ </td>
-
+ <td>
<% unless account.sites.empty? %>
- <tr>
- <td class="first title">Sites:</td>
- <td>
- <ul>
- <%= render :partial => 'site', :collection => account.sites %>
- </ul>
- </td>
- </tr>
+ <ul>
+ <%= render :partial => 'site', :collection => account.sites %>
+ </ul>
<% end %>
-
- <% unless account.services.empty? %>
- <tr>
- <td class="first title">Services:</td>
- <td>
- <ul>
- <%= render :partial => 'service', :collection => account.services %>
- </ul>
- </td>
+ </td>
+
+ <td>
+ <% unless account.books.empty? %>
+ <ul>
+ <% account.books.each do |book| %>
+ <li class="book"><a href="http://www.amazon.<%= book.isbn.match(/^4/) ? "co.jp":"com" %>/dp/<%= book.isbn %>"><%= book.key %></a></li>
+ <% end %>
+ </ul>
+
+
+ <% end %>
+
+ </td>
+ <td>
+ <% unless account.services.empty? %>
+ <ul>
+ <%= render :partial => 'service', :collection => account.services %>
+ </ul>
+ <% end %>
+ </td>
</tr>
<% end %>
+<tr>
+
+</tr>
+
- <% unless account.books.empty? %>
- <tr>
- <td class="first title">Books:</td>
- <td>
- <ul>
- <% account.books.each do |book| %>
- <li class="book"><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>
-</li>
@@ -1,3 +1,4 @@
<ul id="accounts">
+
<%= render :partial => 'account', :collection => @accounts %>
</ul>
@@ -15,7 +15,17 @@
<div id="page">
<div id="content">
+ <li class="account">
+ <table>
+ <tr>
+ <td class="top">Name</td>
+ <td class="top">Sites</td>
+ <td class="top">Books</td>
+ <td class="top">Services</td>
+ </tr>
<%= yield %>
+ </table>
+ </li>
</div>
</div>
View
Binary file not shown.
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.
@@ -1,10 +1,10 @@
html {
- background: #a92014 url(/images/bg.png) no-repeat scroll 100% 0;
+ background: #ffffff url(/images/bg-white.png) no-repeat scroll 100% 0;
}
body {
font-family: "Allerta", Arial, "MS Trebuchet", sans-serif;
- font-size: 62.5%;
+ font-size: 40.5%;
line-height: 1.25em;
color: #F1F1F1;
}
@@ -65,7 +65,7 @@ code {
#header {
background: #ff0000 url('/images/header-background.gif') repeat scroll 0 0;
position: relative;
- padding: .5em 1em .75em 1em;
+ padding: 1.2em 1em .75em 1em;
margin: .6em 0 0 0;
border-bottom: 1px solid #803130;
-webkit-border-top-right-radius: 4px;
@@ -80,7 +80,7 @@ code {
#header h1 {
position: relative;
font-family: 'Cherry Cream Soda', arial, serif;
- font-size: 320%;
+ font-size: 600%;
line-height: 1.25em;
margin: 0;
padding: 0 0 0 2%;
@@ -98,8 +98,7 @@ code {
#page {
position: relative;
width: auto;
- background: white;
- background-color: rgba(255,255,255,0.1);
+ background-color: rgba( 0, 0, 0, 0.1);
min-height: 100%;
font-size: 1.25em;
margin: 0 0 5% 0;
@@ -117,6 +116,7 @@ code {
.image-wrapper {
padding: .2em;
height: 100px;
+ border: white;
}
.image-wrapper img {
@@ -149,41 +149,25 @@ code {
}
#content table {
- width: 65%;
- margin: 0 auto 6em auto;
-}
-#content table th {
- font-weight: bold;
- padding-bottom: 3px;
- border-bottom: 2px solid #222;
+ width: 100%;
+ border-spacing: 0;
}
#content table td {
border-bottom: 1px solid #AAA;
padding: 0.3em 0 0.5em 0;
background-color: rgba(80,80,80,0.1);
+ margin: 0 0 48px 0;
+ padding: 12px 0 0 12px;
}
-#content table td.title,
-#content table td.username {
+#content table td.top {
padding-top: 1em;
background-color: rgba(0,0,0,0.1);
}
-#content table td.title,
-#content table td.portraits,
-#content table td.username {
- padding-left: .8em;
-}
+
#content table tr.last td {
border-bottom: none;
}
-#content table td.first {
- width: 30%;
-}
-#content #accounts {
- margin: 0;
-}
-#content .account {
- margin: 0;
-}
+
#content .account li.nickname,
#content .account li.service,
#content .account li.book {

0 comments on commit ac0e869

Please sign in to comment.