diff options
| author | Alessandro Cosentino <cosenal@gmail.com> | 2012-08-02 18:39:13 -0400 |
|---|---|---|
| committer | Alessandro Cosentino <cosenal@gmail.com> | 2012-08-02 18:39:13 -0400 |
| commit | 9e1b6c31a8818f665ac58307931c6fd308e6c353 (patch) | |
| tree | da25e792b2326b2fc5e09e7495ed38d165a1fc96 | |
| parent | 1117a19bb67188e555e6dcf10a583188c702c3dc (diff) | |
moves back the content of templates/listfolder.php
| -rw-r--r-- | css/news.css | 2 | ||||
| -rw-r--r-- | templates/main.php | 2 | ||||
| -rw-r--r-- | templates/part.feeds.php | 12 | ||||
| -rw-r--r-- | templates/part.listfolder.php | 13 |
4 files changed, 14 insertions, 15 deletions
diff --git a/css/news.css b/css/news.css index f42802d1b..706bb5ecb 100644 --- a/css/news.css +++ b/css/news.css @@ -13,7 +13,7 @@ #dropdownBtn { width: 9em; padding-left: 0; padding-right:20px; background: url('%webroot%/core/img/actions/triangle-s.svg') no-repeat right center; } #addfolder { background: url('%webroot%/core/img/places/folder.svg') no-repeat left center; padding-left: 20px !important; } -#addfeed { background: url('%appswebroot%/apps/news/img/rss.svg') no-repeat left center; padding-left: 20px !important; } +#addfeed { background: url('%appswebroot%/news/img/rss.svg') no-repeat left center; padding-left: 20px !important; } #unreaditemcounter.nonzero { position: relative; background: #5E5E5E; border-radius: 5px; padding: 0 5px; color: white; text-align: center; margin: 0 0.3em 0 0.3em;} #unreaditemcounter.zero { position: relative; margin: 0 0.3em 0 0; } diff --git a/templates/main.php b/templates/main.php index 700acd244..21a05dec1 100644 --- a/templates/main.php +++ b/templates/main.php @@ -32,7 +32,9 @@ echo $this->inc("part.nofeeds"); } ?> + <div id="appsettings" class="popup bottomleft hidden"></div> + </div> <!-- Dialogs --> diff --git a/templates/part.feeds.php b/templates/part.feeds.php index fbf702387..ac57da384 100644 --- a/templates/part.feeds.php +++ b/templates/part.feeds.php @@ -1,7 +1,17 @@ <?php + function print_folder(OC_News_Folder $folder, $depth){ $l = new OC_l10n('news'); - include("part.listfolder.php"); + echo '<ul class="folders"' . (($depth == 0) ? 'style="margin-left: 0px !important;"' : '') .'> <li class="folder_list" >' . + '<div class="collapsable_container" data-id="' . $folder->getId() . '">' . + '<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>' . + '<ul>'; $children = $folder->getChildren(); foreach($children as $child) { diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php deleted file mode 100644 index fafbdb8fa..000000000 --- a/templates/part.listfolder.php +++ /dev/null @@ -1,13 +0,0 @@ -<?php - -echo '<ul class="folders"' . (($depth == 0) ? 'style="margin-left: 0px !important;"' : '') .'> <li class="folder_list" >' . - '<div class="collapsable_container" data-id="' . $folder->getId() . '">' . - '<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>' . - '<ul>'; - -?>
\ No newline at end of file |