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

Tweaks and fixes for listing

Browse Source
This commit is contained in:
Pablo Vazquez
2014-06-23 12:20:03 +02:00
parent 0de9f1482e
commit b0114ba392
3 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,22 +12,21 @@
<th>Submission 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>
<th></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for application in applications %} {% for application in applications %}
<tr class="table-row-link"> <tr>
<td class="relative">{{ loop.index }} <td class="relative">{{ loop.index }}</td>
<a href="{{url_for('applications.view', id=application.id)}}" > <td><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}} {{application.user.first_name}} {{application.user.last_name}}
</a>
</td> </td>
<td>{{application.city_country}}</td> <td>{{application.city_country}}</td>
<td>{{application.submission_date.strftime('%d %B, %Y')}}</td> <td>{{application.submission_date.strftime('%d %B, %Y')}}</td>
<td> <td>
<a href="{{url_for('applications.view', id=application.id)}}" >
{% if application.status == 'under_review' %} {% if application.status == 'under_review' %}
<span class="label label-2x label-info"><i class="fa fa-clock-o"></i> Under Review</span> <span class="label label-2x label-info"><i class="fa fa-clock-o"></i> Under Review</span>
{% elif application.status == 'submitted' %} {% elif application.status == 'submitted' %}
@@ -39,12 +38,18 @@
{% else %} {% else %}
{{application.status}} {{application.status}}
{% endif %} {% endif %}
</a>
</td> </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>
<td>
<a href="{{url_for('applications.view', id=application.id)}}" >
View <i class="fa fa-angle-double-right"></i>
</a>
</td>
</tr> </tr>
{% if loop.last %} {% if loop.last %}
</tbody> </tbody>
@@ -56,5 +61,6 @@
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
<hr/>
{% endblock %} {% endblock %}

21
blender-bfct/application/templates/layout.html
View File

@@ -42,16 +42,16 @@
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
<i class="fa fa-bars"></i> <i class="fa fa-bars"></i>
</button> </button>
<a class="logo" href="http://blender.org"></a> <a class="logo" href="http://www.blender.org"></a>
</div> </div>
<nav class="collapse navbar-collapse" id="navbar-collapse-menu"> <nav class="collapse navbar-collapse" id="navbar-collapse-menu">
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li><a href="http://local.blender.org/features/">Features</a></li> <li><a href="http://www.blender.org/features/">Features</a></li>
<li><a href="http://local.blender.org/download/">Download</a></li> <li><a href="http://www.blender.org/download/">Download</a></li>
<li><a href="http://local.blender.org/support/">Support</a></li> <li><a href="http://www.blender.org/support/">Support</a></li>
<li><a href="http://local.blender.org/get-involved/">Get Involved</a></li> <li><a href="http://www.blender.org/get-involved/">Get Involved</a></li>
<li><a href="http://local.blender.org/about/">About</a></li> <li><a href="http://www.blender.org/about/">About</a></li>
<li><a href="http://www.blender3d.org/e-shop/">Store</a></li> <li><a href="http://www.blender3d.org/e-shop/">Store</a></li>
</ul> </ul>
</nav> </nav>
@@ -79,11 +79,8 @@
<header class="navbar navbar-default navbar-secondlevel navbar-static-top bright" role="navigation"> <header class="navbar navbar-default navbar-secondlevel navbar-static-top bright" role="navigation">
<div class="container relative"> <div class="container relative">
<ul class="nav navbar-nav navbar-left"> <ul class="nav navbar-nav navbar-left">
<li {% if title == 'homepage': %} class="active"{% endif %}> <li {% if title == 'home': %} class="active"{% endif %}>
<a href="{{ url_for('homepage') }}">About BFCT</a> <a href="{{ url_for('homepage') }}">About</a>
</li>
<li>
<a href="http://blendernetwork.org/BFCT">Certified Trainers</a>
</li> </li>
<li {% if title == 'become_a_trainer': %} class="active"{% endif %}> <li {% if title == 'become_a_trainer': %} class="active"{% endif %}>
<a href="{{ url_for('become_a_trainer') }}">Become a Trainer</a> <a href="{{ url_for('become_a_trainer') }}">Become a Trainer</a>
@@ -106,7 +103,7 @@
</ul> </ul>
</li> </li>
{% else %} {% else %}
<li><a href="{{url_for_security('login')}}">Log in</a></li> <li class="absolute right"><a href="{{url_for_security('login')}}"><i class="fa fa-sign-in"></i> Sign in</a></li>
{% endif %} {% endif %}
</ul> </ul>
</div> </div>

2
blender-bfct/application/templates/security/login_user.html
View File

@@ -47,7 +47,7 @@ body {
<div class="container-fluid"> <div class="container-fluid">
<div class="row" id="featured"> <div class="row" id="featured">
<div class="container"> <div class="container box">
<form class="form-signin" role="login" action="{{ url_for_security('login') }}" method="POST" name="login_user_form"> <form class="form-signin" role="login" action="{{ url_for_security('login') }}" method="POST" name="login_user_form">
{{ login_user_form.hidden_tag() }} {{ login_user_form.hidden_tag() }}
<h2 class="form-signin-heading">Please sign in</h2> <h2 class="form-signin-heading">Please sign in</h2>