Skip to content

display reading time and tags in toc nav #15994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
crazy-max merged 1 commit into from
Nov 7, 2022
Merged

display reading time and tags in toc nav #15994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions _includes/read_time.html
View file
Open in desktop

This file was deleted.

51 changes: 28 additions & 23 deletions _layouts/docs.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,8 @@ <h1>{{ page.title }}</h1>
{%- if page.advisory -%}
<blockquote>{{ site.data.advisories.texts[page.advisory] | markdownify }}</blockquote>
{%- endif -%}
<p>{%- include read_time.html -%}</p>
<p></p>
{{ content }}
{%- unless page.notags == true -%}
{%- assign keywords = page.keywords | split:"," -%}
{%- if keywords.size > 0 -%}
<span class="glyphicon glyphicon-tags" style="padding-right: 10px"></span><span style="vertical-align: 2px">
{%- for keyword in keywords -%}
{%- assign strippedKeyword = keyword | strip -%}
<a href="/search/?q={{ strippedKeyword }}">{{ strippedKeyword }}</a>
{%- unless forloop.last %}, {% endunless -%}
{%- endfor -%}
</span>
{%- endif -%}
{%- endunless %}
</section>
</main>
<nav class="col-nav">
Expand All @@ -64,18 +52,35 @@ <h1>{{ page.title }}</h1>
{%- assign my_min = page.toc_min | default: site.toc_min | default: 2 -%}
{%- assign my_max = page.toc_max | default: site.toc_max | default: 3 -%}
{%- assign my_name = page.url | default: "unnamed" -%}
<div id="side-toc-title">Contents:</div>
{%- include toc_pure_liquid.html html=content sanitize=true class="inline_toc" id="my_toc" toc_min=my_min toc_max=my_max page_name=my_name -%}
{%- endunless -%}
<div class="feedback-links">
<div class="side-toc-title">Page details</div>
<div class="metadata-items">
<ul>
{%- if edit_url != "" -%}
<li><a href="{{ edit_url }}"><i class="fa fa-pencil" aria-hidden="true"></i> Edit this page</a></li>
{%- endif -%}
{%- if issue_url != "" -%}
<li><a href="{{ issue_url }}" class="nomunge"><i class="fa fa-check" aria-hidden="true"></i> Request changes</a></li>
{%- endif -%}
{%- unless page.skip_read_time == true %}{% assign words = content | number_of_words %}{% if words >= 360 -%}
<li title="Estimated reading time"><i class="fa fa-clock" aria-hidden="true"></i> {{ words | divided_by:180 }} minutes read</span></li>
{%- endif %}{% endunless -%}
{%- if edit_url != "" -%}
<li><a href="{{ edit_url }}"><i class="fa fa-pencil" aria-hidden="true"></i> Edit this page</a></li>
{%- endif -%}
{%- if issue_url != "" -%}
<li><a href="{{ issue_url }}" class="nomunge"><i class="fa fa-check" aria-hidden="true"></i> Request changes</a></li>
{%- endif -%}
</ul>
</div>
{%- unless page.notags == true -%}
{%- assign keywords = page.keywords | split:"," -%}
{%- if keywords.size > 0 -%}
<div class="side-toc-title">Tags</div>
<div class="keywords-items">
{%- for keyword in keywords -%}
{%- assign strippedKeyword = keyword | strip -%}
<a href="/search/?q={{ strippedKeyword }}" class="nomunge"><i class="fa fa-tag" aria-hidden="true"></i> {{ strippedKeyword }}</a>
{%- endfor -%}
</div>
{%- endif -%}
{%- endunless %}
<div class="side-toc-title">Contents</div>
{%- include toc_pure_liquid.html html=content sanitize=true class="inline_toc" id="my_toc" toc_min=my_min toc_max=my_max page_name=my_name -%}
{%- endunless -%}
</div>
</div>
</div>
Expand Down
38 changes: 32 additions & 6 deletions _scss/_navigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
color: #677285;
}

div#side-toc-title {
div.side-toc-title {
font-size: 12px;
font-weight: bold;
margin: 11px 0 10px 13px;
Expand Down Expand Up @@ -281,12 +281,38 @@ input:checked+.slider:before {
}
}

/*
* feedback links **************************************************************
*/
div.feedback-links {
margin: 15px 0 10px 0;
}

.feedback-links {
margin: 15px 0 10px 0;
div.metadata-items {
margin: 15px 0 10px 0;
ul {
list-style: none;
margin: 0;
padding-left: 20px;
line-height: 20px;
li {
padding: 2px 8px 2px 0;
width: 100%;
font-size: 12px;
a {
padding: 0;
}
}
}
}

div.keywords-items {
padding-left: 20px;
font-size: 12px;
a {
display: inline-block;
margin-right: 8px;
i.fa {
margin: 0;
}
}
}

/*
Expand Down