From 7294076a0b0b47a29d5148b56e0be02c6f17e986 Mon Sep 17 00:00:00 2001
From: hardythe1
Date: Tue, 17 Jun 2014 12:33:40 +0530
Subject: fixing a minor issue in book approval view & in uploading the content
page
---
tbc/templates/tbc/book-review.html | 14 ++++++++++++--
tbc/templates/tbc/upload-content.html | 4 ++--
tbc/urls.py | 2 +-
tbc/views.py | 29 +++++------------------------
4 files changed, 20 insertions(+), 29 deletions(-)
(limited to 'tbc')
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 %}
diff --git a/tbc/urls.py b/tbc/urls.py
index 7ee91aa..0aa0b3c 100644
--- a/tbc/urls.py
+++ b/tbc/urls.py
@@ -2,7 +2,7 @@ from django.conf.urls import patterns, include, url
urlpatterns = patterns('',
- url(r'^$', 'tbc.views.TemporarilyUnavailable', name='TemporarilyUnavailable'),
+ url(r'^$', 'tbc.views.Home', name='Home'),
url(r'^internship-forms/$', 'tbc.views.InternshipForms', name='InternshipForms'),
url(r'^about-pythontbc/$', 'tbc.views.AboutPytbc', name='AboutPytbc'),
url(r'^register/$', 'tbc.views.UserRegister', name='UserRegister'),
diff --git a/tbc/views.py b/tbc/views.py
index 4e1da5e..0a38ea1 100755
--- a/tbc/views.py
+++ b/tbc/views.py
@@ -4,7 +4,6 @@ from django.core.context_processors import csrf
from django.contrib.auth import authenticate, login, logout
from models import *
from tbc.forms import *
-from local import *
import os
import zipfile
import StringIO
@@ -66,7 +65,6 @@ def TemporarilyUnavailable(request):
def Home(request):
context = {}
- return render_to_response('tbc/unavailable.html', context)
images = []
if request.user.is_anonymous():
context['anonymous'] = True
@@ -101,7 +99,6 @@ def Home(request):
def UserLogin(request):
context = {}
- return render_to_response('tbc/unavailable.html', context)
context.update(csrf(request))
if 'require_login' in request.GET:
context['require_login'] = True
@@ -142,7 +139,6 @@ def UserLogin(request):
def UserRegister(request):
context = {}
- return render_to_response('tbc/unavailable.html', context)
if request.method == 'POST':
form = UserRegisterForm(request.POST)
if form.is_valid():
@@ -163,7 +159,6 @@ def UserRegister(request):
def UserProfile(request):
context = {}
- return render_to_response('tbc/unavailable.html', context)
user = request.user
if user.is_authenticated():
if request.method == 'POST':
@@ -192,7 +187,6 @@ def UserProfile(request):
def UserLogout(request):
context = {}
- return render_to_response('tbc/unavailable.html', context)
user = request.user
if user.is_authenticated() and user.is_active:
logout(request)
@@ -201,7 +195,6 @@ def UserLogout(request):
def ForgotPassword(request):
context = {}
- return render_to_response('tbc/unavailable.html', context)
user_emails = []
context.update(csrf(request))
if request.user.is_anonymous():
@@ -239,7 +232,6 @@ def ForgotPassword(request):
def UpdatePassword(request):
context = {}
- return render_to_response('tbc/unavailable.html', context)
user = request.user
context.update(csrf(request))
if user.is_authenticated():
@@ -277,7 +269,6 @@ def UpdatePassword(request):
def SubmitBook(request):
context = {}
- return render_to_response('tbc/unavailable.html', context)
curr_user = request.user
if request.method == 'POST':
form = BookForm(request.POST)
@@ -306,7 +297,6 @@ def SubmitBook(request):
def UpdateBook(request):
context = {}
- return render_to_response('tbc/unavailable.html', context)
current_user = request.user
user_profile = Profile.objects.get(user=current_user)
try:
@@ -348,7 +338,6 @@ def UpdateBook(request):
def ContentUpload(request, book_id=None):
context = {}
- return render_to_response('tbc/unavailable.html', context)
user = request.user
curr_book = Book.objects.get(id=book_id)
if request.method == 'POST':
@@ -388,7 +377,6 @@ def ContentUpload(request, book_id=None):
def UpdateContent(request, book_id=None):
context = {}
- return render_to_response('tbc/unavailable.html', context)
user = request.user
current_book = Book.objects.get(id=book_id)
chapters_to_update = Chapters.objects.filter(book=current_book)
@@ -458,7 +446,6 @@ def GetZip(request, book_id=None):
def BookDetails(request, book_id=None):
context = {}
- return render_to_response('tbc/unavailable.html', context)
if request.user.is_anonymous():
context['anonymous'] = True
else:
@@ -477,7 +464,6 @@ def BookDetails(request, book_id=None):
def BookReview(request, book_id=None):
context = {}
- return render_to_response('tbc/unavailable.html', context)
if is_reviewer(request.user):
if book_id:
book = Book.objects.get(id=book_id)
@@ -505,7 +491,6 @@ def BookReview(request, book_id=None):
def ApproveBook(request, book_id=None):
context = {}
- return render_to_response('tbc/unavailable.html', context)
user = request.user
if is_reviewer(request.user):
if request.method == 'POST' and request.POST['approve_notify'] == "approve":
@@ -513,13 +498,14 @@ def ApproveBook(request, book_id=None):
book.approved = True
book.save()
file_path = os.path.abspath(os.path.dirname(__file__))
- zip_path = "/".join(file_path.split("/")[1:-2])
- zip_path = "/"+zip_path+"/Python-Textbook-Companions/"
+ copy_path = "/".join(file_path.split("/")[1:-2])
+ copy_path = "/"+copy_path+"/Python-Textbook-Companions/"
file_path = file_path+"/static/uploads/"
directory = file_path+book.contributor.user.first_name
os.chmod(directory, 0777)
os.chdir(directory)
- fp = open(book.title+"/README.txt", 'w')
+ book_title = book.title.replace(" ", "_")
+ fp = open(book_title+"/README.txt", 'w')
fp.write("Contributed By: "+book.contributor.user.first_name+" "+book.contributor.user.last_name+"\n")
fp.write("Course: "+book.contributor.course+"\n")
fp.write("College/Institute/Organization: "+book.contributor.insti_org+"\n")
@@ -531,7 +517,7 @@ def ApproveBook(request, book_id=None):
fp.write("Isbn: "+book.isbn+"\n")
fp.write("Edition: "+book.edition)
fp.close()
- x = shutil.copytree(book.title, zip_path+book.title)
+ x = shutil.copytree(book_title, copy_path+book_title)
subject = "Python-TBC: Book Completion"
message = "Hi "+book.contributor.user.first_name+",\n"+\
"Congratulations !\n"+\
@@ -558,7 +544,6 @@ def ApproveBook(request, book_id=None):
def NotifyChanges(request, book_id=None):
context = {}
- return render_to_response('tbc/unavailable.html', context)
if is_reviewer(request.user):
book = Book.objects.get(id=book_id)
if request.method == 'POST':
@@ -583,7 +568,6 @@ def NotifyChanges(request, book_id=None):
def BrowseBooks(request):
context = {}
- return render_to_response('tbc/unavailable.html', context)
category = None
images = []
book_images = []
@@ -616,7 +600,6 @@ def BrowseBooks(request):
def ConvertNotebook(request, notebook_path=None):
- return render_to_response('tbc/unavailable.html', context)
path = os.path.abspath(os.path.dirname(__file__))
path = path+"/static/uploads/"
path = path+notebook_path
@@ -638,7 +621,6 @@ def ConvertNotebook(request, notebook_path=None):
def CompletedBooks(request):
context = {}
- return render_to_response('tbc/unavailable.html', context)
images = []
if request.user.is_anonymous():
context['anonymous'] = True
@@ -652,7 +634,6 @@ def CompletedBooks(request):
def BooksUnderProgress(request):
context = {}
- return render_to_response('tbc/unavailable.html', context)
images = []
if request.user.is_anonymous():
context['anonymous'] = True
--
cgit