From 8fc036327054cf4b5d5a2f70e68be98456fe9884 Mon Sep 17 00:00:00 2001 From: Seth Woodworth Date: Fri, 12 Jul 2013 13:02:38 -0400 Subject: [PATCH] adding dropbox file-picker to new template and to the add_note partial --- karmaworld/assets/css/global.css | 7 ++++++ karmaworld/templates/base.html | 6 ++++- karmaworld/templates/partial/add_note.html | 25 ++++++++++++++++--- .../templates/partial/dropbox_support.html | 19 ++++++++++++++ 4 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 karmaworld/templates/partial/dropbox_support.html diff --git a/karmaworld/assets/css/global.css b/karmaworld/assets/css/global.css index a327042..9c47b80 100644 --- a/karmaworld/assets/css/global.css +++ b/karmaworld/assets/css/global.css @@ -785,7 +785,14 @@ legend margin-bottom:12px; } +/* Turning font awesome icons into buttons */ .awesome-action:hover { + /* For awesome icons with clickstates */ color: #f05a28; cursor: pointer; } + +#drpbx-btn { + color: #3d9ae8; + cursor: pointer; +} diff --git a/karmaworld/templates/base.html b/karmaworld/templates/base.html index 55ad24e..549b036 100644 --- a/karmaworld/templates/base.html +++ b/karmaworld/templates/base.html @@ -15,7 +15,7 @@ - + @@ -67,6 +67,10 @@ {% include 'footer.html' %} +{% block opentip %} + +{% endblock opentip %} + diff --git a/karmaworld/templates/partial/add_note.html b/karmaworld/templates/partial/add_note.html index c367448..134e39b 100644 --- a/karmaworld/templates/partial/add_note.html +++ b/karmaworld/templates/partial/add_note.html @@ -1,12 +1,12 @@ {% load url from future %} +{% include 'partial/opentip.html' %}
- -
+ {% csrf_token %}
@@ -16,10 +16,26 @@
-
-
+
+ +
+
+ +
+ + + +
+ +
@@ -51,4 +67,5 @@ + {% include 'partial/dropbox_support.html' %}
diff --git a/karmaworld/templates/partial/dropbox_support.html b/karmaworld/templates/partial/dropbox_support.html new file mode 100644 index 0000000..94e45f8 --- /dev/null +++ b/karmaworld/templates/partial/dropbox_support.html @@ -0,0 +1,19 @@ +{% comment %} + +{% endcomment %} + + + + -- 2.25.1