Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into survey4operators
Browse files Browse the repository at this point in the history
* origin/master:
  Fixed the english text for the start page description. (#65)
  chg: [templates] updated default index Django admin template in order to add links to different admin tools.
  • Loading branch information
Ruslan Baidan committed Dec 15, 2021
2 parents 8b1b2fb + 700b40a commit 5af1786
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 95 deletions.
2 changes: 1 addition & 1 deletion admin/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
from admin import views

urlpatterns = [
path("export-survey", views.export_survey_json),
path("export/survey.json", views.export_survey_json),
]
2 changes: 1 addition & 1 deletion locale/de/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -5588,7 +5588,7 @@ msgstr ""

#: templates/survey/start.html:21
msgid ""
"We need a little information to be able to give you useful recommendations, "
"We need this information to be able to give you useful recommendations, "
"once the self-assessment is done."
msgstr ""
"Benötigen wir einige Informationen, um Ihnen nützliche Empfehlungen geben zu "
Expand Down
2 changes: 1 addition & 1 deletion locale/django.pot
Original file line number Diff line number Diff line change
Expand Up @@ -4513,6 +4513,6 @@ msgstr ""

#: templates/survey/start.html:21
msgid ""
"We need a little information to be able to give you useful recommendations, "
"We need this information to be able to give you useful recommendations, "
"once the self-assessment is done."
msgstr ""
2 changes: 1 addition & 1 deletion locale/fr/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -5621,7 +5621,7 @@ msgstr "Votre adresse électronique ne sera pas conservée."

#: templates/survey/start.html:21
msgid ""
"We need a little information to be able to give you useful recommendations, "
"We need this information to be able to give you useful recommendations, "
"once the self-assessment is done."
msgstr ""
"Nous avons besoin de quelques informations pour pouvoir vous faire des "
Expand Down
5 changes: 3 additions & 2 deletions stats/urls.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# -*- coding: utf-8 -*-

from django.urls import path

from stats import views

app_name = 'stats'

urlpatterns = [
path("", views.index),
path("", views.index, name="index"),
]
23 changes: 23 additions & 0 deletions templates/admin/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{% extends "admin/base_site.html" %}
{% load i18n apptags static admin_urls %}

{% block breadcrumbs %}<div class="breadcrumbs"><a href="{% url 'admin:index' %}">{% trans 'Home' %}</a> › Translations management</div>{% endblock %}

{% block content %}

<div id="content-main">
<div class="row">
<div class="col">
<h1>Data management</h1>
<p>Export the current survey (questions, answers, recommendations and sections): <a href="/admin/export/survey.json" download>survey.json</a></p>
</div>
</div>
<div class="row">
<div class="col">
<h1>Statistics</h1>
<p>Go to the <a href="{% url 'stats:index' %}">survey statistics page</a>.</p>
</div>
</div>
<br /><br />
</div>
{% endblock %}
88 changes: 0 additions & 88 deletions templates/admin/translations.html

This file was deleted.

2 changes: 1 addition & 1 deletion templates/survey/start.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{% block content %}
<div class="m-2 p-3">
<div class="card-title">
{{ _('We need a little information to be able to give you useful recommendations, once the self-assessment is done.') }}
{{ _('We need this information to be able to give you useful recommendations, once the self-assessment is done.') }}
</div>

<form method="post" id="context_questions">
Expand Down

0 comments on commit 5af1786

Please sign in to comment.