Fix floating "No Results Found" in the search engine.

pydio · Oct 7, 2013 · 7adbae5 · 7adbae5
1 parent 8455078
commit 7adbae5
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 7 deletions.
diff --git a/core/src/plugins/core.ajaxplorer/ajxp_registry.xsd b/core/src/plugins/core.ajaxplorer/ajxp_registry.xsd
@@ -515,10 +515,8 @@
                 <xs:element minOccurs="0" ref="extensionOnInit"/>
                 <xs:element minOccurs="0" ref="clientListener"/>
                 <xs:element minOccurs="0" ref="standardFormDefinition"/>
-                <xs:choice minOccurs="0">
-                    <xs:element ref="serverCallback"/>
-                    <xs:element ref="activeCondition"/>
-                </xs:choice>
+                <xs:element minOccurs="0" ref="serverCallback"/>
+                <xs:element minOccurs="0" ref="activeCondition"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>

diff --git a/core/src/plugins/core.ajaxplorer/i18n/en.php b/core/src/plugins/core.ajaxplorer/i18n/en.php
@@ -532,5 +532,6 @@
 "474" => "No description available",
 "475" => "Files shared amongst all users",
 "476" => "Your personal workspace",
-"477" => "Select a file or folder to see its details here"
+"477" => "Select a file or folder to see its details here",
+"478" => "No results found",
 );
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.SearchEngine.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.SearchEngine.js
@@ -513,7 +513,9 @@ Class.create("SearchEngine", AjxpPane, {
         this.hasResults = true;
 	},
     addNoResultString : function(){
-        $(this._resultsBoxId).insert(new Element('div').update("No results found."));
+        if(!$(this._resultsBoxId).down('#no-results-found')){
+            $(this._resultsBoxId).insert({top: new Element('div', {id:'no-results-found'}).update(MessageHash[478])});
+        }
     },
 	/**
 	 * Put a folder to search in the queue
@@ -534,6 +536,41 @@ Class.create("SearchEngine", AjxpPane, {
 			this.updateStateFinished();
 		}
 	},
+
+    buildNodeProviderProperties: function(currentFolder, remote_indexation){
+
+        var props = {};
+        if(this._searchMode == "remote"){
+            /* REMOTE INDEXER CASE */
+            props.get_action = 'search';
+            props.query = this.crtText;
+            if(this.hasMetaSearch()){
+                props.fields =  this.getSearchColumns().join(',');
+            }
+        }else{
+
+            if(remote_indexation){
+
+                props.get_action = remote_indexation;
+                props.query = this.crtText;
+                if(this.hasMetaSearch()){
+                    props.fields =  this.getSearchColumns().join(',');
+                }
+                props.dir = currentFolder;
+
+            }else{
+
+                props.get_action = 'ls';
+                props.options = 'a' + (this.hasMetaSearch()?'l':'');
+                props.dir = currentFolder;
+
+            }
+
+        }
+        return props;
+
+    },
+
 	/**
 	 * Get a folder content and searches its children 
 	 * Should reference the IAjxpNodeProvider instead!! Still a "ls" here!
@@ -629,6 +666,9 @@ Class.create("SearchEngine", AjxpPane, {
 		var nodes = XPathSelectNodes(oXmlDoc.documentElement, "tree");
         if(!nodes.length){
             this.addNoResultString();
+        }else{
+            var noRes =  $(this._resultsBoxId).down('#no-results-found');
+            if(noRes) noRes.remove();
         }
 		for (var i = 0; i < nodes.length; i++) 
 		{

diff --git a/core/src/plugins/gui.ajax/res/themes/vision/css/ajaxplorer.css b/core/src/plugins/gui.ajax/res/themes/vision/css/ajaxplorer.css
@@ -2554,6 +2554,11 @@ div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed span.text_lab
     padding-top: 0;
 }
 
+#no-results-found {
+    text-align: center;
+    margin-top: 10%;
+}
+
 .infoPanelActions
 {
     padding:5px;
@@ -4240,7 +4245,7 @@ div.innerTabulator > div.tabulatorContainer > #display_toolbar a
     display: none;
 }
 
-.ipanel_no_selection_select {
+.ipanel_no_selection_select, #no-results-found {
     color: rgb(180, 184, 190);
     text-shadow: 1px 1px 0 #ffffff;
 }