OFBiz › OFBiz - Commits

svn commit: r901197 - in /ofbiz/trunk: framework/common/widget/ framework/example/webapp/example/WEB-INF/ framework/example/widget/example/ framework/images/webapp/images/ framework/images/webapp/images/prototypejs/ framework/widget/dtd/ framework/widg...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jleroux@apache.org

svn commit: r901197 - in /ofbiz/trunk: framework/common/widget/ framework/example/webapp/example/WEB-INF/ framework/example/widget/example/ framework/images/webapp/images/ framework/images/webapp/images/prototypejs/ framework/widget/dtd/ framework/widg...

Author: jleroux
Date: Wed Jan 20 13:36:25 2010
New Revision: 901197

URL: http://svn.apache.org/viewvc?rev=901197&view=rev
Log:
I revert r900950 because it introduces a bad side-effect when using a lookup by name, at least as far as I can tell.

Removed:
ofbiz/trunk/framework/example/widget/example/FormWidgetExampleLookupForms.xml
ofbiz/trunk/framework/example/widget/example/FormWidgetExampleLookupScreens.xml
ofbiz/trunk/framework/images/webapp/images/prototypejs/resize.js
Modified:
ofbiz/trunk/framework/common/widget/CommonScreens.xml
ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml
ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml
ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml
ofbiz/trunk/framework/images/webapp/images/fieldlookup.js
ofbiz/trunk/framework/widget/dtd/widget-form.xsd
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl
ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css
ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css
ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/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=901197&r1=901196&r2=901197&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Wed Jan 20 13:36:25 2010
@@ -112,11 +112,10 @@

<screen name="GlobalDecorator">
<section>
- <actions>
+ <actions>

<set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/scriptaculous.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/prototype.js" global="true"/>
- <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/resize.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/calendarDateSelect/calendar_date_select.js" global="true"/>
@@ -283,58 +282,13 @@
<script location="component://common/webcommon/WEB-INF/actions/includes/FindAutocompleteOptions.groovy"/>
</actions>
<widgets>
- <platform-specific><html><html-template location="component://common/webcommon/includes/ajaxAutocompleteOptions.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://common/webcommon/includes/ajaxAutocompleteOptions.ftl"/></html></platform-specific>
</widgets>
</section>
</fail-widgets>
</section>
</screen>

- 
- <screen name="LookupLayerPopupDecorator">
- <section>
- <actions>
- <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <service service-name="getUserPreferenceGroup" result-map="prefResult">
- <field-map field-name="userPrefGroupTypeId" value="GLOBAL_PREFERENCES"/>
- </service>
- <set field="userPreferences" from-field="prefResult.userPrefMap" global="true"/>
-
- <property-map resource="general" map-name="generalProperties" global="true"/>
- <set field="visualThemeId" from-field="userPreferences.VISUAL_THEME" default-value="BIZZNESS_TIME" global="true"/>
- <service service-name="getVisualThemeResources">
- <field-map field-name="visualThemeId"/>
- <field-map field-name="themeResources" from-field="layoutSettings"/>
- </service>
- <set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true"/>
- <set field="messagesTemplateLocation" from-field="layoutSettings.VT_MSG_TMPLT_LOC[0]" default-value="component://common/webcommon/includes/messages.ftl"/>
- </actions>
- <widgets>
- <platform-specific><html><html-template location="${messagesTemplateLocation}"/></html></platform-specific>
- <section>
- <condition>
- <not><if-empty-section section-name="body"/></not>
- </condition>
- <widgets>
- <decorator-section-include name="body"/>
- </widgets>
- <fail-widgets>
- <screenlet title="${title}" id="findScreenlet" collapsible="false" padded="false">
- <container id="search-options">
- <decorator-section-include name="search-options"/>
- </container>
- </screenlet>
- <screenlet>
- <container id="search-results">
- <decorator-section-include name="search-results"/>
- </container>
- </screenlet>
- </fail-widgets>
- </section>
- </widgets>
- </section>
- </screen>
-

<view-map name="findExampleAjax" type="screen" page="component://example/widget/example/ExampleAjaxScreens.xml#AjaxExample"/>
<view-map name="ListExampleFormOnly" type="screen" page="component://example/widget/example/ExampleAjaxScreens.xml#ListExampleFormOnly"/>
@@ -293,6 +290,6 @@
application/vnd.ms-word
application/vnd.ms-powerpoint
-->
-
- 
+
+ 
</site-conf>

Modified: ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml?rev=901197&r1=901196&r2=901197&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml Wed Jan 20 13:36:25 2010
@@ -280,12 +280,6 @@

</form>

- 
- <form name="ExampleLookupFields" type="single" title="">
- <field name="partyIdFrom" position="1" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonFrom}"><lookup target-form-name="LookupPartyNameExamplePopup" description-field-name="LookupPartyNameExamplePopup" lookup-presentation="layer" lookup-position="normal"/></field>
- <field name="partyIdTo" position="2" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonTo}"><lookup target-form-name="LookupPartyNameExamplePopup" lookup-presentation="layer" lookup-position="center" lookup-height="580px" lookup-width="450px"/></field>
- </form>
-
<form name="SelectionBoxesExampleForm" type="single">
<field name="ExampleTypeId">
<check>

Modified: ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml?rev=901197&r1=901196&r2=901197&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml Wed Jan 20 13:36:25 2010
@@ -78,13 +78,6 @@
</container>
<include-form name="FOPFontsExampleForm" location="component://example/widget/example/FormWidgetExampleForms.xml"/>
</container>
- <container style="screenlet-body">
- <container style="button-bar"><label style="h2">${uiLabelMap.ExampleLookupFields}</label></container>
- <container style="screenlet-body">
- <label>${uiLabelMap.ExampleLookupFields}</label>
- </container>
- <include-form name="ExampleLookupFields" location="component://example/widget/example/FormWidgetExampleForms.xml"/>
- </container>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.ExampleViewPermissionError}</label>

Modified: ofbiz/trunk/framework/images/webapp/images/fieldlookup.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/fieldlookup.js?rev=901197&r1=901196&r2=901197&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/fieldlookup.js (original)
+++ ofbiz/trunk/framework/images/webapp/images/fieldlookup.js Wed Jan 20 13:36:25 2010
@@ -23,15 +23,14 @@
var IE5 = (document.getElementById && document.all)? true : false;
var NS6 = (document.getElementById && navigator.appName.indexOf("Netscape")>=0 )? true: false;
var mx, my;
-var CURRENT_LOOKUP = null;

function moveobj(evt) {
if (NS4 || NS6) {
mx=evt.screenX;
- my=evt.screenY;
+ my=evt.screenY;
} else if (IE5 || IE4) {
- mx=event.screenX;
- my=event.screenY;
+ mx=event.screenX;
+ my=event.screenY;
}
}

@@ -45,18 +44,6 @@
if (! viewheight) viewheight = 200;
fieldLookup.popup(viewName, formName, viewWidth, viewheight);
}
-function call_fieldlookupLayer(target, viewName, lookupWidth, lookupHeight, lookupPosition) {
- if(CURRENT_LOOKUP != null){
- if(CURRENT_LOOKUP.parentTarget == target){
- CURRENT_LOOKUP.closeLookup();
- return;
- }
- }
-
- var fieldLookupPopup = new FieldLookupPopup(target, viewName, lookupWidth, lookupHeight, lookupPosition);
- fieldLookupPopup.showLookup();
- this.target = target;
-}
function call_fieldlookup2(target, viewName) {
var fieldLookup = new fieldLookup1(target, arguments);
fieldLookup.popup2(viewName);
@@ -68,21 +55,21 @@

function fieldLookup1(obj_target, args) {
this.args = args;
- // passing methods
- this.popup = lookup_popup1;
- this.popup2 = lookup_popup2;
-
- // validate input parameters
- if (!obj_target)
- return lookup_error("Error calling the field lookup: no target control specified");
- if (obj_target.value == null)
- return lookup_error("Error calling the field lookup: parameter specified is not valid target control");
+ // passing methods
+ this.popup = lookup_popup1;
+ this.popup2 = lookup_popup2;
+
+ // validate input parameters
+ if (!obj_target)
+ return lookup_error("Error calling the field lookup: no target control specified");
+ if (obj_target.value == null)
+ return lookup_error("Error calling the field lookup: parameter specified is not valid target control");
//this.target = obj_target;
target = obj_target;

- // register in global collections
- //this.id = lookups.length;
- //lookups[this.id] = this;
+ // register in global collections
+ //this.id = lookups.length;
+ //lookups[this.id] = this;
}
function fieldLookup2(obj_target, obj_target2) {
// passing methods
@@ -108,433 +95,30 @@
}

function lookup_popup1 (view_name, form_name, viewWidth, viewheight) {
- var obj_lookupwindow = window.open(view_name + '?formName=' + form_name + '&id=' + this.id,'_blank', 'width='+viewWidth+',height='+viewheight+',scrollbars=yes,status=no,resizable=yes,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes');
- obj_lookupwindow.opener = window;
- obj_lookupwindow.focus();
+ var obj_lookupwindow = window.open(view_name + '?formName=' + form_name + '&id=' + this.id,'_blank', 'width='+viewWidth+',height='+viewheight+',scrollbars=yes,status=no,resizable=yes,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes');
+ obj_lookupwindow.opener = window;
+ obj_lookupwindow.focus();
}
function lookup_popup2 (view_name) {
var argString = "";
if (this.args != null) {
- if (this.args.length > 2) {
- for(var i=2; i < this.args.length; i++) {
- argString += "&parm" + (i-2) + "=" + this.args[i];
- }
- }
+ if (this.args.length > 2) {
+ for(var i=2; i < this.args.length; i++) {
+ argString += "&parm" + (i-2) + "=" + this.args[i];
+ }
+ }
}
var sep = "?";
if (view_name.indexOf("?") >= 0) {
sep = "&";
}
- var obj_lookupwindow = window.open(view_name + sep + 'id=' + this.id + argString,'_blank', 'width=700,height=550,scrollbars=yes,status=no,resizable=yes,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes');
- obj_lookupwindow.opener = window;
- obj_lookupwindow.focus();
+ var obj_lookupwindow = window.open(view_name + sep + 'id=' + this.id + argString,'_blank', 'width=700,height=550,scrollbars=yes,status=no,resizable=yes,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes');
+ obj_lookupwindow.opener = window;
+ obj_lookupwindow.focus();
}
function lookup_error (str_message) {
- alert (str_message);
- return null;
-}
-
-/*************************************
- * Fieldlookup Class & Methods
- *************************************/
-
-//init KeyListener
-window.onload=function(){
- //Observe
- Event.observe(document, "keypress", key_event);
+ alert (str_message);
+ return null;
}

-//if ESC is pressed, remove draged portlet + hoverDiv
-function key_event(evt)
-{
- if(evt.keyCode == 27) {
- //removes the hover div after the portlet is moved to another position
- if(CURRENT_LOOKUP != null){
- lookupHide();
- }
- }
-}

-/**
- * Class to create a lookup layer
- * target - target where the value should be passed
- * viewName - view name which will be opened
- * lookupWidth - layer width i.e. 500px, 27% ... [default: 700px]
- * lookupHeight - layer height i.e. 500px, 27% ... [default: 550px]
- * position - normal (under the target field), center (layer is centered) [default: normal] -- !work still in process
- */
-var FieldLookupPopup = Class.create({
- initialize: function(target, viewName, lookupWidth, lookupHeight, position){
- if(isEmpty(target) || isEmpty(viewName)){
- return lookup_error("Lookup can't created, variabels missing");
- }
-
- //removes a existing Lookup
- if(CURRENT_LOOKUP != null){
- CURRENT_LOOKUP.removeLayer();
- }
-
-
- if(isEmpty(lookupWidth)){
- lookupWidth = '700px';
- }
- this.lookupWidth = lookupWidth;
-
- if(isEmpty(lookupHeight)){
- lookupHeight = '550px';
- }
- this.lookupHeight = lookupHeight;
-
- this.parentTarget = target;
- this.viewName = viewName;
- this.position = position;
-
- this.createElement();
- CURRENT_LOOKUP = this;
- },
-
- showLookup: function(){
- if($('fieldLookup') != null){
- Effect.Appear('fieldLookup',{duration: 0.3});
- }
- },
-
- closeLookup: function(){
- if($('fieldLookup') != null){
- Effect.Fade('fieldLookup',{duration: 0.3});
- }
- // removes the layer after fading
- window.setTimeout('CURRENT_LOOKUP.removeLayer()', 400);
-
-
- },
-
- createElement: function(){
- var parent = this.parentTarget;
-
- //creates the lookup dom element
- var lookupDiv = new Element('DIV', {
- id: "fieldLookup",
- style: "width: " + this.lookupWidth + "; height: " + this.lookupHeight + ""
- });
- lookupDiv.setAttribute("class", "fieldLookup");
- lookupDiv.setAttribute("className", "fieldLookup"); //IE7 Hack
-
- //creates lookupHeader
- var headerDiv = new Element('DIV', {
- id: "fieldLookupHeader"
- });
- headerDiv.setAttribute("class", "fieldLookupHeader");
- headerDiv.setAttribute("className", "fieldLookupHeader"); // IE 7 Hack
-
- //create close Button
- var closeButton = new Element('SPAN', {});
- var closeButtonImg = new Element('DIV', {
- onClick: "lookupHide()"
- });
- closeButtonImg.onclick = function(){ lookupHide(); };
-
- closeButton.appendChild(closeButtonImg);
- headerDiv.appendChild(closeButton);
- lookupDiv.appendChild(headerDiv);
-
- //get the lookup from an anjax request
- this.loadContent(lookupDiv);
-
- lookupDiv.style.display = "none";
- //creates the div as child of the form element (parent --> input field; parentNode --> form)
- var pn = parent.parentNode;
-
- //set layer position
- var bdy = document.body;
- if(this.position == "center"){
- bdy.appendChild(lookupDiv);
- var dimensions = lookupDiv.getDimensions();
- lookupLeft = (bdy.offsetWidth/2) - (dimensions.width/2);
- lookupTop = ((bdy.offsetHeight/2) - (dimensions.height/2)) + window.pageYOffset;
- lookupDiv.style.left = lookupLeft + "px";
- lookupDiv.style.top = lookupTop + "px";
-
- }else if(this.position == "right"){
- bdy.appendChild(lookupDiv);
- var dimensions = lookupDiv.getDimensions();
- lookupLeft = (bdy.offsetWidth) - (dimensions.width + 5);
- lookupTop = (bdy.offsetHeight/2) - (dimensions.height/2);
- lookupDiv.style.left = lookupLeft + "px";
- lookupDiv.style.top = lookupTop + "px";
-
- }else if(this.position == "left"){
- bdy.appendChild(lookupDiv);
- var dimensions = lookupDiv.getDimensions();
- lookupLeft = 5;
- lookupTop = (bdy.offsetHeight/2) - (dimensions.height/2);
- lookupDiv.style.left = lookupLeft + "px";
- lookupDiv.style.top = lookupTop + "px";
-
- }else if(this.position == "topright"){
- bdy.appendChild(lookupDiv);
- var dimensions = lookupDiv.getDimensions();
- lookupLeft = (bdy.offsetWidth) - (dimensions.width + 5);
- lookupTop = 5;
- lookupDiv.style.left = lookupLeft + "px";
- lookupDiv.style.top = lookupTop + "px";
-
- }else if(this.position == "topleft"){
- bdy.appendChild(lookupDiv);
- var dimensions = lookupDiv.getDimensions();
- lookupLeft = 5;
- lookupTop = 5;
- lookupDiv.style.left = lookupLeft + "px";
- lookupDiv.style.top = lookupTop + "px";
-
- }else{
- //for 'normal', empty etc.
- if(pn != null){ // IE Fix
- pn.appendChild(lookupDiv);
- }
- }
- this.divRef = lookupDiv;
-
- //make layer draggable
- this.makeDraggable(lookupDiv);
-
- //make the window resiable
- this.makeResizeable(lookupDiv);
-
- },
-
- loadContent: function(lookupDiv){
- new Ajax.Request(this.viewName,{
- onSuccess: function(transport){
- var lookupContent = transport.responseText;
- lookupDiv.insert({bottom: "<div id='fieldLookupContent'>" + lookupContent + "</div>"});
- modifySubmitButton();
- }
- });
- },
-
- makeDraggable: function(lookupDiv){
- this.loopupDrag = new Draggable(lookupDiv,
- {handle: 'fieldLookupHeader',revert: false, ghosting: false}
- );
- },
-
- makeResizeable: function(lookupDiv){
- new Resizeable(lookupDiv,
- {top: 0,
- left: 50,
- resize: function(el){
- $('fieldLookupContent').setStyle({
- width: "100%",
- height: "90%"
- });
- }
- });
- },
-
- removeLayer: function(){
- this.loopupDrag.destroy();
- CURRENT_LOOKUP.divRef.parentNode.removeChild(CURRENT_LOOKUP.divRef);
- CURRENT_LOOKUP = null;
- this.target = null;
- }
-
-});
-
-function lookupHide(){
- if(CURRENT_LOOKUP != null){
- CURRENT_LOOKUP.closeLookup();
- }
-}
-
-/**
- * returns true if a Stirng is empty
- * @param value - String value
- * @return
- */
-function isEmpty(value){
- if(value == null || value == ""){
- return true;
- }
- return false;
-}
-
-/**
- * Modify the Submit Button for the new lookup layer
- * @return
- */
-function modifySubmitButton(){
- /* changes form/submit behavior for Lookup Layer */
- if($('fieldLookup')) {
- //find the lookup form
- var forms = $('fieldLookup').getElementsByTagName('form');
- for(var i =0; i<forms.length; i++){
- if(!isEmpty(forms[i].getAttribute('id'))){
- var lookupForm = $(forms[i].getAttribute('id'));
- }
- }
-
- //diable the form action
- var formAction = lookupForm.getAttribute('action');
- lookupForm.setAttribute('action','');
-
- //modify the form submit button
- for (var i=0;i<lookupForm.length;i++) {
- var ele = lookupForm.elements[i];
- if ((ele.getAttribute('type')) == "submit") {
- ele.style.display = "none";
- var txt = ele.value;
- var submit = new Element('A',{
-
- });
- submit.onclick = function(){
- lookupFormAjaxRequest(formAction, lookupForm.getAttribute('id'));return false;
- };
- submit.setAttribute("class", "smallSubmit");
- submit.setAttribute("className", "smallSubmit"); // IE 7 Hack
- submit.href = "";
-
- var textNode = document.createTextNode(txt);
- submit.appendChild(textNode);
- ele.parentNode.appendChild(submit);
-
- //modifay nav-pager
- var navPager = $('fieldLookup').getElementsByClassName("nav-pager");
- if(navPager.length > 0){
-
- for (var j=0;j<navPager.length;j++) {
- var eleChild = navPager[j].getElementsByTagName("ul")[0].getElementsByTagName("li");
- for (var k=0;k<eleChild.length;k++) {
- var link = eleChild[k].getElementsByTagName("A");
- var select = eleChild[k].getElementsByTagName("SELECT");
-
- if(link.length > 0){
- link[0].href = "javascript:lookupPaginationAjaxRequest('" + link[0].href + "', '" + lookupForm.getAttribute('id') + "', 'link')";
- }else if(select.length > 0){
- try{
- var oc = select[0].getAttribute("onchange");
- if((typeof oc) == "function"){ // IE6/7 Fix
- oc = oc.toString();
- var ocSub = oc.substring((oc.indexOf('=')+2),(oc.length - 4));
- var searchPattern = /'\+this.value\+'/g;
- var searchPattern2 = /'\+this.valu/g;
-
- if(searchPattern.test(ocSub)){
- var viewSize = select[0].value;
- var spl = ocSub.split(searchPattern);
- select[0].onchange = function(){lookupPaginationAjaxRequest(spl[0] + this.value + spl[1], lookupForm.getAttribute('id'), 'select');};
- }else if(searchPattern2.test(ocSub)){
- ocSub = ocSub.replace(searchPattern2, "");
- if(searchPattern.test(ocSub)){
- ocSub.replace(searchPattern, viewSize);
- }
- select[0].onchange = function(){lookupPaginationAjaxRequest(ocSub + this.value, lookupForm.getAttribute('id'), 'select');};
- }
- }else{
- var ocSub = oc.substring((oc.indexOf('=')+1),(oc.length - 1));
- select[0].setAttribute("onchange", "lookupPaginationAjaxRequest(" + ocSub + ", '" + lookupForm.getAttribute('id') + "')");
- }
- }catch(ex){}
- }
- }
- }
-
- }
-
- }
- }
- }
-}
-
-/**
- * Create an ajax request to get the search results
- * @param formAction - action target
- * @param form - formId
- * @return
- */
-function lookupFormAjaxRequest(formAction, form){
- new Ajax.Request(formAction,{
- method: 'post',
- parameters: $(form).serialize(), requestHeaders: {Accept: 'application/json'},
- onSuccess: function(transport){
- var formRequest = transport.responseText;
- $('fieldLookupContent').remove();
- $('fieldLookup').insert({bottom: "<div id='fieldLookupContent'>" + formRequest + "</div>"});
- modifySubmitButton();
- }
- });
-}
-
-function lookupPaginationAjaxRequest(navAction, form, type){
- if(type == 'link'){
- navAction = navAction.substring(0, navAction.length-1);
- }
- new Ajax.Request(navAction,{
- method: 'get',
- requestHeaders: {Accept: 'application/json'},
- onSuccess: function(transport){
- var formRequest = transport.responseText;
- $('fieldLookupContent').remove();
- $('fieldLookup').insert({bottom: "<div id='fieldLookupContent'>" + formRequest + "</div>"});
- modifySubmitButton();
- }
- });
-}
-
-/*******************************************************************************************************
- * This code inserts the value lookedup by a popup window back into the associated form element
- *******************************************************************************************************/
-var re_id = new RegExp('id=(\\d+)');
-var num_id = (re_id.exec(String(window.location))
- ? new Number(RegExp.$1) : 0);
-var obj_caller = (window.opener ? window.opener.lookups[num_id] : null);
-if (obj_caller == null && window.opener != null){
- obj_caller = window.opener;
-}
-else if(obj_caller == null && window.opener == null){
- obj_caller = parent;
-}
-
-var bkColor = "yellow";
-function setSourceColor(src){
-if(src != null)
- src.style.backgroundColor = bkColor;
- }
-// function passing selected value to calling window
-function set_value(value) {
- if (!obj_caller) return;
- setSourceColor(obj_caller.target);
- obj_caller.target.value = value;
- closeLookup();
-}
-// function passing selected value to calling window
-function set_values(value, value2) {
- set_value(value);
- if (!obj_caller.target2) return;
- if (obj_caller.target2 == null) return;
- setSourceColor(obj_caller.target2);
- obj_caller.target2.value = value2;
-}
-function set_multivalues(value) {
- obj_caller.target.value = value;
- var thisForm = obj_caller.target.form;
- var evalString = "";
-
- if (arguments.length > 2 ) {
- for(var i=1; i < arguments.length; i=i+2) {
- evalString = "setSourceColor(thisForm." + arguments[i] + ")";
- eval(evalString);
- evalString = "thisForm." + arguments[i] + ".value='" + arguments[i+1] + "'";
- eval(evalString);
- }
- }
- closeLookup();
- }
-//close the window after passing the value
-function closeLookup(){
- if(window.opener != null){
- window.close();
- } else {
- parent.lookupHide();
- }
-}

Modified: ofbiz/trunk/framework/widget/dtd/widget-form.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/dtd/widget-form.xsd?rev=901197&r1=901196&r2=901197&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/dtd/widget-form.xsd (original)
+++ ofbiz/trunk/framework/widget/dtd/widget-form.xsd Wed Jan 20 13:36:25 2010
@@ -903,34 +903,6 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="lookup-presentation" default="window">
- <xs:annotation><xs:documentation>Shows the lookup as moveable and resizable layer or window. For layer lookups use the 'LookupLayerPopupDecorator'</xs:documentation></xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="layer"/>
- <xs:enumeration value="window"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute type="xs:string" name="lookup-height">
- <xs:annotation><xs:documentation>Only layer height. I.e. 250px, 12%</xs:documentation></xs:annotation>
- </xs:attribute>
- <xs:attribute type="xs:string" name="lookup-width">
- <xs:annotation><xs:documentation>Only layer width. I.e. 250px, 12%</xs:documentation></xs:annotation>
- </xs:attribute>
- <xs:attribute name="lookup-position" default="normal">
- <xs:annotation><xs:documentation>Only layer position. Normal sets the layer under the target field.</xs:documentation></xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="normal"/>
- <xs:enumeration value="center"/>
- <xs:enumeration value="left"/>
- <xs:enumeration value="right"/>
- <xs:enumeration value="topleft"/>
- <xs:enumeration value="topright"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
</xs:attributeGroup>
<xs:element name="password" substitutionGroup="AllFields">
<xs:complexType>

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=901197&r1=901196&r2=901197&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Wed Jan 20 13:36:25 2010
@@ -1931,26 +1931,6 @@
ajaxUrl = createAjaxParamsFromUpdateAreas(updateAreas, null, context);
}

- String lookupPresentation = lookupField.getLookupPresentation();
- if(UtilValidate.isEmpty(lookupPresentation)){
- lookupPresentation = "";
- }
-
- String lookupHeight = lookupField.getLookupHeight();
- if(UtilValidate.isEmpty(lookupHeight)){
- lookupHeight = "";
- }
-
- String lookupWidth = lookupField.getLookupWidth();
- if(UtilValidate.isEmpty(lookupWidth)){
- lookupWidth = "";
- }
-
- String lookupPosition = lookupField.getLookupPosition();
- if(UtilValidate.isEmpty(lookupPosition)){
- lookupPosition = "";
- }
-
StringWriter sr = new StringWriter();
sr.append("<@renderLookupField ");
sr.append(" className=\"");
@@ -1994,15 +1974,7 @@
sr.append(ajaxUrl);
sr.append("\" ajaxEnabled=");
sr.append(Boolean.toString(ajaxEnabled));
- sr.append(" lookupPresentation=\"");
- sr.append(lookupPresentation);
- sr.append("\" lookupHeight=\"");
- sr.append(lookupHeight);
- sr.append("\" lookupWidth=\"");
- sr.append(lookupWidth);
- sr.append("\" lookupPosition=\"");
- sr.append(lookupPosition);
- sr.append("\" />");
+ sr.append(" />");
executeMacro(sr.toString());

this.addAsterisks(writer, context, modelFormField);

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=901197&r1=901196&r2=901197&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Wed Jan 20 13:36:25 2010
@@ -3462,20 +3462,12 @@
protected String descriptionFieldName;
protected String targetParameter;
protected SubHyperlink subHyperlink;
- protected String lookupPresentation;
- protected String lookupWidth;
- protected String lookupHeight;
- protected String lookupPosition;

public LookupField(Element element, ModelFormField modelFormField) {
super(element, modelFormField);
this.formName = FlexibleStringExpander.getInstance(element.getAttribute("target-form-name"));
this.descriptionFieldName = element.getAttribute("description-field-name");
this.targetParameter = element.getAttribute("target-parameter");
- this.lookupPresentation = element.getAttribute("lookup-presentation");
- this.lookupHeight = element.getAttribute("lookup-height");
- this.lookupWidth = element.getAttribute("lookup-width");
- this.lookupPosition = element.getAttribute("lookup-position");

Element subHyperlinkElement = UtilXml.firstChildElement(element, "sub-hyperlink");
if (subHyperlinkElement != null) {
@@ -3523,38 +3515,6 @@
public SubHyperlink getSubHyperlink() {
return this.subHyperlink;
}
-
- public String getLookupPresentation() {
- return this.lookupPresentation;
- }
-
- public void setLookupPresentation(String str) {
- this.lookupPresentation = str;
- }
-
- public String getLookupWidth() {
- return this.lookupWidth;
- }
-
- public void setLookupWidth(String str) {
- this.lookupWidth = str;
- }
-
- public String getLookupHeight() {
- return this.lookupHeight;
- }
-
- public void setLookupHeight(String str) {
- this.lookupHeight = str;
- }
-
- public String getLookupPosition() {
- return this.lookupPosition;
- }
-
- public void setLookupPosition(String str) {
- this.lookupPosition = str;
- }
}

public static class FileField extends TextField {

Modified: ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl?rev=901197&r1=901196&r2=901197&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl Wed Jan 20 13:36:25 2010
@@ -103,7 +103,7 @@
<@renderField value />
</#macro>

-<#macro renderLookupField className alert name value size maxlength id event action disabled autocomplete descriptionFieldName formName lookupFieldFormName targetParameterIter imgSrc ajaxUrl ajaxEnabled lookupPresentation lookupWidth lookupHeight lookupPosition></#macro>
+<#macro renderLookupField className alert name value size maxlength id event action disabled autocomplete descriptionFieldName formName lookupFieldFormName targetParameterIter imgSrc ajaxUrl ajaxEnabled></#macro>
<#macro renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl paginateFirstLabel paginatePreviousStyle ajaxPreviousUrl previousUrl paginatePreviousLabel pageLabel ajaxSelectUrl selectUrl ajaxSelectSizeUrl selectSizeUrl commonDisplaying paginateNextStyle ajaxNextUrl nextUrl paginateNextLabel paginateLastStyle ajaxLastUrl lastUrl paginateLastLabel paginateViewSizeLabel></#macro>
<#macro renderFileField className alert name value size maxlength autocomplete><@renderField value /></#macro>
<#macro renderPasswordField className alert name value size maxlength id autocomplete></#macro>

Modified: ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl?rev=901197&r1=901196&r2=901197&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl Wed Jan 20 13:36:25 2010
@@ -122,7 +122,7 @@
<@makeBlock className value />
</#macro>

-<#macro renderLookupField className alert name value size maxlength id event action disabled autocomplete descriptionFieldName formName lookupFieldFormName targetParameterIter imgSrc ajaxUrl ajaxEnabled lookupPresentation lookupWidth lookupHeight lookupPosition></#macro>
+<#macro renderLookupField className alert name value size maxlength id event action disabled autocomplete descriptionFieldName formName lookupFieldFormName targetParameterIter imgSrc ajaxUrl ajaxEnabled></#macro>
<#macro renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl paginateFirstLabel paginatePreviousStyle ajaxPreviousUrl previousUrl paginatePreviousLabel pageLabel ajaxSelectUrl selectUrl ajaxSelectSizeUrl selectSizeUrl commonDisplaying paginateNextStyle ajaxNextUrl nextUrl paginateNextLabel paginateLastStyle ajaxLastUrl lastUrl paginateLastLabel paginateViewSizeLabel></#macro>
<#macro renderFileField className alert name value size maxlength autocomplete><@makeBlock className value /></#macro>
<#macro renderPasswordField className alert name value size maxlength id autocomplete><@makeBlock className "" /></#macro>

Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=901197&r1=901196&r2=901197&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Wed Jan 20 13:36:25 2010
@@ -408,16 +408,14 @@
</#if>
</#macro>

-<#macro renderLookupField className alert name value size maxlength id event action disabled autocomplete descriptionFieldName formName lookupFieldFormName targetParameterIter imgSrc ajaxUrl ajaxEnabled lookupPresentation lookupWidth lookupHeight lookupPosition>
+<#macro renderLookupField className alert name value size maxlength id event action disabled autocomplete descriptionFieldName formName lookupFieldFormName targetParameterIter imgSrc ajaxUrl ajaxEnabled>
<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 disabled?has_content && disabled> disabled="disabled"</#if><#rt/><#if event?has_content && action?has_content> ${event}="${action}"</#if><#rt/><#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/></li>
-<li><#if lookupPresentation?has_content && lookupPresentation == "layer">
- <a href="javascript:call_fieldlookupLayer(document.${formName?html}.${name?html},'${lookupFieldFormName}','${lookupWidth}','${lookupHeight}','${lookupPosition}'<#rt/>
-<#elseif descriptionFieldName?has_content>
- <a href="javascript:call_fieldlookup3(document.${formName?html}.${name?html},'${descriptionFieldName}','${lookupFieldFormName}'<#rt/>
-<#else>
- <a href="javascript:call_fieldlookup2(document.${formName}.${name},'${lookupFieldFormName}'<#rt/>
-</#if>
+<li><#if descriptionFieldName?has_content>
+ <a href="javascript:call_fieldlookup3(document.${formName?html}.${name?html}, document.${formName?html}.${descriptionFieldName},<#rt/>
+ <#else>
+ <a href="javascript:call_fieldlookup2(document.${formName}.${name},<#rt/>
+</#if>'${lookupFieldFormName}'<#rt>
<#if targetParameterIter?exists>
<#list targetParameterIter as item>
,document.${formName}.${item}.value<#rt>

Modified: ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl?rev=901197&r1=901196&r2=901197&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl Wed Jan 20 13:36:25 2010
@@ -103,7 +103,7 @@
<@renderField value />
</#macro>

-<#macro renderLookupField className alert name value size maxlength id event action disabled autocomplete descriptionFieldName formName lookupFieldFormName targetParameterIter imgSrc ajaxUrl ajaxEnabled lookupPresentation lookupWidth lookupHeight lookupPosition><@renderField value /></#macro>
+<#macro renderLookupField className alert name value size maxlength id event action disabled autocomplete descriptionFieldName formName lookupFieldFormName targetParameterIter imgSrc ajaxUrl ajaxEnabled><@renderField value /></#macro>
<#macro renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl paginateFirstLabel paginatePreviousStyle ajaxPreviousUrl previousUrl paginatePreviousLabel pageLabel ajaxSelectUrl selectUrl ajaxSelectSizeUrl selectSizeUrl commonDisplaying paginateNextStyle ajaxNextUrl nextUrl paginateNextLabel paginateLastStyle ajaxLastUrl lastUrl paginateLastLabel paginateViewSizeLabel></#macro>
<#macro renderFileField className alert name value size maxlength autocomplete><@renderField value /></#macro>
<#macro renderPasswordField className alert name value size maxlength id autocomplete></#macro>

Modified: ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl?rev=901197&r1=901196&r2=901197&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl Wed Jan 20 13:36:25 2010
@@ -101,7 +101,7 @@
<#macro renderRangeFindField className alert name value size maxlength autocomplete titleStyle defaultOptionFrom opEquals opGreaterThan opGreaterThanEquals opLessThan opLessThanEquals value2 defaultOptionThru>
</#macro>

-<#macro renderLookupField className alert name value size maxlength id event action disabled autocomplete descriptionFieldName formName lookupFieldFormName targetParameterIter imgSrc ajaxUrl ajaxEnabled lookupPresentation lookupWidth lookupHeight lookupPosition></#macro>
+<#macro renderLookupField className alert name value size maxlength id event action disabled autocomplete descriptionFieldName formName lookupFieldFormName targetParameterIter imgSrc ajaxUrl ajaxEnabled></#macro>
<#macro renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl paginateFirstLabel paginatePreviousStyle ajaxPreviousUrl previousUrl paginatePreviousLabel pageLabel ajaxSelectUrl selectUrl ajaxSelectSizeUrl selectSizeUrl commonDisplaying paginateNextStyle ajaxNextUrl nextUrl paginateNextLabel paginateLastStyle ajaxLastUrl lastUrl paginateLastLabel paginateViewSizeLabel></#macro>
<#macro renderFileField className alert name value size maxlength autocomplete></#macro>
<#macro renderPasswordField className alert name value size maxlength id autocomplete></#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=901197&r1=901196&r2=901197&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css (original)
+++ ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css Wed Jan 20 13:36:25 2010
@@ -1448,75 +1448,3 @@
width:45%;
float:left;
}
-
-
-/***********************************************
-Lookups
-***********************************************/
- .fieldLookup{
- background: #ffffff;
- border-right: 2px solid #999;
- border-left: 2px solid #999;
- border-bottom: 3px solid #999;
- position: absolute;
- padding: 3px 1 1 1;
- overflow: visible;
- z-index: 1000;
- visibility: visible;
- }
-
- .fieldLookupHeader{
- border-bottom: 1px solid #aaa;
- border-top: 1px solid #999;
- margin: 0;
- height: 18px;
- font-size: 12px;
- padding: 3px 0;
- color: #333;
- background-image: url(../images/header_bg.gif);
- cursor: move;
- }
-
- .fieldLookupHeader span{
- text-align: right;
- cursor: pointer;
- }
-
- .fieldLookupHeader span div{
- background-image: url(../images/header_close_button.png);
- float: right;
- width: 16px;
- height: 16px;
- }
-
- #fieldLookupContent{
- background-color: #ffffff;
- margin: 0;
- padding: 0;
- border: 0;
- overflow: auto;
- width:100%;
- height:95%;
- }
-
-/* overwrite */
- #fieldLookupContent ul li a{
- display: inherit;
- padding: 2px 3px 2px 3px;
- margin: 0;
- cursor: pointer;
- height: auto;
- width: auto;
- background-image: none;
- }
-
-/* overwrite*/
- #fieldLookupContent a{
- display: inherit;
- cursor: pointer;
- }
-
-/* overwrite*/
- #findScreenlet{
- margin-top: 0;
- }

Modified: ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css?rev=901197&r1=901196&r2=901197&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css (original)
+++ ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css Wed Jan 20 13:36:25 2010
@@ -2176,71 +2176,3 @@
margin:0.75em 0 0.09em 0;
text-transform:uppercase;
}
-
-/***********************************************
-Lookups
-***********************************************/
- .fieldLookup{
- background: #ffffff;
- border-right: 2px solid #999;
- border-left: 2px solid #999;
- border-bottom: 3px solid #999;
- position: absolute;
- padding: 3px 1 1 1;
- overflow: visible;
- z-index: 1000;
- visibility: visible;
- }
-
- .fieldLookupHeader{
- border-bottom: 1px solid #aaa;
- border-top: 1px solid #999;
- margin: 0;
- height: 18px;
- font-size: 12px;
- padding: 3px 0;
- color: #333;
- background-image: url(images/header_bg.gif);
- cursor: move;
- }
-
- .fieldLookupHeader span{
- text-align: right;
- cursor: pointer;
- }
-
- .fieldLookupHeader span div{
- background-image: url(images/header_close_button.png);
- float: right;
- width: 16px;
- height: 16px;
- }
-
- #fieldLookupContent{
- background-color: #ffffff;
- margin: 0;
- padding: 0;
- border: 0;
- overflow: auto;
- width:100%;
- height:95%;
- }
-
-/* overwrite*/
- #fieldLookup ul li a{
- display: inherit;
- padding: 2px 3px 2px 3px;
- margin: 0;
- cursor: pointer;
- }
-
- #fieldLookup td a{
- display: inherit;
- cursor: pointer;
- background-image: none;
- }
-
-/* overwrite*/
- #findScreenlet{
- margin-top: 0;
- }

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=901197&r1=901196&r2=901197&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css (original)
+++ ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css Wed Jan 20 13:36:25 2010
@@ -2154,72 +2154,3 @@
margin:0.75em 0 0.09em 0;
text-transform:uppercase;
}
-
-/***********************************************
-Lookups
-***********************************************/
- .fieldLookup{
- background: #ffffff;
- border-right: 2px solid #999;
- border-left: 2px solid #999;
- border-bottom: 3px solid #999;
- position: absolute;
- padding: 3px 1 1 1;
- overflow: visible;
- z-index: 1000;
- visibility: visible;
- }
-
- .fieldLookupHeader{
- border-bottom: 1px solid #aaa;
- border-top: 1px solid #999;
- margin: 0;
- height: 18px;
- font-size: 12px;
- padding: 3px 0;
- color: #333;
- background-image: url(../images/header_bg.gif);
- cursor: move;
- }
-
- .fieldLookupHeader span{
- text-align: right;
- cursor: pointer;
- }
-
- .fieldLookupHeader span div{
- background-image: url(../images/header_close_button.png);
- float: right;
- width: 16px;
- height: 16px;
- }
-
- #fieldLookupContent{
- background-color: #ffffff;
- margin: 0;
- padding: 0;
- border: 0;
- overflow: auto;
- width:100%;
- height:95%;
- }
-
-/* overwrite */
- #fieldLookupContent ul li a{
- display: inherit;
- padding: 2px 3px 2px 3px;
- margin: 0;
- cursor: pointer;
-
- }
-
- #fieldLookupContent td a{
- display: inherit;
- cursor: pointer;
- background-image: none;
- }
-
-/* overwrite*/
- #findScreenlet{
- margin-top: 0;
- }
\ No newline at end of file

Modified: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css?rev=901197&r1=901196&r2=901197&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css (original)
+++ ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css Wed Jan 20 13:36:25 2010
@@ -2205,74 +2205,3 @@
margin:0.75em 0 0.09em 0;
text-transform:uppercase;
}
-
-/***********************************************
-Lookups
-***********************************************/
- .fieldLookup{
- background: #ffffff;
- border-right: 2px solid #999;
- border-left: 2px solid #999;
- border-bottom: 3px solid #999;
- position: absolute;
- padding: 3px 1 1 1;
- overflow: visible;
- z-index: 1000;
- visibility: visible;
- }
-
- .fieldLookupHeader{
- border-bottom: 1px solid #aaa;
- border-top: 1px solid #999;
- margin: 0;
- height: 18px;
- font-size: 12px;
- padding: 3px 0;
- color: #333;
- background-image: url(header_bg.gif);
- cursor: move;
- }
-
- .fieldLookupHeader span{
- text-align: right;
- cursor: pointer;
- }
-
- .fieldLookupHeader span div{
- background-image: url(header_close_button.png);
- float: right;
- width: 16px;
- height: 16px;
- }
-
- #fieldLookupContent{
- background-color: #ffffff;
- margin: 0;
- padding: 0;
- border: 0;
- overflow: auto;
- width:100%;
- height:95%;
- }
-
-/* overwrite */
- #fieldLookupContent ul li a{
- display: inherit;
- padding: 2px 3px 2px 3px;
- margin: 0;
- cursor: pointer;
- height: auto;
- width: auto;
- background-image: none;
- }
-
- #fieldLookupContent a{
- display: inherit;
- cursor: pointer;
- background-image: none;
- }
-
-/* overwrite*/
- #findScreenlet{
- margin-top: 0;
- }