This is an automated email from the ASF dual-hosted git repository. rmetzger pushed a commit to branch release-1.12 in repository https://gitbox.apache.org/repos/asf/flink.git
commit 50a1c8d853ba0e4363e753077caa86891b632dd5 Author: Robert Metzger <[email protected]> AuthorDate: Fri Dec 11 07:50:37 2020 +0100 Partial Revert "[FLINK-20422] Remove site.baseurl from remaining .html templates" This reverts commit 15b66a3b --- docs/_includes/sidenav.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/_includes/sidenav.html b/docs/_includes/sidenav.html index 4528361..ed767f2 100644 --- a/docs/_includes/sidenav.html +++ b/docs/_includes/sidenav.html @@ -41,9 +41,9 @@ Extract the active nav IDs. {%- endfor -%} {%- if page.language == "en" -%} - {%- capture baseurl_i18n -%}{% link index.md %}{%- endcapture -%} + {%- capture baseurl_i18n -%}{{ site.baseurl }}{%- endcapture -%} {%- else if page.language == "zh" -%} - {%- capture baseurl_i18n -%}{% link index.{{ page.language }}.md %}{%- endcapture -%} + {%- capture baseurl_i18n -%}{{ site.baseurl }}/{{ page.language }}{%- endcapture -%} {%- endif -%} {%- comment -%} @@ -80,7 +80,7 @@ level is determined by 'nav-pos'. {%- assign pos = 0 -%} <div class="sidenav-logo"> - <p><a href="{{ baseurl_i18n }}"><img class="bottom" alt="Apache Flink" src="{% link page/img/navbar-brand-logo.jpg %}"></a> v{{ site.version_title }}</p> + <p><a href="{{ baseurl_i18n }}/"><img class="bottom" alt="Apache Flink" src="{{ site.baseurl }}/page/img/navbar-brand-logo.jpg"></a> v{{ site.version_title }}</p> </div> <ul id="sidenav"> {%- for i in (1..10000) -%} @@ -106,8 +106,8 @@ level is determined by 'nav-pos'. {%- endif -%} {%- capture title -%}{%- if this.nav-title -%}{{ this.nav-title }}{%- else -%}{{ this.title }}{%- endif -%}{%- endcapture -%} - {%- capture target -%}"{% link {{ this.path }} %}"{%- if active %} class="active"{%- endif -%}{%- endcapture -%} - {%- capture overview_target -%}"{% link {{ this.path }} %}"{%- if this.url == page.url -%} class="active"{%- endif -%}{%- endcapture -%} + {%- capture target -%}"{{ site.baseurl }}{{ this.url }}"{%- if active %} class="active"{%- endif -%}{%- endcapture -%} + {%- capture overview_target -%}"{{ site.baseurl }}{{ this.url }}"{%- if this.url == page.url -%} class="active"{%- endif -%}{%- endcapture -%} {% if this.section-break %}<hr class="section-break"></hr>{% endif -%} @@ -145,7 +145,7 @@ level is determined by 'nav-pos'. </ul> <div class="sidenav-search-box"> - <form class="navbar-form" role="search" action="{% link search-results.md %}"> + <form class="navbar-form" role="search" action="{{site.baseurl}}/search-results.html"> <div class="form-group"> <input type="text" class="form-control" size="16px" name="q" placeholder="Search"> </div> @@ -173,11 +173,11 @@ level is determined by 'nav-pos'. <div class="sidenav-languages"> {%- if page.is_default_language -%} <!-- link to the Chinese home page when current is blog page --> - <a href="{% link {{ page.path | replace: '.md', '.zh.md' }} %}"> + <a href="{{ site.baseurl }}/zh{{ page.url }}"> <button type="submit" class="btn btn-default">中文版</button> </a> {%- else -%} - <a href="{% link {{ page.path | remove: '.zh' }} %}"> + <a href="{{ site.baseurl }}{{ page.url | remove_first: 'zh/' }}"> <button type="submit" class="btn btn-default">English</button> </a> {%- endif %}
