diff options
| -rw-r--r-- | css/news.css | 2 | ||||
| -rw-r--r-- | js/news.js | 35 |
2 files changed, 25 insertions, 12 deletions
diff --git a/css/news.css b/css/news.css index 750f07261..d66baab22 100644 --- a/css/news.css +++ b/css/news.css @@ -59,8 +59,6 @@ li.feeds_list a { padding: 0 0 0 20px !important; overflow: hidden; text-overflo li.folder_list { background-color: rgb(255,255,255) !important; } div.collapsable { position: relative; border-radius: 5px; } .collapsable_trigger { border: none ; margin: 0 0 0 5px; padding: 0; border-radius: 0; box-shadow: none; vertical-align: middle !important; background: url('%webroot%/core/img/places/folder.svg') no-repeat; height:16px; width:16px; } -.collapsable_trigger_s:hover { background: url('%webroot%/core/img/actions/triangle-s.svg') no-repeat; } -.collapsable_trigger_n:hover { background: url('%webroot%/core/img/actions/triangle-n.svg') no-repeat; } .collapsable_title { padding-left: 0.2em; text-transform: uppercase; } diff --git a/js/news.js b/js/news.js index 432d4da08..a71b07128 100644 --- a/js/news.js +++ b/js/news.js @@ -227,33 +227,48 @@ News={ } } +function collapsable_trigger(trigger, items) { + var triggericon = OC.imagePath('core', 'actions/triangle-s.svg'); + trigger.css('background-image', 'url(' + triggericon + ')'); + if (items.css('display') == 'block') { + trigger.css('-moz-transform', 'none'); + trigger.css('transform', 'none'); + } + else { + trigger.css('-moz-transform', 'rotate(-90deg)'); + trigger.css('transform', 'rotate(-90deg)'); + } +} + function setupFeedList() { $('.collapsable_trigger').click(function(){ - var items = $(this).parent().parent().children('ul').toggle(); - if (items.css('display') == 'block') { - items.show(); - $(this).removeClass('collapsable_trigger_n').addClass('collapsable_trigger_s'); - } - else { - items.hide(); - $(this).removeClass('collapsable_trigger_s').addClass('collapsable_trigger_n'); - } + var items = $(this).parent().parent().children('ul'); + items.toggle(); + collapsable_trigger($(this),items); }); var list = $('.collapsable,.feeds_list').hover( function() { $(this).find('#feeds_delete,#feeds_edit').css('display', 'inline'); $(this).find('#unreaditemcounter').css('display', 'none'); + + var trigger = $(this).find('.collapsable_trigger'); + var items = trigger.parent().parent().children('ul'); + collapsable_trigger(trigger, items); }, function() { $(this).find('#feeds_delete,#feeds_edit').css('display', 'none'); $(this).find('#unreaditemcounter').css('display', 'inline'); + var foldericon = OC.imagePath('core', 'places/folder.svg'); + var trigger = $(this).find('.collapsable_trigger'); + trigger.css('background-image', 'url(' + foldericon + ')'); + trigger.css('-moz-transform', 'none'); + trigger.css('transform', 'none'); } ); list.find('#feeds_delete').hide(); list.find('#feeds_edit').hide(); list.find('#unreaditemcounter').show(); - list.find('.collapsable_trigger').addClass('collapsable_trigger_s'); } function setupRightContent() { |