From: <var...@us...> - 2009-10-06 16:13:07
|
Revision: 7191 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7191&view=rev Author: vargenau Date: 2009-10-06 16:13:00 +0000 (Tue, 06 Oct 2009) Log Message: ----------- Harmonize headers Modified Paths: -------------- trunk/themes/gforge/templates/body.tmpl trunk/themes/gforge/templates/browse-footer.tmpl trunk/themes/gforge/templates/browse.tmpl trunk/themes/gforge/templates/editpage.tmpl trunk/themes/gforge/templates/head.tmpl trunk/themes/gforge/templates/html.tmpl trunk/themes/gforge/templates/info.tmpl trunk/themes/gforge/templates/navbar.tmpl trunk/themes/gforge/templates/pagelink.tmpl trunk/themes/gforge/templates/userprefs.tmpl Modified: trunk/themes/gforge/templates/body.tmpl =================================================================== --- trunk/themes/gforge/templates/body.tmpl 2009-10-06 14:13:48 UTC (rev 7190) +++ trunk/themes/gforge/templates/body.tmpl 2009-10-06 16:13:00 UTC (rev 7191) @@ -1,3 +1,6 @@ +<?php // -*-php-*- +rcs_id('$Id$'); +?> <table width="100%" cellpadding="0" cellspacing="0"> <tr> <td valign="top"> Modified: trunk/themes/gforge/templates/browse-footer.tmpl =================================================================== --- trunk/themes/gforge/templates/browse-footer.tmpl 2009-10-06 14:13:48 UTC (rev 7190) +++ trunk/themes/gforge/templates/browse-footer.tmpl 2009-10-06 16:13:00 UTC (rev 7191) @@ -1,4 +1,4 @@ -<?php // -*-html-*- - rcs_id('$Id$'); +<?php // -*-php-*- +rcs_id('$Id$'); ?> <p class="editdate"><?= $WikiTheme->getOwnerMessage($page) ?> <?= $WikiTheme->getLastModifiedMessage($revision) ?> <?= $WikiTheme->getAuthorMessage($revision) ?></p> Modified: trunk/themes/gforge/templates/browse.tmpl =================================================================== --- trunk/themes/gforge/templates/browse.tmpl 2009-10-06 14:13:48 UTC (rev 7190) +++ trunk/themes/gforge/templates/browse.tmpl 2009-10-06 16:13:00 UTC (rev 7191) @@ -1,4 +1,4 @@ -<?php // -*-html-*- +<?php // -*-php-*- rcs_id('$Id$'); ?> <?php Modified: trunk/themes/gforge/templates/editpage.tmpl =================================================================== --- trunk/themes/gforge/templates/editpage.tmpl 2009-10-06 14:13:48 UTC (rev 7190) +++ trunk/themes/gforge/templates/editpage.tmpl 2009-10-06 16:13:00 UTC (rev 7191) @@ -1,5 +1,6 @@ -<!-- -*-html-*- --> -<!-- $Id$ --> +<?php // -*-php-*- +rcs_id('$Id$'); +?> <?php if (isset($PREVIEW_CONTENT)) { ?> <p><strong><?=_("Preview only! Changes not saved.")?></strong> <!-- FIXME: it would be nice to put a link to the #editarea anchor below, Modified: trunk/themes/gforge/templates/head.tmpl =================================================================== --- trunk/themes/gforge/templates/head.tmpl 2009-10-06 14:13:48 UTC (rev 7190) +++ trunk/themes/gforge/templates/head.tmpl 2009-10-06 16:13:00 UTC (rev 7191) @@ -1,5 +1,5 @@ -<?php // -*-html-*- - rcs_id('$Id$'); +<?php // -*-php-*- +rcs_id('$Id$'); ?> <head> <?php if (ENABLE_XHTML_XML and strstr($request->get('HTTP_ACCEPT'),'application/xhtml+xml')) { ?> Modified: trunk/themes/gforge/templates/html.tmpl =================================================================== --- trunk/themes/gforge/templates/html.tmpl 2009-10-06 14:13:48 UTC (rev 7190) +++ trunk/themes/gforge/templates/html.tmpl 2009-10-06 16:13:00 UTC (rev 7191) @@ -1,8 +1,9 @@ -<?php // -*-html-*- +<?php // -*-php-*- rcs_id('$Id$'); +?> +<?php /* * No header for Gforge (already provided) - * */ ?> <?php $WikiTheme->header() ?> @@ -15,4 +16,4 @@ echo $RCS_IDS; echo "-->\n"; } -?> \ No newline at end of file +?> Modified: trunk/themes/gforge/templates/info.tmpl =================================================================== --- trunk/themes/gforge/templates/info.tmpl 2009-10-06 14:13:48 UTC (rev 7190) +++ trunk/themes/gforge/templates/info.tmpl 2009-10-06 16:13:00 UTC (rev 7191) @@ -1,4 +1,6 @@ -<?php // -*-php-*- ?> +<?php // -*-php-*- +rcs_id('$Id$'); +?> <?= Template("default/info") ?> <div align="center"> Modified: trunk/themes/gforge/templates/navbar.tmpl =================================================================== --- trunk/themes/gforge/templates/navbar.tmpl 2009-10-06 14:13:48 UTC (rev 7190) +++ trunk/themes/gforge/templates/navbar.tmpl 2009-10-06 16:13:00 UTC (rev 7191) @@ -1,7 +1,6 @@ -<?php // -*-html-*- ?> -<!-- $Id$ --> -<!-- The top navigation/search bar --> - +<?php // -*-php-*- +rcs_id('$Id$'); +?> <?php $curuserprefs = $user->getPreferences(); ?> Modified: trunk/themes/gforge/templates/pagelink.tmpl =================================================================== --- trunk/themes/gforge/templates/pagelink.tmpl 2009-10-06 14:13:48 UTC (rev 7190) +++ trunk/themes/gforge/templates/pagelink.tmpl 2009-10-06 16:13:00 UTC (rev 7191) @@ -1,3 +1,6 @@ +<?php // -*-php-*- +rcs_id('$Id$'); +?> <?php /** * Themable paging "|<< << - i/sum - >> >>|" links @@ -2,3 +5,2 @@ * - * $Id$ --> * Variables: PREV, NEXT, PREV_LINK, NEXT_LINK, Modified: trunk/themes/gforge/templates/userprefs.tmpl =================================================================== --- trunk/themes/gforge/templates/userprefs.tmpl 2009-10-06 14:13:48 UTC (rev 7190) +++ trunk/themes/gforge/templates/userprefs.tmpl 2009-10-06 16:13:00 UTC (rev 7191) @@ -1,5 +1,6 @@ -<?php // -*-html-*- ?> -<!-- $Id$ --> +<?php // -*-php-*- +rcs_id('$Id$'); +?> <?php // Todo: Move the logic and code to the plugin // This is very experimental and the read-only part an ugly hack so far. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-10-06 16:40:00
|
Revision: 7192 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7192&view=rev Author: vargenau Date: 2009-10-06 16:39:50 +0000 (Tue, 06 Oct 2009) Log Message: ----------- Templates login.tmpl and head.tmpl not used in Gforge Removed Paths: ------------- trunk/themes/gforge/templates/head.tmpl trunk/themes/gforge/templates/login.tmpl Deleted: trunk/themes/gforge/templates/head.tmpl =================================================================== --- trunk/themes/gforge/templates/head.tmpl 2009-10-06 16:13:00 UTC (rev 7191) +++ trunk/themes/gforge/templates/head.tmpl 2009-10-06 16:39:50 UTC (rev 7192) @@ -1,119 +0,0 @@ -<?php // -*-php-*- -rcs_id('$Id$'); -?> -<head> -<?php if (ENABLE_XHTML_XML and strstr($request->get('HTTP_ACCEPT'),'application/xhtml+xml')) { ?> -<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=<?=$charset?>" /> -<?php } else { ?> -<meta http-equiv="Content-Type" content="text/html; charset=<?=$charset?>" /> -<?php } ?> -<meta http-equiv="content-language" content="<?=$GLOBALS['LANG']?>" /> -<meta http-equiv="Content-Style-Type" content="text/css" /> -<?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?> -<meta name="robots" content="<?= $ROBOTS_CONTENT ?>" /> -<?php if (!empty($PAGE_DESCRIPTION)) { ?> -<meta name="description" content="<?=$PAGE_DESCRIPTION?>" /> -<?php } ?> -<?php if (!empty($PAGE_KEYWORDS)) { ?> -<meta name="keywords" content="<?=$PAGE_KEYWORDS?>" /> -<?php } ?> -<meta name="language" content="<?=$GLOBALS['LANG']?>" /> -<meta name="document-type" content="Public" /> -<meta name="document-rating" content="General" /> -<meta name="generator" content="PhpWiki" /> -<meta name="PHPWIKI_VERSION" content="<?=PHPWIKI_VERSION?>" /> -<base href="<?=PHPWIKI_BASE_URL?>" /> -<link rel="shortcut icon" href="<?=$WikiTheme->getImageURL('favicon.ico')?>" /> -<?php /** - * Additional navigation links are provided here in the html header for browsers - * which support them: Mozilla, iCab, Amaya (and certain versions of Opera??). - * - * See http://www.w3.org/TR/html401/struct/links.html#edef-LINK - * http://www.euronet.nl/~tekelenb/WWW/LINK/index.html - */ ?> -<?php /* The next few lines are wrapped in an odd manner to allow gettext string extraction: cd locale;make */ ?> -<link rel="home" title="<?=HOME_PAGE?>" href="<?=WikiURL(HOME_PAGE)?>" /> -<link rel="help" title="<?= -_("HowToUseWiki")?>" href="<?=WikiURL( -_("HowToUseWiki"))?>" /> -<link rel="copyright" title="<?=COPYRIGHTPAGE_TITLE?>" href="<?=COPYRIGHTPAGE_URL?>" /> -<link rel="author" title="<?=AUTHORPAGE_TITLE?>" href="<?=AUTHORPAGE_URL?>" /> -<link rel="search" title="<?= -_("FindPage")?>" href="<?=WikiURL( -_("FindPage"))?>" /> -<?php /** - * Provide alternate variations of the page content: - * 'viewsource' and 'browse'. - * Translated pages could go here too. - */ - if (!empty($revision)) { - $args = $request->getargs(); - $action = $args['action']; - if (!($action == "viewsource")) { - $alternatelinkTitle = fmt("%s: %s", _("View Source"), $page->getName()); - $alternatelinkUrl = WikiURL($revision, array('action' => 'viewsource')); - } - if (!($action == "browse")) { - $alternatelinkTitle = $page->getName(); - $alternatelinkUrl = WikiURL($revision, array('action' => 'browse')); - } ?> -<link rel="alternate" title="<?= $alternatelinkTitle ?>" href="<?= $alternatelinkUrl ?>" /> -<?php } - /** - * Link tag for RSS auto-discovery. See - * http://diveintomark.org/archives/2002/05/30.html#rss_autodiscovery - * http://www.oreillynet.com/cs/weblog/view/wlg/1475 - */ -?> -<link rel="alternate" type="application/rss+xml" title="RSS" href="<?=WikiURL( -_("RecentChanges"), array('format' => 'rss'))?>" /> -<?php /** - * Add some user-specific links. - */ ?> -<?php if (!$user->isSignedIn()) { - /* For users not signed in */ ?> -<link rel="bookmark" title="<?= -_("SandBox")?>" href="<?=WikiURL( -_("SandBox"))?>" /> -<link rel="bookmark" title="<?= -_("WikiWikiWeb")?>" href="<?=WikiURL( -_("WikiWikiWeb"))?>" /> -<?php } ?> - -<?php if ($user->isAdmin()) { - /* Only for the Administrator */ ?> -<link rel="bookmark" title="<?= -_("PhpWikiAdministration")?>" href="<?=WikiURL( -_("PhpWikiAdministration"))?>" /> -<?php } ?> -<?php if ($user->isSignedIn()) { - /* For signed-in users */ ?> -<link rel="bookmark" title="<?= -_("UserPreferences")?>" href="<?=WikiURL( -_("UserPreferences"))?>" /> -<?php /* User's calendar page - */ - $UserCalPageTitle = $user->getId() . SUBPAGE_SEPARATOR ._("Calendar"); - $UserCalPageUrl = WikiURL($UserCalPageTitle); - ?> -<link rel="bookmark" title="<?= $UserCalPageTitle ?>" href="<?= $UserCalPageUrl ?>" /> -<?php /* Today's calendar page for the user if it exists - */ - $UserCalPageTodayTitle = $UserCalPageTitle . SUBPAGE_SEPARATOR . strftime("%Y-%m-%d", time()); //FIXME - $dbi = $request->getDbh(); - if ($dbi->isWikiPage($UserCalPageTodayTitle)) { - $UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle); - ?> -<link rel="bookmark" title="<?= $UserCalPageTodayTitle ?>" href="<?= $UserCalPageTodayUrl ?>" /> -<?php } ?> -<?php } //end of links for signed-in user ?> -<?= $WikiTheme->getCSS() ?><?php - // avoid redundant bookmark title for custom home page - if ($page->getName() == WIKI_NAME && HOME_PAGE == WIKI_NAME) - $pagetitle = ""; - else - $pagetitle = " - ". AsString($TITLE); -?> -<title><?= WIKI_NAME.$pagetitle ?></title> -<?= $WikiTheme->getMoreHeaders() ?> -</head> Deleted: trunk/themes/gforge/templates/login.tmpl =================================================================== --- trunk/themes/gforge/templates/login.tmpl 2009-10-06 16:13:00 UTC (rev 7191) +++ trunk/themes/gforge/templates/login.tmpl 2009-10-06 16:39:50 UTC (rev 7192) @@ -1,7 +0,0 @@ -<?php // -*-php-*- ?> -<!-- $Id$ --> -<?php if ($fail_message) { ?> - <div class="error"> - <p><?=$fail_message?></p> - </div> -<?php } ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-10-06 17:12:29
|
Revision: 7193 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7193&view=rev Author: vargenau Date: 2009-10-06 17:12:20 +0000 (Tue, 06 Oct 2009) Log Message: ----------- Gforge-specific bottom.tmpl and debug.tmpl Added Paths: ----------- trunk/themes/gforge/templates/bottom.tmpl trunk/themes/gforge/templates/debug.tmpl Added: trunk/themes/gforge/templates/bottom.tmpl =================================================================== --- trunk/themes/gforge/templates/bottom.tmpl (rev 0) +++ trunk/themes/gforge/templates/bottom.tmpl 2009-10-06 17:12:20 UTC (rev 7193) @@ -0,0 +1,10 @@ +<?php // -*-php-*- +rcs_id('$Id$'); +?> +<?php if (!$WikiTheme->DUMP_MODE) { ?> +<?php if (defined('DEBUG') and DEBUG) { ?> +<?= empty($WARNINGS) ? '' : $WARNINGS ?> +<?= $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?> +<?= Template('debug') ?> +<?php } ?> +<?php } ?> Property changes on: trunk/themes/gforge/templates/bottom.tmpl ___________________________________________________________________ Added: svn:keywords + Id Added: trunk/themes/gforge/templates/debug.tmpl =================================================================== --- trunk/themes/gforge/templates/debug.tmpl (rev 0) +++ trunk/themes/gforge/templates/debug.tmpl 2009-10-06 17:12:20 UTC (rev 7193) @@ -0,0 +1,13 @@ +<?php // -*-php-*- +rcs_id('$Id$'); +?> +<?php global $RUNTIMER; ?> +<table width="100%" border="0" cellpadding="0" cellspacing="0"> +<tr><td> +<span class="debug"><?= fmt("Page Execution took %s seconds", $RUNTIMER->getStats()) ?> +<?php $mem = @getMemoryUsage(); if ($mem) { ?> + <?= fmt(", Memory: %s", $mem) ?> +<?php } ?> +</span> +</td></tr></table> +<br clear="all" class="clear-floats" /> Property changes on: trunk/themes/gforge/templates/debug.tmpl ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-10-06 17:34:25
|
Revision: 7195 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7195&view=rev Author: vargenau Date: 2009-10-06 17:34:17 +0000 (Tue, 06 Oct 2009) Log Message: ----------- Remove HTML comments Modified Paths: -------------- trunk/themes/gforge/templates/editpage.tmpl trunk/themes/gforge/templates/info.tmpl Modified: trunk/themes/gforge/templates/editpage.tmpl =================================================================== --- trunk/themes/gforge/templates/editpage.tmpl 2009-10-06 17:19:52 UTC (rev 7194) +++ trunk/themes/gforge/templates/editpage.tmpl 2009-10-06 17:34:17 UTC (rev 7195) @@ -3,9 +3,6 @@ ?> <?php if (isset($PREVIEW_CONTENT)) { ?> <p><strong><?=_("Preview only! Changes not saved.")?></strong> -<!-- FIXME: it would be nice to put a link to the #editarea anchor below, - but it does not work currently with the <base> declared in top.tmpl. - I think we need to do away with using <base> altogether... --> <?= fmt("Please continue editing. (You'll find your %s at the bottom of the page.)", /* HTML::a(array("href" => "#editarea"), */ _("edit area") /*) */) ?> </p> Modified: trunk/themes/gforge/templates/info.tmpl =================================================================== --- trunk/themes/gforge/templates/info.tmpl 2009-10-06 17:19:52 UTC (rev 7194) +++ trunk/themes/gforge/templates/info.tmpl 2009-10-06 17:34:17 UTC (rev 7195) @@ -12,7 +12,6 @@ <?=$SEP?><?= Button(array('action'=>'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?> <?=$SEP?><?= Button("PageDump", _("PageDump")) ?> <?php if ((defined('DEBUG') && DEBUG) || $user->isAdmin()) { ?> - <!-- Buttons really only for debugging --> <?=$SEP?><?= Button("DebugInfo", _("DebugInfo")) ?> <?php $PurgeCache = Button(array('nocache' => 'purge'), @@ -21,6 +20,5 @@ ?> <?=$SEP?><?= $PurgeCache ?> </p> - <!-- End debugging buttons --> <?php } ?> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-04-27 14:25:53
|
Revision: 7358 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7358&view=rev Author: vargenau Date: 2010-04-27 14:25:47 +0000 (Tue, 27 Apr 2010) Log Message: ----------- Remove HTML comment Modified Paths: -------------- trunk/themes/gforge/templates/html.tmpl trunk/themes/gforge/templates/ratings.tmpl Modified: trunk/themes/gforge/templates/html.tmpl =================================================================== --- trunk/themes/gforge/templates/html.tmpl 2010-04-27 09:00:17 UTC (rev 7357) +++ trunk/themes/gforge/templates/html.tmpl 2010-04-27 14:25:47 UTC (rev 7358) @@ -10,10 +10,3 @@ <?= $WikiTheme->getMoreHeaders() ?> <?= Template('body') ?> <?php $WikiTheme->footer() ?> -<?php -if (defined('DEBUG') and DEBUG) { - echo "<!-- phpwiki source: \n"; - echo $RCS_IDS; - echo "-->\n"; -} -?> Modified: trunk/themes/gforge/templates/ratings.tmpl =================================================================== --- trunk/themes/gforge/templates/ratings.tmpl 2010-04-27 09:00:17 UTC (rev 7357) +++ trunk/themes/gforge/templates/ratings.tmpl 2010-04-27 14:25:47 UTC (rev 7358) @@ -1,7 +1,6 @@ <?php // -*-php-*- rcs_id('$Id: ratings.tmpl 6899 2009-06-05 07:16:56Z rurban $'); ?> -<!-- Ratings --> <?php if (!$WikiTheme->DUMP_MODE) { $loader = new WikiPluginLoader(); printXML($loader->expandPI("<"."?plugin RateIt show=top imgPrefix=BStar ?".">", $request, $dbi->_markup)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |