From aa854f3bbcc740a8792551ab50d714331f110623 Mon Sep 17 00:00:00 2001 From: r4sas Date: Sat, 28 Jan 2017 12:22:48 +0300 Subject: [PATCH] fixed tabulation --- pyi2phosts/templates/404.html | 2 +- pyi2phosts/templates/500.html | 2 +- pyi2phosts/templates/base.html | 109 +++++++++--------- pyi2phosts/templates/browse.html | 30 ++--- pyi2phosts/templates/contacts.html | 10 +- pyi2phosts/templates/faq.html | 24 ++-- pyi2phosts/templates/index.html | 88 +++++++------- pyi2phosts/templates/latest.html | 2 +- pyi2phosts/templates/paginator.html | 50 ++++---- pyi2phosts/templates/policy.html | 20 ++-- pyi2phosts/templates/postkey.html | 12 +- .../templates/subdomain_http_verify.html | 10 +- 12 files changed, 179 insertions(+), 180 deletions(-) diff --git a/pyi2phosts/templates/404.html b/pyi2phosts/templates/404.html index 5c2b33a..8a05b63 100644 --- a/pyi2phosts/templates/404.html +++ b/pyi2phosts/templates/404.html @@ -1,5 +1,5 @@ {% extends "base.html" %} {% block content %} -

404 Not Found

+

404 Not Found

{% endblock %} diff --git a/pyi2phosts/templates/500.html b/pyi2phosts/templates/500.html index c50af92..d430a40 100644 --- a/pyi2phosts/templates/500.html +++ b/pyi2phosts/templates/500.html @@ -1,5 +1,5 @@ {% extends "base.html" %} {% block content %} -

500 Internal server error

+

500 Internal server error

{% endblock %} diff --git a/pyi2phosts/templates/base.html b/pyi2phosts/templates/base.html index a55ac1e..83182a0 100644 --- a/pyi2phosts/templates/base.html +++ b/pyi2phosts/templates/base.html @@ -1,65 +1,64 @@ {% load i18n %} - - - {% block title %} - {{ title }} - {% endblock %} - - {% block head %} - {% endblock %} - - - -
-
- - -
-
+ + + {% block title %} + {{ title }} + {% endblock %} + + {% block head %} + {% endblock %} + + + +
+
+ + +
+
- {% block navigation %} -
- -
+ {% block navigation %} +
+ +
-
- {% csrf_token %} - {% for lang in LANGUAGES %} - - {{ lang.0 }} - {% endfor %} - -
+
+ {% csrf_token %} + {% for lang in LANGUAGES %} + + {{ lang.0 }} + {% endfor %} + +
- {% endblock %} + {% endblock %} -
- {% block header %} - {% endblock %} +
+ {% block header %} + {% endblock %} - {% block content %} - {% endblock %} -
+ {% block content %} + {% endblock %} +
- {% block footer %} -
-
- {% block footer-addon %} - {% endblock %} - {% trans "powered-by" %}: py-i2phosts -
- {% endblock %} - + {% block footer %} +
+
+ {% block footer-addon %} + {% endblock %} + {% trans "powered-by" %}: py-i2phosts +
+ {% endblock %} + - diff --git a/pyi2phosts/templates/browse.html b/pyi2phosts/templates/browse.html index b15bc76..dceab68 100644 --- a/pyi2phosts/templates/browse.html +++ b/pyi2phosts/templates/browse.html @@ -9,28 +9,28 @@ {% block content %} {% block table_header %} - + {% endblock table_header %} - {% for host in host_list %} - - - {% endfor %} + {% for host in host_list %} + + + {% endfor %}
{% trans "Host" %}{% trans "Last seen" %}{% trans "Date added" %}{% trans "Description" %}
{% trans "Host" %}{% trans "Last seen" %}{% trans "Date added" %}{% trans "Description" %}
{{ host.name }}{{ host.last_seen }}{{ host.date_added }}{{ host.description }}
{{ host.name }}{{ host.last_seen }}{{ host.date_added }}{{ host.description }}
{% if is_paginated %}
- {% if page_obj.has_previous %} - - < Prev - - {% endif %} + {% if page_obj.has_previous %} + + < Prev + + {% endif %} - Page {{ page_obj.number }} of {{ paginator.num_pages }} + Page {{ page_obj.number }} of {{ paginator.num_pages }} - {% if page_obj.has_next %} - Next > - {% endif %} - {{ paginator.count }} {% trans "hosts total" %} + {% if page_obj.has_next %} + Next > + {% endif %} + {{ paginator.count }} {% trans "hosts total" %} {% endif %} diff --git a/pyi2phosts/templates/contacts.html b/pyi2phosts/templates/contacts.html index 7be1b89..f5ee3f6 100644 --- a/pyi2phosts/templates/contacts.html +++ b/pyi2phosts/templates/contacts.html @@ -5,17 +5,17 @@ {% blocktrans %}

Direct contact methods:

{% endblocktrans %} {% blocktrans %}

Public discussions about service, feedback, proposals and feature requests

{% endblocktrans %} {% endblock %} diff --git a/pyi2phosts/templates/faq.html b/pyi2phosts/templates/faq.html index 986116f..4af70da 100644 --- a/pyi2phosts/templates/faq.html +++ b/pyi2phosts/templates/faq.html @@ -4,24 +4,24 @@ {% block content %}

{% trans "How we are learning about new hosts" %}

    -
  1. {% trans "Pulling from external sources:" %} -
      - {% for source in sources_list %} -
    • {{ source.url }}
      • - {% endfor %} -
    -
    2. -
  2. {% trans "Adding through our service." %} -
    3. +
  3. {% trans "Pulling from external sources:" %} +
      + {% for source in sources_list %} +
    • {{ source.url }}
      • + {% endfor %} +
    +
    4. +
  4. {% trans "Adding through our service." %} +
{% blocktrans %}

Publishing requirements

To get published a host must meet the following criteria:

Admin's approval isn't really necessary, it is only needed in order to eliminate possible hijacking and mass registration attempts. diff --git a/pyi2phosts/templates/index.html b/pyi2phosts/templates/index.html index d604a7c..17edb91 100644 --- a/pyi2phosts/templates/index.html +++ b/pyi2phosts/templates/index.html @@ -2,55 +2,55 @@ {% load i18n %} {% block content %} - {% url 'faq' as faq_url %} - {% blocktrans %} -

About

-

{{ title }} is a domain name registration service for I2P. Hostnames in I2P aren't - globally unique. {{ title }} doesn't act as "central authority", it only provides a - way to publish hosts as an easy means of access to them. You can read more about how - I2P naming works in the official - docs. -

+ {% url 'faq' as faq_url %} + {% blocktrans %} +

About

+

{{ title }} is a domain name registration service for I2P. Hostnames in I2P aren't + globally unique. {{ title }} doesn't act as "central authority", it only provides a + way to publish hosts as an easy means of access to them. You can read more about how + I2P naming works in the official + docs. +

-

To find out how we're registering and publishing hosts, look at - FAQ page. -

- {% endblocktrans %} +

To find out how we're registering and publishing hosts, look at + FAQ page. +

+ {% endblocktrans %} - {% blocktrans %} -

Addressbook service

-

- To start getting new hostnames from {{ title }}, add this - subscription link into your router's - addressbook. Of course, you should add INR's destination before. -

- {% endblocktrans %} + {% blocktrans %} +

Addressbook service

+

+ To start getting new hostnames from {{ title }}, add this + subscription link into your router's + addressbook. Of course, you should add INR's destination before. +

+ {% endblocktrans %} - {% url 'pyi2phosts.jump.views.jumper' 'example.i2p' as jump_url %} - {% url 'pyi2phosts.jump.views.index' as jump_index %} - {% blocktrans %} -

Jump service

- {{ title }} also provides a jump service. For accessing hosts through it, - use urls like - - http://{{ domain }}{{ jump_url }}. - I2P since 0.8.3 gives possibility to add a custom jump-servers. Go to the i2ptunnel - eeproxy configuration page - and add http://{{ domain }}{{ jump_index }} to "Jump URL List" section. -

- {% endblocktrans %} + {% url 'pyi2phosts.jump.views.jumper' 'example.i2p' as jump_url %} + {% url 'pyi2phosts.jump.views.index' as jump_index %} + {% blocktrans %} +

Jump service

+ {{ title }} also provides a jump service. For accessing hosts through it, + use urls like + + http://{{ domain }}{{ jump_url }}. + I2P since 0.8.3 gives possibility to add a custom jump-servers. Go to the i2ptunnel + eeproxy configuration page + and add http://{{ domain }}{{ jump_index }} to "Jump URL List" section. +

+ {% endblocktrans %} - {% url 'pyi2phosts.postkey.views.addkey' as addkey_url %} - {% blocktrans %} -

Registration service

-

If you are running an eepsite or another service and want a human-readable domain name - for them, consider registering it. -

- {% endblocktrans %} + {% url 'pyi2phosts.postkey.views.addkey' as addkey_url %} + {% blocktrans %} +

Registration service

+

If you are running an eepsite or another service and want a human-readable domain name + for them, consider registering it. +

+ {% endblocktrans %} {% endblock %} {% block footer-addon %} - b32 | {% trans "add" %} | + b32 | {% trans "add" %} | {% endblock %} diff --git a/pyi2phosts/templates/latest.html b/pyi2phosts/templates/latest.html index 35592e4..013696d 100644 --- a/pyi2phosts/templates/latest.html +++ b/pyi2phosts/templates/latest.html @@ -9,5 +9,5 @@ {% endblock %} {% block table_header %} - + {% endblock table_header %} diff --git a/pyi2phosts/templates/paginator.html b/pyi2phosts/templates/paginator.html index 62ae9b2..050197d 100644 --- a/pyi2phosts/templates/paginator.html +++ b/pyi2phosts/templates/paginator.html @@ -1,28 +1,28 @@
- {% if has_previous %} - - < Prev - - {% endif %} + {% if has_previous %} + + < Prev + + {% endif %} - {% if show_first %} - 1 - ... - {% endif %} - {% for linkpage in page_numbers %} - {% ifequal linkpage page %} - {{ page }} - {% else %} - {{ linkpage }} - {% endifequal %} - {% endfor %} - {% if show_last %} - ... - {{ pages }} - {% endif %} - {% if has_next %} - Next > - {% endif %} - {{ paginator.count }} total + {% if show_first %} + 1 + ... + {% endif %} + {% for linkpage in page_numbers %} + {% ifequal linkpage page %} + {{ page }} + {% else %} + {{ linkpage }} + {% endifequal %} + {% endfor %} + {% if show_last %} + ... + {{ pages }} + {% endif %} + {% if has_next %} + Next > + {% endif %} + {{ paginator.count }} total
diff --git a/pyi2phosts/templates/policy.html b/pyi2phosts/templates/policy.html index 4e32f7b..d484aff 100644 --- a/pyi2phosts/templates/policy.html +++ b/pyi2phosts/templates/policy.html @@ -2,14 +2,14 @@

{% trans "Domain name registration policy" %}

diff --git a/pyi2phosts/templates/postkey.html b/pyi2phosts/templates/postkey.html index e1cd91e..9946e4f 100644 --- a/pyi2phosts/templates/postkey.html +++ b/pyi2phosts/templates/postkey.html @@ -3,10 +3,10 @@ {% block content %} {% include "policy.html" %} - - {% csrf_token %} -

{% trans "Enter your domain details" %}

- {{ form.as_p }} - - + + {% csrf_token %} +

{% trans "Enter your domain details" %}

+ {{ form.as_p }} + + {% endblock %} diff --git a/pyi2phosts/templates/subdomain_http_verify.html b/pyi2phosts/templates/subdomain_http_verify.html index 6d4dcdc..0e1ba43 100644 --- a/pyi2phosts/templates/subdomain_http_verify.html +++ b/pyi2phosts/templates/subdomain_http_verify.html @@ -15,10 +15,10 @@ This file should be accessible via http://{{ topdomain }}/«filename»

{% endblocktrans %} - - {% csrf_token %} - {{ form.as_p }} - - + + {% csrf_token %} + {{ form.as_p }} + + {% endblock %}
{% trans "Host" %}{% trans "Last seen" %}{% trans "Date added" %}{% trans "Description" %}
{% trans "Host" %}{% trans "Last seen" %}{% trans "Date added" %}{% trans "Description" %}