From de9a69d8cee0b172d7d1ee576bb4c6c4dd4ade3f Mon Sep 17 00:00:00 2001 From: vargenau Date: Fri, 2 Jul 2010 07:31:33 +0000 Subject: [PATCH] Fulltext Search
+ method="get" accept-charset="" style="display:inline" class="searchform"> getArg('s') ? $request->getArg('s') : _("Search"); ?> ') {this.value = '';}" + value="" + onfocus="if (this.value == '') {this.value = '';}" onmouseout="window.status=''; return true;" - onmouseover="window.status=''; return true;" + onmouseover="window.status=''; return true;" type="text" id="search2" - title="" /> + title="" />
diff --git a/doc/THEMES b/doc/THEMES index 26ef7b44e..2a3f2a826 100644 --- a/doc/THEMES +++ b/doc/THEMES @@ -38,7 +38,7 @@ should be created by our HtmlElement methods, which create well-formed HTML objects. Pure HTML entities, e.g. " ?> will be escaped to <br>. -You can easily embed other templates by your own, e.g. +You can easily embed other templates by your own, e.g. Templates are used * by the master action (html and htmldump), which include most other @@ -48,7 +48,7 @@ Templates are used * by certain pagetypes (e.g. wikiblog, comment, wikiforum) To include templates from other themes use this syntax: - + includes the search template from the default theme. Warning! diff --git a/themes/Crao/templates/actionbar.tmpl b/themes/Crao/templates/actionbar.tmpl index 8b5824c0c..767508897 100644 --- a/themes/Crao/templates/actionbar.tmpl +++ b/themes/Crao/templates/actionbar.tmpl @@ -13,31 +13,31 @@
- + isAdmin() or mayAccessPage('change',$page->getName())) { ?> -get('locked') ? 'unlock' : 'lock') ?> +get('locked') ? 'unlock' : 'lock') ?> - - + + isAdmin() or mayAccessPage('remove',$page->getName())) { ?> - + - - - + + + getArg('action') == 'browse') || $user->isAdmin()) { ?> - - + + 'purge'), _("PurgeHtmlCache"), $page->getName()); $purgeb->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed.")); ?> - + - +
diff --git a/themes/Crao/templates/body.tmpl b/themes/Crao/templates/body.tmpl index e362c1a21..f192d0122 100644 --- a/themes/Crao/templates/body.tmpl +++ b/themes/Crao/templates/body.tmpl @@ -1,22 +1,22 @@ -getMoreAttr('body') ?>> +getMoreAttr('body') ?>> -
+
-

+

- - + +
- + diff --git a/themes/Crao/templates/bottom.tmpl b/themes/Crao/templates/bottom.tmpl index 64e92b249..875cca2f7 100644 --- a/themes/Crao/templates/bottom.tmpl +++ b/themes/Crao/templates/bottom.tmpl @@ -7,5 +7,5 @@ -getPostponedErrorsAsHTML() ?> - +getPostponedErrorsAsHTML() ?> + diff --git a/themes/Crao/templates/browse.tmpl b/themes/Crao/templates/browse.tmpl index 75e41a6bd..b004a0961 100644 --- a/themes/Crao/templates/browse.tmpl +++ b/themes/Crao/templates/browse.tmpl @@ -3,18 +3,18 @@ ?> isCurrent()) { ?> -

- - . +

+ + .

-

+

- +
-

getLastModifiedMessage($revision) ?>

+

getLastModifiedMessage($revision) ?>

-

+

- "#editarea"), */ _("edit area") /*) */) ?>

- +
- - + + -

-

+

+

+ action="getPostURL() ?>" + accept-charset=""> '; ?>
- +
- - - - + + + +
- - + +
-
- +
+

- +
-    - +    + isAdmin()) { ?> - +
- + - +
- - + +
-

+

-

+

- + 'text', @@ -49,11 +49,11 @@ else form.submit(); } //--> - document.write(' '); - + diff --git a/themes/Crao/templates/top.tmpl b/themes/Crao/templates/top.tmpl index add5a73b2..8a9b6d1a7 100644 --- a/themes/Crao/templates/top.tmpl +++ b/themes/Crao/templates/top.tmpl @@ -8,8 +8,8 @@ if (!$HIDE_TOOLBARS) { - - + +
diff --git a/themes/Crao/templates/wikiblog.tmpl b/themes/Crao/templates/wikiblog.tmpl index 87a6913ad..d0253d485 100644 --- a/themes/Crao/templates/wikiblog.tmpl +++ b/themes/Crao/templates/wikiblog.tmpl @@ -24,24 +24,24 @@ if ($rev->get('mtime') != $BLOG_CTIME) { ?> -
" +
" class="wikiblog wikitext">
- - + +
get('summary')) { ?> -

get('summary') ?>

+

get('summary') ?>

- +
- - + +
diff --git a/themes/MonoBook/templates/actionbar.tmpl b/themes/MonoBook/templates/actionbar.tmpl index 43246a821..43767ff72 100644 --- a/themes/MonoBook/templates/actionbar.tmpl +++ b/themes/MonoBook/templates/actionbar.tmpl @@ -10,79 +10,79 @@ $isBrowse = $request->getArg('action') == 'browse'; ?>
-
+
    - getParent(), array('class'=>$isBrowse ? "selected" : "", 'title' => "View the page [alt-c]")) ?> isWikiPage($talk->getName())) { ?> - 'browse'), _("Discussion"), $talk->getName()) ?> + 'browse'), _("Discussion"), $talk->getName()) ?> - 'create', + 'create', 'template'=>_("TemplateTalk")), _("Discussion"), $talk->getName()) ?> - getParent(), array('title' => "View the page [alt-c]")) ?> - getName(), array('class'=>$isBrowse ? "selected" : "")) ?> + getParent(), array('title' => "View the page [alt-c]")) ?> + getName(), array('class'=>$isBrowse ? "selected" : "")) ?> - isWikiPage($page->getName()) ? ($revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) : _("Create Page"), false, + isWikiPage($page->getName()) ? ($revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) : _("Create Page"), false, array('id' => 'btn-edit', 'title' => "You can edit this page. Please use the preview button before saving. [alt-e]")) ?> - + isWikiPage($page->getName())) { ?> - "Past versions of this page. [alt-h]")) ?> + "Past versions of this page. [alt-h]")) ?> - + - - get('locked') ? 'unlock' : 'lock') ?> + + get('locked') ? 'unlock' : 'lock') ?> isSignedIn() ) { ?> - "Add/Remove this to/from the list of pages you're monitoring for changes [alt-l]")) ?>
-
+
    isSignedIn() ) { ?> - - + + - isCurrent() ? $page->GetRevisionBefore() : $revision) ?> - + isCurrent() ? $page->GetRevisionBefore() : $revision) ?> + - _("PageInfo")), _("Page info"), $pagename) ?> - _("AuthorHistory")), _("Author history"), $pagename) ?> - - _("PageDump")), _("Page dump"), $pagename) ?> + _("PageInfo")), _("Page info"), $pagename) ?> + _("AuthorHistory")), _("Author history"), $pagename) ?> + + _("PageDump")), _("Page dump"), $pagename) ?> 'purge'), _("Purge HTML cache"), $pagename); $PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed.")); ?> - +
diff --git a/themes/MonoBook/templates/body.tmpl b/themes/MonoBook/templates/body.tmpl index 327e6e824..838e2ba05 100644 --- a/themes/MonoBook/templates/body.tmpl +++ b/themes/MonoBook/templates/body.tmpl @@ -2,35 +2,35 @@ // rcs_id('$Id$'); // Todo: set the body attr dynamically. here class="ns-2" for mozilla ?> -getMoreAttr('body') ?>> +getMoreAttr('body') ?>>
- +
- +
- + - +
- + - - + +
- +
diff --git a/themes/MonoBook/templates/browse-footer.tmpl b/themes/MonoBook/templates/browse-footer.tmpl index ba5032724..cd8f36cef 100644 --- a/themes/MonoBook/templates/browse-footer.tmpl +++ b/themes/MonoBook/templates/browse-footer.tmpl @@ -4,27 +4,27 @@ ?>
    -
  • getOwnerMessage($page) ?> getLastModifiedMessage($revision) ?> getAuthorMessage($revision) ?>
    • +
  • getOwnerMessage($page) ?> getLastModifiedMessage($revision) ?> getAuthorMessage($revision) ?>
    • _dbi->isWikiPage(_("About".WIKI_NAME))) { ?> - +
  • About PhpWiki
  • _dbi->isWikiPage(_("GeneralDisclaimer"))) { ?> - + Disclaimer
- - + + diff --git a/themes/MonoBook/templates/browse.tmpl b/themes/MonoBook/templates/browse.tmpl index 6f40b78c6..ab602d789 100644 --- a/themes/MonoBook/templates/browse.tmpl +++ b/themes/MonoBook/templates/browse.tmpl @@ -3,13 +3,13 @@ ?> isCurrent()) { ?> -

- - . +

+ + .

-

+

- + diff --git a/themes/MonoBook/templates/editpage.tmpl b/themes/MonoBook/templates/editpage.tmpl index c111c12cd..a71c417a5 100644 --- a/themes/MonoBook/templates/editpage.tmpl +++ b/themes/MonoBook/templates/editpage.tmpl @@ -2,4 +2,4 @@ // rcs_id('$Id$'); ?>
- + diff --git a/themes/MonoBook/templates/info.tmpl b/themes/MonoBook/templates/info.tmpl index fe185e597..21c02321a 100644 --- a/themes/MonoBook/templates/info.tmpl +++ b/themes/MonoBook/templates/info.tmpl @@ -94,61 +94,61 @@ if ($type == 'inherited') { ?> - - - + + - - + + - - + - - + + - - + + - - + + - - + + - - + + - - + + - + - + @@ -174,29 +174,29 @@ if (0 and isSubPage($page->getName())) { - - + +
formatDateTime($revision->get('_supplanted')) ?>formatDateTime($revision->get('_supplanted')) ?>
+ - () + ()
, ,
ACL type
ACLasAclGroupLines() ?>asAclGroupLines() ?>
- - - - - 'diff','previous' => 'minor'),_("Diff previous Revision"),$page->getName()) ?> - 'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?> + + + + + 'diff','previous' => 'minor'),_("Diff previous Revision"),$page->getName()) ?> + 'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?> isAdmin()) { ?> - + 'purge'), _("PurgeHtmlCache"), $page->getName()); $PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed.")); ?> - + diff --git a/themes/MonoBook/templates/logo.tmpl b/themes/MonoBook/templates/logo.tmpl index e03574b2e..042484887 100644 --- a/themes/MonoBook/templates/logo.tmpl +++ b/themes/MonoBook/templates/logo.tmpl @@ -1,6 +1,6 @@ -
diff --git a/themes/MonoBook/templates/navbar.tmpl b/themes/MonoBook/templates/navbar.tmpl index 46923ff19..4509bc366 100644 --- a/themes/MonoBook/templates/navbar.tmpl +++ b/themes/MonoBook/templates/navbar.tmpl @@ -9,35 +9,35 @@ $p = $WikiTheme->tooltipAccessKeyPrefix();
-
+
    -
    • -
  • setAttr("accesskey","r"); $link->addTooltip(_("The list of recent changes in the wiki.")." [$p-r]"); ?>
    • -
    • -
    • -
  • 'LikePages'),_("Like pages"), $page->getName()) ?>
    • -
    • -
    • +
    • +
  • setAttr("accesskey","r"); $link->addTooltip(_("The list of recent changes in the wiki.")." [$p-r]"); ?>
    • +
    • +
    • +
  • 'LikePages'),_("Like pages"), $page->getName()) ?>
    • +
    • +
- - + + diff --git a/themes/Sidebar/templates/rc.tmpl b/themes/Sidebar/templates/rc.tmpl index a7a58de6f..ff584c85f 100644 --- a/themes/Sidebar/templates/rc.tmpl +++ b/themes/Sidebar/templates/rc.tmpl @@ -3,7 +3,7 @@ ?>
-
folderArrow('p-rc', 'Closed') ?>
+
folderArrow('p-rc', 'Closed') ?>