Skip to content

Fixes to Profile and Calendar Month View Templates #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 21, 2021
Merged

Fixes to Profile and Calendar Month View Templates #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf6cde8
merged and deleted old calendar template files
OdeYec Feb 20, 2021
20b5026
merged and deleted old calendar template files
OdeYec Feb 20, 2021
4389f6d
added missing export calendar feature to profile page
OdeYec Feb 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions app/templates/calendar/add_week.html
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions app/templates/calendar/calendar.html
View file
Open in desktop

This file was deleted.

81 changes: 0 additions & 81 deletions app/templates/calendar/layout.html
View file
Open in desktop

This file was deleted.

68 changes: 34 additions & 34 deletions app/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,42 +3,42 @@
{% block content %}

<div class="mx-auto">
<main class="d-flex justify-content-center">
<div>
<h2 class="fs-1 fw-bold">
PyLendar
<br>
</h2>
<p>
Open Source Calendar built with Python
</p>
<div class="d-flex position-relative">
<div class="container mx-auto gap-3">
<main class="d-flex justify-content-center">
<div>
<h2 class="fs-1 fw-bold">
PyLendar
<br>
</h2>
<p>
Open Source Calendar built with Python
</p>
<div class="d-flex position-relative">
<div class="container mx-auto gap-3">

{% if quote %}
{% if not quote.author%}
<p><i>"{{ quote.text }}"</i></p>
{% else %}
<p><i>"{{ quote.text }}"</i> <span style="font-size: small;">&nbsp; \ {{quote.author}}</span>
</p>
{% endif %}
{% endif %}
</div>
</div>
<div class="d-flex justify-content-center">
<div class="d-flex justify-content-center">
<a href="{{ url_for('calendar') }}"
class="btn btn-lg btn-primary shadow-lg bg-body p-3 mb-5 bg-gradient2 landing-page-button"
type="button">
<span>Get Started</span>
</a>
</div>
</div>
{% if quote %}
{% if not quote.author%}
<p><i>"{{ quote.text }}"</i></p>
{% else %}
<p><i>"{{ quote.text }}"</i> <span style="font-size: small;">&nbsp; \ {{quote.author}}</span>
</p>
{% endif %}
{% endif %}
</div>
</main>
<div>
<img class="d-block w-100" src="{{ url_for('static', path='/images/calendar.jpg') }}" alt="calendar image">
</div>
<div class="d-flex justify-content-center">
<div class="d-flex justify-content-center">
<a href="{{ url_for('calendar') }}"
class="btn btn-lg btn-primary shadow-lg bg-body p-3 mb-5 bg-gradient2 landing-page-button"
type="button">
<span>Get Started</span>
</a>
</div>
</div>
</div>
</main>
<div>
<img class="d-block w-100" src="{{ url_for('static', path='/images/calendar.jpg') }}" alt="calendar image">
</div>
</div>

{% endblock %}
{% endblock %}
35 changes: 16 additions & 19 deletions app/templates/partials/calendar/calendar_base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
{% extends "./partials/base.html" %}
{% block head %}
{{super()}}

<!-- CSS -->
<link rel="stylesheet" type="text/css" href="{{ url_for('static', path='/grid_style.css') }}">

{{super()}}
<!-- CSS -->
<link rel="stylesheet" type="text/css" href="{{ url_for('static', path='/grid_style.css') }}">
{% endblock head %}
{% block page_name %}Month View{% endblock page_name %}
{% block body %}
<div class="pyldr-container">
{% include 'partials/calendar/navigation.html' %}
<div id="feature-settings">
{% include 'partials/calendar/feature_settings/example.html' %}
</div>
<div class="content">
{% block content %}
{% endblock content %}
</div>
<div class="pyldr-container">
{% include 'partials/calendar/navigation.html' %}
<div id="feature-settings" class="background-lightgray">
{% include 'partials/calendar/feature_settings/example.html' %}
</div>

<!-- Scripts -->
<script src="{{ url_for('static', path='/js/grid_scripts.js') }}"></script>
<script src="{{ url_for('static', path='/js/grid_navigation.js') }}"></script>
{% endblock body %}
<div class="content">
{% block content %}
{% endblock content %}
</div>
</div>
<!-- Scripts -->
<script src="{{ url_for('static', path='/js/grid_scripts.js') }}"></script>
<script src="{{ url_for('static', path='/js/grid_navigation.js') }}"></script>
{% endblock body %}
36 changes: 18 additions & 18 deletions app/templates/partials/calendar/monthly_view/add_week.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{% for week in weeks_block %}
<div class="week">
{% for day in week.days %}
<div class="{{ day.css['day_container'] }}" id="{{ day.set_id() }}">
<div class="month-day-header">
<div class="{{ day.css['date'] }}">{{ day }}</div>
<div><a href="#" class="add-small">+</a></div>
</div>
{% for devent in day.dailyevents %}
<div class="{{ day.css['daily_event'] }}">
<div class="{{ day.css['daily_event_front'] }}">{{ devent[0] }}</div>
<div class="{{ day.css['daily_event_back'] }}">{{ devent[1] }}</div>
</div>
{% endfor %}
{% for event in day.events %}
<div class="{{ day.css['event'] }}"><b>{{ event[0] }}</b> {{ event[1] }}</div>
{% endfor %}
</div>
<div class="week">
{% for day in week.days %}
<div class="{{ day.css['day_container'] }}" id="{{ day.set_id() }}">
<div class="month-day-header">
<div class="{{ day.css['date'] }}">{{ day }}</div>
<div><a href="#" class="add-small">+</a></div>
</div>
{% for devent in day.dailyevents %}
<div class="{{ day.css['daily_event'] }}">
<div class="{{ day.css['daily_event_front'] }}">{{ devent[0] }}</div>
<div class="{{ day.css['daily_event_back'] }}">{{ devent[1] }}</div>
</div>
{% endfor %}
{% for event in day.events %}
<div class="{{ day.css['event'] }}"><b>{{ event[0] }}</b> {{ event[1] }}</div>
{% endfor %}
</div>
{% endfor %}
{% endfor %}
</div>
{% endfor %}
40 changes: 20 additions & 20 deletions app/templates/partials/calendar/monthly_view/monthly_grid.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
<div class="calendar">
<div class="calender-days-titles">
{% for d in week_days %}
{% if d == day.sday %}
<div class="day-title underline-yellow"><b>{{ d.upper() }}</b></div>
{% else %}
<div class="day-title"> {{ d.upper() }}</div>
{% endif %}
{% if d == day.sday %}
<div class="day-title underline-yellow"><b>{{ d.upper() }}</b></div>
{% else %}
<div class="day-title"> {{ d.upper() }}</div>
{% endif %}
{% endfor %}
</div>
<div id="calender-grid">
{% include 'partials/calendar/monthly_view/add_week.html' %}
</div>
</div>
<div>
<div class="sticky">
<div id="months-navigation">
<a href="#{{weeks_block[0].days[0].set_id()}}" class="button background-yellow text-darkblue">
TODAY
</a>
<a id="month-2"></a>
<ion-icon name="caret-up-outline"></ion-icon>
<a id="month-1"></a>
<ion-icon name="caret-up-outline"></ion-icon>
<a id="month0"></a>
<ion-icon name="caret-down-outline"></ion-icon>
<a id="month1"></a>
<ion-icon name="caret-down-outline"></ion-icon>
<a id="month2"></a>
</div>
<div class="sticky">
<div id="months-navigation">
<a href="#{{weeks_block[0].days[0].set_id()}}" class="button background-yellow text-darkblue">
TODAY
</a>
<a id="month-2"></a>
<ion-icon name="caret-up-outline"></ion-icon>
<a id="month-1"></a>
<ion-icon name="caret-up-outline"></ion-icon>
<a id="month0"></a>
<ion-icon name="caret-down-outline"></ion-icon>
<a id="month1"></a>
<ion-icon name="caret-down-outline"></ion-icon>
<a id="month2"></a>
</div>
</div>
</div>
<div id="day-view"></div>
Loading