From: <ce...@us...> - 2004-01-08 13:23:59
|
Update of /cvsroot/csseditor/htdocs/templates In directory sc8-pr-cvs1:/tmp/cvs-serv27993 Modified Files: admin.php common.php conflict.php diff.php edit.php find.php history.php latex.php prefs.php preview.php rss.php save.php view.php Removed Files: wiki.css Log Message: Adaption of the Tavi templates to the csseditor site layout Index: admin.php =================================================================== RCS file: /cvsroot/csseditor/htdocs/templates/admin.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: common.php =================================================================== RCS file: /cvsroot/csseditor/htdocs/templates/common.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** common.php 8 Jan 2004 13:19:36 -0000 1.1 --- common.php 8 Jan 2004 13:23:56 -0000 1.2 *************** *** 20,25 **** // 'toolbar' => An integer; if nonzero, the toolbar will be displayed. ! function template_common_prologue($args) ! { global $WikiName, $HomePage, $WikiLogo, $MetaKeywords, $MetaDescription; global $StyleScript, $SeparateTitleWords, $SeparateHeaderWords; --- 20,24 ---- // 'toolbar' => An integer; if nonzero, the toolbar will be displayed. ! function template_common_prologue($args) { global $WikiName, $HomePage, $WikiLogo, $MetaKeywords, $MetaDescription; global $StyleScript, $SeparateTitleWords, $SeparateHeaderWords; *************** *** 29,88 **** preg_match("/^(.*)\//", $args['headlink'], $path); // Find startpath of page ! ob_start(); // Start buffering output. ! if($SeparateTitleWords) ! { $args['title'] = html_split_name($args['title']); } ! ?> ! <!DOCTYPE html ! PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" ! "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ! <html xmlns = "http://www.w3.org/1999/xhtml"> ! <head> ! <meta name="KEYWORDS" content="<?php print $MetaKeywords . $keywords; ?>" /> ! <meta name="DESCRIPTION" content="<?php print $MetaDescription; ?>" /> ! <?php ! if($args['norobots']) ! { ! ?> ! <meta name="ROBOTS" content="NOINDEX, NOFOLLOW" /> ! <?php } ?> ! <link rel="STYLESHEET" href="<?php print $StyleScript; ?>" type="text/css" /> ! <title><?php print $args['title'] . ' - ' . $WikiName; ?></title> ! </head> ! <body> ! <div id="header"> ! <div class="logo"> ! <a href="<?php print viewURL($HomePage); ?>"><img ! src="<?php print $WikiLogo; ?>" alt="[Home]" /></a> </div> ! <h1> ! <?php print $args['heading']; ! if($args['headlink'] != '') ! { ! ?> ! <a class="title" href="<?php print findURL($args['headlink']); ?>"> ! <?php ! if($SeparateHeaderWords) ! { print html_split_name($args['headlink']); } ! else ! { print $args['headlink']; } ! ?></a> ! <?php ! } print $args['headsufx']; ! ?> ! </h1> ! <div id="toolbar-top"> ! <?php ! if($args['toolbar']) ! { print html_toolbar_top($path[1]); } ! ?> ! ! </div> ! <hr /> ! </div> <?php } --- 28,103 ---- preg_match("/^(.*)\//", $args['headlink'], $path); // Find startpath of page ! ob_start(); // Start buffering output. ! if ($SeparateTitleWords) { ! $args['title'] = html_split_name($args['title']); } ?> ! <!DOCTYPE html ! PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" ! "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ! <html xmlns="http://www.w3.org/1999/xhtml"> ! <head> ! <base href="http://localhost/~chris/csseditor/wiki"/> ! <meta name="keywords" content="<?php print $MetaKeywords . $keywords; ?>" /> ! <meta name="description" content="<?php print $MetaDescription; ?>" /> ! <?php if($args['norobots']) { ?> ! <meta name="robots" content="noindex, nofollow" /> ! <?php } ?> ! <link rel="stylesheet" href="style/wiki.css" type="text/css"/> ! <title><?php print $args['title'] . ' - ' . $WikiName; ?></title> ! </head> ! <body> ! <div id="banner"> ! <a id="sflogo" href="http://sourceforge.net/"></a> ! <h1>CSS Editor (Eclipse Plugin)</h1> </div> ! <div id="navigation"> ! <div class="navheader"> ! <a href="/~chris/csseditor/">Home</a> ! </div> ! <ul> ! <li><a href="/~chris/csseditor/wiki/">Documentation</a></li> ! <li><a href="http://sourceforge.net/project/showfiles.php?group_id=97094">Downloads</a></li> ! <li><a href="http://sourceforge.net/forum/?group_id=97094">Forums</a></li> ! <li><a href="http://sourceforge.net/mail/?group_id=97094">Mailing Lists</a></li> ! <li><a href="http://sourceforge.net/tracker/?group_id=97094">Issue Tracker</a></li> ! <li><a href="http://sourceforge.net/cvs/?group_id=97094">CVS</a></li> ! </ul> ! </div> ! <div id="content"> ! <?php if(!$args['nosearch']) { ?> ! <div id="search"> ! <form method="get" action="<?php print $FindScript; ?>"> ! <input type="hidden" name="action" value="find" /> ! <label for="find"><?php print TMPL_Search; ?></label> ! <input type="text" name="find" size="20" /> ! </form> ! </div> ! <?php } ?> ! <h1> ! <?php print $args['heading']; ! if ($args['headlink'] != '') { ! ?> ! <a href="<?php print findURL($args['headlink']); ?>"> ! <?php ! if ($SeparateHeaderWords) { ! print html_split_name($args['headlink']); ! } else { ! print $args['headlink']; ! } ! ?></a> ! <?php } print $args['headsufx']; ! ?> ! </h1> ! <div id="toolbar-top"> ! <?php ! if ($args['toolbar']) { ! print html_toolbar_top($path[1]); ! } ! ?> ! </div> <?php } *************** *** 108,172 **** // 'nosearch' => An integer; if nonzero, the search form will not appear. ! function template_common_epilogue($args) ! { global $FindScript, $pagestore; - - ?> - <div id="footer"> - <hr /> - <div id="toolbar-bottom"> - <?php - if($args['edit']) - { - if($args['editver'] == 0) - { - echo '<a href="'. editUrl($args['edit']) . '">'.TMPL_EditDocument.'</a>'; - } - else if($args['editver'] == -1) - { - echo TMPL_NoEditDocument; - } - else - { - echo '<a href="' . editUrl($args['edit'], $args['editver']) . '">'. - TMPL_EditArchiveVersion . '</a>'; - } - - if($args['history']) - { print ' | '; } - } - if($args['history']) - { - echo '<a href="'. historyURL($args['history']). '">'. - TMPL_ViewDocHistory . '</a><br />'; - } - if($args['timestamp']) - { - echo "\n</div>\n". TMPL_DocLastModified . ' '. - html_time($args['timestamp']) . '<br />'; - } - if($args['twin'] != '') - { - if(count($twin = $pagestore->twinpages($args['twin']))) - { - echo TMPL_TwinPages . ' '; - for($i = 0; $i < count($twin); $i++) - { print html_twin($twin[$i][0], $twin[$i][1]) . ' <br />'; } - } - } - if(!$args['nosearch']) - { ?> ! <form method="get" action="<?php print $FindScript; ?>"> ! <div class="form"> ! <input type="hidden" name="action" value="find" /> ! <?php print TMPL_Search; ?> <input type="text" name="find" size="20" /> ! </div> ! </form> ! <?php ! } ! ?> ! </div> ! </body> </html> <?php --- 123,166 ---- // 'nosearch' => An integer; if nonzero, the search form will not appear. ! function template_common_epilogue($args) { global $FindScript, $pagestore; ?> ! <div id="footer"> ! <div id="toolbar-bottom"> ! <?php ! if($args['edit']) { ! if($args['editver'] == 0) { ! echo '<a href="'. editUrl($args['edit']) . '">'.TMPL_EditDocument.'</a>'; ! } else if($args['editver'] == -1) { ! echo TMPL_NoEditDocument; ! } else { ! echo '<a href="' . editUrl($args['edit'], $args['editver']) . '">'. ! TMPL_EditArchiveVersion . '</a>'; ! } ! if($args['history']) { ! print ' | '; ! } ! } ! if($args['history']) { ! echo '<a href="'. historyURL($args['history']). '">'. ! TMPL_ViewDocHistory . '</a><br />'; ! } ! if($args['twin'] != '') { ! if(count($twin = $pagestore->twinpages($args['twin']))) { ! echo TMPL_TwinPages . ' '; ! for($i = 0; $i < count($twin); $i++) { ! print html_twin($twin[$i][0], $twin[$i][1]) . ' <br />'; ! } ! } ! } ?> ! </div> ! <?php if($args['timestamp']) { ?> ! <span class="timestamp"> ! <?php echo TMPL_DocLastModified . ' '. html_time($args['timestamp']); ?> ! </span> ! <?php } ?> ! </div> ! </div> ! </body> </html> <?php Index: conflict.php =================================================================== RCS file: /cvsroot/csseditor/htdocs/templates/conflict.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: diff.php =================================================================== RCS file: /cvsroot/csseditor/htdocs/templates/diff.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** diff.php 8 Jan 2004 13:19:36 -0000 1.1 --- diff.php 8 Jan 2004 13:23:56 -0000 1.2 *************** *** 22,31 **** 'toolbar' => 1)); ?> ! <div id="body"> ! <strong><?php echo TMPL_DifferenceBetweenVersions; ?></strong><br /><br /> <?php print $args['diff_html']; ?> - <hr /> - <?php print $args['html']; ?> - </div> <?php template_common_epilogue(array('twin' => $args['page'], --- 22,27 ---- 'toolbar' => 1)); ?> ! <h2><?php echo TMPL_DifferenceBetweenVersions; ?></h2> <?php print $args['diff_html']; ?> <?php template_common_epilogue(array('twin' => $args['page'], Index: edit.php =================================================================== RCS file: /cvsroot/csseditor/htdocs/templates/edit.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** edit.php 8 Jan 2004 13:19:36 -0000 1.1 --- edit.php 8 Jan 2004 13:23:56 -0000 1.2 *************** *** 25,33 **** 'toolbar' => 1)); ?> - <div id="body"> <form method="post" action="<?php print saveURL($args['page']); ?>"> ! <div class="form"> ! <input type="submit" name="Save" value="<?php echo TMPL_ButtonSave; ?>" /> ! <input type="submit" name="Preview" value="<?php echo TMPL_ButtonPreview; ?>" /> <?php if($UserName != '') --- 25,33 ---- 'toolbar' => 1)); ?> <form method="post" action="<?php print saveURL($args['page']); ?>"> ! <input type="submit" name="Save" value="<?php echo TMPL_ButtonSave; ?>" /> ! <input type="submit" name="Preview" value="<?php echo TMPL_ButtonPreview; ?>" /> ! <input type="button" value="Cancel" onclick="history.back()" /> ! <span class="userinfo"> <?php if($UserName != '') *************** *** 35,39 **** else { echo TMPL_VisitPrefs . "\n"; } ! ?><br /> <input type="hidden" name="nextver" value="<?php print $args['nextver']; ?>" /> <?php if($args['archive']) --- 35,39 ---- else { echo TMPL_VisitPrefs . "\n"; } ! ?></span><br /> <input type="hidden" name="nextver" value="<?php print $args['nextver']; ?>" /> <?php if($args['archive']) *************** *** 41,56 **** <input type="hidden" name="archive" value="1" /> <?php }?> ! <textarea name="document" rows="<?php print $EditRows; ?>" cols="<?php print $EditCols; ?>" wrap="virtual"><?php print str_replace('<', '<', str_replace('&', '&', $args['text'])); ?></textarea><br /> ! <?php echo TMPL_SummaryOfChange; ?> <input type="text" name="comment" size="40" value="" /><br /> ! <?php echo TMPL_AddToCategory; ?> <input type="text" name="categories" size="40" value="" /> - </div> </form> - </div> <?php template_common_epilogue(array('twin' => $args['page'], --- 41,54 ---- <input type="hidden" name="archive" value="1" /> <?php }?> ! <textarea id="document" name="document" rows="<?php print $EditRows; ?>" cols="<?php print $EditCols; ?>" wrap="virtual"><?php print str_replace('<', '<', str_replace('&', '&', $args['text'])); ?></textarea><br /> ! <label for="comment"><?php echo TMPL_SummaryOfChange; ?></label> <input type="text" name="comment" size="40" value="" /><br /> ! <label for="categories"><?php echo TMPL_AddToCategory; ?></label> <input type="text" name="categories" size="40" value="" /> </form> <?php template_common_epilogue(array('twin' => $args['page'], Index: find.php =================================================================== RCS file: /cvsroot/csseditor/htdocs/templates/find.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** find.php 8 Jan 2004 13:19:36 -0000 1.1 --- find.php 8 Jan 2004 13:23:56 -0000 1.2 *************** *** 20,26 **** 'toolbar' => 1)); ?> - <div id="body"> <?php print $args['pages']; ?> - </div> <?php template_common_epilogue(array('twin' => '', --- 20,24 ---- Index: history.php =================================================================== RCS file: /cvsroot/csseditor/htdocs/templates/history.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** history.php 8 Jan 2004 13:19:36 -0000 1.1 --- history.php 8 Jan 2004 13:23:56 -0000 1.2 *************** *** 22,48 **** '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><?php echo TMPL_Older; ?></strong></td> ! <td><strong><?php echo TMPL_Newer; ?></strong></td><td></td></tr> ! <?php ! print $args['history']; ! ! ?> ! <tr><td colspan="3"> ! <input type="submit" value="<?php echo TMPL_ButtonComputeDifference; ?>" /></td></tr> ! </table> ! </div> ! </form> ! <hr /><br /> ! ! <strong><?php echo TMPL_ChangesLastAuthor; ?></strong><br /><br /> ! <?php print $args['diff']; ?> - </div> <?php template_common_epilogue(array('twin' => $args['page'], --- 22,46 ---- 'toolbar' => 1)); ?> ! <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> ! <th><?php echo TMPL_Older; ?></th> ! <th><?php echo TMPL_Newer; ?></th> ! <th></th> ! </tr> ! <?php print $args['history']; ?> ! <tr> ! <td colspan="3"> ! <input type="submit" value="<?php echo TMPL_ButtonComputeDifference; ?>" /> ! </td> ! </tr> ! </table> ! </div> ! </form> ! <h2><?php echo TMPL_ChangesLastAuthor; ?></h2> <?php print $args['diff']; ?> <?php template_common_epilogue(array('twin' => $args['page'], Index: latex.php =================================================================== RCS file: /cvsroot/csseditor/htdocs/templates/latex.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: prefs.php =================================================================== RCS file: /cvsroot/csseditor/htdocs/templates/prefs.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** prefs.php 8 Jan 2004 13:19:36 -0000 1.1 --- prefs.php 8 Jan 2004 13:23:56 -0000 1.2 *************** *** 17,47 **** '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 --- 17,48 ---- 'toolbar' => 0)); ?> ! <form action="<?php print $PrefsScript; ?>" method="post"> <input type="hidden" name="referrer" value="<?php print $HTTP_REFERER; ?>" /> ! <h2>User name</h2> ! <p> ! This feature displays your name on RecentChanges to the right ! of pages you edit. If left blank, your IP address will be ! displayed instead. ! </p> ! <input type="text" name="user" value="<?php print $UserName; ?>" /> ! <h2>Edit box</h2> ! <p> ! Here you can set the size of the text area used to edit pages. Note that in ! most browsers, the width (column number) of the text area will be ! automatically be adapted to the size of the browser window. ! </p> ! <label for="rows">Rows:</label> <input type="text" name="rows" size="3" value="<?php print $EditRows; ?>" /><br /> ! <label for="cols">Columns:</label> <input type="text" name="cols" size="3" value="<?php print $EditCols; ?>" /> ! <h2>History lists</h2> ! <p> ! Enter here the maximum number of entries to display in a document's history ! list. ! </p> ! <input type="text" name="hist" size="3" value="<?php print $HistMax; ?>" /> ! <h2>Recent Changes</h2> ! <p> ! Choose your current time here, so the server may figure out what time zone ! you are in. ! </p> <select name="tzoff"> <?php *************** *** 55,76 **** } ?> ! </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' => '', --- 56,83 ---- } ?> ! </select> ! <p> ! 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. ! </p> ! <input type="text" name="days" size="3" value="<?php print $DayLimit; ?>" /> ! <p> ! <em>But</em> display at least this many entries in RecentChanges and other ! subscription lists: ! </p> ! <input type="text" name="min" size="3" value="<?php print $MinEntries; ?>" /> ! <p> ! <input type="checkbox" name="auth"<?php ! if($AuthorDiff) { print ' checked="checked"'; } ?> /> ! <label for="auth"> ! History display should show <em>all</em> changes made by the latest ! author. Otherwise, show only the last change made. ! </label> ! </p> ! <hr /> <input type="submit" name="Save" value="Save" /> ! <input type="button" value="Cancel" onclick="history.back()"/> ! </form> <?php template_common_epilogue(array('twin' => '', Index: preview.php =================================================================== RCS file: /cvsroot/csseditor/htdocs/templates/preview.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** preview.php 8 Jan 2004 13:19:36 -0000 1.1 --- preview.php 8 Jan 2004 13:23:56 -0000 1.2 *************** *** 26,62 **** 'toolbar' => 1)); ?> ! <div id="body"> ! <form method="post" action="<?php print saveURL($args['page']); ?>"> ! <div class="form"> ! <input type="submit" name="Save" value="<?php echo TMPL_ButtonSave; ?>" /> ! <input type="submit" name="Preview" value="<?php echo TMPL_ButtonPreview; ?>" /> ! <?php ! if($UserName != '') ! { print TMPL_YourUsername . ' '. html_ref($UserName, $UserName); } ! else ! { echo TMPL_VisitPrefs . "\n"; } ! ?><br /> ! <input type="hidden" name="nextver" value="<?php print $args['nextver']; ?>" /> ! <?php if($args['archive']) ! {?> ! <input type="hidden" name="archive" value="1" /> ! <?php }?> ! <textarea name="document" rows="<?php ! print $EditRows; ?>" cols="<?php ! print $EditCols; ?>" wrap="virtual"><?php ! print str_replace('<', '<', str_replace('&', '&', $args['text'])); ! ?></textarea><br /> ! <?php echo TMPL_SummaryOfChange; ?> ! <input type="text" name="comment" size="40" value="<?php ! print $comment; ?>" /><br /> ! <?php echo TMPL_AddToCategory; ?> ! <input type="text" name="categories" size="40" value="<?php ! print $categories; ?>" /> ! </div> </form> - <h1><?php echo TMPL_Preview; ?></h1> - <hr /> <?php print $args['html']; ?> - </div> <?php template_common_epilogue(array('twin' => $args['page'], --- 26,33 ---- 'toolbar' => 1)); ?> ! <form onsubmit="history.back()"> ! <input type="submit" value="Back"/> </form> <?php print $args['html']; ?> <?php template_common_epilogue(array('twin' => $args['page'], Index: rss.php =================================================================== RCS file: /cvsroot/csseditor/htdocs/templates/rss.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: save.php =================================================================== RCS file: /cvsroot/csseditor/htdocs/templates/save.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: view.php =================================================================== RCS file: /cvsroot/csseditor/htdocs/templates/view.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 --- wiki.css DELETED --- |