Merge branch 'django1.8' of https://github.com/campbellr/tapiriik int…

…o campbellr-django1.8
cpfair · Sep 10, 2015 · 42a9727 · 42a9727
2 parents d1919d5 + 948482a
commit 42a9727
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -4,10 +4,10 @@ pytz
 lxml
 git+https://github.com/cpfair/dropbox-sdk-python.git
 python-dateutil
-Django==1.5.1
+Django==1.8.2
 pycrypto
 celery
-django-pipeline==1.3.22
+django-pipeline==1.5.1
 requests_oauthlib==0.4.0
 redis
 django-ipware

diff --git a/tapiriik/settings.py b/tapiriik/settings.py
@@ -69,6 +69,7 @@
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+    'pipeline.finders.PipelineFinder',
 #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 

diff --git a/tapiriik/web/templates/site.html b/tapiriik/web/templates/site.html
@@ -1,23 +1,23 @@
 {% load displayutils %}
-{% load compressed %}
+{% load pipeline %}
 <!DOCTYPE html>
 <html>
 <head>
 	<meta http-equiv="Content-Type" value="text/html; charset=UTF-8">
 	<meta name="Description" content="Automatically synchronize your fitness activities between Garmin Connect, Runkeeper, Strava and more.">
 	<meta name="Keywords" content="automatic, synchronize, sync, update, copy, transfer, download, back up, export, fitness, garmin, garmin connect, runkeeper, strava, endomondo, sporttracks, trainingpeaks, ridewithgps, ride with gps, training peaks, dropbox, trainerroad, motivato, velohero, epson, runsense, path, track, heart rate, free, service, gpx, tcx, health, data, service, cycling, running, swimming, walking, what other activities can I put here?, underwater basket weaving, why are you reading the SEO keywords anyways, move along, nothing to see here">
 
-	{% compressed_css 'tapiriik-css' %}
+	{% stylesheet 'tapiriik-css' %}
     {% if config.in_diagnostics %}
 	<script type="text/javascript">tapiriik = {diagnostics: true};</script>
 	<script type="text/javascript" src="{{ STATIC_URL }}js/Chart.min.js"></script>
 	<link rel="stylesheet" href="{{ STATIC_URL }}css/diagnostics.css" />
 	{% endif %}
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"></script>
-    {% compressed_js 'tapiriik-js' %}
+    {% javascript 'tapiriik-js' %}
     {% if user %}
     <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.12/angular.min.js"></script>
-    {% compressed_js 'tapiriik-user-js' %}
+    {% javascript 'tapiriik-user-js' %}
     {% endif %}
     <title>{% block site_title %}{% block title %}dashboard{% endblock %} &bull; tapiriik{% endblock %}</title>
 

diff --git a/tapiriik/web/views/auth.py b/tapiriik/web/views/auth.py
@@ -14,7 +14,7 @@ def auth_login(req, service):
 @require_POST
 def auth_login_ajax(req, service):
     res = auth_do(req, service)
-    return HttpResponse(json.dumps({"success": res == True, "result": res}), mimetype='application/json')
+    return HttpResponse(json.dumps({"success": res == True, "result": res}), content_type='application/json')
 
 
 def auth_do(req, service):
@@ -72,8 +72,8 @@ def auth_disconnect_ajax(req, service):
         status = auth_disconnect_do(req, service)
     except Exception as e:
         raise
-        return HttpResponse(json.dumps({"success": False, "error": str(e)}), mimetype='application/json', status=500)
-    return HttpResponse(json.dumps({"success": status}), mimetype='application/json')
+        return HttpResponse(json.dumps({"success": False, "error": str(e)}), content_type='application/json', status=500)
+    return HttpResponse(json.dumps({"success": status}), content_type='application/json')
 
 
 def auth_disconnect_do(req, service):
@@ -91,4 +91,4 @@ def auth_disconnect_do(req, service):
 @require_POST
 def auth_logout(req):
     User.Logout(req)
-    return redirect("/")
+    return redirect("/")
diff --git a/tapiriik/web/views/dropbox/__init__.py b/tapiriik/web/views/dropbox/__init__.py
@@ -17,4 +17,4 @@ def browse(req, path="/"):
         if item["is_dir"] is False:
             continue
         folders.append(item["path"])
-    return HttpResponse(json.dumps(folders), mimetype='application/json')
+    return HttpResponse(json.dumps(folders), content_type='application/json')
diff --git a/tapiriik/web/views/sync.py b/tapiriik/web/views/sync.py
@@ -48,13 +48,13 @@ def err_msg(err):
     if stats and "QueueHeadTime" in stats:
         sync_status_dict["SynchronizationWaitTime"] = (stats["QueueHeadTime"] - (datetime.utcnow() - req.user["NextSynchronization"]).total_seconds()) if "NextSynchronization" in req.user and req.user["NextSynchronization"] is not None else None
 
-    return HttpResponse(json.dumps(sync_status_dict), mimetype="application/json")
+    return HttpResponse(json.dumps(sync_status_dict), content_type="application/json")
 
 def sync_recent_activity(req):
     if not req.user:
         return HttpResponse(status=403)
     res = SynchronizationTask.RecentSyncActivity(req.user)
-    return HttpResponse(json.dumps(res), mimetype="application/json")
+    return HttpResponse(json.dumps(res), content_type="application/json")
 
 @require_POST
 def sync_schedule_immediate(req):
@@ -100,4 +100,3 @@ def sync_trigger_partial_sync_callback(req, service):
 
     trigger_remote.apply_async(args=[service, affected_connection_external_ids])
     return HttpResponse(status=204)
-