Menu
▾
▴
phpwiki-checkins
|
From: <var...@us...> - 2008-09-09 16:42:06
|
Revision: 6254
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6254&view=rev
Author: vargenau
Date: 2008-09-09 16:42:17 +0000 (Tue, 09 Sep 2008)
Log Message:
-----------
Make string translatable
Modified Paths:
--------------
trunk/lib/plugin/WatchPage.php
Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php 2008-09-09 16:40:25 UTC (rev 6253)
+++ trunk/lib/plugin/WatchPage.php 2008-09-09 16:42:17 UTC (rev 6254)
@@ -52,9 +52,9 @@
return in_array($page, $this->_explodePageList);
}
- // This could be expanded as in mediawiki to a list of each page with a remove button.
+ // This could be expanded as in Mediawiki to a list of each page with a remove button.
function showWatchList($pagelist) {
- return HTML::strong(HTML::tt(empty($pagelist) ? "<empty>" : $pagelist));
+ return HTML::strong(HTML::tt(empty($pagelist) ? _("<empty>") : $pagelist));
}
function addpagelist($page, $pagelist) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-02-25 15:13:58
|
Revision: 6563
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6563&view=rev
Author: vargenau
Date: 2009-02-25 15:13:50 +0000 (Wed, 25 Feb 2009)
Log Message:
-----------
No alert for Gforge
Modified Paths:
--------------
trunk/lib/plugin/WatchPage.php
Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php 2009-02-25 14:51:51 UTC (rev 6562)
+++ trunk/lib/plugin/WatchPage.php 2009-02-25 15:13:50 UTC (rev 6563)
@@ -2,6 +2,7 @@
rcs_id('$Id$');
/**
Copyright (C) 2006 $ThePhpWikiProgrammingTeam
+ Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
This file is part of PhpWiki.
@@ -94,6 +95,8 @@
}
function run($dbi, $argstr, &$request, $basepage) {
+ global $WikiTheme;
+
$args = $this->getArgs($argstr, $request);
if (isa($request,'MockRequest'))
return '';
@@ -146,6 +149,10 @@
$request->_setUser($user);
$request->setArg("verify",false);
$request->setArg("add",false);
+ // No alert for Gforge
+ if (isa($WikiTheme, 'WikiTheme_gforge')) {
+ return;
+ }
$alert = new Alert(
_("Message"),
_("E-Mail Notification for the current page successfully stored in your preferences."));
@@ -157,11 +164,6 @@
}
};
-// $Log: not supported by cvs2svn $
-// Revision 1.1 2006/12/22 01:28:23 rurban
-// new plugin similar to mediawiki
-//
-
// For emacs users
// Local Variables:
// mode: php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-06-12 10:29:14
|
Revision: 6925
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6925&view=rev
Author: vargenau
Date: 2009-06-12 10:29:12 +0000 (Fri, 12 Jun 2009)
Log Message:
-----------
Do not check e-mail when in Gforge
Modified Paths:
--------------
trunk/lib/plugin/WatchPage.php
Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php 2009-06-12 10:03:10 UTC (rev 6924)
+++ trunk/lib/plugin/WatchPage.php 2009-06-12 10:29:12 UTC (rev 6925)
@@ -114,18 +114,21 @@
} else {
$pref = &$request->_prefs;
$messages = "";
- $email = $pref->get("email");
- if (empty($email))
- return HTML::div(
- array('class' => 'errors'),
- _("ERROR: No email defined! You need to do this in your "),
- WikiLink(_("UserPreferences")));
-
- $emailVerified = $pref->get("emailVerified");
- if (empty($emailVerified))
- $messages = HTML::div(array('class' => 'mw-warning'),
- HTML::p("WARNING! Your email address was not verifed yet!"),
- HTML::p("EmailNotifications currently disabled. <TODO>"));
+ if (!defined('GFORGE') or !GFORGE) {
+ $email = $pref->get("email");
+ if (empty($email)) {
+ return HTML::div(
+ array('class' => 'errors'),
+ _("ERROR: No email defined! You need to do this in your "),
+ WikiLink(_("UserPreferences")));
+ }
+ $emailVerified = $pref->get("emailVerified");
+ if (empty($emailVerified)) {
+ $messages = HTML::div(array('class' => 'mw-warning'),
+ HTML::p("WARNING! Your email address was not verifed yet!"),
+ HTML::p("EmailNotifications currently disabled. <TODO>"));
+ }
+ }
$pagelist = $pref->get("notifyPages");
if (! $request->isPost() ) {
return $this->showNotify($request, $messages, $page, $pagelist, false);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-06-12 14:01:19
|
Revision: 6929
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6929&view=rev
Author: vargenau
Date: 2009-06-12 14:01:18 +0000 (Fri, 12 Jun 2009)
Log Message:
-----------
No need to display new watch list if unchanged
Modified Paths:
--------------
trunk/lib/plugin/WatchPage.php
Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php 2009-06-12 13:40:22 UTC (rev 6928)
+++ trunk/lib/plugin/WatchPage.php 2009-06-12 14:01:18 UTC (rev 6929)
@@ -80,11 +80,11 @@
HiddenInputs(array('verify' => 1)),
HiddenInputs($request->getArgs(),false,array('verify')),
$messages,
- HTML::p(_("Your current watchlist: "), $this->showWatchList($pagelist)),
- HTML::p(_("New watchlist: "),
- $this->showWatchList($this->addpagelist($page, $pagelist))));
+ HTML::p(_("Your current watchlist: "), $this->showWatchList($pagelist)));
if ($isNecessary) {
- $form->pushContent(HTML::p(sprintf(_("Do you %s want to add this page \"%s\" to your WatchList?"),
+ $form->pushContent(HTML::p(_("New watchlist: "),
+ $this->showWatchList($this->addpagelist($page, $pagelist))),
+ HTML::p(sprintf(_("Do you %s want to add this page \"%s\" to your WatchList?"),
($verified ? _("really") : ""), $page)),
HTML::p(Button('submit:add', _("Yes")),
HTML::Raw(' '),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-06-12 14:08:46
|
Revision: 6930
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6930&view=rev
Author: vargenau
Date: 2009-06-12 14:08:36 +0000 (Fri, 12 Jun 2009)
Log Message:
-----------
Add space in watch list for better display
Modified Paths:
--------------
trunk/lib/plugin/WatchPage.php
Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php 2009-06-12 14:01:18 UTC (rev 6929)
+++ trunk/lib/plugin/WatchPage.php 2009-06-12 14:08:36 UTC (rev 6930)
@@ -67,7 +67,7 @@
if ($this->contains($pagelist, $page))
return "$pagelist";
else
- return "$pagelist,$page";
+ return "$pagelist, $page";
} else
return "$page";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-06-15 12:59:25
|
Revision: 6935
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6935&view=rev
Author: vargenau
Date: 2009-06-15 12:59:13 +0000 (Mon, 15 Jun 2009)
Log Message:
-----------
Add fieldset and legend
Modified Paths:
--------------
trunk/lib/plugin/WatchPage.php
Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php 2009-06-15 12:45:34 UTC (rev 6934)
+++ trunk/lib/plugin/WatchPage.php 2009-06-15 12:59:13 UTC (rev 6935)
@@ -74,13 +74,13 @@
function showNotify(&$request, $messages, $page, $pagelist, $verified) {
$isNecessary = ! $this->contains($pagelist, $page);
- $form = HTML::form
- (array('action' => $request->getPostURL(),
- 'method' => 'post'),
+ $form = HTML::fieldset(HTML::legend("Watch Page"),
+ HTML::form(array('action' => $request->getPostURL(),
+ 'method' => 'post'),
HiddenInputs(array('verify' => 1)),
HiddenInputs($request->getArgs(),false,array('verify')),
$messages,
- HTML::p(_("Your current watchlist: "), $this->showWatchList($pagelist)));
+ HTML::p(_("Your current watchlist: "), $this->showWatchList($pagelist))));
if ($isNecessary) {
$form->pushContent(HTML::p(_("New watchlist: "),
$this->showWatchList($this->addpagelist($page, $pagelist))),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-06-15 15:28:07
|
Revision: 6939
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6939&view=rev
Author: vargenau
Date: 2009-06-15 15:27:55 +0000 (Mon, 15 Jun 2009)
Log Message:
-----------
Make form work with fieldset
Modified Paths:
--------------
trunk/lib/plugin/WatchPage.php
Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php 2009-06-15 15:06:51 UTC (rev 6938)
+++ trunk/lib/plugin/WatchPage.php 2009-06-15 15:27:55 UTC (rev 6939)
@@ -74,13 +74,12 @@
function showNotify(&$request, $messages, $page, $pagelist, $verified) {
$isNecessary = ! $this->contains($pagelist, $page);
- $form = HTML::fieldset(HTML::legend("Watch Page"),
- HTML::form(array('action' => $request->getPostURL(),
- 'method' => 'post'),
+ $form = HTML::form(array('action' => $request->getPostURL(),
+ 'method' => 'post'),
HiddenInputs(array('verify' => 1)),
HiddenInputs($request->getArgs(),false,array('verify')),
$messages,
- HTML::p(_("Your current watchlist: "), $this->showWatchList($pagelist))));
+ HTML::p(_("Your current watchlist: "), $this->showWatchList($pagelist)));
if ($isNecessary) {
$form->pushContent(HTML::p(_("New watchlist: "),
$this->showWatchList($this->addpagelist($page, $pagelist))),
@@ -95,7 +94,8 @@
HTML::Raw(' '),
Button('submit:cancel', _("Cancel"))));
}
- return $form;
+ $fieldset = HTML::fieldset(HTML::legend("Watch Page"), $form);
+ return $fieldset;
}
function run($dbi, $argstr, &$request, $basepage) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-01-20 08:38:12
|
Revision: 7844
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7844&view=rev
Author: vargenau
Date: 2011-01-20 08:38:06 +0000 (Thu, 20 Jan 2011)
Log Message:
-----------
Translate string
Modified Paths:
--------------
trunk/lib/plugin/WatchPage.php
Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php 2011-01-19 18:02:22 UTC (rev 7843)
+++ trunk/lib/plugin/WatchPage.php 2011-01-20 08:38:06 UTC (rev 7844)
@@ -89,7 +89,7 @@
HTML::Raw(' '),
Button('submit:cancel', _("Cancel"))));
}
- $fieldset = HTML::fieldset(HTML::legend("Watch Page"), $form);
+ $fieldset = HTML::fieldset(HTML::legend(_("Watch Page")), $form);
return $fieldset;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-11-04 10:04:56
|
Revision: 8175
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8175&view=rev
Author: vargenau
Date: 2011-11-04 10:04:45 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Warning message if action cancelled
Modified Paths:
--------------
trunk/lib/plugin/WatchPage.php
Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php 2011-11-04 09:27:08 UTC (rev 8174)
+++ trunk/lib/plugin/WatchPage.php 2011-11-04 10:04:45 UTC (rev 8175)
@@ -135,7 +135,9 @@
$errmsg = '';
if ($request->getArg('cancel')) {
$request->redirect(WikiURL($request->getArg('pagename'),
- false, 'absolute_url')); // noreturn
+ array('warningmsg' => _('WatchPage cancelled')),
+ 'absolute_url'));
+ // noreturn
return;
}
if ($request->getArg('edit')) {
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