Revision: 10781
http://sourceforge.net/p/phpwiki/code/10781
Author: vargenau
Date: 2021-12-15 09:54:31 +0000 (Wed, 15 Dec 2021)
Log Message:
-----------
Merge ./themes/wikilens/templates/head.tmpl with ./themes/default/templates/head.tmpl
Modified Paths:
--------------
trunk/themes/wikilens/templates/head.tmpl
Modified: trunk/themes/wikilens/templates/head.tmpl
===================================================================
--- trunk/themes/wikilens/templates/head.tmpl 2021-12-15 09:53:44 UTC (rev 10780)
+++ trunk/themes/wikilens/templates/head.tmpl 2021-12-15 09:54:31 UTC (rev 10781)
@@ -14,12 +14,10 @@
<link rel="stylesheet" type="text/css" href="<?php echo DATA_PATH ?>/themes/default/highlight.js/styles/github.css"/>
<?php /* The next few lines are wrapped in an odd manner to allow gettext string extraction: cd locale;make */ ?>
<link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
-<link rel="help" title="<?php echo _("Help")."/"._("HowToUseWiki")?>" href="<?php echo WikiURL(
-_("Help")."/"._("HowToUseWiki"))?>" />
+<link rel="help" title="<?php echo _("Help")."/"._("HowToUseWiki")?>" href="<?php echo WikiURL(_("Help")."/"._("HowToUseWiki"))?>" />
<link rel="license" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
<link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" />
-<link rel="search" title="<?php echo _("FindPage")?>" href="<?php echo WikiURL(
-_("FindPage"))?>" />
+<link rel="search" title="<?php echo _("FindPage")?>" href="<?php echo WikiURL(_("FindPage"))?>" />
<?php /**
* Provide alternate variations of the page content:
* 'viewsource' and 'browse'.
@@ -26,8 +24,8 @@
* Translated pages could go here too.
*/
if (!empty($revision)) {
- $args = $request->getargs();
- $action = $args['action'];
+ $args = $request->getArgs();
+ $action = empty($args['action']) ? 'browse' : $args['action'];
if (!($action == "viewsource")) {
$alternatelinkTitle = fmt("%s: %s", _("View Source"), $page->getName());
$alternatelinkUrl = WikiURL($revision, array('action' => 'viewsource'));
@@ -45,7 +43,7 @@
*/
?>
<link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo WikiURL(_("RecentChanges"), array('format' => 'rss'))?>" />
-
+<link rel="alternate" type="application/atom+xml" title="ATOM" href="<?php echo WikiURL(_("RecentChanges"), array('format' => 'atom'))?>" />
<?php /**
* Add some user-specific links.
*/ ?>
@@ -53,10 +51,9 @@
/* For users not signed in */ ?>
<?php } ?>
<link rel="alternate" type="application/x-wiki" title="Edit this page!" href="<?php echo WikiURL($page,array('action'=>'edit')) ?>" />
-<?php if ($user->isadmin()) {
+<?php if ($user->isAdmin()) {
/* Only for the Administrator */ ?>
<?php } ?>
-
<?php if ($user->isSignedIn()) {
/* For signed-in users */ ?>
<?php /* User's calendar page
@@ -73,7 +70,6 @@
?>
<?php } ?>
<?php } //end of links for signed-in user ?>
-
<?php echo $WikiTheme->getCSS() ?>
<?php
// avoid redundant bookmark title for custom home page
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
