summaryrefslogtreecommitdiff
path: root/website/templates
diff options
context:
space:
mode:
authorkomalsheth2862016-09-29 11:04:10 +0530
committerkomalsheth2862016-09-29 11:09:53 +0530
commit47d34d8c99817aa5c45cb13658aae33afe1fa803 (patch)
treec9a77634999b6b1e811e69082910884a035da9ab /website/templates
parentc986e3a0ea056b4d745f56b868ee5641dad63794 (diff)
downloadSciPy2016-47d34d8c99817aa5c45cb13658aae33afe1fa803.tar.gz
SciPy2016-47d34d8c99817aa5c45cb13658aae33afe1fa803.tar.bz2
SciPy2016-47d34d8c99817aa5c45cb13658aae33afe1fa803.zip
Code of Conduct
Diffstat (limited to 'website/templates')
-rwxr-xr-xwebsite/templates/base.html15
-rwxr-xr-xwebsite/templates/cfp.html8
-rw-r--r--website/templates/edit-proposal.html71
-rwxr-xr-xwebsite/templates/submit-cfp.html3
-rwxr-xr-xwebsite/templates/view-abstracts.html21
5 files changed, 99 insertions, 19 deletions
diff --git a/website/templates/base.html b/website/templates/base.html
index a6b0988..4d1abfc 100755
--- a/website/templates/base.html
+++ b/website/templates/base.html
@@ -24,8 +24,8 @@
<h1 >SciPy India 2016</h1>
<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;" >Attend</a></center>
- <a href="{% url 'website:cfp' %}" class="button special" style="width : 220px;">Call for Proposal</a></center>
+ <a href="#attend" class="button special" style="width : 220px;" >Register</a></center>
+ <a href="{% url 'website:cfp' %}" class="button special" style="width : 220px;">Submit Proposal</a></center>
</header>
{% endblock %}
@@ -42,8 +42,8 @@
<li> <a href="#header" class="smoothScroll">Home</a></li>
<li> <a href="#about" class="smoothScroll">About</a></li>
<li> <a href="#speakers" class="smoothScroll">Speakers</a></li>
- <li> <a href="#attend" class="smoothScroll">Attend</a></li>
- <li> <a href="{% url 'website:cfp' %}">Call for Proposal</a></li>
+ <li> <a href="#attend" class="smoothScroll">Register</a></li>
+ <li> <a href="{% url 'website:cfp' %}">Submit Proposal</a></li>
<li> <a href="#schedule" class="smoothScroll">Schedule</a></li>
<li> <a href="#venue" class="smoothScroll">Venue</a></li>
<li> <a href="#sponsors" class="smoothScroll">Sponsors</a></li>
@@ -52,7 +52,7 @@
<li><a href="{% url 'auth:logout' %}?next=/2016/cfp">Logout</a></li>
</ul>
{% else %}
- <li><a href="{% url 'website:cfp' %}" >Login</a></li>
+ <li><a href="{% url 'website:cfp' %}" >COC</a></li>
{% endif %}
</ul>
</div>
@@ -122,7 +122,7 @@
<section id="attend" class="main special">
<header class="major">
- <h2>ATTEND</h2>
+ <h2>REGISTER</h2>
</header>
<table >
@@ -276,8 +276,6 @@
<section>
<h2>Contact Us</h2>
<dl class="alt">
- <dt>Address</dt>
- <dd> CFD - Lab, Aero. Annex Building,<br> Below HSS Dept.,<br> Opp.Metallurgical Dept.IIT Bombay,<br> Powai, Mumbai - 400076<br>India</dd>
<dt>Phone</dt>
<dd> (+91) 22 25764133</dd>
<dt>Email</dt>
@@ -316,7 +314,6 @@
<script src="{% static 'js/ie/respond.min.js' %}"></script>
<script src="{% static 'js/bootstrap.min.js' %}"></script>
<script src="{% static 'js/smoothscroll.js' %}"></script>
- <script src="{% static 'js/rating.js' %}"></script>
<script type="text/javascript">
diff --git a/website/templates/cfp.html b/website/templates/cfp.html
index 1b9116b..a0437e4 100755
--- a/website/templates/cfp.html
+++ b/website/templates/cfp.html
@@ -4,7 +4,7 @@
<!DOCTYPE HTML>
<html>
<head>
- <title>Call for Proposal</title>
+ <title>Submit Proposal</title>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="assets/css/main.css" />
@@ -15,7 +15,7 @@
{% block header %}
<header id="header1">
<h1>SciPy India 2016</h1>
- <h2>Call For Proposal</h2>
+ <h2>Submit Proposal</h2>
</header>
{% endblock %}
@@ -32,7 +32,7 @@
<li><a href="{% url 'website:cfp' %}">{{ user.get_full_name|default:user.username }}</a>
<li><a href="{% url 'auth:logout' %}?next=/2016/cfp">Logout</a></li>
{% else %}
- <li><a href="{% url 'website:cfp' %}" >Login</a></li>
+ <li><a href="{% url 'website:cfp' %}" >COC</a></li>
{% endif %}
</ul>
</div>
@@ -79,7 +79,7 @@
{% else %}
<ul class="features">
<li>
- <span><h2><u>Login</u></h2></span>
+ <span><h2><u>Code of Conduct</u></h2></span>
<p>Login/Register to Submit a Proposal</p>
{% if invalid %}
diff --git a/website/templates/edit-proposal.html b/website/templates/edit-proposal.html
new file mode 100644
index 0000000..3201291
--- /dev/null
+++ b/website/templates/edit-proposal.html
@@ -0,0 +1,71 @@
+{% extends 'base.html' %}
+{% load static %}
+
+<!DOCTYPE HTML>
+
+<html>
+ <head>
+ <title>{{ user.get_full_name|default:user.username }}</title>
+ </head>
+ <body>
+
+
+
+ {% block header %}
+ <header id="header1">
+ <h1>Scipy India 2016</h1>
+ {% if proposal.proposal_type == "ABSTRACT"%}
+ <h2>Edit Abstract Proposal</h2>
+ {% else %}
+ <h2>Edit Workshop Proposal</h2>
+ {% endif %}
+</header>
+{% endblock %}
+
+{% block nav %}
+
+<div id="navbar-main">
+ <div class="navbar navbar-inverse navbar-fixed-top">
+ <div class="navbar-collapse collapse">
+ <ul class="nav navbar-nav">
+ <li><a href="{% url 'website:home' %}" class="active">Home</a></li>
+ {% if user and not user.is_anonymous %}
+ <li><a href="{% url 'website:cfp' %}">{{ user.get_full_name|default:user.username }}</a>
+ <li><a href="{% url 'auth:logout' %}?next=/2016/cfp">Logout</a></li>
+ {% else %}
+ <li><a href="{% url 'website:cfp' %}" >Login</a></li>
+ {% endif %}
+ </ul>
+ </div>
+ </div>
+</div>
+{% endblock %}
+
+{% block content %}
+
+ <div id="wrapper">
+ <div id="main">
+ <section id="content" class="main">
+ <h3>{{ proposal.user.first_name }} {{ proposal.user.last_name }}</h3>
+ <form action="" method=POST enctype="multipart/form-data"> {% csrf_token %}
+ <div class="row1">
+ {% for field in form %}
+
+ <p>{{ field.label}}
+ {% if field.field.required %} <span style="color:red;">*</span> {% endif %}
+ {{ field }}</p>
+ <a style="color:red; ">{{ field.errors }}</a>
+ {% endfor %}
+ </div>
+ {% csrf_token %}
+
+ <center><button class="button special" style="background:#D44727" type="submit">Submit</button></center>
+ </form>
+
+
+ </section>
+ </div>
+ </div>
+
+
+{% endblock %} \ No newline at end of file
diff --git a/website/templates/submit-cfp.html b/website/templates/submit-cfp.html
index 4611a5d..426bfa1 100755
--- a/website/templates/submit-cfp.html
+++ b/website/templates/submit-cfp.html
@@ -86,8 +86,9 @@
{% endfor %}
</div>
{% csrf_token %}
+
<center><button class="button special" style="background:#D44727" type="submit">Submit</button></center>
-
+ </form>
</section>
</div>
{% endif %}
diff --git a/website/templates/view-abstracts.html b/website/templates/view-abstracts.html
index 12cf45e..b5804f1 100755
--- a/website/templates/view-abstracts.html
+++ b/website/templates/view-abstracts.html
@@ -53,8 +53,11 @@
You have not submitted any proposal. To submit proposal click <a href="{% url 'website:cfp' %}">here </a></center>
{% else %}
- <form action="{% url 'website:delete' %}" method="post" onsubmit="return confirm('Sure?');"> {% csrf_token %}
- <table class="table">
+
+ <form action="{% url 'website:status_change' %}" method="post" onsubmit="return confirm('Sure?');"> {% csrf_token %}
+
+
+ <table id = "myTable" class="tablesorter">
<colgroup>
{% if user.is_superuser %}
<col width="10%" />
@@ -114,8 +117,12 @@ You have not submitted any proposal. To submit proposal click <a href="{% url 'w
{% elif proposal.status = 'Commented' %}
<h5 style="color:brown;">{{proposal.status}}</h5>
{% elif proposal.status = 'Resubmit' %}
- <h5 style="color:grey;">{{proposal.status}}</h5>
- {% else %}
+ {% if user.is_superuser %}
+ <h5 style="color:grey;">{{proposal.status}}</h5>
+ {% else %}
+ <a href="{% url 'website:edit_proposal' proposal.id %}">{{proposal.status}}</a>
+ {% endif %}
+ {% else %}
<h5 style="color:blue;">{{proposal.status}}</h5>
{% endif %}
@@ -125,7 +132,11 @@ You have not submitted any proposal. To submit proposal click <a href="{% url 'w
</table>
{% if user.is_superuser %}
<center><input type="submit" id="delete" class ="button special" style="background:#D44727;" value="Delete" name="delete"/>
- <input type="submit" id="dump" class ="button special" style="background:#D44727;" value="Dump" name="dump"/></center>
+ <input type="submit" id="dump" class ="button special" style="background:#D44727;" value="Dump" name="dump"/></center><br>
+ <center>
+ <input type="submit" id="accept" class ="button special" style="background:green;" value="Accept" name="accept"/>
+ <input type="submit" id="rejected" class ="button special" style="background:red;" value="Reject" name="reject"/>
+ <input type="submit" id="resubmit" class ="button special" style="background:grey;" value="Resubmit" name="resubmit"/></center>
{% endif %}
</form>
generated by cgit (git 2.34.1) at 2024-12-20 08:27:43 +0000