diff options
| -rw-r--r-- | ajax/addfeedfolder.php | 2 | ||||
| -rw-r--r-- | css/news.css | 1 | ||||
| -rw-r--r-- | index.php | 6 | ||||
| -rw-r--r-- | templates/part.feeds.php | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/ajax/addfeedfolder.php b/ajax/addfeedfolder.php index e643c861d..a8a0fd3d5 100644 --- a/ajax/addfeedfolder.php +++ b/ajax/addfeedfolder.php @@ -5,7 +5,7 @@ OCP\JSON::checkAppEnabled('news'); $foldermapper = new OC_News_FolderMapper(OCP\USER::getUser()); -$allfeeds = $foldermapper->populate('All Feeds', 0); +$allfeeds = $foldermapper->populate('Everything', 0); if ($allfeeds) { $feedid = isset( $_GET['feedid'] ) ? $_GET['feedid'] : null; diff --git a/css/news.css b/css/news.css index 16c4dd486..87d8e72e0 100644 --- a/css/news.css +++ b/css/news.css @@ -14,6 +14,7 @@ li { padding-right: 0px !important; } /* #dropdownBtn { background: url('%webroot%/core/img/actions/triangle-s.svg') no-repeat right center; } */ #dropdownBtn { width: 9em; padding-right:20px; background: url('%webroot%/core/img/actions/triangle-s.svg') no-repeat right center; } + ul.controls li { float: left; } .accordion .title_unread { background: #DCDCDC; font-size: 12px; border-bottom:1px solid #ccc; font-weight:bold;} @@ -20,14 +20,16 @@ OCP\App::setActiveNavigationEntry('news'); OCP\Util::addscript('news','news'); OCP\Util::addStyle('news','news'); +$l = OC_L10N::get('news'); + $foldermapper = new OC_News_FolderMapper(OCP\USER::getUser()); -$allfeeds = $foldermapper->populate('All Feeds', 0); +$allfeeds = $foldermapper->populate($l->t('Everything'), 0); if ($allfeeds) { $feedid = isset( $_GET['feedid'] ) ? $_GET['feedid'] : null; if ($feedid == null) { - + } } else { diff --git a/templates/part.feeds.php b/templates/part.feeds.php index 3fbf4c08d..60dc4efbc 100644 --- a/templates/part.feeds.php +++ b/templates/part.feeds.php @@ -5,7 +5,7 @@ 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>' . - '<button class="svg action" id="feeds_edit" title="' . $l->t('Edit feed') . '"></button>' . + '<button class="svg action" id="feeds_edit" title="' . $l->t('Rename folder') . '"></button>' . '</div>'; echo '<ul>'; $children = $folder->getChildren(); |