diff --git a/main.py b/main.py index 4c9152f..481488e 100644 --- a/main.py +++ b/main.py @@ -66,7 +66,7 @@ async def search_redirect(domain): async def search(domain, term): amount, results = peertube.search(domain, term) return await render_template( - "search_results.html", domain=domain, amount=amount, results=results + "search_results.html", domain=domain, amount=amount, results=results, search_term=term ) diff --git a/templates/base.html b/templates/base.html new file mode 100644 index 0000000..7b0e25c --- /dev/null +++ b/templates/base.html @@ -0,0 +1,21 @@ + + + + + {% block head %} + {% block full_title %}{% block title %}{% endblock %} - SimpleerTube{% endblock %} + {% endblock %} + + + +
+ + +
+ +
+
+ + {% block content %}{% endblock %} + + diff --git a/templates/domain_index.html b/templates/domain_index.html index 2cc70ae..b95cdce 100644 --- a/templates/domain_index.html +++ b/templates/domain_index.html @@ -1,10 +1,7 @@ - - - - {{ instance_name }} -
- - -
- - +{% extends "base.html" %} + +{% block title %}{{ domain }}{% endblock %} + +{% block content %} +{{ instance_name }} +{% endblock %} diff --git a/templates/search_results.html b/templates/search_results.html index c70b4f1..2072a12 100644 --- a/templates/search_results.html +++ b/templates/search_results.html @@ -1,24 +1,26 @@ - - - -

{{ amount }} results

- - {% for result in results %} - - - - - {% endfor %} -
- - - - - {{ result.name }} -
- {{ result.views }} Views -
- {{ result.channel.displayName }} -
- - +{% extends "base.html" %} + +{% block title %}{{ search_term }} - {{ domain }}{% endblock %} + +{% block content %} +

{{ amount }} results

+ + +{% for result in results %} + + + + +{% endfor %} +
+ + + + + {{ result.name }} +
+ {{ result.views }} Views +
+ {{ result.channel.displayName }} +
+{% endblock %} diff --git a/templates/video.html b/templates/video.html index e4acecc..f649a3b 100644 --- a/templates/video.html +++ b/templates/video.html @@ -1,64 +1,65 @@ - - - -

{{ video.name }}

- By: - {{ video.channel.displayName }} ({{ video.channel.name }}@{{ video.channel.host }}) -
- {% if video.no_quality_selected and not embed %} - -

Please select a resolution:

- {% elif embed %} - -
- Resolutions: - {% else %} - -
- Resolutions: - {% endif %} +{% extends "base.html" %} - {% for resolution in video.resolutions %} - {{ resolution.label }} - {% endfor %} - Embedded - -
- Views: {{ video.views }} Likes: {{ video.likes }} Dislikes: {{ video.dislikes }} +{% block title %}{{ video.name }} - {{ domain }}{% endblock %} -
-
- {{ video.description }} -
-
+{% block content %} +

{{ video.name }}

+By: +{{ video.channel.displayName }} ({{ video.channel.name }}@{{ video.channel.host }}) +
+{% if video.no_quality_selected and not embed %} + +

Please select a resolution:

+{% elif embed %} + +
+ Resolutions: +{% else %} + +
+ Resolutions: +{% endif %} - - - - - - - - - - - - - - - - - - - - - -
Category{{ video.category.label }}
License{{ video.licence.label }}
Language{{ video.language.label }}
Privacy{{ video.privacy.label }}
Tags - {% for tag in video.tags %} - {{ tag }} - {% endfor %} -
- - +{% for resolution in video.resolutions %} + {{ resolution.label }} +{% endfor %} +Embedded + +
+Views: {{ video.views }} Likes: {{ video.likes }} Dislikes: {{ video.dislikes }} + +
+
+{{ video.description }} +
+
+ + + + + + + + + + + + + + + + + + + + + + +
Category{{ video.category.label }}
License{{ video.licence.label }}
Language{{ video.language.label }}
Privacy{{ video.privacy.label }}
Tags + {% for tag in video.tags %} + {{ tag }} + {% endfor %} +
+{% endblock %}