Skip to content

armgit / mwmbl

Public Imported from GitHub
0

An open source, non-profit web search engine

Tidy display format

Daoud Clarkee4e082b4ba5f
diff --git a/front-end/assets/css/global.css b/front-end/assets/css/global.css
index 487dec2..8360306 100644
--- a/front-end/assets/css/global.css
+++ b/front-end/assets/css/global.css
@@ -350,6 +350,17 @@ a {
padding: 10px;
}
+.compare {
+ display: flex;
+ /*flex-direction: column;*/
+ gap: 10px;
+}
+
+.compare-item {
+ /* set the maximum width of the item */
+ /*max-width: 300px;*/
+}
+
/* Sortable styling is not working in HTML 5 yet */
/*.sortable-drag {*/
/* opacity: 1.0;*/
@@ -362,3 +373,7 @@ a {
/*.sortable-chosen {*/
/* opacity: 0;*/
/*}*/
+
+.center {
+ text-align: center;
+}
\ No newline at end of file
diff --git a/mwmbl/templates/mwmbl/curation_detail.html b/mwmbl/templates/mwmbl/curation_detail.html
index d8b5bdf..b3ee9ce 100644
--- a/mwmbl/templates/mwmbl/curation_detail.html
+++ b/mwmbl/templates/mwmbl/curation_detail.html
@@ -1,24 +1,28 @@
{% extends "base.html" %}
-{% load result_filters %}
+
+{% load humanize %}
{% block content %}
- <h1>Original results</h1>
- <ul class="results">
- {% for result in curation.original_results %}
- <li class="result" is="mwmbl-result">
- <div class="result-container">
- <div class="result-link">
- <a href="{{result.url}}">
- <p><span class='link'>{{result.url}}</span> <span class="via">— found via <span class="source">{{result.state|convert_state_to_source|title}}</span></span></p>
- <p class='title'>{{result.title|format_for_query:curation.query}}</p>
- </a>
- <p class='extract'>{{result.extract|format_for_query:curation.query}}</p>
- </div>
- <div class="curation-buttons">
- <button class="button curate-approve{% if result.state >= 7 %} validated{% endif %}">✓</button>
- </div>
- </div>
- </li>
- {% endfor %}
- </ul>
+ <br>
+ <h1 class="center">Curation by {{ curation.user }} {{ curation.timestamp|naturaltime }}
+ for query <a href="/?q={{ curation.query|urlencode }}">{{ curation.query }}</a></h1>
+ <br><br>
+ <div class="compare">
+ <div class="compare-item">
+ <h1 class="center">Original results</h1>
+ <ul class="results">
+ {% for result in curation.original_results %}
+ {% include "result-static.html" with query=curation.query %}
+ {% endfor %}
+ </ul>
+ </div>
+ <div class="compare-item">
+ <h1 class="center">New results</h1>
+ <ul class="results">
+ {% for result in curation.new_results %}
+ {% include "result-static.html" with query=curation.query %}
+ {% endfor %}
+ </ul>
+ </div>
+ </div>
{% endblock %}
diff --git a/mwmbl/templates/result-static.html b/mwmbl/templates/result-static.html
new file mode 100644
index 0000000..28dd992
--- /dev/null
+++ b/mwmbl/templates/result-static.html
@@ -0,0 +1,16 @@
+{% load result_filters %}
+
+<li class="result" is="mwmbl-result">
+ <div class="result-container">
+ <div class="result-link">
+ <a href="{{result.url}}">
+ <p><span class='link'>{{result.url}}</span> <span class="via">— found via <span class="source">{{result.state|convert_state_to_source|title}}</span></span></p>
+ <p class='title'>{{result.title|format_for_query:query}}</p>
+ </a>
+ <p class='extract'>{{result.extract|format_for_query:query}}</p>
+ </div>
+ <div class="curation-buttons">
+ <button class="button curate-approve{% if result.state >= 7 %} validated{% endif %}">✓</button>
+ </div>
+ </div>
+</li>