зеркало из https://github.com/nextcloud/news.git
Polish feedslist layout
This commit is contained in:
Родитель
2259f86359
Коммит
a072943b2e
|
@ -1,5 +1,5 @@
|
|||
|
||||
.collapsable { background: url('%webroot%/core/img/places/folder.svg') no-repeat left center; padding: 0.3em 0.8em 0.3em 20px; }
|
||||
.collapsable { background: url('%webroot%/core/img/places/folder.svg') no-repeat left center; padding: 0 0 0 20px; }
|
||||
.news_input { float:left; font-size:12px; padding:4px 2px; border:solid 1px #aacfe4; width:200px; }
|
||||
.svg { border: inherit; background: inherit; }
|
||||
|
||||
|
@ -54,15 +54,16 @@ ul#feedfoldermenu { position:fixed; margin-left: 0; bottom: 2.8em; border-left:1
|
|||
|
||||
li { padding: 0px !important; }
|
||||
li.menuItem { margin-left:0.7em; margin-right:0.7em; float: none !important; text-align: left; }
|
||||
li.feeds_list { margin-left: 16px !important; text-align: right; }
|
||||
li.feeds_list a { margin-left: 20px !important; overflow: hidden; text-overflow: ellipsis; width: 13em; text-align: left; }
|
||||
li.feeds_list { margin-left: 16px !important; text-align: right; border-radius: 5px; padding-left: 5px !important; }
|
||||
li.feeds_list a { padding: 0 0 0 20px !important; overflow: hidden; text-overflow: ellipsis; text-align: left; width: 13em; }
|
||||
div.folder_container { padding-left: 5px !important; border-radius: 5px; }
|
||||
|
||||
ul.folders { margin-left: 16px !important; }
|
||||
|
||||
li.folder_list:hover { color: rgb(0, 0, 0) !important; background: none !important; }
|
||||
li.feeds_list:hover { background-color: rgb(221, 221, 221) !important; }
|
||||
|
||||
div.collapsable:hover { background-color: rgb(221, 221, 221); }
|
||||
div.folder_container:hover { background-color: rgb(221, 221, 221); }
|
||||
div.add_parentfolder { position: relative; }
|
||||
|
||||
div.dialog { overflow: visible; }
|
||||
|
|
|
@ -3,10 +3,12 @@
|
|||
$l = new OC_l10n('news');
|
||||
|
||||
echo '<ul class="folders"' . (($depth == 0) ? 'style="margin-left: 0px !important;"' : '') .'> <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>' .
|
||||
'<button class="svg action" id="feeds_edit" title="' . $l->t('Rename folder') . '"></button>': '' ) .
|
||||
'</div>';
|
||||
'<div class="folder_container">' .
|
||||
'<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>' .
|
||||
'<button class="svg action" id="feeds_edit" title="' . $l->t('Rename folder') . '"></button>': '' ) .
|
||||
'</div>' .
|
||||
'</div>';
|
||||
echo '<ul>';
|
||||
$children = $folder->getChildren();
|
||||
foreach($children as $child) {
|
||||
|
@ -15,7 +17,7 @@
|
|||
}
|
||||
elseif ($child instanceOf OC_News_Feed) { //onhover $(element).attr('id', 'newID');
|
||||
$favicon = $child->getFavicon();
|
||||
echo '<li style="background: url(' . $favicon . ') left center no-repeat; background-size:16px 16px;" class="feeds_list" data-id="' . $child->getId() . '"><a href="' . OCP\Util::linkTo('news', 'index.php'). '?feedid=' . $child->getId() . '">' . $child->getTitle() .'</a>';
|
||||
echo '<li class="feeds_list" data-id="' . $child->getId() . '"><a href="' . OCP\Util::linkTo('news', 'index.php'). '?feedid=' . $child->getId() . '" style="background: url(' . $favicon . ') left center no-repeat; background-size:16px 16px;">' . $child->getTitle() .'</a>';
|
||||
countUnreadItems($child->getId());
|
||||
echo '<button class="svg action" id="feeds_delete" onClick="(News.Feed.delete(' . $child->getId(). '))" title="' . $l->t('Delete feed') . '"></button>';
|
||||
echo '<button class="svg action" id="feeds_edit" title="' . $l->t('Edit feed') . '"></button>';
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
function print_folder(OC_News_Folder $folder, $depth){
|
||||
echo '<li style="margin-left:' . 10*$depth . 'px;" class="menuItem" onclick="News.DropDownMenu.selectItem(this, ' . $folder->getId() . ')">' . strtoupper($folder->getName()) . '</li>';
|
||||
echo '<li class="menuItem" onclick="News.DropDownMenu.selectItem(this, ' . $folder->getId() . ')">' . strtoupper($folder->getName()) . '</li>';
|
||||
$children = $folder->getChildren();
|
||||
foreach($children as $child) {
|
||||
if ($child instanceOf OC_News_Folder){
|
||||
|
|
Загрузка…
Ссылка в новой задаче