now supporting url only submission

[newslash/newslash.git] / src / newslash_web / templates / submission / submission.html.tt2

diff --git a/src/newslash_web/templates/submission/submission.html.tt2 b/src/newslash_web/templates/submission/submission.html.tt2
index 23ecdb9..2524c19 100644 (file)
--- a/src/newslash_web/templates/submission/submission.html.tt2
+++ b/src/newslash_web/templates/submission/submission.html.tt2
@@ -1,15 +1,44 @@
-[% WRAPPER common/layout enable_sidebar=1 %]
-[% INCLUDE common/vars use={submission = ["submission_id"]} %]
+[% WRAPPER common/layout enable_sidebar=1 short_header=1 %]
+
+[% INCLUDE common/components/comment_tree %]
+[% IF user.editor || user.is_admin -%]
+[% INCLUDE common/components/article_item %]
+[% END -%]
 
 <div class="main-column">
-  <div class="submission main-contents">
-    [%- INCLUDE common/article/article story=submission hide_more_link = 1 %]
-    [%- INCLUDE common/captcha/recaptcha -%]
- </div><!-- .story -->
+  <div class="story main-contents">
+    <div id="story">
+      [%- INCLUDE common/article/article story=submission hide_more_link=1 -%]
+      <article-item></article-item>
+    </div>
+    <div class="next-prev-story">
+      [%- IF params.prev_stoid && params.prev_stoid.story -%]
+      <div class="prev"><a href="/story/[% params.prev_stoid.story.sid %]">
+          ≪ [% params.prev_stoid.story.title %]
+      </a></div>
+      [%- END -%]
+      [%- IF params.next_stoid && params.next_stoid.story -%]
+      <div class="next"><a href="/story/[% params.next_stoid.story.sid %]">
+          [% params.next_stoid.story.title %] ≫
+      </a></div>
+      [%- END -%]
+    </div>
+
+  </div><!-- .story -->
+</div><!-- .main-column -->
 
-  [%- INCLUDE common/comment/comments -%]
+[%- INCLUDE common/sidebar mode="story" -%]
+
+[%#- INCLUDE common/comment/comments_nojs -%]
+[%#- INCLUDE common/comment/comments -%]
+<div id="comments">
+  <comment-tree></comment-tree>
 </div>
+<script>commentTree.run({el:'#comments'});</script>
 
-[%- INCLUDE common/sidebar -%]
+[%- IF user.editor || user.is_admin -%]
+<script>articleItem.addTrigger('#activate-editor', {el: '#story'});</script>
+[%- END -%]
 
 [% END %]
+