Added timestamp to protip.

seuros · vagrant · commit 3b2e08104632 · 2014-07-16T16:28:23.000Z
I'm not happy about the style, but we will fix it later.
diff --git a/Gemfile b/Gemfile
@@ -132,6 +132,7 @@ gem 'sanitize'
 gem 'simple_form'
 gem 'tweet-button'
 gem 'mail_view'
+gem 'local_time'
 
 # Mongo
 gem 'mongoid'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -340,6 +340,8 @@ GEM
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
+    local_time (1.0.0)
+      coffee-rails
     loofah (2.0.0)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.9)
@@ -745,6 +747,7 @@ DEPENDENCIES
   launchy
   letter_opener!
   linkedin
+  local_time
   mail
   mail_view
   memcachier
diff --git a/app/assets/javascripts/protips.js.coffee b/app/assets/javascripts/protips.js.coffee
@@ -5,6 +5,7 @@
 #= require  blur
 #= require  jquery.filedrop
 #= require  vendor/jquery.textselection
+#= require local_time
 
 window.handle_redirect = (response)->
   window.location = response.to  if (response.status == "redirect")
diff --git a/app/assets/stylesheets/protip.scss b/app/assets/stylesheets/protip.scss
@@ -562,7 +562,6 @@ body.protip-single {
         color: #757575;
         background: #e6e6e6;
         text-align: center;
-        padding: 0;
         height: 25px;
         line-height: 25px;
         @include border-radius(4px);
@@ -623,6 +622,7 @@ body.protip-single {
     //share-this-tip
 
     .tip-header {
+      position: relative;
       max-width: inherit;
       .tip-title {
         width: 75%;
@@ -635,7 +635,14 @@ body.protip-single {
           color: #333;
         }
       }
-      //h1
+      //TODO fix this
+      .timestamp {
+        position:absolute;
+        right: 9px;
+        bottom: -29px;
+        font-size: 1.1em;
+        color: #a2a2a2;
+      }
     }
 
     .views {
@@ -758,6 +765,7 @@ body.protip-single {
 
   .tip-content {
     max-width: inherit;
+    margin-top: 20px;
 
     .links {
       float: right;
diff --git a/app/views/protips/_protip.html.haml b/app/views/protips/_protip.html.haml
@@ -1,5 +1,4 @@
 .inside.cf.x-protip-pane
-  //.blur-screen
   .tip-container.cf.x-protip-content.protip-single#x-protip{:class => mode}
     %aside.tip-sidebar
       .user-box
@@ -92,13 +91,17 @@
               - if is_admin?
                 =link_to 'delete', delete_tag_protip_path(protip.public_id, CGI.escape(tag)), :method => :post, :class => "delete"
 
+        //Time stamp
+        %div.timestamp.cf
+          = local_time_ago(protip.created_at)
+
         - if is_admin?
           %ul.admin-tag-links.cf
             %li=link_to 'flag', flag_protip_path(protip), :method => :post, :remote => true, :class => (protip.flagged? ? 'flagged' : "") + " flag"
             %li=link_to 'feature', feature_protip_path(protip), :method => :post, :remote => true, :class => (protip.featured? ? 'featured' : "") + " feature"
             %li=link_to('delete', protip_path(protip.public_id), :method => :delete, :class => 'delete-tip del', :rel => 'nofollow', :title => 'remove protip', :confirm => "Are you sure you permanently want to remove this pro tip?")
 
-        //.tip-body.tip-content
+      %hr
       %div.tip-content
         =raw sanitize(protip.to_html)
 
