diff --git a/LICENSE.txt b/LICENSE.txt index 9db1259..268230d 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2014 Jan Dittberner. +Copyright (c) 2014, 2015 Jan Dittberner. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation diff --git a/README.rst b/README.rst index 5667ad8..3d0de85 100644 --- a/README.rst +++ b/README.rst @@ -3,57 +3,3 @@ gnuviechadmin ============= Customer center for gnuviech servers. - -To use this project follow these steps: - -#. Create your working environment -#. Install Django -#. Create the new project using the django-two-scoops template -#. Install additional dependencies -#. Use the Django admin to create the project - -Working Environment -=================== - -You have several options in setting up your working environment. We recommend -using virtualenv to separate the dependencies of your project from your -system's python environment. If on Linux or Mac OS X, you can also use -virtualenvwrapper to help manage multiple virtualenvs across different -projects. - -Virtualenv Only ---------------- - -First, make sure you are using virtualenv (http://www.virtualenv.org). Once -that's installed, create your virtualenv:: - - $ virtualenv --distribute gnuviechadmin - -You will also need to ensure that the virtualenv has the project directory -added to the path. Adding the project directory will allow `django-admin.py` to -be able to change settings using the `--settings` flag. - -Virtualenv with virtualenvwrapper ------------------------------------- - -In Linux and Mac OSX, you can install virtualenvwrapper -(http://virtualenvwrapper.readthedocs.org/en/latest/), which will take care of -managing your virtual environments and adding the project path to the -`site-directory` for you:: - - $ mkdir gnuviechadmin - $ mkvirtualenv -a gnuviechadmin gnuviechadmin-dev - $ cd gnuviechadmin && add2virtualenv `pwd` - -Installation of Dependencies -============================= - -Depending on where you are installing dependencies: - -In development:: - - $ pip install -r requirements/local.txt - -For production:: - - $ pip install -r requirements.txt diff --git a/docs/changelog.rst b/docs/changelog.rst index 411c535..eed0f81 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,13 @@ Changelog ========= +* :release:`0.5.0 <2015-01-17>` +* :feature:`-` add authentication via social media accounts from Google, + LinkedIn, Twitter and Xing +* :feature:`-` add customer login/logout and dashboard templates +* :feature:`-` add admin list filtering and ordering for mail addresses and + mailboxes + * :release:`0.4.0 <2015-01-11>` * :feature:`-` add mysqltasks and pgsqltasks * :feature:`-` add :py:mod:`userdbs` app to allow management of user databases diff --git a/docs/code.rst b/docs/code.rst index 8cc0a03..22944fe 100644 --- a/docs/code.rst +++ b/docs/code.rst @@ -10,226 +10,15 @@ administrators and customers. .. _Django: https://www.djangoproject.com/ -The project module :py:mod:`gnuviechadmin` -========================================== - -.. automodule:: gnuviechadmin - - -:py:mod:`celery ` ---------------------------------------- - -.. automodule:: gnuviechadmin.celery - :members: - - -:py:mod:`urls ` ------------------------------------ - -.. automodule:: gnuviechadmin.urls - - -:py:mod:`wsgi ` ------------------------------------ - -.. automodule:: gnuviechadmin.wsgi - :members: - - -:py:mod:`settings ` -------------------------------------------- - -.. automodule:: gnuviechadmin.settings - - -:py:mod:`base ` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. automodule:: gnuviechadmin.settings.base - :members: - - -:py:mod:`local ` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. automodule:: gnuviechadmin.settings.local - - -:py:mod:`production ` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. automodule:: gnuviechadmin.settings.production - - -:py:mod:`test ` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. automodule:: gnuviechadmin.settings.test - - -:py:mod:`gvacommon` -=================== - -This module is imported from a separate git project via git subtree and -provides some functionality that is common to all gnuviechadmin subprojects. - -.. automodule:: gvacommon - - -:py:mod:`celeryrouters ` -------------------------------------------------- - -.. automodule:: gvacommon.celeryrouters - :members: - :undoc-members: - - -:py:mod:`managemails` app -========================= - -.. automodule:: managemails - - -:py:mod:`admin ` ------------------------------------ - -.. automodule:: managemails.admin - :members: - - -:py:mod:`models ` -------------------------------------- - -.. automodule:: managemails.models - :members: - - -:py:mod:`mysqltasks` app -======================== - -.. automodule:: mysqltasks - - -:py:mod:`tasks ` ----------------------------------- - -.. automodule:: mysqltasks.tasks - :members: - -.. autotask:: mysqltasks.tasks.create_mysql_database -.. autotask:: mysqltasks.tasks.create_mysql_user -.. autotask:: mysqltasks.tasks.delete_mysql_database -.. autotask:: mysqltasks.tasks.delete_mysql_user -.. autotask:: mysqltasks.tasks.set_mysql_userpassword - - -:py:mod:`osusers` app -===================== - -.. automodule:: osusers - - -:py:mod:`admin ` -------------------------------- - -.. automodule:: osusers.admin - :members: - - -:py:mod:`apps ` ------------------------------ - -.. automodule:: osusers.apps - :members: - - -:py:mod:`models ` ---------------------------------- - -.. automodule:: osusers.models - :members: - - -:py:mod:`tasks ` -------------------------------- - -.. automodule:: osusers.tasks - -.. autotask:: osusers.tasks.add_ldap_user_to_group -.. autotask:: osusers.tasks.create_file_mailbox -.. autotask:: osusers.tasks.create_ldap_group -.. autotask:: osusers.tasks.create_ldap_user -.. autotask:: osusers.tasks.delete_file_mail_userdir -.. autotask:: osusers.tasks.delete_file_mailbox -.. autotask:: osusers.tasks.delete_file_sftp_userdir -.. autotask:: osusers.tasks.delete_ldap_group -.. autotask:: osusers.tasks.delete_ldap_group_if_empty -.. autotask:: osusers.tasks.delete_ldap_user -.. autotask:: osusers.tasks.remove_ldap_user_from_group -.. autotask:: osusers.tasks.setup_file_mail_userdir -.. autotask:: osusers.tasks.setup_file_sftp_userdir - - -:py:mod:`pgsqltasks` app -======================== - -.. automodule:: pgsqltasks - :members: - - -:py:mod:`tasks ` ----------------------------------- - -.. automodule:: pgsqltasks.tasks - -.. autotask:: pgsqltasks.tasks.create_pgsql_database -.. autotask:: pgsqltasks.tasks.create_pgsql_user -.. autotask:: pgsqltasks.tasks.delete_pgsql_database -.. autotask:: pgsqltasks.tasks.delete_pgsql_user -.. autotask:: pgsqltasks.tasks.set_pgsql_userpassword - - -:py:mod:`taskresults` app -========================= - -.. automodule:: taskresults - -:py:mod:`admin ` ------------------------------------ - -.. automodule:: taskresults.admin - -:py:mod:`management.commands ` ---------------------------------------------------------------- - -.. automodule:: taskresults.management.commands - -:py:mod:`fetch_taskresults ` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. automodule:: taskresults.management.commands.fetch_taskresults - -:py:mod:`models ` -------------------------------------- - -.. automodule:: taskresults.models - - -:py:mod:`userdbs` app -===================== - -.. automodule:: userdbs - - -:py:mod:`admin ` -------------------------------- - -.. automodule:: userdbs.admin - :members: - - -:py:mod:`models ` ---------------------------------- - -.. automodule:: userdbs.models - :members: +.. toctree:: + + code/gnuviechadmin + code/gvacommon + code/dashboard + code/domains + code/managemails + code/mysqltasks + code/osusers + code/pgsqltasks + code/taskresults + code/userdbs diff --git a/docs/code/dashboard.rst b/docs/code/dashboard.rst new file mode 100644 index 0000000..2f4666e --- /dev/null +++ b/docs/code/dashboard.rst @@ -0,0 +1,22 @@ +:py:mod:`dashboard` app +======================= + +.. automodule:: dashboard + + +:py:mod:`models ` +----------------------------------- + +.. automodule:: dashboard.models + + +:py:mod:`urls ` +------------------------------- + +.. automodule:: dashboard.urls + + +:py:mod:`views ` +--------------------------------- + +.. automodule:: dashboard.views diff --git a/docs/code/domains.rst b/docs/code/domains.rst new file mode 100644 index 0000000..dcba5f5 --- /dev/null +++ b/docs/code/domains.rst @@ -0,0 +1,16 @@ +:py:mod:`domains` app +===================== + +.. automodule:: domains + + +:py:mod:`admin ` +------------------------------- + +.. automodule:: domains.admin + + +:py:mod:`models ` +--------------------------------- + +.. automodule:: domains.models diff --git a/docs/code/gnuviechadmin.rst b/docs/code/gnuviechadmin.rst new file mode 100644 index 0000000..8d72812 --- /dev/null +++ b/docs/code/gnuviechadmin.rst @@ -0,0 +1,55 @@ +The project module :py:mod:`gnuviechadmin` +========================================== + +.. automodule:: gnuviechadmin + + +:py:mod:`celery ` +--------------------------------------- + +.. automodule:: gnuviechadmin.celery + :members: + + +:py:mod:`urls ` +----------------------------------- + +.. automodule:: gnuviechadmin.urls + + +:py:mod:`wsgi ` +----------------------------------- + +.. automodule:: gnuviechadmin.wsgi + :members: + + +:py:mod:`settings ` +------------------------------------------- + +.. automodule:: gnuviechadmin.settings + + +:py:mod:`base ` +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. automodule:: gnuviechadmin.settings.base + :members: + + +:py:mod:`local ` +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. automodule:: gnuviechadmin.settings.local + + +:py:mod:`production ` +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. automodule:: gnuviechadmin.settings.production + + +:py:mod:`test ` +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. automodule:: gnuviechadmin.settings.test diff --git a/docs/code/gvacommon.rst b/docs/code/gvacommon.rst new file mode 100644 index 0000000..4dbc502 --- /dev/null +++ b/docs/code/gvacommon.rst @@ -0,0 +1,15 @@ +:py:mod:`gvacommon` +=================== + +This module is imported from a separate git project via git subtree and +provides some functionality that is common to all gnuviechadmin subprojects. + +.. automodule:: gvacommon + + +:py:mod:`celeryrouters ` +------------------------------------------------- + +.. automodule:: gvacommon.celeryrouters + :members: + :undoc-members: diff --git a/docs/code/managemails.rst b/docs/code/managemails.rst new file mode 100644 index 0000000..fef6faf --- /dev/null +++ b/docs/code/managemails.rst @@ -0,0 +1,18 @@ +:py:mod:`managemails` app +========================= + +.. automodule:: managemails + + +:py:mod:`admin ` +----------------------------------- + +.. automodule:: managemails.admin + :members: + + +:py:mod:`models ` +------------------------------------- + +.. automodule:: managemails.models + :members: diff --git a/docs/code/mysqltasks.rst b/docs/code/mysqltasks.rst new file mode 100644 index 0000000..80e31ed --- /dev/null +++ b/docs/code/mysqltasks.rst @@ -0,0 +1,17 @@ +:py:mod:`mysqltasks` app +======================== + +.. automodule:: mysqltasks + + +:py:mod:`tasks ` +---------------------------------- + +.. automodule:: mysqltasks.tasks + :members: + +.. autotask:: mysqltasks.tasks.create_mysql_database +.. autotask:: mysqltasks.tasks.create_mysql_user +.. autotask:: mysqltasks.tasks.delete_mysql_database +.. autotask:: mysqltasks.tasks.delete_mysql_user +.. autotask:: mysqltasks.tasks.set_mysql_userpassword diff --git a/docs/code/osusers.rst b/docs/code/osusers.rst new file mode 100644 index 0000000..caa8d05 --- /dev/null +++ b/docs/code/osusers.rst @@ -0,0 +1,45 @@ +:py:mod:`osusers` app +===================== + +.. automodule:: osusers + + +:py:mod:`admin ` +------------------------------- + +.. automodule:: osusers.admin + :members: + + +:py:mod:`apps ` +----------------------------- + +.. automodule:: osusers.apps + :members: + + +:py:mod:`models ` +--------------------------------- + +.. automodule:: osusers.models + :members: + + +:py:mod:`tasks ` +------------------------------- + +.. automodule:: osusers.tasks + +.. autotask:: osusers.tasks.add_ldap_user_to_group +.. autotask:: osusers.tasks.create_file_mailbox +.. autotask:: osusers.tasks.create_ldap_group +.. autotask:: osusers.tasks.create_ldap_user +.. autotask:: osusers.tasks.delete_file_mail_userdir +.. autotask:: osusers.tasks.delete_file_mailbox +.. autotask:: osusers.tasks.delete_file_sftp_userdir +.. autotask:: osusers.tasks.delete_ldap_group +.. autotask:: osusers.tasks.delete_ldap_group_if_empty +.. autotask:: osusers.tasks.delete_ldap_user +.. autotask:: osusers.tasks.remove_ldap_user_from_group +.. autotask:: osusers.tasks.setup_file_mail_userdir +.. autotask:: osusers.tasks.setup_file_sftp_userdir diff --git a/docs/code/pgsqltasks.rst b/docs/code/pgsqltasks.rst new file mode 100644 index 0000000..3003498 --- /dev/null +++ b/docs/code/pgsqltasks.rst @@ -0,0 +1,17 @@ +:py:mod:`pgsqltasks` app +======================== + +.. automodule:: pgsqltasks + :members: + + +:py:mod:`tasks ` +---------------------------------- + +.. automodule:: pgsqltasks.tasks + +.. autotask:: pgsqltasks.tasks.create_pgsql_database +.. autotask:: pgsqltasks.tasks.create_pgsql_user +.. autotask:: pgsqltasks.tasks.delete_pgsql_database +.. autotask:: pgsqltasks.tasks.delete_pgsql_user +.. autotask:: pgsqltasks.tasks.set_pgsql_userpassword diff --git a/docs/code/taskresults.rst b/docs/code/taskresults.rst new file mode 100644 index 0000000..9fb6c82 --- /dev/null +++ b/docs/code/taskresults.rst @@ -0,0 +1,24 @@ +:py:mod:`taskresults` app +========================= + +.. automodule:: taskresults + +:py:mod:`admin ` +----------------------------------- + +.. automodule:: taskresults.admin + +:py:mod:`management.commands ` +--------------------------------------------------------------- + +.. automodule:: taskresults.management.commands + +:py:mod:`fetch_taskresults ` +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. automodule:: taskresults.management.commands.fetch_taskresults + +:py:mod:`models ` +------------------------------------- + +.. automodule:: taskresults.models diff --git a/docs/code/userdbs.rst b/docs/code/userdbs.rst new file mode 100644 index 0000000..7856a9d --- /dev/null +++ b/docs/code/userdbs.rst @@ -0,0 +1,30 @@ +:py:mod:`userdbs` app +===================== + +.. automodule:: userdbs + + +:py:mod:`admin ` +------------------------------- + +.. automodule:: userdbs.admin + :members: + + +:py:mod:`apps ` +----------------------------- + +.. automodule:: userdbs.apps + + +:py:mod:`models ` +--------------------------------- + +.. automodule:: userdbs.models + :members: + + +:py:mod:`views ` +------------------------------- + +.. automodule:: userdbs.views diff --git a/docs/conf.py b/docs/conf.py index 998aeeb..f612c35 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -60,9 +60,9 @@ copyright = u'2014, 2015 Jan Dittberner' # built documents. # # The short X.Y version. -version = '0.4' +version = '0.5' # The full version, including alpha/beta/rc tags. -release = '0.4.0' +release = '0.5.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/index.rst b/docs/index.rst index 3f1d47e..d2cd6fd 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -3,6 +3,16 @@ You can adapt this file completely to your liking, but it should at least contain the root `toctree` directive. +.. include:: ../README.rst + +License +======= + +gnuviechadmin is licensed under the terms of the MIT license: + +.. include:: ../LICENSE.txt + :literal: + Welcome to gnuviechadmin's documentation! ========================================= diff --git a/docs/install.rst b/docs/install.rst index 1bc0333..9e08482 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -1,4 +1,45 @@ -Install -========= +Installation +============ -This is where you write how to get a new laptop to run this project. +You have several options in setting up your working environment. We recommend +using virtualenv to separate the dependencies of your project from your +system's python environment. If on Linux or Mac OS X, you can also use +virtualenvwrapper to help manage multiple virtualenvs across different +projects. + +Virtualenv Only +--------------- + +First, make sure you are using virtualenv (http://www.virtualenv.org). Once +that's installed, create your virtualenv:: + + $ virtualenv --distribute gnuviechadmin + +You will also need to ensure that the virtualenv has the project directory +added to the path. Adding the project directory will allow `django-admin.py` to +be able to change settings using the `--settings` flag. + +Virtualenv with virtualenvwrapper +------------------------------------ + +In Linux and Mac OSX, you can install virtualenvwrapper +(http://virtualenvwrapper.readthedocs.org/en/latest/), which will take care of +managing your virtual environments and adding the project path to the +`site-directory` for you:: + + $ mkdir gnuviechadmin + $ mkvirtualenv -a gnuviechadmin gnuviechadmin-dev + $ cd gnuviechadmin && add2virtualenv `pwd` + +Installation of Dependencies +============================= + +Depending on where you are installing dependencies: + +In development:: + + $ pip install -r requirements/local.txt + +For production:: + + $ pip install -r requirements.txt diff --git a/gnuviechadmin/dashboard/__init__.py b/gnuviechadmin/dashboard/__init__.py new file mode 100644 index 0000000..280cb6c --- /dev/null +++ b/gnuviechadmin/dashboard/__init__.py @@ -0,0 +1,4 @@ +""" +This app contains the customer dashboard implementation for gnuviechadmin. + +""" diff --git a/gnuviechadmin/dashboard/locale/de/LC_MESSAGES/django.po b/gnuviechadmin/dashboard/locale/de/LC_MESSAGES/django.po new file mode 100644 index 0000000..71d4e75 --- /dev/null +++ b/gnuviechadmin/dashboard/locale/de/LC_MESSAGES/django.po @@ -0,0 +1,24 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: gnuviechadmin dashboard\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-17 15:59+0100\n" +"PO-Revision-Date: 2015-01-17 16:01+0100\n" +"Last-Translator: Jan Dittberner \n" +"Language-Team: Jan Dittberner \n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.6.10\n" +"X-Poedit-SourceCharset: UTF-8\n" + +#: dashboard/views.py:43 +msgid "You are not allowed to view this page." +msgstr "Sie haben nicht die nötigen Berechtigungen um diese Seite zu sehen." diff --git a/gnuviechadmin/dashboard/migrations/__init__.py b/gnuviechadmin/dashboard/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/gnuviechadmin/dashboard/models.py b/gnuviechadmin/dashboard/models.py new file mode 100644 index 0000000..e69de29 diff --git a/gnuviechadmin/dashboard/urls.py b/gnuviechadmin/dashboard/urls.py new file mode 100644 index 0000000..58a103b --- /dev/null +++ b/gnuviechadmin/dashboard/urls.py @@ -0,0 +1,19 @@ +from __future__ import absolute_import, unicode_literals + +from django.conf.urls import patterns, url + +from .views import ( + IndexView, + LogoutView, + UserDashboardView, +) + + +urlpatterns = patterns( + '', + url(r'^$', IndexView.as_view(), name='dashboard'), + url(r'^user/(?P[\w0-9@.+-_]+)/$', + UserDashboardView.as_view(), name='customer_dashboard'), + url(r'^logout/', + LogoutView.as_view(), name='logout'), +) diff --git a/gnuviechadmin/dashboard/views.py b/gnuviechadmin/dashboard/views.py new file mode 100644 index 0000000..eec7df6 --- /dev/null +++ b/gnuviechadmin/dashboard/views.py @@ -0,0 +1,56 @@ +""" +This module defines the views for the gnuviechadmin customer dashboard. + +""" +from __future__ import unicode_literals + +from django.http import HttpResponseForbidden +from django.views.generic import ( + DetailView, + TemplateView, +) +from django.views.generic.base import RedirectView +from django.utils.translation import ugettext as _ +from django.contrib.auth import get_user_model, logout + +from braces.views import LoginRequiredMixin + + +class IndexView(TemplateView): + """ + This is the dashboard view. + + """ + template_name = 'dashboard/index.html' + + +class UserDashboardView(LoginRequiredMixin, DetailView): + """ + This is the user dashboard view. + + """ + model = get_user_model() + context_object_name = 'dashboard_user' + slug_field = 'username' + template_name = 'dashboard/user_dashboard.html' + + def dispatch(self, request, *args, **kwargs): + if (request.user.is_staff or request.user == self.get_object()): + return super(UserDashboardView, self).dispatch( + request, *args, **kwargs + ) + return HttpResponseForbidden( + _('You are not allowed to view this page.') + ) + +class LogoutView(RedirectView): + pattern_name = 'dashboard' + + def get(self, *args, **kwargs): + logout(self.request) + return super(LogoutView, self).get(*args, **kwargs) + + def get_redirect_url(self, *args, **kwargs): + if 'next' in self.request.GET: + return self.request.GET['next'] + return super(LogoutView, self).get_redirect_url(*args, **kwargs) diff --git a/gnuviechadmin/domains/locale/de/LC_MESSAGES/django.po b/gnuviechadmin/domains/locale/de/LC_MESSAGES/django.po new file mode 100644 index 0000000..9f35245 --- /dev/null +++ b/gnuviechadmin/domains/locale/de/LC_MESSAGES/django.po @@ -0,0 +1,28 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: gnuviechadmin domains\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-17 15:59+0100\n" +"PO-Revision-Date: 2015-01-17 16:00+0100\n" +"Last-Translator: Jan Dittberner \n" +"Language-Team: Jan Dittberner \n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.6.10\n" +"X-Poedit-SourceCharset: UTF-8\n" + +#: domains/models.py:13 +msgid "Mail domain" +msgstr "E-Maildomain" + +#: domains/models.py:14 +msgid "Mail domains" +msgstr "E-Maildomains" diff --git a/gnuviechadmin/gnuviechadmin/settings/base.py b/gnuviechadmin/gnuviechadmin/settings/base.py index 33f5b85..913c1cd 100644 --- a/gnuviechadmin/gnuviechadmin/settings/base.py +++ b/gnuviechadmin/gnuviechadmin/settings/base.py @@ -10,6 +10,7 @@ from sys import path # Normally you should not import ANYTHING from Django directly # into your settings, but ImproperlyConfigured is an exception. from django.core.exceptions import ImproperlyConfigured +from django.contrib.messages import constants as messages def get_env_variable(var_name): @@ -100,6 +101,11 @@ USE_TZ = True ########## END GENERAL CONFIGURATION +LOCALE_PATHS = ( + normpath(join(SITE_ROOT, 'locale')), +) + + ########## MEDIA CONFIGURATION # See: https://docs.djangoproject.com/en/dev/ref/settings/#media-root MEDIA_ROOT = normpath(join(SITE_ROOT, 'media')) @@ -162,6 +168,9 @@ TEMPLATE_CONTEXT_PROCESSORS = ( 'django.core.context_processors.tz', 'django.contrib.messages.context_processors.messages', 'django.core.context_processors.request', + # allauth specific context processors + 'allauth.account.context_processors.account', + 'allauth.socialaccount.context_processors.socialaccount', ) # See: https://docs.djangoproject.com/en/dev/ref/settings/#template-loaders @@ -193,6 +202,15 @@ MIDDLEWARE_CLASSES = ( ########## END MIDDLEWARE CONFIGURATION +AUTHENTICATION_BACKENDS = ( + # Needed to login by username in Django admin, regardless of `allauth` + "django.contrib.auth.backends.ModelBackend", + + # `allauth` specific authentication methods, such as login by e-mail + "allauth.account.auth_backends.AuthenticationBackend", +) + + ########## URL CONFIGURATION # See: https://docs.djangoproject.com/en/dev/ref/settings/#root-urlconf ROOT_URLCONF = '%s.urls' % SITE_NAME @@ -220,10 +238,23 @@ DJANGO_APPS = ( # Admin panel and documentation: 'django.contrib.admin', # 'django.contrib.admindocs', + + 'crispy_forms', +) + +ALLAUTH_APPS = ( + 'allauth', + 'allauth.account', + 'allauth.socialaccount', + 'allauth.socialaccount.providers.google', + 'allauth.socialaccount.providers.linkedin_oauth2', + 'allauth.socialaccount.providers.twitter', + 'allauth.socialaccount.providers.xing', ) # Apps specific for this project go here. LOCAL_APPS = ( + 'dashboard', 'taskresults', 'mysqltasks', 'pgsqltasks', @@ -234,10 +265,29 @@ LOCAL_APPS = ( ) # See: https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps -INSTALLED_APPS = DJANGO_APPS + LOCAL_APPS +INSTALLED_APPS = DJANGO_APPS + ALLAUTH_APPS + LOCAL_APPS + +MESSAGE_TAGS = { + messages.DEBUG: '', + messages.ERROR: 'text-danger', + messages.INFO: 'text-info', + messages.SUCCESS: 'text-success', + messages.WARNING: 'text-warning', +} ########## END APP CONFIGURATION +########## ALLAUTH CONFIGURATION +LOGIN_REDIRECT_URL = '/' +SOCIALACCOUNT_QUERY_EMAIL = True +########## END ALLAUTH CONFIGURATION + + +########## CRISPY FORMS CONFIGURATION +CRISPY_TEMPLATE_PACK = 'bootstrap3' +########## END CRISPY_FORMS CONFIGURATION + + ########## LOGGING CONFIGURATION # See: https://docs.djangoproject.com/en/dev/ref/settings/#logging # A sample logging configuration. The only tangible logging diff --git a/gnuviechadmin/gnuviechadmin/urls.py b/gnuviechadmin/gnuviechadmin/urls.py index 1ae3acb..c70d6c7 100644 --- a/gnuviechadmin/gnuviechadmin/urls.py +++ b/gnuviechadmin/gnuviechadmin/urls.py @@ -1,23 +1,17 @@ -from django.conf.urls import patterns, include, url -from django.conf.urls.static import static -from django.conf import settings -from django.views.generic import TemplateView +from __future__ import absolute_import + +from django.conf.urls import patterns, include, url +from django.conf import settings + +import dashboard.urls -# Uncomment the next two lines to enable the admin: from django.contrib import admin admin.autodiscover() -urlpatterns = patterns('', - url(r'^$', TemplateView.as_view(template_name='base.html')), - - # Examples: - # url(r'^$', 'gnuviechadmin.views.home', name='home'), - # url(r'^gnuviechadmin/', include('gnuviechadmin.foo.urls')), - - # Uncomment the admin/doc line below to enable admin documentation: - # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), - - # Uncomment the next line to enable the admin: +urlpatterns = patterns( + '', + url(r'', include(dashboard.urls)), + url(r'^accounts/', include('allauth.urls')), url(r'^admin/', include(admin.site.urls)), ) diff --git a/gnuviechadmin/locale/de/LC_MESSAGES/django.po b/gnuviechadmin/locale/de/LC_MESSAGES/django.po new file mode 100644 index 0000000..3f6fbaf --- /dev/null +++ b/gnuviechadmin/locale/de/LC_MESSAGES/django.po @@ -0,0 +1,79 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: gnuviechadmin\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-17 16:13+0100\n" +"PO-Revision-Date: 2015-01-17 16:14+0100\n" +"Last-Translator: Jan Dittberner \n" +"Language-Team: Jan Dittberner \n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.6.10\n" +"X-Poedit-SourceCharset: UTF-8\n" + +#: templates/base.html:52 +msgid "My Profile" +msgstr "Mein Profil" + +#: templates/base.html:53 +msgid "Admin site" +msgstr "Adminsite" + +#: templates/base.html:54 +msgid "Logout" +msgstr "Abmelden" + +#: templates/base.html:56 templates/registration/login.html:4 +msgid "Sign In" +msgstr "Anmelden" + +#: templates/dashboard/index.html:3 +msgid "Welcome" +msgstr "Willkommen" + +#: templates/dashboard/index.html:4 +msgid "Welcome to our customer self service" +msgstr "Willkommen in unserem Selbstservice-System" + +#: templates/dashboard/index.html:7 +#, python-format +msgid "" +"Hello %(full_name)s,
\n" +"You can visit your Dashboard to view and " +"modify your hosting options.\n" +msgstr "" +"Hallo %(full_name)s,
\n" +"Sie können Ihre Startseite besuchen, um " +"Ihre Hostingeinstellungen anzusehen und zu bearbeiten.\n" + +#: templates/dashboard/index.html:11 +msgid "This is your entry to our customer self service sytem." +msgstr "Dies ist Ihr Einstieg in unser Selbstservice-System" + +#: templates/dashboard/index.html:12 +#, python-format +msgid "" +"If you are already a customer you can Sign in to view and modify your hosting options." +msgstr "" +"Wenn Sie bereits Kunde bei uns sind, können Sie sich Anmelden um Ihre Hostingeinstellungen anzusehen " +"und zu bearbeiten." + +#: templates/dashboard/user_dashboard.html:3 +#: templates/dashboard/user_dashboard.html:4 +#, python-format +msgid "Dashboard for %(full_name)s" +msgstr "Startseite für %(full_name)s" + +#: templates/registration/login.html:3 templates/registration/login.html:10 +msgid "Sign in" +msgstr "Anmelden" diff --git a/gnuviechadmin/managemails/admin.py b/gnuviechadmin/managemails/admin.py index d1ddbdb..f059fd4 100644 --- a/gnuviechadmin/managemails/admin.py +++ b/gnuviechadmin/managemails/admin.py @@ -112,7 +112,7 @@ class MailboxAdmin(ActivationChangeMixin, admin.ModelAdmin): actions = ['activate', 'deactivate'] list_display = ('username', 'osuser', 'active') - list_filter = ('active',) + list_filter = ('active', 'osuser') fieldsets = ( (None, { 'fields': ('osuser', 'username', 'password', 'active')}), @@ -157,8 +157,8 @@ class MailAddressForwardInline(admin.TabularInline): class MailAddressAdmin(ActivationChangeMixin, admin.ModelAdmin): actions = ['activate', 'deactivate'] - list_display = ('__str__', 'active') - list_filter = ('active',) + list_display = ('__str__', 'mailaddressmailbox', 'active') + list_filter = ('active', 'domain') inlines = [MailAddressMailboxInline, MailAddressForwardInline] diff --git a/gnuviechadmin/managemails/locale/de/LC_MESSAGES/django.po b/gnuviechadmin/managemails/locale/de/LC_MESSAGES/django.po index 442c816..d46f669 100644 --- a/gnuviechadmin/managemails/locale/de/LC_MESSAGES/django.po +++ b/gnuviechadmin/managemails/locale/de/LC_MESSAGES/django.po @@ -7,10 +7,10 @@ msgid "" msgstr "" "Project-Id-Version: managemails\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-27 22:45+0100\n" -"PO-Revision-Date: 2014-12-27 22:57+0100\n" +"POT-Creation-Date: 2015-01-17 15:59+0100\n" +"PO-Revision-Date: 2015-01-17 16:00+0100\n" "Last-Translator: Jan Dittberner \n" -"Language-Team: de \n" +"Language-Team: Jan Dittberner \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,42 +19,42 @@ msgstr "" "X-Generator: Poedit 1.6.10\n" "X-Poedit-SourceCharset: UTF-8\n" -#: admin.py:14 +#: managemails/admin.py:14 msgid "Passwords don't match" msgstr "Passwörter stimmen nicht überein" -#: admin.py:21 tests/test_admin.py:37 +#: managemails/admin.py:21 managemails/tests/test_admin.py:37 msgid "Hash" msgstr "Hash-Code" -#: admin.py:44 +#: managemails/admin.py:44 msgid "Password" msgstr "Passwort" -#: admin.py:46 +#: managemails/admin.py:46 msgid "Password (again)" msgstr "Passwortwiederholung" -#: admin.py:100 +#: managemails/admin.py:100 msgid "Activate" msgstr "Aktivieren" -#: admin.py:101 +#: managemails/admin.py:101 msgid "Deactivate" msgstr "Deaktivieren" -#: models.py:51 +#: managemails/models.py:52 msgid "Mailbox" msgstr "Postfach" -#: models.py:52 +#: managemails/models.py:53 msgid "Mailboxes" msgstr "Postfächer" -#: models.py:76 +#: managemails/models.py:78 msgid "Mail address" msgstr "E-Mailadresse" -#: models.py:77 +#: managemails/models.py:79 msgid "Mail addresses" msgstr "E-Mailadressen" diff --git a/gnuviechadmin/managemails/migrations/0002_auto_20150117_1238.py b/gnuviechadmin/managemails/migrations/0002_auto_20150117_1238.py new file mode 100644 index 0000000..5c6d070 --- /dev/null +++ b/gnuviechadmin/managemails/migrations/0002_auto_20150117_1238.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('managemails', '0001_initial'), + ] + + operations = [ + migrations.AlterModelOptions( + name='mailaddress', + options={'ordering': ['domain', 'localpart'], 'verbose_name': 'Mail address', 'verbose_name_plural': 'Mail addresses'}, + ), + migrations.AlterModelOptions( + name='mailbox', + options={'ordering': ['osuser', 'username'], 'verbose_name': 'Mailbox', 'verbose_name_plural': 'Mailboxes'}, + ), + ] diff --git a/gnuviechadmin/managemails/models.py b/gnuviechadmin/managemails/models.py index 737dda0..949d260 100644 --- a/gnuviechadmin/managemails/models.py +++ b/gnuviechadmin/managemails/models.py @@ -48,6 +48,7 @@ class Mailbox(ActivateAbleMixin, TimeStampedModel, models.Model): objects = MailboxManager() class Meta: + ordering = ['osuser', 'username'] verbose_name = _('Mailbox') verbose_name_plural = _('Mailboxes') @@ -72,6 +73,7 @@ class MailAddress(ActivateAbleMixin, TimeStampedModel, models.Model): domain = models.ForeignKey(MailDomain) class Meta: + ordering = ['domain', 'localpart'] unique_together = ('localpart', 'domain') verbose_name = _('Mail address') verbose_name_plural = _('Mail addresses') @@ -80,6 +82,7 @@ class MailAddress(ActivateAbleMixin, TimeStampedModel, models.Model): return "{0}@{1}".format(self.localpart, self.domain) +@python_2_unicode_compatible class MailAddressMailbox(TimeStampedModel, models.Model): mailaddress = models.OneToOneField(MailAddress, primary_key=True) mailbox = models.ForeignKey(Mailbox) @@ -87,6 +90,9 @@ class MailAddressMailbox(TimeStampedModel, models.Model): class Meta: unique_together = ('mailaddress', 'mailbox') + def __str__(self): + return self.mailbox.username + class MailAddressForward(TimeStampedModel, models.Model): mailaddress = models.ForeignKey(MailAddress) diff --git a/gnuviechadmin/osusers/locale/de/LC_MESSAGES/django.po b/gnuviechadmin/osusers/locale/de/LC_MESSAGES/django.po index b6919a5..92ce06b 100644 --- a/gnuviechadmin/osusers/locale/de/LC_MESSAGES/django.po +++ b/gnuviechadmin/osusers/locale/de/LC_MESSAGES/django.po @@ -7,10 +7,10 @@ msgid "" msgstr "" "Project-Id-Version: osusers\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-27 22:46+0100\n" -"PO-Revision-Date: 2014-12-27 22:54+0100\n" +"POT-Creation-Date: 2015-01-17 15:59+0100\n" +"PO-Revision-Date: 2015-01-17 16:00+0100\n" "Last-Translator: Jan Dittberner \n" -"Language-Team: de \n" +"Language-Team: Jan Dittberner \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,128 +19,128 @@ msgstr "" "X-Generator: Poedit 1.6.10\n" "X-Poedit-SourceCharset: UTF-8\n" -#: admin.py:16 +#: osusers/admin.py:16 msgid "Passwords don't match" msgstr "Passwörter stimmen nicht überein" -#: admin.py:47 +#: osusers/admin.py:47 msgid "Password" msgstr "Passwort" -#: admin.py:51 +#: osusers/admin.py:51 msgid "Password (again)" msgstr "Passwortwiederholung" -#: admin.py:160 +#: osusers/admin.py:160 msgid "Delete selected users" msgstr "Ausgewählte Nutzer löschen" -#: admin.py:201 +#: osusers/admin.py:201 msgid "Delete selected groups" msgstr "Ausgewählte Gruppen löschen" -#: apps.py:17 +#: osusers/apps.py:17 msgid "Operating System Users and Groups" msgstr "Betriebssystemnutzer- und Gruppen" -#: models.py:41 +#: osusers/models.py:43 msgid "You can not use a user's primary group." msgstr "Sie können nicht die primäre Gruppe des Nutzers verwenden." -#: models.py:71 +#: osusers/models.py:73 msgid "Group name" msgstr "Gruppenname" -#: models.py:73 +#: osusers/models.py:75 msgid "Group ID" msgstr "Gruppen-ID" -#: models.py:74 +#: osusers/models.py:76 msgid "Description" msgstr "Beschreibung" -#: models.py:76 +#: osusers/models.py:78 msgid "Group password" msgstr "Gruppenpasswort" -#: models.py:81 models.py:212 +#: osusers/models.py:83 osusers/models.py:217 msgid "Group" msgstr "Gruppe" -#: models.py:82 +#: osusers/models.py:84 msgid "Groups" msgstr "Gruppen" -#: models.py:209 +#: osusers/models.py:214 msgid "User name" msgstr "Nutzername" -#: models.py:211 +#: osusers/models.py:216 msgid "User ID" msgstr "Nutzer-ID" -#: models.py:213 +#: osusers/models.py:218 msgid "Gecos field" msgstr "GECOS-Feld" -#: models.py:214 +#: osusers/models.py:219 msgid "Home directory" msgstr "Home-Verzeichnis" -#: models.py:215 +#: osusers/models.py:220 msgid "Login shell" msgstr "Loginshell" -#: models.py:221 models.py:335 +#: osusers/models.py:226 osusers/models.py:351 msgid "User" msgstr "Nutzer" -#: models.py:222 +#: osusers/models.py:227 msgid "Users" msgstr "Nutzer" -#: models.py:336 +#: osusers/models.py:352 msgid "Encrypted password" msgstr "Verschlüsseltes Passwort" -#: models.py:338 +#: osusers/models.py:354 msgid "Date of last change" msgstr "Datum der letzten Änderung" -#: models.py:339 +#: osusers/models.py:355 msgid "This is expressed in days since Jan 1, 1970" msgstr "Ausgedrückt als Tage seit dem 1. Januar 1970" -#: models.py:342 +#: osusers/models.py:358 msgid "Minimum age" msgstr "Minimales Alter" -#: models.py:343 +#: osusers/models.py:359 msgid "Minimum number of days before the password can be changed" msgstr "Minmale Anzahl von Tagen bevor das Passwort geändert werden kann" -#: models.py:347 +#: osusers/models.py:363 msgid "Maximum age" msgstr "Maximales Alter" -#: models.py:348 +#: osusers/models.py:364 msgid "Maximum number of days after which the password has to be changed" msgstr "" "Maximale Anzahl von Tagen, nach denen das Passwort geändert werden muss" -#: models.py:352 +#: osusers/models.py:368 msgid "Grace period" msgstr "Duldungsperiode" -#: models.py:353 +#: osusers/models.py:369 msgid "The number of days before the password is going to expire" msgstr "Anzahl von Tagen nach denen das Passwort verfällt" -#: models.py:357 +#: osusers/models.py:373 msgid "Inactivity period" msgstr "Inaktivitätsperiode" -#: models.py:358 +#: osusers/models.py:374 msgid "" "The number of days after the password has expired during which the password " "should still be accepted" @@ -148,28 +148,28 @@ msgstr "" "Die Anzahl von Tagen für die ein verfallenes Passwort noch akzeptiert werden " "soll" -#: models.py:362 +#: osusers/models.py:378 msgid "Account expiration date" msgstr "Kontoverfallsdatum" -#: models.py:363 +#: osusers/models.py:379 msgid "" "The date of expiration of the account, expressed as number of days since Jan " "1, 1970" msgstr "Kontoverfallsdatum in Tagen seit dem 1. Januar 1970" -#: models.py:370 +#: osusers/models.py:386 msgid "Shadow password" msgstr "Shadow-Passwort" -#: models.py:371 +#: osusers/models.py:387 msgid "Shadow passwords" msgstr "Shadow-Passwörter" -#: models.py:397 +#: osusers/models.py:413 msgid "Additional group" msgstr "Weitere Gruppe" -#: models.py:398 +#: osusers/models.py:414 msgid "Additional groups" msgstr "Weitere Gruppen" diff --git a/gnuviechadmin/static/css/font-awesome.min.css b/gnuviechadmin/static/css/font-awesome.min.css new file mode 100644 index 0000000..ec53d4d --- /dev/null +++ b/gnuviechadmin/static/css/font-awesome.min.css @@ -0,0 +1,4 @@ +/*! + * Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome + * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) + */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.2.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.2.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff?v=4.2.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.2.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"} \ No newline at end of file diff --git a/gnuviechadmin/static/fonts/FontAwesome.otf b/gnuviechadmin/static/fonts/FontAwesome.otf new file mode 100644 index 0000000..81c9ad9 Binary files /dev/null and b/gnuviechadmin/static/fonts/FontAwesome.otf differ diff --git a/gnuviechadmin/static/fonts/fontawesome-webfont.eot b/gnuviechadmin/static/fonts/fontawesome-webfont.eot new file mode 100644 index 0000000..84677bc Binary files /dev/null and b/gnuviechadmin/static/fonts/fontawesome-webfont.eot differ diff --git a/gnuviechadmin/static/fonts/fontawesome-webfont.svg b/gnuviechadmin/static/fonts/fontawesome-webfont.svg new file mode 100644 index 0000000..d907b25 --- /dev/null +++ b/gnuviechadmin/static/fonts/fontawesome-webfont.svg @@ -0,0 +1,520 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gnuviechadmin/static/fonts/fontawesome-webfont.ttf b/gnuviechadmin/static/fonts/fontawesome-webfont.ttf new file mode 100644 index 0000000..96a3639 Binary files /dev/null and b/gnuviechadmin/static/fonts/fontawesome-webfont.ttf differ diff --git a/gnuviechadmin/static/fonts/fontawesome-webfont.woff b/gnuviechadmin/static/fonts/fontawesome-webfont.woff new file mode 100644 index 0000000..628b6a5 Binary files /dev/null and b/gnuviechadmin/static/fonts/fontawesome-webfont.woff differ diff --git a/gnuviechadmin/taskresults/locale/de/LC_MESSAGES/django.po b/gnuviechadmin/taskresults/locale/de/LC_MESSAGES/django.po new file mode 100644 index 0000000..fd37349 --- /dev/null +++ b/gnuviechadmin/taskresults/locale/de/LC_MESSAGES/django.po @@ -0,0 +1,48 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: gnuviechadmin taskresults\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-17 15:59+0100\n" +"PO-Revision-Date: 2015-01-17 16:00+0100\n" +"Last-Translator: Jan Dittberner \n" +"Language-Team: Jan Dittberner \n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.6.10\n" +"X-Poedit-SourceCharset: UTF-8\n" + +#: taskresults/models.py:22 +msgid "Task id" +msgstr "Task-Id" + +#: taskresults/models.py:23 +msgid "Task name" +msgstr "Taskname" + +#: taskresults/models.py:24 taskresults/models.py:31 +msgid "Task result" +msgstr "Taskergebnis" + +#: taskresults/models.py:26 +msgid "Task state" +msgstr "Taskstatus" + +#: taskresults/models.py:32 +msgid "Task results" +msgstr "Taskergebnisse" + +#: taskresults/models.py:38 +msgid "yes" +msgstr "ja" + +#: taskresults/models.py:38 +msgid "no" +msgstr "nein" diff --git a/gnuviechadmin/templates/account/account_inactive.html b/gnuviechadmin/templates/account/account_inactive.html new file mode 100644 index 0000000..9bb2dbf --- /dev/null +++ b/gnuviechadmin/templates/account/account_inactive.html @@ -0,0 +1,9 @@ +{% extends "account/base.html" %} + +{% load i18n %} +{% block title %}{{ block.super }} - {% trans "Account Inactive" %}{% endblock title %} +{% block page_title %}{% trans "Account Inactive" %}{% endblock page_title %} + +{% block content %} +

{% trans "This account is inactive." %}

+{% endblock %} diff --git a/gnuviechadmin/templates/account/base.html b/gnuviechadmin/templates/account/base.html new file mode 100644 index 0000000..94d9808 --- /dev/null +++ b/gnuviechadmin/templates/account/base.html @@ -0,0 +1 @@ +{% extends "base.html" %} diff --git a/gnuviechadmin/templates/account/email.html b/gnuviechadmin/templates/account/email.html new file mode 100644 index 0000000..23fb02b --- /dev/null +++ b/gnuviechadmin/templates/account/email.html @@ -0,0 +1,75 @@ +{% extends "account/base.html" %} +{% load i18n crispy_forms_tags %} +{% block title %}{% trans "Account" %}{% endblock title %} +{% block page_title %}{% trans "E-mail Addresses" %}{% endblock page_title %} + +{% block content %} +{% if user.emailaddress_set.all %} +

{% trans 'The following e-mail addresses are associated with your account:' %}

+ +{% else %} +

{% trans 'Warning:'%} {% trans "You currently do not have any e-mail address set up. You should really add an e-mail address so you can receive notifications, reset your password, etc." %}

+{% endif %} + +

{% trans "Add E-mail Address" %}

+ +
+ {% csrf_token %} + {{ form | crispy }} + +
+{% endblock content %} + +{% block extra_js %} + +{% endblock extra_js %} diff --git a/gnuviechadmin/templates/account/email/email_confirmation_message.txt b/gnuviechadmin/templates/account/email/email_confirmation_message.txt new file mode 100644 index 0000000..50bfb87 --- /dev/null +++ b/gnuviechadmin/templates/account/email/email_confirmation_message.txt @@ -0,0 +1,4 @@ +{% load account %}{% user_display user as user_display %}{% load i18n %}{% autoescape off %}{% blocktrans with current_site.name as site_name %}User {{ user_display }} at {{ site_name }} has given this as an email address. + +To confirm this is correct, go to {{ activate_url }} +{% endblocktrans %}{% endautoescape %} diff --git a/gnuviechadmin/templates/account/email/email_confirmation_signup_message.txt b/gnuviechadmin/templates/account/email/email_confirmation_signup_message.txt new file mode 100644 index 0000000..9996f7e --- /dev/null +++ b/gnuviechadmin/templates/account/email/email_confirmation_signup_message.txt @@ -0,0 +1 @@ +{% include "account/email/email_confirmation_message.txt" %} diff --git a/gnuviechadmin/templates/account/email/email_confirmation_signup_subject.txt b/gnuviechadmin/templates/account/email/email_confirmation_signup_subject.txt new file mode 100644 index 0000000..4c85ebb --- /dev/null +++ b/gnuviechadmin/templates/account/email/email_confirmation_signup_subject.txt @@ -0,0 +1 @@ +{% include "account/email/email_confirmation_subject.txt" %} diff --git a/gnuviechadmin/templates/account/email/email_confirmation_subject.txt b/gnuviechadmin/templates/account/email/email_confirmation_subject.txt new file mode 100644 index 0000000..3c960da --- /dev/null +++ b/gnuviechadmin/templates/account/email/email_confirmation_subject.txt @@ -0,0 +1,4 @@ +{% load i18n %} +{% autoescape off %} +{% blocktrans %}Confirm E-mail Address{% endblocktrans %} +{% endautoescape %} diff --git a/gnuviechadmin/templates/account/email/password_reset_key_message.txt b/gnuviechadmin/templates/account/email/password_reset_key_message.txt new file mode 100644 index 0000000..8ef754a --- /dev/null +++ b/gnuviechadmin/templates/account/email/password_reset_key_message.txt @@ -0,0 +1,8 @@ +{% load i18n %}{% blocktrans with site.domain as site_domain %}You're receiving this e-mail because you or someone else has requested a password for your user account at {{site_domain}}. +It can be safely ignored if you did not request a password reset. Click the link below to reset your password.{% endblocktrans %} + +{{ password_reset_url }} + +{% if username %}{% blocktrans %}In case you forgot, your username is {{ username }}.{% endblocktrans %} + +{% endif %}{% trans 'Thanks for using our site!' %} diff --git a/gnuviechadmin/templates/account/email/password_reset_key_subject.txt b/gnuviechadmin/templates/account/email/password_reset_key_subject.txt new file mode 100644 index 0000000..6840c40 --- /dev/null +++ b/gnuviechadmin/templates/account/email/password_reset_key_subject.txt @@ -0,0 +1,4 @@ +{% load i18n %} +{% autoescape off %} +{% blocktrans %}Password Reset E-mail{% endblocktrans %} +{% endautoescape %} diff --git a/gnuviechadmin/templates/account/email_confirm.html b/gnuviechadmin/templates/account/email_confirm.html new file mode 100644 index 0000000..80d4aef --- /dev/null +++ b/gnuviechadmin/templates/account/email_confirm.html @@ -0,0 +1,18 @@ +{% extends "account/base.html" %} +{% load account i18n %} +{% block title %}{{ block.super }} - {% trans "Confirm E-mail Address" %}{% endblock title %} +{% block page_title %}{% trans "Confirm E-Mail Address" %}{% endblock %} + +{% block content %} +{% if confirmation %} + {% user_display confirmation.email_address.user as user_display %} +

{% blocktrans with confirmation.email_address.email as email %}Please confirm that {{ email }} is an e-mail address for user {{ user_display }}.{% endblocktrans %}

+
+ {% csrf_token %} + +
+{% else %} + {% url 'account_email' as email_url %} +

{% blocktrans %}This e-mail confirmation link expired or is invalid. Please issue a new e-mail confirmation request.{% endblocktrans %}

+{% endif %} +{% endblock content %} diff --git a/gnuviechadmin/templates/account/email_confirmed.html b/gnuviechadmin/templates/account/email_confirmed.html new file mode 100644 index 0000000..a6b70bb --- /dev/null +++ b/gnuviechadmin/templates/account/email_confirmed.html @@ -0,0 +1,10 @@ +{% extends "account/base.html" %} +{% load account i18n %} + +{% block title %}{{ block.super }} - {% trans "Confirm E-mail Address" %}{% endblock title %} +{% block page_title %}{% trans "Confirm E-mail Address" %}{% endblock page_title %} + +{% block content %} +{% user_display confirmation.email_address.user as user_display %} +

{% blocktrans with confirmation.email_address.email as email %}You have confirmed that {{ email }} is an e-mail address for user {{ user_display }}.{% endblocktrans %}

+{% endblock content %} diff --git a/gnuviechadmin/templates/account/login.html b/gnuviechadmin/templates/account/login.html new file mode 100644 index 0000000..f3cb8f1 --- /dev/null +++ b/gnuviechadmin/templates/account/login.html @@ -0,0 +1,35 @@ +{% extends "account/base.html" %} +{% load account crispy_forms_tags i18n %} + +{% block title %}{{ block.super }} - {% trans "Sign In" %}{% endblock title %} +{% block page_title %}{% trans "Sign In" %}{% endblock page_title %} + +{% block content %} +{% if socialaccount.providers %} +

{% blocktrans with site.name as site_name %}Please sign in with one +of your existing third party accounts. Or, sign up +for a {{site_name}} account and sign in below:{% endblocktrans %}

+ +
    + {% include "socialaccount/snippets/provider_list.html" with process="login" %} +
+

{% trans 'or' %}

+{% else %} +

{% blocktrans %}If you have not created an account yet, then please +sign up first.{% endblocktrans %}

+{% endif %} + + +{% endblock %} + +{% block extra_js %} +{% include "socialaccount/snippets/login_extra.html" %} +{% endblock extra_js %} diff --git a/gnuviechadmin/templates/account/logout.html b/gnuviechadmin/templates/account/logout.html new file mode 100644 index 0000000..22f66de --- /dev/null +++ b/gnuviechadmin/templates/account/logout.html @@ -0,0 +1,17 @@ +{% extends "account/base.html" %} +{% load i18n %} + +{% block title %}{{ block.super }} - {% trans "Sign Out" %}{% endblock title %} +{% block page_title %}{% trans "Sign Out" %}{% endblock page_title %} + +{% block content %} +

{% trans 'Are you sure you want to sign out?' %}

+ +
+ {% csrf_token %} + {% if redirect_field_value %} + + {% endif %} + +
+{% endblock %} diff --git a/gnuviechadmin/templates/account/messages/cannot_delete_primary_email.txt b/gnuviechadmin/templates/account/messages/cannot_delete_primary_email.txt new file mode 100644 index 0000000..de55571 --- /dev/null +++ b/gnuviechadmin/templates/account/messages/cannot_delete_primary_email.txt @@ -0,0 +1,2 @@ +{% load i18n %} +{% blocktrans %}You cannot remove your primary e-mail address ({{email}}).{% endblocktrans %} diff --git a/gnuviechadmin/templates/account/messages/email_confirmation_sent.txt b/gnuviechadmin/templates/account/messages/email_confirmation_sent.txt new file mode 100644 index 0000000..7a526f8 --- /dev/null +++ b/gnuviechadmin/templates/account/messages/email_confirmation_sent.txt @@ -0,0 +1,2 @@ +{% load i18n %} +{% blocktrans %}Confirmation e-mail sent to {{email}}.{% endblocktrans %} diff --git a/gnuviechadmin/templates/account/messages/email_confirmed.txt b/gnuviechadmin/templates/account/messages/email_confirmed.txt new file mode 100644 index 0000000..3427a4d --- /dev/null +++ b/gnuviechadmin/templates/account/messages/email_confirmed.txt @@ -0,0 +1,2 @@ +{% load i18n %} +{% blocktrans %}You have confirmed {{email}}.{% endblocktrans %} diff --git a/gnuviechadmin/templates/account/messages/email_deleted.txt b/gnuviechadmin/templates/account/messages/email_deleted.txt new file mode 100644 index 0000000..5cf7cf9 --- /dev/null +++ b/gnuviechadmin/templates/account/messages/email_deleted.txt @@ -0,0 +1,2 @@ +{% load i18n %} +{% blocktrans %}Removed e-mail address {{email}}.{% endblocktrans %} diff --git a/gnuviechadmin/templates/account/messages/logged_in.txt b/gnuviechadmin/templates/account/messages/logged_in.txt new file mode 100644 index 0000000..f49248a --- /dev/null +++ b/gnuviechadmin/templates/account/messages/logged_in.txt @@ -0,0 +1,4 @@ +{% load account %} +{% load i18n %} +{% user_display user as name %} +{% blocktrans %}Successfully signed in as {{name}}.{% endblocktrans %} diff --git a/gnuviechadmin/templates/account/messages/logged_out.txt b/gnuviechadmin/templates/account/messages/logged_out.txt new file mode 100644 index 0000000..2cd4627 --- /dev/null +++ b/gnuviechadmin/templates/account/messages/logged_out.txt @@ -0,0 +1,2 @@ +{% load i18n %} +{% blocktrans %}You have signed out.{% endblocktrans %} diff --git a/gnuviechadmin/templates/account/messages/password_changed.txt b/gnuviechadmin/templates/account/messages/password_changed.txt new file mode 100644 index 0000000..bd5801c --- /dev/null +++ b/gnuviechadmin/templates/account/messages/password_changed.txt @@ -0,0 +1,2 @@ +{% load i18n %} +{% blocktrans %}Password successfully changed.{% endblocktrans %} diff --git a/gnuviechadmin/templates/account/messages/password_set.txt b/gnuviechadmin/templates/account/messages/password_set.txt new file mode 100644 index 0000000..e36cef8 --- /dev/null +++ b/gnuviechadmin/templates/account/messages/password_set.txt @@ -0,0 +1,3 @@ +{% load i18n %} +{% blocktrans %}Password successfully set.{% endblocktrans %} + diff --git a/gnuviechadmin/templates/account/messages/primary_email_set.txt b/gnuviechadmin/templates/account/messages/primary_email_set.txt new file mode 100644 index 0000000..b6a70dd --- /dev/null +++ b/gnuviechadmin/templates/account/messages/primary_email_set.txt @@ -0,0 +1,2 @@ +{% load i18n %} +{% blocktrans %}Primary e-mail address set.{% endblocktrans %} diff --git a/gnuviechadmin/templates/account/messages/unverified_primary_email.txt b/gnuviechadmin/templates/account/messages/unverified_primary_email.txt new file mode 100644 index 0000000..9c9d0d8 --- /dev/null +++ b/gnuviechadmin/templates/account/messages/unverified_primary_email.txt @@ -0,0 +1,2 @@ +{% load i18n %} +{% blocktrans %}Your primary e-mail address must be verified.{% endblocktrans %} diff --git a/gnuviechadmin/templates/account/password_change.html b/gnuviechadmin/templates/account/password_change.html new file mode 100644 index 0000000..86e153a --- /dev/null +++ b/gnuviechadmin/templates/account/password_change.html @@ -0,0 +1,13 @@ +{% extends "account/base.html" %} +{% load i18n crispy_forms_tags %} + +{% block title %}{{ block.super }} - {% trans "Change Password" %}{% endblock title %} +{% block page_title %}{% trans "Change Password" %}{% endblock page_title %} + +{% block content %} +
+ {% csrf_token %} + {{ form | crispy }} + +
+{% endblock %} diff --git a/gnuviechadmin/templates/account/password_reset.html b/gnuviechadmin/templates/account/password_reset.html new file mode 100644 index 0000000..90f15f1 --- /dev/null +++ b/gnuviechadmin/templates/account/password_reset.html @@ -0,0 +1,21 @@ +{% extends "account/base.html" %} +{% load account i18n crispy_forms_tags %} + +{% block title %}{{ block.super }} - {% trans "Password Reset" %}{% endblock title %} +{% block page_title %}{% trans "Password Reset" %}{% endblock page_title %} + +{% block content %} + {% if user.is_authenticated %} + {% include "account/snippets/already_logged_in.html" %} + {% endif %} + +

{% trans "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it." %}

+ +
+ {% csrf_token %} + {{ form | crispy }} + +
+ +

{% blocktrans %}Please contact us if you have any trouble resetting your password.{% endblocktrans %}

+{% endblock %} diff --git a/gnuviechadmin/templates/account/password_reset_done.html b/gnuviechadmin/templates/account/password_reset_done.html new file mode 100644 index 0000000..5bbc142 --- /dev/null +++ b/gnuviechadmin/templates/account/password_reset_done.html @@ -0,0 +1,12 @@ +{% extends "account/base.html" %} +{% load account i18n %} + +{% block title %}{{ block.super }} - {% trans "Password Reset" %}{% endblock title %} +{% block page_title %}{% trans "Password Reset" %}{% endblocktrans page_title %} + +{% block content %} +{% if user.is_authenticated %} + {% include "account/snippets/already_logged_in.html" %} +{% endif %} +

{% blocktrans %}We have sent you an e-mail. Please contact us if you do not receive it within a few minutes.{% endblocktrans %}

+{% endblock %} diff --git a/gnuviechadmin/templates/account/password_reset_from_key.html b/gnuviechadmin/templates/account/password_reset_from_key.html new file mode 100644 index 0000000..e4dd274 --- /dev/null +++ b/gnuviechadmin/templates/account/password_reset_from_key.html @@ -0,0 +1,21 @@ +{% extends "account/base.html" %} +{% load i18n crispy_forms_tags %} +{% block title %}{{ block.super }} - {% trans "Change Password" %}{% endblock title %} +{% block page_title %}{% if token_fail %}{% trans "Bad Token" %}{% else %}{% trans "Change Password" %}{% endif %}{% endblock page_title %} + +{% block content %} +{% if token_fail %} + {% url 'account_reset_password' as passwd_reset_url %} +

{% blocktrans %}The password reset link was invalid, possibly because it has already been used. Please request a new password reset.{% endblocktrans %}

+{% else %} + {% if form %} +
+ {% csrf_token %} + {{ form | crispy }} + +
+ {% else %} +

{% trans 'Your password is now changed.' %}

+ {% endif %} +{% endif %} +{% endblock content %} diff --git a/gnuviechadmin/templates/account/password_reset_from_key_done.html b/gnuviechadmin/templates/account/password_reset_from_key_done.html new file mode 100644 index 0000000..d3bfabe --- /dev/null +++ b/gnuviechadmin/templates/account/password_reset_from_key_done.html @@ -0,0 +1,8 @@ +{% extends "account/base.html" %} +{% load i18n %} +{% block title %}{{ block.super }} - {% trans "Change Password" %}{% endblock title %} +{% block page_title %}{% trans "Change Password" %}{% endblock page_title %} + +{% block content %} +

{% trans 'Your password is now changed.' %}

+{% endblock %} diff --git a/gnuviechadmin/templates/account/password_set.html b/gnuviechadmin/templates/account/password_set.html new file mode 100644 index 0000000..3bd0759 --- /dev/null +++ b/gnuviechadmin/templates/account/password_set.html @@ -0,0 +1,13 @@ +{% extends "account/base.html" %} +{% load i18n crispy_forms_tags %} + +{% block title %}{{ block.super }} - {% trans "Set Password" %}{% endblock title %} +{% block page_title %}{% trans "Set Password" %}{% endblock page_title %} + +{% block content %} +
+ {% csrf_token %} + {{ form | crispy }} + +
+{% endblock %} diff --git a/gnuviechadmin/templates/account/signup.html b/gnuviechadmin/templates/account/signup.html new file mode 100644 index 0000000..4f4abf5 --- /dev/null +++ b/gnuviechadmin/templates/account/signup.html @@ -0,0 +1,19 @@ +{% extends "account/base.html" %} +{% load i18n crispy_forms_tags %} + +{% block title %}{{ block.super }} - {% trans "Signup" %}{% endblock title %} +{% block page_title %}{% trans "Sign Up" %}{% endblock page_title %} + +{% block content %} +

{% blocktrans %}Already have an account? Then please sign in.{% endblocktrans %}

+ +{% endblock %} + + diff --git a/gnuviechadmin/templates/account/signup_closed.html b/gnuviechadmin/templates/account/signup_closed.html new file mode 100644 index 0000000..c40efe5 --- /dev/null +++ b/gnuviechadmin/templates/account/signup_closed.html @@ -0,0 +1,9 @@ +{% extends "account/base.html" %} +{% load i18n %} + +{% block title %}{{ block.super }} - {% trans "Sign Up Closed" %}{% endblock title %} +{% block page_title %}{% trans "Sign Up Closed" %}{% endblock page_title %} + +{% block content %} +

{% trans "We are sorry, but the sign up is currently closed." %}

+{% endblock %} diff --git a/gnuviechadmin/templates/account/snippets/already_logged_in.html b/gnuviechadmin/templates/account/snippets/already_logged_in.html new file mode 100644 index 0000000..fd4db27 --- /dev/null +++ b/gnuviechadmin/templates/account/snippets/already_logged_in.html @@ -0,0 +1,4 @@ +{% load account i18n %} + +{% user_display user as user_display %} +

{% trans "Note" %}: {% blocktrans %}you are already logged in as {{ user_display }}.{% endblocktrans %}

diff --git a/gnuviechadmin/templates/account/verification_sent.html b/gnuviechadmin/templates/account/verification_sent.html new file mode 100644 index 0000000..1811d9e --- /dev/null +++ b/gnuviechadmin/templates/account/verification_sent.html @@ -0,0 +1,10 @@ +{% extends "account/base.html" %} + +{% load i18n %} + +{% block title %}{{ block.super }} - {% trans "Verify Your E-mail Address" %}{% endblock title %} +{% block page_title %}{% trans "Verify Your E-mail Address" %}{% endblock page_title %} + +{% block content %} +

{% blocktrans %}We have sent an e-mail to you for verification. Follow the link provided to finalize the signup process. Please contact us if you do not receive it within a few minutes.{% endblocktrans %}

+{% endblock %} diff --git a/gnuviechadmin/templates/account/verified_email_required.html b/gnuviechadmin/templates/account/verified_email_required.html new file mode 100644 index 0000000..eb3c5e1 --- /dev/null +++ b/gnuviechadmin/templates/account/verified_email_required.html @@ -0,0 +1,18 @@ +{% extends "account/base.html" %} +{% load i18n %} + +{% block title %}{{ block.super }} - {% trans "Verify Your E-mail Address" %}{% endblock title %} +{% block page_title %}{% trans "Verify Your E-mail Address" %}{% endblock %} + +{% block content %} +{% url 'account_email' as email_url %} +

{% blocktrans %}This part of the site requires us to verify that +you are who you claim to be. For this purpose, we require that you +verify ownership of your e-mail address. {% endblocktrans %}

+ +

{% blocktrans %}We have sent an e-mail to you for +verification. Please click on the link inside this e-mail. Please +contact us if you do not receive it within a few minutes.{% endblocktrans %}

+ +

{% blocktrans %}Note: you can still change your e-mail address.{% endblocktrans %}

+{% endblock %} diff --git a/gnuviechadmin/templates/base.html b/gnuviechadmin/templates/base.html index 6d43ecb..b73e3cd 100644 --- a/gnuviechadmin/templates/base.html +++ b/gnuviechadmin/templates/base.html @@ -1,4 +1,4 @@ -{% load staticfiles %} +{% load staticfiles i18n account %} @@ -10,6 +10,7 @@ +