Skip to content

Commit 815b429

Browse files
mattmakaimattmakai
committed
change table of contents on desktop to not be so large. ToC page best way to see everything
1 parent aca73a8 commit 815b429

File tree

4 files changed

+27
-10
lines changed

4 files changed

+27
-10
lines changed

‎content/pages/05-deployment/13-operating-systems.markdown‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,22 @@ major reason why you must use them in lieu of Linux.
4848
Ubuntu is a Linux distribution packaged by the
4949
[Canonical Ltd](http://www.canonical.com/) company. Ubuntu uses the
5050
Debian distribution as a base for packages, including the
51-
[aptitude package manager](http://wiki.debian.org/Apt). For desktop versions
52-
of Ubuntu, GNOME (until the 11.04 release) or Unity (11.10 through current)
53-
is bundled with the distribution to provide a user interface.
51+
[aptitude package manager](http://wiki.debian.org/Apt). For desktop versions
52+
of Ubuntu, GNOME (until the 11.04 release, then again in 18.04) or Unity
53+
(11.10 until 17.10) is bundled with the distribution to provide a user
54+
interface.
5455

5556
Ubuntu [Long Term Support](https://wiki.ubuntu.com/LTS) (LTS) releases
5657
are the recommended versions to use for deployments. LTS versions receive
5758
five years of post-release updates from Canonical. Every two years, Canonical
5859
creates a new LTS release, which allows for an easy upgrade path as well
5960
as flexibility in skipping every other LTS release if necessary. As of
60-
April 2016,
61-
[16.04 Xenial Xerus](https://wiki.ubuntu.com/XenialXerus/ReleaseNotes)
61+
May 2018,
62+
[18.04 Bionic Beaver](http://releases.ubuntu.com/18.04/)
6263
is the latest Ubuntu LTS release. Xenial Xerus includes
63-
[Python 3.5](/python-2-or-3.html) as its default Python version, which is
64-
a major update compared with 2.7 in Ubuntu 14.04 LTS.
64+
[Python 3.6](/python-2-or-3.html) as its default Python version, which is
65+
a major update compared with 2.7 in Ubuntu 14.04 LTS and a solid
66+
improvement over Python 3.5 included in Ubuntu 16.04 LTS.
6567

6668

6769
#### Ubuntu Python Packages

‎theme/templates/desktop-toc.html‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<div class="pn" id="full-toc">
2+
<div class="pnh">
3+
<h3><a href="/table-of-contents.html">Chapters</a></h3>
4+
</div>
5+
<div class="lg">
6+
{% for p in pages|sort(attribute='sortorder') %}
7+
{% if p %}
8+
{% if p.toc == "True" %}<a href="/{{ p.slug }}.html" class="lgi {% if page and p.slug == page.slug %}active{% endif %}">{{ p.sidebartitle }}</a>
9+
{% elif p.sortorder[0:2] == page.sortorder[0:2] %}<a href="/{{ p.slug }}.html" class="lgi{% if p.slug == page.slug %} active{% endif %} {% if p.sortorder[0:2]|int > 9 and p.sortorder[2:4]|int > 1 %}sbc2{% else %}sbc{% endif %}">{{ p.sidebartitle }}</a>
10+
{% endif %}
11+
{% endif %}
12+
{% endfor %}
13+
<a href="/table-of-contents.html" class="lgi">...or view the full table of contents.</a>
14+
</div>
15+
</div>

‎theme/templates/full-toc.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ <h3><a href="/table-of-contents.html">Table of Contents</a></h3>
55
<div class="lg">
66
{% for p in pages|sort(attribute='sortorder') %}
77
{% if p %}
8-
{% if p.toc == 'True' %}<a href="/{{ p.slug }}.html" class="lgi{% if p.slug == page.slug %} active{% endif %}">{{ p.sidebartitle }}</a>{% else %}<a href="/{{ p.slug }}.html" class="lgi{% if p.slug == page.slug %} active{% endif %} {% if p.sortorder[0:2]|int > 9 and p.sortorder[2:4]|int > 1 %}sbc2{% else %}sbc{% endif %}">{{ p.sidebartitle }}</a>{% endif %}
9-
{% endif %}
8+
{% if p.toc == 'True' %}<a href="/{{ p.slug }}.html" class="lgi{% if p.slug == page.slug %} active{% endif %}">{{ p.sidebartitle }}</a>{% else %}<a href="/{{ p.slug }}.html" class="lgi{% if p.slug == page.slug %} active{% endif %} {% if p.sortorder[0:2]|int > 9 and p.sortorder[2:4]|int > 1 %}sbc2{% else %}sbc{% endif %}">{{ p.sidebartitle }}</a>{% endif %}
9+
{% endif %}
1010
{% endfor %}
1111
<a href="/table-of-contents.html" class="lgi">...or view all topics.</a>
1212
</div>

‎theme/templates/sidebar.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</div>
1414
</div>
1515
{% if not page.slug == "about-author" %}
16-
{% include "full-toc.html" %}
16+
{% include "desktop-toc.html" %}
1717
{% endif %}
1818
{% endif %}
1919
{% if not page %}

0 commit comments

Comments
 (0)