Merge pull request #139 from TYPO3-Documentation/bugfix-layout

BUGFIX layout.html
TYPO3-Documentation · Jul 21, 2021 · c71b839 · c71b839
2 parents 7d45824 + f4fdc32
commit c71b839
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 38 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -2,6 +2,12 @@
 History
 =======
 
+4.6.1 (2021-07-21)
+==================
+
+*  [BUGFIX] Fix broken layout.html
+*  Add theme variable global_search_action
+
 
 4.6.0 (2021-07-19)
 ==================

diff --git a/sphinx_typo3_theme/layout.html b/sphinx_typo3_theme/layout.html
@@ -110,51 +110,52 @@
 
         <div class="page-header">
             <div class="page-header-inner">
-<!-- pageheader -->
+<!--block pageheader-->
 {%- block pageheader %}
-{%- if logo and logo != 'None' %}
+<div class="row">
+    <div class="col-sm-6 col-lg-7">
+        {%- if logo and logo != 'None' %}
 
-<div class="logo">
-{%- if logo_url %}
-<a href="{{ logo_url }}" {% if logo_title %}title="{{ logo_title|e }}" {% endif %}>
-
-{%- endif %}
-    <img src="{{ pathto('_static/' + logo, 1) }}"
-         {%- if logo_width %} width="{{ logo_width|e }}"{% endif %}
-         {%- if logo_height %} height="{{ logo_height|e }}"{% endif %}
-         {%- if logo_alt %} alt="{{ logo_alt|e }}"{% endif %}
-         {%- if logo_title and not logo_url %} title="{{ logo_title|e }}"{% endif %}
-         {%- if 1 %} class="logo-image" />{% endif %}
+        <div class="logo">
+        {%- if logo_url %}
+        <a href="{{ logo_url }}" {% if logo_title %}title="{{ logo_title|e }}" {% endif %}>
+        {%- endif %}
 
-{%- if logo_url %}
-</a>
+            <img src="{{ pathto('_static/' + logo, 1) }}"
+                 {%- if logo_width %} width="{{ logo_width|e }}"{% endif %}
+                 {%- if logo_height %} height="{{ logo_height|e }}"{% endif %}
+                 {%- if logo_alt %} alt="{{ logo_alt|e }}"{% endif %}
+                 {%- if logo_title and not logo_url %} title="{{ logo_title|e }}"{% endif %}
+                 {%- if 1 %} class="logo-image" />{% endif %}
 
-{%- endif %}
-</div>
+        {%- if logo_url %}
+        </a>
+        {%- endif %}
+        </div>
 
-{%- endif %}
-</div>
-<div class="col-sm-6 col-lg-5">
-<div role="search">
-    {%- if theme_docstypo3org %}
-    <form id="global-search-form" action="/search/search" method="get">
-        <div class="input-group mb-3 mt-sm-3">
-            <input id="globalsearchinput" type="text" class="form-control shadow-none" name="q"
-                   placeholder="Search all TYPO3 documentation" value="" autocomplete="off">
-            <div class="input-group-append">
-                <button class="btn btn-sm btn-primary" type="submit"><i class="fa fa-search"></i>&nbsp;Search</button>
-            </div>
+        {%- endif %}
+    </div><!--/.col-x-->
+    <div class="col-sm-6 col-lg-5">
+        <div role="search">
+            {% if theme_docstypo3org -%}
+            <form id="global-search-form" action="{{ theme_global_search_action }}" method="get">
+                <div class="input-group mb-3 mt-sm-3">
+                    <input type="text" class="form-control shadow-none" name="q" autocomplete="off" placeholder="Search all TYPO3 documentation" id="searchinput" value="">
+                    <div class="input-group-append">
+                        <button class="btn btn-sm btn-primary" type="submit"><i class="fa fa-search"></i>&nbsp;Search</button>
+                    </div>
+                </div>
+            </form>
+            {%- else %}
+            <!--form global search-->
+            {%- endif %}
         </div>
-    </form>
-    {%- else %}
-    <!-- global-search-form -->
-    {%- endif %}
-</div>
-</div>
+    </div><!--/.col-x-->
+</div><!--/.row-->
 {%- endblock %}
-<!-- /pageheader -->
-            </div>
-        </div>
+<!--/block pageheader-->
+            </div><!--/.page-header-inner-->
+        </div><!--/.page-header-inner-->
 
         {% if theme_docstypo3org -%}
             <!--# include virtual="/includes/header.html" -->

diff --git a/sphinx_typo3_theme/theme.conf b/sphinx_typo3_theme/theme.conf
@@ -12,6 +12,7 @@ github_commit_hash = unused, deprecated
 github_repository = unused, deprecated
 github_revision_msg = unused, deprecated
 github_sphinx_locale = unused, deprecated
+global_search_action = https://docs.typo3.org/search/search
 is_homepage =
 path_to_documentation_dir = Documentation
 project_contact =