$t->set('personalkey-help', Horde_Help::link('imp', 'smime-overview-personalkey'));
$t->set('secure_check', Horde::isConnectionSecure());
- if (!$t->get('secure_check')) {
+ if ($t->get('secure_check')) {
$t->set('has_key', $prefs->getValue('smime_public_key') && $prefs->getValue('smime_private_key'));
if ($t->get('has_key')) {
$t->set('viewpublic', Horde::link($selfURL->copy()->add('actionID', 'view_personal_public_key'), _("View Personal Public Key"), null, 'view_key'));
<if:pgpactive>
- <input type="checkbox" id="use_pgp" name="use_pgp" checked="checked" /> <label for="use_pgp"><gettext>Enable PGP functionality?</gettext></label> <tag:overview-help />
- <br />
- <em class="redText"><gettext>NOTE:</gettext></em> <gettext>PGP support requires popup windows to be used. If your browser is currently set to disable popup windows, you must change this setting or else the PGP features will not work correctly.</gettext>
- <br />
+ <div>
+ <input type="checkbox" id="use_pgp" name="use_pgp" checked="checked" />
+ <label for="use_pgp"><gettext>Enable PGP functionality?</gettext></label>
+ <tag:overview-help />
+ </div>
+ <div>
+ <p>
+ <em class="redText"><gettext>NOTE:</gettext></em> <gettext>PGP support requires popup windows to be used. If your browser is currently set to disable popup windows, you must change this setting or else the PGP features will not work correctly.</gettext>
+ </p>
+ </div>
<if:attach_pubkey_notlocked>
- <input type="checkbox" id="pgp_attach_pubkey" name="pgp_attach_pubkey"<if:attach_pubkey> checked="checked"</if:attach_pubkey> /> <label for="pgp_attach_pubkey"><gettext>Should your PGP public key to be attached to your messages by default?</gettext></label> <tag:attach_pubkey-help />
- <br />
+ <div>
+ <input type="checkbox" id="pgp_attach_pubkey" name="pgp_attach_pubkey"<if:attach_pubkey> checked="checked"</if:attach_pubkey> />
+ <label for="pgp_attach_pubkey"><gettext>Should your PGP public key to be attached to your messages by default?</gettext></label>
+ <tag:attach_pubkey-help />
+ </div>
</if:attach_pubkey_notlocked>
<if:scan_body_notlocked>
- <input type="checkbox" id="pgp_scan_body" name="pgp_scan_body"<if:scan_body> checked="checked"</if:scan_body> /> <label for="pgp_scan_body"><gettext>Should the body of text/plain messages be scanned for PGP data?</gettext></label> <tag:scan_body-help />
- <br />
+ <div>
+ <input type="checkbox" id="pgp_scan_body" name="pgp_scan_body"<if:scan_body> checked="checked"</if:scan_body> />
+ <label for="pgp_scan_body"><gettext>Should the body of text/plain messages be scanned for PGP data?</gettext></label>
+ <tag:scan_body-help />
+ </div>
</if:scan_body_notlocked>
<if:verify_notlocked>
- <input type="checkbox" id="pgp_verify" name="pgp_verify"<if:pgp_verify> checked="checked"</if:pgp_verify> /> <label for="pgp_verify"><gettext>Should PGP signed messages automatically be verified when viewed?</gettext></label> <tag:pgp_verify-help />
- <br />
+ <div>
+ <input type="checkbox" id="pgp_verify" name="pgp_verify"<if:pgp_verify> checked="checked"</if:pgp_verify> />
+ <label for="pgp_verify"><gettext>Should PGP signed messages automatically be verified when viewed?</gettext></label>
+ <tag:pgp_verify-help />
+ </div>
</if:verify_notlocked>
<p>
<div class="prefsContainer item">
<if:empty_pubkey_list>
- <em><gettext>No Keys in Keyring</gettext></em><br />
+ <div>
+ <em><gettext>No Keys in Keyring</gettext></em>
+ </div>
<else:empty_pubkey_list>
- <table>
+ <div>
+ <table>
<loop:pubkey_list>
- <tr>
- <td><tag:pubkey_list.name /> (<tag:pubkey_list.email />)</td>
- <td> [<tag:pubkey_list.view /><gettext>View</gettext></a>] [<tag:pubkey_list.info /><gettext>Details</gettext></a>] [<tag:pubkey_list.delete /><gettext>Delete</gettext></a>]</td>
- </tr>
+ <tr>
+ <td><tag:pubkey_list.name /> (<tag:pubkey_list.email />)</td>
+ <td> [<tag:pubkey_list.view /><gettext>View</gettext></a>] [<tag:pubkey_list.info /><gettext>Details</gettext></a>] [<tag:pubkey_list.delete /><gettext>Delete</gettext></a>]</td>
+ </tr>
</loop:pubkey_list>
- </table>
+ </table>
+ </div>
</else:empty_pubkey_list></if:empty_pubkey_list>
<if:no_file_upload>
- <br /><span class="redText"><gettext>Key import is not available. File upload is not enabled on this server.</gettext></span><br />
+ <div>
+ <span class="redText"><gettext>Key import is not available. File upload is not enabled on this server.</gettext></span>
+ </div>
<else:no_file_upload>
<if:no_source>
- <br /><em><gettext>Key import is not available. You have no address book defined to add your contacts.</gettext></em><br />
+ <div>
+ <em><gettext>Key import is not available. You have no address book defined to add your contacts.</gettext></em>
+ </div>
<else:no_source>
- <br /><input type="submit" name="save" class="button" onclick="<tag:public_import_url />return false;" value="<gettext>Import Public Key</gettext>" />
- <tag:import_pubkey-help />
+ <div>
+ <p>
+ <input type="submit" name="save" class="button" onclick="<tag:public_import_url />return false;" value="<gettext>Import Public Key</gettext>" />
+ <tag:import_pubkey-help />
+ </p>
+ </div>
</else:no_source></if:no_source></else:no_file_upload></if:no_file_upload>
</div>
<div class="prefsContainer item">
<if:secure_check>
- <em><gettext>PGP Personal Keypair support requires a secure web connection.</gettext></em>
+ <div>
+ <em><gettext>PGP Personal Keypair support requires a secure web connection.</gettext></em>
+ </div>
<else:secure_check>
+ <div>
<if:has_key>
- <table>
- <tr>
- <td><gettext>Your Public Key:</gettext></td>
- <td> [<tag:viewpublic /><gettext>View</gettext></a>] [<tag:infopublic /><gettext>Details</gettext></a>] [<tag:sendkey /><gettext>Send Key to Public Keyserver</gettext></a>]</td>
- <td><tag:personalkey-public-help /></td>
- </tr>
- <tr>
- <td><gettext>Your Private Key:</gettext></td>
- <td> [<tag:passphrase /></a>] [<tag:viewprivate /><gettext>View</gettext></a>] [<tag:infoprivate /><gettext>Details</gettext></a>]</td>
- <td><tag:personalkey-private-help /></td>
- </tr>
- </table>
+ <table>
+ <tr>
+ <td><gettext>Your Public Key:</gettext></td>
+ <td> [<tag:viewpublic /><gettext>View</gettext></a>] [<tag:infopublic /><gettext>Details</gettext></a>] [<tag:sendkey /><gettext>Send Key to Public Keyserver</gettext></a>]</td>
+ <td><tag:personalkey-public-help /></td>
+ </tr>
+ <tr>
+ <td><gettext>Your Private Key:</gettext></td>
+ <td> [<tag:passphrase /></a>] [<tag:viewprivate /><gettext>View</gettext></a>] [<tag:infoprivate /><gettext>Details</gettext></a>]</td>
+ <td><tag:personalkey-private-help /></td>
+ </tr>
+ </table>
+ </div>
<p>
<input type="submit" name="delete" class="button" onclick="if (confirm('<tag:deletekeypair />')) { document.prefs.actionID.value='delete_key'; return true; } else { return false; }" value="<gettext>Delete Current Keys</gettext>" />
<tag:personalkey-delete-help />
</p>
<else:has_key>
- <table>
- <tr>
- <td><label for="generate_realname"><gettext>Your Name:</gettext></label></td>
- <td> <input type="text" id="generate_realname" name="generate_realname" size="30" maxlength="60" value="<tag:fullname />"/></td>
- <td><tag:personalkey-create-name-help /></td>
- </tr>
- <tr>
- <td><label for="generate_comment"><gettext>Comment:</gettext></label></td>
- <td> <input type="text" id="generate_comment" name="generate_comment" size="30" maxlength="60" /></td>
- <td><tag:personalkey-create-comment-help /></td>
- </tr>
- <tr>
- <td><label for="generate_email"><gettext>E-mail Address:</gettext></label></td>
- <td> <input type="text" id="generate_email" name="generate_email" size="30" maxlength="60" value="<tag:fromaddr />"/></td>
- <td><tag:personalkey-create-email-help /></td>
- </tr>
- <tr>
- <td><label for="generate_keylength"><gettext>Key Length:</gettext></label></td>
- <td>
- <select id="generate_keylength" name="generate_keylength">
- <option value="1024">1024</option>
- <option value="2048">2048</option>
- </select>
- </td>
- <td><tag:personalkey-create-keylength-help /></td>
- </tr>
- <tr>
- <td><label for="generate_passphrase1"><gettext>Passphrase:</gettext></label></td>
- <td> <input type="password" id="generate_passphrase1" name="generate_passphrase1" size="30" maxlength="60" /></td>
- <td><tag:personalkey-create-passphrase-help /></td>
- </tr>
- <tr>
- <td><label for="generate_passphrase2"><gettext>Passphrase (Again):</gettext></label></td>
- <td> <input type="password" id="generate_passphrase2" name="generate_passphrase2" size="30" maxlength="60" /></td>
- <td></td>
- </tr>
- </table>
+ <tr>
+ <td><label for="generate_realname"><gettext>Your Name:</gettext></label></td>
+ <td> <input type="text" id="generate_realname" name="generate_realname" size="30" maxlength="60" value="<tag:fullname />"/></td>
+ <td><tag:personalkey-create-name-help /></td>
+ </tr>
+ <tr>
+ <td><label for="generate_comment"><gettext>Comment:</gettext></label></td>
+ <td> <input type="text" id="generate_comment" name="generate_comment" size="30" maxlength="60" /></td>
+ <td><tag:personalkey-create-comment-help /></td>
+ </tr>
+ <tr>
+ <td><label for="generate_email"><gettext>E-mail Address:</gettext></label></td>
+ <td> <input type="text" id="generate_email" name="generate_email" size="30" maxlength="60" value="<tag:fromaddr />"/></td>
+ <td><tag:personalkey-create-email-help /></td>
+ </tr>
+ <tr>
+ <td><label for="generate_keylength"><gettext>Key Length:</gettext></label></td>
+ <td>
+ <select id="generate_keylength" name="generate_keylength">
+ <option value="1024">1024</option>
+ <option value="2048">2048</option>
+ </select>
+ </td>
+ <td><tag:personalkey-create-keylength-help /></td>
+ </tr>
+ <tr>
+ <td><label for="generate_passphrase1"><gettext>Passphrase:</gettext></label></td>
+ <td> <input type="password" id="generate_passphrase1" name="generate_passphrase1" size="30" maxlength="60" /></td>
+ <td><tag:personalkey-create-passphrase-help /></td>
+ </tr>
+ <tr>
+ <td><label for="generate_passphrase2"><gettext>Passphrase (Again):</gettext></label></td>
+ <td> <input type="password" id="generate_passphrase2" name="generate_passphrase2" size="30" maxlength="60" /></td>
+ <td></td>
+ </tr>
+ </table>
- <p>
- <input type="submit" name="save" class="button" onclick="if (confirm('<tag:keygen />')) { document.prefs.actionID.value='generate_key';return true; } else { return false; }" value="<gettext>Create Keys</gettext>" />
+ <input type="submit" name="save" class="button" onclick="if (confirm('<tag:keygen />')) { document.prefs.actionID.value='generate_key';return true; } else { return false; }" value="<gettext>Create Keys</gettext>" />
<if:no_file_upload><else:no_file_upload>
- <input type="submit" name="save" class="button" onclick="<tag:personal_import_url />return false;" value="<gettext>Import Keypair</gettext>" />
+ <input type="submit" name="save" class="button" onclick="<tag:personal_import_url />return false;" value="<gettext>Import Keypair</gettext>" />
</else:no_file_upload></if:no_file_upload>
- <tag:personalkey-create-actions-help />
-</p>
-</else:has_key></if:has_key></else:secure_check></if:secure_check>
+ <tag:personalkey-create-actions-help />
+ </p>
+</else:has_key></if:has_key>
+ </div>
+</else:secure_check></if:secure_check>
<else:pgpactive>
<if:use_pgp_locked>
- <em><gettext>PGP support is disabled on this system.</gettext></em>
+ <div>
+ <em><gettext>PGP support is disabled on this system.</gettext></em>
+ </div>
<else:use_pgp_locked>
- <input type="checkbox" id="use_pgp" name="use_pgp" /> <tag:use_pgp_label /> <tag:use_pgp_help /><br />
+ <div>
+ <input type="checkbox" id="use_pgp" name="use_pgp" />
+ <tag:use_pgp_label />
+ <tag:use_pgp_help />
+ </div>
</else:use_pgp_locked></if:use_pgp_locked>
<p>
-<?php echo Horde::label('drafts', _("Drafts folder:")) ?><br />
-<input type="hidden" name="drafts_new" id="drafts_new" value="" />
-<select id="drafts" name="drafts">
- <option value="<?php echo IMP::PREF_NO_FOLDER ?>"><?php echo _("None") ?></option>
- <?php echo IMP::flistSelect(array('heading' => _("Create a new drafts folder"), 'filter' => array('INBOX'), 'selected' => IMP::folderPref($prefs->getValue('drafts_folder'), true), 'new_folder' => true)) ?>
-</select>
-<br />
+<div>
+ <div>
+ <?php echo Horde::label('drafts', _("Drafts folder:")) ?>
+ </div>
+ <div>
+ <input type="hidden" name="drafts_new" id="drafts_new" value="" />
+ <select id="drafts" name="drafts">
+ <option value="<?php echo IMP::PREF_NO_FOLDER ?>"><?php echo _("None") ?></option>
+ <?php echo IMP::flistSelect(array('heading' => _("Create a new drafts folder"), 'filter' => array('INBOX'), 'selected' => IMP::folderPref($prefs->getValue('drafts_folder'), true), 'new_folder' => true)) ?>
+ </select>
+ </div>
+</div>
-<?php echo Horde::label('default_encrypt', _("Your default encryption method for sending messages:")) ?><br />
-<select id="default_encrypt" name="default_encrypt">
- <?php echo IMP::encryptList() ?>
-</select>
-<br />
+<div>
+ <div><?php echo Horde::label('default_encrypt', _("Your default encryption method for sending messages:")) ?></div>
+ <div>
+ <select id="default_encrypt" name="default_encrypt">
+ <?php echo IMP::encryptList() ?>
+ </select>
+ </div>
+</div>
$mailbox_option .= '>' . _("Folder Navigator") . "</option>\n"
. IMP::flistSelect(array('selected' => $mailbox_selected, 'inc_vfolder' => true));
}
-
-echo Horde::label('initial_page', _("View or mailbox to display after login:"));
?>
-<br />
-<select id="initial_page" name="initial_page">
- <?php echo $mailbox_option ?>
-</select>
-<br />
+<div>
+ <div>
+ <?php echo Horde::label('initial_page', _("View or mailbox to display after login:")); ?>
+ </div>
+ <div>
+ <select id="initial_page" name="initial_page">
+ <?php echo $mailbox_option ?>
+ </select>
+ </div>
+</div>
-<?php echo Horde::label('sent_mail_folder', _("Sent mail folder:")) ?><br />
-<input type="hidden" name="sent_mail_new" id="sent_mail_new" value="" />
-<select name="sent_mail_folder" id="sent_mail_folder">
- <option value=""><?php echo _("None") ?></option>
- <option value="-1" selected="selected"><?php echo _("Use Default Value") ?></option>
- <?php echo IMP::flistSelect(array('heading' => _("Create a new sent mail folder"), 'filter' => array('INBOX'))) ?>
-</select>
-<br />
+<div>
+ <div>
+ <?php echo Horde::label('sent_mail_folder', _("Sent mail folder:")) ?>
+ </div>
+ <div>
+ <input type="hidden" name="sent_mail_new" id="sent_mail_new" value="" />
+ <select name="sent_mail_folder" id="sent_mail_folder">
+ <option value=""><?php echo _("None") ?></option>
+ <option value="-1" selected="selected"><?php echo _("Use Default Value") ?></option>
+ <?php echo IMP::flistSelect(array('heading' => _("Create a new sent mail folder"), 'filter' => array('INBOX'))) ?>
+ </select>
+ </div>
+</div>
-<?php $nav_audio = $prefs->getValue('nav_audio') ?>
-<p><?php echo _("Play a sound on new mail? Although most browsers support embedded sound files, some may require a plugin.") ?></p>
-<ul class="sound-list">
- <li><label><input type="radio" name="nav_audio" value=""<?php if (!$nav_audio) echo ' checked="checked"' ?> /> <?php echo _("No Sound") ?></label></li>
+<?php
+ $nav_audio = $prefs->getValue('nav_audio')
+?>
+<div>
+ <p><?php echo _("Play a sound on new mail? Although most browsers support embedded sound files, some may require a plugin.") ?></p>
+ <ul class="sound-list">
+ <li>
+ <label>
+ <input type="radio" name="nav_audio" value=""<?php if (!$nav_audio) echo ' checked="checked"' ?> />
+ <?php echo _("No Sound") ?>
+ </label>
+ </li>
<?php foreach (glob($registry->get('themesfs') . '/graphics/audio/*.wav') as $sound): $sound = basename($sound); ?>
- <li>
- <label>
- <input type="radio" name="nav_audio" value="<?php echo htmlspecialchars($sound) ?>"<?php if ($nav_audio == $sound) echo ' checked="checked"' ?> />
- <?php echo htmlspecialchars($sound) ?>
- </label>
- <embed autostart="false" src="<?php echo $registry->getImageDir() . '/audio/' . htmlspecialchars($sound) ?>" />
- </li>
+ <li>
+ <label>
+ <input type="radio" name="nav_audio" value="<?php echo htmlspecialchars($sound) ?>"<?php if ($nav_audio == $sound) echo ' checked="checked"' ?> />
+ <?php echo htmlspecialchars($sound) ?>
+ </label>
+ <embed autostart="false" src="<?php echo $registry->getImageDir() . '/audio/' . htmlspecialchars($sound) ?>" />
+ </li>
<?php endforeach; ?>
-</ul>
+ </ul>
+</div>
<?php
-$cache = IMP_Application::$prefsCache['sourceselect'];
-if (!empty($cache['readSelect']) || !empty($cache['prefSelect'])):
-$imagedir = $registry->getImageDir('horde');
+ $cache = IMP_Application::$prefsCache['sourceselect'];
+ $imagedir = $registry->getImageDir('horde');
?>
-<br />
-
-<input type="hidden" name="search_sources" id="search_sources" value="<?php echo implode("\t", $cache['search']['sources']) ?>" />
+<?php if (!empty($cache['readSelect']) || !empty($cache['prefSelect'])): ?>
+<div>
+ <input type="hidden" name="search_sources" id="search_sources" value="<?php echo implode("\t", $cache['search']['sources']) ?>" />
<?php if (count($cache['readable']) > 1): ?>
-<?php echo _("Choose the order of address books to search when expanding addresses.") ?><br />
-<table>
- <tr>
- <td>
- <label for="unselected_search_sources" class="hidden"><?php echo _("Available Address books:") ?></label>
- <select id="unselected_search_sources" name="unselected_search_sources" id="unselected_search_sources" multiple="multiple" size="5" style="width:20em">
- <option value=""><?php echo _("Available Address books:") ?></option>
+ <p><?php echo _("Choose the order of address books to search when expanding addresses.") ?></p>
+ <tr>
+ <td>
+ <label for="unselected_search_sources" class="hidden"><?php echo _("Available Address books:") ?></label>
+ <select id="unselected_search_sources" name="unselected_search_sources" id="unselected_search_sources" multiple="multiple" size="5" style="width:20em">
+ <option value=""><?php echo _("Available Address books:") ?></option>
<?php foreach ($cache['readSelect'] as $val): ?>
- <option value="<?php echo $val ?>"><?php echo $cache['readable'][$val] ?></option>
+ <option value="<?php echo $val ?>"><?php echo $cache['readable'][$val] ?></option>
<?php endforeach; ?>
- </select>
- </td>
- <td>
- <a href="#" id="addsource"><?php echo Horde::img(isset($GLOBALS['nls']['rtl'][$GLOBALS['language']]) ? 'lhand.png' : 'rhand.png', _("Add source"), null, $imagedir) ?></a>
- <br />
- <a href="#" id="removesource"><?php echo Horde::img(isset($GLOBALS['nls']['rtl'][$GLOBALS['language']]) ? 'rhand.png' : 'lhand.png', _("Remove source"), null, $imagedir) ?></a>
- </td>
- <td>
- <label for="selected_search_sources" class="hidden"><?php echo _("Selected Address books:") ?></label>
- <select name="selected_search_sources" multiple="multiple" size="5" style="width:20em" id="selected_search_sources">
- <option value=""><?php echo _("Selected Address books:") ?></option>
+ </select>
+ </td>
+ <td>
+
<a href="#" id="addsource"><?php echo Horde::img(isset($GLOBALS['nls']['rtl'][$GLOBALS['language']]) ? 'lhand.png' : 'rhand.png', _("Add source"), null, $imagedir) ?></a>
+ <br />
+
<a href="#" id="removesource"><?php echo Horde::img(isset($GLOBALS['nls']['rtl'][$GLOBALS['language']]) ? 'rhand.png' : 'lhand.png', _("Remove source"), null, $imagedir) ?></a>
+ </td>
+ <td>
+ <label for="selected_search_sources" class="hidden"><?php echo _("Selected Address books:") ?></label>
+ <select name="selected_search_sources" multiple="multiple" size="5" style="width:20em" id="selected_search_sources">
+ <option value=""><?php echo _("Selected Address books:") ?></option>
<?php foreach ($cache['prefSelect'] as $key => $val): ?>
- <option value="<?php echo $key ?>"><?php echo $val ?></option>
+ <option value="<?php echo $key ?>"><?php echo $val ?></option>
<?php endforeach; ?>
- </select>
- </td>
- <td>
- <a href="#" id="moveup"><?php echo Horde::img('nav/up.png', _("Move up"), null, $imagedir) ?></a>
- <br />
- <a href="#" id="movedown"><?php echo Horde::img('nav/down.png', _("Move down"), null, $imagedir) ?></a>
- </td>
- </tr>
-</table>
+ </select>
+ </td>
+ <td>
+
<a href="#" id="moveup"><?php echo Horde::img('nav/up.png', _("Move up"), null, $imagedir) ?></a>
+ <br />
+
<a href="#" id="movedown"><?php echo Horde::img('nav/down.png', _("Move down"), null, $imagedir) ?></a>
+ </td>
+ </tr>
+ </table>
-<?php echo _("Click on one of your selected address books and then select all fields to search.") ?><br />
+ <p><?php echo _("Click on one of your selected address books and then select all fields to search.") ?></p>
<?php else: ?>
-<?php echo _("Select all fields to search when expanding addresses.") ?><br />
+ <p><?php echo _("Select all fields to search when expanding addresses.") ?></p>
<?php endif; ?>
-<?php echo _("To select multiple fields, hold down the Control (PC) or Command (Mac) while clicking.") ?><br />
-<input type="hidden" name="search_fields_string" id="search_fields_string" />
-<table>
- <tr>
- <td>
- <label for="search_fields" class="hidden"><?php echo _("Fields to search") ?></label>
- <select id="search_fields" name="search_fields" multiple="multiple" size="5" style="width:20em">
- <option><?php echo str_repeat(' ', 50) ?></option>
- </select>
- </td>
- </tr>
-</table>
+ <div><?php echo _("To select multiple fields, hold down the Control (PC) or Command (Mac) while clicking.") ?></div>
+ <input type="hidden" name="search_fields_string" id="search_fields_string" />
+ <tr>
+ <td>
+ <label for="search_fields" class="hidden"><?php echo _("Fields to search") ?></label>
+ <select id="search_fields" name="search_fields" multiple="multiple" size="5" style="width:20em">
+ <option><?php echo str_repeat(' ', 50) ?></option>
+ </select>
+ </td>
+ </tr>
+ </table>
<?php endif; ?>
<?php if (!empty($cache['writeSelect'])): ?>
-<?php echo _("Choose the address book to use when adding addresses.") ?><br />
-<br />
-<label for="add_source" class="hidden"><?php echo _("Address book to add addresses to") ?></label>
-<select id="add_source" name="add_source">
- <option value=""><?php echo _("None") ?></option>
+ <div><?php echo _("Choose the address book to use when adding addresses.") ?></div>
+ <label for="add_source" class="hidden"><?php echo _("Address book to add addresses to") ?></label>
+ <select id="add_source" name="add_source">
+ <option value=""><?php echo _("None") ?></option>
<?php foreach ($cache['writeSelect'] as $val): ?>
- <option value="<?php echo $val['val'] ?>"<?php if ($val['sel']) echo ' selected="selected"'; ?>><?php echo $val['name'] ?></option>
+ <option value="<?php echo $val['val'] ?>"<?php if ($val['sel']) echo ' selected="selected"'; ?>><?php echo $val['name'] ?></option>
<?php endforeach; ?>
-</select>
+ </select>
<?php endif; ?>
+</div>
-<?php echo Horde::label('spam', _("Spam folder:")) ?><br />
-<input type="hidden" name="spam_new" id="spam_new" value="" />
-<select id="spam" name="spam">
- <option value="<?php echo IMP::PREF_NO_FOLDER ?>"><?php echo _("None") ?></option>
- <?php echo IMP::flistSelect(array('heading' => _("Create a new Spam folder"), 'filter' => array('INBOX'), 'selected' => IMP::folderPref($prefs->getValue('spam_folder'), true), 'new_folder' => true)) ?>
-</select>
+<div>
+ <div>
+ <?php echo Horde::label('spam', _("Spam folder:")) ?>
+ </div>
+ <div>
+ <input type="hidden" name="spam_new" id="spam_new" value="" />
+ <select id="spam" name="spam">
+ <option value="<?php echo IMP::PREF_NO_FOLDER ?>"><?php echo _("None") ?></option>
+ <?php echo IMP::flistSelect(array('heading' => _("Create a new Spam folder"), 'filter' => array('INBOX'), 'selected' => IMP::folderPref($prefs->getValue('spam_folder'), true), 'new_folder' => true)) ?>
+ </select>
+ </div>
+</div>
-<?php echo Horde::label('trash', _("Trash folder:")) ?><br />
-<input type="hidden" name="trash_new" id="trash_new" value="" />
-<select id="trash" name="trash">
+<div>
+ <div>
+ <?php echo Horde::label('trash', _("Trash folder:")) ?>
+ </div>
+ <div>
+ <input type="hidden" name="trash_new" id="trash_new" value="" />
+ <select id="trash" name="trash">
<?php
$use_vtrash = $prefs->getValue('use_vtrash');
echo '<option value="' . IMP::PREF_NO_FOLDER . '">' . _("None") . '</option>' .
'<option value="' . IMP::PREF_VTRASH . '"' . (($use_vtrash) ? ' selected="selected"' : '') . '>' . _("Use Virtual Trash") . '</option>' .
IMP::flistSelect(array('heading' => _("Create a new trash folder"), 'filter' => array('INBOX'), 'selected' => ($use_vtrash ? null : IMP::folderPref($prefs->getValue('trash_folder'), true)), 'new_folder' => true));
?>
-</select>
-<br />
+ </select>
+ </div>
+</div>
<if:smimeactive>
- <input type="checkbox" id="use_smime" name="use_smime" checked="checked" /> <label for="use_smime"><gettext>Enable S/MIME functionality?</gettext></label> <tag:use_smime_help />
- <br />
- <em class="redText"><gettext>NOTE:</gettext></em> <gettext>S/MIME support requires popup windows to be used. If your browser is currently set to disable popup windows, you must change this setting or else the S/MIME features will not work correctly.</gettext>
- <br />
+ <div>
+ <input type="checkbox" id="use_smime" name="use_smime" checked="checked" />
+ <label for="use_smime"><gettext>Enable S/MIME functionality?</gettext></label>
+ <tag:use_smime_help />
+ </div>
+ <div>
+ <p>
+ <em class="redText"><gettext>NOTE:</gettext></em> <gettext>S/MIME support requires popup windows to be used. If your browser is currently set to disable popup windows, you must change this setting or else the S/MIME features will not work correctly.</gettext>
+ </p>
+ </div>
<if:verify_notlocked>
- <input type="checkbox" id="smime_verify" name="smime_verify"<if:smime_verify> checked="checked"</if:smime_verify> /> <label for="smime_verify"><gettext>Should S/MIME signed messages automatically be verified when viewed?</gettext></label> <tag:smime_verify-help />
- <br />
+ <div>
+ <input type="checkbox" id="smime_verify" name="smime_verify"<if:smime_verify> checked="checked"</if:smime_verify> />
+ <label for="smime_verify"><gettext>Should S/MIME signed messages automatically be verified when viewed?</gettext></label>
+ <tag:smime_verify-help />
+ </div>
</if:verify_notlocked>
<p>
</div>
<div class="prefsContainer item">
+ <div>
<if:empty_pubkey_list>
- <em><gettext>No Keys in Keyring</gettext></em>
+ <em><gettext>No Keys in Keyring</gettext></em>
<else:empty_pubkey_list>
- <table>
<loop:pubkey_list>
- <tr>
- <td><tag:pubkey_list.name /> (<tag:pubkey_list.email />)</td>
- <td> [<tag:pubkey_list.view /><gettext>View</gettext></a>] [<tag:pubkey_list.info /><gettext>Details</gettext></a>] [<tag:pubkey_list.delete /><gettext>Delete</gettext></a>]</td>
- </tr>
+ <tr>
+ <td><tag:pubkey_list.name /> (<tag:pubkey_list.email />)</td>
+ <td> [<tag:pubkey_list.view /><gettext>View</gettext></a>] [<tag:pubkey_list.info /><gettext>Details</gettext></a>] [<tag:pubkey_list.delete /><gettext>Delete</gettext></a>]</td>
+ </tr>
</loop:pubkey_list>
- </table>
+ </table>
</else:empty_pubkey_list></if:empty_pubkey_list>
+ </div>
+ <div>
<if:no_file_upload>
- <em class="redText"><gettext>Key import is not available. File upload is not enabled on this server.</gettext></em>
+ <em class="redText"><gettext>Key import is not available. File upload is not enabled on this server.</gettext></em>
<else:no_file_upload>
<if:no_source>
- <em><gettext>Key import is not available. You have no address book defined to add your contacts.</gettext></em>
+ <em><gettext>Key import is not available. You have no address book defined to add your contacts.</gettext></em>
<else:no_source>
- <p><input type="submit" name="save" class="button" onclick="<tag:public_import_url />return false;" value="<gettext>Import Public Key</gettext>" />
- <tag:import_pubkey-help /></p>
+ <p>
+ <input type="submit" name="save" class="button" onclick="<tag:public_import_url />return false;" value="<gettext>Import Public Key</gettext>" />
+ <tag:import_pubkey-help />
+ </p>
</else:no_source></if:no_source></else:no_file_upload></if:no_file_upload>
+ </div>
</div>
<br class="spacer" />
<div class="prefsContainer item">
<if:secure_check>
- <em><gettext>S/MIME Personal Keypair support requires a secure web connection.</gettext></em>
-<else:secure_check>
<if:has_key>
- <table>
- <tr>
- <td><gettext>Your Public Key:</gettext></td>
- <td> [<tag:viewpublic /><gettext>View</gettext></a>] [<tag:infopublic /><gettext>Details</gettext></a>]</td>
- </tr>
- <tr>
- <td><gettext>Your Private Key:</gettext></td>
- <td> [<tag:passphrase /></a>] [<tag:viewprivate /><gettext>View</gettext></a>]</td>
- </tr>
- </table>
+ <div>
+ <table>
+ <tr>
+ <td><gettext>Your Public Key:</gettext></td>
+ <td> [<tag:viewpublic /><gettext>View</gettext></a>] [<tag:infopublic /><gettext>Details</gettext></a>]</td>
+ </tr>
+ <tr>
+ <td><gettext>Your Private Key:</gettext></td>
+ <td> [<tag:passphrase /></a>] [<tag:viewprivate /><gettext>View</gettext></a>]</td>
+ </tr>
+ </table>
+ </div>
- <p><input type="submit" name="delete" class="button" onclick="if (confirm('<tag:deletekeypair />')) { document.prefs.actionID.value='delete_key'; return true; } else { return false; }" value="<gettext>Delete Current Keys</gettext>" />
- <tag:personalkey-delete-help /></p>
+ <p>
+ <input type="submit" name="delete" class="button" onclick="if (confirm('<tag:deletekeypair />')) { document.prefs.actionID.value='delete_key'; return true; } else { return false; }" value="<gettext>Delete Current Keys</gettext>" />
+ <tag:personalkey-delete-help />
+ </p>
<else:has_key>
<if:no_file_upload>
- <em class="redText"><gettext>Certificate import is not available. File upload is not enabled on this server.</gettext></em>
+ <div>
+ <em class="redText"><gettext>Certificate import is not available. File upload is not enabled on this server.</gettext></em>
+ </div>
<else:no_file_upload>
- <em class="redText"><gettext>No certificate available.</gettext></em>
- <p><input type="submit" name="save" class="button" onclick="<tag:personal_import_url />return false;" value="<gettext>Import Keypair</gettext>" /> <tag:import-cert-help /></p>
+ <div>
+ <em class="redText"><gettext>No certificate available.</gettext></em>
+ </div>
+ <p>
+ <input type="submit" name="save" class="button" onclick="<tag:personal_import_url />return false;" value="<gettext>Import Keypair</gettext>" />
+ <tag:import-cert-help />
+ </p>
</else:no_file_upload></if:no_file_upload>
-</else:has_key></if:has_key></else:secure_check></if:secure_check>
+</else:has_key></if:has_key>
+<else:secure_check>
+ <div>
+ <em><gettext>S/MIME Personal Keypair support requires a secure web connection.</gettext></em>
+ </div>
+</else:secure_check></if:secure_check>
<else:smimeactive>
<if:use_smime_locked>
- <em><gettext>S/MIME support is disabled on this system.</gettext></em>
+ <div>
+ <em><gettext>S/MIME support is disabled on this system.</gettext></em>
+ </div>
<else:use_smime_locked>
- <input type="checkbox" id="use_smime" name="use_smime" /> <tag:use_smime_label /> <tag:use_smime_help /><br />
+ <div>
+ <input type="checkbox" id="use_smime" name="use_smime" />
+ <tag:use_smime_label />
+ <tag:use_smime_help />
+ </div>
</else:use_smime_locked></if:use_smime_locked>
<p>
projects / horde.git / commitdiff