Skip to content

Commit cf6cde8

Browse files
OdeYecOdeYec
committed
merged and deleted old calendar template files
1 parent ab1d671 commit cf6cde8

File tree

4 files changed

+92
-91
lines changed

4 files changed

+92
-91
lines changed

‎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>

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

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,40 @@
11
<nav class="text-lightgray background-darkblue">
2-
<div class="menu">
3-
<div class="fixed-features">
4-
<div>
5-
<a href="/profile">
6-
<ion-icon name="person-circle-outline"></ion-icon>
7-
</a>
8-
</div>
9-
<div>
10-
<ion-icon name="search" alt="Search icon"></ion-icon>
11-
</div>
12-
<div>
13-
<ion-icon name="settings-outline"></ion-icon>
14-
</div>
15-
<div>
16-
<ion-icon name="calendar-outline"></ion-icon>
17-
</div>
18-
<div>
19-
<ion-icon name="cube-outline"></ion-icon>
20-
</div>
21-
</div>
22-
<div class="user-features">
23-
<div class="feature" name="feather01">
24-
<ion-icon name="chatbox"></ion-icon>
25-
</div>
26-
</div>
27-
<div id="open-features">
28-
<ion-icon name="ellipsis-vertical"></ion-icon>
29-
</div>
30-
<div>
31-
<a title="About Us" href="{{ url_for('about') }}">
32-
<ion-icon name="information-circle-outline"></ion-icon>
33-
</a>
34-
</div>
2+
<div class="menu">
3+
4+
<div class="fixed-features">
5+
<div>
6+
<a href="/profile">
7+
<ion-icon name="person-circle-outline"></ion-icon>
8+
</a>
9+
</div>
10+
<div>
11+
<ion-icon name="search" alt="Search icon"></ion-icon>
12+
</div>
13+
<div>
14+
<ion-icon name="settings-outline"></ion-icon>
15+
</div>
16+
<div>
17+
<ion-icon name="calendar-outline"></ion-icon>
18+
</div>
19+
<div>
20+
<ion-icon name="cube-outline"></ion-icon>
21+
</div>
22+
<div>
23+
<a title="About Us" href="{{ url_for('about') }}">
24+
<ion-icon name="information-circle-outline"></ion-icon>
25+
</a>
26+
</div>
3527
</div>
36-
</nav>
28+
29+
<div class="user-features">
30+
<div class="feature" name="feather01">
31+
<ion-icon name="chatbox"></ion-icon>
32+
</div>
33+
</div>
34+
35+
<div id="open-features">
36+
<ion-icon name="ellipsis-vertical"></ion-icon>
37+
</div>
38+
39+
</div>
40+
</nav>

0 commit comments

Comments
 (0)