Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

search for entries

Browse Source
This commit is contained in:
Athou
2013-04-03 13:33:33 +02:00
parent 4c25bcdc1b
commit ed189c1c31
10 changed files with 135 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/webapp/directives/toolbar.html
View File

@@ -1,24 +1,28 @@
<div>
<div>
<div class="btn-group read-mode" data-toggle="buttons-radio">
<button type="button" class="btn" ng-model="settingsService.settings.readingMode" btn-radio="'unread'">Unread</button>
<button type="button" class="btn" ng-model="settingsService.settings.readingMode" btn-radio="'all'">All</button>
</div>
<div class="form-horizontal">
<span ui-if="showButtons()">
<div class="btn-group read-mode" data-toggle="buttons-radio">
<button type="button" class="btn" ng-model="settingsService.settings.readingMode" btn-radio="'unread'">Unread</button>
<button type="button" class="btn" ng-model="settingsService.settings.readingMode" btn-radio="'all'">All</button>
</div>
<button type="button" class="btn" ng-click="refresh()"><i class="icon-refresh"></i> Refresh</button>
<button type="button" class="btn" ng-click="markAllAsRead()"><i class="icon-ok"></i> Mark all as read</button>
<button type="button" class="btn" ng-click="refresh()"><i class="icon-refresh"></i> Refresh</button>
<button type="button" class="btn" ng-click="markAllAsRead()"><i class="icon-ok"></i> Mark all as read</button>
<div class="btn-group">
<a class="btn dropdown-toggle" data-toggle="dropdown" href="settings"><i class="icon-cog"></i> {{session.name}} <span class="caret"></span></a>
<ul class="dropdown-menu pull-right">
<li><a href="settings"><i class="icon-wrench"></i> Settings</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 href="logout"><i class="icon-user"></i> Logout</a></li>
</ul>
</div>
<div class="btn-group">
<a class="btn dropdown-toggle" data-toggle="dropdown" href="settings"><i class="icon-cog"></i> {{session.name}} <span class="caret"></span></a>
<ul class="dropdown-menu pull-right">
<li><a href="settings"><i class="icon-wrench"></i> Settings</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 href="logout"><i class="icon-user"></i> Logout</a></li>
</ul>
</div>
</span>
<form ng-submit="search()" class="input-append">
<input type="text" ng-model="keywords"></input>
<button class="btn" type="submit"><i class="icon-search"></i></button>
</form>
<div spinner shown="loading"></div>
</div>
</div>

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

@@ -110,6 +110,7 @@ module.controller('FeedListCtrl', function($scope, $stateParams, $http, $route,
$scope.selectedType = $stateParams._type;
$scope.selectedId = $stateParams._id;
$scope.keywords = $stateParams._keywords;
$scope.name = null;
$scope.message = null;
@@ -140,13 +141,8 @@ module.controller('FeedListCtrl', function($scope, $stateParams, $http, $route,
limit = $window.height() / 33;
limit = parseInt(limit, 10) + 5;
}
EntryService.get({
type : $scope.selectedType,
id : $scope.selectedId,
readType : $scope.settingsService.settings.readingMode,
offset : $scope.entries.length,
limit : limit
}, function(data) {
var callback = function(data) {
for ( var i = 0; i < data.entries.length; i++) {
$scope.entries.push(data.entries[i]);
}
@@ -154,7 +150,22 @@ module.controller('FeedListCtrl', function($scope, $stateParams, $http, $route,
$scope.message = data.message;
$scope.busy = false;
$scope.hasMore = data.entries.length == limit;
});
};
if (!$scope.keywords) {
EntryService.get({
type : $scope.selectedType,
id : $scope.selectedId,
readType : $scope.settingsService.settings.readingMode,
offset : $scope.entries.length,
limit : limit
}, callback);
} else {
EntryService.search({
keywords : $scope.keywords,
offset : $scope.entries.length,
limit : limit
}, callback);
}
};
$scope.mark = function(entry, read) {
@@ -282,8 +293,8 @@ module.controller('ManageUsersCtrl', function($scope, $state, $location,
};
});
module.controller('ManageUserCtrl', function($scope, $state, $stateParams, $dialog,
AdminUsersService) {
module.controller('ManageUserCtrl', function($scope, $state, $stateParams,
$dialog, AdminUsersService) {
$scope.user = $stateParams._id ? AdminUsersService.get({
id : $stateParams._id
}) : {

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

@@ -173,7 +173,7 @@ module.directive('category', function($compile) {
};
});
module.directive('toolbar', function($stateParams, $route, $location,
module.directive('toolbar', function($state, $stateParams, $route, $location,
SettingsService, EntryService, SubscriptionService, SessionService) {
return {
scope : {},
@@ -208,6 +208,21 @@ module.directive('toolbar', function($stateParams, $route, $location,
});
});
};
$scope.keywords = $stateParams._keywords;
$scope.search = function() {
if ($scope.keywords == $stateParams._keywords) {
$scope.refresh();
} else {
$state.transitionTo('feeds.search', {
_keywords : $scope.keywords
});
}
};
$scope.showButtons = function() {
return !$stateParams._keywords;
}
$scope.toAdmin = function() {
$location.path('admin');
};

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

@@ -13,6 +13,11 @@ app.config(function($routeProvider, $stateProvider, $urlRouterProvider) {
templateUrl : 'templates/feeds.view.html',
controller : 'FeedListCtrl'
});
$stateProvider.state('feeds.search', {
url : '/search/:_keywords',
templateUrl : 'templates/feeds.view.html',
controller : 'FeedListCtrl'
});
$stateProvider.state('admin', {
abstract : true,

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

@@ -147,6 +147,12 @@ module.factory('EntryService', function($resource, $http) {
params : {
_method : 'mark'
}
},
search : {
method : 'GET',
params : {
_method : 'search'
}
}
};
var res = $resource('rest/entries/:_method', {}, actions);

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

@@ -8,9 +8,9 @@
<div ng-repeat="entry in entries" class="entry">
<a scroll-to="isOpen && current == entry" scroll-to-offset="-58" href="{{entry.url}}" target="_blank" class="entry-heading" ng-click="entryClicked(entry, $event)"
ng-class="{open: current == entry, closed: current != entry}">
<span ui-if="selectedType == 'category'" class="feed-name">{{entry.feedName}}</span>
<span ui-if="keywords || selectedType == 'category'" class="feed-name">{{entry.feedName}}</span>
<span class="entry-date">{{entry.date}}</span>
<span class="entry-name" ng-class="{unread: entry.read == false, shrink: selectedType == 'category'}" ng-bind-html-unsafe="entry.title"></span>
<span class="entry-name" ng-class="{unread: entry.read == false, shrink: keywords || selectedType == 'category'}" ng-bind-html-unsafe="entry.title"></span>
</a>
<div class="entry-body" ui-if="isOpen && current == entry">