Merge pull request #20 from FOSSEE/Home_page

/2016/ removed from links

4 files changed, 18 insertions, 19 deletions

diff --git a/scipy2016/settings.py b/scipy2016/settings.py
index 1c0ef19..9f24b41 100755
--- a/scipy2016/settings.py
+++ b/scipy2016/settings.py
@@ -148,7 +148,7 @@ USE_TZ = True
 STATIC_URL = '/static/'
 
 MEDIA_ROOT = os.path.join(BASE_DIR, 'uploads')
-MEDIA_URL = "/2016/downloads/"
+MEDIA_URL = "/downloads/"
 
 LOGIN_REDIRECT_URL = '/cfp'
 
diff --git a/scipy2016/urls.py b/scipy2016/urls.py
index 56c899b..5878a44 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'^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>.+)/$',
+    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>.+)/$',
         password_reset_confirm, {'template_name': 'register/password_reset_confirm.html'}, name='password_reset_confirm'),
-    url(r'^2016/password_reset/mail_sent/$', password_reset_done, {'template_name': 'register/password_reset_done.html'},
+    url(r'^password_reset/mail_sent/$', password_reset_done, {'template_name': 'register/password_reset_done.html'},
         name='password_reset_done'),
-    url(r'^2016/password_reset/complete/$', password_reset_complete, {'template_name': 'register/password_reset_complete.html'},
+    url(r'^password_reset/complete/$', password_reset_complete, {'template_name': 'register/password_reset_complete.html'},
         name='password_reset_complete'),
-    url(r'^2016/changepassword/$', password_change, {'template_name': 'register/password_change_form.html'},
+    url(r'^changepassword/$', password_change, {'template_name': 'register/password_change_form.html'},
         name='password_change'),
-    url(r'^2016/password_change/done/$', password_change_done, {'template_name': 'register/password_change_done.html'},
+    url(r'^password_change/done/$', password_change_done, {'template_name': 'register/password_change_done.html'},
         name='password_change_done'),
 )
diff --git a/website/templates/cfp.html b/website/templates/cfp.html
index 8886937..e0eb537 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="/2016/forgotpassword/">Forgot Password?</a>
+                        <a  href="/forgotpassword/">Forgot Password?</a>
                         {% csrf_token %}
                     </form>
                     <!-- </div> -->
diff --git a/website/templates/view-abstracts.html b/website/templates/view-abstracts.html
index 4933244..8979363 100755
--- a/website/templates/view-abstracts.html
+++ b/website/templates/view-abstracts.html
@@ -61,13 +61,11 @@ You have not submitted any proposal. To submit proposal click <a href="{% url 'w
           <colgroup>
                 {% if user.is_superuser  %}
         <col width="10%" />
-        <col width="30%" />
         <col width="20%" />
-        <col width="60%" />
-        <!-- <col width="10%" /> -->
-        <col width="10%" />
-        <col width="10%" />
         <col width="20%" />
+        <col width="20%" />
+        <col width="40%" />
+        <col width="10%" />
         {% else %}
         <col width="20%" />
         <col width="70%" />
@@ -88,7 +86,9 @@ You have not submitted any proposal. To submit proposal click <a href="{% url 'w
       {% if not user.is_superuser %}
     <th> View
       {% endif %}
+      {% if user.is_superuser %}
     <th> Ratings
+      {% endif %}
     <th> Status
     {% for proposal in proposals %}
     <tr>
@@ -107,13 +107,12 @@ 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> {% for rating in ratings %}
-        {{rating.rating}}
+{% if user.is_superuser %}
+      <td> {% for rating in proposal.ratings_set.all %}
+        {{ rating.rating}} by {{rating.user}}<br>
         {% endfor %}
-
-        <!-- <center> {{ proposal.comments_set.count }} </center> --></td>
-
+        </td>
+{% endif %}
       <td>
          {% if proposal.status = 'Accepted' %}
          <h5 style="color:green;">{{proposal.status}}</h5>