Add course info cards & calendars for runs #259
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| .calendar-card .card-header .year { | ||
| color: #868e96; | ||
| } | ||
|
|
||
| table.calendar { | ||
| border-spacing: 0.25em; | ||
| border-collapse: separate; | ||
| display: block; | ||
| margin: 0.5em auto; | ||
| } | ||
|
|
||
| table.calendar tr { | ||
| height: 4em; | ||
| } | ||
|
|
||
| table.calendar td, | ||
| table.calendar th { | ||
| width: 14.28%; | ||
| min-width: 5em; | ||
| height: 100%; | ||
| background-color: rgba(0,0,0,.03); | ||
| vertical-align: center; | ||
| text-align: center; | ||
| box-sizing: border-box; | ||
| padding: 0; | ||
| } | ||
|
|
||
| table.calendar td.foreign-month { | ||
| background-color: transparent; | ||
| color: rgba(0,0,0,.1); | ||
| } | ||
|
|
||
| table.calendar td.no-event { | ||
| color: #343a40; | ||
| } | ||
|
|
||
| table.calendar td.event { | ||
| background-color: #3fb0ac; | ||
| color: white; | ||
| } | ||
|
|
||
| table.calendar td.event a { | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: center; | ||
| width: 100%; | ||
| height: 100%; | ||
| padding: 0.5em; | ||
| color: white; | ||
| } | ||
|
|
||
| table.calendar .session-number { | ||
| display: block; | ||
| } | ||
|
|
||
| table.calendar .session-title { | ||
| display: block; | ||
| width: 4em; | ||
| text-align: center; | ||
| text-overflow: '…'; | ||
| white-space: nowrap; | ||
| overflow: hidden; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| {% extends '_base.html' %} | ||
|
|
||
| {% block extra_links %} | ||
| <link rel="stylesheet" href="{{url_for('static', filename='css/calendar.css')}}"> | ||
| {% endblock extra_links%} | ||
|
|
||
| {% block content %} | ||
|
|
||
| <div class="page"> | ||
| <section class="container"> | ||
|
|
||
|
|
||
| <header class="lesson-header"> | ||
| <a href="{{ url_for('index') }}">Nauč se Python </a> | ||
|
|
||
| {% if course.vars['coach-present'] %} | ||
| > <a href="{{ url_for('runs') }}">Kurzy</a> | ||
| {% else %} | ||
| > <a href="{{ url_for('courses') }}">Materiály</a> | ||
| {% endif%} | ||
| > <a href="{{ course_url(course) }}">{{ course.title }}</a> | ||
| > Kalendář | ||
| <hr> | ||
| </header> | ||
|
|
||
| <h1>{{ course.title }}</h1> | ||
|
|
||
| {% if course.subtitle is defined and course.subtitle != None %} | ||
| <h2>{{ course.subtitle }}</h2> | ||
| {% endif%} | ||
|
|
||
| {% if course.start_date %} | ||
| {% for year, month in months %} | ||
| <h3> | ||
| {{ month | monthname }} <span class="year">{{ year }}</span> | ||
| </h3> | ||
| <table class="calendar"> | ||
| {% for date in calendar.itermonthdates(year, month) %} | ||
| {% if date.weekday() == 0 %}<tr>{% endif %} | ||
| {% if date.month == month %} | ||
| {% set session = sessions_by_date.get(date, None) %} | ||
| {% if session %} | ||
| <td class="event"> | ||
| <a href="{{ url_for('session_coverpage', course=course, session=session.slug) }}" | ||
| title="#{{ session.index+1 }} – {{ session.title }}"> | ||
| <span class="session-number"> | ||
| {{ date.day }}. {{ date.month }}. | ||
| </span> | ||
| <span class="session-title"> | ||
| {{ session.title }} | ||
| </span> | ||
| </a> | ||
| </td> | ||
| {% else %} | ||
| <td class="no-event"> | ||
| {{ date.day }} | ||
| </td> | ||
| {% endif %} | ||
| {% else %} | ||
| <td class="foreign-month"> | ||
| | ||
| </td> | ||
| {% endif %} | ||
| {% if date.weekday() == 6 %}</tr>{% endif %} | ||
| {% endfor %} | ||
| </tr> | ||
| </table> | ||
| {% endfor %} | ||
| {% else %} | ||
| Tento kurz nemá kalendář. | ||
| {% endif %} | ||
|
|
||
| </section> | ||
| </div> | ||
|
|
||
| {% endblock content %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am wondering, if there possibly isn't already a function, that does this?
Now I don't know if this would be any better, faster or more readable (probably not). However when dealing with dates, I'd probably prefer to stick with the date type. (I know, those are in fact months...)
Anyway: please make it a function (regardless of the implementation). That would make it:
months_range(start_date, end_date))There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think
(year, month)tuples are a natural representation here. Datetime objects don't offer much functionality for using them as months.I went with
list_months; I didn't use “range” as the end date is included.