Mercurial > public > sg101
changeset 1018:02ae9a4a846a
ManifestStaticFilesStorage: get rid of STATIC_URL in templates.
line wrap: on
line diff
--- a/sg101/settings/base.py Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/settings/base.py Sun Dec 06 21:49:39 2015 -0600 @@ -95,7 +95,6 @@ "django.core.context_processors.debug", "django.core.context_processors.request", "django.core.context_processors.media", - "django.core.context_processors.static", "django.contrib.messages.context_processors.messages", )
--- a/sg101/templates/accounts/register1.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/accounts/register1.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,6 +1,7 @@ {% extends 'base.html' %} +{% load static from staticfiles %} {% block custom_js %} -<script type="text/javascript" src="{{ STATIC_URL }}js/accounts_code.js"></script> +<script type="text/javascript" src="{% static "js/accounts_code.js" %}"></script> {% endblock %} {% block title %}New User Registration Step 2{% endblock %} {% block content %}
--- a/sg101/templates/bandmap/bandmap_base.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/bandmap/bandmap_base.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,10 +1,11 @@ {% extends 'base.html' %} +{% load static from staticfiles %} {% block custom_css %} -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/bandmap.css" /> +<link rel="stylesheet" type="text/css" href="{% static "css/bandmap.css" %}" /> {% endblock %} {% block custom_js %} <script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key=AIzaSyA8-qKS8Qi9vALxgndMLCdxQrRkXJ_CWNQ"></script> -<script type="text/javascript" src="{{ STATIC_URL }}js/bandmap.js"></script> +<script type="text/javascript" src="{% static "js/bandmap.js" %}"></script> {% endblock %} {% block content %} <h2>Surf Band Map</h2>
--- a/sg101/templates/base.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/base.html Sun Dec 06 21:49:39 2015 -0600 @@ -9,31 +9,32 @@ {% load donations_tags %} {% load core_tags %} {% load cache %} +{% load static from staticfiles %} <head prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb#"> <title>SurfGuitar101.com | {% block title %}{% endblock %}</title> <meta charset="utf-8" /> <meta name="robots" content="all" /> <meta name="Author" content="Brian Neal" /> {% block custom_meta %}{% endblock %} -<link rel="stylesheet" href="{{ STATIC_URL }}css/blueprint/screen.css" media="screen, projection" /> -<link rel="stylesheet" href="{{ STATIC_URL }}css/blueprint/print.css" media="print" /> +<link rel="stylesheet" href="{% static "css/blueprint/screen.css" %}" media="screen, projection" /> +<link rel="stylesheet" href="{% static "css/blueprint/print.css" %}" media="print" /> <!--[if lt IE 8]> -<link rel="stylesheet" href="{{ STATIC_URL }}css/blueprint/ie.css" type="text/css" media="screen, projection" /> +<link rel="stylesheet" href="{% static "css/blueprint/ie.css" %}" type="text/css" media="screen, projection" /> <![endif]--> -<link rel="stylesheet" href="{{ STATIC_URL }}css/base.css" /> -<link rel="stylesheet" href="{{ STATIC_URL }}css/shoutbox.css" /> +<link rel="stylesheet" href="{% static "css/base.css" %}" /> +<link rel="stylesheet" href="{% static "css/shoutbox.css" %}" /> {% script_tags "jquery" %} {% block custom_head %}{% endblock %} {% block custom_css %}{% endblock %} {% block custom_js %}{% endblock %} -<script src="{{ STATIC_URL }}js/jquery.cycle.all3.0.3.js"></script> -<script src="{{ STATIC_URL }}js/shoutbox.js"></script> -<link rel="shortcut icon" href="{{ STATIC_URL }}favicon.ico" /> +<script src="{% static "js/jquery.cycle.all3.0.3.js" %}"></script> +<script src="{% static "js/shoutbox.js" %}"></script> +<link rel="shortcut icon" href="{% static "favicon.ico" %}" /> </head> <body>{% block begin_body %}{% endblock %} <div id="page" class="container"> <div id="header" class="span-24"> - <p><a href="/" title="SG101 Home"><img src="{{ STATIC_URL }}themes/kds/sgLogo.png" alt="SurfGuitar101.com Logo" width="446" height="103" /></a></p> + <p><a href="/" title="SG101 Home"><img src="{% static "themes/kds/sgLogo.png" %}" alt="SurfGuitar101.com Logo" width="446" height="103" /></a></p> </div> <div id="header-nav" class="span-24"> {% include "navbar.html" %} @@ -51,7 +52,7 @@ <li><a href="{% url 'downloads-index' %}">Downloads</a></li> <li><a href="{% url 'forums-index' %}">Forums</a></li> <li><a href="/forums/topic/24987/">Guitar Instruction</a> - <img src="{{ STATIC_URL }}icons/new.png" title="New!" alt="New!" /></li> + <img src="{% static "icons/new.png" %}" title="New!" alt="New!" /></li> <li><a href="{% url 'irc-main' %}">IRC</a></li> <li><a href="{% url 'bio-member_list' type='user' %}">Member List</a></li> <li><a href="{% url 'membermap-index' %}">Member Map</a></li> @@ -63,7 +64,7 @@ <li><a href="{% url 'haystack_search' %}">Search</a></li> <li><a href="/store/">Store</a></li> <li><a href="{% url 'bandmap-map' %}">Surf Band Map</a> - <img src="{{ STATIC_URL }}icons/new.png" title="New!" alt="New!" /></li> + <img src="{% static "icons/new.png" %}" title="New!" alt="New!" /></li> <li><a href="http://wiki.surfguitar101.com">Wiki</a></li> <li><a href="{% url 'ygroup-thread_index' %}">Yahoo Group</a></li> </ul> @@ -100,47 +101,47 @@ <p>Please visit our friends in the surf music community:</p> <ul class="logo-block"> <li><a href="http://www.surferjoemusic.com/festival/"> - <img src="{{ STATIC_URL }}logos/surferjoe.jpg" alt="Surfer Joe Festival" title="Surfer Joe Festival"></a></li> + <img src="{% static "logos/surferjoe.jpg" %}" alt="Surfer Joe Festival" title="Surfer Joe Festival"></a></li> <li><a href="http://www.surfmusic-forum.com"> - <img src="{{ STATIC_URL }}logos/surfmusicforum.png" alt="Surfmusic-Forum.de" title="Surfmusic-Forum.de"></a></li> + <img src="{% static "logos/surfmusicforum.png" %}" alt="Surfmusic-Forum.de" title="Surfmusic-Forum.de"></a></li> <li><a href="http://www.nesmasurf.org/"> - <img src="{{ STATIC_URL }}logos/nesma.png" alt="NESMA" title="N.E.S.M.A."></a></li> + <img src="{% static "logos/nesma.png" %}" alt="NESMA" title="N.E.S.M.A."></a></li> <li><a href="http://hangninesurfmusic.blogspot.de/"> - <img src="{{ STATIC_URL }}logos/hangnine.png" alt="HangNine" title="HangNine Blog"></a></li> + <img src="{% static "logos/hangnine.png" %}" alt="HangNine" title="HangNine Blog"></a></li> <li><a href="http://www.surfrockmusic.com"> - <img src="{{ STATIC_URL }}logos/surfrock.png" alt="SurfRockMusic.com" title="SurfRockMusic.com"></a></li> + <img src="{% static "logos/surfrock.png" %}" alt="SurfRockMusic.com" title="SurfRockMusic.com"></a></li> <li><a href="http://www.northseasurfradio.com"> - <img src="{{ STATIC_URL }}logos/northsea.png" alt="NSSR" title="North Sea Surf Radio"></a></li> + <img src="{% static "logos/northsea.png" %}" alt="NSSR" title="North Sea Surf Radio"></a></li> <li><a href="http://www.luxuriamusic.com/podcasts/Fiberglass%20Jungle"> - <img src="{{ STATIC_URL }}logos/fiberglass.png" alt="Fiberglass Jungle" title="Fiberglass Jungle"></a></li> + <img src="{% static "logos/fiberglass.png" %}" alt="Fiberglass Jungle" title="Fiberglass Jungle"></a></li> <li><a href="https://www.facebook.com/surfmusicmadrid"> - <img src="{{ STATIC_URL }}logos/madrid.png" alt="Surf Music Madrid" title="Surf Music Madrid"></a></li> + <img src="{% static "logos/madrid.png" %}" alt="Surf Music Madrid" title="Surf Music Madrid"></a></li> <li><a href="http://www.festivalsurforama.es/"> - <img src="{{ STATIC_URL }}logos/surforama.png" alt="Surf-O-Rama" title="Surf-O-Rama Festival"></a></li> + <img src="{% static "logos/surforama.png" %}" alt="Surf-O-Rama" title="Surf-O-Rama Festival"></a></li> <li><a href="http://thevoodooclub.com/endlesssummer/"> - <img src="{{ STATIC_URL }}logos/endless.png" alt="Endless Summer" title="Endless Summer Surf Music Festival"></a></li> + <img src="{% static "logos/endless.png" %}" alt="Endless Summer" title="Endless Summer Surf Music Festival"></a></li> <li><a href="https://www.facebook.com/AbiertoDeSurfInstrumental"> - <img src="{{ STATIC_URL }}logos/abierto.png" alt="Abierto de Surf Instrumental" title="Abierto de Surf Instrumental"></a></li> + <img src="{% static "logos/abierto.png" %}" alt="Abierto de Surf Instrumental" title="Abierto de Surf Instrumental"></a></li> <li><a href="http://www.doublecrownrecords.com"> - <img src="{{ STATIC_URL }}logos/doublecrown.png" alt="Double Crown Records" title="Double Crown Records"></a></li> + <img src="{% static "logos/doublecrown.png" %}" alt="Double Crown Records" title="Double Crown Records"></a></li> <li><a href="http://www.greencookie.gr"> - <img src="{{ STATIC_URL }}logos/greencookie.png" alt="Green Cookie Records" title="Green Cookie Records"></a></li> + <img src="{% static "logos/greencookie.png" %}" alt="Green Cookie Records" title="Green Cookie Records"></a></li> <li><a href="http://www.deepeddy.net"> - <img src="{{ STATIC_URL }}logos/deepeddy.png" alt="Deep Eddy Records" title="Deep Eddy Records"></a></li> + <img src="{% static "logos/deepeddy.png" %}" alt="Deep Eddy Records" title="Deep Eddy Records"></a></li> <li><a href="http://radiofreebakersfield.com/"> - <img src="{{ STATIC_URL }}logos/rfb.png" alt="Radio Free Bakersfield" title="Radio Free Bakersfield"></a></li> + <img src="{% static "logos/rfb.png" %}" alt="Radio Free Bakersfield" title="Radio Free Bakersfield"></a></li> <li><a href="http://planetareverb.wix.com/planeta-reverb"> - <img src="{{ STATIC_URL }}logos/planeta_reverb.png" alt="Planeta Reverb" title="Planeta Reverb"></a></li> + <img src="{% static "logos/planeta_reverb.png" %}" alt="Planeta Reverb" title="Planeta Reverb"></a></li> <li><a href="http://reverbjunkiesfilm.com/"> - <img src="{{ STATIC_URL }}logos/reverb_junkies.png" alt="Reverb Junkies" title="Reverb Junkies"></a></li> + <img src="{% static "logos/reverb_junkies.png" %}" alt="Reverb Junkies" title="Reverb Junkies"></a></li> <li><a href="http://southernsurfstomp.blogspot.com/"> - <img src="{{ STATIC_URL }}logos/southern_surf_stomp.png" alt="Southern Surf Stomp" title="Southern Surf Stomp"></a></li> + <img src="{% static "logos/southern_surf_stomp.png" %}" alt="Southern Surf Stomp" title="Southern Surf Stomp"></a></li> <li><a href="http://thenocturnebrain.com/prod.htm"> - <img src="{{ STATIC_URL }}logos/nocturne_brain.png" alt="Nocturne Brain" title="Nocturne Brain"></a></li> + <img src="{% static "logos/nocturne_brain.png" %}" alt="Nocturne Brain" title="Nocturne Brain"></a></li> <li><a href="http://www.surfabillyfreakout.com/"> - <img src="{{ STATIC_URL }}logos/surfabilly_freakout.png" alt="Surfabilly Freakout" title="Surfabilly Freakout"></a></li> + <img src="{% static "logos/surfabilly_freakout.png" %}" alt="Surfabilly Freakout" title="Surfabilly Freakout"></a></li> <li><a href="http://www.reverb-brasil.org/"> - <img src="{{ STATIC_URL }}logos/reverb_brazil.jpg" alt="Reverb Brazil" title="Reverb Brazil"></a></li> + <img src="{% static "logos/reverb_brazil.jpg" %}" alt="Reverb Brazil" title="Reverb Brazil"></a></li> </ul> </div> <p>
--- a/sg101/templates/bio/base.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/bio/base.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,6 +1,7 @@ {% extends 'base.html' %} +{% load static from staticfiles %} {% block custom_css %} -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/bio.css" /> +<link rel="stylesheet" type="text/css" href="{% static "css/bio.css" %}" /> {% block bio_css %}{% endblock %} {% endblock %} {% block content %}
--- a/sg101/templates/bio/edit_elsewhere.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/bio/edit_elsewhere.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,4 +1,5 @@ {% extends 'bio/base.html' %} +{% load static from staticfiles %} {% block title %}Edit Your Elsewhere Links{% endblock %} {% block content %} <h2>Edit Your Elsewhere Links</h2> @@ -7,7 +8,7 @@ <ul> {% for profile in request.user.social_network_profiles.all %} <li> - <img src="{{ STATIC_URL }}elsewhere/{{ profile.icon_name }}" alt="{{ profile.name }}" /> + <img src="{% static "elsewhere/{{ profile.icon_name }}" %}" alt="{{ profile.name }}" /> <a href="{{ profile.url }}" rel="me">{{ profile.name }}</a> <form id="delete-network-{{ profile.id }}" method="post" action=".">{% csrf_token %} <input type="hidden" name="delete_id" value="{{ profile.id }}" /> @@ -43,7 +44,7 @@ <ul> {% for profile in request.user.instant_messenger_profiles.all %} <li> - <img src="{{ STATIC_URL }}elsewhere/{{ profile.icon_name }}" alt="{{ profile.name }}" /> + <img src="{% static "elsewhere/{{ profile.icon_name }}" %}" alt="{{ profile.name }}" /> {{ profile.name }}: <a href="{{ profile.url }}">{{ profile.username }}</a> <form id="delete-messenger-{{ profile.id }}" method="post" action=".">{% csrf_token %} <input type="hidden" name="delete_id" value="{{ profile.id }}" /> @@ -69,7 +70,7 @@ <ul> {% for profile in request.user.website_profiles.all %} <li> - <img src="{{ STATIC_URL }}icons/world.png" alt="{{ profile.name }}" /> + <img src="{% static "icons/world.png" %}" alt="{{ profile.name }}" /> <a href="{{ profile.url }}" rel="me">{{ profile.name }}</a> <form id="delete-website-{{ profile.id }}" method="post" action=".">{% csrf_token %} <input type="hidden" name="delete_id" value="{{ profile.id }}" />
--- a/sg101/templates/bio/edit_profile.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/bio/edit_profile.html Sun Dec 06 21:49:39 2015 -0600 @@ -16,7 +16,7 @@ <table> <tr> <td> - <a href="{% url 'bio-change_avatar' %}"><img src="{{ STATIC_URL }}icons/image_edit.png" alt="Change Avatar" /></a> + <a href="{% url 'bio-change_avatar' %}"><img src="{% static "icons/image_edit.png" %}" alt="Change Avatar" /></a> <a href="{% url 'bio-change_avatar' %}">Change Avatar</a></td> <td>{% avatar user 0 %}</td> </tr> @@ -24,7 +24,7 @@ {{ profile_form.as_table }} <tr> <td> - <a href="{% url 'bio-edit_elsewhere' %}"><img src="{{ STATIC_URL }}icons/link_edit.png" alt="Edit Links" /></a> + <a href="{% url 'bio-edit_elsewhere' %}"><img src="{% static "icons/link_edit.png" %}" alt="Edit Links" /></a> <a href="{% url 'bio-edit_elsewhere' %}">Edit Elsewhere Links</a></td> <td>{% elsewhere_links user %}</td> </tr>
--- a/sg101/templates/bio/members.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/bio/members.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,11 +1,12 @@ {% extends 'bio/base.html' %} {% load cycle from future %} +{% load static from staticfiles %} {% load bio_tags %} {% load messages_tags %} {% block title %}Member List{% endblock %} {% block bio_css %} -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/tab-nav.css" /> -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/pagination.css" /> +<link rel="stylesheet" type="text/css" href="{% static "css/tab-nav.css" %}" /> +<link rel="stylesheet" type="text/css" href="{% static "css/pagination.css" %}" /> {% endblock %} {% block content %} <h2>Member List</h2> @@ -42,9 +43,9 @@ <td>{{ u.date_joined|date:"M. d, Y" }}</td> <td> {% ifnotequal user u %}<a href="{% send_pm_url u.username %}"> - <img src="{{ STATIC_URL }}icons/note.png" alt="PM" title="Send private message" /></a>{% endifnotequal %} + <img src="{% static "icons/note.png" %}" alt="PM" title="Send private message" /></a>{% endifnotequal %} {% if not u.profile.hide_email %}<a href="mailto:{{ u.email }}"> - <img src="{{ STATIC_URL }}icons/email.png" alt="Email" title="Send Email" /></a>{% endif %} + <img src="{% static "icons/email.png" %}" alt="Email" title="Send Email" /></a>{% endif %} </td> </tr> {% endfor %}
--- a/sg101/templates/bio/view_profile.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/bio/view_profile.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,4 +1,5 @@ {% extends 'bio/base.html' %} +{% load static from staticfiles %} {% load bio_tags %} {% load elsewhere_tags %} {% load core_tags %} @@ -11,7 +12,7 @@ $('#bio_profile tr:even').addClass('even'); }); </script> -<script type="text/javascript" src="{{ STATIC_URL }}js/bio.js"></script> +<script type="text/javascript" src="{% static "js/bio.js" %}"></script> {% endblock %} {% block content %} <div class="user_profile"> @@ -81,26 +82,26 @@ </div> {% if this_is_me %} <ul class="icon-list"> - <li><a href="{% url 'bio-edit_profile' %}"><img src="{{ STATIC_URL }}icons/application_edit.png" alt="Edit Profile" /></a> + <li><a href="{% url 'bio-edit_profile' %}"><img src="{% static "icons/application_edit.png" %}" alt="Edit Profile" /></a> <a href="{% url 'bio-edit_profile' %}">Edit Profile</a></li> - <li><a href="{% url 'bio-change_avatar' %}"><img src="{{ STATIC_URL }}icons/image_edit.png" alt="Change Avatar" /></a> + <li><a href="{% url 'bio-change_avatar' %}"><img src="{% static "icons/image_edit.png" %}" alt="Change Avatar" /></a> <a href="{% url 'bio-change_avatar' %}">Change Avatar</a></li> - <li><a href="{% url 'user_photos-upload' %}"><img src="{{ STATIC_URL }}icons/picture_add.png" alt="Upload Photo" /></a> + <li><a href="{% url 'user_photos-upload' %}"><img src="{% static "icons/picture_add.png" %}" alt="Upload Photo" /></a> <a href="{% url 'user_photos-upload' %}">Upload Photo</a></li> - <li><a href="{% url 'bio-edit_elsewhere' %}"><img src="{{ STATIC_URL }}icons/link_edit.png" alt="Edit Links" /></a> + <li><a href="{% url 'bio-edit_elsewhere' %}"><img src="{% static "icons/link_edit.png" %}" alt="Edit Links" /></a> <a href="{% url 'bio-edit_elsewhere' %}">Edit Elsewhere Links</a></li> - <li><a href="{% url 'django.contrib.auth.views.password_change' %}"><img src="{{ STATIC_URL }}icons/key.png" alt="Change Password" /></a> + <li><a href="{% url 'django.contrib.auth.views.password_change' %}"><img src="{% static "icons/key.png" %}" alt="Change Password" /></a> <a href="{% url 'django.contrib.auth.views.password_change' %}">Change Password</a></li> </ul> {% else %} {% if user.is_authenticated %} <ul class="icon-list"> - <li><a href="{% send_pm_url subject.username %}"><img src="{{ STATIC_URL }}icons/note.png" alt="PM" title="Send Private Message" /></a> <a href="{% send_pm_url subject.username %}">Send a private message to {{ subject.username }}</a></li> - <li><a href="{% url 'forums-posts_for_user' username=subject.username %}"><img src="{{ STATIC_URL }}icons/comments.png" + <li><a href="{% send_pm_url subject.username %}"><img src="{% static "icons/note.png" %}" alt="PM" title="Send Private Message" /></a> <a href="{% send_pm_url subject.username %}">Send a private message to {{ subject.username }}</a></li> + <li><a href="{% url 'forums-posts_for_user' username=subject.username %}"><img src="{% static "icons/comments.png" %}" alt="Forum Posts" title="View forum posts by {{ subject.username }}" /></a> <a href="{% url 'forums-posts_for_user' username=subject.username %}">View forum posts by {{ subject.username }}</a></li> - <li><a href="{% url 'user_photos-gallery' username=subject.username %}"><img src="{{ STATIC_URL }}icons/pictures.png" + <li><a href="{% url 'user_photos-gallery' username=subject.username %}"><img src="{% static "icons/pictures.png" %}" alt="View photos" title="View photos uploaded by {{ subject.username }}" /></a> <a href="{% url 'user_photos-gallery' username=subject.username %}">View photos uploaded by {{ subject.username }}</a></li> - <li><img src="{{ STATIC_URL }}icons/flag_red.png" alt="Flag" /> + <li><img src="{% static "icons/flag_red.png" %}" alt="Flag" /> <a href="#" class="profile-flag" id="fp-{{ profile.id }}">Report this profile</a></li> </ul> {% endif %}
--- a/sg101/templates/comments/markdown_preview.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/comments/markdown_preview.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,9 +1,10 @@ +{% load static from staticfiles %} <!DOCTYPE html> <html lang="en"> <head> <meta charset="utf-8" /> <title>Markdown Preview</title> -<link rel="stylesheet" href="{{ STATIC_URL }}js/markitup/templates/preview.css" /> +<link rel="stylesheet" href="{% static "js/markitup/templates/preview.css" %}" /> </head> {{ data|safe }} </body>
--- a/sg101/templates/contests/contest_detail.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/contests/contest_detail.html Sun Dec 06 21:49:39 2015 -0600 @@ -3,22 +3,23 @@ {% load core_tags %} {% load comment_tags %} {% load script_tags %} +{% load static from staticfiles %} {% block custom_meta %} {% open_graph_meta_tags contest %} {% endblock %} {% block title %}Contests: {{ contest.title }}{% endblock %} {% block custom_css %} -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/comments.css" /> +<link rel="stylesheet" type="text/css" href="{% static "css/comments.css" %}" /> {% endblock %} {% block custom_js %} {% if contest.is_active %} {% script_tags "markitup jquery-ui" %} -<script type="text/javascript" src="{{ STATIC_URL }}js/comments.js"></script> +<script type="text/javascript" src="{% static "js/comments.js" %}"></script> {% endif %} <script type="text/javascript"> var contest_id = {{ contest.id }}; </script> -<script type="text/javascript" src="{{ STATIC_URL }}js/contests/contests.js"></script> +<script type="text/javascript" src="{% static "js/contests/contests.js" %}"></script> {% endblock %} {% block content %}
--- a/sg101/templates/contests/contest_list.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/contests/contest_list.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,5 +1,6 @@ {% extends 'base.html' %} {% load bio_tags %} +{% load static from staticfiles %} {% block title %}Contests{% endblock %} {% block content %} <h2>Contests</h2> @@ -11,16 +12,16 @@ <li><a href="{{ contest.get_absolute_url }}">{{ contest.title }}</a> - {{ contest.creation_date|date:"F d, Y" }} to {{ contest.end_date|date:"F d, Y" }} {% if contest.is_active %} - <img src="{{ STATIC_URL }}icons/new.png" alt="New" /> + <img src="{% static "icons/new.png" %}" alt="New" /> {% else %} {% if contest.win_date %} <ul> {% for winner in contest.winners.all %} - <li><img src="{{ STATIC_URL }}icons/rosette.png" alt="Winner" /> {% profile_link winner.username %}</li> + <li><img src="{% static "icons/rosette.png" %}" alt="Winner" /> {% profile_link winner.username %}</li> {% endfor %} </ul> {% else %} - <img src="{{ STATIC_URL }}icons/lock.png" alt="Old" /> + <img src="{% static "icons/lock.png" %}" alt="Old" /> {% endif %} {% endif %} </li>
--- a/sg101/templates/downloads/add.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/downloads/add.html Sun Dec 06 21:49:39 2015 -0600 @@ -2,9 +2,10 @@ {% load downloads_tags %} {% load core_tags %} {% load script_tags %} +{% load static from staticfiles %} {% block title %}Add Download{% endblock %} {% block custom_css %} -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/downloads.css" /> +<link rel="stylesheet" type="text/css" href="{% static "css/downloads.css" %}" /> {% endblock %} {% block custom_js %} {% script_tags 'jquery-ui markitup' %}
--- a/sg101/templates/downloads/download.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/downloads/download.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,5 +1,6 @@ {% load comment_tags %} {% load bio_tags %} +{% load static from staticfiles %} {% get_comment_count for download as comment_count %} <dt> <a href="{{ download.get_absolute_url }}">{{ download.title }}</a> @@ -19,7 +20,7 @@ </tr> <tr> <th>Rating:</th><td><div class="rating" id="rating-{{ download.id }}">{{ download.average_score|floatformat }}</div></td> - <th><img src="{{ STATIC_URL }}icons/comments.png" alt="Comments" title="Comments" /> + <th><img src="{% static "icons/comments.png" %}" alt="Comments" title="Comments" /> <a href="{{ download.get_absolute_url }}">Comments</a>:</th><td>{{ comment_count }}</td> </tr> </table>
--- a/sg101/templates/downloads/download_detail.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/downloads/download_detail.html Sun Dec 06 21:49:39 2015 -0600 @@ -2,16 +2,17 @@ {% load downloads_tags %} {% load comment_tags %} {% load script_tags %} +{% load static from staticfiles %} {% block title %}Downloads Details{% endblock %} {% block custom_css %} -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/comments.css" /> -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/downloads.css" /> +<link rel="stylesheet" type="text/css" href="{% static "css/comments.css" %}" /> +<link rel="stylesheet" type="text/css" href="{% static "css/downloads.css" %}" /> {% endblock %} {% block custom_js %} {% script_tags "markitup jquery-ui" %} -<script type="text/javascript" src="{{ STATIC_URL }}js/comments.js"></script> -<script type="text/javascript" src="{{ STATIC_URL }}js/rating.js"></script> -<script type="text/javascript" src="{{ STATIC_URL }}js/downloads-get.js"></script> +<script type="text/javascript" src="{% static "js/comments.js" %}"></script> +<script type="text/javascript" src="{% static "js/rating.js" %}"></script> +<script type="text/javascript" src="{% static "js/downloads-get.js" %}"></script> {% endblock %} {% block content %} <h2>Downloads</h2>
--- a/sg101/templates/downloads/download_list.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/downloads/download_list.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,14 +1,15 @@ {% extends 'base.html' %} +{% load static from staticfiles %} {% load downloads_tags %} {% block title %}Downloads: {{ category.title }}{% endblock %} {% block custom_css %} -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/downloads.css" /> -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/tab-nav.css" /> -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/pagination.css" /> +<link rel="stylesheet" type="text/css" href="{% static "css/downloads.css" %}" /> +<link rel="stylesheet" type="text/css" href="{% static "css/tab-nav.css" %}" /> +<link rel="stylesheet" type="text/css" href="{% static "css/pagination.css" %}" /> {% endblock %} {% block custom_js %} -<script type="text/javascript" src="{{ STATIC_URL }}js/rating.js"></script> -<script type="text/javascript" src="{{ STATIC_URL }}js/downloads-get.js"></script> +<script type="text/javascript" src="{% static "js/rating.js" %}"></script> +<script type="text/javascript" src="{% static "js/downloads-get.js" %}"></script> {% endblock %} {% block content %} <h2>Downloads</h2>
--- a/sg101/templates/downloads/download_summary.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/downloads/download_summary.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,14 +1,15 @@ {% extends 'base.html' %} {% load downloads_tags %} +{% load static from staticfiles %} {% block title %}{{ title }}{% endblock %} {% block custom_css %} -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/downloads.css" /> -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/tab-nav.css" /> -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/pagination.css" /> +<link rel="stylesheet" type="text/css" href="{% static "css/downloads.css" %}" /> +<link rel="stylesheet" type="text/css" href="{% static "css/tab-nav.css" %}" /> +<link rel="stylesheet" type="text/css" href="{% static "css/pagination.css" %}" /> {% endblock %} {% block custom_js %} -<script type="text/javascript" src="{{ STATIC_URL }}js/rating.js"></script> -<script type="text/javascript" src="{{ STATIC_URL }}js/downloads-get.js"></script> +<script type="text/javascript" src="{% static "js/rating.js" %}"></script> +<script type="text/javascript" src="{% static "js/downloads-get.js" %}"></script> {% endblock %} {% block content %} <h2>Downloads</h2>
--- a/sg101/templates/downloads/index.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/downloads/index.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,8 +1,9 @@ {% extends 'base.html' %} +{% load static from staticfiles %} {% load downloads_tags %} {% block title %}Downloads{% endblock %} {% block custom_css %} -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/downloads.css" /> +<link rel="stylesheet" type="text/css" href="{% static "css/downloads.css" %}" /> {% endblock %} {% block content %} <h2>Downloads</h2>
--- a/sg101/templates/downloads/navigation.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/downloads/navigation.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,5 +1,6 @@ +{% load static from staticfiles %} <div class="app-logo"> -<img src="{{ STATIC_URL }}icons/downloads-logo.jpg" alt="Downloads Logo" title="Downloads" /> + <img src="{% static "icons/downloads-logo.jpg" %}" alt="Downloads Logo" title="Downloads" /> </div> <ul class="app-menu"> <li><a href="{% url 'downloads-index' %}">Categories</a></li>
--- a/sg101/templates/downloads/thanks.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/downloads/thanks.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,9 +1,10 @@ {% extends 'base.html' %} +{% load static from staticfiles %} {% load downloads_tags %} {% block title %}Thanks for the Download{% endblock %} {% block custom_css %} {{ add_form.media }} -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/downloads.css" /> +<link rel="stylesheet" type="text/css" href="{% static "css/downloads.css" %}" /> {% endblock %} {% block content %} <h2>Downloads</h2>
--- a/sg101/templates/forums/display_post.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/forums/display_post.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,3 +1,4 @@ +{% load static from staticfiles %} {% load bio_tags %} {% load forum_tags %} {% load messages_tags %} @@ -20,16 +21,16 @@ {% if user.is_authenticated %} <p> <a href="{% send_pm_url post.user.username %}"> - <img src="{{ STATIC_URL }}icons/note.png" alt="PM" title="Send Private Message to {{ post.user.username }}" /></a> + <img src="{% static "icons/note.png" %}" alt="PM" title="Send Private Message to {{ post.user.username }}" /></a> {% if not post.user.profile.hide_email %}<a href="mailto:{{ post.user.email }}"> - <img src="{{ STATIC_URL }}icons/email.png" alt="Email" title="Send Email to {{ post.user.username}}" /></a>{% endif %} + <img src="{% static "icons/email.png" %}" alt="Email" title="Send Email to {{ post.user.username}}" /></a>{% endif %} </p> {% endif %} </td> <td class="forum-post-body"> <div class="forum-post-info quiet{% if post.user.profile.is_stranger %} stranger{% endif %}"> - {% if post.unread %}<img src="{{ STATIC_URL }}icons/new.png" alt="New" title="New" />{% endif %} - <a href="{{ post.get_absolute_url }}"><img src="{{ STATIC_URL }}icons/link.png" alt="Link" title="Link to this post" /></a> + {% if post.unread %}<img src="{% static "icons/new.png" %}" alt="New" title="New" />{% endif %} + <a href="{{ post.get_absolute_url }}"><img src="{% static "icons/link.png" %}" alt="Link" title="Link to this post" /></a> Posted on {% forum_date post.creation_date user %} {% if can_moderate %}from IP: <a href="{% url 'forums-post_ip_info' post.id %}">{{ post.user_ip }}</a>{% endif %} </div> @@ -52,22 +53,22 @@ <div class="forum-post-info-tools"> <a href="#top" class="quiet" title="Goto the top of the page">Top</a> {% if can_reply %} - <a href="{% url 'forums-new_post' topic_id=post.topic.id %}?quote={{ post.id }}"><img src="{{ STATIC_URL }}icons/comment.png" alt="Reply with quote" title="Reply with quote" /></a> + <a href="{% url 'forums-new_post' topic_id=post.topic.id %}?quote={{ post.id }}"><img src="{% static "icons/comment.png" %}" alt="Reply with quote" title="Reply with quote" /></a> {% endif %} {% post_edit_button post user can_moderate %} <a href="#" class="post-flag" id="fp-{{ post.id }}" title="Flag this post as spam, abuse, or a violation of site rules."> - <img src="{{ STATIC_URL }}icons/flag_red.png" alt="Flag" /></a> + <img src="{% static "icons/flag_red.png" %}" alt="Flag" /></a> {% if can_moderate %} <a href="#" class="post-delete" id="dp-{{ post.id }}" - title="Delete this post"><img src="{{ STATIC_URL }}icons/cross.png" alt="Delete post" /></a> + title="Delete this post"><img src="{% static "icons/cross.png" %}" alt="Delete post" /></a> {% if post.user != user and post.user.profile.is_stranger %} <br /> <span class="quiet">Stranger options:</span> <a href="{% url 'forums-stranger' post.id %}" title="This stranger seems legitimate"> - <img src="{{ STATIC_URL }}icons/tick.png" alt="Acquaintance" /></a> + <img src="{% static "icons/tick.png" %}" alt="Acquaintance" /></a> <a href="{% url 'forums-spammer' post.id %}" title="This is spam"> - <img src="{{ STATIC_URL }}icons/exclamation.png" alt="Spammer" /></a> + <img src="{% static "icons/exclamation.png" %}" alt="Spammer" /></a> {% endif %} {% endif %} </div>
--- a/sg101/templates/forums/index.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/forums/index.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,5 +1,6 @@ {% extends 'base.html' %} {% load cycle from future %} +{% load static from staticfiles %} {% load accounts_tags %} {% load cache %} {% load forum_tags %} @@ -12,7 +13,7 @@ {% endblock %} {% block title %}Forums{% endblock %} {% block content %} -<h2>Forums <a href="/feeds/forums/"><img src="{{ STATIC_URL }}icons/feed.png" alt="Forums Feed" title="Forums Feed" /></a></h2> +<h2>Forums <a href="/feeds/forums/"><img src="{% static "icons/feed.png" %}" alt="Forums Feed" title="Forums Feed" /></a></h2> {% include "forums/forum_query.html" %} @@ -33,7 +34,7 @@ <tr class="{% cycle 'odd' 'even' %}"> <td> {% if forum.has_unread %} - <a href="{{ forum.get_absolute_url }}"><img src="{{ STATIC_URL }}icons/new.png" alt="New Posts" title="New Posts" class="forums-topic-icon" /></a> + <a href="{{ forum.get_absolute_url }}"><img src="{% static "icons/new.png" %}" alt="New Posts" title="New Posts" class="forums-topic-icon" /></a> {% endif %} <h4><a href="{{ forum.get_absolute_url }}">{{ forum.name }}</a></h4> <p>{{ forum.description }}</p>
--- a/sg101/templates/forums/mod_forum.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/forums/mod_forum.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,10 +1,11 @@ {% extends 'base.html' %} {% load cycle from future %} +{% load static from staticfiles %} {% load bio_tags %} {% load forum_tags %} {% block title %}Moderate Forum: {{ forum.name }}{% endblock %} {% block custom_js %} -<script type="text/javascript" src="{{ STATIC_URL }}js/forums_mod.js"></script> +<script type="text/javascript" src="{% static "js/forums_mod.js" %}"></script> {% endblock %} {% block content %} {% forum_navigation forum "Moderate Forum" %} @@ -25,8 +26,8 @@ <tbody> {% for topic in page.object_list %} <tr class="{% cycle 'odd' 'even' %}"> - <td>{% if topic.sticky %}<img src="{{ STATIC_URL }}icons/asterisk_orange.png" alt="Sticky" title="Sticky" class="forums-topic-icon" />{% endif %} - {% if topic.locked %}<img src="{{ STATIC_URL }}icons/lock.png" alt="Locked" title="Locked" + <td>{% if topic.sticky %}<img src="{% static "icons/asterisk_orange.png" %}" alt="Sticky" title="Sticky" class="forums-topic-icon" />{% endif %} + {% if topic.locked %}<img src="{% static "icons/lock.png" %}" alt="Locked" title="Locked" class="forums-topic-icon" />{% endif %} <h4><a href="{{ topic.get_absolute_url }}">{{ topic.name }}</a></h4></td> <td class="forum-index_replies">{{ topic.reply_count }}</td>
--- a/sg101/templates/forums/mod_split_topic.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/forums/mod_split_topic.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,4 +1,5 @@ {% extends 'base.html' %} +{% load static from staticfiles %} {% load cycle from future %} {% load forum_tags %} {% block title %}Forums: Split Topic{% endblock %} @@ -26,7 +27,7 @@ <td class="forum-post-author">{{ post.user.username }}</td> <td class="forum-post-body"> <div class="forum-post-info quiet"> - <a href="{{ post.get_absolute_url }}"><img src="{{ STATIC_URL }}icons/link.png" alt="Link" title="Link to this post" /></a> + <a href="{{ post.get_absolute_url }}"><img src="{% static "icons/link.png" %}" alt="Link" title="Link to this post" /></a> Posted on {{ post.creation_date|date:"M d, Y H:i" }} from IP: {{ post.user_ip }} </div> <div class="forum-post-body-split">
--- a/sg101/templates/forums/topic.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/forums/topic.html Sun Dec 06 21:49:39 2015 -0600 @@ -34,10 +34,10 @@ <div class="forum-block"> {% if topic.sticky %} -<img src="{{ STATIC_URL }}icons/asterisk_orange.png" alt="Sticky" title="Sticky" /> +<img src="{% static "icons/asterisk_orange.png" %}" alt="Sticky" title="Sticky" /> {% endif %} {% if topic.locked %} -<img src="{{ STATIC_URL }}icons/lock.png" alt="Lock" title="This topic is locked" /> +<img src="{% static "icons/lock.png" %}" alt="Lock" title="This topic is locked" /> {% endif %} {% if can_reply %} {% if topic.locked or topic.sticky %}•{% endif %} @@ -69,9 +69,9 @@ <form action="{% url 'forums-mod_topic_delete' topic.id %}" method="post">{% csrf_token %} <input type="submit" value="Delete Topic" id="forum-mod-del-topic" /> </form> - <a href="{% url 'forums-mod_topic_move' topic.id %}"><img src="{{ STATIC_URL }}icons/application_go.png" alt="Move Topic" title="Move Topic" /></a> + <a href="{% url 'forums-mod_topic_move' topic.id %}"><img src="{% static "icons/application_go.png" %}" alt="Move Topic" title="Move Topic" /></a> <a href="{% url 'forums-mod_topic_move' topic.id %}">Move this topic</a> - <a href="{% url 'forums-mod_topic_split' topic.id %}"><img src="{{ STATIC_URL }}icons/arrow_branch.png" alt="Split Topic" title="Split Topic" /></a> + <a href="{% url 'forums-mod_topic_split' topic.id %}"><img src="{% static "icons/arrow_branch.png" %}" alt="Split Topic" title="Split Topic" /></a> <a href="{% url 'forums-mod_topic_split' topic.id %}">Split this topic</a> </div> {% endif %} @@ -87,11 +87,11 @@ <legend>Favorite Options</legend> <p> {% if is_favorite %} - <img src="{{ STATIC_URL }}icons/delete.png" alt="Favorite" /> + <img src="{% static "icons/delete.png" %}" alt="Favorite" /> You currently have saved this topic in your list of favorites. <input type="submit" value="Remove from favorites" /> {% else %} - <img src="{{ STATIC_URL }}icons/add.png" alt="Favorite" /> + <img src="{% static "icons/add.png" %}" alt="Favorite" /> Would you like to save this topic to your favorites list? <input type="submit" value="Save to favorites" /> {% endif %} @@ -108,11 +108,11 @@ <legend>Subscription Options</legend> <p> {% if is_subscribed %} - <img src="{{ STATIC_URL }}icons/email_delete.png" alt="Email" /> + <img src="{% static "icons/email_delete.png" %}" alt="Email" /> You are currently subscribed to this topic and will receive an email when new replies are posted. <input type="submit" value="Unsubscribe Me" /> {% else %} - <img src="{{ STATIC_URL }}icons/email_add.png" alt="Email" /> + <img src="{% static "icons/email_add.png" %}" alt="Email" /> Would you like to receive an email when someone replies to this topic? <input type="submit" value="Subscribe via Email" /> {% endif %}
--- a/sg101/templates/gcalendar/edit.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/gcalendar/edit.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,14 +1,15 @@ {% extends 'base.html' %} +{% load static from staticfiles %} {% block title %}Edit Calendar Events{% endblock %} {% block custom_js %} -<script type="text/javascript" src="{{ STATIC_URL }}js/gcalendar_edit.js"></script> +<script type="text/javascript" src="{% static "js/gcalendar_edit.js" %}"></script> {% endblock %} {% block content %} <div class="breadcrumbs"><a href="{% url 'gcalendar-index' %}">Calendar</a> » Edit Events</div> <h2>Edit Calendar Events</h2> {% if page.object_list %} <p>You have the following events on our calendar. Click on the event title to edit it, or click the -<img src="{{ STATIC_URL }}icons/cross.png" alt="Cross" /> to delete it. +<img src="{% static "icons/cross.png" %}" alt="Cross" /> to delete it. Your changes will be submitted to the site staff for approval, and won't be reflected on the Google calendar until then. The approval process usually takes less than 12 hours. Thanks for helping to keep our calendar up to date! @@ -17,7 +18,7 @@ {% for event in page.object_list %} <li>{{ event.start_date|date:"M d, Y"}} • <a href="{% url 'gcalendar-edit_event' event.id %}" title="Edit Event">{{ event.what }}</a> -<a class="gcal-del" id="gcal-{{ event.id }}" href="#"><img src="{{ STATIC_URL }}icons/cross.png" alt="Delete Event" title="Delete Event" /></a> +<a class="gcal-del" id="gcal-{{ event.id }}" href="#"><img src="{% static "icons/cross.png" %}" alt="Delete Event" title="Delete Event" /></a> </li> {% endfor %} </ul>
--- a/sg101/templates/gcalendar/index.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/gcalendar/index.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,4 +1,5 @@ {% extends 'base.html' %} +{% load static from staticfiles %} {% block title %}Event Calendar{% endblock %} {% block content %} <h2>SurfGuitar101 Event Calendar</h2> @@ -32,14 +33,14 @@ <ul> {% if user.is_authenticated %} - <li><a href="{% url 'gcalendar-add' %}"><img src="{{ STATIC_URL}}icons/calendar_add.png" alt="Add" /></a> + <li><a href="{% url 'gcalendar-add' %}"><img src="{% static "icons/calendar_add.png" %}" alt="Add" /></a> <a href="{% url 'gcalendar-add' %}">Add an event to our calendar</a></li> - <li><a href="{% url 'gcalendar-edit_events' %}"><img src="{{ STATIC_URL}}icons/calendar_edit.png" alt="Edit" /></a> + <li><a href="{% url 'gcalendar-edit_events' %}"><img src="{% static "icons/calendar_edit.png" %}" alt="Edit" /></a> <a href="{% url 'gcalendar-edit_events' %}">Change or delete an event you previously added</a></li> {% endif %} <li> <a href="http://www.google.com/calendar/feeds/i81lu3fkh57sgqqenogefd9v78%40group.calendar.google.com/public/basic"> -<img src="{{ STATIC_URL }}icons/feed.png" alt="feed" /></a> +<img src="{% static "icons/feed.png" %}" alt="feed" /></a> <a href="http://www.google.com/calendar/feeds/i81lu3fkh57sgqqenogefd9v78%40group.calendar.google.com/public/basic"> RSS Feed</a> </li>
--- a/sg101/templates/home.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/home.html Sun Dec 06 21:49:39 2015 -0600 @@ -7,6 +7,7 @@ {% load poll_tags %} {% load forum_tags %} {% load script_tags %} +{% load static from staticfiles %} {% load cache %} {% block title %}Home{% endblock %} {% block custom_meta %}{% open_graph_meta_tags %}{% endblock %} @@ -14,7 +15,7 @@ <link rel="alternate" type="application/rss+xml" title="SurfGuitar101 News" href="{% url 'feeds-news' %}" /> {% endblock %} {% block custom_css %} -<link rel="stylesheet" href="{{ STATIC_URL }}css/news.css" /> +<link rel="stylesheet" href="{% static "css/news.css" %}" /> {% endblock %} {% block custom_js %} <script>
--- a/sg101/templates/membermap/index.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/membermap/index.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,12 +1,13 @@ {% extends 'base.html' %} {% load core_tags %} {% load script_tags %} +{% load static from staticfiles %} {% block title %}Member Map{% endblock %} {% block custom_css %} -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/membermap.css" /> +<link rel="stylesheet" type="text/css" href="{% static "css/membermap.css" %}" /> {% endblock %} {% block custom_js %} -<script type="text/javascript" src="{{ STATIC_URL }}js/membermap.js"></script> +<script type="text/javascript" src="{% static "js/membermap.js" %}"></script> <script src="https://maps.google.com/maps?file=api&v=2&key=ABQIAAAAql_1Xw9MGW3mOxzo8gLb3hSrh5-ALlu4lmYDsscYaAokjyRNqBRaVcqVr3jaDgMRVSK_3HydK9tYWw" type="text/javascript"></script> {% script_tags 'jquery-ui markitup' %} <script type="text/javascript">
--- a/sg101/templates/messages/inbox.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/messages/inbox.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,6 +1,7 @@ {% extends 'messages/messages_base.html' %} +{% load static from staticfiles %} {% block custom_js %} -<script src="{{ STATIC_URL }}js/messages.js"></script> +<script src="{% static "js/messages.js" %}"></script> {% endblock %} {% block messages_content %} <h3>Inbox <small>(Page {{ page.number }} of {{ page.paginator.num_pages }})</small></h3>
--- a/sg101/templates/messages/messages_base.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/messages/messages_base.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,7 +1,8 @@ {% extends 'base.html' %} +{% load static from staticfiles %} {% load script_tags %} {% block custom_css %} -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/messages.css" /> +<link rel="stylesheet" type="text/css" href="{% static "css/messages.css" %}" /> {% endblock %} {% block content %} <h2>Your Private Messages</h2>
--- a/sg101/templates/messages/outbox.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/messages/outbox.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,6 +1,7 @@ {% extends 'messages/messages_base.html' %} +{% load static from staticfiles %} {% block custom_js %} -<script src="{{ STATIC_URL }}js/messages.js"></script> +<script src="{% static "js/messages.js" %}"></script> {% endblock %} {% block messages_content %} <h3>Outbox <small>(Page {{ page.number }} of {{ page.paginator.num_pages }})</small></h3>
--- a/sg101/templates/messages/trash.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/messages/trash.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,6 +1,7 @@ {% extends 'messages/messages_base.html' %} +{% load static from staticfiles %} {% block custom_js %} -<script src="{{ STATIC_URL }}js/messages.js"></script> +<script src="{% static "js/messages.js" %}"></script> {% endblock %} {% block messages_content %} <h3>Trash <small>(Page {{ page.number }} of {{ page.paginator.num_pages }})</small></h3>
--- a/sg101/templates/messages/view_message.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/messages/view_message.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,4 +1,5 @@ {% extends 'messages/messages_base.html' %} +{% load static from staticfiles %} {% load core_tags %} {% load script_tags %} {% block custom_js %} @@ -35,7 +36,7 @@ </div> {% else %} <div class="notice"> - <img src="{{ STATIC_URL }}icons/flag_red.png" alt="Report this message" /> + <img src="{% static "icons/flag_red.png" %}" alt="Report this message" /> <a href="{% url "messages-report" msg.id %}">Report this message for spam or abuse</a>. </div> {% endif %}
--- a/sg101/templates/news/base.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/news/base.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,13 +1,14 @@ {% extends 'base.html' %} +{% load static from staticfiles %} {% block custom_head %} <link rel="alternate" type="application/rss+xml" title="SurfGuitar101 News" href="{% url 'feeds-news' %}" /> {% endblock %} {% block custom_css %} -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/news.css" /> +<link rel="stylesheet" type="text/css" href="{% static "css/news.css" %}" /> {% block news_css %}{% endblock %} {% endblock %} {% block content %} -<h2>SurfGuitar101 News & Articles <a href="{% url 'feeds-news' %}"><img src="{{ STATIC_URL }}icons/feed.png" alt="News Feed" title="News Feed" /></a></h2> +<h2>SurfGuitar101 News & Articles <a href="{% url 'feeds-news' %}"><img src="{% static "icons/feed.png" %}" alt="News Feed" title="News Feed" /></a></h2> <ul class="app-menu"> <li><a href="{% url 'news-index_page' %}">News Main</a></li>
--- a/sg101/templates/news/index.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/news/index.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,8 +1,9 @@ {% extends 'news/base.html' %} {% load script_tags %} +{% load static from staticfiles %} {% block title %}News: {{ title }}{% endblock %} {% block news_css %} -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/pagination.css" /> +<link rel="stylesheet" type="text/css" href="{% static "css/pagination.css" %}" /> {% endblock %} {% block news_content %} <h3>{{ title }}</h3>
--- a/sg101/templates/news/story.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/news/story.html Sun Dec 06 21:49:39 2015 -0600 @@ -3,18 +3,19 @@ {% load bio_tags %} {% load comment_tags %} {% load script_tags %} +{% load static from staticfiles %} {% load core_tags %} {% block title %}News: {{ story.title }}{% endblock %} {% block custom_meta %} {% open_graph_meta_tags story %} {% endblock %} {% block news_css %} -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/comments.css" /> +<link rel="stylesheet" type="text/css" href="{% static "css/comments.css" %}" /> {% endblock %} {% block custom_js %} {% if story.can_comment_on %} {% script_tags "markitup jquery-ui" %} -<script type="text/javascript" src="{{ STATIC_URL }}js/comments.js"></script> +<script type="text/javascript" src="{% static "js/comments.js" %}"></script> {% endif %} {% endblock %} {% block news_content %} @@ -35,17 +36,17 @@ <hr /> <p> Category: <a href="{% url 'news-category' slug=story.category.slug %}">{{ story.category.title }}</a> - <a href="{{ story.get_absolute_url }}"><img src="{{ STATIC_URL }}icons/link.png" + <a href="{{ story.get_absolute_url }}"><img src="{% static "icons/link.png" %}" alt="Story Permalink" title="Story Permalink" /></a> {% if user.is_authenticated %} - <a href="{% url 'news.views.email_story' story.id %}"><img src="{{ STATIC_URL }}icons/email_go.png" + <a href="{% url 'news.views.email_story' story.id %}"><img src="{% static "icons/email_go.png" %}" alt="Send this story to a friend" title="Send this story to a friend" /></a> {% endif %} </p> {% tags_for_object story as story_tags %} {% if story_tags %} <div class="news-tags"> - <img src="{{ STATIC_URL }}icons/tag_blue.png" alt="Tags" title="Tags" /> Tags: + <img src="{% static "icons/tag_blue.png" %}" alt="Tags" title="Tags" /> Tags: <ul> {% for tag in story_tags %} <li><a href="{% url 'news-tag_page' tag_name=tag.name %}">{{ tag.name }}</a></li>
--- a/sg101/templates/podcast/base.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/podcast/base.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,4 +1,5 @@ {% extends 'base.html' %} +{% load static from staticfiles %} {% block custom_head %} <link rel="alternate" type="application/rss+xml" title="SurfGuitar101 Podcast" href="{% url 'podcast-feed' %}" /> {% endblock %} @@ -17,7 +18,7 @@ <a href="mailto:podcast@surfguitar101.com">podcast@surfguitar101.com</a>. </p> <p> -<a href="{% url 'podcast-feed' %}"><img src="{{ STATIC_URL }}icons/feed.png" alt="RSS Feed" title="RSS Feed" /></a> <a href="{% url 'podcast-feed' %}">Subscribe to the podcast via RSS</a>. +<a href="{% url 'podcast-feed' %}"><img src="{% static "icons/feed.png" %}" alt="RSS Feed" title="RSS Feed" /></a> <a href="{% url 'podcast-feed' %}">Subscribe to the podcast via RSS</a>. </p> <p> <strong>Hey iTunes users!</strong> Here is our <a href="http://itunes.apple.com/WebObjects/MZStore.woa/wa/viewPodcast?id=284928526">listing in iTunes</a>. Follow the previous link and then click the subscribe button to let iTunes automatically download episodes for you.
--- a/sg101/templates/podcast/detail.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/podcast/detail.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,15 +1,16 @@ {% extends 'podcast/base.html' %} {% load script_tags %} +{% load static from staticfiles %} {% load core_tags %} {% block title %}Podcast: {{ podcast.title }}{% endblock %} {% block custom_meta %} {% open_graph_meta_tags podcast %} {% endblock %} {% block custom_css %} -<link type="text/css" href="{{ STATIC_URL }}js/jplayer/skins/blue.monday/jplayer.blue.monday.css" rel="stylesheet" /> +<link type="text/css" href="{% static "js/jplayer/skins/blue.monday/jplayer.blue.monday.css" %}" rel="stylesheet" /> {% endblock %} {% block custom_js %} -<script type="text/javascript" src="{{ STATIC_URL }}js/jplayer/jquery.jplayer.min.js"></script> +<script type="text/javascript" src="{% static "js/jplayer/jquery.jplayer.min.js" %}"></script> <script type="text/javascript"> //<![CDATA[ @@ -20,7 +21,7 @@ $.jPlayer.timeFormat.showHour = true; $(this).jPlayer("setMedia", jplayer_media); }, - swfPath: "{{ STATIC_URL }}js/jplayer", + swfPath: "{% static "js/jplayer" %}", supplied: "{{ jplayer_supplied }}" }); });
--- a/sg101/templates/polls/poll_detail.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/polls/poll_detail.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,15 +1,16 @@ {% extends 'base.html' %} {% load comment_tags %} {% load script_tags %} +{% load static from staticfiles %} {% block title %}Poll Results: {{ poll.question }}{% endblock %} {% block custom_css %} -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/polls.css" /> -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/comments.css" /> +<link rel="stylesheet" type="text/css" href="{% static "css/polls.css" %}" /> +<link rel="stylesheet" type="text/css" href="{% static "css/comments.css" %}" /> {% endblock %} {% block custom_js %} {% if poll.is_open %} {% script_tags "markitup jquery-ui" %} -<script type="text/javascript" src="{{ STATIC_URL }}js/comments.js"></script> +<script type="text/javascript" src="{% static "js/comments.js" %}"></script> {% endif %} {% endblock %} {% block content %}
--- a/sg101/templates/polls/poll_vote.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/polls/poll_vote.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,7 +1,8 @@ {% extends 'base.html' %} +{% load static from staticfiles %} {% block title %}Polls: {{ poll.question }}{% endblock %} {% block custom_css %} -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/polls.css" /> +<link rel="stylesheet" type="text/css" href="{% static "css/polls.css" %}" /> {% endblock %} {% block content %} <h2>Poll</h2>
--- a/sg101/templates/potd/view.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/potd/view.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,4 +1,5 @@ {% extends 'base.html' %} +{% load static from staticfiles %} {% load bio_tags %} {% load core_tags %} {% load comment_tags %} @@ -8,12 +9,12 @@ {% open_graph_meta_tags potd %} {% endblock %} {% block custom_css %} -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/potd.css" /> -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/comments.css" /> +<link rel="stylesheet" type="text/css" href="{% static "css/potd.css" %}" /> +<link rel="stylesheet" type="text/css" href="{% static "css/comments.css" %}" /> {% endblock %} {% block custom_js %} {% script_tags "markitup jquery-ui" %} -<script type="text/javascript" src="{{ STATIC_URL }}js/comments.js"></script> +<script type="text/javascript" src="{% static "js/comments.js" %}"></script> {% endblock %} {% block content %} {% if is_current %}
--- a/sg101/templates/search/search.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/search/search.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,6 +1,7 @@ {% extends 'base.html' %} {% load highlight %} {% load core_tags %} +{% load static from staticfiles %} {% block title %}Search{% endblock %} {% block custom_js %} <script type="text/javascript"> @@ -26,7 +27,7 @@ </script> {% endblock %} {% block content %} -<h2>Search <img src="{{ STATIC_URL }}icons/magnifier.png" alt="Search" /></h2> +<h2>Search <img src="{% static "icons/magnifier.png" %}" alt="Search" /></h2> {% if query_parser_error %} <div class="error"> <p>
--- a/sg101/templates/shoutbox/shout_detail.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/shoutbox/shout_detail.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,4 +1,5 @@ {% load bio_tags %} +{% load static from staticfiles %} <tr> <th> {% avatar shout.user %}<br /> @@ -9,11 +10,11 @@ </div> <br /> <span class="date">{{ shout.shout_date|date:"D M d Y H:i:s" }}</span><br /> -<a href="{% url 'shoutbox-view' shout.id %}"><img src="{{ STATIC_URL }}icons/link.png" alt="Permalink" title="Permalink" /></a> -<a href="#" class="shout-flag" id="shout-flag-{{ shout.id }}"><img src="{{ STATIC_URL }}icons/flag_red.png" alt="Flag" +<a href="{% url 'shoutbox-view' shout.id %}"><img src="{% static "icons/link.png" %}" alt="Permalink" title="Permalink" /></a> +<a href="#" class="shout-flag" id="shout-flag-{{ shout.id }}"><img src="{% static "icons/flag_red.png" %}" alt="Flag" title="Flag this shout as offensive" /></a> {% ifequal user.id shout.user.id %} -<a href="#" class="shout-del" id="shout-del-{{ shout.id }}"><img src="{{ STATIC_URL }}icons/cross.png" alt="Delete" title="Delete this shout" /></a> +<a href="#" class="shout-del" id="shout-del-{{ shout.id }}"><img src="{% static "icons/cross.png" %}" alt="Delete" title="Delete this shout" /></a> {% endifequal %} </td> </tr>
--- a/sg101/templates/shoutbox/view.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/shoutbox/view.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,13 +1,14 @@ {% extends 'base.html' %} {% load bio_tags %} {% load script_tags %} +{% load static from staticfiles %} {% block custom_css %} -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/shoutbox_app.css" /> -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/pagination.css" /> +<link rel="stylesheet" type="text/css" href="{% static "css/shoutbox_app.css" %}" /> +<link rel="stylesheet" type="text/css" href="{% static "css/pagination.css" %}" /> {% endblock %} {% block custom_js %} {% script_tags "jquery-jeditable" %} -<script type="text/javascript" src="{{ STATIC_URL }}js/shoutbox_app.js"></script> +<script type="text/javascript" src="{% static "js/shoutbox_app.js" %}"></script> {% endblock %} {% block title %}Shout History{% endblock %} {% block content %}
--- a/sg101/templates/shoutbox/view_shout.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/shoutbox/view_shout.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,11 +1,12 @@ {% extends 'base.html' %} {% load script_tags %} +{% load static from staticfiles %} {% block custom_css %} -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/shoutbox_app.css" /> +<link rel="stylesheet" type="text/css" href="{% static "css/shoutbox_app.css" %}" /> {% endblock %} {% block custom_js %} {% script_tags "jquery-jeditable" %} -<script type="text/javascript" src="{{ STATIC_URL }}js/shoutbox_app.js"></script> +<script type="text/javascript" src="{% static "js/shoutbox_app.js" %}"></script> {% endblock %} {% block title %}Shout #{{ shout.id }}{% endblock %} {% block content %}
--- a/sg101/templates/store/base.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/store/base.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,4 +1,5 @@ {% extends 'base.html' %} +{% load static from staticfiles %} {% block content %} <h2>SurfGuitar101 Store</h2> @@ -61,7 +62,7 @@ its fourth edition, this book features more information, an expanded index, and color photos. Foreword by Dick Dale, the King of the Surf Guitar himself! </p> -<p><img src="{{ STATIC_URL }}store/blairs_book.jpg" /></p> +<p><img src="{% static "store/blairs_book.jpg" %}" /></p> <p>Order now at <a href="http://johnblair.us">John Blair's website</a>.</p> <hr />
--- a/sg101/templates/user_photos/gallery.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/user_photos/gallery.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,8 +1,9 @@ {% extends 'base.html' %} +{% load static from staticfiles %} {% load bio_tags %} {% block title %}Photo Gallery for {{ gallery_owner.username }}{% endblock %} {% block custom_css %} -<link rel="stylesheet" href="{{ STATIC_URL }}css/user_photos.css" /> +<link rel="stylesheet" href="{% static "css/user_photos.css" %}" /> {% endblock %} {% block custom_js %} {% if user == gallery_owner %}
--- a/sg101/templates/user_photos/photo_detail.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/user_photos/photo_detail.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,4 +1,5 @@ {% extends 'base.html' %} +{% load static from staticfiles %} {% load bio_tags %} {% block title %}User Photo Details{% endblock %} {% block custom_js %} @@ -57,9 +58,9 @@ {% if request.user == object.user %} <ul class="icon-list"> - <li><img src="{{ STATIC_URL }}icons/picture_add.png" alt="Photo" /> + <li><img src="{% static "icons/picture_add.png" %}" alt="Photo" /> <a href="{% url 'user_photos-upload' %}">Upload another photo</a></li> - <li><img src="{{ STATIC_URL }}icons/pictures.png" alt="Gallery" /> + <li><img src="{% static "icons/pictures.png" %}" alt="Gallery" /> <a href="{% url 'user_photos-gallery' username=object.user.username %}">See all my photos</a></li> </ul> @@ -71,7 +72,7 @@ {% else %} <p> -<img src="{{ STATIC_URL }}icons/pictures.png" alt="Gallery" /> +<img src="{% static "icons/pictures.png" %}" alt="Gallery" /> <a href="{% url 'user_photos-gallery' username=object.user.username %}">See all photos from {{ object.user.username }}</a></li> </p> {% endif %}
--- a/sg101/templates/weblinks/base.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/weblinks/base.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,7 +1,8 @@ {% extends 'base.html' %} +{% load static from staticfiles %} {% load weblinks_tags %} {% block custom_css %} -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/weblinks.css" /> +<link rel="stylesheet" type="text/css" href="{% static "css/weblinks.css" %}" /> {% block weblinks_css %}{% endblock %} {% block weblinks_js %}{% endblock %} {% endblock %}
--- a/sg101/templates/weblinks/link.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/weblinks/link.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,3 +1,4 @@ +{% load static from staticfiles %} {% load bio_tags %} <dt> <h4><a href="{{ link.url }}">{{ link.title }}</a></h4> @@ -14,7 +15,7 @@ <th>Date Added:</th><td>{{ link.date_added|date:"M d, Y" }}</td> <th>Hits:</th><td>{{ link.hits }}</td> <td> - <a href="#" class="weblinks-broken" id="link-{{ link.id }}"><img src="{{ STATIC_URL }}icons/link_break.png" alt="Broken Link" title="Report this link as broken" /></a> + <a href="#" class="weblinks-broken" id="link-{{ link.id }}"><img src="{% static "icons/link_break.png" %}" alt="Broken Link" title="Report this link as broken" /></a> </td> </tr> <tr><td><input type="submit" value="Visit Site" /></td></tr>
--- a/sg101/templates/weblinks/link_detail.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/weblinks/link_detail.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,7 +1,8 @@ {% extends 'weblinks/base.html' %} +{% load static from staticfiles %} {% block title %}Web Links: {{ link.title }}{% endblock %} {% block weblinks_js %} -<script type="text/javascript" src="{{ STATIC_URL }}js/weblinks.js"></script> +<script type="text/javascript" src="{% static "js/weblinks.js" %}"></script> {% endblock %} {% block weblinks_content %} <h3>Link Details: {{ link.title }}</h3>
--- a/sg101/templates/weblinks/link_summary.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/weblinks/link_summary.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,11 +1,12 @@ {% extends 'weblinks/base.html' %} +{% load static from staticfiles %} {% block title %}Web Links: {{ title }}{% endblock %} {% block weblinks_css %} -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/tab-nav.css" /> -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/pagination.css" /> +<link rel="stylesheet" type="text/css" href="{% static "css/tab-nav.css" %}" /> +<link rel="stylesheet" type="text/css" href="{% static "css/pagination.css" %}" /> {% endblock %} {% block weblinks_js %} -<script type="text/javascript" src="{{ STATIC_URL }}js/weblinks.js"></script> +<script type="text/javascript" src="{% static "js/weblinks.js" %}"></script> {% endblock %} {% block weblinks_content %} <h3>{{ title }}</h3>
--- a/sg101/templates/weblinks/navigation.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/weblinks/navigation.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,5 +1,6 @@ +{% load static from staticfiles %} <div class="app-logo"> -<img src="{{ STATIC_URL }}icons/weblinks-logo.jpg" alt="Links Logo" title="Links" /> + <img src="{% static "icons/weblinks-logo.jpg" %}" alt="Links Logo" title="Links" /> </div> <ul class="app-menu"> <li><a href="{% url 'weblinks-main' %}">Categories</a></li>
--- a/sg101/templates/weblinks/view_links.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/weblinks/view_links.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,11 +1,12 @@ {% extends 'weblinks/base.html' %} +{% load static from staticfiles %} {% block title %}Web Links: {{ category.title }}{% endblock %} {% block weblinks_css %} -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/tab-nav.css" /> -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/pagination.css" /> +<link rel="stylesheet" type="text/css" href="{% static "css/tab-nav.css" %}" /> +<link rel="stylesheet" type="text/css" href="{% static "css/pagination.css" %}" /> {% endblock %} {% block weblinks_js %} -<script type="text/javascript" src="{{ STATIC_URL }}js/weblinks.js"></script> +<script type="text/javascript" src="{% static "js/weblinks.js" %}"></script> {% endblock %} {% block weblinks_content %} <h3>Category: {{ category.title }}</h3>
--- a/sg101/templates/ygroup/post_detail.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/ygroup/post_detail.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,10 +1,11 @@ {% extends 'base.html' %} +{% load static from staticfiles %} {% block title %}Yahoo Group Archives: {{ post.title }}{% endblock %} {% block content %} <h2 class="forum-nav"><a href="{% url 'ygroup-thread_index' %}">Yahoo Group Archives</a> » </h2> <h3 class="forum-nav">{{ post.title }} <a href="{{ post.get_absolute_url }}" rel="nofollow"> - <img src="{{ STATIC_URL }}icons/link.png" alt="permalink" title="permalink" /></a> + <img src="{% static "icons/link.png" %}" alt="permalink" title="permalink" /></a> </h3> <dl> <dt>{{ post.poster }} - {{ post.creation_date|date:"d M Y H:i:s" }}</dt>
--- a/sg101/templates/ygroup/thread.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/ygroup/thread.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,7 +1,8 @@ {% extends 'base.html' %} +{% load static from staticfiles %} {% block title %}Yahoo Group Archives: {{ thread.title }}{% endblock %} {% block custom_css %} -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/pagination.css" /> +<link rel="stylesheet" type="text/css" href="{% static "css/pagination.css" %}" /> {% endblock %} {% block content %} <a name="top" class="intra"></a> @@ -13,14 +14,14 @@ {% endif %} <h3 class="forum-nav">{{ thread.title }} <a href="{{ thread.get_absolute_url }}" rel="nofollow"> - <img src="{{ STATIC_URL }}icons/link.png" alt="permalink" title="permalink" /></a> + <img src="{% static "icons/link.png" %}" alt="permalink" title="permalink" /></a> </h3> {% include "ygroup/pagination.html" %} <dl> {% for post in page_obj.object_list %} <dt><a name="p{{ post.id }}"></a>{{ post.poster }} - {{ post.creation_date|date:"d M Y H:i:s" }} <a href="{{ post.get_absolute_url }}" rel="nofollow"> - <img src="{{ STATIC_URL }}icons/link.png" alt="permalink" title="permalink" /></a></dt> + <img src="{% static "icons/link.png" %}" alt="permalink" title="permalink" /></a></dt> <dd> {{ post.msg|linebreaks }} <p><a href="#top" class="quiet" title="Goto top of page">Top</a></p>
--- a/sg101/templates/ygroup/thread_list.html Sun Dec 06 14:48:30 2015 -0600 +++ b/sg101/templates/ygroup/thread_list.html Sun Dec 06 21:49:39 2015 -0600 @@ -1,7 +1,8 @@ {% extends 'base.html' %} +{% load static from staticfiles %} {% block title %}Yahoo Group Archives{% endblock %} {% block custom_css %} -<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/pagination.css" /> +<link rel="stylesheet" type="text/css" href="{% static "css/pagination.css" %}" /> {% endblock %} {% block content %} <h2>Yahoo Group Archives » Page {{ page_obj.number }}</h2>