diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-11-20 03:51:39 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-11-20 03:51:39 +0100 |
| commit | cee23430ae5aca14d5dcd7cf2c52b62b392afcdf (patch) | |
| tree | 908dd90cdaf4edbd3251f17ff4539968a4dc0152 | |
| parent | 9fa2bf0f7516fb06fe6f05e5558f3ada6886d038 (diff) | |
| parent | 18f345f7759c25950cdf34b7bd677bf6e983d37f (diff) | |
| download | Chimère-cee23430ae5aca14d5dcd7cf2c52b62b392afcdf.tar.bz2 Chimère-cee23430ae5aca14d5dcd7cf2c52b62b392afcdf.zip | |
Merge branch 'master' into carte-ouverte
Conflicts:
chimere/static/styles.css
| -rw-r--r-- | chimere/static/styles.css | 6 | ||||
| -rw-r--r-- | chimere/templates/edit.html | 2 | ||||
| -rw-r--r-- | chimere/templates/edit_route.html | 2 | ||||
| -rw-r--r-- | docs/en/INSTALL.t2t | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/chimere/static/styles.css b/chimere/static/styles.css index 21fbb2e..0784c8f 100644 --- a/chimere/static/styles.css +++ b/chimere/static/styles.css @@ -11,6 +11,10 @@ background-color:#FFF; border-radius: 10px; } +fieldset p{ +margin:4px 8px; +} + legend{ font-weight:bold; color:#607e25; @@ -98,7 +102,7 @@ color:black; } #action li ul{ -margin:10px; +margin:14px 12px; position:absolute; width:600px; } diff --git a/chimere/templates/edit.html b/chimere/templates/edit.html index 4a02fe4..46982fd 100644 --- a/chimere/templates/edit.html +++ b/chimere/templates/edit.html @@ -1,7 +1,7 @@ {% extends "base_user.html" %} {% load i18n %} {% block extra_head %} -{% if dated %}<script type="text/javascript" src="{{extra_url}}admin/jsi18n"></script> +{% if dated %}<script type="text/javascript" src="{{extra_url}}jsi18n"></script> <script type="text/javascript" src="{{extra_url}}media/js/core.js"></script> <link rel="stylesheet" type="text/css" href="{{extra_url}}media/css/base.css"/> <link rel="stylesheet" type="text/css" href="{{extra_url}}media/css/widgets.css"/> diff --git a/chimere/templates/edit_route.html b/chimere/templates/edit_route.html index 5152ba5..2fb6fc8 100644 --- a/chimere/templates/edit_route.html +++ b/chimere/templates/edit_route.html @@ -1,7 +1,7 @@ {% extends "base_user.html" %} {% load i18n %} {% block extra_head %} -{% if dated %}<script type="text/javascript" src="{{extra_url}}admin/jsi18n"></script> +{% if dated %}<script type="text/javascript" src="{{extra_url}}jsi18n"></script> <script type="text/javascript" src="{{extra_url}}media/js/core.js"></script> <link rel="stylesheet" type="text/css" href="{{extra_url}}media/css/base.css"/> <link rel="stylesheet" type="text/css" href="{{extra_url}}media/css/widgets.css"/> diff --git a/docs/en/INSTALL.t2t b/docs/en/INSTALL.t2t index 9cfdd25..a15c2dd 100644 --- a/docs/en/INSTALL.t2t +++ b/docs/en/INSTALL.t2t @@ -123,7 +123,7 @@ If you want to use tinymce don't forget to make it available to Chimère. In this same chimere directory, make a symbolic link to django's basic styles (do not forget to change the path according to your configuration, it is the last time I will recall it to you. Next time, you are on your own !): ``` -ln -s /usr/share/python-support/python-django/django/contrib/admin/media/ . +ln -s /usr/share/pyshared/django/contrib/admin/media/ . ``` +++ Compiling languages +++ |