From 6ac6464cceee17130e8d79181fdc8fdbfdd8921c Mon Sep 17 00:00:00 2001 From: yomguy Date: Thu, 3 Mar 2011 00:02:13 +0100 Subject: [PATCH] rearrange admin pages --- INSTALL | 2 +- telemeta/htdocs/css/admin.css | 73 ++++++++++--------- telemeta/htdocs/css/telemeta.css | 3 +- .../telemeta/admin_enumerations.html | 1 + .../templates/telemeta/admin_general.html | 1 + .../templates/telemeta_default/admin.html | 19 +---- .../telemeta_default/admin_enumerations.html | 32 ++++++++ .../telemeta_default/admin_general.html | 6 ++ .../templates/telemeta_default/login.html | 2 - .../telemeta_default/mediaitem_detail.html | 2 +- telemeta/urls.py | 4 +- telemeta/web/base.py | 8 ++ 12 files changed, 95 insertions(+), 58 deletions(-) create mode 100644 telemeta/templates/telemeta/admin_enumerations.html create mode 100644 telemeta/templates/telemeta/admin_general.html create mode 100644 telemeta/templates/telemeta_default/admin_enumerations.html create mode 100644 telemeta/templates/telemeta_default/admin_general.html diff --git a/INSTALL b/INSTALL index 9369bbb4..8d282e2e 100644 --- a/INSTALL +++ b/INSTALL @@ -132,7 +132,7 @@ Add the following variables: TEMPLATE_CONTEXT_PROCESSORS = ( 'django.core.context_processors.request', - 'django.core.context_processors.auth',) + 'django.contrib.auth.context_processors.auth',) TELEMETA_ORGANIZATION = name of the organization which hosts this installation TELEMETA_SUBJECTS = tuple of subject keywords (used for Dublin Core), such as "Ethnology", etc... diff --git a/telemeta/htdocs/css/admin.css b/telemeta/htdocs/css/admin.css index 53a526b0..f63806d7 100644 --- a/telemeta/htdocs/css/admin.css +++ b/telemeta/htdocs/css/admin.css @@ -1,35 +1,38 @@ -/* Shamelessly stolen from trac's admin.css... */ - -.tabs { - border: 1px solid black; - border-color: gray black black gray; - margin: 2em 0; - padding: .5em 0 0; - float: left; - width: 12em; -} -.tabs ul { list-style: none; margin: 0 0 .5em; padding: 0 } -.tabs li { margin: 0; padding: 0.1em .5em } -.tabs li li { margin: 0 -0.5em; padding-left: 1.5em } -.tabs li li.active { background: #ccb; } -.tabs :link, .tabs :visited { border: none; display: block } -.tabs :link:hover, .tabs :visited:hover { background: transparent } - -.tabcontents { - padding: 0.4em 2em; - margin-left: 12em; - min-height: 300px; -} -p.help { color: #666; font-size: 90%; margin: 1em .5em .5em } - -form.addnew { clear: right; float: right; margin: -2em 0 4em; width: 33% } -form.mod { margin-top: 1em; } -form.mod .field { margin: .5em 0; } -form .field em { color: #888; font-size: smaller } -form .field .disabled em { color: #d7d7d7 } - -table.listing { clear: none; width: 64% } -table.listing .sel, table.listing .default { text-align: center; width: 1% } - - - +/* Shamelessly stolen from trac's admin.css... */ + +.tabs { + border: 1px solid black; + border-color: gray black black gray; + margin: 2em 0; + padding: .5em 0 0 .5em; + float: left; + width: 12em; + color: #6a0307; + font-size: 1em; + font-weight: bold; +} +.tabs ul { list-style: none; margin: 0 0 .5em; padding: 0 } +.tabs li { margin: 0; padding: 0.1em .5em } +.tabs li li { margin: 0 -0.5em; padding-left: 1.5em } +.tabs li li.active { background: #ccb; } +.tabs :link, .tabs :visited { border: none; display: block } +.tabs :link:hover, .tabs :visited:hover { background: transparent } + +.tabcontents { + padding: 0.4em 2em; + margin-left: 12em; + min-height: 300px; +} +p.help { color: #666; font-size: 90%; margin: 1em .5em .5em } + +form.addnew { clear: right; float: right; margin: -2em 0 4em; width: 33% } +form.mod { margin-top: 1em; } +form.mod .field { margin: .5em 0; } +form .field em { color: #888; font-size: smaller } +form .field .disabled em { color: #d7d7d7 } + +table.listing { clear: none; width: 64% } +table.listing .sel, table.listing .default { text-align: center; width: 1% } + + + diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css index 4aae0db7..482fc9ec 100644 --- a/telemeta/htdocs/css/telemeta.css +++ b/telemeta/htdocs/css/telemeta.css @@ -268,7 +268,7 @@ label.disabled { color: #d7d7d7 } background: #FFF url(search_bg.png) no-repeat; padding: .4em .1em; padding-left: 25px; - width: 150px; + width: 180px; color: #555; font-weight: bold; } @@ -808,4 +808,3 @@ a.image-link { border-bottom: 1px solid #ffffff; z-index: 10; } - diff --git a/telemeta/templates/telemeta/admin_enumerations.html b/telemeta/templates/telemeta/admin_enumerations.html new file mode 100644 index 00000000..1d1dd2d3 --- /dev/null +++ b/telemeta/templates/telemeta/admin_enumerations.html @@ -0,0 +1 @@ +{% extends "telemeta_default/admin_enumerations.html" %} diff --git a/telemeta/templates/telemeta/admin_general.html b/telemeta/templates/telemeta/admin_general.html new file mode 100644 index 00000000..1154dc27 --- /dev/null +++ b/telemeta/templates/telemeta/admin_general.html @@ -0,0 +1 @@ +{% extends "telemeta_default/admin_general.html" %} diff --git a/telemeta/templates/telemeta_default/admin.html b/telemeta/templates/telemeta_default/admin.html index 5cc5d36f..59a5edcb 100644 --- a/telemeta/templates/telemeta_default/admin.html +++ b/telemeta/templates/telemeta_default/admin.html @@ -7,24 +7,11 @@ {% block content %}

Administration

+
diff --git a/telemeta/templates/telemeta_default/admin_enumerations.html b/telemeta/templates/telemeta_default/admin_enumerations.html new file mode 100644 index 00000000..1b04a383 --- /dev/null +++ b/telemeta/templates/telemeta_default/admin_enumerations.html @@ -0,0 +1,32 @@ +{% extends "telemeta/admin.html" %} + +{% block content %} +

Administration

+
+
+ +
+ +
+{% if enumerations %} +
    + {% for enum in enumerations %} + {%ifequal enum.id enumeration_id %} +
  • {{ enum.name|capfirst }}
    • + {%else%} +
  • + {{ enum.name|capfirst }}
    • + {%endifequal%} + {% endfor %} +
+{% endif %} +
+ +
+ {% block tabcontents %} + {% endblock %} +
+{% endblock %} diff --git a/telemeta/templates/telemeta_default/admin_general.html b/telemeta/templates/telemeta_default/admin_general.html new file mode 100644 index 00000000..362522f1 --- /dev/null +++ b/telemeta/templates/telemeta_default/admin_general.html @@ -0,0 +1,6 @@ +{% extends "telemeta/admin.html" %} +{% load i18n %} + +{% block tabcontents %} +