From a98298103daf10f189f7c0547dee03b593ef0d9e Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sat, 30 Jan 2021 05:35:07 -0500
Subject: [PATCH] cleanup templates and views
---
archivebox/core/admin.py | 4 +-
archivebox/core/templatetags/core_tags.py | 2 +-
archivebox/core/urls.py | 8 +-
archivebox/core/views.py | 16 +-
archivebox/index/html.py | 6 +-
.../admin/actions_as_select.html | 0
.../admin/app_index.html | 0
.../{themes => templates}/admin/base.html | 0
.../{themes => templates}/admin/login.html | 0
archivebox/templates/admin/private_index.html | 150 ++++++++++++
.../admin/private_index_grid.html} | 2 +-
.../admin/snapshots_grid.html | 2 +-
.../core/add.html} | 2 +-
.../default => templates/core}/base.html | 0
.../core/index_row.html} | 6 +-
.../core/minimal_index.html} | 4 +-
.../core/public_index.html} | 2 +-
.../core/snapshot.html} | 0
.../core/static_index.html} | 2 +-
.../default => templates}/static/add.css | 0
.../default => templates}/static/admin.css | 0
.../default => templates}/static/archive.png | Bin
.../static/bootstrap.min.css | 0
.../default => templates}/static/external.png | Bin
.../static/jquery.dataTables.min.css | 0
.../static/jquery.dataTables.min.js | 0
.../static/jquery.min.js | 0
.../default => templates}/static/sort_asc.png | Bin
.../static/sort_both.png | Bin
.../static/sort_desc.png | Bin
.../default => templates}/static/spinner.gif | Bin
archivebox/themes/legacy/main_index.html | 215 ------------------
archivebox/themes/legacy/main_index_row.html | 16 --
etc/ArchiveBox.conf.default | 1 -
34 files changed, 179 insertions(+), 259 deletions(-)
rename archivebox/{themes => templates}/admin/actions_as_select.html (100%)
rename archivebox/{themes => templates}/admin/app_index.html (100%)
rename archivebox/{themes => templates}/admin/base.html (100%)
rename archivebox/{themes => templates}/admin/login.html (100%)
create mode 100644 archivebox/templates/admin/private_index.html
rename archivebox/{themes/admin/grid_change_list.html => templates/admin/private_index_grid.html} (99%)
rename archivebox/{themes => templates}/admin/snapshots_grid.html (99%)
rename archivebox/{themes/default/add_links.html => templates/core/add.html} (98%)
rename archivebox/{themes/default => templates/core}/base.html (100%)
rename archivebox/{themes/default/main_index_row.html => templates/core/index_row.html} (82%)
rename archivebox/{themes/default/main_index_minimal.html => templates/core/minimal_index.html} (90%)
rename archivebox/{themes/default/core/snapshot_list.html => templates/core/public_index.html} (97%)
rename archivebox/{themes/default/link_details.html => templates/core/snapshot.html} (100%)
rename archivebox/{themes/default/main_index.html => templates/core/static_index.html} (99%)
rename archivebox/{themes/default => templates}/static/add.css (100%)
rename archivebox/{themes/default => templates}/static/admin.css (100%)
rename archivebox/{themes/default => templates}/static/archive.png (100%)
rename archivebox/{themes/default => templates}/static/bootstrap.min.css (100%)
rename archivebox/{themes/default => templates}/static/external.png (100%)
rename archivebox/{themes/default => templates}/static/jquery.dataTables.min.css (100%)
rename archivebox/{themes/default => templates}/static/jquery.dataTables.min.js (100%)
rename archivebox/{themes/default => templates}/static/jquery.min.js (100%)
rename archivebox/{themes/default => templates}/static/sort_asc.png (100%)
rename archivebox/{themes/default => templates}/static/sort_both.png (100%)
rename archivebox/{themes/default => templates}/static/sort_desc.png (100%)
rename archivebox/{themes/default => templates}/static/spinner.gif (100%)
delete mode 100644 archivebox/themes/legacy/main_index.html
delete mode 100644 archivebox/themes/legacy/main_index_row.html
diff --git a/archivebox/core/admin.py b/archivebox/core/admin.py
index f641b177..518731f1 100644
--- a/archivebox/core/admin.py
+++ b/archivebox/core/admin.py
@@ -171,7 +171,7 @@ class SnapshotAdmin(SearchResultsAdminMixin, admin.ModelAdmin):
saved_list_max_show_all = self.list_max_show_all
# Monkey patch here plus core_tags.py
- self.change_list_template = 'admin/grid_change_list.html'
+ self.change_list_template = 'private_index_grid.html'
self.list_per_page = 20
self.list_max_show_all = self.list_per_page
@@ -249,7 +249,7 @@ class ArchiveBoxAdmin(admin.AdminSite):
else:
context["form"] = form
- return render(template_name='add_links.html', request=request, context=context)
+ return render(template_name='add.html', request=request, context=context)
admin.site = ArchiveBoxAdmin()
admin.site.register(get_user_model())
diff --git a/archivebox/core/templatetags/core_tags.py b/archivebox/core/templatetags/core_tags.py
index 25f06852..9ac1ee27 100644
--- a/archivebox/core/templatetags/core_tags.py
+++ b/archivebox/core/templatetags/core_tags.py
@@ -14,7 +14,7 @@ register = template.Library()
def snapshot_image(snapshot):
result = ArchiveResult.objects.filter(snapshot=snapshot, extractor='screenshot', status='succeeded').first()
if result:
- return reverse('LinkAssets', args=[f'{str(snapshot.timestamp)}/{result.output}'])
+ return reverse('Snapshot', args=[f'{str(snapshot.timestamp)}/{result.output}'])
return static('archive.png')
diff --git a/archivebox/core/urls.py b/archivebox/core/urls.py
index b8e4bafb..4c7b429c 100644
--- a/archivebox/core/urls.py
+++ b/archivebox/core/urls.py
@@ -5,22 +5,24 @@ from django.views import static
from django.conf import settings
from django.views.generic.base import RedirectView
-from core.views import MainIndex, LinkDetails, PublicArchiveView, AddView
+from core.views import HomepageView, SnapshotView, PublicIndexView, AddView
# print('DEBUG', settings.DEBUG)
urlpatterns = [
+ path('public/', PublicIndexView.as_view(), name='public-index'),
+
path('robots.txt', static.serve, {'document_root': settings.OUTPUT_DIR, 'path': 'robots.txt'}),
path('favicon.ico', static.serve, {'document_root': settings.OUTPUT_DIR, 'path': 'favicon.ico'}),
path('docs/', RedirectView.as_view(url='https://github.com/ArchiveBox/ArchiveBox/wiki'), name='Docs'),
path('archive/', RedirectView.as_view(url='/')),
- path('archive/<path:path>', LinkDetails.as_view(), name='LinkAssets'),
+ path('archive/<path:path>', SnapshotView.as_view(), name='Snapshot'),
path('admin/core/snapshot/add/', RedirectView.as_view(url='/add/')),
- path('add/', AddView.as_view()),
+ path('add/', AddView.as_view(), name='add'),
path('accounts/login/', RedirectView.as_view(url='/admin/login/')),
path('accounts/logout/', RedirectView.as_view(url='/admin/logout/')),
diff --git a/archivebox/core/views.py b/archivebox/core/views.py
index 810b4740..0e19fad6 100644
--- a/archivebox/core/views.py
+++ b/archivebox/core/views.py
@@ -28,20 +28,20 @@ from ..util import base_url, ansi_to_html
from ..index.html import snapshot_icons
-class MainIndex(View):
- template = 'main_index.html'
-
+class HomepageView(View):
def get(self, request):
if request.user.is_authenticated:
return redirect('/admin/core/snapshot/')
if PUBLIC_INDEX:
- return redirect('public-index')
+ return redirect('/public')
return redirect(f'/admin/login/?next={request.path}')
-class LinkDetails(View):
+class SnapshotView(View):
+ # render static html index from filesystem archive/<timestamp>/index.html
+
def get(self, request, path):
# missing trailing slash -> redirect to index
if '/' not in path:
@@ -91,8 +91,8 @@ class LinkDetails(View):
status=404,
)
-class PublicArchiveView(ListView):
- template = 'snapshot_list.html'
+class PublicIndexView(ListView):
+ template_name = 'public_index.html'
model = Snapshot
paginate_by = 100
ordering = ['title']
@@ -122,7 +122,7 @@ class PublicArchiveView(ListView):
class AddView(UserPassesTestMixin, FormView):
- template_name = "add_links.html"
+ template_name = "add.html"
form_class = AddLinkForm
def get_initial(self):
diff --git a/archivebox/index/html.py b/archivebox/index/html.py
index 28f25fde..3eca5f01 100644
--- a/archivebox/index/html.py
+++ b/archivebox/index/html.py
@@ -25,9 +25,9 @@ from ..config import (
HTML_INDEX_FILENAME,
)
-MAIN_INDEX_TEMPLATE = 'main_index.html'
-MINIMAL_INDEX_TEMPLATE = 'main_index_minimal.html'
-LINK_DETAILS_TEMPLATE = 'link_details.html'
+MAIN_INDEX_TEMPLATE = 'static_index.html'
+MINIMAL_INDEX_TEMPLATE = 'minimal_index.html'
+LINK_DETAILS_TEMPLATE = 'snapshot.html'
TITLE_LOADING_MSG = 'Not yet archived...'
diff --git a/archivebox/themes/admin/actions_as_select.html b/archivebox/templates/admin/actions_as_select.html
similarity index 100%
rename from archivebox/themes/admin/actions_as_select.html
rename to archivebox/templates/admin/actions_as_select.html
diff --git a/archivebox/themes/admin/app_index.html b/archivebox/templates/admin/app_index.html
similarity index 100%
rename from archivebox/themes/admin/app_index.html
rename to archivebox/templates/admin/app_index.html
diff --git a/archivebox/themes/admin/base.html b/archivebox/templates/admin/base.html
similarity index 100%
rename from archivebox/themes/admin/base.html
rename to archivebox/templates/admin/base.html
diff --git a/archivebox/themes/admin/login.html b/archivebox/templates/admin/login.html
similarity index 100%
rename from archivebox/themes/admin/login.html
rename to archivebox/templates/admin/login.html
diff --git a/archivebox/templates/admin/private_index.html b/archivebox/templates/admin/private_index.html
new file mode 100644
index 00000000..7afb62c3
--- /dev/null
+++ b/archivebox/templates/admin/private_index.html
@@ -0,0 +1,150 @@
+{% extends "base.html" %}
+{% load static %}
+
+{% block body %}
+ <div id="toolbar">
+ <form id="changelist-search" action="{% url 'public-index' %}" method="get">
+ <div>
+ <label for="searchbar"><img src="/static/admin/img/search.svg" alt="Search"></label>
+ <input type="text" size="40" name="q" value="" id="searchbar" autofocus placeholder="Title, URL, tags, timestamp, or content...".>
+ <input type="submit" value="Search" style="height: 36px; padding-top: 6px; margin: 8px"/>
+ <input type="button"
+ value="♺"
+ title="Refresh..."
+ onclick="location.href='{% url 'public-index' %}'"
+ style="background-color: rgba(121, 174, 200, 0.8); height: 30px; font-size: 0.8em; margin-top: 12px; padding-top: 6px; float:right">
+ </input>
+ </div>
+ </form>
+ </div>
+ <table id="table-bookmarks">
+ <thead>
+ <tr>
+ <th style="width: 100px;">Bookmarked</th>
+ <th style="width: 26vw;">Snapshot ({{object_list|length}})</th>
+ <th style="width: 140px">Files</th>
+ <th style="width: 16vw;whitespace:nowrap;overflow-x:hidden;">Original URL</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for link in object_list %}
+ {% include 'main_index_row.html' with link=link %}
+ {% endfor %}
+ </tbody>
+ </table>
+ <center>
+ <span class="step-links">
+ {% if page_obj.has_previous %}
+ <a href="{% url 'public-index' %}?page=1">« first</a>
+ <a href="{% url 'public-index' %}?page={{ page_obj.previous_page_number }}">previous</a>
+ {% endif %}
+
+ <span class="current">
+ Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}.
+ </span>
+
+ {% if page_obj.has_next %}
+ <a href="{% url 'public-index' %}?page={{ page_obj.next_page_number }}">next </a>
+ <a href="{% url 'public-index' %}?page={{ page_obj.paginator.num_pages }}">last »</a>
+ {% endif %}
+ </span>
+
+ {% if page_obj.has_next %}
+ <a href="{% url 'public-index' %}?page={{ page_obj.next_page_number }}">next </a>
+ <a href="{% url 'public-index' %}?page={{ page_obj.paginator.num_pages }}">last »</a>
+ {% endif %}
+ </span>
+ <br>
+ </center>
+{% endblock %}
+{% extends "admin/base_site.html" %}
+{% load i18n admin_urls static admin_list %}
+{% load core_tags %}
+
+{% block extrastyle %}
+ {{ block.super }}
+ <link rel="stylesheet" type="text/css" href="{% static "admin/css/changelists.css" %}">
+ {% if cl.formset %}
+ <link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}">
+ {% endif %}
+ {% if cl.formset or action_form %}
+ <script src="{% url 'admin:jsi18n' %}"></script>
+ {% endif %}
+ {{ media.css }}
+ {% if not actions_on_top and not actions_on_bottom %}
+ <style>
+ #changelist table thead th:first-child {width: inherit}
+ </style>
+ {% endif %}
+{% endblock %}
+
+{% block extrahead %}
+{{ block.super }}
+{{ media.js }}
+{% endblock %}
+
+{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} change-list{% endblock %}
+
+{% if not is_popup %}
+{% block breadcrumbs %}
+<div class="breadcrumbs">
+<a href="{% url 'admin:index' %}">{% translate 'Home' %}</a>
+› <a href="{% url 'admin:app_list' app_label=cl.opts.app_label %}">{{ cl.opts.app_config.verbose_name }}</a>
+› {{ cl.opts.verbose_name_plural|capfirst }}
+</div>
+{% endblock %}
+{% endif %}
+
+{% block coltype %}{% endblock %}
+
+{% block content %}
+ <div id="content-main">
+ {% block object-tools %}
+ <ul class="object-tools">
+ {% block object-tools-items %}
+ {% change_list_object_tools %}
+ {% endblock %}
+ </ul>
+ {% endblock %}
+ {% if cl.formset and cl.formset.errors %}
+ <p class="errornote">
+ {% if cl.formset.total_error_count == 1 %}{% translate "Please correct the error below." %}{% else %}{% translate "Please correct the errors below." %}{% endif %}
+ </p>
+ {{ cl.formset.non_form_errors }}
+ {% endif %}
+ <div class="module{% if cl.has_filters %} filtered{% endif %}" id="changelist">
+ <div class="changelist-form-container">
+ {% block search %}{% search_form cl %}{% endblock %}
+ {% block date_hierarchy %}{% if cl.date_hierarchy %}{% date_hierarchy cl %}{% endif %}{% endblock %}
+
+ <form id="changelist-form" method="post"{% if cl.formset and cl.formset.is_multipart %} enctype="multipart/form-data"{% endif %} novalidate>{% csrf_token %}
+ {% if cl.formset %}
+ <div>{{ cl.formset.management_form }}</div>
+ {% endif %}
+
+ {% block result_list %}
+ {% if action_form and actions_on_top and cl.show_admin_actions %}{% admin_actions %}{% endif %}
+ {% comment %}
+ Table grid
+ {% result_list cl %}
+ {% endcomment %}
+ {% snapshots_grid cl %}
+ {% if action_form and actions_on_bottom and cl.show_admin_actions %}{% admin_actions %}{% endif %}
+ {% endblock %}
+ {% block pagination %}{% pagination cl %}{% endblock %}
+ </form>
+ </div>
+ {% block filters %}
+ {% if cl.has_filters %}
+ <div id="changelist-filter">
+ <h2>{% translate 'Filter' %}</h2>
+ {% if cl.has_active_filters %}<h3 id="changelist-filter-clear">
+ <a href="{{ cl.clear_all_filters_qs }}">✖ {% translate "Clear all filters" %}</a>
+ </h3>{% endif %}
+ {% for spec in cl.filter_specs %}{% admin_list_filter cl spec %}{% endfor %}
+ </div>
+ {% endif %}
+ {% endblock %}
+ </div>
+ </div>
+{% endblock %}
diff --git a/archivebox/themes/admin/grid_change_list.html b/archivebox/templates/admin/private_index_grid.html
similarity index 99%
rename from archivebox/themes/admin/grid_change_list.html
rename to archivebox/templates/admin/private_index_grid.html
index 6894efd7..b60f3a3e 100644
--- a/archivebox/themes/admin/grid_change_list.html
+++ b/archivebox/templates/admin/private_index_grid.html
@@ -88,4 +88,4 @@
{% endblock %}
</div>
</div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/archivebox/themes/admin/snapshots_grid.html b/archivebox/templates/admin/snapshots_grid.html
similarity index 99%
rename from archivebox/themes/admin/snapshots_grid.html
rename to archivebox/templates/admin/snapshots_grid.html
index a7a2d4f9..10788060 100644
--- a/archivebox/themes/admin/snapshots_grid.html
+++ b/archivebox/templates/admin/snapshots_grid.html
@@ -159,4 +159,4 @@ footer {
{% endfor %}
</section>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/archivebox/themes/default/add_links.html b/archivebox/templates/core/add.html
similarity index 98%
rename from archivebox/themes/default/add_links.html
rename to archivebox/templates/core/add.html
index fa8b441f..0f161885 100644
--- a/archivebox/themes/default/add_links.html
+++ b/archivebox/templates/core/add.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "core/base.html" %}
{% load static %}
{% load i18n %}
diff --git a/archivebox/themes/default/base.html b/archivebox/templates/core/base.html
similarity index 100%
rename from archivebox/themes/default/base.html
rename to archivebox/templates/core/base.html
diff --git a/archivebox/themes/default/main_index_row.html b/archivebox/templates/core/index_row.html
similarity index 82%
rename from archivebox/themes/default/main_index_row.html
rename to archivebox/templates/core/index_row.html
index eae60ea9..cba3ec39 100644
--- a/archivebox/themes/default/main_index_row.html
+++ b/archivebox/templates/core/index_row.html
@@ -4,9 +4,9 @@
<td title="{{link.timestamp}}"> {% if link.bookmarked_date %} {{ link.bookmarked_date }} {% else %} {{ link.added }} {% endif %} </td>
<td class="title-col" style="opacity: {% if link.title %}1{% else %}0.3{% endif %}">
{% if link.is_archived %}
- <a href="archive/{{link.timestamp}}/index.html"><img src="archive/{{link.timestamp}}/favicon.ico" class="link-favicon" decoding="async"></a>
+ <a href="archive/{{link.timestamp}}/index.html"><img src="archive/{{link.timestamp}}/favicon.ico" onerror="this.style.display='none'" class="link-favicon" decoding="async"></a>
{% else %}
- <a href="archive/{{link.timestamp}}/index.html"><img src="{% static 'spinner.gif' %}" class="link-favicon" decoding="async" style="height: 15px"></a>
+ <a href="archive/{{link.timestamp}}/index.html"><img src="{% static 'spinner.gif' %}" onerror="this.style.display='none'" class="link-favicon" decoding="async" style="height: 15px"></a>
{% endif %}
<a href="archive/{{link.timestamp}}/index.html" title="{{link.title|default:'Not yet archived...'}}">
@@ -28,7 +28,7 @@
{{link.icons}} <small style="float:right; opacity: 0.5">{{link.num_outputs}}</small>
{% else %}
<a href="archive/{{link.timestamp}}/index.html">📄
- {{link.num_outputs}} <img src="{% static 'spinner.gif' %}" class="files-spinner" decoding="async" style="height: 15px"/>
+ {{link.num_outputs}} <img src="{% static 'spinner.gif' %}" onerror="this.style.display='none'" class="files-spinner" decoding="async" style="height: 15px"/>
</a>
{% endif %}
</span>
diff --git a/archivebox/themes/default/main_index_minimal.html b/archivebox/templates/core/minimal_index.html
similarity index 90%
rename from archivebox/themes/default/main_index_minimal.html
rename to archivebox/templates/core/minimal_index.html
index dcfaa23f..3c69a831 100644
--- a/archivebox/themes/default/main_index_minimal.html
+++ b/archivebox/templates/core/minimal_index.html
@@ -16,9 +16,9 @@
</thead>
<tbody>
{% for link in links %}
- {% include "main_index_row.html" with link=link %}
+ {% include "index_row.html" with link=link %}
{% endfor %}
</tbody>
</table>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/archivebox/themes/default/core/snapshot_list.html b/archivebox/templates/core/public_index.html
similarity index 97%
rename from archivebox/themes/default/core/snapshot_list.html
rename to archivebox/templates/core/public_index.html
index dd8ebf15..327042ea 100644
--- a/archivebox/themes/default/core/snapshot_list.html
+++ b/archivebox/templates/core/public_index.html
@@ -28,7 +28,7 @@
</thead>
<tbody>
{% for link in object_list %}
- {% include 'main_index_row.html' with link=link %}
+ {% include 'index_row.html' with link=link %}
{% endfor %}
</tbody>
</table>
diff --git a/archivebox/themes/default/link_details.html b/archivebox/templates/core/snapshot.html
similarity index 100%
rename from archivebox/themes/default/link_details.html
rename to archivebox/templates/core/snapshot.html
diff --git a/archivebox/themes/default/main_index.html b/archivebox/templates/core/static_index.html
similarity index 99%
rename from archivebox/themes/default/main_index.html
rename to archivebox/templates/core/static_index.html
index 269c9825..07066e27 100644
--- a/archivebox/themes/default/main_index.html
+++ b/archivebox/templates/core/static_index.html
@@ -234,7 +234,7 @@
</thead>
<tbody>
{% for link in links %}
- {% include 'main_index_row.html' with link=link %}
+ {% include 'index_row.html' with link=link %}
{% endfor %}
</tbody>
</table>
diff --git a/archivebox/themes/default/static/add.css b/archivebox/templates/static/add.css
similarity index 100%
rename from archivebox/themes/default/static/add.css
rename to archivebox/templates/static/add.css
diff --git a/archivebox/themes/default/static/admin.css b/archivebox/templates/static/admin.css
similarity index 100%
rename from archivebox/themes/default/static/admin.css
rename to archivebox/templates/static/admin.css
diff --git a/archivebox/themes/default/static/archive.png b/archivebox/templates/static/archive.png
similarity index 100%
rename from archivebox/themes/default/static/archive.png
rename to archivebox/templates/static/archive.png
diff --git a/archivebox/themes/default/static/bootstrap.min.css b/archivebox/templates/static/bootstrap.min.css
similarity index 100%
rename from archivebox/themes/default/static/bootstrap.min.css
rename to archivebox/templates/static/bootstrap.min.css
diff --git a/archivebox/themes/default/static/external.png b/archivebox/templates/static/external.png
similarity index 100%
rename from archivebox/themes/default/static/external.png
rename to archivebox/templates/static/external.png
diff --git a/archivebox/themes/default/static/jquery.dataTables.min.css b/archivebox/templates/static/jquery.dataTables.min.css
similarity index 100%
rename from archivebox/themes/default/static/jquery.dataTables.min.css
rename to archivebox/templates/static/jquery.dataTables.min.css
diff --git a/archivebox/themes/default/static/jquery.dataTables.min.js b/archivebox/templates/static/jquery.dataTables.min.js
similarity index 100%
rename from archivebox/themes/default/static/jquery.dataTables.min.js
rename to archivebox/templates/static/jquery.dataTables.min.js
diff --git a/archivebox/themes/default/static/jquery.min.js b/archivebox/templates/static/jquery.min.js
similarity index 100%
rename from archivebox/themes/default/static/jquery.min.js
rename to archivebox/templates/static/jquery.min.js
diff --git a/archivebox/themes/default/static/sort_asc.png b/archivebox/templates/static/sort_asc.png
similarity index 100%
rename from archivebox/themes/default/static/sort_asc.png
rename to archivebox/templates/static/sort_asc.png
diff --git a/archivebox/themes/default/static/sort_both.png b/archivebox/templates/static/sort_both.png
similarity index 100%
rename from archivebox/themes/default/static/sort_both.png
rename to archivebox/templates/static/sort_both.png
diff --git a/archivebox/themes/default/static/sort_desc.png b/archivebox/templates/static/sort_desc.png
similarity index 100%
rename from archivebox/themes/default/static/sort_desc.png
rename to archivebox/templates/static/sort_desc.png
diff --git a/archivebox/themes/default/static/spinner.gif b/archivebox/templates/static/spinner.gif
similarity index 100%
rename from archivebox/themes/default/static/spinner.gif
rename to archivebox/templates/static/spinner.gif
diff --git a/archivebox/themes/legacy/main_index.html b/archivebox/themes/legacy/main_index.html
deleted file mode 100644
index 74e7bf65..00000000
--- a/archivebox/themes/legacy/main_index.html
+++ /dev/null
@@ -1,215 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <title>Archived Sites</title>
- <meta charset="utf-8" name="viewport" content="width=device-width, initial-scale=1">
- <style>
- html, body {
- width: 100%;
- height: 100%;
- font-size: 18px;
- font-weight: 200;
- text-align: center;
- margin: 0px;
- padding: 0px;
- font-family: "Gill Sans", Helvetica, sans-serif;
- }
- .header-top small {
- font-weight: 200;
- color: #efefef;
- }
-
- .header-top {
- width: 100%;
- height: auto;
- min-height: 40px;
- margin: 0px;
- text-align: center;
- color: white;
- font-size: calc(11px + 0.84vw);
- font-weight: 200;
- padding: 4px 4px;
- border-bottom: 3px solid #aa1e55;
- background-color: #aa1e55;
- }
- input[type=search] {
- width: 22vw;
- border-radius: 4px;
- border: 1px solid #aeaeae;
- padding: 3px 5px;
- }
- .nav > div {
- min-height: 30px;
- }
- .header-top a {
- text-decoration: none;
- color: rgba(0,0,0,0.6);
- }
- .header-top a:hover {
- text-decoration: none;
- color: rgba(0,0,0,0.9);
- }
- .header-top .col-lg-4 {
- text-align: center;
- padding-top: 4px;
- padding-bottom: 4px;
- }
- .header-archivebox img {
- display: inline-block;
- margin-right: 3px;
- height: 30px;
- margin-left: 12px;
- margin-top: -4px;
- margin-bottom: 2px;
- }
- .header-archivebox img:hover {
- opacity: 0.5;
- }
-
- #table-bookmarks_length, #table-bookmarks_filter {
- padding-top: 12px;
- opacity: 0.8;
- padding-left: 24px;
- padding-right: 22px;
- margin-bottom: -16px;
- }
- table {
- padding: 6px;
- width: 100%;
- }
- table thead th {
- font-weight: 400;
- }
- table tr {
- height: 35px;
- }
- tbody tr:nth-child(odd) {
- background-color: #ffebeb !important;
- }
- table tr td {
- white-space: nowrap;
- overflow: hidden;
- /*padding-bottom: 0.4em;*/
- /*padding-top: 0.4em;*/
- padding-left: 2px;
- text-align: center;
- }
- table tr td a {
- text-decoration: none;
- }
- table tr td img, table tr td object {
- display: inline-block;
- margin: auto;
- height: 24px;
- width: 24px;
- padding: 0px;
- padding-right: 5px;
- vertical-align: middle;
- margin-left: 4px;
- }
- #table-bookmarks {
- width: 100%;
- overflow-y: scroll;
- table-layout: fixed;
- }
- .dataTables_wrapper {
- background-color: #fafafa;
- }
- table tr a span[data-archived~=False] {
- opacity: 0.4;
- }
- .files-spinner {
- height: 15px;
- width: auto;
- opacity: 0.5;
- vertical-align: -2px;
- }
- .in-progress {
- display: none;
- }
- tr td a.favicon img {
- padding-left: 6px;
- padding-right: 12px;
- vertical-align: -4px;
- }
- tr td a.title {
- font-size: 1.4em;
- text-decoration:none;
- color:black;
- }
- tr td a.title small {
- background-color: #efefef;
- border-radius: 4px;
- float:right
- }
- input[type=search]::-webkit-search-cancel-button {
- -webkit-appearance: searchfield-cancel-button;
- }
- .title-col {
- text-align: left;
- }
- .title-col a {
- color: black;
- }
- </style>
- <link rel="stylesheet" href="static/bootstrap.min.css">
- <link rel="stylesheet" href="static/jquery.dataTables.min.css"/>
- <script src="static/jquery.min.js"></script>
- <script src="static/jquery.dataTables.min.js"></script>
- <script>
- document.addEventListener('error', function(e) {
- e.target.style.opacity = 0;
- }, true)
- jQuery(document).ready(function() {
- jQuery('#table-bookmarks').DataTable({
- stateSave: true, // save state (filtered input, number of entries shown, etc) in localStorage
- dom: '<lf<t>ip>', // how to show the table and its helpers (filter, etc) in the DOM
- order: [[0, 'desc']],
- iDisplayLength: 100,
- });
- });
- </script>
- </head>
- <body>
- <header>
- <div class="header-top container-fluid">
- <div class="row nav">
- <div class="col-sm-2">
- <a href="?" class="header-archivebox" title="Last updated: $time_updated">
- <img src="static/archive.png" alt="Logo"/>
- ArchiveBox
- </a>
- </div>
- <div class="col-sm-10" style="text-align: right">
- <a href="https://github.com/ArchiveBox/ArchiveBox/wiki">Documentation</a> |
- <a href="https://github.com/ArchiveBox/ArchiveBox">Source</a> |
- <a href="https://archivebox.io">Website</a>
- </div>
- </div>
- </div>
- </header>
- <table id="table-bookmarks">
- <thead>
- <tr class="thead-tr">
- <th style="width: 100px;">Bookmarked</th>
- <th style="width: 26vw;">Snapshot ($num_links)</th>
- <th style="width: 50px">Files</th>
- <th style="width: 16vw;whitespace:nowrap;overflow-x:hidden;">Original URL</th>
- </tr>
- </thead>
- <tbody>$rows</tbody>
- </table>
- <footer>
- <br/>
- <center>
- <small>
- Created using <a href="https://github.com/ArchiveBox/ArchiveBox" title="Github">ArchiveBox</a>
- version <a href="https://github.com/ArchiveBox/ArchiveBox/releases" title="Releases">v$version</a>.
- <br/><br/>
- $footer_info
- </small>
- </center>
- <br/>
- </footer>
- </body>
-</html>
diff --git a/archivebox/themes/legacy/main_index_row.html b/archivebox/themes/legacy/main_index_row.html
deleted file mode 100644
index 9112eace..00000000
--- a/archivebox/themes/legacy/main_index_row.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<tr>
- <td title="$timestamp">$bookmarked_date</td>
- <td class="title-col">
- <a href="$archive_path/index.html" class="link-url"><img src="$favicon_url" class="link-favicon" decoding="async"></a>
- <a href="$archive_path/$wget_url" title="$title">
- <span data-title-for="$url" data-archived="$is_archived">$title</span>
- <small style="float:right">$tags</small>
- </a>
- </td>
- <td>
- <a href="$archive_path/index.html">📄
- <span data-number-for="$url" title="Number of extractor outputs">$num_outputs</span>
- </a>
- </td>
- <td style="text-align:left"><a href="$url">$url</a></td>
-</tr>
diff --git a/etc/ArchiveBox.conf.default b/etc/ArchiveBox.conf.default
index fe3bcdde..982a1931 100644
--- a/etc/ArchiveBox.conf.default
+++ b/etc/ArchiveBox.conf.default
@@ -24,7 +24,6 @@
# PUBLIC_INDEX = True
# PUBLIC_SNAPSHOTS = True
# FOOTER_INFO = Content is hosted for personal archiving purposes only. Contact server owner for any takedown requests.
-# ACTIVE_THEME = default
[ARCHIVE_METHOD_TOGGLES]