You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/11/08 23:35:51 UTC
svn commit: r833937 - in /ofbiz/trunk:
framework/widget/templates/htmlFormMacroLibrary.ftl
themes/bizznesstime/webapp/bizznesstime/css/legacy.css
themes/bluelight/webapp/bluelight/style.css
themes/flatgrey/webapp/flatgrey/maincss.css
Author: jleroux
Date: Sun Nov 8 22:35:51 2009
New Revision: 833937
URL: http://svn.apache.org/viewvc?rev=833937&view=rev
Log:
A patch from Bruno Busco "The icon used for accessing the lookups should be defined by the theme" (https://issues.apache.org/jira/browse/OFBIZ-3176) - OFBIZ-3176
In this patch the lookup field renderer has the link image not as a static img field but specified by the theme through a style class.
Modified:
ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/legacy.css
ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css
ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css
Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=833937&r1=833936&r2=833937&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Sun Nov 8 22:35:51 2009
@@ -408,8 +408,9 @@
</#macro>
<#macro renderLookupField className alert name value size maxlength id autocomplete descriptionFieldName formName lookupFieldFormName targetParameterIter imgSrc ajaxUrl ajaxEnabled>
-<input type="text" <@renderClass className alert /><#if name?has_content> name="${name}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if id?has_content> id="${id}"</#if><#rt/><#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/>
-<#if descriptionFieldName?has_content>
+<div class="field-lookup"><ul>
+<li><input type="text" <@renderClass className alert /><#if name?has_content> name="${name}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if id?has_content> id="${id}"</#if><#rt/><#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/></li></li>
+<li><#if descriptionFieldName?has_content>
<a href="javascript:call_fieldlookup3(document.${formName?html}.${name?html},'${descriptionFieldName}',<#rt/>
<#else>
<a href="javascript:call_fieldlookup2(document.${formName}.${name},<#rt/>
@@ -419,8 +420,8 @@
,document.${formName}.${item}.value<#rt>
</#list>
</#if>
-);"><#rt>
-<img src="${imgSrc}"width="15" height="14" border="0" alt="Lookup"/></a><#rt>
+);"></li><#rt>
+</ul></div>
<#if ajaxEnabled?has_content && ajaxEnabled>
<script language="JavaScript" type="text/javascript">ajaxAutoCompleter('${ajaxUrl}');</script><#t/>
</#if>
Modified: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/legacy.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/legacy.css?rev=833937&r1=833936&r2=833937&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/legacy.css (original)
+++ ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/legacy.css Sun Nov 8 22:35:51 2009
@@ -487,8 +487,16 @@
/***********************************************
Calendar
***********************************************/
-.field-lookup {
- background: url(/images/fieldlookup.gif) no-repeat;
+.field-lookup ul li {
+float: left;
+}
+
+.field-lookup ul li a{
+background: url(/images/fieldlookup.gif) no-repeat 0 0;
+display: block;
+margin: 3px 10px 0px 4px;
+width:16px;
+height:16px;
}
.view-calendar {
Modified: ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css?rev=833937&r1=833936&r2=833937&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css (original)
+++ ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css Sun Nov 8 22:35:51 2009
@@ -1850,43 +1850,20 @@
padding: 0 30px 0 30px;
}
-/* ================================= */
- /* ===== Visual Embellishments ===== */
- /* ================================= */
.view-calendar {
background: url(/images/cal.gif) no-repeat;
}
-.field-lookup {
- background: url(/images/fieldlookup.gif) no-repeat;
-}
-
-.nav-first { /*
-background: url(/images/prev-year.gif) no-repeat left center;
-padding-left: 1.8em;
-*/
-
-}
-
-.nav-last { /*
-background: url(/images/next-year.gif) no-repeat right center;
-padding-right: 1.8em;
-*/
-
-}
-
-.nav-next { /*
-background: url(/images/next.gif) no-repeat right center;
-padding-right: 1.8em;
-*/
-
+.field-lookup ul li {
+float: left;
}
-.nav-previous { /*
-background: url(/images/prev.gif) no-repeat left center;
-padding-left: 1.8em;
-*/
-
+.field-lookup ul li a{
+background: url(/bluelight/images/application_view_list.png) no-repeat 0 0;
+display: block;
+margin: 3px 10px 0px 4px;
+width:16px;
+height:16px;
}
/* ================================= */
Modified: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css?rev=833937&r1=833936&r2=833937&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css (original)
+++ ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css Sun Nov 8 22:35:51 2009
@@ -1883,36 +1883,16 @@
background: url(/images/cal.gif) no-repeat;
}
-.field-lookup {
-background: url(/images/fieldlookup.gif) no-repeat;
-}
-
-.nav-first {
-/*
-background: url(/images/prev-year.gif) no-repeat left center;
-padding-left: 1.8em;
-*/
-}
-
-.nav-last {
-/*
-background: url(/images/next-year.gif) no-repeat right center;
-padding-right: 1.8em;
-*/
-}
-
-.nav-next {
-/*
-background: url(/images/next.gif) no-repeat right center;
-padding-right: 1.8em;
-*/
+.field-lookup ul li {
+float: left;
}
-.nav-previous {
-/*
-background: url(/images/prev.gif) no-repeat left center;
-padding-left: 1.8em;
-*/
+.field-lookup ul li a{
+background: url(/images/fieldlookup.gif) no-repeat 0 0;
+display: block;
+margin: 3px 10px 0px 4px;
+width:16px;
+height:16px;
}
/* ================================= */