template: remove deprecated templates

diff --git a/src/newslash_web/templates/common/deprecated/captcha/recaptcha.html.tt2 b/src/newslash_web/templates/common/deprecated/captcha/recaptcha.html.tt2
deleted file mode 100644 (file)
index d1021f1..0000000
--- a/src/newslash_web/templates/common/deprecated/captcha/recaptcha.html.tt2
+++ /dev/null
@@ -1,9 +0,0 @@
-[%- IF !config.ReCaptcha.disable && use_captcha && !user.is_login -%]
-<div class="g-recaptcha"
-     data-badge="inline"
-     data-sitekey="[% ReCaptcha.site_key %]"
-     data-callback="recaptchaDone"
-     data-size="invisible">
-</div>
-[%- END -%]
-

diff --git a/src/newslash_web/templates/common/timeline/item.html.tt2 b/src/newslash_web/templates/common/timeline/item.html.tt2
deleted file mode 100644 (file)
index a56f04f..0000000
--- a/src/newslash_web/templates/common/timeline/item.html.tt2
+++ /dev/null
@@ -1,58 +0,0 @@
-[%# this template is deprecated. use common/article/article ! %]
-[%-
-IF item.content_type == 'story'; content_id = item.sid; END;
-IF item.content_type == 'journal'; content_id = item.id; END;
-IF item.content_type == 'submission'; content_id = item.subid; END;
--%]
-<article type="[% item.content_type %]" item-id="[% content_id %]" [% IF !item.x_template %]v-if="0"[% END %]>
-  <header>
-    <h1>
-      [%- IF item.primary_topic.image.length || x_template -%]
-      <img [% IF item.primary_topic.image %]src="[% Site.topic_icon_base_url %]/[% item.primary_topic.image %]"[% END %]
-           :src="topicIconURL" v-if="topicIconURL" />
-      [%- END -%]
-      [%- IF item.content_type == 'story'; url = "/story/" _ item.sid _ "/"; END -%]
-      [%- IF item.content_type == 'journal'; url = "/journal/" _ item.id _ "/"; END -%]
-      [%- IF item.content_type == 'submission'; url = "/submission/" _ item.subid _ "/"; END -%]
-      [%- IF item.preview == 'yes' ; url = "#"; END -%]
-      <a href="[% url %]" v-html="item.title">[% item.title %]</a>
-    </h1>
-    <div class="property">
-      <span class="content-type">
-        [%- IF item.content_type == 'story' -%]ストーリー[%- END -%]
-        [%- IF item.content_type == 'journal' -%]日記[%- END -%]
-        [%- IF item.content_type == 'submission' -%]タレコミ[%- END -%]
-      </span>
-      by <span v-text="item.author">[% item.author %]</span>
-      <span v-text="item.time">[% item.time %]</span>
-      [% IF item.content_type == 'story' %]<span v-text="item.dept">[% item.dept %]</span> 部門より[% END %]
-    </div>
-    <div class="toolbar">
-      [%- IF item.content_type == 'journal' && item.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" aria-hidden="true"></span>
-      </button>
-      [%- END -%]
-    </div>
-  </header>
-  <div class="body contents-text" v-html="item.introtext">[% item.introtext %]</div>
-  [% IF item.bodytext %]<div>read more</div>[% END %]
-  <footer>
-    <div class="comment-counter">
-      <a href="#comments"><span class="counter" v-text="item.commentcount">[% item.commentcount %]</span>コメント</a>
-    </div>
-    <div class="tag-bar">
-      <ul class="tags">
-       [%- FOREACH topic IN item.topics -%]
-       <li>[% topic.textname %]</li>
-       [%- END -%]
-      </ul>
-      <ul class="user-tags">
-       [%- FOREACH tag IN item.user_tags -%]
-       <li>[% tag.textname %]</li>
-       [%- END -%]
-      </ul>
-    </div>
-  </footer>
-</article>

diff --git a/src/newslash_web/templates/user/home.html.tt2 b/src/newslash_web/templates/user/home.html.tt2
index 82288a8..8192d3b 100644 (file)
--- a/src/newslash_web/templates/user/home.html.tt2
+++ b/src/newslash_web/templates/user/home.html.tt2
@@ -27,7 +27,7 @@
 
   <div class="index main-contents">
     [%- FOREACH item IN items -%]
-    [%- INCLUDE common/timeline/item %]
+    [%- INCLUDE common/article/article %]
     [%- END -%]
   </div><!-- .index -->
 </div>