From b0994d46c0a917baa4bcd8521c7b7df89721cb90 Mon Sep 17 00:00:00 2001
From: Pablo Vazquez <venomgfx@gmail.com>
Date: Sat, 21 Jun 2014 02:14:37 +0200
Subject: [PATCH] Updates on the listing and view template

---
 .../application/static/assets/css/bfct.css    |  2 +-
 blender-bfct/application/static/assets_shared |  2 +-
 .../templates/applications/index.html         | 37 ++++++++++++++-----
 .../templates/applications/view.html          | 17 +++++++--
 4 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/blender-bfct/application/static/assets/css/bfct.css b/blender-bfct/application/static/assets/css/bfct.css
index a1a23bd..89e9947 100644
--- a/blender-bfct/application/static/assets/css/bfct.css
+++ b/blender-bfct/application/static/assets/css/bfct.css
@@ -2,7 +2,7 @@
 @import url(http://fonts.googleapis.com/css?family=Open+Sans+Condensed:300);
 
 .application_row {
-	width: 430%;
+	width: 2800%;
 	height: 100%;
 	top: 0;
 	left: 0;
diff --git a/blender-bfct/application/static/assets_shared b/blender-bfct/application/static/assets_shared
index c1b0adf..7b3d854 160000
--- a/blender-bfct/application/static/assets_shared
+++ b/blender-bfct/application/static/assets_shared
@@ -1 +1 @@
-Subproject commit c1b0adf34cf1cadd1e270e05e12d074ef7280d96
+Subproject commit 7b3d854c59a2b274db30417081293ec9bb296004
diff --git a/blender-bfct/application/templates/applications/index.html b/blender-bfct/application/templates/applications/index.html
index 52a3e20..cf4ebce 100755
--- a/blender-bfct/application/templates/applications/index.html
+++ b/blender-bfct/application/templates/applications/index.html
@@ -2,12 +2,14 @@
 {% block body %}
 <div class="row">
     <div class="col-md-12">
+        <h1>BFCT Applications</h1>
         <table class="table table-striped table-hover">
             <thead>
                 <tr>
-                    <th>Applicant</th>
+                    <th>#</th>
+                    <th>Name</th>
                     <th>Country</th>
-                    <th>Date</th>
+                    <th>Submission Date</th>
                     <th>Status</th>
                     <th class="content-align-center">Approvals</th>
                 </tr>
@@ -15,26 +17,43 @@
             <tbody>
             {% for application in applications %}
                 <tr class="table-row-link">
-                    <td class="relative">
+                    <td class="relative">{{ loop.index }}
                         <a href="{{url_for('applications.view', id=application.id)}}" >
                             <div class="application_row"></div>
                         </a>
+                    </td>
+                    <td>
                         {{application.user.first_name}} {{application.user.last_name}}
                     </td>
                     <td>{{application.city_country}}</td>
-                    <td>{{application.pretty_submission_date}}</td>
-                    <td>{{application.status}}</td>
+                    <td>{{application.submission_date.strftime('%d %B, %Y')}}</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">
                         {{application.approve}}
                             /
                         {{application.approve + application.reject}}
                     </td>
                 </tr>
-
-                <div class="clearfix"></div>
+                {% if loop.last %}
+                </tbody>
+            </table>
+                <div class="content-align-right">
+                    Listing {{ loop.index }} applications
+                </div>
+                {% endif %}
             {% endfor %}
-            </tbody>
-        </table>
     </div>
 </div>
 
diff --git a/blender-bfct/application/templates/applications/view.html b/blender-bfct/application/templates/applications/view.html
index fb2bff1..8c38e90 100755
--- a/blender-bfct/application/templates/applications/view.html
+++ b/blender-bfct/application/templates/applications/view.html
@@ -9,7 +9,8 @@
         <div class="box">
             <i class="backicon fa fa-info-circle"></i>
         <p>
-         <ul>
+         <h3>{{application.user.first_name}}'s details:</h3>
+         <ul class="list-margin-none offset-top-1">
             <li>Website:
                 <a href="{{application.website}}">
                     {{application.website}}
@@ -39,10 +40,18 @@
         <div class="box">
             {% if application.status == 'under_review' %}
                 <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' %}
-                <i class="backicon fa fa-arrow-right"></i>
-                <h2>Submitted <i class="title-icon fa fa-arrow-right"></i></h2>
+                <i class="backicon fa fa-legal"></i>
+                <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 %}
                 {{application.status}}
             {% endif %}