diff --git a/inc/search.php b/inc/search.php index ea20c4f3b73b589e5a0c8f787b5aa3888bb4f9d4..af7506f780bb6e62513d0946583f2f24fe17bc37 100644 --- a/inc/search.php +++ b/inc/search.php @@ -230,6 +230,21 @@ function search_pagename(&$data,$base,$file,$type,$lvl,$opts){ return true; } +/** + * Just lists all documents + * + * @author Andreas Gohr <andi@splitbrain.org> + */ +function search_allpages(&$data,$base,$file,$type,$lvl,$opts){ + //we do nothing with directories + if($type == 'd') return true; + //only search txt files + if(!preg_match('#\.txt$#',$file)) return true; + + $data[]['id'] = pathID($file); + return true; +} + /** * Search for backlinks to a given page * diff --git a/lib/plugins/admin.php b/lib/plugins/admin.php index 936278d2b45b19437f8d679ec945a2ba63664ca1..339f465a78f671c7917929f42d6676bfc42f3a4f 100644 --- a/lib/plugins/admin.php +++ b/lib/plugins/admin.php @@ -78,9 +78,9 @@ class DokuWiki_Admin_Plugin { $file = DOKU_PLUGIN.$plugin.'/lang/'.$conf['lang'].'/'.$id.'.txt'; if(!@file_exists($file)){ //fall back to english - $file = DOKU_PLUGIN.$plugin.'inc/lang/en/'.$id.'.txt'; + $file = DOKU_PLUGIN.$plugin.'/lang/en/'.$id.'.txt'; } - return $file; + return $file; } // use this function to access plugin language strings diff --git a/lib/scripts/tw-sack.js b/lib/scripts/tw-sack.js index 1480ca41cfb65e1c828165255e75cbf78167f0ed..d608a76b73630826aa3f68ca29af08a2a2e14757 100644 --- a/lib/scripts/tw-sack.js +++ b/lib/scripts/tw-sack.js @@ -94,7 +94,6 @@ function sack(file){ } catch (e) {} } - this.xmlhttp.send(this.URLString); this.xmlhttp.onreadystatechange = function() { switch (self.xmlhttp.readyState){ case 1: @@ -126,6 +125,7 @@ function sack(file){ break; } }; + this.xmlhttp.send(this.URLString); } } }; diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index ee03815ff731dad23404d8146b5635401f8b95fc..79a205f7ec80cb765c8f269c3d6bef38ba218358 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -116,7 +116,7 @@ input.missing { /* --------- buttons ------------------- */ -input.button { +input.button, button.button{ border: 1px solid #8cacbb; color: Black; background-color: white;