From: Charles Connell <charles@connells.org>
Date: Thu, 13 Mar 2014 04:46:12 +0000 (-0400)
Subject: File upload now pretty
X-Git-Tag: release-20150131~144^2~35
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=19a9f4ff3957b9c5a313fd1329f125fffe3431e7;p=oweals%2Fkarmaworld.git

File upload now pretty
---

diff --git a/karmaworld/apps/notes/models.py b/karmaworld/apps/notes/models.py
index 1e1fff9..c5d9973 100644
--- a/karmaworld/apps/notes/models.py
+++ b/karmaworld/apps/notes/models.py
@@ -109,7 +109,7 @@ class Document(models.Model):
                     'data-fp-multiple': 'true', 
                     'data-fp-folders': 'true',
                     'data-fp-button-class':
-                      'add-note-btn',
+                      'inline-button add-note-btn',
                     'data-fp-button-text': 'Add Notes',
                     'data-fp-extensions':
                       '.pdf,.doc,.docx,.txt,.html,.rtf,.odt,.png,.jpg,.jpeg,.ppt,.pptx',
diff --git a/karmaworld/assets/css/global.css b/karmaworld/assets/css/global.css
index 4093148..ee79996 100644
--- a/karmaworld/assets/css/global.css
+++ b/karmaworld/assets/css/global.css
@@ -51,3 +51,11 @@ label.inline-label
   display: inline;
 }
 
+button.inline-button {
+  background: grey;
+  color: white;
+  border: none;
+  padding: 5px;
+  border-radius: 0.3em;
+  display: inline;
+}
\ No newline at end of file
diff --git a/karmaworld/assets/css/home.css b/karmaworld/assets/css/home.css
index 42a7550..7a36eb2 100644
--- a/karmaworld/assets/css/home.css
+++ b/karmaworld/assets/css/home.css
@@ -8,15 +8,6 @@
   text-align: center;
 }
 
-button.add-course {
-  background: grey;
-  color: white;
-  border: none;
-  padding: 5px;
-  border-radius: 0.3em;
-  display: inline;
-}
-
 input.search-courses {
   width: 15em;
   display: inline;
diff --git a/karmaworld/assets/css/note_course_pages.css b/karmaworld/assets/css/note_course_pages.css
index 635508a..dfd11c5 100644
--- a/karmaworld/assets/css/note_course_pages.css
+++ b/karmaworld/assets/css/note_course_pages.css
@@ -27,15 +27,6 @@ span.course-header-school
   cursor: pointer;
 }
 
-.add-note-btn {
-  background: grey;
-  color: white;
-  border: none;
-  padding: 5px;
-  border-radius: 0.3em;
-  display: inline;
-}
-
 input.search-notes {
   width: 15em;
   display: inline;
@@ -61,9 +52,9 @@ select.note-sort {
   padding: 10px 0 0 0;
 }
 
-ul.socialaccount_providers li
+ul.socialaccount_providers li,
+ul#uploaded_files li
 {
   display: inline;
 }
 
-
diff --git a/karmaworld/templates/courses/course_list.html b/karmaworld/templates/courses/course_list.html
index ea32c20..c0b24cc 100644
--- a/karmaworld/templates/courses/course_list.html
+++ b/karmaworld/templates/courses/course_list.html
@@ -42,7 +42,7 @@
 
   <div id="course-search-bar" class="row">
     <div class="small-12 columns">
-      <button id="add-course-btn" class="add-course">Add a Course</button>
+      <button id="add-course-btn" class="inline-button">Add a Course</button>
       <input class="search-courses" type="text" placeholder="Search Courses" />
       <div id="course-sort-wrapper">
         Sort By
diff --git a/karmaworld/templates/partial/filepicker.html b/karmaworld/templates/partial/filepicker.html
index 68b5800..00424eb 100644
--- a/karmaworld/templates/partial/filepicker.html
+++ b/karmaworld/templates/partial/filepicker.html
@@ -6,7 +6,7 @@
     <div class="small-12 columns">
       <div id="forms_container">
       </div>
-      <div id="success" class="">
+      <div id="success" class="hide">
         <p>Thank you for sharing:</p>
         <ul id="uploaded_files">
         </ul>
@@ -17,10 +17,11 @@
             you can build a reputation by continuing to upload great notes.
             Refresh to share more notes.</p>
           <div class="socialaccount_ballot">
+            <p>Sign up with:</p>
             <ul class="socialaccount_providers">
               {% include "socialaccount/snippets/provider_list.html" with process="login" %}
+              <li><a href="{{ signup_url }}"> or a traditional account</a></li>
             </ul>
-            <a href="{{ signup_url }}">Sign up for a traditional account</a>
           </div>
         {% else %}
           <p>It will take a minute for your notes to appear. This page will refresh soon so you
@@ -31,7 +32,7 @@
       </div>
     </div>
 
-    <div id="form-template" class="row">
+    <div id="form-template" class="hide">
       <form class="inline-form" method="POST" action="{% url 'upload_post' %}">
         <div class="small-11 large-6 columns">
           <label for="id_name">Title of Note <small class="form">* Required</small></label>
@@ -54,15 +55,15 @@
           {% csrf_token %}
           <input type="text" class="csrf" value='{{ csrf_token }}'>
         </div>
-        <div class="show-for-medium-up columns large-1 end">
-          <i class="fa fa-times-circle awesome-action remove" id="icon-remove-sign"></i>
+        <div class="show-for-medium-up columns medium-1 large-1 end">
+          <i class="fa fa-times-circle fa-lg awesome-action remove" id="icon-remove-sign"></i>
         </div>
       </form>
     </div>
   </div>
   <div class="small-8 small-offset-3 columns large-2">
     <div id="save-btn" class="hide">
-      <i id="save-btn-icon" class="fa fa-save"></i> Save
+      <button class="inline-button"><i id="save-btn-icon" class="fa fa-save"></i> Save</button>
     </div>
   </div>
 
diff --git a/karmaworld/templates/socialaccount/snippets/provider_list.html b/karmaworld/templates/socialaccount/snippets/provider_list.html
index 4fd1ba8..1961983 100644
--- a/karmaworld/templates/socialaccount/snippets/provider_list.html
+++ b/karmaworld/templates/socialaccount/snippets/provider_list.html
@@ -7,13 +7,13 @@
   <a title="{{brand.name}}" 
      class="socialaccount_provider {{provider.id}} {{brand.id}}" 
      href="{% provider_login_url provider.id openid=brand.openid_url process=process %}"
-     ><img src="{{STATIC_URL}}img/{{brand.name|lower}}.png"></a>
+     ><button class="inline-button">{{ brand.name }}"></button></a>
 </li>
 {% endfor %}
 {% endif %}
 <li>
   <a title="{{provider.name}}" class="socialaccount_provider {{provider.id}}" 
-     href="{% provider_login_url provider.id process=process %}"><img src="{{STATIC_URL}}img/{{provider.name|lower}}.png"></a>
+     href="{% provider_login_url provider.id process=process %}"><button class="inline-button">{{ provider.name }}</button></a>
 </li>
 {% endfor %}