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

add categories

Browse Source
This commit is contained in:
Athou
2013-03-31 08:17:28 +02:00
parent 5a4d11c4de
commit 89c7a00ebf
8 changed files with 137 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/webapp/directives/subscribe.html
View File

@@ -9,6 +9,7 @@
<a ng-click="open()">Subscribe</a>
</li>
<li><a ng-click="openImport()">Import</a></li>
<li><a ng-click="openCategory()">New category</a></li>
</ul>
</div>
<div modal="isOpen" close="close()" options="opts">
@@ -44,7 +45,7 @@
</div>
</form>
<div class="modal-footer">
<button class="btn btn-warning cancel" ng-click="close()">Cancel</button>
<button class="btn cancel" ng-click="close()">Cancel</button>
<button class="btn btn-primary ok" type="submit">Save</button>
</div>
</div>
@@ -66,9 +67,39 @@
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-warning cancel" ng-click="closeImport()">Cancel</button>
<button type="button" class="btn cancel" ng-click="closeImport()">Cancel</button>
<button class="btn btn-primary ok" type="submit" upload-submit="uploadComplete(contents, completed)">Import</button>
</div>
</form>
</div>
<div modal="isOpenCategory" close="closeCategory()" options="opts">
<div class="modal-header">
<button type="button" class="close" ng-click="closeCategory()">&times;</button>
<h4>New category</h4>
</div>
<form name="categoryForm" class="form-horizontal" ng-submit="saveCategory()">
<div class="modal-body">
<div class="control-group" ng-class="{error : !categoryForm.name.$valid}">
<label class="control-label">Name</label>
<div class="controls">
<input type="text" name="name" ng-model="cat.name" required></input>
<span class="help-block" ng-show="!categoryForm.name.$valid">Required</span>
</div>
</div>
<div class="control-group" ng-class="{error : !categoryForm.category.$valid}">
<label class="control-label">Category</label>
<div class="controls">
<select name="category" ng-model="cat.parentId" class="input-block-level" required>
<option ng-repeat="cat in SubscriptionService.flatCategories" value="{{cat.id}}">{{cat.name}}</option>
</select>
<span class="help-block" ng-show="!categoryForm.category.$valid">Required</span>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn cancel" ng-click="closeCategory()">Cancel</button>
<button class="btn btn-primary ok" type="submit">Save</button>
</div>
</form>
</div>
</div>

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

@@ -10,10 +10,10 @@
<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><span class="caret"></span></a>
<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><a ng-click="toAdmin()"><i class="icon-edit"></i> Admin</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>