Halaman utama Jelajahi Bantuan
Masuk
wiki
/
weseek__growi
cermin dari https://github.com/weseek/growi
2
0
Fork 0
Berkas Masalah 0 Wiki
Jelajahi Sumber

Merge pull request #5917 from weseek/fix/issue-5754-integrate

fix: Search result screen is broken under content 100% setting
Yuki Takei 3 tahun lalu
induk
992debc5b3 431ad5ee57
melakukan
0c01c73d09
4 mengubah file dengan 17 tambahan dan 6 penghapusan
Tampilan Split Tampilkan Statistik Diff
  1. 7 2
      packages/app/src/server/util/middlewares.js
  2. 4 2
      packages/app/src/server/views/layout/layout.html
  3. 3 1
      packages/app/src/server/views/private-legacy-pages.html
  4. 3 1
      packages/app/src/server/views/search.html

+ 7 - 2
packages/app/src/server/util/middlewares.js
Tampilan Berkas 

@@ -4,10 +4,10 @@ import loggerFactory from '~/utils/logger';
 
 // all new middlewares should be an independent file under /server/middlewares
 
 // eslint-disable-next-line no-unused-vars
 
 
-const { formatDistanceStrict } = require('date-fns');
 
 const { pathUtils } = require('@growi/core');
 
-const md5 = require('md5');
 
+const { formatDistanceStrict } = require('date-fns');
 
 const entities = require('entities');
 
+const md5 = require('md5');
 
 
 // eslint-disable-next-line no-unused-vars
 
 const logger = loggerFactory('growi:lib:middlewares');
 
@@ -153,6 +153,11 @@ module.exports = (crowi) => {
 
         return list.slice(start, end);
 
       });
 
 
+      swig.setFilter('push', (list, element) => {
 
+        list.push(element);
 
+        return list;
 
+      });
 
+
 
       next();
 
     };
 
   };

+ 4 - 2
packages/app/src/server/views/layout/layout.html
Tampilan Berkas 

@@ -59,11 +59,13 @@
 
 {% endblock %}
 
 
 {% block html_body %}
 
+{% set additionalBodyClasses = []; %}
 
+{% block html_additional_body_classes %}{% endblock %}
 
 {% if getConfig('crowi', 'customize:isContainerFluid') %}
 
-  {% set additionalBodyClass = 'growi-layout-fluid' %}
 
+  {% set additionalBodyClasses = additionalBodyClasses|push('growi-layout-fluid') %}
 
 {% endif %}
 
 <body
 
-  class="{% block html_base_css %}{% endblock %} growi {{ additionalBodyClass }}"
 
+  class="{% block html_base_css %}{% endblock %} growi {{ additionalBodyClasses|join(' ') }}"
 
   data-plugin-enabled="{{ getConfig('crowi', 'plugin:isEnabledPlugins') }}"
 
   {% block html_base_attr %}{% endblock %}
 
   data-csrftoken="{{ csrf() }}"

+ 3 - 1
packages/app/src/server/views/private-legacy-pages.html
Tampilan Berkas 

@@ -12,7 +12,9 @@
 
 {% endblock %}
 
 
 <!-- add .on-search to body tag class in layout -->
 
-{% set additionalBodyClass = 'on-search' %}
 
+{% block html_additional_body_classes %}
 
+  {% set additionalBodyClasses = additionalBodyClasses|push('on-search') %}
 
+{% endblock %}
 
 
 {% block layout_main %}
 
 <div id="grw-fav-sticky-trigger" class="sticky-top"></div>

+ 3 - 1
packages/app/src/server/views/search.html
Tampilan Berkas 

@@ -12,7 +12,9 @@
 
 {% endblock %}
 
 
 <!-- add .on-search to body tag class in layout -->
 
-{% set additionalBodyClass = 'on-search' %}
 
+{% block html_additional_body_classes %}
 
+  {% set additionalBodyClasses = additionalBodyClasses|push('on-search') %}
 
+{% endblock %}
 
 
 {% block layout_main %}
 
 <div id="grw-fav-sticky-trigger" class="sticky-top"></div>