You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by ma...@apache.org on 2014/01/15 22:38:05 UTC
[42/50] [abbrv] git commit: Updating ServletModule and index.html
Updating ServletModule and index.html
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/d6fbe2d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/d6fbe2d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/d6fbe2d1
Branch: refs/heads/mansu/AURORA-4187_scheduler_home_page-no-seed
Commit: d6fbe2d15d1c7f7aa2ab40c4a01e85ae375282d4
Parents: 97b5754
Author: Suman Karumuri <sk...@twitter.com>
Authored: Mon Dec 30 17:56:51 2013 -0800
Committer: Suman Karumuri <sk...@twitter.com>
Committed: Mon Jan 13 15:24:39 2014 -0800
----------------------------------------------------------------------
angular-seed-master/app/index.html | 4 ++--
.../aurora/scheduler/http/ServletModule.java | 21 +++++++++++++++++++-
2 files changed, 22 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/d6fbe2d1/angular-seed-master/app/index.html
----------------------------------------------------------------------
diff --git a/angular-seed-master/app/index.html b/angular-seed-master/app/index.html
index 7125b00..d88d767 100644
--- a/angular-seed-master/app/index.html
+++ b/angular-seed-master/app/index.html
@@ -22,7 +22,7 @@
</div>
<!-- Scripts -->
-<script src="lib/angular/angular.js"></script>
+<script src="js/angular.js"></script>
<script src="js/app.js"></script>
<script src="js/controllers.js"></script>
<script src="js/directives.js"></script>
@@ -33,6 +33,6 @@
<link href="//netdna.bootstrapcdn.com/bootstrap/2.3.2/css/bootstrap.min.css" rel="stylesheet">
<!--smart table-->
-<script src="lib/smart-table/Smart-Table.min.js"></script>
+<script src="js/smartTable.js"></script>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/d6fbe2d1/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java b/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
index 9f5d7a9..a0a44fd 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
@@ -176,7 +176,26 @@ public class ServletModule extends AbstractModule {
* A function to handle all assets related to the UI client.
*/
private void registerUIClient() {
- registerAsset("ui/home.html", "/ui/home.html");
+ registerAngular();
+ registerSmartTable();
+
+ registerAsset("ui/index.html", "/ui/index.html");
+ registerAsset("ui/roleLink.html", "/ui/roleLink.html");
+
+ registerAsset("ui/css/app.css", "/css/app.css");
+
+ registerAsset("ui/js/app.js", "/js/app.js");
+ registerAsset("ui/js/controllers.js", "/js/controllers.js");
+ registerAsset("ui/js/directives.js", "/js/directives.js");
+ registerAsset("ui/js/services.js", "/js/services.js");
+ }
+
+ private void registerSmartTable() {
+ registerAsset("bower_components/smart-table/Smart-Table.debug.js", "/js/smartTable.js", false);
+ }
+
+ private void registerAngular() {
+ registerAsset("bower_components/angular/angular.js", "/js/angular.js", false);
}
private void registerAsset(String resourceLocation, String registerLocation) {