p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

magic-removal: cleaned up edit-inline tabular interface in preparation for new edit-inline interface (thanks for the new CSS/images, Wilson) 

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@1839 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jacob Kaplan-Moss 2006-01-06 22:06:22 +00:00
parent c93965bbef
commit 84b7590ba6
9 changed files with 175 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/contrib/admin/media/css/base.css
View File

@ -1,2 +1,5 @@
@import url(global.css); @import "null?\"\{";
@import url(changelists.css); @import url('global.css');
@import url('changelists.css');
/*\*/ @import "patch-iewin.css"; /**/

243
django/contrib/admin/media/css/global.css
View File

@ -1,7 +1,6 @@
/* /*
DJANGO Admin Global Styles DJANGO Admin Master Styles
by Wilson Miner wilson@lawrence.com by Wilson Miner (wminer@ljworld.com). Copyright 2004-2005 Lawrence Journal-World
Copyright (c) 2005 Lawrence Journal-World
*/ */
body { margin:0; padding:0; font-family:"Lucida Grande","Bitstream Vera Sans",Verdana,Arial,sans-serif; color:#333; } body { margin:0; padding:0; font-family:"Lucida Grande","Bitstream Vera Sans",Verdana,Arial,sans-serif; color:#333; }
@ -11,9 +10,10 @@ a:link, a:visited { color: #5b80b2; text-decoration:none; }
a:hover { color: #036; } a:hover { color: #036; }
a img { border:none; } a img { border:none; }
/* GLOBAL DEFAULTS */ /* GLOBAL DEFAULTS */
p, ol, ul, dl { margin:.2em 0 .8em 0; font-size:12px; } p, ol, ul, dl { margin:.2em 0 .8em 0; font-size:12px; }
p { padding:0; line-height:140%; } p { padding:0; line-height:140%; }
h1,h2,h3,h4,h5 { font-weight:bold; } h1,h2,h3,h4,h5 { font-weight:bold; }
h1 { font-size:18px; color:#666; padding:0 6px 0 0; margin:0 0 .2em 0; } h1 { font-size:18px; color:#666; padding:0 6px 0 0; margin:0 0 .2em 0; }
h2 { font-size:16px; margin:1em 0 .5em 0; } h2 { font-size:16px; margin:1em 0 .5em 0; }
@ -21,6 +21,7 @@ h2.subhead { font-weight:normal;margin-top:0; }
h3 { font-size:14px; margin:.8em 0 .3em 0; color:#666; font-weight:bold; } h3 { font-size:14px; margin:.8em 0 .3em 0; color:#666; font-weight:bold; }
h4 { font-size:12px; margin:1em 0 .8em 0; padding-bottom:3px; } h4 { font-size:12px; margin:1em 0 .8em 0; padding-bottom:3px; }
h5 { font-size:10px; margin:1.5em 0 .5em 0; color:#666; text-transform:uppercase; letter-spacing:1px; } h5 { font-size:10px; margin:1.5em 0 .5em 0; color:#666; text-transform:uppercase; letter-spacing:1px; }
ul li { list-style-type:square; padding:1px 0; } ul li { list-style-type:square; padding:1px 0; }
ul.plainlist { margin-left:0 !important; } ul.plainlist { margin-left:0 !important; }
ul.plainlist li { list-style-type:none; } ul.plainlist li { list-style-type:none; }
@ -28,168 +29,148 @@ li ul { margin-bottom:0; }
li, dt, dd { font-size:11px; line-height:14px; } li, dt, dd { font-size:11px; line-height:14px; }
dt { font-weight:bold; margin-top:4px; } dt { font-weight:bold; margin-top:4px; }
dd { margin-left:0; } dd { margin-left:0; }
form { margin:0; padding:0; } form { margin:0; padding:0; }
fieldset { margin:0; padding:0; } fieldset { margin:0; padding:0; }
blockquote { font-size:11px; color:#777; margin-left:2px; padding-left:10px; border-left:5px solid #ddd; } blockquote { font-size:11px; color:#777; margin-left:2px; padding-left:10px; border-left:5px solid #ddd; }
code, pre { font-family:"Bitstream Vera Sans Mono", Monaco, "Courier New", Courier, monospace; background:inherit; color:#666; font-size:11px; } code, pre { font-family:"Bitstream Vera Sans Mono", Monaco, "Courier New", Courier, monospace; background:inherit; color:#666; font-size:11px; }
pre.literal-block { margin:10px; background:#eee; padding:6px 8px; } pre.literal-block { margin:10px; background:#eee; padding:6px 8px; }
code strong { color:#930; } code strong { color:#930; }
hr { clear:both; color:#eee; background-color:#eee; height:1px; border:none; margin:0; padding:0; font-size:1px; line-height:1px; } hr { clear:both; color:#eee; background-color:#eee; height:1px; border:none; margin:0; padding:0; font-size:1px; line-height:1px; }
div.system-message { background: #ffc; margin: 10px; padding: 6px 8px; font-size: .8em; }
div.system-message p.system-message-title { padding:4px 5px 4px 25px; margin:0; color:red;background:#ffc url(../img/admin/icon_error.gif) 5px .3em no-repeat; }
/* PAGE STRUCTURE */ /* PAGE STRUCTURE */
#container { position:relative; width:100%; min-width:720px; } #container { position:relative; width:100%; min-width:658px; }
#header { text-align:left; min-height:55px; _height:55px; } #header { text-align:left; min-height:55px; }
#content { margin:10px 15px; } #content { margin:10px 15px; }
#content-main { float:left; } #content-main, #content-related { float:left; }
#content-related { float:right; }
#footer { clear:both; padding:10px; } #footer { clear:both; padding:10px; }
/* COLUMN TYPES */ /* COLUMN TYPES */
.colMS, .colM, .colSM, .colM #content-main, .colM #content-main .xfull { width:758px; } /* master site width for fixed-width pages */ .colSM #content-main { float:right; }
.colMS #content-main, .colSM #content-main, .colMS #content-main .xfull, .colSM #content-main .xfull { width:519px; } /* main column width for 2-column pages */ .colSM #content-related { float:left; }
.colMS #content-related, .colSM #content-related, .colSMS #content-related { width:220px; } /* sidebar column width */ .colMS #content-main, .colSM #content-main { width:68%; }
.colSM #content-related { float:left; } .colSM #content-main { float:right; } /* swaps left and right columns */ .colMS #content-related { margin-left:12px; width:30%; }
.colSMS #content-main { width:298px; } .colSM #content-related { margin-right:12px; width:30%; }
.popup .colM { width:95%; }
.popup #content-main, .flex #content-main, .flex .xfull { width:100% !important; } /* main column width for liquid-width pages */
.popup .flex #content-main, .popup .colM #content-main { width:100% !important; }
.subcol { float:left; width:46%; margin-right:15px; }
/* WIDTHS */ /* HEADER */
.x50 { width:50px; }
.x75 { width:75px; }
.x100 { width:100px; }
.x150 { width:150px; }
.x200 { width:200px; }
.x250 { width:250px; }
.x300 { width:300px; }
.x400 { width:400px; }
.x500 { width:500px; }
/* HEADER */
#header { background:#417690; color:#ffc; } #header { background:#417690; color:#ffc; }
#header a:link, #header a:visited { color:white; } #header a:link, #header a:visited { color:white; }
#header a:hover { text-decoration:underline; } #header a:hover { text-decoration:underline; }
#branding { float:left; width:480px; } #branding { float:left; width:480px; }
#branding h1 /* client name */ { padding:8px 0 0 10px; margin:0; font-size:18px; font-weight:normal; color:#f4f379; } #branding h1 { padding:8px 0 0 10px; margin:0; font-size:18px; font-weight:normal; color:#f4f379; }
#branding h2 /* site name */ { font-size:14px; padding:0 0 8px 10px; margin:0; font-weight:normal; color:#ffc; } #branding h2 { font-size:14px; padding:0 0 8px 10px; margin:0; font-weight:normal; color:#ffc; }
#user-tools { font-size:11px; padding:8px 8px 0 5px; text-align:right; } #user-tools { font-size:11px; padding:8px 8px 0 5px; text-align:right; }
/* SIDEBAR */
/* SIDEBAR */
#content-related h3 { font-size:12px; color:#666; margin-bottom:3px; } #content-related h3 { font-size:12px; color:#666; margin-bottom:3px; }
#content-related h4 { font-size:11px; } #content-related h4 { font-size:11px; }
/* TABLES */ /* TABLES */
table { border-collapse:collapse; border-color:#ccc; } table { border-collapse:collapse; border-color:#ccc; }
td, th { font-size:11px; line-height:13px; border-bottom:1px solid #eee; vertical-align:top; padding:5px; font-family:"Lucida Grande", Verdana, Arial, sans-serif; } td, th { font-size:11px; line-height:13px; border-bottom:1px solid #eee; vertical-align:top; padding:5px; font-family:"Lucida Grande", Verdana, Arial, sans-serif; }
th { text-align:left; font-size:12px; } th { text-align:left; font-size:12px; font-weight:bold; }
thead th { font-weight:bold; color:#666; padding:2px 5px; font-size:11px; background:#e1e1e1 url(../img/admin/nav-bg.gif) top left repeat-x; border-left:1px solid #ddd; border-bottom:1px solid #ddd; } thead th, tfoot td { color:#666; padding:2px 5px; font-size:11px; background:#e1e1e1 url(../img/admin/nav-bg.gif) top left repeat-x; border-left:1px solid #ddd; border-bottom:1px solid #ddd; }
thead th:first-child { border-left:none !important; } tfoot td { border-bottom:none; border-top:1px solid #ddd; }
.superwide table th, .superwide table td, .superwide table input, .superwide table select { font-size:10px; } thead th:first-child, tfoot td:first-child { border-left:none !important; }
.module table { border-collapse: collapse; } .module table { border-collapse: collapse; }
thead th.optional { font-weight:normal !important; } thead th.optional { font-weight:normal !important; }
#home-page table.module tr:hover { background:#EDF3FE; }
fieldset table { border-right:1px solid #eee; } fieldset table { border-right:1px solid #eee; }
tr.row-label td { font-size:9px; padding-top:2px; padding-bottom:0; border-bottom:none; color:#666; margin-top:-1px; } tr.row-label td { font-size:9px; padding-top:2px; padding-bottom:0; border-bottom:none; color:#666; margin-top:-1px; }
tr.alt { background:#f6f6f6; } tr.alt { background:#f6f6f6; }
.row1 { background:#EDF3FE; } .row1 { background:#EDF3FE; }
.row2 { background:white; } .row2 { background:white; }
table#change-history { width:100%; }
table#change-history tbody th { width:16em; }
/* TABLE SORTING */ /* SORTABLE TABLES */
thead th a:link, thead th a:visited { color:#666; display:block; } thead th a:link, thead th a:visited { color:#666; display:block; }
table thead th.sorted { background-position:bottom left !important; } table thead th.sorted { background-position:bottom left !important; }
table thead th.sorted a { padding-right:13px; } table thead th.sorted a { padding-right:13px; }
table thead th.ascending a { background:url(../img/admin/arrow-down.gif) right .4em no-repeat; } table thead th.ascending a { background:url(../img/admin/arrow-down.gif) right .4em no-repeat; }
table thead th.descending a { background:url(../img/admin/arrow-up.gif) right .4em no-repeat; } table thead th.descending a { background:url(../img/admin/arrow-up.gif) right .4em no-repeat; }
/* MODULES */ /* ORDERABLE TABLES */
table.orderable tbody tr td:hover { cursor:move; }
table.orderable tbody tr td:first-child { padding-left:14px; background-image:url(../img/admin/nav-bg-grabber.gif); background-repeat:repeat-y; }
table.orderable-initalized .order-cell, body>tr>td.order-cell { display:none; }
/* MODULES */
.module { border:1px solid #ccc; margin-bottom:5px; background:white; } .module { border:1px solid #ccc; margin-bottom:5px; background:white; }
.module p, .module ul, .module h3, .module h4, .module dl, .module pre { padding-left:10px; padding-right:10px; } .module p, .module ul, .module h3, .module h4, .module dl, .module pre { padding-left:10px; padding-right:10px; }
.module blockquote { margin-left:12px; } .module blockquote { margin-left:12px; }
.module ul, .module ol { margin-left:1.5em; } .module ul, .module ol { margin-left:1.5em; }
.module h2, .module caption { margin:0; padding:2px 5px 3px 5px; font-size:11px; text-align:left; background:#7CA0C7 url(../img/admin/default-bg.gif) left top repeat-x; color:white; font-weight:bold; } .module h2, .module caption { margin:0; padding:2px 5px 3px 5px; font-size:11px; text-align:left; font-weight:bold; color:#666; }
.module caption { border:1px solid #ccc; border-bottom:none; } .module caption { border:1px solid #ccc; border-bottom:none; }
.module h2, .module caption { background:#7CA0C7 url(../img/admin/default-bg.gif) top left repeat-x; color:white; }
.module h3 { margin-top:.6em; } .module h3 { margin-top:.6em; }
#content-related .module h2 { background:#eee url(../img/admin/nav-bg.gif) bottom left repeat-x; color:#666; } #content-related .module h2 { background:#eee url(../img/admin/nav-bg.gif) bottom left repeat-x; color:#666; }
#content-main .verbose .actionlist { float:right; font-size:10px; width:17em; position:relative; top:-1.6em; margin:0 8px; }
/* DASHBOARD */ /* RECENT ACTIONS MODULE */
.dashboard .module table th { width:100%; }
.dashboard .module table td { white-space:nowrap; }
.dashboard .module table td a { display:block; padding-right:.6em; }
/* RECENT ACTIONS MODULE */
.module ul.actionlist { margin-left:0; } .module ul.actionlist { margin-left:0; }
ul.actionlist li { list-style-type:none; } ul.actionlist li { list-style-type:none; }
/* FORM DEFAULTS */ /* DASHBOARD */
input, textarea, select { margin:2px 0; padding:2px 3px; vertical-align:middle; border:1px solid #ccc; font-family:"Lucida Grande", Verdana, Arial, sans-serif; font-weight:normal; font-size:11px; } .dashboard #content { max-width:1000px; }
textarea { vertical-align:top !important; } .dashboard .module table { width:100%; }
input[type=checkbox], input[type=radio] { border:none; }
/* FORM BUTTONS */ /* OBJECT HISTORY */
input[type=submit], input[type=button], .submit-row input { background:white url(../img/admin/nav-bg.gif) bottom repeat-x; padding:3px; } table#change-history { width:100%; }
table#change-history tbody th { width:16em; }
/* FORM DEFAULTS */
input, textarea, select { margin:2px 0; padding:2px 3px; vertical-align:middle; font-family:"Lucida Grande", Verdana, Arial, sans-serif; font-weight:normal; font-size:11px; }
textarea { vertical-align:top !important; }
input[type=text], input[type=password], textarea, select, .vTextField { border:1px solid #ccc; }
/* FORM BUTTONS */
input[type=submit], input[type=button], .submit-row input { border:1px solid #ccc; background:white url(../img/admin/nav-bg.gif) bottom repeat-x; }
input[type=submit]:active, input[type=button]:active { background-image:url(../img/admin/nav-bg-reverse.gif); background-position:top; } input[type=submit]:active, input[type=button]:active { background-image:url(../img/admin/nav-bg-reverse.gif); background-position:top; }
input[type=submit].default, .submit-row input.default { border:2px solid #5b80b2; background:#7CA0C7 url(../img/admin/default-bg.gif) bottom repeat-x; font-weight:bold; color:white; } input[type=submit].default, .submit-row input.default { border:2px solid #5b80b2; padding:3px; background:white url(../img/admin/default-bg.gif) bottom repeat-x; font-weight:bold; color:white; }
input[type=submit].default:active { background-image:url(../img/admin/default-bg-reverse.gif); background-position:top; } input[type=submit].default:active { background-image:url(../img/admin/default-bg-reverse.gif); background-position:top; }
.submit-row { padding:5px 7px; text-align:right; background:#ffc; border:1px solid #ccc; margin:5px 0; } .submit-row { padding:5px 7px; text-align:right; background:#ffc; border:1px solid #ccc; margin:5px 0; }
.submit-row input { margin:0 0 0 5px; } .submit-row input { margin:0 0 0 5px; }
.submit-row .float-left { padding-top:.1em; }
/* ACTIONS */ /* FORM ROWS */
.actions { border-bottom:1px solid #eee; text-align:right; } .form-row { overflow:hidden; padding:8px 12px; font-size:11px; border-bottom:1px solid #eee; }
.collection { border-top: 1ex solid #7CA0C7; }
/* FORM ROWS */
.form-row { clear:both; padding:8px 12px; font-size:11px; }
html>body .form-row { border-bottom:1px solid #eee; }
.form-row:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
.form-row img, .form-row input { vertical-align:middle; } .form-row img, .form-row input { vertical-align:middle; }
form .form-row p { padding-left:0; font-size:11px; } form .form-row p { padding-left:0; font-size:11px; }
/* FORM LABELS */ /* FORM LABELS */
form h4 { margin:0 !important; padding:0 !important; border:none !important; } form h4 { margin:0 !important; padding:0 !important; border:none !important; }
label { font-weight:normal !important; color:#666; font-size:12px; } label { font-weight:normal !important; color:#666; font-size:12px; }
label.inline { margin-left:20px; } label.inline { margin-left:20px; }
.required label, label.required { font-weight:bold !important; color:#333 !important; } .required label, label.required { font-weight:bold !important; color:#333 !important; }
/* RADIO BUTTONS */ /* RADIO BUTTONS */
form ul.radiolist li { list-style-type:none; } form ul.radiolist li { list-style-type:none; }
form ul.radiolist label { float:none; display:inline; } form ul.radiolist label { float:none; display:inline; }
form ul.inline { margin-left:0; padding:0; } form ul.inline { margin-left:0; padding:0; }
form ul.inline li { float:left; padding-right:7px; } form ul.inline li { float:left; padding-right:7px; }
/* ALIGNED FIELDSETS */ /* ALIGNED FIELDSETS */
.aligned label { display:block; padding:0 1em 3px 0; float:left; text-align:left; width:8em; } .aligned label { display:block; padding:0 1em 3px 0; float:left; width:8em; }
.aligned label.inline { display:inline; float:none; } .aligned label.inline { display:inline; float:none; }
.colMS .aligned .vLargeTextField, .colMS .aligned .vXMLLargeTextField { width:350px; } .colMS .aligned .vLargeTextField, .colMS .aligned .vXMLLargeTextField { width:350px; }
form .aligned p, form .aligned ul { margin-left:7em; padding-left:30px; } form .aligned p, form .aligned ul { margin-left:7em; padding-left:30px; }
form .aligned table p { margin-left:0; padding-left:0; } form .aligned table p { margin-left:0; padding-left:0; }
form .aligned p.help { padding-left:38px; } form .aligned p.help { padding-left:38px; }
.aligned .vCheckboxLabel { float:none !important; display:inline; } .aligned .vCheckboxLabel { float:none !important; display:inline; padding-left:4px; }
.colM .aligned .vLargeTextField, colM .aligned .vXMLLargeTextField { width:610px; } .colM .aligned .vLargeTextField, colM .aligned .vXMLLargeTextField { width:610px; }
.checkbox-row p.help { margin-left:0; padding-left:0 !important; } .checkbox-row p.help { margin-left:0; padding-left:0 !important; }
/* WIDE FIELDSETS */ /* WIDE FIELDSETS */
.wide label { width:15em !important; } .wide label { width:15em !important; }
form .wide p { margin-left:15em; } form .wide p { margin-left:15em; }
form .wide p.help { padding-left:38px; } form .wide p.help { padding-left:38px; }
.colM fieldset.wide .vLargeTextField, .colM fieldset.wide .vXMLLargeTextField { width:450px; } .colM fieldset.wide .vLargeTextField, .colM fieldset.wide .vXMLLargeTextField { width:450px; }
/* COLLAPSED FIELDSETS */ /* COLLAPSED FIELDSETS */
fieldset.collapsed * { display:none; } fieldset.collapsed * { display:none; }
fieldset.collapsed h2, fieldset.collapsed { display:block !important; } fieldset.collapsed h2, fieldset.collapsed .collapse-toggle { display:block !important; }
fieldset.collapsed .collapse-toggle { display: inline !important; } fieldset.collapsed h2 { background-image:url(../img/admin/nav-bg.gif); background-position:bottom left; color:#999; }
fieldset.collapse h2 a.collapse-toggle { color:#ffc; } fieldset.collapsed .collapse-toggle { padding:3px 5px !important; background:#efefef; }
fieldset.collapse h2 a.collapse-toggle:hover { text-decoration:underline; } fieldset.collapsed .collapse-toggle a { display:inline !important; }
.hidden { display:none; }
/* MESSAGES & ERRORS */ /* MESSAGES & ERRORS */
ul.messagelist { padding:0 0 5px 0; margin:0; } ul.messagelist { padding:0 0 5px 0; margin:0; }
ul.messagelist li { font-size:12px; display:block; padding:4px 5px 4px 25px; margin:0 0 3px 0; border-bottom:1px solid #ddd; color:#666; background:#ffc url(../img/admin/icon_success.gif) 5px .3em no-repeat; } ul.messagelist li { font-size:12px; display:block; padding:4px 5px 4px 25px; margin:0 0 3px 0; border-bottom:1px solid #ddd; color:#666; background:#ffc url(../img/admin/icon_success.gif) 5px .3em no-repeat; }
.errornote { font-size:12px !important; display:block; padding:4px 5px 4px 25px; margin:0 0 3px 0; border:1px solid red; color:red;background:#ffc url(../img/admin/icon_error.gif) 5px .3em no-repeat; } .errornote { font-size:12px !important; display:block; padding:4px 5px 4px 25px; margin:0 0 3px 0; border:1px solid red; color:red;background:#ffc url(../img/admin/icon_error.gif) 5px .3em no-repeat; }
@ -200,16 +181,16 @@ td ul.errorlist li { margin:0 !important; }
.error { background:#ffc; } .error { background:#ffc; }
.error input, .error select { border:1px solid red; } .error input, .error select { border:1px solid red; }
/* ACTION ICONS */ /* ACTION ICONS */
.addlink { padding-left:12px; background:url(../img/admin/icon_addlink.gif) 0 .2em no-repeat; } .addlink { padding-left:12px; background:url(../img/admin/icon_addlink.gif) 0 .2em no-repeat; }
.changelink { padding-left:12px; background:url(../img/admin/icon_changelink.gif) 0 .2em no-repeat; } .changelink { padding-left:12px; background:url(../img/admin/icon_changelink.gif) 0 .2em no-repeat; }
.deletelink { padding-left:12px; background:url(../img/admin/icon_deletelink.gif) 0 .2em no-repeat; } .deletelink { padding-left:12px; background:url(../img/admin/icon_deletelink.gif) 0 .25em no-repeat; }
a.deletelink:link, a.deletelink:visited { color:#CC3434; } a.deletelink:link, a.deletelink:visited { color:#CC3434; }
a.deletelink:hover { color:#993333; } a.deletelink:hover { color:#993333; }
/* OBJECT TOOLS */ /* OBJECT TOOLS */
.object-tools { font-size:10px; font-weight:bold; font-family:Arial,Helvetica,sans-serif; padding-left:0; margin-bottom:5px; float:right; position:relative; margin-top:-2.4em; margin-bottom:-2em; } .object-tools { font-size:10px; font-weight:bold; font-family:Arial,Helvetica,sans-serif; padding-left:0; float:right; position:relative; margin-top:-2.4em; margin-bottom:-2em; }
.form-row .object-tools { margin-top:0; margin-bottom:0; } .form-row .object-tools { margin-top:5px; margin-bottom:5px; float:none; height:2em; padding-left:3.5em; }
.object-tools li { display:block; float:left; background:url(../img/admin/tool-left.gif) 0 0 no-repeat; padding:0 0 0 8px; margin-left:2px; height:16px; } .object-tools li { display:block; float:left; background:url(../img/admin/tool-left.gif) 0 0 no-repeat; padding:0 0 0 8px; margin-left:2px; height:16px; }
.object-tools li:hover { background:url(../img/admin/tool-left_over.gif) 0 0 no-repeat; } .object-tools li:hover { background:url(../img/admin/tool-left_over.gif) 0 0 no-repeat; }
.object-tools a:link, .object-tools a:visited { display:block; float:left; color:white; padding:.1em 14px .1em 8px; height:14px; background:#999 url(../img/admin/tool-right.gif) 100% 0 no-repeat; } .object-tools a:link, .object-tools a:visited { display:block; float:left; color:white; padding:.1em 14px .1em 8px; height:14px; background:#999 url(../img/admin/tool-right.gif) 100% 0 no-repeat; }
@ -219,24 +200,19 @@ a.deletelink:hover { color:#993333; }
.object-tools a.addlink { background:#999 url(../img/admin/tooltag-add.gif) top right no-repeat; padding-right:28px; } .object-tools a.addlink { background:#999 url(../img/admin/tooltag-add.gif) top right no-repeat; padding-right:28px; }
.object-tools a.addlink:hover { background:#5b80b2 url(../img/admin/tooltag-add_over.gif) top right no-repeat; } .object-tools a.addlink:hover { background:#5b80b2 url(../img/admin/tooltag-add_over.gif) top right no-repeat; }
/* INLINE CONTROLS */ /* BREADCRUMBS */
#inline-controls { font-weight:bold; font-size:12px; }
#inline-specific-controls { margin-left:6px; padding:0 8px; border-left:6px solid #ccc; }
/* BREADCRUMBS */
p.breadcrumbs { font-size:11px; color:#ccc;text-align:left; } /* old breadcrumbs style */
div.breadcrumbs { background:white url(../img/admin/nav-bg-reverse.gif) 0 -10px repeat-x; padding:2px 8px 3px 8px; font-size:11px; color:#999; border-top:1px solid white; border-bottom:1px solid #ccc; text-align:left; } div.breadcrumbs { background:white url(../img/admin/nav-bg-reverse.gif) 0 -10px repeat-x; padding:2px 8px 3px 8px; font-size:11px; color:#999; border-top:1px solid white; border-bottom:1px solid #ccc; text-align:left; }
/* SELECTOR (FILTER INTERFACE) */ /* SELECTOR (FILTER INTERFACE) */
.selector { width:580px; float:left; } .selector { width:580px; float:left; }
.selector select { width:270px; height:170px; } .selector select { width:270px; height:17.2em; }
.selector-available, .selector-chosen { float:left; width:270px; text-align:center; margin-bottom:5px; } .selector-available, .selector-chosen { float:left; width:270px; text-align:center; margin-bottom:5px; }
.selector-available h2, .selector-chosen h2 { border:1px solid #ccc; } .selector-available h2, .selector-chosen h2 { border:1px solid #ccc; }
.selector .selector-available h2 { background:white url(../img/admin/nav-bg.gif) bottom left repeat-x; color:#666; } .selector .selector-available h2 { background:white url(../img/admin/nav-bg.gif) bottom left repeat-x; color:#666; }
.selector .selector-filter { background:white; border:1px solid #ccc; border-width:0 1px; padding:3px; color:#999; font-size:10px; margin:0; text-align:left; } .selector .selector-filter { background:white; border:1px solid #ccc; border-width:0 1px; padding:3px; color:#999; font-size:10px; margin:0; text-align:left; }
.selector .selector-chosen .selector-filter { padding:4px 5px; } .selector .selector-chosen .selector-filter { padding:4px 5px; }
.selector .selector-available input { width:230px; } .selector .selector-available input { width:230px; }
.selector ul.selector-chooser { float:left; width:22px; height:50px; background:url(../img/admin/chooser-bg.gif) top center no-repeat; margin:13% 3px 0 3px; padding:0; } .selector ul.selector-chooser { float:left; width:22px; height:50px; background:url(../img/admin/chooser-bg.gif) top center no-repeat; margin:8em 3px 0 3px; padding:0; }
.selector-chooser li { margin:0; padding:3px; list-style-type:none; } .selector-chooser li { margin:0; padding:3px; list-style-type:none; }
.selector select { margin-bottom:5px; margin-top:0; } .selector select { margin-bottom:5px; margin-top:0; }
.selector-add, .selector-remove { width:16px; height:16px; display:block; text-indent:-3000px; } .selector-add, .selector-remove { width:16px; height:16px; display:block; text-indent:-3000px; }
@ -247,9 +223,9 @@ a.selector-chooseall:hover, a.selector-clearall:hover { color:#036; }
a.selector-chooseall { width:7em; background:url(../img/admin/selector-addall.gif) left center no-repeat; } a.selector-chooseall { width:7em; background:url(../img/admin/selector-addall.gif) left center no-repeat; }
a.selector-clearall { background:url(../img/admin/selector-removeall.gif) left center no-repeat; } a.selector-clearall { background:url(../img/admin/selector-removeall.gif) left center no-repeat; }
/* Stacked selectors for long items */ /* STACKED SELECTORS */
.stacked { float:left; width:500px; } .stacked { float:left; width:500px; }
.stacked select { width:480px; height:100px; } .stacked select { width:480px; height:10.1em; }
.stacked .selector-available, .stacked .selector-chosen { width:480px; } .stacked .selector-available, .stacked .selector-chosen { width:480px; }
.stacked .selector-available { margin-bottom:0; } .stacked .selector-available { margin-bottom:0; }
.stacked .selector-available input { width:442px; } .stacked .selector-available input { width:442px; }
@ -259,20 +235,20 @@ a.selector-clearall { background:url(../img/admin/selector-removeall.gif) left c
.stacked .selector-add { background-image:url(../img/admin/selector_stacked-add.gif); } .stacked .selector-add { background-image:url(../img/admin/selector_stacked-add.gif); }
.stacked .selector-remove { background-image:url(../img/admin/selector_stacked-remove.gif); } .stacked .selector-remove { background-image:url(../img/admin/selector_stacked-remove.gif); }
/* DATE AND TIME */ /* DATE AND TIME */
p.datetime { line-height:20px; margin:0; padding:0; color:#666; font-size:11px; font-weight:bold; } p.datetime { line-height:20px; margin:0; padding:0; color:#666; font-size:11px; font-weight:bold; }
.datetime span { font-size:11px; font-weight:normal; color:#ccc; white-space:nowrap; } .datetime span { font-size:11px; color:#ccc; font-weight:normal; white-space:nowrap; }
.vDateField { margin-left:4px; } .vDateField { margin-left:4px; }
table p.datetime { font-size:10px; margin-left:0; padding-left:0; } table p.datetime { font-size:10px; margin-left:0; padding-left:0; }
/* FILE UPLOADS */ /* FILE UPLOADS */
p.file-upload { line-height:20px; margin:0; padding:0; color:#666; font-size:11px; font-weight:bold; } p.file-upload { line-height:20px; margin:0; padding:0; color:#666; font-size:11px; font-weight:bold; }
.file-upload a { font-weight:normal; } .file-upload a { font-weight:normal; }
.file-upload .deletelink { margin-left:5px; } .file-upload .deletelink { margin-left:5px; }
/* CALENDARS & CLOCKS */ /* CALENDARS & CLOCKS */
.calendarbox, .clockbox { margin:5px auto; font-size:11px; width: 16em; text-align: center; background:white; position:relative; } .calendarbox, .clockbox { margin:5px auto; width: 10em; text-align: center; background:white; position:relative; }
.clockbox { width:9em; } .clockbox { width:6em; }
.calendar { margin:0; padding: 0; } .calendar { margin:0; padding: 0; }
.calendar table { margin: 0; padding: 0; border-collapse:collapse; background:white; width:99%; } .calendar table { margin: 0; padding: 0; border-collapse:collapse; background:white; width:99%; }
.calendar caption, .calendarbox h2 { margin: 0; font-size:11px; text-align:center; border-top:none; } .calendar caption, .calendarbox h2 { margin: 0; font-size:11px; text-align:center; border-top:none; }
@ -296,13 +272,7 @@ 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; } ul.timelist, .timelist li { list-style-type:none; margin:0; padding:0; }
.timelist a { padding:2px; } .timelist a { padding:2px; }
/* ORDERING WIDGET */ /* PAGINATOR */
ul#orderthese { padding:0; margin:0; list-style-type:none; }
ul#orderthese li { list-style-type:none; display:block; padding:0; margin:6px 0; width:214px; background:#f6f6f6; white-space:nowrap; overflow:hidden; }
ul#orderthese li span { display:block; border:1px solid #e7e7e7; background:transparent url(../img/admin/nav-bg-grabber.gif) top left repeat-y; font-size:10px !important; padding:4px 6px 4px 12px; }
ul#orderthese span:hover { background-color:#efefef; }
/* PAGINATOR */
.paginator { font-size:11px; padding-top:10px; padding-bottom:10px; line-height:22px; margin:0; border-top:1px solid #ddd; } .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: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 { padding:0 !important; border:none !important; }
@ -311,7 +281,40 @@ ul#orderthese span:hover { background-color:#efefef; }
.paginator .this-page { padding:2px 6px; font-weight:bold; font-size:13px; vertical-align:top; } .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; } .paginator a:hover { color:white; background:#5b80b2; border-color:#036; }
/* TEXT STYLES & MODIFIERS */ /* 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; }
ul.orderer li:hover { cursor:move; background-color:#ddd; }
ul.orderer li a.selector { margin-left:12px; overflow:hidden; width:83%; font-size:10px !important; padding:0.6em 0; }
ul.orderer li a:link, ul.orderer li a:visited { color:#333; }
ul.orderer li .inline-deletelink { position:absolute; right:4px; margin-top:0.6em; }
ul.orderer li.selected { background-color:#f8f8f8; border-right-color:#f8f8f8; }
ul.orderer li.deleted { background:#bbb url(../img/admin/deleted-overlay.gif); }
ul.orderer li.deleted a:link, ul.orderer li.deleted a:visited { color:#888; }
ul.orderer li.deleted .inline-deletelink { background-image:url(../img/admin/inline-restore.png); }
ul.orderer li.deleted:hover, ul.orderer li.deleted a.selector:hover { cursor:default; }
/* EDIT INLINE */
.inline-deletelink { display:block; text-indent:-9999px; background:transparent url(../img/admin/inline-delete.png) no-repeat; width:15px; height:15px; margin:0.4em 0; border: 0px none; }
.inline-deletelink:hover { background-position:-15px 0; cursor:pointer; }
.editinline button.addlink { border: 0px none; color: #5b80b2; font-size: 100%; cursor: pointer; }
.editinline button.addlink:hover { color: #036; cursor: pointer; }
.editinline table .help { text-align:right; float:right; padding-left:2em; }
.editinline tfoot .addlink { white-space:nowrap; }
.editinline table thead th:last-child { border-left:none; }
.editinline tr.deleted { background:#ddd url(../img/admin/deleted-overlay.gif); }
.editinline tr.deleted .inline-deletelink { background-image:url(../img/admin/inline-restore.png); }
.editinline tr.deleted td:hover { cursor:default; }
.editinline tr.deleted td:first-child { background-image:none !important; }
/* STACKED */
.editinline-stacked { min-width:758px; }
.editinline-stacked .inline-object { margin-left:210px; background:white; }
.editinline-stacked .inline-source { float:left; width:200px; background:#f8f8f8; }
.editinline-stacked .inline-splitter { float:left; width:9px; background:#f8f8f8 url(../img/admin/inline-splitter-bg.gif) 50% 50% no-repeat; border-right:1px solid #ccc; }
.editinline-stacked .controls { clear:both; background:#e1e1e1 url(../img/admin/nav-bg.gif) top left repeat-x; padding:3px 4px; font-size:11px; border-top:1px solid #ddd; }
/* TEXT STYLES & MODIFIERS */
.small { font-size:11px; } .small { font-size:11px; }
.tiny { font-size:10px; } .tiny { font-size:10px; }
p.tiny { margin-top:-2px; } p.tiny { margin-top:-2px; }
@ -329,13 +332,11 @@ p img, h1 img, h2 img, h3 img, h4 img, td img { vertical-align:middle; }
.example { margin:10px 0; padding:5px 10px; background:#efefef; } .example { margin:10px 0; padding:5px 10px; background:#efefef; }
.nowrap { white-space:nowrap; } .nowrap { white-space:nowrap; }
/* CUSTOM FORM FIELDS */ /* CUSTOM FORM FIELDS */
.vSelectMultipleField { vertical-align:top !important; } .vSelectMultipleField { vertical-align:top !important; }
.vCheckboxField { border:none; } .vCheckboxField { border:none; }
.vDateField, .vTimeField { margin-right:2px; } .vDateField, .vTimeField { margin-right:2px; }
.vFileUploadField { border:none; } .vURLField { width:30em; }
.vURLField { width:380px; } .vLargeTextField, .vXMLLargeTextField { width:48em; }
.vLargeTextField, .vXMLLargeTextField { width:480px; } .flatpages-flatpage #id_content { height:40.2em; }
.colM .vLargeTextField, .colM .vXMLLargeTextField { width:720px; } .module table .vPositiveSmallIntegerField { width:2.2em; }
body.core-flatfile #id_content { height: 400px; }
.module table .vPositiveSmallIntegerField { width: 22px; }

BIN
django/contrib/admin/media/img/admin/deleted-overlay.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 45 B

BIN
django/contrib/admin/media/img/admin/inline-delete-8bit.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 477 B

BIN
django/contrib/admin/media/img/admin/inline-delete.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 781 B

BIN
django/contrib/admin/media/img/admin/inline-restore-8bit.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 447 B

BIN
django/contrib/admin/media/img/admin/inline-restore.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 623 B

BIN
django/contrib/admin/media/img/admin/inline-splitter-bg.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 102 B

49
django/contrib/admin/templates/admin/edit_inline_tabular.html
View File

@ -1,4 +1,50 @@
{% load admin_modify %} {% load admin_modify %}
<fieldset class="module editinline">
<h2>{{ bound_related_object.relation.opts.verbose_name_plural|capfirst }}</h2>
<table>
<thead>
<tr>
{% for fw in bound_related_object.field_wrapper_list %}
{% if fw.needs_header %}
<th{{ fw.header_class_attribute }}>{{ fw.field.verbose_name|capfirst }}</th>
{% endif %}
{% endfor %}
<th>&nbsp;</th>
</tr>
</thead>
<tfoot>
<tr>
<td colspan='{{ num_headers }}'>
<button class="addlink" name="command" value="{{ bound_related_object.relation.var_name }}.add">
Add another {{ bound_related_object.relation.opts.verbose_name }}
</button>
</td>
</tr>
</tfoot>
<tbody>
{% for fcw in bound_related_object.form_field_collection_wrappers %}
<tr class="{% cycle row1,row2 %}{% if fcw.obj.errors %} error{% endif %}">
{% for bound_field in fcw.bound_fields %}
{% if not bound_field.hidden %}
<td {{ bound_field.cell_class_attribute }}>
{{ bound_field.html_error_list }}
{% field_widget bound_field %}
</td>
{% endif %}
{% endfor %}
<td class="controls" >
<button class="inline-deletelink" name="command" value="{{ bound_related_object.relation.var_name }}.{{ fcw.index }}.delete">
Delete {{ bound_related_object.relation.opts.verbose_name }}
</button>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</fieldset>
<!--
<fieldset class="module"> <fieldset class="module">
<h2>{{ bound_related_object.relation.opts.verbose_name_plural|capfirst }}</h2><table> <h2>{{ bound_related_object.relation.opts.verbose_name_plural|capfirst }}</h2><table>
<thead><tr> <thead><tr>
@ -12,7 +58,7 @@
{% for fcw in bound_related_object.form_field_collection_wrappers %} {% for fcw in bound_related_object.form_field_collection_wrappers %}
{% if change %}{% if original_row_needed %} {% if change %}{% if original_row_needed %}
{% if fcw.obj.original %} {% if fcw.obj.original %}
<tr class="row-label {% cycle row1,row2 %}"><td colspan="{{ num_headers }}"><strong>{{ fcw.obj.original }}</strong></tr> <tr class="row-label {% cycle row1,row2 %}"><td colspan="{{ num_headers }}"></tr>
{% endif %} {% endif %}
{% endif %}{% endif %} {% endif %}{% endif %}
{% if fcw.obj.errors %} {% if fcw.obj.errors %}
@ -48,3 +94,4 @@
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
</fieldset> </fieldset>
-->