Django

Code

Changeset 2625

Show
Ignore:
Timestamp:
04/06/06 12:06:10 (3 years ago)
Author:
wilson
Message:

magic-removal: Changed admin templates to load individual stylesheets only when necessary and further modularized css.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2621 r2625  
    1010@import url('global.css'); 
    1111@import url('layout.css'); 
    12 @import url('changelists.css'); 
    13 @import url('forms.css'); 
    14 @import url('widgets.css'); 
    15 @import url('dashboard.css'); 
    1612 
    1713/* Import patch for IE 6 Windows */ 

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

    r2621 r2625  
     1@import url('base.css'); 
     2 
     3/* CHANGELISTS */ 
    14#changelist { position:relative; width:100%; } 
    25#changelist table { width:100%; } 
    …… 
    3740.change-list ul.toplinks .date-back a { color:#999; } 
    3841.change-list ul.toplinks .date-back a:hover { color:#036; } 
     42 
     43/* PAGINATOR */ 
     44.paginator { font-size:11px; padding-top:10px; padding-bottom:10px; line-height:22px; margin:0; border-top:1px solid #ddd; } 
     45.paginator a:link, .paginator a:visited { padding:2px 6px; border:solid 1px #ccc; background:white; text-decoration:none; } 
     46.paginator a.showall { padding:0 !important; border:none !important; } 
     47.paginator a.showall:hover { color:#036 !important; background:transparent !important; } 
     48.paginator .end { border-width:2px !important; margin-right:6px; } 
     49.paginator .this-page { padding:2px 6px; font-weight:bold; font-size:13px; vertical-align:top; } 
     50.paginator a:hover { color:white; background:#5b80b2; border-color:#036; } 

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

    r2621 r2625  
     1@import url('base.css'); 
     2 
    13/* DASHBOARD */ 
    24.dashboard .module table th { width:100%; } 

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

    r2621 r2625  
     1@import url('base.css'); 
     2@import url('widgets.css'); 
     3 
    14/* SUBMIT ROW */ 
    2 .submit-row { padding:5px 7px; text-align:right; background:white url(../img/admin/nav-bg.gif) 0 100% repeat-x;; border:1px solid #ccc; margin:5px 0; } 
     5.submit-row { padding:5px 7px; text-align:right; background:white url(../img/admin/nav-bg.gif) 0 100% repeat-x; border:1px solid #ccc; margin:5px 0; } 
    36.submit-row input { margin:0 0 0 5px; } 
    47.submit-row p { margin-top:0.3em; } 
    5 .submit-row .deletelink { background:url(../img/admin/tool-delete.gif) 0 50% no-repeat; padding-left:18px; } 
     8.submit-row .deletelink { background:url(../img/admin/icon_deletelink.gif) 0 50% no-repeat; padding-left:14px; } 
    69 
    710/* FORM ROWS */ 

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

    r2621 r2625  
    1 body { margin:0; padding:0; font-family:"Lucida Grande","Bitstream Vera Sans",Verdana,Arial,sans-serif; color:#333; background:#fff; } 
     1body { margin:0; padding:0; font-size:12px; font-family:"Lucida Grande","Bitstream Vera Sans",Verdana,Arial,sans-serif; color:#333; background:#fff; } 
    22 
    33/* LINKS */ 
    …… 
    77 
    88/* GLOBAL DEFAULTS */ 
    9 p, ol, ul, dl { margin:.2em 0 .8em 0; font-size:12px; } 
     9p, ol, ul, dl { margin:.2em 0 .8em 0; } 
    1010p { padding:0; line-height:140%; } 
    1111 

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

    r2621 r2625  
    6868.timelist a { padding:2px; } 
    6969 
    70 /* PAGINATOR */ 
    71 .paginator { font-size:11px; padding-top:10px; padding-bottom:10px; line-height:22px; margin:0; border-top:1px solid #ddd; } 
    72 .paginator a:link, .paginator a:visited { padding:2px 6px; border:solid 1px #ccc; background:white; text-decoration:none; } 
    73 .paginator a.showall { padding:0 !important; border:none !important; } 
    74 .paginator a.showall:hover { color:#036 !important; background:transparent !important; } 
    75 .paginator .end { border-width:2px !important; margin-right:6px; } 
    76 .paginator .this-page { padding:2px 6px; font-weight:bold; font-size:13px; vertical-align:top; } 
    77 .paginator a:hover { color:white; background:#5b80b2; border-color:#036; } 
    78  
    7970/* INLINE ORDERER */ 
    8071ul.orderer {  position:relative; padding:0 !important; margin:0 !important; list-style-type:none; } 

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

    r2556 r2625  
    55{% for js in javascript_imports %}{% include_admin_script js %}{% endfor %} 
    66{% endblock %} 
     7{% block stylesheet %}{% admin_media_prefix %}css/forms.css{% endblock %} 
    78{% block coltype %}{% if ordered_objects %}colMS{% else %}colM{% endif %}{% endblock %} 
    89{% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %} 

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

    r2064 r2625  
    11{% extends "admin/base_site" %} 
    22{% load adminmedia admin_list i18n %} 
     3{% block stylesheet %}{% admin_media_prefix %}css/changelists.css{% endblock %} 
    34{% block bodyclass %}change-list{% endblock %} 
    45{% block userlinks %}<a href="../../doc/">{% trans 'Documentation' %}</a> / <a href="../../password_change/">{% trans 'Change password' %}</a> / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %} 

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

    r2619 r2625  
    22{% load i18n %} 
    33 
     4{% block stylesheet %}{% load adminmedia %}{% admin_media_prefix %}css/dashboard.css{% endblock %} 
    45{% block coltype %}colMS{% endblock %} 
    56{% block bodyclass %}dashboard{% endblock %} 

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

    r1068 r2625  
    22{% load i18n %} 
    33 
     4{% block content_title %}{% endblock %} 
    45{% block breadcrumbs %}{% endblock %} 
    56 
    …… 
    1011{% endif %} 
    1112<div id="content-main"> 
    12 <form action="{{ app_path }}" method="post"> 
    13  
    14 <p class="aligned"> 
    15 <label for="id_username">{% trans 'Username:' %}</label> <input type="text" name="username" id="id_username" /> 
    16 </p> 
    17 <p class="aligned"> 
    18 <label for="id_password">{% trans 'Password:' %}</label> <input type="password" name="password" id="id_password" /> 
    19 <input type="hidden" name="this_is_the_login_form" value="1" /> 
    20 <input type="hidden" name="post_data" value="{{ post_data }}" />{% comment %} <span class="help">{% trans 'Have you <a href="/password_reset/">forgotten your password</a>?' %}</span>{% endcomment %} 
    21 </p> 
    22  
    23 <div class="aligned "> 
    24 <label>&nbsp;</label><input type="submit" value="{% trans 'Log in' %}" /> 
    25 </div> 
     13<form action="{{ app_path }}" method="post" id="login-form"> 
     14        <div class="form-row"> 
     15                <label for="id_username">{% trans 'Username:' %}</label> <input type="text" name="username" id="id_username" /> 
     16        </div> 
     17        <div class="form-row"> 
     18                <label for="id_password">{% trans 'Password:' %}</label> <input type="password" name="password" id="id_password" /> 
     19                <input type="hidden" name="this_is_the_login_form" value="1" /> 
     20                <input type="hidden" name="post_data" value="{{ post_data }}" /> <span class="help">{% trans 'Have you <a href="/password_reset/">forgotten your password</a>?' %}</span> 
     21        </div> 
     22        <div class="submit-row"> 
     23                <label>&nbsp;</label><input type="submit" value="{% trans 'Log in' %}" /> 
     24        </div> 
    2625</form> 
    2726