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

Merge pull request #85 from crowi/revert-80-feature-add-revision-toc-to-portal

Revert "Add revision TOC to PORTAL page"
Norio Suzuki 9 лет назад
Родитель
Сommit
3e4d08e61e
3 измененных файлов с 6 добавлено и 8 удалено
  1. 0 3
      lib/views/_revision_toc.html
  2. 5 1
      lib/views/page.html
  3. 1 4
      lib/views/page_list.html

+ 0 - 3
lib/views/_revision_toc.html

@@ -1,3 +0,0 @@
-<div class="revision-toc" id="revision-toc">
-  <a data-toggle="collapse" data-parent="#revision-toc" href="#revision-toc-content" class="revision-toc-head collapsed">目次</a>
-</div>

+ 5 - 1
lib/views/page.html

@@ -109,7 +109,11 @@
 
     {# formatted text #}
     <div class="tab-pane {% if not req.body.pageForm %}active{% endif %}" id="revision-body">
-      {% include '_revision_toc.html' %}
+      <div class="revision-toc" id="revision-toc">
+        <a data-toggle="collapse" data-parent="#revision-toc" href="#revision-toc-content" class="revision-toc-head collapsed">目次</a>
+
+      </div>
+      <div class="wiki {{ revision.format }}" id="revision-body-content"></div>
     </div>
 
     {# edit form #}

+ 1 - 4
lib/views/page_list.html

@@ -67,10 +67,7 @@
   </ul>
 
   <div class="tab-content">
-    <div class="wiki tab-pane {% if not req.body.pageForm %}active{% endif %}">
-      {% include '_revision_toc.html' %}
-      <div id="revision-body-content">{{ page.revision.body|nl2br|safe }}</div>
-    </div>
+    <div class="wiki tab-pane {% if not req.body.pageForm %}active{% endif %}" id="revision-body-content">{{ page.revision.body|nl2br|safe }}</div>
 
     <script type="text/template" id="raw-text-original">{{ page.revision.body }}</script>
     <script type="text/javascript">