Mercurial > public > sg101

changeset 694:d84aaf239182

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
For #53, use HTML5 DOCTYPE. Some markup cleanup also.
author Brian Neal <bgneal@gmail.com>
date Fri, 06 Sep 2013 21:50:53 -0500
parents ad69236e8501
children 2d35e5f97a99 efb525863a75
files core/templatetags/script_tags.py forums/templatetags/forum_tags.py sg101/templates/404.html sg101/templates/500.html sg101/templates/base.html sg101/templates/comments/markdown_preview.html sg101/templates/core/rfb_block.html sg101/templates/downloads/commands/category_report.html sg101/templates/forums/forum_index.html sg101/templates/forums/topic_export.html sg101/templates/home.html sg101/templates/offline.html sg101/templates/potd/potd_block.html sg101/templates/shoutbox/shoutbox.html sg101/templates/weblinks/navigation.html
diffstat 15 files changed, 54 insertions(+), 66 deletions(-) [+]
line wrap: on
line diff
--- 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 += '<link rel="stylesheet" href="%s%s" type="text/css" />' % (prefix, path)
+                s += '<link rel="stylesheet" href="%s%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 += '<script type="text/javascript" src="%s%s"></script>' % (prefix, path)
+                s += '<script src="%s%s"></script>' % (prefix, path)
 
     return s
--- 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 '<p>The current time is %s. All times shown are %s.</p>' % (
+    return 'The current time is %s. All times shown are %s.' % (
             curr_time.strftime(fmt), curr_time.strftime('%Z%z'))
 
 
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head><title>Page Not Found</title>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+   <meta charset="utf-8" />
+   <title>Page Not Found</title>
 </head>
 <body>
 
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head><title>Internal Server Error</title>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+   <meta charset="utf-8" />
+   <title>Internal Server Error</title>
 </head>
 <body>
 
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" 
-   xmlns:og="http://ogp.me/ns#"
-   xmlns:fb="https://www.facebook.com/2008/fbml"
-   xml:lang="en" lang="en">
+<!DOCTYPE html>
+<html lang="en">
 {% load shoutbox_tags %}
 {% load irc_tags %}
 {% load potd_tags %}
@@ -13,27 +8,26 @@
 {% load donations_tags %}
 {% load core_tags %}
 {% load cache %}
-<head><title>SurfGuitar101.com | {% block title %}{% endblock %}</title>
-<meta http-equiv="Content-Type" content="text/html" />
-<meta http-equiv="Content-Language" content="en-US" />
+<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" />
-<meta name="copyright" content="(C) Copyright 2006 - 2012 Brian Neal" />
 {% block custom_meta %}{% endblock %}
-<link rel="stylesheet" href="{{ STATIC_URL }}css/blueprint/screen.css" type="text/css" media="screen, projection" />
-<link rel="stylesheet" href="{{ STATIC_URL }}css/blueprint/print.css" type="text/css" media="print" /> 
+<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" />
 <!--[if lt IE 8]>
 <link rel="stylesheet" href="{{ STATIC_URL }}css/blueprint/ie.css" type="text/css" media="screen, projection" />
 <![endif]-->
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/base.css" />
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/shoutbox.css" />
+<link rel="stylesheet" href="{{ STATIC_URL }}css/base.css" />
+<link rel="stylesheet" href="{{ STATIC_URL }}css/shoutbox.css" />
 {% script_tags "jquery" %}
 {% block custom_head %}{% endblock %}
 {% block custom_css %}{% endblock %}
 {% block custom_js %}{% endblock %}
-<script type="text/javascript" src="{{ STATIC_URL }}js/jquery.cycle.all3.0.3.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}js/shoutbox.js"></script>
-<link rel="shortcut icon" type="image/vnd.microsoft.com" href="{{ STATIC_URL }}favicon.ico" />
+<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" />
 </head>
 <body>{% block begin_body %}{% endblock %}
 <div id="page" class="container">
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!DOCTYPE html>
+<html lang="en">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta charset="utf-8" />
 <title>Markdown Preview</title>
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}js/markitup/templates/preview.css" />
+<link rel="stylesheet" href="{{ STATIC_URL }}js/markitup/templates/preview.css" />
 </head>
 {{ data|safe }}
 </body>
--- 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 %}
-<center>
+<div class="centered">
 <a href="http://radiofreebakersfield.com/"><img src="{% banner_url 'rfb' %}" alt="Radio Free Bakersfield" title="Radio Free Bakersfield" /></a>
 <p>Listen to <a href="http://radiofreebakersfield.com/">Radio Free Bakersfield</a> for the SG101 Pick of the Week!</p>
-</center>
+</div>
 {% endblock %}
--- 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 @@
 <!DOCTYPE html>
 <html lang="en">
    <head>
-      <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+      <meta charset="utf-8" />
       <title>Download Report: {{ category.title }}</title>
    </head>
    <body>
--- 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 %}
 <p><a href="{% url 'forums-mod_forum' slug=forum.slug %}">Moderate this forum</a></p>
 {% endif %}
-{% current_forum_time user %}
+<p>{% current_forum_time user %}</p>
 </div>
 {% endblock %}
--- 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 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-   <meta charset=utf-8>
+   <meta charset="utf-8">
    <title>{{ topic.name }} - SG101 topic #{{ topic.id }}</title>
 </head>
 <body>
--- 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 @@
 <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" href="{{ STATIC_URL }}css/news.css" />
 {% endblock %}
 {% block custom_js %}
-<script type="text/javascript">
+<script>
    $(document).ready(function() {
       $('#home-slideshow img:first').fadeIn(1000, function() {
          $('#home-slideshow').cycle({
@@ -49,7 +49,7 @@
 <p>Since February 26, 2006, SurfGuitar101.com has been the premier home on the web for friends and fans of the world-wide phenomenon known as surf music! Created in Southern California in the early 1960's, surf music is very much alive today and has spread around the globe. Join us in our forums to discuss surf music, past and present. Meet new friends and discover new bands. Want to play surf music? We have lots of forums devoted to playing, performing, and writing surf music. We have lots of discussions on gear: guitars, amps, and drums. Check out our podcasts and hear some really great tunes! Finally, we feature news and articles on the surf scene, and you'll always know where you can catch some live surf music!
 </p>
 </div>
-<br clear="all" />
+<br class="clear" />
 {% cache 3600 home_bulletins %}
    {% current_bulletins %}
 {% endcache %}
--- a/sg101/templates/offline.html	Wed Sep 04 19:55:20 2013 -0500
+++ b/sg101/templates/offline.html	Fri Sep 06 21:50:53 2013 -0500
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head><title>SurfGuitar101.com Currently Offline</title>
-<meta http-equiv="Content-Type" content="text/html" />
-<meta http-equiv="Content-Language" content="en-US" />
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" />
+<title>SurfGuitar101.com Currently Offline</title>
 </head>
 <body>
    <h1>SurfGuitar101.com is Offline</h1>
--- a/sg101/templates/potd/potd_block.html	Wed Sep 04 19:55:20 2013 -0500
+++ b/sg101/templates/potd/potd_block.html	Fri Sep 06 21:50:53 2013 -0500
@@ -2,10 +2,10 @@
 {% block block_title %}Photo of the Day{% endblock %}
 {% block block_content %}
 {% if potd %}
-<center>
+<div class="centered">
 <a href="{% url 'potd-view' %}"><img src="{{ potd.thumb.url }}" alt="{{ potd.caption }}" title="{{ potd.caption }}" /></a><br />
 <a href="{% url 'potd-view' %}">{{ potd.caption }}</a>
-</center>
+</div>
 {% else %}
 <p>No photo at this time.</p>
 {% endif %}
--- a/sg101/templates/shoutbox/shoutbox.html	Wed Sep 04 19:55:20 2013 -0500
+++ b/sg101/templates/shoutbox/shoutbox.html	Fri Sep 06 21:50:53 2013 -0500
@@ -11,23 +11,24 @@
       </p>
    {% endfor %}
 </div>
-<center>
+<div class="centered">
    <button type="button" id="shoutbox-prev" title="Previous">&laquo;</button>
    <a href="{% url 'shoutbox-history' %}">Shout History</a>
    <button type="button" id="shoutbox-next" title="Next">&raquo;</button>
-</center>
+</div>
 {% if user.is_authenticated %}
-<center>
-<div>
-   <input type="text" maxlength="2048" size="13" name="msg" value="" id="shoutbox-smiley-input" />
+<div class="centered">
+<form>
+   <input type="text" maxlength="2048" name="msg" value="" id="shoutbox-smiley-input"
+    style="width:98%;" />
    <br />
    <input id="shoutbox-submit" type="submit" value="Shout" />
    <input id="shoutbox-smilies" type="button" value="Smilies" />
-</div>
+</form>
 <div id="shoutbox-smiley-frame" style="display:none;">
 <img id="shoutbox-busy-icon" src="{{ STATIC_URL }}icons/ajax_busy.gif" alt="Please wait" />
 </div>
-</center>
+</div>
 {% else %}
 <p>
 Please <a href="{% url 'accounts-login' %}">login</a> or
--- a/sg101/templates/weblinks/navigation.html	Wed Sep 04 19:55:20 2013 -0500
+++ b/sg101/templates/weblinks/navigation.html	Fri Sep 06 21:50:53 2013 -0500
@@ -9,8 +9,8 @@
 <li><a href="{% url 'weblinks-add_link' %}">Add Link</a></li>
 {% endif %}
 </ul>
-<center>
+<div class="centered">
    <form action="{% url 'weblinks-random_link' %}" method="post">{% csrf_token %}
       <input type="submit" value="Visit a Random Link" />
    </form>
-</center>
+</div>