Django

Code

Changeset 2121

Show
Ignore:
Timestamp:
01/23/06 18:49:16 (3 years ago)
Author:
adrian
Message:

magic-removal: Merged to [2120]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/magic-removal/django/contrib/admin/media/css/global.css

    r1965 r2121  
    4242/* PAGE STRUCTURE */ 
    4343#container { position:relative; width:100%; min-width:658px; } 
    44 #header { text-align:left; min-height:55px; } 
     44#header { text-align:left; } 
    4545#content { margin:10px 15px; } 
    4646#content-main, #content-related { float:left; } 
    …… 
    5555 
    5656/* HEADER */ 
    57 #header { background:#417690; color:#ffc; } 
    58 #header a:link, #header a:visited      { color:white; } 
     57#header { background:#417690; color:#ffc; min-height:2.5em; _height:2.5em; } 
     58#header a:link, #header a:visited { color:white; } 
    5959#header a:hover { text-decoration:underline; } 
    60 #branding { float:left; width:480px; } 
    61 #branding h1 { padding:8px 0 0 10px; margin:0; font-size:18px; font-weight:normal; color:#f4f379; } 
    62 #branding h2 { font-size:14px; padding:0 0 8px 10px; margin:0; font-weight:normal; color:#ffc; } 
    63 #user-tools    { font-size:11px; padding:8px 8px 0 5px; text-align:right; } 
     60#branding { float:left; width:18em; } 
     61#branding h1 { padding:0.5em 10px 0 10px; font-size:18px; margin:0; font-weight:normal; color:#f4f379; } 
     62#branding h2 { padding:0 10px 0.5em 10px; font-size:14px; margin:0; font-weight:normal; color:#ffc; } 
     63#user-tools { padding:1.2em 10px; font-size:11px; text-align:right; } 
    6464 
    6565/* SIDEBAR */ 

  • django/branches/magic-removal/django/contrib/admin/templates/admin/base.html

    r1977 r2121  
    2121        </div> 
    2222        {% if not user.is_anonymous %} 
    23         <div id="user-tools">{% trans 'Welcome,' %} <strong>{% if user.first_name %}{{ user.first_name }}{% else %}{{ user.username }}{% endif %}</strong>. <br />{% block userlinks %}<a href="doc/">{% trans 'Documentation' %}</a> / <a href="password_change/">{% trans 'Change password' %}</a> / <a href="logout/">{% trans 'Log out' %}</a>{% endblock %}</div> 
     23        <div id="user-tools">{% trans 'Welcome,' %} <strong>{% if user.first_name %}{{ user.first_name }}{% else %}{{ user.username }}{% endif %}</strong>. {% block userlinks %}<a href="doc/">{% trans 'Documentation' %}</a> / <a href="password_change/">{% trans 'Change password' %}</a> / <a href="logout/">{% trans 'Log out' %}</a>{% endblock %}</div> 
    2424        {% endif %} 
    2525        {% block nav-global %}{% endblock %} 
    26         <br class="clear" /> 
    2726    </div> 
    2827    <!-- END Header --> 

  • django/branches/magic-removal/django/contrib/admin/templates/admin/base_site.html

    r1068 r2121  
    66{% block branding %} 
    77<h1 id="site-name">{% trans 'Django administration' %}</h1> 
    8 <h2 id="site-url"><a href="http://www.example.com/">example.com</a></h2> 
    98{% endblock %} 
    109 

  • django/branches/magic-removal/docs/faq.txt

    r2080 r2121  
    167167.. _unofficial Django screencast: http://www.throwingbeans.org/django_screencasts.html 
    168168 
     169How can I download the Django documentation to read it offline? 
     170--------------------------------------------------------------- 
     171 
     172The Django docs are available in the ``docs`` directory of each Django tarball 
     173release. These docs are in ReST (restructured text) format, and each text file 
     174corresponds to a Web page on the official Django site. 
     175 
     176Because the documentation is `stored in revision control`_, you can browse 
     177documentation changes just like you can browse code changes. 
     178 
     179Technically, the docs on Django's site are generated from the latest development 
     180versions of those ReST documents, so the docs on the Django site may offer more 
     181information than the docs that come with the latest Django release. 
     182 
     183.. _stored in revision control: http://code.djangoproject.com/browser/django/trunk/docs 
     184 
    169185Installation questions 
    170186====================== 
    …… 
    391407allows access to users with those two fields both set to True. 
    392408 
     409How do I automatically set a field's value to the user who last edited the object in the admin? 
     410----------------------------------------------------------------------------------------------- 
     411 
     412At this point, you can't do this. But it's an oft-requested feature, so we're 
     413discussing how it can be implemented. The problem is we don't want to couple 
     414the model layer with the admin layer with the request layer (to get the current 
     415user). It's a tricky problem. 
     416 
     417How do I limit admin access so that objects can only be edited by the users who created them? 
     418--------------------------------------------------------------------------------------------- 
     419 
     420See the answer to the previous question. 
     421 
    393422My "list_filter" contains a ManyToManyField, but the filter doesn't display. 
    394423---------------------------------------------------------------------------- 

  • django/branches/magic-removal/docs/templates.txt

    r2015 r2121  
    283283 
    284284    {% load comments i18n %} 
     285 
     286Custom libraries and template inheritance 
     287----------------------------------------- 
     288 
     289When you load a custom tag or filter library, the tags/filters are only made 
     290available to the current template -- not any parent or child templates along 
     291the template-inheritance path. 
     292 
     293For example, if a template ``foo.html`` has ``{% load comments %}``, a child 
     294template (e.g., one that has ``{% extends foo %}`` will *not* have access to 
     295the comments template tags and filters. The child template is responsible for 
     296its own ``{% load comments %}``. 
     297 
     298This is a feature for the sake of maintainability and sanity. 
    285299 
    286300Built-in tag and filter reference