aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject git commit: Added a nav bar with Aurora logo.
Date Thu, 15 May 2014 04:37:16 GMT
Repository: incubator-aurora
Updated Branches:
  refs/heads/master fb11cd381 -> e50ba7df1


Added a nav bar with Aurora logo.

Testing Done:
Tested on local laptop.

Bugs closed: AURORA-381

Reviewed at https://reviews.apache.org/r/21426/


Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/e50ba7df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/e50ba7df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/e50ba7df

Branch: refs/heads/master
Commit: e50ba7df1fb67ece7c0790e3b3987ef456c4aa63
Parents: fb11cd3
Author: Suman Karumuri <mansu@apache.org>
Authored: Wed May 14 21:36:19 2014 -0700
Committer: Suman Karumuri <skarumuri@twitter.com>
Committed: Wed May 14 21:36:19 2014 -0700

----------------------------------------------------------------------
 .../aurora/scheduler/http/ServletModule.java       |   1 +
 .../scheduler/http/assets/images/aurora_logo.png   | Bin 0 -> 15106 bytes
 .../apache/aurora/scheduler/http/ui/css/app.css    |   9 +++++++++
 .../org/apache/aurora/scheduler/http/ui/index.html |  10 ++++++++++
 4 files changed, 20 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/e50ba7df/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 6d76f60..effd48a 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
@@ -104,6 +104,7 @@ public class ServletModule extends AbstractModule {
 
     registerAsset("assets/images/viz.png", "/images/viz.png");
     registerAsset("assets/images/aurora.png", "/images/aurora.png");
+    registerAsset("assets/images/aurora_logo.png", "/images/aurora_logo.png");
 
     registerUIClient();
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/e50ba7df/src/main/resources/org/apache/aurora/scheduler/http/assets/images/aurora_logo.png
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/assets/images/aurora_logo.png
b/src/main/resources/org/apache/aurora/scheduler/http/assets/images/aurora_logo.png
new file mode 100644
index 0000000..abcfbb8
Binary files /dev/null and b/src/main/resources/org/apache/aurora/scheduler/http/assets/images/aurora_logo.png
differ

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/e50ba7df/src/main/resources/org/apache/aurora/scheduler/http/ui/css/app.css
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/css/app.css b/src/main/resources/org/apache/aurora/scheduler/http/ui/css/app.css
index dc515ac..d64c5b4 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/css/app.css
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/css/app.css
@@ -4,6 +4,15 @@
   display: none !important;
 }
 
+.header {
+  margin-bottom: 10px;
+  border-bottom: darkgray 1px solid;
+}
+
+.logo {
+  width: 200px;
+}
+
 .pagination {
   text-align: center;
 }

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/e50ba7df/src/main/resources/org/apache/aurora/scheduler/http/ui/index.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/index.html b/src/main/resources/org/apache/aurora/scheduler/http/ui/index.html
index 817bd55..c805a17 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/index.html
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/index.html
@@ -8,6 +8,16 @@
 </head>
 <body class='ng-cloak'>
 
+<nav class="navbar navbar-static-top header" role="navigation">
+  <div class="container-fluid">
+    <div class="navbar-header">
+      <a class="navbar-brand" href="/scheduler">
+        <img class="logo" src="/images/aurora_logo.png"/>
+      </a>
+    </div>
+  </div>
+</nav>
+
 <div class='container-fluid'>
   <ng-view></ng-view>
 </div>


Mime
View raw message