addressing @ElDeveloper comments

Author: antgonza

qiita_db/study.py

@@ -360,13 +360,13 @@ def delete(cls, id_):
         Raises
         ------
         QiitaDBError
-            If the sample_(_id) table exists == a sample template exists
+            If the sample_(id_) table exists means a sample template exists
         """
         cls._check_subclass()
 
         conn_handler = SQLConnectionHandler()
         if exists_table('sample_%d' % id_, conn_handler):
-            raise QiitaDBError('Study "%s" can not be erased because it has a '
+            raise QiitaDBError('Study "%s" cannot be erased because it has a '
                                'sample template' % cls(id_).title)
 
         queue = "delete_study_%d" % id_

qiita_pet/templates/study_description.html

@@ -184,24 +184,34 @@
   form.submit();
 }
 
+function validate_delete_study_text() {
+  if ($("#study-alias").val() == "{{study_alias}}") {
+    $('#delete-study-button').prop('disabled', false);
+  } else {
+    $('#delete-study-button').prop('disabled', true);
+  }
+}
+
 function delete_study() {
   if ($("#study-alias").val() != "{{study_alias}}") {
     alert("The added name doesn't match the study alias");
     return false;
   }
-  var form = $("<form>")
-  .attr("action", window.location.href)
-  .attr("method", "post")
-  .append($("<input>")
-  .attr("type", "hidden")
-  .attr("name", "study_id")
-  .attr("value", {{study.id}}))
-  .append($("<input>")
-  .attr("type", "hidden")
-  .attr("name", "action")
-  .attr("value", "delete_study"));
-  $("body").append(form);
-  form.submit();
+  if (confirm('Are you sure you want to delete "{{study_title}}"?')) {
+    var form = $("<form>")
+    .attr("action", window.location.href)
+    .attr("method", "post")
+    .append($("<input>")
+    .attr("type", "hidden")
+    .attr("name", "study_id")
+    .attr("value", {{study.id}}))
+    .append($("<input>")
+    .attr("type", "hidden")
+    .attr("name", "action")
+    .attr("value", "delete_study"));
+    $("body").append(form);
+    form.submit();
+  }
 }
 
 function delete_sample_template() {
@@ -568,7 +578,7 @@ <h2><i>{{study_alias}}</i></h2>
         <a class="btn btn-default glyphicon glyphicon-edit" href="/study/edit/{{study.id}}" title="Edit the study information" style="margin:5px; word-spacing: -10px;"> Edit</a>
       {% end %}
       <a href="/study/upload/{{study.id}}" class="btn btn-default glyphicon glyphicon-upload" title="Upload study files" style="margin:5px; word-spacing: -10px;"> Upload</a>
-      <a class="btn btn-danger glyphicon glyphicon-trash" data-toggle="modal" data-target="#delete-study"></a>
+      <a class="btn btn-danger glyphicon glyphicon-trash" style="display: inline-block;" data-toggle="modal" data-target="#delete-study"> Delete-study</a>
     </td>
   </tr>
 </table>
@@ -606,13 +616,16 @@ <h2><i>{{study_alias}}</i></h2>
   <div class="modal-dialog modal-sm">
     <div class="modal-content">
       <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         <h3>Deleting:<br/></h3><h4>{{study_title}}</h4>
-        You will only be able to delete a study that has no data associated with it.
       </div>
       <div class="modal-body">
+        You will only be able to delete a study that has no data associated with it.
+      </div>
+      <div class="modal-footer">
         To continue you need to write the alias name of the study:
-          <input type="text" name="study-alias" id="study-alias">
-          <a class="btn btn-danger glyphicon glyphicon-trash" onclick="delete_study()"></a>
+        <input type="text" name="study-alias" id="study-alias" onkeyup="validate_delete_study_text();">
+        <button class="btn btn-danger glyphicon glyphicon-trash" onclick="delete_study();" id="delete-study-button" disabled></button>
       </div>
     </div>
   </div>