Skip to content

Commit d7450b6

Browse files
OdeYecOdeYec
authored
Fixes to Profile and Calendar Month View Templates (#327)
* merged and deleted old calendar template files * merged and deleted old calendar template files * added missing export calendar feature to profile page
1 parent fe4cab9 commit d7450b6

File tree

10 files changed

+152
-250
lines changed

10 files changed

+152
-250
lines changed

‎app/templates/calendar/add_week.html

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎app/templates/calendar/calendar.html

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎app/templates/calendar/layout.html

Lines changed: 0 additions & 81 deletions
This file was deleted.

‎app/templates/index.html

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,42 @@
33
{% block content %}
44

55
<div class="mx-auto">
6-
<main class="d-flex justify-content-center">
7-
<div>
8-
<h2 class="fs-1 fw-bold">
9-
PyLendar
10-
<br>
11-
</h2>
12-
<p>
13-
Open Source Calendar built with Python
14-
</p>
15-
<div class="d-flex position-relative">
16-
<div class="container mx-auto gap-3">
6+
<main class="d-flex justify-content-center">
7+
<div>
8+
<h2 class="fs-1 fw-bold">
9+
PyLendar
10+
<br>
11+
</h2>
12+
<p>
13+
Open Source Calendar built with Python
14+
</p>
15+
<div class="d-flex position-relative">
16+
<div class="container mx-auto gap-3">
1717

18-
{% if quote %}
19-
{% if not quote.author%}
20-
<p><i>"{{ quote.text }}"</i></p>
21-
{% else %}
22-
<p><i>"{{ quote.text }}"</i> <span style="font-size: small;">&nbsp; \ {{quote.author}}</span>
23-
</p>
24-
{% endif %}
25-
{% endif %}
26-
</div>
27-
</div>
28-
<div class="d-flex justify-content-center">
29-
<div class="d-flex justify-content-center">
30-
<a href="{{ url_for('calendar') }}"
31-
class="btn btn-lg btn-primary shadow-lg bg-body p-3 mb-5 bg-gradient2 landing-page-button"
32-
type="button">
33-
<span>Get Started</span>
34-
</a>
35-
</div>
36-
</div>
18+
{% if quote %}
19+
{% if not quote.author%}
20+
<p><i>"{{ quote.text }}"</i></p>
21+
{% else %}
22+
<p><i>"{{ quote.text }}"</i> <span style="font-size: small;">&nbsp; \ {{quote.author}}</span>
23+
</p>
24+
{% endif %}
25+
{% endif %}
3726
</div>
38-
</main>
39-
<div>
40-
<img class="d-block w-100" src="{{ url_for('static', path='/images/calendar.jpg') }}" alt="calendar image">
27+
</div>
28+
<div class="d-flex justify-content-center">
29+
<div class="d-flex justify-content-center">
30+
<a href="{{ url_for('calendar') }}"
31+
class="btn btn-lg btn-primary shadow-lg bg-body p-3 mb-5 bg-gradient2 landing-page-button"
32+
type="button">
33+
<span>Get Started</span>
34+
</a>
35+
</div>
36+
</div>
4137
</div>
38+
</main>
39+
<div>
40+
<img class="d-block w-100" src="{{ url_for('static', path='/images/calendar.jpg') }}" alt="calendar image">
41+
</div>
4242
</div>
4343

44-
{% endblock %}
44+
{% endblock %}

‎app/templates/partials/calendar/calendar_base.html

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
{% extends "./partials/base.html" %}
22
{% block head %}
3-
{{super()}}
4-
5-
<!-- CSS -->
6-
<link rel="stylesheet" type="text/css" href="{{ url_for('static', path='/grid_style.css') }}">
7-
3+
{{super()}}
4+
<!-- CSS -->
5+
<link rel="stylesheet" type="text/css" href="{{ url_for('static', path='/grid_style.css') }}">
86
{% endblock head %}
97
{% block page_name %}Month View{% endblock page_name %}
108
{% block body %}
11-
<div class="pyldr-container">
12-
{% include 'partials/calendar/navigation.html' %}
13-
<div id="feature-settings">
14-
{% include 'partials/calendar/feature_settings/example.html' %}
15-
</div>
16-
<div class="content">
17-
{% block content %}
18-
{% endblock content %}
19-
</div>
9+
<div class="pyldr-container">
10+
{% include 'partials/calendar/navigation.html' %}
11+
<div id="feature-settings" class="background-lightgray">
12+
{% include 'partials/calendar/feature_settings/example.html' %}
2013
</div>
21-
22-
<!-- Scripts -->
23-
<script src="{{ url_for('static', path='/js/grid_scripts.js') }}"></script>
24-
<script src="{{ url_for('static', path='/js/grid_navigation.js') }}"></script>
25-
{% endblock body %}
14+
<div class="content">
15+
{% block content %}
16+
{% endblock content %}
17+
</div>
18+
</div>
19+
<!-- Scripts -->
20+
<script src="{{ url_for('static', path='/js/grid_scripts.js') }}"></script>
21+
<script src="{{ url_for('static', path='/js/grid_navigation.js') }}"></script>
22+
{% endblock body %}

‎app/templates/partials/calendar/monthly_view/add_week.html

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{% for week in weeks_block %}
2-
<div class="week">
3-
{% for day in week.days %}
4-
<div class="{{ day.css['day_container'] }}" id="{{ day.set_id() }}">
5-
<div class="month-day-header">
6-
<div class="{{ day.css['date'] }}">{{ day }}</div>
7-
<div><a href="#" class="add-small">+</a></div>
8-
</div>
9-
{% for devent in day.dailyevents %}
10-
<div class="{{ day.css['daily_event'] }}">
11-
<div class="{{ day.css['daily_event_front'] }}">{{ devent[0] }}</div>
12-
<div class="{{ day.css['daily_event_back'] }}">{{ devent[1] }}</div>
13-
</div>
14-
{% endfor %}
15-
{% for event in day.events %}
16-
<div class="{{ day.css['event'] }}"><b>{{ event[0] }}</b> {{ event[1] }}</div>
17-
{% endfor %}
18-
</div>
2+
<div class="week">
3+
{% for day in week.days %}
4+
<div class="{{ day.css['day_container'] }}" id="{{ day.set_id() }}">
5+
<div class="month-day-header">
6+
<div class="{{ day.css['date'] }}">{{ day }}</div>
7+
<div><a href="#" class="add-small">+</a></div>
8+
</div>
9+
{% for devent in day.dailyevents %}
10+
<div class="{{ day.css['daily_event'] }}">
11+
<div class="{{ day.css['daily_event_front'] }}">{{ devent[0] }}</div>
12+
<div class="{{ day.css['daily_event_back'] }}">{{ devent[1] }}</div>
13+
</div>
14+
{% endfor %}
15+
{% for event in day.events %}
16+
<div class="{{ day.css['event'] }}"><b>{{ event[0] }}</b> {{ event[1] }}</div>
1917
{% endfor %}
2018
</div>
21-
{% endfor %}
19+
{% endfor %}
20+
</div>
21+
{% endfor %}

‎app/templates/partials/calendar/monthly_view/monthly_grid.html

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
<div class="calendar">
22
<div class="calender-days-titles">
33
{% for d in week_days %}
4-
{% if d == day.sday %}
5-
<div class="day-title underline-yellow"><b>{{ d.upper() }}</b></div>
6-
{% else %}
7-
<div class="day-title"> {{ d.upper() }}</div>
8-
{% endif %}
4+
{% if d == day.sday %}
5+
<div class="day-title underline-yellow"><b>{{ d.upper() }}</b></div>
6+
{% else %}
7+
<div class="day-title"> {{ d.upper() }}</div>
8+
{% endif %}
99
{% endfor %}
1010
</div>
1111
<div id="calender-grid">
1212
{% include 'partials/calendar/monthly_view/add_week.html' %}
1313
</div>
1414
</div>
1515
<div>
16-
<div class="sticky">
17-
<div id="months-navigation">
18-
<a href="#{{weeks_block[0].days[0].set_id()}}" class="button background-yellow text-darkblue">
19-
TODAY
20-
</a>
21-
<a id="month-2"></a>
22-
<ion-icon name="caret-up-outline"></ion-icon>
23-
<a id="month-1"></a>
24-
<ion-icon name="caret-up-outline"></ion-icon>
25-
<a id="month0"></a>
26-
<ion-icon name="caret-down-outline"></ion-icon>
27-
<a id="month1"></a>
28-
<ion-icon name="caret-down-outline"></ion-icon>
29-
<a id="month2"></a>
30-
</div>
16+
<div class="sticky">
17+
<div id="months-navigation">
18+
<a href="#{{weeks_block[0].days[0].set_id()}}" class="button background-yellow text-darkblue">
19+
TODAY
20+
</a>
21+
<a id="month-2"></a>
22+
<ion-icon name="caret-up-outline"></ion-icon>
23+
<a id="month-1"></a>
24+
<ion-icon name="caret-up-outline"></ion-icon>
25+
<a id="month0"></a>
26+
<ion-icon name="caret-down-outline"></ion-icon>
27+
<a id="month1"></a>
28+
<ion-icon name="caret-down-outline"></ion-icon>
29+
<a id="month2"></a>
3130
</div>
31+
</div>
3232
</div>
3333
<div id="day-view"></div>

0 commit comments

Comments
 (0)