diff --git a/app/templates/calendar_day_view.html b/app/templates/calendar_day_view.html index 745864de..ba681c9f 100644 --- a/app/templates/calendar_day_view.html +++ b/app/templates/calendar_day_view.html @@ -20,19 +20,24 @@ {{day}} / {{month}} {% endif %} +
+ {% for event in all_day_events %} +

{{ event.title }}

+ {% endfor %} +
- {% for hour in range(25)%} -
-
- {% if view == 'day'%} - {% set hour = hour|string() %} - {{hour.zfill(2)}}:00 - {% endif %} -
-
-
- {% endfor %} + {% for hour in range(25)%} +
+
+ {% if view == 'day'%} + {% set hour = hour|string() %} + {{hour.zfill(2)}}:00 + {% endif %} +
+
+
+ {% endfor %}
{% for event, attr in events %} @@ -56,14 +61,15 @@
{% endfor %}
- + {% if view == 'day'%} {% endif %} -{% if view == 'day'%}
{% endif %} +{% if view == 'day'%} +
{% endif %} diff --git a/app/templates/dayview.html b/app/templates/dayview.html deleted file mode 100644 index 8a5a2a16..00000000 --- a/app/templates/dayview.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - dayview - - -
- {% if view == 'day' %} - - {{month}} - {{day}} - {% if zodiac %} -
- zodiac sign -
- {% endif %} - {% else %} - {{day}} / {{month}} - {% endif %} -
-
- {% for event in all_day_events %} -

{{ event.title }}

- {% endfor %} -
-
-
- {% if view == 'day'%} - {% for hour in range(24)%} -
- {% set hour = hour|string() %} - {{hour.zfill(2)}}:00 -
- {% endfor %} - {% endif %} -
-
- {% for event, attr in events %} -
-

{{ event.title }}

- {% if attr.total_time_visible %} -

{{attr.total_time}}

- {% endif %} -
- {% endfor %} -
-
- {% for i in range(25)%} -
---
- {% endfor %} -
-
- - {% for event, attr in events %} -
- - - -
- {% endfor %} -
-
-
-
-
Have a nice day
- - - - diff --git a/app/templates/event/partials/edit_event_details_tab.html b/app/templates/event/partials/edit_event_details_tab.html deleted file mode 100644 index 871b1eab..00000000 --- a/app/templates/event/partials/edit_event_details_tab.html +++ /dev/null @@ -1,86 +0,0 @@ -
- - -
- -
- - -
-
-
-
- - - -
-
- - - -
-
- - - -
-
-
- - - - -
-
- - - - -
-
- - - -
-
- -
-
- - -
-
-
- - -
-
- - - - - - - -
-
diff --git a/app/templates/partials/calendar/event/edit_event_details_tab.html b/app/templates/partials/calendar/event/edit_event_details_tab.html index 4e27dadf..e9fde613 100644 --- a/app/templates/partials/calendar/event/edit_event_details_tab.html +++ b/app/templates/partials/calendar/event/edit_event_details_tab.html @@ -1,75 +1,95 @@
- - -
-
- -
- - -
-
-
-
- - - -
-
- - - -
-
- - - -
+ + +
+
+
+ + +
+
+ + + +
+
+ + + +
+
+ + + +
+
- - - - + + + +
+
- - - - + + + +
+
- - - + + +
+
- + +
+ +
+ +
+
-
- - -
-
- - - - -
+
+ + +
+ +
+ + + + + + + + + +
diff --git a/app/templates/partials/user_profile/middle_content.html b/app/templates/partials/user_profile/middle_content.html new file mode 100644 index 00000000..193dc351 --- /dev/null +++ b/app/templates/partials/user_profile/middle_content.html @@ -0,0 +1,13 @@ +
+
+
+ +
+ {% for event in events %} + + {% include 'partials/user_profile/middle_content/event_card.html' %} + + {% include 'partials/user_profile/middle_content/update_event_modal.html' %} + {% endfor %} +
+
\ No newline at end of file diff --git a/app/templates/partials/user_profile/middle_content/event_card.html b/app/templates/partials/user_profile/middle_content/event_card.html new file mode 100644 index 00000000..9c86560e --- /dev/null +++ b/app/templates/partials/user_profile/middle_content/event_card.html @@ -0,0 +1,15 @@ +
+
+ {{ gettext("Upcoming event on (date)", date=event.start) }} + + {% include 'partials/user_profile/middle_content/event_settings.html' %} +
+ +
+

+ The Event {{ event }} - description ... +

+
+ Last updated {{time}} ago +
+
\ No newline at end of file diff --git a/app/templates/partials/user_profile/middle_content/event_settings.html b/app/templates/partials/user_profile/middle_content/event_settings.html new file mode 100644 index 00000000..b9d7f048 --- /dev/null +++ b/app/templates/partials/user_profile/middle_content/event_settings.html @@ -0,0 +1,10 @@ + +
+ + + +
+
\ No newline at end of file diff --git a/app/templates/partials/user_profile/middle_content/update_event_modal.html b/app/templates/partials/user_profile/middle_content/update_event_modal.html new file mode 100644 index 00000000..a6966e28 --- /dev/null +++ b/app/templates/partials/user_profile/middle_content/update_event_modal.html @@ -0,0 +1,16 @@ + \ No newline at end of file diff --git a/app/templates/partials/user_profile/sidebar_left.html b/app/templates/partials/user_profile/sidebar_left.html new file mode 100644 index 00000000..92c48acb --- /dev/null +++ b/app/templates/partials/user_profile/sidebar_left.html @@ -0,0 +1,12 @@ +
+ + +{% include 'partials/user_profile/sidebar_left/profile_card.html' %} + + + {% include 'partials/user_profile/sidebar_left/features_card.html' %} + + + {% include 'partials/user_profile/sidebar_left/daily_horoscope.html' %} + +
\ No newline at end of file diff --git a/app/templates/partials/user_profile/sidebar_left/daily_horoscope.html b/app/templates/partials/user_profile/sidebar_left/daily_horoscope.html new file mode 100644 index 00000000..29bea347 --- /dev/null +++ b/app/templates/partials/user_profile/sidebar_left/daily_horoscope.html @@ -0,0 +1,13 @@ +
+
+ + +
+
\ No newline at end of file diff --git a/app/templates/partials/user_profile/sidebar_left/features_card.html b/app/templates/partials/user_profile/sidebar_left/features_card.html new file mode 100644 index 00000000..3015edcc --- /dev/null +++ b/app/templates/partials/user_profile/sidebar_left/features_card.html @@ -0,0 +1,33 @@ +
+
+ +

+ Explore more features +

+ + +
+
\ No newline at end of file diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card.html b/app/templates/partials/user_profile/sidebar_left/profile_card.html new file mode 100644 index 00000000..b4dbaec2 --- /dev/null +++ b/app/templates/partials/user_profile/sidebar_left/profile_card.html @@ -0,0 +1,8 @@ +
+ + {% include 'partials/user_profile/sidebar_left/profile_card/profile_update_menu.html' %} + + {% include 'partials/user_profile/sidebar_left/profile_card/modals.html' %} + + {% include 'partials/user_profile/sidebar_left/profile_card/user_details.html' %} +
\ No newline at end of file diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/modals.html b/app/templates/partials/user_profile/sidebar_left/profile_card/modals.html new file mode 100644 index 00000000..cde0ca1e --- /dev/null +++ b/app/templates/partials/user_profile/sidebar_left/profile_card/modals.html @@ -0,0 +1,17 @@ + +{% include 'partials/user_profile/sidebar_left/profile_card/modals/name_modal.html' %} + + +{% include 'partials/user_profile/sidebar_left/profile_card/modals/email_modal.html' %} + + +{% include 'partials/user_profile/sidebar_left/profile_card/modals/description_modal.html' %} + + +{% include 'partials/user_profile/sidebar_left/profile_card/modals/upload_photo_modal.html' %} + + +{% include 'partials/user_profile/sidebar_left/profile_card/modals/telegram_modal.html' %} + + +{% include 'partials/user_profile/sidebar_left/profile_card/modals/calendar_privacy_modal.html' %} \ No newline at end of file diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/calendar_privacy_modal.html b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/calendar_privacy_modal.html new file mode 100644 index 00000000..b56b1572 --- /dev/null +++ b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/calendar_privacy_modal.html @@ -0,0 +1,22 @@ + \ No newline at end of file diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/description_modal.html b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/description_modal.html new file mode 100644 index 00000000..ad13a645 --- /dev/null +++ b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/description_modal.html @@ -0,0 +1,20 @@ + \ No newline at end of file diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/email_modal.html b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/email_modal.html new file mode 100644 index 00000000..49055e94 --- /dev/null +++ b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/email_modal.html @@ -0,0 +1,20 @@ + \ No newline at end of file diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/name_modal.html b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/name_modal.html new file mode 100644 index 00000000..264c9c3a --- /dev/null +++ b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/name_modal.html @@ -0,0 +1,20 @@ + \ No newline at end of file diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/telegram_modal.html b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/telegram_modal.html new file mode 100644 index 00000000..bf9be4fc --- /dev/null +++ b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/telegram_modal.html @@ -0,0 +1,21 @@ + \ No newline at end of file diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/upload_photo_modal.html b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/upload_photo_modal.html new file mode 100644 index 00000000..d1e44547 --- /dev/null +++ b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/upload_photo_modal.html @@ -0,0 +1,21 @@ + \ No newline at end of file diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html b/app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html new file mode 100644 index 00000000..df643cf1 --- /dev/null +++ b/app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html @@ -0,0 +1,46 @@ +
+ +
\ No newline at end of file diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/user_details.html b/app/templates/partials/user_profile/sidebar_left/profile_card/user_details.html new file mode 100644 index 00000000..5f85416f --- /dev/null +++ b/app/templates/partials/user_profile/sidebar_left/profile_card/user_details.html @@ -0,0 +1,14 @@ +Profile image +
+
{{ user.full_name }}
+

+ + Settings + +

+
+

+ {{ user.description }} +

+
\ No newline at end of file diff --git a/app/templates/partials/user_profile/sidebar_right.html b/app/templates/partials/user_profile/sidebar_right.html new file mode 100644 index 00000000..c84dedb8 --- /dev/null +++ b/app/templates/partials/user_profile/sidebar_right.html @@ -0,0 +1,15 @@ +
+ + + {% include 'partials/user_profile/sidebar_right/meetups.html' %} + + + {% include 'partials/user_profile/sidebar_right/on_this_day.html' %} + + + {% include 'partials/user_profile/sidebar_right/new_card.html' %} + + + {% include 'partials/user_profile/sidebar_right/new_card2.html' %} + +
\ No newline at end of file diff --git a/app/templates/partials/user_profile/sidebar_right/meetups.html b/app/templates/partials/user_profile/sidebar_right/meetups.html new file mode 100644 index 00000000..bc9ee2c4 --- /dev/null +++ b/app/templates/partials/user_profile/sidebar_right/meetups.html @@ -0,0 +1,7 @@ +
+
+

+ {{ gettext("Explore MeetUps near you") }} +

+
+
\ No newline at end of file diff --git a/app/templates/partials/user_profile/sidebar_right/new_card.html b/app/templates/partials/user_profile/sidebar_right/new_card.html new file mode 100644 index 00000000..ff6350f7 --- /dev/null +++ b/app/templates/partials/user_profile/sidebar_right/new_card.html @@ -0,0 +1,7 @@ +
+
+

+ {{ gettext("Your Card") }} +

+
+
\ No newline at end of file diff --git a/app/templates/partials/user_profile/sidebar_right/new_card2.html b/app/templates/partials/user_profile/sidebar_right/new_card2.html new file mode 100644 index 00000000..20529588 --- /dev/null +++ b/app/templates/partials/user_profile/sidebar_right/new_card2.html @@ -0,0 +1,7 @@ +
+
+

+ Your Card +

+
+
\ No newline at end of file diff --git a/app/templates/partials/user_profile/sidebar_right/on_this_day.html b/app/templates/partials/user_profile/sidebar_right/on_this_day.html new file mode 100644 index 00000000..71b9fe42 --- /dev/null +++ b/app/templates/partials/user_profile/sidebar_right/on_this_day.html @@ -0,0 +1,5 @@ +
+
+ {% include "on_this_day.html" %} +
+
\ No newline at end of file diff --git a/app/templates/profile.html b/app/templates/profile.html index b12f25ee..900739ec 100644 --- a/app/templates/profile.html +++ b/app/templates/profile.html @@ -1,377 +1,19 @@ -{% extends "base.html" %} {% include "partials/calendar/event/text_editor_partial_head.html" %} {% block content %} +{% extends "base.html" %} +{% include "partials/calendar/event/text_editor_partial_head.html" %} +{% block content %}
-
- -
+ {% include 'partials/user_profile/sidebar_left.html' %} - -
- - - - - - - - - - - - - - - -
- - -
- {% for event in events %} - -
-
- {{ gettext("Upcoming event on (date)", date=event.start) }} - - -
- - - - -
-
- - -
-
-

- The Event {{ event }} - description ... -

-
- Last updated 3 mins ago -
-
-
-

- {{ gettext("The Event (event)", event=event.title) }} -

-
- {{ gettext("Last updated (time) ago") }} -
- - {% endfor %} -
- -
-
-
-
+ + {% include 'partials/user_profile/middle_content.html' %} + {% include 'partials/user_profile/sidebar_right.html' %} -
- - -
-
-

- {{ gettext("Explore MeetUps near you") }} -

-
- - -
-
-

- {{ gettext("Your Card") }} -

-
- - - -
-
-

- Your Card -

- -
-
- {% include "on_this_day.html" %} -
-
-
-
-
-
-
-{% include "partials/calendar/event/text_editor_partial_body.html" %} {% endblock content %} \ No newline at end of file +{% include "partials/calendar/event/text_editor_partial_body.html" %} +{% endblock content %} \ No newline at end of file