diff --git a/.isort.cfg b/.isort.cfg new file mode 100644 index 0000000000..424d3ae65b --- /dev/null +++ b/.isort.cfg @@ -0,0 +1,6 @@ +[settings] +default_section = THIRDPARTY +known_first_party = mayan +known_django = django +multi_line_output = 5 +sections = FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER diff --git a/.tx/config b/.tx/config index f2d91534ce..b4cdcd1b61 100644 --- a/.tx/config +++ b/.tx/config @@ -13,6 +13,12 @@ source_lang = en source_file = mayan/apps/appearance/locale/en/LC_MESSAGES/django.po type = PO +[mayan-edms.autoadmin-2-0] +file_filter = mayan/apps/autoadmin/locale//LC_MESSAGES/django.po +source_lang = en +source_file = mayan/apps/autoadmin/locale/en/LC_MESSAGES/django.po +type = PO + [mayan-edms.authentication-2-0] file_filter = mayan/apps/authentication/locale//LC_MESSAGES/django.po source_lang = en diff --git a/HISTORY.rst b/HISTORY.rst index 9d70804d28..380136fdf8 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -111,7 +111,61 @@ The maximum size of the document cache is controlled by the new DOCUMENTS_CACHE_MAXIMUM_SIZE setting. This setting defaults to 500 megabytes. - +- Add support for post edit callbacks to settings. This + callback willl execute when a settings's value is changed. +- Switch to full app paths. Instead of inserting the path + of the apps into the Python app, the apps are now + referenced by their full import path. This avoid app name + clashes with external or native Python libraries. + Example: Mayan statistics app vs. Python new statistics library. + Every app reference is now prepended with 'mayan.apps'. + Existing config.yml files need to be updated manually. +- Added a colorized console log formatter. New log formatter + that colors the output depending on the log level of the + message. The default palette handles: INFO, SUCCESS, ERROR, + DEBUG and CRITICAL. +- Decreased the thumbnail fade-in duration. Reduce the + document thumbnail fadein animation length to speed up + display of resolved thumbnails. Seems to reduce browser + load in FireFox. +- Document stubs are now filtered from the search results. +- Replaced deprecated string_concat in preparation for an + eventual Django 2.x upgrade. +- Removed the converter's base64 image support as it was + no longer being used by any stock app. +- Removed the SIGNATURES_GPG_HOME settings. The GPG keys + are no longer stored in disk but in the database itself + making this setting obsolete. This changed happened + several versions ago and this removal doesn't affect + any code path. +- Added two new settings to the django_gpg app: + SIGNATURES_GPG_BACKEND and SIGNATURES_GPG_BACKEND_ARGUMENTS. + These settings allow changing the GPG backend that the + app will use. +- Removed the settings SIGNATURES_GPG_PATH. The path to the + GPG binary is now passed via the + SIGNATURES_GPG_BACKEND_ARGUMENTS. +- Renamed the setting ``SIGNATURES_STORAGE_BACKEND`` to + ``DOCUMENT_SIGNATURES_STORAGE_BACKEND`` and the setting + ``SIGNATURES_STORAGE_BACKEND_ARGUMENTS`` to + ``DOCUMENT_SIGNATURES_STORAGE_BACKEND_ARGUMENTS``. This + change differentiates them from the setting from the + django_gpg app. +- Updated the django_gpg app to work with the latest + version of the python-gnupg package (0.4.3). +- Set sensible default path for binaries by detecting + the operating system. +- The HOME_VIEW setting is not a Django setting but a setting + from the common app. The HOME_VIEW has been moved to the + COMMON namespace and renamed to COMMON_HOME_VIEW. +- New link added to display the events of the current user. +- Incorporate the django-autoadmin app and convert it + into a Mayan app. With change adds the new settings: + "COMMON_AUTOADMIN_EMAIL", "AUTOADMIN_PASSWORD", and + "AUTOADMIN_USERNAME". +- Changed the use of the list/zip combinarion to generate + the full list of metadata lookup choices to a generator. + 3.1.9 (2018-11-01) ================== - Convert the furl instance to text to allow serializing it into diff --git a/contrib/scripts/process_messages.py b/contrib/scripts/process_messages.py index 11783c8ce5..afdbdd33a1 100755 --- a/contrib/scripts/process_messages.py +++ b/contrib/scripts/process_messages.py @@ -9,13 +9,13 @@ import sh APP_LIST = ( - 'acls', 'appearance', 'authentication', 'cabinets', 'checkouts', 'common', - 'converter', 'django_gpg', 'document_comments', 'document_indexing', - 'document_parsing', 'document_signatures', 'document_states', 'documents', - 'dynamic_search', 'events', 'linking', 'lock_manager', 'mayan_statistics', - 'mailer', 'metadata', 'mirroring', 'motd', 'navigation', 'ocr', 'permissions', - 'rest_api', 'smart_settings', 'sources', 'storage', 'tags', 'task_manager', - 'user_management' + 'acls', 'appearance', 'authentication', 'autoadmin', 'cabinets', + 'checkouts', 'common', 'converter', 'django_gpg', 'document_comments', + 'document_indexing', 'document_parsing', 'document_signatures', + 'document_states', 'documents', 'dynamic_search', 'events', 'linking', + 'lock_manager', 'mayan_statistics', 'mailer', 'metadata', 'mirroring', + 'motd', 'navigation', 'ocr', 'permissions', 'rest_api', 'smart_settings', + 'sources', 'storage', 'tags', 'task_manager', 'user_management' ) LANGUAGE_LIST = ( diff --git a/docs/releases/3.1.6.rst b/docs/releases/3.1.6.rst index a09bd8c04f..3fe154bd5b 100644 --- a/docs/releases/3.1.6.rst +++ b/docs/releases/3.1.6.rst @@ -9,10 +9,10 @@ Changes * Improve index mirroring value clean up code to remove the spaces at the starts and at the end of directories. Closes again GitLab issue #520 - Thanks to TheOneValen @ for the report. + Thanks to @TheOneValen for the report. * Improve index mirroring cache class to use the hash of the keys instead of the literal keys. Avoid warning about invalid key - characters. Closes GitLab issue #518. Thanks to TheOneValen @ for the + characters. Closes GitLab issue #518. Thanks to @TheOneValen for the report. * Only render the Template API view for authenticated users. Thanks rgarcia for the report. diff --git a/docs/releases/3.1.7.rst b/docs/releases/3.1.7.rst index b3c5c3b5dd..9a696cd1ed 100644 --- a/docs/releases/3.1.7.rst +++ b/docs/releases/3.1.7.rst @@ -12,10 +12,10 @@ Changes * Remove duplicate YAML loading of environment variables. * Don't load development apps if they are already loaded. * Make sure all key used as input for the cache key hash are - bytes and not unicode. GitLab issue #520. Thanks to TheOneValen - @TheOneValen for the report. + bytes and not unicode. GitLab issue #520. Thanks to @TheOneValen for + the report. * Ignore document stub from the index mirror. GitLab issue - #520. Thanks to TheOneValen @TheOneValen for the report. + #520. Thanks to @TheOneValen for the report. * Fix for the Docker image INSTALL_FLAG path. Thanks to Mark Maglana @relaxdiego for the report and to Hamish Farroq @farroq_HAM for the patch. GitLab issue #525. diff --git a/docs/releases/3.1.9.rst b/docs/releases/3.1.9.rst index 793099d7c8..1234fee0a0 100644 --- a/docs/releases/3.1.9.rst +++ b/docs/releases/3.1.9.rst @@ -8,7 +8,8 @@ Changes ------- * Convert the furl instance to text to allow serializing it into - JSON to be passed as arguments to the background task. + JSON and be passed as arguments to the background task. Fixes + metadata assignment issues when uploading new documents. Removals -------- diff --git a/mayan/apps/acls/__init__.py b/mayan/apps/acls/__init__.py index 67159f8380..f338aec7f5 100644 --- a/mayan/apps/acls/__init__.py +++ b/mayan/apps/acls/__init__.py @@ -2,4 +2,4 @@ from __future__ import unicode_literals from .classes import ModelPermission # NOQA -default_app_config = 'acls.apps.ACLsApp' +default_app_config = 'mayan.apps.acls.apps.ACLsApp' diff --git a/mayan/apps/acls/api_views.py b/mayan/apps/acls/api_views.py index 13c07b7299..9f3932314c 100644 --- a/mayan/apps/acls/api_views.py +++ b/mayan/apps/acls/api_views.py @@ -2,7 +2,6 @@ from __future__ import absolute_import, unicode_literals from django.contrib.contenttypes.models import ContentType from django.shortcuts import get_object_or_404 - from rest_framework import generics from .models import AccessControlList diff --git a/mayan/apps/acls/apps.py b/mayan/apps/acls/apps.py index 9d31ac3e77..73ac37d443 100644 --- a/mayan/apps/acls/apps.py +++ b/mayan/apps/acls/apps.py @@ -2,16 +2,18 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ -from common import MayanAppConfig, menu_object, menu_sidebar -from navigation import SourceColumn +from mayan.apps.common import MayanAppConfig, menu_object, menu_sidebar +from mayan.apps.navigation import SourceColumn from .links import link_acl_create, link_acl_delete, link_acl_permissions class ACLsApp(MayanAppConfig): + app_namespace = 'acls' + app_url = 'acls' has_rest_api = True has_tests = True - name = 'acls' + name = 'mayan.apps.acls' verbose_name = _('ACLs') def ready(self): diff --git a/mayan/apps/acls/classes.py b/mayan/apps/acls/classes.py index 7d3b2e35d3..499571a8d6 100644 --- a/mayan/apps/acls/classes.py +++ b/mayan/apps/acls/classes.py @@ -1,4 +1,4 @@ -from __future__ import unicode_literals, absolute_import +from __future__ import absolute_import, unicode_literals import logging diff --git a/mayan/apps/acls/icons.py b/mayan/apps/acls/icons.py index 61b294faf3..1a1c73ef30 100644 --- a/mayan/apps/acls/icons.py +++ b/mayan/apps/acls/icons.py @@ -1,6 +1,6 @@ from __future__ import absolute_import, unicode_literals -from appearance.classes import Icon +from mayan.apps.appearance.classes import Icon icon_acl_list = Icon(driver_name='fontawesome', symbol='lock') icon_acl_new = Icon(driver_name='fontawesome', symbol='plus') diff --git a/mayan/apps/acls/links.py b/mayan/apps/acls/links.py index b1b2d07c13..2cd93a42b0 100644 --- a/mayan/apps/acls/links.py +++ b/mayan/apps/acls/links.py @@ -3,10 +3,10 @@ from __future__ import unicode_literals from django.apps import apps from django.utils.translation import ugettext_lazy as _ -from navigation import Link +from mayan.apps.navigation import Link from .icons import icon_acl_list, icon_acl_new -from .permissions import permission_acl_view, permission_acl_edit +from .permissions import permission_acl_edit, permission_acl_view def get_kwargs_factory(variable_name): diff --git a/mayan/apps/acls/managers.py b/mayan/apps/acls/managers.py index 995be822e0..21f7058fac 100644 --- a/mayan/apps/acls/managers.py +++ b/mayan/apps/acls/managers.py @@ -6,14 +6,15 @@ from django.contrib.contenttypes.models import ContentType from django.core.exceptions import PermissionDenied from django.db import models from django.db.models import Q -from django.utils.translation import ugettext, ugettext_lazy as _ +from django.utils.translation import ugettext +from django.utils.translation import ugettext_lazy as _ -from common.utils import return_attrib, return_related -from permissions import Permission -from permissions.models import StoredPermission +from mayan.apps.common.utils import return_attrib, return_related +from mayan.apps.permissions import Permission +from mayan.apps.permissions.models import StoredPermission -from .exceptions import PermissionNotValidForClass from .classes import ModelPermission +from .exceptions import PermissionNotValidForClass logger = logging.getLogger(__name__) diff --git a/mayan/apps/acls/migrations/0001_initial.py b/mayan/apps/acls/migrations/0001_initial.py index 48932b6683..1a50c46e0b 100644 --- a/mayan/apps/acls/migrations/0001_initial.py +++ b/mayan/apps/acls/migrations/0001_initial.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mayan/apps/acls/migrations/0002_auto_20150703_0513.py b/mayan/apps/acls/migrations/0002_auto_20150703_0513.py index 6ff7c6def5..429819719d 100644 --- a/mayan/apps/acls/migrations/0002_auto_20150703_0513.py +++ b/mayan/apps/acls/migrations/0002_auto_20150703_0513.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mayan/apps/acls/models.py b/mayan/apps/acls/models.py index 800773dc75..490f0991c4 100644 --- a/mayan/apps/acls/models.py +++ b/mayan/apps/acls/models.py @@ -8,7 +8,7 @@ from django.db import models from django.utils.encoding import force_text, python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ -from permissions.models import Role, StoredPermission +from mayan.apps.permissions.models import Role, StoredPermission from .managers import AccessControlListManager diff --git a/mayan/apps/acls/permissions.py b/mayan/apps/acls/permissions.py index da7a5ddce9..b2e7e789a1 100644 --- a/mayan/apps/acls/permissions.py +++ b/mayan/apps/acls/permissions.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.utils.translation import ugettext_lazy as _ -from permissions import PermissionNamespace +from mayan.apps.permissions import PermissionNamespace namespace = PermissionNamespace('acls', _('Access control lists')) diff --git a/mayan/apps/acls/serializers.py b/mayan/apps/acls/serializers.py index d312f8d827..87e41036d5 100644 --- a/mayan/apps/acls/serializers.py +++ b/mayan/apps/acls/serializers.py @@ -9,10 +9,12 @@ from rest_framework import serializers from rest_framework.exceptions import ValidationError from rest_framework.reverse import reverse -from common.serializers import ContentTypeSerializer -from permissions import Permission -from permissions.models import Role, StoredPermission -from permissions.serializers import PermissionSerializer, RoleSerializer +from mayan.apps.common.serializers import ContentTypeSerializer +from mayan.apps.permissions import Permission +from mayan.apps.permissions.models import Role, StoredPermission +from mayan.apps.permissions.serializers import ( + PermissionSerializer, RoleSerializer +) from .models import AccessControlList diff --git a/mayan/apps/acls/tests/test_actions.py b/mayan/apps/acls/tests/test_actions.py index c99d9f85b1..f638fef451 100644 --- a/mayan/apps/acls/tests/test_actions.py +++ b/mayan/apps/acls/tests/test_actions.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals from django.contrib.contenttypes.models import ContentType -from document_states.tests.test_actions import ActionTestCase -from documents.permissions import permission_document_view +from mayan.apps.document_states.tests.test_actions import ActionTestCase +from mayan.apps.documents.permissions import permission_document_view from ..workflow_actions import GrantAccessAction, RevokeAccessAction diff --git a/mayan/apps/acls/tests/test_api.py b/mayan/apps/acls/tests/test_api.py index 359530fcf0..26f8273854 100644 --- a/mayan/apps/acls/tests/test_api.py +++ b/mayan/apps/acls/tests/test_api.py @@ -5,10 +5,10 @@ from django.test import override_settings from rest_framework import status -from documents.permissions import permission_document_view -from documents.tests import DocumentTestMixin -from permissions.tests.literals import TEST_ROLE_LABEL -from rest_api.tests import BaseAPITestCase +from mayan.apps.documents.permissions import permission_document_view +from mayan.apps.documents.tests import DocumentTestMixin +from mayan.apps.permissions.tests.literals import TEST_ROLE_LABEL +from mayan.apps.rest_api.tests import BaseAPITestCase from ..models import AccessControlList from ..permissions import permission_acl_view diff --git a/mayan/apps/acls/tests/test_links.py b/mayan/apps/acls/tests/test_links.py index 0ccc5ca63c..821194ce03 100644 --- a/mayan/apps/acls/tests/test_links.py +++ b/mayan/apps/acls/tests/test_links.py @@ -3,10 +3,10 @@ from __future__ import unicode_literals from django.contrib.contenttypes.models import ContentType from django.urls import reverse -from documents.tests import GenericDocumentViewTestCase +from mayan.apps.documents.tests import GenericDocumentViewTestCase from ..links import ( - link_acl_delete, link_acl_list, link_acl_create, link_acl_permissions + link_acl_create, link_acl_delete, link_acl_list, link_acl_permissions ) from ..models import AccessControlList from ..permissions import permission_acl_edit, permission_acl_view diff --git a/mayan/apps/acls/tests/test_models.py b/mayan/apps/acls/tests/test_models.py index 691d35553b..1a723ab0cf 100644 --- a/mayan/apps/acls/tests/test_models.py +++ b/mayan/apps/acls/tests/test_models.py @@ -3,12 +3,12 @@ from __future__ import absolute_import, unicode_literals from django.core.exceptions import PermissionDenied from django.test import override_settings -from common.tests import BaseTestCase -from documents.models import Document, DocumentType -from documents.permissions import permission_document_view -from documents.tests import ( - TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_TYPE_LABEL, - TEST_DOCUMENT_TYPE_2_LABEL +from mayan.apps.common.tests import BaseTestCase +from mayan.apps.documents.models import Document, DocumentType +from mayan.apps.documents.permissions import permission_document_view +from mayan.apps.documents.tests import ( + TEST_DOCUMENT_TYPE_2_LABEL, TEST_DOCUMENT_TYPE_LABEL, + TEST_SMALL_DOCUMENT_PATH ) from ..models import AccessControlList diff --git a/mayan/apps/acls/tests/test_views.py b/mayan/apps/acls/tests/test_views.py index 3784792fe0..38f98f0d5d 100644 --- a/mayan/apps/acls/tests/test_views.py +++ b/mayan/apps/acls/tests/test_views.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.contrib.contenttypes.models import ContentType -from documents.tests import GenericDocumentViewTestCase +from mayan.apps.documents.tests import GenericDocumentViewTestCase from ..models import AccessControlList from ..permissions import permission_acl_edit, permission_acl_view diff --git a/mayan/apps/acls/views.py b/mayan/apps/acls/views.py index efd3becad7..8531829781 100644 --- a/mayan/apps/acls/views.py +++ b/mayan/apps/acls/views.py @@ -11,12 +11,12 @@ from django.urls import reverse from django.utils.encoding import force_text from django.utils.translation import ugettext_lazy as _ -from common.views import ( +from mayan.apps.common.views import ( AssignRemoveView, SingleObjectCreateView, SingleObjectDeleteView, SingleObjectListView ) -from permissions import PermissionNamespace, Permission -from permissions.models import StoredPermission +from mayan.apps.permissions import Permission, PermissionNamespace +from mayan.apps.permissions.models import StoredPermission from .classes import ModelPermission from .icons import icon_acl_list diff --git a/mayan/apps/acls/workflow_actions.py b/mayan/apps/acls/workflow_actions.py index 60cc5838f0..1843f73745 100644 --- a/mayan/apps/acls/workflow_actions.py +++ b/mayan/apps/acls/workflow_actions.py @@ -7,10 +7,10 @@ from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ValidationError from django.utils.translation import ugettext_lazy as _ -from acls.models import AccessControlList -from document_states.classes import WorkflowAction -from permissions.classes import Permission -from permissions.models import Role +from mayan.apps.acls.models import AccessControlList +from mayan.apps.document_states.classes import WorkflowAction +from mayan.apps.permissions.classes import Permission +from mayan.apps.permissions.models import Role from .classes import ModelPermission from .permissions import permission_acl_edit diff --git a/mayan/apps/appearance/__init__.py b/mayan/apps/appearance/__init__.py index 627f641acf..ddf88f7515 100644 --- a/mayan/apps/appearance/__init__.py +++ b/mayan/apps/appearance/__init__.py @@ -1,3 +1,3 @@ from __future__ import unicode_literals -default_app_config = 'appearance.apps.AppearanceApp' +default_app_config = 'mayan.apps.appearance.apps.AppearanceApp' diff --git a/mayan/apps/appearance/apps.py b/mayan/apps/appearance/apps.py index b8781b2023..f32a9a88b2 100644 --- a/mayan/apps/appearance/apps.py +++ b/mayan/apps/appearance/apps.py @@ -2,13 +2,13 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ -from common import MayanAppConfig +from mayan.apps.common import MayanAppConfig from .licenses import * # NOQA class AppearanceApp(MayanAppConfig): - name = 'appearance' + name = 'mayan.apps.appearance' verbose_name = _('Appearance') def ready(self): diff --git a/mayan/apps/appearance/licenses.py b/mayan/apps/appearance/licenses.py index 0f4180e2d0..db12e997c9 100644 --- a/mayan/apps/appearance/licenses.py +++ b/mayan/apps/appearance/licenses.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from common.classes import Package +from mayan.apps.common.classes import Package Package(label='Bootstrap', license_text=''' The MIT License (MIT) diff --git a/mayan/apps/appearance/settings.py b/mayan/apps/appearance/settings.py index ebcc2619ac..5a53ef6719 100644 --- a/mayan/apps/appearance/settings.py +++ b/mayan/apps/appearance/settings.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ -from smart_settings import Namespace +from mayan.apps.smart_settings import Namespace from .literals import DEFAULT_MAXIMUM_TITLE_LENGTH diff --git a/mayan/apps/appearance/static/appearance/js/mayan_image.js b/mayan/apps/appearance/static/appearance/js/mayan_image.js index 16b7544649..63b26fc0c0 100644 --- a/mayan/apps/appearance/static/appearance/js/mayan_image.js +++ b/mayan/apps/appearance/static/appearance/js/mayan_image.js @@ -43,7 +43,7 @@ class MayanImage { $('.lazy-load').one('load', function() { $(this).hide(); - $(this).fadeIn(300); + $(this).fadeIn(200); $(this).siblings('.spinner-container').remove(); $(this).removeClass('lazy-load pull-left'); clearTimeout(MayanImage.timer); @@ -52,7 +52,7 @@ class MayanImage { $('.lazy-load-carousel').one('load', function() { $(this).hide(); - $(this).fadeIn(300); + $(this).fadeIn(200); $(this).siblings('.spinner-container').remove(); $(this).removeClass('lazy-load-carousel pull-left'); }); diff --git a/mayan/apps/appearance/templates/appearance/about.html b/mayan/apps/appearance/templates/appearance/about.html index 3a553b3e70..2bb43b1117 100644 --- a/mayan/apps/appearance/templates/appearance/about.html +++ b/mayan/apps/appearance/templates/appearance/about.html @@ -60,14 +60,14 @@ {% smart_setting 'COMMON_PROJECT_TITLE' as setting_project_title %} {% project_information '__title__' as project_title %} - {% get_icon 'common.icons.icon_documentation' as icon_documentation %} - {% get_icon 'common.icons.icon_forum' as icon_forum %} - {% get_icon 'common.icons.icon_social_facebook' as icon_social_facebook %} - {% get_icon 'common.icons.icon_social_paypal' as icon_social_paypal %} - {% get_icon 'common.icons.icon_social_twitter' as icon_social_twitter %} - {% get_icon 'common.icons.icon_social_instagram' as icon_social_instagram %} - {% get_icon 'common.icons.icon_source_code' as icon_source_code %} - {% get_icon 'common.icons.icon_wiki' as icon_wiki %} + {% get_icon 'mayan.apps.common.icons.icon_documentation' as icon_documentation %} + {% get_icon 'mayan.apps.common.icons.icon_forum' as icon_forum %} + {% get_icon 'mayan.apps.common.icons.icon_social_facebook' as icon_social_facebook %} + {% get_icon 'mayan.apps.common.icons.icon_social_paypal' as icon_social_paypal %} + {% get_icon 'mayan.apps.common.icons.icon_social_twitter' as icon_social_twitter %} + {% get_icon 'mayan.apps.common.icons.icon_social_instagram' as icon_social_instagram %} + {% get_icon 'mayan.apps.common.icons.icon_source_code' as icon_source_code %} + {% get_icon 'mayan.apps.common.icons.icon_wiki' as icon_wiki %}

{{ setting_project_title }}

diff --git a/mayan/apps/appearance/templates/appearance/home.html b/mayan/apps/appearance/templates/appearance/home.html index 4a6bdd4c11..273cf9ea12 100644 --- a/mayan/apps/appearance/templates/appearance/home.html +++ b/mayan/apps/appearance/templates/appearance/home.html @@ -44,7 +44,7 @@
-
+
diff --git a/mayan/apps/appearance/templates/authentication/login.html b/mayan/apps/appearance/templates/authentication/login.html index bb1b038718..dcbe3ed42d 100644 --- a/mayan/apps/appearance/templates/authentication/login.html +++ b/mayan/apps/appearance/templates/authentication/login.html @@ -13,28 +13,7 @@ {% block project_name %}{% endblock %} {% block content_plain %} - {% autoadmin_properties %} - {% if autoadmin_properties.account %} -
-
-
-
-

{% trans "First time login" %}

-
-
- {% smart_setting 'COMMON_PROJECT_TITLE' as project_title %} -

{% blocktrans %}You have just finished installing {{ project_title }}, congratulations!{% endblocktrans %}

-

{% trans 'Login using the following credentials:' %}

-

{% blocktrans with autoadmin_properties.account as account %}Username: {{ account }}{% endblocktrans %}

-

{% blocktrans with autoadmin_properties.account.email as email %}Email: {{ email }}{% endblocktrans %}

-

{% blocktrans with autoadmin_properties.password as password %}Password: {{ password }}{% endblocktrans %}

-

{% trans 'Be sure to change the password to increase security and to disable this message.' %}

-
-
-
-
- {% endif %} - + {% autoadmin_partial %} {% motd %}
diff --git a/mayan/apps/appearance/templates/navigation/generic_subnavigation.html b/mayan/apps/appearance/templates/navigation/generic_subnavigation.html index 2b0d8abab2..4ae4f99185 100644 --- a/mayan/apps/appearance/templates/navigation/generic_subnavigation.html +++ b/mayan/apps/appearance/templates/navigation/generic_subnavigation.html @@ -1,7 +1,7 @@ {% load common_tags %} {% load navigation_tags %} -{% if link|get_type == "" %} +{% if link|get_type == "" %}