Merge branch 'dev'

README.rst

@@ -22,6 +22,7 @@ and applications without the provisions of the AGPLv3.
 * Home page: http://jet.geex-arts.com/
 * **Live Demo**: http://demo.jet.geex-arts.com/admin/
 * Documentation: http://jet.readthedocs.org/
+* libi.io http://libi.io/library/1683
 * PyPI: https://pypi.python.org/pypi/django-jet
 * Support: support@jet.geex-arts.com
 
@@ -167,7 +168,7 @@ Dashboard installation
 
 .. code::
 
-    pip install google-api-python-client
+    pip install google-api-python-client==1.4.1
 
 * Create database tables:
 

docs/dashboard_modules.rst

@@ -66,7 +66,7 @@ Extra Installation
 
 .. code::
 
-   pip install google-api-python-client
+   pip install google-api-python-client==1.4.1
 
 * Specify path to your Google Analytics ``client_secrets.json`` (obtained at Google website):
 

docs/index.rst

@@ -38,6 +38,7 @@ Resources
 
 * Home page: http://jet.geex-arts.com/
 * **Live Demo**: http://demo.jet.geex-arts.com/admin/
+* libi.io http://libi.io/library/1683
 * PyPI: https://pypi.python.org/pypi/django-jet
 * Support: support@jet.geex-arts.com
 

docs/install_dashboard.rst

@@ -34,7 +34,7 @@ Dashboard Installation
 
 .. code::
 
-    pip install google-api-python-client
+    pip install google-api-python-client==1.4.1
 
 * Create database tables:
 

gulpfile.js

@@ -26,7 +26,7 @@ var cssProcessors = [
 ];
 
 gulp.task('scripts', function() {
-    browserify('./jet/static/jet/js/src/main.js')
+    return browserify('./jet/static/jet/js/src/main.js')
         .bundle()
         .on('error', function(error) {
             console.error(error);
@@ -38,7 +38,7 @@ gulp.task('scripts', function() {
 });
 
 gulp.task('styles', function() {
-    gulp.src('./jet/static/jet/css/**/*.scss')
+    return gulp.src('./jet/static/jet/css/**/*.scss')
         .pipe(sourcemaps.init())
         .pipe(sass({
             outputStyle: 'compressed'
@@ -55,67 +55,68 @@ gulp.task('styles', function() {
 });
 
 gulp.task('vendor-styles', function() {
-    gulp.src('./node_modules/jquery-ui/themes/base/images/*')
-        .pipe(gulp.dest('./jet/static/jet/css/jquery-ui/images/'));
-
-    merge(
-        gulp.src([
-            './node_modules/select2/dist/css/select2.css',
-            './node_modules/timepicker/jquery.ui.timepicker.css'
-        ]),
-        gulp.src([
-            './node_modules/jquery-ui/themes/base/all.css'
-        ])
-            .pipe(cleanCSS()) // needed to remove jQuery UI comments breaking concatCss
+    return merge(
+        gulp.src('./node_modules/jquery-ui/themes/base/images/*')
+            .pipe(gulp.dest('./jet/static/jet/css/jquery-ui/images/')),
+        merge(
+            gulp.src([
+                './node_modules/select2/dist/css/select2.css',
+                './node_modules/timepicker/jquery.ui.timepicker.css'
+            ]),
+            gulp.src([
+                './node_modules/jquery-ui/themes/base/all.css'
+            ])
+                .pipe(cleanCSS()) // needed to remove jQuery UI comments breaking concatCss
+                .on('error', function(error) {
+                    console.error(error);
+                })
+                .pipe(concatCss('jquery-ui.css', {
+                    rebaseUrls: false
+                }))
+                .on('error', function(error) {
+                    console.error(error);
+                })
+                .pipe(replace('images/', 'jquery-ui/images/'))
+                .on('error', function(error) {
+                    console.error(error);
+                }),
+            gulp.src([
+                './node_modules/perfect-scrollbar/src/css/main.scss'
+            ])
+                .pipe(sass({
+                    outputStyle: 'compressed'
+                }))
+                .on('error', function(error) {
+                    console.error(error);
+                })
+        )
+            .pipe(postcss(cssProcessors))
             .on('error', function(error) {
                 console.error(error);
             })
-            .pipe(concatCss('jquery-ui.css', {
+            .pipe(concatCss('vendor.css', {
                 rebaseUrls: false
             }))
             .on('error', function(error) {
                 console.error(error);
             })
-            .pipe(replace('images/', 'jquery-ui/images/'))
-            .on('error', function(error) {
-                console.error(error);
-            }),
-        gulp.src([
-            './node_modules/perfect-scrollbar/src/css/main.scss'
-        ])
-            .pipe(sass({
-                outputStyle: 'compressed'
-            }))
+            .pipe(cleanCSS())
             .on('error', function(error) {
                 console.error(error);
             })
+            .pipe(gulp.dest('./jet/static/jet/css'))
     )
-        .pipe(postcss(cssProcessors))
-        .on('error', function(error) {
-            console.error(error);
-        })
-        .pipe(concatCss('vendor.css', {
-            rebaseUrls: false
-        }))
-        .on('error', function(error) {
-            console.error(error);
-        })
-        .pipe(cleanCSS())
-        .on('error', function(error) {
-            console.error(error);
-        })
-        .pipe(gulp.dest('./jet/static/jet/css'));
 });
 
 gulp.task('vendor-translations', function() {
-    gulp.src(['./node_modules/jquery-ui/ui/i18n/*.js'])
-        .pipe(gulp.dest('./jet/static/jet/js/i18n/jquery-ui/'));
-
-    gulp.src(['./node_modules/timepicker/i18n/*.js'])
-        .pipe(gulp.dest('./jet/static/jet/js/i18n/jquery-ui-timepicker/'));
-
-    gulp.src(['./node_modules/select2/dist/js/i18n/*.js'])
-        .pipe(gulp.dest('./jet/static/jet/js/i18n/select2/'));
+    return merge(
+        gulp.src(['./node_modules/jquery-ui/ui/i18n/*.js'])
+            .pipe(gulp.dest('./jet/static/jet/js/i18n/jquery-ui/')),
+        gulp.src(['./node_modules/timepicker/i18n/*.js'])
+            .pipe(gulp.dest('./jet/static/jet/js/i18n/jquery-ui-timepicker/')),
+        gulp.src(['./node_modules/select2/dist/js/i18n/*.js'])
+            .pipe(gulp.dest('./jet/static/jet/js/i18n/select2/'))
+    )
 });
 
 gulp.task('locales', shell.task('python manage.py compilemessages', { quiet: true }));

jet/dashboard/locale/de/LC_MESSAGES/django.po

@@ -260,7 +260,7 @@ msgid "You must install the FeedParser python module"
 msgstr "Bitte FeedParser Python modul installieren"
 
 msgid "You must provide a valid feed URL"
-msgstr "Bitte eine valide feed URL angeben"
+msgstr "Bitte eine gültige Feed URL angeben"
 
 msgid "Delete widget"
 msgstr "Widget löschen"

jet/dashboard/templatetags/jet_dashboard_tags.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 from django import template
-from django.core.urlresolvers import resolve
 from jet.dashboard.utils import get_current_dashboard
 
 register = template.Library()
@@ -10,7 +9,6 @@ register = template.Library()
 def get_dashboard(context, location):
     dashboard_cls = get_current_dashboard(location)
 
-    resolver = resolve(context['request'].path)
-    app_label = resolver.kwargs.get('app_label')
+    app_label = context['request'].resolver_match.kwargs.get('app_label')
 
-    return dashboard_cls(context, app_label=app_label)
+    return dashboard_cls(context, app_label=app_label)

jet/filters.py

@@ -15,6 +15,7 @@ except ImportError: # Django 1.6
 
 
 class RelatedFieldAjaxListFilter(RelatedFieldListFilter):
+    template = 'jet/related_field_ajax_list_filter.html'
     ajax_attrs = None
 
     def has_output(self):

jet/static/jet/css/_breadcrumbs.scss

@@ -16,6 +16,8 @@ div.breadcrumbs {
 
   @include for-mobile {
     padding: 20px 20px 10px 20px;
+    white-space: normal;
+    text-overflow: clip;
     overflow: auto;
   }
 

jet/static/jet/js/src/features/related-popups.js

@@ -85,7 +85,9 @@ RelatedPopups.prototype = {
         });
 
         $('.inline-group').on('inline-group-row:added', function(e, $inlineItem) {
-            self.initLinksForRow($inlineItem.find('.form-row'));
+            $inlineItem.find('.form-row').each(function() {
+                self.initLinksForRow($(this));
+            });
         });
     },
     initPopupBackButton: function() {

jet/static/jet/js/src/layout-updaters/toolbar.js

@@ -32,6 +32,10 @@ ToolbarUpdater.prototype = {
                 var $select = $('<select>').addClass('changelist-filter-select');
                 var $items = $element.find('li');
 
+                $.each($element.prop('attributes'), function() {
+                    $select.attr(this.name, this.value);
+                });
+
                 if ($items.filter('.selected').length > 1) {
                     $select.attr('multiple', true);
                 }

jet/templates/jet/related_field_ajax_list_filter.html

@@ -0,0 +1,8 @@
+{% load i18n %}
+<h3>{% blocktrans with filter_title=title %} By {{ filter_title }} {% endblocktrans %}</h3>
+<ul{% if spec.ajax_attrs %} class="ajax"{% endif %}{% if spec.ajax_attrs %}{{ spec.ajax_attrs }}{% endif %}>
+    {% for choice in choices %}
+        <li{% if choice.selected %} class="selected"{% endif %}>
+        <a href="{{ choice.query_string|iriencode }}" title="{{ choice.display }}">{{ choice.display }}</a></li>
+    {% endfor %}
+</ul>

jet/templatetags/jet_tags.py

@@ -7,6 +7,7 @@ from django.forms import CheckboxInput, ModelChoiceField, Select, ModelMultipleC
 from django.contrib.admin.widgets import RelatedFieldWidgetWrapper
 from django.utils.formats import get_format
 from django.utils.safestring import mark_safe
+from django.utils.encoding import smart_text
 from jet import settings, VERSION
 from jet.models import Bookmark, PinnedApplication
 from jet.utils import get_app_list, get_model_instance_label, get_model_queryset, get_possible_language_codes, \
@@ -267,7 +268,7 @@ def jet_popup_response_data(context):
     return json.dumps({
         'action': context.get('action'),
         'value': context.get('value') or context.get('pk_value'),
-        'obj': str(context.get('obj')),
+        'obj': smart_text(context.get('obj')),
         'new_value': context.get('new_value')
     })
 

jet/tests/dashboard.py

@@ -31,3 +31,34 @@ class TestIndexDashboard(Dashboard):
             column=1,
             order=1
         ))
+
+
+class TestAppIndexDashboard(Dashboard):
+    columns = 3
+    init_with_context_called = False
+
+    class Media:
+        js = ('file.js', 'file2.js')
+        css = ('file.css', 'file2.css')
+
+    def init_with_context(self, context):
+        self.init_with_context_called = True
+        self.available_children.append(modules.LinkList)
+        self.available_children.append(modules.Feed)
+
+        # append a recent actions module
+        self.children.append(modules.RecentActions(
+            'Recent Actions',
+            10,
+            column=0,
+            order=1
+        ))
+
+        # append a feed module
+        self.children.append(modules.Feed(
+            'Latest Django News',
+            feed_url='http://www.djangoproject.com/rss/weblog/',
+            limit=5,
+            column=1,
+            order=1
+        ))

jet/tests/settings.py

@@ -69,6 +69,5 @@ MEDIA_URL = ''
 
 STATIC_URL = '/static/'
 
-
-
-
+JET_INDEX_DASHBOARD = 'jet.tests.dashboard.TestIndexDashboard'
+JET_APP_INDEX_DASHBOARD = 'jet.tests.dashboard.TestAppIndexDashboard'

jet/tests/test_dashboard.py

@@ -1,5 +1,7 @@
 from django.contrib.auth.models import User
+from django.core.urlresolvers import reverse
 from django.test import TestCase, Client
+from jet.dashboard.dashboard import Dashboard
 from jet.dashboard.modules import LinkList, RecentActions
 from jet.dashboard.models import UserDashboardModule
 from jet.tests.dashboard import TestIndexDashboard
@@ -61,5 +63,23 @@ class DashboardTestCase(TestCase):
         self.assertEqual(media.css[0], 'file.css')
         self.assertEqual(media.css[1], 'file2.css')
 
+    def test_index_dashboard_view(self):
+        response = self.admin.get(reverse('admin:index'))
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue('dashboard' in response.context)
 
+        dashboard = response.context['dashboard']
 
+        self.assertIsInstance(dashboard, Dashboard)
+        self.assertIsNone(dashboard.app_label)
+
+    def test_app_index_dashboard_view(self):
+        app_label = 'tests'
+        response = self.admin.get(reverse('admin:app_list', args=(app_label,)))
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue('dashboard' in response.context)
+
+        dashboard = response.context['dashboard']
+
+        self.assertIsInstance(dashboard, Dashboard)
+        self.assertEqual(dashboard.app_label, app_label)