From 477bd674fb0b0e3c938d948cac0ba2e96049f806 Mon Sep 17 00:00:00 2001 From: Riccardo Spagni Date: Mon, 23 Feb 2015 17:49:33 +0200 Subject: [PATCH] fixed language page for very low-res devices, fixed blog by tag title --- _includes/head.html | 2 ++ _layouts/blog_by_tag.html | 59 +++++++++++++++++++++++---------------- _strings_en.yml | 1 + language.php | 2 +- 4 files changed, 39 insertions(+), 25 deletions(-) diff --git a/_includes/head.html b/_includes/head.html index 9fab872c..11460e88 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -6,6 +6,8 @@ {% if page.entry %} {{ page.entry }} | {% t global.wiki %} | {% t index.page_title %} +{% elsif tag %} +{% t global.tags %}: {{ tag.name }} | {% t index.page_title %} {% elsif page.title %} {{ page.title }} | {% t index.page_title %} {% else %} diff --git a/_layouts/blog_by_tag.html b/_layouts/blog_by_tag.html index 45e13297..6e46df88 100644 --- a/_layouts/blog_by_tag.html +++ b/_layouts/blog_by_tag.html @@ -1,30 +1,41 @@ ---- -layout: default ---- - -{% assign filename = page.path | remove: '.md' | split: '/' | last %} - -{% for data_tag in site.data.tags %} +<!DOCTYPE html> +<html> + {% assign filename = page.path | remove: '.md' | split: '/' | last %} + {% for data_tag in site.data.tags %} {% if data_tag.slug == filename %} {% assign tag = data_tag %} {% endif %} -{% endfor %} + {% endfor %} -<div class="page-title"> - <!-- Icon is based on work by Sergiu Bagrin (http://pixelkit.com) and is licensed under Creative Commons BY 3.0 --> - <img src="//static.getmonero.org/images/icon_tags.svg" class="title-icon"><h2 class="inline">{% t tags.all %}: <span class="kicks">{{ tag.name }}</span></h2> -</div> + {% include head.html %} -<div> - {% if site.tags[tag.slug] %} - {% for post in site.tags[tag.slug] %} - <h3><a href="{{ post.url }}">{{ post.title }}</a></h3> - <blockquote> - {{ post.summary }} - </blockquote> - {% endfor %} - {% else %} - <h3>{% t tags.notags %}</h3> - {% endif %} -</div> + <body> + {% include header.html %} + + <div class="container main-content"> + + <div class="page-title"> + <!-- Icon is based on work by Sergiu Bagrin (http://pixelkit.com) and is licensed under Creative Commons BY 3.0 --> + <img src="//static.getmonero.org/images/icon_tags.svg" class="title-icon"><h2 class="inline">{% t tags.all %}: <span class="kicks">{{ tag.name }}</span></h2> + </div> + + <div> + {% if site.tags[tag.slug] %} + {% for post in site.tags[tag.slug] %} + <h3><a href="{{ post.url }}">{{ post.title }}</a></h3> + <blockquote> + {{ post.summary }} + </blockquote> + {% endfor %} + {% else %} + <h3>{% t tags.notags %}</h3> + {% endif %} + </div> + </div> + + {% include footer.html %} + + </body> + +</html> diff --git a/_strings_en.yml b/_strings_en.yml index 5a6fdb5f..3321bd26 100644 --- a/_strings_en.yml +++ b/_strings_en.yml @@ -5,6 +5,7 @@ global: copyright: Copyright monero_project: The Monero Project wiki: Moneropedia + tags: Articles By Tag terms: Terms privacy: Privacy copyright: Copyright diff --git a/language.php b/language.php index ce319454..846224bd 100644 --- a/language.php +++ b/language.php @@ -35,7 +35,7 @@ if (isset($_COOKIE["MONERO_LANG"])) <body class="body-language"> <!-- Static navbar --> <div class="navbar navbar-default navbar-fixed-top" role="navigation"> - <div class="container"> + <div class="container" style="padding-bottom: 0px;"> <div class="navbar-header"> <a class="navbar-brand" href="/"><img class="logo" src="//static.getmonero.org/images/logo.svg"></a> </div>