diff options
Diffstat (limited to 'website')
| -rwxr-xr-x | website/templates/cfp.html | 46 |
1 files changed, 3 insertions, 43 deletions
diff --git a/website/templates/cfp.html b/website/templates/cfp.html index b8e28f2..0ac6379 100755 --- a/website/templates/cfp.html +++ b/website/templates/cfp.html @@ -65,56 +65,16 @@ </ul> <br/> {% if user.is_superuser %} - <center><a href="{% url 'website:view_abstracts' %}" class="btn btn-info">View Proposals</a> </center> + <center><a href="{% url 'website:view_abstracts' %}" class="button special">View Proposals</a> </center> {% else %} <center> - <a href="{% url 'website:view_abstracts' %}" class="btn btn-info">View Proposals</a> - <a href="{% url 'website:submitcfp' %}" class ="btn btn-info" role="button"> Submit paper </a> - <a href="{% url 'website:submitcfw' %}" class ="btn btn-info" role="button">Submit workshop </a> + <a href="{% url 'website:view_abstracts' %}" class="button special">View Proposals</a> </center> {% endif %} {% else %} <p align = "justify">We invite you to submit proposals for talks or workshops to be presented at SciPy 2017. The time duration for talks is 15 or 30 minutes and for workshops is 2 to 4 hours. There will be two parallel tracks for the workshops this year. One track is meant for beginners and the other is for advanced users. </p> <hr> -<<<<<<< HEAD - <span> - <h2><u>Login</u></h2> - </span> - <p>Login/Register to Submit a Proposal</p> - {% if invalid %} - <p style="color:red; font-size:15px;">* Invalid Username/Password</p> - {% endif %} - <!-- <div id = "my_form"> --> - <form action="" method="POST"> - {{ form.as_p }} - <button class="btn btn-info" 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="/2017/forgotpassword/">Forgot Password?</a> - {% csrf_token %} - </form> - <!-- </div> --> - <p>Or Sign in with: - <a href="{% url 'social:begin' 'google-oauth2' %}" class="btn btn-social-icon " style="color:#dd4b39;"><i class="icon-google-plus"></i></a> - <a href="{% url 'social:begin' 'facebook' %}?next={{ request.path }}" class=" btn btn-social-icon" style="color:#3b5998"><i class="icon-facebook"></i></a> - </p> - </li> - <!-- </div> --> - <!-- <div class="col-md-6" > --> - <li> - <span> - <h2><u>Important Dates</u></h2> - </span> - <ul> - <li>Call for proposals opens: <b>15 Sept. 2017</b></li> - <li>Last date for submission of proposals: <b>1st Nov. 2017</b></li> - <li>Announcement of selected proposals: <b>15 Nov. 2017</b></li> - </ul> - </li> - <!-- </div> --> - {% endif %} - </div> -======= <div class="row"> <div style="float:right;padding-left: 30px;"> <span><h2><u>Login</u></h2></span> @@ -148,10 +108,10 @@ </div> {% endif %} </div> ->>>>>>> 5c624c6831481d0701d673e46ae15fcfcef4152f {% endblock %} {% include 'footer.html' %} </body> </html> + |