diff options
| author | Kate Arzamastseva <pshns@ukr.net> | 2011-07-14 11:36:48 +0300 |
|---|---|---|
| committer | Kate Arzamastseva <pshns@ukr.net> | 2011-07-14 11:36:48 +0300 |
| commit | dd9ba38e965cfc3c06fbb80fed65556dbfbfda1c (patch) | |
| tree | b7d432501c87e15a62b1b3a70562fb830f249555 /lib | |
| parent | b3b326700990f7b793fe4f5dd03cc7b4ab2e9672 (diff) | |
| download | rpg-dd9ba38e965cfc3c06fbb80fed65556dbfbfda1c.tar.gz rpg-dd9ba38e965cfc3c06fbb80fed65556dbfbfda1c.tar.bz2 | |
mediamanager tabs, upload form fix
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/scripts/media.js | 6 | ||||
| -rw-r--r-- | lib/tpl/default/mediamanager.css | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/lib/scripts/media.js b/lib/scripts/media.js index af5346cbe..de3d03dfe 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -64,7 +64,8 @@ var dw_mediamanager = { jQuery('#mediamanager__layout_list').delegate('#mediamanager__tabs_files a', 'click', dw_mediamanager.list) .delegate('#mediamanager__tabs_list a', 'click', dw_mediamanager.list_view) .delegate('#mediamanager__file_list a', 'click', dw_mediamanager.details) - .delegate('#dw__mediasearch', 'submit', dw_mediamanager.list); + .delegate('#dw__mediasearch', 'submit', dw_mediamanager.list) + .delegate('#upload__file', 'change', dw_mediamanager.suggest); jQuery('#mediamanager__layout_detail').delegate('#mediamanager__tabs_details a', 'click', dw_mediamanager.details) .delegate('#mediamanager__btn_update', 'submit', dw_mediamanager.list) @@ -216,6 +217,9 @@ var dw_mediamanager = { $file = jQuery(this); $name = jQuery('#upload__name'); + + if ($name.val() != '') return; + if(!$file.length || !$name.length) { return; } diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css index 55ac39fd2..e87473687 100644 --- a/lib/tpl/default/mediamanager.css +++ b/lib/tpl/default/mediamanager.css @@ -246,5 +246,10 @@ form.meta textarea.edit { } .idx .selected { - color: red !important; + background-color: __highlight__; + font-weight: bold; +} + +.mediamanager div.upload { + padding-bottom: 0.5em; }
\ No newline at end of file |