moved some directives to controller/partial

This commit is contained in:
Athou
2013-04-05 07:51:53 +02:00
parent 92bc5a7586
commit a839cb2297
5 changed files with 133 additions and 152 deletions

View File

@@ -0,0 +1,105 @@
<div ng-controller="SubscribeCtrl">
<div class="btn-group">
<button class="btn" ng-click="open()">Subscribe</button>
<button class="btn dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li>
<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">
<div class="modal-header">
<button type="button" class="close" ng-click="close()">&times;</button>
<h4>Subscribe</h4>
</div>
<form name="subscribeForm" class="form-horizontal" ng-submit="save()">
<div class="modal-body">
<div class="control-group" ng-class="{error : !subscribeForm.url.$valid}">
<label class="control-label">Feed URL</label>
<div class="controls">
<input type="text" name="url" ng-model="sub.url" ng-blur="urlChanged()" placeholder="http://example.com/feed" class="input-block-level" required></input>
<span class="help-block" ng-show="!subscribeForm.url.$valid">Required</span>
</div>
</div>
<div class="control-group" ng-class="{error : !subscribeForm.title.$valid}">
<label class="control-label">Feed Name</label>
<div class="controls">
<input type="text" name="title" ng-model="sub.title" class="input-block-level" required></input>
<span class="help-block" ng-show="!subscribeForm.title.$valid">Required</span>
</div>
</div>
<div class="control-group" ng-class="{error : !subscribeForm.category.$valid}">
<label class="control-label">Category</label>
<div class="controls">
<select name="category" ng-model="sub.categoryId" 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="!subscribeForm.category.$valid">Required</span>
</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>
<div modal="isOpenImport" close="closeImport()" options="opts">
<div class="modal-header">
<button type="button" class="close" ng-click="closeImport()">&times;</button>
<h4>Import</h4>
</div>
<form ng-upload class="form-horizontal" action="rest/subscriptions/import">
<div class="modal-body">
<div class="control-group">
<span>Select the subscriptions.xml file you got from the zip file on google.com/takeout</span>
</div>
<div class="control-group">
<label class="control-label">XML File</label>
<div class="controls">
<input type="file" name="file"></input>
</div>
</div>
</div>
<div class="modal-footer">
<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>

View File

@@ -0,0 +1,28 @@
<div ng-controller="ToolbarCtrl">
<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>
<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 ng-click="toSettings()"><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>

View File

@@ -1,7 +1,7 @@
<div class="container-fluid">
<div class="row-fluid">
<div class="span2 sidebar-nav-fixed">
<subscribe></subscribe>
<div ng-include="'templates/_subscribe.html'"></div>
<div class="css-treeview" ng-controller="CategoryTreeCtrl">
<ul>
<category node="SubscriptionService.subscriptions"
@@ -13,8 +13,7 @@
</div>
</div>
<div class="span10">
<div class="toolbar">
<toolbar></toolbar>
<div class="toolbar" ng-include="'templates/_toolbar.html'">
</div>
<div class="entryList">
<div ui-view></div>