From cf6cde83ebc5ef4922085ceeb774a6d65f0cc60e Mon Sep 17 00:00:00 2001 From: Odelia Yechiel Date: Sat, 20 Feb 2021 19:39:09 +0200 Subject: [PATCH 1/3] merged and deleted old calendar template files --- .../partials/calendar/calendar_base.html | 35 +++++---- .../calendar/monthly_view/add_week.html | 36 +++++----- .../calendar/monthly_view/monthly_grid.html | 40 +++++------ .../partials/calendar/navigation.html | 72 ++++++++++--------- 4 files changed, 92 insertions(+), 91 deletions(-) diff --git a/app/templates/partials/calendar/calendar_base.html b/app/templates/partials/calendar/calendar_base.html index 740add68..c70ce366 100644 --- a/app/templates/partials/calendar/calendar_base.html +++ b/app/templates/partials/calendar/calendar_base.html @@ -1,25 +1,22 @@ {% extends "./partials/base.html" %} {% block head %} - {{super()}} - - - - +{{super()}} + + {% endblock head %} {% block page_name %}Month View{% endblock page_name %} {% block body %} -
- {% include 'partials/calendar/navigation.html' %} -
- {% include 'partials/calendar/feature_settings/example.html' %} -
-
- {% block content %} - {% endblock content %} -
+
+ {% include 'partials/calendar/navigation.html' %} +
+ {% include 'partials/calendar/feature_settings/example.html' %}
- - - - -{% endblock body %} \ No newline at end of file +
+ {% block content %} + {% endblock content %} +
+
+ + + +{% endblock body %} diff --git a/app/templates/partials/calendar/monthly_view/add_week.html b/app/templates/partials/calendar/monthly_view/add_week.html index a53a7f4a..2f821846 100644 --- a/app/templates/partials/calendar/monthly_view/add_week.html +++ b/app/templates/partials/calendar/monthly_view/add_week.html @@ -1,21 +1,21 @@ {% for week in weeks_block %} -
- {% for day in week.days %} -
-
-
{{ day }}
- -
- {% for devent in day.dailyevents %} -
-
{{ devent[0] }}
-
{{ devent[1] }}
-
- {% endfor %} - {% for event in day.events %} -
{{ event[0] }} {{ event[1] }}
- {% endfor %} -
+
+ {% for day in week.days %} +
+
+
{{ day }}
+ +
+ {% for devent in day.dailyevents %} +
+
{{ devent[0] }}
+
{{ devent[1] }}
+
+ {% endfor %} + {% for event in day.events %} +
{{ event[0] }} {{ event[1] }}
{% endfor %}
-{% endfor %} \ No newline at end of file + {% endfor %} +
+{% endfor %} diff --git a/app/templates/partials/calendar/monthly_view/monthly_grid.html b/app/templates/partials/calendar/monthly_view/monthly_grid.html index 41d70b65..1a2df047 100644 --- a/app/templates/partials/calendar/monthly_view/monthly_grid.html +++ b/app/templates/partials/calendar/monthly_view/monthly_grid.html @@ -1,11 +1,11 @@
{% for d in week_days %} - {% if d == day.sday %} -
{{ d.upper() }}
- {% else %} -
{{ d.upper() }}
- {% endif %} + {% if d == day.sday %} +
{{ d.upper() }}
+ {% else %} +
{{ d.upper() }}
+ {% endif %} {% endfor %}
@@ -13,21 +13,21 @@
-
-
- - TODAY - - - - - - - - - - -
+
+
+ + TODAY + + + + + + + + + +
+
diff --git a/app/templates/partials/calendar/navigation.html b/app/templates/partials/calendar/navigation.html index 84a1303b..ab65b8eb 100644 --- a/app/templates/partials/calendar/navigation.html +++ b/app/templates/partials/calendar/navigation.html @@ -1,36 +1,40 @@ \ No newline at end of file + +
+
+ +
+
+ +
+ +
+ +
+ From 20b50266b673cb33a3cb5020156c0957a7028b0b Mon Sep 17 00:00:00 2001 From: Odelia Yechiel Date: Sat, 20 Feb 2021 19:40:14 +0200 Subject: [PATCH 2/3] merged and deleted old calendar template files --- app/templates/calendar/add_week.html | 21 -------- app/templates/calendar/calendar.html | 19 ------- app/templates/calendar/layout.html | 81 ---------------------------- 3 files changed, 121 deletions(-) delete mode 100644 app/templates/calendar/add_week.html delete mode 100644 app/templates/calendar/calendar.html delete mode 100644 app/templates/calendar/layout.html diff --git a/app/templates/calendar/add_week.html b/app/templates/calendar/add_week.html deleted file mode 100644 index 702ee572..00000000 --- a/app/templates/calendar/add_week.html +++ /dev/null @@ -1,21 +0,0 @@ -{% for week in weeks_block %} -
- {% for day in week.days %} -
-
-
{{day}}
- -
- {% for devent in day.dailyevents %} -
-
{{devent[0]}}
-
{{devent[1]}}
-
- {% endfor %} - {% for event in day.events %} -
{{event[0]}} {{event[1]}}
- {% endfor %} -
- {% endfor %} -
-{% endfor %} \ No newline at end of file diff --git a/app/templates/calendar/calendar.html b/app/templates/calendar/calendar.html deleted file mode 100644 index d5d95c15..00000000 --- a/app/templates/calendar/calendar.html +++ /dev/null @@ -1,19 +0,0 @@ -{% extends 'calendar/layout.html' %} - -{% block main %} -
-
- {% for d in week_days %} - {% if d == day.sday %} -
{{ d.upper() }}
- {% else %} -
{{ d.upper() }}
- {% endif %} - {% endfor %} -
-
- {% include 'calendar/add_week.html' %} -
-
-
-{% endblock %} \ No newline at end of file diff --git a/app/templates/calendar/layout.html b/app/templates/calendar/layout.html deleted file mode 100644 index 90a320ec..00000000 --- a/app/templates/calendar/layout.html +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - Calendar - - - -
- -
-
FEATURE NAME
-
-
-
-
-
{{day.display()}}
-
Location 0oc 00:00
-
- -
-
- {% block main %} {% endblock %} -
-
-
- - - \ No newline at end of file From 4389f6d161e9486fd05e43a933b13ac8c44fc766 Mon Sep 17 00:00:00 2001 From: Odelia Yechiel Date: Sat, 20 Feb 2021 19:44:18 +0200 Subject: [PATCH 3/3] added missing export calendar feature to profile page --- app/templates/index.html | 68 +++++++++---------- .../sidebar_left/features_card.html | 15 ++-- .../features_card/export_calendar.html | 15 ++++ 3 files changed, 60 insertions(+), 38 deletions(-) create mode 100644 app/templates/partials/user_profile/sidebar_left/features_card/export_calendar.html diff --git a/app/templates/index.html b/app/templates/index.html index 32a492b5..3bc1d8fc 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -3,42 +3,42 @@ {% block content %}
-
-
-

- PyLendar -
-

-

- Open Source Calendar built with Python -

-
-
+
+
+

+ PyLendar +
+

+

+ Open Source Calendar built with Python +

+
+
- {% if quote %} - {% if not quote.author%} -

"{{ quote.text }}"

- {% else %} -

"{{ quote.text }}"   \ {{quote.author}} -

- {% endif %} - {% endif %} -
-
-
-
- - Get Started - -
-
+ {% if quote %} + {% if not quote.author%} +

"{{ quote.text }}"

+ {% else %} +

"{{ quote.text }}"   \ {{quote.author}} +

+ {% endif %} + {% endif %}
-
-
- calendar image +
+
+
+ + Get Started + +
+
+
+
+ calendar image +
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/partials/user_profile/sidebar_left/features_card.html b/app/templates/partials/user_profile/sidebar_left/features_card.html index 3015edcc..0f2729c7 100644 --- a/app/templates/partials/user_profile/sidebar_left/features_card.html +++ b/app/templates/partials/user_profile/sidebar_left/features_card.html @@ -6,6 +6,7 @@

-
\ No newline at end of file + diff --git a/app/templates/partials/user_profile/sidebar_left/features_card/export_calendar.html b/app/templates/partials/user_profile/sidebar_left/features_card/export_calendar.html new file mode 100644 index 00000000..3a34dade --- /dev/null +++ b/app/templates/partials/user_profile/sidebar_left/features_card/export_calendar.html @@ -0,0 +1,15 @@ + + +
+
+
+
+
+
+ +
+