Mercurial > public > sg101
changeset 682:25a408bb71a3
For Django 1.5.2; remove 'load url from future' tag.
line wrap: on
line diff
--- a/sg101/templates/accounts/ajax_login_form.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/accounts/ajax_login_form.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} <div id="login-dialog" title="SurfGuitar101 Login"> <p id="login-error" class="error"></p> <form>
--- a/sg101/templates/accounts/login.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/accounts/login.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% block title %}Login{% endblock %} {% block content %} <h2>Login</h2>
--- a/sg101/templates/accounts/password_change.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/accounts/password_change.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% block title %}Change Password{% endblock %} {% block content %} <h2>Change Password</h2>
--- a/sg101/templates/accounts/password_reset_complete.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/accounts/password_reset_complete.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% block title %}Password Reset Complete{% endblock %} {% block content %} <h2>Password Reset Complete</h2>
--- a/sg101/templates/accounts/password_reset_confirm.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/accounts/password_reset_confirm.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% block title %}Reset Password{% endblock %} {% block content %} <h2>Reset Password</h2>
--- a/sg101/templates/accounts/register_failure.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/accounts/register_failure.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% block title %}Registration Error{% endblock %} {% block content %} <h2>Registration Error</h2>
--- a/sg101/templates/accounts/register_success.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/accounts/register_success.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% block title %}Registration Confirmed{% endblock %} {% block content %} <h2>Congratulations, Your Account Has Been Created</h2>
--- a/sg101/templates/accounts/user_stats_tag.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/accounts/user_stats_tag.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} {% load bio_tags %} {% load cache %} {% load humanize %}
--- a/sg101/templates/antispam/blocked.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/antispam/blocked.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% block title %}Blocked{% endblock %} {% block content %} <h2>Blocked</h2>
--- a/sg101/templates/antispam/suspended.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/antispam/suspended.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% block title %}Account Suspension Status{% endblock %} {% block content %} <h2>Account Suspension Status</h2>
--- a/sg101/templates/base.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/base.html Mon Aug 19 21:04:27 2013 -0500 @@ -5,7 +5,6 @@ xmlns:og="http://ogp.me/ns#" xmlns:fb="https://www.facebook.com/2008/fbml" xml:lang="en" lang="en"> -{% load url from future %} {% load shoutbox_tags %} {% load irc_tags %} {% load potd_tags %}
--- a/sg101/templates/bio/avatar.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/bio/avatar.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'bio/base.html' %} -{% load url from future %} {% load bio_tags %} {% block title %}Change My Avatar{% endblock %} {% block content %}
--- a/sg101/templates/bio/avatar_tag.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/bio/avatar_tag.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,2 +1,1 @@ -{% load url from future %} {% if profile_link %}<a href="{% url 'bio-view_profile' username=username %}" title="View profile for {{ username }}">{% endif %}<img src="{{ url }}" alt="avatar" title="{{ title }}" class="avatar" {% if style %}style="{{ style }}"{% endif %} />{% if profile_link %}</a>{% endif %}
--- a/sg101/templates/bio/edit_elsewhere.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/bio/edit_elsewhere.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'bio/base.html' %} -{% load url from future %} {% block title %}Edit Your Elsewhere Links{% endblock %} {% block content %} <h2>Edit Your Elsewhere Links</h2>
--- a/sg101/templates/bio/edit_profile.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/bio/edit_profile.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'bio/base.html' %} -{% load url from future %} {% load bio_tags %} {% load elsewhere_tags %} {% block title %}Edit Profile{% endblock %}
--- a/sg101/templates/bio/members.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/bio/members.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'bio/base.html' %} -{% load url from future %} {% load bio_tags %} {% block title %}Member List{% endblock %} {% block bio_css %}
--- a/sg101/templates/bio/profile_link_tag.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/bio/profile_link_tag.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,2 +1,1 @@ -{% load url from future %} <a href="{% url 'bio-view_profile' username=username %}" title="View profile for {{ username }}">{{ username }}</a>{{ trailing_text }}
--- a/sg101/templates/bio/view_profile.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/bio/view_profile.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'bio/base.html' %} -{% load url from future %} {% load bio_tags %} {% load elsewhere_tags %} {% load core_tags %}
--- a/sg101/templates/comments/comment.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/comments/comment.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} {% load bio_tags %} <div class="comment" id="c{{ comment.id }}"> <div class="comment-list">{{ forloop.counter }}.</div>
--- a/sg101/templates/comments/comment_form.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/comments/comment_form.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} {% load core_tags %} {% if user.is_authenticated %} <form action="{% url 'comments-post' %}" method="post" id="comment-form">{% csrf_token %}
--- a/sg101/templates/contact/contact_form.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/contact/contact_form.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% block title %}Contact{% endblock %} {% block content %} <h2>Contact Us</h2>
--- a/sg101/templates/contests/contest_detail.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/contests/contest_detail.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% load bio_tags %} {% load core_tags %} {% block custom_meta %}
--- a/sg101/templates/core/birthday_block.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/core/birthday_block.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'side_block.html' %} -{% load url from future %} {% load bio_tags %} {% load humanize %} {% block block_title %}<img src="{{ STATIC_URL }}icons/cake.png" alt="Cake" class="middle" /> {{ today|date:"F" }} Birthdays <img src="{{ STATIC_URL }}icons/cake.png" alt="Cake" class="middle" /> {% endblock %}
--- a/sg101/templates/donations/index.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/donations/index.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% load bio_tags %} {% load cache %} {% load donations_tags %}
--- a/sg101/templates/donations/monthly_goal_tag.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/donations/monthly_goal_tag.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'side_block.html' %} -{% load url from future %} {% block block_title %}Donations{% endblock %} {% block block_content %} <p class="centered">Help us meet our monthly goal:</p>
--- a/sg101/templates/donations/thanks.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/donations/thanks.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% block title %}Thanks For The Donation{% endblock %} {% block content %} <div class="breadcrumbs"><a href="{% url 'donations-index' %}">Donations</a> » Thanks</div>
--- a/sg101/templates/downloads/download.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/downloads/download.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} {% load comment_tags %} {% load bio_tags %} {% get_comment_count for download as comment_count %}
--- a/sg101/templates/downloads/download_list.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/downloads/download_list.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% load downloads_tags %} {% block title %}Downloads: {{ category.title }}{% endblock %} {% block custom_css %}
--- a/sg101/templates/downloads/index.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/downloads/index.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% load downloads_tags %} {% block title %}Downloads{% endblock %} {% block custom_css %}
--- a/sg101/templates/downloads/navigation.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/downloads/navigation.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} <div class="app-logo"> <img src="{{ STATIC_URL }}icons/downloads-logo.jpg" alt="Downloads Logo" title="Downloads" /> </div>
--- a/sg101/templates/forums/display_post.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/forums/display_post.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} {% load bio_tags %} {% load forum_tags %} <tr class="forum-post {{ rowcolors }}" id="post-{{ post.id }}">
--- a/sg101/templates/forums/favorite_status.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/forums/favorite_status.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% load forum_tags %} {% block title %}Forums: Favorite Topics{% endblock %} {% block content %}
--- a/sg101/templates/forums/forum_index.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/forums/forum_index.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% load forum_tags %} {% load bio_tags %} {% block custom_head %}
--- a/sg101/templates/forums/forum_query.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/forums/forum_query.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} <form action="." method="get" id="forum-query-form"> <select id="forum-query-select"> {% if user.is_authenticated %}
--- a/sg101/templates/forums/forum_stats_tag.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/forums/forum_stats_tag.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} {% load humanize %} <div id="forum-stats"> {% if topic_count and post_count %}
--- a/sg101/templates/forums/index.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/forums/index.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% load accounts_tags %} {% load cache %} {% load forum_tags %}
--- a/sg101/templates/forums/jump_box.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/forums/jump_box.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} <form action="." method="get" id="forum-jumpbox-form"> <select id="forum-jumpbox-select"> <option value="{% url 'forums-forum_index' slug='surfguitar101-website' %}">SurfGuitar101 Website</option>
--- a/sg101/templates/forums/last_post_info.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/forums/last_post_info.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} {% load bio_tags %} {% load forum_tags %} {% if post %}
--- a/sg101/templates/forums/mod_forum.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/forums/mod_forum.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% load bio_tags %} {% load forum_tags %} {% block title %}Moderate Forum: {{ forum.name }}{% endblock %}
--- a/sg101/templates/forums/navigation_tag.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/forums/navigation_tag.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} <a class="intra" name="top"></a> <h2 class="forum-nav"><a href="{% url 'forums-index' %}">SurfGuitar101 Forums</a> » {% for nav_item in nav_list %}
--- a/sg101/templates/forums/new_posts_tag.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/forums/new_posts_tag.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} {% load core_tags %} <div> <h2>Latest Forum Posts</h2>
--- a/sg101/templates/forums/post_edit_button.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/forums/post_edit_button.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} {% if show_button %} <a href="{% url 'forums-edit_post' id=post.id %}"><img src="{{ STATIC_URL }}icons/page_edit.png" alt="Edit post" title="Edit post" /></a> {% endif %}
--- a/sg101/templates/forums/post_ip.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/forums/post_ip.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% load bio_tags %} {% block title %}Post IP Address Info: {{ post.user_ip }}{% endblock %} {% block content %}
--- a/sg101/templates/forums/spammer.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/forums/spammer.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% load bio_tags %} {% block title %}Deactivate Spammer: {{ post.user.username }}{% endblock %} {% block content %}
--- a/sg101/templates/forums/spammer_nailed.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/forums/spammer_nailed.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% load bio_tags %} {% block title %}Spammer Nailed: {{ spammer.username }}{% endblock %} {% block content %}
--- a/sg101/templates/forums/stranger.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/forums/stranger.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% load bio_tags %} {% block title %}Promote Stranger: {{ post.user.username }}{% endblock %} {% block content %}
--- a/sg101/templates/forums/subscription_status.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/forums/subscription_status.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% load forum_tags %} {% block title %}Forums: {% if is_subscribed %}S{% else %}Uns{% endif %}ubscribed to Topic{% endblock %} {% block content %}
--- a/sg101/templates/forums/topic.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/forums/topic.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% load forum_tags %} {% load core_tags %} {% load script_tags %}
--- a/sg101/templates/forums/topic_icons_tag.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/forums/topic_icons_tag.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} {% if topic.has_unread %}<a href="{% url 'forums-topic_unread' id=topic.id %}"><img src="{{ STATIC_URL }}icons/new.png" alt="New Posts" title="New Posts" class="forums-topic-icon" /></a>{% endif %} {% 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"
--- a/sg101/templates/forums/topic_list.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/forums/topic_list.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% load bio_tags %} {% load forum_tags %} {% block title %}Forums: {{ title }}{% endblock %}
--- a/sg101/templates/gcalendar/edit.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/gcalendar/edit.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% block title %}Edit Calendar Events{% endblock %} {% block custom_js %} <script type="text/javascript" src="{{ STATIC_URL }}js/gcalendar_edit.js"></script>
--- a/sg101/templates/gcalendar/event.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/gcalendar/event.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% load core_tags %} {% block title %}{{ title }}{% endblock %} {% block custom_js %}
--- a/sg101/templates/gcalendar/google_sync.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/gcalendar/google_sync.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'admin/base_site.html' %} -{% load url from future %} {% load core_tags %} {% block title %}Sync Events w/Google Calendar{% endblock %} {% block breadcrumbs %}
--- a/sg101/templates/gcalendar/index.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/gcalendar/index.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% block title %}Event Calendar{% endblock %} {% block content %} <h2>SurfGuitar101 Event Calendar</h2>
--- a/sg101/templates/gcalendar/thanks_add.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/gcalendar/thanks_add.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% block title %}Event Calendar - Thanks{% endblock %} {% block content %} <div class="breadcrumbs"><a href="{% url 'gcalendar-index' %}">Calendar</a> » Thanks</div>
--- a/sg101/templates/gcalendar/thanks_edit.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/gcalendar/thanks_edit.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% block title %}Event Calendar Changes Received{% endblock %} {% block content %} <div class="breadcrumbs"><a href="{% url 'gcalendar-index' %}">Calendar</a> » Edit Events</div>
--- a/sg101/templates/home.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/home.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% load bulletin_tags %} {% load core_tags %} {% load news_tags %}
--- a/sg101/templates/membermap/balloon.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/membermap/balloon.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} {% load bio_tags %} {% if avatar_url %} <a href="{% url 'bio-view_profile' username=user.name %}">
--- a/sg101/templates/membermap/index.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/membermap/index.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% load core_tags %} {% block title %}Member Map{% endblock %} {% block custom_js %}
--- a/sg101/templates/membermap/markdown.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/membermap/markdown.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} {% load markup %} {% load smiley_tags %} {% load bio_tags %}
--- a/sg101/templates/messages/compose_tab.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/messages/compose_tab.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} {% load core_tags %} {% load script_tags %} {% script_tags 'markitup' %}
--- a/sg101/templates/messages/inbox_tab.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/messages/inbox_tab.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} {% if messages %} <ul class="user-messages"> {% for msg in messages %}
--- a/sg101/templates/messages/outbox_tab.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/messages/outbox_tab.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} {% if messages %} <ul class="user-messages"> {% for msg in messages %}
--- a/sg101/templates/messages/tabbed_base.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/messages/tabbed_base.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% load script_tags %} {% block custom_css %} <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/messages.css" />
--- a/sg101/templates/messages/trash_tab.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/messages/trash_tab.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} {% if messages %} <ul class="user-messages"> {% for msg in messages %}
--- a/sg101/templates/messages/unread_messages_tag.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/messages/unread_messages_tag.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} {% if unread_count == 0 %} <a href="{% url 'messages-index' %}"><span id="unread_msg_text">Private Messages</span></a> {% endif %}
--- a/sg101/templates/navbar.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/navbar.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} {% load messages_tags %} <ul> {% if user.is_authenticated %}
--- a/sg101/templates/news/archive_index.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/news/archive_index.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'news/base.html' %} -{% load url from future %} {% block title %}News Archive{% endblock %} {% block archive-class %}class="active"{% endblock %} {% block news_content %}
--- a/sg101/templates/news/base.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/news/base.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% block custom_head %} <link rel="alternate" type="application/rss+xml" title="SurfGuitar101 News" href="{% url 'feeds-news' %}" /> {% endblock %}
--- a/sg101/templates/news/category_index.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/news/category_index.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'news/base.html' %} -{% load url from future %} {% block title %}News: Categories{% endblock %} {% block categories-class %}class="active"{% endblock %} {% block news_content %}
--- a/sg101/templates/news/current_news.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/news/current_news.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} {% if stories %} <h2>Current News Stories</h2> {% for story in stories %}
--- a/sg101/templates/news/story.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/news/story.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'news/base.html' %} -{% load url from future %} {% load tagging_tags %} {% load bio_tags %} {% load comment_tags %}
--- a/sg101/templates/news/story_summary.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/news/story_summary.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} {% load tagging_tags %} {% load bio_tags %} {% load comment_tags %}
--- a/sg101/templates/news/submit_news.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/news/submit_news.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'news/base.html' %} -{% load url from future %} {% block title %}News: Submit News{% endblock %} {% if add_form %} {% block custom_js %}
--- a/sg101/templates/news/tag_index.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/news/tag_index.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'news/base.html' %} -{% load url from future %} {% block title %}News: Tags{% endblock %} {% block tags-class %}class="active"{% endblock %} {% block news_content %}
--- a/sg101/templates/podcast/base.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/podcast/base.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% block custom_head %} <link rel="alternate" type="application/rss+xml" title="SurfGuitar101 Podcast" href="{% url 'podcast-feed' %}" /> {% endblock %}
--- a/sg101/templates/podcast/detail.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/podcast/detail.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'podcast/base.html' %} -{% load url from future %} {% load script_tags %} {% load core_tags %} {% block title %}Podcast: {{ podcast.title }}{% endblock %}
--- a/sg101/templates/polls/latest_poll_block_tag.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/polls/latest_poll_block_tag.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'side_block.html' %} -{% load url from future %} {% block block_title %}Current Polls{% endblock %} {% block block_content %} {% if polls %}
--- a/sg101/templates/polls/latest_poll_tag.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/polls/latest_poll_tag.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} {% if poll %} <div> <h2>Latest Poll</h2>
--- a/sg101/templates/polls/poll_detail.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/polls/poll_detail.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% load comment_tags %} {% load script_tags %} {% block title %}Poll Results: {{ poll.question }}{% endblock %}
--- a/sg101/templates/polls/poll_vote.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/polls/poll_vote.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% block title %}Polls: {{ poll.question }}{% endblock %} {% block custom_css %} <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/polls.css" />
--- a/sg101/templates/potd/potd_block.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/potd/potd_block.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'side_block.html' %} -{% load url from future %} {% block block_title %}Photo of the Day{% endblock %} {% block block_content %} {% if potd %}
--- a/sg101/templates/potd/view.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/potd/view.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% load bio_tags %} {% load core_tags %} {% load comment_tags %}
--- a/sg101/templates/shoutbox/missing_shout.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/shoutbox/missing_shout.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% block title %}Shout Not Found{% endblock %} {% block content %} <div class="breadcrumbs"><a href="{% url 'shoutbox-history' %}">Shoutbox History</a> » Shout Not Found</div>
--- a/sg101/templates/shoutbox/shout_detail.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/shoutbox/shout_detail.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} {% load bio_tags %} <tr> <th>
--- a/sg101/templates/shoutbox/shoutbox.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/shoutbox/shoutbox.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'side_block.html' %} -{% load url from future %} {% load core_tags %} {% block block_title %}Shoutbox{% endblock %} {% block block_content %}
--- a/sg101/templates/shoutbox/view_shout.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/shoutbox/view_shout.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% load script_tags %} {% block custom_css %} <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/shoutbox_app.css" />
--- a/sg101/templates/weblinks/add_link.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/weblinks/add_link.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'weblinks/base.html' %} -{% load url from future %} {% block title %}Web Links: Add Link{% endblock %} {% block weblinks_content %} <h3>Add Link</h3>
--- a/sg101/templates/weblinks/index.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/weblinks/index.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'weblinks/base.html' %} -{% load url from future %} {% block title %}Web Links{% endblock %} {% block weblinks_content %} <h3>Categories</h3>
--- a/sg101/templates/weblinks/link.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/weblinks/link.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} {% load bio_tags %} <dt> <h4><a href="{{ link.url }}">{{ link.title }}</a></h4>
--- a/sg101/templates/weblinks/navigation.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/weblinks/navigation.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,4 +1,3 @@ -{% load url from future %} <div class="app-logo"> <img src="{{ STATIC_URL }}icons/weblinks-logo.jpg" alt="Links Logo" title="Links" /> </div>
--- a/sg101/templates/weblinks/view_links.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/weblinks/view_links.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'weblinks/base.html' %} -{% load url from future %} {% block title %}Web Links: {{ category.title }}{% endblock %} {% block weblinks_css %} <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/tab-nav.css" />
--- a/sg101/templates/ygroup/post_detail.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/ygroup/post_detail.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% 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>
--- a/sg101/templates/ygroup/thread.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/ygroup/thread.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% block title %}Yahoo Group Archives: {{ thread.title }}{% endblock %} {% block custom_css %} <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/pagination.css" />
--- a/sg101/templates/ygroup/thread_list.html Fri Aug 16 20:43:39 2013 -0500 +++ b/sg101/templates/ygroup/thread_list.html Mon Aug 19 21:04:27 2013 -0500 @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load url from future %} {% block title %}Yahoo Group Archives{% endblock %} {% block custom_css %} <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/pagination.css" />