diff --git a/frontends/etiquette_flask/backend/endpoints/photo_endpoints.py b/frontends/etiquette_flask/backend/endpoints/photo_endpoints.py index dcec347..9e558b8 100644 --- a/frontends/etiquette_flask/backend/endpoints/photo_endpoints.py +++ b/frontends/etiquette_flask/backend/endpoints/photo_endpoints.py @@ -452,6 +452,17 @@ def get_search_core(): } return final_results +@site.route('/search_embed') +def get_search_embed(): + search_results = get_search_core() + response = common.render_template( + request, + 'search_embed.html', + results=search_results['results'], + search_kwargs=search_results['search_kwargs'], + ) + return response + @site.route('/search') def get_search_html(): search_results = get_search_core() diff --git a/frontends/etiquette_flask/static/css/etiquette.css b/frontends/etiquette_flask/static/css/etiquette.css index f442a61..7545782 100644 --- a/frontends/etiquette_flask/static/css/etiquette.css +++ b/frontends/etiquette_flask/static/css/etiquette.css @@ -15,6 +15,13 @@ input, select, textarea border-radius: 2px; } +iframe.embedded_search +{ + width: 100%; + max-height: 500px; + border: none; +} + .header_element:hover { background-color: var(--color_secondary); diff --git a/frontends/etiquette_flask/static/js/common.js b/frontends/etiquette_flask/static/js/common.js index 2c39edd..508b50e 100644 --- a/frontends/etiquette_flask/static/js/common.js +++ b/frontends/etiquette_flask/static/js/common.js @@ -165,6 +165,12 @@ function html_to_element(html) return template.content.firstElementChild; } +common.size_iframe_to_content = +function size_iframe_to_content(iframe) +{ + iframe.style.height = iframe.contentWindow.document.documentElement.scrollHeight + 'px'; +} + //////////////////////////////////////////////////////////////////////////////////////////////////// // HOOKS & ADD-ONS ///////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/frontends/etiquette_flask/templates/search_embed.html b/frontends/etiquette_flask/templates/search_embed.html new file mode 100644 index 0000000..08c605a --- /dev/null +++ b/frontends/etiquette_flask/templates/search_embed.html @@ -0,0 +1,31 @@ + + + + + + + {% if theme %}{% endif %} + + + + + +
+ {% import "photo_card.html" as photo_card %} + {% import "album_card.html" as album_card %} + {% for result in results %} + {% if result.__class__.__name__ == 'Photo' %} + {{photo_card.create_photo_card(result, view=search_kwargs["view"])}} + {% elif result.__class__.__name__ == 'Album' %} + {{album_card.create_album_card(result, view=search_kwargs["view"])}} + {% endif %} + {% endfor %} +
+ + + \ No newline at end of file diff --git a/frontends/etiquette_flask/templates/tags.html b/frontends/etiquette_flask/templates/tags.html index 3d6b52d..b4e89a4 100644 --- a/frontends/etiquette_flask/templates/tags.html +++ b/frontends/etiquette_flask/templates/tags.html @@ -233,6 +233,18 @@ h2, h3 {% endif %} {% endif %} + + {% if specific_tag %} +
+

Recent photos

+ +
+ {% endif %} diff --git a/frontends/etiquette_flask/templates/user.html b/frontends/etiquette_flask/templates/user.html index 64c5e3a..32be541 100644 --- a/frontends/etiquette_flask/templates/user.html +++ b/frontends/etiquette_flask/templates/user.html @@ -14,10 +14,15 @@ @@ -26,10 +31,18 @@ {{header.make_header(session=session)}}
-

{{user.display_name}}

-

ID: {{user.id}}

-

User since {{user.created|timestamp_to_naturaldate}}.

-

Photos by {{user.display_name}}

+

{{user.display_name}}

+

ID: {{user.id}}

+

User since {{user.created|timestamp_to_naturaldate}}.

+
+
+

Photos by {{user.display_name}}

+