Django

Code

Changeset 9463

Show
Ignore:
Timestamp:
11/15/08 18:08:48 (8 months ago)
Author:
wilson
Message:

Removed the hidden import rules in the contrib.admin stylesheets. Each individual stylesheet is now linked to explicitly from the template where it's used (in the extrastyle block), with the exception of widgets.css, which is imported by forms.css, but still available separately for reuse. Also moved the override stylesheets (IE and RTL) below the extrastyle block and all styles within the conditional comment which blocks CSS from IE5 and lower.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/contrib/admin/media/css/changelists.css

    r9299 r9463  
    1 @import url('base.css'); 
    2  
    31/* CHANGELISTS */ 
    42 

  • django/trunk/django/contrib/admin/media/css/dashboard.css

    r9299 r9463  
    1 @import url('base.css'); 
    2  
    31/* DASHBOARD */ 
    42 

  • django/trunk/django/contrib/admin/media/css/forms.css

    r9299 r9463  
    1 @import url('base.css'); 
    21@import url('widgets.css'); 
    32 

  • django/trunk/django/contrib/admin/media/css/login.css

    r9304 r9463  
    1 @import url('base.css'); 
    2  
    31/* LOGIN FORM */ 
    42 

  • django/trunk/django/contrib/admin/templates/admin/base.html

    r9303 r9463  
    33<head> 
    44<title>{% block title %}{% endblock %}</title> 
    5 <![if gte IE 6]><link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% load adminmedia %}{% admin_media_prefix %}css/base.css{% endblock %}" /><![endif]> 
     5<![if gte IE 6]><!-- Block all styles from IE5 and lower --> 
     6<link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% load adminmedia %}{% admin_media_prefix %}css/base.css{% endblock %}" /> 
     7{% block extrastyle %}{% endblock %} 
    68<!--[if lte IE 7]><link rel="stylesheet" type="text/css" href="{% block stylesheet_ie %}{% load adminmedia %}{% admin_media_prefix %}css/ie.css{% endblock %}" /><![endif]--> 
    79{% if LANGUAGE_BIDI %}<link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% admin_media_prefix %}css/rtl.css{% endblock %}" />{% endif %} 
    8 {% block extrastyle %}{% endblock %} 
     10<![endif]> 
    911{% block extrahead %}{% endblock %} 
    1012{% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE" />{% endblock %} 

  • django/trunk/django/contrib/admin/templates/admin/change_form.html

    r9371 r9463  
    77{% endblock %} 
    88 
    9 {% block stylesheet %}{% admin_media_prefix %}css/forms.css{% endblock %} 
     9{% block extrastyle %}<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />{% endblock %} 
    1010 
    1111{% block coltype %}{% if ordered_objects %}colMS{% else %}colM{% endif %}{% endblock %} 

  • django/trunk/django/contrib/admin/templates/admin/change_list.html

    r8984 r9463  
    22{% load adminmedia admin_list i18n %} 
    33 
    4 {% block stylesheet %}{% admin_media_prefix %}css/changelists.css{% endblock %} 
     4{% block extrastyle %}<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/changelists.css" />{% endblock %} 
    55 
    66{% block bodyclass %}change-list{% endblock %} 

  • django/trunk/django/contrib/admin/templates/admin/index.html

    r8984 r9463  
    22{% load i18n %} 
    33 
    4 {% block stylesheet %}{% load adminmedia %}{% admin_media_prefix %}css/dashboard.css{% endblock %} 
     4{% block extrastyle %}<link rel="stylesheet" type="text/css" href="{% load adminmedia %}{% admin_media_prefix %}css/dashboard.css" />{% endblock %} 
    55 
    66{% block coltype %}colMS{% endblock %} 

  • django/trunk/django/contrib/admin/templates/admin/login.html

    r8877 r9463  
    22{% load i18n %} 
    33 
    4 {% block stylesheet %}{% load adminmedia %}{% admin_media_prefix %}css/login.css{% endblock %} 
     4{% block extrastyle %}{% load adminmedia %}<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/login.css" />{% endblock %} 
    55 
    66{% block bodyclass %}login{% endblock %}