Skip to content

ISSUE-21 ambrosia buttons should use Sakai's default button backgroun… #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
austin48 wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −17
Open

ISSUE-21 ambrosia buttons should use Sakai's default button backgroun… #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ambrosia/ambrosia-impl/impl/src/java/org/etudes/ambrosia/impl/UiFileUpload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("</span>");
Expand Down
18 changes: 9 additions & 9 deletions ambrosia/ambrosia-impl/impl/src/java/org/etudes/ambrosia/impl/UiNavigation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;\"" : "") + "/></td>");
+ ((this.confirmCancelIcon != null) ? "style=\"padding-left:2em; background-image: url('"
+ context.getUrl(this.confirmCancelIcon) + "'); background-position: .2em; background-repeat: no-repeat;\"" : "") + "/></td>");
secondary.print("<td style=\"padding:1em\" align=\"right\"><input type=\"button\" value=\"" + title
+ "\" onclick=\"hideConfirm('confirm_" + id + "','act_" + id + "();');return false;\"");
if (selectedIcon != null)
{
secondary.print(" style=\"padding-left:2em; background: #2a94c0 url('" + context.getUrl(selectedIcon) + "') .2em no-repeat;\"");
secondary.print(" style=\"padding-left:2em; background-image: url('" + context.getUrl(selectedIcon) + "'); background-position: .2em; background-repeat: no-repeat;\"");
}
secondary.println("/></td>");
secondary.println("</tr></table></div>");
Expand All @@ -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;\"" : "") + "/></td>");
+ ((this.requirementsOkIcon != null) ? "style=\"padding-left:2em; background-image: url('"
+ context.getUrl(this.requirementsOkIcon) + "'); background-position: .2em; background-repeat: no-repeat;\"" : "") + "/></td>");
secondary.println("</tr></table></div>");

// validation function
Expand Down Expand Up @@ -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("<input type=\"hidden\" id=\"saveVal\" name=\"saveVal\" value=\""+id+"\">");
Expand Down
8 changes: 4 additions & 4 deletions ambrosia/ambrosia-impl/impl/src/java/org/etudes/ambrosia/impl/UiToggle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down