admin

noreply Thu, 06 Apr 2006 10:06:21 -0700

Author: wilson
Date: 2006-04-06 12:06:10 -0500 (Thu, 06 Apr 2006)
New Revision: 2625


Modified:
   django/branches/magic-removal/django/contrib/admin/media/css/base.css
   django/branches/magic-removal/django/contrib/admin/media/css/changelists.css
   django/branches/magic-removal/django/contrib/admin/media/css/dashboard.css
   django/branches/magic-removal/django/contrib/admin/media/css/forms.css
   django/branches/magic-removal/django/contrib/admin/media/css/global.css
   django/branches/magic-removal/django/contrib/admin/media/css/widgets.css
   
django/branches/magic-removal/django/contrib/admin/templates/admin/change_form.html
   
django/branches/magic-removal/django/contrib/admin/templates/admin/change_list.html
   django/branches/magic-removal/django/contrib/admin/templates/admin/index.html
   django/branches/magic-removal/django/contrib/admin/templates/admin/login.html
Log:
magic-removal: Changed admin templates to load individual stylesheets only when 
necessary and further modularized css.


Modified: django/branches/magic-removal/django/contrib/admin/media/css/base.css
===================================================================
--- django/branches/magic-removal/django/contrib/admin/media/css/base.css       
2006-04-06 14:20:11 UTC (rev 2624)
+++ django/branches/magic-removal/django/contrib/admin/media/css/base.css       
2006-04-06 17:06:10 UTC (rev 2625)
@@ -9,10 +9,6 @@
 /* Import other styles */
 @import url('global.css');
 @import url('layout.css');
[EMAIL PROTECTED] url('changelists.css');
[EMAIL PROTECTED] url('forms.css');
[EMAIL PROTECTED] url('widgets.css');
[EMAIL PROTECTED] url('dashboard.css');
 
 /* Import patch for IE 6 Windows */
 /*\*/ @import "patch-iewin.css"; /**/
\ No newline at end of file

Modified: 
django/branches/magic-removal/django/contrib/admin/media/css/changelists.css
===================================================================
--- 
django/branches/magic-removal/django/contrib/admin/media/css/changelists.css    
    2006-04-06 14:20:11 UTC (rev 2624)
+++ 
django/branches/magic-removal/django/contrib/admin/media/css/changelists.css    
    2006-04-06 17:06:10 UTC (rev 2625)
@@ -1,3 +1,6 @@
[EMAIL PROTECTED] 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; }

Modified: 
django/branches/magic-removal/django/contrib/admin/media/css/dashboard.css
===================================================================
--- django/branches/magic-removal/django/contrib/admin/media/css/dashboard.css  
2006-04-06 14:20:11 UTC (rev 2624)
+++ django/branches/magic-removal/django/contrib/admin/media/css/dashboard.css  
2006-04-06 17:06:10 UTC (rev 2625)
@@ -1,3 +1,5 @@
[EMAIL PROTECTED] url('base.css');
+
 /* DASHBOARD */
 .dashboard .module table th { width:100%; }
 .dashboard .module table td { white-space:nowrap; }

Modified: django/branches/magic-removal/django/contrib/admin/media/css/forms.css
===================================================================
--- django/branches/magic-removal/django/contrib/admin/media/css/forms.css      
2006-04-06 14:20:11 UTC (rev 2624)
+++ django/branches/magic-removal/django/contrib/admin/media/css/forms.css      
2006-04-06 17:06:10 UTC (rev 2625)
@@ -1,8 +1,11 @@
[EMAIL PROTECTED] url('base.css');
[EMAIL PROTECTED] 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; }

Modified: 
django/branches/magic-removal/django/contrib/admin/media/css/global.css
===================================================================
--- django/branches/magic-removal/django/contrib/admin/media/css/global.css     
2006-04-06 14:20:11 UTC (rev 2624)
+++ django/branches/magic-removal/django/contrib/admin/media/css/global.css     
2006-04-06 17:06:10 UTC (rev 2625)
@@ -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 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; }

Modified: 
django/branches/magic-removal/django/contrib/admin/media/css/widgets.css
===================================================================
--- django/branches/magic-removal/django/contrib/admin/media/css/widgets.css    
2006-04-06 14:20:11 UTC (rev 2624)
+++ django/branches/magic-removal/django/contrib/admin/media/css/widgets.css    
2006-04-06 17:06:10 UTC (rev 2625)
@@ -67,15 +67,6 @@
 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; }

Modified: 
django/branches/magic-removal/django/contrib/admin/templates/admin/change_form.html
===================================================================
--- 
django/branches/magic-removal/django/contrib/admin/templates/admin/change_form.html
 2006-04-06 14:20:11 UTC (rev 2624)
+++ 
django/branches/magic-removal/django/contrib/admin/templates/admin/change_form.html
 2006-04-06 17:06:10 UTC (rev 2625)
@@ -4,6 +4,7 @@
 <script type="text/javascript" src="../../../jsi18n/"></script>
 {% 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 %}<a href="../../../doc/">{% trans 'Documentation' %}</a> / 
<a href="../../../password_change/">{% trans 'Change password' %}</a> / <a 
href="../../../logout/">{% trans 'Log out' %}</a>{% endblock %}

Modified: 
django/branches/magic-removal/django/contrib/admin/templates/admin/change_list.html
===================================================================
--- 
django/branches/magic-removal/django/contrib/admin/templates/admin/change_list.html
 2006-04-06 14:20:11 UTC (rev 2624)
+++ 
django/branches/magic-removal/django/contrib/admin/templates/admin/change_list.html
 2006-04-06 17:06:10 UTC (rev 2625)
@@ -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 %}<a href="../../doc/">{% trans 'Documentation' %}</a> / <a 
href="../../password_change/">{% trans 'Change password' %}</a> / <a 
href="../../logout/">{% trans 'Log out' %}</a>{% endblock %}
 {% if not is_popup %}{% block breadcrumbs %}<div class="breadcrumbs"><a 
href="../../">{% trans "Home" %}</a> &rsaquo; {{ 
cl.opts.verbose_name_plural|capfirst }}</div>{% endblock %}{% endif %}

Modified: 
django/branches/magic-removal/django/contrib/admin/templates/admin/index.html
===================================================================
--- 
django/branches/magic-removal/django/contrib/admin/templates/admin/index.html   
    2006-04-06 14:20:11 UTC (rev 2624)
+++ 
django/branches/magic-removal/django/contrib/admin/templates/admin/index.html   
    2006-04-06 17:06:10 UTC (rev 2625)
@@ -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 %}

Modified: 
django/branches/magic-removal/django/contrib/admin/templates/admin/login.html
===================================================================
--- 
django/branches/magic-removal/django/contrib/admin/templates/admin/login.html   
    2006-04-06 14:20:11 UTC (rev 2624)
+++ 
django/branches/magic-removal/django/contrib/admin/templates/admin/login.html   
    2006-04-06 17:06:10 UTC (rev 2625)
@@ -1,6 +1,7 @@
 {% extends "admin/base_site" %}
 {% load i18n %}
 
+{% block content_title %}{% endblock %}
 {% block breadcrumbs %}{% endblock %}
 
 {% block content %}
@@ -9,20 +10,18 @@
 <p class="errornote">{{ error_message }}</p>
 {% endif %}
 <div id="content-main">
-<form action="{{ app_path }}" method="post">
-
-<p class="aligned">
-<label for="id_username">{% trans 'Username:' %}</label> <input type="text" 
name="username" id="id_username" />
-</p>
-<p class="aligned">
-<label for="id_password">{% trans 'Password:' %}</label> <input 
type="password" name="password" id="id_password" />
-<input type="hidden" name="this_is_the_login_form" value="1" />
-<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 %}
-</p>
-
-<div class="aligned ">
-<label>&nbsp;</label><input type="submit" value="{% trans 'Log in' %}" />
-</div>
+<form action="{{ app_path }}" method="post" id="login-form">
+       <div class="form-row">
+               <label for="id_username">{% trans 'Username:' %}</label> <input 
type="text" name="username" id="id_username" />
+       </div>
+       <div class="form-row">
+               <label for="id_password">{% trans 'Password:' %}</label> <input 
type="password" name="password" id="id_password" />
+               <input type="hidden" name="this_is_the_login_form" value="1" />
+               <input type="hidden" name="post_data" value="{{ post_data }}" 
/> <span class="help">{% trans 'Have you <a href="/password_reset/">forgotten 
your password</a>?' %}</span>
+       </div>
+       <div class="submit-row">
+               <label>&nbsp;</label><input type="submit" value="{% trans 'Log 
in' %}" />
+       </div>
 </form>
 
 <script type="text/javascript">


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates
-~----------~----~----~----~------~----~------~--~---

[Changeset] r2625 - in django/branches/magic-removal/django/contrib/admin: media/css templates/admin

Reply via email to