Merge pull request #55 from cyberarm/master

steveklabnik · steveklabnik · commit 8ae7744be167 · 2011-06-08T15:28:05.000-07:00
A few Changes
diff --git a/public/css/site.css b/public/css/site.css
@@ -41,11 +41,20 @@ hr {
   background-color:#000;
 }
 .vertical-center-text {
-  padding-top:20px;
+  /*padding-top:20px;*/
   padding-left:80px;
 }
 
 
 .preview {
   background-color: #fff;
 }
+
+.gravatar {
+float: left;
+border-radius:4px;
+}
+
+.hacker-gravatar {
+border-radius: 4px;
+}
diff --git a/views/content/show.haml b/views/content/show.haml
@@ -8,7 +8,7 @@
   .comment{:style => "clear:both;padding-bottom:1em"}
     %div{:style => "float:left;padding-right:1em"}
       %a{:href => "/hackers/#{reply.author}"}
-        %img{:src => gravatar_url_for(reply.author_email), :alt => "#{reply.author.downcase}_gravatar", :class => "comment_gravatar"}
+        %img{:src => gravatar_url_for(reply.author_email), :alt => "#{reply.author.downcase}_gravatar", :class => "gravatar"}
     %div{:style => "width:500px"}
       %p
         <a href="/hackers/#{reply.author}">#{reply.author}</a> says:
diff --git a/views/hackers/show.haml b/views/hackers/show.haml
@@ -1,6 +1,6 @@
 .span-18
 %h1= @hacker.username + "'s page"
-%img{:src => @hacker.gravatar_url}
+%img{:src => @hacker.gravatar_url, :class => "hacker-gravatar"}
 %h2 About #{@hacker.username}:
 %p= @hacker.about
 %hr
diff --git a/views/programs/show.haml b/views/programs/show.haml
@@ -12,7 +12,7 @@
     .comment{:style => "clear:both;padding-bottom:1em"}
       %div{:style => "float:left;padding-right:1em"}
         %a{:href => "/hackers/#{reply.author}"}
-          %img{:src => gravatar_url_for(reply.author_email), :alt => "#{reply.author.downcase}_gravatar", :class => "comment_gravatar"}
+          %img{:src => gravatar_url_for(reply.author_email), :alt => "#{reply.author.downcase}_gravatar", :class => "hacker-gravatar"}
       %div{:style => "width:500px"}
         %p
           <a href="/hackers/#{reply.author}">#{reply.author}</a> says:
diff --git a/views/sessions/login.haml b/views/sessions/login.haml
@@ -7,7 +7,7 @@
       %td
         %label{:for => "user_username"} Username
       %td
-        %input{:id => "user_username", :name => "username", :size => 30, :type => "text"}
+        %input{:id => "user_username", :name => "username", :size => 30, :type => "text", :autofocus => "focus"}
     %tr
       %td
         %label{:for => "user_password"} Password
diff --git a/views/stream.haml b/views/stream.haml
@@ -53,12 +53,15 @@
   %ul{:style => "list-style:none"}
     - @content_list.each do |content|
       %li{:style => "height:70px"}
-        %img{:height => "64", :src => content.image, :style => "float:left"}/
+        %img{:height => "64", :src => content.image, :class => "gravatar"}/
         %p{:class => "vertical-center-text"}
           %a{:href => "/hackers/#{content.author}"}= content.author
           shared a
           %a{:href => "/content/#{content.id}"}= content.type
           \: "#{content.body[0,50]}..." (#{content.comments.length} comments)
+        %p{:class => "vertical-center-text"}
+          Posted on #{content.created_at.strftime("%m/%d/%Y at %I:%M%p")}
+      %br/
   - unless @prev_page.nil?
     %a.button{:href => @prev_page, :id => "prev_button"}
       &laquo; Previous
