template: fix timestamp formatting

diff --git a/src/newslash_web/lib/Newslash/Model/Comments.pm b/src/newslash_web/lib/Newslash/Model/Comments.pm
index ca00c58..de5ba87 100644 (file)
--- a/src/newslash_web/lib/Newslash/Model/Comments.pm
+++ b/src/newslash_web/lib/Newslash/Model/Comments.pm
@@ -7,6 +7,7 @@ use Mojo::Log;
 use bytes qw();
 use Digest::MD5 qw(md5_hex);
 use Encode;
+use Newslash::Util::Formatters qw(format_datetime);
 
 #========================================================================
 
@@ -169,6 +170,7 @@ sub _generalize {
     $c->{title} = $c->{subject};
     $c->{time} = $c->{date};
     $c->{introtext} = $c->{comment};
+    $c->{date_string} = format_datetime($c->{date});
 
     #my $max_weight = 0;
     #for my $t (@{$c->{topics}}) {

diff --git a/src/newslash_web/lib/Newslash/Model/Stories.pm b/src/newslash_web/lib/Newslash/Model/Stories.pm
index ad3fa21..ce3531a 100644 (file)
--- a/src/newslash_web/lib/Newslash/Model/Stories.pm
+++ b/src/newslash_web/lib/Newslash/Model/Stories.pm
@@ -5,6 +5,7 @@ use Newslash::Model::SlashDB;
 
 use Data::Dumper;
 use DateTime;
+use Newslash::Util::Formatters qw(format_datetime);
 
 #========================================================================
 
@@ -1005,6 +1006,8 @@ sub _generalize {
         #}
     }
 
+    warn "timestamp: $story->{time}";
+    $story->{time_string} = format_datetime($story->{time});
     $story->{discussion_id} = $story->{discussion};
 }
 

diff --git a/src/newslash_web/templates/common/article/article.html.tt2 b/src/newslash_web/templates/common/article/article.html.tt2
index c045cc4..206d93f 100644 (file)
--- a/src/newslash_web/templates/common/article/article.html.tt2
+++ b/src/newslash_web/templates/common/article/article.html.tt2
@@ -23,16 +23,19 @@ IF story.content_type == 'submission'; content_id = story.subid; END;
         [%- IF story.content_type == 'submission' -%]タレコミ[%- END -%]
       </span>
       by <span v-text="item.author">[% story.author %]</span>
-      <span v-text="item.time">[% story.time %]</span>
+      <span v-text="formatDateTime(item.time)">[% story.time_string %]</span>
       [% IF story.content_type == 'story' %]<span v-text="item.dept">[% story.dept %]</span> 部門より[% END %]
     </div>
-    <div class="toolbar">
+    <div class="toolbar" v-show="!editing">
       [%- IF story.content_type == 'journal' && story.uid == user.uid || x_template -%]
       <button type="button" class="btn btn-default btn-sm"
               area-label="編集" v-show="editable" v-on:click="editItem(item)">
         <span class="glyphicon glyphicon-pencil"></span>
       </button>
       [%- END -%]
+      [%- IF story.content_type == 'submission' && user.author || x_template -%]
+      [<a href="/admin/story/edit?subid=[% story.submission_id %]">accept</a>]
+      [%- END -%]
     </div>
   </header>
   <div class="body contents-text" v-html="item.introtext">[% story.introtext %]</div>

diff --git a/src/newslash_web/templates/common/article/editor.html.tt2 b/src/newslash_web/templates/common/article/editor.html.tt2
index fb48e77..8ac46be 100644 (file)
--- a/src/newslash_web/templates/common/article/editor.html.tt2
+++ b/src/newslash_web/templates/common/article/editor.html.tt2
@@ -9,7 +9,7 @@
 
     <div class="form-inline" v-if="item.content_type == 'story'">
       <p class="form-group">
-        <label for="post-createtime" >日時（GMT）：</label>
+        <label for="post-createtime" >日時（JST）：</label>
         <input id="post-createtime" type="datetime-local" class="form-control" name="createtime" v-model="item.createtime" placeholder="XXXX-XX-XX XX:XX:XX" value="[% date.format(date.now, "%FT%T") %]"/>
       </p>
       <p class="form-group">

diff --git a/src/newslash_web/templates/common/comment/comment.html.tt2 b/src/newslash_web/templates/common/comment/comment.html.tt2
index b230239..97c34ff 100644 (file)
--- a/src/newslash_web/templates/common/comment/comment.html.tt2
+++ b/src/newslash_web/templates/common/comment/comment.html.tt2
@@ -31,7 +31,7 @@
         <span v-text="comment.author">[% comment.author %]</span>
         [% END %]
       </span>
-      <span class="date">on <span v-text="comment.date">[% comment.date %]</span></span>
+      <span class="date">on <span v-text="comment.date_string">[% comment.date_string %]</span></span>
       <span class="cid">(#<span v-text="comment.cid">[% comment.cid %]</span>)</span>
       [%- IF user.is_admin -%]
       <span class="ipid"><span v-text="comment.ipid">[% comment.ipid %]</span></span>