Changeset 337

Timestamp:

07/29/05 10:25:31 (3 years ago)

Author:

adrian

Message:

Fixed #223 -- Changed breadcrumbs in admin doc templates to use relative, not absolute, URLs. Thanks, Drew Amato

Files:

• django/trunk/django/conf/admin_templates/doc/bookmarklets.html (modified) (4 diffs)
• django/trunk/django/conf/admin_templates/doc/index.html (modified) (2 diffs)
• django/trunk/django/conf/admin_templates/doc/missing_docutils.html (modified) (2 diffs)
• django/trunk/django/conf/admin_templates/doc/model_detail.html (modified) (1 diff)
• django/trunk/django/conf/admin_templates/doc/model_index.html (modified) (1 diff)
• django/trunk/django/conf/admin_templates/doc/template_filter_index.html (modified) (1 diff)
• django/trunk/django/conf/admin_templates/doc/template_tag_index.html (modified) (1 diff)
• django/trunk/django/conf/admin_templates/doc/view_detail.html (modified) (1 diff)
• django/trunk/django/conf/admin_templates/doc/view_index.html (modified) (2 diffs)

django/trunk/django/conf/admin_templates/doc/bookmarklets.html

@@ -1 +1 @@
-{% extends "base_site" %}
-
-/">Home</a> &rsaquo; <a href="/doc
+../../">Home</a> &rsaquo; <a href="..
-
-{% block title %}Documentation bookmarklets{% endblock %}
@@ -11 +11 @@
-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
- 
+
-your computer is "internal").</p>
-
@@ -17 +17 @@
-    <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+'/';})()">Documentation for this page</a></h3>
-    <p>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);})();">Show object ID</a></h3>
-    <p>Shows the content-type and unique ID for pages that represent a single object.</p>
@@ -23 +23 @@
-    <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='{{ admun_url }}/'+type.split('.').join('/')+'/'+id+'/';})()">Edit this object (current window)</a></h3>
-    <p>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('{{ admun_url }}/'+type.split('.').join('/')+'/'+id+'/');})()">Edit this object (new window)</a></h3>
-    <p>As above, but opens the admin page in a new window.</p>

django/trunk/django/conf/admin_templates/doc/index.html

@@ -1 +1 @@
-{% extends "base_site" %}
-
-
+..
-
-{% block title %}Documentation{% endblock %}
@@ -12 +12 @@
-        <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="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>

django/trunk/django/conf/admin_templates/doc/missing_docutils.html

@@ -1 +1 @@
-{% extends "base_site" %}
-
-
+..
-
-{% block title %}Please install docutils{% endblock %}
@@ -11 +11 @@
-<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>

django/trunk/django/conf/admin_templates/doc/model_detail.html

@@ -13 +13 @@
-{% endblock %}
-
-/">Home</a> &rsaquo; <a href="/doc/">Documentation</a> &rsaquo; <a href="/doc/models
+../../../">Home</a> &rsaquo; <a href="../../">Documentation</a> &rsaquo; <a href="..
-
-{% block title %}Model: {{ name }}{% endblock %}

django/trunk/django/conf/admin_templates/doc/model_index.html

@@ -3 +3 @@
-{% block coltype %}colSM{% endblock %}
-
-/">Home</a> &rsaquo; <a href="/doc
+../../">Home</a> &rsaquo; <a href="..
-
-{% block title %}Models{% endblock %}

django/trunk/django/conf/admin_templates/doc/template_filter_index.html

@@ -1 +1 @@
-{% extends "base_site" %}
-
-
-{% block coltype %}colSM{% endblock %}
-
-
-
-
-
+
-
-{% block title %}Template filters{% endblock %}

django/trunk/django/conf/admin_templates/doc/template_tag_index.html

@@ -1 +1 @@
-{% extends "base_site" %}
-
-
-{% block coltype %}colSM{% endblock %}
-
-
-
-
-
+
-
-{% block title %}Template tags{% endblock %}

django/trunk/django/conf/admin_templates/doc/view_detail.html

@@ -1 +1 @@
-{% extends "base_site" %}
-
-/">Home</a> &rsaquo; <a href="/doc/">Documentation</a> &rsaquo; <a href="/doc/views
+../../../">Home</a> &rsaquo; <a href="../../">Documentation</a> &rsaquo; <a href="..
-
-{% block title %}View: {{ name }}{% endblock %}

django/trunk/django/conf/admin_templates/doc/view_index.html

@@ -3 +3 @@
-{% block coltype %}colSM{% endblock %}
-
-/">Home</a> &rsaquo; <a href="/doc
+../../">Home</a> &rsaquo; <a href="..
-
-{% block title %}Views{% endblock %}
-
-
-{% block content %}
-
-
-
-<h1>View documentation</h1>
-
-
-<div id="content-main">
-
-
-{% regroup views|dictsort:"site_id" by site as views_by_site %}
@@ -35 +30 @@
-</div>
-
-
-{% endblock %}
-