[myexperiment-hackers] [1940] branches/event_logging: News generation.

[noreply]

Revision

1940

Author

alekses6

Date

2008-11-11 09:45:15 -0500 (Tue, 11 Nov 2008)

Log Message

News generation. Fixed CSS style for news actions - now actions are shown in correct font-size in FF. Refactored code to remove 2 helpers and use ruby functions instead.

Modified Paths

• branches/event_logging/app/helpers/application_helper.rb
• branches/event_logging/app/views/layouts/_public_news_entry.rxml
• branches/event_logging/public/stylesheets/styles.css

Diff

Modified: branches/event_logging/app/helpers/application_helper.rb (1939 => 1940)

--- branches/event_logging/app/helpers/application_helper.rb	2008-11-11 12:12:44 UTC (rev 1939)
+++ branches/event_logging/app/helpers/application_helper.rb	2008-11-11 14:45:15 UTC (rev 1940)
@@ -581,15 +581,7 @@
     return "#{issn[0..3]}-#{issn[4..7]}"
   end
   
-  def formatted_time(long_time)
-    # bugfix to 'pad out' hours and minutes which are less than ten.. eg: 3:2 --> 03:02 [am]
-    time = "#{(long_time.hour < 10 ? "0#{long_time.hour}" : long_time.hour)}:#{(long_time.min < 10 ? "0#{long_time.min}" : long_time.min)}"
-  end
-  
-  def formatted_date(long_date)
-    date = "#{long_date.day}/#{long_date.month}/#{long_date.year}"
-  end
-  
+    
   # A generic caller method / interpreter of results of a true news generation method;
   #
   # Parameters:
@@ -622,7 +614,7 @@
     }.each do |news_item|
       nearest_day = news_item[0] - (news_item[0].hour.hours + news_item[0].min.minutes + news_item[0].sec.seconds)
       
-      time = formatted_time(news_item[0])
+      time = news_item[0].strftime("%H:%M")
       
       if hash.has_key? nearest_day
         hash[nearest_day] << ["#{time}", "#{news_item[1]}"]

Modified: branches/event_logging/app/views/layouts/_public_news_entry.rxml (1939 => 1940)

--- branches/event_logging/app/views/layouts/_public_news_entry.rxml	2008-11-11 12:12:44 UTC (rev 1939)
+++ branches/event_logging/app/views/layouts/_public_news_entry.rxml	2008-11-11 14:45:15 UTC (rev 1940)
@@ -1,5 +1,5 @@
 xm.item do
-  xm.title "#{formatted_date(public_news_entry[0])} @ #{formatted_time(public_news_entry[0])} - #{strip_html(public_news_entry[1])}"
+  xm.title "#{public_news_entry[0].strftime("%m/%d/%Y")} @ #{public_news_entry[0].strftime("%H:%M")} - #{strip_html(public_news_entry[1])}"
   xm.description white_list(public_news_entry[1])
   xm.pubDate public_news_entry[0].rfc822
 end
\ No newline at end of file

Modified: branches/event_logging/public/stylesheets/styles.css (1939 => 1940)

--- branches/event_logging/public/stylesheets/styles.css	2008-11-11 12:12:44 UTC (rev 1939)
+++ branches/event_logging/public/stylesheets/styles.css	2008-11-11 14:45:15 UTC (rev 1940)
@@ -765,7 +765,6 @@
 }
 
 .news_feed_action{
-	font-size: 93%;
 	font-weight: bold;
 	color: #990000;
 }