Merge branch 'release-1.12.2'

README.md

@@ -60,9 +60,10 @@ Everything is styled through CSS and when required, JS is used.
 
 The following packages are required to manage the Google Analytics index:
 
-- google-auth==1.22.1
-- google-auth-httplib2==0.0.4
-- google-api-python-client==1.5.5
+- google-auth
+- google-auth-httplib2
+- google-api-python-client
+- requests
 
 At the moment __baton__ defines only 4 custom templates:
 

baton/static/baton/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baton",
-  "version": "1.12.1",
+  "version": "1.12.2",
   "description": "Django Baton App",
   "main": "index.js",
   "scripts": {

baton/static/baton/app/src/core/Tabs.js

@@ -90,6 +90,10 @@ let Tabs = {
     $('input[name="_addanother"]').on('click', function () {
       location.hash = ''
     })
+
+    $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
+      $('[title]').tooltip()
+    })
   },
   createInlineEl: function (el, setDataTab = false) {
     let domEl

baton/static/baton/app/src/styles/_placeholders.scss

@@ -595,11 +595,11 @@
   }
 
   fieldset.collapse {
-    cursor: pointer;
     display: block;
 
     h2 {
       align-items: center;
+      cursor: pointer;
       display: flex;
       flex-direction: row;
       justify-content: space-between;
@@ -656,10 +656,16 @@
       font-size: 1.1rem;
       padding: 8px 10px;
 
+      .inline_label {
+        margin-right: auto;
+      }
+
+      /* replaced by prev rules, keeping here for reference for a while
       > .delete,
       > .inline_label + span {
         margin-left: auto;
       }
+      */
 
       > .delete {
         label {

baton/views.py

@@ -26,7 +26,7 @@ def get(self, request):
         self.app_list = site.get_app_list(request)
         self.apps_dict = self.create_app_list_dict()
         # no menu provided
-        items = get_config('MENU')
+        items = self.get_menu(request)
         if not items:
             voices = self.get_default_voices()
         else:
@@ -36,6 +36,9 @@ def get(self, request):
 
         return JsonResponse(voices, safe=False)
 
+    def get_menu(self, request):
+        return get_config('MENU')
+
     def add_voice(self, voices, item):
         """ Adds a voice to the list
         """

docs/conf.py

@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'1.12.1'
+version = u'1.12.2'
 # The full version, including alpha/beta/rc tags.
-release = u'1.12.1'
+release = u'1.12.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -11,7 +11,7 @@
 
 setup(
     name='django-baton',
-    version='1.12.1',
+    version='1.12.2',
     packages=['baton', 'baton.autodiscover', 'baton.templatetags'],
     include_package_data=True,
     license='MIT License',
@@ -22,9 +22,10 @@
     author='abidibo',
     author_email='abidibo@gmail.com',
     install_requires=[
-        'google-auth==1.22.1',
-        'google-auth-httplib2==0.0.4',
-        'google-api-python-client==1.5.5',
+        'google-auth',
+        'google-auth-httplib2',
+        'google-api-python-client',
+        'requests',
     ],
     classifiers=[
         'Development Status :: 5 - Production/Stable',