aaron/fincom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up styles woo

Browse Source
This commit is contained in:
Aaron Gutierrez
2018-10-21 10:10:27 -07:00
parent 0eba3c29a3
commit 695a4b9af6
20 changed files with 548 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
templates/boilerplate.html
View File

@@ -9,15 +9,19 @@
</head>
<body>
<div class="nav">
<a href="/logout">logout</a>
{% if fincom %}
<a href="/committees">manage</a>
{% endif %}
<h3>The Aaron Gutierrez, '17, Fincom Web App</h3>
<div>
{% if fincom %}
<a href="/committees">manage</a>
{% endif %}
<a href="/logout">logout</a>
</div>
</div>
<div class="container">
{% block main %}
{% endblock %}
<div class="content">
<div class="container">
{% block main %}
{% endblock %}
</div>
</div>
{% block bottom %}
{% endblock %}

8
templates/fincom/index.html
View File

@@ -11,13 +11,13 @@
<div>
<h3>Delta Beta Chapter</h3>
<h2>Fincom Webapp</h2>
{% if error %}
<p>{{ error }}</p>
{% endif %}
<a class="btn btn-info btn-lg"
<a class="btn btn-info"
href="/login/google-oauth2/?next={{ next }}">
Login with your AndrewID
</a>
{% if error %}
<p>{{ error }}</p>
{% endif %}
</div>
</body>
</html>

6
templates/items/details.html
View File

@@ -8,7 +8,7 @@
<div class="approve">
{% if I.details %}
<div class="details">
<span>Details:</span><br>
<span>Details</span><br>
{{ I.details }}</div>
{% endif %}
<div class="status">Status: <span>{{ I.statusText }}</span></div>
@@ -23,7 +23,9 @@
<a href="/items" class="btn">Back</a>
</div>
<a href="{{ I.image.url }}"><img src="{{ I.image.thumbnail.url }}"></a>
<a href="{{ I.image.url }}">
<img src="{{ I.image.thumbnail.url }}" alt="Click to view">
</a>
</div>
</div>

24
templates/items/edit.html
View File

@@ -5,25 +5,24 @@
{% block main %}
<div>
<a href="/items" class="btn pull-right">Back</a>
<h1>Edit Reimbursements</h1>
<hr>
<form action="/items/{{ I.pk }}/edit" method="post">
{% csrf_token %}
<div>
<div class="inputRow">
<label for="desc">Item</label>
<input id="desc" type="text" name="desc" placeholder="What you bought"
value="{{ I.desc }}">
</div>
<div>
<div class="inputRow">
<label for="event">Event</label>
<input id="event" type="text" name="event" placeholder="When we need it"
value="{{ I.event }}">
</div>
<div>
<div class="inputRow">
<label for="committee">Committee or Budget</label>
<select name="committee" id="committee">
{% for C in committees %}
@@ -36,29 +35,26 @@
</select>
</div>
<div>
<div class="inputRow">
<label for="cost">Cost</label>
<input id="cost" type="text" name="cost" placeholder="15.00"
value="{{ I.cost }}">
</div>
<div>
<div class="inputRow">
<label for="date">Date Purchased</label>
<input id="date" type="date" name="date" placeholder="mm/dd/yyyy"
value="{{ I.date_purchased }}">
</div>
<div class="clear">
<div>
<div class="inputRow">
<label for="details">Details</label>
<textarea id="details" name="details" rows="4" class="clear">{{ I.details }}</textarea>
</div>
<textarea id="details" name="details" rows="4">{{ I.details }}</textarea>
</div>
<div class="clear">
<div>
<input type="submit">
</div>
<div class="editActions">
<a href="/items" class="btn">Back</a>
<input type="submit" class="btn">
</div>
</form>
</div>

2
templates/items/item-email.html
View File

@@ -30,7 +30,7 @@ Please review and then approve or reject the request from {{ submitter }} for {{
</a>
<div style="color: #969499; font-size: 12px; margin: 0px;">
{% if I.approved or I.processed %}
Approved By:
Approved By:
{% for u in I.approved_by.all %}
{{ u.first_name }} {{ u.last_name }}
{% endfor %}

28
templates/items/item.html
View File

@@ -1,18 +1,20 @@
<div class="item">
<div class="committee">
{{ I.comName }}
</div>
{% if I.approved %}
<div class="cost approved">
{% elif I.processed %}
<div class="cost processed">
{% elif I.rejected %}
<div class="cost rejected">
{% else %}
<div class="cost newItem">
{% endif %}
${{ I.cost|floatformat:"2" }}
<div class="committeeAndCost">
<div class="committee">
{{ I.comName }}
</div>
{% if I.approved %}
<div class="cost approved">
{% elif I.processed %}
<div class="cost processed">
{% elif I.rejected %}
<div class="cost rejected">
{% else %}
<div class="cost newItem">
{% endif %}
${{ I.cost|floatformat:"2" }}
</div>
</div>
<a href="/items/{{ I.pk }}">
<div class="details-row">
<b>{{ I.event }}:</b>

34
templates/items/new.html
View File

@@ -5,27 +5,23 @@
{% block main %}
<div>
<h1>Add New Reimbursements</h1>
<h1>New Reimbursement</h1>
<hr>
<div class="rcol">
Make sure all information is accurate, you submit an itemized receipt, and
you select the correct committee.
</div>
<form action="/items/new" method="post" enctype="multipart/form-data">
{% csrf_token %}
<div>
<div class="inputRow">
<label for="desc">Item</label>
<input id="desc" type="text" name="desc" placeholder="What you bought">
</div>
<div>
<div class="inputRow">
<label for="event">Event</label>
<input id="event" type="text" name="event" placeholder="When we need it">
</div>
<div>
<div class="inputRow">
<label for="committee">Committee or Budget</label>
<select name="committee" id="committee">
<option disabled selected>Select a committee</option>
@@ -35,32 +31,34 @@
</select>
</div>
<div>
<div class="inputRow">
<label for="cost">Cost</label>
<input id="cost" type="text" name="cost" placeholder="15.00">
</div>
<div>
<div class="inputRow">
<label for="date">Date Purchased</label>
<input id="date" type="date" name="date" placeholder="mm/dd/yyyy">
</div>
<div class="clear">
<div>
<div class="inputRow">
<label for="details">Details</label>
<textarea id="details" name="details" rows="4" class="clear"></textarea>
</div>
<textarea id="details" name="details" rows="4"></textarea>
</div>
<div>
<div class="inputRow">
<label for="image">Receipt</label>
<input type="file" name="image" id="image" accept="image/*">
</div>
<div class="clear">
<div>
<input type="submit">
<div class="notes">
Make sure all information is accurate, you submit an itemized receipt, and
you select the correct committee.
</div>
<div class="editActions">
<a href="/items" class="btn">Back</a>
<input type="submit" class="btn">
</div>
</form>
</div>

16
templates/items/section.html
View File

@@ -5,13 +5,7 @@
{% empty %}
<div class="empty">No Reimbursements</div>
{% endfor %}
{% if items.has_next %}
<a class="page" href="?{{ pagination_key }}={{ items.next_page_number }}">
Older &rarr;
</a>
{% else %}
<a class="page empty">Older &rarr;</a>
{% endif %}
<div class="pagination">
{% if items.has_previous %}
<a class="page" href="?{{ pagination_key }}={{ items.previous_page_number }}">
&larr; Newer
@@ -19,4 +13,12 @@
{% else %}
<a class="page empty">&larr; Newer</a>
{% endif %}
{% if items.has_next %}
<a class="page" href="?{{ pagination_key }}={{ items.next_page_number }}">
Older &rarr;
</a>
{% else %}
<a class="page empty">Older &rarr;</a>
{% endif %}
</div>
</div>