fix journal/submission create page's layout

diff --git a/src/newslash_web/css/newslash/editor.less b/src/newslash_web/css/newslash/editor.less
index 786efe4..9ce252e 100644 (file)
--- a/src/newslash_web/css/newslash/editor.less
+++ b/src/newslash_web/css/newslash/editor.less
@@ -1,5 +1,29 @@
 /* editor.less */
 
+.editor {
+    &:extend(.bordered-box);
+    margin-bottom: 12px;
+    
+    h1 {
+        &:extend(.rectangle-header);
+        &:extend(.large-text);
+    }
+
+    h2 {
+        &:extend(.rectangle-header);
+        clear: left;
+    }
+
+    h3 {
+        &:extend(.rectangle-header);
+        clear: left;
+    }
+
+    .content-editor-wrap {
+       margin-right: @component-horizontal-margin + 2px;
+    }
+}
+
 textarea.editor { &:extend(.tallest); }
 
 .tag-editor {

diff --git a/src/newslash_web/lib/Newslash/Web.pm b/src/newslash_web/lib/Newslash/Web.pm
index 0c61edd..02d9538 100644 (file)
--- a/src/newslash_web/lib/Newslash/Web.pm
+++ b/src/newslash_web/lib/Newslash/Web.pm
@@ -274,7 +274,7 @@ sub startup {
 
     # journal page
     # also see user page settings for /~username/journal/
-    $r->get('/journal/new')->to('journal#create', seclev => 1, no_ad => 1);
+    $r->get('/journal/new')->to('journal#create', seclev => 1, no_ad => 1, use_captcha => 1);
     $r->get('/journal/:id/')->to('journal#single');
 
     # submission page

diff --git a/src/newslash_web/lib/Newslash/Web/Controller/Journal.pm b/src/newslash_web/lib/Newslash/Web/Controller/Journal.pm
index d5e2510..87afd9c 100644 (file)
--- a/src/newslash_web/lib/Newslash/Web/Controller/Journal.pm
+++ b/src/newslash_web/lib/Newslash/Web/Controller/Journal.pm
@@ -64,7 +64,7 @@ sub create {
                };
 
     $c->render(page => $page,
-              use_captcha => 1,
+              the_user => $c->stash('user'),
        );
 }
 

diff --git a/src/newslash_web/templates/journal/create.html.tt2 b/src/newslash_web/templates/journal/create.html.tt2
index fa24393..ab58275 100644 (file)
--- a/src/newslash_web/templates/journal/create.html.tt2
+++ b/src/newslash_web/templates/journal/create.html.tt2
@@ -2,7 +2,7 @@
 
 <div class="article-wrapper">
   <div class="content-wrapper">
-    <div class="post submission main-contents" id="journal-editor">
+    <div class="post submission main-contents editor" id="journal-editor">
       <h2>日記の編集</h2>
       <div id="post-preview">
        [%- INCLUDE common/article/article hide_more_link=1 -%]

diff --git a/src/newslash_web/templates/submission/create.html.tt2 b/src/newslash_web/templates/submission/create.html.tt2
index b69f404..900e34f 100644 (file)
--- a/src/newslash_web/templates/submission/create.html.tt2
+++ b/src/newslash_web/templates/submission/create.html.tt2
@@ -3,7 +3,7 @@
 <div class="article-wrapper">
   <div class="content-wrapper">
     <div class="main-column">
-      <div class="post submission main-contents" id="submission-editor">
+      <div class="post submission main-contents editor" id="submission-editor">
         <h2>タレコミの編集</h2>
         <div id="post-preview">
           <article-editor csrf-token="[% helpers.csrf_token('submission') %]" content-type="submission"></article-editor>