Django

Code

Changeset 932

Show
Ignore:
Timestamp:
10/18/05 05:50:15 (3 years ago)
Author:
hugo
Message:

i18n: merged to [931] from trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/i18n/django/conf/admin_media/css/changelists.css

    r775 r932  
    1 /*  
    2     ______________________________ 
    3     DJANGO  
    4     Admin Changelist Styles 
    5  
    6     Extends base.css 
    7  
    8     by Wilson Miner 
    9     wilson@lawrence.com 
    10  
    11     Copyright (c) 2005 
    12          Lawrence Journal-World 
    13  
    14     645 New Hampshire 
    15     Lawrence, KS 66044 
    16  
     1/* 
     2    DJANGO Admin Changelist Styles 
     3    by Wilson Miner wilson@lawrence.com 
     4    Copyright (c) 2005 Lawrence Journal-World 
    175*/ 
    186 
    19 #changelist {position:relative; width:100%;} 
    20 #changelist table {width:100%;} 
    21 .change-list .filtered table { border-right:1px solid #ddd, width:100%; } 
    22 .change-list .filtered {min-height:400px; _height:400px;} 
    23 .change-list .filtered {background:white url(../img/admin/changelist-bg.gif) top right repeat-y !important;} 
    24 .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull {margin-right:160px !important; width:auto !important; } 
    25 .change-list .filtered table tbody th {padding-right:10px;} 
    26 #changelist .toplinks {border-bottom:1px solid #ccc !important;} 
    27 #changelist .paginator { color:#666; border-top:1px solid #eee; border-bottom:1px solid #eee; background:white url(../img/admin/nav-bg.gif) 0 180% repeat-x; overflow:hidden;} 
     7#changelist { position:relative; width:100%; } 
     8#changelist table { width:100%; } 
     9.change-list .filtered table { border-right:1px solid #ddd; } 
     10.change-list .filtered { min-height:400px; _height:400px; } 
     11.change-list .filtered { background:white url(../img/admin/changelist-bg.gif) top right repeat-y !important; } 
     12.change-list .filtered table, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull { margin-right:160px !important; width:auto !important; } 
     13.change-list .filtered table tbody th { padding-right:10px; } 
     14#changelist .toplinks { border-bottom:1px solid #ccc !important; } 
     15#changelist .paginator { color:#666; border-top:1px solid #eee; border-bottom:1px solid #eee; background:white url(../img/admin/nav-bg.gif) 0 180% repeat-x; overflow:hidden; } 
    2816.change-list .filtered .paginator { border-right:1px solid #ddd; } 
    2917 
    3018/*  CHANGELIST TABLES  */ 
    31  
    32 #changelist table thead th {white-space:nowrap;} 
    33 #changelist table tbody td {border-left: 1px solid #ddd;} 
    34 #changelist table tfoot {color: #666;} 
     19#changelist table thead th { white-space:nowrap; } 
     20#changelist table tbody td { border-left: 1px solid #ddd; } 
     21#changelist table tfoot { color: #666; } 
    3522 
    3623/*  TOOLBAR  */ 
    37  
    38 #changelist #toolbar {padding:3px; border-bottom:1px solid #ddd; background:#e1e1e1 url(../img/admin/nav-bg.gif) top left repeat-x; color:#666;} 
    39 #changelist #toolbar form input {font-size:11px; padding:1px 2px;} 
    40 #changelist #toolbar form #searchbar {padding:2px;} 
    41 #changelist #changelist-search img {vertical-align:middle;} 
     24#changelist #toolbar { padding:3px; border-bottom:1px solid #ddd; background:#e1e1e1 url(../img/admin/nav-bg.gif) top left repeat-x; color:#666; } 
     25#changelist #toolbar form input { font-size:11px; padding:1px 2px; } 
     26#changelist #toolbar form #searchbar { padding:2px; } 
     27#changelist #changelist-search img { vertical-align:middle; } 
    4228 
    4329/*  FILTER COLUMN  */ 
    44  
    45 #changelist-filter {position:absolute; top:0; right:0; z-index:1000; width:160px; border-left:1px solid #ddd; background:#efefef; margin:0;} 
    46 #changelist-filter h2 {font-size:11px; padding:2px 5px; border-bottom:1px solid #ddd;} 
    47 #changelist-filter h3 {font-size:12px; margin-bottom:0;} 
    48 #changelist-filter ul {padding-left:0;margin-left:10px;_margin-right:-10px;} 
    49 #changelist-filter li {list-style-type:none; margin-left:0; padding-left:0;} 
    50 #changelist-filter a {color:#999;} 
    51 #changelist-filter a:hover {color:#036;} 
    52 #changelist-filter li.selected {border-left:5px solid #ccc; padding-left:5px;margin-left:-10px;} 
    53 #changelist-filter li.selected a {color:#5b80b2 !important;} 
     30#changelist-filter { position:absolute; top:0; right:0; z-index:1000; width:160px; border-left:1px solid #ddd; background:#efefef; margin:0; } 
     31#changelist-filter h2 { font-size:11px; padding:2px 5px; border-bottom:1px solid #ddd; } 
     32#changelist-filter h3 { font-size:12px; margin-bottom:0; } 
     33#changelist-filter ul { padding-left:0;margin-left:10px;_margin-right:-10px; } 
     34#changelist-filter li { list-style-type:none; margin-left:0; padding-left:0; } 
     35#changelist-filter a { color:#999; } 
     36#changelist-filter a:hover { color:#036; } 
     37#changelist-filter li.selected { border-left:5px solid #ccc; padding-left:5px;margin-left:-10px; } 
     38#changelist-filter li.selected a { color:#5b80b2 !important; } 
    5439 
    5540/*  DATE DRILLDOWN  */ 
    56  
    57 .change-list ul.toplinks {display:block; background:white url(../img/admin/nav-bg-reverse.gif) 0 -10px repeat-x; border-top:1px solid white; float:left;  padding:0 !important;  margin:0 !important; width:100%;} 
    58 .change-list ul.toplinks li {float: left; width: 9em; padding:3px 6px; font-weight: bold; list-style-type:none;} 
    59 .change-list ul.toplinks .date-back a {color:#999;} 
    60 .change-list ul.toplinks .date-back a:hover {color:#036;} 
     41.change-list ul.toplinks { display:block; background:white url(../img/admin/nav-bg-reverse.gif) 0 -10px repeat-x; border-top:1px solid white; float:left;  padding:0 !important;  margin:0 !important; width:100%; } 
     42.change-list ul.toplinks li { float: left; width: 9em; padding:3px 6px; font-weight: bold; list-style-type:none; } 
     43.change-list ul.toplinks .date-back a { color:#999; } 
     44.change-list ul.toplinks .date-back a:hover { color:#036; } 

  • django/branches/i18n/django/conf/admin_media/css/global.css

    r844 r932  
    11/* 
    2     ______________________________ 
    3     DJANGO 
    4     Admin Global Styles 
    5  
    6     Extends base.css 
    7  
    8     by Wilson Miner 
    9     wilson@lawrence.com 
    10  
    11     Copyright (c) 2005 
    12     Lawrence Journal-World 
    13  
    14     645 New Hampshire 
    15     Lawrence, KS 66044 
    16  
    17     ______________________________ 
    18     SITE DIMENSIONS 
    19  
    20     Site Width:     768px 
    21     Content Width:  750px 
    22     Main Column:    580px 
    23     Sidebar:        220px 
    24  
    25     ______________________________ 
    26     COLORS 
    27  
    28     Blue           #5b80b2 
    29     Dark Blue      #036 
    30  
     2    DJANGO Admin Global Styles 
     3    by Wilson Miner wilson@lawrence.com 
     4    Copyright (c) 2005 Lawrence Journal-World 
    315*/ 
    326 
    …… 
    348 
    359/* LINKS */ 
    36  
    3710a:link, a:visited { color: #5b80b2; text-decoration:none; } 
    3811a:hover { color: #036; } 
    …… 
    4013 
    4114/*  GLOBAL DEFAULTS */ 
    42  
    4315p, ol, ul, dl { margin:.2em 0 .8em 0; font-size:12px; } 
    4416p { padding:0; line-height:140%; } 
    …… 
    6840 
    6941/*  PAGE STRUCTURE  */ 
    70  
    7142#container { position:relative; width:100%; min-width:720px; } 
    7243#header { text-align:left; min-height:55px; _height:55px; } 
    …… 
    7748 
    7849/*  COLUMN TYPES  */ 
    79 /* 
    80     colM = Main             |  M  | 
    81     colMS = Main, Sidebar   | M |S| 
    82     colSM = Sidebar, Main   |S| M | 
    83     flex = single-column, liquid width 
    84     superwide = single-column, extra-wide fixed width 
    85 */ 
    8650.colMS, .colM, .colSM, .colM #content-main, .colM #content-main .xfull { width:758px; } /* master site width for fixed-width pages */ 
    8751.colMS #content-main, .colSM #content-main, .colMS #content-main .xfull, .colSM #content-main .xfull { width:519px; } /* main column width for 2-column pages */ 
    …… 
    9559 
    9660/*  WIDTHS  */ 
    97  
    9861.x50 { width:50px; } 
    9962.x75 { width:75px; } 
    …… 
    10770 
    10871/*  HEADER  */ 
    109  
    11072#header { background:#417690; color:#ffc; } 
    11173#header a:link, #header a:visited       { color:white; } 
    …… 
    11880 
    11981/*  SIDEBAR  */ 
    120  
    12182#content-related h3 { font-size:12px; color:#666; margin-bottom:3px; } 
    12283#content-related h4 { font-size:11px; } 
    12384 
    12485/*  TABLES  */ 
    125  
    12686table { border-collapse:collapse; border-color:#ccc; } 
    12787td, 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; } 
    …… 
    142102 
    143103/*  TABLE SORTING  */ 
    144  
    145104thead th a:link, thead th a:visited { color:#666; display:block; } 
    146105table thead th.sorted { background-position:bottom left !important; } 
    …… 
    150109 
    151110/*  MODULES  */ 
    152  
    153111.module { border:1px solid #ccc; margin-bottom:5px; background:white; } 
    154112.module p, .module ul, .module h3, .module h4, .module dl, .module pre { padding-left:10px; padding-right:10px; } 
    …… 
    174132 
    175133/*  FORM BUTTONS  */ 
    176  
    177134input[type=submit], input[type=button], .submit-row input { background:white url(../img/admin/nav-bg.gif) bottom repeat-x; padding:3px; } 
    178135input[type=submit]:active, input[type=button]:active { background-image:url(../img/admin/nav-bg-reverse.gif); background-position:top; } 
    …… 
    184141 
    185142/*  FORM ROWS  */ 
    186  
    187143.form-row { clear:both; padding:8px 12px; font-size:11px; } 
    188144html>body .form-row { border-bottom:1px solid #eee; } 
    …… 
    192148 
    193149/*  FORM LABELS  */ 
    194  
    195150form h4 { margin:0 !important; padding:0 !important; border:none !important; } 
    196151label { font-weight:normal !important; color:#666; font-size:12px; } 
    …… 
    199154 
    200155/*  RADIO BUTTONS */ 
    201  
    202156form ul.radiolist li { list-style-type:none; } 
    203157form ul.radiolist label { float:none; display:inline; } 
    …… 
    206160 
    207161/*  ALIGNED FIELDSETS  */ 
    208  
    209162.aligned label { display:block; padding:0 1em 3px 0; float:left; text-align:left; width:8em; } 
    210163.aligned label.inline { display:inline; float:none; } 
    …… 
    218171 
    219172/*  WIDE FIELDSETS  */ 
    220  
    221173.wide label { width:15em !important; } 
    222174form .wide p { margin-left:15em; } 
    …… 
    225177 
    226178/*  COLLAPSED FIELDSETS  */ 
    227  
    228179fieldset.collapsed * { display:none; } 
    229180fieldset.collapsed h2, fieldset.collapsed { display:block !important; } 
    …… 
    234185 
    235186/* MESSAGES & ERRORS  */ 
    236  
    237187ul.messagelist { padding:0 0 5px 0; margin:0; } 
    238188ul.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; } 
    …… 
    246196 
    247197/*  ACTION ICONS  */ 
    248  
    249198.addlink { padding-left:12px; background:url(../img/admin/icon_addlink.gif) 0 .2em no-repeat; } 
    250199.changelink { padding-left:12px; background:url(../img/admin/icon_changelink.gif) 0 .2em no-repeat; } 
    …… 
    254203 
    255204/*  OBJECT TOOLS  */ 
    256  
    257205.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; } 
    258206.form-row .object-tools { margin-top:0; margin-bottom:0; } 
    …… 
    267215 
    268216/*  INLINE CONTROLS  */ 
    269  
    270217#inline-controls { font-weight:bold; font-size:12px; } 
    271218#inline-specific-controls { margin-left:6px; padding:0 8px; border-left:6px solid #ccc;  } 
    272219 
    273220/*  BREADCRUMBS  */ 
    274  
    275221p.breadcrumbs { font-size:11px; color:#ccc;text-align:left; } /* old breadcrumbs style */ 
    276222div.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; } 
    277223 
    278224/*  SELECTOR (FILTER INTERFACE)  */ 
    279  
    280225.selector { width:580px; float:left; } 
    281226.selector select { width:270px; height:170px; } 
    …… 
    298243 
    299244/*  Stacked selectors for long items  */ 
    300  
    301245.stacked { float:left; width:500px; } 
    302246.stacked select { width:480px; height:100px; } 
    …… 
    311255 
    312256/*  DATE AND TIME  */ 
    313  
    314257p.datetime { line-height:20px; margin:0; padding:0; color:#666; font-size:11px; font-weight:bold; } 
    315258.datetime span { font-size:11px; font-weight:normal; white-space:nowrap; } 
    …… 
    318261 
    319262/*  FILE UPLOADS  */ 
    320  
    321263p.file-upload { line-height:20px; margin:0; padding:0; color:#666; font-size:11px; font-weight:bold; } 
    322264.file-upload a { font-weight:normal; } 
    …… 
    324266 
    325267/*  CALENDARS & CLOCKS  */ 
    326  
    327268.calendarbox, .clockbox { margin:5px auto; width: 10em; text-align: center; background:white; position:relative; } 
    328269.clockbox { width:6em; } 
    …… 
    351292 
    352293/*  ORDERING WIDGET  */ 
    353  
    354294ul#orderthese { padding:0; margin:0; list-style-type:none; } 
    355295ul#orderthese li { list-style-type:none; display:block; padding:0; margin:6px 0; width:214px; background:#f6f6f6; white-space:nowrap; overflow:hidden; } 
    …… 
    358298 
    359299/*  PAGINATOR  */ 
    360  
    361300.paginator { font-size:11px; padding-top:10px; padding-bottom:10px; line-height:22px; margin:0; border-top:1px solid #ddd; } 
    362301.paginator a:link, .paginator a:visited { padding:2px 6px; border:solid 1px #ccc; background:white; text-decoration:none; } 
    …… 
    368307 
    369308/*  TEXT STYLES & MODIFIERS  */ 
    370  
    371309.small { font-size:11px; } 
    372310.tiny { font-size:10px; } 
    …… 
    387325 
    388326/*  CUSTOM FORM FIELDS  */ 
    389  
    390327.vSelectMultipleField { vertical-align:top !important; } 
    391328.vCheckboxField { border:none; } 

  • django/branches/i18n/django/conf/urls/admin.py

    r469 r932  
    33 
    44urlpatterns = ( 
    5     ('^$', 'django.views.admin.main.index'), 
     5    ('^$', 'django.contrib.admin.views.main.index'), 
    66    ('^logout/$', 'django.views.auth.login.logout'), 
    77    ('^password_change/$', 'django.views.registration.passwords.password_change'), 
    88    ('^password_change/done/$', 'django.views.registration.passwords.password_change_done'), 
    9     ('^template_validator/$', 'django.views.admin.template.template_validator'), 
     9    ('^template_validator/$', 'django.contrib.admin.views.template.template_validator'), 
    1010 
    1111    # Documentation 
    12     ('^doc/$', 'django.views.admin.doc.doc_index'), 
    13     ('^doc/bookmarklets/$', 'django.views.admin.doc.bookmarklets'), 
    14     ('^doc/tags/$', 'django.views.admin.doc.template_tag_index'), 
    15     ('^doc/filters/$', 'django.views.admin.doc.template_filter_index'), 
    16     ('^doc/views/$', 'django.views.admin.doc.view_index'), 
    17     ('^doc/views/jump/$', 'django.views.admin.doc.jump_to_view'), 
    18     ('^doc/views/(?P<view>[^/]+)/$', 'django.views.admin.doc.view_detail'), 
    19     ('^doc/models/$', 'django.views.admin.doc.model_index'), 
    20     ('^doc/models/(?P<model>[^/]+)/$', 'django.views.admin.doc.model_detail'), 
     12    ('^doc/$', 'django.contrib.admin.views.doc.doc_index'), 
     13    ('^doc/bookmarklets/$', 'django.contrib.admin.views.doc.bookmarklets'), 
     14    ('^doc/tags/$', 'django.contrib.admin.views.doc.template_tag_index'), 
     15    ('^doc/filters/$', 'django.contrib.admin.views.doc.template_filter_index'), 
     16    ('^doc/views/$', 'django.contrib.admin.views.doc.view_index'), 
     17    ('^doc/views/jump/$', 'django.contrib.admin.views.doc.jump_to_view'), 
     18    ('^doc/views/(?P<view>[^/]+)/$', 'django.contrib.admin.views.doc.view_detail'), 
     19    ('^doc/models/$', 'django.contrib.admin.views.doc.model_index'), 
     20    ('^doc/models/(?P<model>[^/]+)/$', 'django.contrib.admin.views.doc.model_detail'), 
    2121#    ('^doc/templates/$', 'django.views.admin.doc.template_index'), 
    22     ('^doc/templates/(?P<template>.*)/$', 'django.views.admin.doc.template_detail'), 
     22    ('^doc/templates/(?P<template>.*)/$', 'django.contrib.admin.views.doc.template_detail'), 
    2323) 
    2424 
    …… 
    4949urlpatterns += ( 
    5050    # Metasystem admin pages 
    51     ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/$', 'django.views.admin.main.change_list'), 
    52     ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/add/$', 'django.views.admin.main.add_stage'), 
    53     ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/jsvalidation/$', 'django.views.admin.jsvalidation.jsvalidation'), 
    54     ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/(?P<object_id>.+)/history/$', 'django.views.admin.main.history'), 
    55     ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/(?P<object_id>.+)/delete/$', 'django.views.admin.main.delete_stage'), 
    56     ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/(?P<object_id>.+)/$', 'django.views.admin.main.change_stage'), 
     51    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/$', 'django.contrib.admin.views.main.change_list'), 
     52    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/add/$', 'django.contrib.admin.views.main.add_stage'), 
     53    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/(?P<object_id>.+)/history/$', 'django.contrib.admin.views.main.history'), 
     54    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/(?P<object_id>.+)/delete/$', 'django.contrib.admin.views.main.delete_stage'), 
     55    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/(?P<object_id>.+)/$', 'django.contrib.admin.views.main.change_stage'), 
    5756) 
    5857urlpatterns = patterns('', *urlpatterns) 

  • django/branches/i18n/docs/templates.txt

    r910 r932  
    400400 
    401401        {% if athlete_list %} 
    402             Number of athletes: {{ athlete_list|count }} 
     402            Number of athletes: {{ athlete_list|length }} 
    403403        {% else %} 
    404404            No athletes. 
    …… 
    406406 
    407407    In the above, if ``athlete_list`` is not empty, the number of athletes will be 
    408     displayed by the ``{{ athlete_list|count }}`` variable. 
     408    displayed by the ``{{ athlete_list|length }}`` variable. 
    409409 
    410410    As you can see, the ``if`` tag can take an option ``{% else %}`` clause that 
    …… 
    433433        {% if athlete_list %} 
    434434            {% if coach_list %} 
    435                 Number of athletes: {{ athlete_list|count }}. 
    436                 Number of coaches: {{ coach_list|count }}. 
     435                Number of athletes: {{ athlete_list|length }}. 
     436                Number of coaches: {{ coach_list|length }}. 
    437437            {% endif %} 
    438438        {% endif %}