git.cweiske.de
/
grauphel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
592c24c
)
make search work in ownCloud 8.1
author
Christian Weiske
<cweiske@cweiske.de>
Wed, 15 Jul 2015 18:23:11 +0000
(20:23 +0200)
committer
Christian Weiske
<cweiske@cweiske.de>
Wed, 15 Jul 2015 18:23:11 +0000
(20:23 +0200)
appinfo/app.php
patch
|
blob
|
history
grauphel.css
patch
|
blob
|
history
templates/error.php
patch
|
blob
|
history
templates/gui-database.php
patch
|
blob
|
history
templates/gui-note.php
patch
|
blob
|
history
templates/index.php
patch
|
blob
|
history
templates/tag.php
patch
|
blob
|
history
templates/tokens.php
patch
|
blob
|
history
diff --git
a/appinfo/app.php
b/appinfo/app.php
index d78a9bb2b681c6001b88fa34e229e66563c7c2d6..afbc7879f78ff9ffd9ae766ebb5395034fab9291 100755
(executable)
--- a/
appinfo/app.php
+++ b/
appinfo/app.php
@@
-8,6
+8,10
@@
'name' => 'Tomboy notes'
)
);
'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');
?>
\OCP\Util::addscript('grauphel', 'loader');
?>
diff --git
a/grauphel.css
b/grauphel.css
index 14eafb0d57e3917d9a52f972b96f21848a379687..20c0ead087da94a45e2d44dd5ce47c34213c033a 100644
(file)
--- a/
grauphel.css
+++ b/
grauphel.css
@@
-132,7
+132,7
@@
table.table thead th {
vertical-align: middle;
}
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;
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;
}
.note-content a {
text-decoration: underline;
+}
+
+#searchresults {
+ margin-top: 0px;
+ min-height: 100%;
+ margin-bottom: 50px;
}
\ No newline at end of file
}
\ No newline at end of file
diff --git
a/templates/error.php
b/templates/error.php
index 7ce4f8d18a0a3ca11a7904da1a14a90f5c1df3e3..9ea4c330e911f8bb74459c1ae7b1ee6720baf271 100644
(file)
--- 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">
<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>
<div>
<h1>grauphel - Tomboy notes server</h1>
<h2>Error</h2>
diff --git
a/templates/gui-database.php
b/templates/gui-database.php
index 6fc057ae80d6d479377f364f5e61ec6c895c7d99..95c70d609f2a4705dd8715d920c5b28c55cd607e 100644
(file)
--- 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">
<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
<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 ae004d63fd249f03b4a3dd538af8c375593f3d12..8061a50adc2998be2ee7259842d2520600569eab 100644
(file)
--- 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">
<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>
<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 e945f9a7bb6e604a9c8d4ae0d3716ca033e9413f..6eb2905a7013a3ce0ba7a4beba3eca20d2bceb81 100644
(file)
--- a/
templates/index.php
+++ b/
templates/index.php
@@
-4,6
+4,7
@@
<?php $_['appNavigation']->printPage(); ?>
<div id="app-content" class="content">
<?php $_['appNavigation']->printPage(); ?>
<div id="app-content" class="content">
+ <div id="searchresults" class="hidden"></div>
<div>
<h1>grauphel - Tomboy notes server</h1>
<p>
<div>
<h1>grauphel - Tomboy notes server</h1>
<p>
diff --git
a/templates/tag.php
b/templates/tag.php
index a8752a44a8a76df57651cd72ed0f4426ee552ad0..7d5cab172c7e238d948c7710eea7c95074175db1 100644
(file)
--- a/
templates/tag.php
+++ b/
templates/tag.php
@@
-4,6
+4,7
@@
<?php $_['appNavigation']->printPage(); ?>
<div id="app-content" class="list">
<?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">
<h1>Notebook: <?php p($_['tag']); ?></h1>
<table class="table" id="grauphel-notes">
diff --git
a/templates/tokens.php
b/templates/tokens.php
index 3aaabb716faa416ded367afbf597cb1f82a34b3c..c79ba7d0004dd28f35a49a5c27f00dae359e1989 100644
(file)
--- 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">
<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.
<h1>Manage access tokens</h1>
<p>
Here you see which applications have access to the notes.