From 48941f1713cf4ed405f29fc2239661f2cb4d981b Mon Sep 17 00:00:00 2001
From: Michael Jett <mjett@mitre.org>
Date: Tue, 25 Sep 2012 12:47:49 -0400
Subject: [PATCH] Dynamic JS loading and UI updates

---
 .../src/main/webapp/WEB-INF/tags/footer.tag            |  6 +++---
 .../src/main/webapp/WEB-INF/views/admin/manage.jsp     |  8 +++++---
 .../webapp/resources/bootstrap2/css/bootstrap.min.css  |  4 +++-
 .../src/main/webapp/resources/js/{app.js => admin.js}  |  6 +++---
 .../resources/template/{client.html => admin.html}     |  0
 .../src/main/webapp/resources/template/list.html       | 10 ----------
 6 files changed, 14 insertions(+), 20 deletions(-)
 rename openid-connect-server/src/main/webapp/resources/js/{app.js => admin.js} (99%)
 rename openid-connect-server/src/main/webapp/resources/template/{client.html => admin.html} (100%)
 delete mode 100644 openid-connect-server/src/main/webapp/resources/template/list.html

diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/footer.tag b/openid-connect-server/src/main/webapp/WEB-INF/tags/footer.tag
index ab95c3171..5c010bfd6 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/tags/footer.tag
+++ b/openid-connect-server/src/main/webapp/WEB-INF/tags/footer.tag
@@ -1,4 +1,4 @@
-<%@attribute name="loadapp" required="false" type="java.lang.Boolean" %>
+<%@attribute name="js" required="false" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <!-- Le javascript
@@ -8,8 +8,8 @@
 <script type="text/javascript" src="resources/js/underscore-min.js"></script>
 <script type="text/javascript" src="resources/js/backbone-min.js"></script>
 <script type="text/javascript" src="resources/js/backbone.validations.js"></script>
-<c:if test="${loadapp == null || loadapp == Boolean.TRUE}">
-<script type="text/javascript" src="resources/js/app.js"></script>
+<c:if test="${js != null || js != ''}">
+<script type="text/javascript" src="${js}"></script>
 </c:if>
 </body>
 </html>
\ No newline at end of file
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/views/admin/manage.jsp b/openid-connect-server/src/main/webapp/WEB-INF/views/admin/manage.jsp
index d601973d0..d72bbfadc 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/views/admin/manage.jsp
+++ b/openid-connect-server/src/main/webapp/WEB-INF/views/admin/manage.jsp
@@ -10,13 +10,15 @@
     <div class="row-fluid">
         <o:sidebar/>
         <div class="span10">
-            <div class="content">
+            <div class="content span12">
                 <o:breadcrumbs crumb="Manage Clients"/>
-
+                <div class="progress">
+                    <div class="bar" style="width: 60%;"></div>
+                </div>
                 <span id="content"></span>
                 <o:copyright/>
             </div>
         </div>
     </div>
 </div>
-<o:footer/>
+<o:footer js="resources/js/admin.js"/>
diff --git a/openid-connect-server/src/main/webapp/resources/bootstrap2/css/bootstrap.min.css b/openid-connect-server/src/main/webapp/resources/bootstrap2/css/bootstrap.min.css
index 97a31fef1..38940db46 100644
--- a/openid-connect-server/src/main/webapp/resources/bootstrap2/css/bootstrap.min.css
+++ b/openid-connect-server/src/main/webapp/resources/bootstrap2/css/bootstrap.min.css
@@ -1,4 +1,6 @@
 @import url('https://fonts.googleapis.com/css?family=Open+Sans:400,700');
+
+html {overflow-y: scroll;}
 article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;}
 audio,canvas,video{display:inline-block;*display:inline;*zoom:1;}
 audio:not([controls]){display:none;}
@@ -176,7 +178,7 @@ input:focus:required:invalid,textarea:focus:required:invalid,select:focus:requir
 .form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#eeeeee;border-top:1px solid #ddd;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";}
 .form-actions:after{clear:both;}
 .uneditable-input{overflow:hidden;white-space:nowrap;cursor:not-allowed;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);}
-:-moz-placeholder{color:#999999;}
+:-moz-placeholder{color:#d7d7d7;}
 ::-webkit-input-placeholder{color:#999999;}
 .help-block,.help-inline{color:#888888;}
 .help-block{display:block;margin-bottom:9px;}
diff --git a/openid-connect-server/src/main/webapp/resources/js/app.js b/openid-connect-server/src/main/webapp/resources/js/admin.js
similarity index 99%
rename from openid-connect-server/src/main/webapp/resources/js/app.js
rename to openid-connect-server/src/main/webapp/resources/js/admin.js
index ece5ed7bf..de9e9bb49 100644
--- a/openid-connect-server/src/main/webapp/resources/js/app.js
+++ b/openid-connect-server/src/main/webapp/resources/js/admin.js
@@ -554,7 +554,8 @@
             "clients":"listClients",
             "client/new":"newClient",
             "client/:id":"editClient",
-            "white_list":"whiteList"
+            "white_list":"whiteList",
+            '*path':  'listClients'
         },
 
         initialize:function () {
@@ -667,8 +668,7 @@
         };
 
         // load templates and append them to the body
-        $.get('resources/template/client.html', _load);
-        $.get('resources/template/list.html', _load);
+        $.get('resources/template/admin.html', _load);
 
         jQuery.ajaxSetup({async:true});
         app = new AppRouter();
diff --git a/openid-connect-server/src/main/webapp/resources/template/client.html b/openid-connect-server/src/main/webapp/resources/template/admin.html
similarity index 100%
rename from openid-connect-server/src/main/webapp/resources/template/client.html
rename to openid-connect-server/src/main/webapp/resources/template/admin.html
diff --git a/openid-connect-server/src/main/webapp/resources/template/list.html b/openid-connect-server/src/main/webapp/resources/template/list.html
deleted file mode 100644
index 1bcd6879a..000000000
--- a/openid-connect-server/src/main/webapp/resources/template/list.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<script type="text/html" id="tmpl-url-list">
-    <div class="well">
-        <label>White list
-            <textarea class="span7" rows="5" id="textarea" class="input-xlarge"></textarea></label>
-        <span class="help-block">Enter URLs separated by a newline.</span>
-
-        <button class="btn">Save</button>
-
-    </div>
-</script>
\ No newline at end of file