reorganized form

lib/locales/en-US/translation.json

@@ -376,7 +376,8 @@
 	},
 
   "markdown_setting": {
-    "markdown_rendering": "You can change Markdown rendering settings.",
+    "line_break_setting": "Line Break Setting",
+    "line_break_setting_desc": "You can change line break settings.",
     "Enable Line Break": "Enable Line Break",
     "Enable Line Break desc": "Treat line break in the text page as <code>&lt;br&gt;</code> in HTML",
     "Enable Line Break for comment": "Enable Line Break in comment",

lib/locales/ja/translation.json

@@ -391,13 +391,16 @@
     }
   },
   "markdown_setting": {
-    "markdown_rendering": "Markdownレンダリングの設定を変更できます。",
+    "line_break_setting": "Line Break設定",
+    "line_break_setting_desc": "Line Breakの設定を変更できます。",
     "Enable Line Break": "Line Break を有効にする",
     "Enable Line Break desc": "ページテキスト中の改行を、HTML内で<code>&lt;br&gt;</code>として扱います",
     "Enable Line Break for comment": "コメント欄で Line Break を有効にする",
     "Enable Line Break for comment desc": "コメント中の改行を、HTML内で<code>&lt;br&gt;</code>として扱います",
+    "XSS_setting": "XSS防止設定",
+    "XSS_setting_desc": "クロスサイトスクリプティング(XSS)防止設定を変更できます。",
     "TBD": "(TBD: コメント欄の Markdown 化は未だ実装されていません)",
-    "Prevent XSS(Cross Site Scripting)": "クロスサイトスクリプティング(XSS)をブロックする",
+    "Prevent XSS(Cross Site Scripting)": "マークダウンテキスト内のHTMLタグを有効にする",
     "Prevent XSS(Cross Site Scripting)desc": "悪意のあるプログラムからの攻撃を防ぎます",
     "Prevent XSS(Cross Site Scripting)desc2": "無効にすることで、<code>&lt;iframe&gt;</code>等の一部ソースの表示を可能にします",
     "Strip ignore tag": "ホワイトリストに入っていないタグを出力しない",

lib/views/admin/markdown.html

@@ -39,8 +39,8 @@
 
       <form action="/admin/markdown/lineBreaksSetting" method="post" class="form-horizontal" id="markdownSettingForm" role="form">
       <fieldset>
-        <legend>{{ t('Markdown settings') }}</legend>
-        <p class="well">{{ t("markdown_setting.markdown_rendering") }}</p>
+        <legend>{{ t('markdown_setting.line_break_setting') }}</legend>
+        <p class="well">{{ t("markdown_setting.line_break_setting_desc") }}</p>
 
         <div class="form-group">
           <label for="markdownSetting[markdown:isEnabledLinebreaks]" class="col-xs-4 control-label">
@@ -57,8 +57,7 @@
                     {% if !markdownSetting['markdown:isEnabledLinebreaks'] %}checked{% endif %}> OFF
               </label>
             </div>
-            <p class="help-block">{{ t("markdown_setting.Enable Line Break desc") }}
-</p>
+            <p class="help-block">{{ t("markdown_setting.Enable Line Break desc") }}</p>
           </div>
         </div>
 
@@ -82,36 +81,45 @@
         </div>
 
         <div class="form-group">
-            <label for="markdownSetting[markdown:isPreventXss]" class="col-xs-4 control-label">
-              {{ t('markdown_setting.Prevent XSS(Cross Site Scripting)') }}
-            </label>
-            <div class="col-xs-5">
-                <div class="btn-group btn-toggle" data-toggle="buttons">
-                    <label class="btn btn-default btn-rounded btn-outline {% if markdownSetting['markdown:isEnabledPreventXss'] %}active{% endif %}" data-active-class="primary">
-                      <input name="markdownSetting[markdown:isEnabledPreventXss]" value="true" type="radio"
-                          {% if true === markdownSetting['markdown:isEnabledPreventXss'] %}checked{% endif %}> ON
-                    </label>
-                    <label class="btn btn-default btn-rounded btn-outline {% if !markdownSetting['markdown:isEnabledPreventXss'] %}active{% endif %}" data-active-class="default">
-                      <input name="markdownSetting[markdown:isEnabledPreventXss]" value="false" type="radio"
-                          {% if !markdownSetting['markdown:isEnabledPreventXss'] %}checked{% endif %}> OFF
-                    </label>
-                  </div>
-              <div>
-                <div class="input">
-                  <form>
-                    <input type="radio" name="preventXSS" value="stripignoretag" checked>
-                      {{ t('markdown_setting.Strip ignore tag') }}<br>
-                    <input type="radio" name="preventXSS" value="WLtagnames">
-                      {{ t('markdown_setting.White list tag names') }}<br>
-                    <input type="radio" name="preventXSS" value="WLtagattribute">
-                      {{ t('markdown_setting.White list tag attributes') }}
-                  </form>
-                </div>
-              </div>
-              <p class="help-block">{{ t("markdown_setting.Prevent XSS(Cross Site Scripting)desc") }}<br>{{ t("markdown_setting.Prevent XSS(Cross Site Scripting)desc2") }}</p>
-              </div>
+          <div class="col-xs-offset-4 col-xs-5">
+            <input type="hidden" name="_csrf" value="{{ csrf() }}">
+            <button type="submit" class="btn btn-primary">{{ t("Update") }}</button>
+          </div>
+        </div>
 
+      </fieldset>
+      </form>
 
+      <form action="/admin/markdown/XSSSetting" method="post" class="form-horizontal" id="markdownSettingForm" role="form">
+      <fieldset>
+        <legend>{{ t('markdown_setting.XSS_setting') }}</legend>
+        <p class="well">{{ t("markdown_setting.XSS_setting_desc") }}</p>
+        <div class="form-group">
+          <label for="markdownSetting[markdown:isPreventXss]" class="col-xs-4 control-label">
+            {{ t('markdown_setting.Prevent XSS(Cross Site Scripting)') }}
+          </label>
+          <div class="col-xs-5">
+            <div class="btn-group btn-toggle" data-toggle="buttons">
+              <label class="btn btn-default btn-rounded btn-outline {% if markdownSetting['markdown:isEnabledPreventXss'] %}active{% endif %}" data-active-class="primary">
+                <input name="markdownSetting[markdown:isEnabledPreventXss]" value="true" type="radio"
+                    {% if true === markdownSetting['markdown:isEnabledPreventXss'] %}checked{% endif %}> ON
+              </label>
+              <label class="btn btn-default btn-rounded btn-outline {% if !markdownSetting['markdown:isEnabledPreventXss'] %}active{% endif %}" data-active-class="default">
+                <input name="markdownSetting[markdown:isEnabledPreventXss]" value="false" type="radio"
+                    {% if !markdownSetting['markdown:isEnabledPreventXss'] %}checked{% endif %}> OFF
+              </label>
+            </div>
+            <div class="input">
+              <input type="radio" name="preventXSS" value="stripignoretag" checked>
+                {{ t('markdown_setting.Strip ignore tag') }}<br>
+              <input type="radio" name="preventXSS" value="WLtagnames">
+                {{ t('markdown_setting.White list tag names') }}<br>
+              <input type="radio" name="preventXSS" value="WLtagattribute">
+                {{ t('markdown_setting.White list tag attributes') }}
+            </div>
+            <p class="help-block">{{ t("markdown_setting.Prevent XSS(Cross Site Scripting)desc") }}<br>{{ t("markdown_setting.Prevent XSS(Cross Site Scripting)desc2") }}</p>
+          </div>
+        </div>
 
         <div class="form-group">
           <div class="col-xs-offset-4 col-xs-5">
@@ -119,9 +127,14 @@
             <button type="submit" class="btn btn-primary">{{ t("Update") }}</button>
           </div>
         </div>
+
       </fieldset>
       </form>
 
+
+
+
+
     </div>
   </div>