From cc36851bdda92848d0adf065261e13ac97974e53 Mon Sep 17 00:00:00 2001
From: Justin Richer <jricher@mitre.org>
Date: Tue, 11 Dec 2012 12:38:55 -0500
Subject: [PATCH] propagated field name change to UI

---
 .../src/main/webapp/resources/js/admin.js     |  4 ++--
 .../main/webapp/resources/template/admin.html | 22 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/openid-connect-server/src/main/webapp/resources/js/admin.js b/openid-connect-server/src/main/webapp/resources/js/admin.js
index c3f528ab4..d697306df 100644
--- a/openid-connect-server/src/main/webapp/resources/js/admin.js
+++ b/openid-connect-server/src/main/webapp/resources/js/admin.js
@@ -226,7 +226,7 @@
         defaults:{
             id:null,
             idTokenValiditySeconds: 600,
-            applicationName:"",
+            clientName:"",
             clientSecret:"",
             registeredRedirectUri:[],
             authorizedGrantTypes:["authorization_code"],
@@ -563,7 +563,7 @@
             }
             
             var valid = this.model.set({
-                applicationName:$('#applicationName input').val(),
+                clientName:$('#clientName input').val(),
                 clientId:$('#clientId input').val(),
                 clientSecret: clientSecret,
                 generateClientSecret:generateClientSecret,
diff --git a/openid-connect-server/src/main/webapp/resources/template/admin.html b/openid-connect-server/src/main/webapp/resources/template/admin.html
index 44717696d..e80c6542c 100644
--- a/openid-connect-server/src/main/webapp/resources/template/admin.html
+++ b/openid-connect-server/src/main/webapp/resources/template/admin.html
@@ -13,7 +13,7 @@
     </td>
 
     <td>
-        <%=applicationName%>
+        <%=clientName%>
         <!--expandable future information-->
     </td>
 
@@ -33,8 +33,8 @@
         <thead>
         <tr>
 			<th></th>
-            <th>Client ID</th>
-            <th>Application Name</th>
+            <th>ID</th>
+            <th>Name</th>
             <th></th>
         </tr>
         </thead>
@@ -60,10 +60,10 @@
                 <button class="btn btn-small btn-primary">Save</button>&nbsp;<button class="btn btn-small btn-cancel">Cancel</button>
             </div>
 
-            <div class="control-group" id="applicationName">
-                <label class="control-label">Application name</label>
+            <div class="control-group" id="clientName">
+                <label class="control-label">Client name</label>
                 <div class="controls">
-                    <input value="<%=applicationName%>" maxlength="100" type="text" class="" placeholder="Type something">
+                    <input value="<%=clientName%>" maxlength="100" type="text" class="" placeholder="Type something">
                     <p class="help-block">Human-readable application name</p>
                 </div>
             </div>
@@ -301,7 +301,7 @@
     </td>
 
     <td>
-        <%=client.applicationName%>
+        <%=client.clientName%>
         <!--expandable future information-->
     </td>
 
@@ -320,8 +320,8 @@
         <thead>
         <tr>
 			<th></th>
-            <th>Client ID</th>
-            <th>Application Name</th>
+            <th>ID</th>
+            <th>Name</th>
             <th></th>
         </tr>
         </thead>
@@ -350,7 +350,7 @@
 				<label class="control-label">Client</label>
 				<div class="controls">
 					<input type="hidden" name="clientId" value="<%= client.clientId %>" />
-					<%= client.applicationName != null ? client.applicationName : client.clientId %>
+					<%= client.clientName != null ? client.clientName : client.clientId %>
 				</div>
 			</div>
 
@@ -411,7 +411,7 @@
 	</td>
 
     <td>
-        <%= client.applicationName != null ? client.applicationName : client.clientId %>
+        <%= client.clientName != null ? client.clientName : client.clientId %>
         <blockquote><small><%=client.clientDescription%></small></blockquote>
 		<!-- put scopes and other info here -->
     </td>