bookmarklet for next unread item

This commit is contained in:
Athou
2013-05-19 16:24:56 +02:00
parent fb1df96d29
commit eb198b74b0
8 changed files with 107 additions and 14 deletions

View File

@@ -936,6 +936,16 @@ function($scope, $location, $state, AdminSettingsService) {
};
}]);
module.controller('HelpController', [ '$scope', 'CategoryService',
'AnalyticsService',
function($scope, CategoryService, AnalyticsService) {
AnalyticsService.track();
$scope.CategoryService = CategoryService;
$scope.categoryId = 'all';
} ]);
module.controller('FooterController', [ '$scope', function($scope) {
var baseUrl = window.location.href.substring(0, window.location.href.lastIndexOf('#'));
@@ -943,4 +953,4 @@ module.controller('FooterController', [ '$scope', function($scope) {
$scope.subToMeUrl = baseUrl + 'rest/feed/subscribe?url={feed}';
$scope.subToMeName = hostname.indexOf('www.commafeed.com') !== -1 ? 'CommaFeed' : 'CommaFeed (' + hostname + ')';
} ]);
}]);

View File

@@ -30,11 +30,6 @@ app.config([ '$routeProvider', '$stateProvider', '$urlRouterProvider', '$httpPro
$httpProvider.responseInterceptors.push(interceptor);
var trackCtrl = [ 'AnalyticsService', function(AnalyticsService) {
AnalyticsService.track();
} ];
$stateProvider.state('feeds', {
'abstract' : true,
url : '/feeds',
@@ -63,7 +58,7 @@ app.config([ '$routeProvider', '$stateProvider', '$urlRouterProvider', '$httpPro
$stateProvider.state('feeds.help', {
url : '/help',
templateUrl : 'templates/feeds.help.html',
controller : trackCtrl
controller : 'HelpController'
});
$stateProvider.state('feeds.settings', {
url : '/settings',

View File

@@ -5,4 +5,5 @@
@import "components/admin-panel";
@import "components/toolbar";
@import "components/entry-list";
@import "components/subscription-list";
@import "components/subscription-list";
@import "components/help";

View File

@@ -0,0 +1,5 @@
.help .category-select {
margin: 0;
padding: 0;
height: auto;
}

View File

@@ -1,4 +1,4 @@
<div class="row-fluid">
<div class="row-fluid help">
<div class="span6">
<h4><i class="icon-question-sign"></i> ${toolbar.about}</h4>
<p>
@@ -21,15 +21,25 @@
</form>
<h4><i class="icon-puzzle-piece"></i> ${about.goodies}</h4>
<p>
${about.goodies.subscribe_url}: <a href="rest/feed/subscribe?url=FEED_URL_HERE" target="_blank">rest/feed/subscribe?url=FEED_URL_HERE</a>
</p>
<p>
<a href="https://chrome.google.com/webstore/detail/commafeed/bpbfpjiciblcfeganojjkfapnllbhdga" target="_blank">${about.goodies.chrome_extension}</a>
</p>
<p>
<a href="https://addons.mozilla.org/en-US/firefox/addon/commafeed/" target="_blank">${about.goodies.firefox_extension}</a>
</p>
<p>
${about.goodies.subscribe_url}: <a href="rest/feed/subscribe?url=FEED_URL_HERE" target="_blank">rest/feed/subscribe?url=FEED_URL_HERE</a>
</p>
<p>
${about.goodies.subscribe_bookmarklet}: <a href="https://www.subtome.com/settings.html" target="_blank">SubToMe</a>
</p>
<p>
${about.goodies.next_unread_bookmarklet}: ${subscribe.category}
<select ng-model="categoryId" ng-options="cat.id as cat.name for cat in CategoryService.flatCategories"
class="category-select">
</select>
<a href="next?category={{categoryId}}" target="_blank">${global.link}</a>
</p>
<h4><i class="icon-globe"></i> ${about.translation}</h4>
<p>