http://ofbiz.116.s1.nabble.com/Re-svn-commit-r1517611-in-ofbiz-trunk-framework-widget-dtd-widget-menu-xsd-src-org-ofbiz-widget-menul-tp4643973.html
There is an issue with this commit related to menus-item and its attribute parent-portal-page-value.
> Author: adrianc
> Date: Mon Aug 26 17:09:41 2013
> New Revision: 1517611
>
> URL:
http://svn.apache.org/r1517611> Log:
> Restored rev 1517353 and fixed a trivial markup error.
>
> Added:
> ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MacroMenuRenderer.java
> - copied unchanged from r1517433, ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MacroMenuRenderer.java
> ofbiz/trunk/framework/widget/templates/htmlMenuMacroLibrary.ftl
> - copied, changed from r1517433, ofbiz/trunk/framework/widget/templates/htmlMenuMacroLibrary.ftl
> Modified:
> ofbiz/trunk/framework/widget/dtd/widget-menu.xsd
> ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java
>
> Modified: ofbiz/trunk/framework/widget/dtd/widget-menu.xsd
> URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/dtd/widget-menu.xsd?rev=1517611&r1=1517610&r2=1517611&view=diff> ==============================================================================
> --- ofbiz/trunk/framework/widget/dtd/widget-menu.xsd (original)
> +++ ofbiz/trunk/framework/widget/dtd/widget-menu.xsd Mon Aug 26 17:09:41 2013
> @@ -73,7 +73,12 @@ under the License.
> <xs:attribute type="xs:string" name="default-cell-width" />
> <xs:attribute type="xs:string" name="default-disabled-title-style" />
> <xs:attribute type="xs:string" name="selected-menuitem-context-field-name" />
> - <xs:attribute type="xs:string" name="menu-container-style" />
> + <xs:attribute type="xs:string" name="menu-container-style">
> + <xs:annotation>
> + <xs:documentation>The style of the container that encloses the menu items. This
> + attribute is ignored when the id attribute is not empty.</xs:documentation>
> + </xs:annotation>
> + </xs:attribute>
> <xs:attribute name="default-align" default="left">
> <xs:simpleType>
> <xs:restriction base="xs:token">
>
> Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java
> URL:
>
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java?rev=1517611&r1=1517610&r2=1517611&view=diff> ============================================================================== ---
> ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java (original) +++
> ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java Mon Aug 26 17:09:41 2013 @@ -38,8 +38,10 @@
> import org.ofbiz.webapp.view.AbstractVie
> import org.ofbiz.webapp.view.ViewHandlerException;
> import org.ofbiz.widget.form.FormStringRenderer;
> import org.ofbiz.widget.form.MacroFormRenderer;
> -import org.ofbiz.widget.tree.TreeStringRenderer;
> +import org.ofbiz.widget.menu.MacroMenuRenderer;
> +import org.ofbiz.widget.menu.MenuStringRenderer;
> import org.ofbiz.widget.tree.MacroTreeRenderer;
> +import org.ofbiz.widget.tree.TreeStringRenderer;
> import org.xml.sax.SAXException;
>
> import freemarker.template.TemplateException;
> @@ -90,15 +92,13 @@ public class MacroScreenViewHandler exte
> ScreenStringRenderer screenStringRenderer = new MacroScreenRenderer(UtilProperties.getPropertyValue("widget",
> getName() + ".name"), UtilProperties.getPropertyValue("widget", getName() + ".screenrenderer")); FormStringRenderer
> formStringRenderer = new MacroFormRenderer(UtilProperties.getPropertyValue("widget", getName() + ".formrenderer"),
> request, response); TreeStringRenderer treeStringRenderer = new MacroTreeRenderer(UtilProperties.getPropertyValue("widget",
> getName() + ".treerenderer"), writer);
> - // TODO: uncomment these lines when the renderers are implemented
> - //MenuStringRenderer menuStringRenderer = new MacroMenuRenderer(UtilProperties.getPropertyValue("widget", getName()
> + ".menurenderer"), writer); + MenuStringRenderer menuStringRenderer = new
> MacroMenuRenderer(UtilProperties.getPropertyValue("widget", getName() + ".menurenderer"), request, response);
>
> ScreenRenderer screens = new ScreenRenderer(writer, null, screenStringRenderer);
> screens.populateContextForRequest(request, response, servletContext);
> - // this is the object used to render forms from their definitions
> screens.getContext().put("formStringRenderer", formStringRenderer);
> screens.getContext().put("treeStringRenderer", treeStringRenderer);
> - //screens.getContext().put("menuStringRenderer", menuStringRenderer);
> + screens.getContext().put("menuStringRenderer", menuStringRenderer);
> screens.getContext().put("simpleEncoder", StringUtil.getEncoder(UtilProperties.getPropertyValue("widget", getName() +
> ".encoder"))); screenStringRenderer.renderScreenBegin(writer, screens.getContext());
> screens.render(page);
>
> Copied: ofbiz/trunk/framework/widget/templates/htmlMenuMacroLibrary.ftl (from r1517433,
> ofbiz/trunk/framework/widget/templates/htmlMenuMacroLibrary.ftl)
> URL:
>
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlMenuMacroLibrary.ftl?p2=ofbiz/trunk/framework/widget/templates/htmlMenuMacroLibrary.ftl&p1=ofbiz/trunk/framework/widget/templates/htmlMenuMacroLibrary.ftl&r1=1517433&r2=1517611&rev=1517611&view=diff> ============================================================================== ---
> ofbiz/trunk/framework/widget/templates/htmlMenuMacroLibrary.ftl (original) +++
> ofbiz/trunk/framework/widget/templates/htmlMenuMacroLibrary.ftl Mon Aug 26 17:09:41 2013 @@ -21,9 +21,9 @@ under the License.
> <#if boundaryComment?has_content>
> <!-- ${boundaryComment} -->
> </#if>
> - <div<#if id?has_content> id="${id}"</#if><#if style?has_content> class="${style}"</#if>>
> + <div<#if id?has_content> id="${id}"<#elseif style?has_content> class="${style}"</#if>>
> <#if title?has_content>
> - <h2>${title}</h2>
> + <h2>${title}</h2>
> </#if>
> <ul>
> <li>
> @@ -36,37 +36,30 @@ under the License.
> </ul>
> <br class="clear"/>
> </div>
> - <#if boundaryComment?has_content>
> +<#if boundaryComment?has_content>
> <!-- ${boundaryComment} -->
> - </#if>
> +</#if>
> </#macro>
>
> <#macro renderImage src id style width height border>
> - <img src="${src}"<#if id?has_content> id="${id}"</#if><#if style?has_content> class="${style}"</#if><#if width?has_content>
> width="${width}"</#if><#if height?has_content> height="${height}"</#if><#if border?has_content> border="${border}"</#if> /> +<img
> src="${src}"<#if id?has_content> id="${id}"</#if><#if style?has_content> class="${style}"</#if><#if width?has_content>
> width="${width}"</#if><#if height?has_content> height="${height}"</#if><#if border?has_content> border="${border}"</#if> />
> </#macro>
>
> <#macro renderLink linkType linkUrl parameterList targetWindow uniqueItemName actionUrl id="" style="" name="" height="" width=""
> text="" imgStr=""> <#if "hidden-form" == linkType>
> - <form method="post" action="${actionUrl}"<#if targetWindow?has_content> target="${targetWindow}"</#if>
> onsubmit="javascript:submitFormDisableSubmits(this)" name="${uniqueItemName}"><#rt/> +<form method="post"
> action="${actionUrl}"<#if targetWindow?has_content> target="${targetWindow}"</#if>
> onsubmit="javascript:submitFormDisableSubmits(this)" name="${uniqueItemName}"><#rt/> <#list parameterList as parameter> -
> <input name="${parameter.name}" value="${parameter.value}" type="hidden"/><#rt/> +<input name="${parameter.name}"
> value="${parameter.value}" type="hidden"/><#rt/> </#list>
> - </form><#rt/>
> +</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>"><#if
> imgStr?has_content>${imgStr}</#if><#if text?has_content>${text}</#if></a> +<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>"><#if
> imgStr?has_content>${imgStr}</#if><#if text?has_content>${text}</#if></a><#rt/> </#macro>
>
> <#macro renderMenuItemBegin style toolTip linkStr containsNestedMenus>
> - <li<#if style?has_content> class="${style}"</#if><#if toolTip?has_content> title="${title}"</#if>>
> - <#if linkStr?has_content>${linkStr}</#if>
> - <#if containsNestedMenus>
> - <ul>
> - </#if>
> + <li<#if style?has_content> class="${style}"</#if><#if toolTip?has_content> title="${title}"</#if>><#if
> linkStr?has_content>${linkStr}</#if><#if containsNestedMenus><ul></#if><#rt/> </#macro>
>
> <#macro renderMenuItemEnd containsNestedMenus>
> - <#if containsNestedMenus>
> - </ul>
> - </#if>
> - </li>
> +<#if containsNestedMenus></ul></#if></li>
> </#macro>