Merge pull request #77 from DallasMorningNews/editor-0.3.1

Editor 0.3.1
DallasMorningNews · Jan 2, 2018 · 45864a3 · 45864a3
2 parents 6cf3381 + ed836a5
commit 45864a3
Show file tree

Hide file tree

Showing 15 changed files with 2,345 additions and 3,056 deletions.
diff --git a/chartwerk/static/chartwerk/css/app.css b/chartwerk/static/chartwerk/css/app.css
diff --git a/chartwerk/static/chartwerk/css/editor.css b/chartwerk/static/chartwerk/css/editor.css
diff --git a/chartwerk/static/chartwerk/js/app.bundle.js b/chartwerk/static/chartwerk/js/app.bundle.js
diff --git a/chartwerk/static/chartwerk/js/app.bundle.js.map b/chartwerk/static/chartwerk/js/app.bundle.js.map
diff --git a/chartwerk/static/chartwerk/js/client.bundle.js b/chartwerk/static/chartwerk/js/client.bundle.js
diff --git a/chartwerk/static/chartwerk/js/client.bundle.js.map b/chartwerk/static/chartwerk/js/client.bundle.js.map
diff --git a/chartwerk/static/chartwerk/js/client.js b/chartwerk/static/chartwerk/js/client.js
diff --git a/chartwerk/static/chartwerk/js/client.js.map b/chartwerk/static/chartwerk/js/client.js.map
diff --git a/chartwerk/static/chartwerk/js/editor.js b/chartwerk/static/chartwerk/js/editor.js
diff --git a/chartwerk/static/chartwerk/js/editor.js.map b/chartwerk/static/chartwerk/js/editor.js.map
diff --git a/chartwerk/staticapp/yarn.lock b/chartwerk/staticapp/yarn.lock
diff --git a/chartwerk/tasks/aws.py b/chartwerk/tasks/aws.py
@@ -9,13 +9,14 @@
 import boto3
 from boto3.session import Session
 from celery import shared_task
-from chartwerk.conf import settings as app_settings
-from chartwerk.models import Chart
 from django.contrib.staticfiles.templatetags.staticfiles import static
 from django.template.loader import render_to_string
 from django.utils.encoding import smart_bytes, smart_text
 from django.utils.six.moves.urllib.request import urlopen
 
+from chartwerk.conf import settings as app_settings
+from chartwerk.models import Chart
+
 logger = logging.getLogger(__name__)
 
 
@@ -162,7 +163,7 @@ def write_to_aws(pk):
 
     try:
         werk.client = {
-            'scripts': render_local_static('chartwerk/js/client.bundle.js'),
+            'scripts': render_local_static('chartwerk/js/client.js'),
             'styles': render_local_static('chartwerk/css/client.css'),
         }
         werk.dependencies = build_dependencies(

diff --git a/chartwerk/templates/chartwerk/django-chartwerk-editor.html b/chartwerk/templates/chartwerk/django-chartwerk-editor.html
@@ -5,8 +5,8 @@
 {%block custom_head%}
 <link rel="icon" href="{% static 'chartwerk/img/favicon.ico'%}" type="image/x-icon">
 <link rel="shortcut icon" href="{% static 'chartwerk/img/favicon.ico'%}" type="image/x-icon">
-<link rel="stylesheet" href="{% static 'chartwerk/css/vendor.css' %}" media="screen" title="no title" charset="utf-8">
-<link rel="stylesheet" href="{% static 'chartwerk/css/app.css' %}" media="screen" title="no title" charset="utf-8">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
+<link rel="stylesheet" href="{% static 'chartwerk/css/editor.css' %}" media="screen" title="no title" charset="utf-8">
 {%endblock%}
 
 {%block custom_js%}
@@ -24,8 +24,7 @@
     color_schemes: '{{color_schemes|escapejs}}',
   };
 </script>
-<script type="text/javascript" src="{% static 'chartwerk/js/vendor.js' %}"></script>
-<script type="text/javascript" src="{% static 'chartwerk/js/app.bundle.js' %}"></script>
+<script type="text/javascript" src="{% static 'chartwerk/js/editor.js' %}"></script>
 {%endblock%}
 
 {%block content%}
@@ -52,5 +51,4 @@ <h1>
     <div class="loading-text"><span>Loading</span><img src="{% static 'chartwerk/img/loader.gif' %}"></div>
 </div>
 
-{% include "chartwerk/partials/modals/data-preview.html" %}
 {%endblock%}
diff --git a/docs/conf.py b/docs/conf.py
@@ -59,9 +59,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'0.5.17'
+version = u'0.5.18'
 # The full version, including alpha/beta/rc tags.
-release = u'0.5.17'
+release = u'0.5.18'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 REPO_URL = 'https://github.com/DallasMorningNews/django-chartwerk/'
 
-PYPI_VERSION = '0.5.17'
+PYPI_VERSION = '0.5.18'
 
 with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as readme:
     README = readme.read()
@@ -37,6 +37,7 @@
         'Framework :: Django :: 1.9',
         'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
+        'Framework :: Django :: 2.0',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: GNU Affero General Public License v3',
         'Operating System :: OS Independent',
@@ -53,7 +54,6 @@
     install_requires=[
         'boto3>=1.4.0',
         'celery>=4.0.0',
-        'Django>=1.9',
         'django-uuslug>=1.1.8',
         'djangorestframework>=2.4',
         'Pillow',