Menu
▾
▴
phpwiki-checkins
|
From: <var...@us...> - 2009-03-22 14:04:23
|
Revision: 6684
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6684&view=rev
Author: vargenau
Date: 2009-03-22 14:04:19 +0000 (Sun, 22 Mar 2009)
Log Message:
-----------
Add ACL to PageInfo
Modified Paths:
--------------
trunk/themes/default/templates/info.tmpl
Modified: trunk/themes/default/templates/info.tmpl
===================================================================
--- trunk/themes/default/templates/info.tmpl 2009-03-22 11:31:45 UTC (rev 6683)
+++ trunk/themes/default/templates/info.tmpl 2009-03-22 14:04:19 UTC (rev 6684)
@@ -73,6 +73,15 @@
$tableSummary = fmt("Statistics about %s.", $page->getName());
$Sep = $WikiTheme->getButtonSeparator();
+$perm_tree = pagePermissions($page->getName());
+list($type, $perm) = pagePermissionsAcl($perm_tree[0], $perm_tree);
+if ($type == 'inherited') {
+ $type = sprintf(_("page permission inherited from %s"), $perm_tree[1][0]);
+} elseif ($type == 'page') {
+ $type = _("invidual page permission");
+} elseif ($type == 'default') {
+ $type = _("default page permission");
+}
?>
<!-- FIXME: move table formatting to css -->
@@ -117,7 +126,7 @@
</tr>
<?php } ?>
<tr>
- <td align="right" valign="top" class="pageinfo"><?= $label['summary'] ?></td>
+ <td align="right" nowrap="nowrap" valign="top" class="pageinfo"><?= $label['summary'] ?></td>
<td><?= $summary ?></td>
</tr>
<?php if ($is_current) { ?>
@@ -125,6 +134,14 @@
<td align="right"><?= $LOCKED_CB ?></td>
<td class="pageinfo"><?=_("Locked")?></td>
</tr>
+ <tr>
+ <td align="right" class="pageinfo">ACL type</td>
+ <td><?= $type ?></td>
+ </tr>
+ <tr>
+ <td align="right" valign="top" class="pageinfo">ACL</td>
+ <td><?= $perm->asAclLines() ?></td>
+ </tr>
<?php } ?>
<?php // determine page type
@@ -155,33 +172,3 @@
<?php } ?>
</table>
-
-<?php
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-// $Log: not supported by cvs2svn $
-// Revision 1.19 2007/01/02 13:30:36 rurban
-// bring in revision, use fixed summary height
-//
-// Revision 1.18 2005/02/02 19:02:10 rurban
-// link author
-//
-// Revision 1.17 2004/06/14 11:26:52 rurban
-// renamed global $Theme to $WikiTheme (gforge nameclash)
-//
-// Revision 1.16 2004/05/18 14:47:21 rurban
-// Simplified strings for easier translation
-//
-// Revision 1.15 2003/12/11 19:38:29 carstenklapp
-// Internal change: Fix PHP Warning: Call-time pass-by-reference has been deprecated
-//
-// Revision 1.14 2003/11/29 20:13:38 carstenklapp
-// Internal change: Refactored ByteFormatter code into a new function in
-// stdlib (now used by PageList too).
-//
-// Revision 1.13 2003/02/21 04:24:48 dairiki
-// Fix <td> </td> nesting. (Was generating invalid HTML.)
-//
-// Revision 1.12 2003/01/11 22:54:28 carstenklapp
-// Added Page type field displayed for special pages.
-//
-?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-04-02 12:33:02
|
Revision: 6761
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6761&view=rev
Author: vargenau
Date: 2009-04-02 12:32:58 +0000 (Thu, 02 Apr 2009)
Log Message:
-----------
No need for a HTML::textarea for summary (single line)
Modified Paths:
--------------
trunk/themes/default/templates/info.tmpl
Modified: trunk/themes/default/templates/info.tmpl
===================================================================
--- trunk/themes/default/templates/info.tmpl 2009-04-01 12:48:10 UTC (rev 6760)
+++ trunk/themes/default/templates/info.tmpl 2009-04-02 12:32:58 UTC (rev 6761)
@@ -36,13 +36,7 @@
? fmt("Version %s", $markupVersion)
: _("Original (1.2 or 1.0)");
-$summary = HTML::textarea(array('name' => 'summary',
- 'class' => 'summary',
- 'rows' => 3,
- 'cols' => intval($request->getPref('editWidth')/2),
- 'readonly' => 'readonly'
- ),
- $revision->get('summary'));
+$summary = $revision->get('summary');
if ($is_current = $revision->isCurrent()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-06-02 16:50:29
|
Revision: 6846
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6846&view=rev
Author: vargenau
Date: 2009-06-02 16:50:19 +0000 (Tue, 02 Jun 2009)
Log Message:
-----------
Display external status of page
Modified Paths:
--------------
trunk/themes/default/templates/info.tmpl
Modified: trunk/themes/default/templates/info.tmpl
===================================================================
--- trunk/themes/default/templates/info.tmpl 2009-06-02 16:14:56 UTC (rev 6845)
+++ trunk/themes/default/templates/info.tmpl 2009-06-02 16:50:19 UTC (rev 6846)
@@ -50,7 +50,6 @@
$lockunlock = $page->get('locked') ? 'unlock' : 'lock';
$clickcheckbUrl = WikiURL($revision, array('action' => $lockunlock));
$clickcheckb = "location.href='$clickcheckbUrl'";
-
$LOCKED_CB->setAttr('onclick', $clickcheckb);
}
@@ -128,7 +127,13 @@
<td align="right"><?= $LOCKED_CB ?></td>
<td class="pageinfo"><?=_("Locked")?></td>
</tr>
+<?php if (ENABLE_EXTERNAL_PAGES) { ?>
<tr>
+ <td align="right" class="pageinfo">Is External:</td>
+ <td><?= $page->get('external') ? _("Yes") : _("No") ?></td>
+ </tr>
+<?php } ?>
+ <tr>
<td align="right" class="pageinfo">ACL type</td>
<td><?= $type ?></td>
</tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-01-20 12:55:05
|
Revision: 7846
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7846&view=rev
Author: vargenau
Date: 2011-01-20 12:54:59 +0000 (Thu, 20 Jan 2011)
Log Message:
-----------
Translate strings
Modified Paths:
--------------
trunk/themes/default/templates/info.tmpl
Modified: trunk/themes/default/templates/info.tmpl
===================================================================
--- trunk/themes/default/templates/info.tmpl 2011-01-20 09:22:12 UTC (rev 7845)
+++ trunk/themes/default/templates/info.tmpl 2011-01-20 12:54:59 UTC (rev 7846)
@@ -126,20 +126,20 @@
<?php if ($is_current) { ?>
<tr>
<td align="right"><?php echo $LOCKED_CB ?></td>
- <td class="pageinfo"><?php echo _("Locked")?></td>
+ <td class="pageinfo"><?php echo _("Locked:")?></td>
</tr>
<?php if (ENABLE_EXTERNAL_PAGES) { ?>
<tr>
- <td align="right" class="pageinfo">Is External:</td>
+ <td align="right" class="pageinfo"><?php echo _("Is External:") ?></td>
<td><?php echo $page->get('external') ? _("Yes") : _("No") ?></td>
</tr>
<?php } ?>
<tr>
- <td align="right" class="pageinfo">ACL type</td>
+ <td align="right" class="pageinfo"><?php echo _("ACL type:") ?></td>
<td><?php echo $type ?></td>
</tr>
<tr>
- <td align="right" valign="top" class="pageinfo">ACL</td>
+ <td align="right" valign="top" class="pageinfo"><?php echo _("ACL:") ?></td>
<td><?php echo $perm->asAclLines() ?></td>
</tr>
<?php } ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-01-20 13:02:59
|
Revision: 7847
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7847&view=rev
Author: vargenau
Date: 2011-01-20 13:02:53 +0000 (Thu, 20 Jan 2011)
Log Message:
-----------
No colon
Modified Paths:
--------------
trunk/themes/default/templates/info.tmpl
Modified: trunk/themes/default/templates/info.tmpl
===================================================================
--- trunk/themes/default/templates/info.tmpl 2011-01-20 12:54:59 UTC (rev 7846)
+++ trunk/themes/default/templates/info.tmpl 2011-01-20 13:02:53 UTC (rev 7847)
@@ -126,7 +126,7 @@
<?php if ($is_current) { ?>
<tr>
<td align="right"><?php echo $LOCKED_CB ?></td>
- <td class="pageinfo"><?php echo _("Locked:")?></td>
+ <td class="pageinfo"><?php echo _("Locked")?></td>
</tr>
<?php if (ENABLE_EXTERNAL_PAGES) { ?>
<tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-09-23 12:27:07
|
Revision: 8117
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8117&view=rev
Author: vargenau
Date: 2011-09-23 12:27:01 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
Use CSS
Modified Paths:
--------------
trunk/themes/default/templates/info.tmpl
Modified: trunk/themes/default/templates/info.tmpl
===================================================================
--- trunk/themes/default/templates/info.tmpl 2011-09-23 12:23:06 UTC (rev 8116)
+++ trunk/themes/default/templates/info.tmpl 2011-09-23 12:27:01 UTC (rev 8117)
@@ -78,23 +78,21 @@
}
?>
-<!-- FIXME: move table formatting to css -->
-<table summary="<?php echo $tableSummary ?>" class="pageinfo"
- border="0" cellspacing="0" cellpadding="3">
+<table summary="<?php echo $tableSummary ?>" class="pageinfo">
<?php if (!$is_current) { ?>
<tr>
- <td align="right" class="pageinfo"><?php echo _("Supplanted on:")?></td>
+ <td class="align-right pageinfo"><?php echo _("Supplanted on:")?></td>
<td><?php echo $WikiTheme->formatDateTime($revision->get('_supplanted')) ?></td>
</tr>
<?php } ?>
<tr>
- <td align="right" nowrap="nowrap" class="pageinfo"><?php echo $label['date'] ?></td>
+ <td class="align-right nowrap pageinfo"><?php echo $label['date'] ?></td>
<td><?php echo $modifed ?><?php echo $minor_flag ?></td>
</tr>
<tr>
- <td align="right" class="pageinfo"><?php echo $label['author'] ?></td>
+ <td class="align-right pageinfo"><?php echo $label['author'] ?></td>
<td><?php echo $authorLink ?>
<?php if (! ($author == $authorId)) {
if ($dbi->isWikiPage($authorId)) $authorId = WikiLink($authorId); ?>
@@ -102,44 +100,44 @@
<?php } ?></td>
</tr>
<tr>
- <td align="right" class="pageinfo"><?php echo _("Page Version:")?></td>
+ <td class="align-right pageinfo"><?php echo _("Page Version:")?></td>
<td><?php echo $version ?></td>
</tr>
<tr>
- <td align="right" class="pageinfo"><?php echo _("Markup:")?></td>
+ <td class="align-right pageinfo"><?php echo _("Markup:")?></td>
<td><?php echo $markupVersion ?></td>
</tr>
<tr>
- <td align="right" class="pageinfo"><?php echo _("Size:")?></td>
+ <td class="align-right pageinfo"><?php echo _("Size:")?></td>
<td><?php echo $wordcount ?>, <?php echo $size ?></td>
</tr>
<?php if ($is_current) { ?>
<tr>
- <td align="right" class="pageinfo"><?php echo _("Hits:") ?></td>
+ <td class="align-right pageinfo"><?php echo _("Hits:") ?></td>
<td><?php echo $hits ?></td>
</tr>
<?php } ?>
<tr>
- <td align="right" nowrap="nowrap" valign="top" class="pageinfo"><?php echo $label['summary'] ?></td>
+ <td class="align-right nowrap top pageinfo"><?php echo $label['summary'] ?></td>
<td><?php echo $summary ?></td>
</tr>
<?php if ($is_current) { ?>
<tr>
- <td align="right"><?php echo $LOCKED_CB ?></td>
+ <td class="align-right"><?php echo $LOCKED_CB ?></td>
<td class="pageinfo"><?php echo _("Locked")?></td>
</tr>
<?php if (ENABLE_EXTERNAL_PAGES) { ?>
<tr>
- <td align="right" class="pageinfo"><?php echo _("Is External:") ?></td>
+ <td class="align-right pageinfo"><?php echo _("Is External:") ?></td>
<td><?php echo $page->get('external') ? _("Yes") : _("No") ?></td>
</tr>
<?php } ?>
<tr>
- <td align="right" class="pageinfo"><?php echo _("ACL type:") ?></td>
+ <td class="align-right pageinfo"><?php echo _("ACL type:") ?></td>
<td><?php echo $type ?></td>
</tr>
<tr>
- <td align="right" valign="top" class="pageinfo"><?php echo _("ACL:") ?></td>
+ <td class="align-right top pageinfo"><?php echo _("ACL:") ?></td>
<td><?php echo $perm->asAclLines() ?></td>
</tr>
<?php } ?>
@@ -157,7 +155,7 @@
if ($page->get('pagetype') == 'wikiblog') {
$pagetype []= _("Blog page");
}
-if ($page->getName() == _("InterWikiMap")) {
+if ($page->getName() == __("InterWikiMap")) {
$pagetype []= _("InterWikiMap");
}
if (isSubPage($page->getName())) {
@@ -166,8 +164,8 @@
<?php if (!empty($pagetype)) { $pagetype = implode(", ", $pagetype); ?>
<tr>
- <td align="right" class="pageinfo"><?php echo _("Page Type:")?></td>
- <td align="left"><?php echo $pagetype?></td>
+ <td class="align-right pageinfo"><?php echo _("Page Type:")?></td>
+ <td><?php echo $pagetype?></td>
</tr>
<?php } ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-09-23 16:08:15
|
Revision: 8118
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8118&view=rev
Author: vargenau
Date: 2011-09-23 16:08:09 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
Translate ":" (for French)
Modified Paths:
--------------
trunk/themes/default/templates/info.tmpl
Modified: trunk/themes/default/templates/info.tmpl
===================================================================
--- trunk/themes/default/templates/info.tmpl 2011-09-23 12:27:01 UTC (rev 8117)
+++ trunk/themes/default/templates/info.tmpl 2011-09-23 16:08:09 UTC (rev 8118)
@@ -54,14 +54,14 @@
$LOCKED_CB->setAttr('onclick', $clickcheckb);
}
- $label['date'] = _("Last Modified").':';
- $label['author'] = _("Last Author").':';
- $label['summary'] = _("Last Summary").':';
+ $label['date'] = _("Last Modified:");
+ $label['author'] = _("Last Author:");
+ $label['summary'] = _("Last Summary:");
} else {
$label['date'] = _("Saved on:");
- $label['author'] = _("Author").':';
- $label['summary'] = _("Summary").':';
+ $label['author'] = _("Author:");
+ $label['summary'] = _("Summary:");
}
$tableSummary = fmt("Statistics about %s.", $page->getName());
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