You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2016/02/11 11:29:14 UTC

[1/2] brooklyn-ui git commit: Added brooklyn branding to stock swagger-ui

Repository: brooklyn-ui
Updated Branches:
  refs/heads/master 72d57e11c -> c2e374eb8


Added brooklyn branding to stock swagger-ui


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/47908b4f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/47908b4f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/47908b4f

Branch: refs/heads/master
Commit: 47908b4f38660b4c687e80798b4ac14134a626cf
Parents: 6a272d4
Author: Mark McKenna <m4...@gmail.com>
Authored: Wed Feb 10 10:25:16 2016 +0000
Committer: Mark McKenna <m4...@gmail.com>
Committed: Wed Feb 10 10:32:38 2016 +0000

----------------------------------------------------------------------
 src/main/webapp/assets/html/swagger-ui.html | 32 ++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/47908b4f/src/main/webapp/assets/html/swagger-ui.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/assets/html/swagger-ui.html b/src/main/webapp/assets/html/swagger-ui.html
index 499c855..87715bc 100644
--- a/src/main/webapp/assets/html/swagger-ui.html
+++ b/src/main/webapp/assets/html/swagger-ui.html
@@ -29,6 +29,9 @@
     <link href='../swagger-ui/css/reset.css' media='print' rel='stylesheet' type='text/css'/>
     <link href='../swagger-ui/css/print.css' media='print' rel='stylesheet' type='text/css'/>
     <link href='../swagger-ui/css/style.css' media='print' rel='stylesheet' type='text/css'/>
+    <link rel="stylesheet" href="../css/styles.css">
+    <link rel="stylesheet" href="../css/brooklyn.css">
+
     <script src='../swagger-ui/lib/jquery-1.8.0.min.js' type='text/javascript'></script>
     <script src='../swagger-ui/lib/jquery.wiggle.min.js' type='text/javascript'></script>
     <script src='../swagger-ui/lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
@@ -70,9 +73,34 @@
         }
     </style>
 </head>
-
-<body class="swagger-section">
+<body>
+<div class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+        <div class="userName-top"><span id="user"></span> | <a href="/logout" id="logout-link">Log out</a></div>
+        <div class="container">
+            <a class="logo" href="#" title="Brooklyn, Version 0.9.0-SNAPSHOT"><!-- Logo added via CSS --></a> <!-- BROOKLYN_VERSION -->
+            <div class="menubar-top">
+                <ul class="nav">
+                    <li><a href="/#v1/home" class="nav1 nav1_home">Home</a></li>
+                    <li><a href="/#v1/editor/" class="nav1 nav1_editor">Composer</a></li>
+                    <li><a href="/#v1/applications" class="nav1 nav1_apps">Applications</a></li>
+                    <li><a href="/#v1/catalog" class="nav1 nav1_catalog">Catalog</a></li>
+                    <li class="dropdown">
+                        <a href="#" class="nav1 nav1_script dropdown-toggle" data-toggle="dropdown">Script</a>
+                        <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+                            <li><a href="/assets/html/swagger-ui.html" target="_blank" class="nav1 nav1_apidoc">REST API</a></li>
+                            <li><a href="/#v1/script/groovy" class="nav1 nav1_groovy">Groovy</a></li>
+                        </ul>
+                    </li>
+                    <li><a href="/#v1/help" class="nav1 nav1_help"><b>?</b></a></li>
+                </ul>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="swagger-section">
 <div id="message-bar" class="swagger-ui-wrap" data-sw-translate>&nbsp;</div>
 <div id="swagger-ui-container" class="swagger-ui-wrap"></div>
+</div>
 </body>
 </html>


[2/2] brooklyn-ui git commit: This closes #4

Posted by sj...@apache.org.
This closes #4

Added brooklyn branding to stock swagger-ui


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/c2e374eb
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/c2e374eb
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/c2e374eb

Branch: refs/heads/master
Commit: c2e374eb8291e6248514d3f2469938abb56d517c
Parents: 72d57e1 47908b4
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Thu Feb 11 10:21:14 2016 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Thu Feb 11 10:21:14 2016 +0000

----------------------------------------------------------------------
 src/main/webapp/assets/html/swagger-ui.html | 32 ++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)
----------------------------------------------------------------------