itizawa 5 лет назад
Родитель
Сommit
fe8b35ddd7
2 измененных файлов с 9 добавлено и 7 удалено
  1. 1 1
      src/server/routes/page.js
  2. 8 6
      src/server/views/layout/layout.html

+ 1 - 1
src/server/routes/page.js

@@ -445,7 +445,7 @@ module.exports = function(crowi, app) {
 
     const layoutName = configManager.getConfig('crowi', 'customize:layout');
     // TODO Consider the layout for share
-    const view = `layout-${layoutName}/page`;
+    const view = `layout-${layoutName}/shared_page`;
 
     const shareLink = await ShareLink.find({ _id: linkId }).populate('Page');
     const page = shareLink.relatedPage;

+ 8 - 6
src/server/views/layout/layout.html

@@ -115,16 +115,18 @@
   {% block head_warn_breaking_changes %}{% include '../widget/alert_breaking_changes.html' %}{% endblock %}
 
   <div id="page-wrapper" class="page-wrapper d-flex">
-    {# Sidebar #}
-    <div id="grw-sidebar-wrapper"></div>
+    {% block sidebar %}
+      <div id="grw-sidebar-wrapper"></div>
+    {% endblock %}
 
     <div class="flex-fill mw-0">
       {% block head_warn_alert_siteurl_undefined %}{% include '../widget/alert_siteurl_undefined.html' %}{% endblock %}
 
-      {# Search #}
-      {% if isSearchServiceConfigured() %}
-        <div id="grw-search-top" class="search-top" role="search"></div>
-      {% endif %}
+      {% block search %}
+        {% if isSearchServiceConfigured() %}
+          <div id="grw-search-top" class="search-top" role="search"></div>
+        {% endif %}
+      {% endblock %}
 
       {% block layout_main %}{% endblock %}
     </div>