mirror/archivebox
1
0
Fork 0
mirror of https://github.com/pirate/ArchiveBox.git synced 2025-08-21 13:52:30 +02:00
Code Issues Releases Wiki Activity

use older docker compose version for more features

Browse Source
This commit is contained in:
Nick Sweeting
2021-04-05 23:22:05 -04:00
parent cadac4838e
commit 1485e4eb90
4 changed files with 26 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
archivebox/templates/admin/base.html
View File

@@ -89,31 +89,7 @@
</div> </div>
{% block usertools %} {% block usertools %}
{% if has_permission %} {% if has_permission %}
<div id="user-tools"> {% include 'navigation.html' %}
<a href="{% url 'admin:Add' %}">Add ➕</a> &nbsp; &nbsp;
<a href="{% url 'Home' %}">Snapshots</a> |
<a href="/admin/core/archiveresult/?o=-1">Outputs</a> |
<a href="/admin/core/tag/">Tags</a> &nbsp; &nbsp;
<a href="{% url 'Docs' %}">Docs</a> |
<a href="/admin/">Admin</a>
&nbsp; &nbsp;
{% block welcome-msg %}
{% trans 'User' %}
<strong>{% firstof user.get_short_name user.get_username %}</strong> &nbsp; &nbsp;
{% endblock %}
{% block userlinks %}
{% if user.is_active and user.is_staff %}
{% url 'django-admindocs-docroot' as docsroot %}
{% if docsroot %}
<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> /
{% endif %}
{% endif %}
{% if user.has_usable_password %}
<a href="{% url 'admin:password_change' %}">Account</a> /
{% endif %}
<a href="{% url 'admin:logout' %}">{% trans 'Log out' %}</a>
{% endblock %}
</div>
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% block nav-global %}{% endblock %} {% block nav-global %}{% endblock %}

17
archivebox/templates/core/base.html
View File

@@ -44,21 +44,8 @@
</a> </a>
</h1> </h1>
</div> </div>
<div id="user-tools"> {% include 'navigation.html' %}
<a href="/add/">➕&nbsp; Add</a> &nbsp;/&nbsp;
<a href="/">Snapshots</a> &nbsp;/&nbsp;
<a href="/admin/">Admin</a> &nbsp;/&nbsp;
<a href="https://github.com/ArchiveBox/ArchiveBox/wiki">Docs</a>
{% if user.is_authenticated %}
&nbsp; &nbsp;
User
<strong>{% firstof user.get_short_name user.get_username %}</strong> &nbsp; &nbsp;
{% if user.has_usable_password %}
<a href="{% url 'admin:password_change' %}">Change password</a> /
{% endif %}
<a href="{% url 'admin:logout' %}">Log out</a>
{% endif %}
</div>
</div> </div>
<div id="content" class="flex"> <div id="content" class="flex">
{% block body %} {% block body %}

22
archivebox/templates/core/navigation.html Normal file
View File

@@ -0,0 +1,22 @@
{% load i18n static %}
<div id="user-tools">
<a href="{% url 'admin:Add' %}">Add ➕</a> &nbsp; &nbsp;
<a href="{% url 'Home' %}">Snapshots</a> |
<a href="/admin/core/tag/">Tags</a> |
<a href="/admin/core/archiveresult/?o=-1">Log</a> &nbsp; &nbsp;
<a href="{% url 'Docs' %}">Docs</a> |
<a href="{% url 'public-index' %}">Public</a> |
<a href="/admin/">Admin</a>
&nbsp; &nbsp;
{% block welcome-msg %}
{% trans 'User' %}
<strong>{% firstof user.get_short_name user.get_username %}</strong> &nbsp; &nbsp;
{% endblock %}
{% block userlinks %}
{% if user.has_usable_password %}
<a href="{% url 'admin:password_change' %}">Account</a> /
{% endif %}
<a href="{% url 'admin:logout' %}">{% trans 'Log out' %}</a>
{% endblock %}
</div>

3
docker-compose.yml
View File

@@ -7,7 +7,7 @@
# Documentation: # Documentation:
# https://github.com/ArchiveBox/ArchiveBox/wiki/Docker#docker-compose # https://github.com/ArchiveBox/ArchiveBox/wiki/Docker#docker-compose
version: '3.7' version: '2.4'
services: services:
archivebox: archivebox:
@@ -87,4 +87,3 @@ services:
# volumes: # volumes:
# ./data:/archivebox # ./data:/archivebox
# ./data/wayback:/webarchive # ./data/wayback:/webarchive