From 6db23cb986b080625be4bf7bd70c1adc53abe369 Mon Sep 17 00:00:00 2001
From: arcan1s <esalexeev@gmail.com>
Date: Thu, 16 Jan 2014 21:42:36 +0400
Subject: [PATCH] chages with ru pages

---
 404.html                                      |  4 +-
 _config.yml                                   |  2 +-
 _includes/footer_back.html                    |  6 ++-
 _includes/footer_comment.html                 | 19 +++++--
 _includes/footer_fullback.html                |  9 +++-
 _layouts/default.html                         | 10 ++--
 _layouts/paper.html                           | 27 +++++++---
 _layouts/project.html                         | 51 +++++++++++++------
 ru/404.html                                   |  4 +-
 .../_posts}/.2011-01-14-about-zshrchtml       |  0
 .../_posts}/2014-01-14-about-zshrc.html       |  4 +-
 ru/about.html                                 |  1 +
 ru/authors.html                               |  1 +
 ru/blog/index.html                            | 11 ++--
 ru/index.html                                 |  1 +
 ru/projects/git-etc.html                      |  1 +
 ru/projects/index.html                        |  1 +
 ru/projects/oblikuestrategies.html            |  1 +
 ru/projects/pytextmonitor.html                |  1 +
 ru/projects/queued.html                       |  1 +
 20 files changed, 110 insertions(+), 45 deletions(-)
 rename {_ruposts => ru/_posts}/.2011-01-14-about-zshrchtml (100%)
 rename {_ruposts => ru/_posts}/2014-01-14-about-zshrc.html (97%)

diff --git a/404.html b/404.html
index 6dcd211..99373b2 100644
--- a/404.html
+++ b/404.html
@@ -8,8 +8,8 @@
     <meta name="description" content="arcanis' homepage" />
     <link rel="license" type="text/html" href="/authors" />
 
-    <link rel="stylesheet" href="/resources/styles.css">
-    <link rel="stylesheet" href="/resources/pygment_trac.css">
+    <link rel="stylesheet" href="/resources/css/styles.css">
+    <link rel="stylesheet" href="/resources/css/pygment_trac.css">
     <link rel="shortcut icon" href="/resources/icon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
     <!--[if lt IE 9]>
diff --git a/_config.yml b/_config.yml
index 80c2542..f7cc345 100644
--- a/_config.yml
+++ b/_config.yml
@@ -15,7 +15,7 @@ relative_permalinks: true
 
 permalink:     pretty
 paginate:      10
-paginate_path: '/blog/:num'
+paginate_path: 'blog/:num'
 
 markdown:      rdiscount
 markdown_ext:  markdown,mkd,mkdn,md
diff --git a/_includes/footer_back.html b/_includes/footer_back.html
index 0dd2ca4..4e2273a 100644
--- a/_includes/footer_back.html
+++ b/_includes/footer_back.html
@@ -1 +1,5 @@
-<p class="view"><a href="/">Back to Homepage</a></p>
+{% if page.category == "ru" %}
+  <p class="view"><a href="/ru">Домашняя страница</a></p>
+{% else %}
+  <p class="view"><a href="/">Back to Homepage</a></p>
+{% endif %}
diff --git a/_includes/footer_comment.html b/_includes/footer_comment.html
index 4413e09..72295cd 100644
--- a/_includes/footer_comment.html
+++ b/_includes/footer_comment.html
@@ -9,12 +9,21 @@
     }
   });
 </script>
-<div id="comments">
-  <h2>Comments</h2>
-  <div id="header">
-    Want to leave a comment? Visit <a href="https://github.com/arcan1s/arcan1s.github.io/issues/{{page.commentIssueId}}" target="_blank"> this post's issue page on GitHub</a> (you'll need a GitHub account).
+{% if page.category == "ru" %}
+  <div id="comments">
+    <h2>Комментарии</h2>
+    <div id="header">
+      Хотите оставить комментарий? Посетите <a href="https://github.com/arcan1s/arcan1s.github.io/issues/{{page.commentIssueId}}" target="_blank">эту страницу на GitHub</a> (Вам необходим аккаунт на GitHub).
+    </div>
   </div>
-</div>
+{% else %}
+  <div id="comments">
+    <h2>Comments</h2>
+    <div id="header">
+      Want to leave a comment? Visit <a href="https://github.com/arcan1s/arcan1s.github.io/issues/{{page.commentIssueId}}" target="_blank"> this post's issue page on GitHub</a> (you'll need a GitHub account).
+    </div>
+  </div>
+{% endif %}
 <script type="text/javascript">
   function loadComments(data) {
     for (var i=0; i<data.length; i++) {
diff --git a/_includes/footer_fullback.html b/_includes/footer_fullback.html
index e381c96..7ba6cb0 100644
--- a/_includes/footer_fullback.html
+++ b/_includes/footer_fullback.html
@@ -1,2 +1,7 @@
-<p class="view"><a href="javascript:history.back()">Back</a><br>
-<a href="/">Back to Homepage</a></p>
+{% if page.category == "ru" %}
+  <p class="view"><a href="javascript:history.back()">Назад</a><br>
+  <a href="/ru">Домашняя страница</a></p>
+{% else %}
+  <p class="view"><a href="javascript:history.back()">Back</a><br>
+  <a href="/">Back to Homepage</a></p>
+{% endif %}
diff --git a/_layouts/default.html b/_layouts/default.html
index cdd80a1..90cef39 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -39,9 +39,13 @@
         {% if page.share == true %}
           {% include footer_sharethis.html %}
         {% endif %}
-           <small>Hosted on GitHub Pages. <a href="/authors">Authors</a></small></p>
-        <p><a href="{{ page.url }}"><img src="/resources/en.png"></a>
-        <a href="/ru{{ page.url }}"><img src="/resources/ru.png"></a></p>
+        {% if page.category == "ru" %}
+          <small>Расположено на GitHub Pages. <a href="/ru/authors">Авторы</a></small></p>
+          <p><a href="{{ page.url | replace: '/ru/', '/' }}"><img src="/resources/en.png"></a></p>
+        {% else %}
+          <small>Hosted on GitHub Pages. <a href="/authors">Authors</a></small></p>
+          <p><a href="/ru{{ page.url }}"><img src="/resources/ru.png"></a></p>
+        {% endif %}
       </footer>
     </div>
     <script src="/resources/js/scale.fix.js"></script>
diff --git a/_layouts/paper.html b/_layouts/paper.html
index 93164be..9cd4652 100644
--- a/_layouts/paper.html
+++ b/_layouts/paper.html
@@ -8,14 +8,29 @@ layout: default
     <div class="wrapper">
       <header>
         <h1>{{ page.title }}</h1>
-        <p align="justify">{{ page.date | date_to_string }}<br>
-        <i>Last edit: {{ page.last | date_to_string }}</i></p>
-        <p align="justify">{{ Tags: page.tags }}</p>
-        <p align="justify"><b>Related posts</b>:<br>
+        {% if page.category == "ru" %}
+          <p align="justify">{{ page.date | date_to_string }}<br>
+          <i>Последнее редактирование: {{ page.last | date_to_string }}</i></p>
+          <p align="justify"><b>Тэги</b>: {{ page.tags }}</p>
+          <p align="justify"><b>Похожие посты</b>:<br>
           {% for post in site.related_posts limit:3 %}
-            <i>{{ page.last | date_to_string }}</i> <a href="{{ post.url }}">{{ post.title }}</a><br>
+            {% if post.category == "ru" %}
+              <i>{{ page.last | date_to_string }}</i> <a href="{{ post.url }}">{{ post.title }}</a><br>
+            {% endif %}
           {% endfor %}
-        </p>
+          </p>
+        {% else %}
+          <p align="justify">{{ page.date | date_to_string }}<br>
+          <i>Last edit: {{ page.last | date_to_string }}</i></p>
+          <p align="justify"><b>Tags</b>: {{ page.tags }}</p>
+          <p align="justify"><b>Related posts</b>:<br>
+          {% for post in site.related_posts limit:3 %}
+            {% if post.category != "ru" %}
+              <i>{{ page.last | date_to_string }}</i> <a href="{{ post.url }}">{{ post.title }}</a><br>
+            {% endif %}
+          {% endfor %}
+          </p>
+        {% endif %}
       </header>
       <section>
 
diff --git a/_layouts/project.html b/_layouts/project.html
index a9c70d9..c22cf03 100644
--- a/_layouts/project.html
+++ b/_layouts/project.html
@@ -9,25 +9,44 @@ layout: default
       <header>
         <h1>{{ page.title }}</h1>
         <p class="view">{{ page.description }}</p>
-        <p class="view"><a href="#info">General information</a><br>
-                        <a href="#install">Installation guide</a><br>
-                        <a href="#howto">How to use</a><br>
-                        <a href="#config">Configuration</a><br>
-                        {% if page.hasgui == true %}
-                          <a href="#gui">GUI</a><br>
-                          <a href="#screenshots">Screenshots</a><br>
-                        {% endif %}
-                        <a href="#links">Links</a></p>
+        {% if page.category == "ru" %}
+          <p class="view"><a href="#info">Общая информация</a><br>
+          <a href="#install">Установка</a><br>
+          <a href="#howto">Использование</a><br>
+          <a href="#config">Настройка</a><br>
+          {% if page.hasgui == true %}
+            <a href="#gui">Графический интерфейс</a><br>
+            <a href="#screenshots">Скриншоты</a><br>
+          {% endif %}
+          <a href="#links">Ссылки</a></p>
+        {% else %}
+          <p class="view"><a href="#info">General information</a><br>
+          <a href="#install">Installation guide</a><br>
+          <a href="#howto">How to use</a><br>
+          <a href="#config">Configuration</a><br>
+          {% if page.hasgui == true %}
+            <a href="#gui">GUI</a><br>
+            <a href="#screenshots">Screenshots</a><br>
+          {% endif %}
+          <a href="#links">Links</a></p>
+        {% endif %}
       </header>
       <section>
 
 {{ content }}
 
-<h2><a name="links" class="anchor" href="#links"><span class="octicon octicon-link"></span></a>Links</h2>
-<ul>
-  <li><a href="https://github.com/arcan1s/{{ page.short }}">GitHub repo</a></li>
-  <li><a href="https://github.com/arcan1s/{{ page.short }}/releases">Latest release</a></li>
-  {% for link in page.links %}
+{% if page.category == "ru" %}
+  <h2><a name="links" class="anchor" href="#links"><span class="octicon octicon-link"></span></a>Ссылки</h2>
+  <ul>
+    <li><a href="https://github.com/arcan1s/{{ page.short }}">Репозиторий на GitHub</a></li>
+    <li><a href="https://github.com/arcan1s/{{ page.short }}/releases">Последний релиз</a></li>
+{% else %}
+  <h2><a name="links" class="anchor" href="#links"><span class="octicon octicon-link"></span></a>Links</h2>
+  <ul>
+    <li><a href="https://github.com/arcan1s/{{ page.short }}">GitHub repo</a></li>
+    <li><a href="https://github.com/arcan1s/{{ page.short }}/releases">Latest release</a></li>
+{% endif %}
+{% for link in page.links %}
     <li>{{ link }}</li>
-  {% endfor %}
-</ul>
+{% endfor %}
+  </ul>
diff --git a/ru/404.html b/ru/404.html
index cecb3b8..08e6246 100644
--- a/ru/404.html
+++ b/ru/404.html
@@ -8,8 +8,8 @@
     <meta name="description" content="arcanis' homepage" />
     <link rel="license" type="text/html" href="/authors" />
 
-    <link rel="stylesheet" href="/resources/styles.css">
-    <link rel="stylesheet" href="/resources/pygment_trac.css">
+    <link rel="stylesheet" href="/resources/css/styles.css">
+    <link rel="stylesheet" href="/resources/css/pygment_trac.css">
     <link rel="shortcut icon" href="/resources/icon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
     <!--[if lt IE 9]>
diff --git a/_ruposts/.2011-01-14-about-zshrchtml b/ru/_posts/.2011-01-14-about-zshrchtml
similarity index 100%
rename from _ruposts/.2011-01-14-about-zshrchtml
rename to ru/_posts/.2011-01-14-about-zshrchtml
diff --git a/_ruposts/2014-01-14-about-zshrc.html b/ru/_posts/2014-01-14-about-zshrc.html
similarity index 97%
rename from _ruposts/2014-01-14-about-zshrc.html
rename to ru/_posts/2014-01-14-about-zshrc.html
index b6ee7f0..e9719e9 100644
--- a/_ruposts/2014-01-14-about-zshrc.html
+++ b/ru/_posts/2014-01-14-about-zshrc.html
@@ -1,11 +1,11 @@
 ---
+category: ru
 layout: paper
-categories: ru
 last: 14 January 2014
 tags: zshrc, configuration, linux
 title: About zshrc
 short: about-zshrc
-description: It is first paper in my blog (I think I need something here for tests =)). There are many similar articles, and I'll not be an exception. I just want to show my <code>.zshrc</code> and explain what it does and why it is needed. Also any comments or additions are welcome. It is a translated paper from Russian (<a href="http://archlinux.org.ru/forum/topic/12752/">original</a>).
+description: РУССКИЙ. It is first paper in my blog (I think I need something here for tests =)). There are many similar articles, and I'll not be an exception. I just want to show my <code>.zshrc</code> and explain what it does and why it is needed. Also any comments or additions are welcome. It is a translated paper from Russian (<a href="http://archlinux.org.ru/forum/topic/12752/">original</a>).
 commentIssueId: 5
 ---
 <h3><a name="prepare" class="anchor" href="#prepare"><span class="octicon octicon-link"></span></a>Prepare</h2>
diff --git a/ru/about.html b/ru/about.html
index 70b1155..86be1ad 100644
--- a/ru/about.html
+++ b/ru/about.html
@@ -1,4 +1,5 @@
 ---
+category: ru
 layout: default
 comment: false
 share: true
diff --git a/ru/authors.html b/ru/authors.html
index 1625256..4cd0c1c 100644
--- a/ru/authors.html
+++ b/ru/authors.html
@@ -1,4 +1,5 @@
 ---
+category: ru
 layout: default
 comment: false
 share: false
diff --git a/ru/blog/index.html b/ru/blog/index.html
index 7b3ec25..6434136 100644
--- a/ru/blog/index.html
+++ b/ru/blog/index.html
@@ -1,4 +1,5 @@
 ---
+category: ru
 layout: default
 title: arcanis' blog
 comment: false
@@ -12,7 +13,7 @@ back: 1
       </header>
       <section>
 
-    {% for post in paginator.ruposts %}
+    {% for post in paginator.posts %}
       <h1><a name="{{ post.short }}" class="anchor" href="#{{ post.short }}"><span class="octicon octicon-link"></span></a><a href="{{ post.url }}">{{ post.title }}</a></h1>
       <p align="justify"><i>{{ post.date | date_to_string}}</i></p>
       <p align="justify">{{ post.description }}</p>
@@ -21,7 +22,7 @@ back: 1
 
     {% if paginator.total_pages > 1 %}
       {% if paginator.previous_page %}
-        <a href="{{ paginator.previous_page_path }}">&laquo; Prev</a>
+        <a href="/ru{{ paginator.previous_page_path }}">&laquo; Prev</a>
       {% else %}
         <span>&laquo; Prev</span>
       {% endif %}
@@ -30,14 +31,14 @@ back: 1
         {% if page == paginator.page %}
           <em>{{ page }}</em>
         {% elsif page == 1 %}
-          <a href="{{ '/blog' }}">{{ page }}</a>
+          <a href="{{ '/ru/blog' }}">{{ page }}</a>
         {% else %}
-          <a href="{{ site.paginate_path | replace: ':num', page }}">{{ page }}</a>
+          <a href="/ru{{ site.paginate_path | replace: ':num', page }}">{{ page }}</a>
         {% endif %}
       {% endfor %}
 
       {% if paginator.next_page %}
-        <a href="{{ paginator.next_page_path }}">Next &raquo;</a>
+        <a href="/ru{{ paginator.next_page_path }}">Next &raquo;</a>
       {% else %}
         <span>Next &raquo;</span>
       {% endif %}
diff --git a/ru/index.html b/ru/index.html
index b082297..1916b7a 100644
--- a/ru/index.html
+++ b/ru/index.html
@@ -1,4 +1,5 @@
 ---
+category: ru
 layout: default
 comment: false
 share: true
diff --git a/ru/projects/git-etc.html b/ru/projects/git-etc.html
index 382cc15..ad895a4 100644
--- a/ru/projects/git-etc.html
+++ b/ru/projects/git-etc.html
@@ -1,4 +1,5 @@
 ---
+category: ru
 layout: project
 title: git-etc
 short: git-etc
diff --git a/ru/projects/index.html b/ru/projects/index.html
index a40de91..d2ce11f 100644
--- a/ru/projects/index.html
+++ b/ru/projects/index.html
@@ -1,4 +1,5 @@
 ---
+category: ru
 layout: default
 title: arcanis' projects
 comment: false
diff --git a/ru/projects/oblikuestrategies.html b/ru/projects/oblikuestrategies.html
index 4f861f1..d3791c5 100644
--- a/ru/projects/oblikuestrategies.html
+++ b/ru/projects/oblikuestrategies.html
@@ -1,4 +1,5 @@
 ---
+category: ru
 layout: project
 title: Oblikue strategies
 short: oblikuestrategies
diff --git a/ru/projects/pytextmonitor.html b/ru/projects/pytextmonitor.html
index 916acf6..ea2524c 100644
--- a/ru/projects/pytextmonitor.html
+++ b/ru/projects/pytextmonitor.html
@@ -1,4 +1,5 @@
 ---
+category: ru
 layout: project
 title: py-text-monitor
 short: pytextmonitor
diff --git a/ru/projects/queued.html b/ru/projects/queued.html
index b2bf299..8216896 100644
--- a/ru/projects/queued.html
+++ b/ru/projects/queued.html
@@ -1,4 +1,5 @@
 ---
+category: ru
 layout: project
 title: queued
 short: queued