1. Dan Carroll
  2. dancarrollorg

Commits

Dan Carroll  committed 12677fb

Move templates to apps where appropriate. Also fix up some other small things.

  • Participants
  • Parent commits 019ad6b
  • Branches default

Comments (0)

Files changed (26)

File mysite/blog/templates/blog/entry_archive_month.html

View file
+{% extends "blog/entry_list.html" %}
+{% block title %} | Blog | {{ month|date:"F Y" }}{% endblock %}
+
+{% block contentTitle %}<a href="{% url blog_archive_month year=month|date:"Y",month=month|date:"m" %}">Monthly archive for {{ month|date:"F Y" }}</a>{% endblock %}

File mysite/blog/templates/blog/entry_archive_year.html

View file
+{% extends "blog/entry_list.html" %}
+{% block title %} | Blog | {{ year }}{% endblock %}
+
+{% block contentTitle %}<a href="{% url blog_archive_year year %}">Yearly archive for {{ year }}</a>{% endblock %}

File mysite/blog/templates/blog/entry_detail.html

View file
+{% extends "base.html" %}
+{% block title %} | Blog | {{ object.title}}{% endblock %}
+
+{% block content %}
+    <div id="sidebar" class="fRight rightContent">
+        <h3 class="section-title"><a href="{% url blog_index %}">Posted</a></h3>
+        <ul><li>{{ object.pub_date|date:"F j, Y" }}</li></ul>
+        
+        <h3 class="section-title"><a href="{% url blog_tag_list %}">Tagged</a></h3>
+        {% load blog_extras %}{% render_tag_links_for_object object %}
+    </div>
+    
+    <div class="leftContent">
+        <h2 class="section-title">{{ object.title }}</h2>
+        <div id="entry-body">
+            {{ object.body|safe }}
+        </div>
+    </div>
+
+    <div id="comments">
+    <h2 class="section-title">comments</h2>
+    {% if object.allow_comments %}
+        {% load disqus_tags %}
+        {% disqus_dev %}
+        {% disqus_show_comments %}
+    {% else %}
+        <h3>Comments have been closed for this entry.</h3>
+    {% endif %}
+    </div>
+    
+{% endblock %}

File mysite/blog/templates/blog/entry_list.html

View file
+{% extends "base.html" %}
+{% block title %} | Blog{% if page_title %} | {{ page_title }}{% endif %}{% endblock %}
+
+{% block content %}
+    <div id="sidebar" class="fRight rightContent">
+        <h3 class="section-title"><a href="{% url blog_index %}">Entry archive</a></h3>
+        {% load blog_extras %}{% render_month_links %}
+        
+        <h3 class="section-title"><a href="{% url blog_tag_list %}">Tags</a></h3>
+        {% render_all_tag_links %}
+    </div>
+    
+    <div class="leftContent">
+        <h2 class="section-title">{% block contentTitle %}<a href="{% url blog_index %}">entries</a>{% endblock %}</h2>
+        {% block entryList %}
+        <div id="entry-list">
+            {% for entry in object_list %}
+                <h3><a href="{{ entry.get_absolute_url }}">{{ entry.title }}</a> <span class="time">POSTED {{ entry.pub_date|timesince|upper }} AGO</span></h3>
+                <p>{{ entry.snip }} <a href="{{ entry.get_absolute_url }}">(Read more...)</a></p>
+            {% endfor %}
+            
+            <div class="indicator">
+                {% if has_previous %}<a href="{{ previous }}">&#171; Newer entries</a>{% endif %}
+                {% if has_previous and has_next %}|{% endif %}
+                {% if has_next %}<a href="{{ next }}">Older entries &#187;</a>{% endif %}
+            </div>
+        </div>
+        {% endblock %}
+    </div>
+{% endblock %}

File mysite/blog/templates/blog/tag_cloud_tag.html

View file
+{% if tag_cloud %}
+<p class="tagCloud">{% for tag in tag_cloud %}
+    <a href="{% url blog_tag_detail tag.name %}" style="font-size: {{ tag.font_size }}em;">{{ tag.name }}</a>
+{% endfor %}</p>
+{% endif %}

File mysite/blog/templates/blog/tag_detail.html

View file
+{% extends "blog/entry_list.html" %}
+{% block title %} | Blog | {{ tag.name }}{% endblock %}
+{% block stylesheets %}<link rel="alternate" type="application/rss+xml" title="Latest blog entries tagged '{{ tag.name }}'" href="{% url blog_tagged_rss tag_name=tag.name %}" />{% endblock %}
+
+{% block contentTitle %}<a href="{% url blog_tag_detail tag.name %}">Entries tagged with "{{ tag.name }}"</a>{% endblock %}

File mysite/blog/templates/blog/tag_list.html

View file
+{% extends "blog/entry_list.html" %}
+{% block title %} | Blog | Tag cloud{% endblock %}
+
+{% block contentTitle %}Tag cloud{% endblock %}
+{% block entryList %}
+    {% load blog_extras %}{% render_tag_cloud %}
+{% endblock %}

File mysite/blog/templates/blog/tag_list_tag.html

View file
+{% if tag_list %}
+<ul>
+    {% for tag in tag_list %}
+    <li><a href="{% url blog_tag_detail tag.name %}">{{ tag.name }}</a></li>
+    {% endfor %}
+</ul>
+{% else %}
+    <p>No tags available</p>
+{% endif %}

File mysite/metaweblog/metaweblog.py

View file
 from django.core.urlresolvers import reverse
 
 from django_xmlrpc.decorators import xmlrpc_func
-from mysite.blog.models import Entry
+from blog.models import Entry
 from tagging.models import Tag
 
 

File mysite/metaweblog/templates/metaweblog/rsd.xml

View file
+<?xml version="1.0" encoding="UTF-8"?>
+<rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
+  <service>
+    <engineName>Django</engineName>
+    <engineLink>http://www.djangoproject.com/</engineLink>
+    <homePageLink>http://{{ current_site.domain }}/</homePageLink>
+    <apis>
+      <api name="MetaWeblog" blogID="1" preferred="true" apiLink="http://{{ current_site.domain }}{% url xml_rpc_url %}" />
+    </apis>
+  </service>
+</rsd>

File mysite/metaweblog/templates/metaweblog/wlwmanifest.xml

View file
+<?xml version="1.0" encoding="utf-8" ?>
+
+<manifest xmlns="http://schemas.microsoft.com/wlw/manifest/weblog">
+  <options>
+    <clientType>Metaweblog</clientType>
+    <supportsNewCategories>Yes</supportsNewCategories>
+	<supportsNewCategoriesInline>Yes</supportsNewCategoriesInline>
+	<supportsSlug>Yes</supportsSlug>
+    <supportsExcerpt>Yes</supportsExcerpt>
+    <supportsEmptyTitles>No</supportsEmptyTitles>
+    <requiresHtmlTitles>No</requiresHtmlTitles>
+    <supportsAutoUpdate>Yes</supportsAutoUpdate>
+  </options>
+
+  <weblog>
+    <serviceName>Django</serviceName>
+    <homepageLinkText>View site</homepageLinkText>
+    <adminLinkText>Manage site</adminLinkText>
+
+    <adminUrl>
+      <![CDATA[ 
+			{blog-homepage-url}/admin/
+		]]>
+    </adminUrl>
+    <postEditingUrl>
+      <![CDATA[ 
+			{blog-homepage-url}/admin/blog/entry/{post-id}/
+		]]>
+    </postEditingUrl>
+  </weblog>
+  
+</manifest>
+

File mysite/metaweblog/templates/xmlrpc_get.html

View file
+{% extends "admin/base_site.html" %}
+
+{% block title %}XML-RPC Service{% endblock %}
+
+{% block extrahead %}
+<style type="text/css">
+<!--
+.function {
+	border-bottom: 2px solid;
+}
+.function_desc {
+	padding-left: 15px;
+	padding-right: 15px;
+}
+.function_doc {
+	padding: 2px;
+	background-color: #EEE;
+}
+-->
+</style>
+{% endblock %}
+
+{% block content %}
+<h1>XML-RPC Service</h1>
+<h2>You need to invoke this service using an XML-RPC Client.</h2>
+<h2>The following methods are available:</h2>
+{% for m in methods %}
+  <div class="function">
+	<h3>{{ m.0 }}</h3>
+		<div class="function_desc">
+		<strong>Types of Argument{{ m.1.args|length|pluralize }}: </strong> {{ m.1.args }} <br />
+		<strong>Type of Return: </strong> {{ m.1.returns }} <br />
+		<pre class="function_doc">{{ m.2 }}</pre>
+		</div>
+  </div>
+{% endfor %}
+{% endblock %}
+

File mysite/settings.py

View file
     'django.contrib.sites',
     'django.contrib.flatpages',
     'activitysync',
-    'mysite.blog',
+    'blog',
     'disqus',
+    'metaweblog',
     'tagging',
     'django.contrib.admin',
     'django.contrib.admindocs',

File mysite/templates/blog/entry_archive_month.html

-{% extends "blog/entry_list.html" %}
-{% block title %} | Blog | {{ month|date:"F Y" }}{% endblock %}
-
-{% block contentTitle %}<a href="{% url blog_archive_month year=month|date:"Y",month=month|date:"m" %}">Monthly archive for {{ month|date:"F Y" }}</a>{% endblock %}

File mysite/templates/blog/entry_archive_year.html

-{% extends "blog/entry_list.html" %}
-{% block title %} | Blog | {{ year }}{% endblock %}
-
-{% block contentTitle %}<a href="{% url blog_archive_year year %}">Yearly archive for {{ year }}</a>{% endblock %}

File mysite/templates/blog/entry_detail.html

-{% extends "base.html" %}
-{% block title %} | Blog | {{ object.title}}{% endblock %}
-
-{% block content %}
-    <div id="sidebar" class="fRight rightContent">
-        <h3 class="section-title"><a href="{% url blog_index %}">Posted</a></h3>
-        <ul><li>{{ object.pub_date|date:"F j, Y" }}</li></ul>
-        
-        <h3 class="section-title"><a href="{% url blog_tag_list %}">Tagged</a></h3>
-        {% load blog_extras %}{% render_tag_links_for_object object %}
-    </div>
-    
-    <div class="leftContent">
-        <h2 class="section-title">{{ object.title }}</h2>
-        <div id="entry-body">
-            {{ object.body|safe }}
-        </div>
-    </div>
-
-    <div id="comments">
-    <h2 class="section-title">comments</h2>
-    {% if object.allow_comments %}
-        {% load disqus_tags %}
-        {% disqus_dev %}
-        {% disqus_show_comments %}
-    {% else %}
-        <h3>Comments have been closed for this entry.</h3>
-    {% endif %}
-    </div>
-    
-{% endblock %}

File mysite/templates/blog/entry_list.html

-{% extends "base.html" %}
-{% block title %} | Blog{% if page_title %} | {{ page_title }}{% endif %}{% endblock %}
-
-{% block content %}
-    <div id="sidebar" class="fRight rightContent">
-        <h3 class="section-title"><a href="{% url blog_index %}">Entry archive</a></h3>
-        {% load blog_extras %}{% render_month_links %}
-        
-        <h3 class="section-title"><a href="{% url blog_tag_list %}">Tags</a></h3>
-        {% render_all_tag_links %}
-    </div>
-    
-    <div class="leftContent">
-        <h2 class="section-title">{% block contentTitle %}<a href="{% url blog_index %}">entries</a>{% endblock %}</h2>
-        {% block entryList %}
-        <div id="entry-list">
-            {% for entry in object_list %}
-                <h3><a href="{{ entry.get_absolute_url }}">{{ entry.title }}</a> <span class="time">POSTED {{ entry.pub_date|timesince|upper }} AGO</span></h3>
-                <p>{{ entry.snip }} <a href="{{ entry.get_absolute_url }}">(Read more...)</a></p>
-            {% endfor %}
-            
-            <div class="indicator">
-                {% if has_previous %}<a href="{{ previous }}">&#171; Newer entries</a>{% endif %}
-                {% if has_previous and has_next %}|{% endif %}
-                {% if has_next %}<a href="{{ next }}">Older entries &#187;</a>{% endif %}
-            </div>
-        </div>
-        {% endblock %}
-    </div>
-{% endblock %}

File mysite/templates/blog/tag_cloud_tag.html

-{% if tag_cloud %}
-<p class="tagCloud">{% for tag in tag_cloud %}
-    <a href="{% url blog_tag_detail tag.name %}" style="font-size: {{ tag.font_size }}em;">{{ tag.name }}</a>
-{% endfor %}</p>
-{% endif %}

File mysite/templates/blog/tag_detail.html

-{% extends "blog/entry_list.html" %}
-{% block title %} | Blog | {{ tag.name }}{% endblock %}
-{% block stylesheets %}<link rel="alternate" type="application/rss+xml" title="Latest blog entries tagged '{{ tag.name }}'" href="{% url blog_tagged_rss tag_name=tag.name %}" />{% endblock %}
-
-{% block contentTitle %}<a href="{% url blog_tag_detail tag.name %}">Entries tagged with "{{ tag.name }}"</a>{% endblock %}

File mysite/templates/blog/tag_list.html

-{% extends "blog/entry_list.html" %}
-{% block title %} | Blog | Tag cloud{% endblock %}
-
-{% block contentTitle %}Tag cloud{% endblock %}
-{% block entryList %}
-    {% load blog_extras %}{% render_tag_cloud %}
-{% endblock %}

File mysite/templates/blog/tag_list_tag.html

-{% if tag_list %}
-<ul>
-    {% for tag in tag_list %}
-    <li><a href="{% url blog_tag_detail tag.name %}">{{ tag.name }}</a></li>
-    {% endfor %}
-</ul>
-{% else %}
-    <p>No tags available</p>
-{% endif %}

File mysite/templates/metaweblog/rsd.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
-  <service>
-    <engineName>Django</engineName>
-    <engineLink>http://www.djangoproject.com/</engineLink>
-    <homePageLink>http://{{ current_site.domain }}/</homePageLink>
-    <apis>
-      <api name="MetaWeblog" blogID="1" preferred="true" apiLink="http://{{ current_site.domain }}{% url xml_rpc_url %}" />
-    </apis>
-  </service>
-</rsd>

File mysite/templates/metaweblog/wlwmanifest.xml

-<?xml version="1.0" encoding="utf-8" ?>
-
-<manifest xmlns="http://schemas.microsoft.com/wlw/manifest/weblog">
-  <options>
-    <clientType>Metaweblog</clientType>
-    <supportsNewCategories>Yes</supportsNewCategories>
-	<supportsNewCategoriesInline>Yes</supportsNewCategoriesInline>
-	<supportsSlug>Yes</supportsSlug>
-    <supportsExcerpt>Yes</supportsExcerpt>
-    <supportsEmptyTitles>No</supportsEmptyTitles>
-    <requiresHtmlTitles>No</requiresHtmlTitles>
-    <supportsAutoUpdate>Yes</supportsAutoUpdate>
-  </options>
-
-  <weblog>
-    <serviceName>Django</serviceName>
-    <homepageLinkText>View site</homepageLinkText>
-    <adminLinkText>Manage site</adminLinkText>
-
-    <adminUrl>
-      <![CDATA[ 
-			{blog-homepage-url}/admin/
-		]]>
-    </adminUrl>
-    <postEditingUrl>
-      <![CDATA[ 
-			{blog-homepage-url}/admin/blog/entry/{post-id}/
-		]]>
-    </postEditingUrl>
-  </weblog>
-  
-</manifest>
-

File mysite/templates/xmlrpc_get.html

-{% extends "admin/base_site.html" %}
-
-{% block title %}XML-RPC Service{% endblock %}
-
-{% block extrahead %}
-<style type="text/css">
-<!--
-.function {
-	border-bottom: 2px solid;
-}
-.function_desc {
-	padding-left: 15px;
-	padding-right: 15px;
-}
-.function_doc {
-	padding: 2px;
-	background-color: #EEE;
-}
--->
-</style>
-{% endblock %}
-
-{% block content %}
-<h1>XML-RPC Service</h1>
-<h2>You need to invoke this service using an XML-RPC Client.</h2>
-<h2>The following methods are available:</h2>
-{% for m in methods %}
-  <div class="function">
-	<h3>{{ m.0 }}</h3>
-		<div class="function_desc">
-		<strong>Types of Argument{{ m.1.args|length|pluralize }}: </strong> {{ m.1.args }} <br />
-		<strong>Type of Return: </strong> {{ m.1.returns }} <br />
-		<pre class="function_doc">{{ m.2 }}</pre>
-		</div>
-  </div>
-{% endfor %}
-{% endblock %}
-