From: Seth Woodworth <seth@sethish.com>
Date: Thu, 21 Mar 2013 21:18:56 +0000 (-0400)
Subject: Merge branch 'master' of github.com:FinalsClub/karmaworld
X-Git-Tag: release-20150131~474^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=81bb408186d3dc056ebcb5811bb58570f1a4e6ec;p=oweals%2Fkarmaworld.git

Merge branch 'master' of github.com:FinalsClub/karmaworld
---

81bb408186d3dc056ebcb5811bb58570f1a4e6ec
diff --cc karmaworld/templates/partial/add_note.html
index f9a2ecd,202297a..86d182c
--- a/karmaworld/templates/partial/add_note.html
+++ b/karmaworld/templates/partial/add_note.html
@@@ -5,12 -5,11 +5,12 @@@
      //var csrf_token = "{{ csrf_token }}";
    </script>
  
-   <div id=file-uploader style="display:none"></div>
+ 
    <form id=add-note method="POST">
      {% csrf_token %}
 +
      <div class="row">
-       <div class="four columns offset-by-one">
+       <div class="four columns offset-by-one upload-status" style="display:none">
          <legend><span id=add-note-status>Uploading</span> <span id=filename>note</span>...</legend>
          <div class=progress> <div id="progress-fill"></div> </div>
        </div>