Merge branch 'dev'

.travis.yml

@@ -13,10 +13,10 @@ env:
 before_install:
   - export DJANGO_SETTINGS_MODULE=jet.tests.settings
 install:
-  - if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install importlib; fi
   - pip install -q Django==$DJANGO --use-mirrors
   - pip install . --use-mirrors
-  - pip install coveralls
+  - pip install coverage==3.7.1
+  - pip install coveralls==0.5
 script:
   - coverage run --source=jet --omit=*/migrations/*,*/south_migrations/*,*/tests/* manage.py test jet
 after_success:
@@ -24,8 +24,6 @@ after_success:
   - coveralls
 matrix:
   exclude:
-    - python: 2.6
-      env: DJANGO=1.6.11
     - python: 2.6
       env: DJANGO=1.7.7
     - python: 2.6

CHANGELOG.rst

@@ -1,6 +1,16 @@
 Changelog
 =========
 
+0.1.0
+-----
+* [Fix] Issue-9: Fixed dashboard application templates not being loaded because of bad manifest (thanks to blueicefield for the report)
+* [Fix] Added missing localization for django 1.6
+* [Fix] Added importlib requirement for python 2.6
+* [Fix] Added python 2.6 test
+* [Fix] Fixed coveralls 1.0 failing for python 3.2
+* [Improvement] Expand non dashboard sidebar width
+
+
 0.0.9
 -----
 * [Feature] Replace sidemenu scrollbars with Mac-like ones

MANIFEST.in

@@ -3,3 +3,5 @@ include LICENSE
 recursive-include jet/locale *
 recursive-include jet/static *
 recursive-include jet/templates *
+recursive-include jet/dashboard/static *
+recursive-include jet/dashboard/templates *

jet/__init__.py

@@ -1 +1 @@
-VERSION = '0.0.9'
+VERSION = '0.1.0'

jet/dashboard/dashboard.py

@@ -1,5 +1,5 @@
 from importlib import import_module
-from django.core.urlresolvers import resolve, reverse
+from django.core.urlresolvers import reverse
 from django.template.loader import render_to_string
 from jet.dashboard import modules
 from jet.dashboard.models import UserDashboardModule

jet/locale/ru/LC_MESSAGES/django.po

@@ -595,7 +595,7 @@ msgstr ""
 
 #: templates/admin/base.html:149
 msgid "View site"
-msgstr ""
+msgstr "Открыть сайт"
 
 #: templates/admin/base.html:189 templates/admin/base.html.py:206
 msgid "Add bookmark"
@@ -690,12 +690,12 @@ msgstr ""
 #: templates/admin/delete_confirmation.html:42
 #: templates/admin/delete_selected_confirmation.html:44
 msgid "No, take me back"
-msgstr ""
+msgstr "Нет, отменить и вернуться к выбору"
 
 #: templates/admin/delete_confirmation.html:56
 #: templates/admin/delete_selected_confirmation.html:59
 msgid "Objects"
-msgstr ""
+msgstr "Объекты"
 
 #: templates/admin/delete_selected_confirmation.html:11
 msgid "Delete multiple objects"

jet/models.py

@@ -1,10 +1,7 @@
-from importlib import import_module
-import json
 from django.db import models
 from django.utils import timezone
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
-from jet.utils import LazyDateTimeEncoder
 
 
 @python_2_unicode_compatible

jet/static/jet/css/_content.scss

@@ -78,7 +78,7 @@ ul.object-tools {
 
 .content-sidebar {
   float: right;
-  width: 18em;
+  width: 24em;
   margin: 0 20px;
 }
 

jet/static/jet/css/themes/default/base.css

@@ -4650,7 +4650,7 @@ ul.object-tools {
 
 .content-sidebar {
   float: right;
-  width: 18em;
+  width: 24em;
   margin: 0 20px; }
 
 .dashboard .module table td a {

jet/static/jet/css/themes/green/base.css

@@ -4681,7 +4681,7 @@ ul.object-tools {
 
 .content-sidebar {
   float: right;
-  width: 18em;
+  width: 24em;
   margin: 0 20px; }
 
 .dashboard .module table td a {

jet/utils.py

@@ -1,5 +1,4 @@
 import datetime
-from importlib import import_module
 import json
 from django.core.serializers.json import DjangoJSONEncoder
 from django.http import HttpResponse

setup.py

@@ -5,6 +5,15 @@ from setuptools import setup, find_packages
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
+
+def get_install_requires():
+    install_requires = []
+    try:
+        import importlib
+    except ImportError:
+        install_requires.append('importlib')
+    return install_requires
+
 setup(
     name='django-jet',
     version=__import__('jet').VERSION,
@@ -34,5 +43,6 @@ setup(
         'Topic :: Software Development :: User Interfaces',
     ],
     zip_safe=False,
-    include_package_data=True
+    include_package_data=True,
+    install_requires=get_install_requires()
 )