diff options
| -rwxr-xr-x | scipy2016/settings.py | 18 | ||||
| -rwxr-xr-x | scipy2016/urls.py | 12 | ||||
| -rwxr-xr-x | website/forms.py | 4 | ||||
| -rwxr-xr-x | website/templates/base.html | 4 | ||||
| -rwxr-xr-x | website/templates/cfp.html | 2 | ||||
| -rwxr-xr-x | website/templates/comment-abstract.html | 2 | ||||
| -rwxr-xr-x | website/templates/register/password_reset_form.html | 3 | ||||
| -rwxr-xr-x | website/templates/submit-cfw.html | 2 | ||||
| -rwxr-xr-x | website/templates/view-abstracts.html | 5 | ||||
| -rwxr-xr-x | website/views.py | 10 |
10 files changed, 32 insertions, 30 deletions
diff --git a/scipy2016/settings.py b/scipy2016/settings.py index 01cedf0..1c0ef19 100755 --- a/scipy2016/settings.py +++ b/scipy2016/settings.py @@ -133,7 +133,7 @@ RECAPTCHA_PRIVATE_KEY = RECAPTCHA_PRIVATE LANGUAGE_CODE = 'en-us' -TIME_ZONE = 'UTC' +TIME_ZONE = 'Asia/Calcutta' USE_I18N = True @@ -148,16 +148,16 @@ USE_TZ = True STATIC_URL = '/static/' MEDIA_ROOT = os.path.join(BASE_DIR, 'uploads') -MEDIA_URL = "/downloads/" +MEDIA_URL = "/2016/downloads/" LOGIN_REDIRECT_URL = '/cfp' # smtp -# ACCOUNT_ACTIVATION_DAYS = 7 -# EMAIL_HOST = 'localhost' -# EMAIL_PORT = 1025 -# EMAIL_HOST_USER = '' -# EMAIL_HOST_PASSWORD = '' -# EMAIL_USE_TLS = False -# DEFAULT_FROM_EMAIL = 'komal@gmail.com'
\ No newline at end of file +ACCOUNT_ACTIVATION_DAYS = 7 +EMAIL_HOST = 'localhost' +EMAIL_PORT = 1025 +EMAIL_HOST_USER = '' +EMAIL_HOST_PASSWORD = '' +EMAIL_USE_TLS = False +DEFAULT_FROM_EMAIL = 'komal@gmail.com'
\ No newline at end of file diff --git a/scipy2016/urls.py b/scipy2016/urls.py index 5878a44..56c899b 100755 --- a/scipy2016/urls.py +++ b/scipy2016/urls.py @@ -14,15 +14,15 @@ urlpatterns = patterns('', url(r'^', include('social.apps.django_app.urls', namespace='social')), url(r'^', include('django.contrib.auth.urls', namespace='auth')), - url(r'^forgotpassword/$', password_reset, {'template_name': 'register/password_reset_form.html'}, name="password_reset"), - url(r'^password_reset/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$', + url(r'^2016/forgotpassword/$', password_reset, {'template_name': 'register/password_reset_form.html'}, name="password_reset"), + url(r'^2016/password_reset/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$', password_reset_confirm, {'template_name': 'register/password_reset_confirm.html'}, name='password_reset_confirm'), - url(r'^password_reset/mail_sent/$', password_reset_done, {'template_name': 'register/password_reset_done.html'}, + url(r'^2016/password_reset/mail_sent/$', password_reset_done, {'template_name': 'register/password_reset_done.html'}, name='password_reset_done'), - url(r'^password_reset/complete/$', password_reset_complete, {'template_name': 'register/password_reset_complete.html'}, + url(r'^2016/password_reset/complete/$', password_reset_complete, {'template_name': 'register/password_reset_complete.html'}, name='password_reset_complete'), - url(r'^changepassword/$', password_change, {'template_name': 'register/password_change_form.html'}, + url(r'^2016/changepassword/$', password_change, {'template_name': 'register/password_change_form.html'}, name='password_change'), - url(r'^password_change/done/$', password_change_done, {'template_name': 'register/password_change_done.html'}, + url(r'^2016/password_change/done/$', password_change_done, {'template_name': 'register/password_change_done.html'}, name='password_change_done'), ) diff --git a/website/forms.py b/website/forms.py index 4ea983e..180fead 100755 --- a/website/forms.py +++ b/website/forms.py @@ -149,7 +149,7 @@ class WorkshopForm(forms.ModelForm): duration = forms.ChoiceField(choices=ws_duration, label = 'Duration (Hrs.)') - tags = forms.ChoiceField(choices=MY_CHOICES) + tags = forms.ChoiceField(choices=MY_CHOICES, label = 'Lavel') class Meta: model = Proposal @@ -203,7 +203,7 @@ class UserRegisterForm(UserCreationForm): password2 = forms.CharField(widget=forms.PasswordInput(attrs={'placeholder': 'Confirm Password'}), required = True, error_messages = {'required':'Password Confirm field required.'}, - label = 'RePassword' + label = 'Re-enter Password' ) def clean_first_name(self): diff --git a/website/templates/base.html b/website/templates/base.html index fd20174..fb3d745 100755 --- a/website/templates/base.html +++ b/website/templates/base.html @@ -428,7 +428,7 @@ </ul>
Visit SciPy.in/
- <a style="color:white;" href="http://scipy.in/2009">2009</a>/
+ <a style="color:white;" target="_blank" href="http://scipy.in/2009">2009</a>/
<a style="color:white;" target="_blank" href="http://scipy.in/scipyin/2010/">2010</a>/
<a style="color:white;" target="_blank" href="http://scipy.in/scipyin/2011/">2011</a>/
<a style="color:white;" target="_blank" href="http://scipy.in/2012">2012</a>/
@@ -441,7 +441,7 @@ <center><img src="{% static 'img/fossee.png' %}" width=100 height=40>
<a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/"></a>
<img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png" /></center>
- <center>This work is licensed under a <a href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>.<center>
+ <center>This work is licensed under a <a target="_blank" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>.<center>
<br>
</div>
diff --git a/website/templates/cfp.html b/website/templates/cfp.html index e0eb537..8886937 100755 --- a/website/templates/cfp.html +++ b/website/templates/cfp.html @@ -101,7 +101,7 @@ {{ form.as_p }} <button class="button special" style="background:#D44727" name ="login"type="submit">Login</button><br><br> <a style="padding-right : 20px;" href="{% url 'website:userregister' %}" class="btn btn btn-primary">Create an Account</a> - <a href="/forgotpassword/">Forgot Password?</a> + <a href="/2016/forgotpassword/">Forgot Password?</a> {% csrf_token %} </form> <!-- </div> --> diff --git a/website/templates/comment-abstract.html b/website/templates/comment-abstract.html index 3bb6824..eb540f7 100755 --- a/website/templates/comment-abstract.html +++ b/website/templates/comment-abstract.html @@ -89,7 +89,7 @@ {% for rate in rates %} <div> {{rate.rating}}/10 - by {{ rate.user.first_name }} {{ rate.user.last_name }} + by - {{ rate.user }} </div> {% endfor %} diff --git a/website/templates/register/password_reset_form.html b/website/templates/register/password_reset_form.html index d2ac4f8..3075735 100755 --- a/website/templates/register/password_reset_form.html +++ b/website/templates/register/password_reset_form.html @@ -50,7 +50,8 @@ Kindly enter your email ID used for registration. The password reset link will b <form action="" method="post"> {% csrf_token %} {{ form.email.errors }} - <p><label for="id_email">E-mail address:</label> {{ form.email }} <input type="submit" value="Reset password" /></p> + <p><label for="id_email">E-mail address:</label> {{ form.email }} + <br/><input type="submit" class ="button special" value="Reset password" /></p> <!-- <button class="btn btn-sm btn-primary" type="submit">Request</button> <a class="btn btn-sm " href="{{URL_ROOT}}/accounts/login/">Cancel</a> --> diff --git a/website/templates/submit-cfw.html b/website/templates/submit-cfw.html index f5dbc77..cae6d34 100755 --- a/website/templates/submit-cfw.html +++ b/website/templates/submit-cfw.html @@ -51,7 +51,7 @@ <div id="wrapper"> <div id="main"> <section id="content" class="main"> -{% if proposals_w > 1 %} You have exceeded the abstract submission limit. +{% if proposals_w > 1 %} You have exceeded the workshop proposal submission limit. You may view your submitted proposals by clicking <a href="{% url 'website:view_abstracts' %}" class="btn "> here</a> </div> </div> diff --git a/website/templates/view-abstracts.html b/website/templates/view-abstracts.html index c1f6968..4933244 100755 --- a/website/templates/view-abstracts.html +++ b/website/templates/view-abstracts.html @@ -107,7 +107,10 @@ You have not submitted any proposal. To submit proposal click <a href="{% url 'w <td style="white-space: nowrap; text-overflow:ellipsis; overflow: hidden; max-width:.5px;"> {{proposal.title}}</td> <td ><a href="{% url 'website:abstract_details' proposal.id %}">View</a> </td> {% endif %} - <td>{{proposal.rating}} + + <td> {% for rating in ratings %} + {{rating.rating}} + {% endfor %} <!-- <center> {{ proposal.comments_set.count }} </center> --></td> diff --git a/website/views.py b/website/views.py index 276f70e..b516fad 100755 --- a/website/views.py +++ b/website/views.py @@ -241,17 +241,15 @@ def view_abstracts(request): count_list =[] if user.is_authenticated(): if user.is_superuser : - proposals = Proposal.objects.all() + proposals = Proposal.objects.all().order_by('status') + ratings = Ratings.objects.all() + context['ratings'] = ratings context['proposals'] = proposals - for proposal in proposals: - count = Comments.objects.filter(proposal = proposal).count() - count_list.append(count) - context['counts'] = count_list context['user'] = user return render(request, 'view-abstracts.html', context) elif user is not None: if Proposal.objects.filter(user = user).exists : - proposals = Proposal.objects.filter(user = user) + proposals = Proposal.objects.filter(user = user).order_by('status') context['counts'] = count_list context['proposals'] = proposals context['user'] = user |