From: Michael M Slusarz Date: Wed, 17 Feb 2010 07:55:38 +0000 (-0700) Subject: prefs cleanups X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=143acecf023c46b6298013c3c98618fa64d23b4e;p=horde.git prefs cleanups --- diff --git a/imp/smime.php b/imp/smime.php index eca74176c..9e7be4907 100644 --- a/imp/smime.php +++ b/imp/smime.php @@ -197,7 +197,7 @@ if ($openssl_check && $prefs->getValue('use_smime')) { $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')); diff --git a/imp/templates/pgp/pgp.html b/imp/templates/pgp/pgp.html index 308491727..b80386cee 100644 --- a/imp/templates/pgp/pgp.html +++ b/imp/templates/pgp/pgp.html @@ -1,19 +1,34 @@ -   -
- NOTE: 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. -
+
+ + + +
+
+

+ NOTE: 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. +

+
- checked="checked" />   -
+
+ checked="checked" /> + + +
- checked="checked" />   -
+
+ checked="checked" /> + + +
- checked="checked" />   -
+
+ checked="checked" /> + + +

@@ -31,26 +46,38 @@

- No Keys in Keyring
+
+ No Keys in Keyring +
- +
+
- - - - + + + + -
()  [View] [Details] [Delete]
()  [View] [Details] [Delete]
+ +
-
Key import is not available. File upload is not enabled on this server.
+
+ Key import is not available. File upload is not enabled on this server. +
-
Key import is not available. You have no address book defined to add your contacts.
+
+ Key import is not available. You have no address book defined to add your contacts. +
-
- +
+

+ + +

+
@@ -63,78 +90,90 @@
- PGP Personal Keypair support requires a secure web connection. +
+ PGP Personal Keypair support requires a secure web connection. +
+
- - - - - - - - - - - -
Your Public Key:  [View] [Details] [Send Key to Public Keyserver]
Your Private Key:  [] [View] [Details]
+ + + + + + + + + + + +
Your Public Key:  [View] [Details] [Send Key to Public Keyserver]
Your Private Key:  [] [View] [Details]
+

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  
  
  
  - -
  
  
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  
  
  
  + +
  
  
-

- +

+ - + - -

- + +

+ +
+ - PGP support is disabled on this system. +
+ PGP support is disabled on this system. +
-
+
+ + + +

diff --git a/imp/templates/prefs/draftsselect.inc b/imp/templates/prefs/draftsselect.inc index 349b230b4..499ccd433 100644 --- a/imp/templates/prefs/draftsselect.inc +++ b/imp/templates/prefs/draftsselect.inc @@ -1,7 +1,12 @@ -
- - -
+

+
+ +
+
+ + +
+
diff --git a/imp/templates/prefs/encryptselect.inc b/imp/templates/prefs/encryptselect.inc index ef89f5284..8bfc7d0fc 100644 --- a/imp/templates/prefs/encryptselect.inc +++ b/imp/templates/prefs/encryptselect.inc @@ -1,5 +1,8 @@ -
- -
+
+
+
+ +
+
diff --git a/imp/templates/prefs/initialpageselect.inc b/imp/templates/prefs/initialpageselect.inc index c0a4308fe..1dc7b6587 100644 --- a/imp/templates/prefs/initialpageselect.inc +++ b/imp/templates/prefs/initialpageselect.inc @@ -10,11 +10,14 @@ if (empty($GLOBALS['conf']['user']['allow_folders'])) { $mailbox_option .= '>' . _("Folder Navigator") . "\n" . IMP::flistSelect(array('selected' => $mailbox_selected, 'inc_vfolder' => true)); } - -echo Horde::label('initial_page', _("View or mailbox to display after login:")); ?> -
- -
+
+
+ +
+
+ +
+
diff --git a/imp/templates/prefs/sentmailselect.inc b/imp/templates/prefs/sentmailselect.inc index 1663f0e4c..2a438dc2b 100644 --- a/imp/templates/prefs/sentmailselect.inc +++ b/imp/templates/prefs/sentmailselect.inc @@ -1,8 +1,13 @@ -
- - -
+
+
+ +
+
+ + +
+
diff --git a/imp/templates/prefs/soundselect.inc b/imp/templates/prefs/soundselect.inc index 4bccae690..8c476bf3c 100644 --- a/imp/templates/prefs/soundselect.inc +++ b/imp/templates/prefs/soundselect.inc @@ -1,14 +1,23 @@ -getValue('nav_audio') ?> -

-
    -
    • +getValue('nav_audio') +?> +
    +

    +
      +
    • + +
      • get('themesfs') . '/graphics/audio/*.wav') as $sound): $sound = basename($sound); ?> -
    • - - -
      • +
    • + + +
      • -
    +
+ diff --git a/imp/templates/prefs/sourceselect.inc b/imp/templates/prefs/sourceselect.inc index b46ab5960..ab7decf9f 100644 --- a/imp/templates/prefs/sourceselect.inc +++ b/imp/templates/prefs/sourceselect.inc @@ -1,73 +1,72 @@ getImageDir('horde'); + $cache = IMP_Application::$prefsCache['sourceselect']; + $imagedir = $registry->getImageDir('horde'); ?> -
- -" /> + +
+ " /> 1): ?> -
- - - + + +
- - + + - - + + - - -
+ + - - -
- - 		- - + + +
+ + 		+ + - - -
- -
+ + 		+ +
+ +
-
+

-
+

-
- - - - - -
- - -
+
+ + + + + +
+ + +
-
-
- - + - + - + +
diff --git a/imp/templates/prefs/spamselect.inc b/imp/templates/prefs/spamselect.inc index bf4681210..9cfd315cf 100644 --- a/imp/templates/prefs/spamselect.inc +++ b/imp/templates/prefs/spamselect.inc @@ -1,6 +1,12 @@ -
- - +
+
+ +
+
+ + +
+
diff --git a/imp/templates/prefs/trashselect.inc b/imp/templates/prefs/trashselect.inc index 9ba80d224..5b67ef20b 100644 --- a/imp/templates/prefs/trashselect.inc +++ b/imp/templates/prefs/trashselect.inc @@ -1,11 +1,16 @@ -
- - + -
+ + + diff --git a/imp/templates/smime/smime.html b/imp/templates/smime/smime.html index c7fa66b78..b3206c9d5 100644 --- a/imp/templates/smime/smime.html +++ b/imp/templates/smime/smime.html @@ -1,11 +1,20 @@ -   -
- NOTE: 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. -
+
+ + + +
+
+

+ NOTE: 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. +

+
- checked="checked" />   -
+
+ checked="checked" /> + + +

@@ -22,28 +31,34 @@

+
- No Keys in Keyring + No Keys in Keyring - +
- - - - + + + + -
()  [View] [Details] [Delete]
()  [View] [Details] [Delete]
+ +
+
- Key import is not available. File upload is not enabled on this server. + Key import is not available. File upload is not enabled on this server. - Key import is not available. You have no address book defined to add your contacts. + Key import is not available. You have no address book defined to add your contacts. -

-

+

+ + +

+

@@ -55,35 +70,55 @@
- S/MIME Personal Keypair support requires a secure web connection. - - - - - - - - - - -
Your Public Key:  [View] [Details]
Your Private Key:  [] [View]
+
+ + + + + + + + + +
Your Public Key:  [View] [Details]
Your Private Key:  [] [View]
+
-

-

+

+ + +

- Certificate import is not available. File upload is not enabled on this server. +
+ Certificate import is not available. File upload is not enabled on this server. +
- No certificate available. -

+
+ No certificate available. +
+

+ + +

- + + +
+ S/MIME Personal Keypair support requires a secure web connection. +
+ - S/MIME support is disabled on this system. +
+ S/MIME support is disabled on this system. +
-
+
+ + + +