Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Removed example.com from default admin templates. One less thing to c…

…hange in setup.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2117 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 683c757c54bd6c5f35f43c5737b766a2c1885742 1 parent a07b704
Wilson Miner authored
View
17 django/contrib/admin/media/css/global.css
@@ -40,7 +40,7 @@ div.system-message p.system-message-title { padding:4px 5px 4px 25px; margin:0;
/* PAGE STRUCTURE */
#container { position:relative; width:100%; min-width:720px; }
-#header { text-align:left; min-height:55px; _height:55px; }
+#header { text-align:left; }
#content { margin:10px 15px; }
#content-main { float:left; }
#content-related { float:right; }
@@ -57,7 +57,7 @@ div.system-message p.system-message-title { padding:4px 5px 4px 25px; margin:0;
.popup .flex #content-main, .popup .colM #content-main { width:100% !important; }
.subcol { float:left; width:46%; margin-right:15px; }
-/* WIDTHS */
+/* WIDTHS - DEPRECATED */
.x50 { width:50px; }
.x75 { width:75px; }
.x100 { width:100px; }
@@ -69,14 +69,13 @@ div.system-message p.system-message-title { padding:4px 5px 4px 25px; margin:0;
.x500 { width:500px; }
/* HEADER */
-#header { background:#417690; color:#ffc; }
-#header a:link, #header a:visited { color:white; }
+#header { background:#417690; color:#ffc; min-height:2.5em; _height:2.5em; }
+#header a:link, #header a:visited { color:white; }
#header a:hover { text-decoration:underline; }
-#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 h2 /* site name */ { 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; }
-
+#branding { float:left; width:18em; }
+#branding h1 { padding:0.5em 10px 0 10px; font-size:18px; margin:0; font-weight:normal; color:#f4f379; }
+#branding h2 { padding:0 10px 0.5em 10px; font-size:14px; margin:0; font-weight:normal; color:#ffc; }
+#user-tools { padding:1.2em 10px; font-size:11px; text-align:right; }
/* SIDEBAR */
#content-related h3 { font-size:12px; color:#666; margin-bottom:3px; }
View
3  django/contrib/admin/templates/admin/base.html
@@ -20,10 +20,9 @@
{% block branding %}{% endblock %}
</div>
{% if not user.is_anonymous %}
- <div id="user-tools">{% trans 'Welcome,' %} <strong>{% if user.first_name %}{{ user.first_name }}{% else %}{{ user.username }}{% endif %}</strong>. <br />{% block userlinks %}<a href="doc/">{% trans 'Documentation' %}</a> / <a href="password_change/">{% trans 'Change password' %}</a> / <a href="logout/">{% trans 'Log out' %}</a>{% endblock %}</div>
+ <div id="user-tools">{% trans 'Welcome,' %} <strong>{% if user.first_name %}{{ user.first_name }}{% else %}{{ user.username }}{% endif %}</strong>. {% block userlinks %}<a href="doc/">{% trans 'Documentation' %}</a> / <a href="password_change/">{% trans 'Change password' %}</a> / <a href="logout/">{% trans 'Log out' %}</a>{% endblock %}</div>
{% endif %}
{% block nav-global %}{% endblock %}
- <br class="clear" />
</div>
<!-- END Header -->
{% block breadcrumbs %}<div class="breadcrumbs"><a href="/">{% trans 'Home' %}</a>{% if title %} &rsaquo; {{ title }}{% endif %}</div>{% endblock %}
View
1  django/contrib/admin/templates/admin/base_site.html
@@ -5,7 +5,6 @@
{% block branding %}
<h1 id="site-name">{% trans 'Django administration' %}</h1>
-<h2 id="site-url"><a href="http://www.example.com/">example.com</a></h2>
{% endblock %}
{% block nav-global %}{% endblock %}
Please sign in to comment.
Something went wrong with that request. Please try again.