diff options
| author | Gregor Tätzner <gregor@freenet.de> | 2012-07-20 11:31:07 +0200 |
|---|---|---|
| committer | Gregor Tätzner <gregor@freenet.de> | 2012-07-20 11:31:07 +0200 |
| commit | a072943b2e428a14243329ee3717392f7f5e4da1 (patch) | |
| tree | e1bd8000a9c86d201125a34d757601148ce075a5 /templates | |
| parent | 2259f8635969a3b409dedda8cc1662486fe12ba4 (diff) | |
Polish feedslist layout
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/part.feeds.php | 12 | ||||
| -rw-r--r-- | templates/part.folderlist.php | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/templates/part.feeds.php b/templates/part.feeds.php index 3ddbcaab8..1447fc5e1 100644 --- a/templates/part.feeds.php +++ b/templates/part.feeds.php @@ -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>'; diff --git a/templates/part.folderlist.php b/templates/part.folderlist.php index a5f9626c6..670684fd4 100644 --- a/templates/part.folderlist.php +++ b/templates/part.folderlist.php @@ -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){ |