github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

logo url -> uri

pull/306/merge
Justin Richer 2013-03-04 16:53:09 -05:00
parent 7c3ddd0a86
commit 33c488d9ae
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
openid-connect-server/src/main/webapp/resources/js/client.js
View File

@ -25,7 +25,7 @@ var ClientModel = Backbone.Model.extend({
scope:[], scope:[],
authorities:[], authorities:[],
clientDescription:"", clientDescription:"",
logoUrl:"", logoUri:"",
clientId:"", clientId:"",
allowRefresh:false, allowRefresh:false,
accessTokenValiditySeconds: 3600, accessTokenValiditySeconds: 3600,
@ -212,7 +212,7 @@ var ClientFormView = Backbone.View.extend({
"change #requireClientSecret":"toggleRequireClientSecret", "change #requireClientSecret":"toggleRequireClientSecret",
"change #displayClientSecret":"toggleDisplayClientSecret", "change #displayClientSecret":"toggleDisplayClientSecret",
"change #generateClientSecret":"toggleGenerateClientSecret", "change #generateClientSecret":"toggleGenerateClientSecret",
"change #logoUrl input":"previewLogo" "change #logoUri input":"previewLogo"
}, },
toggleRefreshTokenTimeout:function () { toggleRefreshTokenTimeout:function () {
@ -220,9 +220,9 @@ var ClientFormView = Backbone.View.extend({
}, },
previewLogo:function(event) { previewLogo:function(event) {
if ($('#logoUrl input', this.el).val()) { if ($('#logoUri input', this.el).val()) {
$('#logoPreview', this.el).empty(); $('#logoPreview', this.el).empty();
$('#logoPreview', this.el).attr('src', $('#logoUrl input').val()); $('#logoPreview', this.el).attr('src', $('#logoUri input').val());
} else { } else {
$('#logoBlock', this.el).hide(); $('#logoBlock', this.el).hide();
} }
@ -355,7 +355,7 @@ var ClientFormView = Backbone.View.extend({
generateClientSecret:generateClientSecret, generateClientSecret:generateClientSecret,
redirectUris: this.redirectUrisCollection.pluck("item"), redirectUris: this.redirectUrisCollection.pluck("item"),
clientDescription:$('#clientDescription textarea').val(), clientDescription:$('#clientDescription textarea').val(),
logoUrl:$('#logoUrl input').val(), logoUri:$('#logoUri input').val(),
authorizedGrantTypes: authorizedGrantTypes, authorizedGrantTypes: authorizedGrantTypes,
accessTokenValiditySeconds: accessTokenValiditySeconds, accessTokenValiditySeconds: accessTokenValiditySeconds,
refreshTokenValiditySeconds: refreshTokenValiditySeconds, refreshTokenValiditySeconds: refreshTokenValiditySeconds,
@ -364,6 +364,7 @@ var ClientFormView = Backbone.View.extend({
allowIntrospection: $('#allowIntrospection input').is(':checked'), allowIntrospection: $('#allowIntrospection input').is(':checked'),
scope: scopes, scope: scopes,
}); });
// post-validate // post-validate
@ -423,7 +424,7 @@ var ClientFormView = Backbone.View.extend({
}); });
$("#scope .controls",this.el).html(new ListWidgetView({placeholder: 'new scope here' $("#scope .controls",this.el).html(new ListWidgetView({placeholder: 'new scope here'
, autocomplete: _.uniq(_.flatten(app.systemScopeList.pluck("value"))) // TODO: load from default scopes , autocomplete: _.uniq(_.flatten(app.systemScopeList.pluck("value")))
, collection: this.scopeCollection}).render().el); , collection: this.scopeCollection}).render().el);
if (!this.model.get("allowRefresh")) { if (!this.model.get("allowRefresh")) {

5
openid-connect-server/src/main/webapp/resources/template/client.html
View File

@ -112,10 +112,10 @@
</div> </div>
</div> </div>
<div class="control-group" id="logoUrl"> <div class="control-group" id="logoUri">
<label class="control-label">Logo URL</label> <label class="control-label">Logo URL</label>
<div class="controls"> <div class="controls">
<input placeholder="http://" value="<%=logoUrl%>" maxlength="100" type="text" class=""/> <input placeholder="http://" value="<%=logoUri%>" maxlength="100" type="text" class=""/>
<p class="help-block">URL to use for a logo image</p> <p class="help-block">URL to use for a logo image</p>
</div> </div>
</div> </div>
@ -123,6 +123,7 @@
<div class="control-group" id="logoBlock"> <div class="control-group" id="logoBlock">
<label class="control-label">Logo Preview</label> <label class="control-label">Logo Preview</label>
<div class="controls"> <div class="controls">
<!-- TODO: this should be an internally-served placeholder graphic -->
<img src="http://placehold.it/275x200&text=Enter a logo URL" alt="logo" id="logoPreview" width="275px" class="thumbnail" /> <img src="http://placehold.it/275x200&text=Enter a logo URL" alt="logo" id="logoPreview" width="275px" class="thumbnail" />
</div> </div>
</div> </div>