Skip to content
This repository was archived by the owner on Feb 10, 2018. It is now read-only.

CHANEY WIP BIGFIXES: fix lots of band plugin UI / prereg / UX fixes #26

Open
binary1230 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

CHANEY WIP BIGFIXES: fix lots of band plugin UI / prereg / UX fixes #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bb3754
Add fancy material design scaffold and styling for forms.
cybersenshi May 13, 2016
6798553
Merge remote-tracking branch 'origin/master'
cybersenshi May 13, 2016
5a46075
fix lots of band plugin UI / prereg / UX fixes
cybersenshi May 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 9 additions & 23 deletions bands/templates/bandbase.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,13 @@
{% extends "preregistration/preregbase.html" %}
{% block title %}Band Information{% endblock %}

{% block title %}
Band Information
{% endblock title %}

{% block content %}

<style type="text/css">
.panel.panel-default {
padding-bottom: 15px;
}
table { max-width: 100%; }
table td, table th { padding: 5px; }
table td ul { margin: 0px; }
.return-link {
display: block;
text-align: center;
margin-bottom: 10px;
}
.game-display {
font-family: Courier;
padding-top: 7px;
}
</style>
<div class="masthead"></div>
<div class="panel panel-default" style="padding-left:15px">
{% block body %}{% endblock %}
</div>
<div class="panel panel-default">
{% block body %}{% endblock body %}
</div><!-- /panel -->

{% endblock %}
{% endblock content %}
93 changes: 45 additions & 48 deletions bands/templates/bands/agreement.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,60 +59,57 @@ <h3>Your Information:</h3>
<input type="hidden" name="id" value="{{ band_info.db_id }}" />
{% csrf_token %}

<div class="form-group">
<label class="col-sm-2 control-label">Performer Count:</label>
<div class="col-sm-6">
<input class="form-control" type="number" name="performer_count" value="{{ band_info.performer_count|default:band.estimated_performer_count }}" />
<p class="help-text">
<ul>

<li class="input-field">
<label for="performer_count">
Performer Count
</label>
<input id="performer_count" class="form-control" type="tel" name="performer_count" value="{{ band_info.performer_count|default:band.estimated_performer_count }}" />
<span class="help-text">
To ensure that we have assigned the correct number of badges to your band, please confirm the number
of performers in your band.
</p>
</div>
</div>

<div class="form-group">
<label class="col-sm-2 control-label">PoC Phone Number:</label>
<div class="col-sm-6">
<input class="form-control" type="text" name="poc_phone" value="{{ band_info.poc_phone|default:band.group.leader.cellphone }}" />
<p class="help-text">
</span>
</li>
<li class="input-field">
<label for="poc_phone">
PoC Phone Number
</label>
<input id="poc_phone" class="form-control" type="tel" name="poc_phone" value="{{ band_info.poc_phone|default:band.group.leader.cellphone }}" />
<span class="help-text">
Please enter the cellphone number of your preferred Point of Contact for any issues we may need to
contact you about on-site.
</p>
</div>
</div>

<div class="form-group">
<label class="col-sm-2 control-label">Arrival Time:</label>
<div class="col-sm-6">
<input class="form-control" type="text" name="arrival_time" value="{{ band_info.arrival_time }}" />
<p class="help-text">
</span>
</li>
<li class="input-field">
<label for="arrival_time">
Arrival Time
</label>
<input id="arrival_time" class="form-control" type="text" name="arrival_time" value="{{ band_info.arrival_time }}" />
<span class="help-text">
Please be as specific as possible about the day and time you plan on arriving at {{ c.EVENT_NAME }}.
</p>
</div>
</div>

<div class="form-group">
<label class="col-sm-2 control-label">Parking:</label>
<div class="col-sm-6">
{% checkbox band_info.bringing_vehicle %} We will be parking at MAGFest.
</div>
</div>

<div id="vehicle-info" class="form-group" style="display:none">
<label class="col-sm-2 control-label">Vehicle Information:</label>
<div class="col-sm-6">
<input class="form-control" type="text" name="vehicle_info" value="{{ band_info.vehicle_info }}" />
<p class="help-text">
</span>
</li>
<li class="input-field">
{% checkbox band_info.bringing_vehicle %}
<label for="bringing_vehicle" class="makematch">We will be parking at MAGFest</label>
</li>
​
<li id="vehicle-info" class="input-field" style="display:none">
<label for="vehicle-info">
Vehicle Information</label>
<input class="form-control" id="vehicle-info" type="text" name="vehicle_info" value="{{ band_info.vehicle_info }}" />
<span class="help-text">
If you're parking on-site, then please tell us the vehicle info (car, truck, attached trailer, tour bus, monster truck), so we can ensure parking availability.
</p>
</div>
</div>

<div class="form-group">
<div class="col-sm-6 col-sm-offset-2">
<button type="submit" class="btn btn-primary">Upload Band Info</button>
</div>
</div>
</span>
</li>
<li class="input-field">
<button type="submit" class="btn waves-effect waves-light blue darken-1">
Upload Band Info
</button>
</li>

</ul>
</form>

<script>
Expand Down
90 changes: 50 additions & 40 deletions bands/templates/bands/bio.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,62 +3,72 @@

<h3>Bio Info for {{ band.group.name }}</h3>

Please provide a short bio for our website. Everything else is optional, but if you provide a picture and any social media
information, we'll include that as well.
<p>
Please provide a short bio for our website. Everything else is optional, but if you provide a picture and any social media
information, we'll include that as well.
</p>

<br/> <br/>

<form method="post" action="bio" class="form-horizontal" role="form" enctype="multipart/form-data">
<input type="hidden" name="band_id" value="{{ band.id }}" />
<input type="hidden" name="id" value="{{ band_bio.db_id }}" />
{% csrf_token %}

<div class="form-group">
<label class="col-sm-2 control-label">Short Bio:</label>
<div class="col-sm-6">
<textarea class="form-control" name="desc">{{ band_bio.desc }}</textarea>
</div>
</div>
<ul>
<li class="input-field">
<label for="desc" class="control-label">
Short Bio
</label>
<textarea id="desc" name="desc">{{ band_bio.desc }}</textarea>
</li>

<div class="form-group">
<label class="col-sm-2 control-label optional-field">Website:</label>
<div class="col-sm-6">
<input type=text" class="form-control" name="website" value="{{ band_bio.website }}" />
</div>
</div>
<li class="input-field">
<label for="website" class="control-label optional-field">
Website
</label>
<input type="text" class="form-control" id="website" name="website" value="{{ band_bio.website }}" />
</li>

<div class="form-group">
<label class="col-sm-2 control-label optional-field">Facebook:</label>
<div class="col-sm-6">
<input type=text" class="form-control" name="facebook" value="{{ band_bio.facebook }}" />
</div>
</div>
<li class="input-field">
<label for="facebook" class="control-label optional-field">
Facebook
</label>
<input type="text" class="form-control" id="facebook" name="facebook" value="{{ band_bio.facebook }}" />
</li>

<div class="form-group">
<label class="col-sm-2 control-label optional-field">Twitter:</label>
<div class="col-sm-6">
<input type=text" class="form-control" name="twitter" value="{{ band_bio.twitter }}" />
</div>
</div>
<li class="input-field">
<label for="twitter" class="control-label optional-field">
Twitter
</label>
<input type="text" class="form-control" id="twitter" name="twitter" value="{{ band_bio.twitter }}" />
</li>

<div class="form-group">
<label class="col-sm-2 control-label optional-field">Other Social Media:</label>
<div class="col-sm-6">
<input type=text" class="form-control" name="other_social_media" value="{{ band_bio.other_social_media }}" />
</div>
</div>
<li class="input-field">
<label for="other_social_media" class="control-label optional-field">
Other Social Media
</label>
<input type="text" class="form-control" id="other_social_media" name="other_social_media" value="{{ band_bio.other_social_media }}" />
</li>

<div class="form-group">
<label class="col-sm-2 control-label optional-field">Picture:</label>
<div class="col-sm-6">
</ul>

<div class="file-field input-field">
<div class="btn blue darken-1 optional-field">
<span>
Picture
</span>
<input type="file" name="bio_pic" />
</div>
<div class="file-path-wrapper">
<input class="file-path validate" type="text">
</div>

</div>

<div class="form-group">
<div class="col-sm-6 col-sm-offset-2">
<button type="submit" class="btn btn-primary">Upload Bio Info</button>
</div>
<div class="input-field">
<button type="submit" class="btn blue darken-1">
Upload Bio Info
</button>
</div>
</form>

Expand Down
2 changes: 1 addition & 1 deletion bands/templates/bands/charity.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ <h3>Charity Donations</h3>
MAGFest hosts a yearly charity auction, with 100% of proceeds going to
<a target="_blank" href="http://childsplaycharity.org/">Child's Play</a>. Do you have any cool stuff you can sign that
you think would sell at the auction? Our attendees love it when performers they admire sign stuff! If you've got
anything to donate, please tell us what it is!
anything to donate, please tell us what it is! (We love silly things! If you have a silly thing, please suggest!)

<br/> <br/>

Expand Down
85 changes: 52 additions & 33 deletions bands/templates/bands/panel.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,64 +11,83 @@
});
</script>

<h2>Want a Panel?</h2>
<h2>
Want a Panel?
</h2>

<p>
Many of our musical guests are also interested in offering an panel. While we cannot guarantee that we'll have room in
our schedule to accommodate all requests, we definitely want to hear your ideas. Please fill out the

<br/> <br/>
our schedule to accommodate all requests, we definitely want to hear your ideas.
</p>
<p>
If you have an idea please fill out the form below:
</p>

<form method="post" action="panel" class="form-horizontal" role="form">
<input type="hidden" name="band_id" value="{{ band.id }}" />
<input type="hidden" name="id" value="{{ band_panel.db_id }}" />
{% csrf_token %}

<div class="form-group">
<label class="col-sm-2 control-label">Want a Panel?</label>
<div class="col-sm-6" style="padding-top:7px">
<select name="wants_panel">
<option value="">Do you want a panel?</option>
{% options c.BAND_PANEL_OPTS band_panel.wants_panel %}
</select>
</div>
</div>
<div class="input-field">
<select name="wants_panel" disabled selected>
<option value="">
Do you want a panel?
</option>
{% options c.BAND_PANEL_OPTS band_panel.wants_panel %}
</select>
<label>
Want a Panel?
</label>
</div>

<div class="form-group panel-info">
<label class="col-sm-2 control-label">Panel Name:</label>
<div class="col-sm-6">
<ul>
<li class="input-field panel-info">
<label class="col-sm-4 control-label">
Panel Name
</label>
<div class="col-sm-4">
<input type="text" class="form-control" name="name" value="{{ band_panel.name }}" />
</div>
</div>
</li>

<div class="form-group panel-info">
<label class="col-sm-2 control-label">Panel Length:</label>
<div class="col-sm-6">
<li class="input-field panel-info">
<label class="col-sm-4 control-label">
Panel Length
</label>
<div class="col-sm-4">
<input type="text" class="form-control" name="length" value="{{ band_panel.length }}" />
<p class="help-text">
An hour is typical, including time for Q&A.
</p>
</div>
</div>
</li>

<div class="form-group panel-info">
<label class="col-sm-2 control-label">Panel Description:</label>
<div class="col-sm-6">
<li class="input-field panel-info">
<label class="col-sm-4 control-label">
Panel Description
</label>
<div class="col-sm-4">
<textarea class="form-control" rows="3" name="desc">{{ band_panel.desc }}</textarea>
</div>
</div>
</li>

<div class="form-group panel-info">
<label class="col-sm-2 control-label">Tech Needs:</label>
<div class="col-sm-6">
<li class="input-field panel-info">
<label class="col-sm-4 control-label">
Tech Needs
</label>
<div class="col-sm-4">
{% checkgroup band_panel.tech_needs %}
</div>
</div>
</li>

<div class="form-group">
<div class="col-sm-6 col-sm-offset-2">
<button class="btn btn-primary">Submit Panel Preferences</button>
<li class="form-group">
<div class="col-sm-4 col-sm-offset-4">
<button class="btn btn-primary">
Submit Panel Preferences
</button>
</div>
</div>
</li>
</ul>
</form>

{% endblock %}
Loading