diff options
| -rw-r--r-- | conf/_dev.yml | 2 | ||||
| -rw-r--r-- | site/_includes/header.html | 14 | ||||
| -rw-r--r-- | site/_layouts/doc.html | 8 | ||||
| -rw-r--r-- | site/docs/docsearch.html | 14 |
4 files changed, 19 insertions, 19 deletions
diff --git a/conf/_dev.yml b/conf/_dev.yml index d281aa7..15a8dd4 100644 --- a/conf/_dev.yml +++ b/conf/_dev.yml @@ -1,4 +1,4 @@ -baseurl: "" +baseurl: "/next" default_linked_docs_version: master destination: build-dev exclude: diff --git a/site/_includes/header.html b/site/_includes/header.html index 552cce3..a421f1c 100644 --- a/site/_includes/header.html +++ b/site/_includes/header.html @@ -27,31 +27,31 @@ <div class="nav_bar_left"> <ul class="nav navbar-nav"> <li {% if page.specs_tab %}class="active"{% endif %}> - <a href="{{ site.baseurl }}/docs/{{LANGUAGE}}/{{VERSION}}/getting_started/">Getting Started</a> + <a href="{{ site.baseurl }}{{ site.docsurl }}/{{LANGUAGE}}/{{VERSION}}/getting_started/">Getting Started</a> </li> <li {% if page.specs_tab %}class="active"{% endif %}> - <a href="{{ site.baseurl }}/docs/{{LANGUAGE}}/{{VERSION}}/architecture/">Architecture Guides</a> + <a href="{{ site.baseurl }}{{ site.docsurl }}/{{LANGUAGE}}/{{VERSION}}/architecture/">Architecture Guides</a> </li> <li {% if page.appfw_tab %}class="active"{% endif %}> - <a href="{{ site.baseurl }}/docs/{{LANGUAGE}}/{{VERSION}}//hardware/">Hardware Support</a> + <a href="{{ site.baseurl }}{{ site.docsurl }}/{{LANGUAGE}}/{{VERSION}}//hardware/">Hardware Support</a> </li> <li {% if page.specs_tab %}class="active"{% endif %}> - <a href="{{ site.baseurl }}/docs/{{LANGUAGE}}/{{VERSION}}/devguides/">Developer Guides</a> + <a href="{{ site.baseurl }}{{ site.docsurl }}/{{LANGUAGE}}/{{VERSION}}/devguides/">Developer Guides</a> </li> <li {% if page.appfw_tab %}class="active"{% endif %}> - <a href="{{ site.baseurl }}/docs/{{LANGUAGE}}/{{VERSION}}/apis_services/">APIs & Services</a> + <a href="{{ site.baseurl }}{{ site.docsurl }}/{{LANGUAGE}}/{{VERSION}}/apis_services/">APIs & Services</a> </li> <li {% if page.appfw_tab %}class="active"{% endif %}> - <a href="{{ site.baseurl }}/docs/{{LANGUAGE}}/{{VERSION}}/howto/">How To</a> + <a href="{{ site.baseurl }}{{ site.docsurl }}/{{LANGUAGE}}/{{VERSION}}/howto/">How To</a> </li> <li {% if page.appfw_tab %}class="active"{% endif %}> - <a href="{{ site.baseurl }}/docs/{{LANGUAGE}}/{{VERSION}}/reference/">Reference</a> + <a href="{{ site.baseurl }}{{ site.docsurl }}/{{LANGUAGE}}/{{VERSION}}/reference/">Reference</a> </li> </ul> </div> diff --git a/site/_layouts/doc.html b/site/_layouts/doc.html index 61ffdf0..2b6cf39 100644 --- a/site/_layouts/doc.html +++ b/site/_layouts/doc.html @@ -3,7 +3,7 @@ layout: base docs_tab: true analytics_id: {{site.ganalytics}} -scripts: +scripts: - lib/raphael-min.js - lib/underscore-min.js - lib/sequence-diagram-min.js @@ -15,12 +15,12 @@ scripts: set some constants {% endcomment %} {% assign ALL_PAGES = site.data.all-pages %} -{% assign DOCSDIR = site.docsurl %} +{% capture DOCSDIR %}{{ site.baseurl }}{{ site.docsurl }}{% endcapture %} {% assign TOCSDIR = site.data.tocs %} {% assign TOCFILE = TOCSDIR[page.tocdir][page.tocfile] %} {% capture VERSION_ROOT %}{{DOCSDIR}}/{{ page.language }}/{{ page.version }}/{{page.tocdir}}/{% endcapture %} -{% capture VERSION_URL %}{{DOCSDIR}}/{{ page.language }}/{{ page.version }}/{% endcapture %} +{% capture VERSION_URL %}{{ site.docsurl }}/{{ page.language }}/{{ page.version }}/{% endcapture %} {% capture LANGUAGE_ROOT %}{{DOCSDIR}}/{{ page.language }}/{% endcapture %} {% assign MY_ENTRY = page.url | replace: VERSION_ROOT,"" %} @@ -202,7 +202,7 @@ set some constants This page might not exist in the target version because page layouts change from version to version {% endcomment %} - {% capture other_version_root %}/docs/{{ page.language }}/{{ other_version_string }}/{% endcapture %} + {% capture other_version_root %}{{site.docsurl}}/{{ page.language }}/{{ other_version_string }}/{% endcapture %} {% assign other_version_url = page.url | replace:VERSION_URL,other_version_root %} {% comment %} diff --git a/site/docs/docsearch.html b/site/docs/docsearch.html index 39cf69a..3c28cdc 100644 --- a/site/docs/docsearch.html +++ b/site/docs/docsearch.html @@ -5,13 +5,13 @@ <html lang="{% if page.language %}{{ page.language }}{% else %}{{ site.language }}{% endif %}"> {% include head.html %} <body> - <h3><a href="{{ site.baseurl }}/docs/en/{{ site.default_linked_docs_version }}/getting_started/">Getting started</a></h3> - <h3><a href="{{ site.baseurl }}/docs/en/{{ site.default_linked_docs_version }}/hardware/">Hardware Support</a></h3> - <h3><a href="{{ site.baseurl }}/docs/en/{{ site.default_linked_docs_version }}/architecture/">Architecture Guides</a></h3> - <h3><a href="{{ site.baseurl }}/docs/en/{{ site.default_linked_docs_version }}/devguides/">Developer Guides</a></h3> - <h3><a href="{{ site.baseurl }}/docs/en/{{ site.default_linked_docs_version }}/apis_services/">APIs & Services</a></h3> - <h3><a href="{{ site.baseurl }}/docs/en/{{ site.default_linked_docs_version }}/howto/">How To</a></h3> - <h3><a href="{{ site.baseurl }}/docs/en/{{ site.default_linked_docs_version }}/reference/">Reference</a></h3> + <h3><a href="{{site.baseurl}}{{ site.docsurl }}/en/{{ site.default_linked_docs_version }}/getting_started/">Getting started</a></h3> + <h3><a href="{{site.baseurl}}{{ site.docsurl }}/en/{{ site.default_linked_docs_version }}/hardware/">Hardware Support</a></h3> + <h3><a href="{{site.baseurl}}{{ site.docsurl }}/en/{{ site.default_linked_docs_version }}/architecture/">Architecture Guides</a></h3> + <h3><a href="{{site.baseurl}}{{ site.docsurl }}/en/{{ site.default_linked_docs_version }}/devguides/">Developer Guides</a></h3> + <h3><a href="{{site.baseurl}}{{ site.docsurl }}/en/{{ site.default_linked_docs_version }}/apis_services/">APIs & Services</a></h3> + <h3><a href="{{site.baseurl}}{{ site.docsurl }}/en/{{ site.default_linked_docs_version }}/howto/">How To</a></h3> + <h3><a href="{{site.baseurl}}{{ site.docsurl }}/en/{{ site.default_linked_docs_version }}/reference/">Reference</a></h3> {% include algolia.html %} </body> </html> |