Sotaro KARASAWA 10 лет назад
Родитель
Сommit
b3a7cf314a
3 измененных файлов с 18 добавлено и 8 удалено
  1. 12 5
      lib/views/page_list.html
  2. 2 3
      resource/css/_form.scss
  3. 4 0
      resource/css/_portal.scss

+ 12 - 5
lib/views/page_list.html

@@ -23,7 +23,7 @@
 {% endblock %}
 
 <div class="page-list content-main {% if req.body.pageForm %}on-edit{% endif %}"
-  data-page-portal="{% if page %}{{ page.isPortal() }}1{% else %}0{% endif %}"
+  data-page-portal="{% if page and page.isPortal() %}1{% else %}0{% endif %}"
   data-page-id="{% if page %}{{ page._id.toString() }}{% endif %}"
   data-current-user="{% if user %}{{ user._id.toString() }}{% endif %}"
   data-page-revision-id="{% if revision %}{{ revision._id.toString() }}{% endif %}"
@@ -32,10 +32,18 @@
 
 <div class="portal">
 {% if page %}
-  <div class="">
-    {{ page.revision.body }}
+  <div class="wiki" id="revision-body-content">
   </div>
-{% else %}
+  <script type="text/template" id="raw-text-original">{{ page.revision.body }}</script>
+  <script type="text/javascript">
+    $(function(){
+        var renderer = new Crowi.renderer($('#raw-text-original').html());
+        renderer.render();
+        Crowi.correctHeaders('#revision-body-content');
+    });
+  </script>
+{% endif %}
+
   <div class="portal-form-header">
     Create Portal: <strong>{{ path }}</strong>
     <p class="pull-right ">
@@ -47,7 +55,6 @@
       {% include '_form.html' %}
     </div>
   </div>
-{% endif %}
 </div>
 
 <ul class="nav nav-tabs">

+ 2 - 3
resource/css/_form.scss

@@ -104,9 +104,8 @@
   }
 }
 .crowi.main-container .main .page-list.content-main.on-edit { // {{{ Edit Form of Page List
-  .nav {
-    display: none;
-  }
+  .wiki,
+  .nav,
   .tab-content {
     display: none;
   }

+ 4 - 0
resource/css/_portal.scss

@@ -1,7 +1,11 @@
 .portal {
+  margin-bottom: 16px;
+  padding-bottom: 16px;
+
   .portal-form {
 
   }
+
 } // .portal
 
 .portal-side {