# HG changeset patch # User Brian Neal # Date 1378522253 18000 # Node ID d84aaf2391825b2e653838f965db809e4e1eac05 # Parent ad69236e85019453e71dbb99adfe317f1e0424ae For #53, use HTML5 DOCTYPE. Some markup cleanup also. diff -r ad69236e8501 -r d84aaf239182 core/templatetags/script_tags.py --- a/core/templatetags/script_tags.py Wed Sep 04 19:55:20 2013 -0500 +++ b/core/templatetags/script_tags.py Fri Sep 06 21:50:53 2013 -0500 @@ -15,13 +15,13 @@ prefix = '' if not path.startswith('http'): prefix = settings.STATIC_URL - s += '' % (prefix, path) + s += '' % (prefix, path) if library in settings.GPP_THIRD_PARTY_JS: for path in settings.GPP_THIRD_PARTY_JS[library]: prefix = '' if not path.startswith('http'): prefix = settings.STATIC_URL - s += '' % (prefix, path) + s += '' % (prefix, path) return s diff -r ad69236e8501 -r d84aaf239182 forums/templatetags/forum_tags.py --- a/forums/templatetags/forum_tags.py Wed Sep 04 19:55:20 2013 -0500 +++ b/forums/templatetags/forum_tags.py Fri Sep 06 21:50:53 2013 -0500 @@ -7,12 +7,9 @@ from django import template from django.conf import settings from django.core.cache import cache -from django.contrib.auth.models import User from forums.models import Forum from forums.models import Topic -from forums.models import Post -from forums.models import Category from forums.latest import get_stats, get_latest_topics @@ -94,7 +91,7 @@ else: fmt = TIME_FMT_12 - return '

The current time is %s. All times shown are %s.

' % ( + return 'The current time is %s. All times shown are %s.' % ( curr_time.strftime(fmt), curr_time.strftime('%Z%z')) diff -r ad69236e8501 -r d84aaf239182 sg101/templates/404.html --- a/sg101/templates/404.html Wed Sep 04 19:55:20 2013 -0500 +++ b/sg101/templates/404.html Fri Sep 06 21:50:53 2013 -0500 @@ -1,8 +1,8 @@ - - - -Page Not Found + + + + + Page Not Found diff -r ad69236e8501 -r d84aaf239182 sg101/templates/500.html --- a/sg101/templates/500.html Wed Sep 04 19:55:20 2013 -0500 +++ b/sg101/templates/500.html Fri Sep 06 21:50:53 2013 -0500 @@ -1,8 +1,8 @@ - - - -Internal Server Error + + + + + Internal Server Error diff -r ad69236e8501 -r d84aaf239182 sg101/templates/base.html --- a/sg101/templates/base.html Wed Sep 04 19:55:20 2013 -0500 +++ b/sg101/templates/base.html Fri Sep 06 21:50:53 2013 -0500 @@ -1,10 +1,5 @@ - - - + + {% load shoutbox_tags %} {% load irc_tags %} {% load potd_tags %} @@ -13,27 +8,26 @@ {% load donations_tags %} {% load core_tags %} {% load cache %} -SurfGuitar101.com | {% block title %}{% endblock %} - - + +SurfGuitar101.com | {% block title %}{% endblock %} + - {% block custom_meta %}{% endblock %} - - + + - - + + {% script_tags "jquery" %} {% block custom_head %}{% endblock %} {% block custom_css %}{% endblock %} {% block custom_js %}{% endblock %} - - - + + + {% block begin_body %}{% endblock %}
diff -r ad69236e8501 -r d84aaf239182 sg101/templates/comments/markdown_preview.html --- a/sg101/templates/comments/markdown_preview.html Wed Sep 04 19:55:20 2013 -0500 +++ b/sg101/templates/comments/markdown_preview.html Fri Sep 06 21:50:53 2013 -0500 @@ -1,11 +1,9 @@ - - - + + - + Markdown Preview - + {{ data|safe }} diff -r ad69236e8501 -r d84aaf239182 sg101/templates/core/rfb_block.html --- a/sg101/templates/core/rfb_block.html Wed Sep 04 19:55:20 2013 -0500 +++ b/sg101/templates/core/rfb_block.html Fri Sep 06 21:50:53 2013 -0500 @@ -2,8 +2,8 @@ {% load banner_tags %} {% block block_title %}R.F.B.{% endblock %} {% block block_content %} -
+
Radio Free Bakersfield

Listen to Radio Free Bakersfield for the SG101 Pick of the Week!

-
+
{% endblock %} diff -r ad69236e8501 -r d84aaf239182 sg101/templates/downloads/commands/category_report.html --- a/sg101/templates/downloads/commands/category_report.html Wed Sep 04 19:55:20 2013 -0500 +++ b/sg101/templates/downloads/commands/category_report.html Fri Sep 06 21:50:53 2013 -0500 @@ -1,7 +1,7 @@ - + Download Report: {{ category.title }} diff -r ad69236e8501 -r d84aaf239182 sg101/templates/forums/forum_index.html --- a/sg101/templates/forums/forum_index.html Wed Sep 04 19:55:20 2013 -0500 +++ b/sg101/templates/forums/forum_index.html Fri Sep 06 21:50:53 2013 -0500 @@ -66,6 +66,6 @@ {% if can_moderate %}

Moderate this forum

{% endif %} -{% current_forum_time user %} +

{% current_forum_time user %}

{% endblock %} diff -r ad69236e8501 -r d84aaf239182 sg101/templates/forums/topic_export.html --- a/sg101/templates/forums/topic_export.html Wed Sep 04 19:55:20 2013 -0500 +++ b/sg101/templates/forums/topic_export.html Fri Sep 06 21:50:53 2013 -0500 @@ -1,7 +1,7 @@ - + {{ topic.name }} - SG101 topic #{{ topic.id }} diff -r ad69236e8501 -r d84aaf239182 sg101/templates/home.html --- a/sg101/templates/home.html Wed Sep 04 19:55:20 2013 -0500 +++ b/sg101/templates/home.html Fri Sep 06 21:50:53 2013 -0500 @@ -14,10 +14,10 @@ {% endblock %} {% block custom_css %} - + {% endblock %} {% block custom_js %} -