From a30f87160f07aba6b7be448e0e52684b5d5ad6a5 Mon Sep 17 00:00:00 2001 From: Wilson Miner Date: Thu, 6 Apr 2006 17:06:10 +0000 Subject: [PATCH] magic-removal: Changed admin templates to load individual stylesheets only when necessary and further modularized css. git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2625 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/media/css/base.css | 4 --- .../contrib/admin/media/css/changelists.css | 12 +++++++++ django/contrib/admin/media/css/dashboard.css | 2 ++ django/contrib/admin/media/css/forms.css | 7 +++-- django/contrib/admin/media/css/global.css | 4 +-- django/contrib/admin/media/css/widgets.css | 9 ------- .../admin/templates/admin/change_form.html | 1 + .../admin/templates/admin/change_list.html | 1 + .../contrib/admin/templates/admin/index.html | 1 + .../contrib/admin/templates/admin/login.html | 27 +++++++++---------- 10 files changed, 37 insertions(+), 31 deletions(-) diff --git a/django/contrib/admin/media/css/base.css b/django/contrib/admin/media/css/base.css index c59ed24782..88f7d9a95a 100644 --- a/django/contrib/admin/media/css/base.css +++ b/django/contrib/admin/media/css/base.css @@ -9,10 +9,6 @@ /* Import other styles */ @import url('global.css'); @import url('layout.css'); -@import url('changelists.css'); -@import url('forms.css'); -@import url('widgets.css'); -@import url('dashboard.css'); /* Import patch for IE 6 Windows */ /*\*/ @import "patch-iewin.css"; /**/ \ No newline at end of file diff --git a/django/contrib/admin/media/css/changelists.css b/django/contrib/admin/media/css/changelists.css index 3a63315b45..2269c9fe20 100644 --- a/django/contrib/admin/media/css/changelists.css +++ b/django/contrib/admin/media/css/changelists.css @@ -1,3 +1,6 @@ +@import url('base.css'); + +/* CHANGELISTS */ #changelist { position:relative; width:100%; } #changelist table { width:100%; } .change-list .filtered table { border-right:1px solid #ddd; } @@ -36,3 +39,12 @@ .change-list ul.toplinks li { float: left; width: 9em; padding:3px 6px; font-weight: bold; list-style-type:none; } .change-list ul.toplinks .date-back a { color:#999; } .change-list ul.toplinks .date-back a:hover { color:#036; } + +/* PAGINATOR */ +.paginator { font-size:11px; padding-top:10px; padding-bottom:10px; line-height:22px; margin:0; border-top:1px solid #ddd; } +.paginator a:link, .paginator a:visited { padding:2px 6px; border:solid 1px #ccc; background:white; text-decoration:none; } +.paginator a.showall { padding:0 !important; border:none !important; } +.paginator a.showall:hover { color:#036 !important; background:transparent !important; } +.paginator .end { border-width:2px !important; margin-right:6px; } +.paginator .this-page { padding:2px 6px; font-weight:bold; font-size:13px; vertical-align:top; } +.paginator a:hover { color:white; background:#5b80b2; border-color:#036; } diff --git a/django/contrib/admin/media/css/dashboard.css b/django/contrib/admin/media/css/dashboard.css index 4fdaf7db41..d27797324b 100644 --- a/django/contrib/admin/media/css/dashboard.css +++ b/django/contrib/admin/media/css/dashboard.css @@ -1,3 +1,5 @@ +@import url('base.css'); + /* DASHBOARD */ .dashboard .module table th { width:100%; } .dashboard .module table td { white-space:nowrap; } diff --git a/django/contrib/admin/media/css/forms.css b/django/contrib/admin/media/css/forms.css index c2ef3f9891..0078718af3 100644 --- a/django/contrib/admin/media/css/forms.css +++ b/django/contrib/admin/media/css/forms.css @@ -1,8 +1,11 @@ +@import url('base.css'); +@import url('widgets.css'); + /* SUBMIT ROW */ -.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; } +.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; } .submit-row input { margin:0 0 0 5px; } .submit-row p { margin-top:0.3em; } -.submit-row .deletelink { background:url(../img/admin/tool-delete.gif) 0 50% no-repeat; padding-left:18px; } +.submit-row .deletelink { background:url(../img/admin/icon_deletelink.gif) 0 50% no-repeat; padding-left:14px; } /* FORM ROWS */ .form-row { overflow:hidden; padding:8px 12px; font-size:11px; border-bottom:1px solid #eee; } diff --git a/django/contrib/admin/media/css/global.css b/django/contrib/admin/media/css/global.css index 318b32a6c9..67e37324e5 100644 --- a/django/contrib/admin/media/css/global.css +++ b/django/contrib/admin/media/css/global.css @@ -1,4 +1,4 @@ -body { margin:0; padding:0; font-family:"Lucida Grande","Bitstream Vera Sans",Verdana,Arial,sans-serif; color:#333; background:#fff; } +body { margin:0; padding:0; font-size:12px; font-family:"Lucida Grande","Bitstream Vera Sans",Verdana,Arial,sans-serif; color:#333; background:#fff; } /* LINKS */ a:link, a:visited { color: #5b80b2; text-decoration:none; } @@ -6,7 +6,7 @@ a:hover { color: #036; } a img { border:none; } /* GLOBAL DEFAULTS */ -p, ol, ul, dl { margin:.2em 0 .8em 0; font-size:12px; } +p, ol, ul, dl { margin:.2em 0 .8em 0; } p { padding:0; line-height:140%; } h1,h2,h3,h4,h5 { font-weight:bold; } diff --git a/django/contrib/admin/media/css/widgets.css b/django/contrib/admin/media/css/widgets.css index 24ac0d9278..367b1d1177 100644 --- a/django/contrib/admin/media/css/widgets.css +++ b/django/contrib/admin/media/css/widgets.css @@ -67,15 +67,6 @@ p.file-upload { line-height:20px; margin:0; padding:0; color:#666; font-size:11p ul.timelist, .timelist li { list-style-type:none; margin:0; padding:0; } .timelist a { padding:2px; } -/* PAGINATOR */ -.paginator { font-size:11px; padding-top:10px; padding-bottom:10px; line-height:22px; margin:0; border-top:1px solid #ddd; } -.paginator a:link, .paginator a:visited { padding:2px 6px; border:solid 1px #ccc; background:white; text-decoration:none; } -.paginator a.showall { padding:0 !important; border:none !important; } -.paginator a.showall:hover { color:#036 !important; background:transparent !important; } -.paginator .end { border-width:2px !important; margin-right:6px; } -.paginator .this-page { padding:2px 6px; font-weight:bold; font-size:13px; vertical-align:top; } -.paginator a:hover { color:white; background:#5b80b2; border-color:#036; } - /* INLINE ORDERER */ ul.orderer { position:relative; padding:0 !important; margin:0 !important; list-style-type:none; } ul.orderer li { list-style-type:none; display:block; padding:0; margin:0; border:1px solid #bbb; border-width:0 1px 1px 0; white-space:nowrap; overflow:hidden; background:#e2e2e2 url(../img/admin/nav-bg-grabber.gif) repeat-y; } diff --git a/django/contrib/admin/templates/admin/change_form.html b/django/contrib/admin/templates/admin/change_form.html index 54bed12627..47cbff821f 100644 --- a/django/contrib/admin/templates/admin/change_form.html +++ b/django/contrib/admin/templates/admin/change_form.html @@ -4,6 +4,7 @@ {% for js in javascript_imports %}{% include_admin_script js %}{% endfor %} {% endblock %} +{% block stylesheet %}{% admin_media_prefix %}css/forms.css{% endblock %} {% block coltype %}{% if ordered_objects %}colMS{% else %}colM{% endif %}{% endblock %} {% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %} {% block userlinks %}{% trans 'Documentation' %} / {% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} diff --git a/django/contrib/admin/templates/admin/change_list.html b/django/contrib/admin/templates/admin/change_list.html index 00a8419482..11ea944b61 100644 --- a/django/contrib/admin/templates/admin/change_list.html +++ b/django/contrib/admin/templates/admin/change_list.html @@ -1,5 +1,6 @@ {% extends "admin/base_site" %} {% load adminmedia admin_list i18n %} +{% block stylesheet %}{% admin_media_prefix %}css/changelists.css{% endblock %} {% block bodyclass %}change-list{% endblock %} {% block userlinks %}{% trans 'Documentation' %} / {% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} {% if not is_popup %}{% block breadcrumbs %}
{% trans "Home" %} › {{ cl.opts.verbose_name_plural|capfirst }}
{% endblock %}{% endif %} diff --git a/django/contrib/admin/templates/admin/index.html b/django/contrib/admin/templates/admin/index.html index ca82a86707..40130c4d59 100644 --- a/django/contrib/admin/templates/admin/index.html +++ b/django/contrib/admin/templates/admin/index.html @@ -1,6 +1,7 @@ {% extends "admin/base_site" %} {% load i18n %} +{% block stylesheet %}{% load adminmedia %}{% admin_media_prefix %}css/dashboard.css{% endblock %} {% block coltype %}colMS{% endblock %} {% block bodyclass %}dashboard{% endblock %} {% block breadcrumbs %}{% endblock %} diff --git a/django/contrib/admin/templates/admin/login.html b/django/contrib/admin/templates/admin/login.html index ea823e1020..66ca4b0372 100644 --- a/django/contrib/admin/templates/admin/login.html +++ b/django/contrib/admin/templates/admin/login.html @@ -1,6 +1,7 @@ {% extends "admin/base_site" %} {% load i18n %} +{% block content_title %}{% endblock %} {% block breadcrumbs %}{% endblock %} {% block content %} @@ -9,20 +10,18 @@

{{ error_message }}

{% endif %}
-
- -

- -

-

- - -{% comment %} {% trans 'Have you forgotten your password?' %}{% endcomment %} -

- -
- -
+ +
+ +
+
+ + + {% trans 'Have you forgotten your password?' %} +
+
+ +