diff options
| -rw-r--r-- | css/news.css | 13 | ||||
| -rw-r--r-- | templates/part.feeds.php | 18 |
2 files changed, 18 insertions, 13 deletions
diff --git a/css/news.css b/css/news.css index 7e7256849..6078cdf99 100644 --- a/css/news.css +++ b/css/news.css @@ -3,8 +3,10 @@ #feeds { background: #fff; width: 20em; left: 12.5em; top: 3.7em; bottom:3em; position: fixed; overflow: auto; padding: 0; margin: 0; } /* #feeds a { height: 23px; display: block; margin: 0 0 0 0; padding: 0 0 0 25px; } */ #bottomcontrols { padding: 0; bottom:0px; height:2.8em; width: 20em; margin:0; background:#eee; border-top:1px solid #ccc; position:fixed; -moz-box-shadow: 0 -3px 3px -3px #000; -webkit-box-shadow: 0 -3px 3px -3px #000; box-shadow: 0 -3px 3px -3px #000;} -#feeds_delete { position:relative; float:right; background:url('%webroot%/core/img/actions/delete.svg') no-repeat center; } -#feeds_edit { position:relative; float:right; background:url('%webroot%/core/img/actions/rename.svg') no-repeat center; } +#feeds_delete { position: absolute; right: 0px; background-image: url('%webroot%/core/img/actions/delete.svg'); background-repeat: no-repeat; } +.collapsable { background: url('%webroot%/core/img/filetypes/folder.png') no-repeat left center; padding-left: 20px;} + +#feeds_edit { position: relative; float:right; background:url('%webroot%/core/img/actions/rename.svg') no-repeat center; } .svg { border: inherit; background: inherit; } @@ -13,3 +15,10 @@ ul.controls li { float: left; } .accordion .title { background: #DCDCDC; font-size: 12px; border-bottom:1px solid #ccc; font-weight:bold;} + +li.folder_list:hover { color: rgb(0, 0, 0) !important; background: none !important; } +li.feeds_list:hover { background: none repeat scroll 0% 0% rgb(221, 221, 221) !important; } +div.collapsable:hover { background-color: rgb(221, 221, 221); } + +li { padding-right: 0px !important; } + diff --git a/templates/part.feeds.php b/templates/part.feeds.php index adcbe8411..e3266bed6 100644 --- a/templates/part.feeds.php +++ b/templates/part.feeds.php @@ -1,15 +1,11 @@ <?php function print_folder(OC_News_Folder $folder, $depth){ $l = new OC_l10n('news'); - - echo '<ul style="margin-left:' . 10*$depth . 'px;"> <li style="background-image:url(' . - OC_Helper::imagePath('core', 'filetypes/folder.png') . '); background-repeat:no-repeat; background-position:0px 8px; padding-left: 20px; ">' . - '<span class="collapsable">' . $folder->getName() . '</span>'; -/* - if ($depth != 0) { - echo '<button class="svg action" id="feeds_delete" onClick="(News.Folder.delete(' . $folder->getId(). '))" title="' . $l->t('Delete folder') . '"></button>'; - } -*/ + + echo '<ul style="margin-left:' . 10*$depth . 'px;"> <li class="folder_list" >' . + '<div class="collapsable" >' . strtoupper($folder->getName()) . + ( ($depth != 0) ? '<button class="svg action" id="feeds_delete" onClick="(News.Folder.delete(' . $folder->getId(). '))" title="' . $l->t('Delete folder') . '">' : '' ) . '</button>' . + '</div>'; echo '<ul>'; $children = $folder->getChildren(); foreach($children as $child) { @@ -29,6 +25,6 @@ } echo '</ul></li></ul>'; } - + print_folder($_['allfeeds'], 0); -?> +?>
\ No newline at end of file |