Merge branch 'release-1.9.2'

baton/static/baton/app/package.json

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

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

@@ -13,6 +13,10 @@ let Menu = {
     this.fixNodes()
     this.fetchData()
     this.setHeight()
+    let self = this
+    $(window).on('resize', function () {
+      self.setHeight()
+    })
   },
   fixNodes: function () {
     let container = $('<div/>', { 'class': 'container-fluid' })
@@ -38,13 +42,13 @@ let Menu = {
       self.render(data)
       self.Dispatcher.emit('onMenuReady')
     })
-    .fail(function (err) {
-      console.error(err.responseText)
-      self.menu.remove()
-      $('#content').removeClass('col-md-9').removeClass('col-lg-10')
-        .css('flex-grow', 1)
-      self.Dispatcher.emit('onMenuError')
-    })
+      .fail(function (err) {
+        console.error(err.responseText)
+        self.menu.remove()
+        $('#content').removeClass('col-md-9').removeClass('col-lg-10')
+          .css('flex-grow', 1)
+        self.Dispatcher.emit('onMenuError')
+      })
   },
   setHeight: function () {
     let height = $(window).height() - $('#header').height() - 17 // nav padding and border

baton/static/baton/app/src/index.js

@@ -46,13 +46,20 @@ window.Baton = {
     if (page === 'add_form' || page === 'change_form') {
       Tabs.init(Dispatcher)
     }
+
+    // tooltips
+    this.loadTooltips()
+
     console.info('Baton:', 'ready')
     document.body.className += ' baton-ready'
     if (config.menuAlwaysCollapsed) {
       document.body.className += ' menu-mobile'
     }
     Dispatcher.emit('onReady')
   },
+  loadTooltips: function () {
+    $('[title]').tooltip()
+  },
   page: function () {
     if (/^(\/[a-z]{2})?\/admin\/$/.test(location.pathname)) {
       return 'dashboard'

baton/templates/admin/filer/folder/directory_listing.html

@@ -0,0 +1,5 @@
+{% extends "admin/filer/folder/directory_listing.html" %}
+{% load i18n %}
+{% block content_title %}
+<h1>{% trans "Folders" %}</h1>
+{% endblock %}

docs/conf.py

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

setup.py

@@ -9,7 +9,7 @@
 
 setup(
     name='django-baton',
-    version='1.9.1',
+    version='1.9.2',
     packages=['baton', 'baton.autodiscover', 'baton.templatetags'],
     include_package_data=True,
     license='MIT License',