-
-
-
- {% endif %}
+ {% endif %}
+
+
+
Shoutbox
+ {% if not shouts %}
+
+
No shouts.
+ {% endif %}
-
-
Shoutbox
- {% if not shouts %}
-
-
No shouts.
- {% endif %}
- {% for i in shouts %}
+ {% for i in shouts %}
+
+
+ {{ i['message'] }}
+
+
+ {% endfor %}
-
- {{ i['message'] }}
-
-
- {% endfor %}
-
[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 @@
-
+