Update of /cvsroot/phpwiki/phpwiki/templates
In directory usw-pr-cvs1:/tmp/cvs-serv22720
Modified Files:
browse.html editpage.html message.html
Log Message:
Some template sections have been simplified with tokens. Template.php recognises new tokens and calls the necessary functions in Toolbar.php.
Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/browse.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** browse.html 2002/01/03 00:09:18 1.37
--- browse.html 2002/01/03 19:12:41 1.38
***************
*** 22,46 ****
</head>
<body>
! <div><a class="wikilink"
! href="${BROWSE}$_("HomePage")"
! ><img src="${LOGO}"
! border="0" alt="${WIKI_NAME}: $_("HomePage")"
! align="right" /></a></div>
<h1><?plugin-link BackLinks page="[pagename]" class="backlinks" linktext="${SPLIT_PAGE}" ?></h1>
<div class="br"><br clear="all" class="ignore" /></div>
! <?php if (! $IS_CURRENT) { ?>
! <p><strong>$_("Note:")</strong> $_("You are viewing an old revision of this page.")
! <a href="${BROWSE}${PAGEURL}">$_("View the current version")</a>.</p>
! <hr class="ignore" noshade="noshade" />
! <?php } ?>
<div class="wikitext">${CONTENT}</div>
<hr class="ignore" noshade="noshade" />
!
! <?php if ($IS_CURRENT) { ?>
! <?php printf(_("Last edited on %s."),"${LASTMODIFIED}"); ?>
! <?php } else { ?>
! <?php printf(_("Version %s, saved on %s."),"${VERSION}","${LASTMODIFIED}"); ?>
! <?php } ?>
! <form action='<?php echo WikiURL(_("TitleSearch")); ?>' method="get" accept-charset="${CHARSET}">
<hr color="black" class="toolbar" />
<!-- I would like not to have to use these tables, and managed to
--- 22,32 ----
</head>
<body>
! <div>${LOGO}</div>
<h1><?plugin-link BackLinks page="[pagename]" class="backlinks" linktext="${SPLIT_PAGE}" ?></h1>
<div class="br"><br clear="all" class="ignore" /></div>
! ${NOT_VIEWING_CURRENT}
<div class="wikitext">${CONTENT}</div>
<hr class="ignore" noshade="noshade" />
! ${LASTMODIFIED}
<hr color="black" class="toolbar" />
<!-- I would like not to have to use these tables, and managed to
***************
*** 78,105 ****
<?php } ?>
</td>
! <td align="right">
! <?php echo LinkExistingWikiWord(_("RecentChanges")) ?>
! | <?php echo LinkExistingWikiWord(_("FindPage")) ?>
! | <span><input type="hidden" name="auto_redirect" value="1" />
! <input type="text" name="s" size="12"
! title=_("Quick Search")
! onmouseover="window.status='$_("Quick Search")'; return true;"
! onmouseout="window.status=''; return true;" /></span>
! | <?plugin-link LikePages page="[pagename]" ?>
! </td>
</tr></table>
<table summary="Toolbar 2: Sign in." class="toolbar" width="100%"
cellpadding="0" cellspacing="0" border="0"><tr valign="baseline">
! <td>
! <?php if ($user->is_authenticated()) { ?>
! <?php printf(_("You are signed in as %s"), LinkWikiWord($USERID)); ?>
! | <a class="wikiaction" href="${ACTION}logout">$_("SignOut")</a>
! <?php } else { ?>
! <a class="wikiaction" href="${ACTION}login">$_("SignIn")</a>
! <?php } ?>
! </td>
!
! <td align="right">
! </td>
</tr></table>
--- 64,73 ----
<?php } ?>
</td>
! <td align="right">${SEARCH}</td>
</tr></table>
<table summary="Toolbar 2: Sign in." class="toolbar" width="100%"
cellpadding="0" cellspacing="0" border="0"><tr valign="baseline">
! <td>${SIGNIN}</td>
! <td align="right"></td>
</tr></table>
Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/editpage.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** editpage.html 2002/01/03 00:09:18 1.36
--- editpage.html 2002/01/03 19:12:41 1.37
***************
*** 15,23 ****
</head>
<body>
! <div><a class="wikilink"
! href="${BROWSE}$_("HomePage")"
! ><img src="${LOGO}"
! border="0" alt="${WIKI_NAME}: $_("HomePage")"
! align="right" /></a></div>
<!--This hack allows the h1 to be localised. FIXME: move out of html template into php-->
<h1><?php printf(_("Edit: %s"),"<a class=\"backlinks\" href=\"${BROWSE}"._("BackLinks")."?page=${PAGE}\">${PAGE}</a>"); ?></h1>
--- 15,19 ----
</head>
<body>
! <div>${LOGO}</div>
<!--This hack allows the h1 to be localised. FIXME: move out of html template into php-->
<h1><?php printf(_("Edit: %s"),"<a class=\"backlinks\" href=\"${BROWSE}"._("BackLinks")."?page=${PAGE}\">${PAGE}</a>"); ?></h1>
Index: message.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/message.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** message.html 2002/01/03 00:09:18 1.20
--- message.html 2002/01/03 19:12:41 1.21
***************
*** 15,23 ****
</head>
<body>
! <div><a class="wikilink"
! href="${BROWSE}$_("HomePage")"
! ><img src="${LOGO}"
! border="0" alt="${WIKI_NAME}: $_("HomePage")"
! align="right" /></a></div>
<h1>${TITLE}</h1>
${CONTENT}
--- 15,19 ----
</head>
<body>
! <div>${LOGO}</div>
<h1>${TITLE}</h1>
${CONTENT}
|
