diff --git a/index.html b/index.html index 18ab006..4e8aca7 100644 --- a/index.html +++ b/index.html @@ -12,66 +12,5 @@ - - - - - diff --git a/webapp/partials/feedsView.html b/webapp/partials/feedsView.html new file mode 100644 index 0000000..84cbb4f --- /dev/null +++ b/webapp/partials/feedsView.html @@ -0,0 +1,33 @@ +
+
+

Freader

+
+
+ + {{addErrorText}} +
+ + +
+
+
+ +
+
+

{{feed.name}}

+

{{feed.description}}

+
+

{{article.title}}

+
+ + +
+
+

Do you really want to delete this feed ?

+ YesNo +
+
+
+
diff --git a/webapp/partials/loginView.html b/webapp/partials/loginView.html new file mode 100644 index 0000000..0e7ad03 --- /dev/null +++ b/webapp/partials/loginView.html @@ -0,0 +1,21 @@ +
+ +
+ Welcome to Freader +

Welcome to Freader

+
+
+

{{errorMsg}}

+
+ + +
+
+ + +
+ + {{text.changeAction}} +
+ +
diff --git a/webapp/webapp.js b/webapp/webapp.js index 2bab4fa..7fca4ec 100644 --- a/webapp/webapp.js +++ b/webapp/webapp.js @@ -7,8 +7,8 @@ angular.module('backend', ['ngResource']). angular.module('Freader', ['backend']) .config(function ($routeProvider) { $routeProvider. - when("/", {controller: loginCtrl, template: document.getElementById('loginView').text}). - when("/feeds", {controller: feedsCtrl, template: document.getElementById('feedsView').text}). + when("/", {controller: loginCtrl, templateUrl: 'partials/loginView.html'}). + when("/feeds", {controller: feedsCtrl, templateUrl: 'partials/feedsView.html'}). otherwise({redirectTo:'/'}); });