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

use ui-router instead of routeProvider

Browse Source
This commit is contained in:
Athou
2013-03-29 15:09:50 +01:00
parent 60bcb64828
commit fc8bd5c812
14 changed files with 1145 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/com/commafeed/frontend/pages/HomePage.html
View File

@@ -5,29 +5,8 @@
</head>
<body>
<div ng-app="commafeed" id="main" class="main">
<div class="container-fluid">
<div class="row-fluid">
<div class="span2 sidebar-nav-fixed">
<subscribe></subscribe>
<div class="css-treeview" ng-controller="CategoryTreeCtrl">
<ul>
<category node="SubscriptionService.subscriptions" feed-click="feedClicked(id)"
category-click="categoryClicked(id)" selected-type="selectedType"
selected-id="selectedId"
format-category-name="formatCategoryName(category)"
format-feed-name="formatFeedName(feed)"> </category>
</ul>
</div>
</div>
<div class="span10">
<div class="toolbar">
<toolbar></toolbar>
</div>
<div class="entryList">
<ng:view></ng:view>
</div>
</div>
</div>
<div ui-view>
</div>
</div>
</body>

2
src/main/java/com/commafeed/frontend/pages/HomePage.java
View File

@@ -11,6 +11,7 @@ import com.commafeed.frontend.references.angular.AngularResourceReference;
import com.commafeed.frontend.references.angular.AngularSanitizeReference;
import com.commafeed.frontend.references.angularui.AngularUIReference;
import com.commafeed.frontend.references.angularuibootstrap.AngularUIBootstrapReference;
import com.commafeed.frontend.references.angularuistate.AngularUIStateReference;
import com.commafeed.frontend.references.csstreeview.CssTreeViewReference;
import com.commafeed.frontend.references.mousetrap.MouseTrapReference;
import com.commafeed.frontend.references.nginfinitescroll.NGInfiniteScrollReference;
@@ -30,6 +31,7 @@ public class HomePage extends BasePage {
AngularSanitizeReference.renderHead(response);
AngularUIReference.renderHead(response);
AngularUIBootstrapReference.renderHead(response);
AngularUIStateReference.renderHead(response);
NGUploadReference.renderHead(response);
NGInfiniteScrollReference.renderHead(response);
Select2Reference.renderHead(response);