Get rid of the web_theme app

mayan/apps/common/templates/login.html

@@ -1,15 +1,82 @@
-{% extends 'web_theme_login.html' %}
+{% extends 'web_theme_base.html' %}
 
 {% load i18n %}
 
+{% load autoadmin_tags %}
 {% load project_tags %}
+{% load theme_tags %}
+
+{% block web_theme_head %}
+    {% if user.is_authenticated %}
+        {% get_login_redirect_url %}
+        <meta http-equiv="REFRESH" content="5;url={{ LOGIN_REDIRECT_URL }}">
+    {% endif %}
+{% endblock %}
 
 {% block html_title %}{% project_name %} :: {% trans 'Login' %}{% endblock %}
 
+    {% if user.is_authenticated %}
+        {% block web_theme_content %}
+            {% get_login_redirect_url %}
+                <div class="content">
+                    <h2 class="title">{% trans 'You are already logged in' %}</h2>
+                    <div class="inner">
+                        <p>
+                            {% trans 'Redirecting you to the website entry point in 5 seconds.' %}
+                        <p>
+                        </p>
+                            {% blocktrans %}Or click <a href="{{ LOGIN_REDIRECT_URL }}">here</a> if redirection doesn't work.{% endblocktrans %}
+                        </p>
+                    </div>
+                </div>
+        {% endblock %}
+    {% else %}
+        {% block content_plain %}
+            {% auto_admin_properties %}
+            {% if auto_admin_properties.account %}
+                <div id="box">
+                    <div class="block" id="block-login">
+                        <h2>{% trans "First time login" %}</h2>
+                        <div class="content login">
+                            <p>{% trans 'You have just finished installing <strong>Mayan EDMS</strong>, congratulations!' %}</p>
+                            <p>{% trans 'Login using the following credentials:' %}</p>
+                            <p>{% blocktrans with auto_admin_properties.account as account %}Username: <strong>{{ account }}</strong>{% endblocktrans %}</p>
+                            <p>{% blocktrans with auto_admin_properties.account.email as email %}Email: <strong>{{ email }}</strong>{% endblocktrans %}</p>
+                            <p>{% blocktrans with auto_admin_properties.password as password %}Password: <strong>{{ password }}</strong>{% endblocktrans %}</p>
+                            <p>{% trans 'Be sure to change the password to increase security and to disable this message.' %}</p>
+                        </div>
+                    </div>
+                </div>
+            {% endif %}
+            <div id="box">
+                <h1>{% project_name %}</h1>
+                <div class="block" id="block-login">
+                    <h2>{% trans 'Login' %}</h2>
+                    <div class="content login">
+                        <form action="." method="post" class="form login">{% csrf_token %}
+                            <div class="group wat-cf">
+                                {% include 'generic_form_instance.html' %}
+                                <input type="hidden" name="next" value="{{ next|escape }}" />
+                                <div class="group navform wat-cf">
+                                <button class="button" type="submit">
+                                    <img src="{{ STATIC_URL }}web_theme_media/images/icons/key.png" alt="Save" /> {% trans 'Login' %}
+                                </button>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+            {% get_web_theme_setting "VERBOSE_LOGIN" as verbose_login %}
+            {% if verbose_login %}
+                {% include 'verbose_login.html' %}
+            {% endif %}
+        {% endblock %}
+    {% endif %}
+
 {% block web_theme_stylesheets %}
     <style>
         input#id_email { width: 100%; }
     </style>
 {% endblock web_theme_stylesheets %}
 
-{% block project_name %}{% project_name %}{% endblock %}
+{% block project_name %}{% endblock %}

mayan/apps/main/conf/settings.py

@@ -1,7 +1,7 @@
 """Configuration options for the main app"""
 
 from django.utils.translation import ugettext_lazy as _
-from smart_settings.api import register_setting
+from smart_settings.api import register_setting, register_settings
 
 register_setting(
     namespace=u'main',
@@ -27,3 +27,13 @@ register_setting(
     global_name=u'MAIN_DISABLE_ICONS',
     default=False,
 )
+
+register_settings(
+    namespace=u'main',
+    module=u'main.conf.settings',
+    settings=[
+        {'name': u'THEME', 'global_name': u'MAIN_THEME', 'default': u'activo', 'description': _(u'CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and warehouse.')},
+        {'name': u'ENABLE_SCROLL_JS', 'global_name': u'MAIN_ENABLE_SCROLL_JS', 'default': True, 'hidden': True},
+        {'name': u'VERBOSE_LOGIN', 'global_name': u'MAIN_VERBOSE_LOGIN', 'default': True, 'description': _(u'Display extra information in the login screen.')},
+    ]
+)

mayan/apps/web_theme/conf/settings.py

@@ -1,14 +0,0 @@
-"""Configuration options for the web_theme app"""
-from django.utils.translation import ugettext_lazy as _
-
-from smart_settings.api import register_settings
-
-register_settings(
-    namespace=u'web_theme',
-    module=u'web_theme.conf.settings',
-    settings=[
-        {'name': u'THEME', 'global_name': u'WEB_THEME_THEME', 'default': u'activo', 'description': _(u'CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and warehouse.')},
-        {'name': u'ENABLE_SCROLL_JS', 'global_name': u'WEB_THEME_ENABLE_SCROLL_JS', 'default': True, 'hidden': True},
-        {'name': u'VERBOSE_LOGIN', 'global_name': u'WEB_THEME_VERBOSE_LOGIN', 'default': True, 'description': _(u'Display extra information in the login screen.')},
-    ]
-)

mayan/apps/web_theme/locale/ar/LC_MESSAGES/django.po

@@ -1,122 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-# Mohammed ALDOUB <voulnet@gmail.com>, 2013
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-31 19:55-0400\n"
-"PO-Revision-Date: 2013-01-26 08:25+0000\n"
-"Last-Translator: Mohammed ALDOUB <voulnet@gmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/mayan-edms/"
-"language/ar/)\n"
-"Language: ar\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: conf/settings.py:10
-msgid ""
-"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-"
-"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and "
-"warehouse."
-msgstr ""
-"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-"
-"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and "
-"warehouse."
-
-#: conf/settings.py:12
-msgid "Display extra information in the login screen."
-msgstr "Display extra information in the login screen."
-
-#: templates/web_theme_base.html:75
-msgid "dismiss all notifications"
-msgstr "dismiss all notifications"
-
-#: templates/web_theme_base.html:75
-msgid "close all"
-msgstr "close all"
-
-#: templates/web_theme_base.html:76
-msgid "dismiss this notification"
-msgstr "dismiss this notification"
-
-#: templates/web_theme_base.html:76
-msgid "close"
-msgstr "close"
-
-#: templates/web_theme_login.html:15 templates/web_theme_login.html.py:53
-#: templates/web_theme_login.html:61
-msgid "Login"
-msgstr "Login"
-
-#: templates/web_theme_login.html:21
-msgid "You are already logged in"
-msgstr "You are already logged in"
-
-#: templates/web_theme_login.html:24
-msgid "Redirecting you to the website entry point in 5 seconds."
-msgstr "Redirecting you to the website entry point in 5 seconds."
-
-#: templates/web_theme_login.html:27
-#, python-format
-msgid ""
-"Or click <a href=\"%(LOGIN_REDIRECT_URL)s\">here</a> if redirection doesn't "
-"work."
-msgstr ""
-"Or click <a href=\"%(LOGIN_REDIRECT_URL)s\">here</a> if redirection doesn't "
-"work."
-
-#: templates/web_theme_login.html:38
-msgid "First time login"
-msgstr "First time login"
-
-#: templates/web_theme_login.html:40
-msgid ""
-"You have just finished installing <strong>Mayan EDMS</strong>, "
-"congratulations!"
-msgstr ""
-"You have just finished installing <strong>Mayan EDMS</strong>, "
-"congratulations!"
-
-#: templates/web_theme_login.html:41
-msgid "Login using the following credentials:"
-msgstr "Login using the following credentials:"
-
-#: templates/web_theme_login.html:42
-#, python-format
-msgid "Username: <strong>%(account)s</strong>"
-msgstr "Username: <strong>%(account)s</strong>"
-
-#: templates/web_theme_login.html:43
-#, fuzzy, python-format
-msgid "Email: <strong>%(email)s</strong>"
-msgstr "Username: <strong>%(account)s</strong>"
-
-#: templates/web_theme_login.html:44
-#, python-format
-msgid "Password: <strong>%(password)s</strong>"
-msgstr "Password: <strong>%(password)s</strong>"
-
-#: templates/web_theme_login.html:45
-msgid ""
-"Be sure to change the password to increase security and to disable this "
-"message."
-msgstr ""
-"Be sure to change the password to increase security and to disable this "
-"message."
-
-#: templates/pagination/pagination.html:6
-#: templates/pagination/pagination.html:8
-msgid "Previous"
-msgstr "Previous"
-
-#: templates/pagination/pagination.html:26
-#: templates/pagination/pagination.html:28
-msgid "Next"
-msgstr "Next"

mayan/apps/web_theme/locale/bg/LC_MESSAGES/django.po

@@ -1,120 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-# Pavlin Koldamov <pkoldamov@gmail.com>, 2012
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-31 19:55-0400\n"
-"PO-Revision-Date: 2012-12-12 06:07+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Bulgarian (http://www.transifex.com/projects/p/mayan-edms/"
-"language/bg/)\n"
-"Language: bg\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"
-
-#: conf/settings.py:10
-msgid ""
-"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-"
-"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and "
-"warehouse."
-msgstr ""
-"CSS тема за прилагане, опции: amro, bec, bec-green, blue, default, djime-"
-"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish и "
-"warehouse."
-
-#: conf/settings.py:12
-msgid "Display extra information in the login screen."
-msgstr "Показване на допълнителна информация в  прозореца за вход."
-
-#: templates/web_theme_base.html:75
-msgid "dismiss all notifications"
-msgstr "отказване на всички промени"
-
-#: templates/web_theme_base.html:75
-msgid "close all"
-msgstr "затваряне на всичко"
-
-#: templates/web_theme_base.html:76
-msgid "dismiss this notification"
-msgstr "отказ от това съобщение"
-
-#: templates/web_theme_base.html:76
-msgid "close"
-msgstr "затваряне"
-
-#: templates/web_theme_login.html:15 templates/web_theme_login.html.py:53
-#: templates/web_theme_login.html:61
-msgid "Login"
-msgstr "Вход"
-
-#: templates/web_theme_login.html:21
-msgid "You are already logged in"
-msgstr "Вече сте влезли"
-
-#: templates/web_theme_login.html:24
-msgid "Redirecting you to the website entry point in 5 seconds."
-msgstr "Прехвърляме Ви към началото на уебсайта, 5 секунди."
-
-#: templates/web_theme_login.html:27
-#, python-format
-msgid ""
-"Or click <a href=\"%(LOGIN_REDIRECT_URL)s\">here</a> if redirection doesn't "
-"work."
-msgstr ""
-"Или натиснете <a href=\"%(LOGIN_REDIRECT_URL)s\">тук</a> ако прехвърлянето "
-"не сработи."
-
-#: templates/web_theme_login.html:38
-msgid "First time login"
-msgstr "Логване за първи път"
-
-#: templates/web_theme_login.html:40
-msgid ""
-"You have just finished installing <strong>Mayan EDMS</strong>, "
-"congratulations!"
-msgstr ""
-"Вие приключихте инсталирането на <strong>Mayan EDMS</strong>, поздравления!"
-
-#: templates/web_theme_login.html:41
-msgid "Login using the following credentials:"
-msgstr "Логване, използвайки следните параметри:"
-
-#: templates/web_theme_login.html:42
-#, python-format
-msgid "Username: <strong>%(account)s</strong>"
-msgstr "Потребителско име: <strong>%(account)s</strong>"
-
-#: templates/web_theme_login.html:43
-#, fuzzy, python-format
-msgid "Email: <strong>%(email)s</strong>"
-msgstr "Потребителско име: <strong>%(account)s</strong>"
-
-#: templates/web_theme_login.html:44
-#, python-format
-msgid "Password: <strong>%(password)s</strong>"
-msgstr "Парола: <strong>%(password)s</strong>"
-
-#: templates/web_theme_login.html:45
-msgid ""
-"Be sure to change the password to increase security and to disable this "
-"message."
-msgstr ""
-"Моля променете паролата, за да повишите нивото на сигурност и да "
-"деактивирате това съобщение."
-
-#: templates/pagination/pagination.html:6
-#: templates/pagination/pagination.html:8
-msgid "Previous"
-msgstr "Предна"
-
-#: templates/pagination/pagination.html:26
-#: templates/pagination/pagination.html:28
-msgid "Next"
-msgstr "Следваща"

mayan/apps/web_theme/locale/bs_BA/LC_MESSAGES/django.po

@@ -1,121 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-# www.ping.ba <jomer@ping.ba>, 2013
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-31 19:55-0400\n"
-"PO-Revision-Date: 2013-06-24 15:49+0000\n"
-"Last-Translator: www.ping.ba <jomer@ping.ba>\n"
-"Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
-"projects/p/mayan-edms/language/bs_BA/)\n"
-"Language: bs_BA\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: conf/settings.py:10
-msgid ""
-"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-"
-"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and "
-"warehouse."
-msgstr ""
-"CSS tema za primjenu, opcije su : amro, bec, bec-green, blue, default, djime-"
-"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish i "
-"warehouse."
-
-#: conf/settings.py:12
-msgid "Display extra information in the login screen."
-msgstr "Prikaži dodatne informacije na login ekranu."
-
-#: templates/web_theme_base.html:75
-msgid "dismiss all notifications"
-msgstr "ne prikazuj više ove notifikacije"
-
-#: templates/web_theme_base.html:75
-msgid "close all"
-msgstr "zatvori sve"
-
-#: templates/web_theme_base.html:76
-msgid "dismiss this notification"
-msgstr "ne prikazuj više ovu notifikaciju"
-
-#: templates/web_theme_base.html:76
-msgid "close"
-msgstr "zatvori"
-
-#: templates/web_theme_login.html:15 templates/web_theme_login.html.py:53
-#: templates/web_theme_login.html:61
-msgid "Login"
-msgstr "Login"
-
-#: templates/web_theme_login.html:21
-msgid "You are already logged in"
-msgstr "Već ste prijavljeni/logirani"
-
-#: templates/web_theme_login.html:24
-msgid "Redirecting you to the website entry point in 5 seconds."
-msgstr "Preusmjeravamo vas na website entry point za 5 sekundi."
-
-#: templates/web_theme_login.html:27
-#, python-format
-msgid ""
-"Or click <a href=\"%(LOGIN_REDIRECT_URL)s\">here</a> if redirection doesn't "
-"work."
-msgstr ""
-"Ili birajte <a href=\"%(LOGIN_REDIRECT_URL)s\">here</a> ako redirekcja ne "
-"radi."
-
-#: templates/web_theme_login.html:38
-msgid "First time login"
-msgstr "Prijava - prvi put"
-
-#: templates/web_theme_login.html:40
-msgid ""
-"You have just finished installing <strong>Mayan EDMS</strong>, "
-"congratulations!"
-msgstr ""
-"Upravo ste završili instalaciju <strong>Mayan EDMS</strong>, čestitamo!"
-
-#: templates/web_theme_login.html:41
-msgid "Login using the following credentials:"
-msgstr "Prijava korištenjem sljedećih podataka:"
-
-#: templates/web_theme_login.html:42
-#, python-format
-msgid "Username: <strong>%(account)s</strong>"
-msgstr "Korisnik: <strong>%(account)s</strong>"
-
-#: templates/web_theme_login.html:43
-#, fuzzy, python-format
-msgid "Email: <strong>%(email)s</strong>"
-msgstr "Korisnik: <strong>%(account)s</strong>"
-
-#: templates/web_theme_login.html:44
-#, python-format
-msgid "Password: <strong>%(password)s</strong>"
-msgstr "Pasvord: <strong>%(password)s</strong>"
-
-#: templates/web_theme_login.html:45
-msgid ""
-"Be sure to change the password to increase security and to disable this "
-"message."
-msgstr ""
-"Ne zaboravite promijeniti pasvord da pojačate sigurnost i onemogućite dalje "
-"prikazivanje ove poruke."
-
-#: templates/pagination/pagination.html:6
-#: templates/pagination/pagination.html:8
-msgid "Previous"
-msgstr "Prethodni"
-
-#: templates/pagination/pagination.html:26
-#: templates/pagination/pagination.html:28
-msgid "Next"
-msgstr "Sljedeći"

mayan/apps/web_theme/locale/da/LC_MESSAGES/django.po

@@ -1,111 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-31 19:55-0400\n"
-"PO-Revision-Date: 2012-12-12 06:07+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Danish (http://www.transifex.com/projects/p/mayan-edms/"
-"language/da/)\n"
-"Language: da\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"
-
-#: conf/settings.py:10
-msgid ""
-"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-"
-"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and "
-"warehouse."
-msgstr ""
-
-#: conf/settings.py:12
-msgid "Display extra information in the login screen."
-msgstr ""
-
-#: templates/web_theme_base.html:75
-msgid "dismiss all notifications"
-msgstr ""
-
-#: templates/web_theme_base.html:75
-msgid "close all"
-msgstr ""
-
-#: templates/web_theme_base.html:76
-msgid "dismiss this notification"
-msgstr ""
-
-#: templates/web_theme_base.html:76
-msgid "close"
-msgstr ""
-
-#: templates/web_theme_login.html:15 templates/web_theme_login.html.py:53
-#: templates/web_theme_login.html:61
-msgid "Login"
-msgstr ""
-
-#: templates/web_theme_login.html:21
-msgid "You are already logged in"
-msgstr ""
-
-#: templates/web_theme_login.html:24
-msgid "Redirecting you to the website entry point in 5 seconds."
-msgstr ""
-
-#: templates/web_theme_login.html:27
-#, python-format
-msgid ""
-"Or click <a href=\"%(LOGIN_REDIRECT_URL)s\">here</a> if redirection doesn't "
-"work."
-msgstr ""
-
-#: templates/web_theme_login.html:38
-msgid "First time login"
-msgstr ""
-
-#: templates/web_theme_login.html:40
-msgid ""
-"You have just finished installing <strong>Mayan EDMS</strong>, "
-"congratulations!"
-msgstr ""
-
-#: templates/web_theme_login.html:41
-msgid "Login using the following credentials:"
-msgstr ""
-
-#: templates/web_theme_login.html:42
-#, python-format
-msgid "Username: <strong>%(account)s</strong>"
-msgstr ""
-
-#: templates/web_theme_login.html:43
-#, python-format
-msgid "Email: <strong>%(email)s</strong>"
-msgstr ""
-
-#: templates/web_theme_login.html:44
-#, python-format
-msgid "Password: <strong>%(password)s</strong>"
-msgstr ""
-
-#: templates/web_theme_login.html:45
-msgid ""
-"Be sure to change the password to increase security and to disable this "
-"message."
-msgstr ""
-
-#: templates/pagination/pagination.html:6
-#: templates/pagination/pagination.html:8
-msgid "Previous"
-msgstr ""
-
-#: templates/pagination/pagination.html:26
-#: templates/pagination/pagination.html:28
-msgid "Next"
-msgstr ""