You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2009/10/18 19:09:37 UTC
svn commit: r826469 - in /ofbiz/trunk: framework/common/widget/
framework/widget/templates/ themes/bizznesstime/webapp/bizznesstime/css/
themes/bluelight/webapp/bluelight/ themes/flatgrey/webapp/flatgrey/
Author: adrianc
Date: Sun Oct 18 17:09:37 2009
New Revision: 826469
URL: http://svn.apache.org/viewvc?rev=826469&view=rev
Log:
Improved screenlet-body handling, patch from Bruno Busco - https://issues.apache.org/jira/browse/OFBIZ-3012.
Modified:
ofbiz/trunk/framework/common/widget/CommonScreens.xml
ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl
ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css
ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css
ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css
Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=826469&r1=826468&r2=826469&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Sun Oct 18 17:09:37 2009
@@ -429,22 +429,18 @@
</section>
<decorator-section-include name="menu-bar"/>
<container style="clear"/>
- <screenlet id="searchOptions" name="findScreenlet" collapsible="true" padded="false">
- <container style="screenlet-body">
- <label style="h2" text="${uiLabelMap.CommonSearchOptions}"/>
- <container id="search-options">
- <decorator-section-include name="search-options"/>
- </container>
+ <screenlet id="searchOptions" name="findScreenlet" collapsible="true">
+ <label style="h2" text="${uiLabelMap.CommonSearchOptions}"/>
+ <container id="search-options">
+ <decorator-section-include name="search-options"/>
</container>
</screenlet>
- <container style="screenlet">
- <container style="screenlet-body">
- <label style="h2" text="${uiLabelMap.CommonSearchResults}"/>
- </container>
+ <screenlet padded="false">
+ <label style="h2" text="${uiLabelMap.CommonSearchResults}"/>
<container id="search-results">
<decorator-section-include name="search-results"/>
</container>
- </container>
+ </screenlet>
</widgets>
</section>
</screen>
Modified: ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl?rev=826469&r1=826468&r2=826469&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl Sun Oct 18 17:09:37 2009
@@ -145,8 +145,9 @@
<#if !collapsed>
${menuString}
</#if>
-</ul><br class="clear" /></div><div <#if collapsibleAreaId?has_content> id="${collapsibleAreaId}" <#if collapsed> style="display: none;"</#if></#if><#if padded> class="screenlet-body"</#if>>
+</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>>
</#macro>
<#macro renderScreenletSubWidget></#macro>
<#macro renderScreenletEnd></div></div></#macro>
Modified: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css?rev=826469&r1=826468&r2=826469&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css (original)
+++ ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css Sun Oct 18 17:09:37 2009
@@ -1234,6 +1234,11 @@
display:block;
}
+div.no-padding {
+ padding: 0;
+ border: none;
+}
+
.screenlet-title-bar {
background-color: #1c334d;
color: #ffffff;
Modified: ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css?rev=826469&r1=826468&r2=826469&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css (original)
+++ ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css Sun Oct 18 17:09:37 2009
@@ -724,6 +724,11 @@
border: 0.1em solid #5CA3D7;
}
+DIV.no-padding {
+ padding: 0;
+ border: none;
+}
+
#column-container {
margin: auto;
padding: 0 1em 1em 1em;
Modified: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css?rev=826469&r1=826468&r2=826469&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css (original)
+++ ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css Sun Oct 18 17:09:37 2009
@@ -731,6 +731,11 @@
padding: 0.4em;
}
+DIV.no-padding {
+padding: 0;
+border: none;
+}
+
#column-container {
margin: auto;
padding: 1em;