diff --git a/Application/main.skin b/Application/main.skin index 630e6e8c..4bc3e011 100644 --- a/Application/main.skin +++ b/Application/main.skin @@ -37,6 +37,6 @@ app.properties -<% this.properties prefix="" separator=" " suffix="" %> +<% this.properties itemprefix='' separator=' ' itemsuffix='' % --> diff --git a/Global/functions.js b/Global/functions.js index 94acd536..578ef6eb 100644 --- a/Global/functions.js +++ b/Global/functions.js @@ -235,9 +235,6 @@ function createAuth() { * macro-utility: formatting property lists */ function formatProperties(props,par) { - var prefix = (par && par.prefix) ? par.prefix : ""; - var suffix = (par && par.suffix) ? par.suffix : ""; - var separator = (par && par.separator) ? par.separator : ""; if ( props.size()==0 ) return ""; var e = props.keys(); @@ -249,7 +246,7 @@ function formatProperties(props,par) { for ( var i in arr ) { // don't print the admin-password if ( arr[i].toLowerCase()=="adminusername" || arr[i].toLowerCase()=="adminpassword" ) continue; - res.write ( prefix + arr[i] + separator + props.getProperty(arr[i]) + suffix ); + res.write ( par.itemprefix + arr[i] + par.separator + props.getProperty(arr[i]) + par.itemsuffix ); } } diff --git a/Root/main.skin b/Root/main.skin index 306c6761..fd84cdc4 100644 --- a/Root/main.skin +++ b/Root/main.skin @@ -98,7 +98,7 @@ server.properties -<% this.properties prefix="" separator=" " suffix="" %> +<% this.properties itemprefix='' separator=' ' itemsuffix='' %>