WIP forms, tweaks on 2nd level navbar, and labels on listing

This commit is contained in:
2014-06-22 01:21:09 +02:00
parent 3db3535435
commit 5749ee6c32
5 changed files with 94 additions and 53 deletions

View File

@@ -9,3 +9,50 @@
position: absolute;
}
.label.label-2x {
font-size: 100%;
}
.input-group {
position: relative;
}
.form-control {
top: 0;
position: absolute;
background-color: transparent;
border: none;
margin-top: 24px;
border-bottom: 1px solid #ccc;
box-shadow: none;
transition: all 0.1s ease-in-out ;
}
.input-group-lg>.form-control, .input-group-lg>.input-group-addon, .input-group-lg>.input-group-btn>.btn {
padding: 0px 4px 0px 10px;
height: 40px;
font-size: 120%;
}
.control-label {
font-size: 80%;
}
.input-group .control-label {
position: absolute;
left: 0;
top: 6px;
opacity: 0;
transition: all ease-out 0.2s;
transition-delay: .4s;
}
.form-control:hover, .form-control:focus {
background-color: white;
}
.form-control:focus + .control-label,
.form-control:hover + .control-label{
opacity: 0.8;
top: 1px;
}

View File

@@ -29,13 +29,13 @@
<td>{{application.submission_date.strftime('%d %B, %Y')}}</td>
<td>
{% if application.status == 'under_review' %}
<span class="label 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' %}
<span class="label label-danger"><i class="fa fa-warning"></i> Pending</span>
<span class="label label-2x label-danger"><i class="fa fa-warning"></i> Pending</span>
{% elif application.status == 'approved' %}
<span class="label label-success"><i class="fa fa-star"></i> Approved!</span>
<span class="label label-2x label-success"><i class="fa fa-star"></i> Approved!</span>
{% elif application.status == 'rejected' %}
<span class="label label-default"><i class="fa fa-times"></i> Rejected</span>
<span class="label label-2x label-default"><i class="fa fa-times"></i> Rejected</span>
{% else %}
{{application.status}}
{% endif %}

View File

@@ -1,84 +1,78 @@
{% extends 'layout.html' %}
{% block body %}
<div class="row">
<div class="col-md-6">
<div class="col-md-8">
<form class="form-horizontal" method="POST" action="{{url_for('apply')}}">
<fieldset>
{{ form.hidden_tag() }}
<label class="control-label">
<div class="input-group input-group-lg">
<span class="input-group-addon">Blender Network Profile link</span>
{{ form.network_profile(class='form-control', placeholder='First Name') }}
<div class="input-group input-group-lg width-full">
{{ form.network_profile(class='form-control', placeholder='Network Profile URL') }}
<label class="control-label">Blender Network Profile</label>
</div>
</label>
<label class="control-label">
<div class="input-group input-group-lg">
<span class="input-group-addon">Website</span>
<div class="input-group input-group-lg width-full">
{{ form.website(class='form-control', placeholder='Your website') }}
<label class="control-label">Website</label>
</div>
</label>
<label class="control-label">
<div class="input-group input-group-lg">
<span class="input-group-addon">City and Country</span>
{{ form.city_country(class='form-control', placeholder='Your city and country') }}
<div class="input-group input-group-lg width-full">
{{ form.city_country(class='form-control', placeholder='Your city and country') }}
<label class="control-label">City and Country</label>
</div>
</label>
<label class="control-label">
<div class="input-group input-group-lg">
<span class="input-group-addon">Teaching at university</span>
{{ form.teaching(class='form-control') }}
<div class="input-group input-group-lg width-full">
{{ form.teaching(class='form-control') }}
<label class="control-label">Are you teaching at a university?</label>
</div>
</label>
<label class="control-label">
<div class="input-group input-group-lg">
<span class="input-group-addon">Institution Name</span>
<div class="input-group input-group-lg width-full">
{{ form.institution_name(class='form-control', placeholder='School or institution name') }}
<label class="control-label">School or Institution Name</label>
</div>
</label>
<label class="control-label">
<div class="input-group input-group-lg">
<span class="input-group-addon">Areas of expertise</span>
<div class="input-group input-group-lg width-full">
{{ form.skills(class='form-control') }}
<label class="control-label">Areas of Expertise</label>
</div>
</label>
<label class="control-label">
<div class="input-group input-group-lg">
<span class="input-group-addon">Video Example</span>
<div class="input-group input-group-lg width-full">
{{ form.video_example(class='form-control', placeholder='Video Example') }}
<label class="control-label">Video Example</label>
</div>
</label>
<label class="control-label">
<div class="input-group input-group-lg">
<span class="input-group-addon">Written Example</span>
<div class="input-group input-group-lg width-full">
{{ form.written_example(class='form-control', placeholder='Written Example') }}
<label class="control-label">Written Example</label>
</div>
</label>
<label class="control-label">
<div class="input-group input-group-lg">
<span class="input-group-addon">Portfolio and CV</span>
<div class="input-group input-group-lg width-full">
{{ form.portfolio_cv(class='form-control', placeholder='Porftolio and CV') }}
<label class="control-label">Porftolio / Curriculum Vitae</label>
</div>
</label>
<label class="control-label">
<div class="input-group input-group-lg">
<span class="input-group-addon">Bio and message</span>
<div class="input-group input-group-lg width-full">
{{ form.bio_message(class='form-control', placeholder='Bio and message') }}
<label class="control-label">Biography or Personal Message</label>
</div>
</label>
<input class="btn btn-default btn-block" type="submit" value="Go">
<button class="btn btn-default btn-success btn-squishy width-half pull-right offset-top-2" type="submit" value="Go">
Send Application <i class="fa fa-send"></i>
</button>
</fieldset>
</form>
</div>
<div class="col-md-4 box">
<i class="backicon fa fa-question-circle"></i>
<h2>What happens when I apply?</h2>
<p>
Once we receive your application, the Blender Foundation Certification Board
will proceed to review it. This may take some days.
<br/><br/>You can come back to this page and check
the status of your application anytime.
<br/><br/>Once your application has been reviewed, you'll receive
an e-mail with the results, and instructions on how to proceed.
</p>
</div>
</div>
{% endblock %}

View File

@@ -77,7 +77,7 @@
</div>
<header class="navbar navbar-default navbar-secondlevel navbar-static-top bright" role="navigation">
<div class="container">
<div class="container relative">
<ul class="nav navbar-nav navbar-left">
<li {% if title == 'home': %} class="active"{% endif %}>
<a href="{{ url_for('homepage') }}">Home</a>
@@ -88,9 +88,9 @@
{% endif %}
{% if current_user.is_authenticated() %}
<li class="dropdown">
<li class="dropdown absolute right">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{{current_user.email}} <b class="caret"></b></a>
<ul class="dropdown-menu">
<ul class="dropdown-menu right">
{% if not current_user.has_role('bfct') %}
<li><a href="{{url_for('apply')}}"><i class="fa fa-edit"></i> Apply / View</a></li>
{% endif %}