Просмотр исходного кода

Merge pull request #609 from weseek/imprv/GC-937-add-presentation-separator

Imprv/gc 937 add presentation separator
Yuki Takei 7 лет назад
Родитель
Сommit
b96f9194a4

+ 1 - 0
resource/locales/en-US/translation.json

@@ -431,6 +431,7 @@
     "Preset one separator desc": "Blank line 3 lines",
     "Preset two separator": "Preset 2",
     "Preset two separator desc": "Markdown horizontal rule",
+    "Preset two separator value": "-----",
     "Custom separator": "Custom",
     "Custom separator desc": "Any character",
     "XSS_setting": "Prevent XSS(Cross Site Scripting) Setting",

+ 1 - 0
resource/locales/ja/translation.json

@@ -448,6 +448,7 @@
     "Preset one separator desc": "空行を3行で改頁します",
     "Preset two separator": "プリセット 2",
     "Preset two separator desc": "Markdown の区切り線で改頁します",
+    "Preset two separator value": "-----",
     "Custom separator": "カスタム",
     "Custom separator desc": "任意の文字で改頁します",
     "XSS_setting": "XSS(Cross Site Scripting)対策設定",

+ 1 - 0
src/server/views/admin/markdown.html

@@ -117,6 +117,7 @@
                 <p class="font-weight-bold">{{ t('markdown_setting.Preset two separator') }}</p>
                 <div class="m-t-15">
                     {{ t('markdown_setting.Preset two separator desc') }}
+                    <input class="form-control" type="text" name="presetTwoSeparator" value="{{ t('markdown_setting.Preset two separator value') }}" readonly>
                 </div>
               </label>
           </div>

+ 15 - 5
src/server/views/page_presentation.html

@@ -58,15 +58,25 @@ gh/highlightjs/cdn-release@9.12.0/build/languages/yaml.min.js
   <body>
     <div class="reveal">
       <div class="slides">
-        <section data-markdown data-separator="^\n\n\n">
-          <script type="text/template">
-{{ revision.body|presentation|safe }}
-
+        {% set pageBreakSeparator = pageBreakSeparator()|default(1) %}
+        {% set pageBreakCustomSeparator = pageBreakCustomSeparator()|default('') %}
 
+        {% if 1 === pageBreakSeparator %}
+          {% set dataSeparator = "^\n\n\n" %}
+        {% elseif 2 === pageBreakSeparator %}
+          {% set dataSeparator = "^-----$" %}
+        {% elseif 3 === pageBreakSeparator %}
+          {% set dataSeparator = "^" + pageBreakCustomSeparator + "$" %}
+        {% else %}
+          {% set dataSeparator = "^\n\n\n" %}
+        {% endif %}
 
-# おしまい
+        <section data-markdown data-separator={{dataSeparator}}>
+          <script type="text/template">
+{{ revision.body|presentation|safe }}
           </script>
         </section>
+        <section  data-markdown># おしまい</section>
       </div>
     </div>