garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

apply theme

Browse Source
This commit is contained in:
Athou
2014-08-09 19:21:59 +02:00
parent cf96a0a84e
commit afbbd07a13
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/app/js/controllers.js
View File

@@ -710,6 +710,11 @@ module.controller('FeedListCtrl', [
$scope.$emit('emitReload'); $scope.$emit('emitReload');
} }
}); });
$scope.$watch('settingsService.settings.theme', function(newValue, oldValue) {
if (newValue) {
angular.element('html').attr('id', 'theme-' + newValue);
}
});
$scope.limit = SettingsService.settings.viewMode == 'title' ? 10 : 5; $scope.limit = SettingsService.settings.viewMode == 'title' ? 10 : 5;
$scope.busy = false; $scope.busy = false;

3
src/main/java/com/commafeed/CommaFeedApplication.java
View File

@@ -133,6 +133,7 @@ public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
UserSettingsDAO userSettingsDAO = new UserSettingsDAO(sessionFactory); UserSettingsDAO userSettingsDAO = new UserSettingsDAO(sessionFactory);
FeedEntryStatusDAO feedEntryStatusDAO = new FeedEntryStatusDAO(sessionFactory, feedEntryDAO, feedEntryTagDAO, config); FeedEntryStatusDAO feedEntryStatusDAO = new FeedEntryStatusDAO(sessionFactory, feedEntryDAO, feedEntryTagDAO, config);
// Queuing system
FeedQueues queues = new FeedQueues(feedDAO, config, metrics); FeedQueues queues = new FeedQueues(feedDAO, config, metrics);
// Services // Services
@@ -151,8 +152,6 @@ public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
UserService userService = new UserService(feedCategoryDAO, userDAO, userSettingsDAO, feedSubscriptionService, encryptionService, UserService userService = new UserService(feedCategoryDAO, userDAO, userSettingsDAO, feedSubscriptionService, encryptionService,
config); config);
StartupService startupService = new StartupService(sessionFactory, userDAO, userService); StartupService startupService = new StartupService(sessionFactory, userDAO, userService);
// OPML
OPMLImporter opmlImporter = new OPMLImporter(feedCategoryDAO, feedSubscriptionService, cacheService); OPMLImporter opmlImporter = new OPMLImporter(feedCategoryDAO, feedSubscriptionService, cacheService);
OPMLExporter opmlExporter = new OPMLExporter(feedCategoryDAO, feedSubscriptionDAO); OPMLExporter opmlExporter = new OPMLExporter(feedCategoryDAO, feedSubscriptionDAO);