Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'remove-stale-js' into 'master'

Browse source 
Fix review buttons by removing stale compiled JS; also some styling

See merge request LCA2018/symposion_app!27
This commit is contained in:
James Polley 2017-09-16 12:26:47 +00:00
commit b89e6e9b56
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pinaxcon/templates/symposion/reviews/base.html
View file

@ -103,7 +103,6 @@
{% endblock %} {% endblock %}
{% block extra_script %} {% block extra_script %}
<script src="{% static 'js/site-92ae8d0d6c.js' %}" type="text/javascript"></script>
<script src="{{ STATIC_URL }}datatables/js/jquery.dataTables.min.js" type="text/javascript"></script> <script src="{{ STATIC_URL }}datatables/js/jquery.dataTables.min.js" type="text/javascript"></script>
<script src="{{ STATIC_URL }}tabletools/js/TableTools.min.js" type="text/javascript"></script> <script src="{{ STATIC_URL }}tabletools/js/TableTools.min.js" type="text/javascript"></script>
<script src="{{ STATIC_URL }}datatables/js/dataTables.bootstrap.js" type="text/javascript"></script> <script src="{{ STATIC_URL }}datatables/js/dataTables.bootstrap.js" type="text/javascript"></script>

8
pinaxcon/templates/symposion/reviews/review_detail.html
View file

@ -19,7 +19,7 @@
<div class="btn-group"> <div class="btn-group">
{% if proposal.result.status == "accepted" %} {% if proposal.result.status == "accepted" %}
<a class="btn dropdown-toggle btn-success" data-toggle="dropdown" href="#">Accepted <span class="caret"></span></a> <a class="btn dropdown-toggle btn-success" data-toggle="dropdown" href="#">Accepted <span class="caret"></span></a>
<div class="dropdown-menu pull-right" style="width: 200px; padding-left: 10px;"> <div class="dropdown-menu pull-right">
<div class="btn-group"> <div class="btn-group">
<input type="submit" name="result_submit" value="reject" class="btn btn-xs btn-danger" /> <input type="submit" name="result_submit" value="reject" class="btn btn-xs btn-danger" />
<input type="submit" name="result_submit" value="standby" class="btn btn-xs" /> <input type="submit" name="result_submit" value="standby" class="btn btn-xs" />
@ -30,7 +30,7 @@
{% else %} {% else %}
{% if proposal.result.status == "rejected" %} {% if proposal.result.status == "rejected" %}
<a class="btn dropdown-toggle btn-danger" data-toggle="dropdown" href="#">Rejected <span class="caret"></span></a> <a class="btn dropdown-toggle btn-danger" data-toggle="dropdown" href="#">Rejected <span class="caret"></span></a>
<div class="dropdown-menu pull-right" style="width: 200px; padding-left: 10px;"> <div class="dropdown-menu pull-right">
<div class="btn-group"> <div class="btn-group">
<input type="submit" name="result_submit" value="accept" class="btn btn-xs btn-success" /> <input type="submit" name="result_submit" value="accept" class="btn btn-xs btn-success" />
<input type="submit" name="result_submit" value="standby" class="btn btn-xs" /> <input type="submit" name="result_submit" value="standby" class="btn btn-xs" />
@ -40,7 +40,7 @@
{% else %} {% else %}
{% if proposal.result.status == "standby" %} {% if proposal.result.status == "standby" %}
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">Standby <span class="caret"></span></a> <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">Standby <span class="caret"></span></a>
<div class="dropdown-menu pull-right" style="width: 200px; padding-left: 10px;"> <div class="dropdown-menu pull-right">
<div class="btn-group"> <div class="btn-group">
<input type="submit" name="result_submit" value="accept" class="btn btn-xs btn-success" /> <input type="submit" name="result_submit" value="accept" class="btn btn-xs btn-success" />
<input type="submit" name="result_submit" value="reject" class="btn btn-xs btn-danger" /> <input type="submit" name="result_submit" value="reject" class="btn btn-xs btn-danger" />
@ -49,7 +49,7 @@
</div> </div>
{% else %} {% else %}
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">Undecided <span class="caret"></span></a> <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">Undecided <span class="caret"></span></a>
<div class="dropdown-menu pull-right" style="width: 200px; padding-left: 10px;"> <div class="dropdown-menu pull-right">
<div class="btn-group"> <div class="btn-group">
<input type="submit" name="result_submit" value="accept" class="btn btn-xs btn-success" /> <input type="submit" name="result_submit" value="accept" class="btn btn-xs btn-success" />
<input type="submit" name="result_submit" value="reject" class="btn btn-xs btn-danger" /> <input type="submit" name="result_submit" value="reject" class="btn btn-xs btn-danger" />