diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.js b/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.js b/config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/search.get.js b/config/alfresco/templates/webscripts/org/alfresco/office/search.get.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.html.ftl index da55622c17..734a2611f0 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.html.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.html.ftl @@ -16,10 +16,11 @@ <#assign maxresults=10> <#assign resCount=0> + <#assign totalResults=0> <#assign results = companyhome.childrenByLuceneSearch[queryString] > <#if results?size = 0> -
- (No results found) +
+ (No results found)
<#else> <#assign totalResults = results?size> diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.js b/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/source/web/scripts/office/search.js b/source/web/scripts/office/search.js index e5b041c2e2..499f809171 100644 --- a/source/web/scripts/office/search.js +++ b/source/web/scripts/office/search.js @@ -20,14 +20,20 @@ var OfficeSearch = itemsFound: function(shownResults, totalResults) { - if (shownResults < totalResults) + var strFound; + if (totalResults == 0) { - $('itemsFound').innerHTML = "Showing first " + shownResults + " of " + totalResults + " total items found"; + strFound = "No items found"; + } + else if (shownResults < totalResults) + { + strFound = "Showing first " + shownResults + " of " + totalResults + " total items found"; } else { - $('itemsFound').innerHTML = "Showing all " + shownResults + " items found"; + strFound = "Showing all " + shownResults + " items found"; } + $('itemsFound').innerHTML = strFound; }, /* AJAX call to perform server-side search */