diff --git a/ambrosia/ambrosia-impl/impl/src/java/org/etudes/ambrosia/impl/UiFileUpload.java b/ambrosia/ambrosia-impl/impl/src/java/org/etudes/ambrosia/impl/UiFileUpload.java index 08e4851..e42366a 100644 --- a/ambrosia/ambrosia-impl/impl/src/java/org/etudes/ambrosia/impl/UiFileUpload.java +++ b/ambrosia/ambrosia-impl/impl/src/java/org/etudes/ambrosia/impl/UiFileUpload.java @@ -262,10 +262,10 @@ public boolean render(Context context, Object focus) + "title=\"" + description + "\" " - + (((this.icon != null) && (this.iconStyle == IconStyle.left)) ? "style=\"padding-left:2em; background: #2a94c0 url('" - + context.getUrl(this.icon) + "') .2em no-repeat;\"" : "") - + (((this.icon != null) && (this.iconStyle == IconStyle.right)) ? "style=\"padding-left:.4em; padding-right:2em; background: #2a94c0 url('" - + context.getUrl(this.icon) + "') right no-repeat;\"" + + (((this.icon != null) && (this.iconStyle == IconStyle.left)) ? "style=\"padding-left:2em; background-image: url('" + + context.getUrl(this.icon) + "'); background-position: .2em; background-repeat: no-repeat;\"" : "") + + (((this.icon != null) && (this.iconStyle == IconStyle.right)) ? "style=\"padding-left:.4em; padding-right:2em; background-image: url('" + + context.getUrl(this.icon) + "'); background-position: right; background-repeat: no-repeat;\"" : "") + "/>"); response.println(""); diff --git a/ambrosia/ambrosia-impl/impl/src/java/org/etudes/ambrosia/impl/UiNavigation.java b/ambrosia/ambrosia-impl/impl/src/java/org/etudes/ambrosia/impl/UiNavigation.java index 44bed10..535d75d 100644 --- a/ambrosia/ambrosia-impl/impl/src/java/org/etudes/ambrosia/impl/UiNavigation.java +++ b/ambrosia/ambrosia-impl/impl/src/java/org/etudes/ambrosia/impl/UiNavigation.java @@ -1119,13 +1119,13 @@ protected void renderContents(Context context, Object focus) + "','cancel_" + id + "()');return false;\" " - + ((this.confirmCancelIcon != null) ? "style=\"padding-left:2em; background: #2a94c0 url('" - + context.getUrl(this.confirmCancelIcon) + "') .2em no-repeat;\"" : "") + "/>"); + + ((this.confirmCancelIcon != null) ? "style=\"padding-left:2em; background-image: url('" + + context.getUrl(this.confirmCancelIcon) + "'); background-position: .2em; background-repeat: no-repeat;\"" : "") + "/>"); secondary.print(""); secondary.println(""); @@ -1147,8 +1147,8 @@ protected void renderContents(Context context, Object focus) + id + "','');return false;\" " // TODO: do we need confirm cancel? -ggolden - + ((this.requirementsOkIcon != null) ? "style=\"padding-left:2em; background: #2a94c0 url('" - + context.getUrl(this.requirementsOkIcon) + "') .2em no-repeat;\"" : "") + "/>"); + + ((this.requirementsOkIcon != null) ? "style=\"padding-left:2em; background-image: url('" + + context.getUrl(this.requirementsOkIcon) + "'); background-position: .2em; background-repeat: no-repeat;\"" : "") + "/>"); secondary.println(""); // validation function @@ -1269,10 +1269,10 @@ else if (this.wrap) + "title=\"" + description + "\" " - + (((selectedIcon != null) && (this.iconStyle == IconStyle.left)) ? "style=\"padding-left:2em; background: #2a94c0 url('" - + context.getUrl(selectedIcon) + "') .2em no-repeat;\"" : "") - + (((selectedIcon != null) && (this.iconStyle == IconStyle.right)) ? "style=\"padding-left:.4em; padding-right:2em; background: #2a94c0 url('" - + context.getUrl(selectedIcon) + "') right no-repeat;\"" + + (((selectedIcon != null) && (this.iconStyle == IconStyle.left)) ? "style=\"padding-left:2em; background-image: url('" + + context.getUrl(selectedIcon) + "'); background-position: .2em; background-repeat: no-repeat;\"" : "") + + (((selectedIcon != null) && (this.iconStyle == IconStyle.right)) ? "style=\"padding-left:.4em; padding-right:2em; background-image: url('" + + context.getUrl(selectedIcon) + "'); background-position: right; background-repeat: no-repeat;\"" : "") + "/>"); if (title.equals("Save")) response.println(""); diff --git a/ambrosia/ambrosia-impl/impl/src/java/org/etudes/ambrosia/impl/UiToggle.java b/ambrosia/ambrosia-impl/impl/src/java/org/etudes/ambrosia/impl/UiToggle.java index ade3824..f862672 100644 --- a/ambrosia/ambrosia-impl/impl/src/java/org/etudes/ambrosia/impl/UiToggle.java +++ b/ambrosia/ambrosia-impl/impl/src/java/org/etudes/ambrosia/impl/UiToggle.java @@ -256,11 +256,11 @@ public boolean render(Context context, Object focus) + "();return false;\" " + ((accessKey == null) ? "" : "accesskey=\"" + accessKey.charAt(0) + "\" ") + ((description == null) ? "" : "title=\"" + description + "\" ") - + (((this.icon != null) && (this.iconStyle == Navigation.IconStyle.left)) ? "style=\"padding-left:2em; background: #2a94c0 url('" - + context.getUrl(this.icon) + "') .2em no-repeat;\"" + + (((this.icon != null) && (this.iconStyle == Navigation.IconStyle.left)) ? "style=\"padding-left:2em; background-image: url('" + + context.getUrl(this.icon) + "'); background-position: .2em; background-repeat: no-repeat;\"" : "") - + (((this.icon != null) && (this.iconStyle == Navigation.IconStyle.right)) ? "style=\"padding-left:.4em; padding-right:2em; background: #2a94c0 url('" - + context.getUrl(this.icon) + "') right no-repeat;\"" + + (((this.icon != null) && (this.iconStyle == Navigation.IconStyle.right)) ? "style=\"padding-left:.4em; padding-right:2em; background-image: url('" + + context.getUrl(this.icon) + "'); background-position: right; background-repeat: no-repeat;\"" : "") + "/>"); break;