Răsfoiți Sursa

add SearchTop for mobile

Yuki Takei 5 ani în urmă
părinte
comite
dc18a57d4f
2 a modificat fișierele cu 18 adăugiri și 7 ștergeri
  1. 1 0
      src/client/js/bootstrap.jsx
  2. 17 7
      src/server/views/layout/layout.html

+ 1 - 0
src/client/js/bootstrap.jsx

@@ -43,6 +43,7 @@ const componentMappings = {
   'grw-navbar-toggler': <NavbarToggler />,
   'grw-navbar-toggler': <NavbarToggler />,
 
 
   'grw-search-top': <SearchTop />,
   'grw-search-top': <SearchTop />,
+  'grw-search-top-for-mobile': <SearchTop />,
   'personal-dropdown': <PersonalDropdown />,
   'personal-dropdown': <PersonalDropdown />,
 
 
   'create-page-button': <PageCreateButton />,
   'create-page-button': <PageCreateButton />,

+ 17 - 7
src/server/views/layout/layout.html

@@ -87,13 +87,13 @@
     </div>
     </div>
 
 
     {# Search #}
     {# Search #}
+    {% if isSearchServiceConfigured() %}
     <ul class="navbar-nav grw-navbar-search d-none d-md-block">
     <ul class="navbar-nav grw-navbar-search d-none d-md-block">
       <li>
       <li>
-        {% if isSearchServiceConfigured() %}
-        <div class="search-top" role="search" id="search-top"></div>
-        {% endif %}
+        <div id="grw-search-top" class="search-top" role="search"></div>
       </li>
       </li>
     </ul>
     </ul>
+    {% endif %}
 
 
     {# Navbar Right #}
     {# Navbar Right #}
     <ul class="navbar-nav ml-auto">
     <ul class="navbar-nav ml-auto">
@@ -105,6 +105,11 @@
           <span>{{ t('New') }}</span>
           <span>{{ t('New') }}</span>
         </a>
         </a>
       </li>
       </li>
+      <li class="nav-item d-md-none">
+        <a type="button" class="nav-link px-4" data-target="#grw-search-top-collapse" data-toggle="collapse">
+          <i class="icon-magnifier mr-2"></i>
+        </a>
+      </li>
       <li id="personal-dropdown" class="nav-item dropdown dropdown-toggle"></li>
       <li id="personal-dropdown" class="nav-item dropdown dropdown-toggle"></li>
       {% else %}
       {% else %}
       <li id="login-user" class="nav-item"><a class="nav-link" href="/login">Login</a></li>
       <li id="login-user" class="nav-item"><a class="nav-link" href="/login">Login</a></li>
@@ -115,19 +120,24 @@
     </ul>
     </ul>
 
 
   </nav>
   </nav>
+
   {% include '../modal/create_page.html' %}
   {% include '../modal/create_page.html' %}
   {% endblock  %} {# layout_head_nav #}
   {% endblock  %} {# layout_head_nav #}
 
 
   {% block head_warn_breaking_changes %}{% include '../widget/alert_breaking_changes.html' %}{% endblock %}
   {% block head_warn_breaking_changes %}{% include '../widget/alert_breaking_changes.html' %}{% endblock %}
 
 
-  <div class="d-flex">
+  <div id="page-wrapper" class="page-wrapper d-flex">
     {# Sidebar #}
     {# Sidebar #}
     <div id="grw-sidebar-wrapper"></div>
     <div id="grw-sidebar-wrapper"></div>
 
 
-    <div id="page-wrapper" class="flex-grow-1">
+    <div class="flex-grow-1">
       {% block head_warn_alert_siteurl_undefined %}{% include '../widget/alert_siteurl_undefined.html' %}{% endblock %}
       {% block head_warn_alert_siteurl_undefined %}{% include '../widget/alert_siteurl_undefined.html' %}{% endblock %}
-      {% block layout_main %}
-      {% endblock %} {# layout_main #}
+
+      <div id="grw-search-top-collapse" class="collapse d-md-none p-3">
+        <div id="grw-search-top-for-mobile" class="search-top" role="search"></div>
+      </div>
+
+      {% block layout_main %}{% endblock %}
     </div>
     </div>
   </div>
   </div>