From: Christian Weiske <cweiske@cweiske.de>
Date: Wed, 15 Jul 2015 18:23:11 +0000 (+0200)
Subject: make search work in ownCloud 8.1
X-Git-Tag: v0.6.0~6
X-Git-Url: https://git.cweiske.de/grauphel.git/commitdiff_plain/d776c4c77ddb59cb571f23bf4ef042bd0a246751?ds=sidebyside

make search work in ownCloud 8.1
---

diff --git a/appinfo/app.php b/appinfo/app.php
index d78a9bb..afbc787 100755
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -8,6 +8,10 @@
         'name' => 'Tomboy notes'
     )
 );
-\OC_Search::registerProvider('OCA\Grauphel\Search\Provider');
+
+\OC::$server->getSearch()->registerProvider(
+    'OCA\Grauphel\Search\Provider', array('apps' => array('grauphel'))
+);
+
 \OCP\Util::addscript('grauphel', 'loader');
 ?>
diff --git a/grauphel.css b/grauphel.css
index 14eafb0..20c0ead 100644
--- a/grauphel.css
+++ b/grauphel.css
@@ -132,7 +132,7 @@ table.table thead th {
     vertical-align: middle;
 }
 
-table.table th, table.table td {
+table.table th, table.table td, #searchresults td {
     border-bottom:1px solid #ddd;
     text-align:left;
     font-weight:normal;
@@ -194,4 +194,10 @@ table.table form button.action {
 }
 .note-content a {
     text-decoration: underline;
+}
+
+#searchresults {
+    margin-top: 0px;
+    min-height: 100%;
+    margin-bottom: 50px;
 }
\ No newline at end of file
diff --git a/templates/error.php b/templates/error.php
index 7ce4f8d..9ea4c33 100644
--- a/templates/error.php
+++ b/templates/error.php
@@ -1,6 +1,7 @@
 <link rel="stylesheet" href="<?php p(OCP\Util::linkTo('grauphel','grauphel.css')); ?>" type="text/css"/>
 
 <div id="app-content" class="content">
+  <div id="searchresults" class="hidden"></div>
   <div>
     <h1>grauphel - Tomboy notes server</h1>
     <h2>Error</h2>
diff --git a/templates/gui-database.php b/templates/gui-database.php
index 6fc057a..95c70d6 100644
--- a/templates/gui-database.php
+++ b/templates/gui-database.php
@@ -6,6 +6,7 @@
 <script type="text/javascript" src="<?php p(OCP\Util::linkTo('grauphel','js/grauphel.js')); ?>"></script>
 
 <div id="app-content" class="content">
+  <div id="searchresults" class="hidden"></div>
   <h1>Manage database</h1>
   <p>
     In case something went seriously wrong during synchronization, you may reset your
diff --git a/templates/gui-note.php b/templates/gui-note.php
index ae004d6..8061a50 100644
--- a/templates/gui-note.php
+++ b/templates/gui-note.php
@@ -6,6 +6,7 @@
 <script type="text/javascript" src="<?php p(OCP\Util::linkTo('grauphel','js/grauphel.js')); ?>"></script>
 
 <div id="app-content" class="content">
+ <div id="searchresults" class="hidden"></div>
  <div class="actions">
   <a class="button" href="<?php echo p($_['links']['html']); ?>">HTML</a>
   <a class="button" href="<?php echo p($_['links']['text']); ?>">Text</a>
diff --git a/templates/index.php b/templates/index.php
index e945f9a..6eb2905 100644
--- a/templates/index.php
+++ b/templates/index.php
@@ -4,6 +4,7 @@
 <?php $_['appNavigation']->printPage(); ?>
 
 <div id="app-content" class="content">
+  <div id="searchresults" class="hidden"></div>
   <div>
     <h1>grauphel - Tomboy notes server</h1>
     <p>
diff --git a/templates/tag.php b/templates/tag.php
index a8752a4..7d5cab1 100644
--- a/templates/tag.php
+++ b/templates/tag.php
@@ -4,6 +4,7 @@
 <?php $_['appNavigation']->printPage(); ?>
 
 <div id="app-content" class="list">
+  <div id="searchresults" class="hidden"></div>
   <h1>Notebook: <?php p($_['tag']); ?></h1>
 
   <table class="table" id="grauphel-notes">
diff --git a/templates/tokens.php b/templates/tokens.php
index 3aaabb7..c79ba7d 100644
--- a/templates/tokens.php
+++ b/templates/tokens.php
@@ -6,6 +6,7 @@
 <script type="text/javascript" src="<?php p(OCP\Util::linkTo('grauphel','js/grauphel.js')); ?>"></script>
 
 <div id="app-content" class="list">
+  <div id="searchresults" class="hidden"></div>
   <h1>Manage access tokens</h1>
   <p>
     Here you see which applications have access to the notes.