diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-09-04 20:05:24 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-09-04 20:05:24 +0200 |
| commit | 1f16014274a2ad16fcd635fc9b506ef429a33677 (patch) | |
| tree | d7e4c7b4121f09210b398aa4d6bc3830e6e1858e /ishtar_common/static | |
| parent | 4aa9cda8b8bd1c9f51e467541a97d30669130243 (diff) | |
| download | Ishtar-1f16014274a2ad16fcd635fc9b506ef429a33677.tar.bz2 Ishtar-1f16014274a2ad16fcd635fc9b506ef429a33677.zip | |
Improve Image field management (refs #1365)
* add a custom widget to allow display via prettyPhoto on forms
* disable resizing when the image is deleted
* fix "has image" search request to manage empty and null field for images
* fix deletion of files by the wizard
* fix initialization of instancied form for files and images
Diffstat (limited to 'ishtar_common/static')
| -rw-r--r-- | ishtar_common/static/js/ishtar.js | 1 | ||||
| -rw-r--r-- | ishtar_common/static/media/style.css | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js index abd4f6733..71ba78bde 100644 --- a/ishtar_common/static/js/ishtar.js +++ b/ishtar_common/static/js/ishtar.js @@ -48,6 +48,7 @@ $(document).ready(function(){ $('#language_selector').change(function(){ $('#language_form').submit(); }); + $(".prettyPhoto a").prettyPhoto({'social_tools':''}); }); $('#to_bottom_arrow').live('click', function(){ diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index a219160f2..cfc75728b 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -74,7 +74,7 @@ h3{ margin:1em 0 0.5em 0; } -label{display:block} +/*label{display:block}*/ label:first-letter { text-transform: uppercase; @@ -160,9 +160,10 @@ div#language_form_div{ padding:2px 20px; } +/* div#language_form_div label{ display:inline; -} +}*/ div#context_menu{ height:110px; @@ -209,9 +210,9 @@ div#context_menu fieldset{ -webkit-border-radius:8px; border-radius:8px; } -div#context_menu fieldset label{ +/*div#context_menu fieldset label{ display:inline; -} +}*/ div#context_menu ul{ margin:0; |