Revert "Short headings, API tabs, whole topic=EE, page.intro, right-nav fix"

This reverts commit 42af4621737f26fe520d2d499e43446f5d9d2df5.
This commit is contained in:
Joao Fernandes 2017-11-03 09:59:42 -07:00 committed by Jim Galasyn
parent da5bfa91cb
commit 983ce02e3c
1 changed files with 12 additions and 25 deletions

View File

@ -133,20 +133,19 @@
<h1>{{ page.title }}</h1>{% endif %} {% if page.advisory %}
<blockquote>{{ site.data.advisories.texts[page.advisory] | markdownify }}</blockquote>{% endif %}{% endif %} {% unless page.tree == false %}{% include read_time.html %}{% endunless %}
{% if page.enterprise %}{% include ee_dropdown.html %}{% endif %}
{% if page.ui_tabs or page.cli_tabs or page.api_tabs %}{% capture content %}
{% capture enterprise_advisory %}<blockquote>
<p>These instructions require Docker Enterprise</p>
<p>The UI instructions shown here are for the dashboard provided with
<a href="/enterprise/#docker-ee-feature-tiers">Docker Enterprise Standard</a>
or higher.</p></blockquote>{% endcapture %}
{% if page.whole_page_ee %}{{ enterprise_advisory }}{% endif %}
{% if page.intro %}{{ page.intro | markdownify }}{% else %}{{ page.description | markdownify }}{% endif %}
{% if page.ui_tabs or page.cli_tabs %}
{{ page.description | markdownify }}
{% if page.ui_tabs %}
<h2>In the UI</h2>
<h2>{{ page.title }} in the UI</h2>
{% unless page.whole_page_ee %}{{ enterprise_advisory %}}{% endif %}
<blockquote>
<p>These instructions require Docker Enterprise</p>
<p>The UI instructions shown here are for the dashboard provided with
<a href="/enterprise/#docker-ee-feature-tiers">Docker Enterprise Standard</a>
or higher.</p>
</blockquote>
<ul class="nav nav-tabs">{% for tab in page.ui_tabs %}
<li{% if forloop.first %} class="active"{% endif %}><a data-toggle="tab" data-target="#ui-{{ tab.version | slugify }}" id="ui-tabheader-{{ tab.version | slugify }}">{{ site.tablabels[tab.version] }}{% if tab.orhigher %} (or higher){% endif %}{% if tab.orlower %} (or lower){% endif %}</a></li>{% endfor %}
@ -158,7 +157,7 @@
{% endif %}
{% if page.cli_tabs %}
<h2>In the CLI</h2>
<h2>{{ page.title }} in the CLI</h2>
<ul class="nav nav-tabs">{% for tab in page.cli_tabs %}
<li{% if forloop.first %} class="active"{% endif %}><a data-toggle="tab" data-target="#cli-{{ tab.version | slugify }}" id="cli-tabheader-{{ tab.version | slugify }}">{{ site.tablabels[tab.version] }}</a></li>{% endfor %}
@ -167,18 +166,6 @@
<div id="cli-{{ tab.version | slugify }}" class="tab-pane fade{% if forloop.first %} in active{% endif %}">{% capture thistab %}{% include_relative {{ page.path | split: "/" | last }} version=tab.version cli="true" %}{% endcapture %}{{ thistab | split: "---" | last | markdownify }}</div>{% endfor %}
</div>
{% endif %}
{% if page.api_tabs %}
<h2>In the API</h2>
<ul class="nav nav-tabs">{% for tab in page.api_tabs %}
<li{% if forloop.first %} class="active"{% endif %}><a data-toggle="tab" data-target="#api-{{ tab.version | slugify }}" id="api-tabheader-{{ tab.version | slugify }}">{{ site.tablabels[tab.version] }}</a></li>{% endfor %}
</ul>
<div class="tab-content">{% for tab in page.api_tabs %}
<div id="api-{{ tab.version | slugify }}" class="tab-pane fade{% if forloop.first %} in active{% endif %}">{% capture thistab %}{% include_relative {{ page.path | split: "/" | last }} version=tab.version api="true" %}{% endcapture %}{{ thistab | split: "---" | last | markdownify }}</div>{% endfor %}
</div>
{% endif %}
{% if page.next_steps %}
@ -190,9 +177,9 @@
{% endfor %}
</ul>
{% endif %}
{% endcapture %}
{% endif %}
{% else %}
{{ content }}
{% endif %}
<!-- tags -->
{% unless page.notags == true %}
{% assign keywords = page.keywords | split:"," %}