Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Better theming for archive navigation
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
  • Loading branch information
Kwpolska committed Dec 24, 2016
1 parent a9b3f75 commit e83d413
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 15 deletions.
35 changes: 25 additions & 10 deletions nikola/data/themes/base/assets/css/theme.css
Expand Up @@ -132,23 +132,23 @@ body {
content: "↓ ";
}
.postindexpager .pager .previous:before,
.archivepager .pager .up:before {
.archivenav .pager .up:before {
content: "↑ ";
}
.postpromonav .pager .next:after,
.archivepager .pager .next:after {
.archivenav .pager .next:after {
content: " →";
}
.postpromonav .pager .previous:dir(rtl):after,
.archivepager .pager .previous:dir(rtl):after {
.archivenav .pager .previous:dir(rtl):after {
content: " →";
}
.postpromonav .pager .previous:before,
.archivepager .pager .previous:before {
.archivenav .pager .previous:before {
content: "← ";
}
.postpromonav .pager .next:dir(rtl):before,
.archivepager .pager .next:dir(rtl):before {
.archivenav .pager .next:dir(rtl):before {
content: "← ";
}

Expand All @@ -161,23 +161,38 @@ body {
height: 1em;
}
.postpromonav .tags li,
.postpromonav .pager li {
.postpromonav .pager li,
.archivenav .pager li {
display: inline-block;
}
.postpromonav .pager .next {
.archivenav .pager {
text-align: center
}
.postpromonav .pager .next,
.archivenav .pager .next {
float: right;
}
.postpromonav .pager .next:dir(rtl) {
.postpromonav .pager .next:dir(rtl),
.archivenav .pager .next:dir(rtl) {
float: left;
}

.postpromonav .pager .previous {
.postpromonav .pager .previous,
.archivenav .pager .previous {
float: left;
}
.postpromonav .pager .previous:dir(rtl) {
.postpromonav .pager .previous:dir(rtl),
.archivenav .pager .previous:dir(rtl) {
float: right;
}

.archivenav .pager .disabled,
.archivenav .pager .disabled a,
.archivenav .pager .disabled:link {
color: #888;
cursor: not-allowed;
}

.metadata p {
display: inline;
}
Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/base/messages/messages_en.py
Expand Up @@ -26,7 +26,7 @@
"Posts for {month} {day}, {year}": "Posts for {month} {day}, {year}",
"Posts for {month} {year}": "Posts for {month} {year}",
"Previous post": "Previous post",
"Previous": "Previos",
"Previous": "Previous",
"Publication date": "Publication date",
"RSS feed": "RSS feed",
"Read in English": "Read in English",
Expand Down
Expand Up @@ -7,12 +7,18 @@
<ul class="pager">
%if previous_archive:
<li class="previous"><a href="${previous_archive}" rel="prev">${messages("Previous")}</a></li>
%endif
%else:
<li class="previous disabled"><a href="#" rel="prev">${messages("Previous")}</a></li>
% endif
%if up_archive:
<li class="up"><a href="${up_archive}" rel="up">${messages("Up")}</a></li>
%else:
<li class="up disabled"><a href="#" rel="up">${messages("Up")}</a></li>
%endif
%if next_archive:
<li class="next"><a href="${next_archive}" rel="next">${messages("Next")}</a></li>
%else:
<li class="next disabled"><a href="#" rel="next">${messages("Next")}</a></li>
%endif
</ul>
</nav>
Expand Down
2 changes: 0 additions & 2 deletions nikola/plugins/task/archive.py
Expand Up @@ -179,8 +179,6 @@ def provide_context_and_uptodate(self, classification, lang, node=None):
context["next_archive"] = self.site.link('archive', flat_samelevel[nextidx], lang) if nextidx != len(flat_samelevel) else None
context["archive_nodelevel"] = nodelevel
context["has_archive_navigation"] = bool(context["previous_archive"] or context["up_archive"] or context["next_archive"])
print(context)
context['title'] = context['title'] + repr(context)
else:
context["has_archive_navigation"] = False
if page_kind == 'index':
Expand Down
2 changes: 1 addition & 1 deletion translations/nikola.messages/en.po
Expand Up @@ -148,7 +148,7 @@ msgid "Toggle navigation"
msgstr "Toggle navigation"

msgid "Previous"
msgstr "Previos"
msgstr "Previous"

msgid "Up"
msgstr "Up"
Expand Down

0 comments on commit e83d413

Please sign in to comment.