0
@@ -16,7 +16,7 @@ module Admin::ArticlesHelper
0
 
0
   def published_at_for(article)
0
     return 'not published' unless article
0
-    format = utc_to_local(article.published_at).year == Time.now.year ? :plain : :standard
0
+    format = article.published_at.year == Time.now.utc.year ? :plain : :standard
0
     article.published? ? utc_to_local(article.published_at).to_s(format) : "not published"
0
   end
0
 

0
@@ -11,8 +11,8 @@ module Mephisto
0
           'permalink'        => article.permalink,
0
           'url'              => article.full_permalink,
0
           'body'             => article.send(:body_for_mode, mode),
0
-          'published_at'     => article.published_at,
0
-          'updated_at'       => article.updated_at,
0
+          'published_at'     => article.site.timezone.utc_to_local(article.published_at),
0
+          'updated_at'       => article.site.timezone.utc_to_local(article.updated_at),
0
           'comments_count'   => article.comments_count,
0
           'author'           => article.user.to_liquid,
0
           'comments_allowed' => article.comments_allowed?

0
@@ -2,6 +2,7 @@
0
 
0
 {% for article in articles %}
0
   <h2>{{ article.title }}</h2>
0
+  <p><span>{{ article.published_at | format_date: 'standard' }}</span></p>
0
   <p>{{ article | link_to_article }}</p>
0
   <p>{{ article.body }}</p>
0
 {% endfor %}
0
\ No newline at end of file

0
@@ -91,12 +91,17 @@ class MephistoControllerTest < Test::Unit::TestCase
0
 
0
   def test_should_render_liquid_templates_on_home
0
     get_mephisto
0
-    assert_tag :tag => 'h1', :content => 'This is the layout'
0
-    assert_tag :tag => 'p',  :content => 'home'
0
-    assert_tag :tag => 'h2', :content => contents(:welcome).title
0
-    assert_tag :tag => 'h2', :content => contents(:another).title
0
-    assert_tag :tag => 'p',  :content => contents(:welcome).excerpt
0
-    assert_tag :tag => 'p',  :content => contents(:another).body
0
+    assert_tag 'h1', :content => 'This is the layout'
0
+    assert_tag 'p',  :content => 'home'
0
+    assert_tag 'h2', :content => contents(:welcome).title
0
+    assert_tag 'h2', :content => contents(:another).title
0
+    assert_tag 'p',  :content => contents(:welcome).excerpt
0
+    assert_tag 'p',  :content => contents(:another).body
0
+  end
0
+
0
+  def test_should_show_time_in_correct_timezone
0
+    get_mephisto
0
+    assert_tag 'span', :content => assigns(:site).timezone.utc_to_local(contents(:welcome).published_at).to_s(:standard)
0
   end
0
 
0
   def test_should_render_liquid_templates_by_sections