Skip to content

Commit deacc56

Browse files
committed
Making nav consistent on lottery pages
1 parent ca8f90f commit deacc56

16 files changed

+63
-58
lines changed

uber/templates/hotel_lottery_admin/edit_hotel.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
{% block title %}{{ 'Edit' if hotel.id else 'Add' }} Hotel{% endblock %}
33
{% block content %}
44

5+
{% include 'hotel_lottery_admin/nav.html' %}
6+
57
<h2>{{ 'Edit' if hotel.id else 'Add' }} Hotel</h2>
68

79
<div class="mb-3">

uber/templates/hotel_lottery_admin/edit_inventory_item.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
{% block title %}{{ 'Edit' if item.id else 'Add' }} Inventory Item{% endblock %}
33
{% block content %}
44

5+
{% include 'hotel_lottery_admin/nav.html' %}
6+
57
<h2>{{ 'Edit' if item.id else 'Add' }} Inventory Item</h2>
68

79
<div class="mb-3">

uber/templates/hotel_lottery_admin/edit_room_type.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
{% block title %}{{ 'Edit' if room_type.id else 'Add' }} Room Type{% endblock %}
33
{% block content %}
44

5+
{% include 'hotel_lottery_admin/nav.html' %}
6+
57
<h2>{{ 'Edit' if room_type.id else 'Add' }} Room Type</h2>
68

79
<div class="mb-3">

uber/templates/hotel_lottery_admin/export_tracking.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
{% block title %}Export Tracking{% endblock %}
33
{% block content %}
44

5-
<h2>Hotel Export Tracking</h2>
6-
7-
<div class="mb-3">
8-
<a href="index" class="btn btn-outline-secondary">Back to Applications</a>
9-
</div>
5+
{% include 'hotel_lottery_admin/nav.html' %}
106

117
<table class="table table-hover">
128
<thead>

uber/templates/hotel_lottery_admin/feed.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
{% block title %}Recent Changes to Lottery Applications{% endblock %}
33
{% block content %}
44

5-
<h2>Feed of Database Changes to Lottery Applications <a href="index" class="btn btn-primary">Back to Application List</a></h2>
5+
{% include 'hotel_lottery_admin/nav.html' %}
6+
7+
<h2>Feed of Database Changes to Lottery Applications</h2>
68

79
<div class="card card-body">
810
<form method="get" action="feed" style="text-align:center">

uber/templates/hotel_lottery_admin/form.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
{% block title %}Lottery Application{% if id != "None" and application.attendee %} for {{ application.attendee_name }}{% endif %}{% endblock %}
55
{% block content %}
66

7+
{% include 'hotel_lottery_admin/nav.html' %}
8+
79
{{ macros.nav_menu(
810
application, c.PAGE_PATH,
911
"../hotel_lottery_admin/form?id={id}", "Application Data", True,

uber/templates/hotel_lottery_admin/history.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
{% import 'macros.html' as macros with context %}
33
{% block title %}Lottery Application History for {{ application.attendee_name }}{% endblock %}
44
{% block content %}
5+
{% include 'hotel_lottery_admin/nav.html' %}
6+
57
{{ macros.nav_menu(
68
application, c.PAGE_PATH,
79
"../hotel_lottery_admin/form?id={id}", "Application Data", True,

uber/templates/hotel_lottery_admin/hotel_inventory.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
{% block title %}Hotel Lottery Inventory{% endblock %}
33
{% block content %}
44

5+
{% include 'hotel_lottery_admin/nav.html' %}
6+
57
{% macro inventory_table(inventory, display_hotel=True) %}
68
{% for hotel, room_list in inventory.items() %}
79
<tr>
@@ -37,7 +39,6 @@
3739

3840
<h2 class="mb-3">
3941
Hotel Lottery Inventory -- {{ now_localized()|datetime("%m/%d/%Y, %-I:%M%p") }}
40-
<small><a href="index">Back to Lottery Entries</a></small>
4142
</h2>
4243

4344
<h3>Standard Rooms</h3>

uber/templates/hotel_lottery_admin/index.html

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{% block title %}Hotel Lottery Admin{% endblock %}
33
{% block content %}
44

5-
<h2>Hotel Lottery Applications</h2>
5+
{% include 'hotel_lottery_admin/nav.html' %}
66

77
<div class="row g-3 mb-3">
88
<div class="col-sm">
@@ -28,33 +28,11 @@ <h2>Hotel Lottery Applications</h2>
2828
</div>
2929
</div>
3030

31-
<div class="d-flex gap-3 mb-3 justify-content-between">
32-
<div>
33-
{{ total_count }} total application{{ total_count|pluralize }}
34-
| {{ complete_count }} completed valid application{{ complete_count|pluralize }}
35-
<br/>{{ room_count }} requested room{{ room_count|pluralize }}
36-
| {{ suite_count }} requested suite{{ suite_count|pluralize }}
37-
</div>
38-
<div class="text-end">
39-
<a href="hotel_inventory">View Room/Suite Inventory</a>
40-
&nbsp;
41-
<a href="manage_hotels">Hotels</a>
42-
&nbsp;
43-
<a href="manage_room_types">Room Types</a>
44-
&nbsp;
45-
<a href="manage_inventory">Inventory</a>
46-
&nbsp;
47-
<a href="lottery_runs">Lottery Runs</a>
48-
&nbsp;
49-
<a href="export_tracking">Export Tracking</a>
50-
&nbsp;
51-
<a href="hotel_inventory_zip"><i class="fa fa-download"></i> Assigned Rooms by Date</a>
52-
&nbsp;
53-
<a href="assigned_entries"><i class="fa fa-download"></i> Passkey Export</a>
54-
</div>
55-
</div>
56-
<div class="d-flex gap-3 mb-3 justify-content-end">
57-
<a href="lottery_runs" class="btn btn-primary">Manage Lottery Runs</a>
31+
<div class="mb-3">
32+
{{ total_count }} total application{{ total_count|pluralize }}
33+
| {{ complete_count }} completed valid application{{ complete_count|pluralize }}
34+
<br/>{{ room_count }} requested room{{ room_count|pluralize }}
35+
| {{ suite_count }} requested suite{{ suite_count|pluralize }}
5836
</div>
5937

6038
{% if search_results %}

uber/templates/hotel_lottery_admin/lottery_run_detail.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22
{% block title %}Lottery Run: {{ lottery_run.name }}{% endblock %}
33
{% block content %}
44

5-
<h2>Lottery Run: {{ lottery_run.name }}</h2>
5+
{% include 'hotel_lottery_admin/nav.html' %}
66

7-
<div class="mb-3">
8-
<a href="lottery_runs" class="btn btn-outline-secondary">Back to Lottery Runs</a>
9-
</div>
7+
<h2>Lottery Run: {{ lottery_run.name }}</h2>
108

119
<div class="row g-3 mb-3">
1210
<div class="col-md-6">

0 commit comments

Comments
 (0)