From: <var...@us...> - 2011-09-27 07:48:01
|
Revision: 8132 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8132&view=rev Author: vargenau Date: 2011-09-27 07:47:49 +0000 (Tue, 27 Sep 2011) Log Message: ----------- Simplify layout Modified Paths: -------------- trunk/themes/fusionforge/templates/userprefs.tmpl Modified: trunk/themes/fusionforge/templates/userprefs.tmpl =================================================================== --- trunk/themes/fusionforge/templates/userprefs.tmpl 2011-09-26 15:18:21 UTC (rev 8131) +++ trunk/themes/fusionforge/templates/userprefs.tmpl 2011-09-27 07:47:49 UTC (rev 8132) @@ -189,17 +189,18 @@ <legend><strong><?php echo _("User preferences for this project")?></strong></legend> <table class="fullwidth"> - <tr><td colspan="3"><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"> <?php echo _("Get an email 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> - <td><p class="hint"><?php echo _("Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed.")?></p></td> + <td><p class="hint"><?php echo _("Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed.")?></p></td> <?php } else { ?> - <td><?php echo $pref->get('notifyPages')?></td><td></td> + <td colspan="2"><?php echo $pref->get('notifyPages')?></td> <?php } ?> </tr> @@ -211,121 +212,142 @@ <table class="fullwidth"> - <tr><td colspan="3"><h3><?php echo _("E-mail Notification")?></h3></td></tr> + <tr><td colspan="2"><h3><?php echo _("E-mail Notification")?></h3></td></tr> <tr> <td> - <p><?php echo _("Do not send my own modifications:")?></p> + <p class="nowrap"> + <?php echo $OwnModificationsCB ?> + <?php echo _("Do not send my own modifications")?> + </p> </td> <td> - <p><?php echo $OwnModificationsCB ?></p> - </td> - <td> <p class="hint"><?php echo _("Check if you do not want to be notified of your own modifications.")?></p> </td> </tr> <tr> <td> - <p><?php echo _("Do not send minor modifications:")?></p> + <p class="nowrap"> + <?php echo $MajorModificationsOnlyCB ?> + <?php echo _("Do not send minor modifications")?> + </p> </td> <td> - <p><?php echo $MajorModificationsOnlyCB ?></p> - </td> - <td> <p class="hint"><?php echo _("Check if you do not want to be notified of minor modifications.")?></p> </td> </tr> - <tr><td colspan="3"><h3><?php echo _("Menus")?></h3></td></tr> + <tr><td colspan="2"><h3><?php echo _("Menus")?></h3></td></tr> <tr> <td> <fieldset> <legend><?php echo _("Top Menu")?></legend> - <table cellpadding="0" cellspacing="0"> + <table> <tr> <td> - <p><?php echo $DiffMenuItem ?> <?php echo _("Last Difference")?></p> + <p class="nowrap"><?php echo $DiffMenuItem ?> <?php echo _("Last Difference")?></p> </td> </tr> <tr> <td> - <p><?php echo $RevertMenuItem ?> <?php echo _("Revert")?></p> + <p class="nowrap"><?php echo $RevertMenuItem ?> <?php echo _("Revert")?></p> </td> </tr> <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?> <tr> <td> - <p><?php echo $PDFMenuItem ?> <?php echo _("PDF")?></p> + <p class="nowrap"><?php echo $PDFMenuItem ?> <?php echo _("PDF")?></p> </td> </tr> <?php } ?> <tr> <td> - <p><?php echo $LockMenuItem ?> <?php echo _("Lock")?></p> + <p class="nowrap"><?php echo $LockMenuItem ?> <?php echo _("Lock")?></p> </td> </tr> <tr> <td> - <p><?php echo $ChownMenuItem ?> <?php echo _("Change Owner")?></p> + <p class="nowrap"><?php echo $ChownMenuItem ?> <?php echo _("Change Owner")?></p> </td> </tr> <tr> <td> - <p><?php echo $SetaclMenuItem ?> <?php echo _("Access Rights")?></p> + <p class="nowrap"><?php echo $SetaclMenuItem ?> <?php echo _("Access Rights")?></p> </td> </tr> </table> </fieldset> </td> + <td class="top"> + <p class="hint"><?php echo _("Check menu items to display.")?></p> + </td> + </tr> - <td style="vertical-align:top"> + <tr> + <td class="top"> <fieldset> <legend><?php echo _("Left Menu")?></legend> - <table cellpadding="0" cellspacing="0"> + <table> <tr> <td> - <p><?php echo $RandomPageMenuItem ?> <?php echo _("Random Page")?></p> + <p class="nowrap"><?php echo $RandomPageMenuItem ?> <?php echo _("Random Page")?></p> </td> </tr> <tr> <td> - <p><?php echo $LikePagesPageMenuItem ?> <?php echo _("Like Pages")?></p> + <p class="nowrap"><?php echo $LikePagesPageMenuItem ?> <?php echo _("Like Pages")?></p> </td> </tr> </table> </fieldset> </td> - - <td style="vertical-align:top"> - <p class="hint"><?php echo _("Check menu items to display.")?></p> + <td> </td> </tr> - <tr><td colspan="3"><h3><?php echo _("Appearance")?></h3></td></tr> + <tr><td colspan="2"><h3><?php echo _("Appearance")?></h3></td></tr> - <tr><td colspan="3"><?php echo _("Here you can override site-specific default values.") ?></td></tr> - <tr><td align="right"><?php echo _("Show Page Trail")?></td> - <td><?php echo $PageTrailCB?></td> - <td><p class="hint"><?php echo _("Show Page Trail at top of page.")?></p></td></tr> - <tr><td align="right"><?php echo fmt("Hide %s:", WikiLink("Help:LinkIcons"))?></td> - <td><?php echo $NoLinkIconsCB?></td> - <td><p class="hint"><?php echo _("Hide or show LinkIcons.")?></p></td></tr> - <tr><td align="right"><?php echo fmt("Add %s:", WikiLink("Help:GoogleLink"))?></td> - <td><?php echo $GoogleLinkCB?></td> - <td><p class="hint"><?php echo fmt("Add Google links to unknown pages behind the '?', and the create action behind the pagename instead. See %s.", WikiLink("MeatBall:GooglePrompt"))?></p></td></tr> + <tr><td colspan="2"><?php echo _("Here you can override site-specific default values.") ?></td></tr> + <tr> + <td> + <p class="nowrap"> + <?php echo $PageTrailCB?> + <?php echo _("Show Page Trail")?> + </p> + </td> + <td><p class="hint"><?php echo _("Show Page Trail at top of page.")?></p></td> + </tr> + <tr> + <td> + <p class="nowrap"> + <?php echo $NoLinkIconsCB?> + <?php echo fmt("Hide %s", WikiLink("Help:LinkIcons"))?> + </p> + </td> + <td><p class="hint"><?php echo _("Hide or show LinkIcons.")?></p></td> + </tr> + <tr> + <td> + <p class="nowrap"> + <?php echo $GoogleLinkCB?> + <?php echo fmt("Add %s", WikiLink("Help:GoogleLink"))?> + </p> + </td> + <td><p class="hint"><?php echo fmt("Add Google links to unknown pages behind the '?', and the create action behind the pagename instead. See %s.", WikiLink("MeatBall:GooglePrompt"))?></p></td> + </tr> - <tr><td colspan="3"><h3><?php echo _("Edit Area Size")?></h3></td></tr> + <tr><td colspan="2"><h3><?php echo _("Edit Area Size")?></h3></td></tr> - <tr><td colspan="2"> - <?php echo _("Height")?>: + <tr><td> + <?php echo _("Height:")?> <?php if ($isForm) { ?> <input type="text" name="pref[editHeight]" size="4" maxlength="4" class="numeric" value="<?php echo $pref->get('editHeight')?>" /> <?php } else { ?> <?php echo $pref->get('editHeight')?> <?php } ?> - <?php echo _("Width")?>: + <?php echo _("Width:")?> <?php if ($isForm) { ?> <input type="text" name="pref[editWidth]" size="4" maxlength="4" class="numeric" value="<?php echo $pref->get('editWidth')?>" /> @@ -337,9 +359,9 @@ <?php echo _("Note that many browsers will automatically adjust the width of the editing area so that it fills the browser window. In this case, the width preference will be ignored.")?></p> </td></tr> - <tr><td colspan="3"><h3><?php echo _("Time Zone")?></h3></td></tr> + <tr><td colspan="2"><h3><?php echo _("Time Zone")?></h3></td></tr> - <tr><td colspan="2"><p> + <tr><td><p> <?php echo fmt("Add %s hours to the server's local time when reporting times.", $timeOffsetInput)?> </p></td><td> @@ -351,12 +373,14 @@ </p> </td></tr> - <tr><td colspan="3"><h3><?php echo _("Date Format")?></h3></td></tr> + <tr><td colspan="2"><h3><?php echo _("Date Format")?></h3></td></tr> - <tr><td colspan="2"><p> - <?php echo _("Show relative dates using 'Today' and 'Yesterday'")?>: - <?php echo $RelativeDatesCB ?> - </p></td><td></td></tr> + <tr><td colspan="2"> + <p> + <?php echo $RelativeDatesCB ?> + <?php echo _("Show relative dates using 'Today' and 'Yesterday'")?> + </p> + </td></tr> </table> </fieldset> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |