UI cleanup for dynamic registration and resource registration

Author: jricher

openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json

@@ -231,10 +231,12 @@
         "configuration-url": "Client Configuration URL",
         "edit-dynamically-registered": "Edit a Dynamically Registered Client",
         "edit-existing": "Edit an existing client",
-        "edit-existing-help": "Paste in your client ID and registration access token to access the client.",
+        "edit-existing-help": "Use this form to edit a previously-registered client. Paste in your client ID and registration access token to access the client.",
+        "edit-existing-button": "Edit Client",
         "invalid-access-token": "Invalid client or registration access token.",
         "new-client": "Register a new client",
-        "or": " - OR - ",
+        "new-client-help": "Use this form to register a new client with the authorization server. You will be given a client ID and a registration access token to manage your client.",
+        "new-client-button": "New Client",
         "regtoken-placeholder": "Enter Registration Access Token",
         "warning": "<strong>Warning!</strong> You MUST protect your <b>Client ID</b>, <b>Client Secret (if provided)</b>, and your <b>Registration Access Token</b>. If you lose your Client ID or Registration Access Token, you will no longer have access to your client's registration records and you will need to register a new client.",
         "will-be-generated": "Will be generated by the server when the client is saved"
@@ -266,13 +268,14 @@
         "configuration-url": "Client Configuration URL",
         "edit": "Edit Protected Resource",
         "edit-existing": "Edit an existing protected resource",
-        "edit-existing-help": "Paste in your ID and registration access token to access the resource's properties.",
+        "edit-existing-help": "Use this form to edit a previously-registered resource. Paste in your client ID and registration access token to access the client.",
+        "edit-existing-button": "Edit Resource",
         "invalid-access-token": "Invalid client or registration access token.",
-        "new": "New Protected Resource",
-        "new-resource": "Register a new protected resource",
-        "or": " - OR - ",
+        "new-client": "Register a new protected resource",
+        "new-client-help": "Use this form to register a new resource with the authorization server. You will be given a client ID and a registration access token to manage your resource.",
+        "new-client-button": "New Resource",
         "regtoken-placeholder": "Enter Registration Access Token",
-        "will-be-generated": "Will be generated",
+        "will-be-generated": "Will be generated by the server when the resource is saved"
         "warning": "<strong>Warning!</strong> You MUST protect your <b>Client ID</b>, <b>Client Secret (if provided)</b>, and your <b>Registration Access Token</b>. If you lose your Client ID or Registration Access Token, you will no longer have access to your client's registration records and you will need to register a new client.",
         "client-form": {
         	"scope-help": "Scopes that this resource will be able to introspect tokens for."

openid-connect-server-webapp/src/main/webapp/resources/template/dynreg.html

@@ -20,17 +20,18 @@
 
 <div class="row-fluid">
 
-<div class="span5 well">
-	<button class="btn btn-large" id="newreg" data-i18n="dynreg.new-client">Register a new client</button>
+<div class="span6 well">
+	<h2 data-i18n="dynreg.new-client">Register a new client</h2>
+	<p data-i18n="dynreg.new-client-help">Use this form to register a new client with the authorization server. You will be given a client ID and a registration access token to manage your client.</p>
+	<button class="btn btn-success" id="newreg"><i class="icon-plus icon-white"></i> <span data-i18n="dynreg.new-client-button">New Client</span></button>
 </div>
-<div class="span2 text-center">
-	<strong><span data-i18n="dynreg.or"> - OR - </span></strong>
-</div>
-<div class="span5 well">
+<div class="span6 well">
+	<h2 data-i18n="dynreg.edit-existing">Edit an existing client</h2>
+	<p class="help-block" data-i18n="dynreg.edit-existing-help">Use this form to edit a previously-registered client. Paste in your client ID and registration access token to access the client.</p>
+
 	<input type="text" id="clientId" placeholder="Enter Client ID" data-i18n="[placeholder]dynreg.client-id-placeholder"> 
 	<input type="text" id="regtoken" placeholder="Enter Registration Access Token" data-i18n="[placeholder]dynreg.regtoken-placeholder"> 
-	<button class="btn btn-large" id="editreg" data-i18n="dynreg.edit-existing">Edit an existing client</button>
-	<span class="help-block" data-i18n="dynreg.edit-existing-help">Paste in your client ID and registration access token to access the client.</span>
+	<button class="btn btn-info" id="editreg"><i class="icon-edit icon-white"></i> <span data-i18n="dynreg.edit-existing-button">Edit Client</span></button>
 </div>
 
 </script>

openid-connect-server-webapp/src/main/webapp/resources/template/rsreg.html

@@ -20,17 +20,18 @@
 
 <div class="row-fluid">
 
-<div class="span5 well">
-	<button class="btn btn-large" id="newreg" data-i18n="rsreg.new-resource">Register a new protected resource</button>
+<div class="span6 well">
+	<h2 data-i18n="rsreg.new-client">Register a new resource</h2>
+	<p data-i18n="rsreg.new-client-help">Use this form to register a new protected with the authorization server. You will be given a client ID and a registration access token to manage your resource.</p>
+	<button class="btn btn-success" id="newreg"><i class="icon-plus icon-white"></i> <span data-i18n="rsreg.new-client-button">New Resource</span></button>
 </div>
-<div class="span2 text-center">
-	<strong><span data-i18n="dynreg.or"> - OR - </span></strong>
-</div>
-<div class="span5 well">
-	<input type="text" id="clientId" placeholder="Enter Resource ID" data-i18n="[placeholder]rsreg.resource-id-placeholder"> 
+<div class="span6 well">
+	<h2 data-i18n="rsreg.edit-existing">Edit an existing protected resource</h2>
+	<p class="help-block" data-i18n="rsreg.edit-existing-help">Use this form to edit a previously-registered resource. Paste in your client ID and registration access token to access the resource.</p>
+
+	<input type="text" id="clientId" placeholder="Enter Client ID" data-i18n="[placeholder]rsreg.client-id-placeholder"> 
 	<input type="text" id="regtoken" placeholder="Enter Registration Access Token" data-i18n="[placeholder]rsreg.regtoken-placeholder"> 
-	<button class="btn btn-large" id="editreg" data-i18n="rsreg.edit-existing">Edit an existing protected resource</button>
-	<span class="help-block" data-i18n="rsreg.edit-existing-help">Paste in your ID and registration access token to access the resource's properties.</span>
+	<button class="btn btn-info" id="editreg"><i class="icon-edit icon-white"></i> <span data-i18n="rsreg.edit-existing-button">Edit Resource</span></button>
 </div>
 
 </script>
@@ -76,7 +77,8 @@ <h1 data-i18n="rsreg.edit"></h1>
 				</div>
 
 			</div>
-
+			<% } %>
+		<div class="well">
             <div class="control-group" id="clientId">
                 <label class="control-label" data-i18n="client.client-form.client-id">Client ID</label>
                 <div class="controls">
@@ -135,8 +137,7 @@ <h1 data-i18n="rsreg.edit"></h1>
                 </div>
             </div>
 
-			<% } %>
-
+		</div>
 
             <div class="control-group" id="clientName">
                 <label class="control-label" data-i18n="client.client-form.client-name">Client name</label>