Merge remote-tracking branch 'origin/v4' into v4

docs/source/getting-started/formset.rst

@@ -42,7 +42,8 @@ On this page it is shown examples of Widgets formsets configurations.
                 '_list',
                 '_label'
             ]
-        }
+        },
+        'notifications-area'
    ]
 
 Configuration options
@@ -132,6 +133,12 @@ Use the prefixes [h1:,h2:,h3:,h4:,h5:,h1-right:,h2-right:,h3-right:,h4-right:,h5
    ]
 
 
+Notifications area
+**********************
+By default the application's messages are shown on the top of each application, but it is possible to define
+a new position to these messages by including the code 'notifications-area' on the formset.
+
+
 2 segments side by side
 ########################
 

docs/source/getting-started/installing.rst

@@ -105,14 +105,38 @@ django-allauth is a reusable Django app that allows for both local and social au
 To make it work with Orquestra follow the instructions described `@django-allauth documentation 
 <http://django-allauth.readthedocs.io/en/latest/installation.html>`_.
 
+Typical django-allauth configuration
+______________________________________
+
+.. code:: shell
+
+    pip install django-allauth
+
+
 Add the next configuration to your Django project setttings.
 
 .. code:: python
 
-   ...
+    ...
+
+    INSTALLED_APPS = [
+        ...
+        'allauth',
+        'allauth.account',
+        'allauth.socialaccount',
+        'allauth.socialaccount.providers.google',
+        'allauth.socialaccount.providers.facebook',
+        'django.contrib.sites',
+        ...
+    ]
+
+    AUTHENTICATION_BACKENDS = [
+        'django.contrib.auth.backends.ModelBackend',
+        'allauth.account.auth_backends.AuthenticationBackend',
+    ]
 
-   LOGIN_URL = '/accounts/login/'
-   LOGIN_REDIRECT_URL = '/'
+    LOGIN_URL = '/accounts/login/'
+    LOGIN_REDIRECT_URL = '/'
 
 Add the next configuration to the **local_settings.py** file to configure **orquestra** to require always authentication before accessing the applications.
 

pyforms_web/__init__.py

@@ -4,7 +4,7 @@
 __author__      = "Ricardo Ribeiro"
 __credits__     = ["Ricardo Ribeiro"]
 __license__     = 'GNU GPLv3'
-__version__     = "4.1.3"
+__version__ = "4.1.5"
 __maintainer__  = "Ricardo Ribeiro"
 __email__       = "ricardojvr@gmail.com"
 __status__      = "Development"

pyforms_web/basewidget.py

@@ -39,6 +39,9 @@ class BaseWidget(object):
     #: str: Css classes to add to the form.
     CSS = ''
 
+    #: str: Static files to include in the page
+    STATIC_FILES = []
+
     def __init__(self, *args, **kwargs):
         """
         :param str title: Title of the app. By default will assume the value in the class variable TITLE.
@@ -299,6 +302,9 @@ def generate_panel(self, formset):
         """
         if formset is None:
             return ''
+        elif 'notifications-area' == formset:
+            return "<div class='notifications-area field'></div>"
+
         elif '=' in formset:
             index = list( formset ).index('=')
             return "<div id='{splitter_id}' class='horizontalSplitter' ><div>{top}</div><div>{bottom}</div></div>".format(

pyforms_web/web/static/pyformsjs/BaseWidget.js

@@ -175,7 +175,12 @@ class BaseWidget{
                     for(var i=0; i<msg.messages.length; i++) html += '<li>'+msg.messages[i]+'</li>';
                     html    += '</ul>';
                 };
-                $(html).prependTo(this.jquery()).find('.close').on('click', function(){
+
+                var destination = this.jquery().find('.notifications-area');
+                if( destination.length==0 )
+                    destination = this.jquery()
+
+                $(html).prependTo(destination).find('.close').on('click', function(){
                     $(this).closest('.message').transition({animation:'fade',onComplete:function(){$(this).remove();} });
                 });
             };

pyforms_web/web/static/pyformsjs/ControlTextArea.js

@@ -22,5 +22,22 @@ class ControlTextArea extends ControlBase {
 
     ////////////////////////////////////////////////////////////////////////////////
 
+    /**
+    Enable the control.
+    */
+    enable(){
+        this.jquery().removeAttr('readonly');
+        this.jquery().removeClass('disabled');
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////
+
+    /**
+    Disable the control.
+    */
+    disable(){
+        this.jquery().attr('readonly', 'readonly');
+        this.jquery().addClass('disabled');
+    }
 }