diff --git a/app/static/app/js/components/ProjectList.jsx b/app/static/app/js/components/ProjectList.jsx index fbf57c51..d226cbb2 100644 --- a/app/static/app/js/components/ProjectList.jsx +++ b/app/static/app/js/components/ProjectList.jsx @@ -87,7 +87,7 @@ class ProjectList extends Paginated { render() { if (this.state.loading){ - return (
Loading projects...
); + return (
); }else{ return (
diff --git a/app/templates/app/base.html b/app/templates/app/base.html index 2cd4edd2..97286216 100644 --- a/app/templates/app/base.html +++ b/app/templates/app/base.html @@ -64,23 +64,6 @@ -
{{ SETTINGS.theme.html_before_header|safe }} diff --git a/app/templates/app/logged_in_base.html b/app/templates/app/logged_in_base.html index f0008d4e..ed1762d2 100644 --- a/app/templates/app/logged_in_base.html +++ b/app/templates/app/logged_in_base.html @@ -12,7 +12,7 @@ {% endif %} +
  • + {% trans 'About' %} +
  • diff --git a/app/templates/app/version.html b/app/templates/app/version.html deleted file mode 100644 index cafd7c26..00000000 --- a/app/templates/app/version.html +++ /dev/null @@ -1,15 +0,0 @@ -{% extends "app/logged_in_base.html" %} -{% load i18n settings %} - -{% block content %} - -
    - {% app_version as version %} -

    WebODM {{ version }}

    - -
    https://github.com/OpenDroneMap/WebODM
    - -
    This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see https://www.gnu.org/licenses/.
    -
    - -{% endblock %} diff --git a/app/templatetags/settings.py b/app/templatetags/settings.py index 56de1c87..a530264f 100644 --- a/app/templatetags/settings.py +++ b/app/templatetags/settings.py @@ -11,10 +11,6 @@ logger = logging.getLogger('app.logger') def is_single_user_mode(): return settings.SINGLE_USER_MODE -@register.simple_tag -def app_version(): - return settings.VERSION - @register.simple_tag(takes_context=True) def settings_image_url(context, image): try: diff --git a/app/urls.py b/app/urls.py index 7d55e333..e8881c4f 100644 --- a/app/urls.py +++ b/app/urls.py @@ -39,7 +39,7 @@ urlpatterns = [ url(r'^plugins/(?P[^/.]+)/(.*)$', app_view_handler), - url(r'^version/$', app_views.app_version, name='app_version'), + url(r'^about/$', app_views.about, name='about'), # TODO: add caching: https://docs.djangoproject.com/en/3.1/topics/i18n/translation/#note-on-performance url(r'^jsi18n/', JavaScriptCatalog.as_view(packages=['app']), name='javascript-catalog'), ] diff --git a/app/views/app.py b/app/views/app.py index 4fd47168..9138b9fb 100644 --- a/app/views/app.py +++ b/app/views/app.py @@ -99,8 +99,8 @@ def model_display(request, project_pk=None, task_pk=None): }.items() }) -def app_version(request): - return render(request, 'app/version.html', {'title': _('Version')}) +def about(request): + return render(request, 'app/about.html', {'title': _('About'), 'version': settings.VERSION}) @login_required def processing_node(request, processing_node_id): diff --git a/locale/django.pot b/locale/django.pot index c2d2d380..9d5f27c5 100644 --- a/locale/django.pot +++ b/locale/django.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-14 20:25+0000\n" +"POT-Creation-Date: 2020-12-14 21:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -66,6 +66,11 @@ msgid "" "a> is optional, but can increase georeferencing accuracy" msgstr "" +#: app/templates/app/logged_in_base.html:15 +#, python-format +msgid "Hello, %(user)s!" +msgstr "" + #: app/templates/app/logged_in_base.html:19 msgid "Logout" msgstr "" @@ -110,6 +115,10 @@ msgstr "" msgid "Application" msgstr "" +#: app/templates/app/logged_in_base.html:107 app/views/app.py:103 +msgid "About" +msgstr "" + #: app/templates/app/processing_node.html:11 msgid "Hostname" msgstr "" @@ -195,62 +204,58 @@ msgstr "" msgid "Diagnostic Information" msgstr "" -#: plugins/diagnostic/templates/diagnostic.html:8 -msgid "App Version" -msgstr "" - -#: plugins/diagnostic/templates/diagnostic.html:12 +#: plugins/diagnostic/templates/diagnostic.html:10 msgid "Storage Space" msgstr "" -#: plugins/diagnostic/templates/diagnostic.html:16 -#: plugins/diagnostic/templates/diagnostic.html:42 -#: plugins/diagnostic/templates/diagnostic.html:47 +#: plugins/diagnostic/templates/diagnostic.html:14 +#: plugins/diagnostic/templates/diagnostic.html:40 +#: plugins/diagnostic/templates/diagnostic.html:45 msgctxt "Megabytes of storage space" msgid "Free" msgstr "" -#: plugins/diagnostic/templates/diagnostic.html:17 -#: plugins/diagnostic/templates/diagnostic.html:41 -#: plugins/diagnostic/templates/diagnostic.html:47 +#: plugins/diagnostic/templates/diagnostic.html:15 +#: plugins/diagnostic/templates/diagnostic.html:39 +#: plugins/diagnostic/templates/diagnostic.html:45 msgctxt "Megabytes of storage space" msgid "Used" msgstr "" -#: plugins/diagnostic/templates/diagnostic.html:18 +#: plugins/diagnostic/templates/diagnostic.html:16 msgctxt "Megabytes of storage space" msgid "Total" msgstr "" -#: plugins/diagnostic/templates/diagnostic.html:22 +#: plugins/diagnostic/templates/diagnostic.html:20 msgctxt "Computer memory (RAM)" msgid "Memory" msgstr "" -#: plugins/diagnostic/templates/diagnostic.html:26 -#: plugins/diagnostic/templates/diagnostic.html:77 -#: plugins/diagnostic/templates/diagnostic.html:82 +#: plugins/diagnostic/templates/diagnostic.html:24 +#: plugins/diagnostic/templates/diagnostic.html:75 +#: plugins/diagnostic/templates/diagnostic.html:80 msgctxt "Megabytes of memory space" msgid "Free" msgstr "" -#: plugins/diagnostic/templates/diagnostic.html:27 -#: plugins/diagnostic/templates/diagnostic.html:76 -#: plugins/diagnostic/templates/diagnostic.html:82 +#: plugins/diagnostic/templates/diagnostic.html:25 +#: plugins/diagnostic/templates/diagnostic.html:74 +#: plugins/diagnostic/templates/diagnostic.html:80 msgctxt "Megabytes of memory space" msgid "Used" msgstr "" -#: plugins/diagnostic/templates/diagnostic.html:28 +#: plugins/diagnostic/templates/diagnostic.html:26 msgctxt "Megabytes of memory space" msgid "Total" msgstr "" -#: plugins/diagnostic/templates/diagnostic.html:35 +#: plugins/diagnostic/templates/diagnostic.html:33 msgid "Note!" msgstr "" -#: plugins/diagnostic/templates/diagnostic.html:35 +#: plugins/diagnostic/templates/diagnostic.html:33 #, python-format msgid "" "These values might be relative to the virtualization environment in which " @@ -259,8 +264,8 @@ msgid "" "in a docker setup." msgstr "" -#: plugins/diagnostic/templates/diagnostic.html:49 -#: plugins/diagnostic/templates/diagnostic.html:84 +#: plugins/diagnostic/templates/diagnostic.html:47 +#: plugins/diagnostic/templates/diagnostic.html:82 msgid "Disk Space" msgstr "" diff --git a/locale/djangojs.pot b/locale/djangojs.pot index 8e8b5ff6..60886079 100644 --- a/locale/djangojs.pot +++ b/locale/djangojs.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-14 20:25+0000\n" +"POT-Creation-Date: 2020-12-14 21:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/it/LC_MESSAGES/django.po b/locale/it/LC_MESSAGES/django.po index 4f02ba38..4429ab34 100644 --- a/locale/it/LC_MESSAGES/django.po +++ b/locale/it/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-14 20:25+0000\n" +"POT-Creation-Date: 2020-12-14 21:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -66,6 +66,11 @@ msgid "" "a> is optional, but can increase georeferencing accuracy" msgstr "" +#: app/templates/app/logged_in_base.html:15 +#, python-format +msgid "Hello, %(user)s!" +msgstr "Ciao, %(user)s!" + #: app/templates/app/logged_in_base.html:19 msgid "Logout" msgstr "Chiudi Sessione" @@ -110,6 +115,10 @@ msgstr "Plugins" msgid "Application" msgstr "Applicazione" +#: app/templates/app/logged_in_base.html:107 app/views/app.py:103 +msgid "About" +msgstr "Informazioni" + #: app/templates/app/processing_node.html:11 msgid "Hostname" msgstr "Hostname" @@ -195,62 +204,58 @@ msgstr "Diagnostica" msgid "Diagnostic Information" msgstr "Informazioni di Diagnostica" -#: plugins/diagnostic/templates/diagnostic.html:8 -msgid "App Version" -msgstr "Versione App" - -#: plugins/diagnostic/templates/diagnostic.html:12 +#: plugins/diagnostic/templates/diagnostic.html:10 msgid "Storage Space" msgstr "Spazio su Disco" -#: plugins/diagnostic/templates/diagnostic.html:16 -#: plugins/diagnostic/templates/diagnostic.html:42 -#: plugins/diagnostic/templates/diagnostic.html:47 +#: plugins/diagnostic/templates/diagnostic.html:14 +#: plugins/diagnostic/templates/diagnostic.html:40 +#: plugins/diagnostic/templates/diagnostic.html:45 msgctxt "Megabytes of storage space" msgid "Free" msgstr "Libero" -#: plugins/diagnostic/templates/diagnostic.html:17 -#: plugins/diagnostic/templates/diagnostic.html:41 -#: plugins/diagnostic/templates/diagnostic.html:47 +#: plugins/diagnostic/templates/diagnostic.html:15 +#: plugins/diagnostic/templates/diagnostic.html:39 +#: plugins/diagnostic/templates/diagnostic.html:45 msgctxt "Megabytes of storage space" msgid "Used" msgstr "Usato" -#: plugins/diagnostic/templates/diagnostic.html:18 +#: plugins/diagnostic/templates/diagnostic.html:16 msgctxt "Megabytes of storage space" msgid "Total" msgstr "Totale" -#: plugins/diagnostic/templates/diagnostic.html:22 +#: plugins/diagnostic/templates/diagnostic.html:20 msgctxt "Computer memory (RAM)" msgid "Memory" msgstr "Memoria" -#: plugins/diagnostic/templates/diagnostic.html:26 -#: plugins/diagnostic/templates/diagnostic.html:77 -#: plugins/diagnostic/templates/diagnostic.html:82 +#: plugins/diagnostic/templates/diagnostic.html:24 +#: plugins/diagnostic/templates/diagnostic.html:75 +#: plugins/diagnostic/templates/diagnostic.html:80 msgctxt "Megabytes of memory space" msgid "Free" msgstr "Libera" -#: plugins/diagnostic/templates/diagnostic.html:27 -#: plugins/diagnostic/templates/diagnostic.html:76 -#: plugins/diagnostic/templates/diagnostic.html:82 +#: plugins/diagnostic/templates/diagnostic.html:25 +#: plugins/diagnostic/templates/diagnostic.html:74 +#: plugins/diagnostic/templates/diagnostic.html:80 msgctxt "Megabytes of memory space" msgid "Used" msgstr "Usata" -#: plugins/diagnostic/templates/diagnostic.html:28 +#: plugins/diagnostic/templates/diagnostic.html:26 msgctxt "Megabytes of memory space" msgid "Total" msgstr "Totale" -#: plugins/diagnostic/templates/diagnostic.html:35 +#: plugins/diagnostic/templates/diagnostic.html:33 msgid "Note!" msgstr "Nota!" -#: plugins/diagnostic/templates/diagnostic.html:35 +#: plugins/diagnostic/templates/diagnostic.html:33 #, python-format msgid "" "These values might be relative to the virtualization environment in which " @@ -259,8 +264,8 @@ msgid "" "in a docker setup." msgstr "" -#: plugins/diagnostic/templates/diagnostic.html:49 -#: plugins/diagnostic/templates/diagnostic.html:84 +#: plugins/diagnostic/templates/diagnostic.html:47 +#: plugins/diagnostic/templates/diagnostic.html:82 msgid "Disk Space" msgstr "Spazio su Disco" @@ -271,3 +276,6 @@ msgstr "Rete Lightning" #: plugins/posm-gcpi/plugin.py:8 msgid "GCP Interface" msgstr "Interfaccia GCP" + +#~ msgid "App Version" +#~ msgstr "Versione App" diff --git a/locale/it/LC_MESSAGES/djangojs.po b/locale/it/LC_MESSAGES/djangojs.po index afe97c7b..913c582d 100644 --- a/locale/it/LC_MESSAGES/djangojs.po +++ b/locale/it/LC_MESSAGES/djangojs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-14 20:25+0000\n" +"POT-Creation-Date: 2020-12-14 21:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"