diff options
author | Sashi20 | 2018-09-27 12:31:17 +0530 |
---|---|---|
committer | Sashi20 | 2018-09-27 12:31:17 +0530 |
commit | 9b4ad968f1b70f3c111e1e4fce4fce46bd968629 (patch) | |
tree | db1a22a92e52a1eabb7253deb2f3010e7b040cf1 | |
parent | 0485cab238fef6b9f9c325758dbf28706905cb77 (diff) | |
download | nccps-2018-9b4ad968f1b70f3c111e1e4fce4fce46bd968629.tar.gz nccps-2018-9b4ad968f1b70f3c111e1e4fce4fce46bd968629.tar.bz2 nccps-2018-9b4ad968f1b70f3c111e1e4fce4fce46bd968629.zip |
Modified user status to view proposals
-rw-r--r-- | static/website/bootstrap-css/assets/images/backgrounds/bg-2.jpg | bin | 628031 -> 678802 bytes | |||
-rw-r--r-- | static/website/templates/view-profile.html | 2 | ||||
-rwxr-xr-x | static/website/templates/view-proposals.html | 24 | ||||
-rwxr-xr-x | website/forms.py | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/static/website/bootstrap-css/assets/images/backgrounds/bg-2.jpg b/static/website/bootstrap-css/assets/images/backgrounds/bg-2.jpg Binary files differindex 9ecd1d8..91dd45f 100644 --- a/static/website/bootstrap-css/assets/images/backgrounds/bg-2.jpg +++ b/static/website/bootstrap-css/assets/images/backgrounds/bg-2.jpg diff --git a/static/website/templates/view-profile.html b/static/website/templates/view-profile.html index 844a2ba..d8fa8ab 100644 --- a/static/website/templates/view-profile.html +++ b/static/website/templates/view-profile.html @@ -47,7 +47,7 @@ </h2> </span> <ul> - <li>Last date for paper submission: <b> 28/09/2018</b></li> + <li>Last date for paper submission: <b> 03/10/2018</b></li> <li>Notification of acceptance: <b>22/10/2018</b></li> <li>Last date for final paper submission: <b>02/11/2018</b></li> </ul> diff --git a/static/website/templates/view-proposals.html b/static/website/templates/view-proposals.html index 269690e..6a3089a 100755 --- a/static/website/templates/view-proposals.html +++ b/static/website/templates/view-proposals.html @@ -30,7 +30,7 @@ <div class="table-responsive"> <table id = "myTable" width="100%" cellpadding="10" class="table-bordered table-hover tablesorter"> <colgroup> - {% if user.is_superuser %} + {% if user.is_staff %} <col width="15%" /> <col width="20%" /> <col width="10%" /> @@ -45,17 +45,17 @@ <col width="20%" /> {% endif %} </colgroup> - {% if user.is_superuser %} + {% if user.is_staff %} <th style="text-align: center;"> </th> <th style="text-align: center;">Speaker {% endif %} <th style="text-align: center;"> Type <th style="text-align: center;"> Title - {% if not user.is_superuser %} + {% if not user.is_staff %} <th style="text-align: center;"> View {% endif %} - {% if user.is_superuser %} + {% if user.is_staff %} <th style="text-align: center;"> <center> Duration</center> {% else %} @@ -64,7 +64,7 @@ <th style="text-align: center;"> Status {% for proposal in proposals %} <tr> - {% if user.is_superuser %} + {% if user.is_staff %} <td style="text-align: center;"> {% if proposal.status == 'Rejected' %} {% else %} @@ -76,14 +76,14 @@ </td> {% endif %} <td style="text-align: center;"> {{proposal.proposal_type }} </td> - {% if user.is_superuser %} + {% if user.is_staff %} <td style="white-space: nowrap; text-overflow:ellipsis; overflow: hidden; max-width:.5px;"><a title="Title : {{proposal.title}}, Tags: {{proposal.tags}}" href="{% url 'website:comment_abstract' proposal.id %}">{{proposal.title}}</a> </td> {% else %} <td style="white-space: nowrap; text-overflow:ellipsis; overflow: hidden; max-width:.5px;"> {{proposal.title}}</td> <td style="text-align: center;"><a href="{% url 'website:abstract_details' proposal.id %}">View</a> </td> {% endif %} <td style="text-align: center;"> - {% if user.is_superuser %} + {% if user.is_staff %} <center>{{ proposal.duration }} {% if proposal.proposal_type == 'ABSTRACT' %} Mins{% else %} Hrs {% endif %} @@ -100,7 +100,7 @@ {% elif proposal.status == 'Commented' %} <h5 style="color:brown;">{{proposal.status}}</h5> {% elif proposal.status == 'Edit' %} - {% if user.is_superuser %} + {% if user.is_staff %} <h5 style="color:grey;">{{proposal.status}}</h5> {% else %} <a href="">{{proposal.status}}</a> @@ -111,11 +111,11 @@ </td> <!-- <div> - {% if not user.is_superuser and type == 'ABSTRACT' %} + {% if not user.is_staff and type == 'ABSTRACT' %} <a href="{% url 'website:submitcfw' %}" class ="btn btn-info" role="button">Submit workshop </a> - {% elif not user.is_superuser and type == 'WORKSHOP' %} + {% elif not user.is_staff and type == 'WORKSHOP' %} <a href="{% url 'website:submitcfp' %}" class ="btn btn-info" role="button"> Submit paper </a> - {% elif not user.is_superuser%} + {% elif not user.is_staff%} {% endif %} </div>--> </tr> @@ -126,7 +126,7 @@ </p> - {% if user.is_superuser %} + {% if user.is_staff %} <input type="submit" id="delete" class ="btn btn-info" value="Delete" name="delete"/> <center> <input type="submit" id="accept" class ="btn btn-info" value="Accept" name="accept"/> diff --git a/website/forms.py b/website/forms.py index a08c9ee..5631d46 100755 --- a/website/forms.py +++ b/website/forms.py @@ -144,7 +144,7 @@ class ProposalForm(forms.ModelForm): ) abstract = forms.CharField(widget= forms.HiddenInput(),required=False, label='') proposal_type = forms.CharField( - widget=forms.HiddenInput(), label='', initial='ABSTRACT', required=False) + widget=forms.HiddenInput(), label='', initial='PAPER', required=False) duration = forms.ChoiceField(widget=forms.Select(attrs={'readonly': True}), choices=abs_duration, required=True) #duration = forms.ChoiceField(choices=abs_duration, widget=forms.ChoiceField(attrs={'readonly': True}), |