More loading feedback (client)

docs-core/src/main/java/com/sismics/docs/core/dao/lucene/LuceneDao.java

@@ -10,6 +10,7 @@ import java.util.Set;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.StringField;
 import org.apache.lucene.document.TextField;
+import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.queries.TermsFilter;
@@ -171,12 +172,17 @@ public class LuceneDao {
         TermsFilter userFilter = new TermsFilter(terms);
         
         // Search
-        IndexSearcher searcher = new IndexSearcher(AppContext.getInstance().getIndexingService().getDirectoryReader());
+        DirectoryReader directoryReader = AppContext.getInstance().getIndexingService().getDirectoryReader();
+        Set<String> documentIdList = new HashSet<String>();
+        if (directoryReader == null) {
+            // The directory reader is not yet initialized (probably because there is nothing indexed)
+            return documentIdList;
+        }
+        IndexSearcher searcher = new IndexSearcher(directoryReader);
         TopDocs topDocs = searcher.search(query, userFilter, Integer.MAX_VALUE);
         ScoreDoc[] docs = topDocs.scoreDocs;
         
         // Extract document IDs
-        Set<String> documentIdList = new HashSet<String>();
         for (int i = 0; i < docs.length; i++) {
             org.apache.lucene.document.Document document = searcher.doc(docs[i].doc);
             String type = document.get("type");

docs-core/src/main/java/com/sismics/docs/core/service/IndexingService.java

@@ -128,7 +128,6 @@ public class IndexingService extends AbstractScheduledService {
     public DirectoryReader getDirectoryReader() {
         if (directoryReader == null) {
             if (!DirectoryReader.indexExists(directory)) {
-                log.info("Lucene directory not yet created");
                 return null;
             }
             try {

docs-web/src/main/webapp/index.html

@@ -60,7 +60,7 @@
     <div class="navbar" ng-controller="Navigation">
       <div class="navbar-inner">
         <div class="container">
-          <div class="brand loader" ng-class="{hide: !isLoading() }">
+          <div class="brand loader hidden-phone" ng-class="{hide: !isLoading() }">
             <img src="img/loader.gif" />
           </div>
           

docs-web/src/main/webapp/partial/docs/document.edit.html

@@ -1,4 +1,7 @@
-<form class="form-horizontal" name="documentForm">
+<img src="img/loader.gif" ng-if="!document && isEdit()" />
+
+<div ng-if="document || !isEdit()">
+  <form class="form-horizontal" name="documentForm">
     <div class="control-group" ng-class="{ error: !documentForm.title.$valid }">
       <label class="control-label" for="inputTitle">Title</label>
       <div class="controls">
@@ -46,11 +49,12 @@
       <button type="submit" class="btn btn-primary" ng-disabled="!documentForm.$valid || fileIsUploading" ng-click="edit()">{{ isEdit() ? 'Edit' : 'Add' }}</button>
       <button type="submit" class="btn" ng-click="cancel()">Cancel</button>
     </div>
-</form>
+  </form>
   
-<div class="row-fluid" ng-show="fileIsUploading">
+  <div class="row-fluid" ng-show="fileIsUploading">
     <h4>Uploading files...</h4>
     <div class="span6"><progress percent="fileProgress" class="progress-info active"></progress></div>
-</div>
+  </div>
   
-<alert ng-repeat="alert in alerts" type="alert.type" close="closeAlert($index)">{{ alert.msg }}</alert>
+  <alert ng-repeat="alert in alerts" type="alert.type" close="closeAlert($index)">{{ alert.msg }}</alert>
+</div>

docs-web/src/main/webapp/partial/docs/settings.user.edit.html

@@ -1,10 +1,13 @@
-<h2 ng-show="isEdit()">Edit
+<img src="img/loader.gif" ng-if="!user && isEdit()" />
+
+<div ng-if="user || !isEdit()">
+  <h2 ng-show="isEdit()">Edit
     <small>"{{ user.username }}"</small>
-</h2>
+  </h2>
-<h2 ng-show="!isEdit()">Add
+  <h2 ng-show="!isEdit()">Add
     <small>user</small>
-</h2>
+  </h2>
-<form class="form-horizontal" name="editUserForm" novalidate>
+  <form class="form-horizontal" name="editUserForm" novalidate>
     <div class="control-group" ng-class="{ error: !editUserForm.username.$valid, success: editUserForm.username.$valid }">
       <label class="control-label" for="inputUsername">Username</label>
   
@@ -58,5 +61,6 @@
         <span class="icon-trash icon-white"></span> Delete
       </button>
     </div>
-</form>
+  </form>
-<alert ng-repeat="alert in alerts" type="alert.type" close="closeAlert($index)">{{ alert.msg }}</alert>
+  <alert ng-repeat="alert in alerts" type="alert.type" close="closeAlert($index)">{{ alert.msg }}</alert>
+</div>