move submit button into form

src/main/webapp/directives/category.html

@@ -7,6 +7,9 @@
 			<div class="dropdown pull-right" ng-show="hovered==feed">
 				<a dropdown-toggle class="pull-right feed-menu-icon"><i class="icon icon-chevron-down" ng-class="{error: feed.message}"></i> </a>
 				<ul class="dropdown-menu">
+					<li>
+				    	<a ng-click="edit(feed)">Edit</a>
+				    </li>
 				    <li>
 				    	<a ng-click="unsubscribe(feed)">Unsubscribe</a>
 				    </li>

src/main/webapp/directives/subscribe.html

@@ -43,11 +43,11 @@
 					</div>
 				</div>
 			</div>
+			<div class="modal-footer">
+				<button class="btn cancel" ng-click="close()">Cancel</button>
+				<button class="btn btn-primary ok" type="submit">Save</button>
+			</div>
 		</form>
-		<div class="modal-footer">
-			<button class="btn cancel" ng-click="close()">Cancel</button>
-			<button class="btn btn-primary ok" type="submit">Save</button>
-		</div>
 	</div>
 	<div modal="isOpenImport" close="closeImport()" options="opts">
 		<div class="modal-header">

src/main/webapp/js/directives.js

@@ -61,7 +61,7 @@ module.directive('subscribe', function(SubscriptionService) {
 
 			$scope.urlChanged = function() {
 				if ($scope.sub.url && !$scope.sub.title) {
-					$scope.sub.title = 'Loading';
+					$scope.sub.title = 'Loading...';
 					SubscriptionService.fetch({
 						url : $scope.sub.url
 					}, function(data) {