svn commit: r1095984 [8/8] - in /ofbiz/trunk: ./ framework/common/widget/ framework/example/widget/examp
Locked
svn commit: r1095984 [8/8] - in /ofbiz/trunk: ./ framework/common/widget/ framework/example/widget/examp
 
|
Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/wand.png
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/wand.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/wand.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/weather_clouds.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/weather_clouds.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/weather_clouds.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/weather_cloudy.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/weather_cloudy.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/weather_cloudy.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/weather_lightning.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/weather_lightning.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/weather_lightning.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/weather_rain.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/weather_rain.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/weather_rain.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/weather_snow.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/weather_snow.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/weather_snow.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/weather_sun.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/weather_sun.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/weather_sun.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/webcam.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/webcam.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/webcam.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/webcam_add.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/webcam_add.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/webcam_add.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/webcam_delete.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/webcam_delete.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/webcam_delete.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/webcam_error.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/webcam_error.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/webcam_error.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/world.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/world.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/world.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/world_add.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/world_add.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/world_add.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/world_delete.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/world_delete.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/world_delete.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/world_edit.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/world_edit.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/world_edit.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/world_go.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/world_go.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/world_go.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/world_link.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/world_link.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/world_link.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/wrench.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/wrench.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/wrench.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/wrench_orange.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/wrench_orange.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/wrench_orange.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/xhtml.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/xhtml.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/xhtml.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/xhtml_add.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/xhtml_add.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/xhtml_add.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/xhtml_delete.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/xhtml_delete.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/xhtml_delete.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/xhtml_go.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/xhtml_go.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/xhtml_go.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/xhtml_valid.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/xhtml_valid.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/xhtml_valid.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/zoom.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/zoom.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/zoom.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/zoom_in.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/zoom_in.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/zoom_in.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/zoom_out.png URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/zoom_out.png?rev=1095984&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/icons/famfamfam/zoom_out.png ------------------------------------------------------------------------------ svn:mime-type = image/png Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=1095984&r1=1095983&r2=1095984&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Fri Apr 22 18:51:10 2011 @@ -190,7 +190,7 @@ public class MacroFormRenderer implement } String description = displayField.getDescription(context); String type = displayField.getType(); - String imageLocation = displayField.getImageLocation(); + String imageLocation = displayField.getImageLocation(context); Integer size = Integer.valueOf("0"); String title = ""; @@ -311,7 +311,7 @@ public class MacroFormRenderer implement } public void renderHyperlinkField(Appendable writer, Map<String, Object> context, HyperlinkField hyperlinkField) throws IOException { - this.request.setAttribute("image", hyperlinkField.getImage()); + this.request.setAttribute("image", hyperlinkField.getImageLocation(context)); ModelFormField modelFormField = hyperlinkField.getModelFormField(); String encodedAlternate = encode(hyperlinkField.getAlternate(context), modelFormField, context); @@ -1070,7 +1070,7 @@ public class MacroFormRenderer implement String name = modelFormField.getParameterName(context); String buttonType = submitField.getButtonType(); String formName = modelForm.getCurrentFormName(context); - String imgSrc = submitField.getImageLocation(); + String imgSrc = submitField.getImageLocation(context); String confirmation = submitField.getConfirmation(context); String className = ""; String alert = "false"; Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=1095984&r1=1095983&r2=1095984&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Fri Apr 22 18:51:10 2011 @@ -2064,7 +2064,7 @@ public class ModelFormField { protected FlexibleStringExpander description; protected String type; // matches type of field, currently text or currency protected String size; // maximum number of characters to display - protected String imageLocation; + protected FlexibleStringExpander imageLocation; protected FlexibleStringExpander currency; protected FlexibleStringExpander date; protected InPlaceEditor inPlaceEditor; @@ -2086,7 +2086,7 @@ public class ModelFormField { super(element, modelFormField); this.type = element.getAttribute("type"); this.size = element.getAttribute("size"); - this.imageLocation = element.getAttribute("image-location"); + this.setImageLocation(element.getAttribute("image-location")); this.setCurrency(element.getAttribute("currency")); this.setDescription(element.getAttribute("description")); this.setDate(element.getAttribute("date")); @@ -2118,8 +2118,8 @@ public class ModelFormField { return this.size = size; } - public String getImageLocation(){ - return this.imageLocation; + public String getImageLocation(Map<String, Object> context){ + return this.imageLocation.expandString(context); } public String getDescription(Map<String, Object> context) { @@ -2231,6 +2231,13 @@ public class ModelFormField { } /** + * @param Image-location + */ + public void setImageLocation(String value) { + this.imageLocation = FlexibleStringExpander.getInstance(value); + } + + /** * @param Description */ public void setDescription(String string) { @@ -2361,11 +2368,11 @@ public class ModelFormField { protected boolean alsoHidden = true; protected String linkType; protected String targetType; - protected String image; protected String size; protected FlexibleStringExpander target; protected FlexibleStringExpander description; protected FlexibleStringExpander alternate; + protected FlexibleStringExpander imageLocation; protected FlexibleStringExpander imageTitle; protected FlexibleStringExpander targetWindowExdr; protected FlexibleMapAccessor<Map<String, String>> parametersMapAcsr; @@ -2390,6 +2397,7 @@ public class ModelFormField { this.setDescription(element.getAttribute("description")); this.setAlternate(element.getAttribute("alternate")); + this.setImageLocation(element.getAttribute("image-location")); this.setImageTitle(element.getAttribute("image-title")); this.setTarget(element.getAttribute("target")); this.alsoHidden = !"false".equals(element.getAttribute("also-hidden")); @@ -2397,7 +2405,6 @@ public class ModelFormField { this.targetType = element.getAttribute("target-type"); this.targetWindowExdr = FlexibleStringExpander.getInstance(element.getAttribute("target-window")); this.parametersMapAcsr = FlexibleMapAccessor.getInstance(element.getAttribute("parameters-map")); - this.image = element.getAttribute("image-location"); this.size = element.getAttribute("size"); this.setRequestConfirmation("true".equals(element.getAttribute("request-confirmation"))); this.setConfirmationMsg(element.getAttribute("confirmation-message")); @@ -2461,6 +2468,10 @@ public class ModelFormField { public String getAlternate(Map<String, Object> context) { return this.alternate.expandString(context); } + + public String getImageLocation(Map<String, Object> context) { + return this.imageLocation.expandString(context); + } public String getImageTitle(Map<String, Object> context) { return this.imageTitle.expandString(context); @@ -2485,10 +2496,6 @@ public class ModelFormField { return fullParameterMap; } - public String getImage() { - return this.image; - } - public String getSize() { return this.size; } @@ -2521,6 +2528,13 @@ public class ModelFormField { /** * @param string */ + public void setImageLocation(String string) { + this.imageLocation = FlexibleStringExpander.getInstance(string); + } + + /** + * @param string + */ public void setImageTitle(String string) { this.imageTitle = FlexibleStringExpander.getInstance(string); } @@ -3402,7 +3416,7 @@ public class ModelFormField { public static class SubmitField extends FieldInfo { protected String buttonType; - protected String imageLocation; + protected FlexibleStringExpander imageLocation; protected FlexibleStringExpander backgroundSubmitRefreshTargetExdr; protected boolean requestConfirmation = false; protected FlexibleStringExpander confirmationMsgExdr; @@ -3422,7 +3436,7 @@ public class ModelFormField { public SubmitField(Element element, ModelFormField modelFormField) { super(element, modelFormField); this.buttonType = element.getAttribute("button-type"); - this.imageLocation = element.getAttribute("image-location"); + setImageLocation(element.getAttribute("image-location")); this.backgroundSubmitRefreshTargetExdr = FlexibleStringExpander.getInstance(element.getAttribute("background-submit-refresh-target")); setRequestConfirmation("true".equals(element.getAttribute("request-confirmation"))); setConfirmationMsg(element.getAttribute("confirmation-message")); @@ -3437,8 +3451,8 @@ public class ModelFormField { return buttonType; } - public String getImageLocation() { - return imageLocation; + public String getImageLocation(Map<String, Object> context) { + return this.imageLocation.expandString(context); } public boolean getRequestConfirmation() { @@ -3472,8 +3486,8 @@ public class ModelFormField { /** * @param string */ - public void setImageLocation(String string) { - imageLocation = string; + public void setImageLocation(String val) { + imageLocation = FlexibleStringExpander.getInstance(val); } public String getBackgroundSubmitRefreshTarget(Map<String, Object> context) { Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java?rev=1095984&r1=1095983&r2=1095984&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java Fri Apr 22 18:51:10 2011 @@ -493,10 +493,11 @@ public class HtmlMenuRenderer extends Ht // the text Image img = link.getImage(); - if (img == null) { - writer.append(link.getText(context)); - } else { + if (img != null) { renderImage(writer, context, img); + writer.append(" " + link.getText(context)); + } else { + writer.append(link.getText(context)); } if (UtilValidate.isNotEmpty(target)) { Modified: ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl?rev=1095984&r1=1095983&r2=1095984&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl (original) +++ ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl Fri Apr 22 18:51:10 2011 @@ -70,7 +70,7 @@ under the License. <#if id?has_content><#assign idText = " id=\"${id}\""/></#if> <#if style?has_content> <#if style=="h1"> - <h1${idText}>${text}</h1> + <h1${idText}>${text}</h1> <#elseif style=="h2"> <h2${idText}>${text}</h2> <#elseif style=="h3"> @@ -82,10 +82,10 @@ under the License. <#elseif style=="h6"> <h6${idText}>${text}</h6> <#else> - <span${idText} class="${style}">${text}</span> + <span${idText} class="${style}">${text}</span> </#if> <#else> - <span${idText}>${text}</span> + <span${idText}>${text}</span> </#if> </#if> </#macro> @@ -100,7 +100,7 @@ under the License. </form><#rt/> </#if> <a <#if id?has_content>id="${id}"</#if> <#if style?has_content>class="${style}"</#if> <#if name?has_content>name="${name}"</#if> <#if targetWindow?has_content>target="${targetWindow}"</#if> href="<#if "hidden-form"==linkType>javascript:document.${uniqueItemName}.submit()<#else>${linkUrl}</#if>"><#rt/> -<#if imgStr?has_content>${imgStr}<#else><#if text?has_content>${text}</#if></#if></a> +<#if imgStr?has_content>${imgStr}</#if><#if text?has_content>${text}</#if></a> <#else> <div id="${uniqueItemName}"></div> @@ -267,7 +267,7 @@ ${menuString} <input name="mode" value="DRAGDROPBOTTOM" type="hidden"/> </form> <a href="javascript:document.movePortletLeft_${portletKey}.submit()"> </a></li> - </#if> + </#if> <#if nextColumnSeqId?has_content> <li class="move-right"> <form method="post" action="updatePortletSeqDragDrop" name="movePortletRight_${portletKey}"> @@ -278,7 +278,7 @@ ${menuString} <input name="mode" value="DRAGDROPBOTTOM" type="hidden"/> </form> <a href="javascript:document.movePortletRight_${portletKey}.submit()"> </a></li> - </#if> + </#if> <#if prevPortletId?has_content> <li class="move-up"> <form method="post" action="updatePortletSeqDragDrop" name="movePortletUp_${portletKey}"> @@ -291,7 +291,7 @@ ${menuString} <input name="mode" value="DRAGDROPBEFORE" type="hidden"/> </form> <a href="javascript:document.movePortletUp_${portletKey}.submit()"> </a></li> - </#if> + </#if> <#if nextPortletId?has_content> <li class="move-down"> <form method="post" action="updatePortletSeqDragDrop" name="movePortletDown_${portletKey}"> @@ -304,7 +304,7 @@ ${menuString} <input name="mode" value="DRAGDROPAFTER" type="hidden"/> </form> <a href="javascript:document.movePortletDown_${portletKey}.submit()"> </a></li> - </#if> + </#if> </ul> <br class="clear"/> </div> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |