diff --git a/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryCallbackPage.html b/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryCallbackPage.html index 9f373f02..2ef21f7e 100644 --- a/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryCallbackPage.html +++ b/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryCallbackPage.html @@ -5,15 +5,19 @@
-
- New Password: - -
- Confirm: - -
- - + +
+ + +
+
+ + +
+
+ + +
diff --git a/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryPage.html b/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryPage.html index 19940bfb..03c85239 100644 --- a/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryPage.html +++ b/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryPage.html @@ -2,15 +2,18 @@
-
+
-
- Email: - -
- - + +
+ + +
+
+ + +
diff --git a/src/main/java/com/commafeed/frontend/pages/WelcomePage.html b/src/main/java/com/commafeed/frontend/pages/WelcomePage.html index 5b128471..3048b192 100644 --- a/src/main/java/com/commafeed/frontend/pages/WelcomePage.html +++ b/src/main/java/com/commafeed/frontend/pages/WelcomePage.html @@ -3,8 +3,8 @@
-
-
+
+
@@ -23,14 +23,14 @@
-
-
+
+

Login

-
+

Register

@@ -40,7 +40,7 @@
-
+
© CommaFeed diff --git a/src/main/java/com/commafeed/frontend/pages/components/LoginPanel.html b/src/main/java/com/commafeed/frontend/pages/components/LoginPanel.html index 760e0c23..76550dab 100644 --- a/src/main/java/com/commafeed/frontend/pages/components/LoginPanel.html +++ b/src/main/java/com/commafeed/frontend/pages/components/LoginPanel.html @@ -4,24 +4,20 @@
-
- -
- -
+
+ +
-
- -
- -
+
+ +
-

-

+ -

+
Forgot password? diff --git a/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.html b/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.html index de60c3d6..8ef739e0 100644 --- a/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.html +++ b/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.html @@ -4,23 +4,17 @@
-
- -
- -
+
+ +
-
- -
- -
+
+ +
-
- -
- -
+
+ +
diff --git a/src/main/webapp/js/controllers.js b/src/main/webapp/js/controllers.js index 4ad5a90f..ac1b557f 100644 --- a/src/main/webapp/js/controllers.js +++ b/src/main/webapp/js/controllers.js @@ -30,36 +30,16 @@ module.run(['$rootScope', function($rootScope) { }); }]); -module.controller('SubscribeCtrl', ['$scope', 'FeedService', 'CategoryService', 'MobileService', - function($scope, FeedService, CategoryService, MobileService) { +module.controller('SubscribeCtrl', ['$scope', '$location', 'FeedService', 'CategoryService', 'MobileService', + function($scope, $location, FeedService, CategoryService, MobileService) { - $scope.opts = { - backdropFade : true, - dialogFade : true + $scope.sub = { + categoryId : 'all' }; - $scope.isOpen = false; - $scope.isOpenImport = false; - $scope.sub = {}; - $scope.CategoryService = CategoryService; $scope.MobileService = MobileService; - $scope.search = function() { - $scope.$emit('emitFeedSearch'); - }; - - $scope.open = function() { - $scope.sub = { - categoryId : $scope.sub.categoryId || 'all' - }; - $scope.isOpen = true; - }; - - $scope.close = function() { - $scope.isOpen = false; - }; - // 'ok', 'loading' or 'failed' $scope.state = 'ok'; $scope.urlChanged = function() { @@ -88,39 +68,45 @@ module.controller('SubscribeCtrl', ['$scope', 'FeedService', 'CategoryService', } FeedService.subscribe($scope.sub, function() { CategoryService.init(); - $scope.close(); + $location.path('/'); }, function(data) { $scope.state = 'failed'; $scope.sub.title = 'ERROR: ' + data.data; }); }; - $scope.openImport = function() { - $scope.isOpenImport = true; + $scope.back = function() { + $location.path('/'); }; + }]); - $scope.closeImport = function() { - $scope.isOpenImport = false; - }; +module.controller('NewCategoryCtrl', ['$scope', '$location', 'FeedService', 'CategoryService', 'MobileService', + function($scope, $location, FeedService, CategoryService, MobileService) { - $scope.cat = {}; + $scope.CategoryService = CategoryService; + $scope.MobileService = MobileService; - $scope.openCategory = function() { - $scope.isOpenCategory = true; - $scope.cat = { - parentId : 'all' - }; - }; - - $scope.closeCategory = function() { - $scope.isOpenCategory = false; + $scope.cat = { + parentId : 'all' }; $scope.saveCategory = function() { CategoryService.add($scope.cat, function() { CategoryService.init(); }); - $scope.closeCategory(); + $location.path('/'); + }; + + $scope.back = function() { + $location.path('/'); + }; + }]); + +module.controller('ImportCtrl', ['$scope', '$location', 'FeedService', 'CategoryService', 'MobileService', + function($scope, $location, FeedService, CategoryService, MobileService) { + + $scope.back = function() { + $location.path('/'); }; }]); diff --git a/src/main/webapp/js/main.js b/src/main/webapp/js/main.js index c7d85b42..cdab06e3 100644 --- a/src/main/webapp/js/main.js +++ b/src/main/webapp/js/main.js @@ -39,6 +39,21 @@ app.config(['$routeProvider', '$stateProvider', '$urlRouterProvider', '$httpProv templateUrl : 'templates/feeds.view.html', controller : 'FeedListCtrl' }); + $stateProvider.state('feeds.subscribe', { + url : '/subscribe', + templateUrl : 'templates/feeds.subscribe.html', + controller : 'SubscribeCtrl' + }); + $stateProvider.state('feeds.new_category', { + url : '/add_category', + templateUrl : 'templates/feeds.new_category.html', + controller : 'NewCategoryCtrl' + }); + $stateProvider.state('feeds.import', { + url : '/import', + templateUrl : 'templates/feeds.import.html', + controller : 'ImportCtrl' + }); $stateProvider.state('feeds.search', { url : '/search/:_keywords', templateUrl : 'templates/feeds.view.html', diff --git a/src/main/webapp/sass/components/_entry-list.scss b/src/main/webapp/sass/components/_entry-list.scss index 5e63e04b..579c0a99 100644 --- a/src/main/webapp/sass/components/_entry-list.scss +++ b/src/main/webapp/sass/components/_entry-list.scss @@ -14,6 +14,7 @@ .entrylist-header h3 { margin: 0; + line-height: 40px; } .entrylist-header a { @@ -70,7 +71,7 @@ #feed-accordion .entry-heading-link { color: black; - height: 20px; + height: 32px; display: block; cursor: pointer; padding: 6px 0px; diff --git a/src/main/webapp/sass/components/_subscription-list.scss b/src/main/webapp/sass/components/_subscription-list.scss index b0f951b3..b4193b56 100644 --- a/src/main/webapp/sass/components/_subscription-list.scss +++ b/src/main/webapp/sass/components/_subscription-list.scss @@ -48,6 +48,7 @@ .css-treeview ul { list-style: none; margin-left: 0px; + padding: 0; } .css-treeview li { diff --git a/src/main/webapp/sass/components/_toolbar.scss b/src/main/webapp/sass/components/_toolbar.scss index ce524784..8bd4754d 100644 --- a/src/main/webapp/sass/components/_toolbar.scss +++ b/src/main/webapp/sass/components/_toolbar.scss @@ -1,4 +1,3 @@ - .toolbar { padding-top: 10px; padding-bottom: 10px; @@ -12,3 +11,6 @@ display: inline-block; } +.toolbar .keywords { + width: 244px; +} \ No newline at end of file diff --git a/src/main/webapp/sass/generic/_misc.scss b/src/main/webapp/sass/generic/_misc.scss index a376cdac..29fb68bb 100644 --- a/src/main/webapp/sass/generic/_misc.scss +++ b/src/main/webapp/sass/generic/_misc.scss @@ -1,3 +1,11 @@ +.container-full { + width: 100%; + margin: 0 auto; + padding-right: 20px; + padding-left: 20px; + padding-left: 20px; +} + .pointer { cursor: pointer; } @@ -50,6 +58,7 @@ .welcome .preview { margin: 20px 0 20px 0; + max-width: 100%; } .welcome .demo { diff --git a/src/main/webapp/templates/_category.html b/src/main/webapp/templates/_category.html index c310a426..786cbdd2 100644 --- a/src/main/webapp/templates/_category.html +++ b/src/main/webapp/templates/_category.html @@ -7,42 +7,31 @@
- + - - {{categoryLabel(node)}} - - - {{categoryCountLabel(node)}} - + {{categoryLabel(node)}} + {{categoryCountLabel(node)}}
diff --git a/src/main/webapp/templates/_feedsearch.html b/src/main/webapp/templates/_feedsearch.html index 4b983eb2..fbdb837d 100644 --- a/src/main/webapp/templates/_feedsearch.html +++ b/src/main/webapp/templates/_feedsearch.html @@ -1,19 +1,17 @@
-
+

- +

${feedsearch.help}
${feedsearch.result_prefix} - + diff --git a/src/main/webapp/templates/_footer.html b/src/main/webapp/templates/_footer.html index c2735a83..167cc2b6 100644 --- a/src/main/webapp/templates/_footer.html +++ b/src/main/webapp/templates/_footer.html @@ -1,3 +1,3 @@
- +
\ No newline at end of file diff --git a/src/main/webapp/templates/_metrics.meter.html b/src/main/webapp/templates/_metrics.meter.html index a9068268..dec86966 100644 --- a/src/main/webapp/templates/_metrics.meter.html +++ b/src/main/webapp/templates/_metrics.meter.html @@ -3,7 +3,7 @@
Mean
{{metric.meanRate | number:2}}
- +
1 min
{{metric.oneMinuteRate | number:2}}
@@ -12,9 +12,9 @@
15 min
{{metric.fifteenMinuteRate | number:2}}
- +
Total
{{metric.count}}
- +
\ No newline at end of file diff --git a/src/main/webapp/templates/_shortcuts.html b/src/main/webapp/templates/_shortcuts.html index 0e99352e..527c4038 100644 --- a/src/main/webapp/templates/_shortcuts.html +++ b/src/main/webapp/templates/_shortcuts.html @@ -4,19 +4,19 @@
k
${about.shortcuts.open_previous_entry}
- +
${about.shortcuts.spacebar}
${about.shortcuts.move_page_down_up}
- +
n
${about.shortcuts.focus_next_entry}
p
${about.shortcuts.focus_previous_entry}
- +
shift+j,shift+n
${about.shortcuts.open_next_feed}
- +
shift+k,shift+p
${about.shortcuts.open_previous_feed}
@@ -25,35 +25,47 @@
v
${about.shortcuts.open_current_entry_in_new_window}
- +
b
${about.shortcuts.open_current_entry_in_new_window_background}
- +
s
${about.shortcuts.star_unstar}
- +
m
${about.shortcuts.mark_current_entry}
- +
shift+a
${about.shortcuts.mark_all_as_read}
${about.shortcuts.mouse_middleclick}
${about.shortcuts.open_in_new_tab_mark_as_read}
- +
f
${about.shortcuts.fullscreen}
- +
+,-
${about.shortcuts.font_size}
- -
g a
+ +
+ g + + a +
${about.shortcuts.go_to_all}
- -
g s
+ +
+ g + + s +
${about.shortcuts.go_to_starred}
- -
g u
+ +
+ g + + u +
${about.shortcuts.feed_search}
- + \ No newline at end of file diff --git a/src/main/webapp/templates/_subscribe.html b/src/main/webapp/templates/_subscribe.html deleted file mode 100644 index 968e0760..00000000 --- a/src/main/webapp/templates/_subscribe.html +++ /dev/null @@ -1,109 +0,0 @@ -
- -
- - - -
- -
- -
- -
-
- -

${tree.subscribe}

-
- -
-
- -
- - ${global.required} -
-
-
- -
- - ${global.required} -
-
-
- -
- - ${global.required} -
-
-
-
- - -
- -
-
-
- -

${tree.import}

-
-
-
-
- -
- -
-
-
-
- - -
-
-
-
-
- -

${tree.new_category}

-
-
-
-
- -
- - ${global.required} -
-
-
- -
- - ${global.required} -
-
-
-
- - -
-
-
-
\ No newline at end of file diff --git a/src/main/webapp/templates/_toolbar.html b/src/main/webapp/templates/_toolbar.html index 7f437643..ee7baa24 100644 --- a/src/main/webapp/templates/_toolbar.html +++ b/src/main/webapp/templates/_toolbar.html @@ -1,84 +1,132 @@
-
- +
- - + + + + + +
- -
- +
- -
- +
-
- +
- - + +
- +
- - + +
- +
- - + + + + + +
- +
- -
-
- - -
+
+
+ + + + +
+
- +
diff --git a/src/main/webapp/templates/_tree.html b/src/main/webapp/templates/_tree.html index b1b2fa80..cbe2bb9d 100644 --- a/src/main/webapp/templates/_tree.html +++ b/src/main/webapp/templates/_tree.html @@ -1,15 +1,48 @@ -
- +
+ +
+ +
+
    + + + + +
  • + +
    • +
+
\ No newline at end of file diff --git a/src/main/webapp/templates/admin.metrics.html b/src/main/webapp/templates/admin.metrics.html index 908f25d4..3f5aeacd 100644 --- a/src/main/webapp/templates/admin.metrics.html +++ b/src/main/webapp/templates/admin.metrics.html @@ -4,10 +4,14 @@ - - - - - - + + + + + +
\ No newline at end of file diff --git a/src/main/webapp/templates/admin.settings.html b/src/main/webapp/templates/admin.settings.html index 918f3998..231749f4 100644 --- a/src/main/webapp/templates/admin.settings.html +++ b/src/main/webapp/templates/admin.settings.html @@ -10,182 +10,171 @@
-
-
-
- -
- +
+
+
+ +
+ The URL in your address bar right now, up to the # (not included)
-
- -
- +
+ +
+
+ +
-
- -
- +
+ +
+
+ +
-
- -
- +
+ +
+
-
- -
- +
+ +
+
-
- -
- +
+ +
+
-
- -
- +
+ +
+ Requires restart
-
- -
- +
+ +
+ Requires restart
-
- -
-
-
-
- -
- +
+
+ +
+
-
- -
- +
+ +
+
-
- -
- +
+ +
+
+ +
-
- -
- +
+ +
+
-
- -
- +
+ +
+
-
- -
- - Don't use this unless you know what you're doing! +
+ +
+
+ + Don't use this unless you know what you're doing! +
-
- -
- +
+ +
+
+ +
-
- -
- +
+ +
+
+ +
-
- -
-
-
- -
- +
+ +
+
-
- -
- +
+ +
+ 0 = keep forever
-
- -
- +
+ +
+
-
- -
- +
+ +
+
+ +
-
-
- +
+
+
diff --git a/src/main/webapp/templates/admin.useradd.html b/src/main/webapp/templates/admin.useradd.html index 81c6ab6b..ace68a95 100644 --- a/src/main/webapp/templates/admin.useradd.html +++ b/src/main/webapp/templates/admin.useradd.html @@ -3,42 +3,37 @@

Add user

- {{alert.msg}} + {{alert.msg}}
-
- -
- +
+ +
+
-
- -
- +
+ +
+
-
- -
+
+ +
-
- -
+
+ +
-
-
- +
+
+
diff --git a/src/main/webapp/templates/admin.useredit.html b/src/main/webapp/templates/admin.useredit.html index 24d0ed84..f8f8bd97 100644 --- a/src/main/webapp/templates/admin.useredit.html +++ b/src/main/webapp/templates/admin.useredit.html @@ -3,51 +3,45 @@

Edit user

- {{alert.msg}} + {{alert.msg}}
-
- -
- +
+ +
+
-
- -
- - Leave blank if you don't want to change the password. +
+ +
+ + Leave blank if you don't want to change the password.
-
- -
- +
+ +
+
-
- -
+
+ +
-
- -
+
+ +
-
-
- - +
+
+ +
diff --git a/src/main/webapp/templates/admin.userlist.html b/src/main/webapp/templates/admin.userlist.html index 97440525..1f68a9a6 100644 --- a/src/main/webapp/templates/admin.userlist.html +++ b/src/main/webapp/templates/admin.userlist.html @@ -5,8 +5,8 @@
- - + +
diff --git a/src/main/webapp/templates/feeds.category_details.html b/src/main/webapp/templates/feeds.category_details.html index 6ae5b726..5fa7a15f 100644 --- a/src/main/webapp/templates/feeds.category_details.html +++ b/src/main/webapp/templates/feeds.category_details.html @@ -3,43 +3,45 @@

${details.category_details}

-
- -
- +
+ +
+ ${global.required}
-
- -
- ${global.required}
- -
- -
- + +
+ +
+
-
- -
+
+ +
${global.link} ${details.generate_api_key_first}
-
- - - +
+
+ + + +
diff --git a/src/main/webapp/templates/feeds.feed_details.html b/src/main/webapp/templates/feeds.feed_details.html index c96b605b..0d8450e8 100644 --- a/src/main/webapp/templates/feeds.feed_details.html +++ b/src/main/webapp/templates/feeds.feed_details.html @@ -3,76 +3,77 @@

${details.feed_details}

-
- -
+
+ +
{{sub.feedUrl}}
-
- -
+
+ +
{{sub.feedLink}}
-
- -
- - ${global.required} +
+ +
+ ${global.required}
-
- -
- - - ${global.required} + ${global.required}
-
- -
- +
+ +
+
-
- -
+
+ +
{{sub.lastRefresh|entryDate}}
- -
- -
+ +
+ +
{{sub.nextRefresh|entryDate:"${details.queued_for_refresh}" }}
- -
- -
+ +
+ +
{{sub.message}}
-
- -
+
+ +
${global.link} ${details.generate_api_key_first}
-
- - - +
+
+ + + +
diff --git a/src/main/webapp/templates/feeds.help.html b/src/main/webapp/templates/feeds.help.html index 02fa4b49..5a640d95 100644 --- a/src/main/webapp/templates/feeds.help.html +++ b/src/main/webapp/templates/feeds.help.html @@ -1,29 +1,38 @@ -
-
- +
+
+
-

${toolbar.about}

+

+ + ${toolbar.about} +

- ${about.line1_prefix}GitHub${about.line1_suffix} + ${about.line1_prefix} + GitHub + ${about.line1_suffix}

- ${about.line2_prefix}GitHub${about.line2_suffix} + ${about.line2_prefix} + GitHub + ${about.line2_suffix}

${about.version} {{infos.version}} ({{infos.gitCommit}})
- +
-

${toolbar.donate}

-

- ${about.line3} -

-
- +
-

${about.translation}

+

+ + ${about.translation} +

+

${about.translation.message}

- ${about.translation.message} -

-

- - ${about.translation.link} - + ${about.translation.link}

-

${about.rest_api}

-

- ${about.rest_api.line1} -

+

+ + ${about.rest_api} +

+

${about.rest_api.line1}

${about.rest_api.link_to_documentation}

-
+
-

${about.keyboard_shortcuts}

+

+ + ${about.keyboard_shortcuts} +

- +
-

${about.announcements}

+

+ + ${about.announcements} +

- +
- +
diff --git a/src/main/webapp/templates/feeds.html b/src/main/webapp/templates/feeds.html index 2df55ea9..38a48f0d 100644 --- a/src/main/webapp/templates/feeds.html +++ b/src/main/webapp/templates/feeds.html @@ -1,13 +1,12 @@ -
-
-
+
+
+
-
-
+
diff --git a/src/main/webapp/templates/feeds.import.html b/src/main/webapp/templates/feeds.import.html new file mode 100644 index 00000000..f76e688b --- /dev/null +++ b/src/main/webapp/templates/feeds.import.html @@ -0,0 +1,19 @@ +
+
+

${tree.import}

+
+ +
+ +
+ +
+
+
+
+ + +
+
+ +
\ No newline at end of file diff --git a/src/main/webapp/templates/feeds.new_category.html b/src/main/webapp/templates/feeds.new_category.html new file mode 100644 index 00000000..dae60d8f --- /dev/null +++ b/src/main/webapp/templates/feeds.new_category.html @@ -0,0 +1,29 @@ +
+
+

${tree.new_category}

+
+
+
+ +
+ + ${global.required} +
+
+
+ +
+ + ${global.required} +
+
+
+
+ + +
+
+
+
\ No newline at end of file diff --git a/src/main/webapp/templates/feeds.subscribe.html b/src/main/webapp/templates/feeds.subscribe.html new file mode 100644 index 00000000..3cb0e852 --- /dev/null +++ b/src/main/webapp/templates/feeds.subscribe.html @@ -0,0 +1,37 @@ +
+
+

${tree.subscribe}

+
+
+
+ +
+ + ${global.required} +
+
+
+ +
+ + ${global.required} +
+
+
+ +
+ + ${global.required} +
+
+
+
+ + +
+
+
+
\ No newline at end of file diff --git a/src/main/webapp/templates/feeds.tag_details.html b/src/main/webapp/templates/feeds.tag_details.html index 20514488..3e8a3016 100644 --- a/src/main/webapp/templates/feeds.tag_details.html +++ b/src/main/webapp/templates/feeds.tag_details.html @@ -3,16 +3,20 @@

${details.tag_details}

-
- -
- ${global.link} - ${details.generate_api_key_first} +
+ +
+
+ ${global.link} + ${details.generate_api_key_first} +
-
- +
+
+ +
diff --git a/src/main/webapp/templates/feeds.view.html b/src/main/webapp/templates/feeds.view.html index 3915bf45..5c74fb75 100644 --- a/src/main/webapp/templates/feeds.view.html +++ b/src/main/webapp/templates/feeds.view.html @@ -70,15 +70,16 @@ ${global.download}
-
- - +
+
- - +
+
+ +