Fixed #7811: moved admindocs templates into admindocs/templates. This is slightly backwards-incompatible in that if you're using the admindocs you'll need to add 'django.contrib.admindocs' to INSTALLED_APPS.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8264 bcc190cf-cafb-0310-a4f2-bffc1f526a37

10 files changed, 0 insertions, 348 deletions

diff --git a/django/contrib/admin/templates/admin_doc/bookmarklets.html b/django/contrib/admin/templates/admin_doc/bookmarklets.html
deleted file mode 100644
index 64475299c2..0000000000
--- a/django/contrib/admin/templates/admin_doc/bookmarklets.html
+++ /dev/null
@@ -1,31 +0,0 @@
-{% extends "admin/base_site.html" %}
-
-{% block breadcrumbs %}{% load i18n %}<div class="breadcrumbs"><a href="../../">{% trans "Home" %}</a> &rsaquo; <a href="../">{% trans "Documentation" %}</a> &rsaquo; {% trans "Bookmarklets" %}</div>{% endblock %}
-{% block title %}{% trans "Documentation bookmarklets" %}{% endblock %}
-
-{% block content %}
-
-{% blocktrans %}
-<p class="help">To install bookmarklets, drag the link to your bookmarks
-toolbar, or right-click the link and add it to your bookmarks. Now you can
-select the bookmarklet from any page in the site.  Note that some of these
-bookmarklets require you to be viewing the site from a computer designated
-as "internal" (talk to your system administrator if you aren't sure if
-your computer is "internal").</p>
-{% endblocktrans %}
-
-<div id="content-main">
-    <h3><a href="javascript:(function(){if(typeof ActiveXObject!='undefined'){x=new ActiveXObject('Microsoft.XMLHTTP')}else if(typeof XMLHttpRequest!='undefined'){x=new XMLHttpRequest()}else{return;}x.open('HEAD',location.href,false);x.send(null);try{view=x.getResponseHeader('x-view');}catch(e){alert('No view found for this page');return;}if(view=='undefined'){alert('No view found for this page');}document.location='{{ admin_url }}doc/views/'+view+'/';})()">{% trans "Documentation for this page" %}</a></h3>
-    <p>{% trans "Jumps you from any page to the documentation for the view that generates that page." %}</p>
-
-    <h3><a href="javascript:(function(){if(typeof ActiveXObject!='undefined'){x=new ActiveXObject('Microsoft.XMLHTTP')}else if(typeof XMLHttpRequest!='undefined'){x=new XMLHttpRequest()}else{return;}x.open('GET',location.href,false);x.send(null);try{type=x.getResponseHeader('x-object-type');id=x.getResponseHeader('x-object-id');}catch(e){type='(none)';id='(none)';}d=document;b=d.body;e=d.createElement('div');e.id='xxxhhh';s=e.style;s.position='absolute';s.left='10px';s.top='10px';s.font='10px monospace';s.border='1px black solid';s.padding='4px';s.backgroundColor='#eee';e.appendChild(d.createTextNode('Type: '+type));e.appendChild(d.createElement('br'));e.appendChild(d.createTextNode('ID: '+id));e.appendChild(d.createElement('br'));l=d.createElement('a');l.href='#';l.onclick=function(){b.removeChild(e);};l.appendChild(d.createTextNode('[close]'));l.style.textDecoration='none';e.appendChild(l);b.appendChild(e);})();">{% trans "Show object ID" %}</a></h3>
-    <p>{% trans "Shows the content-type and unique ID for pages that represent a single object." %}</p>
-
-    <h3><a href="javascript:(function(){if(typeof ActiveXObject!='undefined'){var x=new ActiveXObject('Microsoft.XMLHTTP')}else if(typeof XMLHttpRequest!='undefined'){var x=new XMLHttpRequest()}else{return;}x.open('GET',location.href,false);x.send(null);try{var type=x.getResponseHeader('x-object-type');var id=x.getResponseHeader('x-object-id');}catch(e){return;}document.location='{{ admin_url }}'+type.split('.').join('/')+'/'+id+'/';})()">{% trans "Edit this object (current window)" %}</a></h3>
-    <p>{% trans "Jumps to the admin page for pages that represent a single object." %}</p>
-
-    <h3><a href="javascript:(function(){if(typeof ActiveXObject!='undefined'){var x=new ActiveXObject('Microsoft.XMLHTTP')}else if(typeof XMLHttpRequest!='undefined'){var x=new XMLHttpRequest()}else{return;}x.open('GET',location.href,false);x.send(null);try{var type=x.getResponseHeader('x-object-type');var id=x.getResponseHeader('x-object-id');}catch(e){return;}window.open('{{ admin_url }}'+type.split('.').join('/')+'/'+id+'/');})()">{% trans "Edit this object (new window)" %}</a></h3>
-    <p>{% trans "As above, but opens the admin page in a new window." %}</p>
-</div>
-
-{% endblock %}
diff --git a/django/contrib/admin/templates/admin_doc/index.html b/django/contrib/admin/templates/admin_doc/index.html
deleted file mode 100644
index 242fc7339a..0000000000
--- a/django/contrib/admin/templates/admin_doc/index.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% extends "admin/base_site.html" %}
-{% load i18n %}
-{% block breadcrumbs %}<div class="breadcrumbs"><a href="../">Home</a> &rsaquo; Documentation</div>{% endblock %}
-{% block title %}Documentation{% endblock %}
-
-{% block content %}
-
-<h1>Documentation</h1>
-
-<div id="content-main">
-  <h3><a href="tags/">Tags</a></h3>
-  <p>List of all the template tags and their functions.</p>
-
-  <h3><a href="filters/">Filters</a></h3>
-  <p>Filters are actions which can be applied to variables in a template to alter the output.</p>
-
-  <h3><a href="models/">Models</a></h3>
-  <p>Models are descriptions of all the objects in the system and their associated fields. Each model has a list of fields which can be accessed as template variables.</p>
-
-  <h3><a href="views/">Views</a></h3>
-  <p>Each page on the public site is generated by a view. The view defines which template is used to generate the page and which objects are available to that template.</p>
-
-    <h3><a href="bookmarklets/">Bookmarklets</a></h3>
-    <p>Tools for your browser to quickly access admin functionality.</p>
-</div>
-
-{% endblock %}
-
diff --git a/django/contrib/admin/templates/admin_doc/missing_docutils.html b/django/contrib/admin/templates/admin_doc/missing_docutils.html
deleted file mode 100644
index 97c9d4711c..0000000000
--- a/django/contrib/admin/templates/admin_doc/missing_docutils.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% extends "admin/base_site.html" %}
-{% load i18n %}
-{% block breadcrumbs %}<div class="breadcrumbs"><a href="../">Home</a> &rsaquo; Documentation</div>{% endblock %}
-{% block title %}Please install docutils{% endblock %}
-
-{% block content %}
-
-<h1>Documentation</h1>
-
-<div id="content-main">
-  <h3>The admin documentation system requires Python's <a href="http://docutils.sf.net/">docutils</a> library.</h3>
-
-  <p>Please ask your administrators to install <a href="http://docutils.sf.net/">docutils</a>.</p>
-</div>
-
-{% endblock %}
diff --git a/django/contrib/admin/templates/admin_doc/model_detail.html b/django/contrib/admin/templates/admin_doc/model_detail.html
deleted file mode 100644
index 414397f23a..0000000000
--- a/django/contrib/admin/templates/admin_doc/model_detail.html
+++ /dev/null
@@ -1,46 +0,0 @@
-{% extends "admin/base_site.html" %}
-{% load i18n %}
-{% block extrahead %}
-{{ block.super }}
-<style type="text/css">
-.module table { width:100%; }
-.module table p { padding: 0; margin: 0; }
-</style>
-{% endblock %}
-
-{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../../">Home</a> &rsaquo; <a href="../../">Documentation</a> &rsaquo; <a href="../">Models</a> &rsaquo; {{ name }}</div>{% endblock %}
-
-{% block title %}Model: {{ name }}{% endblock %}
-
-{% block content %}
-<div id="content-main">
-<h1>{{ summary }}</h1>
-
-{% if description %}
-  <p>{% filter linebreaksbr %}{% trans description %}{% endfilter %}</p>
-{% endif %}
-
-<div class="module">
-<table class="model">
-<thead>
-<tr>
-    <th>Field</th>
-    <th>Type</th>
-    <th>Description</th>
-</tr>
-</thead>
-<tbody>
-{% for field in fields|dictsort:"name" %}
-<tr>
-    <td>{{ field.name }}</td>
-    <td>{{ field.data_type }}</td>
-    <td>{% if field.verbose %}{{ field.verbose }}{% endif %}{% if field.help_text %} - {{ field.help_text|safe }}{% endif %}</td>
-</tr>
-{% endfor %}
-</tbody>
-</table>
-</div>
-
-<p class="small"><a href="../">&lsaquo; Back to Models Documentation</a></p>
-</div>
-{% endblock %}
diff --git a/django/contrib/admin/templates/admin_doc/model_index.html b/django/contrib/admin/templates/admin_doc/model_index.html
deleted file mode 100644
index 702fdff329..0000000000
--- a/django/contrib/admin/templates/admin_doc/model_index.html
+++ /dev/null
@@ -1,44 +0,0 @@
-{% extends "admin/base_site.html" %}
-{% load i18n %}
-{% block coltype %}colSM{% endblock %}
-{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">Home</a> &rsaquo; <a href="../">Documentation</a> &rsaquo; Models</div>{% endblock %}
-
-{% block title %}Models{% endblock %}
-
-{% block content %}
-
-<h1>Model documentation</h1>
-
-{% regroup models by app_label as grouped_models %}
-
-<div id="content-main">
-{% for group in grouped_models %}
-<div class="module">
-<h2 id="{{ group.grouper }}">{{ group.grouper|capfirst }}</h2>
-
-<table class="xfull">
-{% for model in group.list %}
-<tr>
-<th><a href="{{ model.app_label }}.{{ model.object_name.lower }}/">{{ model.object_name }}</a></th>
-</tr>
-{% endfor %}
-</table>
-</div>
-{% endfor %}
-
-</div>
-{% endblock %}
-
-{% block sidebar %}
-<div id="content-related" class="sidebar">
-<div class="module">
-<h2>Model groups</h2>
-<ul>
-{% regroup models by app_label as grouped_models %}
-{% for group in grouped_models %}
-    <li><a href="#{{ group.grouper }}">{{ group.grouper|capfirst }}</a></li>
-{% endfor %}
-</ul>
-</div>
-</div>
-{% endblock %}
diff --git a/django/contrib/admin/templates/admin_doc/template_detail.html b/django/contrib/admin/templates/admin_doc/template_detail.html
deleted file mode 100644
index a8b02bd189..0000000000
--- a/django/contrib/admin/templates/admin_doc/template_detail.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% extends "admin/base_site.html" %}
-{% load i18n %}
-{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../../">Home</a> &rsaquo; <a href="../../">Documentation</a> &rsaquo; Templates &rsaquo; {{ name|escape }}</div>{% endblock %}
-
-{% block title %}Template: {{ name|escape }}{% endblock %}
-
-{% block content %}
-<h1>Template: "{{ name|escape }}"</h1>
-
-{% regroup templates|dictsort:"site_id" by site as templates_by_site %}
-{% for group in templates_by_site %}
-    <h2>Search path for template "{{ name|escape }}" on {{ group.grouper }}:</h2>
-    <ol>
-    {% for template in group.list|dictsort:"order" %}
-        <li><code>{{ template.file|escape }}</code>{% if not template.exists %} <em>(does not exist)</em>{% endif %}</li>
-    {% endfor %}
-    </ol>
-{% endfor %}
-
-<p class="small"><a href="../../">&lsaquo; Back to Documentation</a></p>
-{% endblock %}
diff --git a/django/contrib/admin/templates/admin_doc/template_filter_index.html b/django/contrib/admin/templates/admin_doc/template_filter_index.html
deleted file mode 100644
index 902396d416..0000000000
--- a/django/contrib/admin/templates/admin_doc/template_filter_index.html
+++ /dev/null
@@ -1,47 +0,0 @@
-{% extends "admin/base_site.html" %}
-{% load i18n %}
-{% block coltype %}colSM{% endblock %}
-{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">Home</a> &rsaquo; <a href="../">Documentation</a> &rsaquo; filters</div>{% endblock %}
-{% block title %}Template filters{% endblock %}
-
-{% block content %}
-
-<h1>Template filter documentation</h1>
-
-<div id="content-main">
-{% regroup filters|dictsort:"library" by library as filter_libraries %}
-{% for library in filter_libraries %}
-<div class="module">
-    <h2>{% if library.grouper %}{{ library.grouper }}{% else %}Built-in filters{% endif %}</h2>
-    {% if library.grouper %}<p class="small quiet">To use these filters, put <code>{% templatetag openblock %} load {{ library.grouper }} {% templatetag closeblock %}</code> in your template before using the filter.</p><hr />{% endif %}
-    {% for filter in library.list|dictsort:"name" %}
-    <h3 id="{{ filter.name }}">{{ filter.name }}</h3>
-    <p>{{ filter.title }}</p>
-    <p>{{ filter.body }}</p>
-    {% if not forloop.last %}<hr />{% endif %}
-    {% endfor %}
-</div>
-{% endfor %}
-</div>
-
-{% endblock %}
-
-{% block sidebar %}
-
-<div id="content-related">
-
-{% regroup filters|dictsort:"library" by library as filter_libraries %}
-{% for library in filter_libraries %}
-<div class="module">
-    <h2>{% if library.grouper %}{{ library.grouper }}{% else %}Built-in filters{% endif %}</h2>
-    <ul>
-    {% for filter in library.list|dictsort:"name" %}
-        <li><a href="#{{ filter.name }}">{{ filter.name }}</a></li>
-    {% endfor %}
-    </ul>
-</div>
-{% endfor %}
-
-</div>
-
-{% endblock %}
diff --git a/django/contrib/admin/templates/admin_doc/template_tag_index.html b/django/contrib/admin/templates/admin_doc/template_tag_index.html
deleted file mode 100644
index ea49529393..0000000000
--- a/django/contrib/admin/templates/admin_doc/template_tag_index.html
+++ /dev/null
@@ -1,47 +0,0 @@
-{% extends "admin/base_site.html" %}
-{% load i18n %}
-{% block coltype %}colSM{% endblock %}
-{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">Home</a> &rsaquo; <a href="../">Documentation</a> &rsaquo; Tags</div>{% endblock %}
-{% block title %}Template tags{% endblock %}
-
-{% block content %}
-
-<h1>Template tag documentation</h1>
-
-<div id="content-main">
-{% regroup tags|dictsort:"library" by library as tag_libraries %}
-{% for library in tag_libraries %}
-<div class="module">
-    <h2>{% if library.grouper %}{{ library.grouper }}{% else %}Built-in tags{% endif %}</h2>
-    {% if library.grouper %}<p class="small quiet">To use these tags, put <code>{% templatetag openblock %} load {{ library.grouper }} {% templatetag closeblock %}</code> in your template before using the tag.</p><hr />{% endif %}
-    {% for tag in library.list|dictsort:"name" %}
-    <h3 id="{{ tag.name }}">{{ tag.name }}</h3>
-    <h4>{{ tag.title }}</h4>
-    <p>{{ tag.body }}</p>
-    {% if not forloop.last %}<hr />{% endif %}
-    {% endfor %}
-</div>
-{% endfor %}
-</div>
-
-{% endblock %}
-
-{% block sidebar %}
-
-<div id="content-related">
-
-{% regroup tags|dictsort:"library" by library as tag_libraries %}
-{% for library in tag_libraries %}
-<div class="module">
-    <h2>{% if library.grouper %}{{ library.grouper }}{% else %}Built-in tags{% endif %}</h2>
-    <ul>
-    {% for tag in library.list|dictsort:"name" %}
-        <li><a href="#{{ tag.name }}">{{ tag.name }}</a></li>
-    {% endfor %}
-    </ul>
-</div>
-{% endfor %}
-
-</div>
-
-{% endblock %}
diff --git a/django/contrib/admin/templates/admin_doc/view_detail.html b/django/contrib/admin/templates/admin_doc/view_detail.html
deleted file mode 100644
index d7415ab74f..0000000000
--- a/django/contrib/admin/templates/admin_doc/view_detail.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% extends "admin/base_site.html" %}
-{% load i18n %}
-{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../../">Home</a> &rsaquo; <a href="../../">Documentation</a> &rsaquo; <a href="../">Views</a> &rsaquo; {{ name }}</div>{% endblock %}
-{% block title %}View: {{ name }}{% endblock %}
-
-{% block content %}
-
-<h1>{{ name }}</h1>
-
-<h2 class="subhead">{{ summary }}</h2>
-
-<p>{{ body }}</p>
-
-{% if meta.Context %}
-<h3>Context:</h3>
-<p>{{ meta.Context }}</p>
-{% endif %}
-
-{% if meta.Templates %}
-<h3>Templates:</h3>
-<p>{{ meta.Templates }}</p>
-{% endif %}
-
-<p class="small"><a href="../">&lsaquo; Back to Views Documentation</a></p>
-{% endblock %}
diff --git a/django/contrib/admin/templates/admin_doc/view_index.html b/django/contrib/admin/templates/admin_doc/view_index.html
deleted file mode 100644
index 4099005828..0000000000
--- a/django/contrib/admin/templates/admin_doc/view_index.html
+++ /dev/null
@@ -1,43 +0,0 @@
-{% extends "admin/base_site.html" %}
-{% load i18n %}
-{% block coltype %}colSM{% endblock %}
-{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">Home</a> &rsaquo; <a href="../">Documentation</a> &rsaquo; Views</div>{% endblock %}
-{% block title %}Views{% endblock %}
-
-{% block content %}
-
-<h1>View documentation</h1>
-
-{% regroup views|dictsort:"site_id" by site as views_by_site %}
-
-<div id="content-related" class="sidebar">
-<div class="module">
-<h2>Jump to site</h2>
-<ul>
-    {% for site_views in views_by_site %}
-    <li><a href="#site{{ site_views.grouper.id }}">{{ site_views.grouper.name }}</a></li>
-    {% endfor %}
-</ul>
-</div>
-</div>
-
-<div id="content-main">
-
-{% for site_views in views_by_site %}
-<div class="module">
-<h2 id="site{{ site_views.grouper.id }}">Views by URL on {{ site_views.grouper.name }}</h2>
-
-{% for view in site_views.list|dictsort:"url" %}
-{% ifchanged %}
-<h3><a href="{{ view.module }}.{{ view.name }}/">{{ view.url|escape }}</a></h3>
-<p class="small quiet">View function: {{ view.module }}.{{ view.name }}</p>
-<p>{{ view.title }}</p>
-<hr />
-{% endifchanged %}
-{% endfor %}
-</div>
-{% endfor %}
-</div>
-{% endblock %}
-
-