summaryrefslogtreecommitdiff
path: root/ishtar_common/templates/ishtar
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar_common/templates/ishtar')
-rw-r--r--ishtar_common/templates/ishtar/blocks/news_feed.html5
-rw-r--r--ishtar_common/templates/ishtar/forms/profile.html8
2 files changed, 11 insertions, 2 deletions
diff --git a/ishtar_common/templates/ishtar/blocks/news_feed.html b/ishtar_common/templates/ishtar/blocks/news_feed.html
new file mode 100644
index 000000000..63524303a
--- /dev/null
+++ b/ishtar_common/templates/ishtar/blocks/news_feed.html
@@ -0,0 +1,5 @@
+{% load i18n %}
+{% if news_feed %}<div class="container card p-3">
+ <h3><i class="fa fa-newspaper-o" aria-hidden="true"></i> &nbsp;{% trans "Latest forum entries" %}</h3>
+ {{ news_feed|safe }}
+</div>{% endif %}
diff --git a/ishtar_common/templates/ishtar/forms/profile.html b/ishtar_common/templates/ishtar/forms/profile.html
index 795ab6ab1..f4e3f5b41 100644
--- a/ishtar_common/templates/ishtar/forms/profile.html
+++ b/ishtar_common/templates/ishtar/forms/profile.html
@@ -14,7 +14,6 @@ $(document).ready(function(){
{% block content %}
<div class="container">
-<h2>{{page_name}}</h2>
<div class='form'>
{% if form.non_field_errors %}
@@ -30,9 +29,14 @@ $(document).ready(function(){
</div>{% endif %}
{% endfor %}
+ <h2>{% trans "Edit user preferences" %}</h2>
+ <h3>{% trans "Global preferences" %}</h3>
<div class="form-row">
{% for field in form.visible_fields %}
- {% if forloop.counter0 == 0 %}
+ {% if forloop.counter0 == 2 %}
+ </div>
+ <h3>{% trans "Current profile" %}</h3>
+ <div class="form-row">
<div class="form-group col-12"><div class="col-lg-6">
{{field|bs_field|safe}}
</div></div>