Merge branch 'master' into board

tjcsl · Mar 22, 2016 · 18d6420 · 18d6420
2 parents e0b1fc8 + dad72e2
commit 18d6420
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 10 deletions.
diff --git a/Ion.egg-info/requires.txt b/Ion.egg-info/requires.txt
@@ -11,7 +11,7 @@ django-oauth-toolkit==0.10.0
 django-redis-cache==1.6.5
 django-redis-sessions==0.5.0
 djangorestframework==3.3.3
-django-simple-history==1.8.0
+django-simple-history==1.8.1
 django-widget-tweaks==1.4.1
 Fabric3==1.10.2.post3
 gssapi==1.2.0
@@ -20,15 +20,15 @@ hiredis==0.2.0
 icalendar==3.9.2
 ipaddress==1.0.16
 ldap3==1.1.2
-Markdown==2.6.5
+Markdown==2.6.6
 nose==1.3.7
 oauthlib==1.0.3
 pexpect==4.0.1
 psycopg2==2.6.1
 pycrypto==2.6.1
 pysftp==0.2.8
 python-ldap-test==0.2.0
-python-magic==0.4.10
+python-magic==0.4.11
 redis==2.10.5
 reportlab==3.3.0
 requests==2.9.1

diff --git a/docs/developing/oauth.rst b/docs/developing/oauth.rst
@@ -73,6 +73,10 @@ After 36,000 seconds (1 hour), the token will expire; you need to renew it. This
      args = { "client_id": CLIENT_ID, "client_secret": CLIENT_SECRET }
      token = oauth.refresh_token("https://ion.tjhsst.edu/oauth/token/", **args)
 
+
+If you want to use python-social-auth, a plugin is available in the ion_oauth package.
+See `ion_oauth <https://pypi.python.org/pypi/ion_oauth>`_
+
 PHP
 ---
 

diff --git a/docs/rtd-requirements.txt b/docs/rtd-requirements.txt
@@ -11,22 +11,22 @@ django-oauth-toolkit==0.10.0
 django-redis-cache==1.6.5
 django-redis-sessions==0.5.0
 djangorestframework==3.3.3
-django-simple-history==1.8.0
+django-simple-history==1.8.1
 django-widget-tweaks==1.4.1
 Fabric3==1.10.2.post3
 gunicorn==19.4.5
 hiredis==0.2.0
 icalendar==3.9.2
 ipaddress==1.0.16
 ldap3==1.1.2
-Markdown==2.6.5
+Markdown==2.6.6
 nose==1.3.7
 oauthlib==1.0.3
 pexpect==4.0.1
 psycopg2==2.6.1
 pycrypto==2.6.1
 pysftp==0.2.8
-python-magic==0.4.10
+python-magic==0.4.11
 redis==2.10.5
 reportlab==3.3.0
 requests==2.9.1

diff --git a/intranet/static/js/common.nav.js b/intranet/static/js/common.nav.js
@@ -0,0 +1,39 @@
+$(function() {
+    var initX = null, initY = null, listening = false;
+    $(window).on("touchstart", function(e) {
+        initX = e.originalEvent.touches[0].clientX;
+        initY = e.originalEvent.touches[0].clientY;
+        listening = true;
+    });
+    $(window).on("touchend", function(e) {
+        listening = false;
+    });
+    $(window).on("touchmove", function(e) {
+        if (!listening) {
+            return;
+        }
+        var nowX = e.originalEvent.touches[0].clientX;
+        var nowY = e.originalEvent.touches[0].clientY;
+        if (Math.abs(nowY - initY) > 30) {
+            listening = false;
+            return;
+        }
+        var diffX = nowX - initX;
+        if (Math.abs(diffX) > 30) {
+            var nav = $(".main > .nav").eq(0);
+            var g = $(".nav-g");
+            var shown = nav.css('left').split(/[^\-\d]+/)[0] == 0;
+            if (diffX > 0 && !shown) {
+                nav.animate({ left: "0px" }, 200);
+                g.addClass("close-l").fadeIn(200);
+                $("body").addClass("disable-scroll").addClass("mobile-nav-show");
+            }
+            else if (shown) {
+                nav.animate({ left: "-202px" }, 200);
+                g.removeClass("close-l").fadeOut(200);
+                $("body").removeClass("disable-scroll").removeClass("mobile-nav-show");
+            }
+            listening = false;
+        }
+    });
+});
diff --git a/intranet/static/js/eighth/signupUI.js b/intranet/static/js/eighth/signupUI.js
@@ -179,4 +179,38 @@ $(function() {
     $("#activity-list").on("scroll", function() {
         sh.scroll();
     });
-});
+
+    var initX = null, initY = null, listening = false;
+    $(".day-picker").on("touchstart", function(e) {
+        e.stopPropagation();
+        initX = e.originalEvent.touches[0].clientX;
+        initY = e.originalEvent.touches[0].clientY;
+        listening = true;
+    });
+    $(".day-picker").on("touchend", function(e) {
+        e.stopPropagation();
+        listening = false;
+    });
+    $(".day-picker").on("touchmove", function(e) {
+        e.stopPropagation();
+        if (!listening) {
+            return;
+        }
+        var nowX = e.originalEvent.touches[0].clientX;
+        var nowY = e.originalEvent.touches[0].clientY;
+        if (Math.abs(nowY - initY) > 30) {
+            listening = false;
+            return;
+        }
+        var diffX = nowX - initX;
+        if (Math.abs(diffX) > 30) {
+            if (diffX > 0) {
+                $(".earlier-days").click();
+            }
+            else {
+                $(".later-days").click();
+            }
+            listening = false;
+        }
+    });
+});
diff --git a/intranet/templates/page_with_nav.html b/intranet/templates/page_with_nav.html
@@ -1,5 +1,10 @@
 {% extends "page_with_header.html" %}
+{% load staticfiles %}
 
+{% block js %}
+    {{ block.super }}
+    <script type="text/javascript" src="{% static 'js/common.nav.js' %}"></script>
+{% endblock %}
 
 {% block content %}
     {% include "nav.html" %}

diff --git a/requirements.txt b/requirements.txt
@@ -11,7 +11,7 @@ django-oauth-toolkit==0.10.0
 django-redis-cache==1.6.5
 django-redis-sessions==0.5.0
 djangorestframework==3.3.3
-django-simple-history==1.8.0
+django-simple-history==1.8.1
 django-widget-tweaks==1.4.1
 Fabric3==1.10.2.post3
 gssapi==1.2.0
@@ -20,15 +20,15 @@ hiredis==0.2.0
 icalendar==3.9.2
 ipaddress==1.0.16
 ldap3==1.1.2
-Markdown==2.6.5
+Markdown==2.6.6
 nose==1.3.7
 oauthlib==1.0.3
 pexpect==4.0.1
 psycopg2==2.6.1
 pycrypto==2.6.1
 pysftp==0.2.8
 python-ldap-test==0.2.0
-python-magic==0.4.10
+python-magic==0.4.11
 redis==2.10.5
 reportlab==3.3.0
 requests==2.9.1