diff --git a/HISTORY.rst b/HISTORY.rst index 420415d83f..3913f3fd7e 100644 --- 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) ================== diff --git a/README.md b/README.md index cc0cb970fa..37026453b4 100644 --- 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 @@ +

Book

+ +The pre-release version of the book "Exploring Mayan EDMS" available now at a discounted price! + +

+ + + +

+ +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/ +

Installation

The easiest way to use Mayan EDMS is by using the official diff --git a/README.rst b/README.rst index 2066833da6..25498d500c 100644 --- 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 `__ +.. |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 diff --git a/docker/rootfs/version b/docker/rootfs/version index 34cde5690e..406ebcbd95 100755 --- a/docker/rootfs/version +++ b/docker/rootfs/version @@ -1 +1 @@ -3.2.6 +3.2.7 diff --git a/docs/releases/3.2.7.rst b/docs/releases/3.2.7.rst index 7dadb0c199..2054f37b80 100644 --- 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/ diff --git a/mayan/__init__.py b/mayan/__init__.py index 9ca2eb1dcc..761d9b1094 100644 --- 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' diff --git a/mayan/apps/appearance/static/appearance/js/mayan_app.js b/mayan/apps/appearance/static/appearance/js/mayan_app.js index acbeeb1283..fca4f7aa07 100644 --- 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 diff --git a/mayan/apps/appearance/templates/appearance/about.html b/mayan/apps/appearance/templates/appearance/about.html index 3e10465a32..183955fc3f 100644 --- a/mayan/apps/appearance/templates/appearance/about.html +++ b/mayan/apps/appearance/templates/appearance/about.html @@ -117,6 +117,18 @@ {% endblocktrans %}

+

+ {% blocktrans with icon_social_paypal as icon_social_paypal%} + You can also donate directly to the creator and lead developer. {{ icon_social_paypal }} + {% endblocktrans %} +

+ +

+ {% blocktrans with icon_social_paypal as icon_social_paypal%} + Besides donations you can also support the project by purchasing a copy of the book "Exploring Mayan EDMS" by Roberto Rosario.
The book is available on pre-release format at a discounted price for a limited time. + {% 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 }}. diff --git a/mayan/apps/appearance/templates/appearance/base.html b/mayan/apps/appearance/templates/appearance/base.html index 5824d82cd6..55a5e0e3e5 100644 --- 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 %}

-
-
- {% 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 %}