tIndentation improvements in HTML templates. - diasporadiaries - a platform for writing stories with personal accounts and messages [h|git clone git://parazyd.org/diasporadiaries.git|URL:git://parazyd.org/diasporadiaries.git|server|port] [1|Log|/git/diasporadiaries/log.gph|server|port] [1|Files|/git/diasporadiaries/files.gph|server|port] [1|Refs|/git/diasporadiaries/refs.gph|server|port] [1|Submodules|/git/diasporadiaries/file/.gitmodules.gph|server|port] [1|README|/git/diasporadiaries/file/README.md.gph|server|port] [1|LICENSE|/git/diasporadiaries/file/LICENSE.gph|server|port] --- [1|commit 1d55c5b1343242e0c9efaa25c5296f6abc64e95b|/git/diasporadiaries/commit/1d55c5b1343242e0c9efaa25c5296f6abc64e95b.gph|server|port] [1|parent b446ab9f04c30b95cd9964b7133ff766c1f4e4af|/git/diasporadiaries/commit/b446ab9f04c30b95cd9964b7133ff766c1f4e4af.gph|server|port] [h|Author: parazyd |URL:mailto:parazyd@dyne.org|server|port] Date: Wed, 23 Jan 2019 13:24:13 +0100 Indentation improvements in HTML templates. Diffstat: M templates/change_pass.html | 18 +++++++++--------- M templates/contact.html | 47 +++++++++++++++++-------------- M templates/country.html | 12 ++++++------ M templates/dashboard.html | 4 ++-- M templates/edit.html | 111 ++++++++++++++++--------------- M templates/fail.html | 6 +++--- M templates/following.html | 52 ++++++++++++++++--------------- M templates/index.html | 102 ++++++++++++++++---------------- M templates/login.html | 18 +++++++++--------- M templates/messages.html | 96 ++++++++++++++++---------------- M templates/profile.html | 129 ++++++++++++++++--------------- M templates/success.html | 6 +++--- M templates/success_write.html | 42 ++++++++++++++++---------------- M templates/view.html | 38 ++++++++++++++++++------------- M templates/write.html | 90 ++++++++++++++++---------------- 15 files changed, 393 insertions(+), 378 deletions(-) --- [1|diff --git a/templates/change_pass.html b/templates/change_pass.html|/git/diasporadiaries/file/templates/change_pass.html.gph|server|port] t@@ -16,20 +16,20 @@
-

Old password:
- -

+

Old password:
+ +

-

New Password:
- -

+

New Password:
+ +

- + - +
- {% include 'footer.html' %} +{% include 'footer.html' %} [1|diff --git a/templates/contact.html b/templates/contact.html|/git/diasporadiaries/file/templates/contact.html.gph|server|port] t@@ -6,35 +6,40 @@
-

Contact

-
+

Contact

+
-

You can contact us at elena@dyne.org - and parazyd.dyne.org

+

+ You can contact us at elena@dyne.org + and parazyd.dyne.org +

-

If you wish to donate funds to support Diaspora Diaries, you can - do so with a bank transfer or by sending us bitcoins:

+

If you wish to donate funds to support Diaspora Diaries, you + can do so with a bank transfer or by sending us bitcoins:

-

Bank transfer

-

People wanting to do a bank transfer can use the following - link: https://bunq.me/parazyd

+

Bank transfer

+

People wanting to do a bank transfer can use the following + link: https://bunq.me/parazyd

-

Bitcoin

-

If you prefer using Bitcoin, please consider sending transactions to the - following address:

-

1E5S4BrvonFGEgaNRLkX3GRw1yyP4FwrEn

+

Bitcoin

+

If you prefer using Bitcoin, please consider sending + transactions to the following address:

-

For ease of use, below is a QR code you can scan as well:

+

+ 1E5S4BrvonFGEgaNRLkX3GRw1yyP4FwrEn +

-

+

For ease of use, below is a QR code you can scan as well:

-

Thank you kindly! ❤️

+

-
-

Diaspora Diaries is free software! It is licensed with GNU Affero General - Public License v3 and the source code can be found on Github. +

Thank you kindly! ❤️

+ +
+

Diaspora Diaries is free software! It is licensed with GNU Affero General + Public License v3 and the source code can be found on Github.

[1|diff --git a/templates/country.html b/templates/country.html|/git/diasporadiaries/file/templates/country.html.gph|server|port] t@@ -6,12 +6,12 @@
- {% if filtered_stories %} -

{{ country }} diaries by people from {{ filtered_stories[0]['embarkname'] }}

- {% else %} -

{{ country }} diaries

- {% endif %} -
+ {% if filtered_stories %} +

{{ country }} diaries by people from {{ filtered_stories[0]['embarkname'] }}

+ {% else %} +

{{ country }} diaries

+ {% endif %} +
{% include 'gallery.html' %} [1|diff --git a/templates/dashboard.html b/templates/dashboard.html|/git/diasporadiaries/file/templates/dashboard.html.gph|server|port] t@@ -6,8 +6,8 @@
-

Dashboard - {{ listtype }} stories

-
+

Dashboard - {{ listtype }} stories

+
{% include 'gallery.html' %} [1|diff --git a/templates/edit.html b/templates/edit.html|/git/diasporadiaries/file/templates/edit.html.gph|server|port] t@@ -20,73 +20,74 @@
-

- -

- -
[1|diff --git a/templates/fail.html b/templates/fail.html|/git/diasporadiaries/file/templates/fail.html.gph|server|port] t@@ -6,10 +6,10 @@
-

Sorry!

-
+

Sorry!

+
-

{{ msg }}

+

{{ msg }}

[1|diff --git a/templates/following.html b/templates/following.html|/git/diasporadiaries/file/templates/following.html.gph|server|port] t@@ -6,36 +6,38 @@
-

Users you are following

-
- -
- {% if following %} - {% for i in following %} -
-
+

Users you are following

+
+ +
+ {% if following %} + + {% for i in following %} +
- - - -

{{ i[1] }}

-
-
- {% for i in countries %} +
+ + + +

{{ i[1] }}

+
+
+ {% for i in countries %} {{ i[1] }} - {% endfor %} -
-
- + {% endfor %} +
+
+ +
+
+ {% endfor %} + + {% else %} +

You aren't following anyone.

+ {% endif %}
-
- {% endfor %} - {% else %} -

You aren't following anyone.

- {% endif %} -
{% include 'footer.html' %} [1|diff --git a/templates/index.html b/templates/index.html|/git/diasporadiaries/file/templates/index.html.gph|server|port] t@@ -6,57 +6,57 @@
-

Diaspora Diaries

-
- -

This is a place where everyone that has an experience with living abroad - can write down their story.

- -

You can use your knowledge and the situations you have gone - through to help someone with similar problems, everyday frustrations or just - make them feel less alone. You can also write about the reasons and background - of your migration. After all, we are all just human beings in a search for - peace and happiness.

- -

Let your fellow humans know that they are surrounded with - others of their kind. Make them feel less scared and lonely.

- -

- GO AND WRITE DOWN YOUR - STORY! -

- - - - -
-

In this day and age, there are a lot of people migrating in a - search for a better life. People are changing towns, cities, states and even - continents in their quest for a better surroundings. They are searching for a - place where they can feel more at ease, chase their dreams or simply live - their life.

- -

Moving to a place different from the one you were born in, - accustomed to and familiar with is often a difficult and long process that can - be filled with a lot of misunderstandings and dead ends leading to frustration - and overwhelming feeling of loneliness.

- -

It is hard to walk through foreign streets, filled with busy - unfamiliar faces, signs, foreign languages, different climate and culture - trying to get your foot in the door and organize your new life. Every - community has its way of doing things, very often not so clearly explained. - It is natural to feel lost and confused.

- -

Person changing it’s environment has a fresh and highly - perceptive regard towards new culture and corresponding customs. They can spot - a bizarre rule of conduct from miles ahead. It is strange, it is funny, it is - useful.

- -
- -
-

Recent stories

- {% include 'gallery.html' %} +

Diaspora Diaries

+
+ +

This is a place where everyone that has an experience with living abroad + can write down their story.

+ +

You can use your knowledge and the situations you have gone + through to help someone with similar problems, everyday frustrations or just + make them feel less alone. You can also write about the reasons and + background of your migration. After all, we are all just human beings in a + search for peace and happiness.

+ +

Let your fellow humans know that they are surrounded with + others of their kind. Make them feel less scared and lonely.

+ +

+ GO AND WRITE DOWN YOUR + STORY! +

+ + + + +
+

In this day and age, there are a lot of people migrating + in a search for a better life. People are changing towns, cities, states + and even continents in their quest for a better surroundings. They are + searching for a place where they can feel more at ease, chase their dreams + or simply live their life.

+ +

Moving to a place different from the one you were born in, + accustomed to and familiar with is often a difficult and long process that + can be filled with a lot of misunderstandings and dead ends leading to + frustration and overwhelming feeling of loneliness.

+ +

It is hard to walk through foreign streets, filled with + busy unfamiliar faces, signs, foreign languages, different climate and + culture trying to get your foot in the door and organize your new life. + Every community has its way of doing things, very often not so clearly + explained. It is natural to feel lost and confused.

+ +

Person changing it’s environment has a fresh and highly + perceptive regard towards new culture and corresponding customs. They can + spot a bizarre rule of conduct from miles ahead. It is strange, it is + funny, it is useful.

+
+ +
+

Recent stories

+ + {% include 'gallery.html' %}
[1|diff --git a/templates/login.html b/templates/login.html|/git/diasporadiaries/file/templates/login.html.gph|server|port] t@@ -11,18 +11,18 @@
-

Email:
- -

+

Email:
+ +

-

Password:
- -

+

Password:
+ +

- + - -
+ +
[1|diff --git a/templates/messages.html b/templates/messages.html|/git/diasporadiaries/file/templates/messages.html.gph|server|port] t@@ -6,62 +6,62 @@
- {% if them %} -

Messages with {{ them['name'] }}

- {% else %} -

Messages

- {% endif %} -
+ {% if them %} +

Messages with {{ them['name'] }}

+ {% else %} +

Messages

+ {% endif %} +
- {% if not single %} -
- - - - - - - - - - {% for i in messages %} - - - - - - {% endfor %} - -
FromLatestAt
{{ i[0] }}{{ i[2]['message'] }}{{ i[2]['time'] }}
-
- {% else %} + {% if not single %} +
+ + + + + + + + + + {% for i in messages %} + + + + + + {% endfor %} + +
FromLatestAt
{{ i[0] }}{{ i[2]['message'] }}{{ i[2]['time'] }}
+
+ {% else %} -
-
-
-

Reply:

- - -
- -

- +
+
+
+

Reply:

+ + +
+ +

+ - {% if not messages %} -

No messages.

- {% endif %} + {% if not messages %} +

No messages.

+ {% endif %} - {% for i in messages %} + {% for i in messages %}
-

{{ i['message'] }}

-
{{ i['from'] }} - {{ i['time'] }}
+

{{ i['message'] }}

+
{{ i['from'] }} - {{ i['time'] }}
- {% endfor %} + {% endfor %} -
- < back - {% endif %} +
+ < back + {% endif %}
[1|diff --git a/templates/profile.html b/templates/profile.html|/git/diasporadiaries/file/templates/profile.html.gph|server|port] t@@ -6,80 +6,81 @@
-

Diaries by {{ name }}

-
+

Diaries by {{ name }}

+
-
- {% if current_user.id == uid %} - People you follow - Change your password -
- {% else %} -
- - {% if is_following %} - - - {% else %} - - - {% endif %} -
- {% endif %} -
-
+
+ {% if current_user.id == uid %} + People you follow + Change your password +
+ {% else %} +
+ + {% if is_following %} + + + {% else %} + + + {% endif %} +
+ {% endif %} +
+
{% include 'gallery.html' %} - {% if current_user.is_active %} -
-
- Send PM - -
+ {% if current_user.is_active %} +
+
+ Send PM + +
-
[1|diff --git a/templates/success.html b/templates/success.html|/git/diasporadiaries/file/templates/success.html.gph|server|port] t@@ -6,10 +6,10 @@
-

Success.

-
+

Success.

+
-

{{ msg }}

+

{{ msg }}

[1|diff --git a/templates/success_write.html b/templates/success_write.html|/git/diasporadiaries/file/templates/success_write.html.gph|server|port] t@@ -6,36 +6,36 @@
-

Story submitted!

-
+

Story submitted!

+
-

Thank you for writing your story!

+

Thank you for writing your story!

-

Your story will be read and approved by someone from the - crew.

+

Your story will be read and approved by someone from the + crew.

-

Bookmark or copy the following link if you ever wish to delete - your post:

+

Bookmark or copy the following link if you ever wish to + delete your post:

-

{{ request.host_url }}delete?key={{ delkey }}

+

{{ request.host_url }}delete?key={{ delkey }}

- {% if new %} -

Since you've left your email, we've created credentials - for you. This will enable you to send and recieve messages, and have a - profile page.

+ {% if new %} +

Since you've left your email, we've created credentials for + you. This will enable you to send and recieve messages, and have a profile + page.

-

Your email is kept privately and will not be used for - any purposes other than identifying your account in the database. - It's the easiest way for us unfortunately.

+

Your email is kept privately and will not be used for + any purposes other than identifying your account in the database. + It's the easiest way for us unfortunately.

-

To log in, use your email address and the following password: - {{ new }}

+

To log in, use your email address and the following + password: {{ new }}

-

If you wish to delete your account, don't hesitate to contact - us via email.

+

If you wish to delete your account, don't hesitate to + contact us via email.

- {% endif %} -

You can return to the homepage now.

+ {% endif %} +

You can return to the homepage now.

[1|diff --git a/templates/view.html b/templates/view.html|/git/diasporadiaries/file/templates/view.html.gph|server|port] t@@ -8,30 +8,36 @@ {% if story %} -

{{ story['name'] }} in {{ story['disembarkname'] }}

-
+

{{ story['name'] }} in {{ story['disembarkname'] }}

+
-

by {{ story['name'] }}, {{ story['date'] }} {{ story['time'] }}

- {% if current_user.is_admin %} - Edit - Hide -
- {% endif %} +

+ by {{ story['name'] }}, {{ story['date'] }} {{ story['time'] }} + {% if story['city'] %} +
in story['city'] + {% endif %} +

- {{ story['story']|safe }} + {% if current_user.is_admin %} + Edit + Hide +
+ {% endif %} -
- < back + {{ story['story']|safe }} - {% else %} +
+ < back -

Error!

+ {% else %} -

No story with this story id.

+

Error!

-

You can return to the homepage now.

+

No story with this story id.

- {% endif %} +

You can return to the homepage now.

+ + {% endif %}
[1|diff --git a/templates/write.html b/templates/write.html|/git/diasporadiaries/file/templates/write.html.gph|server|port] t@@ -20,51 +20,51 @@
-
-
-

Name:
- {% if current_user.name %} - - {% else %} - - {% endif %} -

- -

Country of embarkment:
- - -

- -

Country of disembarkment:
- - -

- -

City of the story:
- -

- -

Email:
- {% if current_user.username %} - - {% else %} - - {% endif %} -

- - - -

Write your story:
- -

- - -
-
+
+
+

Name:
+ {% if current_user.name %} + + {% else %} + + {% endif %} +

+ +

Country of embarkment:
+ + +

+ +

Country of disembarkment:
+ + +

+ +

City of the story:
+ +

+ +

Email:
+ {% if current_user.username %} + + {% else %} + + {% endif %} +

+ + + +

Write your story:
+ +

+ + +
+