Permalink
Browse files

Fixes for inputs etc

  • Loading branch information...
1 parent 3455ea6 commit 9bebed84e0c288d9cb32dffc899c15191dcffca2 @marcpalmer marcpalmer committed Nov 26, 2012
@@ -38,7 +38,7 @@ grails.project.dependency.resolution = {
runtime ":jquery:1.7.1"
runtime ":resources:1.2.RC2"
compile ":bean-fields:1.0"
- compile ":platform-ui:1.0.M1-SNAPSHOT"
+ compile ":platform-ui:1.0.RC1"
runtime ":twitter-bootstrap:2.1.1"
}
}
@@ -13,12 +13,13 @@ ${field}
<bean:textAreaTemplate>
${field}
</bean:textAreaTemplate>
+<g:set var="type" value="${type ?: 'text'}"/>
<g:if test="${beanObject}">
<g:if test="${type == 'password'}">
<bean:field type="password" beanName="dummy" bean="${beanObject}" property="${name}" noLabel="${true}"/>
</g:if>
<g:else>
- <bean:field beanName="dummy" bean="${beanObject}" property="${name}" noLabel="${true}"/>
+ <bean:field type="${type}" beanName="dummy" bean="${beanObject}" property="${name}" noLabel="${true}"/>
</g:else>
</g:if>
<g:else>
@@ -8,9 +8,9 @@
logoClass - Class to apply to the logo element
uiArgs
--%>
-<g:set var="logoSizeClass" value="${logoClass+(w?:'')+'x'+(h?:'')}"/>
+<g:set var="logoSizeClass" value="${logoClass+(width?:'')+'x'+(height?:'')}"/>
<g:if test="${logoUri}">
- <a href="${p.siteURL().encodeAsHTML()}"><r:img uri="${logoUri.encodeAsHTML()}" class="${p.joinClasses(values:[classes, logoClass, logoSizeClass])}" alt="${applicationName.encodeAsHTML()}" width="${w}" height="${h}"/></a>
+ <a href="${p.siteURL().encodeAsHTML()}"><r:img uri="${logoUri.encodeAsHTML()}" class="${p.joinClasses(values:[classes, logoClass, logoSizeClass])}" alt="${applicationName.encodeAsHTML()}" width="${width}" height="${height}"/></a>
</g:if>
<g:else>
<a href="${p.siteURL().encodeAsHTML()}" class="${classes}"><h1>${applicationName.encodeAsHTML()}</h1></a>
@@ -1,3 +1,4 @@
/* Customisation here */
img.logo {
+
}

0 comments on commit 9bebed8

Please sign in to comment.