OFBiz › OFBiz - Commits

svn commit: r931665 - in /ofbiz/trunk/themes: bizznesstime/includes/ bluelight/includes/ droppingcrumbs/includes/ droppingcrumbs/webapp/droppingcrumbs/css/ flatgrey/includes/ tomahawk/includes/ tomahawk/webapp/tomahawk/css/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

buscob

svn commit: r931665 - in /ofbiz/trunk/themes: bizznesstime/includes/ bluelight/includes/ droppingcrumbs/includes/ droppingcrumbs/webapp/droppingcrumbs/css/ flatgrey/includes/ tomahawk/includes/ tomahawk/webapp/tomahawk/css/

Author: buscob
Date: Wed Apr 7 20:15:21 2010
New Revision: 931665

URL: http://svn.apache.org/viewvc?rev=931665&view=rev
Log:
A patch from Blas Rodriguez Somoza
OFBIZ-3621 - XHTML validation errors (themes)
XHTML validation errors

* Unclosed INPUT
* attributes without values (checked, selected, disabled, etc)
* attribute values without "
* Uppercase tags or attributes.
* Unencoded ampersands in urls.

Other errors:

Header.ftl (tomahawk & droppingcrumbs)
Line 108. Wrong markup. Div can't be inside <a>
<a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>" title="${layoutSettings.companyName}"><div> </div></a>

Style.css (tomahawk & droppingcrumbs)
Line 945. The logo is used as the background of the logo area, but because the size of the background image means nothing for dimensioning, it will be clipped.
background: url(../images/ofbiz_logo.png) no-repeat;

Solution: This is a hack to put the logo in the style sheet as the background. If the logo is only in the stylesheet without any trick, the logo will be clipped and disappears.
The logo can be loaded as an image directly in header.ftl and it will appear without clip and without any hack in header.ftl.

appbarOpen.ftl (droppingcrumbs)
Line 99, unclosed <li> and <ul>

header.ftl (bizznesstime)
Line 111. div can't be inside span.

Modified:
ofbiz/trunk/themes/bizznesstime/includes/header.ftl
ofbiz/trunk/themes/bluelight/includes/header.ftl
ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl
ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl
ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
ofbiz/trunk/themes/flatgrey/includes/header.ftl
ofbiz/trunk/themes/tomahawk/includes/header.ftl
ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css

Modified: ofbiz/trunk/themes/bizznesstime/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/header.ftl?rev=931665&r1=931664&r2=931665&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/includes/header.ftl (original)
+++ ofbiz/trunk/themes/bizznesstime/includes/header.ftl Wed Apr 7 20:15:21 2010
@@ -108,11 +108,11 @@ under the License.
<div id="controls">
<span id="prefBtn">
<a href="#" class="contracted">${uiLabelMap.CommonPreferences}</a>
- <div id="preferences" style="display:none">
+ <span id="preferences" style="display:none">
<a href="<@ofbizUrl>ListLocales</@ofbizUrl>" id="language">${uiLabelMap.CommonLanguageTitle} - ${locale.getDisplayName(locale)}</a>
<a href="<@ofbizUrl>ListTimezones</@ofbizUrl>" id="timezone">${nowTimestamp?datetime?string.short} - ${timeZone.getDisplayName(timeZone.useDaylightTime(), Static["java.util.TimeZone"].LONG, locale)}</a>
<a href="<@ofbizUrl>ListVisualThemes</@ofbizUrl>" id="theme">${uiLabelMap.CommonVisualThemes}</a>
- </div>
+ </span>
</span>
<span>
<#if person?has_content>

Modified: ofbiz/trunk/themes/bluelight/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/header.ftl?rev=931665&r1=931664&r2=931665&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/includes/header.ftl (original)
+++ ofbiz/trunk/themes/bluelight/includes/header.ftl Wed Apr 7 20:15:21 2010
@@ -16,7 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<#assign externalKeyParam = "&externalLoginKey=" + requestAttributes.externalLoginKey?if_exists>
+<#assign externalKeyParam = "&externalLoginKey=" + requestAttributes.externalLoginKey?if_exists>

<#if (requestAttributes.person)?exists><#assign person = requestAttributes.person></#if>
<#if (requestAttributes.partyGroup)?exists><#assign partyGroup = requestAttributes.partyGroup></#if>
@@ -151,7 +151,7 @@ under the License.
</#if>
<#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists>
<#include "component://common/webcommon/includes/helplink.ftl" />
- <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);" title=${uiLabelMap.CommonHelp}></a></li>
+ <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li>
</#if>
<#if userLogin?exists>
<#if (userPreferences.COMPACT_HEADER)?default("N") == "Y">

Modified: ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl?rev=931665&r1=931664&r2=931665&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl (original)
+++ ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl Wed Apr 7 20:15:21 2010
@@ -97,4 +97,6 @@ under the License.
</ul>
</li>
</ul>
+ </li>
+ </ul>
</div>

Modified: ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl?rev=931665&r1=931664&r2=931665&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl (original)
+++ ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl Wed Apr 7 20:15:21 2010
@@ -16,7 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<#assign externalKeyParam = "&externalLoginKey=" + requestAttributes.externalLoginKey?if_exists>
+<#assign externalKeyParam = "&externalLoginKey=" + requestAttributes.externalLoginKey?if_exists>

<#if (requestAttributes.person)?exists><#assign person = requestAttributes.person></#if>
<#if (requestAttributes.partyGroup)?exists><#assign partyGroup = requestAttributes.partyGroup></#if>
@@ -113,7 +113,7 @@ under the License.
<div id="masthead">
<ul>
<#if (userPreferences.COMPACT_HEADER)?default("N") == "Y">
- <li class="logo-area">
+ <li>
<#if shortcutIcon?has_content>
<a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>"><img src="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)}</@ofbizContentUrl>" height="16px" width="16px"/></a>
</#if>
@@ -127,7 +127,7 @@ under the License.
<#assign headerImageUrl = layoutSettings.VT_HDR_IMAGE_URL.get(0)>
</#if>
<#if headerImageUrl?exists>
- <li class="logo-area"><a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>" title="${layoutSettings.companyName}"><div> </div></a></li>
+ <li id="logo-area"><a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>" title="${layoutSettings.companyName}"><span> </span></a></li>
</#if>
<#if layoutSettings.middleTopMessage1?has_content && layoutSettings.middleTopMessage1 != " ">
<li>

Modified: ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css?rev=931665&r1=931664&r2=931665&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css (original)
+++ ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css Wed Apr 7 20:15:21 2010
@@ -920,7 +920,7 @@ font-weight: bold;
/* ==================================== */
/* ===== Masthead (Header) Styles ===== */
/* ==================================== */
-.logo-area a div{
+#logo-area {
background: url(/droppingcrumbs/images/ofbiz_logo.gif) no-repeat;
width:260px;
height:50px;

Modified: ofbiz/trunk/themes/flatgrey/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/header.ftl?rev=931665&r1=931664&r2=931665&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/header.ftl Wed Apr 7 20:15:21 2010
@@ -77,7 +77,7 @@ under the License.
${extraHead}
</#list>
</#if>
- <#if lastParameters?exists><#assign parametersURL = "&" + lastParameters></#if>
+ <#if lastParameters?exists><#assign parametersURL = "&" + lastParameters></#if>
</head>
<#if layoutSettings.headerImageLinkUrl?exists>
<#assign logoLinkURL = "${layoutSettings.headerImageLinkUrl}">
@@ -138,7 +138,7 @@ under the License.
</#if>
<li/>
<#if layoutSettings.middleTopMessage1?has_content && layoutSettings.middleTopMessage1 != " ">
- <li class=h4>
+ <li class="h4">
<div class="divHidden">
<center>${layoutSettings.middleTopHeader?if_exists}</center>
<a href="${layoutSettings.middleTopLink1?if_exists}">${layoutSettings.middleTopMessage1?if_exists}</a><br/>

Modified: ofbiz/trunk/themes/tomahawk/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/header.ftl?rev=931665&r1=931664&r2=931665&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/includes/header.ftl (original)
+++ ofbiz/trunk/themes/tomahawk/includes/header.ftl Wed Apr 7 20:15:21 2010
@@ -16,7 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<#assign externalKeyParam = "&externalLoginKey=" + requestAttributes.externalLoginKey?if_exists>
+<#assign externalKeyParam = "&externalLoginKey=" + requestAttributes.externalLoginKey?if_exists>

<#if (requestAttributes.person)?exists><#assign person = requestAttributes.person></#if>
<#if (requestAttributes.partyGroup)?exists><#assign partyGroup = requestAttributes.partyGroup></#if>
@@ -105,7 +105,7 @@ under the License.
<#assign headerImageUrl = layoutSettings.VT_HDR_IMAGE_URL.get(0)>
</#if>
<#if headerImageUrl?exists>
- <li class="logo-area"><a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>" title="${layoutSettings.companyName}"><div> </div></a></li>
+ <li id="logo-area"><a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>" title="${layoutSettings.companyName}"><span> </span></a></li>
</#if>
<#if layoutSettings.middleTopMessage1?has_content && layoutSettings.middleTopMessage1 != " ">
<li class="last-system-msg">

Modified: ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css?rev=931665&r1=931664&r2=931665&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css (original)
+++ ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css Wed Apr 7 20:15:21 2010
@@ -941,7 +941,7 @@ font-weight: bold;
/* ==================================== */
/* ===== Masthead (Header) Styles ===== */
/* ==================================== */
-.logo-area a div{
+#logo-area {
background: url(../images/ofbiz_logo.png) no-repeat;
width:385px;
height:50px;