From 89467836c894873931b0ca924040a9ccead5db4b Mon Sep 17 00:00:00 2001 From: Seth Woodworth Date: Mon, 25 Mar 2013 13:44:40 -0400 Subject: [PATCH] moving the thankyou form to the right place, styling it and hiding it on adding another note --- karmaworld/assets/css/global.css | 5 ++--- karmaworld/assets/js/lightboxupload.js | 9 ++++----- karmaworld/templates/courses/course_detail.html | 6 +++--- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/karmaworld/assets/css/global.css b/karmaworld/assets/css/global.css index a0ddd48..a0a5d7b 100644 --- a/karmaworld/assets/css/global.css +++ b/karmaworld/assets/css/global.css @@ -710,15 +710,14 @@ p.text a #thankyou { - border: 1px solid #8e8e8e; margin: 60px 20px; padding: 20px; } #thankyou p { - font-family: "MuseoSlab-500"; - font-size: 17px; + font-family: "MuseoSlab-300"; + font-size: 22px; margin: 0px; } diff --git a/karmaworld/assets/js/lightboxupload.js b/karmaworld/assets/js/lightboxupload.js index 37775c8..37ccad9 100644 --- a/karmaworld/assets/js/lightboxupload.js +++ b/karmaworld/assets/js/lightboxupload.js @@ -1,14 +1,10 @@ $(function(){ - // Show the 'add note' form - // first, instantiate the fileuploader on page load - // TODO: connect it to the '^ save' form submit - // Show the upload lightbox on upload button click // check if we arrived at this page planning on uploading a note if(window.location.hash) { - // Get the first hasgh, remove the # character + // Get the first hash, remove the # character var hash = window.location.hash.substring(1); if (hash === 'upload-note'){ $('#add-note-form').show(); @@ -17,6 +13,8 @@ $(function(){ } $('#add-note-btn').click(function(){ + // hide the thankyou message on add-another uploads + $('#thankyou-wrapper').hide(); // show the add note form // TODO: rewrite to .show the form with a slide transition $('#add-note-form').show(); @@ -26,6 +24,7 @@ $(function(){ $('#add-note-btn').hide(); }); + // Dismiss x click $(".icon-remove-circle").click(function() { $("#add-note-form").hide(); diff --git a/karmaworld/templates/courses/course_detail.html b/karmaworld/templates/courses/course_detail.html index 4ac79d7..04e050c 100644 --- a/karmaworld/templates/courses/course_detail.html +++ b/karmaworld/templates/courses/course_detail.html @@ -60,12 +60,12 @@ {% include 'partial/add_note.html' %} {% if request.GET.thankyou == '' %} -
-
+
+

Thank you for uploading - {{ request.GET.name }} + {{ request.GET.name }}. Share another or take a quick survey to help us make KarmaNotes even better.

-- 2.25.1