diff --git a/benchcoach/static/benchcoach.svg b/benchcoach/static/benchcoach.svg new file mode 100644 index 0000000..858d545 --- /dev/null +++ b/benchcoach/static/benchcoach.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/benchcoach/static/css/base.css b/benchcoach/static/css/base.css deleted file mode 100644 index 8a60244..0000000 --- a/benchcoach/static/css/base.css +++ /dev/null @@ -1,7 +0,0 @@ -body { - padding-top: 5rem; -} -.starter-template { - padding: 3rem 1.5rem; - text-align: center; -} \ No newline at end of file diff --git a/benchcoach/static/tommy-lasorda.jpg b/benchcoach/static/tommy-lasorda.jpg new file mode 100644 index 0000000..2540ad0 Binary files /dev/null and b/benchcoach/static/tommy-lasorda.jpg differ diff --git a/events/views.py b/events/views.py index 9b83e5f..d4e5b8d 100644 --- a/events/views.py +++ b/events/views.py @@ -14,6 +14,7 @@ class EventsListView(BenchcoachListView): page_title = "Events" title_strf = '{item.away_team} vs. {item.home_team}' body_strf = "{item.start:%a, %b %-d, %-I:%M %p},\n{item.venue}" + active_tabs = ['events_tab'] def get_context_data(self): context = super().get_context_data() diff --git a/lib/views.py b/lib/views.py index cf00d68..cf67117 100644 --- a/lib/views.py +++ b/lib/views.py @@ -21,6 +21,7 @@ class BenchcoachListView(TemplateView): title_strf = "{item}" subtitle_strf = "" body_strf = "" + active_tabs = [] def get_context_data(self): items = self.Model.objects.all() @@ -42,6 +43,8 @@ class BenchcoachListView(TemplateView): for item in items ] } + for tab in self.active_tabs: + context[tab] = 'active' return context class BenchcoachEditView(TemplateView): diff --git a/lineups/models.py b/lineups/models.py index 2dd59ca..679e3d6 100644 --- a/lineups/models.py +++ b/lineups/models.py @@ -20,7 +20,7 @@ class Positioning(models.Model): ('DH','DH') ] position = models.CharField(choices=positions, default=None, max_length=2, null=True, blank=True) - order = models.PositiveSmallIntegerField(default=0, null=True) + order = models.PositiveSmallIntegerField(default=None, null=True) class Meta: unique_together = ('player', 'event',) diff --git a/lineups/templates/lineups/lineup.html b/lineups/templates/lineups/lineup.html index 1f9ebdb..a288036 100644 --- a/lineups/templates/lineups/lineup.html +++ b/lineups/templates/lineups/lineup.html @@ -1,47 +1,68 @@ {% extends 'base.html' %}{% block title %} {{ title }} {% endblock %}{% load crispy_forms_tags %}{% load static %} +{% with events_active="active" %} +{% block precontent %} +
+ < {{ previous_event.start|date:"D" }} {{ previous_event.start|date:"n/j" }} +
+
{{ event.away_team.name }} vs. {{ event.home_team.name }}
+

{{ event.start|date:"l, F j, Y g:i A" }}
{{ event.venue.name }}

+
+
+ {{ next_event.start|date:"D" }} {{ next_event.start|date:"n/j" }} > +
+ + +{% endblock %}{% endwith %} {% block content %} -

{{ title }}

- {{ event.away_team.name }} vs. {{ event.home_team.name }}
- {{ event.start|date:"l, F j, Y g:i A" }}
- {{ event.venue.name }}
-
+
+
+
+

Away Team: {{ event.away_team.name }}

+

Home Team: {{ event.home_team.name }}

+

Day: {{ event.start|date:"l, F j Y" }}

+

Time: {{ event.start|date:"g:i A" }}

+

Venue: {{ event.venue.name }}

+
+
+
{% csrf_token %} {{ formset.management_form }}
+{# #}
-
Lineup
- - {% include 'lineups/player-table-header.html' %} - - {% for form in formset %} - {% if form.instance.order or form.instance.position == "P" %} - {% include 'lineups/player-table-row.html' with form=form available_display="none" order_display="table-cell" %} - {% endif %} - {% endfor %} - -
- +
+
DH'd
+
+ {% include 'lineups/player-table.html' with table_id="dhd" formset=formset_dhd available_class="d-none" order_class="d-none"%} +
+
+
+
Lineup
+
+ {% include 'lineups/player-table.html' with table_id="lineup" formset=formset_lineup available_class="d-none"%} +
+
+
-
Players
- - {% include 'lineups/player-table-header.html' %} - - {% for form in formset|dictsortreversed:"availability.available"%} - {% if not form.instance.order and not form.instance.position == "P" %} - {% include 'lineups/player-table-row.html' with form=form available_display="table-cell" order_display="none" %} - {% endif %} - {% endfor %} - -
+
+
Bench
+
+ {% include 'lineups/player-table.html' with table_id="bench" formset=formset_bench order_class="d-none"%} +
+
+