diff options
| -rw-r--r-- | js/app/Config.js | 6 | ||||
| -rw-r--r-- | js/app/Run.js | 4 | ||||
| -rw-r--r-- | js/controller/ContentController.js | 14 | ||||
| -rw-r--r-- | l10n/fr.js | 1 | ||||
| -rw-r--r-- | l10n/fr.json | 1 | ||||
| -rw-r--r-- | templates/part.content.php | 10 | ||||
| -rw-r--r-- | templates/part.navigation.starredfeed.php | 2 |
7 files changed, 7 insertions, 31 deletions
diff --git a/js/app/Config.js b/js/app/Config.js index 8ac503b44..f7c62e7ae 100644 --- a/js/app/Config.js +++ b/js/app/Config.js @@ -191,12 +191,6 @@ app.config(function ($routeProvider, $provide, $httpProvider, $locationProvider) resolve: getItemResolve(feedType.STARRED), type: feedType.STARRED }) - .when('/items/shared', { - controller: 'ContentController as Content', - templateUrl: 'content.html', - resolve: getItemResolve(feedType.SHARED), - type: feedType.SHARED - }) .when('/items/unread', { controller: 'ContentController as Content', templateUrl: 'content.html', diff --git a/js/app/Run.js b/js/app/Run.js index 6aa79f7dd..1a1572864 100644 --- a/js/app/Run.js +++ b/js/app/Run.js @@ -45,10 +45,6 @@ app.run(function ($rootScope, $location, $http, $q, $interval, $route, Loading, url = '/items/starred'; break; - case FEED_TYPE.SHARED: - url = '/items/shared'; - break; - case FEED_TYPE.EXPLORE: url = '/explore'; break; diff --git a/js/controller/ContentController.js b/js/controller/ContentController.js index 97520f72c..06389ef14 100644 --- a/js/controller/ContentController.js +++ b/js/controller/ContentController.js @@ -89,9 +89,7 @@ app.controller('ContentController', function (Publisher, FeedResource, ItemResou if (!item.keepUnread && item.unread === true) { ItemResource.markItemRead(itemId); - if (item.isShared === false) { - FeedResource.markItemOfFeedRead(item.feedId); - } + FeedResource.markItemOfFeedRead(item.feedId); } }; @@ -103,9 +101,7 @@ app.controller('ContentController', function (Publisher, FeedResource, ItemResou var item = ItemResource.get(itemId); if (!item.unread) { ItemResource.markItemRead(itemId, false); - if (item.isShared === false) { - FeedResource.markItemOfFeedUnread(item.feedId); - } + FeedResource.markItemOfFeedUnread(item.feedId); } item.keepUnread = !item.keepUnread; @@ -140,10 +136,8 @@ app.controller('ContentController', function (Publisher, FeedResource, ItemResou itemIds.forEach(function (itemId) { var item = ItemResource.get(itemId); if (!item.keepUnread) { - if (item.isShared === false) { - ids.push(itemId); - feedIds.push(item.feedId); - } + ids.push(itemId); + feedIds.push(item.feedId); } }); diff --git a/l10n/fr.js b/l10n/fr.js index 06682e787..3f3922294 100644 --- a/l10n/fr.js +++ b/l10n/fr.js @@ -38,7 +38,6 @@ OC.L10N.register( "Remove keep article unread" : "Marquer l'article comme lu", "by" : "par", "from" : "de", - "shared from": "partagé par", "Play audio" : "Ecouter", "Download audio" : "Télécharger le son", "Download video" : "Télécharger la vidéo", diff --git a/l10n/fr.json b/l10n/fr.json index 4ab10bb92..25bbdbed8 100644 --- a/l10n/fr.json +++ b/l10n/fr.json @@ -36,7 +36,6 @@ "Remove keep article unread" : "Marquer l'article comme lu", "by" : "par", "from" : "de", - "shared from" : "partagé par", "Play audio" : "Ecouter", "Download audio" : "Télécharger le son", "Download video" : "Télécharger la vidéo", diff --git a/templates/part.content.php b/templates/part.content.php index 8ea8b168f..9ce6ae10e 100644 --- a/templates/part.content.php +++ b/templates/part.content.php @@ -122,18 +122,12 @@ <span class="author" ng-show="item.author"> <?php p($l->t('by')) ?> {{ ::item.author }} </span> - <span ng-if="item.sharedBy == ''" class="source"><?php p($l->t('from')) ?> - <a ng-href="#/items/feeds/{{ item.feedId }}/"> + <span class="source"><?php p($l->t('from')) ?> + <a ng-href="#/items/feeds/{{ ::item.feedId }}/"> {{ ::Content.getFeed(item.feedId).title }} <img ng-if="Content.getFeed(item.feedId).faviconLink && !Content.isCompactView()" src="{{ ::Content.getFeed(item.feedId).faviconLink }}" alt="favicon"> </a> </span> - <span ng-if="item.sharedBy != ''" class="source"><?php p($l->t('shared from')) ?> - <a ng-href="#/items/feeds/{{ item.feedId }}/"> - {{ :: item.sharedBy}} - <img ng-if="Content.getFeed(item.feedId).faviconLink && !Content.isCompactView()" src="{{ ::Content.getFeed(item.feedId).faviconLink }}" alt="favicon"> - </a> - </span> </div> <div class="enclosure" ng-if="Content.getMediaType(item.enclosureMime) == 'audio'"> diff --git a/templates/part.navigation.starredfeed.php b/templates/part.navigation.starredfeed.php index 7846f060d..1f096d57d 100644 --- a/templates/part.navigation.starredfeed.php +++ b/templates/part.navigation.starredfeed.php @@ -4,7 +4,7 @@ }" class="with-counter starred-feed"> - <a class="icon-starred" ng-href="#/items/shared/"> + <a class="icon-starred" ng-href="#/items/starred/"> <?php p($l->t('Starred')) ?> </a> |