From: <var...@us...> - 2009-07-17 09:07:23
|
Revision: 7044 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7044&view=rev Author: vargenau Date: 2009-07-17 09:07:16 +0000 (Fri, 17 Jul 2009) Log Message: ----------- Add fieldset Modified Paths: -------------- trunk/lib/purgepage.php trunk/lib/removepage.php Modified: trunk/lib/purgepage.php =================================================================== --- trunk/lib/purgepage.php 2009-07-16 12:58:22 UTC (rev 7043) +++ trunk/lib/purgepage.php 2009-07-17 09:07:16 UTC (rev 7044) @@ -22,26 +22,23 @@ $purgeB = Button('submit:verify', _("Purge Page"), 'wikiadmin'); $cancelB = Button('submit:cancel', _("Cancel"), 'button'); // use generic wiki button look - $html = HTML(HTML::p(fmt("You are about to purge '%s'!", $pagelink)), + $fieldset = HTML::fieldset(HTML::p(fmt("You are about to purge '%s'!", $pagelink)), HTML::form(array('method' => 'post', 'action' => $request->getPostURL()), HiddenInputs(array('currentversion' => $version, 'pagename' => $page->getName(), 'action' => 'purge')), - HTML::div(array('class' => 'toolbar'), $purgeB, $WikiTheme->getButtonSeparator(), - $cancelB)), - HTML::hr() + $cancelB)) ); $sample = HTML::div(array('class' => 'transclusion')); // simple and fast preview expanding only newlines foreach (explode("\n", firstNWordsOfContent(100, $current->getPackedContent())) as $s) { $sample->pushContent($s, HTML::br()); } - $html->pushContent(HTML::div(array('class' => 'wikitext'), - $sample)); + $html = HTML($fieldset, HTML::div(array('class' => 'wikitext'), $sample)); } elseif ($request->getArg('currentversion') != $version) { $html = HTML(HTML::p(array('class' => 'error'), (_("Someone has edited the page!"))), Modified: trunk/lib/removepage.php =================================================================== --- trunk/lib/removepage.php 2009-07-16 12:58:22 UTC (rev 7043) +++ trunk/lib/removepage.php 2009-07-17 09:07:16 UTC (rev 7044) @@ -22,26 +22,23 @@ $removeB = Button('submit:verify', _("Remove Page"), 'wikiadmin'); $cancelB = Button('submit:cancel', _("Cancel"), 'button'); // use generic wiki button look - $html = HTML(HTML::p(fmt("You are about to remove '%s'!", $pagelink)), + $fieldset = HTML::fieldset(HTML::p(fmt("You are about to remove '%s'!", $pagelink)), HTML::form(array('method' => 'post', 'action' => $request->getPostURL()), HiddenInputs(array('currentversion' => $version, 'pagename' => $page->getName(), 'action' => 'remove')), - HTML::div(array('class' => 'toolbar'), $removeB, $WikiTheme->getButtonSeparator(), - $cancelB)), - HTML::hr() + $cancelB)) ); $sample = HTML::div(array('class' => 'transclusion')); // simple and fast preview expanding only newlines foreach (explode("\n", firstNWordsOfContent(100, $current->getPackedContent())) as $s) { $sample->pushContent($s, HTML::br()); } - $html->pushContent(HTML::div(array('class' => 'wikitext'), - $sample)); + $html = HTML($fieldset, HTML::div(array('class' => 'wikitext'), $sample)); } elseif ($request->getArg('currentversion') != $version) { $html = HTML(HTML::p(array('class' => 'error'), (_("Someone has edited the page!"))), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |