svn commit: r1206013 - in /ofbiz/trunk/framework/widget: src/org/ofbiz/widget/screen/MacroScreenRenderer.java templates/htmlScreenMacroLibrary.ftl

[adrianc]

Author: adrianc
Date: Thu Nov 24 23:01:31 2011
New Revision: 1206013

URL: http://svn.apache.org/viewvc?rev=1206013&view=rev
Log:
Changed the behavior of screenlet title bar: Do not hide title bar controls 
when screenlet is collapsed.

Modified:
    
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
    ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl

Modified: 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java?rev=1206013&r1=1206012&r2=1206013&view=diff
==============================================================================
--- 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
 (original)
+++ 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
 Thu Nov 24 23:01:31 2011
@@ -613,19 +613,17 @@ public class MacroScreenRenderer impleme
                     fullUrlString = request.getRequestURI() + "?" + 
queryString;
                 }
             }
-            if (!collapsed) {
-                StringWriter sb = new StringWriter();
-                if (navMenu != null) {
-                    MenuStringRenderer savedRenderer = (MenuStringRenderer) 
context.get("menuStringRenderer");
-                    MenuStringRenderer renderer = new 
ScreenletMenuRenderer(request, response);
-                    context.put("menuStringRenderer", renderer);
-                    navMenu.renderWidgetString(sb, context, this);
-                    context.put("menuStringRenderer", savedRenderer);
-                } else if (navForm != null) {
-                    renderScreenletPaginateMenu(sb, context, navForm);
-                }
-                menuString = sb.toString();
+            StringWriter sb = new StringWriter();
+            if (navMenu != null) {
+                MenuStringRenderer savedRenderer = (MenuStringRenderer) 
context.get("menuStringRenderer");
+                MenuStringRenderer renderer = new 
ScreenletMenuRenderer(request, response);
+                context.put("menuStringRenderer", renderer);
+                navMenu.renderWidgetString(sb, context, this);
+                context.put("menuStringRenderer", savedRenderer);
+            } else if (navForm != null) {
+                renderScreenletPaginateMenu(sb, context, navForm);
             }
+            menuString = sb.toString();
         }
 
         Map<String, Object> parameters = FastMap.newInstance();

Modified: ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl?rev=1206013&r1=1206012&r2=1206013&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl Thu Nov 
24 23:01:31 2011
@@ -157,9 +157,12 @@ expanded"><a <#if javaScriptEnabled>oncl
 </#if>
 >&nbsp;</a></li>
 </#if>
+<#--
 <#if !collapsed>
 ${menuString}
 </#if>
+ -->
+${menuString}
 </ul><br class="clear" /></div>
 </#if>
 <div <#if collapsibleAreaId?has_content> id="${collapsibleAreaId}" <#if 
collapsed> style="display: none;"</#if></#if><#if padded> 
class="screenlet-body"<#else> class="screenlet-body no-padding"</#if>>