Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Template changes to djangoproject website related to [1333]

git-svn-id: http://code.djangoproject.com/svn/djangoproject.com@1334 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit dcf09b23ef0d243d8c64bd0c8fac9b9f94973336 1 parent 2bd910a
jacob authored
View
4 django_website/templates/base.html
@@ -15,7 +15,7 @@
<meta name="keywords" content="Python, Django, framework, open-source" />
<meta name="description" content="Django is a high-level Python Web framework that encourages rapid development and clean, pragmatic design." />
- <link href="http://media.djangoproject.com/css/base.css" rel="stylesheet" type="text/css" media="screen" />
+ <link href="http://media.djangoproject.com/css/{% block cssid %}base{% endblock %}.css" rel="stylesheet" type="text/css" media="screen" />
<link href="http://media.djangoproject.com/css/print.css" rel="stylesheet" type="text/css" media="print" />
{% block extrahead %}{% endblock %}
</head>
@@ -46,7 +46,7 @@ <h1 id="logo"><a href="/"><img src="http://media.djangoproject.com/img/site/hdr_
</div>
<!-- END #content -->
<div id="footer">
- <p>This site's design and contents Copyright &copy; 2005 Lawrence Journal-World unless otherwise noted.</p>
+ <p>&copy; 2005 <a href="http://www.ljworld.com/">Lawrence Journal-World</a> unless otherwise noted. Django is a registered trademark of Lawrence Journal-World.</p>
</div>
</div>
<!-- END #container -->
View
22 django_website/templates/base_community.html
@@ -8,23 +8,25 @@
{% block content-related %}
-<h2>Get involed</h2>
+<h2>Get involved</h2>
<ul>
-<li>Do you write about Django? <a href="mailto:jacob@jacobian.org">Let us know</a> and we'll add your feed to this page.</li>
-<li>If you'd like to contribute to Django, join the <a href="http://groups-beta.google.com/group/django-developers">django-developers mailing list</a></li>
-<li><a href="http://code.djangoproject.com/newticket">Report bugs and make feature requests</a> in our ticket system.</li>
-<li>Contribute documentation to <a href="http://code.djangoproject.com/wiki">the wiki</a></li>
-<li>If you find bugs or documentation that isn't explained well enough, please post a comment to the appropriate page, and we'll fix things.</li>
+<li><strong>Do you write about Django?</strong> <a href="mailto:jacob@jacobian.org">Let us know</a>, and we'll add your feed to this page.</li>
+<li><strong>Is your site or project powered by Django?</strong> Display one of <a href="/community/badges/">these handy badges</a> to show your support. And add your site to the <a href="http://code.djangoproject.com/wiki/DjangoPoweredSites">list of Django-powered sites</a>.</li>
+<li><strong>If you'd like to contribute to Django</strong>, join the <a href="http://groups.google.com/group/django-developers">django-developers mailing list</a>.</li>
+<li><strong>Follow code and ticket changes</strong> by subscribing to the <a href="http://groups.google.com/group/django-updates">django-updates mailing list</a>.</li>
+<li><strong><a href="http://code.djangoproject.com/newticket">Report bugs and make feature requests</a></strong> in our ticket system.</li>
+<li><strong>Contribute documentation</strong> to <a href="http://code.djangoproject.com/wiki">the wiki</a>.</li>
+<li><strong>Feel free to post comments</strong> throughout this site, to augment our documentation. We review comments frequently and integrate them into the official docs. <a href="/comments/">View recent comments</a>.</li>
</ul>
<h2>Get help</h2>
<ul>
-<li><a href="/documentation/faq/">Check our FAQ</a> first. If you have a basic question that's not answered by the FAQ, <a href="http://code.djangoproject.com/newticket">file a ticket</a> to tell us you think it should be in there.</li>
-<li><a href="irc://irc.freenode.net/django">#django IRC channel on irc.freenode.net</a></li>
-<li>Read the <a href="http://loglibrary.com/show_page/latest/179">IRC channel logs</a></li>
-<li>Ask questions on the <a href="http://groups-beta.google.com/group/django-users">django-users mailing list</a></li>
+<li><strong><a href="/documentation/faq/">Check our FAQ</a> first</strong>. If you have a basic question that's not answered by the FAQ, <a href="http://code.djangoproject.com/newticket">file a ticket</a> to tell us you think it should be in there.</li>
+<li><strong>Chat live with other Django users</strong> in the <a href="irc://irc.freenode.net/django">#django IRC channel on irc.freenode.net</a>.</li>
+<!--<li>Read the <a href="http://loglibrary.com/show_page/latest/179">IRC channel logs</a>.</li>-->
+<li><strong>Ask questions</strong> on the <a href="http://groups-beta.google.com/group/django-users">django-users mailing list</a>.</li>
</ul>
<h2>Authors</h2>
View
1  django_website/templates/base_docs.html
@@ -5,3 +5,4 @@
{% block title %}Documentation{% endblock %}
{% block billboard %}<h2><a href="/documentation/">Django documentation</a></h2>{% endblock %}
+
View
4 django_website/templates/base_download.html
@@ -1,7 +1,7 @@
-{% extends "base" %}
+{% extends "base_2col" %}
{% block sectionid %}download{% endblock %}
{% block title %}Download{% endblock %}
-{% block billboard %}<h2>Download</h2>{% endblock %}
+{% block billboard %}<h2>Download</h2>{% endblock %}
View
12 django_website/templates/base_weblog.html
@@ -13,13 +13,17 @@
{% block content-related %}
<h2>Archives</h2>
<ul class="linklist">
-<li><a href="/weblog/2005/jul/">July 2005</a></li>
+ <li><a href="/weblog/2005/nov/">November 2005</a></li>
+ <li><a href="/weblog/2005/oct/">October 2005</a></li>
+ <li><a href="/weblog/2005/sep/">September 2005</a></li>
+ <li><a href="/weblog/2005/aug/">August 2005</a></li>
+ <li><a href="/weblog/2005/jul/">July 2005</a></li>
</ul>
<h2>RSS feeds</h2>
<ul class="linklist">
-<li><a href="/rss/weblog/">Latest weblog entries</a></li>
-<li><a href="/rss/comments/">Latest comments</a></li>
-<li><a href="http://code.djangoproject.com/timeline?daysback=90&amp;max=50&amp;wiki=on&amp;ticket=on&amp;changeset=on&amp;milestone=on&amp;format=rss">Recent code changes</a></li>
+ <li><a href="/rss/weblog/">Latest weblog entries</a></li>
+ <li><a href="/rss/comments/">Latest comments</a></li>
+ <li><a href="http://code.djangoproject.com/timeline?daysback=90&amp;max=50&amp;wiki=on&amp;ticket=on&amp;changeset=on&amp;milestone=on&amp;format=rss">Recent code changes</a></li>
</ul>
{% endblock %}
View
8 django_website/templates/docs/documents_detail.html
@@ -20,8 +20,12 @@ <h2 id="comments">Comments</h2>
<h2>Post a comment</h2>
-<p class="small quiet"><strong>Note:</strong> comments will be periodically reviewed, integrated
-into the documentation proper, and removed.</p>
+<p class="small quiet"><strong>Note:</strong> Please only use the comments for
+questions/critcisms/suggestions on the docs; if you experience errors please <a
+href="http://code.djangoproject.com/newticket">file a ticket</a>, ask in the IRC
+channel, or post to the <a href="http://groups-beta.google.com/group/django-users">
+django-users list</a>. Comments will be periodically reviewed, integrated into
+the documentation proper, and removed.</p>
{% free_comment_form for docs.documents object.id %}
</div>
View
4 django_website/templates/flatfiles/docs.html
@@ -11,11 +11,11 @@
<h2>Getting help</h2>
<ul class="toc">
<li><a href="irc://irc.freenode.net/django">#django IRC channel</a></li>
- <li><a href="http://loglibrary.com/show_page/latest/179">#django IRC logs</a></li>
+ <li><a href="http://simon.bofh.ms/logger/django/">#django IRC logs</a></li>
<li><a href="http://groups-beta.google.com/group/django-users">Django-users mailing list</a></li>
<li><a href="http://groups-beta.google.com/group/django-developers">Django-developers mailing list</a></li>
<li><a href="http://code.djangoproject.com/newticket">Report a bug</a></li>
<li><a href="/comments/">Recent comments posted to djangoproject.com</a></li>
</ul>
-{% endblock %}
+{% endblock %}
View
11 django_website/templates/flatfiles/download.html
@@ -5,3 +5,14 @@
{{ flatfile.content }}
{% endblock %}
+
+{% block content-related %}
+<h2>For the impatient:</h2>
+<ul>
+ <li>Download the latest release: <a href="http://www.djangoproject.com/download/0.90/tarball/">Django-0.90.tar.gz</a>.</li>
+ <li>Download the latest release as an egg: <a href="http://www.djangoproject.com/download/0.90/egg/">Django-0.90-py2.4.egg</a>.</li>
+</ul>
+
+<h2>Which version is better?</h2>
+<p>We (<a href="http://code.djangoproject.com/wiki/WorldOnline">World Online</a>, Django developers) improve Django every day and are pretty good about not checking in broken code. We use the development code directly on our servers, so we consider it stable. With that in mind, we <strong>recommend that you use the latest development code</strong>, because it generally contains more features and fewer bugs than the "official" releases.</p>
+{% endblock %}
View
17 django_website/templates/flatfiles/homepage.html
@@ -7,7 +7,8 @@
{% block content %}
<h1>Meet Django</h1>
<h2 class="deck">Django is a high-level Python Web framework that encourages rapid development and clean, pragmatic design.</h2>
-<p>Developed and used over the past two years by a newspaper Web operation, Django is well-suited for developing content-management systems. It was designed from scratch to handle the intensive deadlines of a newsroom and the stringent requirements of experienced Web developers. It focuses on automating as much as possible and adhering to the <a href="http://c2.com/cgi/wiki?DontRepeatYourself"><abbr title="Don't Repeat Yourself">DRY</abbr> principle</a>.</p>
+<p>Developed and used over the past two years by a fast-moving online-news operation, Django was designed from scratch to handle two challenges: the intensive deadlines of a newsroom and the stringent requirements of experienced Web developers. It has convenient niceties for developing content-management systems, but it's an excellent tool for building any Web site.</p>
+<p>Django focuses on automating as much as possible and adhering to the <a href="http://c2.com/cgi/wiki?DontRepeatYourself"><abbr title="Don't Repeat Yourself">DRY</abbr> principle</a>.</p>
<p>Dive in by <a href="/documentation/overview/">reading the overview &rarr;</a></p>
<p>When you're ready to code, read the <a href="/documentation/install/">installation guide</a> and <a href="/documentation/tutorial1/">tutorial</a>.</p>
<div id="content-secondary">
@@ -19,7 +20,7 @@ <h2 class="deck">Django is a high-level Python Web framework that encourages rap
<h3>Template system</h3>
<p>Use Django's powerful and extensible <a href="http://www.djangoproject.com/documentation/templates/">template language</a> to separate design, content and Python code.</p>
<h3>Cache system</h3>
- <p>Hook into memcached or other cache frameworks for <a href="http://www.djangoproject.com/documentation/cache/">super caching</a> &mdash; as granularly as you need.</p>
+ <p>Hook into memcached or other cache frameworks for <a href="http://www.djangoproject.com/documentation/cache/">super caching</a> &mdash; it's as granular as you need.</p>
<h3>Automatic admin interface</h3>
<p>Save yourself the tedious work of creating interfaces for people to add and update content. <a href="http://www.djangoproject.com/documentation/admin_css/">Django does that automatically</a>.</p>
</div>
@@ -30,13 +31,13 @@ <h2 class="deck">Django is a high-level Python Web framework that encourages rap
<h2>Download</h2>
<ul class="linklist">
- <li><a href="/download/">Get current development version</a></li>
+ <li><a href="/download/">Get current version: 0.90</a></li>
</ul>
<h2>Documentation</h2>
<ul class="linklist">
+ <li><a href="/documentation/install/">Installation guide</a></li>
<li><a href="/documentation/tutorial1/">Tutorial</a></li>
- <li><a href="/documentation/templates/">Template language guide</a></li>
- <li><a href="/documentation/#reference">API reference</a></li>
+ <li><a href="/documentation/">More...</a></li>
</ul>
<h2>Sites that use Django</h2>
<dl>
@@ -60,14 +61,14 @@ <h2 class="deck">Django is a high-level Python Web framework that encourages rap
{% load comments %}
{% load latestblogentry %}
-{% get_latest_blog_entries 3 as latest_entries %}
+{% get_latest_blog_entries 4 as latest_entries %}
{% for latest_entry in latest_entries %}
{% get_free_comment_count for blog.entries latest_entry.id as comment_count %}
<h3><a href="{{ latest_entry.get_absolute_url }}">{{ latest_entry.headline }}</a></h3>
- <p class="date">by <strong>{{ latest_entry.author }}</strong> on {{ latest_entry.pub_date|date:"F j, Y" }}</p>
+ <p class="date">by <strong>{{ latest_entry.author }}</strong> on {{ latest_entry.pub_date|date:"M. j, Y" }}</p>
{{ latest_entry.summary }}
- <p class="more"><a href="{{ latest_entry.get_absolute_url }}">Read more</a> / <a href="{{ latest_entry.get_absolute_url }}#comments">{{ comment_count }} comment{{ comment_count|pluralize }}</a></p>
+ <p class="more"><a href="{{ latest_entry.get_absolute_url }}">Read more</a>{% if comment_count %} / <a href="{{ latest_entry.get_absolute_url }}#comments">{{ comment_count }} comment{{ comment_count|pluralize }}</a>{% endif %}</p>
{% endfor %}
{% comment %}
View
1  django_website/templates/flatpages/default.html
@@ -0,0 +1 @@
+{% extends 'flatfiles/default' %}
View
2  django_website/templates/trac_templates/attachment.cs
@@ -2,7 +2,7 @@
<?cs include "header.cs" ?>
<?cs include "macros.cs" ?>
-<div id="ctxtnav" class="nav"></div>
+<div id="ctxtnav" class="nav"><ul><li class="last"><a href="?format=txt">View as plain text</a></li></ul></div>
<div id="content" class="attachment">
Please sign in to comment.
Something went wrong with that request. Please try again.