diff --git a/bookwyrm/templates/about.html b/bookwyrm/templates/about.html deleted file mode 100644 index aa7426ca..00000000 --- a/bookwyrm/templates/about.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends 'layout.html' %} -{% block content %} - -
-
- {% include 'snippets/about.html' %} -
- -
-

Code of Conduct

-
- {{ site.code_of_conduct | safe }} -
-
-
-{% endblock %} diff --git a/bookwyrm/templates/discover/about.html b/bookwyrm/templates/discover/about.html new file mode 100644 index 00000000..09115807 --- /dev/null +++ b/bookwyrm/templates/discover/about.html @@ -0,0 +1,22 @@ +{% extends 'layout.html' %} +{% block content %} + +
+

{{ site.name }}

+

{{ site.instance_tagline }}

+
+ +{% include 'discover/icons.html' %} + +
+ {% include 'snippets/about.html' %} +
+ +
+

Code of Conduct

+
+ {{ site.code_of_conduct | safe }} +
+
+ +{% endblock %} diff --git a/bookwyrm/templates/discover/discover.html b/bookwyrm/templates/discover/discover.html index 0b6f8a1f..5a808bf7 100644 --- a/bookwyrm/templates/discover/discover.html +++ b/bookwyrm/templates/discover/discover.html @@ -1,33 +1,14 @@ {% extends 'layout.html' %} {% block content %} -{% if not request.user.is_authenticated %}

{{ site.name }}

{{ site.instance_tagline }}

-
-
-
-

-

Decentralized

-
-
-
-
-

-

Friendly

-
-
-
-
-

-

Anti-Corporate

-
-
-
+{% include 'discover/icons.html' %} +{% if not request.user.is_authenticated %}
@@ -49,10 +30,6 @@
-{% else %} -
-

Discover

-
{% endif %}
diff --git a/bookwyrm/templates/discover/icons.html b/bookwyrm/templates/discover/icons.html new file mode 100644 index 00000000..a4086282 --- /dev/null +++ b/bookwyrm/templates/discover/icons.html @@ -0,0 +1,21 @@ +
+
+
+

+

Decentralized

+
+
+
+
+

+

Friendly

+
+
+
+
+

+

Anti-Corporate

+
+
+
+ diff --git a/bookwyrm/views/landing.py b/bookwyrm/views/landing.py index 854f3a9b..3be3eb31 100644 --- a/bookwyrm/views/landing.py +++ b/bookwyrm/views/landing.py @@ -16,7 +16,7 @@ class About(View): data = { 'title': 'About', } - return TemplateResponse(request, 'about.html', data) + return TemplateResponse(request, 'discover/about.html', data) class Home(View): ''' discover page or home feed depending on auth '''