From f7a54d1f0d9271a953ade0b85950f8bdd73812a9 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Tue, 16 Apr 2013 13:12:24 +0200
Subject: [PATCH] about page placeholder

---
 src/main/webapp/js/controllers.js         |  3 +++
 src/main/webapp/js/main.js                |  4 ++++
 src/main/webapp/js/services.js            |  2 +-
 src/main/webapp/templates/_toolbar.html   |  1 +
 src/main/webapp/templates/feeds.help.html | 19 +++++++++++++++++++
 5 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 src/main/webapp/templates/feeds.help.html

diff --git a/src/main/webapp/js/controllers.js b/src/main/webapp/js/controllers.js
index be11bc4b..f5bc41c3 100644
--- a/src/main/webapp/js/controllers.js
+++ b/src/main/webapp/js/controllers.js
@@ -265,6 +265,9 @@ module.controller('ToolbarCtrl',
 			$scope.toProfile = function() {
 				$location.path('profile');
 			};
+			$scope.toHelp = function() {
+				$state.transitionTo('feeds.help');
+			};
 		});
 
 module.controller('FeedListCtrl', function($scope, $stateParams, $http, $route,
diff --git a/src/main/webapp/js/main.js b/src/main/webapp/js/main.js
index a0bc2167..13282263 100644
--- a/src/main/webapp/js/main.js
+++ b/src/main/webapp/js/main.js
@@ -18,6 +18,10 @@ app.config(function($routeProvider, $stateProvider, $urlRouterProvider) {
 		templateUrl : 'templates/feeds.view.html',
 		controller : 'FeedListCtrl'
 	});
+	$stateProvider.state('feeds.help', {
+		url : '/help',
+		templateUrl : 'templates/feeds.help.html'
+	});
 
 	$stateProvider.state('admin', {
 		abstract : true,
diff --git a/src/main/webapp/js/services.js b/src/main/webapp/js/services.js
index f7ac4d0e..60dd5bcc 100644
--- a/src/main/webapp/js/services.js
+++ b/src/main/webapp/js/services.js
@@ -103,7 +103,7 @@ module.factory('SubscriptionService', function($resource, $http) {
 
 	var res = $resource('rest/subscriptions/:_type/:_method', {}, actions);
 	s.init = function(callback) {
-		res.get(function(data) {
+		s.get(function(data) {
 			s.subscriptions = data;
 			s.flatCategories = flatten(s.subscriptions);
 			if (callback)
diff --git a/src/main/webapp/templates/_toolbar.html b/src/main/webapp/templates/_toolbar.html
index 793904a0..2f310a8c 100644
--- a/src/main/webapp/templates/_toolbar.html
+++ b/src/main/webapp/templates/_toolbar.html
@@ -20,6 +20,7 @@
 					<li><a ng-click="toProfile()"><i class="icon-user"></i> Profile</a></li>
 					<li ng-show="session.admin"><a ng-click="toAdmin()"><i class="icon-edit"></i> Admin</a></li>
 					<li class="divider"></li>
+					<li><a ng-click="toHelp()"><i class="icon-question-sign"></i> About</a></li>
 					<li><a href="logout"><i class="icon-off"></i> Logout</a></li>
 				</ul>
 			</div>
diff --git a/src/main/webapp/templates/feeds.help.html b/src/main/webapp/templates/feeds.help.html
new file mode 100644
index 00000000..b2a783df
--- /dev/null
+++ b/src/main/webapp/templates/feeds.help.html
@@ -0,0 +1,19 @@
+<div>
+	
+	<h3>CommaFeed</h3>
+	<p>
+		CommaFeed is an open-source project. Sources are hosted on <a href="https://github.com/Athou/commafeed" target="_blank">GitHub</a>.
+	</p>
+	<p>
+		If you encounter an issue, please report it on the <a href="https://github.com/Athou/commafeed/issues" target="_blank">issues page</a> of the GitHub project.
+	</p>
+	
+	<h3>REST API</h3>
+	<p>
+		CommaFeed is built on top of JAX-RS and AngularJS. As such, a REST API is available.
+	</p>
+	<p>
+		The documentation about the API is available <a href="api" target="_blank">here</a>.
+	</p>
+
+</div>
\ No newline at end of file