From 5fce8589230f72ce98fd25780625ebd9808e3404 Mon Sep 17 00:00:00 2001 From: Levi Date: Wed, 3 Aug 2016 00:50:33 -0500 Subject: [PATCH] Changed donations.html table style, Added pagination to donations list view. Hiding donate now button if the user is logged in and already has a donation.Handled the case when an user has not donations yet in donations.html view. Fixed bug on donation signup --- digitalglarus/urls.py | 1 + digitalglarus/views.py | 1 + membership/forms.py | 2 +- nosystemd/static/nosystemd/css/nosystemd.css | 13 +++++++++++++ nosystemd/static/nosystemd/js/donation.js | 2 ++ nosystemd/templates/nosystemd/donation.html | 19 ++++++++++++++----- .../djangocms_blog/includes/blog_item.html | 1 + ungleich/test_views.py | 1 + 8 files changed, 34 insertions(+), 6 deletions(-) diff --git a/digitalglarus/urls.py b/digitalglarus/urls.py index 7f08190c..b25fa273 100644 --- a/digitalglarus/urls.py +++ b/digitalglarus/urls.py @@ -5,6 +5,7 @@ from . import views from .views import ContactView, IndexView, AboutView urlpatterns = [ + url(_(r'^$'), IndexView.as_view(), name='contact'), url(_(r'contact/?$'), ContactView.as_view(), name='contact'), url(_(r'supporters/?$'), views.supporters, name='supporters'), url(r'calendar_api/(?P\d+)/(?P\d+)?$', views.CalendarApi.as_view(),name='calendar_api_1'), diff --git a/digitalglarus/views.py b/digitalglarus/views.py index b4623922..edd5dbdf 100644 --- a/digitalglarus/views.py +++ b/digitalglarus/views.py @@ -20,6 +20,7 @@ from membership.models import Calendar as CalendarModel import json from django.contrib.auth import logout + class CalendarApi(View): def get(self,request,month,year): calendar = BookCalendar(request.user,requested_month=month).formatmonth(int(year),int(month)) diff --git a/membership/forms.py b/membership/forms.py index 999add6b..7d2e8850 100644 --- a/membership/forms.py +++ b/membership/forms.py @@ -26,7 +26,7 @@ class LoginForm(forms.Form): def login(self,request): username = self.cleaned_data.get('email') password = self.cleaned_data.get('password') - user = authenticate(email=username,password=password) + user = authenticate(email=username, password=password) return user diff --git a/nosystemd/static/nosystemd/css/nosystemd.css b/nosystemd/static/nosystemd/css/nosystemd.css index abba1659..120508bc 100644 --- a/nosystemd/static/nosystemd/css/nosystemd.css +++ b/nosystemd/static/nosystemd/css/nosystemd.css @@ -1,3 +1,16 @@ +form{ + + + font-family: sans-serif; +} + + +.donation-container { + + margin-top:0% !important; +} + + .donations-container { top:30% !important; diff --git a/nosystemd/static/nosystemd/js/donation.js b/nosystemd/static/nosystemd/js/donation.js index c431f7ce..b853cab7 100644 --- a/nosystemd/static/nosystemd/js/donation.js +++ b/nosystemd/static/nosystemd/js/donation.js @@ -37,7 +37,9 @@ $( document ).ready(function() { var PublishableKey = window.stripeKey; Stripe.setPublishableKey(PublishableKey); + console.log('form',$form); Stripe.card.createToken($form, function stripeResponseHandler(status, response) { + console.log('response',response); if (response.error) { /* Visual feedback */ $form.find('[type=submit]').html('Try again'); diff --git a/nosystemd/templates/nosystemd/donation.html b/nosystemd/templates/nosystemd/donation.html index 864a98e9..0156db4d 100644 --- a/nosystemd/templates/nosystemd/donation.html +++ b/nosystemd/templates/nosystemd/donation.html @@ -4,10 +4,10 @@
-
-
+
+
-
+
@@ -53,9 +53,18 @@
-
- + + +
+
+
+
+
+
+
+
+
diff --git a/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html b/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html index 50c1b0ce..9825fe92 100644 --- a/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html +++ b/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html @@ -5,6 +5,7 @@

{{ post.title }}

+

{% if not TRUNCWORDS_COUNT %} {% render_model post "abstract" %} diff --git a/ungleich/test_views.py b/ungleich/test_views.py index 09375894..17130857 100644 --- a/ungleich/test_views.py +++ b/ungleich/test_views.py @@ -22,6 +22,7 @@ class PostListViewUngleichTest(BaseTestCase): self.url = reverse('ungleich:post-list') self.view = PostListViewUngleich self.expected_template = 'djangocms_blog/post_list_ungleich.html' + activate(self.EN_LANGUAGE_CODE) en_post_titles = ['post-title-1', 'post-title-2'] self.en_posts = [mommy.make(Post, title=x, publish=True) for x in en_post_titles] # activate DE language in order to create DE POSTS