Merge pull request #11 from wanderer/rideshare

Rideshare. I <3 Martin

occupywallst/api.py

@@ -129,38 +129,6 @@ def attendees(bounds, **kwargs):
                'username': userinfo.user.username,
                'position': userinfo.position_latlng}
 
-
-def rides(bounds=None, **kwargs):
-    """Find all rides within visible map area"""
-    if bounds:
-        bbox = _str_to_bbox(bounds)
-        qset = (db.Ride.objects
-                .filter(route__isnull=False,
-                        route__bboverlaps=bbox,
-                        depart_time__gte=date.today()))
-    else:
-        qset = (db.Ride.objects
-                .filter(route__isnull=False))
-    for ride in qset:
-        yield {'id': ride.id,
-               'route': ride.route}
-
-
-def ride_request_update(request_id, status, user=None, **kwargs):
-    ride_request = (db.RideRequest.objects.filter(id=request_id)
-                    .select_related("ride", "ride__user"))
-    try:
-        req = ride_request[0]
-    except IndexError:
-        raise APIException(_("request not found"))
-    if req.ride.user == user:
-        req.status = status
-        req.save()
-        return [{"id": req.id, "status": req.status}]
-    else:
-        raise APIException(_("insufficient permissions"))
-
-
 def attendee_info(username, **kwargs):
     """Get information for displaying attendee bubble"""
     user = (db.User.objects

occupywallst/forms.py

@@ -9,6 +9,7 @@
 
 from django import forms
 from django.forms.models import modelformset_factory
+from django.conf import settings
 
 from occupywallst import models as db
 from occupywallst.fields import ReCaptchaField
@@ -84,7 +85,8 @@ class SignupForm(ProfileForm):
     password = forms.CharField(label="Password", widget=forms.PasswordInput,
                                min_length=6, max_length=128,
                                help_text="At least 6 characters")
-    captcha = ReCaptchaField()
+    if not settings.DEBUG:
+        captcha = ReCaptchaField()
 
     def __init__(self, *args, **kwargs):
         super(SignupForm, self).__init__(None, *args, **kwargs)

occupywallst/media/css/jquery.dataTables.css

@@ -0,0 +1,221 @@
+
+/*
+ * Table
+ */
+table.dataTable {
+	margin: 0 auto;
+	clear: both;
+	width: 100%;
+}
+
+table.dataTable thead th {
+	padding: 3px 18px 3px 10px;
+	border-bottom: 1px solid black;
+	font-weight: bold;
+	cursor: pointer;
+	*cursor: hand;
+}
+
+table.dataTable tfoot th {
+	padding: 3px 18px 3px 10px;
+	border-top: 1px solid black;
+	font-weight: bold;
+}
+
+table.dataTable td {
+	padding: 3px 10px;
+}
+
+table.dataTable td.center,
+table.dataTable td.dataTables_empty {
+	text-align: center;
+}
+
+table.dataTable tr.odd { background-color: #E2E4FF; }
+table.dataTable tr.even { background-color: white; }
+
+table.dataTable tr.odd td.sorting_1 { background-color: #D3D6FF; }
+table.dataTable tr.odd td.sorting_2 { background-color: #DADCFF; }
+table.dataTable tr.odd td.sorting_3 { background-color: #E0E2FF; }
+table.dataTable tr.even td.sorting_1 { background-color: #EAEBFF; }
+table.dataTable tr.even td.sorting_2 { background-color: #F2F3FF; }
+table.dataTable tr.even td.sorting_3 { background-color: #F9F9FF; }
+
+
+/*
+ * Table wrapper
+ */
+.dataTables_wrapper {
+	position: relative;
+	clear: both;
+	*zoom: 1;
+}
+
+
+/*
+ * Page length menu
+ */
+.dataTables_length {
+	float: left;
+}
+
+
+/*
+ * Filter
+ */
+.dataTables_filter {
+	float: right;
+	text-align: right;
+}
+
+
+/*
+ * Table information
+ */
+.dataTables_info {
+	clear: both;
+	float: left;
+}
+
+
+/*
+ * Pagination
+ */
+.dataTables_paginate {
+	float: right;
+	text-align: right;
+}
+
+/* Two button pagination - previous / next */
+.paginate_disabled_previous,
+.paginate_enabled_previous,
+.paginate_disabled_next,
+.paginate_enabled_next {
+	height: 19px;
+	float: left;
+	cursor: pointer;
+	*cursor: hand;
+	color: #111 !important;
+}
+.paginate_disabled_previous:hover,
+.paginate_enabled_previous:hover,
+.paginate_disabled_next:hover,
+.paginate_enabled_next:hover {
+	text-decoration: none !important;
+}
+.paginate_disabled_previous:active,
+.paginate_enabled_previous:active,
+.paginate_disabled_next:active,
+.paginate_enabled_next:active {
+	outline: none;
+}
+
+.paginate_disabled_previous,
+.paginate_disabled_next {
+	color: #666 !important;
+}
+.paginate_disabled_previous,
+.paginate_enabled_previous {
+	padding-left: 23px;
+}
+.paginate_disabled_next,
+.paginate_enabled_next {
+	padding-right: 23px;
+	margin-left: 10px;
+}
+
+.paginate_enabled_previous { background: url('../images/back_enabled.png') no-repeat top left; }
+.paginate_enabled_previous:hover { background: url('../images/back_enabled_hover.png') no-repeat top left; }
+.paginate_disabled_previous { background: url('../images/back_disabled.png') no-repeat top left; }
+
+.paginate_enabled_next { background: url('../images/forward_enabled.png') no-repeat top right; }
+.paginate_enabled_next:hover { background: url('../images/forward_enabled_hover.png') no-repeat top right; }
+.paginate_disabled_next { background: url('../images/forward_disabled.png') no-repeat top right; }
+
+/* Full number pagination */
+.paging_full_numbers {
+	height: 22px;
+	line-height: 22px;
+}
+.paging_full_numbers a:active {
+	outline: none
+}
+.paging_full_numbers a:hover {
+	text-decoration: none;
+}
+
+.paging_full_numbers a.paginate_button,
+.paging_full_numbers a.paginate_active {
+	border: 1px solid #aaa;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	padding: 2px 5px;
+	margin: 0 3px;
+	cursor: pointer;
+	*cursor: hand;
+	color: #333 !important;
+}
+
+.paging_full_numbers a.paginate_button {
+	background-color: #ddd;
+}
+
+.paging_full_numbers a.paginate_button:hover {
+	background-color: #ccc;
+	text-decoration: none !important;
+}
+
+.paging_full_numbers a.paginate_active {
+	background-color: #99B3FF;
+}
+
+
+/*
+ * Processing indicator
+ */
+.dataTables_processing {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	width: 250px;
+	height: 30px;
+	margin-left: -125px;
+	margin-top: -15px;
+	padding: 14px 0 2px 0;
+	border: 1px solid #ddd;
+	text-align: center;
+	color: #999;
+	font-size: 14px;
+	background-color: white;
+}
+
+
+/*
+ * Sorting
+ */
+.paginate_enabled_previous { background: url('../img/back_enabled.png') no-repeat top left; }
+.paginate_enabled_previous:hover { background: url('../img/back_enabled_hover.png') no-repeat top left; }
+.paginate_disabled_previous { background: url('../img/back_disabled.png') no-repeat top left; }
+
+.paginate_enabled_next { background: url('../img/forward_enabled.png') no-repeat top right; }
+.paginate_enabled_next:hover { background: url('../img/forward_enabled_hover.png') no-repeat top right; }
+.paginate_disabled_next { background: url('../img/forward_disabled.png') no-repeat top right; }
+
+table.dataTable th:active {
+	outline: none;
+}
+
+
+/*
+ * Scrolling
+ */
+.dataTables_scroll {
+	clear: both;
+}
+
+.dataTables_scrollBody {
+	*margin-top: -1px;
+	-webkit-overflow-scrolling: touch;
+}
+

occupywallst/media/css/rideshare.css

@@ -0,0 +1,7 @@
+#carpool_listing{
+	width:100%;
+}
+#carpool_listing th{
+ text-align: left;
+}
+