diff --git a/TODO b/TODO index 0af044b..d15e3d2 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,3 @@ -- Component link with scroll up - Search - List profiles - Chat \ No newline at end of file diff --git a/app/website/templates/components.yaml b/app/website/templates/components.yaml new file mode 100644 index 0000000..70ebbd5 --- /dev/null +++ b/app/website/templates/components.yaml @@ -0,0 +1,2 @@ +components: + link: "components/link.html" \ No newline at end of file diff --git a/app/website/templates/components/link.html b/app/website/templates/components/link.html new file mode 100644 index 0000000..1930c8e --- /dev/null +++ b/app/website/templates/components/link.html @@ -0,0 +1,11 @@ +
+ {# Primary data #} + + + {# Secondary data #} + {% if page %} + + {% endif %} + {# Button #} + +
\ No newline at end of file diff --git a/app/website/templates/layouts/base.html b/app/website/templates/layouts/base.html index 1e87afd..95e3c5f 100644 --- a/app/website/templates/layouts/base.html +++ b/app/website/templates/layouts/base.html @@ -1,4 +1,5 @@ {% load static %} +{% load slippers %} @@ -12,9 +13,12 @@ {# Styles #} + {# JavaScript #} - + + +
@@ -26,20 +30,15 @@ diff --git a/app/website/templates/pages/about.html b/app/website/templates/pages/about.html index d830039..3835300 100644 --- a/app/website/templates/pages/about.html +++ b/app/website/templates/pages/about.html @@ -1,3 +1,3 @@ -
+
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Corporis dignissimos dolor inventore laudantium libero optio quo reprehenderit repudiandae sapiente similique. Delectus dolorum enim fuga fugiat ipsam nam recusandae sequi sint.
diff --git a/app/website/templates/pages/talk-single.html b/app/website/templates/pages/talk-single.html index 0a25b51..0708332 100644 --- a/app/website/templates/pages/talk-single.html +++ b/app/website/templates/pages/talk-single.html @@ -1,4 +1,5 @@ -
+{% load slippers %} +

@@ -12,11 +13,6 @@

Author {{ talk.author.full_name }} - {{ talk.category.name }}

-

- - - - Back -
+ {% #link text="Back" action="page" value="talks" page=1 %}{% /link %}

\ No newline at end of file diff --git a/app/website/templates/pages/talks.html b/app/website/templates/pages/talks.html index fce3ba0..81ca212 100644 --- a/app/website/templates/pages/talks.html +++ b/app/website/templates/pages/talks.html @@ -1,4 +1,5 @@ -
+{% load slippers %} +
{% for talk in talks %}
@@ -24,11 +25,7 @@ {% endfor %} {# Pagination #}
- - - - -

Show more

- +

Page {{ page }}

+ {% #link text="Next page" action="page" value="talks" page=next_page %}{% /link %}
diff --git a/event/settings.py b/event/settings.py index 06bad84..d2a38cd 100644 --- a/event/settings.py +++ b/event/settings.py @@ -43,6 +43,7 @@ INSTALLED_APPS = [ "django.contrib.staticfiles", "django_extensions", "channels", + "slippers", "app.website", ]