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

Updates on the listing and view template

Browse Source
This commit is contained in:
Pablo Vazquez
2014-06-21 02:14:37 +02:00
parent 0e3f8c536b
commit b0994d46c0
4 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
blender-bfct/application/static/assets/css/bfct.css
View File

@@ -2,7 +2,7 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans+Condensed:300); @import url(http://fonts.googleapis.com/css?family=Open+Sans+Condensed:300);
.application_row { .application_row {
width: 430%; width: 2800%;
height: 100%; height: 100%;
top: 0; top: 0;
left: 0; left: 0;

2
blender-bfct/application/static/assets_shared

Submodule blender-bfct/application/static/assets_shared updated: c1b0adf34c...7b3d854c59

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

@@ -2,12 +2,14 @@
{% block body %} {% block body %}
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<h1>BFCT Applications</h1>
<table class="table table-striped table-hover"> <table class="table table-striped table-hover">
<thead> <thead>
<tr> <tr>
<th>Applicant</th> <th>#</th>
<th>Name</th>
<th>Country</th> <th>Country</th>
<th>Date</th> <th>Submission Date</th>
<th>Status</th> <th>Status</th>
<th class="content-align-center">Approvals</th> <th class="content-align-center">Approvals</th>
</tr> </tr>
@@ -15,26 +17,43 @@
<tbody> <tbody>
{% for application in applications %} {% for application in applications %}
<tr class="table-row-link"> <tr class="table-row-link">
<td class="relative"> <td class="relative">{{ loop.index }}
<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>
</a> </a>
</td>
<td>
{{application.user.first_name}} {{application.user.last_name}} {{application.user.first_name}} {{application.user.last_name}}
</td> </td>
<td>{{application.city_country}}</td> <td>{{application.city_country}}</td>
<td>{{application.pretty_submission_date}}</td> <td>{{application.submission_date.strftime('%d %B, %Y')}}</td>
<td>{{application.status}}</td> <td>
{% if application.status == 'under_review' %}
<i class="fa fa-clock-o"></i> Under Review
{% elif application.status == 'submitted' %}
<span class="danger"><i class="fa fa-warning"></i> Pending</span>
{% elif application.status == 'approved' %}
<i class="warning fa fa-star"></i> Approved!
{% elif application.status == 'rejected' %}
<i class="fa fa-times"></i> Rejected
{% else %}
{{application.status}}
{% endif %}
</td>
<td class="content-align-center"> <td class="content-align-center">
{{application.approve}} {{application.approve}}
/ /
{{application.approve + application.reject}} {{application.approve + application.reject}}
</td> </td>
</tr> </tr>
{% if loop.last %}
<div class="clearfix"></div> </tbody>
</table>
<div class="content-align-right">
Listing {{ loop.index }} applications
</div>
{% endif %}
{% endfor %} {% endfor %}
</tbody>
</table>
</div> </div>
</div> </div>

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

@@ -9,7 +9,8 @@
<div class="box"> <div class="box">
<i class="backicon fa fa-info-circle"></i> <i class="backicon fa fa-info-circle"></i>
<p> <p>
<ul> <h3>{{application.user.first_name}}'s details:</h3>
<ul class="list-margin-none offset-top-1">
<li>Website: <li>Website:
<a href="{{application.website}}"> <a href="{{application.website}}">
{{application.website}} {{application.website}}
@@ -39,10 +40,18 @@
<div class="box"> <div class="box">
{% if application.status == 'under_review' %} {% if application.status == 'under_review' %}
<i class="backicon fa fa-clock-o"></i> <i class="backicon fa fa-clock-o"></i>
<h2>Under Review <i class="title-icon fa fa-clock-o"></i></h2> <h1>Under Review <i class="title-icon fa fa-clock-o"></i></h1>
{% elif application.status == 'submitted' %} {% elif application.status == 'submitted' %}
<i class="backicon fa fa-arrow-right"></i> <i class="backicon fa fa-legal"></i>
<h2>Submitted <i class="title-icon fa fa-arrow-right"></i></h2> <h1>Pending Review <span class="danger pull-right"><i class="fa fa-legal"></i></span></h1>
{% elif application.status == 'approved' %}
<i class="backicon fa fa-star"></i>
<h1>Approved! <span class="warning pull-right"><i class="fa fa-star"></i>
</span></h1>
{% elif application.status == 'rejected' %}
<i class="backicon fa fa-times"></i>
<h1>Rejected <span class="danger pull-right"><i class="fa fa-times"></i>
</i></h1>
{% else %} {% else %}
{{application.status}} {{application.status}}
{% endif %} {% endif %}