From f299d61aa183456426a9bf1194e5692d4076207b Mon Sep 17 00:00:00 2001 From: Charles Connell Date: Wed, 12 Mar 2014 18:18:20 -0400 Subject: [PATCH] moving around the filepicker button --- karmaworld/apps/notes/models.py | 9 +++------ karmaworld/assets/css/note_course_pages.css | 11 +++++++++- karmaworld/settings/common.py | 1 + .../templates/courses/course_detail.html | 20 ++++++++----------- karmaworld/templates/partial/filepicker.html | 17 ++++++---------- 5 files changed, 28 insertions(+), 30 deletions(-) diff --git a/karmaworld/apps/notes/models.py b/karmaworld/apps/notes/models.py index 3e58f48..c1fabac 100644 --- a/karmaworld/apps/notes/models.py +++ b/karmaworld/apps/notes/models.py @@ -108,17 +108,14 @@ class Document(models.Model): 'data-fp-multiple': 'true', 'data-fp-folders': 'true', 'data-fp-button-class': - 'add-note-btn small-10 columns large-4', - 'data-fp-button-text': - mark_safe(" add notes"), - 'data-fp-drag-class': - 'dragdrop show-for-medium-up large-7 columns', - 'data-fp-drag-text': 'Drop Some Knowledge', + 'add-note-btn', + 'data-fp-button-text': 'Add Notes', 'data-fp-extensions': '.pdf,.doc,.docx,.txt,.html,.rtf,.odt,.png,.jpg,.jpeg,.ppt,.pptx', 'data-fp-store-location': 'S3', 'data-fp-policy': fp_policy, 'data-fp-signature': fp_signature, + 'type': 'filepicker', 'onchange': "got_file(event)", }, # FileField settings diff --git a/karmaworld/assets/css/note_course_pages.css b/karmaworld/assets/css/note_course_pages.css index 115c631..635508a 100644 --- a/karmaworld/assets/css/note_course_pages.css +++ b/karmaworld/assets/css/note_course_pages.css @@ -27,7 +27,7 @@ span.course-header-school cursor: pointer; } -button.add-note { +.add-note-btn { background: grey; color: white; border: none; @@ -42,6 +42,10 @@ input.search-notes { margin-right: 0; } +form.search-notes { + display: inline; +} + #note-sort-wrapper { float: right; display: inline; @@ -57,4 +61,9 @@ select.note-sort { padding: 10px 0 0 0; } +ul.socialaccount_providers li +{ + display: inline; +} + diff --git a/karmaworld/settings/common.py b/karmaworld/settings/common.py index 440dd2a..eff3233 100644 --- a/karmaworld/settings/common.py +++ b/karmaworld/settings/common.py @@ -14,6 +14,7 @@ from djcelery import setup_loader from karmaworld.secret.filepicker import FILEPICKER_API_KEY as fp_api FILEPICKER_API_KEY = fp_api +FILEPICKER_INPUT_TYPE = 'filepicker' from karmaworld.secret.static_s3 import * diff --git a/karmaworld/templates/courses/course_detail.html b/karmaworld/templates/courses/course_detail.html index 50e91dc..8b73356 100644 --- a/karmaworld/templates/courses/course_detail.html +++ b/karmaworld/templates/courses/course_detail.html @@ -136,10 +136,11 @@ - -
-
-
- - - {% include 'partial/filepicker.html' %} -
diff --git a/karmaworld/templates/partial/filepicker.html b/karmaworld/templates/partial/filepicker.html index b699ada..68b5800 100644 --- a/karmaworld/templates/partial/filepicker.html +++ b/karmaworld/templates/partial/filepicker.html @@ -2,16 +2,11 @@ {% load socialaccount %} {{ file_upload_form.media }}
-
-
- {{ file_upload_form.as_p }} -
-
-
+
-
+

Thank you for sharing:

@@ -20,7 +15,7 @@ We'd love to have you sign up so you can claim the karma points you just got. With a KarmaNotes account, you can build a reputation by continuing to upload great notes. - Want to share again?

+ Refresh to share more notes.

    {% include "socialaccount/snippets/provider_list.html" with process="login" %} @@ -36,15 +31,15 @@
-