diff options
author | hardythe1 | 2014-06-17 12:58:07 +0530 |
---|---|---|
committer | hardythe1 | 2014-06-17 12:58:07 +0530 |
commit | 634c19bb9308e328802fd1c85b08aa6dcea2ac7a (patch) | |
tree | 9439d30c0ec9512556714a24d543730246c03016 /tbc/templates | |
parent | e022b894fef6c3d82d7cd8b3f3ee69df606b0e2e (diff) | |
parent | 81b8051c334f2da986cb588f9c496626f89fbb88 (diff) | |
download | Python-TBC-Interface-634c19bb9308e328802fd1c85b08aa6dcea2ac7a.tar.gz Python-TBC-Interface-634c19bb9308e328802fd1c85b08aa6dcea2ac7a.tar.bz2 Python-TBC-Interface-634c19bb9308e328802fd1c85b08aa6dcea2ac7a.zip |
resolving conflict
Diffstat (limited to 'tbc/templates')
-rw-r--r-- | tbc/templates/tbc/book-review.html | 14 | ||||
-rw-r--r-- | tbc/templates/tbc/upload-content.html | 4 |
2 files changed, 14 insertions, 4 deletions
diff --git a/tbc/templates/tbc/book-review.html b/tbc/templates/tbc/book-review.html index 774998c..d7270b4 100644 --- a/tbc/templates/tbc/book-review.html +++ b/tbc/templates/tbc/book-review.html @@ -2,10 +2,20 @@ {% load static %} {% block content %} {% if book_review %} -<p>Book has been approved !</p> +<center> + <div class="alert" style="width:230px;height:23px;"> + <a class="close" data-dismiss="alert" href="#">×</a> + <p>Book has been approved !</p> + </div> + </center> {% endif %} {% if mail_notify %} -<p>Successfully notified the required changes !</p> +<center> + <div class="alert" style="width:230px;height:23px;"> + <a class="close" data-dismiss="alert" href="#">×</a> + <p>Successfully notified the required changes !</p> + </div> + </center> {% endif %} <center><h3>Books to be reviewed</h3></center> <ol> diff --git a/tbc/templates/tbc/upload-content.html b/tbc/templates/tbc/upload-content.html index 01bb584..5f6025c 100644 --- a/tbc/templates/tbc/upload-content.html +++ b/tbc/templates/tbc/upload-content.html @@ -47,7 +47,7 @@ function validate_content() <div id="content-wrap" style="max-width:600px;"> <p>Upload chapters as individual IPython notebooks. Please do not use spaces to name your Ipython Notebook files. For ex. use "chapter1.ipynb instead of chapter 1.ipynb"</p> - <form action="/upload-content/{{ curr_book.id }}" method=POST enctype="multipart/form-data"> + <form action="/upload-content/{{ curr_book.id }}" method=POST enctype="multipart/form-data" onSubmit="return validate_content();"> {% csrf_token %} {% for i in no_notebooks %} <input type=text id=chapter{{i}} name=chapter{{i}} placeholder="Chapter {{ forloop.counter }} name"> @@ -60,7 +60,7 @@ function validate_content() <input type=text id=caption{{i}} name=caption{{i}} placeholder="Caption {{ forloop.counter }}"> <input type=file id=image{{i}} name=image{{i}}> {% endfor %} - <center><input class="btn btn-primary" type=submit value=submit onClick="return validate_content();"></center> + <center><input class="btn btn-primary" type=submit value=submit></center> </form> </div> {% endblock %} |