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

refactored tree, no more dropdown for feed editing

Browse Source
This commit is contained in:
Athou
2013-04-30 16:17:34 +02:00
parent bfde9241eb
commit 2d40c4292c
16 changed files with 444 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/webapp/css/app.css
View File

@@ -6,6 +6,11 @@
margin-bottom: 0px;
}
.horizontal-align {
padding-top: 5px;
line-height: 20px
}
.welcome .header {
margin: 20px 0 40px 0;
}

30
src/main/webapp/directives/category.html
View File

@@ -1,17 +1,9 @@
<li>
<div ng-mouseenter="hovered=node" ng-mouseleave="hovered=null" class="pointer" ui-if="showLabel">
<div class="dropdown pull-right">
<a data-toggle="dropdown" class="pull-right">
<i ng-class="{'icon-chevron-down': hovered==node && node.id != 'all'}" class="icon"></i>
</a>
<ul class="dropdown-menu">
<li>
<a ng-click="renameCategory(node)">Rename</a>
</li>
<li>
<a ng-click="deleteCategory(node)">Delete</a>
</li>
</ul>
<div class="pull-right" ng-click="showCategoryDetails(node)">
<i ng-class="{'icon-chevron-right': hovered==node}" class="icon"></i>
</div>
</div>
<span class="fldr">
<i ng-class="{'icon-caret-right': !node.expanded, 'icon-caret-down': node.expanded}" ng-click="toggleCategory(node)" ng-show="showChildren"></i>
@@ -32,22 +24,12 @@
<li ng-repeat="feed in node.feeds" ng-mouseenter="hovered=feed"
ng-mouseleave="hovered=null" ng-show="settingsService.settings.showRead == true || feed.unread > 0"
ng-class="{error: feed.message && feed.errorCount > 10}">
<div class="dropdown pull-right">
<a data-toggle="dropdown" class="pull-right">
<i ng-class="{'icon-chevron-down': hovered==feed}" class="icon"></i>
</a>
<ul class="dropdown-menu">
<li>
<a ng-click="renameFeed(feed)">Rename</a>
</li>
<li>
<a ng-click="unsubscribe(feed)">Unsubscribe</a>
</li>
</ul>
<div class="pull-right" ng-click="showFeedDetails(feed)">
<i ng-class="{'icon-chevron-right': hovered==feed}" class="icon pointer"></i>
</div>
<a ng-click="feedClicked(feed.id)" class="feed-link"
ng-class="{selected: (feed.id == selectedId && selectedType == 'feed'), unread: feed.unread }">
<favicon url="feed.feedUrl" />
<favicon url="feed.feedLink" />
{{formatFeedName(feed)}}
</a>
</li>

130
src/main/webapp/js/controllers.js
View File

@@ -169,6 +169,136 @@ function($scope, $timeout, $stateParams, $window, $location, $state, $route, Cat
});
}]);
module.controller('FeedDetailsCtrl', ['$scope', '$state', '$stateParams', 'FeedService', 'CategoryService', '$dialog',
function($scope, $state, $stateParams, FeedService, CategoryService, $dialog) {
$scope.CategoryService = CategoryService;
$scope.sub = FeedService.get({
id : $stateParams._id
});
$scope.back = function() {
$state.transitionTo('feeds.view', {
_id: $stateParams._id,
_type: 'feed'
});
};
$scope.unsubscribe = function() {
var sub = $scope.sub;
var title = 'Unsubscribe';
var msg = 'Unsubscribe from ' + sub.name + ' ?';
var btns = [ {
result : 'cancel',
label : 'Cancel'
}, {
result : 'ok',
label : 'OK',
cssClass : 'btn-primary'
} ];
$dialog.messageBox(title, msg, btns).open().then(
function(result) {
if (result == 'ok') {
var data = {
id : sub.id
};
FeedService.unsubscribe(data,
function() {
CategoryService.init();
});
$state.transitionTo('feeds.view', {
_id: 'all',
_type: 'category'
});
}
});
};
$scope.save = function() {
var sub = $scope.sub;
FeedService.modify({
id : sub.id,
name : sub.name,
categoryId : sub.categoryId
}, function() {
CategoryService.init();
$state.transitionTo('feeds.view', {
_id: 'all',
_type: 'category'
});
});
};
}]);
module.controller('CategoryDetailsCtrl', ['$scope', '$state', '$stateParams', 'FeedService', 'CategoryService', '$dialog',
function($scope, $state, $stateParams, FeedService, CategoryService, $dialog) {
$scope.CategoryService = CategoryService;
CategoryService.get(function() {
for(var i = 0; i < CategoryService.flatCategories.length; i++){
var cat = CategoryService.flatCategories[i];
if (cat.id == $stateParams._id) {
$scope.category = angular.copy(cat);
$scope.category.name = $scope.category.origName;
break;
}
}
});
$scope.back = function() {
$state.transitionTo('feeds.view', {
_id: $stateParams._id,
_type: 'category'
});
};
$scope.deleteCategory = function() {
var category = $scope.category;
var title = 'Delete category';
var msg = 'Delete category ' + category.name + ' ?';
var btns = [ {
result : 'cancel',
label : 'Cancel'
}, {
result : 'ok',
label : 'OK',
cssClass : 'btn-primary'
} ];
$dialog.messageBox(title, msg, btns).open().then(
function(result) {
if (result == 'ok') {
CategoryService.remove({
id : category.id
}, function() {
CategoryService.init();
});
$state.transitionTo('feeds.view', {
_id: 'all',
_type: 'category'
});
}
});
};
$scope.save = function() {
var cat = $scope.category;
CategoryService.modify({
id : cat.id,
name : cat.name,
parentId : cat.parentId
}, function() {
CategoryService.init();
$state.transitionTo('feeds.view', {
_id: 'all',
_type: 'category'
});
});
};
}]);
module.controller('ToolbarCtrl', ['$scope', '$http', '$state', '$stateParams',
'$route', '$location', 'SettingsService', 'EntryService', 'ProfileService', 'AnalyticsService', 'ServerService', 'FeedService',
function($scope, $http, $state, $stateParams, $route, $location,

81
src/main/webapp/js/directives.js
View File

@@ -112,32 +112,6 @@ module.directive('category', [ function() {
function($scope, $state, $dialog, FeedService, CategoryService,
SettingsService) {
$scope.settingsService = SettingsService;
$scope.unsubscribe = function(subscription) {
var title = 'Unsubscribe';
var msg = 'Unsubscribe from ' + subscription.name
+ ' ?';
var btns = [ {
result : 'cancel',
label : 'Cancel'
}, {
result : 'ok',
label : 'OK',
cssClass : 'btn-primary'
} ];
$dialog.messageBox(title, msg, btns).open().then(
function(result) {
if (result == 'ok') {
var data = {
id : subscription.id
};
FeedService.unsubscribe(data,
function() {
CategoryService.init();
});
}
});
};
$scope.formatCategoryName = function(category) {
var count = $scope.unreadCount({
@@ -181,52 +155,17 @@ module.directive('category', [ function() {
});
}
};
$scope.renameFeed = function(feed) {
var name = window.prompt('Rename feed : ', feed.name);
if (name && name != feed.name) {
feed.name = name;
FeedService.rename({
id : feed.id,
name : name
});
}
$scope.showFeedDetails = function(feed) {
$state.transitionTo('feeds.feed_details', {
_id: feed.id
});
};
$scope.renameCategory = function(category) {
var name = window.prompt('Rename category: ',
category.name);
if (name && name != category.name) {
category.name = name;
CategoryService.rename({
id : category.id,
name : name
});
}
};
$scope.deleteCategory = function(category) {
var title = 'Delete category';
var msg = 'Delete category ' + category.name + ' ?';
var btns = [ {
result : 'cancel',
label : 'Cancel'
}, {
result : 'ok',
label : 'OK',
cssClass : 'btn-primary'
} ];
$dialog.messageBox(title, msg, btns).open().then(
function(result) {
if (result == 'ok') {
CategoryService.remove({
id : category.id
}, function() {
CategoryService.init();
});
}
});
$scope.showCategoryDetails = function(category) {
$state.transitionTo('feeds.category_details', {
_id: category.id
});
};
$scope.toggleCategory = function(category) {

10
src/main/webapp/js/main.js
View File

@@ -23,6 +23,16 @@ function($routeProvider, $stateProvider, $urlRouterProvider) {
templateUrl : 'templates/feeds.view.html',
controller : 'FeedListCtrl'
});
$stateProvider.state('feeds.feed_details', {
url : '/details/feed/:_id',
templateUrl : 'templates/feeds.feed_details.html',
controller : 'FeedDetailsCtrl'
});
$stateProvider.state('feeds.category_details', {
url : '/details/category/:_id',
templateUrl : 'templates/feeds.category_details.html',
controller : 'CategoryDetailsCtrl'
});
$stateProvider.state('feeds.help', {
url : '/help',
templateUrl : 'templates/feeds.help.html',

12
src/main/webapp/js/services.js
View File

@@ -80,14 +80,15 @@ function($resource, $http) {
_method : 'unsubscribe'
}
},
rename : {
modify : {
method : 'POST',
params : {
_method : 'rename'
_method : 'modify'
}
}
};
var res = $resource('rest/feed/:_method', {}, actions);
res.get = $resource('rest/feed/get/:id').get;
return res;
}]);
@@ -102,7 +103,8 @@ function($resource, $http) {
}
array.push({
id : category.id,
name : name
name : name,
origName: category.name
});
if (category.children) {
for ( var i = 0; i < category.children.length; i++) {
@@ -142,10 +144,10 @@ function($resource, $http) {
_method : 'delete'
}
},
rename : {
modify : {
method : 'POST',
params : {
_method : 'rename'
_method : 'modify'
}
},
collapse : {

38
src/main/webapp/templates/feeds.category_details.html Normal file
View File

@@ -0,0 +1,38 @@
<div>
<div class="page-header">
<h3>Category details</h3>
</div>
<form name="form" class="form-horizontal" ng-submit="save()">
<div class="control-group" ng-class="{error : !form.name.$valid}">
<label class="control-label">Name</label>
<div class="controls">
<input type="text" name="name" ng-model="category.name" class="input-block-level" required></input>
<span class="help-block" ng-show="!form.name.$valid">Required</span>
</div>
</div>
<div class="control-group" ng-class="{error : !form.category.$valid}">
<label class="control-label">Parent category</label>
<div class="controls">
<select name="category" class="input-block-level" ng-model="cat.parentId"
ng-options="cat.id as cat.name for cat in CategoryService.flatCategories">
</select>
<span class="help-block" ng-show="!form.category.$valid">Required</span>
</div>
</div>
<div class="control-group">
<label class="control-label">Feed URL</label>
<div class="controls horizontal-align">
<a href="{{'rest/category/entriesAsFeed?id=' + cat.id}}" target="_blank">{{'rest/category/entriesAsFeed?id=' + cat.id}}</a>
</div>
</div>
<div class="form-actions">
<button type="submit" class="btn btn-primary">Save</button>
<button type="button" class="btn" ng-click="back()">Cancel</button>
<button type="button" class="btn btn-danger" ng-click="unsubscribe()">Unsubscribe</button>
</div>
</form>
</div>

51
src/main/webapp/templates/feeds.feed_details.html Normal file
View File

@@ -0,0 +1,51 @@
<div>
<div class="page-header">
<h3>Feed details</h3>
</div>
<form name="form" class="form-horizontal" ng-submit="save()">
<div class="control-group">
<label class="control-label">URL</label>
<div class="controls horizontal-align">
<a href="{{sub.feedUrl}}" target="_blank">{{sub.feedUrl}}</a>
</div>
</div>
<div class="control-group" ng-class="{error : !form.name.$valid}">
<label class="control-label">Name</label>
<div class="controls">
<input type="text" name="name" ng-model="sub.name" class="input-block-level" required></input>
<span class="help-block" ng-show="!form.name.$valid">Required</span>
</div>
</div>
<div class="control-group" ng-class="{error : !form.category.$valid}">
<label class="control-label">Category</label>
<div class="controls">
<select name="category" class="input-block-level" ng-model="sub.categoryId"
ng-options="cat.id as cat.name for cat in CategoryService.flatCategories">
</select>
<span class="help-block" ng-show="!form.category.$valid">Required</span>
</div>
</div>
<div class="control-group">
<label class="control-label">Last refresh</label>
<div class="controls horizontal-align">
<span>{{sub.lastRefresh|date:'medium'}}</span>
</div>
</div>
<div class="control-group">
<label class="control-label">Feed URL</label>
<div class="controls horizontal-align">
<a href="{{'rest/feed/entriesAsFeed?id=' + sub.id}}" target="_blank">{{'rest/feed/entriesAsFeed?id=' + sub.id}}</a>
</div>
</div>
<div class="form-actions">
<button type="submit" class="btn btn-primary">Save</button>
<button type="button" class="btn" ng-click="back()">Cancel</button>
<button type="button" class="btn btn-danger" ng-click="unsubscribe()">Unsubscribe</button>
</div>
</form>
</div>

2
src/main/webapp/templates/feeds.view.html
View File

@@ -13,7 +13,7 @@
<i ng-class="{'icon-star icon-star-yellow': entry.starred, 'icon-star-empty': !entry.starred}"
class="pointer"></i>
</span>
<favicon url="entry.feedUrl" />
<favicon url="entry.feedLink" />
{{entry.feedName}}
</span>
<span class="entry-date">{{entry.date | date: 'yyyy-MM-dd HH:mm'}}</span>