refs owncloud#368: Use custom search box

css/notes.css

@@ -173,3 +173,9 @@
         padding-left: 90px;
     }
 }
+
+#searchnotes {
+    width: 100%;
+    border-left: 0px;
+    padding-left: 12px;
+}

js/app/controllers/notescontroller.js

@@ -43,8 +43,7 @@ app.controller('NotesController', function($routeParams, $scope, $location,
         });
     };
 
-    var searchform = $('.searchbox');
-	var searchbox = $('#searchbox');
+	var searchbox = $('#searchnotes');
 
     initSearch();
 
@@ -59,13 +58,6 @@ app.controller('NotesController', function($routeParams, $scope, $location,
 		}, 250);
 		searchbox.bind('propertychange change keyup input paste', checkQueryChange);
 
-		/** Handle clearing the searchbox. This has to be registered to the parent form
-		 *  of the #searchbox element.
-		 */
-		searchform.on('reset', function() {
-			setQueryString('');
-		});
-
 		/** Run search when enter pressed within the searchbox */
 		searchbox.bind('keydown', function (event) {
 			if (event.which === 13) {

templates/main.php

@@ -40,6 +40,10 @@
                 oc-click-focus="{ selector: '#app-content textarea' }">
                 <a href='#'>+ <span><?php p($l->t('New note')); ?></span></a>
             </li>
+            <!-- search notes button -->
+            <li>
+                <input id="searchnotes" type="search" name="searchnotes" value="" autocomplete="off" placeholder="Search in notes" />
+            </li>
             <!-- notes list -->
             <li ng-repeat="note in notes|orderBy:['-favorite','-modified']|noteFilter:queryString"
                 ng-class="{ active: note.id == route.noteId }">
@@ -67,7 +71,4 @@
     <div id="app-content" ng-class="{loading: is.loading}">
         <div id="app-content-container" ng-view></div>
     </div>
-
-    <!-- Show search button in header -->
-    <div id="searchresults" class="hidden" data-appfilter="notes"></div>
 </div>