Merge branch 'samuel' into unstable

templates/add_corpus.html

@@ -12,7 +12,6 @@
 {% block content %}
 
 <div id="loading" style="position:absolute; top:50%; left:40%; width:80px; display: none;" >
-
     <img src="{% static "img/ajax-loader.gif" %}" alt="" />
 </div>
 
@@ -29,11 +28,5 @@
 </div>
 </div>
 
-<script>
-function showLoader(){
-  $('#loading').setStyle('display', 'block');
-  $('submit_btn').disabled = true;
-};
-</script>
 
 {% endblock %}

templates/add_corpus_as_p.html

@@ -24,5 +24,4 @@
 </form>
 </div>
 </div>
-
 {% endblock %}

templates/project.html

@@ -51,8 +51,7 @@
 		
 		{{ formResource.non_field_errors }}
 		{{ formResource.as_p}}
-		<input type="submit" class="btn" value="Add this corpus (zip file only)" />
-</form>
+		<input onclick='$("#semLoader").css("visibility", "visible"); $("#semLoader").show();' type="submit" name="submit" id="submit" class="btn" value="Add this corpus" /><div>
     </center>
 				</p>
 
@@ -65,7 +64,11 @@
         </div>
         </div>
 </div>
-<!-- Add jumbotron container for each type of corpus (presse, science etc.) --!>
+<!-- Add jumbotron container for each type of corpus (presse, science etc.) -->
+
+          <div id="semLoader" style="position:absolute; top:50%; left:40%; width:80px; visibility: hidden;">
+							<img src="{% static "js/libs/img2/loading-bar.gif" %}"></img>
+          </div>
 
 <div class="container">
 				{% if list_corpora  %}