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

fix bootstrap dialogs

Browse Source
This commit is contained in:
Athou
2013-11-28 09:40:50 +01:00
parent b8f0af5b2e
commit 8f6aa0896b
10 changed files with 104 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/i18n/en.properties
View File

@@ -87,6 +87,8 @@ details.queued_for_refresh=Queued for refresh
details.feed_url=Feed URL details.feed_url=Feed URL
details.generate_api_key_first=Generate an API key in your profile first. details.generate_api_key_first=Generate an API key in your profile first.
details.unsubscribe=Unsubscribe details.unsubscribe=Unsubscribe
details.unsubscribe_confirmation=Are you sure you want to unsubscribe from this feed?
details.delete_category_confirmation=Are you sure you want to delete this category?
details.category_details=Category details details.category_details=Category details
details.tag_details=Tag details details.tag_details=Tag details
details.parent_category=Parent category details.parent_category=Parent category
@@ -103,6 +105,7 @@ profile.generate_new_api_key=Generate new API key
profile.generate_new_api_key_info=Changing password will generate a new API key profile.generate_new_api_key_info=Changing password will generate a new API key
profile.opml_export=OPML export profile.opml_export=OPML export
profile.delete_account=Delete account profile.delete_account=Delete account
profile.delete_account_confirmation=Delete your acount? There's no turning back!
about.rest_api=REST API about.rest_api=REST API
about.keyboard_shortcuts=Keyboard shortcuts about.keyboard_shortcuts=Keyboard shortcuts

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

@@ -268,8 +268,8 @@ module.controller('CategoryTreeCtrl', ['$scope', '$timeout', '$stateParams', '$w
}); });
}]); }]);
module.controller('FeedDetailsCtrl', ['$scope', '$state', '$stateParams', 'FeedService', 'CategoryService', 'ProfileService', '$dialog', module.controller('FeedDetailsCtrl', ['$scope', '$state', '$stateParams', 'FeedService', 'CategoryService', 'ProfileService',
function($scope, $state, $stateParams, FeedService, CategoryService, ProfileService, $dialog) { function($scope, $state, $stateParams, FeedService, CategoryService, ProfileService) {
$scope.CategoryService = CategoryService; $scope.CategoryService = CategoryService;
$scope.user = ProfileService.get(); $scope.user = ProfileService.get();
@@ -290,30 +290,15 @@ module.controller('FeedDetailsCtrl', ['$scope', '$state', '$stateParams', 'FeedS
$scope.unsubscribe = function() { $scope.unsubscribe = function() {
var sub = $scope.sub; var sub = $scope.sub;
var title = 'Unsubscribe'; var data = {
var msg = 'Unsubscribe from ' + sub.name + '?'; id : sub.id
var btns = [{ };
result : 'cancel', FeedService.unsubscribe(data, function() {
label : 'Cancel' CategoryService.init();
}, { });
result : 'ok', $state.transitionTo('feeds.view', {
label : 'OK', _id : 'all',
cssClass : 'btn-primary' _type : 'category'
}];
$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'
});
}
}); });
}; };
@@ -335,7 +320,7 @@ module.controller('FeedDetailsCtrl', ['$scope', '$state', '$stateParams', 'FeedS
}]); }]);
module.controller('CategoryDetailsCtrl', ['$scope', '$state', '$stateParams', 'FeedService', 'CategoryService', 'ProfileService', module.controller('CategoryDetailsCtrl', ['$scope', '$state', '$stateParams', 'FeedService', 'CategoryService', 'ProfileService',
'$dialog', function($scope, $state, $stateParams, FeedService, CategoryService, ProfileService, $dialog) { function($scope, $state, $stateParams, FeedService, CategoryService, ProfileService) {
$scope.CategoryService = CategoryService; $scope.CategoryService = CategoryService;
$scope.user = ProfileService.get(); $scope.user = ProfileService.get();
@@ -382,29 +367,14 @@ module.controller('CategoryDetailsCtrl', ['$scope', '$state', '$stateParams', 'F
$scope.deleteCategory = function() { $scope.deleteCategory = function() {
var category = $scope.category; var category = $scope.category;
var title = 'Delete category'; CategoryService.remove({
var msg = 'Delete category ' + category.name + ' ?'; id : category.id
var btns = [{ }, function() {
result : 'cancel', CategoryService.init();
label : 'Cancel' });
}, { $state.transitionTo('feeds.view', {
result : 'ok', _id : 'all',
label : 'OK', _type : 'category'
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'
});
}
}); });
}; };
@@ -425,8 +395,8 @@ module.controller('CategoryDetailsCtrl', ['$scope', '$state', '$stateParams', 'F
}; };
}]); }]);
module.controller('TagDetailsCtrl', ['$scope', '$state', '$stateParams', 'FeedService', 'CategoryService', 'ProfileService', '$dialog', module.controller('TagDetailsCtrl', ['$scope', '$state', '$stateParams', 'FeedService', 'CategoryService', 'ProfileService',
function($scope, $state, $stateParams, FeedService, CategoryService, ProfileService, $dialog) { function($scope, $state, $stateParams, FeedService, CategoryService, ProfileService) {
$scope.CategoryService = CategoryService; $scope.CategoryService = CategoryService;
$scope.user = ProfileService.get(); $scope.user = ProfileService.get();
@@ -1334,8 +1304,8 @@ module.controller('ManageUsersCtrl', ['$scope', '$state', '$location', 'AdminUse
}; };
}]); }]);
module.controller('ManageUserCtrl', ['$scope', '$state', '$stateParams', '$dialog', 'AdminUsersService', module.controller('ManageUserCtrl', ['$scope', '$state', '$stateParams', 'AdminUsersService',
function($scope, $state, $stateParams, $dialog, AdminUsersService) { function($scope, $state, $stateParams, AdminUsersService) {
$scope.user = $stateParams._id ? AdminUsersService.get({ $scope.user = $stateParams._id ? AdminUsersService.get({
id : $stateParams._id id : $stateParams._id
}) : { }) : {
@@ -1362,26 +1332,11 @@ module.controller('ManageUserCtrl', ['$scope', '$state', '$stateParams', '$dialo
}, alertFunction); }, alertFunction);
}; };
$scope.remove = function() { $scope.remove = function() {
var title = 'Delete user'; AdminUsersService.remove({
var msg = 'Delete user ' + $scope.user.name + ' ?'; id : $scope.user.id
var btns = [{ }, function() {
result : 'cancel', $state.transitionTo('admin.userlist');
label : 'Cancel' }, alertFunction);
}, {
result : 'ok',
label : 'OK',
cssClass : 'btn-primary'
}];
$dialog.messageBox(title, msg, btns).open().then(function(result) {
if (result == 'ok') {
AdminUsersService.remove({
id : $scope.user.id
}, function() {
$state.transitionTo('admin.userlist');
}, alertFunction);
}
});
}; };
}]); }]);
@@ -1412,8 +1367,8 @@ module.controller('SettingsCtrl', ['$scope', '$location', 'SettingsService', 'An
}; };
}]); }]);
module.controller('ProfileCtrl', ['$scope', '$location', '$dialog', 'ProfileService', 'AnalyticsService', module.controller('ProfileCtrl', ['$scope', '$location', 'ProfileService', 'AnalyticsService',
function($scope, $location, $dialog, ProfileService, AnalyticsService) { function($scope, $location, ProfileService, AnalyticsService) {
AnalyticsService.track(); AnalyticsService.track();
@@ -1437,23 +1392,8 @@ module.controller('ProfileCtrl', ['$scope', '$location', '$dialog', 'ProfileServ
}); });
}; };
$scope.deleteAccount = function() { $scope.deleteAccount = function() {
var title = 'Delete account'; ProfileService.deleteAccount({});
var msg = 'Delete your acount? There\'s no turning back!'; window.location.href = 'logout';
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') {
ProfileService.deleteAccount({});
window.location.href = 'logout';
}
});
}; };
}]); }]);

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

@@ -15,6 +15,22 @@ module.directive('focus', ['$timeout', function($timeout) {
}; };
}]); }]);
module.directive('confirmClick', [function() {
return {
priority : -1,
restrict : 'A',
link : function(scope, element, attrs) {
element.bind('click', function(e) {
var message = attrs.confirmClick;
if (message && !confirm(message)) {
e.stopImmediatePropagation();
e.preventDefault();
}
});
}
};
}]);
/** /**
* Open a popup window pointing to the url in the href attribute * Open a popup window pointing to the url in the href attribute
*/ */
@@ -154,8 +170,8 @@ module.directive('category', [function() {
restrict : 'E', restrict : 'E',
replace : true, replace : true,
templateUrl : 'templates/_category.html', templateUrl : 'templates/_category.html',
controller : ['$scope', '$state', '$dialog', 'FeedService', 'CategoryService', 'SettingsService', 'MobileService', controller : ['$scope', '$state', 'FeedService', 'CategoryService', 'SettingsService', 'MobileService',
function($scope, $state, $dialog, FeedService, CategoryService, SettingsService, MobileService) { function($scope, $state, FeedService, CategoryService, SettingsService, MobileService) {
$scope.settingsService = SettingsService; $scope.settingsService = SettingsService;
$scope.getClass = function(level) { $scope.getClass = function(level) {

8
src/main/webapp/sass/generic/_misc.scss
View File

@@ -6,6 +6,14 @@
padding-left: 20px; padding-left: 20px;
} }
body .modal {
display: block;
}
body .modal-backdrop {
opacity: 0.5;
}
.pointer { .pointer {
cursor: pointer; cursor: pointer;
} }

44
src/main/webapp/templates/_feedsearch.html
View File

@@ -1,25 +1,29 @@
<div ng-controller="FeedSearchCtrl"> <div ng-controller="FeedSearchCtrl">
<div modal="feedSearchModal" close="close()" options="{dialogClass: 'modal feed-search-dialog'}"> <div modal="feedSearchModal" close="close()" options="{dialogClass: 'modal feed-search-dialog'}">
<div class="modal-header"> <div class="modal-dialog">
<button type="button" class="close" ng-click="close()">&times;</button> <div class="modal-content">
<h4> <div class="modal-header">
<input ng-model="filter" class="filter-input" <button type="button" class="close" ng-click="close()">&times;</button>
ui-keydown="{'up': 'focusPrevious($event)', 'down': 'focusNext($event)', 'enter': 'openFocused()' }" placeholder="${feedsearch.hint}" <h4>
focus="feedSearchModal"> <input ng-model="filter" class="filter-input"
</h4> ui-keydown="{'up': 'focusPrevious($event)', 'down': 'focusNext($event)', 'enter': 'openFocused()' }" placeholder="${feedsearch.hint}"
<small>${feedsearch.help}</small> focus="feedSearchModal">
</div> </h4>
<div class="modal-body"> <small>${feedsearch.help}</small>
<strong>${feedsearch.result_prefix}</strong> </div>
<span ng-repeat="feed in (filtered = (CategoryService.feeds | filter:{name: filter} | limitTo:40))"> <div class="modal-body">
<span ng-class="{block: filter, focus: focus.id == feed.id}" class="feed-link"> <strong>${feedsearch.result_prefix}</strong>
<a class=" pointer" ng-click="goToFeed(feed.id)"> <span ng-repeat="feed in (filtered = (CategoryService.feeds | filter:{name: filter} | limitTo:40))">
<favicon url="feed.iconUrl" /> <span ng-class="{block: filter, focus: focus.id == feed.id}" class="feed-link">
&nbsp;{{feed.name}} <a class=" pointer" ng-click="goToFeed(feed.id)">
</a> <favicon url="feed.iconUrl" />
<span ng-show="!filter && !$last">&bull;</span> &nbsp;{{feed.name}}
</span> </a>
</span> <span ng-show="!filter && !$last">&bull;</span>
</span>
</span>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

2
src/main/webapp/templates/admin.useredit.html
View File

@@ -40,7 +40,7 @@
<div class="form-group"> <div class="form-group">
<div class="col-sm-offset-2 col-sm-10"> <div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-primary">Save</button> <button type="submit" class="btn btn-primary">Save</button>
<button type="button" class="btn btn-danger" ng-click="remove()">Delete</button> <button type="button" class="btn btn-danger" ng-click="remove()" confirm-click="Are you sure you want to delete this user?">Delete</button>
<button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button> <button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button>
</div> </div>
</div> </div>

3
src/main/webapp/templates/feeds.category_details.html
View File

@@ -39,7 +39,8 @@
<div class="form-group"> <div class="form-group">
<div class="col-sm-offset-2 col-sm-10"> <div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-primary" ng-if="!isMeta()">${global.save}</button> <button type="submit" class="btn btn-primary" ng-if="!isMeta()">${global.save}</button>
<button type="button" class="btn btn-danger" ng-click="deleteCategory()" ng-if="!isMeta()">${global.delete}</button> <button type="button" class="btn btn-danger" ng-click="deleteCategory()" ng-show="!isMeta()"
confirm-click="${details.delete_category_confirmation}">${global.delete}</button>
<button type="button" class="btn btn-default" ng-click="back()">${global.cancel}</button> <button type="button" class="btn btn-default" ng-click="back()">${global.cancel}</button>
</div> </div>
</div> </div>

11
src/main/webapp/templates/feeds.feed_details.html
View File

@@ -18,8 +18,8 @@
<div class="form-group" ng-class="{error : !form.name.$valid}"> <div class="form-group" ng-class="{error : !form.name.$valid}">
<label class="col-sm-2 control-label">${details.name}</label> <label class="col-sm-2 control-label">${details.name}</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="text" name="name" ng-model="sub.name" class="form-control" required></input> <span class="help-block" <input type="text" name="name" ng-model="sub.name" class="form-control" required></input>
ng-show="!form.name.$valid">${global.required}</span> <span class="help-block" ng-show="!form.name.$valid">${global.required}</span>
</div> </div>
</div> </div>
@@ -28,7 +28,8 @@
<div class="col-sm-10"> <div class="col-sm-10">
<select name="category" class="form-control" ng-model="sub.categoryId" <select name="category" class="form-control" ng-model="sub.categoryId"
ng-options="cat.id as cat.name for cat in CategoryService.flatCategories"> ng-options="cat.id as cat.name for cat in CategoryService.flatCategories">
</select> <span class="help-block" ng-show="!form.category.$valid">${global.required}</span> </select>
<span class="help-block" ng-show="!form.category.$valid">${global.required}</span>
</div> </div>
</div> </div>
@@ -70,8 +71,8 @@
<div class="form-group"> <div class="form-group">
<div class="col-sm-offset-2 col-sm-10"> <div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-primary">${global.save}</button> <button type="submit" class="btn btn-primary">${global.save}</button>
<button type="button" class="btn btn-danger" ng-click="unsubscribe()">${details.unsubscribe}</button> <button type="button" class="btn btn-danger" ng-click="unsubscribe()" confirm-click="${details.unsubscribe_confirmation}">${details.unsubscribe}</button>
<button type="button" class="btn btn-default" ng-click="back()">${global.cancel}</button> <button type="button" class="btn btn-default" ng-click="back()">${global.cancel}</button>
</div> </div>
</div> </div>

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

@@ -126,11 +126,15 @@
<span ng-hide="keywords">"{{name}}" ${view.no_unread_items}</span> <span ng-hide="keywords">"{{name}}" ${view.no_unread_items}</span>
</div> </div>
<div modal="shortcutsModal" close="shortcutsModal=false" options="shortcutsOpts"> <div modal="shortcutsModal" close="shortcutsModal=false" options="shortcutsOpts">
<div class="modal-header"> <div class="modal-dialog">
<button type="button" class="close" ng-click="shortcutsModal=false">&times;</button> <div class="modal-content">
<h4>${about.keyboard_shortcuts}</h4> <div class="modal-header">
<button type="button" class="close" ng-click="shortcutsModal=false">&times;</button>
<h4>${about.keyboard_shortcuts}</h4>
</div>
<div class="modal-body" ng-include="'templates/_shortcuts.html'"></div>
</div>
</div> </div>
<div ng-include="'templates/_shortcuts.html'"></div>
</div> </div>
</div> </div>
<div style="height: 30px" ng-if="settingsService.settings.viewMode != 'expanded' && entries.length != 0"></div> <div style="height: 30px" ng-if="settingsService.settings.viewMode != 'expanded' && entries.length != 0"></div>

2
src/main/webapp/templates/profile.html
View File

@@ -57,7 +57,7 @@
<div class="form-group"> <div class="form-group">
<div class="col-sm-offset-2 col-sm-10"> <div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-primary">${global.save}</button> <button type="submit" class="btn btn-primary">${global.save}</button>
<button type="button" class="btn btn-danger" ng-click="deleteAccount()">${profile.delete_account}</button> <button type="button" class="btn btn-danger" ng-click="deleteAccount()" confirm-click="${profile.delete_account_confirmation}">${profile.delete_account}</button>
<button type="button" class="btn btn-default" ng-click="cancel()">${global.cancel}</button> <button type="button" class="btn btn-default" ng-click="cancel()">${global.cancel}</button>
</div> </div>
</div> </div>