summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-03-24 12:24:47 -0500
committerDan McGee <dan@archlinux.org>2012-03-24 12:24:47 -0500
commit20198e67ff37565932bc9b036bb678e8243d46c5 (patch)
tree6ba2fa9658fabdba1f74dde25285b23cd3137fef
parent60c8c00c4f7c2deddcfb1cade8e48d56dca2e9ad (diff)
downloadarchweb-20198e67ff37565932bc9b036bb678e8243d46c5.tar.gz
archweb-20198e67ff37565932bc9b036bb678e8243d46c5.zip
Begin removal of cdnprefix tag
This starts the removal of this code I wrote a while ago in favor of the now core Django static files application and the helpful static template tag. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat
-rw-r--r--templates/base.html16
-rw-r--r--templates/public/donate.html14
-rw-r--r--templates/public/download.html5
-rw-r--r--templates/public/index.html21
4 files changed, 29 insertions, 27 deletions
diff --git a/templates/base.html b/templates/base.html
index 79c7cc92..b8a5be46 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,15 +1,15 @@
-{% load url from future %}<!DOCTYPE html>
+{% load url from future %}{% load static from staticfiles %}<!DOCTYPE html>
<html lang="en">
<head>
<title>{% block title %}Arch Linux{% endblock %}</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
- <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}archweb.css" media="screen, projection" />
- <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}archweb-print.css" media="print" />
- <link rel="icon" type="image/x-icon" href="{{ STATIC_URL }}favicon.ico" />
- <link rel="shortcut icon" type="image/x-icon" href="{{ STATIC_URL }}favicon.ico" />
- <link rel="apple-touch-icon" href="{{ STATIC_URL }}logos/apple-touch-icon-57x57.png" />
- <link rel="apple-touch-icon" sizes="72x72" href="{{ STATIC_URL }}logos/apple-touch-icon-72x72.png" />
- <link rel="apple-touch-icon" sizes="114x114" href="{{ STATIC_URL }}logos/apple-touch-icon-114x114.png" />
+ <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="search" type="application/opensearchdescription+xml" href="{% url 'opensearch-packages' as osp %}{{ osp }}" title="Arch Linux Packages" />
{% block head %}{% endblock %}
</head>
diff --git a/templates/public/donate.html b/templates/public/donate.html
index 76fd0aa1..3b3ee108 100644
--- a/templates/public/donate.html
+++ b/templates/public/donate.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{% load cache %}
-{% load cdn %}
+{% load static from staticfiles %}
{% block title %}Arch Linux - Donate{% endblock %}
@@ -31,7 +31,7 @@
as <a href="http://www.spi-inc.org/donations/">how donations work</a>.</p>
<a href="https://co.clickandpledge.com/Default.aspx?WID=47294">
- <img width="210" height="34" src="{% cdnprefix %}/media/CP_EN_BK_S_001.gif" alt="Donate via Click&amp;Pledge to Arch Linux" title="Donate via Click&amp;Pledge to Arch Linux"/>
+ <img width="210" height="34" src="{% static "CP_EN_BK_S_001.gif" %}" alt="Donate via Click&amp;Pledge to Arch Linux" title="Donate via Click&amp;Pledge to Arch Linux"/>
</a>
<h3>Commercial sponsors and contributions</h3>
@@ -41,7 +41,7 @@
in a server rack, bandwidth, and electricity for our main server.</p>
<a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux"
- title="velocity network"><img width="252" height="58" src="{% cdnprefix %}/media/vnet_button.png" class="sponsor-btn-vnet"
+ title="velocity network"><img width="252" height="58" src="{% static "vnet_button.png" %}" class="sponsor-btn-vnet"
title="" alt="velocity network - it's about time" /></a>
<p>We also wish to extend a special Thank You to <a
@@ -52,7 +52,7 @@
head over to their website for more details.</p>
<a href="https://www.sevenl.net/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl"
- title="SevenL Networks - Dedicated Arch Linux servers"><img width="252" height="58" src="{% cdnprefix %}/media/sevenl_button.png"
+ title="SevenL Networks - Dedicated Arch Linux servers"><img width="252" height="58" src="{% static "sevenl_button.png" %}"
class="sponsor-btn-sevenl" title="A big Thank You to SevenL Networks for their generous contribution"
alt="We would like to express our thanks to SevenL Networks for their generous contribution" /></a>
@@ -60,15 +60,15 @@
title="AirVM.com">AirVM.com</a> for contributing a VMWare-based Virtual Machine.</p>
<a href="http://www.airvm.com/ArchLinux"
- title="AirVM.com - Your Green Technology Partner"><img width="252" height="58" src="{% cdnprefix %}/media/airvm_button.png"
+ title="AirVM.com - Your Green Technology Partner"><img width="252" height="58" src="{% static "airvm_button.png" %}"
class="sponsor-btn-airvm" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner" /></a>
<h3>Past donors</h3>
<div id="donor-list">
<ul>
- {% for donor in donors %}
- <li>{{ donor.name }}</li>{% endfor %}
+{% for donor in donors %}
+<li>{{ donor.name }}</li>{% endfor %}
</ul>
</div>
<div class="clear"></div>
diff --git a/templates/public/download.html b/templates/public/download.html
index d244ec75..a3ff2a37 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -1,6 +1,7 @@
{% extends "base.html" %}
-{% load cache cdn %}
+{% load cache %}
{% load url from future %}
+{% load static from staticfiles %}
{% block title %}Arch Linux - Downloads{% endblock %}
{% block navbarclass %}anb-download{% endblock %}
@@ -125,7 +126,7 @@
title="Release Engineering ISO download">Download snapshots</a></li>
<li><a href="{{ releng_pxeboot_url }}"
title="Arch Linux Netboot Live System">Boot latest snapshots over the network</a>
- <img width="16" height="16" src="{% cdnprefix %}/media/new.png" alt="New"/></li>
+ <img width="16" height="16" src="{% static "new.png" %}" alt="New"/></li>
<li><a href="{% url 'releng-test-overview' %}"
title="Release Engineering ISO feedback">Feedback</a></li>
</ul>
diff --git a/templates/public/index.html b/templates/public/index.html
index 53ccd2d2..04c4795d 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -1,6 +1,7 @@
{% extends "base.html" %}
-{% load markup cache cdn %}
+{% load markup cache %}
{% load url from future %}
+{% load static from staticfiles %}
{% block head %}
<link rel="alternate" type="application/rss+xml" title="Arch Linux News Updates" href="/feeds/news/" />
@@ -42,7 +43,7 @@
</h3>
<a href="/feeds/news/" title="Arch News RSS Feed"
- class="rss-icon"><img width="16" height="16" src="{% cdnprefix %}/media/rss.png" alt="RSS Feed" /></a>
+ class="rss-icon"><img width="16" height="16" src="{% static "rss.png" %}" alt="RSS Feed" /></a>
{% for news in news_updates %}
{% if forloop.counter0 < 5 %}
@@ -95,7 +96,7 @@
title="Browse all of the latest packages">more</a>)</span></h3>
<a href="/feeds/packages/" title="Arch Package Updates RSS Feed"
- class="rss-icon"><img width="16" height="16" src="{% cdnprefix %}/media/rss.png" alt="RSS Feed" /></a>
+ class="rss-icon"><img width="16" height="16" src="{% static "rss.png" %}" alt="RSS Feed" /></a>
<table>
{% for update in pkg_updates %}
@@ -156,7 +157,7 @@
title="Check the status of all known mirrors">Mirror Status</a></li>
<li><a href="/packages/differences/"
title="See differences in packages between available architectures">Differences Reports</a>
- <img width="16" height="16" src="{% cdnprefix %}/media/new.png" alt="New"/></li>
+ <img width="16" height="16" src="{% static "new.png" %}" alt="New"/></li>
</ul>
<h4>Development</h4>
@@ -176,7 +177,7 @@
title="Releng Testbuild Feedback">Releng Testbuild Feedback</a></li>
<li><a href="{% url 'visualize-index' %}"
title="View visualizations">Visualizations</a>
- <img width="16" height="16" src="{% cdnprefix %}/media/new.png" alt="New"/></li>
+ <img width="16" height="16" src="{% static "new.png" %}" alt="New"/></li>
</ul>
<h4>More Resources</h4>
@@ -184,7 +185,7 @@
<ul>
<li><a href="{% url 'page-keys' %}"
title="Package/Database signing master keys">Signing Master Keys</a>
- <img width="16" height="16" src="{% cdnprefix %}/media/new.png" alt="New"/></li>
+ <img width="16" height="16" src="{% static "new.png" %}" alt="New"/></li>
<li><a href="https://wiki.archlinux.org/index.php/Arch_Linux_Press_Review"
title="Arch Linux in the media">Press Coverage</a></li>
<li><a href="{% url 'page-art' %}" title="Arch logos and other artwork for promotional use">Logos &amp; Artwork</a></li>
@@ -199,20 +200,20 @@
<div id="home-donate-button" class="widget">
<a href="https://co.clickandpledge.com/Default.aspx?WID=47294">
- <img width="210" height="34" src="{% cdnprefix %}/media/CP_EN_BK_S_001.gif" alt="Donate via Click&amp;Pledge to Arch Linux" title="Donate via Click&amp;Pledge to Arch Linux"/>
+ <img width="210" height="34" src="{% static "CP_EN_BK_S_001.gif" %}" alt="Donate via Click&amp;Pledge to Arch Linux" title="Donate via Click&amp;Pledge to Arch Linux"/>
</a>
</div>
<div id="arch-sponsors" class="widget">
<a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux" title="Velocity Network">
- <img width="252" height="58" src="{% cdnprefix %}/media/vnet_button.png" alt="Velocity Network - It's about time" />
+ <img width="252" height="58" src="{% static "vnet_button.png" %}" alt="Velocity Network - It's about time" />
</a>
<a href="https://www.sevenl.net/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl" title="SevenL Networks - Dedicated Arch Linux servers">
- <img width="252" height="58" src="{% cdnprefix %}/media/sevenl_button.png" title="A big Thank You to SevenL Networks for their generous contribution" alt="We would like to express our thanks to SevenL Networks for their generous contribution" />
+ <img width="252" height="58" src="{% static "sevenl_button.png" %}" title="A big Thank You to SevenL Networks for their generous contribution" alt="We would like to express our thanks to SevenL Networks for their generous contribution" />
</a>
<a href="http://www.airvm.com/ArchLinux" title="AirVM.com - Your Green Technology Partner">
- <img width="252" height="58" src="{% cdnprefix %}/media/airvm_button.png" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner" />
+ <img width="252" height="58" src="{% static "airvm_button.png" %}" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner" />
</a>
</div>
generated by cgit v1.2.3-55-g3dc8 (git 2.39.1) at 2024-04-16 22:19:49 +0000