SF.net SVN: phpwiki:[11096] trunk
carstenklapp--- via phpwiki-checkins <[email protected]> Fri, 14 Feb 2025 04:32:38 +0000
| Newsgroups | gmane.comp.web.wiki.phpwiki.checkins |
|---|---|
| Message-ID | <[email protected]> |
Revision: 11096
http://sourceforge.net/p/phpwiki/code/11096
Author: carstenklapp
Date: 2025-02-14 04:32:37 +0000 (Fri, 14 Feb 2025)
Log Message:
-----------
Improved formatting output for debugging, adjusted code for themes which depend on default theme. Added signature template
Modified Paths:
--------------
trunk/pgsrc/ReleaseNotes
trunk/themes/Portland/portland.css
trunk/themes/default/phpwiki-common.css
trunk/themes/default/phpwiki-modern.css
trunk/themes/default/phpwiki-printer.css
trunk/themes/default/phpwiki.css
trunk/themes/default/templates/head.tmpl
trunk/themes/default/templates/navbar.tmpl
trunk/themes/default/templates/savepage.tmpl
trunk/themes/default/templates/search.tmpl
trunk/themes/default/templates/signin.tmpl
trunk/themes/default/templates/top.tmpl
trunk/themes/fusionforge/interwiki.map
Added Paths:
-----------
trunk/themes/default/templates/signature.tmpl
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes 2025-02-14 04:15:28 UTC (rev 11095)
+++ trunk/pgsrc/ReleaseNotes 2025-02-14 04:32:37 UTC (rev 11096)
@@ -1,4 +1,4 @@
-Date: Fri, 14 Feb 2025 02:26:17 +0000
+Date: Fri, 14 Feb 2025 04:29:43 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
Content-Type: application/x-phpwiki;
pagename=ReleaseNotes;
@@ -19,8 +19,14 @@
* Updated ##.htaccess## files to work with Apache 2.4. Will still work with
older versions but requires mod_version module which is available in
Apache 2.0.56 and later.
-* Minor updates to Hawaiian theme.
+* Minor updates to Hawaiian theme and Portland theme.
+* Fixed MacOSX theme buttons not loading, other visual improvements and
+ RecentChanges uses a table now.
+* Improved formatting output for debugging, adjusted code for themes
+ which depend on default theme. Added signature template (can be disabled
+ by adding this line to themeinfo.php: ##$this->addImageAlias('signature', false);)##
+
== 1.6.4 2024-03-13 Marc-Etienne Vargenau, Christof Meerwald ==
* Upgrade PEAR to relase 1.10.14, PEAR DB to release 1.12.1
Modified: trunk/themes/Portland/portland.css
===================================================================
--- trunk/themes/Portland/portland.css 2025-02-14 04:15:28 UTC (rev 11095)
+++ trunk/themes/Portland/portland.css 2025-02-14 04:32:37 UTC (rev 11096)
@@ -101,3 +101,20 @@
padding-bottom: 0;
margin: 0.5ex 0;
}
+
+/* Recent changes */
+.tdselected, .tdunselected {
+ text-align: center;
+ padding-left: 5px;
+ padding-right: 5px;
+ color: black;
+}
+.tdselected {
+ font-weight: bold;
+ background: #fffff0;
+
+}
+.tdunselected {
+ background-color: white;
+ text-decoration: underline;
+}
Modified: trunk/themes/default/phpwiki-common.css
===================================================================
--- trunk/themes/default/phpwiki-common.css 2025-02-14 04:15:28 UTC (rev 11095)
+++ trunk/themes/default/phpwiki-common.css 2025-02-14 04:32:37 UTC (rev 11096)
@@ -66,7 +66,7 @@
/* Banners ============================================================ */
-.success, .feedback, .warning, .warning_msg, .error, .information {
+.success, .feedback, .warning, .warning_msg, .error, .information, .depreciated {
color: black;
padding-left: 0.5em;
padding-right: 0.5em;
@@ -81,13 +81,33 @@
.warning_msg, .warning {
border-color: orange;
background-color: #FEEFB3;
+ font-family: monospace;
+
}
.error {
border-color: red;
background-color: #FFBABA;
+ padding-top: 0.00ex;
+ padding-left: 0.25ex;
+ padding-bottom: 0.1ex;
+ padding-right: 0.25ex;
}
+p.error {
+ display: block;
+ padding: 1ex;
+}
+.depreciated {
+ border-color: #bbbbbb;
+ background-color: white;
+ padding-top: 0.00ex;
+ padding-bottom: 0.1ex;
+}
+.depreciated p {
+ font-family: monospace;
+}
+
.information {
border-color: blue;
background-color: #BDE5F8;
@@ -140,6 +160,26 @@
padding-left: 1em;
}
+/* CreateTocPlugin plugin ================================================== */
+
+div.toc { /*toc box*/
+ border: 1px solid gray;
+ background-color: white;
+ padding: 1ex;
+}
+
+div.toc p { /*toc title*/
+ text-decoration: none;
+ padding-top: 0ex;
+ margin-left: 5px;
+}
+div.toclist p a { /*toc items*/
+/* text-decoration: none;*/
+ padding-top: 0ex;
+ margin-left: 5px;
+}
+
+
/* WikicreoleTable, MediawikiTable and RichTable plugins ============== */
/*
@@ -171,13 +211,13 @@
table.boxed caption, table.bordered caption {
text-align: center;
- font-weight: bold;
+// font-weight: bold;
caption-side: bottom;
padding-top: 0.8em;
}
table.boxed th, table.bordered th {
- font-weight: bold;
+// font-weight: bold;
background-color: #d8d8d8;
}
Modified: trunk/themes/default/phpwiki-modern.css
===================================================================
--- trunk/themes/default/phpwiki-modern.css 2025-02-14 04:15:28 UTC (rev 11095)
+++ trunk/themes/default/phpwiki-modern.css 2025-02-14 04:32:37 UTC (rev 11096)
@@ -91,7 +91,8 @@
color: #004662
}
-.wiki:hover, .backlinks:hover {
+.wiki:hover,
+.backlinks:hover {
color: #5454ff;
}
@@ -100,8 +101,12 @@
/**
* wikiaction, wikiadmin, wikiunsafe:
*/
-.wikiaction, .wikiadmin, .wiki-rc-action, .backlinks {
- color: #69798f; /* pale cyan */
+.wikiaction,
+.wikiadmin,
+.wiki-rc-action,
+.backlinks {
+ color: #69798f;
+ /* pale cyan */
text-decoration: none;
font-weight: bold;
}
@@ -116,7 +121,9 @@
}
/* Unknown links */
-.wikiunknown a, .named-wikiunknown a, .wikiunknown u {
+.wikiunknown a,
+.named-wikiunknown a,
+.wikiunknown u {
text-decoration: none;
color: #600;
}
@@ -130,11 +137,15 @@
text-decoration: none;
}
-.interwiki, i.interwiki .wikipage, em .interwiki .wikipage {
+.interwiki,
+i.interwiki .wikipage,
+em .interwiki .wikipage {
font-style: oblique;
}
-.interwiki .wikipage, i .interwiki, em .interwiki {
+.interwiki .wikipage,
+i .interwiki,
+em .interwiki {
font-style: normal;
}
@@ -141,7 +152,12 @@
/**
* headings
*/
-h1, h2, h3, h4, h5, h6 {
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
font-family: Arial, Helvetica, sans-serif;
}
@@ -182,7 +198,11 @@
margin-left: 1.5em;
}
-h2, h3, h4, h5, h6 {
+h2,
+h3,
+h4,
+h5,
+h6 {
margin-top: 2ex;
padding-top: 0.15ex;
padding-bottom: 0.1ex;
@@ -203,7 +223,8 @@
border: 0.5pt solid #bebebe;
}
-.pagelist thead, .pagelist thead u {
+.pagelist thead,
+.pagelist thead u {
background: #bebebe;
color: white;
font-weight: bold;
@@ -221,7 +242,9 @@
/**
* Toolbar
*/
-.toolbar, td, input.button {
+.toolbar,
+td,
+input.button {
font-family: Arial, Helvetica, sans-serif;
}
@@ -229,9 +252,11 @@
cursor: pointer;
}
-#navbuttons, #actionbar {
+#navbuttons,
+#actionbar {
color: black;
- background: #ddd; /* dark gray */
+ background: #ddd;
+ /* dark gray */
margin-top: 0.1ex;
margin-bottom: 1ex;
margin-left: 0;
@@ -238,8 +263,10 @@
margin-right: 0;
}
-#actionbar table, #navbuttons {
- border-top: 0.5pt solid black; /* medium gray */
+#actionbar table,
+#navbuttons {
+ border-top: 0.5pt solid black;
+ /* medium gray */
border-bottom: 0.5pt solid black;
padding-top: 0.3ex;
padding-bottom: 0.4ex;
@@ -257,7 +284,8 @@
padding-right: 0.5em;
}
-hr.ignore, hr.toolbar {
+hr.ignore,
+hr.toolbar {
height: 0;
/* margin: -1ex; * Hack for Mozilla */
/* Hack for ie and OmniWeb to hide this element */
@@ -289,7 +317,8 @@
text-decoration: underline;
}
-.transclusion, .wiki-edithelp {
+.transclusion,
+.wiki-edithelp {
background: white;
font-size: smaller;
padding-left: 0.5em;
@@ -351,7 +380,8 @@
font-size: larger;
}
-table.cal-header tr, table.cal-header td {
+table.cal-header tr,
+table.cal-header td {
text-align: center;
background: black;
color: white;
@@ -420,16 +450,19 @@
color: #ffff00;
}
-.diff del, .diff ins {
+.diff del,
+.diff ins {
font-weight: bold;
text-decoration: none;
}
-.diff .original, .diff .deleted {
+.diff .original,
+.diff .deleted {
background: #fcc;
}
-.diff .final, .diff .added {
+.diff .final,
+.diff .added {
background: #cfc;
}
@@ -448,7 +481,8 @@
font-weight: bold;
}
-.pageinfo-minoredit, .pageinfo-authorid {
+.pageinfo-minoredit,
+.pageinfo-authorid {
font-size: smaller;
font-style: oblique;
}
@@ -506,4 +540,4 @@
position: absolute;
left: 0.5em;
top: 0;
-}
+}
\ No newline at end of file
Modified: trunk/themes/default/phpwiki-printer.css
===================================================================
--- trunk/themes/default/phpwiki-printer.css 2025-02-14 04:15:28 UTC (rev 11095)
+++ trunk/themes/default/phpwiki-printer.css 2025-02-14 04:32:37 UTC (rev 11096)
@@ -278,6 +278,10 @@
clear: both;
}
+.wiki-rc-action { /*diff buttons*/
+ display: none;
+}
+
/* Debug */
.debug {
display: none;
Modified: trunk/themes/default/phpwiki.css
===================================================================
--- trunk/themes/default/phpwiki.css 2025-02-14 04:15:28 UTC (rev 11095)
+++ trunk/themes/default/phpwiki.css 2025-02-14 04:32:37 UTC (rev 11096)
@@ -40,7 +40,8 @@
body {
background: #fffff0;
font-family: Arial, Helvetica, sans-serif;
- font-size: 85%; /* The default is too large. But enlarge monospace below */
+ font-size: 85%;
+ /* The default is too large. But enlarge monospace below */
margin: 1.5ex 1em;
}
@@ -133,20 +134,29 @@
/**
* Link styles
*/
-.wiki, .named-wiki {
+.wiki,
+.named-wiki {
text-decoration: none;
font-weight: bold;
}
/* Action buttons */
-a.wikiaction, a.wikiadmin, a.wiki-rc-action, a.wikiunsafe,
-input.wikiaction, input.button, input.wikiadmin {
+a.wikiaction,
+a.wikiadmin,
+a.wiki-rc-action,
+a.wikiunsafe,
+input.wikiaction,
+input.button,
+input.wikiadmin {
text-decoration: none;
font-family: Arial, Helvetica, sans-serif;
white-space: nowrap;
}
-a.wikiaction, a.wikiaction:visited, input.wikiaction, input.button {
+a.wikiaction,
+a.wikiaction:visited,
+input.wikiaction,
+input.button {
background-color: #ddd;
}
@@ -154,18 +164,22 @@
background-color: #fcc;
}
-a.wikiadmin, a.wikiadmin:visited, input.wikiadmin {
+a.wikiadmin,
+a.wikiadmin:visited,
+input.wikiadmin {
background-color: #fdd;
}
/* Unknown links */
-.wikiunknown, .named-wikiunknown {
+.wikiunknown,
+.named-wikiunknown {
font-weight: normal;
font-size: 100%;
}
/* QuestionMark #600 */
-.wikiunknown a, .named-wikiunknown a {
+.wikiunknown a,
+.named-wikiunknown a {
color: #447;
background-color: #eee;
text-decoration: none;
@@ -192,16 +206,22 @@
text-decoration: none;
}
-.interwiki, i.interwiki .wikipage, em .interwiki .wikipage {
+.interwiki,
+i.interwiki .wikipage,
+em .interwiki .wikipage {
font-style: oblique;
}
-.interwiki .wikipage, i .interwiki, em .interwiki {
+.interwiki .wikipage,
+i .interwiki,
+em .interwiki {
font-style: normal;
}
/* image buttons */
-a.wikibutton, a.wikibutton:visited, input.wikibutton {
+a.wikibutton,
+a.wikibutton:visited,
+input.wikibutton {
background-color: white;
}
@@ -208,7 +228,12 @@
/**
* headings: Georgia
*/
-h1, h2, h3, h4, h5, h6 {
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
font-family: Arial, Helvetica, sans-serif;
}
@@ -220,7 +245,8 @@
/**
* Tables
*/
-table, td {
+table,
+td {
font-family: Arial, Helvetica, sans-serif;
}
@@ -251,7 +277,9 @@
}
th.gridbutton {
- background-color: ThreeDLightShadow;
+ /* background-color: ThreeDLightShadow;*/
+ background-color: #eaedf4;
+
color: black;
font-family: Tahoma, Arial, Helvetica, sans-serif;
font-size: small;
@@ -262,15 +290,20 @@
padding: 5px 0 5px 0;
border-width: 1px;
border-style: solid;
- border-color: ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;
+ /* border-color: ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;*/
}
-input.gridbutton, a.gridbutton, a:hover.gridbutton, a:visited.gridbutton {
+input.gridbutton,
+a.gridbutton,
+a:hover.gridbutton,
+a:visited.gridbutton {
text-decoration: none;
font-size: small;
font-weight: normal;
font-family: Tahoma, Arial, Helvetica, sans-serif;
- background-color: ThreeDLightShadow;
+ /* background-color: ThreeDLightShadow;*/
+ background-color: #eaedf4;
+
color: black;
}
@@ -277,11 +310,14 @@
/**
* Toolbar
*/
-.toolbar, input.button, #signin {
+.toolbar,
+input.button,
+#signin {
font-family: Arial, Helvetica, sans-serif;
}
-.toolbar, .edit-toolbar {
+.toolbar,
+.edit-toolbar {
padding: 0;
margin: 0;
}
@@ -290,14 +326,17 @@
cursor: pointer;
}
-.edit-toolbar img, .edit-toolbar input {
+.edit-toolbar img,
+.edit-toolbar input {
background-color: #fff;
border: 1px solid ButtonFace;
}
#navbuttons {
- padding-right: 4em; /* wrap around logo */
- padding-bottom: 1ex; /* space for h1 */
+ padding-right: 4em;
+ /* wrap around logo */
+ padding-bottom: 1ex;
+ /* space for h1 */
}
.editdate {
@@ -306,9 +345,17 @@
padding: 0;
padding-top: 0.25ex;
}
+/*
+#logo {
+/* uncomment this if you don't want to hide the h1
+display: flex;
+ align-items: center;
+}
+*/
#logo img {
float: right;
+ align: right;
/* "paper" borders */
border-top: 1px #e8e6df solid;
border-left: 1px #e8e6df solid;
@@ -316,6 +363,14 @@
border-right: 1px #b2b2b2 solid;
}
+#logo h1 {
+ margin-left: 1ex;
+
+ display: none;
+
+}
+
+
/**
* Edit Page & View Source
*/
@@ -369,7 +424,8 @@
margin-right: 0.25em;
}
-.transclusion, .wiki-edithelp {
+.transclusion,
+.wiki-edithelp {
font-size: smaller;
}
@@ -386,7 +442,8 @@
.wiki-edithelp {
background: white;
- border: medium solid #fff8dc; /* darker ivory */
+ border: medium solid #fff8dc;
+ /* darker ivory */
padding-left: 0.5em;
padding-right: 0.5em;
padding-top: 0.75ex;
@@ -428,7 +485,8 @@
font-size: larger;
}
-table.cal-header tr, table.cal-header td {
+table.cal-header tr,
+table.cal-header td {
text-align: center;
}
@@ -511,25 +569,30 @@
}
/* changed words */
-.diff del, .diff ins {
+.diff del,
+.diff ins {
font-weight: bold;
text-decoration: none;
}
/* blocks containing deleted or added words */
-.diff .original, .diff .deleted,
-.diff .final, .diff .added {
+.diff .original,
+.diff .deleted,
+.diff .final,
+.diff .added {
background: white;
}
/* blocks containing deleted words */
-.diff .original, .diff .deleted {
+.diff .original,
+.diff .deleted {
background: #fcc;
border: none;
}
/* blocks containing added words */
-.diff .final, .diff .added {
+.diff .final,
+.diff .added {
background: #cfc;
border: none;
}
@@ -551,7 +614,8 @@
font-weight: bold;
}
-.pageinfo-minoredit, .pageinfo-authorid {
+.pageinfo-minoredit,
+.pageinfo-authorid {
font-size: smaller;
font-style: oblique;
}
@@ -559,7 +623,8 @@
/**
* Other
*/
-.printer, .no-css {
+.printer,
+.no-css {
display: none;
}
@@ -571,7 +636,8 @@
font-size: smaller;
margin: 1ex 0;
padding: 0.5ex 0.5em;
- border: medium solid #fff8dc; /* darker ivory */
+ border: medium solid #fff8dc;
+ /* darker ivory */
}
/* Hints */
@@ -658,6 +724,28 @@
margin-left: -0.6em;
}
+/* Recent changes */
+.tdselected,
+.tdunselected {
+ text-align: center;
+ padding-left: 5px;
+ padding-right: 5px;
+ color: black;
+}
+
+.tdselected {
+ font-weight: bold;
+ background: #fffff0;
+
+}
+
+.tdunselected,
+.tdunselected a {
+ background-color: white;
+}
+
+
+
/*
* wikiblog
*/
@@ -666,12 +754,12 @@
padding: 0 0;
}
-div.wikiblog > div {
+div.wikiblog>div {
margin: 0 0;
padding: 0.5ex 0.5em;
}
-div.wikiblog > div.wikiblog-footer {
+div.wikiblog>div.wikiblog-footer {
/* background-color: #eee; */
padding: 0.2ex 0.5em;
}
@@ -970,7 +1058,8 @@
* The div inside the wikiadmin upload form does not
* have a class yet, so it must be referenced indirectly
*/
-div.wikiaction, form.wikiadmin div {
+div.wikiaction,
+form.wikiadmin div {
border-bottom: 1px solid #d8d8e7;
border-right: 1px solid #d8d8e7;
border-top: 1px solid #96a2ae;
@@ -983,7 +1072,9 @@
}
/* Add space between the input field and following buttons, but not after the last button. */
-div.wikiaction input[type=text], div.wikiadmin input[type=text], form.wikiadmin input[type=file] {
+div.wikiaction input[type=text],
+div.wikiadmin input[type=text],
+form.wikiadmin input[type=file] {
margin-right: 0.5em;
}
@@ -992,8 +1083,13 @@
*/
/* Make wikiaction links look like buttons */
-a.wikiaction, a.wikiadmin, a.wikiunsafe,
-input.wikiaction, input.wikiadmin, input.wikiunsafe, input.button {
+a.wikiaction,
+a.wikiadmin,
+a.wikiunsafe,
+input.wikiaction,
+input.wikiadmin,
+input.wikiunsafe,
+input.button {
color: black;
border: 1px outset;
padding: 0.05ex 0.25em 0.1ex 0.25em;
@@ -1003,12 +1099,15 @@
line-height: 2.6ex;
}
-div#navbuttons, div#signin, div#actionbuttons {
+div#navbuttons,
+div#signin,
+div#actionbuttons {
line-height: 3.0ex;
}
/* QuestionMark */
-.wikiunknown a, .named-wikiunknown a {
+.wikiunknown a,
+.named-wikiunknown a {
border-top: 1px solid #c6d2de;
border-left: 1px solid #c6d2de;
border-bottom: 1px solid #a2a2a2;
@@ -1036,11 +1135,14 @@
}
/* image buttons */
-a.wikibutton, a.wikibutton:visited, input.wikibutton {
+a.wikibutton,
+a.wikibutton:visited,
+input.wikibutton {
background-color: white;
border: 0;
}
+
/**
* Diff Output
*/
@@ -1050,12 +1152,15 @@
}
/* deleted & added words */
-.diff del, .diff ins {
+.diff del,
+.diff ins {
padding-left: 1px;
padding-right: 1px;
}
-#edit-public, h1.firstHeading-public, h1.firstHeading-rating-public {
+#edit-public,
+h1.firstHeading-public,
+h1.firstHeading-rating-public {
background-color: #ffce7b;
border: 1px solid #ffa500;
-}
+}
\ No newline at end of file
Modified: trunk/themes/default/templates/head.tmpl
===================================================================
--- trunk/themes/default/templates/head.tmpl 2025-02-14 04:15:28 UTC (rev 11095)
+++ trunk/themes/default/templates/head.tmpl 2025-02-14 04:32:37 UTC (rev 11096)
@@ -27,7 +27,7 @@
$args = $request->getArgs();
$action = empty($args['action']) ? 'browse' : $args['action'];
if (!($action == "viewsource")) {
- $alternatelinkTitle = fmt("%s: %s", _("View Source"), $page->getName());
+ $alternatelinkTitle = fmt(_("%s: %s"), _("View Source"), $page->getName());
$alternatelinkUrl = WikiURL($revision, array('action' => 'viewsource'));
}
if (!($action == "browse")) {
Modified: trunk/themes/default/templates/navbar.tmpl
===================================================================
--- trunk/themes/default/templates/navbar.tmpl 2025-02-14 04:15:28 UTC (rev 11095)
+++ trunk/themes/default/templates/navbar.tmpl 2025-02-14 04:32:37 UTC (rev 11096)
@@ -13,7 +13,8 @@
<?php } ?>
<?php echo WikiLink(__("RecentChanges"), "button") ?>
<?php echo $SEP?><?php echo Template('search',
- array('SEARCH_BEFORE' => HTML::button(_("FindPage"))))
+ array('SEARCH_BEFORE' => WikiLink(__("FindPage"), "button")
+))
?>
<?php if (!empty($revision)) { ?>
<?php echo $SEP?><?php echo $WikiTheme->makeLinkButton($revision, _("LikePages"), __("LikePages")) ?>
Modified: trunk/themes/default/templates/savepage.tmpl
===================================================================
--- trunk/themes/default/templates/savepage.tmpl 2025-02-14 04:15:28 UTC (rev 11095)
+++ trunk/themes/default/templates/savepage.tmpl 2025-02-14 04:32:37 UTC (rev 11096)
@@ -4,6 +4,8 @@
<?php if (!empty($LOCK_CHANGED_MSG)) { ?>
<p class="feedback"><?php echo $LOCK_CHANGED_MSG?></p>
+<?php } else { ?>
+<?php echo Template('signature') ?>
<?php } ?>
<?php echo Template('browse') ?>
Modified: trunk/themes/default/templates/search.tmpl
===================================================================
--- trunk/themes/default/templates/search.tmpl 2025-02-14 04:15:28 UTC (rev 11095)
+++ trunk/themes/default/templates/search.tmpl 2025-02-14 04:32:37 UTC (rev 11096)
@@ -1,4 +1,4 @@
-<div role="search" id="searchholder">
+<span role="search" id="searchholder">
<form id="searchform" action="<?php echo WikiURL(_("TitleSearch"))?>"
method="get" accept-charset="UTF-8" style="display:inline" class="searchform">
<?php
@@ -7,6 +7,7 @@
<input type="hidden" name="pagename" value="<?php echo _("TitleSearch")?>" />
<?php } ?>
<input type="hidden" name="auto_redirect" value="1" />
+<input type="hidden" name="regex" value="pcre" />
<?php echo empty($SEARCH_BEFORE) ? '' : $SEARCH_BEFORE ?>
<input name="s" size="16" maxlength="256"
value="<?php echo $s?>"
@@ -17,4 +18,4 @@
title="<?php echo _("TitleSearch") ?>" />
<?php echo empty($SEARCH_AFTER) ? '' : $SEARCH_AFTER ?>
</form>
-</div>
+</span>
Added: trunk/themes/default/templates/signature.tmpl
===================================================================
--- trunk/themes/default/templates/signature.tmpl (rev 0)
+++ trunk/themes/default/templates/signature.tmpl 2025-02-14 04:32:37 UTC (rev 11096)
@@ -0,0 +1,9 @@
+<div id="wiki-signature"><p><?php
+ echo sprintf(_("Thank you for editing %s. Your attention to detail is appreciated."),
+ $page->getName());?>
+</p>
+<img src="<?php
+ echo $WikiTheme->getImageURL('signature');?>" alt="<?php
+ echo sprintf(_('Official signature of %s, your PhpWiki Admin'),
+ ADMIN_USER);?>" />
+</div>
Modified: trunk/themes/default/templates/signin.tmpl
===================================================================
--- trunk/themes/default/templates/signin.tmpl 2025-02-14 04:15:28 UTC (rev 11095)
+++ trunk/themes/default/templates/signin.tmpl 2025-02-14 04:32:37 UTC (rev 11096)
@@ -36,7 +36,7 @@
$SignInInput->addTooltip(_("Enter your UserId to sign in"));
$userid = $user->getId();
if ($user->isSignedIn()) {
- echo sprintf(_("You are signed but not authenticated as %s. "),
+ echo sprintf(_("You are signed in but not authenticated as %s. "),
asXML(HTML::a(array(
'href'=>'#',
'title' => sprintf(_("Click to authenticate as %s"),$userid),
Modified: trunk/themes/default/templates/top.tmpl
===================================================================
--- trunk/themes/default/templates/top.tmpl 2025-02-14 04:15:28 UTC (rev 11095)
+++ trunk/themes/default/templates/top.tmpl 2025-02-14 04:32:37 UTC (rev 11096)
@@ -6,11 +6,11 @@
<div id="logo"><a class="wikilink"
href="<?php echo WikiURL(HOME_PAGE)?>"
><img src="<?php echo $WikiTheme->getImageURL('logo')?>" id="logo-img"
- alt="<?php echo fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" /></a></div>
+ alt="<?php echo fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" /></a><h1><?php echo WIKI_NAME ?></h1></div>
<?php // The top navigation/search bar ?>
<div class="toolbar">
- <?php echo Template('navbar') ?>
- </div>
+ <?php echo Template('navbar') ?>
+</div>
<?php } ?>
<?php // Page title ?>
Modified: trunk/themes/fusionforge/interwiki.map
===================================================================
--- trunk/themes/fusionforge/interwiki.map 2025-02-14 04:15:28 UTC (rev 11095)
+++ trunk/themes/fusionforge/interwiki.map 2025-02-14 04:32:37 UTC (rev 11096)
@@ -13,7 +13,7 @@
JargonFile http://sunir.org/apps/meta.pl?wiki=JargonFile&redirect=
JiniWiki http://www.cdegroot.com/cgi-bin/jini?
JspWiki http://www.ecyrd.com/JSPWiki/Wiki.jsp?page=
-MeatBall http://www.usemod.com/cgi-bin/mb.pl?
+MeatBall http://www.usemod.org/cgi-bin/mb.pl?
MetaWiki http://sunir.org/apps/meta.pl?
MetaWikiPedia http://meta.wikipedia.com/wiki/
MoinMoin http://moinmoin.wikiwikiweb.de/
@@ -23,7 +23,7 @@
PhpWikiSvn https://sourceforge.net/p/phpwiki/code/HEAD/tree/trunk/
SourceForge http://sourceforge.net/
TWiki http://twiki.org/cgi-bin/view/
-UseMod http://www.usemod.com/cgi-bin/wiki.pl?
+UseMod http://www.usemod.org/cgi-bin/wiki.pl?
Wiktionary http://wiktionary.org/wiki/
Wiki http://c2.com/cgi/wiki?
WikiLens http://www.wikilens.org/wiki.php/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.