diff --git a/_includes/head.html b/_includes/head.html index 88aad44473c6bdb51e52e4998f74793a54124d0c..6d2afab46efc295529f522b2788263730bdba3e9 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -3,7 +3,13 @@ <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title>{% t index.page_title %}</title> + <title> +{% if page.title %} +{{ page.title }} | {% t index.page_title %} +{% else %} +{% t index.page_title %} +{% endif %} + </title> <meta name="description" content="{{ site.description }}"> <meta name="keywords" content="{{ site.keywords }}"> diff --git a/_includes/header.html b/_includes/header.html index 859ab792ec048193d1dcafb2a4d82c54a2553483..75e3d80a0bacc9074d64c95af1c412c48b41cc29 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -29,7 +29,6 @@ <li><a href="/getting-started/running">{% t menu.running %}</a></li> <li class="divider"></li> <li><a href="/downloads">{% t menu.downloads %}</a></li> - <li><a href="/getting-started/simplewallet">{% t menu.simplewallet %}</a></li> <li class="divider"></li> <li><a href="/getting-started/accepting">{% t menu.accepting %}</a></li> <li><a href="/getting-started/merchants">{% t menu.merchants %}</a></li> @@ -42,7 +41,8 @@ <li><a href="/knowledge-base/people">{% t menu.people %}</a></li> <li><a href="/knowledge-base/moneropedia">{% t menu.wiki %}</a></li> <li class="divider"></li> - <li><a href="/knowledge-base/compiling">{% t menu.compiling %}</a></li> + <li><a href="/knowledge-base/user-guides">{% t menu.userguides %}</a></li> + <li><a href="/knowledge-base/developer-guides">{% t menu.developerguides %}</a></li> <li class="divider"></li> <li><a href="/knowledge-base/openalias">{% t menu.openalias %}</a></li> <li><a href="/knowledge-base/projects">{% t menu.projects %}</a></li> diff --git a/_strings_en.yml b/_strings_en.yml index 7d57dcf36ab69a8d49b362ab00d92709aab4d5b5..21cf9b40eaa7e434683c191cc0fec37e4541350c 100644 --- a/_strings_en.yml +++ b/_strings_en.yml @@ -1,7 +1,3 @@ -files: - index: index.html - vocab: vocab.html - simplewallet: use-simplewallet.html global: date: '%Y/%m/%d' monero: Monero @@ -22,13 +18,13 @@ menu: choose: How to Choose a Monero Client running: How to Run a Monero Node downloads: All Monero Downloads - simplewallet: How to Use SimpleWallet accepting: How to Accept Monero Payments merchants: Monero Merchant Directory about: About Monero people: The People Behind Monero wiki: Moneropedia - compiling: Compiling Monero + userguides: User Guides + developerguides: Developer Guides openalias: The OpenAlias Project alternative: Alternative Clients projects: External Projects @@ -85,4 +81,9 @@ index: all_downloads: View all downloads here c_download: Downloads monero_for: Monero for - latest_blockchain: Latest Blockchain \ No newline at end of file + latest_blockchain: Latest Blockchain +blog: + title_1: All + title_2: Blog + title_3: Posts + tagged: Tagged under \ No newline at end of file diff --git a/blog/index.html b/blog/index.html index b7eb7a987671d6cfd9fff52c7ecd1f68f4fa3e9a..2f1540e0ac1a98c789c10cf97f2cae73a0dc8861 100644 --- a/blog/index.html +++ b/blog/index.html @@ -3,19 +3,22 @@ layout: default title: All Blog Posts --- -<!-- This loops through the paginated posts --> +<h2>{% t blog.title_1 %} <span class="purple-kicks">{% t blog.title_2 %}</span> {% t blog.title_3 %}</h2> + {% for post in paginator.posts %} - <h1><a href="{{ post.url }}">{{ post.title }}</a></h1> - <p class="author"> - <span class="date">{{ post.date }}</span> - </p> - <div class="content"> + <h3><a href="{{ post.url }}">{{ post.title }}</a></h3> + <blockquote> {{ post.summary }} - </div> + <small>{% t blog.tagged %}: + {% for tag in post.tags %} + [{{ tag }}] + {% endfor %} + </small> + </blockquote> {% endfor %} {% if paginator.total_pages > 1 %} -<div class="pagination"> +<div class="text-center"> {% if paginator.previous_page %} <a href="{{ paginator.previous_page_path | prepend: site.baseurl | replace: '//', '/' }}">« Prev</a> {% else %} diff --git a/home.php b/home.php index 4758798e9b9991cfd885a394ed87c49e1b00543e..8fca6cf494c508a6302fc76f456c8c233121e03c 100644 --- a/home.php +++ b/home.php @@ -1,5 +1,6 @@ --- layout: root +Title: Home --- <!-- Top Boxes --> @@ -18,14 +19,12 @@ layout: root <!-- Icon is based on work by Icomoon (http://www.icomoon.io) and is licensed under Creative Commons BY 3.0 --> <img src="//static.monero.cc/images/icon_news.svg" class="inline-icon" style="height: 60px;"><h2>{% t index.the_latest %} <span class="announcements">{% t index.news %}</span></h2> <ul> + {% for post in site.posts limit:3 %} <li> - <a href="https://bitcointalk.org/index.php?topic=583449.msg7708137#msg7708137">[{% t index.date_1 %} - <span class="news-title">{% t index.news_1 %}</span>]</a><br> - {% t index.news_text_1 %} - </li> - <li> - <a href="https://bitcointalk.org/index.php?topic=583449.msg7542304#msg7542304">[{% t index.date_2 %} - <span class="news-title">{% t index.news_2 %}</span>]</a><br> - {% t index.news_text_2 %} + <a href="post.url">[{{ post.date | date: "%B %d" }} - <span class="news-title">{{ post.title }}</span>]</a><br> + {{ post.summary }} </li> + {% endfor %} </ul> </div> </div>