Merge remote-tracking branch 'origin/versions/micro' into feature/merge_micro

Signed-off-by: Roberto Rosario <roberto.rosario@mayan-edms.com>
2019-08-29 00:07:18 -04:00
parent 09f481f5f0 b329ed7618
commit 49979dede5
13 changed files with 128 additions and 47 deletions
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -73,7 +73,7 @@
 - Add redactions app.
 - Unify all line endings to be Linux style.

-3.2.7 (2019-08-XX)
+3.2.7 (2019-08-28)
 ==================
 - Fix checkout form bug. Thanks to Lucius Schaerer
  (@lschaer1) for the report.
@@ -102,6 +102,12 @@
  for the report.
 - Rename the MAYAN_USER_GUID environment variable
  to MAYAN_USER_GID.
+* 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.
+* Make sure system alerts don't appear under
+  floating elements.

 3.2.6 (2019-07-10)
 ==================
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
+[![Donation](https://img.shields.io/badge/donation-PayPal-brightgreen)](https://paypal.me/MayanEDMS)
 [![pypi][pypi]][pypi-url]
 [![builds][builds]][builds-url]
-[![coverage][cover]][cover-url]
 ![python][python]
 ![license][license]
 [![Docker pulls](https://img.shields.io/docker/pulls/mayanedms/mayanedms.svg?maxAge=3600)](https://hub.docker.com/r/mayanedms/mayanedms/)
 [![Docker Stars](https://img.shields.io/docker/stars/mayanedms/mayanedms.svg?maxAge=3600)](https://hub.docker.com/r/mayanedms/mayanedms/)
-[![Docker layers](https://images.microbadger.com/badges/image/mayanedms/mayanedms.svg)](https://microbadger.com/images/mayanedms/mayanedms)
+

 [pypi]: http://img.shields.io/pypi/v/mayan-edms.svg
 [pypi-url]: http://badge.fury.io/py/mayan-edms
@@ -43,6 +43,20 @@

 </div>

+<h2 align="center">Book</h2>
+
+The pre-release version of the book "Exploring Mayan EDMS" available now at a discounted price!
+
+<p align="center">
+    <a href="https://sellfy.com/p/um2fkx/">
+        <img width="400" src="https://d12swbtw719y4s.cloudfront.net/images/v6RpxW40/aP0qKLjkPiAuXZhYuB45/wDAULAzFyx.jpeg?w=548">
+    </a>
+</p>
+
+Limited quantities. Buyers of the pre-release will get the full version for free when it is ready.
+
+The link is https://sellfy.com/p/um2fkx/
+
 <h2 align="center">Installation</h2>

 The easiest way to use Mayan EDMS is by using the official
--- a/README.rst
+++ b/README.rst
@@ -1,4 +1,4 @@
-|pypi| |builds| |coverage| |python| |license| |docker_pulls| |docker_stars| |docker_layers|
+|donation| |pypi| |builds| |coverage| |python| |license| |docker_pulls| |docker_stars| |docker_layers|


 .. image:: https://gitlab.com/mayan-edms/mayan-edms/raw/master/docs/_static/mayan_logo.png
@@ -25,6 +25,16 @@ at: https://docs.mayan-edms.com/topics/installation.html

 .. _Docker: https://www.docker.com/

+The pre-release version of the book "Exploring Mayan EDMS" available now at a discounted price!
+
+.. image:: https://camo.githubusercontent.com/89d2fe787507c9247aa7bb406e2682b53eb7a5f9/68747470733a2f2f64313273776274773731397934732e636c6f756466726f6e742e6e65742f696d616765732f76365270785734302f615030714b4c6a6b50694175585a6859754234352f774441554c417a4679782e6a7065673f773d353438
+    :align: center
+    :width: 300
+    :target: https://sellfy.com/p/um2fkx/
+
+Limited quantities. Buyers of the pre-release will get the full version for free when it is ready.
+Click the image or visit: https://sellfy.com/p/um2fkx/
+
 Hardware requirements

 - 2 Gigabytes of RAM (1 Gigabyte if OCR is turned off).
@@ -44,6 +54,8 @@ Important links
 - `Videos <https://www.youtube.com/channel/UCJOOXHP1MJ9lVA7d8ZTlHPw>`__


+.. |donation| image:: https://img.shields.io/badge/donation-PayPal-brightgreen
+   :target: https://paypal.me/MayanEDMS
 .. |pypi| image:: http://img.shields.io/pypi/v/mayan-edms.svg
   :target: http://badge.fury.io/py/mayan-edms
 .. |builds| image:: https://gitlab.com/mayan-edms/mayan-edms/badges/master/build.svg
--- a/docker/rootfs/version
+++ b/docker/rootfs/version
@@ -1 +1 @@
-3.2.6
+3.2.7
--- a/docs/releases/3.2.7.rst
+++ b/docs/releases/3.2.7.rst
@@ -1,7 +1,7 @@
 Version 3.2.7
 =============

-Released: August XX, 2019
+Released: August 28, 2019


 Changes
@@ -35,6 +35,12 @@ Changes
 - Rename the MAYAN_USER_GUID environment variable
  to MAYAN_USER_GID.
 - Backport individual index rebuild support.
+- 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.
+- Make sure system alerts don't appear under
+  floating elements.

 Removals
 --------
@@ -127,11 +133,13 @@ Backward incompatible changes
 Bugs fixed or issues closed
 ---------------------------

+- :gitlab-issue:`643` The "Actions" button won't show up, if window size between 992 and 1248 px
 - :gitlab-issue:`650` Permission denied when MAYAN_USER_UID and MAYAN_USER_GUID are set
 - :gitlab-issue:`652` MAYAN_USER_GUID cannot be set to specific values
 - :gitlab-issue:`654` Internal Server Error, Document Checkout
 - :gitlab-issue:`655` Index setup tree view shows two times the "enabled" field instead of "Link documents"
 - :gitlab-issue:`657` Mailer password length restriction is too short
 - :forum-topic:`1039` Re: /api/documents/{id}/cabinets returns 500
+- :forum-topic:`1050` edit/delete sub-cabinet

 .. _PyPI: https://pypi.python.org/pypi/mayan-edms/
--- a/mayan/init.py
+++ b/mayan/init.py
@@ -1,9 +1,9 @@
 from __future__ import unicode_literals

 __title__ = 'Mayan EDMS'
-__version__ = '3.2.6'
-__build__ = 0x030206
-__build_string__ = 'v3.2.6-68-gab601f9180_Wed Jul 17 04:30:11 2019 -0400'
+__version__ = '3.2.7'
+__build__ = 0x030207
+__build_string__ = 'v3.2.7_Wed Aug 28 17:31:08 2019 -0400'
 __django_version__ = '1.11'
 __author__ = 'Roberto Rosario'
 __author_email__ = 'roberto.rosario@mayan-edms.com'
--- a/mayan/apps/appearance/static/appearance/js/mayan_app.js
+++ b/mayan/apps/appearance/static/appearance/js/mayan_app.js
@@ -49,12 +49,13 @@ class MayanApp {

    static setupNavBarState () {
        $('body').on('click', '.a-main-menu-accordion-link', function (event) {
-            console.log('ad');
+            var $this = $(this);
+
            $('.a-main-menu-accordion-link').each(function (index, value) {
-                $(this).parent().removeClass('active');
+                $this.parent().removeClass('active');
            });

-            $(this).parent().addClass('active');
+            $this.parent().addClass('active');
        });
    }

@@ -63,8 +64,10 @@ class MayanApp {
        var uriFragment = uri.fragment();
        $('.a-main-menu-accordion-link').each(function (index, value) {
            if (value.pathname === uriFragment) {
-                $(this).closest('.collapse').addClass('in').parent().find('.collapsed').removeClass('collapsed').attr('aria-expanded', 'true');
-                $(this).parent().addClass('active');
+                var $this = $(this);
+
+                $this.closest('.collapse').addClass('in').parent().find('.collapsed').removeClass('collapsed').attr('aria-expanded', 'true');
+                $this.parent().addClass('active');
            }
        });
    }
@@ -77,6 +80,13 @@ class MayanApp {
        }
    }

+    doBodyAdjust () {
+        // Adjust the height of the body-spacer to move content elements
+        // up or down when the navbar changes size.
+        const navbarSize = 60;
+        $('.body-spacer').css('height', $('.navbar').height() - navbarSize);
+    }
+
    doRefreshAJAXMenu (options) {
        $.ajax({
            complete: function() {
@@ -89,7 +99,7 @@ class MayanApp {
                    $(options.menuSelector).html(data.html);
                    options.app.ajaxMenuHashes[data.name] = data.hex_hash;
                    if (options.callback !== undefined) {
-                        options.callback();
+                        options.callback(options);
                    }
                }
            },
@@ -172,6 +182,7 @@ class MayanApp {
        var self = this;

        this.setupAJAXSpinner();
+        this.setupBodyAdjust();
        this.setupFormHotkeys();
        this.setupFullHeightResizing();
        this.setupItemsSelector();
@@ -207,6 +218,14 @@ class MayanApp {
        });
    }

+    setupBodyAdjust () {
+        var self = this;
+
+        this.window.resize(function() {
+            self.doBodyAdjust();
+        });
+    }
+
    setupFormHotkeys () {
        $('body').on('keypress', '.form-hotkey-enter', function (e) {
            if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13)) {
@@ -298,7 +317,7 @@ class MayanApp {
        });
    }

-   setupPanelSelection () {
+    setupPanelSelection () {
        var app = this;

        // Setup panel highlighting on check
--- a/mayan/apps/appearance/templates/appearance/about.html
+++ b/mayan/apps/appearance/templates/appearance/about.html
@@ -117,6 +117,18 @@
            {% endblocktrans %}
        </p>

+        <p class="text-center">
+            {% blocktrans with icon_social_paypal as icon_social_paypal%}
+                You can also <a class="new_window" href="https://www.paypal.com/paypalme2/RobertoRosario">donate directly to the creator and lead developer.  {{ icon_social_paypal }}</a>
+            {% endblocktrans %}
+        </p>
+
+        <p class="text-center">
+            {% blocktrans with icon_social_paypal as icon_social_paypal%}
+                Besides donations you can also support the project by <a class="new_window" href="https://sellfy.com/p/um2fkx/">purchasing a copy of the book "Exploring Mayan EDMS" by Roberto Rosario</a>. <br>The book is available on pre-release format at a discounted price for a limited time.
+            {% endblocktrans %}
+        </p>
+
        <p class="text-center">
            {% blocktrans with icon_documentation as icon_documentation and icon_wiki as icon_wiki %}
                The complete list of changes is available via the <a class="new_window" href="https://docs.mayan-edms.com/releases/index.html">Release notes {{ icon_documentation }}</a> or the short version <a class="new_window" href="https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst">Changelog {{ icon_documentation }}</a>.
--- a/mayan/apps/appearance/templates/appearance/base.html
+++ b/mayan/apps/appearance/templates/appearance/base.html
@@ -23,38 +23,40 @@
    {% block content_plain %}{% endblock %}
 {% else %}
    <div class="">
-        <div class="row zero-margin">
-            <div class="col-xs-12">
-                {% common_check_sqlite as check_sqlite %}
-                {% if common_check_sqlite %}
-                    <div class="alert alert-dismissible alert-warning">
-                        <button type="button" class="close" data-dismiss="alert">&times;</button>
-                        <p><strong>{% trans 'Warning' %}</strong> {{ check_sqlite }}</p>
-                    </div>
-                {% endif %}
-                {% block messages %}
-                {% endblock %}
-
-                {% smart_settings_check_changed as settings_changed %}
-                {% if settings_changed %}
-                    <div class="alert alert-dismissible alert-warning">
-                        <button type="button" class="close" data-dismiss="alert">&times;</button>
-                        <p><strong>{% trans 'Warning' %}</strong> {% trans 'Settings updated, restart your installation for changes to take proper effect.' %}</p>
-                    </div>
-                {% endif %}
-            </div>
-        </div>

        {% navigation_resolve_menus names='facet,list facet' sort_results=True as facet_menus_link_results %}

        <div class="row zero-margin">
            <div class="col-xs-12 {% if facet_menus_link_results %}has-sidebar{% endif %}" id="viewport">
+                <div class="row zero-margin">
+                    <div class="col-xs-12">
+                        {% common_check_sqlite as check_sqlite %}
+                        {% if common_check_sqlite %}
+                            <div class="alert alert-dismissible alert-warning">
+                                <button type="button" class="close" data-dismiss="alert">&times;</button>
+                                <p><strong>{% trans 'Warning' %}</strong> {{ check_sqlite }}</p>
+                            </div>
+                        {% endif %}
+                        {% block messages %}
+                        {% endblock %}
+
+                        {% smart_settings_check_changed as settings_changed %}
+                        {% if settings_changed %}
+                            <div class="alert alert-dismissible alert-warning">
+                                <button type="button" class="close" data-dismiss="alert">&times;</button>
+                                <p><strong>{% trans 'Warning' %}</strong> {% trans 'Settings updated, restart your installation for changes to take proper effect.' %}</p>
+                            </div>
+                        {% endif %}
+                    </div>
+                </div>
+
                {% include 'appearance/calculate_form_title.html' %}

                {# action menu #}
                {% navigation_resolve_menus names='object,secondary' sort_results=True as action_menus_link_results %}
                {% if action_menus_link_results %}
                    <div class="pull-right btn-group" id="menu-actions">
+                        <div class="body-spacer"></div>
                        <button aria-expanded="true" class="btn btn-danger btn-sm dropdown-toggle" data-toggle="dropdown" type="button">
                            {% trans 'Actions' %}
                            <span class="caret"></span>
@@ -106,6 +108,7 @@

            {% if facet_menus_link_results %}
                <div id="sidebar">
+                    <div class="body-spacer"></div>
                    <div class="list-group">
                        {% for menu_link_result in facet_menus_link_results %}
                            {% for link_group in menu_link_result.link_groups %}
--- a/mayan/apps/appearance/templates/appearance/root.html
+++ b/mayan/apps/appearance/templates/appearance/root.html
@@ -39,6 +39,7 @@
                {% include 'appearance/menu_main.html' %}
            </div>
            <div class="main">
+                <div class="body-spacer"></div>
                <div class="row zero-margin">
                    <div class="col-xs-12">
                        <div id="ajax-content"></div>
@@ -104,7 +105,10 @@
            var app = new MayanApp({
                ajaxMenusOptions: [
                    {
-                        callback: MayanApp.updateNavbarState,
+                        callback: function (options) {
+                            MayanApp.updateNavbarState();
+                            options.app.doBodyAdjust();
+                        },
                        interval: 5000,
                        menuSelector: '#menu-main',
                        name: 'menu_main',
@@ -123,6 +127,7 @@
                MayanImage.intialize({
                    templateInvalidDocument: '{% spaceless %}{% include "documents/invalid_document.html" %}{% endspaceless %}'
                });
+                app.doBodyAdjust();
                app.doToastrMessages();
                app.resizeFullHeight();
                app.setupSelect2();
@@ -132,6 +137,7 @@
            jQuery(document).ready(function() {
                app.initialize();
            });
+
        </script>
    </body>
 </html>
--- a/mayan/apps/authentication/templates/authentication/login.html
+++ b/mayan/apps/authentication/templates/authentication/login.html
@@ -17,7 +17,7 @@
    {% motd %}

    <div class="row">
-        <div class="col-xs-12 col-sm-10 col-sm-offset-1 col-md-10 col-md-offset-1 col-lg-6 col-lg-offset-3">
+        <div class="col-xs-10 col-xs-offset-1 col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3 col-lg-4 col-lg-offset-4">
            <div class="panel panel-primary">
                <div class="panel-heading">
                    <h3 class="panel-title">&nbsp;</h3>
--- a/mayan/apps/autoadmin/templates/autoadmin/credentials.html
+++ b/mayan/apps/autoadmin/templates/autoadmin/credentials.html
@@ -8,17 +8,19 @@
            <br>
            <div class="panel panel-primary">
                <div class="panel-heading">
-                    <h3 class="panel-title">{% trans 'First time login' %}</h3>
+                    <h3 class="text-center panel-title">{% trans 'Automatic credentials' %}</h3>
                </div>
                <div class="panel-body">
                    <div class="content login">
                        {% smart_setting 'COMMON_PROJECT_TITLE' as project_title %}
-                        <p>{% blocktrans %}You have just finished installing <strong>{{ project_title }}</strong>, congratulations!{% endblocktrans %}</p>
-                        <p>{% trans 'Login using the following credentials:' %}</p>
-                        <p>{% blocktrans with autoadmin_properties.account as account %}Username: <strong>{{ account }}</strong>{% endblocktrans %}</p>
-                        <p>{% blocktrans with autoadmin_properties.account.email as email %}Email: <strong>{{ email }}</strong>{% endblocktrans %}</p>
-                        <p>{% blocktrans with autoadmin_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>
+                        <p class="text-center">{% blocktrans %}You have just finished installing <strong>{{ project_title }}</strong>, congratulations!{% endblocktrans %}</p>
+                        <p class="text-center">{% trans 'Login using the following credentials:' %}</p>
+                        <p class="text-center">
+                            {% blocktrans with autoadmin_properties.account as account %}Username: <strong>{{ account }}</strong>{% endblocktrans %}<br>
+                            {% blocktrans with autoadmin_properties.account.email as email %}Email: <strong>{{ email }}</strong>{% endblocktrans %}<br>
+                            {% blocktrans with autoadmin_properties.password as password %}Password: <strong>{{ password }}</strong>{% endblocktrans %}
+                        </p>
+                        <p class="text-center">{% trans 'Be sure to change the password to increase security and to disable this message.' %}</p>
                    </div>
                </div>
            </div>
--- a/mayan/apps/document_indexing/tests/test_views.py
+++ b/mayan/apps/document_indexing/tests/test_views.py
@@ -125,7 +125,6 @@ class IndexInstaceViewTestCase(
            link_documents=True
        )

-
    def test_index_rebuild_view_no_permission(self):
        self.upload_document()
        self._create_test_index()
@@ -1 +1 @@
 .2.6
 .2.7