[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: wiki/template admin.php,1.1.1.1,1.2 common.php,
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: wiki/template admin.php,1.1.1.1,1.2 common.php,1.1.1.1,1.2 conflict.php,1.1.1.1,1.2 diff.php,1.1.1.1,1.2 edit.php,1.1.1.1,1.2 find.php,1.1.1.1,1.2 history.php,1.1.1.1,1.2 prefs.php,1.1.1.1,1.2 preview.php,1.1.1.1,1.2 rss.php,1.1.1.1,1.2 save.php,1.1.1.1,1.2 view.php,1.1.1.1,1.2 wiki.css,1.1.1.1,1.2 |
|
Date: |
Mon, 03 Mar 2003 08:37:08 -0500 |
Update of /cvsroot/phpgroupware/wiki/template
In directory subversions:/tmp/cvs-serv23134/template
Modified Files:
admin.php common.php conflict.php diff.php edit.php find.php
history.php prefs.php preview.php rss.php save.php view.php
wiki.css
Log Message:
make Axis-0.44 the new head-version
Index: admin.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/template/admin.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** admin.php 3 Mar 2003 13:00:42 -0000 1.1.1.1
--- admin.php 3 Mar 2003 13:37:05 -0000 1.2
***************
*** 1,32 ****
! <?php
! // $Id$
!
! require_once(TemplateDir . '/common.php');
!
! // The admin template is passed an associative array with the following
! // elements:
! //
! // html => A string containing the XHTML markup of the form to be
! // displayed.
!
! function template_admin($args)
! {
! template_common_prologue(array('norobots' => 1,
! 'title' => 'Administration',
! 'heading' => 'Administration',
! 'headlink' => '',
! 'headsufx' => '',
! 'toolbar' => 0));
! ?>
! <div id="body">
! <?php print $args['html']; ?>
! </div>
! <?php
! template_common_epilogue(array('twin' => '',
! 'edit' => '',
! 'editver' => 0,
! 'history' => '',
! 'timestamp' => '',
! 'nosearch' => 1));
! }
! ?>
--- 1,32 ----
! <?php
! // $Id$
!
! require_once(TemplateDir . '/common.php');
!
! // The admin template is passed an associative array with the following
! // elements:
! //
! // html => A string containing the XHTML markup of the form to be
! // displayed.
!
! function template_admin($args)
! {
! template_common_prologue(array('norobots' => 1,
! 'title' => 'Administration',
! 'heading' => 'Administration',
! 'headlink' => '',
! 'headsufx' => '',
! 'toolbar' => 0));
! ?>
! <div id="body">
! <?php print $args['html']; ?>
! </div>
! <?php
! template_common_epilogue(array('twin' => '',
! 'edit' => '',
! 'editver' => 0,
! 'history' => '',
! 'timestamp' => '',
! 'nosearch' => 1));
! }
! ?>
Index: common.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/template/common.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** common.php 3 Mar 2003 13:00:42 -0000 1.1.1.1
--- common.php 3 Mar 2003 13:37:05 -0000 1.2
***************
*** 79,83 ****
{ print html_toolbar_top(); }
?>
! <hr />
</div>
<?php
--- 79,83 ----
{ print html_toolbar_top(); }
?>
! <!--<hr align=left width=99% /> -->
</div>
<?php
***************
*** 110,119 ****
?>
<div id="footer">
! <hr />
<?php
if(!$args['nosearch'])
{
?>
! <form method="get" action="<?php print $FindScript; ?>">
<div class="form">
<?php
--- 110,119 ----
?>
<div id="footer">
! <hr align=left width=99% />
<?php
if(!$args['nosearch'])
{
?>
! <form method="get" action="<?php print $FindScript; ?>" name="thesearch">
<div class="form">
<?php
***************
*** 143,148 ****
{
?>
! <a href="<?php print historyURL($args['history']); ?>">View document
history</a><br />
! <?php
}
if($args['timestamp'])
--- 143,152 ----
{
?>
! <a href="<?php print historyURL($args['history']); ?>">View document
history</a>
! <input type="hidden" name="action" value="find" />
! <? if(!$args['nosearch']) { ?>
! | Search: <input type="text" name="find" size="20" />
! <? }
! echo "<br />";
}
if($args['timestamp'])
***************
*** 165,170 ****
{
?>
! <input type="hidden" name="action" value="find" />
! Search: <input type="text" name="find" size="20" />
</div>
</form>
--- 169,173 ----
{
?>
! <hr align=left width=99% />
</div>
</form>
***************
*** 178,182 ****
$size = ob_get_length();
! header("Content-Length: $size");
ob_end_flush();
}
--- 181,185 ----
$size = ob_get_length();
! ##header("Content-Length: $size");
ob_end_flush();
}
Index: conflict.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/template/conflict.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** conflict.php 3 Mar 2003 13:00:42 -0000 1.1.1.1
--- conflict.php 3 Mar 2003 13:37:05 -0000 1.2
***************
*** 1,81 ****
! <?php
! // $Id$
!
! require_once(TemplateDir . '/common.php');
!
! // The conflict template is passed an associative array with the following
! // elements:
! //
! // page => A string containing the name of the wiki page being edited.
! // text => A string containing the wiki markup of the version that was
! // saved while the user was editing the page.
! // html => A string containing the XHTML markup of the version of the
! // page that was saved while the user was editing the page.
! // usertext => A string containing the wiki markup of the text the user
! // tried to save.
! // timestamp => Timestamp of last edit to page.
! // nextver => An integer; the expected version of this document when
saved.
!
! function template_conflict($args)
! {
! global $EditRows, $EditCols, $UserName, $PrefsScript;
!
! template_common_prologue(array('norobots' => 1,
! 'title' => 'Editing ' . $args['page'],
! 'heading' => 'Editing ',
! 'headlink' => $args['page'],
! 'headsufx' => '',
! 'toolbar' => 1));
! ?>
! <div id="body">
! <p class="warning">
! Warning: since you started editing, this document has been changed by
someone
! else. Please merge your edits into the current version of this document.
! </p>
! <h1>Current Version</h1>
! <form method="post" action="<?php print saveURL($args['page']); ?>">
! <div class="form">
! <input type="submit" name="Save" value="Save" />
! <input type="submit" name="Preview" value="Preview" />
! <?php
! if($UserName != '')
! { print 'Your user name is ' . html_ref($UserName, $UserName); }
! else
! {
! ?> Visit <a href="<?php print $PrefsScript; ?>">Preferences</a> to set your
! user name<?php
! }
! ?><br />
! <input type="hidden" name="nextver" value="<?php print $args['nextver'];
?>" />
! <textarea name="document" rows="<?php
! print $EditRows; ?>" cols="<?php
! print $EditCols; ?>" wrap="virtual"><?php
! print str_replace('<', '<', str_replace('&', '&', $args['text']));
! ?></textarea><br />
! Summary of change:
! <input type="text" name="comment" size="40" value="" /><br />
! Add document to category:
! <input type="text" name="categories" size="40" value="" />
! <hr />
! <h1>Your changes</h1>
! <textarea name="discard" rows="<?php
! print $EditRows; ?>" cols="<?php
! print $EditCols; ?>" wrap="virtual"><?php
! print str_replace('<', '<', str_replace('&', '&',
$args['usertext']));
! ?></textarea><br />
! </div>
! </form>
! <h1>Preview of Current Version</h1>
! <?php
! print $args['html'];
! ?>
! </div>
! <?php
! template_common_epilogue(array('twin' => $args['page'],
! 'edit' => '',
! 'editver' => 0,
! 'history' => $args['page'],
! 'timestamp' => $args['timestamp'],
! 'nosearch' => 0));
! }
! ?>
--- 1,81 ----
! <?php
! // $Id$
!
! require_once(TemplateDir . '/common.php');
!
! // The conflict template is passed an associative array with the following
! // elements:
! //
! // page => A string containing the name of the wiki page being edited.
! // text => A string containing the wiki markup of the version that was
! // saved while the user was editing the page.
! // html => A string containing the XHTML markup of the version of the
! // page that was saved while the user was editing the page.
! // usertext => A string containing the wiki markup of the text the user
! // tried to save.
! // timestamp => Timestamp of last edit to page.
! // nextver => An integer; the expected version of this document when
saved.
!
! function template_conflict($args)
! {
! global $EditRows, $EditCols, $UserName, $PrefsScript;
!
! template_common_prologue(array('norobots' => 1,
! 'title' => 'Editing ' . $args['page'],
! 'heading' => 'Editing ',
! 'headlink' => $args['page'],
! 'headsufx' => '',
! 'toolbar' => 1));
! ?>
! <div id="body">
! <p class="warning">
! Warning: since you started editing, this document has been changed by
someone
! else. Please merge your edits into the current version of this document.
! </p>
! <h1>Current Version</h1>
! <form method="post" action="<?php print saveURL($args['page']); ?>">
! <div class="form">
! <input type="submit" name="Save" value="Save" />
! <input type="submit" name="Preview" value="Preview" />
! <?php
! if($UserName != '')
! { print 'Your user name is ' . html_ref($UserName, $UserName); }
! else
! {
! ?> Visit <a href="<?php print $PrefsScript; ?>">Preferences</a> to set your
! user name<?php
! }
! ?><br />
! <input type="hidden" name="nextver" value="<?php print $args['nextver'];
?>" />
! <textarea name="document" rows="<?php
! print $EditRows; ?>" cols="<?php
! print $EditCols; ?>" wrap="virtual"><?php
! print str_replace('<', '<', str_replace('&', '&', $args['text']));
! ?></textarea><br />
! Summary of change:
! <input type="text" name="comment" size="40" value="" /><br />
! Add document to category:
! <input type="text" name="categories" size="40" value="" />
! <hr />
! <h1>Your changes</h1>
! <textarea name="discard" rows="<?php
! print $EditRows; ?>" cols="<?php
! print $EditCols; ?>" wrap="virtual"><?php
! print str_replace('<', '<', str_replace('&', '&',
$args['usertext']));
! ?></textarea><br />
! </div>
! </form>
! <h1>Preview of Current Version</h1>
! <?php
! print $args['html'];
! ?>
! </div>
! <?php
! template_common_epilogue(array('twin' => $args['page'],
! 'edit' => '',
! 'editver' => 0,
! 'history' => $args['page'],
! 'timestamp' => $args['timestamp'],
! 'nosearch' => 0));
! }
! ?>
Index: diff.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/template/diff.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** diff.php 3 Mar 2003 13:00:42 -0000 1.1.1.1
--- diff.php 3 Mar 2003 13:37:05 -0000 1.2
***************
*** 1,38 ****
! <?php
! // $Id$
!
! require_once(TemplateDir . '/common.php');
!
! // The diff template is passed an associative array with the following
! // elements:
! //
! // page => A string containing the name of the wiki page being viewed.
! // diff_html => A string containing the XHTML markup for the differences.
! // html => A string containing the XHTML markup for the page itself.
! // editable => An integer. Will be nonzero if user is allowed to edit
page.
! // timestamp => Timestamp of last edit to page.
!
! function template_diff($args)
! {
! template_common_prologue(array('norobots' => 1,
! 'title' => 'Differences in ' .
$args['page'],
! 'heading' => 'Differences in ',
! 'headlink' => $args['page'],
! 'headsufx' => '',
! 'toolbar' => 1));
! ?>
! <div id="body">
! <strong>Difference between versions:</strong><br /><br />
! <?php print $args['diff_html']; ?>
! <hr />
! <?php print $args['html']; ?>
! </div>
! <?php
! template_common_epilogue(array('twin' => $args['page'],
! 'edit' => $args['page'],
! 'editver' => $args['editable'] ? 0 : -1,
! 'history' => $args['page'],
! 'timestamp' => $args['timestamp'],
! 'nosearch' => 0));
! }
! ?>
--- 1,38 ----
! <?php
! // $Id$
!
! require_once(TemplateDir . '/common.php');
!
! // The diff template is passed an associative array with the following
! // elements:
! //
! // page => A string containing the name of the wiki page being viewed.
! // diff_html => A string containing the XHTML markup for the differences.
! // html => A string containing the XHTML markup for the page itself.
! // editable => An integer. Will be nonzero if user is allowed to edit
page.
! // timestamp => Timestamp of last edit to page.
!
! function template_diff($args)
! {
! template_common_prologue(array('norobots' => 1,
! 'title' => 'Differences in ' .
$args['page'],
! 'heading' => 'Differences in ',
! 'headlink' => $args['page'],
! 'headsufx' => '',
! 'toolbar' => 1));
! ?>
! <div id="body">
! <strong>Difference between versions:</strong><br /><br />
! <?php print $args['diff_html']; ?>
! <hr />
! <?php print $args['html']; ?>
! </div>
! <?php
! template_common_epilogue(array('twin' => $args['page'],
! 'edit' => $args['page'],
! 'editver' => $args['editable'] ? 0 : -1,
! 'history' => $args['page'],
! 'timestamp' => $args['timestamp'],
! 'nosearch' => 0));
! }
! ?>
Index: edit.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/template/edit.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** edit.php 3 Mar 2003 13:00:42 -0000 1.1.1.1
--- edit.php 3 Mar 2003 13:37:05 -0000 1.2
***************
*** 24,33 ****
'headsufx' => '',
'toolbar' => 1));
?>
<div id="body">
! <form method="post" action="<?php print saveURL($args['page']); ?>">
<div class="form">
<input type="submit" name="Save" value="Save" />
<input type="submit" name="Preview" value="Preview" />
<?php
if($UserName != '')
--- 24,41 ----
'headsufx' => '',
'toolbar' => 1));
+ template_common_epilogue(array('twin' => $args['page'],
+ 'edit' => '',
+ 'editver' => '',
+ 'history' => $args['page'],
+ 'timestamp' => $args['timestamp'],
+ 'nosearch' => 0));
+
?>
<div id="body">
! <form method="post" name="editform" action="<?php print
saveURL($args['page']); ?>">
<div class="form">
<input type="submit" name="Save" value="Save" />
<input type="submit" name="Preview" value="Preview" />
+ <input type="submit" name="SaveAndContinue" value="Save & Continue" />
<?php
if($UserName != '')
***************
*** 57,61 ****
</div>
<?php
! template_common_epilogue(array('twin' => $args['page'],
'edit' => '',
'editver' => '',
--- 65,69 ----
</div>
<?php
! /* template_common_epilogue(array('twin' => $args['page'],
'edit' => '',
'editver' => '',
***************
*** 63,66 ****
--- 71,75 ----
'timestamp' => $args['timestamp'],
'nosearch' => 0));
+ */
}
?>
Index: find.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/template/find.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** find.php 3 Mar 2003 13:00:42 -0000 1.1.1.1
--- find.php 3 Mar 2003 13:37:05 -0000 1.2
***************
*** 1,33 ****
! <?php
! // $Id$
!
! require_once(TemplateDir . '/common.php');
!
! // The find template is passed an associative array with the following
! // elements:
! //
! // find => A string containing the text that was searched for.
! // pages => A string containing the XHTML markup for the list of pages
! // found containing the given text.
!
! function template_find($args)
! {
! template_common_prologue(array('norobots' => 1,
! 'title' => 'Find ' . $args['find'],
! 'heading' => 'Find ' . $args['find'],
! 'headlink' => '',
! 'headsufx' => '',
! 'toolbar' => 1));
! ?>
! <div id="body">
! <?php print $args['pages']; ?>
! </div>
! <?php
! template_common_epilogue(array('twin' => '',
! 'edit' => '',
! 'editver' => 0,
! 'history' => '',
! 'timestamp' => '',
! 'nosearch' => 0));
! }
! ?>
--- 1,33 ----
! <?php
! // $Id$
!
! require_once(TemplateDir . '/common.php');
!
! // The find template is passed an associative array with the following
! // elements:
! //
! // find => A string containing the text that was searched for.
! // pages => A string containing the XHTML markup for the list of pages
! // found containing the given text.
!
! function template_find($args)
! {
! template_common_prologue(array('norobots' => 1,
! 'title' => 'Find ' . $args['find'],
! 'heading' => 'Find ' . $args['find'],
! 'headlink' => '',
! 'headsufx' => '',
! 'toolbar' => 1));
! ?>
! <div id="body">
! <?php print $args['pages']; ?>
! </div>
! <?php
! template_common_epilogue(array('twin' => '',
! 'edit' => '',
! 'editver' => 0,
! 'history' => '',
! 'timestamp' => '',
! 'nosearch' => 0));
! }
! ?>
Index: history.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/template/history.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** history.php 3 Mar 2003 13:00:42 -0000 1.1.1.1
--- history.php 3 Mar 2003 13:37:05 -0000 1.2
***************
*** 1,55 ****
! <?php
! // $Id$
!
! require_once(TemplateDir . '/common.php');
!
! // The history template is passed an associative array with the following
! // elements:
! //
! // page => A string containing the name of the wiki page.
! // history => A string containing the XHTML markup for the history form.
! // diff => A string containing the XHTML markup for the changes made.
!
! function template_history($args)
! {
! global $DiffScript;
!
! template_common_prologue(array('norobots' => 1,
! 'title' => 'History of ' . $args['page'],
! 'heading' => 'History of ',
! 'headlink' => $args['page'],
! 'headsufx' => '',
! 'toolbar' => 1));
! ?>
! <div id="body">
! <form method="get" action="<?php print $DiffScript; ?>">
! <div class="form">
! <input type="hidden" name="action" value="diff" />
! <input type="hidden" name="page" value="<?php print $args['page']; ?>" />
! <table border="0">
! <tr><td><strong>Older</strong></td>
! <td><strong>Newer</strong></td><td></td></tr>
! <?php
! print $args['history'];
!
! ?>
! <tr><td colspan="3">
! <input type="submit" value="Compute Difference" /></td></tr>
! </table>
! </div>
! </form>
! <hr /><br />
!
! <strong>Changes by last author:</strong><br /><br />
!
! <?php print $args['diff']; ?>
! </div>
! <?php
! template_common_epilogue(array('twin' => $args['page'],
! 'edit' => '',
! 'editver' => 0,
! 'history' => '',
! 'timestamp' => '',
! 'nosearch' => 0));
! }
! ?>
--- 1,55 ----
! <?php
! // $Id$
!
! require_once(TemplateDir . '/common.php');
!
! // The history template is passed an associative array with the following
! // elements:
! //
! // page => A string containing the name of the wiki page.
! // history => A string containing the XHTML markup for the history form.
! // diff => A string containing the XHTML markup for the changes made.
!
! function template_history($args)
! {
! global $DiffScript;
!
! template_common_prologue(array('norobots' => 1,
! 'title' => 'History of ' . $args['page'],
! 'heading' => 'History of ',
! 'headlink' => $args['page'],
! 'headsufx' => '',
! 'toolbar' => 1));
! ?>
! <div id="body">
! <form method="get" action="<?php print $DiffScript; ?>">
! <div class="form">
! <input type="hidden" name="action" value="diff" />
! <input type="hidden" name="page" value="<?php print $args['page']; ?>" />
! <table border="0">
! <tr><td><strong>Older</strong></td>
! <td><strong>Newer</strong></td><td></td></tr>
! <?php
! print $args['history'];
!
! ?>
! <tr><td colspan="3">
! <input type="submit" value="Compute Difference" /></td></tr>
! </table>
! </div>
! </form>
! <hr /><br />
!
! <strong>Changes by last author:</strong><br /><br />
!
! <?php print $args['diff']; ?>
! </div>
! <?php
! template_common_epilogue(array('twin' => $args['page'],
! 'edit' => '',
! 'editver' => 0,
! 'history' => '',
! 'timestamp' => '',
! 'nosearch' => 0));
! }
! ?>
Index: prefs.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/template/prefs.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** prefs.php 3 Mar 2003 13:00:42 -0000 1.1.1.1
--- prefs.php 3 Mar 2003 13:37:05 -0000 1.2
***************
*** 1,83 ****
! <?php
! // $Id$
!
! require('parse/html.php');
! require_once(TemplateDir . '/common.php');
!
! function template_prefs()
! {
! global $PrefsScript, $HTTP_REFERER, $HistMax, $TimeZoneOff;
! global $AuthorDiff, $EditRows, $EditCols, $UserName, $DayLimit, $MinEntries;
!
! template_common_prologue(array('norobots' => 1,
! 'title' => 'Preferences',
! 'heading' => 'Preferences',
! 'headlink' => '',
! 'headsufx' => '',
! 'toolbar' => 0));
! ?>
! <div id="body">
! <form action="<?php print $PrefsScript; ?>" method="post">
! <div class="form">
! <input type="hidden" name="referrer" value="<?php print $HTTP_REFERER; ?>"
/>
!
! <strong>User name</strong><br /><br />
!
! This feature displays your name on RecentChanges to the right
! of pages you edit. If left blank, your IP address will be
! displayed instead.<br /><br />
! <input type="text" name="user" value="<?php print $UserName; ?>" /><br />
! <hr />
!
! <strong>Edit box</strong><br /><br />
! Rows: <input type="text" name="rows" value="<?php print $EditRows; ?>"
/><br />
! Columns: <input type="text" name="cols" value="<?php
! print $EditCols; ?>" /><br />
! <hr />
!
! <strong>History lists</strong><br /><br />
! Enter here the maximum number of entries to display in a document's history
! list.<br /><br />
! <input type="text" name="hist" value="<?php print $HistMax; ?>" /><br /><br
/>
!
! <strong>RecentChanges</strong><br /><br />
! Choose your current time here, so the server may figure out what time zone
! you are in.<br /><br />
! <select name="tzoff">
! <?php
! for($i = -23.5 * 60; $i <= 23.5 * 60; $i += 30)
! {
! ?>
! <option value="<?php print $i; ?>"<?php if($i == $TimeZoneOff) { print '
selected="selected"'; } ?>><?php
! print date('Y-m-d H:i', time() + $i * 60);
! ?></option>
! <?php
! }
! ?>
! </select><br /><br />
! Enter here the number of days of edits to display on RecentChanges or any
! other subscription list. Set this to zero if you wish to see all pages in
! RecentChanges, regardless of how recently they were edited.<br /><br />
! <input type="text" name="days" value="<?php print $DayLimit; ?>" /><br
/><br />
! <em>But</em> display at least this many entries in RecentChanges and other
! subscription lists:<br /><br />
! <input type="text" name="min" value="<?php print $MinEntries; ?>" /><br
/><br />
! <input type="checkbox" name="auth"<?php
! if($AuthorDiff) { print ' checked="checked"'; } ?> />
! History display should show <em>all</em> changes made by the latest
! author. Otherwise, show only the last change made.<br />
!
! <hr /><br />
! <input type="submit" name="Save" value="Save" />
! </div>
! </form>
! </div>
! <?php
! template_common_epilogue(array('twin' => '',
! 'edit' => '',
! 'editver' => 0,
! 'history' => '',
! 'timestamp' => '',
! 'nosearch' => 1));
! }
! ?>
--- 1,85 ----
! <?php
! // $Id$
!
! require('parse/html.php');
! require_once(TemplateDir . '/common.php');
!
! function template_prefs()
! {
! global $PrefsScript, $HTTP_REFERER, $HistMax, $TimeZoneOff;
! global $AuthorDiff, $EditRows, $EditCols, $UserName, $DayLimit, $MinEntries;
!
! template_common_prologue(array('norobots' => 1,
! 'title' => 'Preferences',
! 'heading' => 'Preferences',
! 'headlink' => '',
! 'headsufx' => '',
! 'toolbar' => 0));
! ?>
! <div id="body">
! <form action="<?php print $PrefsScript; ?>" method="post">
! <div class="form">
! <input type="hidden" name="referrer" value="<?php print $HTTP_REFERER; ?>"
/>
!
! <!-- <strong>User name</strong><br /><br />
!
! This feature displays your name on RecentChanges to the right
! of pages you edit. If left blank, your IP address will be
! displayed instead.<br /><br />
! <input type="text" name="user" value="-->
! Your username is "<?php print $UserName; ?>".<br><br>
! <!--" /><br />
! <hr align=left width=99% />-->
!
! <strong>Edit box</strong><br /><br />
! Rows: <input type="text" name="rows" value="<?php print $EditRows; ?>"
/><br />
! Columns: <input type="text" name="cols" value="<?php
! print $EditCols; ?>" /><br />
! <hr align=left width=99% />
!
! <strong>History lists</strong><br /><br />
! Enter here the maximum number of entries to display in a document's history
! list.<br /><br />
! <input type="text" name="hist" value="<?php print $HistMax; ?>" /><br /><br
/>
!
! <strong>RecentChanges</strong><br /><br />
! Choose your current time here, so the server may figure out what time zone
! you are in.<br /><br />
! <select name="tzoff">
! <?php
! for($i = -23.5 * 60; $i <= 23.5 * 60; $i += 30)
! {
! ?>
! <option value="<?php print $i; ?>"<?php if($i == $TimeZoneOff) { print '
selected="selected"'; } ?>><?php
! print date('Y-m-d H:i', time() + $i * 60);
! ?></option>
! <?php
! }
! ?>
! </select><br /><br />
! Enter here the number of days of edits to display on RecentChanges or any
! other subscription list. Set this to zero if you wish to see all pages in
! RecentChanges, regardless of how recently they were edited.<br /><br />
! <input type="text" name="days" value="<?php print $DayLimit; ?>" /><br
/><br />
! <em>But</em> display at least this many entries in RecentChanges and other
! subscription lists:<br /><br />
! <input type="text" name="min" value="<?php print $MinEntries; ?>" /><br
/><br />
! <input type="checkbox" name="auth"<?php
! if($AuthorDiff) { print ' checked="checked"'; } ?> />
! History display should show <em>all</em> changes made by the latest
! author. Otherwise, show only the last change made.<br />
!
! <hr align=left width=99% /><br />
! <input type="submit" name="Save" value="Save" />
! </div>
! </form>
! </div>
! <?php
! template_common_epilogue(array('twin' => '',
! 'edit' => '',
! 'editver' => 0,
! 'history' => '',
! 'timestamp' => '',
! 'nosearch' => 1));
! }
! ?>
Index: preview.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/template/preview.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** preview.php 3 Mar 2003 13:00:42 -0000 1.1.1.1
--- preview.php 3 Mar 2003 13:37:05 -0000 1.2
***************
*** 25,34 ****
'headsufx' => '',
'toolbar' => 1));
?>
<div id="body">
! <form method="post" action="<?php print saveURL($args['page']); ?>">
<div class="form">
<input type="submit" name="Save" value="Save" />
<input type="submit" name="Preview" value="Preview" />
<?php
if($UserName != '')
--- 25,41 ----
'headsufx' => '',
'toolbar' => 1));
+ template_common_epilogue(array('twin' => $args['page'],
+ 'edit' => '',
+ 'editver' => 0,
+ 'history' => $args['page'],
+ 'timestamp' => $args['timestamp'],
+ 'nosearch' => 0));
?>
<div id="body">
! <form method="post" name="editform" action="<?php print
saveURL($args['page']); ?>">
<div class="form">
<input type="submit" name="Save" value="Save" />
<input type="submit" name="Preview" value="Preview" />
+ <input type="submit" name="SaveAndContinue" value="Save & Continue" />
<?php
if($UserName != '')
***************
*** 59,67 ****
</form>
<h1>Preview</h1>
! <hr />
<?php print $args['html']; ?>
</div>
<?php
! template_common_epilogue(array('twin' => $args['page'],
'edit' => '',
'editver' => 0,
--- 66,74 ----
</form>
<h1>Preview</h1>
! <hr align=left width=99% />
<?php print $args['html']; ?>
</div>
<?php
! /* template_common_epilogue(array('twin' => $args['page'],
'edit' => '',
'editver' => 0,
***************
*** 69,72 ****
--- 76,80 ----
'timestamp' => $args['timestamp'],
'nosearch' => 0));
+ */
}
?>
Index: rss.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/template/rss.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** rss.php 3 Mar 2003 13:00:42 -0000 1.1.1.1
--- rss.php 3 Mar 2003 13:37:05 -0000 1.2
***************
*** 1,55 ****
! <?php
! // $Id$
!
! // The RSS template is passed an associative array with the following
! // elements:
! //
! // itemseq => A string containing the rdf:li elements for the syndication.
! // itemdesc => A string containing the item elements for the syndication.
!
! function template_rss($args)
! {
! global $ScriptBase, $WikiName, $MetaDescription, $InterWikiPrefix;
! global $Charset;
!
! header('Content-type: text/plain');
! ?>
! <?php print '<?xml '; ?>version="1.0" encoding="<?php print $Charset; ?>"?>
! <rdf:RDF
! xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
! xmlns="http://purl.org/rss/1.0/";
! xmlns:dc="http://purl.org/dc/elements/1.1/";
! xmlns:wiki="http://purl.org/rss/1.0/modules/wiki/";
! >
! <!--
! Add a "days=nnn" URL parameter to get nnn days of information
! (the default is 2). Use days=-1 to show entire history.
! Add a "min=nnn" URL parameter to force a minimum of nnn entries
! in the output (the default is 10).
! -->
! <channel rdf:about="<?php print $ScriptBase; ?>">
! <title><?php print $WikiName; ?></title>
! <link><?php print $ScriptBase; ?></link>
! <description><?php print $MetaDescription; ?></description>
! <wiki:interwiki>
! <rdf:Description link="<?php print $ScriptBase . '?'; ?>">
! <rdf:value><?php print $InterWikiPrefix; ?></rdf:value>
! </rdf:Description>
! </wiki:interwiki>
! <items>
! <rdf:Seq>
! <?php
! print $args['itemseq'];
! ?>
! </rdf:Seq>
! </items>
! </channel>
!
! <?php
! print $args['itemdesc'];
! ?>
!
! </rdf:RDF>
! <?php
! }
! ?>
--- 1,55 ----
! <?php
! // $Id$
!
! // The RSS template is passed an associative array with the following
! // elements:
! //
! // itemseq => A string containing the rdf:li elements for the syndication.
! // itemdesc => A string containing the item elements for the syndication.
!
! function template_rss($args)
! {
! global $ScriptBase, $WikiName, $MetaDescription, $InterWikiPrefix;
! global $Charset;
!
! header('Content-type: text/plain');
! ?>
! <?php print '<?xml '; ?>version="1.0" encoding="<?php print $Charset; ?>"?>
! <rdf:RDF
! xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
! xmlns="http://purl.org/rss/1.0/";
! xmlns:dc="http://purl.org/dc/elements/1.1/";
! xmlns:wiki="http://purl.org/rss/1.0/modules/wiki/";
! >
! <!--
! Add a "days=nnn" URL parameter to get nnn days of information
! (the default is 2). Use days=-1 to show entire history.
! Add a "min=nnn" URL parameter to force a minimum of nnn entries
! in the output (the default is 10).
! -->
! <channel rdf:about="<?php print $ScriptBase; ?>">
! <title><?php print $WikiName; ?></title>
! <link><?php print $ScriptBase; ?></link>
! <description><?php print $MetaDescription; ?></description>
! <wiki:interwiki>
! <rdf:Description link="<?php print $ScriptBase . '?'; ?>">
! <rdf:value><?php print $InterWikiPrefix; ?></rdf:value>
! </rdf:Description>
! </wiki:interwiki>
! <items>
! <rdf:Seq>
! <?php
! print $args['itemseq'];
! ?>
! </rdf:Seq>
! </items>
! </channel>
!
! <?php
! print $args['itemdesc'];
! ?>
!
! </rdf:RDF>
! <?php
! }
! ?>
Index: save.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/template/save.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** save.php 3 Mar 2003 13:00:42 -0000 1.1.1.1
--- save.php 3 Mar 2003 13:37:05 -0000 1.2
***************
*** 1,18 ****
! <?php
! // $Id$
!
! // The save template is passed an associative array with the following
! // elements:
! //
! // page => A string containing the name of the wiki page being saved.
! // text => A string containing the wiki markup for the given page.
!
! function template_save($args)
! {
! // You might use this to put up some sort of "thank-you" page like Ward
! // does in WikiWiki, or to display a list of words that fail spell-check.
! // For now, we simply redirect to the view action for this page.
!
! header('Location: ' . viewURL($args['page']));
! }
! ?>
--- 1,18 ----
! <?php
! // $Id$
!
! // The save template is passed an associative array with the following
! // elements:
! //
! // page => A string containing the name of the wiki page being saved.
! // text => A string containing the wiki markup for the given page.
!
! function template_save($args)
! {
! // You might use this to put up some sort of "thank-you" page like Ward
! // does in WikiWiki, or to display a list of words that fail spell-check.
! // For now, we simply redirect to the view action for this page.
!
! header('Location: ' . viewURL($args['page']));
! }
! ?>
Index: view.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/template/view.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** view.php 3 Mar 2003 13:00:42 -0000 1.1.1.1
--- view.php 3 Mar 2003 13:37:05 -0000 1.2
***************
*** 25,28 ****
--- 25,36 ----
: '',
'toolbar' => 1));
+ template_common_epilogue(array('twin' => $args['page'],
+ 'edit' => $args['page'],
+ 'editver' => !$args['editable'] ? -1
+ : ($args['archive']
+ ? $args['version'] : 0),
+ 'history' => $args['page'],
+ 'timestamp' => $args['timestamp'],
+ 'nosearch' => 0));
?>
***************
*** 31,35 ****
</div>
<?php
! template_common_epilogue(array('twin' => $args['page'],
'edit' => $args['page'],
'editver' => !$args['editable'] ? -1
--- 39,43 ----
</div>
<?php
! template_common_epilogue(array('twin' => $args['page'],
'edit' => $args['page'],
'editver' => !$args['editable'] ? -1
***************
*** 38,42 ****
'history' => $args['page'],
'timestamp' => $args['timestamp'],
! 'nosearch' => 0));
}
?>
--- 46,50 ----
'history' => $args['page'],
'timestamp' => $args['timestamp'],
! 'nosearch' => 1));
}
?>
Index: wiki.css
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/template/wiki.css,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** wiki.css 3 Mar 2003 13:00:42 -0000 1.1.1.1
--- wiki.css 3 Mar 2003 13:37:05 -0000 1.2
***************
*** 32,36 ****
{ margin-bottom: 0; }
textarea
! { width: 100%; }
dl, ul, ol
{ margin-top: 0px;
--- 32,36 ----
{ margin-bottom: 0; }
textarea
! { width: 95%; }
dl, ul, ol
{ margin-top: 0px;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: wiki/template admin.php,1.1.1.1,1.2 common.php,1.1.1.1,1.2 conflict.php,1.1.1.1,1.2 diff.php,1.1.1.1,1.2 edit.php,1.1.1.1,1.2 find.php,1.1.1.1,1.2 history.php,1.1.1.1,1.2 prefs.php,1.1.1.1,1.2 preview.php,1.1.1.1,1.2 rss.php,1.1.1.1,1.2 save.php,1.1.1.1,1.2 view.php,1.1.1.1,1.2 wiki.css,1.1.1.1,1.2,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: wiki - Imported sources
- Next by Date:
[Phpgroupware-cvs] CVS: wiki/lib category.php,1.1.1.1,1.2 db.php,1.1.1.1,1.2 defaults.php,1.1.1.1,1.2 diff.php,1.1.1.1,1.2 headers.php,1.1.1.1,1.2 init.php,1.1.1.1,1.2 main.php,1.1.1.1,1.2 messages.php,1.1.1.1,1.2 page.php,1.1.1.1,1.2 pagestore.php,1.1.1.1,1.2 rate.php,1.1.1.1,1.2 url.php,1.1.1.1,1.2
- Previous by thread:
[Phpgroupware-cvs] CVS: wiki - Imported sources
- Next by thread:
[Phpgroupware-cvs] CVS: wiki/lib category.php,1.1.1.1,1.2 db.php,1.1.1.1,1.2 defaults.php,1.1.1.1,1.2 diff.php,1.1.1.1,1.2 headers.php,1.1.1.1,1.2 init.php,1.1.1.1,1.2 main.php,1.1.1.1,1.2 messages.php,1.1.1.1,1.2 page.php,1.1.1.1,1.2 pagestore.php,1.1.1.1,1.2 rate.php,1.1.1.1,1.2 url.php,1.1.1.1,1.2
- Index(es):