archive/blender-bfct
Archived
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update on buttons

Browse Source
This commit is contained in:
Pablo Vazquez
2014-06-20 17:30:28 +02:00
parent 2ac308e114
commit a418bdf512
3 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
blender-bfct/application/static/assets_shared

Submodule blender-bfct/application/static/assets_shared updated: a83634e5af...0ab2954746

6
blender-bfct/application/templates/applications/index.html
View File

@@ -14,7 +14,7 @@
</thead> </thead>
<tbody> <tbody>
{% for application in applications %} {% for application in applications %}
<tr> <tr class="table-row-link">
<td class="relative"> <td class="relative">
<a href="{{url_for('applications.view', id=application.id)}}" > <a href="{{url_for('applications.view', id=application.id)}}" >
<div class="application_row"></div> <div class="application_row"></div>
@@ -25,9 +25,9 @@
<td>{{application.pretty_submission_date}}</td> <td>{{application.pretty_submission_date}}</td>
<td>{{application.status}}</td> <td>{{application.status}}</td>
<td class="content-align-center"> <td class="content-align-center">
<span class="success">{{application.approve}}</span> {{application.approve}}
/ /
<span class="danger">{{application.approve + application.reject}}</span> {{application.approve + application.reject}}
</td> </td>
</tr> </tr>

35
blender-bfct/application/templates/applications/view.html
View File

@@ -2,7 +2,7 @@
{% block body %} {% block body %}
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-8">
<h2>{{application.user.first_name}} {{application.user.last_name}} <small>{{application.city_country}}</small></h2> <h2>{{application.user.first_name}} {{application.user.last_name}} <small>{{application.city_country}}</small></h2>
<p>{{application.bio_message}}</p> <p>{{application.bio_message}}</p>
<ul> <ul>
@@ -12,11 +12,11 @@
<li><a href="{{application.portfolio_cv}}">{{application.portfolio_cv}}</a></li> <li><a href="{{application.portfolio_cv}}">{{application.portfolio_cv}}</a></li>
</ul> </ul>
</div> </div>
<div class="col-md-6"> <div class="col-md-4">
<h2>Status: {{application.status}}</h2> <h2>Status: {{application.status}}</h2>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<table class="table"> <table class="table table-striped table-hover">
<thead> <thead>
<tr> <tr>
<th>Reviewer</th> <th>Reviewer</th>
@@ -41,35 +41,40 @@
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>
{% if not review %}
<div class="row"> <div class="row">
{% if not review %} <hr/>
<div class="col-md-6"> <div class="col-md-6">
<a href="{{url_for('applications.vote', approved=1, id=application.id)}}" class="btn btn-default">Approve</a> <a href="{{url_for('applications.vote', approved=1, id=application.id)}}" class="btn btn-default btn-block btn-squishy btn-success">
<i class="fa fa-thumbs-up"></i> Approve
</a>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<a href="{{url_for('applications.vote', approved=0, id=application.id)}}" class="btn btn-default">Reject</a> <a href="{{url_for('applications.vote', approved=0, id=application.id)}}" class="btn btn-default btn-block btn-squishy btn-danger">
<i class="fa fa-thumbs-down"></i> Reject
</a>
</div> </div>
{% else %} {% else %}
<div class="col-md-6"> <div class="col-md-6">
<p>You {% if review.approved %} approved {% else %} rejected {% endif %} this candidate.</p> <p>You {% if review.approved %} approved {% else %} rejected {% endif %} this candidate.</p>
</div> </div>
{% endif %}
</div> </div>
<div class="row"> {% endif %}
{% if current_user.has_role('admin') %} {% if current_user.has_role('admin') %}
{% if not application.review_end_date %} {% if not application.review_end_date %}
<div class="col-md-12"><hr/></div>
<div class="col-md-6"> <div class="col-md-6">
<a href="{{url_for('applications.final_review', approved=1, id=application.id)}}" class="btn btn-default">Final Approve</a>
<a href="{{url_for('applications.final_review', approved=1, id=application.id)}}" class="btn btn-default btn-block btn-squishy btn-success">Final Approve</a>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<a href="{{url_for('applications.final_review', approved=0, id=application.id)}}" class="btn btn-default">Final Reject</a> <a href="{{url_for('applications.final_review', approved=0, id=application.id)}}" class="btn btn-default btn-block btn-squishy btn-danger">Final Reject</a>
</div> </div>
{% endif %}
{% endif %} {% endif %}
</div> {% endif %}
</div> </div>
</div> </div>