Merge pull request #58 from derek63/add-versions-to-footer

Add versions to footer
lightblue-platform · Feb 3, 2015 · f90bfc4 · f90bfc4
2 parents 2c0c2ce + b3194a5
commit f90bfc4
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 3 deletions.
diff --git a/common/src/main/webapp/css/lightblue-apps.css b/common/src/main/webapp/css/lightblue-apps.css
@@ -0,0 +1,16 @@
+html {
+  position: relative;
+  min-height: 100%;
+}
+body {
+  /* Margin bottom by footer height */
+  margin-bottom: 60px;
+}
+.footer {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  /* Set the fixed height of the footer here */
+  height: 60px;
+  background-color: #f5f5f5;
+}
diff --git a/common/src/main/webapp/js/lightblue-apps.js b/common/src/main/webapp/js/lightblue-apps.js
@@ -246,14 +246,38 @@
           showErrorMessage( textStatus );
       });
   }
+
+  function loadVersions() {
+      "use strict";
+
+      var request = $.ajax({
+          type: "GET",
+          url: metadataServicePath + "health",
+      });
+
+      request.done(function( msg ) {
+          if (msg.objectType === 'error') {
+              showLightblueErrorMessage(msg);
+          }
+          else {
+        	  $("#metadata-service-version").text("Metadata Service Version: " + msg);
+          }
+      });
+
+      request.fail(function( jqXHR, textStatus ) {
+          showErrorMessage( textStatus );
+      });
+  }
 
   $(document).ready(function() {
       "use strict";
 
       if (!isAdmin()) {
           $(".role-user-admin").hide();
-      }
-
+      }   
+
+      loadVersions();
+
       var entitySelect = $("#entities");
       var versionSelect = $("#versions");
       var submitButton = $("#load-content-btn");

diff --git a/metadata-mgmt-saml-auth/pom.xml b/metadata-mgmt-saml-auth/pom.xml
@@ -22,6 +22,10 @@
             <version>${project.version}</version>
             <type>war</type>
         </dependency>
+        <dependency>
+            <groupId>com.redhat.lightblue.client</groupId>
+            <artifactId>lightblue-client-http</artifactId>
+        </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
@@ -53,6 +57,12 @@
                             <artifactId>lightblue-applications-common</artifactId>
                         </overlay>
                     </overlays>
+                    <webResources>
+                      <resource>
+                        <directory>src/main/webapp</directory>
+                        <filtering>true</filtering>
+                      </resource>
+                    </webResources>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/metadata-mgmt/pom.xml b/metadata-mgmt/pom.xml
@@ -16,6 +16,10 @@
             <version>${project.version}</version>
             <type>war</type>
         </dependency>
+        <dependency>
+            <groupId>com.redhat.lightblue.client</groupId>
+            <artifactId>lightblue-client-http</artifactId>
+        </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
@@ -43,6 +47,12 @@
                             <artifactId>lightblue-applications-common</artifactId>
                         </overlay>
                     </overlays>
+                    <webResources>
+                      <resource>
+                        <directory>src/main/webapp</directory>
+                        <filtering>true</filtering>
+                      </resource>
+                    </webResources>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/metadata-mgmt/src/main/webapp/index.html b/metadata-mgmt/src/main/webapp/index.html
@@ -255,6 +255,14 @@ <h3 class="panel-title">
                     </div>
                 </div>
             </div>
-	</div>
+	    </div>
+      <footer class="footer">
+      <div class="container">
+        <p class="text-muted">
+          <div class="text-muted" id="app-version">App Version: ${project.version} </div>
+          <div class="text-muted" id="metadata-service-version">Metadata Service Version: </div> 
+        </p>
+      </div>
+    </footer>
     </body>
 </html>