diff --git a/HISTORY.rst b/HISTORY.rst index 8da213fc35..598f07411d 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -30,6 +30,7 @@ * Add automatic adjustment of HTML body on navigation bar changes. Closes GitLab issue #643. Thanks to Light Templar (@LightTemplar) for the report. +* Unify all line endings to be Linux style. 3.2.6 (2019-07-10) ================== diff --git a/docs/releases/3.2.7.rst b/docs/releases/3.2.7.rst index 392a04b688..632d35b643 100644 --- a/docs/releases/3.2.7.rst +++ b/docs/releases/3.2.7.rst @@ -38,6 +38,7 @@ Changes - Add automatic adjustment of HTML body on navigation bar changes. Closes GitLab issue #643. Thanks to Light Templar (@LightTemplar) for the report. +- Unify all line endings to be Linux style. Removals -------- diff --git a/mayan/apps/appearance/templates/appearance/about.html b/mayan/apps/appearance/templates/appearance/about.html index 2bb43b1117..3e10465a32 100644 --- a/mayan/apps/appearance/templates/appearance/about.html +++ b/mayan/apps/appearance/templates/appearance/about.html @@ -1,156 +1,156 @@ -{% extends 'appearance/base.html' %} - -{% load i18n %} -{% load static %} - -{% load appearance_tags %} -{% load common_tags %} -{% load smart_settings_tags %} - -{% block title %}{% trans 'About' %}{% endblock %} - -{% block stylesheets %} - -{% endblock stylesheets %} - -{% block content %} - {% project_information '__build_string__' as build_number %} - {% smart_setting 'COMMON_PROJECT_TITLE' as setting_project_title %} - {% project_information '__title__' as project_title %} - - {% 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 }}

- {% if project_title != setting_project_title %} -
-

- {% blocktrans with setting_project_title as setting_project_title and project_title as project_title %} - {{ setting_project_title }} is based on {{ project_title }} - {% endblocktrans %} -

- {% endif %} -

{% trans 'Version' %} {% project_information '__version__' %}

- {% if build_number %} -

{% blocktrans with build_number as build_number %}Build number: {{ build_number }}{% endblocktrans %}

- {% endif %} -

- {% project_information '__description__' as project_description %} - {% trans project_description %} -

- -

- {% project_information '__website__' %} -

- -

- {% project_information '__license__' as license_information %} - {% trans 'Released under the license:' %} {% trans license_information %} -

- - - -

- {% blocktrans with project_title as project_title %} - {{ project_title }} is a free and open-source software brought to you with by Roberto Rosario and contributors. - {% endblocktrans %} -

- -

- {% blocktrans with project_title as project_title %} - It takes great effort to make {{ project_title }} as feature-rich as it is. We need all the help we can get! - {% endblocktrans %} -

- -

- {% blocktrans with project_title as project_title and icon_social_paypal as icon_social_paypal%} - If you use {{ project_title }} please consider making a donation {{ icon_social_paypal }} - {% endblocktrans %} -

- -

- {% blocktrans with icon_documentation as icon_documentation and icon_wiki as icon_wiki %} - The complete list of changes is available via the Release notes {{ icon_documentation }} or the short version Changelog {{ icon_documentation }}. - {% endblocktrans %} -

- -

- {% blocktrans with icon_documentation as icon_documentation and icon_wiki as icon_wiki %} - For questions check the Documentation {{ icon_documentation }} or the Wiki {{ icon_wiki }}. - {% endblocktrans %} -

- -

- {% blocktrans with icon_forum as icon_forum and icon_source_code as icon_source_code %} - If you found a bug or have a feature idea, visit the Forum {{ icon_forum }} or open a ticket in the Source code repository {{ icon_source_code }}. - {% endblocktrans %} -

-

- {% blocktrans with project_title as project_title and icon_twitter as icon_twitter and icon_facebook as icon_facebook and icon_instagram as icon_instagram %} - Spread the word. Talk to your friends and colleagues about how awesome {{ project_title }} is! - Follow us on Twitter {{ icon_social_twitter }}, Facebook {{ icon_social_facebook }}, or Instagram {{ icon_social_instagram }} - {% endblocktrans %} -

-
-{% endblock %} - -{% block footer %} -
-
-
-
- {% project_information '__copyright__' %} -
-
-
-
-{% endblock %} +{% extends 'appearance/base.html' %} + +{% load i18n %} +{% load static %} + +{% load appearance_tags %} +{% load common_tags %} +{% load smart_settings_tags %} + +{% block title %}{% trans 'About' %}{% endblock %} + +{% block stylesheets %} + +{% endblock stylesheets %} + +{% block content %} + {% project_information '__build_string__' as build_number %} + {% smart_setting 'COMMON_PROJECT_TITLE' as setting_project_title %} + {% project_information '__title__' as project_title %} + + {% 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 }}

+ {% if project_title != setting_project_title %} +
+

+ {% blocktrans with setting_project_title as setting_project_title and project_title as project_title %} + {{ setting_project_title }} is based on {{ project_title }} + {% endblocktrans %} +

+ {% endif %} +

{% trans 'Version' %} {% project_information '__version__' %}

+ {% if build_number %} +

{% blocktrans with build_number as build_number %}Build number: {{ build_number }}{% endblocktrans %}

+ {% endif %} +

+ {% project_information '__description__' as project_description %} + {% trans project_description %} +

+ +

+ {% project_information '__website__' %} +

+ +

+ {% project_information '__license__' as license_information %} + {% trans 'Released under the license:' %} {% trans license_information %} +

+ + + +

+ {% blocktrans with project_title as project_title %} + {{ project_title }} is a free and open-source software brought to you with by Roberto Rosario and contributors. + {% endblocktrans %} +

+ +

+ {% blocktrans with project_title as project_title %} + It takes great effort to make {{ project_title }} as feature-rich as it is. We need all the help we can get! + {% endblocktrans %} +

+ +

+ {% blocktrans with project_title as project_title and icon_social_paypal as icon_social_paypal%} + If you use {{ project_title }} please consider making a donation {{ icon_social_paypal }} + {% endblocktrans %} +

+ +

+ {% blocktrans with icon_documentation as icon_documentation and icon_wiki as icon_wiki %} + The complete list of changes is available via the Release notes {{ icon_documentation }} or the short version Changelog {{ icon_documentation }}. + {% endblocktrans %} +

+ +

+ {% blocktrans with icon_documentation as icon_documentation and icon_wiki as icon_wiki %} + For questions check the Documentation {{ icon_documentation }} or the Wiki {{ icon_wiki }}. + {% endblocktrans %} +

+ +

+ {% blocktrans with icon_forum as icon_forum and icon_source_code as icon_source_code %} + If you found a bug or have a feature idea, visit the Forum {{ icon_forum }} or open a ticket in the Source code repository {{ icon_source_code }}. + {% endblocktrans %} +

+

+ {% blocktrans with project_title as project_title and icon_twitter as icon_twitter and icon_facebook as icon_facebook and icon_instagram as icon_instagram %} + Spread the word. Talk to your friends and colleagues about how awesome {{ project_title }} is! + Follow us on Twitter {{ icon_social_twitter }}, Facebook {{ icon_social_facebook }}, or Instagram {{ icon_social_instagram }} + {% endblocktrans %} +

+
+{% endblock %} + +{% block footer %} +
+
+
+
+ {% project_information '__copyright__' %} +
+
+
+
+{% endblock %} diff --git a/mayan/apps/appearance/templates/appearance/base.html b/mayan/apps/appearance/templates/appearance/base.html index 1af9f0358c..63cc89add7 100644 --- a/mayan/apps/appearance/templates/appearance/base.html +++ b/mayan/apps/appearance/templates/appearance/base.html @@ -1,149 +1,149 @@ -{% load i18n %} -{% load static %} - -{% load common_tags %} -{% load navigation_tags %} -{% load smart_settings_tags %} - - - -{% block stylesheets %}{% endblock %} - -{% if appearance_type == 'plain' %} - {% block content_plain %}{% endblock %} -{% else %} -
-
-
- {% common_check_sqlite as check_sqlite %} - {% if common_check_sqlite %} -
- -

{% trans 'Warning' %} {{ check_sqlite }}

-
- {% endif %} - {% block messages %} - {% endblock %} - - {% smart_settings_check_changed as settings_changed %} - {% if settings_changed %} -
- -

{% trans 'Warning' %} {% trans 'Settings updated, restart your installation for changes to take proper effect.' %}

-
- {% endif %} -
-
- - {% navigation_resolve_menus names='facet,list facet' sort_results=True as facet_menus_link_results %} - -
- - - {% if facet_menus_link_results %} - - {% endif %} -
-
-{% endif %} - - -{% block javascript %}{% endblock %} - - +{% load i18n %} +{% load static %} + +{% load common_tags %} +{% load navigation_tags %} +{% load smart_settings_tags %} + + + +{% block stylesheets %}{% endblock %} + +{% if appearance_type == 'plain' %} + {% block content_plain %}{% endblock %} +{% else %} +
+
+
+ {% common_check_sqlite as check_sqlite %} + {% if common_check_sqlite %} +
+ +

{% trans 'Warning' %} {{ check_sqlite }}

+
+ {% endif %} + {% block messages %} + {% endblock %} + + {% smart_settings_check_changed as settings_changed %} + {% if settings_changed %} +
+ +

{% trans 'Warning' %} {% trans 'Settings updated, restart your installation for changes to take proper effect.' %}

+
+ {% endif %} +
+
+ + {% navigation_resolve_menus names='facet,list facet' sort_results=True as facet_menus_link_results %} + +
+ + + {% if facet_menus_link_results %} + + {% endif %} +
+
+{% endif %} + + +{% block javascript %}{% endblock %} + + diff --git a/mayan/apps/appearance/templates/appearance/home.html b/mayan/apps/appearance/templates/appearance/home.html index dc0b693aa7..9c7bc68cc8 100644 --- a/mayan/apps/appearance/templates/appearance/home.html +++ b/mayan/apps/appearance/templates/appearance/home.html @@ -1,49 +1,49 @@ -{% extends 'appearance/base.html' %} - -{% load i18n %} -{% load static %} - -{% load common_tags %} -{% load dashboards_tags %} -{% load navigation_tags %} - -{% block title %}{% trans 'Dashboard' %}{% endblock %} - -{% block javascript %} - -{% endblock javascript %} - -{% block content %} -
-
- {% if missing_list %} -
-
-

{% trans 'Getting started' %}

-
-
- {% trans 'Before you can fully use Mayan EDMS you need the following:' %} - -
- {% for missing in missing_list %} - -

{{ missing.label }}

-

{{ missing.description }}

- - {% endfor %} -
-
-
- {% endif %} -
-
- - {% include 'dynamic_search/search_box.html' %} - - {% render_dashboard 'main' %} - -{% endblock %} +{% extends 'appearance/base.html' %} + +{% load i18n %} +{% load static %} + +{% load common_tags %} +{% load dashboards_tags %} +{% load navigation_tags %} + +{% block title %}{% trans 'Dashboard' %}{% endblock %} + +{% block javascript %} + +{% endblock javascript %} + +{% block content %} +
+
+ {% if missing_list %} +
+
+

{% trans 'Getting started' %}

+
+
+ {% trans 'Before you can fully use Mayan EDMS you need the following:' %} + +
+ {% for missing in missing_list %} + +

{{ missing.label }}

+

{{ missing.description }}

+ + {% endfor %} +
+
+
+ {% endif %} +
+
+ + {% include 'dynamic_search/search_box.html' %} + + {% render_dashboard 'main' %} + +{% endblock %} diff --git a/mayan/apps/authentication/templates/authentication/login.html b/mayan/apps/authentication/templates/authentication/login.html index dcbe3ed42d..0d3fc49492 100644 --- a/mayan/apps/authentication/templates/authentication/login.html +++ b/mayan/apps/authentication/templates/authentication/login.html @@ -1,46 +1,46 @@ -{% extends 'appearance/base_plain.html' %} - -{% load i18n %} -{% load static %} - -{% load autoadmin_tags %} -{% load common_tags %} -{% load motd_tags %} -{% load smart_settings_tags %} - -{% block base_title %}{% trans 'Login' %}{% endblock %} - -{% block project_name %}{% endblock %} - -{% block content_plain %} - {% autoadmin_partial %} - {% motd %} - -
-
-
-
-

 

-
-
-

{% trans 'Sign in' %}

-
- -
-
-
-{% endblock %} +{% extends 'appearance/base_plain.html' %} + +{% load i18n %} +{% load static %} + +{% load autoadmin_tags %} +{% load common_tags %} +{% load motd_tags %} +{% load smart_settings_tags %} + +{% block base_title %}{% trans 'Login' %}{% endblock %} + +{% block project_name %}{% endblock %} + +{% block content_plain %} + {% autoadmin_partial %} + {% motd %} + +
+
+
+
+

 

+
+
+

{% trans 'Sign in' %}

+
+ +
+
+
+{% endblock %} diff --git a/mayan/apps/autoadmin/templates/autoadmin/credentials.html b/mayan/apps/autoadmin/templates/autoadmin/credentials.html index 7e89a5be15..3a258c8034 100755 --- a/mayan/apps/autoadmin/templates/autoadmin/credentials.html +++ b/mayan/apps/autoadmin/templates/autoadmin/credentials.html @@ -1,27 +1,27 @@ -{% load i18n %} - -{% load smart_settings_tags %} - -{% if autoadmin_properties.account %} -
-
-
-
-
-

{% trans 'First time login' %}

-
-
- -
-
-
-
-{% endif %} +{% load i18n %} + +{% load smart_settings_tags %} + +{% if autoadmin_properties.account %} +
+
+
+
+
+

{% trans 'First time login' %}

+
+
+ +
+
+
+
+{% endif %}