From 321c29cbcf205152f4676e20f1664c437589ff9f Mon Sep 17 00:00:00 2001 From: arcan1s Date: Tue, 29 Jul 2014 21:42:42 +0400 Subject: [PATCH] edited patterns and main english pages --- 404.html | 25 +++++------ _includes/comment.html | 4 +- _includes/cse.html | 2 +- _includes/footer_back.html | 4 +- _includes/footer_fullback.html | 12 +++-- _includes/footer_sharethis.html | 10 ++--- _includes/footer_sign.html | 16 ++++--- _includes/google_analytics.html | 4 +- _includes/header_sharethis.html | 2 +- _layouts/default.html | 29 ++++++------ _layouts/paper.html | 14 +++--- _layouts/project.html | 42 ++++++++--------- about.html | 60 +++++++++++++++---------- authors.html | 24 +++++----- feed-short.xml | 46 +++++++++---------- feed.xml | 50 +++++++++++---------- index.html | 29 ++++++------ resources/css/styles.css | 13 ++++++ resources/preview/photo_siicm_prev.jpg | Bin 81941 -> 25757 bytes 19 files changed, 213 insertions(+), 173 deletions(-) diff --git a/404.html b/404.html index 1331d32..f5ef018 100644 --- a/404.html +++ b/404.html @@ -3,17 +3,17 @@ - Error 404 - - - + {{ page.title }} + + + - - - + + + @@ -24,7 +24,7 @@
- - + diff --git a/_includes/comment.html b/_includes/comment.html index 3acb6a5..330b1d9 100644 --- a/_includes/comment.html +++ b/_includes/comment.html @@ -2,7 +2,7 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/_includes/cse.html b/_includes/cse.html index 7d1db5a..1d1cb03 100644 --- a/_includes/cse.html +++ b/_includes/cse.html @@ -1,4 +1,4 @@ - + diff --git a/_includes/header_sharethis.html b/_includes/header_sharethis.html index e9439fc..4a84c6a 100644 --- a/_includes/header_sharethis.html +++ b/_includes/header_sharethis.html @@ -1,3 +1,3 @@ - + diff --git a/_layouts/default.html b/_layouts/default.html index 0a8b9da..e88258c 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -4,23 +4,27 @@ {{ page.title }} - - - + + + - - - + + + {% if page.category == "ru" %} - - + + {% else %} - - + + {% endif %} {% include google_analytics.html %} {% if page.share == true %} @@ -47,7 +51,6 @@ {% include footer_sign.html %} - - + diff --git a/_layouts/paper.html b/_layouts/paper.html index 3374b90..bb2dab7 100644 --- a/_layouts/paper.html +++ b/_layouts/paper.html @@ -12,15 +12,15 @@ layout: default

{% include shortdate_to_ru.html %}

Тэги: {{ page.tags }}

{% if page.tags contains 'offtop' %} - + {% else %}

Похожие посты:
{% for post in site.related_posts limit:5 %} {% if post.tags contains 'offtop' %} - + {% else %} {% if post.category == "ru" %} - {{ post.title }}
+ {{ post.title }}
{% endif %} {% endif %} {% endfor %} @@ -30,15 +30,15 @@ layout: default

{{ page.date | date_to_string }}

Tags: {{ page.tags }}

{% if page.tags contains 'offtop' %} - + {% else %}

Related posts:
{% for post in site.related_posts limit:5 %} {% if post.tags contains 'offtop' %} - + {% else %} {% if post.category != "ru" %} - {{ post.title }}
+ {{ post.title }}
{% endif %} {% endif %} {% endfor %} @@ -48,7 +48,7 @@ layout: default

-

{{ page.title }}

+

{{ page.title }}

{{ page.description }}

{{ content }} diff --git a/_layouts/project.html b/_layouts/project.html index 700677e..15fd42c 100644 --- a/_layouts/project.html +++ b/_layouts/project.html @@ -10,32 +10,32 @@ layout: default

{{ page.title }}

{% if page.category == "ru" %} - Общая информация
- Установка
- Использование
- Настройка
+ Общая информация
+ Установка
+ Использование
+ Настройка
{% if page.hasgui == true %} - Графический интерфейс
- Скриншоты
+ Графический интерфейс
+ Скриншоты
{% endif %} - Ссылки + Ссылки {% else %} - General information
- Installation guide
- How to use
- Configuration
+ General information
+ Installation guide
+ How to use
+ Configuration
{% if page.hasgui == true %} - GUI
- Screenshots
+ GUI
+ Screenshots
{% endif %} - Links + Links {% endif %}

{% if page.category == "ru" %} - Сообщить о баге + Сообщить о баге {% else %} - Report a bug + Report a bug {% endif %}

@@ -44,17 +44,17 @@ layout: default {{ content }} {% if page.category == "ru" %} -

Ссылки

+

Ссылки

  • Репозиторий на GitHub
  • Последний релиз
    • {% else %} -

    Links

    +

    Links

    • GitHub repo
    • Latest release
      • {% endif %} -{% for link in page.links %} -
    • {{ link }}
      • -{% endfor %} + {% for link in page.links %} +
    • {{ link }}
      • + {% endfor %}
    diff --git a/about.html b/about.html index 1036431..288edfe 100644 --- a/about.html +++ b/about.html @@ -10,19 +10,22 @@ title: About me

    {{ page.title }}

    - -

    GitHub Profile
    - TU Profile on archlinux.org
    - Some of my publications
    - PGP signature: 0x31361F01
    - Public keys

    +

    + GitHub Profile
    + TU Profile on archlinux.org
    + Some of my publications
    + PGP signature: 0x31361F01
    + Public keys +

    Contacts

    -

    Alias: arcanis/arcan1s
    - IRC: arcan1s
    - ICQ: 407-398-235
    - Jabber: arcanis (at) jabber (dot) ru
    - E-mail: darkarcanis (at) mail (dot) ru

    +

    + Alias: arcanis/arcan1s
    + IRC: arcan1s
    + ICQ: 407-398-235
    + Jabber: arcanis (at) jabber (dot) ru
    + E-mail: darkarcanis (at) mail (dot) ru +

    @@ -34,31 +37,42 @@ GS/CS d-(+) s: a-- C++++ UL+++>$ P L++ E--- W++ N !o !K w- !O M- !V PS+@ PE Y PG ------END GEEK CODE BLOCK------ {% endhighlight %} -

    -

    Photo by Grineva O.V.

    +
    + + Photo + +
    Photo by Grineva O.V.
    +
    -

    My name is Evgeniy Alekseev and I'm from Siberia (seriously, I was born in Siberia). In the global Internet I have usually nickname arcan1s, but in the Russian segment it is usually arcanis. I'm a graduate of the Department of Chemistry, Moscow State University and now I'm a PhD student and working in my University. My speciality is a theoretical chemistry (like molecular physics and some of quantum chemistry).

    +

    My name is Evgeniy Alekseev and I'm from Siberia (seriously, I was born in Siberia). In the global Internet I have usually nickname arcan1s, but in the Russian segment it is usually arcanis. I'm a graduate of the Department of Chemistry Moscow State University and now I'm a PhD student and working in my University. My speciality is a theoretical chemistry (like molecular physics and some of quantum chemistry).

    -

    At leisure I write small applications on C, C++ and Python (and some application scripts on Shell). In order not to seem like a bearded nerd sometimes I listen music and read Robert Jordan's or George R.R. Martin's books (or other similar). (But my friends tell me that I still look like a bearded nerd.) Music that I usually listen may be found on my home server.

    +

    At leisure I write small applications on C, C++ and Python (and some application scripts on Shell). In order not to seem like a bearded nerd sometimes I listen music and read Robert Jordan's or George R.R. Martin's books (or other similar). (But my friends tell me that I still look like a bearded nerd.) Music that I usually listen may be found on my home server.

    -

    Also I'm an Archlinux user (maybe that's why I look like a bearded nerd). And in October 2013 I became an Archlinux Trusted User:

    +

    Also I'm an Archlinux user (maybe that's why I look like a bearded nerd). And in October 2013 I became an Archlinux Trusted User:

    -The Trusted User (TU) is a member of the community charged with keeping the AUR in working order. He/she maintains popular packages (communicating with and sending patches upstream as needed), and votes in administrative matters. A TU is elected from active community members by current TUs in a democratic process. TUs are the only members who have a final say in the direction of the AUR.
    -

    © ArchWiki

    + The Trusted User (TU) is a member of the community charged with keeping the AUR in working order. He/she maintains popular packages (communicating with and sending patches upstream as needed), and votes in administrative matters. A TU is elected from active community members by current TUs in a democratic process. TUs are the only members who have a final say in the direction of the AUR. + +

    + © ArchWiki +

    All contact information can be found on the left. Feel free to contact me with any questions. Oh, wait! If you will write me to ICQ or jabber you must correctly answer antispam bot's question first. The question is:

    + {% highlight c %} int i = 1; i = ++i + ++i; return i; {% endhighlight %} +

    And the correct answer is 5 (or 6, as you wish).

    diff --git a/authors.html b/authors.html index cc4148a..42d0a48 100644 --- a/authors.html +++ b/authors.html @@ -13,22 +13,24 @@ title: Authors
    -

    The code and content of this site is licensed under Beerware license:

    -

    "THE BEER-WARE LICENSE" (Revision 42):
    -Evgeniy Alekseev wrote this file. As long as you retain this notice you can do whatever you want with this stuff. If we meet some day, and you think this stuff is worth it, you can buy me a beer in return.

    +

    The code and content of this site is licensed under Beerware license:

    +
    + "THE BEER-WARE LICENSE" (Revision 42):
    + Evgeniy Alekseev wrote this file. As long as you retain this notice you can do whatever you want with this stuff. If we meet some day, and you think this stuff is worth it, you can buy me a beer in return. +

    This site uses:

    -

    Special thanks to Monztruo, I borrowed his icon.

    +

    Special thanks to Monztruo, I borrowed his icon.

    © Evgeniy Alekseev, 2014-{{ site.time | date: '%Y' }}

    diff --git a/feed-short.xml b/feed-short.xml index 27dad08..e4c3f7e 100644 --- a/feed-short.xml +++ b/feed-short.xml @@ -3,28 +3,28 @@ layout: none --- - - arcanis' blog - arcanis' blog (title only) - {{ site.url }} - - {{ site.url }}/resources/icon-35x35.png - arcanis' blog - {{ site.url }} - - - {% for post in site.categories.en limit:10 %} - {% if post.tags contains 'offtop' %} + + arcanis' blog + arcanis' blog (title only) + {{ site.url }} + + {{ site.url }}/resources/icon-35x35.png + arcanis' blog + {{ site.url }} + + + {% for post in site.categories.en limit:10 %} + {% if post.tags contains 'offtop' %} - {% else %} - - {{ post.title | xml_escape }} - {{ post.description | xml_escape }} - {{ post.date | date: "%a, %d %b %Y %H:%M:%S %z" }} - {{ site.url }}{{ post.url }} - {{ site.url }}{{ post.url }} - - {% endif %} - {% endfor %} - + {% else %} + + {{ post.title | xml_escape }} + {{ post.description | xml_escape }} + {{ post.date | date: "%a, %d %b %Y %H:%M:%S %z" }} + {{ site.url }}{{ post.url }} + {{ site.url }}{{ post.url }} + + {% endif %} + {% endfor %} + diff --git a/feed.xml b/feed.xml index abe3889..3a6e1c0 100644 --- a/feed.xml +++ b/feed.xml @@ -3,29 +3,31 @@ layout: none --- - - arcanis' blog - arcanis' blog - {{ site.url }} - - {{ site.url }}/resources/icon-35x35.png - arcanis' blog - {{ site.url }} - - - {% for post in site.categories.en limit:10 %} - {% if post.tags contains 'offtop' %} + + arcanis' blog + arcanis' blog + {{ site.url }} + + {{ site.url }}/resources/icon-35x35.png + arcanis' blog + {{ site.url }} + + + {% for post in site.categories.en limit:10 %} + {% if post.tags contains 'offtop' %} - {% else %} - - {{ post.title | xml_escape }} - {{ post.description | xml_escape }} - {{ post.content | xml_escape}} - {{ post.date | date: "%a, %d %b %Y %H:%M:%S %z" }} - {{ site.url }}{{ post.url }} - {{ site.url }}{{ post.url }} - - {% endif %} - {% endfor %} - + {% else %} + + {{ post.title | xml_escape }} + + {{ post.description | xml_escape }} + {{ post.content | xml_escape}} + + {{ post.date | date: "%a, %d %b %Y %H:%M:%S %z" }} + {{ site.url }}{{ post.url }} + {{ site.url }}{{ post.url }} + + {% endif %} + {% endfor %} + diff --git a/index.html b/index.html index a7fbb8d..6f31cd0 100644 --- a/index.html +++ b/index.html @@ -10,26 +10,25 @@ title: arcanis' homepage

    {{ page.title }}

    - -

    Projects
    - Repository

    -

    About me

    +

    Projects
    + Repository

    +

    About me

    -