Menu
▾
▴
phpwiki-checkins
|
From: <var...@us...> - 2010-09-22 14:39:30
|
Revision: 7706
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7706&view=rev
Author: vargenau
Date: 2010-09-22 14:39:24 +0000 (Wed, 22 Sep 2010)
Log Message:
-----------
Better handle nonexistent revisions
Modified Paths:
--------------
trunk/themes/fusionforge/templates/actionbar.tmpl
trunk/themes/fusionforge/templates/browse.tmpl
Modified: trunk/themes/fusionforge/templates/actionbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/actionbar.tmpl 2010-09-21 07:45:12 UTC (rev 7705)
+++ trunk/themes/fusionforge/templates/actionbar.tmpl 2010-09-22 14:39:24 UTC (rev 7706)
@@ -50,8 +50,16 @@
<td class="spacer"> </td>
<td class="spacer"> </td>
- <?php if (!($page->get('locked')) and (mayAccessPage('edit', $page->getName())) and $revision) { ?>
- <td class="bold"><?php echo Button("edit", $dbh->isWikiPage($page->getName()) ? ($revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) : _("Create Page")) ?></td>
+ <?php if (!($page->get('locked')) and (mayAccessPage('edit', $page->getName()))) { ?>
+ <td class="bold">
+ <?php if (! $dbh->isWikiPage($page->getName())) { ?>
+ <?php echo Button("edit", _("Create Page")) ?>
+ <?php } else if ($revision && (($revision->isCurrent()) || ($revision->hasDefaultContents()))) { ?>
+ <?php echo Button("edit", _("Edit")) ?>
+ <?php } else { ?>
+ <?php echo Button("edit", _("Edit Old Revision")) ?>
+ <?php } ?>
+ </td>
<?php } else if ($dbh->isWikiPage($page->getName())) { ?>
<td><?php echo Button("viewsource", _("View Source")) ?></td>
<?php } ?>
Modified: trunk/themes/fusionforge/templates/browse.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/browse.tmpl 2010-09-21 07:45:12 UTC (rev 7705)
+++ trunk/themes/fusionforge/templates/browse.tmpl 2010-09-22 14:39:24 UTC (rev 7706)
@@ -5,10 +5,16 @@
$curuserprefs = $user->getPreferences();
?>
+<?php if ($page->exists() and $revision and $revision->hasDefaultContents()) { ?>
+ <p class="error"><strong><?php echo _("Error:")?></strong>
+ <?php echo _("This revision of the page does not exist.")?>
+ <?php echo Button('browse', _("View the current version."), $page)?>
+ </p>
+<?php } else { ?>
<?php if ($revision and !$revision->isCurrent()) { ?>
<p class="warning_msg"><strong><?php echo _("Note:")?></strong>
- <?php echo _("You are viewing an old revision of this page.")?>
- <?php echo Button('browse', _("View the current version"), $page)?>.
+ <?php echo _("You are viewing an old revision of this page.")?>
+ <?php echo Button('browse', _("View the current version."), $page)?>
</p>
<?php } ?>
<?php if (!empty($redirected)) { ?>
@@ -31,6 +37,8 @@
<?php echo $CONTENT?>
+<?php } ?>
+
<div id="footer"><?php // for top & bottom toolbars stylesheet ?>
<?php echo Template('browse-footer')?>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2010-10-22 18:38:40
|
Revision: 7720
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7720&view=rev
Author: vargenau
Date: 2010-10-22 18:38:33 +0000 (Fri, 22 Oct 2010)
Log Message:
-----------
Remove rcs_id
Modified Paths:
--------------
trunk/themes/fusionforge/templates/actionbar.tmpl
trunk/themes/fusionforge/templates/blogform.tmpl
trunk/themes/fusionforge/templates/body.tmpl
trunk/themes/fusionforge/templates/bottom.tmpl
trunk/themes/fusionforge/templates/browse-footer.tmpl
trunk/themes/fusionforge/templates/browse.tmpl
trunk/themes/fusionforge/templates/debug.tmpl
trunk/themes/fusionforge/templates/editpage.tmpl
trunk/themes/fusionforge/templates/html.tmpl
trunk/themes/fusionforge/templates/login.tmpl
trunk/themes/fusionforge/templates/navbar.tmpl
trunk/themes/fusionforge/templates/pagelink.tmpl
trunk/themes/fusionforge/templates/ratings.tmpl
trunk/themes/fusionforge/templates/userprefs.tmpl
Modified: trunk/themes/fusionforge/templates/actionbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/actionbar.tmpl 2010-10-22 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/actionbar.tmpl 2010-10-22 18:38:33 UTC (rev 7720)
@@ -1,8 +1,6 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
-?>
+// $Id$
-<?php
$curuserprefs = $user->getPreferences();
$dbh = $request->getDbh();
$isAdmin = $user->isAdmin();
@@ -19,7 +17,7 @@
<?php $talk = new WikiPageName('Talk:'.$pagename); ?>
<td class="bold">
<?php echo Button(array(),
- $isActionPage ? _("Action Page") : _("Page"),
+ $isActionPage ? _("Action Page") : _("Page"),
$talk->getParent(), array('title' => "Page")) ?>
</td>
<td class="spacer"> </td>
@@ -85,7 +83,7 @@
<td class="spacer"> </td>
<td><?php echo Button(array('action'=>'BackLinks'), _("Back Links"),$page->getName()) ?></td>
- <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?>
+ <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?>
<?php if ($curuserprefs->get('pdfMenuItem')) { ?>
<td class="spacer"> </td>
<td><?php echo Button("pdf") ?></td>
Modified: trunk/themes/fusionforge/templates/blogform.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/blogform.tmpl 2010-10-22 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/blogform.tmpl 2010-10-22 18:38:33 UTC (rev 7720)
@@ -1,5 +1,5 @@
<?php // -*- php -*-
-// rcs_id('$Id$');
+// $Id$
?>
<div class="wikiblog wikiblog-form">
<form action="<?php echo $request->getPostURL()?>" method="post" name="editpage"
Modified: trunk/themes/fusionforge/templates/body.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/body.tmpl 2010-10-22 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/body.tmpl 2010-10-22 18:38:33 UTC (rev 7720)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
Modified: trunk/themes/fusionforge/templates/bottom.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/bottom.tmpl 2010-10-22 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/bottom.tmpl 2010-10-22 18:38:33 UTC (rev 7720)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<?php if (!$WikiTheme->DUMP_MODE) { ?>
<?php if (defined('DEBUG') and DEBUG) { ?>
Modified: trunk/themes/fusionforge/templates/browse-footer.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/browse-footer.tmpl 2010-10-22 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/browse-footer.tmpl 2010-10-22 18:38:33 UTC (rev 7720)
@@ -1,4 +1,4 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<p class="editdate"><?php echo $WikiTheme->getOwnerMessage($page) ?> <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?></p>
Modified: trunk/themes/fusionforge/templates/browse.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/browse.tmpl 2010-10-22 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/browse.tmpl 2010-10-22 18:38:33 UTC (rev 7720)
@@ -1,7 +1,6 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
-?>
-<?php
+// $Id$
+
$curuserprefs = $user->getPreferences();
?>
Modified: trunk/themes/fusionforge/templates/debug.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/debug.tmpl 2010-10-22 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/debug.tmpl 2010-10-22 18:38:33 UTC (rev 7720)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<?php global $RUNTIMER; ?>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl 2010-10-22 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/editpage.tmpl 2010-10-22 18:38:33 UTC (rev 7720)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<?php if (isset($PREVIEW_CONTENT)) { ?>
<p><strong><?php echo _("Preview only! Changes not saved.")?></strong>
@@ -17,7 +17,7 @@
<?php echo _("Saving this page will overwrite the current version.")?></strong></p>
<?php } ?>
<?php /*
- * FIXME: Hack!
+ * FIXME: Hack!
* The funky URL used for the form action parameter is bogus.
* This is needed, otherwise the redirect to the real browser
* page won't work with some browsers. (NS4 and Mozilla 0.97 won't accept
@@ -33,7 +33,7 @@
<tr><td><?php echo $EDIT_TOOLBAR ?></td>
<td align="right"><div id="editarea-size">
<?php echo _("Size").':'?>
- <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
+ <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
<label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
<noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
</div></td></tr></table>
@@ -44,12 +44,12 @@
<table summary="Toolbar: Page editing options." class="toolbar" width="100%"
cellpadding="0" cellspacing="0" border="0">
<tr valign="middle">
- <td>
+ <td>
<?php echo $MINOR_EDIT_CB ?> <label for="edit-minor_edit"><?php echo _("This is a minor change.")?></label><br />
</td>
<td align="center">
<?php echo $PREVIEW_B ?>
- <?php if ($SAVE_B) { ?>
+ <?php if ($SAVE_B) { ?>
<?php echo $SEP?><?php echo $SAVE_B ?>
<?php } ?>
<?php echo $SEP?><?php echo $CHANGES_B ?>
Modified: trunk/themes/fusionforge/templates/html.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/html.tmpl 2010-10-22 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/html.tmpl 2010-10-22 18:38:33 UTC (rev 7720)
@@ -1,7 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
-?>
-<?php
+// $Id$
/*
* No header for FusionForge (already provided)
*/
Modified: trunk/themes/fusionforge/templates/login.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/login.tmpl 2010-10-22 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/login.tmpl 2010-10-22 18:38:33 UTC (rev 7720)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<?php if ($fail_message) { ?>
<div class="error"><p><?php echo $fail_message?></p></div>
Modified: trunk/themes/fusionforge/templates/navbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/navbar.tmpl 2010-10-22 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/navbar.tmpl 2010-10-22 18:38:33 UTC (rev 7720)
@@ -1,7 +1,6 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
-?>
-<?php
+// $Id$
+
$curuserprefs = $user->getPreferences();
$dbh = $request->getDbh();
$username = $user->UserName();
Modified: trunk/themes/fusionforge/templates/pagelink.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/pagelink.tmpl 2010-10-22 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/pagelink.tmpl 2010-10-22 18:38:33 UTC (rev 7720)
@@ -1,7 +1,6 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
-?>
-<?php
+// $Id$
+
/**
* Themable paging "|<< << - i/sum - >> >>|" links
*
@@ -25,7 +24,7 @@
<?php echo fmt(" - %d / %d - ", $ACTPAGE, $NUMPAGES) ?>
</td>
<td class="wikipaging<?php echo $NEXT ? "-enabled" : "-disabled" ?>" align="right">
- <?php echo $NEXT ? HTML::a(array('href'=>$NEXT_LINK),_("Next >>")) : _(">>") ?>
+ <?php echo $NEXT ? HTML::a(array('href'=>$NEXT_LINK),_("Next >>")) : _(">>") ?>
<?php echo $NEXT ? HTML::a(array('href'=>$LAST_LINK),_(">>|")) : _(">>|") ?>
</td>
Modified: trunk/themes/fusionforge/templates/ratings.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/ratings.tmpl 2010-10-22 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/ratings.tmpl 2010-10-22 18:38:33 UTC (rev 7720)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
?>
<?php if (!$WikiTheme->DUMP_MODE) {
$loader = new WikiPluginLoader();
Modified: trunk/themes/fusionforge/templates/userprefs.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/userprefs.tmpl 2010-10-22 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/userprefs.tmpl 2010-10-22 18:38:33 UTC (rev 7720)
@@ -1,7 +1,5 @@
<?php // -*-php-*-
-// rcs_id('$Id$');
-?>
-<?php
+// $Id$'
// Todo: Move the logic and code to the plugin
// This is very experimental and the read-only part an ugly hack so far.
foreach (explode(',','errmsg,isForm') as $var) {
@@ -9,7 +7,7 @@
}
$plugin = $request->getArg('pagename');
-if (isActionPage($request->getArg('pagename'))
+if (isActionPage($request->getArg('pagename'))
and $isForm and $plugin == _("PreferencesInfo")) {
$isForm = false;
}
@@ -130,44 +128,44 @@
$SelectThemes = ''; $SelectLanguages = '';
$SelectThemesDesc = ''; $SelectLanguagesDesc = '';
if ( $isForm ) {
- $SelectOptions = HTML();
+ $SelectOptions = HTML();
if (!empty($available_themes) and is_array($available_themes)) {
- if (!$pref->get('theme') or $pref->get('theme') == THEME)
- $SelectOptions->pushContent(selectedOption("",_("<system theme>")));
- else
- $SelectOptions->pushContent(unselectedOption("",_("<system theme>")));
- foreach ($available_themes as $theme) {
- if ($theme == $pref->get('theme') and $theme != THEME)
- $SelectOptions->pushContent(selectedOption($theme));
- else
- $SelectOptions->pushContent(unselectedOption($theme));
- }
- $SelectThemes = HTML::select(array('name' => "pref[theme]",'id' => 'theme'),
- $SelectOptions);
- $SelectThemesDesc = _("Personal theme:");
+ if (!$pref->get('theme') or $pref->get('theme') == THEME)
+ $SelectOptions->pushContent(selectedOption("",_("<system theme>")));
+ else
+ $SelectOptions->pushContent(unselectedOption("",_("<system theme>")));
+ foreach ($available_themes as $theme) {
+ if ($theme == $pref->get('theme') and $theme != THEME)
+ $SelectOptions->pushContent(selectedOption($theme));
+ else
+ $SelectOptions->pushContent(unselectedOption($theme));
+ }
+ $SelectThemes = HTML::select(array('name' => "pref[theme]",'id' => 'theme'),
+ $SelectOptions);
+ $SelectThemesDesc = _("Personal theme:");
}
-
+
$SelectOptions = HTML();
if (!empty($available_languages) and is_array($available_languages)) {
- if (!$pref->get('lang') or $pref->get('lang') == DEFAULT_LANGUAGE)
- $SelectOptions->pushContent(selectedOption("",_("<system language>")));
- else
- $SelectOptions->pushContent(unselectedOption("",_("<system language>")));
- foreach ($available_languages as $lang) {
- if ($lang == $pref->get('lang') and $lang != DEFAULT_LANGUAGE)
- $SelectOptions->pushContent(selectedOption($lang));
- else
- $SelectOptions->pushContent(unselectedOption($lang));
- }
- $SelectLanguages = HTML::select(array('name' => "pref[lang]",'id' => 'lang'),
- $SelectOptions);
- $SelectLanguagesDesc = _("Personal language:");
+ if (!$pref->get('lang') or $pref->get('lang') == DEFAULT_LANGUAGE)
+ $SelectOptions->pushContent(selectedOption("",_("<system language>")));
+ else
+ $SelectOptions->pushContent(unselectedOption("",_("<system language>")));
+ foreach ($available_languages as $lang) {
+ if ($lang == $pref->get('lang') and $lang != DEFAULT_LANGUAGE)
+ $SelectOptions->pushContent(selectedOption($lang));
+ else
+ $SelectOptions->pushContent(unselectedOption($lang));
+ }
+ $SelectLanguages = HTML::select(array('name' => "pref[lang]",'id' => 'lang'),
+ $SelectOptions);
+ $SelectLanguagesDesc = _("Personal language:");
} else {
- if ($SelectThemes == '') {
- $appearance = false;
- $SelectThemesDesc = '';
- $SelectLanguagesDesc = '';
- }
+ if ($SelectThemes == '') {
+ $appearance = false;
+ $SelectThemesDesc = '';
+ $SelectLanguagesDesc = '';
+ }
}
} else {
$SelectThemesDesc = _("Personal theme:");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-09-28 15:57:06
|
Revision: 8314
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8314&view=rev
Author: vargenau
Date: 2012-09-28 15:57:00 +0000 (Fri, 28 Sep 2012)
Log Message:
-----------
Remove $Id$
Modified Paths:
--------------
trunk/themes/fusionforge/templates/ratings.tmpl
trunk/themes/fusionforge/templates/savepage.tmpl
trunk/themes/fusionforge/templates/userprefs.tmpl
Modified: trunk/themes/fusionforge/templates/ratings.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/ratings.tmpl 2012-09-28 15:56:14 UTC (rev 8313)
+++ trunk/themes/fusionforge/templates/ratings.tmpl 2012-09-28 15:57:00 UTC (rev 8314)
@@ -1,6 +1,3 @@
-<?php // -*-php-*-
-// $Id$
-?>
<?php if (!$WikiTheme->DUMP_MODE) {
$loader = new WikiPluginLoader();
printXML($loader->expandPI("<"."?plugin RateIt show=top imgPrefix=BStar ?".">", $request, $dbi->_markup));
Modified: trunk/themes/fusionforge/templates/savepage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/savepage.tmpl 2012-09-28 15:56:14 UTC (rev 8313)
+++ trunk/themes/fusionforge/templates/savepage.tmpl 2012-09-28 15:57:00 UTC (rev 8314)
@@ -1,7 +1,3 @@
-<?php // -*-php-*-
-// $Id$'
-?>
-
<?php if (!empty($WARNINGS)) { ?>
<?php echo $WARNINGS ?>
<?php } ?>
Modified: trunk/themes/fusionforge/templates/userprefs.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/userprefs.tmpl 2012-09-28 15:56:14 UTC (rev 8313)
+++ trunk/themes/fusionforge/templates/userprefs.tmpl 2012-09-28 15:57:00 UTC (rev 8314)
@@ -1,5 +1,4 @@
-<?php // -*-php-*-
-// $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.
foreach (explode(',','errmsg,isForm') as $var) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-09-28 16:01:36
|
Revision: 8315
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8315&view=rev
Author: vargenau
Date: 2012-09-28 16:01:26 +0000 (Fri, 28 Sep 2012)
Log Message:
-----------
Remove $Id$
Modified Paths:
--------------
trunk/themes/fusionforge/templates/login.tmpl
trunk/themes/fusionforge/templates/navbar.tmpl
Property Changed:
----------------
trunk/themes/fusionforge/templates/login.tmpl
trunk/themes/fusionforge/templates/navbar.tmpl
Modified: trunk/themes/fusionforge/templates/login.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/login.tmpl 2012-09-28 15:57:00 UTC (rev 8314)
+++ trunk/themes/fusionforge/templates/login.tmpl 2012-09-28 16:01:26 UTC (rev 8315)
@@ -1,6 +1,3 @@
-<?php // -*-php-*-
-// $Id$
-?>
<?php if ($fail_message) { ?>
<div class="error"><p><?php echo $fail_message?></p></div>
<?php } ?>
Property changes on: trunk/themes/fusionforge/templates/login.tmpl
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/themes/fusionforge/templates/navbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/navbar.tmpl 2012-09-28 15:57:00 UTC (rev 8314)
+++ trunk/themes/fusionforge/templates/navbar.tmpl 2012-09-28 16:01:26 UTC (rev 8315)
@@ -1,6 +1,4 @@
-<?php // -*-php-*-
-// $Id$
-
+<?php
$curuserprefs = $user->getPreferences();
$dbh = $request->getDbh();
$username = $user->UserName();
Property changes on: trunk/themes/fusionforge/templates/navbar.tmpl
___________________________________________________________________
Deleted: svn:keywords
- Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-09-28 16:07:11
|
Revision: 8316
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8316&view=rev
Author: vargenau
Date: 2012-09-28 16:07:01 +0000 (Fri, 28 Sep 2012)
Log Message:
-----------
Remove $Id$
Modified Paths:
--------------
trunk/themes/fusionforge/templates/blogform.tmpl
trunk/themes/fusionforge/templates/browse-footer.tmpl
trunk/themes/fusionforge/templates/html.tmpl
Property Changed:
----------------
trunk/themes/fusionforge/templates/browse-footer.tmpl
trunk/themes/fusionforge/templates/html.tmpl
Modified: trunk/themes/fusionforge/templates/blogform.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/blogform.tmpl 2012-09-28 16:01:26 UTC (rev 8315)
+++ trunk/themes/fusionforge/templates/blogform.tmpl 2012-09-28 16:07:01 UTC (rev 8316)
@@ -1,6 +1,3 @@
-<?php // -*- php -*-
-// $Id$
-?>
<div class="wikiblog wikiblog-form">
<form action="<?php echo $request->getPostURL()?>" method="post" name="editpage"
accept-charset="<?php echo $charset?>" id="wikiblog-form">
Modified: trunk/themes/fusionforge/templates/browse-footer.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/browse-footer.tmpl 2012-09-28 16:01:26 UTC (rev 8315)
+++ trunk/themes/fusionforge/templates/browse-footer.tmpl 2012-09-28 16:07:01 UTC (rev 8316)
@@ -1,4 +1 @@
-<?php // -*-php-*-
-// $Id$
-?>
<p class="editdate"><?php echo $WikiTheme->getOwnerMessage($page) ?> <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?></p>
Property changes on: trunk/themes/fusionforge/templates/browse-footer.tmpl
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/themes/fusionforge/templates/html.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/html.tmpl 2012-09-28 16:01:26 UTC (rev 8315)
+++ trunk/themes/fusionforge/templates/html.tmpl 2012-09-28 16:07:01 UTC (rev 8316)
@@ -1,5 +1,4 @@
-<?php // -*-php-*-
-// $Id$
+<?php
/*
* No header for FusionForge (already provided)
*/
Property changes on: trunk/themes/fusionforge/templates/html.tmpl
___________________________________________________________________
Deleted: svn:keywords
- Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-10-02 11:46:59
|
Revision: 8376
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8376&view=rev
Author: vargenau
Date: 2012-10-02 11:46:53 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
Remove $Id
Modified Paths:
--------------
trunk/themes/fusionforge/templates/browse.tmpl
trunk/themes/fusionforge/templates/debug.tmpl
Modified: trunk/themes/fusionforge/templates/browse.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/browse.tmpl 2012-10-02 09:53:17 UTC (rev 8375)
+++ trunk/themes/fusionforge/templates/browse.tmpl 2012-10-02 11:46:53 UTC (rev 8376)
@@ -1,6 +1,4 @@
-<?php // -*-php-*-
-// $Id$
-
+<?php
$curuserprefs = $user->getPreferences();
?>
Modified: trunk/themes/fusionforge/templates/debug.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/debug.tmpl 2012-10-02 09:53:17 UTC (rev 8375)
+++ trunk/themes/fusionforge/templates/debug.tmpl 2012-10-02 11:46:53 UTC (rev 8376)
@@ -1,6 +1,3 @@
-<?php // -*-php-*-
-// $Id$
-?>
<p class="debug">
<?php
global $RUNTIMER;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-12-05 15:36:54
|
Revision: 8604
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8604&view=rev
Author: vargenau
Date: 2012-12-05 15:36:45 +0000 (Wed, 05 Dec 2012)
Log Message:
-----------
Remove title
Modified Paths:
--------------
trunk/themes/fusionforge/templates/actionbar.tmpl
trunk/themes/fusionforge/templates/navbar.tmpl
Modified: trunk/themes/fusionforge/templates/actionbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/actionbar.tmpl 2012-12-05 14:16:30 UTC (rev 8603)
+++ trunk/themes/fusionforge/templates/actionbar.tmpl 2012-12-05 15:36:45 UTC (rev 8604)
@@ -13,9 +13,7 @@
<?php if (!string_ends_with($pagename, SUBPAGE_SEPARATOR._("Discussion"))) { ?>
<?php $talk = new WikiPageName('Talk:'.$pagename); ?>
<li class="bold">
- <?php echo Button(array(),
- $isActionPage ? _("Action Page") : _("Page"),
- $talk->getParent(), array('title' => "Page")) ?>
+ <?php echo Button(array(), $isActionPage ? _("Action Page") : _("Page"), $talk->getParent()) ?>
</li>
<?php if (!$isActionPage) { ?>
<?php if ($dbh->isWikiPage($talk->getName())) { ?>
@@ -33,10 +31,10 @@
<?php } else {
$talk = new WikiPageName($pagename); ?>
<li>
- <?php echo Button(array(),$isActionPage ? _("Action Page") : _("Page"), $talk->getParent(), array('title' => "View the page")) ?>
+ <?php echo Button(array(), $isActionPage ? _("Action Page") : _("Page"), $talk->getParent()) ?>
</li>
<li class="bold">
- <?php echo Button(array(),_("Discussion"), $talk->getName()) ?>
+ <?php echo Button(array(), _("Discussion"), $talk->getName()) ?>
</li>
<?php } ?>
</ul>
Modified: trunk/themes/fusionforge/templates/navbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/navbar.tmpl 2012-12-05 14:16:30 UTC (rev 8603)
+++ trunk/themes/fusionforge/templates/navbar.tmpl 2012-12-05 15:36:45 UTC (rev 8604)
@@ -4,25 +4,25 @@
$username = $user->UserName();
?>
- <li class="submenu"><?php echo WikiLink(__("HomePage"), "", _("Home Page")) ?></li>
- <li class="submenu"><?php echo WikiLink(__("RecentChanges"), "", _("Recent Changes")) ?></li>
- <li class="submenu"><?php echo WikiLink(__("SpecialPages"), "", _("Special Pages")) ?></li>
- <li class="submenu"><?php echo WikiLink(__("FindPage"), "", _("Search")) ?></li>
+ <li class="submenu"><?php echo Button(array(), _("Home Page"), __("HomePage")) ?></li>
+ <li class="submenu"><?php echo Button(array(), _("Recent Changes"), __("RecentChanges")) ?></li>
+ <li class="submenu"><?php echo Button(array(), _("Special Pages"), __("SpecialPages")) ?></li>
+ <li class="submenu"><?php echo Button(array(), _("Search"), __("FindPage")) ?></li>
<?php if ($curuserprefs->get('randomPageMenuItem')) { ?>
- <li class="submenu"><?php echo WikiLink(__("RandomPage"), "", _("Random Page")) ?></li>
+ <li class="submenu"><?php echo Button(array(), _("Random Page"), __("RandomPage")) ?></li>
<?php } ?>
<?php if ($curuserprefs->get('likePagesMenuItem')) { ?>
- <li class="submenu"><?php echo Button(array('action'=>__("LikePages")), _("Like Pages"),$page->getName()) ?></li>
+ <li class="submenu"><?php echo Button(array('action'=>__("LikePages")), _("Like Pages"), $page->getName()) ?></li>
<?php } ?>
<?php if (!empty($user) && $user->isSignedIn()) { ?>
- <li class="submenu"><?php echo WikiLink(__("UpLoad"), "", _("Upload File")) ?></li>
+ <li class="submenu"><?php echo Button(array(), _("Upload File"), __("UpLoad")) ?></li>
<?php } ?>
<?php if (!empty($user) && $user->isAdmin()) { ?>
- <li class="submenu"><?php echo WikiLink(__("PhpWikiAdministration"), "", _("Wiki Admin")) ?></li>
+ <li class="submenu"><?php echo Button(array(), _("Wiki Admin"), __("PhpWikiAdministration")) ?></li>
<?php } ?>
<?php if (!empty($user) && $user->isSignedIn()) { ?>
<?php if ($dbh->isWikiPage($username)) { ?>
- <li class="submenu"><?php echo WikiLink($username, "", _("My User Page")) ?></li>
+ <li class="submenu"><?php echo Button(array(), _("My User Page"), $username) ?></li>
<?php } ?>
- <li class="submenu"><?php echo WikiLink(__("UserPreferences"), "", _("User Preferences")) ?></li>
+ <li class="submenu"><?php echo Button(array(), _("User Preferences"), __("UserPreferences")) ?></li>
<?php } ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X