diff options
| author | Alessandro Cosentino <cosenal@gmail.com> | 2012-07-08 14:41:24 -0400 |
|---|---|---|
| committer | Alessandro Cosentino <cosenal@gmail.com> | 2012-07-08 14:41:24 -0400 |
| commit | f5da58ed9e482b5be664484213a7caa167dfaca0 (patch) | |
| tree | 19f1349737572c1aea051dd164b43fa7d6355727 | |
| parent | 0b4106fab98ab3018601b2d6d51ffb36ffcbc411 (diff) | |
| parent | c27b0a963ed8080e71fba5512187f656a917adc1 (diff) | |
merge request 8
| -rw-r--r-- | css/news.css | 1 | ||||
| -rw-r--r-- | js/news.js | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/css/news.css b/css/news.css index e49a1ef0a..fb1dadf5a 100644 --- a/css/news.css +++ b/css/news.css @@ -1,6 +1,5 @@ li { padding-right: 0px !important; } -.accordion .title { background: #DCDCDC; font-size: 12px; border-bottom:1px solid #ccc; font-weight:bold;} .collapsable { background: url('%webroot%/core/img/places/folder.svg') no-repeat left center; padding-left: 20px;} .news_input { float:left; font-size:12px; padding:4px 2px; border:solid 1px #aacfe4; width:200px; } .svg { border: inherit; background: inherit; } diff --git a/js/news.js b/js/news.js index 2ad56eacd..1d5232734 100644 --- a/js/news.js +++ b/js/news.js @@ -122,7 +122,7 @@ News={ markItem:function(itemid) { $.post(OC.filePath('news', 'ajax', 'markitem.php'),{'itemid':itemid},function(jsondata){ if(jsondata.status == 'success'){ - + } else{ OC.dialogs.alert(jsondata.data.message, t('news', 'Error')); @@ -151,16 +151,18 @@ $(document).ready(function(){ return false; }).next().hide(); - + $('.feeds_list').hover(function() { $(this).find('#feeds_delete').toggle(); var list = $('.collapsable,.feeds_list').hover(function() { + var elem = $(this).find('#feeds_delete,#feeds_edit'); if(elem.css('display') == 'none') elem.css('display', 'inline'); else elem.css('display', 'none'); + return false; }); |