Made various changes to djangoproject.com templates (committing this …

…b/c the changes weren't in SVN yet) git-svn-id: http://code.djangoproject.com/svn/djangoproject.com@1932 bcc190cf-cafb-0310-a4f2-bffc1f526a37
django · Jan 12, 2006 · 3fcd7f4 · 3fcd7f4
1 parent e7984eb
commit 3fcd7f4
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 23 deletions.
diff --git a/django_website/templates/aggregator/feeditems_list.html b/django_website/templates/aggregator/feeditems_list.html
@@ -7,9 +7,8 @@
 {% block content %}
 
 <h1>Community</h1>
-<h2 class="deck">Django hasn't even been officially released yet, and there's
+<h2 class="deck">This page, updated every 15 minutes, aggregates blog entries by people who are
-already a great, helpful, excited community of Web developers who've been
+writing about Django.</h2>
-using and discussing it. This page, updated every 15 minutes, aggregates their feeds.</h2>
 
 {% for item in object_list %}
 <h2><a href="{{ item.link }}">{{ item.title }}</a></h2>

diff --git a/django_website/templates/base.html b/django_website/templates/base.html
@@ -20,7 +20,7 @@
       {% block extrahead %}{% endblock %}
 	</head>
 
-	<body id="{% block sectionid %}generic{% endblock %}">
+	<body id="{% block sectionid %}generic{% endblock %}" class="{% block coltype %}default{% endblock %}">
 
 	<div id="container">
 		<div id="header">

diff --git a/django_website/templates/base_community.html b/django_website/templates/base_community.html
@@ -11,21 +11,32 @@
 <h2>Get involved</h2>
 
 <ul>
-<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><a href="http://groups-beta.google.com/group/django-users">django-users mailing list</a> -- the main place to go for help</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><a href="irc://irc.freenode.net/django">#django IRC channel</a> -- chat with other Django users</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><a href="http://code.djangoproject.com/newticket">Ticket system</a> -- report bugs and make feature requests</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>
+</ul>
-<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>
+<h2>Tell the world</h2>
-<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>
+<li><a href="http://code.djangoproject.com/wiki/DjangoPoweredSites">Django-powered sites</a> -- add your site to the list</li>
+<li><a href="/community/badges/">Django badges</a> -- show your support (or wish longingly)</li>
+<li>Write about Django, and <a href="mailto:jacob@jacobian.org">let us know</a>, and we'll add your feed to this page.</li>
+</ul>
+
+<h2>Improve Django</h2>
+
+<ul>
+<li><a href="http://groups.google.com/group/django-developers">django-developers mailing list</a> -- where the developers of Django hang out</li>
+<li><a href="http://groups.google.com/group/django-updates">django-updates mailing list</a> -- get updated for each code and ticket change (for the super-obsessed)</li>
+<li>Post comments on any page of this site. <a href="/comments/">View recent comments</a>.</li>
+<li><a href="http://code.djangoproject.com/wiki">Django wiki</a> -- contribute tips and documentation</a></li>
 </ul>
 
 <h2>Get help</h2>
 
 <ul>
 <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>
 
@@ -38,4 +49,5 @@ <h2>Authors</h2>
 <li><a href="{{ feed.public_url }}">{{ feed }}</a> <a class="rss" href="{{ feed.feed_url }}">RSS</a></li>
 {% endfor %}
 </ul>
-{% endblock %}
+<p>Do you write about Django? <a href="mailto:jacob@jacobian.org">Let us know</a>, and we'll add your feed to this page.</p>
+{% endblock %}
diff --git a/django_website/templates/base_weblog.html b/django_website/templates/base_weblog.html
@@ -13,7 +13,9 @@
 {% block content-related %}
 <h2>Archives</h2>
 <ul class="linklist">
-    <li><a href="/weblog/2005/nov/">November 2005</a></li>
+	<li><a href="/weblog/2006/jan/">January 2006</a></li>
+	<li><a href="/weblog/2005/dec/">December 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>

diff --git a/django_website/templates/flatfiles/download.html b/django_website/templates/flatfiles/download.html
@@ -9,10 +9,15 @@ <h1>{{ flatpage.title }}</h1>
 {% 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: <a href="http://www.djangoproject.com/download/0.91/tarball/">Django-0.91.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>
+  <li>Download the latest release as an egg: <a href="http://www.djangoproject.com/download/0.91/egg/">Django-0.91-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>
+
+<h2>Previous releases</h2>
+<ul>
+  <li>Django 0.90: <a href="http://www.djangoproject.com/download/0.90/egg/">tarball</a> | <a href="http://www.djangoproject.com/download/0.90/tarball/">egg</a>
+</ul>
 {% endblock %}
diff --git a/django_website/templates/flatfiles/homepage.html b/django_website/templates/flatfiles/homepage.html
@@ -1,28 +1,32 @@
 {% extends "base_3col" %}
 
+{% block cssid %}homepage{% endblock %}
+
 {% block sectionid %}homepage{% endblock %}
 
 {% block billboard %}<h2>The Web framework for perfectionists (with deadlines). Django makes it easier to build better Web apps more quickly and with less code.</h2>{% endblock %}
 
 {% 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 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>Developed and used over two years by a fast-moving online-news operation, Django was designed to handle two challenges: the intensive deadlines of a newsroom and the stringent requirements of the <a href="http://www.djangoproject.com/documentation/faq/#who-s-behind-this">experienced Web developers who wrote it</a>. It lets you build high-performing, elegant Web applications quickly.</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">
 	<h2>The Django framework</h2>
 	<h3>Object-relational mapper</h3>
 	<p>Define your <a href="http://www.djangoproject.com/documentation/model_api/">data models</a> entirely in Python. You get a rich, <a href="/documentation/db_api/">dynamic database-access API</a> for free &mdash; but you can still write SQL if needed.</p>
-	<h3>URL dispatcher</h3>
+	<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/tutorial2/">Django does that automatically</a>, and it's production-ready.</p>
+	<h3>Elegant URL design</h3>
 	<p>Design pretty, <a href="http://www.djangoproject.com/documentation/url_dispatch/">cruft-free URLs</a> with no framework-specific limitations. Be as flexible as you like.</p>
 	<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>
+	<p>Use Django's powerful, extensible and designer-friendly <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; it's as granular as you need.</p>
+	<p>Hook into memcached or other cache frameworks for <a href="http://www.djangoproject.com/documentation/cache/">super performance</a> &mdash; caching is as granular as you need.</p>
-	<h3>Automatic admin interface</h3>
+        <h3>Internationalization</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>
+        <p>Django has full support for <a href="http://www.djangoproject.com/documentation/i18n/">multi-language applications</a>, letting you specify translation strings and providing hooks for language-specific functionality.</p>
 </div>
 <!-- END #content-secondary -->
 {% endblock %}
@@ -31,12 +35,15 @@ <h3>Automatic admin interface</h3>
 
 <h2>Download</h2>
 <ul class="linklist">
-    <li><a href="/download/">Get current version: 0.90</a></li>
+    <li class="button-download"><a href="/download/">Latest release: <strong>0.91</strong></a></li>
 </ul>
+<p>Open source, <a href="http://code.djangoproject.com/browser/django/trunk/LICENSE">BSD license</a></p>
 <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/model_api/">Models</a></li>
+	<li><a href="/documentation/templates/">Templates</a></li>
 	<li><a href="/documentation/">More...</a></li>
 </ul>
 <h2>Sites that use Django</h2>
@@ -47,13 +54,16 @@ <h2>Sites that use Django</h2>
 	<dd>An internationally renowned local-entertainment site with events, stories, bands, drink specials and more.</dd>
 	<dt><a href="http://www.ljworld.com/">LJWorld.com</a></dt>
 	<dd>An industry-leading newspaper site.</dd>
+    <dt><a href="http://projects.washingtonpost.com/congress/">washingtonpost.com</a></dt>
+    <dd>The Washington Post's growing selection of innovative Web database applications.</dd>
 	<dt><a href="http://www.kusports.com/">KUSports.com</a></dt>
 	<dd>The bible for University of Kansas sports fans.</dd>
 	<dt><a href="http://www.lawrencechamber.com/">lawrencechamber.com</a></dt>
 	<dd>A Chamber of Commerce site that doesn't suck.</dd>
 	<dt><a href="http://www.kkcscountry.com/">KKCScountry.com</a></dt>
 	<dd>A radio station site in Colorado Springs.</dd>
 </dl>
+<p><a href="http://code.djangoproject.com/wiki/DjangoPoweredSites">See more sites...</a></p>
 {% endblock %}
 
 {% block content-extra %}

diff --git a/django_website/templates/flatpages/snakesandrubies.html b/django_website/templates/flatpages/snakesandrubies.html
@@ -0,0 +1,8 @@
+{% extends "base" %}
+
+{% block title %}{{ flatpage.title }}{% endblock %}
+
+{% block content %}
+<h1>{{ flatpage.title }}</h1>
+{{ flatpage.content }}
+{% endblock %}