template: fix for updated ReCaptcha plugin

diff --git a/src/newslash_web/templates/common/article/editor.html.tt2 b/src/newslash_web/templates/common/article/editor.html.tt2
index c99ef6e..16b8529 100644 (file)
--- a/src/newslash_web/templates/common/article/editor.html.tt2
+++ b/src/newslash_web/templates/common/article/editor.html.tt2
@@ -1,9 +1,9 @@
 <div class="journal-editor">
+  <div class="alert alert-info post-done" v-if="mode == 'posted'">
+    投稿を行いました。URL:<A :href="createdUrl" v-text="createdUrl"></a>
+  </div>
   <div class="alert alert-info" v-show="message">
-    <div v-if="createdUrl">
-      投稿を行いました。URL:<A :href="createdUrl" v-text="createdUrl"></a>
-    </div>
-    <div v-else-if="message == 'duplicated_post'">エラー：すでに同じ内容が投稿されています</div>
+    <div v-if="message == 'duplicated_post'">エラー：すでに同じ内容が投稿されています</div>
     <div v-else-if="message == 'server_error'">サーバーエラー：投稿に失敗しました</div>
     <div v-else-if="message == 'no_title'">エラー：タイトルがありません</div>
     <div v-else-if="message == 'no_content'">エラー：本文かURLを指定してください</div>

diff --git a/src/newslash_web/templates/common/comment/comment_form.html.tt2 b/src/newslash_web/templates/common/comment/comment_form.html.tt2
index c47345f..8d91295 100644 (file)
--- a/src/newslash_web/templates/common/comment/comment_form.html.tt2
+++ b/src/newslash_web/templates/common/comment/comment_form.html.tt2
@@ -22,4 +22,4 @@
   </div>
 </form>
 
-[%- INCLUDE common/captcha/recaptcha -%]
+[% helpers.insert_recaptcha %]

diff --git a/src/newslash_web/templates/common/footer.html.tt2 b/src/newslash_web/templates/common/footer.html.tt2
index 23e71e1..4d3e72c 100644 (file)
--- a/src/newslash_web/templates/common/footer.html.tt2
+++ b/src/newslash_web/templates/common/footer.html.tt2
@@ -1,6 +1,4 @@
-[%- IF use_captcha && !user.is_login %]
-<script src="https://www.google.com/recaptcha/api.js"></script>
-[%- END %]
+[%- helpers.declare("begin_footer") %]
 <section class="motd">
   <blockquote cite="https://srad.jp">
     <p>&#147;[% INCLUDE common/motd %]&#148;</p>

diff --git a/src/newslash_web/templates/submission/create.html.tt2 b/src/newslash_web/templates/submission/create.html.tt2
index b37b2e4..2f993e2 100644 (file)
--- a/src/newslash_web/templates/submission/create.html.tt2
+++ b/src/newslash_web/templates/submission/create.html.tt2
@@ -1,7 +1,6 @@
-[% WRAPPER common/layout enable_sidebar=1 %]
+[% WRAPPER common/layout %]
 [% INCLUDE common/components/article_item type="submission" %]
 
-[%- USE date -%]
 <div class="main-column">
   <div class="post submission main-contents" id="submission-editor">
     <h2>タレコミの編集</h2>
@@ -9,12 +8,11 @@
       <article-item :item="item" :show-editor="true" csrf-token="[% helpers.csrf_token('submission') %]"></article-item>
     </div>
   </div>
-[%- INCLUDE common/captcha/recaptcha -%]
+  [% helpers.insert_recaptcha %]
 </div>
 [%- INCLUDE common/sidebar -%]
 
 [% helpers.load_js("editor.js") %]
-[%# <script src="/js/editor.js" ></script> %]
 <script>
   editor.run({ type: 'submission', el: '#submission-editor' });
 </script>