summaryrefslogtreecommitdiff
path: root/templates/base.html
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-04-21 02:22:44 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-04-21 02:22:44 -0400
commit03fa7e4f27bdb39a8f8f5ed91a87d18bf8357b47 (patch)
treec67eafcbda55706f18400b3115a2b8a5be318394 /templates/base.html
parent91c451821ce7000cbc268cec8427d208a6cedd7e (diff)
parentb8ee7b1ee281b45b245fb454228b8ad847c56200 (diff)
Merge branch 'archweb' into archweb-generic2
Conflicts: devel/views.py feeds.py public/views.py settings.py sitestatic/archweb.js templates/base.html templates/devel/profile.html templates/mirrors/status.html templates/news/view.html templates/packages/flaghelp.html templates/packages/opensearch.xml templates/public/download.html templates/public/feeds.html templates/public/index.html templates/registration/login.html templates/releng/results.html templates/todolists/public_list.html
Diffstat (limited to 'templates/base.html')
-rw-r--r--templates/base.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/templates/base.html b/templates/base.html
index f555b83d..5702c8e0 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,15 +1,15 @@
-{% load url from future %}{% load static from staticfiles %}{% load wiki %}<!DOCTYPE html>
+{% load static from staticfiles %}{% load wiki %}<!DOCTYPE html>
<html lang="en">
<head>
+ <meta charset="utf-8" />
<title>{% block title %}{{ BRANDING_DISTRONAME }}{% endblock %}</title>
- <meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="{% static "archweb.css" %}" media="screen, projection" />
- <link rel="stylesheet" type="text/css" href="{% static "archweb-print.css" %}" media="print" />
<link rel="icon" type="image/x-icon" href="{% static "favicon.ico" %}" />
<link rel="shortcut icon" type="image/x-icon" href="{% static "favicon.ico" %}" />
<link rel="apple-touch-icon" href="{% static "logos/apple-touch-icon-57x57.png" %}" />
<link rel="apple-touch-icon" sizes="72x72" href="{% static "logos/apple-touch-icon-72x72.png" %}" />
<link rel="apple-touch-icon" sizes="114x114" href="{% static "logos/apple-touch-icon-114x114.png" %}" />
+ <link rel="apple-touch-icon" sizes="144x144" href="{% static "logos/apple-touch-icon-144x144.png" %}" />
<link rel="search" type="application/opensearchdescription+xml" href="{% url 'opensearch-packages' as osp %}{{ osp }}" title="{{ BRANDING_DISTRONAME }} Packages" />
{% block head %}{% endblock %}
</head>
@@ -41,7 +41,6 @@
<li><a href="{% url 'devel-clocks' %}" title="Developer world clocks">Dev Clocks</a></li>
<li><a href="{{ MAILMAN_BASE_URL }}/mailman/private/arch-dev/"
title="arch-dev mailing list archives">Archives</a></li>
- <li><a href="/mirrors/" title="Mirror server statistics">Mirrors</a></li>
<li><a href="https://stats.archlinux.org/munin/"
title="Arch server monitoring">Server Monitoring</a></li>
{% if user.is_staff %}
@@ -82,5 +81,6 @@
the exclusive licensee of Linus Torvalds, owner of the mark on a world-wide basis.</p>
</div>
</div>
+ {% block script_block %}{% endblock %}
</body>
</html>