Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Checking in latest changes to djangoproject.com templates

git-svn-id: http://code.djangoproject.com/svn/djangoproject.com@4401 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit c190f51bba08b56333ee5d06834ab9d428042d9b 1 parent e30a464
jacob authored
View
2  django_website/templates/404.html
@@ -6,7 +6,7 @@
<h2>Page not found</h2>
-<p>Looks like you followed a bad link. If you think it's our fault, please <a href="http://code.djangoproject.com/newticket/">let us know</a>.</p>
+<p>Looks like you followed a bad link. If you think it's our fault, please <a href="http://code.djangoproject.com/simpleticket/">let us know</a>.</p>
<p>Here's a link to the <a href="/">homepage</a>. You know, just in case.</p>
View
6 django_website/templates/base_community.html
@@ -12,7 +12,7 @@
<ul>
<li><a href="irc://irc.freenode.net/django">#django IRC channel</a> -- chat with other Django users</li>
-<li><a href="http://code.djangoproject.com/newticket">Ticket system</a> -- report bugs and make feature requests</li>
+<li><a href="http://code.djangoproject.com/simpleticket">Ticket system</a> -- report bugs and make feature requests</li>
</ul>
<h2>Mailing lists</h2>
@@ -29,6 +29,8 @@
<p>Subscribe: <input type="text" name="email" size="15" /> <input type="submit" value="Go" /></p>
</form>
+<p>Problems subscribing? See this <a href="http://groups.google.com/support/bin/answer.py?answer=12346&amp;topic=251">FAQ answer</a> about non-Gmail addresses.</p>
+
<h2>Tell the world</h2>
<ul>
<li><a href="http://code.djangoproject.com/wiki/DjangoPoweredSites">Django-powered sites</a> &mdash; add your site to the list</li>
@@ -50,7 +52,7 @@
<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><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/simpleticket">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><strong>Ask questions</strong> on the <a href="http://groups-beta.google.com/group/django-users">django-users mailing list</a>.</li>
</ul>
View
5 django_website/templates/base_weblog.html
@@ -13,6 +13,11 @@
{% block content-related %}
<h2>Archives</h2>
<ul class="linklist">
+ <li><a href="/weblog/2007/jan/">January 2007</a></li>
+ <li><a href="/weblog/2006/dec/">December 2006</a></li>
+ <li><a href="/weblog/2006/nov/">November 2006</a></li>
+ <li><a href="/weblog/2006/oct/">October 2006</a></li>
+ <li><a href="/weblog/2006/sep/">September 2006</a></li>
<li><a href="/weblog/2006/aug/">August 2006</a></li>
<li><a href="/weblog/2006/jul/">July 2006</a></li>
<li><a href="/weblog/2006/jun/">June 2006</a></li>
View
2  django_website/templates/blog/entry_detail.html
@@ -16,7 +16,7 @@ <h2 id="comments">Comments</h2>
{% for comment in comment_list %}
<div class="comment" id="c{{ comment.id }}">
- <h3>{{ comment.person_name }} <span class="small quiet">{{ comment.submit_date|date:"F j, Y" }} at {{ comment.submit_date|date:"P" }}</span></h3>
+ <h3>{{ comment.person_name|escape }} <span class="small quiet">{{ comment.submit_date|date:"F j, Y" }} at {{ comment.submit_date|date:"P" }}</span></h3>
{{ comment.comment|escape|urlizetrunc:"40"|linebreaks }}
</div>
{% endfor %}
View
2  django_website/templates/comments/free_preview.html
@@ -17,7 +17,7 @@
{% else %}
<div class="comment">
{{ comment.comment|escape|urlizetrunc:"40"|linebreaks }}
- <p class="date small">Posted by <strong>{{ comment.person_name }}</strong></p>
+ <p class="date small">Posted by <strong>{{ comment.person_name|escape }}</strong></p>
</div>
<p><input type="submit" name="post" value="Post public comment" /></p>
View
2  django_website/templates/comments/freecomment_list.html
@@ -16,7 +16,7 @@
{% for comment in object_list %}
<div class="comment" id="c{{ comment.id }}">
- <h3><a href="{{ comment.get_absolute_url }}">{{ comment.person_name }} <span class="small quiet">{{ comment.submit_date|date:"F j, Y" }} at {{ comment.submit_date|date:"P" }}</span></a></h3>
+ <h3><a href="{{ comment.get_absolute_url }}">{{ comment.person_name|escape }} <span class="small quiet">{{ comment.submit_date|date:"F j, Y" }} at {{ comment.submit_date|date:"P" }}</span></a></h3>
{{ comment.comment|escape|urlizetrunc:"40"|linebreaks }}
</div>
{% endfor %}
View
6 django_website/templates/docs/document_detail.html
@@ -13,7 +13,7 @@ <h2 id="comments">Comments</h2>
{% for comment in comment_list %}
<div class="comment" id="c{{ comment.id }}">
- <h3>{{ comment.person_name }} <span class="small quiet">{{ comment.submit_date|date:"F j, Y" }} at {{ comment.submit_date|date:"P" }}</span></h3>
+ <h3>{{ comment.person_name|escape }} <span class="small quiet">{{ comment.submit_date|date:"F j, Y" }} at {{ comment.submit_date|date:"P" }}</span></h3>
{{ comment.comment|escape|urlizetrunc:"40"|linebreaks }}
</div>
{% endfor %}
@@ -22,7 +22,7 @@ <h2 id="comments">Comments</h2>
<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
+href="http://code.djangoproject.com/simpleticket">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>
@@ -31,4 +31,4 @@ <h2 id="comments">Comments</h2>
</div>
{% endblock %}
-{% block content-related %}<h2>Contents</h2>{{ object.get_toc }}{% endblock %}
+{% block content-related %}<h2>Contents</h2>{{ object.get_toc }}{% endblock %}
View
2  django_website/templates/flatfiles/docs.html
@@ -20,7 +20,7 @@
<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="http://code.djangoproject.com/simpleticket">Report a bug</a></li>
<li><a href="/comments/">Recent comments posted to djangoproject.com</a></li>
</ul>
View
4 django_website/templates/flatfiles/download.html
@@ -9,7 +9,7 @@
{% block content-related %}
<h2>For the impatient:</h2>
<ul>
- <li>Download the latest release: <a href="http://www.djangoproject.com/download/0.95/tarball/">Django-0.95.tar.gz</a>.</li>
+ <li>Download the latest release: <a href="http://www.djangoproject.com/download/0.95.1/tarball/">Django-0.95.1.tar.gz</a>.</li>
</ul>
<h2>Which version is better?</h2>
@@ -17,6 +17,8 @@
<h2>Previous releases</h2>
<ul>
+ <li>Django 0.95.1: <a href="http://www.djangoproject.com/download/0.95.1/tarball/">tarball</a></li>
+ <li>Django 0.95: <a href="http://www.djangoproject.com/download/0.95/tarball/">tarball</a></li>
<li>Django 0.91: <a href="http://www.djangoproject.com/download/0.91/tarball/">tarball</a></li>
<li>Django 0.90: <a href="http://www.djangoproject.com/download/0.90/tarball/">tarball</a> | <a href="http://www.djangoproject.com/download/0.90/egg/">egg</a></li>
</ul>
View
19 django_website/templates/flatfiles/homepage.html
@@ -35,7 +35,7 @@ <h2 class="deck">Django is a high-level Python Web framework that encourages rap
<h2>Download</h2>
<ul class="linklist">
- <li class="button-download"><a href="/download/">Latest release: <strong>0.95</strong></a></li>
+ <li class="button-download"><a href="/download/">Latest release: <strong>0.95.1</strong></a></li>
</ul>
<p>Open source, <a href="http://code.djangoproject.com/browser/django/trunk/LICENSE">BSD license</a></p>
<h2>Documentation</h2>
@@ -44,24 +44,25 @@ <h2 class="deck">Django is a high-level Python Web framework that encourages rap
<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>New: <a href="http://www.djangobook.com/">The Django Book</a></li>
<li><a href="/documentation/">More...</a></li>
</ul>
<h2>Sites that use Django</h2>
<dl>
+ <dt><a href="http://www.lawrence.com/">lawrence.com</a></dt>
+ <dd>An internationally renowned local-entertainment site with events, stories, bands, drink specials and more.</dd>
+ <dt><a href="http://code.djangoproject.com/wiki/DjangoPoweredSites#Sites/featuresatTheWashingtonPost">washingtonpost.com</a></dt>
+ <dd>The Washington Post's growing selection of innovative Web database applications.</dd>
<dt><a href="http://www.chicagocrime.org/">chicagocrime.org</a></dt>
<dd>A freely browsable database of crimes reported in Chicago.</dd>
- <dt><a href="http://www.lawrence.com/">lawrence.com</a></dt>
- <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.tabblo.com/">Tabblo</a></dt>
+ <dd>An innovative photo-sharing site, with a narrative twist.</dd>
+ <dt><a href="http://www.torontolife.com/">Toronto Life</a></dt>
+ <dd>Toronto's city magazine.</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 %}
View
87 django_website/templates/trac_templates/browser.cs
@@ -1,41 +1,47 @@
-<?cs set:html.stylesheet = 'css/browser.css' ?>
-<?cs include: "header.cs"?>
+<?cs include "header.cs"?>
<?cs include "macros.cs"?>
<div id="ctxtnav" class="nav">
<ul>
- <li class="last"><a href="<?cs var:browser.log_href ?>">Revision Log</a></li>
+ <li class="first"><a href="<?cs var:browser.restr_changeset_href ?>">
+ Last Change</a></li>
+ <li class="last"><a href="<?cs var:browser.log_href ?>">
+ Revision Log</a></li>
</ul>
</div>
+
+<div id="searchable">
<div id="content" class="browser">
<h1><?cs call:browser_path_links(browser.path, browser) ?></h1>
<div id="jumprev">
- <form action="" method="get"><div>
- <label for="rev">View revision:</label>
- <input type="text" id="rev" name="rev" value="<?cs
- var:browser.revision ?>" size="4" />
- </div></form>
+ <form action="" method="get">
+ <div>
+ <label for="rev">View revision:</label>
+ <input type="text" id="rev" name="rev" value="<?cs
+ var:browser.revision ?>" size="4" />
+ </div>
+ </form>
</div>
<?cs if:browser.is_dir ?>
<table class="listing" id="dirlist">
<thead>
<tr><?cs
- call:sortable_th(browser.order, browser.desc, 'name', 'Name', browser.href) ?><?cs
- call:sortable_th(browser.order, browser.desc, 'size', 'Size', browser.href) ?>
+ call:sortable_th(browser.order, browser.desc, 'name', 'Name', browser.order_href) ?><?cs
+ call:sortable_th(browser.order, browser.desc, 'size', 'Size', browser.order_href) ?>
<th class="rev">Rev</th><?cs
- call:sortable_th(browser.order, browser.desc, 'date', 'Age', browser.href) ?>
+ call:sortable_th(browser.order, browser.desc, 'date', 'Age', browser.order_href) ?>
<th class="change">Last Change</th>
</tr>
</thead>
<tbody>
- <?cs if:len(links.up) != "/" ?>
+ <?cs if:len(chrome.links.up) ?>
<tr class="even">
- <td class="name" colspan="4">
+ <td class="name" colspan="5">
<a class="parent" title="Parent Directory" href="<?cs
- var:links.up.0.href ?>">../</a>
+ var:chrome.links.up.0.href ?>">../</a>
</td>
</tr>
<?cs /if ?>
@@ -43,22 +49,12 @@
<?cs set:change = browser.changes[item.rev] ?>
<tr class="<?cs if:name(item) % #2 ?>even<?cs else ?>odd<?cs /if ?>">
<td class="name"><?cs
- if:item.is_dir ?><?cs
- if:item.permission ?>
- <a class="dir" title="Browse Directory" href="<?cs
- var:item.browser_href ?>"><?cs var:item.name ?></a><?cs
- else ?>
- <span class="dir" title="Access Denied" href=""><?cs
- var:item.name ?></span><?cs
- /if ?><?cs
- else ?><?cs
- if:item.permission != '' ?>
- <a class="file" title="View File" href="<?cs
- var:item.browser_href ?>"><?cs var:item.name ?></a><?cs
- else ?>
- <span class="file" title="Access Denied" href=""><?cs
- var:item.name ?></span><?cs
- /if ?><?cs
+ if:item.is_dir ?>
+ <a class="dir" title="Browse Directory" href="<?cs
+ var:item.browser_href ?>"><?cs var:item.name ?></a><?cs
+ else ?>
+ <a class="file" title="View File" href="<?cs
+ var:item.browser_href ?>"><?cs var:item.name ?></a><?cs
/if ?>
</td>
<td class="size"><?cs var:item.size ?></td>
@@ -79,20 +75,20 @@
if:len(browser.props) || !browser.is_dir ?>
<table id="info" summary="Revision info"><?cs
if:!browser.is_dir ?><tr>
- <th scope="row">
- Revision <a href="<?cs var:file.changeset_href ?>"><?cs var:file.rev ?></a>
+ <th scope="col">
+ Revision <a href="<?cs var:file.changeset_href ?>"><?cs var:file.rev ?></a>, <?cs var:file.size ?>
(checked in by <?cs var:file.author ?>, <?cs var:file.age ?> ago)
- </th>
+ </th></tr><tr>
<td class="message"><?cs var:file.message ?></td>
</tr><?cs /if ?><?cs
if:len(browser.props) ?><tr>
<td colspan="2"><ul class="props"><?cs
each:prop = browser.props ?>
- <li>Property <strong><?cs var:name(prop) ?></strong> set to <em><code><?cs
- var:prop ?></code></em></li><?cs
+ <li>Property <strong><?cs var:prop.name ?></strong> set to <em><code><?cs
+ var:prop.value ?></code></em></li><?cs
/each ?>
- </ul></td><?cs
- /if ?></tr>
+ </ul></td></tr><?cs
+ /if ?>
</table><?cs
/if ?><?cs
@@ -101,8 +97,8 @@
if:file.preview ?><?cs
var:file.preview ?><?cs
elif:file.max_file_size_reached ?>
- <strong>HTML preview not available</strong>, since file-size exceeds <?cs
- var:file.max_file_size ?> bytes. Try <a href="<?cs
+ <strong>HTML preview not available</strong>, since the file size exceeds
+ <?cs var:file.max_file_size ?> bytes. Try <a href="<?cs
var:file.raw_href ?>">downloading</a> the file instead.<?cs
else ?><strong>HTML preview not available</strong>. To view, <a href="<?cs
var:file.raw_href ?>">download</a> the file.<?cs
@@ -115,5 +111,18 @@
?>/TracBrowser">TracBrowser</a> for help on using the browser.
</div>
+ <div id="anydiff">
+ <form action="<?cs var:browser.anydiff_href ?>" method="get">
+ <div class="buttons">
+ <input type="hidden" name="new_path" value="<?cs var:browser.path ?>" />
+ <input type="hidden" name="old_path" value="<?cs var:browser.path ?>" />
+ <input type="hidden" name="new_rev" value="<?cs var:browser.revision ?>" />
+ <input type="hidden" name="old_rev" value="<?cs var:browser.revision ?>" />
+ <input type="submit" value="View changes..." title="Prepare an Arbitrary Diff" />
+ </div>
+ </form>
+ </div>
+
+</div>
</div>
<?cs include:"footer.cs"?>
View
5 django_website/templates/trac_templates/header.cs
@@ -30,10 +30,11 @@
<?cs if:html.stylesheet2 ?>@import url(http://media.djangoproject.com/trac/<?cs var:html.stylesheet2 ?>);<?cs /if ?>
<?cs include "site_css.cs" ?>
</style>
- <script src="<?cs var:htdocs_location ?>trac.js" type="text/javascript"></script>
+ <script src="http://media.djangoproject.com/trac/trac.js" type="text/javascript"></script>
<link href="http://media.djangoproject.com/trac/css/trac.css" rel="stylesheet" type="text/css" media="all" />
<link href="http://media.djangoproject.com/css/base.css" rel="stylesheet" type="text/css" media="all" />
+ <link href="http://media.djangoproject.com/css/admin.css" rel="stylesheet" type="text/css" media="all" />
</head>
@@ -117,4 +118,4 @@
trac.acl.TICKET_CREATE, "7") ?><?cs
call:navlink("Search", trac.href.search, "search",
trac.acl.SEARCH_VIEW, "4") ?></ul>
- </div>
+ </div>
View
2  django_website/templates/trac_templates/macros.cs
@@ -174,6 +174,6 @@
def:sortable_th(order, desc, class, title, href) ?>
<th class="<?cs var:class ?><?cs if:order == class ?> <?cs if:desc ?>desc<?cs else ?>asc<?cs /if ?><?cs /if ?>">
<a title="Sort by <?cs var:class ?><?cs if:order == class && !desc ?> (descending)<?cs /if ?>"
- href="<?cs var:href ?>&order=<?cs var:class ?><?cs if:order == class && !desc ?>&desc=1<?cs /if ?>"><?cs var:title ?></a>
+ href="<?cs var:href ?>?order=<?cs var:class ?><?cs if:order == class && !desc ?>&desc=1<?cs /if ?>"><?cs var:title ?></a>
</th><?cs
/def ?>
View
1  django_website/templates/trac_templates/newticket.cs
@@ -17,6 +17,7 @@
<li>Please check the the <a href="http://www.djangoproject.com/documentation/faq/">FAQ</a> first if you suspect your issue might be a frequently-asked question.</li>
<li>Please don't use the ticket system to ask support questions. Use the <a href="http://groups.google.com/group/django-users">django-users mailing list</a> for that, or our IRC channel. (See the "Get help" section of the <a href="http://www.djangoproject.com/community/">community page</a> for more information.)</li>
<li>If you're submitting a patch, please submit it via the "Attach file" button, which will appear after you've created the ticket. Please don't paste the patch into the ticket description itself.</li>
+<li>If you're getting rejected by the spam filter, make sure you've entered your name and email on the <a href="/settings">settings page</a>.</li>
</ul>
<h2>Submit the bug or feature request</h2>
View
46 django_website/templates/trac_templates/ticket_notify_email.cs
@@ -1,23 +1,23 @@
-<?cs var:$email.ticket_body_hdr ?>
-<?cs var:$email.ticket_props ?><?cs
-if:$ticket.new ?>
-<?cs var:$ticket.description ?>
-<?cs else ?><?cs
- if:$email.changes_body ?>
-Changes (by <?cs var:$ticket.change.author ?>):
-
-<?cs var:$email.changes_body ?><?cs
- /if ?><?cs
-var:$email.changes_descr
-?><?cs if:$ticket.change.comment.newvalue ?>
-Comment<?cs
- if:!$email.changes_body ?> (by <?cs
- var:$ticket.change.comment.author ?>)<?cs /if ?>:
-
-<?cs var:$ticket.change.comment.newvalue ?>
-<?cs /if ?><?cs
-/if ?>
---
-Ticket URL: <<?cs var:$ticket.link ?>>
-<?cs var:$project.name ?> <<?cs var:$project.url ?>>
-<?cs var:$project.descr ?>
+<?cs var:email.ticket_body_hdr ?>
+<?cs var:email.ticket_props ?><?cs
+if:ticket.new ?>
+<?cs var:ticket.description ?>
+<?cs else ?><?cs
+ if:email.changes_body ?>
+Changes (by <?cs var:ticket.change.author ?>):
+
+<?cs var:email.changes_body ?><?cs
+ /if ?><?cs
+var:email.changes_descr
+?><?cs if:ticket.change.comment ?>
+Comment<?cs
+ if:!email.changes_body ?> (by <?cs
+ var:ticket.change.author ?>)<?cs /if ?>:
+
+<?cs var:ticket.change.comment ?>
+<?cs /if ?><?cs
+/if ?>
+--
+Ticket URL: <<?cs var:ticket.link ?>>
+<?cs var:project.name ?> <<?cs var:project.url ?>>
+<?cs var:project.descr ?>
Please sign in to comment.
Something went wrong with that request. Please try again.