From: <var...@us...> - 2014-07-31 11:14:48
|
Revision: 9043 http://sourceforge.net/p/phpwiki/code/9043 Author: vargenau Date: 2014-07-31 11:14:40 +0000 (Thu, 31 Jul 2014) Log Message: ----------- Whitespace Modified Paths: -------------- trunk/themes/Crao/templates/wikiblog.tmpl trunk/themes/Portland/templates/viewsource.tmpl trunk/themes/Wordpress/templates/viewsource.tmpl trunk/themes/blog/templates/wikiblog.tmpl trunk/themes/default/templates/blogform.tmpl trunk/themes/default/templates/frameset.tmpl trunk/themes/default/templates/userprefs.tmpl trunk/themes/default/templates/viewsource.tmpl trunk/themes/default/templates/wikiblog.tmpl trunk/themes/fusionforge/templates/userprefs.tmpl trunk/themes/wikilens/templates/categorypage.tmpl Modified: trunk/themes/Crao/templates/wikiblog.tmpl =================================================================== --- trunk/themes/Crao/templates/wikiblog.tmpl 2014-07-31 10:39:48 UTC (rev 9042) +++ trunk/themes/Crao/templates/wikiblog.tmpl 2014-07-31 11:14:40 UTC (rev 9043) @@ -1,13 +1,13 @@ <?php $CDATE = $WikiTheme->formatDateTime($BLOG_CTIME); - $buttons = $modified = ''; if ($user->isAdmin() or $user->getId() == $BLOG_CREATOR) { $buttons = HTML::small(array('class' => 'floatleft'), Button('edit', false, $page)); - if ($user->isAdmin()) - $buttons->pushContent(Button('remove', false, $page)); + if ($user->isAdmin()) { + $buttons->pushContent(Button('remove', false, $page)); + } } // This is a hack, but since we only have a fake PageRevision, @@ -19,8 +19,6 @@ $mtime, $rev->get('author'))); } ?> - -<!-- FIXME: move table formatting to css --> <div title="<?php echo fmt("Comments on %s by %s.", $BLOG_PARENT, $BLOG_CREATOR)?>" class="wikiblog wikitext"> <div class="wikiblog-header"> Modified: trunk/themes/Portland/templates/viewsource.tmpl =================================================================== --- trunk/themes/Portland/templates/viewsource.tmpl 2014-07-31 10:39:48 UTC (rev 9042) +++ trunk/themes/Portland/templates/viewsource.tmpl 2014-07-31 11:14:40 UTC (rev 9043) @@ -1,10 +1,12 @@ <?php if ($page->get('locked') && !$user->isAdmin()) { ?> <p class="warning_msg"><strong><?php echo _("Note:")?></strong> - <?php echo _("This page has been locked and cannot be edited.")?></p> + <?php echo _("This page has been locked and cannot be edited.")?> + </p> <?php } ?> <?php if ($revision and !$revision->isCurrent()) { ?> <p class="warning_msg"><?php echo _("You are viewing an old revision of this page.")?> - <?php echo Button('viewsource', _("View the current version."), $page)?></p> + <?php echo Button('viewsource', _("View the current version."), $page) ?> + </p> <?php } ?> <textarea class="wikiedit" name="content" Modified: trunk/themes/Wordpress/templates/viewsource.tmpl =================================================================== --- trunk/themes/Wordpress/templates/viewsource.tmpl 2014-07-31 10:39:48 UTC (rev 9042) +++ trunk/themes/Wordpress/templates/viewsource.tmpl 2014-07-31 11:14:40 UTC (rev 9043) @@ -4,11 +4,13 @@ if (empty($revision)) $revision = $page->getCurrentRevision(false); if ($page->get('locked') && !$user->isAdmin()) { ?> <p class="warning_msg"><strong><?php echo _("Note:")?></strong> - <?php echo _("This page has been locked and cannot be edited.")?></p> + <?php echo _("This page has been locked and cannot be edited.")?> + </p> <?php } ?> -<?php if (! $revision->isCurrent()) { ?> +<?php if ($revision and !$revision->isCurrent()) { ?> <p class="warning_msg"><?php echo _("You are viewing an old revision of this page.")?> - <?php echo Button('viewsource', _("View the current version."), $page)?></p> + <?php echo Button('viewsource', _("View the current version."), $page) ?> + </p> <?php } ?> <textarea class="wikiedit" name="content" Modified: trunk/themes/blog/templates/wikiblog.tmpl =================================================================== --- trunk/themes/blog/templates/wikiblog.tmpl 2014-07-31 10:39:48 UTC (rev 9042) +++ trunk/themes/blog/templates/wikiblog.tmpl 2014-07-31 11:14:40 UTC (rev 9043) @@ -1,6 +1,5 @@ <?php $CDATE = $WikiTheme->formatDateTime($BLOG_CTIME); - $buttons = $modified = ''; if ($user->isAdmin() or $user->getId() == $BLOG_CREATOR) { Modified: trunk/themes/default/templates/blogform.tmpl =================================================================== --- trunk/themes/default/templates/blogform.tmpl 2014-07-31 10:39:48 UTC (rev 9042) +++ trunk/themes/default/templates/blogform.tmpl 2014-07-31 11:14:40 UTC (rev 9043) @@ -9,7 +9,7 @@ maxlength="256" name="edit[summary]" value="" /> <?php echo $EDIT_TOOLBAR ?> <a id="editarea"></a> - <textarea id="edit-content" class="edit-content" rows="8" cols="68" style="width:540px" + <textarea id="edit-content" class="edit-content" rows="8" style="width:540px" name="edit[content]"></textarea> <br /> <input id="wikiblog-submit" type="submit" value="<?php echo _("Add Entry")?>" Modified: trunk/themes/default/templates/frameset.tmpl =================================================================== --- trunk/themes/default/templates/frameset.tmpl 2014-07-31 10:39:48 UTC (rev 9042) +++ trunk/themes/default/templates/frameset.tmpl 2014-07-31 11:14:40 UTC (rev 9043) @@ -1,5 +1,7 @@ <?php -// This template is used for the FrameInclude plugin. +/* + * This template is used for the FrameInclude plugin. + */ $topurl = $request->getURLtoSelf(array('frame' => 'header')); $boturl = $request->getURLtoSelf(array('frame' => 'footer')); @@ -12,9 +14,9 @@ <?php echo Template('head') ?> <frameset rows="<?php echo $ROWS?>"> - <frame name="header" src="<?php echo $topurl?>" <?php echo $FRAMEARGS ?>/> + <frame name="header" src="<?php echo $topurl?>" <?php echo $FRAMEARGS ?> /> <?php echo $CONTENT_FRAME ?> - <frame name="footer" src="<?php echo $boturl?>" <?php echo $FRAMEARGS ?>/> + <frame name="footer" src="<?php echo $boturl?>" <?php echo $FRAMEARGS ?> /> <noframes><?php echo Template('body') ?></noframes> </frameset> </html> Modified: trunk/themes/default/templates/userprefs.tmpl =================================================================== --- trunk/themes/default/templates/userprefs.tmpl 2014-07-31 10:39:48 UTC (rev 9042) +++ trunk/themes/default/templates/userprefs.tmpl 2014-07-31 11:14:40 UTC (rev 9043) @@ -176,6 +176,7 @@ <tr><td colspan="2"> <?php echo _("Get an e-mail notification at changes of the following pages:")?> </td></tr> + <tr> <?php if ($isForm) { ?> <td><textarea name="pref[notifyPages]" cols="40" rows="6"><?php echo $pref->get('notifyPages')?></textarea></td> @@ -288,11 +289,12 @@ </table> <?php if ($isForm) { ?> - <hr /> - <p><?php echo Button("submit:", _("Update Preferences"), 'wikiadmin')?> +<hr /> +<p> + <?php echo Button("submit:", _("Update Preferences"), 'wikiadmin')?> <?php echo Button("submit:delete", _("Reset Preferences"), 'wikiadmin')?> - <?php echo Button("submit:cancel", _("Cancel"), 'button')?></p> - -<?php echo HiddenInputs($request->getArgs(), false, array('pref')) ?> + <?php echo Button("submit:cancel", _("Cancel"), 'button')?> + <?php echo HiddenInputs($request->getArgs(), false, array('pref')) ?> +</p> </form> <?php } ?> Modified: trunk/themes/default/templates/viewsource.tmpl =================================================================== --- trunk/themes/default/templates/viewsource.tmpl 2014-07-31 10:39:48 UTC (rev 9042) +++ trunk/themes/default/templates/viewsource.tmpl 2014-07-31 11:14:40 UTC (rev 9043) @@ -5,7 +5,7 @@ <?php } ?> <?php if ($revision and !$revision->isCurrent()) { ?> <p class="warning_msg"><?php echo _("You are viewing an old revision of this page.")?> - <?php echo Button('edit', _("View the current version."), $page) ?> + <?php echo Button('viewsource', _("View the current version."), $page) ?> </p> <?php } ?> <br class="clear-floats" /> Modified: trunk/themes/default/templates/wikiblog.tmpl =================================================================== --- trunk/themes/default/templates/wikiblog.tmpl 2014-07-31 10:39:48 UTC (rev 9042) +++ trunk/themes/default/templates/wikiblog.tmpl 2014-07-31 11:14:40 UTC (rev 9043) @@ -6,7 +6,7 @@ $buttons = HTML::small(array('class' => 'floatleft'), Button('edit', false, $page)); if ($user->isAdmin()) { - $buttons->pushContent($SEP, Button('remove', false, $page)); + $buttons->pushContent($SEP, Button('remove', false, $page)); } } Modified: trunk/themes/fusionforge/templates/userprefs.tmpl =================================================================== --- trunk/themes/fusionforge/templates/userprefs.tmpl 2014-07-31 10:39:48 UTC (rev 9042) +++ trunk/themes/fusionforge/templates/userprefs.tmpl 2014-07-31 11:14:40 UTC (rev 9043) @@ -130,16 +130,16 @@ <legend><strong><?php echo _("User preferences for this project")?></strong></legend> <table class="fullwidth"> - <tr><td colspan="2"><h3><?php echo _("E-mail Notification")?></h3></td></tr> + <tr><td colspan="2"><h3><?php echo _("E-mail Notification")?></h3></td></tr> - <tr><td colspan="2"> + <tr><td colspan="2"> <?php echo _("Get an e-mail notification at changes of the following pages:")?> - </td></tr> + </td></tr> - <tr> + <tr> <?php if ($isForm) { ?> <td><textarea name="pref[notifyPages]" cols="40" rows="6"><?php echo $pref->get('notifyPages')?></textarea></td> - <td><p class="hint"><?php echo _("Enter pages separated by space or comma. Wildcards (fileglobbing) allowed.")?></p></td> + <td><p class="hint"><?php echo _("Enter pages separated by space or comma. Wildcards (fileglobbing) allowed.")?></p></td> <?php } else { ?> <td colspan="2"><?php echo $pref->get('notifyPages')?></td> <?php } ?> @@ -153,7 +153,9 @@ <table class="fullwidth"> - <tr><td colspan="2"><h3><?php echo _("E-mail Notification")?></h3></td></tr> + <tr> + <td colspan="2"><h3><?php echo _("E-mail Notification")?></h3></td> + </tr> <tr> <td> Modified: trunk/themes/wikilens/templates/categorypage.tmpl =================================================================== --- trunk/themes/wikilens/templates/categorypage.tmpl 2014-07-31 10:39:48 UTC (rev 9042) +++ trunk/themes/wikilens/templates/categorypage.tmpl 2014-07-31 11:14:40 UTC (rev 9043) @@ -1,3 +1,6 @@ +<?php +// This template is used for the CategoryPage plugin. +?> <div class="categorypage categorypage-form"> <p>This page represents the <?php echo $SINGULAR?> category.</p> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |