You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2012/03/20 19:10:03 UTC
svn commit: r1303065 - in /ofbiz/branches/release11.04:
framework/common/webcommon/includes/ framework/common/widget/
framework/images/webapp/images/
framework/images/webapp/images/jquery/ui/development-bundle/themes/base/
framework/images/webapp/image...
Author: ashish
Date: Tue Mar 20 18:10:02 2012
New Revision: 1303065
URL: http://svn.apache.org/viewvc?rev=1303065&view=rev
Log:
Applied bug fix from trunk r1303062.
Bug fix, Applied patch from jira issue - OFBIZ-4734 - User behaviour issue on auto-completer.
Currently if user type in auto-completer text box and if matches found then list display as auto-completer result list but if no matches found then user didn't know that result will come or not, even no matches found.
Change behaviour is when user type in text box then spinner (ajax loader image) shows wchich tells user that search is in progress.
If matches found or not found spinner disapperars and reult/ no result message listed in auto-completer relsult list.
Now user won't see any abnormal behaviour at ui.
Added spinner image for the auto-completer request.
Also added the "No Records Found" message if no matches found for the auto-completer search.
Thanks Nitesh, Deepak and Rishi for the contribution.
Modified:
ofbiz/branches/release11.04/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl
ofbiz/branches/release11.04/framework/common/widget/CommonScreens.xml
ofbiz/branches/release11.04/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.autocomplete.css
ofbiz/branches/release11.04/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.autocomplete.css
ofbiz/branches/release11.04/framework/images/webapp/images/selectall.js
ofbiz/branches/release11.04/themes/bizznesstime/webapp/bizznesstime/css/style.css
ofbiz/branches/release11.04/themes/bluelight/webapp/bluelight/style.css
ofbiz/branches/release11.04/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
ofbiz/branches/release11.04/themes/flatgrey/webapp/flatgrey/javascript.css
ofbiz/branches/release11.04/themes/multiflex/webapp/multiflex/style.css
ofbiz/branches/release11.04/themes/tomahawk/webapp/tomahawk/css/style.css
Modified: ofbiz/branches/release11.04/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl?rev=1303065&r1=1303064&r2=1303065&view=diff
==============================================================================
--- ofbiz/branches/release11.04/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl (original)
+++ ofbiz/branches/release11.04/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl Tue Mar 20 18:10:02 2012
@@ -33,8 +33,8 @@ under the License.
</#if>
<#else>
<script type="text/javascript">
- <#if autocompleteOptions?exists>
var autocomp = [
+ <#if autocompleteOptions?has_content>
<#assign displayReturnField = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties", "widget.autocompleter.displayReturnField")>
<#list autocompleteOptions as autocompleteOption>
{
@@ -53,12 +53,18 @@ under the License.
<#if ("Y" == displayReturnField)>
<#assign displayString = displayString + "[" + returnField + "]">
</#if>
- "id": " ${returnField}",
+ "id": "${returnField}",
"label": "<#if (displayString?trim?has_content )>${displayString?trim}<#else>${returnField}</#if>",
"value": "${returnField}"
}<#if autocompleteOption_has_next>,</#if>
</#list>
- ];
+ <#else>
+ {
+ "id": "",
+ "label": "${uiLabelMap.CommonNoRecordFound}",
+ "value": ""
+ }
</#if>
+];
</script>
</#if>
Modified: ofbiz/branches/release11.04/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/common/widget/CommonScreens.xml?rev=1303065&r1=1303064&r2=1303065&view=diff
==============================================================================
--- ofbiz/branches/release11.04/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/branches/release11.04/framework/common/widget/CommonScreens.xml Tue Mar 20 18:10:02 2012
@@ -326,6 +326,7 @@ under the License.
<fail-widgets>
<section>
<actions>
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<set field="searchType" from-field="parameters.searchType" default-value="${searchType}"/>
<property-to-field resource="widget" property="widget.autocompleter.defaultViewSize" field="autocompleterViewSize"/>
<script location="component://common/webcommon/WEB-INF/actions/includes/FindAutocompleteOptions.groovy"/>
Modified: ofbiz/branches/release11.04/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.autocomplete.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.autocomplete.css?rev=1303065&r1=1303064&r2=1303065&view=diff
==============================================================================
--- ofbiz/branches/release11.04/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.autocomplete.css (original)
+++ ofbiz/branches/release11.04/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.autocomplete.css Tue Mar 20 18:10:02 2012
@@ -21,6 +21,7 @@
*
* http://docs.jquery.com/UI/Menu#theming
*/
+.ui-autocomplete-loading { background: white url('../images/ui-anim_basic_16x16.gif') right center no-repeat !important; }
.ui-menu {
list-style:none;
padding: 2px;
Modified: ofbiz/branches/release11.04/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.autocomplete.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.autocomplete.css?rev=1303065&r1=1303064&r2=1303065&view=diff
==============================================================================
--- ofbiz/branches/release11.04/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.autocomplete.css (original)
+++ ofbiz/branches/release11.04/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.autocomplete.css Tue Mar 20 18:10:02 2012
@@ -21,6 +21,7 @@
*
* http://docs.jquery.com/UI/Menu#theming
*/
+.ui-autocomplete-loading { background: white url('../images/ui-anim_basic_16x16.gif') right center no-repeat !important; }
.ui-menu {
list-style:none;
padding: 2px;
Modified: ofbiz/branches/release11.04/framework/images/webapp/images/selectall.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/images/webapp/images/selectall.js?rev=1303065&r1=1303064&r2=1303065&view=diff
==============================================================================
--- ofbiz/branches/release11.04/framework/images/webapp/images/selectall.js (original)
+++ ofbiz/branches/release11.04/framework/images/webapp/images/selectall.js Tue Mar 20 18:10:02 2012
@@ -436,7 +436,7 @@ function ajaxAutoCompleter(areaCsvString
select: function(event, ui){
//jQuery("#" + areaArray[0]).html(ui.item);
jQuery("#" + areaArray[0]).val(ui.item.value); // setting a text field
- if (showDescription) {
+ if (showDescription && (ui.item.value != undefined && ui.item.value != '') {
setLookDescription(areaArray[0], ui.item.label, areaArray[2], formName)
}
}
Modified: ofbiz/branches/release11.04/themes/bizznesstime/webapp/bizznesstime/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/themes/bizznesstime/webapp/bizznesstime/css/style.css?rev=1303065&r1=1303064&r2=1303065&view=diff
==============================================================================
--- ofbiz/branches/release11.04/themes/bizznesstime/webapp/bizznesstime/css/style.css (original)
+++ ofbiz/branches/release11.04/themes/bizznesstime/webapp/bizznesstime/css/style.css Tue Mar 20 18:10:02 2012
@@ -1908,6 +1908,7 @@ width:10%
*
* http://docs.jquery.com/UI/Menu#theming
*/
+.ui-autocomplete-loading { background: white url('../images/ui-anim_basic_16x16.gif') right center no-repeat !important; }
.ui-menu {
list-style:none;
padding: 2px;
Modified: ofbiz/branches/release11.04/themes/bluelight/webapp/bluelight/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/themes/bluelight/webapp/bluelight/style.css?rev=1303065&r1=1303064&r2=1303065&view=diff
==============================================================================
--- ofbiz/branches/release11.04/themes/bluelight/webapp/bluelight/style.css (original)
+++ ofbiz/branches/release11.04/themes/bluelight/webapp/bluelight/style.css Tue Mar 20 18:10:02 2012
@@ -2421,6 +2421,7 @@ background-image:url(/images/spinner.gif
*
* http://docs.jquery.com/UI/Menu#theming
*/
+.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat !important; }
.ui-menu {
list-style:none;
padding: 2px;
Modified: ofbiz/branches/release11.04/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css?rev=1303065&r1=1303064&r2=1303065&view=diff
==============================================================================
--- ofbiz/branches/release11.04/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css (original)
+++ ofbiz/branches/release11.04/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css Tue Mar 20 18:10:02 2012
@@ -2406,6 +2406,7 @@ background-image:url(/images/spinner.gif
*
* http://docs.jquery.com/UI/Menu#theming
*/
+.ui-autocomplete-loading { background: white url('../images/ui-anim_basic_16x16.gif') right center no-repeat !important; }
.ui-menu {
list-style:none;
padding: 2px;
Modified: ofbiz/branches/release11.04/themes/flatgrey/webapp/flatgrey/javascript.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/themes/flatgrey/webapp/flatgrey/javascript.css?rev=1303065&r1=1303064&r2=1303065&view=diff
==============================================================================
--- ofbiz/branches/release11.04/themes/flatgrey/webapp/flatgrey/javascript.css (original)
+++ ofbiz/branches/release11.04/themes/flatgrey/webapp/flatgrey/javascript.css Tue Mar 20 18:10:02 2012
@@ -493,6 +493,7 @@ div.autocomplete ul li {
*
* http://docs.jquery.com/UI/Menu#theming
*/
+.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat !important; }
.ui-menu {
list-style:none;
padding: 2px;
Modified: ofbiz/branches/release11.04/themes/multiflex/webapp/multiflex/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/themes/multiflex/webapp/multiflex/style.css?rev=1303065&r1=1303064&r2=1303065&view=diff
==============================================================================
--- ofbiz/branches/release11.04/themes/multiflex/webapp/multiflex/style.css (original)
+++ ofbiz/branches/release11.04/themes/multiflex/webapp/multiflex/style.css Tue Mar 20 18:10:02 2012
@@ -2532,6 +2532,7 @@ height: 1px;
*
* http://docs.jquery.com/UI/Menu#theming
*/
+.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat !important; }
.ui-menu {
list-style:none;
padding: 2px;
Modified: ofbiz/branches/release11.04/themes/tomahawk/webapp/tomahawk/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1303065&r1=1303064&r2=1303065&view=diff
==============================================================================
--- ofbiz/branches/release11.04/themes/tomahawk/webapp/tomahawk/css/style.css (original)
+++ ofbiz/branches/release11.04/themes/tomahawk/webapp/tomahawk/css/style.css Tue Mar 20 18:10:02 2012
@@ -2793,6 +2793,7 @@ background-image:url(/tomahawk/images/sp
*
* http://docs.jquery.com/UI/Menu#theming
*/
+.ui-autocomplete-loading { background: white url('../images/ui-anim_basic_16x16.gif') right center no-repeat !important; }
.ui-menu {
list-style:none;
padding: 2px;