New FB and google plus links added

2 files changed, 11 insertions, 8 deletions

diff --git a/website/templates/base.html b/website/templates/base.html
index a9ac680..e196699 100755
--- a/website/templates/base.html
+++ b/website/templates/base.html
@@ -25,7 +25,7 @@
 						<p style="color:#484848; font-weight:700; font-size:28px;" >DECEMBER 10 & 11</p><br><br>

             			

             	 <a href="#attend" class="button special" style="width : 220px;" >Register</a></center>

-            	 <a href="{% url 'website:cfp' %}" class="button special"  style="width : 220px;">Submit</a></center>

+            	 <a href="{% url 'website:cfp' %}" class="button special"  style="width : 220px;">Submit</a>

 					</header>

 {% endblock %}

 

@@ -246,7 +246,7 @@
 

 <p>Do not insult or put down attendees or engage in any action that violates the open, welcoming and sharing spirit of the conference. Be kind and sensitive to the people around you when you are attending the conference, and avoid any kind of offensive or degrading behavior.</p>

 

-<p>If a participant engages in behavior that violates this code of conduct, the conference organizers may take any action they deem appropriate, including warning the offender or expulsion from the conference with no refund.</p>

+<p><b>If a participant engages in behavior that violates this code of conduct, the conference organizers may take any action they deem appropriate, including warning the offender or expulsion from the conference with no refund.</b></p>

 

 <p>Thank you for helping to make SciPy India a welcoming, friendly event for all.</p>

 

@@ -423,8 +423,8 @@
 							</dl>

 							<ul class="icons">

 								<li><a style="color:white;" target="_blank" href="https://twitter.com/scipyindia" class="icon-twitter alt"><span class="label"></span></a></li>

-								<li><a style="color:white;" target="_blank" href="https://www.facebook.com/scipydotin" class="icon-facebook alt"><span class="label"></span></a></li>

-								<li><a style="color:white;" target="_blank" href="https://plus.google.com/+ScipyIndia/posts" class="icon-google-plus alt"><span class="label"></span></a></li>

+								<li><a style="color:white;" target="_blank" href="https://www.facebook.com/scipyindia2016/" class="icon-facebook alt"><span class="label"></span></a></li>

+								<li><a style="color:white;" target="_blank" href="https://plus.google.com/103605487308376724082" class="icon-google-plus alt"><span class="label"></span></a></li>

 

 							</ul>

 							Visit SciPy.in/

diff --git a/website/templates/view-abstracts.html b/website/templates/view-abstracts.html
index 619657d..f40ca76 100755
--- a/website/templates/view-abstracts.html
+++ b/website/templates/view-abstracts.html
@@ -54,7 +54,7 @@ You have not submitted any proposal. To submit proposal click <a href="{% url 'w
 {% else %}
 
 
-   <form action="{% url 'website:status_change' %}" method="post" onsubmit="return confirm('Sure?');"> {% csrf_token %}
+   <form action="{% url 'website:status_change' %}" method="post" onsubmit="return confirm('Are You Sure?');"> {% csrf_token %}
 
 
     <table id = "myTable"  class="tablesorter">
@@ -93,9 +93,12 @@ You have not submitted any proposal. To submit proposal click <a href="{% url 'w
     <th> Status
     {% for proposal in proposals %}
     <tr>
-        {% if user.is_superuser  %}
-      <td><center> <input type = "checkbox" name="delete_proposal" value = {{proposal.id}}></input></center></td>
-          
+        {% if user.is_superuser %}
+         <td>
+          {% if proposal.status = 'Rejected' %}
+          {% else %}
+          <center> <input type = "checkbox" name="delete_proposal" value = {{proposal.id}}></input></center></td>
+          {% endif %}
         <td>
             {{ proposal.user.get_full_name}}
         </td>