More coherent organization of IMP templates
authorMichael M Slusarz <slusarz@curecanti.org>
Tue, 16 Mar 2010 03:14:47 +0000 (21:14 -0600)
committerMichael M Slusarz <slusarz@curecanti.org>
Tue, 16 Mar 2010 03:14:47 +0000 (21:14 -0600)
Better separates the three views.

120 files changed:
imp/acl.php
imp/compose-dimp.php
imp/compose-mimp.php
imp/compose.php
imp/config/hooks.php.dist
imp/contacts.php
imp/filterprefs.php
imp/folders-mimp.php
imp/folders.php
imp/index-dimp.php
imp/lib/Crypt/Pgp.php
imp/lib/Crypt/Smime.php
imp/lib/IMP.php
imp/lib/Ui/Compose.php
imp/lib/Views/Compose.php
imp/mailbox-mimp.php
imp/mailbox.php
imp/message-dimp.php
imp/message-mimp.php
imp/message.php
imp/pgp.php
imp/search-basic.php
imp/search.php
imp/stationery.php
imp/templates/acl/acl.html [deleted file]
imp/templates/chunks/compose.php [deleted file]
imp/templates/chunks/message.php [deleted file]
imp/templates/common-header.inc
imp/templates/compose/compose-mimp.html [deleted file]
imp/templates/compose/compose.html [deleted file]
imp/templates/compose/redirect.html [deleted file]
imp/templates/compose/success.html [deleted file]
imp/templates/contacts/contacts.html [deleted file]
imp/templates/dimp/chunks/compose.php [new file with mode: 0644]
imp/templates/dimp/chunks/message.php [new file with mode: 0644]
imp/templates/dimp/compose/compose.html [new file with mode: 0644]
imp/templates/dimp/index.inc [new file with mode: 0644]
imp/templates/dimp/javascript_defs_dimp.php [new file with mode: 0644]
imp/templates/dimp/portal/portal.html [new file with mode: 0644]
imp/templates/filters/prefs.html [deleted file]
imp/templates/folders/actions.html [deleted file]
imp/templates/folders/folders-mimp.html [deleted file]
imp/templates/folders/folders.html [deleted file]
imp/templates/folders/folders_confirm.html [deleted file]
imp/templates/folders/folders_size.html [deleted file]
imp/templates/folders/head.html [deleted file]
imp/templates/folders/import.html [deleted file]
imp/templates/imp/acl/acl.html [new file with mode: 0644]
imp/templates/imp/compose.html [deleted file]
imp/templates/imp/compose/compose.html [new file with mode: 0644]
imp/templates/imp/compose/redirect.html [new file with mode: 0644]
imp/templates/imp/compose/success.html [new file with mode: 0644]
imp/templates/imp/contacts/contacts.html [new file with mode: 0644]
imp/templates/imp/folders/actions.html [new file with mode: 0644]
imp/templates/imp/folders/folders.html [new file with mode: 0644]
imp/templates/imp/folders/folders_confirm.html [new file with mode: 0644]
imp/templates/imp/folders/folders_size.html [new file with mode: 0644]
imp/templates/imp/folders/head.html [new file with mode: 0644]
imp/templates/imp/folders/import.html [new file with mode: 0644]
imp/templates/imp/javascript_defs.php [new file with mode: 0644]
imp/templates/imp/mailbox/actions.html [new file with mode: 0644]
imp/templates/imp/mailbox/actions_deleted.html [new file with mode: 0644]
imp/templates/imp/mailbox/empty_mailbox.html [new file with mode: 0644]
imp/templates/imp/mailbox/header.html [new file with mode: 0644]
imp/templates/imp/mailbox/mailbox.html [new file with mode: 0644]
imp/templates/imp/mailbox/message_footers.html [new file with mode: 0644]
imp/templates/imp/mailbox/message_headers.html [new file with mode: 0644]
imp/templates/imp/mailbox/navbar.html [new file with mode: 0644]
imp/templates/imp/mailbox/searchfolder.html [new file with mode: 0644]
imp/templates/imp/menu/menu.html [new file with mode: 0644]
imp/templates/imp/message/message.html [new file with mode: 0644]
imp/templates/imp/message/navbar_actions.html [new file with mode: 0644]
imp/templates/imp/message/navbar_navigate.html [new file with mode: 0644]
imp/templates/imp/message/navbar_top.html [new file with mode: 0644]
imp/templates/imp/portal.html [deleted file]
imp/templates/imp/search/search-basic.html [new file with mode: 0644]
imp/templates/imp/search/search.html [new file with mode: 0644]
imp/templates/imp/thread/thread.html [new file with mode: 0644]
imp/templates/index/index-dimp.inc [deleted file]
imp/templates/javascript_defs.php [deleted file]
imp/templates/javascript_defs_dimp.php [deleted file]
imp/templates/mailbox/actions.html [deleted file]
imp/templates/mailbox/actions_deleted.html [deleted file]
imp/templates/mailbox/empty_mailbox.html [deleted file]
imp/templates/mailbox/header.html [deleted file]
imp/templates/mailbox/mailbox-mimp.html [deleted file]
imp/templates/mailbox/mailbox.html [deleted file]
imp/templates/mailbox/message_footers.html [deleted file]
imp/templates/mailbox/message_headers.html [deleted file]
imp/templates/mailbox/navbar.html [deleted file]
imp/templates/mailbox/search-mimp.html [deleted file]
imp/templates/mailbox/searchfolder.html [deleted file]
imp/templates/menu.html [deleted file]
imp/templates/message/message-mimp.html [deleted file]
imp/templates/message/message.html [deleted file]
imp/templates/message/navbar_actions.html [deleted file]
imp/templates/message/navbar_navigate.html [deleted file]
imp/templates/message/navbar_top.html [deleted file]
imp/templates/message/part-mimp.html [deleted file]
imp/templates/mimp/compose/compose.html [new file with mode: 0644]
imp/templates/mimp/folders/folders.html [new file with mode: 0644]
imp/templates/mimp/mailbox/mailbox.html [new file with mode: 0644]
imp/templates/mimp/mailbox/search.html [new file with mode: 0644]
imp/templates/mimp/message/message.html [new file with mode: 0644]
imp/templates/mimp/message/part.html [new file with mode: 0644]
imp/templates/pgp/import_key.html [deleted file]
imp/templates/pgp/pgp.html [deleted file]
imp/templates/prefs/filters/filters.html [new file with mode: 0644]
imp/templates/prefs/pgp/import_key.html [new file with mode: 0644]
imp/templates/prefs/pgp/pgp.html [new file with mode: 0644]
imp/templates/prefs/smime/import_key.html [new file with mode: 0644]
imp/templates/prefs/smime/smime.html [new file with mode: 0644]
imp/templates/prefs/stationery/stationery.html [new file with mode: 0644]
imp/templates/search/search-basic.html [deleted file]
imp/templates/search/search.html [deleted file]
imp/templates/smime/import_key.html [deleted file]
imp/templates/smime/smime.html [deleted file]
imp/templates/stationery/stationery.html [deleted file]
imp/templates/thread/thread.html [deleted file]
imp/thread.php

index b4e03ad..5588927 100644 (file)
@@ -186,7 +186,7 @@ $t->set('width', round(100 / (count($rightsval) + 1)) . '%');
 $t->set('prefsurl', $prefs_url);
 
 Horde::addScriptFile('acl.js', 'imp');
-echo $t->fetch(IMP_TEMPLATES . '/acl/acl.html');
+echo $t->fetch(IMP_TEMPLATES . '/imp/acl/acl.html');
 if (!$chunk) {
     require $registry->get('templates', 'horde') . '/common-footer.inc';
 }
index ce11c81..3304473 100644 (file)
@@ -205,7 +205,7 @@ $scripts = array(
 
 IMP::status();
 IMP_Dimp::header(_("Message Composition"), $scripts);
-echo $t->fetch(IMP_TEMPLATES . '/imp/compose.html');
+echo $t->fetch(IMP_TEMPLATES . '/dimp/compose/compose.html');
 Horde::includeScriptFiles();
 Horde::outputInlineScript();
 echo $compose_result['jsappend'];
index 73bb8db..e4ed603 100644 (file)
@@ -348,4 +348,4 @@ $t->set('title', $title);
 
 require IMP_TEMPLATES . '/common-header.inc';
 IMP::status();
-echo $t->fetch(IMP_TEMPLATES . '/compose/compose-mimp.html');
+echo $t->fetch(IMP_TEMPLATES . '/mimp/compose/compose.html');
index 483674a..5e89cdf 100644 (file)
@@ -731,7 +731,7 @@ if ($redirect) {
     $t->set('input_value', htmlspecialchars($header['to']));
     $t->set('help', Horde_Help::link('imp', 'compose-to'));
 
-    $template_output = $t->fetch(IMP_TEMPLATES . '/compose/redirect.html');
+    $template_output = $t->fetch(IMP_TEMPLATES . '/imp/compose/redirect.html');
 } else {
     /* Prepare the compose template. */
     $tabindex = 0;
@@ -1037,7 +1037,7 @@ if ($redirect) {
     }
 
     $t->set('status', Horde_Util::bufferOutput(array('IMP', 'status')));
-    $template_output = $t->fetch(IMP_TEMPLATES . '/compose/compose.html');
+    $template_output = $t->fetch(IMP_TEMPLATES . '/imp/compose/compose.html');
 }
 
 if ($rtemode && !$redirect) {
index b5de25f..1bd35a5 100644 (file)
@@ -674,7 +674,7 @@ class IMP_Hooks
     /**
      * DIMP: Allow additional information to be added to the array that is
      * passed to the message text display template:
-     *   imp/templates/chunks/message.php.
+     *   imp/templates/dimp/chunks/message.php.
      *
      * @param array $msg  The current entry array (see the showMessage()
      *                    function in lib/Views/ShowMessage.php for the
index f391af7..30b9104 100644 (file)
@@ -105,5 +105,5 @@ Horde::addInlineScript(array(
     'ImpContacts.formname = \'' . $formname . '\'',
     'ImpContacts.to_only = ' . intval($to_only),
 ));
-echo $template->fetch(IMP_TEMPLATES . '/contacts/contacts.html');
+echo $template->fetch(IMP_TEMPLATES . '/imp/contacts/contacts.html');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
index 25e3432..cbda88b 100644 (file)
@@ -120,7 +120,7 @@ if (!$blacklist_link && !$whitelist_link && !$filters_link) {
     }
 }
 
-echo $t->fetch(IMP_TEMPLATES . '/filters/prefs.html');
+echo $t->fetch(IMP_TEMPLATES . '/prefs/filters/filters.html');
 if (!$chunk) {
     require $registry->get('templates', 'horde') . '/common-footer.inc';
 }
index 92a85b8..ff960c0 100644 (file)
@@ -74,4 +74,4 @@ $t->set('title', $title);
 
 require_once IMP_TEMPLATES . '/common-header.inc';
 IMP::status();
-echo $t->fetch(IMP_TEMPLATES . '/folders/folders-mimp.html');
+echo $t->fetch(IMP_TEMPLATES . '/mimp/folders/folders.html');
index 50893b5..c312614 100644 (file)
@@ -281,7 +281,7 @@ case 'folders_empty_mailbox_confirm':
         $template->set('folders', $loop);
         $template->set('folders_url', $folders_url);
         $template->set('folders_token', Horde::getRequestToken('imp.folders'));
-        echo $template->fetch(IMP_TEMPLATES . '/folders/folders_confirm.html');
+        echo $template->fetch(IMP_TEMPLATES . '/imp/folders/folders_confirm.html');
 
         require $registry->get('templates', 'horde') . '/common-footer.inc';
         exit;
@@ -321,7 +321,7 @@ case 'mbox_size':
         $template->set('folders', $loop);
         $template->set('folders_url', $folders_url);
         $template->set('folders_sum', sprintf(_("%.2fMB"), $sum / (1024 * 1024)));
-        echo $template->fetch(IMP_TEMPLATES . '/folders/folders_size.html');
+        echo $template->fetch(IMP_TEMPLATES . '/imp/folders/folders_size.html');
 
         require $registry->get('templates', 'horde') . '/common-footer.inc';
         exit;
@@ -350,7 +350,7 @@ if ($_SESSION['imp']['file_upload'] && ($actionID == 'import_mbox')) {
     $i_template->set('import_folder', $folder_list[0]);
     $i_template->set('folder_name', htmlspecialchars(Horde_String::convertCharset($folder_list[0], 'UTF7-IMAP'), ENT_COMPAT, $charset));
     $i_template->set('folders_token', $folders_token);
-    echo $i_template->fetch(IMP_TEMPLATES . '/folders/import.html');
+    echo $i_template->fetch(IMP_TEMPLATES . '/imp/folders/import.html');
     require $registry->get('templates', 'horde') . '/common-footer.inc';
     exit;
 }
@@ -475,12 +475,12 @@ IMP::menu();
 IMP::status();
 IMP::quota();
 
-echo $head_template->fetch(IMP_TEMPLATES . '/folders/head.html');
-echo $a_template->fetch(IMP_TEMPLATES . '/folders/actions.html');
-echo $template->fetch(IMP_TEMPLATES . '/folders/folders.html');
+echo $head_template->fetch(IMP_TEMPLATES . '/imp/folders/head.html');
+echo $a_template->fetch(IMP_TEMPLATES . '/imp/folders/actions.html');
+echo $template->fetch(IMP_TEMPLATES . '/imp/folders/folders.html');
 if (count($rows) > 10) {
     $a_template->set('id', 1);
-    echo $a_template->fetch(IMP_TEMPLATES . '/folders/actions.html');
+    echo $a_template->fetch(IMP_TEMPLATES . '/imp/folders/actions.html');
 }
 
 /* No need for extra template - close out the tags here. */
index 3fe7364..4acf8db 100644 (file)
@@ -62,7 +62,7 @@ foreach (IMP_Dimp::menuList() as $app) {
 }
 
 echo "<body>\n";
-require IMP_TEMPLATES . '/index/index-dimp.inc';
+require IMP_TEMPLATES . '/dimp/index.inc';
 Horde::includeScriptFiles();
 Horde::outputInlineScript();
 echo "</body>\n</html>";
index b8f940f..7d4de5e 100644 (file)
@@ -648,7 +648,7 @@ class IMP_Crypt_Pgp extends Horde_Crypt_Pgp
         $t->set('import_public_key', $target == 'process_import_public_key');
         $t->set('import_personal_public_key', $target == 'process_import_personal_public_key');
         $t->set('import_personal_private_key', $target == 'process_import_personal_private_key');
-        echo $t->fetch(IMP_TEMPLATES . '/pgp/import_key.html');
+        echo $t->fetch(IMP_TEMPLATES . '/prefs/pgp/import_key.html');
     }
 
     /**
index b094c3c..fd97566 100644 (file)
@@ -483,7 +483,7 @@ class IMP_Crypt_Smime extends Horde_Crypt_Smime
         $t->set('forminput', Horde_Util::formInput());
         $t->set('import_public_key', $target == 'process_import_public_key');
         $t->set('import_personal_certs', $target == 'process_import_personal_certs');
-        echo $t->fetch(IMP_TEMPLATES . '/smime/import_key.html');
+        echo $t->fetch(IMP_TEMPLATES . '/prefs/smime/import_key.html');
     }
 
     /**
index ec4510b..ea6b13a 100644 (file)
@@ -545,7 +545,7 @@ class IMP
     static public function menu()
     {
         self::prepareMenu();
-        echo self::$_menuTemplate->fetch(IMP_TEMPLATES . '/menu.html');
+        echo self::$_menuTemplate->fetch(IMP_TEMPLATES . '/imp/menu/menu.html');
     }
 
     /**
index 87f009b..3787645 100644 (file)
@@ -288,7 +288,7 @@ class IMP_Ui_Compose
         require IMP_TEMPLATES . '/common-header.inc';
         $success_template = $GLOBALS['injector']->createInstance('Horde_Template');
         $success_template->set('menu', $menu->render());
-        echo $success_template->fetch(IMP_TEMPLATES . '/compose/success.html');
+        echo $success_template->fetch(IMP_TEMPLATES . '/imp/compose/success.html');
         IMP::status();
         require $GLOBALS['registry']->get('templates', 'horde') . '/common-footer.inc';
     }
index f78e1cc..16c6c1f 100644 (file)
@@ -97,7 +97,7 @@ class IMP_Views_Compose
 
         // Buffer output so that we can return a string from this function
         ob_start();
-        require IMP_TEMPLATES . '/chunks/compose.php';
+        require IMP_TEMPLATES . '/dimp/chunks/compose.php';
         $result['html'] .= ob_get_contents();
         ob_clean();
 
index 95f8634..9c6e106 100644 (file)
@@ -99,7 +99,7 @@ case 's':
 
     require_once IMP_TEMPLATES . '/common-header.inc';
     IMP::status();
-    echo $t->fetch(IMP_TEMPLATES . '/mailbox/search-mimp.html');
+    echo $t->fetch(IMP_TEMPLATES . '/mimp/mailbox/search.html');
     exit;
 
 // 'rs' = run search
@@ -272,4 +272,4 @@ try {
 
 require_once IMP_TEMPLATES . '/common-header.inc';
 IMP::status();
-echo $t->fetch(IMP_TEMPLATES . '/mailbox/mailbox-mimp.html');
+echo $t->fetch(IMP_TEMPLATES . '/mimp/mailbox/mailbox.html');
index df0cd0c..2463f67 100644 (file)
@@ -34,7 +34,7 @@ function _outputSummaries($msgs)
     }
 
     $template->set('messages', $msgs, true);
-    echo $template->fetch(IMP_TEMPLATES . '/mailbox/mailbox.html');
+    echo $template->fetch(IMP_TEMPLATES . '/imp/mailbox/mailbox.html');
 }
 
 
@@ -438,7 +438,7 @@ if ($pageOb['pagecount'] > 1) {
     $hdr_template->set('page', sprintf(_("Page %d of %d"), $pageOb['page'], $pageOb['pagecount']));
 }
 
-echo $hdr_template->fetch(IMP_TEMPLATES . '/mailbox/header.html');
+echo $hdr_template->fetch(IMP_TEMPLATES . '/imp/mailbox/header.html');
 
 /* If no messages, exit immediately. */
 if (empty($pageOb['end'])) {
@@ -450,13 +450,13 @@ if (empty($pageOb['end'])) {
         if (!$readonly) {
             $del_template->set('purge', Horde::widget($refresh_url->copy()->add(array('actionID' => 'expunge_mailbox', 'mailbox_token' => $mailbox_token)), _("Purge Deleted"), 'widget purgeAction', '', '', _("Pur_ge Deleted")));
         }
-        echo $del_template->fetch(IMP_TEMPLATES . '/mailbox/actions_deleted.html');
+        echo $del_template->fetch(IMP_TEMPLATES . '/imp/mailbox/actions_deleted.html');
     }
 
     $empty_template = $injector->createInstance('Horde_Template');
     $empty_template->setOption('gettext', true);
     $empty_template->set('search_mbox', $search_mbox);
-    echo $empty_template->fetch(IMP_TEMPLATES . '/mailbox/empty_mailbox.html');
+    echo $empty_template->fetch(IMP_TEMPLATES . '/imp/mailbox/empty_mailbox.html');
     require $registry->get('templates', 'horde') . '/common-footer.inc';
     exit;
 }
@@ -498,7 +498,7 @@ if ($pageOb['msgcount']) {
         $n_template->set('page_size', Horde_String::length($pageOb['pagecount']));
     }
 
-    echo $n_template->fetch(IMP_TEMPLATES . '/mailbox/navbar.html');
+    echo $n_template->fetch(IMP_TEMPLATES . '/imp/mailbox/navbar.html');
 
     /* Prepare the actions template. */
     $a_template = $injector->createInstance('Horde_Template');
@@ -547,7 +547,7 @@ if ($pageOb['msgcount']) {
 
     $a_template->set('view_messages', Horde::widget('#', _("View Messages"), 'widget viewAction', '', '', _("View Messages")));
 
-    echo $a_template->fetch(IMP_TEMPLATES . '/mailbox/actions.html');
+    echo $a_template->fetch(IMP_TEMPLATES . '/imp/mailbox/actions.html');
 }
 
 /* Define some variables now so we don't have to keep redefining in the
@@ -669,7 +669,7 @@ if ($pageOb['msgcount']) {
 
     if (!$search_mbox) {
         $mh_template->set('mh_count', $mh_count++);
-        echo $mh_template->fetch(IMP_TEMPLATES . '/mailbox/message_headers.html');
+        echo $mh_template->fetch(IMP_TEMPLATES . '/imp/mailbox/message_headers.html');
     }
 }
 
@@ -694,13 +694,13 @@ while (list(,$ob) = each($mbox_info['overview'])) {
             }
             $search_template->set('lastMbox', $lastMbox);
             $search_template->set('folder_link', $folder_link);
-            echo $search_template->fetch(IMP_TEMPLATES . '/mailbox/searchfolder.html');
+            echo $search_template->fetch(IMP_TEMPLATES . '/imp/mailbox/searchfolder.html');
 
             if ($mh_count) {
                 $mh_template->set('form_tag', false);
             }
             $mh_template->set('mh_count', $mh_count++);
-            echo $mh_template->fetch(IMP_TEMPLATES . '/mailbox/message_headers.html');
+            echo $mh_template->fetch(IMP_TEMPLATES . '/imp/mailbox/message_headers.html');
         }
     }
 
@@ -827,15 +827,15 @@ _outputSummaries($msgs);
 /* Prepare the message footers template. */
 $mf_template = $injector->createInstance('Horde_Template');
 $mf_template->set('page', $pageOb['page']);
-echo $mf_template->fetch(IMP_TEMPLATES . '/mailbox/message_footers.html');
+echo $mf_template->fetch(IMP_TEMPLATES . '/imp/mailbox/message_footers.html');
 
 /* If there are 20 messages or less, don't show the actions/navbar again. */
 if (($pageOb['end'] - $pageOb['begin']) >= 20) {
     $a_template->set('isbottom', true);
-    echo $a_template->fetch(IMP_TEMPLATES . '/mailbox/actions.html');
+    echo $a_template->fetch(IMP_TEMPLATES . '/imp/mailbox/actions.html');
     $n_template->set('id', 2);
     $n_template->set('isbottom', true);
-    echo $n_template->fetch(IMP_TEMPLATES . '/mailbox/navbar.html');
+    echo $n_template->fetch(IMP_TEMPLATES . '/imp/mailbox/navbar.html');
 }
 
 Horde::addInlineScript(array(
index 489884d..b36d0c0 100644 (file)
@@ -89,7 +89,7 @@ Horde::addInlineScript(array_filter($js_onload), 'load');
 IMP::status();
 IMP_Dimp::header($show_msg_result['title'], $scripts);
 echo "<body>\n";
-require IMP_TEMPLATES . '/chunks/message.php';
+require IMP_TEMPLATES . '/dimp/chunks/message.php';
 Horde::includeScriptFiles();
 Horde::outputInlineScript();
 if (!$disable_compose) {
index 3e9b615..4082d09 100644 (file)
@@ -157,7 +157,7 @@ if (($vars->a == 'pa') &&
     $t->set('self_link', $self_link);
 
     require IMP_TEMPLATES . '/common-header.inc';
-    echo $t->fetch(IMP_TEMPLATES . '/message/part-mimp.html');
+    echo $t->fetch(IMP_TEMPLATES . '/mimp/message/part.html');
 
     exit;
 }
@@ -354,4 +354,4 @@ $t->set('title', ($status ? $status . ' | ' : '') . $display_headers['subject']
 
 require IMP_TEMPLATES . '/common-header.inc';
 IMP::status();
-echo $t->fetch(IMP_TEMPLATES . '/message/message-mimp.html');
+echo $t->fetch(IMP_TEMPLATES . '/mimp/message/message.html');
index e7203bc..f31d054 100644 (file)
@@ -665,16 +665,16 @@ IMP::menu();
 IMP::status();
 IMP::quota();
 
-echo $t_template->fetch(IMP_TEMPLATES . '/message/navbar_top.html');
-echo $n_template->fetch(IMP_TEMPLATES . '/message/navbar_navigate.html');
-echo $a_template->fetch(IMP_TEMPLATES . '/message/navbar_actions.html');
-echo $m_template->fetch(IMP_TEMPLATES . '/message/message.html');
+echo $t_template->fetch(IMP_TEMPLATES . '/imp/message/navbar_top.html');
+echo $n_template->fetch(IMP_TEMPLATES . '/imp/message/navbar_navigate.html');
+echo $a_template->fetch(IMP_TEMPLATES . '/imp/message/navbar_actions.html');
+echo $m_template->fetch(IMP_TEMPLATES . '/imp/message/message.html');
 
 $a_template->set('isbottom', true);
-echo $a_template->fetch(IMP_TEMPLATES . '/message/navbar_actions.html');
+echo $a_template->fetch(IMP_TEMPLATES . '/imp/message/navbar_actions.html');
 
 $n_template->set('id', 2);
 $n_template->set('isbottom', true);
-echo $n_template->fetch(IMP_TEMPLATES . '/message/navbar_navigate.html');
+echo $n_template->fetch(IMP_TEMPLATES . '/imp/message/navbar_navigate.html');
 
 require $registry->get('templates', 'horde') . '/common-footer.inc';
index 751cc8a..28f576c 100644 (file)
@@ -326,7 +326,7 @@ if ($prefs->getValue('use_pgp')) {
 }
 $t->set('prefsurl', Horde::getServiceLink('options', 'imp'));
 
-echo $t->fetch(IMP_TEMPLATES . '/pgp/pgp.html');
+echo $t->fetch(IMP_TEMPLATES . '/prefs/pgp/pgp.html');
 if (!$chunk) {
     require $registry->get('templates', 'horde') . '/common-footer.inc';
 }
index b24875e..87ce1cd 100644 (file)
@@ -74,5 +74,5 @@ if ($browser->hasFeature('javascript')) {
     $t->set('advsearch', Horde::link(Horde::applicationUrl('search.php')->add(array('search_mailbox' => $search_mailbox))));
 }
 
-echo $t->fetch(IMP_TEMPLATES . '/search/search-basic.html');
+echo $t->fetch(IMP_TEMPLATES . '/imp/search/search-basic.html');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
index 8c4ef4d..97d72b4 100644 (file)
@@ -221,5 +221,5 @@ if (!$dimp_view) {
 }
 IMP::status();
 
-echo $t->fetch(IMP_TEMPLATES . '/search/search.html');
+echo $t->fetch(IMP_TEMPLATES . '/imp/search/search.html');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
index 81f9af3..2a818c3 100644 (file)
@@ -131,7 +131,7 @@ $t->set('content', $stationery['c']);
 $t->set('button_href', $compose_url->copy()->add('group', 'compose'));
 $t->set('button_val', htmlspecialchars(_("Return to Message Composition"), ENT_COMPAT, Horde_Nls::getCharset()));
 
-echo $t->fetch(IMP_TEMPLATES . '/stationery/stationery.html');
+echo $t->fetch(IMP_TEMPLATES . '/prefs/stationery/stationery.html');
 if (!$chunk) {
     require $registry->get('templates', 'horde') . '/common-footer.inc';
 }
diff --git a/imp/templates/acl/acl.html b/imp/templates/acl/acl.html
deleted file mode 100644 (file)
index 9fd0a26..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-<form method="post" name="folders" id="folders" action="<tag:aclurl />">
-<input type="hidden" name="actionID" value="" />
-<tag:forminput />
-
-<div class="header">
- <tag:aclnavcell />
- <gettext>Share mail folders</gettext>
-</div>
-
-<div class="header">
- <ul>
-  <li>
-   <label for="aclfolder" class="hidden"><gettext>Change Folder</gettext></label>
-   <tag:changefolder /><span class="folderImg"></span></a> <select id="aclfolder" name="folder"><tag:options /></select>
-  </li>
- </ul>
- <span class="smallheader"><tag:current /></span>
-</div>
-</form>
-
-<form method="post" name="acl" id="acl" action="<tag:aclurl />">
-<input type="hidden" name="actionID" value="imp_acl_set" />
-<input type="hidden" name="folder" value="<tag:folder />" />
-<tag:forminput />
-<table cellspacing="0" width="100%">
-<if:noacl>
- <tr>
-  <td colspan="<tag:maxrule />" class="item leftAlign">
-   <em><strong> <gettext>The current list of users with access to this folder could not be retrieved.</gettext></strong></em>
-  </td>
-  <td class="item leftAlign">&nbsp;</td>
- </tr>
- <tr>
-  <td colspan="<tag:maxrule />" class="header">
-   <input type="button" class="button" name="back" onclick="$('acl').disable(); document.location.href='<tag:prefsurl />'" value="<gettext>Return to Options</gettext>" />
-  </td>
-  <td class="header">&nbsp;</td>
- </tr>
-<else:noacl>
-<tr>
- <th class="item" width="<tag:width />">
-  <h3><strong><gettext>User</gettext></strong></h3>
- </th>
-<loop:rights>
- <th class="item" width="<tag:width />">
-  <h4><strong><span title="<tag:rights.desc />"><tag:rights.title /></span></strong></h4>
- </th>
-</loop:rights>
-</tr>
-<loop:curr_acl>
-<tr>
- <td class="item"><tag:curr_acl.index /><input id="<tag:curr_acl.index />" type="hidden" name="acl[<tag:curr_acl.index />][]" value="" /></td>
-<loop:curr_acl.rule>
- <td class="item" align="center">
-  <label class="hidden" for="<tag:curr_acl.index />:<tag:curr_acl.rule.val />">Rule <tag:curr_acl.rule.val /> for user <tag:curr_acl.index /></label>
-  <input type="checkbox" class="checkbox" id="<tag:curr_acl.index />:<tag:curr_acl.rule.val />"
-  <if:curr_acl.disabled> disabled="disabled"<else:curr_acl.disabled><if:canedit> name="acl[<tag:curr_acl.index />][]" value="<tag:curr_acl.rule.val />"<else:canedit> disabled="disabled"</else:canedit></if:canedit></else:curr_acl.disabled></if:curr_acl.disabled><if:curr_acl.rule.enabled> checked="checked"</if:curr_acl.rule.enabled> />
- </td>
-</loop:curr_acl.rule>
-</tr>
-</loop:curr_acl>
-
-<if:canedit>
-<tr>
- <td class="item">
-  <label for="new_user" class="hidden">New User</label><tag:new_user />
- </td>
-<loop:rights>
- <td class="item" align="center">
-  <label class="hidden" for="new_user:<tag:rights.right />">Rule <tag:rights.right /> for the new user</label><input id="new_user:<tag:rights.right />" type="checkbox" name="new_acl[]" value="<tag:rights.right />" class="checkbox" />
- </td>
-</loop:rights>
-</tr>
-<tr>
- <td>&nbsp;</td>
-</tr>
-<tr>
- <td colspan="<tag:maxrule />" class="header">
-  <input type="button" class="button" id="fbutton" name="fbutton" onclick="$('acl').submit(); $('acl').disable();" value="<gettext>Save</gettext>" />
-  <input type="button" class="button" id="resetbut" name="resetbut" value="<gettext>Reset</gettext>" />
-  <input type="button" class="button" id="back" name="back" onclick="$('acl').disable(); document.location.href='<tag:prefsurl />'" value="<gettext>Return to Options</gettext>" />
- </td>
- <td class="header">&nbsp;</td>
-</tr>
-<else:canedit>
-<tr>
- <td colspan="<tag:maxrule />" class="item leftAlign">
-  <em><strong><gettext>You do not have permission to change access to this folder.</gettext></strong></em>
- </td>
- <td class="item leftAlign">&nbsp;</td>
-</tr>
-
-<tr>
- <td colspan="<tag:maxrule />" class="header">
-  <input type="button" class="button" name="back" onclick="$('acl').disable(); document.location.href='<tag:prefsurl />'" value="<gettext>Return to Options</gettext>" />
- </td>
- <td class="header">&nbsp;</td>
-</tr>
-</else:canedit></if:canedit>
-</else:noacl></if:noacl>
-</table>
-</form>
diff --git a/imp/templates/chunks/compose.php b/imp/templates/chunks/compose.php
deleted file mode 100644 (file)
index 32ec64c..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-/**
- * compose.php - Used by IMP_Views_Compose:: to render the compose screen.
- *
- * Variables passed in from calling code:
- *   $compose_html, $from, $id, $identity, $composeCache, $rte,
- *   $selected_identity
- *
- * Copyright 2005-2010 The Horde Project (http://www.horde.org/)
- *
- * See the enclosed file COPYING for license information (GPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
- */
-
-$d_read = $GLOBALS['prefs']->getValue('disposition_request_read');
-$save_attach = $GLOBALS['prefs']->getValue('save_attachments');
-
-/* Determine if compose mode is disabled. */
-$compose_disable = !IMP::canCompose();
-
-?>
-<form id="compose" name="compose" enctype="multipart/form-data" action="<?php echo Horde::getServiceLink('ajax', 'imp') ?>addAttachment" method="post" target="submit_frame">
-<?php echo Horde_Util::formInput() ?>
-<input type="hidden" id="last_identity" name="last_identity" value="<?php echo (int)$selected_identity ?>" />
-<input type="hidden" id="html" name="html" value="<?php echo intval($rte && $compose_html) ?>" />
-<input type="hidden" id="composeCache" name="composeCache" value="<?php echo $composeCache ?>" />
-
-<div class="dimpActions dimpActionsCompose">
-<?php if (!$compose_disable): ?>
- <div><?php echo IMP_Dimp::actionButton(array('icon' => 'Forward', 'id' => 'send_button', 'title' => _("Send"))); ?></div>
-<?php endif; ?>
- <div><?php echo IMP_Dimp::actionButton(array('icon' => 'Spellcheck', 'id' => 'spellcheck', 'title' => _("Check Spelling"))); ?></div>
- <div><?php echo IMP_Dimp::actionButton(array('icon' => 'Drafts', 'id' => 'draft_button', 'title' => _("Save as Draft"))); ?></div>
-</div>
-
-<div id="writemsg">
- <div class="msgwrite">
-  <div class="dimpOptions">
-   <div id="togglecc">
-    <label>
-     <input name="togglecc" type="checkbox" class="checkbox" /> <?php echo _("Show Cc") ?>
-    </label>
-   </div>
-   <div id="togglebcc">
-    <label>
-     <input name="togglebcc" type="checkbox" class="checkbox" /> <?php echo _("Show Bcc") ?>
-    </label>
-  </div>
-<?php if ($rte): ?>
-   <div>
-    <label>
-     <input id="htmlcheckbox" type="checkbox" class="checkbox"<?php if ($compose_html) echo 'checked="checked"' ?> /> <?php echo _("HTML composition") ?>
-    </label>
-   </div>
-<?php endif; ?>
-<?php if ($GLOBALS['conf']['compose']['allow_receipts'] && $d_read != 'never'): ?>
-   <div>
-    <label>
-     <input name="request_read_receipt" type="checkbox" class="checkbox"<?php if ($d_read != 'ask') echo ' checked="checked"' ?> /> <?php echo _("Read Receipt") ?>
-    </label>
-   </div>
-<?php endif; ?>
-<?php if ($GLOBALS['conf']['user']['allow_folders'] && !$GLOBALS['prefs']->isLocked('save_sent_mail')): ?>
-   <div style="display:none">
-    <label>
-     <input id="save_sent_mail" name="save_sent_mail" type="checkbox" class="checkbox" /> <?php echo _("Save in") ?>
-     <span id="sent_mail_folder_label"></span>
-    </label>
-    <input id="save_sent_mail_folder" name="save_sent_mail_folder" type="hidden" />
-   </div>
-<?php endif; ?>
-<?php if ($GLOBALS['prefs']->getValue('set_priority')): ?>
-   <div>
-    <?php echo _("Priority:") ?> <span id="priority_label"></span>
-    <input id="priority" name="priority" type="hidden" value="normal" />
-   </div>
-<?php endif; ?>
-  </div>
-  <table>
-   <tr>
-    <td class="label"><?php echo _("From: ") ?></td>
-    <td>
-     <select id="identity" name="identity">
-<?php foreach ($identity->getSelectList() as $id => $from): ?>
-      <option value="<?php echo htmlspecialchars($id) ?>"<?php if ($id == $selected_identity) echo ' selected="selected"' ?>><?php echo htmlspecialchars($from) ?></option>
-<?php endforeach; ?>
-     </select>
-    </td>
-   </tr>
-   <tr id="sendto">
-    <td class="label"><span><?php echo _("To: ") ?></span></td>
-    <td>
-     <span id="to_loading_img" class="loadingImg" style="display:none"></span>
-     <textarea id="to" name="to" rows="1" cols="75"></textarea>
-    </td>
-   </tr>
-   <tr id="sendcc" style="display:none">
-    <td class="label"><span><?php echo _("Cc: ") ?></span></td>
-    <td>
-     <span id="cc_loading_img" class="loadingImg" style="display:none"></span>
-     <textarea id="cc" name="cc" rows="1" cols="75"></textarea>
-    </td>
-   </tr>
-   <tr id="sendbcc" style="display:none">
-    <td class="label"><span><?php echo _("Bcc: ") ?></span></td>
-    <td>
-     <span id="bcc_loading_img" class="loadingImg" style="display:none"></span>
-     <textarea id="bcc" name="bcc" rows="1" cols="75"></textarea>
-    </td>
-   </tr>
-   <tr>
-    <td class="label"><?php echo _("Subject: ") ?></td>
-    <td class="subject"><input type="text" id="subject" name="subject" /></td>
-   </tr>
-   <tr class="atcrow">
-    <td class="label"><span class="iconImg attachmentImg"></span>: </td>
-    <td id="attach_cell">
-     <input type="file" id="upload" name="file_1" />
-<?php if (strpos($save_attach, 'prompt') !== false): ?>
-     <label style="display:none"><input type="checkbox" class="checkbox" name="save_attachments_select"<?php if (strpos($save_attach, 'yes') !== false) echo ' checked="checked"' ?> /> <?php echo _("Save Attachments in sent folder") ?></label><br />
-<?php endif; ?>
-     <ul id="attach_list" style="display:none"></ul>
-    </td>
-   </tr>
-   <tr id="noticerow" style="display:none">
-    <td colspan="2">
-     <ul class="notices">
-      <li id="replyallnotice" style="display:none"><span class="iconImg closeImg"></span><?php echo _("You are currently replying to ALL recipients. Click here to reply to the original sender instead.") ?></li>
-      <li id="replylistnotice" style="display:none"><span class="iconImg closeImg"></span><?php echo _("You are currently replying to the mailing list. Click here to reply to the original sender instead.") ?></li>
-      <li id="fwdattachnotice" style="display:none"><span class="iconImg closeImg"></span><?php echo _("Click here to add the original message text to the body.") ?></li>
-      <li id="fwdbodynotice" style="display:none"><span class="iconImg closeImg"></span><?php echo _("Click here to add the original message as an attachment.") ?></li>
-     </ul>
-    </td>
-   </tr>
-  </table>
- </div>
-
- <div id="composeMessageParent">
-  <textarea name="message" rows="20" id="composeMessage" class="fixed"></textarea>
- </div>
-</div>
-</form>
-
-<span id="sendingImg" class="loadingImg" style="display:none"></span>
-
-<iframe name="submit_frame" id="submit_frame" style="display:none" src="javascript:false;"></iframe>
diff --git a/imp/templates/chunks/message.php b/imp/templates/chunks/message.php
deleted file mode 100644 (file)
index b0a4a8e..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
- * Dynamic view (dimp) compose template.
- *
- * Copyright 2005-2010 The Horde Project (http://www.horde.org/)
- *
- * See the enclosed file COPYING for license information (GPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
- */
-?>
-<div id="dimpLoading"><?php echo _("Loading...") ?></div>
-<div id="pageContainer" style="display:none">
- <div id="msgData">
-  <div class="dimpActions dimpActionsMsg">
-   <div class="headercloseimg closeImg" id="windowclose" title="X"></div>
-   <div><?php echo IMP_Dimp::actionButton(array('class' => 'hasmenu', 'icon' => 'Reply', 'id' => 'reply_link', 'title' => _("Reply"))) ?></div>
-   <div><?php echo IMP_Dimp::actionButton(array('class' => 'hasmenu', 'icon' => 'Forward', 'id' => 'forward_link', 'title' => _("Forward"))) ?></div>
-<?php if (!empty($conf['spam']['reporting']) && (!$conf['spam']['spamfolder'] || ($folder != IMP::folderPref($prefs->getValue('spam_folder'), true)))): ?>
-   <div><?php echo IMP_Dimp::actionButton(array('icon' => 'Spam', 'id' => 'button_spam', 'title' => _("Spam"))) ?></div>
-<?php endif; ?>
-<?php if (!empty($conf['notspam']['reporting']) && (!$conf['notspam']['spamfolder'] || ($folder == IMP::folderPref($prefs->getValue('spam_folder'), true)))): ?>
-   <div><?php echo IMP_Dimp::actionButton(array('icon' => 'Ham', 'id' => 'button_ham', 'title' => _("Innocent"))) ?></div>
-<?php endif; ?>
-<?php if (!$readonly): ?>
-   <div><?php echo IMP_Dimp::actionButton(array('icon' => 'Delete', 'id' => 'button_deleted', 'title' => _("Delete"))) ?></div>
-<?php endif; ?>
-  </div>
-
-  <div class="msgfullread">
-   <div class="msgHeaders">
-    <div id="msgHeaders">
-     <div class="dimpOptions">
-<?php if (!empty($conf['user']['allow_view_source'])): ?>
-      <div>
-       <span id="msg_view_source">
-        <span class="iconImg"></span>
-        <a><?php echo _("View Source") ?></a>
-       </span>
-      </div>
-<?php endif; ?>
-      <div>
-       <span>
-        <span class="iconImg saveAsImg"></span>
-        <a href="<?php echo $show_msg_result['save_as'] ?>"><?php echo _("Save") ?></a>
-       </span>
-      </div>
-     </div>
-     <div id="msgHeadersContent">
-      <table>
-       <thead>
-        <tr>
-         <td class="label"><?php echo _("Subject") ?>:</td>
-         <td class="subject"><?php echo $show_msg_result['subject'] ?></td>
-        </tr>
-<?php foreach($show_msg_result['headers'] as $val): ?>
-        <tr<?php if (isset($val['id'])): ?> id="msgHeader<?php echo $val['id'] ?>"<?php endif; ?>>
-         <td class="label"><?php echo $val['name'] ?>:</td>
-         <td><?php echo $val['value'] ?></td>
-        </tr>
-<?php endforeach; ?>
-<?php if (isset($show_msg_result['atc_label'])): ?>
-        <tr id="msgAtc">
-         <td class="label" id="partlist_toggle">
-          <span class="iconImg attachmentImg attachmentImage"></span>
-<?php if ($show_msg_result['atc_list']): ?>
-          <span id="partlist_col" class="iconImg"></span>
-          <span id="partlist_exp" class="iconImg" style="display:none"></span>
-<?php endif; ?>
-         </td>
-         <td>
-          <span class="atcLabel"><?php echo $show_msg_result['atc_label'] ?></span><?php echo isset($show_msg_result['atc_download']) ? $show_msg_result['atc_download'] : '' ?>
-<?php if (isset($show_msg_result['atc_list'])): ?>
-          <div id="partlist" style="display:none">
-           <table>
-            <?php echo $show_msg_result['atc_list'] ?>
-           </table>
-          </div>
-<?php endif; ?>
-         </td>
-        </tr>
-<?php endif; ?>
-        <tr id="msgLogInfo" style="display:none">
-         <td class="label" id="msgloglist_toggle">
-          <span class="iconImg" id="msgloglist_col"></span>
-          <span class="iconImg" id="msgloglist_exp" style="display:none"></span>
-         </td>
-         <td>
-          <div>
-           <span class="msgLogLabel"><?php echo _("Message Log") ?></span>
-          </div>
-          <div id="msgloglist" style="display:none">
-           <ul></ul>
-          </div>
-         </td>
-        </tr>
-       </thead>
-      </table>
-     </div>
-    </div>
-   </div>
-   <div class="messageBody">
-    <?php echo $show_msg_result['msgtext'] ?>
-   </div>
-  </div>
- </div>
-
-<?php if (!$disable_compose): ?>
- <div id="qreply" style="display:none">
-  <div class="header">
-   <div class="headercloseimg" id="compose_close">
-    <span class="closeImg" title="X"></span>
-   </div>
-   <div><?php echo _("Message:") . ' ' . $show_msg_result['subject'] ?></div>
-  </div>
-  <?php echo $compose_result['html']; ?>
- </div>
-</div>
-
-<div class="context" id="ctx_replypopdown" style="display:none">
- <a id="ctx_reply_reply"><span class="contextImg"></span><?php echo _("To Sender") ?></a>
- <a id="ctx_reply_reply_all"><span class="contextImg"></span><?php echo _("To All") ?></a>
-<?php if ($show_msg_result['list_info']['exists']): ?>
- <a id="ctx_reply_reply_list"><span class="contextImg"></span><?php echo _("To List") ?></a>
-<?php endif; ?>
-</div>
-
-<?php if (!$prefs->isLocked('forward_default')): ?>
-<div class="context" id="ctx_forwardpopdown" style="display:none;">
- <a id="ctx_forward_attach"><span class="contextImg"></span><?php echo _("As Attachment") ?></a>
- <a id="ctx_forward_body"><span class="contextImg"></span><?php echo _("In Body Text") ?></a>
- <a id="ctx_forward_both"><span class="contextImg"></span><?php echo _("Attachment and Body Text") ?></a>
-</div>
-<?php endif; ?>
-<?php endif; ?>
-
-<div class="context" id="ctx_contacts" style="display:none">
- <a id="ctx_contacts_new"><span class="contextImg"></span><?php echo _("New Message") ?></a>
- <a id="ctx_contacts_add"><span class="contextImg"></span><?php echo _("Add to Address Book") ?></a>
-</div>
-
-<div style="display:none">
- <span id="largeaddrspan">
-  <span class="largeaddrtoggle">
-   <span class="largeaddrlist">[<?php echo _("Show Addresses - %d recipients") ?>]</span>
-   <span class="largeaddrlist" style="display:none">[<?php echo _("Hide Addresses") ?>]</span>
-  </span>
-  <span class="dispaddrlist" style="display:none"></span>
- </span>
-</div>
index 23bc4f8..d534b9b 100644 (file)
@@ -6,7 +6,7 @@ $imp_view = IMP::getViewMode();
  * other scripts already added. */
 switch ($imp_view) {
 case 'dimp':
-    include IMP_TEMPLATES . '/javascript_defs_dimp.php';
+    include IMP_TEMPLATES . '/dimp/javascript_defs_dimp.php';
     break;
 
 case 'mimp':
@@ -14,7 +14,7 @@ case 'mimp':
     break;
 
 default:
-    include IMP_TEMPLATES . '/javascript_defs.php';
+    include IMP_TEMPLATES . '/imp/javascript_defs.php';
     break;
 }
 
diff --git a/imp/templates/compose/compose-mimp.html b/imp/templates/compose/compose-mimp.html
deleted file mode 100644 (file)
index 80f34ab..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-  <div><tag:title /></div>
-  <hr />
-  <form action="<tag:url />" method="post">
-   <input type="hidden" name="composeCache" value="<tag:cacheid />" />
-<if:redirect>
-   <input type="hidden" name="action" value="rc" />
-<else:redirect>
-   <p>
-    <label for="identity">
-     <gettext>From:</gettext>
-     <select id="identity" name="identity">
-<loop:identities>
-      <option value="<tag:identities.key />"<if:identities.sel> selected="selected"</if:identities.sel>><tag:identities.val /></option>
-</loop:identities>
-     </select>
-    </label>
-   </p>
-</if:redirect>
-<loop:hdrs>
-   <p>
-    <label for="<tag:hdrs.key />">
-     <tag:hdrs.label />
-     <input id="<tag:hdrs.key />" name="<tag:hdrs.key />" value="<tag:hdrs.val />" />
-    </label>
-   </p>
-<if:hdrs.matchlabel>
-   <blockquote>
-    <div><tag:hdrs.matchlabel /></div>
-<loop:hdrs.match>
-    <div><label for="<tag:hdrs.match.id />"><input type="checkbox" name="<tag:hdrs.match.id />" id="<tag:hdrs.match.id />" value="<tag:hdrs.match.val />" /><tag:hdrs.match.val /></label></div>
-</loop:hdrs.match>
-   </blockquote>
-</if:hdrs.matchlabel>
-</loop:hdrs>
-<if:redirect>
-   <p>
-    <input type="submit" name="a" value="<gettext>Redirect</gettext>" />
-<else:redirect>
-   <p>
-    <gettext>Subject:</gettext> <input name="subject" value="<tag:subject />" />
-   </p>
-   <p>
-    <gettext>Message:</gettext>
-    <br />
-    <textarea name="message" rows="10" cols="80"><tag:msg /></textarea>
-   </p>
-   <p>
-<if:compose_enable>
-    <input type="submit" name="a" value="<gettext>Send</gettext>" />
-</if:compose_enable>
-<if:save_draft>
-    <input type="submit" name="a" value="<gettext>Save Draft</gettext>" />
-</if:save_draft>
-</else:redirect></if:redirect>
-    <input type="submit" name="a" value="<gettext>Expand Names</gettext>" />
-    <input type="submit" name="a" value="<gettext>Cancel</gettext>" />
-   </p>
-  </form>
-  <hr />
-  <div><gettext>Menu</gettext></div>
-  <tag:menu />
- </body>
-</html>
diff --git a/imp/templates/compose/compose.html b/imp/templates/compose/compose.html
deleted file mode 100644 (file)
index 371db3e..0000000
+++ /dev/null
@@ -1,308 +0,0 @@
-<form method="post" id="compose" name="compose" <if:file_upload>enctype="multipart/form-data" </if:file_upload> action="<tag:post_action />">
-<tag:forminput />
-<loop:hidden>
-<input type="hidden" name="<tag:hidden.n />" value="<tag:hidden.v />" id="<tag:hidden.n />" />
-</loop:hidden>
-
-<h1 class="header">
- <div class="rightFloat"><tag:help /></div>
- <tag:title />
-</h1>
-
-<br />
-
-<tag:status />
-
-<table cellspacing="0">
- <tr>
-  <td>&nbsp;</td>
-  <td class="nowrap">
-<if:allow_compose>
-   <input name="btn_send_message" type="submit" <tag:send_msg_ak /> class="button" value="<gettext>Send Message</gettext>" />
-</if:allow_compose>
-<if:save_draft_ak>
-   <input name="btn_save_draft" type="submit" <tag:save_draft_ak /> class="button" value="<gettext>Save Draft</gettext>" />
-</if:save_draft_ak>
-   <input name="btn_cancel_compose" type="submit" title="<gettext>Cancel Message</gettext>" class="button" value="<gettext>Cancel Message</gettext>" />
-  </td>
- </tr>
-
- <tr>
-  <td class="light rightAlign"><strong><if:di_locked><gettext>From</gettext><else:di_locked><tag:identity_label /></else:di_locked></if:di_locked>&nbsp;</strong></td>
-  <td class="item">
-<if:di_locked>
-<if:fromaddr_locked>
-   <strong>&nbsp;<tag:from /></strong>
-<else:fromaddr_locked>
-   <input id="text_identity" type="text" tabindex="<tag:fromaddr_tabindex />" name="from" value="<tag:from />" style="direction:ltr" />
-</else:fromaddr_locked></if:fromaddr_locked>
-<else:di_locked>
-   <input type="hidden" id="last_identity" name="last_identity" value="<tag:last_identity />" />
-<if:count_select_list>
-   <select id="identity" name="identity" tabindex="<tag:selectlist_tabindex />">
-<loop:select_list>
-    <option value="<tag:select_list.value />" <if:select_list.selected>selected="selected" </if:select_list.selected>><tag:select_list.label /></option>
-</loop:select_list>
-   </select>
-<else:count_select_list>
-   <input type="hidden" name="identity" value="tag:identity_default />" />
-   <tag:identity_text />
-</else:count_select_list></if:count_select_list>
-</else:di_locked></if:di_locked>
-  </td>
- </tr>
-
-<loop:addr>
- <tr>
-  <td class="light rightAlign"><strong><tag:addr.label />&nbsp;</strong></td>
-  <td class="item addressTr">
-   <input type="text" id="<tag:addr.id />" autocomplete="off" tabindex="<tag:addr.input_tabindex />" style="direction:ltr" name="<tag:addr.id />" value="<tag:addr.input_value />" />
-   <span id="<tag:addr.id />_loading_img" style="display:none;" class="loadingImg"></span>
-  </td>
- </tr>
-</loop:addr>
-
- <tr>
-  <td class="light rightAlign"><strong><tag:subject_label />&nbsp;</strong></td>
-  <td class="item">
-   <input type="text" id="subject" tabindex="<tag:subject_tabindex />" name="subject" value="<tag:subject />" />
-  </td>
- </tr>
-
-<if:unlocked_charset>
- <tr>
-  <td class="light rightAlign">
-   <strong><tag:charset_label />&nbsp;</strong>
-  </td>
-  <td class="item">
-   <select id="charset" name="charset" tabindex="<tag:charset_tabindex />">
-<loop:charset_array>
-    <option value="<tag:charset_array.value />" <if:charset_array.selected>selected="selected" </if:charset_array.selected>><tag:charset_array.label /></option>
-</loop:charset_array>
-   </select>
-  </td>
- </tr>
-</if:unlocked_charset>
-
-<if:set_priority>
- <tr>
-  <td class="light rightAlign">
-   <strong><tag:priority_label />&nbsp;</strong>
-  </td>
-  <td class="item">
-   <select id="priority" name="priority" tabindex="<tag:priority_tabindex />">
-<loop:pri_opt>
-    <option value="<tag:pri_opt.val />" <if:pri_opt.selected>selected="selected" </if:pri_opt.selected>><tag:pri_opt.label /></option>
-</loop:pri_opt>
-   </select>
-  </td>
- </tr>
-</if:set_priority>
-
-<if:stationery>
- <tr>
-  <td class="light rightAlign"><strong><tag:stationery_label />&nbsp;</strong></td>
-  <td class="item">
-   <select name="stationery" id="stationery">
-    <option value=""><gettext>Select stationery:</gettext></option>
-<loop:stationeries>
-    <option value="<tag:stationeries.val />" <if:stationeries.selected>selected="selected" </if:stationeries.selected>><tag:stationeries.label /></option>
-</loop:stationeries>
-   </select>
-  </td>
- </tr>
-</if:stationery>
-
- <tr>
-  <td>&nbsp;</td>
-  <td class="item">
-   <table width="100%" cellspacing="0">
-    <tr>
-<loop:compose_options>
-     <td align="center">
-      <tag:compose_options.url /><tag:compose_options.img /><br /><tag:compose_options.label /></a>
-     </td>
-</loop:compose_options>
-    </tr>
-   </table>
-  </td>
- </tr>
-
-<if:ssm>
- <tr>
-  <td>&nbsp;</td>
-  <td class="item">
-   <input id="ssm" type="checkbox" class="checkbox" name="save_sent_mail" <if:ssm_selected>checked="checked" </if:ssm_selected>/>
-   <tag:ssm_label />
-<if:ssm_folders>
-   <select tabindex="<tag:ssm_tabindex />" id="sent_mail_folder" name="sent_mail_folder"><tag:ssm_folders /></select>
-<else:ssm_folders>
-   <span id="sent_mail_folder"><tag:ssm_folder /></span>
-</else:ssm_folders></if:ssm_folders>
-  </td>
- </tr>
-</if:ssm>
-
-<if:rrr>
- <tr>
-  <td>&nbsp;</td>
-  <td class="item">
-   <input id="rrr" type="checkbox" class="checkbox" name="request_read_receipt" <if:rrr_selected>checked="checked" </if:rrr_selected>/> <tag:rrr_label />
-  </td>
- </tr>
-</if:rrr>
-
-<if:compose_html>
- <tr>
-  <td>&nbsp;</td>
-  <td class="item">
-   <tag:html_img />
-   <tag:html_switch />
-   <if:rtemode><gettext>Switch to plain text composition</gettext><else:rtemode><gettext>Switch to HTML composition</gettext></else:rtemode></if:rtemode></a>
-  </td>
- </tr>
-</if:compose_html>
-
- <tr>
-  <td class="light rightAlign"><strong><tag:message_label />&nbsp;</strong></td>
-  <td class="item" id="composeMessageParent">
-   <textarea class="fixed composebody" tabindex="<tag:message_tabindex />" name="message" id="composeMessage" rows="20" cols="80"><tag:message /></textarea>
-  </td>
- </tr>
-
- <tr>
-  <td>&nbsp;</td>
-  <td class="nowrap">
-<if:allow_compose>
-   <input name="btn_send_message" type="submit" <tag:send_msg_ak /> class="button" value="<gettext>Send Message</gettext>" />
-</if:allow_compose>
-<if:save_draft_ak>
-   <input name="btn_save_draft" type="submit" <tag:save_draft_ak /> class="button" value="<gettext>Save Draft</gettext>" />
-</if:save_draft_ak>
-   <input name="btn_cancel_compose" type="submit" title="<gettext>Cancel Message</gettext>" class="button" value="<gettext>Cancel Message</gettext>" />
-  </td>
- </tr>
-
-<if:use_encrypt>
- <tr>
-  <td>&nbsp;</td>
-  <td class="item nowrap">
-   <tag:encrypt_label />:&nbsp;
-   <select id="encrypt_options" name="encrypt_options">
-    <tag:encrypt_options />
-   </select>
-  </td>
- </tr>
-</if:use_encrypt>
-
-<if:pgp_options>
- <tr>
-  <td>&nbsp;</td>
-  <td class="item nowrap">
-   <input id="pap" type="checkbox" class="checkbox" name="pgp_attach_pubkey" <if:pgp_attach_pubkey>checked="checked" </if:pgp_attach_pubkey>/>
-   <tag:pap />
-  </td>
- </tr>
-</if:pgp_options>
-
-<if:vcard>
- <tr>
-  <td>&nbsp;</td>
-  <td class="item nowrap">
-   <input id="vcard" type="checkbox" class="checkbox" name="vcard" <if:attach_vcard>checked="checked" </if:attach_vcard>/>
-   <tag:vcard />
-  </td>
- </tr>
-</if:vcard>
-</table>
-
-<if:file_upload>
-<br />
-
-<h1 class="header">
- <strong>&nbsp;<a id="attachments"></a><gettext>Attachments</gettext></strong>
-<if:selectlistlink>
- &nbsp;<tag:selectlistlink />
- <input type="hidden" name="selectlist_selectid" value="" />
-</if:selectlistlink>
-</h1>
-
-<table width="100%" cellspacing="0">
- <tr class="item" id="upload_atc">
-<if:maxattachsize>
-  <td><gettext>Maximum total attachment size reached.</gettext></td>
-<else:maxattachsize>
-<if:maxattachmentnumber>
-  <td><gettext>Maximum number of attachments reached.</gettext></td>
-<else:maxattachmentnumber>
-  <td>
-   <table>
-    <tr id="attachment_row_1">
-     <td>
-      <strong><label for="upload_1"><gettext>File</gettext> 1:</label></strong> <input id="upload_1" name="upload_1" tabindex="<tag:file_tabindex />" type="file" size="25" />
-     </td>
-    </tr>
-    <tr>
-     <td>
-      (<gettext>Maximum Attachment Size</gettext>: <tag:attach_size /> <gettext>bytes</gettext>)
-     </td>
-    </tr>
-   </table>
-  </td>
-</else:maxattachmentnumber></if:maxattachmentnumber>
-</else:maxattachsize></if:maxattachsize>
-  <td class="rightAlign">
-   <input type="submit" name="btn_add_attachment" class="button" value="<gettext>Update</gettext>" />
-  </td>
- </tr>
-
-<if:show_link_save_attach>
-<loop:attach_options>
- <tr class="item">
-  <td colspan="3">
-   <strong><label for="<tag:attach_options.name />"><tag:attach_options.label /></label></strong>&nbsp;
-   <select id="<tag:attach_options.name />" name="<tag:attach_options.name />">
-    <option value="1"<if:attach_options.select_yes> selected="selected"</if:attach_options.select_yes>><gettext>Yes</gettext></option>
-    <option value="0"<if:attach_options.select_no> selected="selected"</if:attach_options.select_no>><gettext>No</gettext></option>
-   </select>
-  </td>
- </tr>
-</loop:attach_options>
-</if:show_link_save_attach>
-</table>
-
-<if:numberattach>
-<br />
-
-<div class="smallheader leftAlign">
- <gettext>Current Attachments</gettext> (<gettext>Total Size:</gettext> <tag:total_attach_size /> <gettext>KB</gettext><if:perc_attach> / <tag:perc_attach /></if:perc_attach>)
-</div>
-
-<table class="leftAlign attachList">
-<loop:atc>
- <tr class="item">
-  <td>
-   <img style="padding-right:5px" src="<tag:atc.icon />" alt="[Icon]" />
-   <strong><tag:atc.name /></strong> &nbsp;(<tag:atc.type />) &nbsp;&nbsp;<strong><gettext>Size:</gettext></strong> <tag:atc.size /> <gettext>KB</gettext>
-  </td>
- </tr>
- <tr class="item">
-  <td style="padding-left:30px">
-   <table>
-    <tr>
-     <td class="rightAlign"><strong><label for="file_description_<tag:atc.number />"><gettext>Description:</gettext></label></strong>&nbsp;</td>
-     <td><input type="text" size="40" id="file_description_<tag:atc.number />" name="file_description_<tag:atc.number />" value="<tag:atc.description />" /></td>
-    </tr>
-    <tr>
-     <td class="rightAlign"><strong><label for="delattachment<tag:atc.number />"><gettext>Delete?</gettext></label></strong></td>
-     <td><input type="checkbox" class="checkbox" id="delattachment<tag:atc.number />" name="delattachments[]" value="<tag:atc.number />" /></td>
-    </tr>
-   </table>
-  </td>
- </tr>
-</loop:atc>
-</table>
-</if:numberattach>
-</if:file_upload>
-
-</form>
diff --git a/imp/templates/compose/redirect.html b/imp/templates/compose/redirect.html
deleted file mode 100644 (file)
index b96392e..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-<form method="post" action="<tag:post_action />" id="redirect" name="redirect">
-<input type="hidden" name="thismailbox" value="<tag:mailbox />" />
-<input type="hidden" name="uid" value="<tag:uid />" />
-<input type="hidden" id="actionID" name="actionID" value="redirect_send" />
-<input type="hidden" name="compose_requestToken" value="<tag:token />" />
-
-<tag:status />
-
-<h1 class="header">
- <tag:title />
-</h1>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<if:has_search>
- <tr>
-  <td>&nbsp;</td>
-  <td class="item">
-   <table cellspacing="0" width="100%">
-    <tr>
-     <td align="center"><tag:abook /></td>
-    </tr>
-   </table>
-  </td>
- </tr>
-</if:has_search>
-
- <tr>
-  <td class="light rightAlign"><strong><tag:to />&nbsp;</strong></td>
-  <td class="item leftAlign">
-   <table border="0" width="100%" cellpadding="0">
-    <tr>
-     <td class="leftAlign">
-      <input type="text" id="to" size="55" name="to" value="<tag:input_value />" />
-      <span id="to_loading_img" style="display:none;"><tag:loading_img /></span>
-     </td>
-     <td class="rightAlign"><tag:help />&nbsp;</td>
-    </tr>
-   </table>
-  </td>
- </tr>
- <tr>
-  <td>&nbsp;</td>
-  <td>
-<if:allow_compose>
-   <input name="btn_redirect" type="submit" class="button" value="<gettext>Redirect Message</gettext>" />
-</if:allow_compose>
-   <input name="btn_cancel_compose" type="button" class="button" value="<gettext>Cancel Message</gettext>" />
-  </td>
- </tr>
-</table>
-</form>
-
-<br />
diff --git a/imp/templates/compose/success.html b/imp/templates/compose/success.html
deleted file mode 100644 (file)
index 8e505cf..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<div id="menu"><tag:menu /></div>
diff --git a/imp/templates/contacts/contacts.html b/imp/templates/contacts/contacts.html
deleted file mode 100644 (file)
index 1e74a9e..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-<form method="post" id="contacts" action="<tag:action />">
-<input type="hidden" name="formname" value="<tag:formname />" />
-<input type="hidden" name="searched" value="1" />
-<input type="hidden" id="sa" name="sa" />
-<tag:formInput />
-
-<h1 class="header">
- <gettext>Address Book</gettext>
-</h1>
-
-<div id="contactstable" class="headerbox item">
- <p class="control">
-  <label for="search"><strong><gettext>Find:</gettext></strong></label>
-  <input value="<tag:search />" id="search" name="search" />
-<if:multiple_source>
-  <strong><label for="source"><gettext>from</gettext></label></strong>
-  <select id="source" name="source">
-<loop:source_list>
-   <option value="<tag:source_list.val />"<if:source_list.selected> selected="selected"</if:source_list.selected>><tag:source_list.label /></option>
-</loop:source_list>
-  </select>
-<else:multiple_source>
-  <input name="source" type="hidden" value="<tag:source_list />" />
-</else:multiple_source></if:multiple_source>
-  <input type="submit" class="button" value="<gettext>Search</gettext>" />
-  <input id="btn_clear" type="submit" class="button" style="display:none" value="<gettext>Reset</gettext>" />
- </p>
-
- <table width="100%" cellspacing="2">
-  <tr>
-   <td width="33%">
-    <label for="search_results" class="hidden"><gettext>Search Results</gettext></label>
-    <select id="search_results" name="search_results" multiple="multiple" size="10">
-     <option value=""><gettext>* Please select address(es) *</gettext></option>
-<loop:a_list>
-     <option title="<tag:a_list />" value="<tag:a_list />"><tag:a_list /></option>
-</loop:a_list>
-    </select>
-   </td>
-   <td width="33%" class="contactsButtons">
-    <input id="btn_add_to" type="button" class="button" value="<gettext>To</gettext> &gt;&gt;" /><br />&nbsp;<br />
-<if:cc>
-    <input id="btn_add_cc" type="button" class="button" value="<gettext>Cc</gettext> &gt;&gt;" /><br />&nbsp;<br />
-    <input id="btn_add_bcc" type="button" class="button" value="<gettext>Bcc</gettext> &gt;&gt;" />
-</if:cc>
-   </td>
-   <td width="33%">
-    <label for="selected_addresses" class="hidden"><gettext>Selected Addresses</gettext></label>
-    <select id="selected_addresses" name="selected_addresses" multiple="multiple" size="10">
-     <option value=""><gettext>* Add these by clicking OK *</gettext></option>
-<loop:sa>
-     <option value="<tag:sa />"><tag:sa /></option>
-</loop:sa>
-    </select>
-   </td>
-  </tr>
-  <tr>
-   <td colspan="2">&nbsp;</td>
-   <td>
-    <input type="button" class="button" value="<gettext>Delete</gettext>" />
-   </td>
-  </tr>
- </table>
-</div>
-
-<br class="spacer" />
-
-<div>
- <input id="btn_update" type="button" class="button" value="<gettext>OK</gettext>" />
- <input id="btn_cancel" type="button" class="button" value="<gettext>Cancel</gettext>" />
-</div>
-
-</form>
diff --git a/imp/templates/dimp/chunks/compose.php b/imp/templates/dimp/chunks/compose.php
new file mode 100644 (file)
index 0000000..32ec64c
--- /dev/null
@@ -0,0 +1,146 @@
+<?php
+/**
+ * compose.php - Used by IMP_Views_Compose:: to render the compose screen.
+ *
+ * Variables passed in from calling code:
+ *   $compose_html, $from, $id, $identity, $composeCache, $rte,
+ *   $selected_identity
+ *
+ * Copyright 2005-2010 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (GPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ */
+
+$d_read = $GLOBALS['prefs']->getValue('disposition_request_read');
+$save_attach = $GLOBALS['prefs']->getValue('save_attachments');
+
+/* Determine if compose mode is disabled. */
+$compose_disable = !IMP::canCompose();
+
+?>
+<form id="compose" name="compose" enctype="multipart/form-data" action="<?php echo Horde::getServiceLink('ajax', 'imp') ?>addAttachment" method="post" target="submit_frame">
+<?php echo Horde_Util::formInput() ?>
+<input type="hidden" id="last_identity" name="last_identity" value="<?php echo (int)$selected_identity ?>" />
+<input type="hidden" id="html" name="html" value="<?php echo intval($rte && $compose_html) ?>" />
+<input type="hidden" id="composeCache" name="composeCache" value="<?php echo $composeCache ?>" />
+
+<div class="dimpActions dimpActionsCompose">
+<?php if (!$compose_disable): ?>
+ <div><?php echo IMP_Dimp::actionButton(array('icon' => 'Forward', 'id' => 'send_button', 'title' => _("Send"))); ?></div>
+<?php endif; ?>
+ <div><?php echo IMP_Dimp::actionButton(array('icon' => 'Spellcheck', 'id' => 'spellcheck', 'title' => _("Check Spelling"))); ?></div>
+ <div><?php echo IMP_Dimp::actionButton(array('icon' => 'Drafts', 'id' => 'draft_button', 'title' => _("Save as Draft"))); ?></div>
+</div>
+
+<div id="writemsg">
+ <div class="msgwrite">
+  <div class="dimpOptions">
+   <div id="togglecc">
+    <label>
+     <input name="togglecc" type="checkbox" class="checkbox" /> <?php echo _("Show Cc") ?>
+    </label>
+   </div>
+   <div id="togglebcc">
+    <label>
+     <input name="togglebcc" type="checkbox" class="checkbox" /> <?php echo _("Show Bcc") ?>
+    </label>
+  </div>
+<?php if ($rte): ?>
+   <div>
+    <label>
+     <input id="htmlcheckbox" type="checkbox" class="checkbox"<?php if ($compose_html) echo 'checked="checked"' ?> /> <?php echo _("HTML composition") ?>
+    </label>
+   </div>
+<?php endif; ?>
+<?php if ($GLOBALS['conf']['compose']['allow_receipts'] && $d_read != 'never'): ?>
+   <div>
+    <label>
+     <input name="request_read_receipt" type="checkbox" class="checkbox"<?php if ($d_read != 'ask') echo ' checked="checked"' ?> /> <?php echo _("Read Receipt") ?>
+    </label>
+   </div>
+<?php endif; ?>
+<?php if ($GLOBALS['conf']['user']['allow_folders'] && !$GLOBALS['prefs']->isLocked('save_sent_mail')): ?>
+   <div style="display:none">
+    <label>
+     <input id="save_sent_mail" name="save_sent_mail" type="checkbox" class="checkbox" /> <?php echo _("Save in") ?>
+     <span id="sent_mail_folder_label"></span>
+    </label>
+    <input id="save_sent_mail_folder" name="save_sent_mail_folder" type="hidden" />
+   </div>
+<?php endif; ?>
+<?php if ($GLOBALS['prefs']->getValue('set_priority')): ?>
+   <div>
+    <?php echo _("Priority:") ?> <span id="priority_label"></span>
+    <input id="priority" name="priority" type="hidden" value="normal" />
+   </div>
+<?php endif; ?>
+  </div>
+  <table>
+   <tr>
+    <td class="label"><?php echo _("From: ") ?></td>
+    <td>
+     <select id="identity" name="identity">
+<?php foreach ($identity->getSelectList() as $id => $from): ?>
+      <option value="<?php echo htmlspecialchars($id) ?>"<?php if ($id == $selected_identity) echo ' selected="selected"' ?>><?php echo htmlspecialchars($from) ?></option>
+<?php endforeach; ?>
+     </select>
+    </td>
+   </tr>
+   <tr id="sendto">
+    <td class="label"><span><?php echo _("To: ") ?></span></td>
+    <td>
+     <span id="to_loading_img" class="loadingImg" style="display:none"></span>
+     <textarea id="to" name="to" rows="1" cols="75"></textarea>
+    </td>
+   </tr>
+   <tr id="sendcc" style="display:none">
+    <td class="label"><span><?php echo _("Cc: ") ?></span></td>
+    <td>
+     <span id="cc_loading_img" class="loadingImg" style="display:none"></span>
+     <textarea id="cc" name="cc" rows="1" cols="75"></textarea>
+    </td>
+   </tr>
+   <tr id="sendbcc" style="display:none">
+    <td class="label"><span><?php echo _("Bcc: ") ?></span></td>
+    <td>
+     <span id="bcc_loading_img" class="loadingImg" style="display:none"></span>
+     <textarea id="bcc" name="bcc" rows="1" cols="75"></textarea>
+    </td>
+   </tr>
+   <tr>
+    <td class="label"><?php echo _("Subject: ") ?></td>
+    <td class="subject"><input type="text" id="subject" name="subject" /></td>
+   </tr>
+   <tr class="atcrow">
+    <td class="label"><span class="iconImg attachmentImg"></span>: </td>
+    <td id="attach_cell">
+     <input type="file" id="upload" name="file_1" />
+<?php if (strpos($save_attach, 'prompt') !== false): ?>
+     <label style="display:none"><input type="checkbox" class="checkbox" name="save_attachments_select"<?php if (strpos($save_attach, 'yes') !== false) echo ' checked="checked"' ?> /> <?php echo _("Save Attachments in sent folder") ?></label><br />
+<?php endif; ?>
+     <ul id="attach_list" style="display:none"></ul>
+    </td>
+   </tr>
+   <tr id="noticerow" style="display:none">
+    <td colspan="2">
+     <ul class="notices">
+      <li id="replyallnotice" style="display:none"><span class="iconImg closeImg"></span><?php echo _("You are currently replying to ALL recipients. Click here to reply to the original sender instead.") ?></li>
+      <li id="replylistnotice" style="display:none"><span class="iconImg closeImg"></span><?php echo _("You are currently replying to the mailing list. Click here to reply to the original sender instead.") ?></li>
+      <li id="fwdattachnotice" style="display:none"><span class="iconImg closeImg"></span><?php echo _("Click here to add the original message text to the body.") ?></li>
+      <li id="fwdbodynotice" style="display:none"><span class="iconImg closeImg"></span><?php echo _("Click here to add the original message as an attachment.") ?></li>
+     </ul>
+    </td>
+   </tr>
+  </table>
+ </div>
+
+ <div id="composeMessageParent">
+  <textarea name="message" rows="20" id="composeMessage" class="fixed"></textarea>
+ </div>
+</div>
+</form>
+
+<span id="sendingImg" class="loadingImg" style="display:none"></span>
+
+<iframe name="submit_frame" id="submit_frame" style="display:none" src="javascript:false;"></iframe>
diff --git a/imp/templates/dimp/chunks/message.php b/imp/templates/dimp/chunks/message.php
new file mode 100644 (file)
index 0000000..b0a4a8e
--- /dev/null
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Dynamic view (dimp) compose template.
+ *
+ * Copyright 2005-2010 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (GPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ */
+?>
+<div id="dimpLoading"><?php echo _("Loading...") ?></div>
+<div id="pageContainer" style="display:none">
+ <div id="msgData">
+  <div class="dimpActions dimpActionsMsg">
+   <div class="headercloseimg closeImg" id="windowclose" title="X"></div>
+   <div><?php echo IMP_Dimp::actionButton(array('class' => 'hasmenu', 'icon' => 'Reply', 'id' => 'reply_link', 'title' => _("Reply"))) ?></div>
+   <div><?php echo IMP_Dimp::actionButton(array('class' => 'hasmenu', 'icon' => 'Forward', 'id' => 'forward_link', 'title' => _("Forward"))) ?></div>
+<?php if (!empty($conf['spam']['reporting']) && (!$conf['spam']['spamfolder'] || ($folder != IMP::folderPref($prefs->getValue('spam_folder'), true)))): ?>
+   <div><?php echo IMP_Dimp::actionButton(array('icon' => 'Spam', 'id' => 'button_spam', 'title' => _("Spam"))) ?></div>
+<?php endif; ?>
+<?php if (!empty($conf['notspam']['reporting']) && (!$conf['notspam']['spamfolder'] || ($folder == IMP::folderPref($prefs->getValue('spam_folder'), true)))): ?>
+   <div><?php echo IMP_Dimp::actionButton(array('icon' => 'Ham', 'id' => 'button_ham', 'title' => _("Innocent"))) ?></div>
+<?php endif; ?>
+<?php if (!$readonly): ?>
+   <div><?php echo IMP_Dimp::actionButton(array('icon' => 'Delete', 'id' => 'button_deleted', 'title' => _("Delete"))) ?></div>
+<?php endif; ?>
+  </div>
+
+  <div class="msgfullread">
+   <div class="msgHeaders">
+    <div id="msgHeaders">
+     <div class="dimpOptions">
+<?php if (!empty($conf['user']['allow_view_source'])): ?>
+      <div>
+       <span id="msg_view_source">
+        <span class="iconImg"></span>
+        <a><?php echo _("View Source") ?></a>
+       </span>
+      </div>
+<?php endif; ?>
+      <div>
+       <span>
+        <span class="iconImg saveAsImg"></span>
+        <a href="<?php echo $show_msg_result['save_as'] ?>"><?php echo _("Save") ?></a>
+       </span>
+      </div>
+     </div>
+     <div id="msgHeadersContent">
+      <table>
+       <thead>
+        <tr>
+         <td class="label"><?php echo _("Subject") ?>:</td>
+         <td class="subject"><?php echo $show_msg_result['subject'] ?></td>
+        </tr>
+<?php foreach($show_msg_result['headers'] as $val): ?>
+        <tr<?php if (isset($val['id'])): ?> id="msgHeader<?php echo $val['id'] ?>"<?php endif; ?>>
+         <td class="label"><?php echo $val['name'] ?>:</td>
+         <td><?php echo $val['value'] ?></td>
+        </tr>
+<?php endforeach; ?>
+<?php if (isset($show_msg_result['atc_label'])): ?>
+        <tr id="msgAtc">
+         <td class="label" id="partlist_toggle">
+          <span class="iconImg attachmentImg attachmentImage"></span>
+<?php if ($show_msg_result['atc_list']): ?>
+          <span id="partlist_col" class="iconImg"></span>
+          <span id="partlist_exp" class="iconImg" style="display:none"></span>
+<?php endif; ?>
+         </td>
+         <td>
+          <span class="atcLabel"><?php echo $show_msg_result['atc_label'] ?></span><?php echo isset($show_msg_result['atc_download']) ? $show_msg_result['atc_download'] : '' ?>
+<?php if (isset($show_msg_result['atc_list'])): ?>
+          <div id="partlist" style="display:none">
+           <table>
+            <?php echo $show_msg_result['atc_list'] ?>
+           </table>
+          </div>
+<?php endif; ?>
+         </td>
+        </tr>
+<?php endif; ?>
+        <tr id="msgLogInfo" style="display:none">
+         <td class="label" id="msgloglist_toggle">
+          <span class="iconImg" id="msgloglist_col"></span>
+          <span class="iconImg" id="msgloglist_exp" style="display:none"></span>
+         </td>
+         <td>
+          <div>
+           <span class="msgLogLabel"><?php echo _("Message Log") ?></span>
+          </div>
+          <div id="msgloglist" style="display:none">
+           <ul></ul>
+          </div>
+         </td>
+        </tr>
+       </thead>
+      </table>
+     </div>
+    </div>
+   </div>
+   <div class="messageBody">
+    <?php echo $show_msg_result['msgtext'] ?>
+   </div>
+  </div>
+ </div>
+
+<?php if (!$disable_compose): ?>
+ <div id="qreply" style="display:none">
+  <div class="header">
+   <div class="headercloseimg" id="compose_close">
+    <span class="closeImg" title="X"></span>
+   </div>
+   <div><?php echo _("Message:") . ' ' . $show_msg_result['subject'] ?></div>
+  </div>
+  <?php echo $compose_result['html']; ?>
+ </div>
+</div>
+
+<div class="context" id="ctx_replypopdown" style="display:none">
+ <a id="ctx_reply_reply"><span class="contextImg"></span><?php echo _("To Sender") ?></a>
+ <a id="ctx_reply_reply_all"><span class="contextImg"></span><?php echo _("To All") ?></a>
+<?php if ($show_msg_result['list_info']['exists']): ?>
+ <a id="ctx_reply_reply_list"><span class="contextImg"></span><?php echo _("To List") ?></a>
+<?php endif; ?>
+</div>
+
+<?php if (!$prefs->isLocked('forward_default')): ?>
+<div class="context" id="ctx_forwardpopdown" style="display:none;">
+ <a id="ctx_forward_attach"><span class="contextImg"></span><?php echo _("As Attachment") ?></a>
+ <a id="ctx_forward_body"><span class="contextImg"></span><?php echo _("In Body Text") ?></a>
+ <a id="ctx_forward_both"><span class="contextImg"></span><?php echo _("Attachment and Body Text") ?></a>
+</div>
+<?php endif; ?>
+<?php endif; ?>
+
+<div class="context" id="ctx_contacts" style="display:none">
+ <a id="ctx_contacts_new"><span class="contextImg"></span><?php echo _("New Message") ?></a>
+ <a id="ctx_contacts_add"><span class="contextImg"></span><?php echo _("Add to Address Book") ?></a>
+</div>
+
+<div style="display:none">
+ <span id="largeaddrspan">
+  <span class="largeaddrtoggle">
+   <span class="largeaddrlist">[<?php echo _("Show Addresses - %d recipients") ?>]</span>
+   <span class="largeaddrlist" style="display:none">[<?php echo _("Hide Addresses") ?>]</span>
+  </span>
+  <span class="dispaddrlist" style="display:none"></span>
+ </span>
+</div>
diff --git a/imp/templates/dimp/compose/compose.html b/imp/templates/dimp/compose/compose.html
new file mode 100644 (file)
index 0000000..bb42ada
--- /dev/null
@@ -0,0 +1,9 @@
+<body>
+ <div id="dimpLoading"><gettext>Loading...</gettext></div>
+ <div id="pageContainer" style="display:none">
+  <div class="header">
+   <div class="headercloseimg closeImg" id="compose_close"></div>
+   <tag:title />
+  </div>
+  <tag:compose_html />
+ </div>
diff --git a/imp/templates/dimp/index.inc b/imp/templates/dimp/index.inc
new file mode 100644 (file)
index 0000000..730260b
--- /dev/null
@@ -0,0 +1,498 @@
+<?php
+/**
+ * Dynamic view (dimp) index template.
+ *
+ * Copyright 2005-2010 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (GPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ */
+
+$usetrash = $prefs->getValue('use_trash');
+$use_sub = $prefs->getValue('subscribe');
+
+$has_blacklist = $registry->hasMethod('mail/blacklistFrom');
+$has_whitelist = $registry->hasMethod('mail/whitelistFrom');
+
+// Quota information
+$show_quota = (isset($_SESSION['imp']['imap']['quota']) && is_array($_SESSION['imp']['imap']['quota']));
+
+// Get the list of available IMAP flags
+$flag_list = $injector->getInstance('IMP_Imap_Flags')->getList(array('imap' => true));
+
+function _simpleButton($id, $text, $image, $nodisplay = false)
+{
+    $ak = Horde::getAccessKey($text, true);
+    return '<li class="servicelink"' .
+        (strlen($id) ? ' id="' . $id . '"' : '') .
+        (strlen($ak) ? ' accesskey="' . $ak . '"' : '') .
+        ($nodisplay ? ' style="display:none"' : '') . '>' .
+        '<span class="iconSpan ' . $image . '"></span>' .
+        '<a>' . Horde::highlightAccessKey($text, $ak) . '</a></li>';
+}
+?>
+<div id="dimpLoading">
+ <?php echo _("Loading...") ?>
+ <noscript>
+  <div class="nojserror"><?php echo _("Error! This application requires javascript to be available and enabled in your browser.") ?></div>
+ </noscript>
+</div>
+
+<div id="dimpPage" style="display:none">
+ <div id="header"></div>
+ <div id="pageContainer">
+  <div id="sidebar">
+   <div id="logo">
+    <a id="logolink"><?php echo _("Horde") ?></a>
+   </div>
+   <ul id="dimpbarActions">
+    <?php echo _simpleButton('composelink', _("_New Message"), 'dimpactionCompose') ?>
+    <?php echo _simpleButton('checkmaillink', _("_Get Mail"), 'dimpactionCheckmail') ?>
+    <?php echo _simpleButton('refreshlink', _("_Refresh Search"), 'dimpactionRefresh', true) ?>
+    <?php echo _simpleButton('alertsloglink', _("Alerts _Log"), 'infoIcon') ?>
+<?php if (!empty($_SESSION['imp']['filteravail'])): ?>
+    <?php echo _simpleButton('applyfilterlink', _("Apply Filters"), 'filtersIcon') ?>
+<?php endif; ?>
+   </ul>
+   <div class="sepfull"></div>
+   <ul id="serviceActions">
+<?php if (($registry->get('status', 'horde') != 'hidden') && ($registry->get('status', 'horde') != 'notoolbar')): ?>
+    <?php echo _simpleButton('appportal', _("_Portal"), 'hordeIcon') ?>
+<?php endif; ?>
+<?php if (Horde_Menu::showService('options')): ?>
+    <?php echo _simpleButton('appoptions', _("_Options"), 'prefsIcon') ?>
+<?php endif; ?>
+<?php if (Horde_Menu::showService('logout')): ?>
+    <?php echo _simpleButton('applogout', _("_Log Out"), 'logoutIcon') ?>
+<?php endif; ?>
+   </ul>
+   <div class="sepfull"></div>
+   <div id="foldersLoading"><?php echo _("Loading...") ?></div>
+   <div id="foldersSidebar" style="display:none">
+    <ul class="folderlist" id="specialfolders"></ul>
+<?php if (!empty($application_folders)): ?>
+    <div class="sepfull"></div>
+    <ul id="applicationfolders">
+<?php foreach ($application_folders as $val): ?>
+     <li class="custom">
+      <img src="<?php echo $val['icon'] ?>" alt="<?php echo $val['name'] ?>" />
+      <a title="<?php echo $val['name'] ?>" id="app<?php echo $val['app'] ?>"><?php echo $val['name'] ?></a>
+     </li>
+<?php endforeach; ?>
+    </ul>
+<?php endif; ?>
+<?php if (!empty($site_menu)): ?>
+    <div id="sitemenu">
+     <div class="sepfull"></div>
+     <ul>
+<?php foreach ($site_menu as $key => $menu_item): ?>
+<?php if ($menu_item == 'separator'): ?>
+     </ul>
+     <div class="sepfull"></div>
+     <ul>
+<?php else: ?>
+      <li class="custom">
+       <img src="<?php echo $menu_item['icon'] ?>" alt="<?php echo $menu_item['text'] ?>" />
+       <a title="<?php echo $menu_item['text'] ?>" id="menu<?php echo $key ?>"><?php echo $menu_item['text'] ?></a>
+      </li>
+<?php endif; ?>
+<?php endforeach; ?>
+     </ul>
+    </div>
+<?php endif; ?>
+    <div class="sepfull"></div>
+    <ul class="folderlist" id="normalfolders">
+     <li class="folder" id="folderopts">
+      <span class="iconSpan folderImg"></span>
+      <a title="<?php echo _("Folder Options") ?>"><?php echo _("Folder Options") ?></a>
+     </li>
+     <li class="folder" id="dropbase" style="display:none">
+      <span class="iconSpan folderImg"></span>
+      <a title="<?php echo _("Move to Base Level") ?>"><?php echo _("Move to Base Level") ?></a>
+     </li>
+    </ul>
+   </div>
+  </div>
+
+  <div id="dimpmain">
+   <div id="dimpmain_portal"><?php echo _("Loading...") ?></div>
+   <div id="dimpmain_folder" style="display:none">
+    <div id="dimpmain_folder_top">
+     <div id="tabbar">
+<?php if (!empty($application_folders) || !empty($site_menu)): ?>
+      <div class="tabset">
+       <ul>
+        <li>
+         <a id="hometab"><img src="<?php echo $registry->get('icon', 'horde') ?>" alt="<?php echo _("Home") ?>" /><?php echo _("Home") ?></a>
+        </li>
+<?php foreach ($application_folders as $val): ?>
+        <li<?php if ($val['app'] == 'dimp') echo ' class="activeTab"' ?>>
+         <a class="applicationtab" id="apptab<?php echo $val['app'] ?>"><img src="<?php echo $val['icon'] ?>" alt="<?php echo $val['name'] ?>" /><?php echo $val['name'] ?></a>
+        </li>
+<?php endforeach; ?>
+<?php foreach ($site_menu as $key => $menu_item): if ($menu_item == 'separator') continue; ?>
+        <li>
+         <a id="tab<?php echo $key ?>"><img src="<?php echo $menu_item['icon'] ?>" alt="<?php echo $menu_item['text'] ?>" /><?php echo $menu_item['text'] ?></a>
+        </li>
+<?php endforeach; ?>
+<?php if ($show_quota): ?>
+        <li id="quota">
+         <span class="used"><?php echo Horde::img('quotauncover.gif') ?></span>
+        </li>
+<?php endif; ?>
+       </ul>
+      </div>
+<?php elseif ($show_quota): ?>
+      <div id="quota">
+        <span class="used"><?php echo Horde::img('quotauncover.gif') ?></span>
+      </div>
+<?php endif; ?>
+     </div>
+     <div class="header mboxheader">
+      <div>
+       <span class="rightFloat" id="msgHeader"></span>
+       <span id="folderName"></span>
+       <span class="iconImg readonlyImg" style="display:none" title="<?php echo htmlspecialchars(_("Read-Only")) ?>"></span>
+      </div>
+     </div>
+
+     <div class="dimpActions">
+<?php if ($_SESSION['imp']['protocol'] != 'pop'): ?>
+      <div id="qsearch">
+       <span id="qsearch_icon"></span>
+       <form action="#" method="post">
+        <input autocomplete="off" id="qsearch_input" type="text" />
+       </form>
+       <span class="closeImg" id="qsearch_close" style="display:none" title="<?php echo _("Clear Search") ?>"></span>
+       <span id="qsearch_close_filter" style="display:none">Clear Filter</span>
+      </div>
+<?php endif; ?>
+      <div><?php echo IMP_Dimp::actionButton(array('class' => 'noselectDisable', 'icon' => 'Reply', 'id' => 'button_reply', 'title' => _("Reply"))) ?></div>
+      <div><?php echo IMP_Dimp::actionButton(array('class' => 'noselectDisable', 'icon' => 'Forward', 'id' => 'button_forward', 'title' => _("Forward"))) ?></div>
+<?php if (!empty($conf['spam']['reporting'])): ?>
+      <div><?php echo IMP_Dimp::actionButton(array('class' => 'noselectDisable', 'icon' => 'Spam', 'id' => 'button_spam', 'title' => _("Spam"))) ?></div>
+<?php endif; ?>
+<?php if (!empty($conf['notspam']['reporting'])): ?>
+      <div><?php echo IMP_Dimp::actionButton(array('class' => 'noselectDisable', 'icon' => 'Ham', 'id' => 'button_ham', 'title' => _("Innocent"))) ?></div>
+<?php endif; ?>
+      <div><?php echo IMP_Dimp::actionButton(array('class' => 'noselectDisable', 'icon' => 'Delete', 'id' => 'button_deleted', 'title' => _("Delete"))) ?></div>
+      <div id="button_compose"><?php echo IMP_Dimp::actionButton(array('icon' => 'Compose', 'title' => _("Compose"))) ?></div>
+      <div id="button_checkmail"><?php echo IMP_Dimp::actionButton(array('icon' => 'Checkmail', 'title' => _("Get Mail"))) ?></div>
+      <div><?php echo IMP_Dimp::actionButton(array('icon' => 'Other', 'id' => 'button_other', 'title' => _("Other Actions"))) ?></div>
+     </div>
+
+     <div id="msglistHeader" class="item">
+      <div class="msgStatus"></div>
+      <div class="msgFrom sep"></div>
+      <div class="msgSubject sep"></div>
+      <div class="msgDate sep"></div>
+      <div class="msgSize sep"></div>
+     </div>
+    </div>
+
+    <div id="msgSplitPane"></div>
+    <span id="viewportLoading" class="loadingImg" style="display:none"></span>
+
+    <div id="previewPane" style="display:none">
+     <span id="msgLoading" class="loadingImg" style="display:none"></span>
+     <div id="previewInfo" style="display:none">
+      <?php echo _("To preview a message, select it from the message list.") ?>
+      <br />
+<?php if ($browser->isBrowser('opera')): ?>
+      <?php echo _("A left click") ?> + <span class="kbd"><?php echo _("Shift") ?></span> + <span class="kbd"><?php echo _("Ctrl") ?></span> <?php echo _("will display available actions.") ?>
+<?php else: ?>
+      <?php echo _("A right-click on a message or a folder will display available actions.") ?>
+<?php endif; ?>
+      <br />
+      <?php printf(_("Click on a message while holding down the %s key to select multiple messages.  To select a range of messages, click the first message of the range, navigate to the last message of the range, and then click on the last message while holding down the %s key."), '<span class="kbd">' . _("Ctrl") . '</span>', '<span class="kbd">' . _("Shift") . '</span>') ?><br /><br />
+      <?php echo _("The following keyboard shortcuts are available:") ?><br />
+      <span class="iconImg keyupImg"></span> / <span class="iconImg keydownImg"></span> : <?php echo _("Move up/down through the message list.") ?><br />
+      <span class="kbd"><?php echo _("PgUp") ?></span> / <span class="kbd"><?php echo _("PgDown") ?></span> : <?php echo _("Move one page up/down through the message list.") ?><br />
+      <span class="kbd"><?php echo _("Alt") ?></span> + <span class="kbd"><?php echo _("PgUp") ?></span> / <span class="kbd"><?php echo _("PgDown") ?></span> : <?php echo _("Scroll up/down through the display of the previewed message.") ?><br />
+      <span class="kbd"><?php echo _("Home") ?></span> / <span class="kbd"><?php echo _("End") ?></span> : <?php echo  _("Move to the beginning/end of the message list.") ?><br />
+      <span class="kbd"><?php echo _("Del") ?></span> : <?php echo _("Delete the currently selected message(s).") ?> <?php printf(_("%s will delete the current message and move to the next message if a single message is selected."), '<span class="kbd">' . _("Shift") . '</span> + <span class="kbd">' . _("Del") . '</span>') ?><br />
+      <span class="kbd"><?php echo _("Shift") ?></span> + <span class="kbd"><?php echo _("N") ?></span> : <?php echo _("Move to the next unseen message (non-search folders only).") ?><br />
+      <span class="kbd"><?php echo _("Enter") ?></span> : <?php echo _("Open message in a popup window.") ?><br />
+      <span class="kbd"><?php echo _("Ctrl") ?></span> + <span class="kbd"><?php echo 'A' ?></span> : <?php echo _("Select all messages in the current mailbox.") ?><br />
+     </div>
+
+     <div id="previewMsg" style="display:none">
+      <div class="msgHeaders">
+       <div id="toggleHeaders">
+        <a id="th_expand"><span class="iconImg" title="<?php echo htmlspecialchars(_("Expand Headers")) ?>"></span></a>
+        <a id="th_collapse" style="display:none"><span class="iconImg" title="<?php echo htmlspecialchars(_("Collapse Headers")) ?>"></span></a>
+       </div>
+       <div id="msgHeadersColl">
+        <a id="msg_newwin"><span class="iconImg" title="<?php echo htmlspecialchars(_("Open in new window")) ?>"></span></a>
+        <span class="date"></span>
+        <span class="subject"></span>
+        <span class="fromcontainer"><?php echo _("from") ?> <span class="from"></span></span>
+       </div>
+       <div id="msgHeaders" style="display:none">
+        <div class="dimpOptions">
+         <div>
+          <span id="msg_newwin_options">
+           <span class="iconImg"></span>
+           <a><?php echo _("Open in new window") ?></a>
+          </span>
+         </div>
+<?php if (!empty($conf['user']['allow_view_source'])): ?>
+         <div>
+          <span id="msg_view_source">
+           <span class="iconImg"></span>
+           <a><?php echo _("View Source") ?></a>
+          </span>
+         </div>
+<?php endif; ?>
+        </div>
+        <div id="msgHeadersContent">
+         <table>
+          <thead>
+           <tr>
+            <td class="label"><?php echo _("Subject") ?>:</td>
+            <td class="subject"></td>
+           </tr>
+           <tr id="msgHeaderFrom">
+            <td class="label"><?php echo _("From") ?>:</td>
+            <td class="from"></td>
+           </tr>
+           <tr id="msgHeaderDate">
+            <td class="label"><?php echo _("Date") ?>:</td>
+            <td class="date"></td>
+           </tr>
+           <tr id="msgHeaderTo">
+            <td class="label"><?php echo _("To") ?>:</td>
+            <td class="to"></td>
+           </tr>
+           <tr id="msgHeaderCc">
+            <td class="label"><?php echo _("Cc") ?>:</td>
+            <td class="cc"></td>
+           </tr>
+           <tr id="msgAtc" style="display:none">
+            <td class="label" id="partlist_toggle">
+             <span class="iconImg attachmentImg attachmentImage"></span>
+             <span class="iconImg" id="partlist_col"></span>
+             <span class="iconImg" id="partlist_exp" style="display:none"></span>
+             </td>
+            <td>
+             <div></div>
+             <div id="partlist" style="display:none">
+              <table></table>
+             </div>
+            </td>
+           </tr>
+           <tr id="msgLogInfo" style="display:none">
+            <td class="label" id="msgloglist_toggle">
+             <span class="iconImg" id="msgloglist_col"></span>
+             <span class="iconImg" id="msgloglist_exp" style="display:none"></span>
+            </td>
+            <td>
+             <div><span class="msgLogLabel"><?php echo _("Message Log") ?></span></div>
+             <div id="msgloglist" style="display:none">
+              <ul></ul>
+             </div>
+            </td>
+           </tr>
+          </thead>
+         </table>
+        </div>
+       </div>
+      </div>
+      <div id="messageBody" class="messageBody"></div>
+     </div>
+    </div>
+   </div>
+  </div>
+ </div>
+</div>
+
+<div class="context" id="ctx_folder" style="display:none">
+ <a id="ctx_folder_create"><span class="contextImg"></span><?php echo _("Create subfolder") ?></a>
+ <a id="ctx_folder_rename"><span class="contextImg"></span><?php echo _("Rename Folder") ?></a>
+ <a id="ctx_folder_empty"><span class="contextImg"></span><?php echo _("Empty Folder") ?></a>
+ <a id="ctx_folder_delete"><span class="contextImg"></span><?php echo _("Delete Folder") ?></a>
+ <div class="sep"></div>
+ <a id="ctx_folder_setflag"><span class="contextImg"></span><?php echo _("Mark all as") ?></a>
+ <div class="sep"></div>
+ <a id="ctx_folder_poll"><span class="contextImg"></span><?php echo _("Check for New Mail") ?></a>
+ <a id="ctx_folder_nopoll"><span class="contextImg"></span><?php echo _("Do Not Check for New Mail") ?></a>
+<?php if ($use_sub): ?>
+ <a id="ctx_folder_sub"><span class="contextImg"></span><?php echo _("Subscribe") ?></a>
+ <a id="ctx_folder_unsub"><span class="contextImg"></span><?php echo _("Unsubscribe") ?></a>
+<?php endif; ?>
+ <div style="display:none">
+  <div class="sep"></div>
+  <a id="ctx_folder_expand"><span class="contextImg"></span><?php echo _("Expand All") ?></a>
+  <a id="ctx_folder_collapse"><span class="contextImg"></span><?php echo _("Collapse All") ?></a>
+ </div>
+</div>
+
+<div class="context" id="ctx_folder_flag" style="display:none">
+ <a id="ctx_folder_seen"><span class="contextImg"></span><?php echo _("Read") ?></a>
+ <a id="ctx_folder_unseen"><span class="contextImg"></span><?php echo _("Unseen") ?></a>
+</div>
+
+<div class="context" id="ctx_container" style="display:none">
+ <a id="ctx_container_create"><span class="contextImg"></span><?php echo _("Create subfolder") ?></a>
+ <a id="ctx_container_rename"><span class="contextImg"></span><?php echo _("Rename Folder") ?></a>
+ <div class="sep"></div>
+ <a id="ctx_container_expand"><span class="contextImg"></span><?php echo _("Expand All") ?></a>
+ <a id="ctx_container_collapse"><span class="contextImg"></span><?php echo _("Collapse All") ?></a>
+</div>
+
+<?php if ($conf['user']['allow_folders']): ?>
+<div class="context" id="ctx_folderopts" style="display:none">
+ <a id="ctx_folderopts_new"><span class="contextImg"></span><?php echo _("New Folder") ?></a>
+<?php if ($use_sub): ?>
+ <a id="ctx_folderopts_sub" style="display:none"><span class="contextImg"></span><?php echo _("Hide Unsubscribed") ?></a>
+ <a id="ctx_folderopts_unsub"><span class="contextImg"></span><?php echo _("Show Unsubscribed") ?></a>
+<?php endif; ?>
+ <a id="ctx_folderopts_expand"><span class="contextImg"></span><?php echo _("Expand All") ?></a>
+ <a id="ctx_folderopts_collapse"><span class="contextImg"></span><?php echo _("Collapse All") ?></a>
+ <div class="sep"></div>
+ <a id="ctx_folderopts_reload"><span class="contextImg"></span><?php echo _("Rebuild Folder List") ?></a>
+</div>
+<?php endif; ?>
+
+<div class="context" id="ctx_noactions" style="display:none">
+ <div><?php echo _("No actions available") ?></div>
+</div>
+
+<div class="context" id="ctx_vfolder" style="display:none">
+ <a id="ctx_vfolder_edit"><span class="contextImg"></span><?php echo _("Edit Virtual Folder") ?></a>
+ <a id="ctx_vfolder_delete"><span class="contextImg"></span><?php echo _("Delete Virtual Folder") ?></a>
+</div>
+
+<div class="context" id="ctx_message" style="display:none">
+ <a id="ctx_message_resume" style="display:none"><span class="contextImg"></span><?php echo _("Resume Draft") ?></a>
+ <a id="ctx_message_reply"><span class="contextImg"></span><?php echo _("Reply") ?></a>
+ <a id="ctx_message_forward"><span class="contextImg"></span><?php echo _("Forward") ?></a>
+<?php if (!empty($flag_list)): ?>
+ <div>
+  <div class="sep"></div>
+  <a id="ctx_message_setflag"><span class="contextImg"></span><?php echo _("Mark as") ?></a>
+  <a id="ctx_message_unsetflag"><span class="contextImg"></span><?php echo _("Unmark as") ?></a>
+ </div>
+<?php endif; ?>
+ <div class="sep"></div>
+<?php if (!empty($conf['spam']['reporting'])): ?>
+ <a id="ctx_message_spam"><span class="contextImg"></span><?php echo _("Report as Spam") ?></a>
+<?php endif; ?>
+<?php if (!empty($conf['notspam']['reporting'])): ?>
+ <a id="ctx_message_ham"><span class="contextImg"></span><?php echo _("Report as Innocent") ?></a>
+<?php endif; ?>
+<?php if ($has_blacklist): ?>
+ <a id="ctx_message_blacklist"><span class="contextImg"></span><?php echo _("Blacklist") ?></a>
+<?php endif; ?>
+<?php if ($has_whitelist): ?>
+ <a id="ctx_message_whitelist"><span class="contextImg"></span><?php echo _("Whitelist") ?></a>
+<?php endif; ?>
+ <a id="ctx_message_deleted"><span class="contextImg"></span><?php echo _("Delete") ?></a>
+<?php if (!$usetrash): ?>
+ <a id="ctx_message_undeleted"><span class="contextImg"></span><?php echo _("Undelete") ?></a>
+<?php endif; ?>
+ <div style="display:none">
+  <div class="sep"></div>
+  <a id="ctx_message_source"><span class="contextImg"></span><?php echo _("View Source") ?></a>
+ </div>
+</div>
+
+<div class="context" id="ctx_reply" style="display:none;">
+ <a id="ctx_reply_reply"><span class="contextImg"></span><?php echo _("To Sender") ?></a>
+ <a id="ctx_reply_reply_all"><span class="contextImg"></span><?php echo _("To All") ?></a>
+ <a id="ctx_reply_reply_list"><span class="contextImg"></span><?php echo _("To List") ?></a>
+</div>
+
+<?php if (!$prefs->isLocked('forward_default')): ?>
+<div class="context" id="ctx_forward" style="display:none;">
+ <a id="ctx_forward_attach"><span class="contextImg"></span><?php echo _("As Attachment") ?></a>
+ <a id="ctx_forward_body"><span class="contextImg"></span><?php echo _("In Body Text") ?></a>
+ <a id="ctx_forward_both"><span class="contextImg"></span><?php echo _("Attachment and Body Text") ?></a>
+</div>
+<?php endif; ?>
+
+<div class="context" id="ctx_otheractions" style="display:none">
+ <a id="oa_preview_hide"><span class="contextImg"></span><?php echo _("Hide Preview") ?></a>
+ <a id="oa_preview_show"><span class="contextImg"></span><?php echo _("Show Preview") ?></a>
+ <a id="oa_layout_horiz"><span class="contextImg"></span><?php echo _("Horizontal Layout") ?></a>
+ <a id="oa_layout_vert"><span class="contextImg"></span><?php echo _("Vertical Layout") ?></a>
+<?php if (!empty($flag_list)): ?>
+ <div>
+  <div class="sep"></div>
+  <a id="oa_setflag"><span class="contextImg"></span><?php echo _("Mark as") ?></a>
+  <a id="oa_unsetflag"><span class="contextImg"></span><?php echo _("Unmark as") ?></a>
+ </div>
+<?php endif; ?>
+<?php if ($has_blacklist || $has_whitelist): ?>
+<?php if ($has_blacklist): ?>
+ <div>
+  <div class="sep"></div>
+  <a id="oa_blacklist"><span class="contextImg"></span><?php echo _("Blacklist") ?></a>
+ </div>
+<?php endif; ?>
+<?php if ($has_whitelist): ?>
+ <div>
+  <div<?php if (!$has_blacklist) echo ' class="sep"'; ?>></div>
+  <a id="oa_whitelist"><span class="contextImg"></span><?php echo _("Whitelist") ?></a>
+ </div>
+<?php endif; ?>
+<?php endif; ?>
+ <div class="sep"></div>
+ <a id="oa_selectall"><span class="contextImg"></span><?php echo _("Select All") ?></a>
+<?php if (!$usetrash): ?>
+ <div class="sep"></div>
+ <a id="oa_purge_deleted"><span class="contextImg"></span><?php echo _("Purge Deleted") ?></a>
+ <a id="oa_undeleted"><span class="contextImg"></span><?php echo _("Undelete") ?></a>
+<?php endif; ?>
+</div>
+
+<?php if (!empty($flag_list)): ?>
+<div class="context" id="ctx_flag" style="display:none">
+<?php foreach ($flag_list as $key => $val): ?>
+ <a flag="<?php echo htmlspecialchars($key) ?>"><span class="contextImg <?php echo htmlspecialchars($val['c']) ?>"<?php echo ($val['t'] == 'imapp') ? ' style="background:' . htmlspecialchars($val['b']) . '"' : '' ?>></span><?php echo htmlspecialchars($val['l']) ?></a>
+<?php endforeach; ?>
+</div>
+<?php endif; ?>
+
+<div class="context" id="ctx_contacts" style="display:none">
+ <a id="ctx_contacts_new"><span class="contextImg"></span><?php echo _("New Message") ?></a>
+ <a id="ctx_contacts_add"><span class="contextImg"></span><?php echo _("Add to Address Book") ?></a>
+</div>
+
+<?php if ($_SESSION['imp']['protocol'] != 'pop'): ?>
+<div class="context" id="ctx_qsearchopts" style="display:none">
+ <a id="ctx_qsearchopts_by"><?php echo _("Search By") ?></a>
+ <div class="sep"></div>
+ <a id="ctx_qsearchopts_filter"><?php echo _("Show Only") ?></a>
+ <a id="ctx_qsearchopts_filternot"><?php echo _("Don't Show") ?></a>
+ <div class="sep"></div>
+ <a id="ctx_qsearchopts_advanced"><?php echo _("Advanced Search...") ?></a>
+</div>
+
+<div class="context" id="ctx_qsearchby" style="display:none">
+ <a id="ctx_qsearchby_all"><?php echo _("Entire Message") ?></a>
+ <a id="ctx_qsearchby_body"><?php echo _("Body") ?></a>
+ <a id="ctx_qsearchby_from"><?php echo _("From") ?></a>
+ <a id="ctx_qsearchby_to"><?php echo _("To") ?></a>
+ <a id="ctx_qsearchby_subject"><?php echo _("Subject") ?></a>
+</div>
+<?php endif; ?>
+
+<div style="display:none">
+ <span id="largeaddrspan">
+  <span class="largeaddrtoggle">
+   <span class="largeaddrlist">[<?php echo _("Show Addresses - %d recipients") ?>]</span>
+   <span class="largeaddrlist" style="display:none">[<?php echo _("Hide Addresses") ?>]</span>
+  </span>
+  <span class="dispaddrlist" style="display:none"></span>
+ </span>
+</div>
+
+<div id="folderform" style="display:none">
+ <form action="#" class="RBForm">
+  <p></p>
+  <input type="text" size="15" />
+  <input type="button" class="button RBFolderOk" value="<?php echo _("Ok") ?>" />
+  <input type="button" class="button RBFolderCancel" value="<?php echo _("Cancel") ?>" />
+ </form>
+</div>
diff --git a/imp/templates/dimp/javascript_defs_dimp.php b/imp/templates/dimp/javascript_defs_dimp.php
new file mode 100644 (file)
index 0000000..c94aa84
--- /dev/null
@@ -0,0 +1,202 @@
+<?php
+/**
+ * DIMP base JS file.
+ *
+ * Copyright 2005-2010 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (GPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ */
+
+$app_urls = $code = $flags = array();
+
+foreach (IMP_Dimp::menuList() as $app) {
+    $app_urls[$app] = (string) Horde::url($GLOBALS['registry']->getInitialPage($app), true);
+}
+
+include IMP_BASE . '/config/portal.php';
+foreach ($dimp_block_list as $block) {
+    if ($block['ob'] instanceof Horde_Block) {
+        $app = $block['ob']->getApp();
+        if (empty($app_urls[$app])) {
+            $app_urls[$app] = (string) Horde::url($GLOBALS['registry']->getInitialPage($app), true);
+        }
+    }
+}
+
+/* Generate flag array. */
+foreach ($GLOBALS['injector']->getInstance('IMP_Imap_Flags')->getList(array('fgcolor' => true)) as $val) {
+    $flags[$val['flag']] = array_filter(array(
+        'b' => isset($val['b']) ? $val['b'] : null,
+        'c' => $val['c'],
+        'f' => $val['f'],
+        'l' => $val['l'],
+        'n' => isset($val['n']) ? $val['n'] : null,
+        // Indicate if this is a user *P*ref flag
+        'p' => intval($val['t'] == 'imapp')
+    ));
+}
+
+/* Variables used in core javascript files. */
+$code['conf'] = array_filter(array(
+    // URL variables
+    'URI_AJAX' => (string) Horde::getServiceLink('ajax', 'imp'),
+    'URI_COMPOSE' => (string) Horde::applicationUrl('compose-dimp.php'),
+    'URI_DIMP' => (string) Horde::applicationUrl('index-dimp.php'),
+    'URI_MESSAGE' => (string) Horde::applicationUrl('message-dimp.php'),
+    'URI_PREFS' => (string) Horde::getServiceLink('prefsapi', 'imp'),
+    'URI_PREFS_IMP' => str_replace('&amp;', '&', (string) Horde::getServiceLink('options', 'imp')),
+    'URI_SEARCH' => (string) Horde::applicationUrl('search.php'),
+    'URI_VIEW' => (string) Horde::applicationUrl('view.php'),
+
+    'IDX_SEP' => IMP::IDX_SEP,
+    'SESSION_ID' => defined('SID') ? SID : '',
+
+    // Other variables
+    'app_urls' => $app_urls,
+    'buffer_pages' => intval($GLOBALS['conf']['dimp']['viewport']['buffer_pages']),
+    'disable_compose' => !IMP::canCompose(),
+    'filter_any' => intval($GLOBALS['prefs']->getValue('filter_any_mailbox')),
+    'fixed_folders' => empty($GLOBALS['conf']['server']['fixed_folders'])
+        ? array()
+        : array_map(array('IMP_Dimp', 'appendedFolderPref'), $GLOBALS['conf']['server']['fixed_folders']),
+    'flags' => $flags,
+    'fsearchid' => IMP_Search::MBOX_PREFIX . IMP_Search::DIMP_FILTERSEARCH,
+    'ham_spammbox' => intval(!empty($GLOBALS['conf']['notspam']['spamfolder'])),
+    'login_view' => $GLOBALS['prefs']->getValue('dimp_login_view'),
+    'name' => $GLOBALS['registry']->get('name', 'imp'),
+    'popup_height' => 610,
+    'popup_width' => 820,
+    'preview_pref' => $GLOBALS['prefs']->getValue('dimp_show_preview') === true ? 'horiz' : $GLOBALS['prefs']->getValue('dimp_show_preview'),
+    'qsearchid' => IMP_Search::MBOX_PREFIX . IMP_Search::DIMP_QUICKSEARCH,
+    'qsearchfield' => $GLOBALS['prefs']->getValue('dimp_qsearch_field'),
+    'refresh_time' => intval($GLOBALS['prefs']->getValue('refresh_time')),
+    'searchprefix' => IMP_Search::MBOX_PREFIX,
+    'sidebar_width' => max((int)$GLOBALS['prefs']->getValue('sidebar_width'), 150) . 'px',
+    'sort' => array(
+        'from' => array(
+            't' => _("From"),
+            'v' => Horde_Imap_Client::SORT_FROM
+        ),
+        'to' => array(
+            't' => _("To"),
+            'v' => Horde_Imap_Client::SORT_TO
+        ),
+        'subject' => array(
+            't' => _("Subject"),
+            'v' => Horde_Imap_Client::SORT_SUBJECT
+        ),
+        'thread' => array(
+            't' => _("Thread"),
+            'v' => Horde_Imap_Client::SORT_THREAD
+        ),
+        'date' => array(
+            't' => _("Date"),
+            'v' => Horde_Imap_Client::SORT_DATE
+        ),
+        'arrival' => array(
+            't' => _("Arrival"),
+            'v' => Horde_Imap_Client::SORT_ARRIVAL
+        ),
+        'size' => array(
+            't' => _("Size"),
+            'v' => Horde_Imap_Client::SORT_SIZE
+        )
+    ),
+    'spam_mbox' => IMP::folderPref($GLOBALS['prefs']->getValue('spam_folder'), true),
+    'spam_spammbox' => intval(!empty($GLOBALS['conf']['spam']['spamfolder'])),
+    'splitbar_pos' => intval($GLOBALS['prefs']->getValue('dimp_splitbar')),
+
+    'toggle_pref' => intval($GLOBALS['prefs']->getValue('dimp_toggle_headers')),
+    'viewport_wait' => intval($GLOBALS['conf']['dimp']['viewport']['viewport_wait']),
+));
+
+/* Gettext strings used in core javascript files. */
+$code['text'] = array(
+    'ajax_error' => _("Error when communicating with the server."),
+    'ajax_recover' => _("The connection to the server has been restored."),
+    'ajax_timeout' => _("There has been no contact with the server for several minutes. The server may be temporarily unavailable or network problems may be interrupting your session. You will not see any updates until the connection is restored."),
+    'badaddr' => _("Invalid Address"),
+    'badsubject' => _("Invalid Subject"),
+    'baselevel' => _("base level of the folder tree"),
+    'cancel' => _("Cancel"),
+    'check' => _("Checking..."),
+    'copyto' => _("Copy %s to %s"),
+    'create_prompt' => _("Create folder:"),
+    'createsub_prompt' => _("Create subfolder:"),
+    'delete_folder' => _("Permanently delete %s?"),
+    'empty_folder' => _("Permanently delete all messages in %s?"),
+    'hidealog' => Horde::highlightAccessKey(_("Hide Alerts _Log"), Horde::getAccessKey(_("Alerts _Log"), true)),
+    'listmsg_wait' => _("The server is still generating the message list."),
+    'listmsg_timeout' => _("The server was unable to generate the message list."),
+    'loading' => _("Loading..."),
+    'message' => _("Message"),
+    'messages' => _("Messages"),
+    'moveto' => _("Move %s to %s"),
+    'noalerts' => _("No Alerts"),
+    'nomessages' => _("No Messages"),
+    'of' => _("of"),
+    'ok' => _("Ok"),
+    'onlogout' => _("Logging Out..."),
+    'popup_block' => _("A popup window could not be opened. Your browser may be blocking popups."),
+    'portal' => ("Portal"),
+    'prefs' => _("User Options"),
+    'rename_prompt' => _("Rename folder to:"),
+    'search' => _("Search"),
+    'verify' => _("Verifying..."),
+    'vp_empty' => _("There are no messages in this mailbox."),
+);
+
+if (in_array(basename($_SERVER['PHP_SELF']), array('compose-dimp.php', 'message-dimp.php'))){
+    $compose_cursor = $GLOBALS['prefs']->getValue('compose_cursor');
+
+    /* Variables used in compose page. */
+    $code['conf_compose'] = array_filter(array(
+        'attach_limit' => ($GLOBALS['conf']['compose']['attach_count_limit'] ? intval($GLOBALS['conf']['compose']['attach_count_limit']) : -1),
+        'auto_save_interval_val' => intval($GLOBALS['prefs']->getValue('auto_save_drafts')),
+        'bcc' => intval($GLOBALS['prefs']->getValue('compose_bcc')),
+        'cc' => intval($GLOBALS['prefs']->getValue('compose_cc')),
+        'close_draft' => intval($GLOBALS['prefs']->getValue('close_draft')),
+        'compose_cursor' => ($compose_cursor ? $compose_cursor : 'top'),
+        'drafts_mbox' => IMP::folderPref($GLOBALS['prefs']->getValue('drafts_folder'), true),
+        'rte_avail' => intval($GLOBALS['browser']->hasFeature('rte')),
+        'spellcheck' => intval($GLOBALS['prefs']->getValue('compose_spellcheck')),
+    ));
+
+    /* Gettext strings used in compose page. */
+    $code['text_compose'] = array(
+        'atc_limit' => _("The attachment limit has been reached."),
+        'cancel' => _("Cancelling this message will permanently discard its contents and will delete auto-saved drafts.\nAre you sure you want to do this?"),
+        'nosubject' => _("The message does not have a Subject entered.") . "\n" . _("Send message without a Subject?"),
+        'remove' => _("Remove"),
+        'spell_noerror' => _("No spelling errors found."),
+        'toggle_html' => _("Really discard all formatting information? This operation cannot be undone."),
+        'uploading' => _("Uploading..."),
+    );
+
+    if ($GLOBALS['registry']->hasMethod('contacts/search')) {
+        $code['conf_compose']['URI_ABOOK'] = (string) Horde::applicationUrl('contacts.php');
+    }
+
+    if ($GLOBALS['prefs']->getValue('set_priority')) {
+        $code['conf_compose']['priority'] = array(
+            array(
+                'l' => _("High"),
+                'v' => 'high'
+            ),
+            array(
+                'l' => _("Normal"),
+                's' => true,
+                'v' => 'normal'
+            ),
+            array(
+                'l' => _("Low"),
+                'v' => 'low'
+            )
+        );
+    }
+}
+
+Horde::addInlineScript(array(
+    'var DIMP = ' . Horde_Serialize::serialize($code, Horde_Serialize::JSON, Horde_Nls::getCharset())
+), null, true);
diff --git a/imp/templates/dimp/portal/portal.html b/imp/templates/dimp/portal/portal.html
new file mode 100644 (file)
index 0000000..8110283
--- /dev/null
@@ -0,0 +1,9 @@
+<div id="portalchunk">
+<loop:block>
+ <div class="<tag:block.class />"<if:block.domid> id="<tag:block.domid />"</if:block.domid>>
+  <h1 class="header"><a app="<tag:block.app />"><tag:block.title /></a></h1>
+  <tag:block.content />
+ </div>
+  <br class="clear" /><br />
+</loop:block>
+</div>
diff --git a/imp/templates/filters/prefs.html b/imp/templates/filters/prefs.html
deleted file mode 100644 (file)
index 5864cc1..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-<div class="header">
- <tag:navcell /> <gettext>Filter Settings</gettext>
-</div>
-
-<if:notactive>
-<div class="prefsContainer item">
- <em><gettext>Filter support is disabled on this system.</gettext></em>
-
- <p><input type="button" name="back" class="button" onclick="document.location.href='<tag:prefsurl />'" value="<tag:return_text />" /></p>
-</div>
-<else:notactive>
-<div class="prefsContainer item">
-<form method="post" name="prefs" action="<tag:selfurl />">
-<tag:forminput />
-<input type="hidden" name="actionID" value="update_prefs" />
-<input type="hidden" name="group" value="<tag:group />" />
-<input type="hidden" name="app" value="<tag:app />" />
-
-<loop:links>
-<tag:links.img /> &nbsp;<tag:links.link /><tag:links.text /></a> &nbsp;<tag:links.help /><br />
-</loop:links>
-
-<if:opts>
-<br />
-<loop:opts>
-<input type="checkbox" id="filter_<tag:opts.key />" name="filter_<tag:opts.key />" <if:opts.checked>checked="checked" </if:opts.checked>/> &nbsp;<tag:opts.label /> &nbsp;<tag:opts.help /><br />
-</loop:opts>
-
-<p>
- <input type="submit" name="save" class="button" onclick="document.prefs.actionID.value='update_prefs';return true;" value="<tag:save_opts />" />&nbsp;&nbsp;
- <input id="prefs_return" type="button" name="back" class="button" onclick="document.location.href='<tag:prefsurl />'" value="<tag:return_text />" />
-</p>
-</if:opts>
-
-</form>
-</div>
-</else:notactive></if:notactive>
diff --git a/imp/templates/folders/actions.html b/imp/templates/folders/actions.html
deleted file mode 100644 (file)
index 4a58c67..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-<table>
- <tr class="control">
-  <td>
-<if:javascript>
-   <div class="leftFloat">
-    <label for="checkAll<tag:id />" class="hidden"><gettext>Check All/None</gettext></label>
-    &nbsp;<input type="checkbox" class="checkbox" id="checkAll<tag:id />" name="checkAll" <tag:check_ak /> />
-   </div>
-</if:javascript>
-   <div class="leftFloat folderChoose">
-    <label for="action_choose<tag:id />" class="hidden"><gettext>Choose Action</gettext></label>
-    <select id="action_choose<tag:id />">
-     <option selected="selected"><gettext>Choose Action</gettext></option>
-     <option value="" disabled="disabled">--------------------</option>
-<if:create_folder>
-     <option value="create_folder"><gettext>Create</gettext></option>
-</if:create_folder>
-     <option value="rename_folder"><gettext>Rename</gettext></option>
-     <option value="delete_folder_confirm"><gettext>Delete</gettext></option>
-     <option value="folders_empty_mailbox_confirm"><gettext>Empty</gettext></option>
-<if:notrash>
-     <option value="expunge_folder"><gettext>Purge</gettext></option>
-</if:notrash>
-<if:subscribe>
-     <option value="subscribe_folder"><gettext>Subscribe</gettext></option>
-     <option value="unsubscribe_folder"><gettext>Unsubscribe</gettext></option>
-</if:subscribe>
-<if:nav_poll>
-     <option value="poll_folder"><gettext>Check for New Mail</gettext></option>
-     <option value="nopoll_folder"><gettext>Do Not Check for New Mail</gettext></option>
-</if:nav_poll>
-     <option value="mark_folder_seen"><gettext>Mark All Messages as Seen</gettext></option>
-     <option value="mark_folder_unseen"><gettext>Mark All Messages as Unseen</gettext></option>
-     <option value="download_folder"><gettext>Download</gettext></option>
-     <option value="download_folder_zip"><gettext>Download [.zip format]</gettext></option>
-<if:file_upload>
-     <option value="import_mbox"><gettext>Import Messages</gettext></option>
-</if:file_upload>
-     <option value="mbox_size"><gettext>Show Size</gettext></option>
-     <option value="rebuild_tree"><gettext>Rebuild Folder Tree</gettext></option>
-    </select>
-<if:javascript><else:javascript>
-    <input name="btn_action" type="submit" class="button" value="<tag:go />" />
-</else:javascript></if:javascript>
-   </div>
-   <div class="leftFloat folderActions">
-    <ul class="msgactions">
-<if:subscribe>
-     <li><tag:toggle_subscribe /></li>
-</if:subscribe>
-     <li><tag:expand_all /></li>
-     <li class="lastnavbar"><tag:collapse_all /></li>
-    </ul>
-   </div>
-   <div class="rightFloat">
-    <tag:help />
-   </div>
-  </td>
- </tr>
-</table>
diff --git a/imp/templates/folders/folders-mimp.html b/imp/templates/folders/folders-mimp.html
deleted file mode 100644 (file)
index 4a99017..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-  <div><tag:title /></div>
-  <hr />
-<loop:rows>
-  <div><tag:rows.level /><if:rows.link><a href="<tag:rows.link />"><tag:rows.label /></a><else:rows.link><tag:rows.label /></else:rows.link></if:rows.link><if:rows.msgs> (<tag:rows.msgs />)</if:rows.msgs></div>
-</loop:rows>
-  <hr />
-  <div><gettext>Menu</gettext></div>
-  <tag:menu />
- </body>
-</html>
diff --git a/imp/templates/folders/folders.html b/imp/templates/folders/folders.html
deleted file mode 100644 (file)
index 3c9d5f9..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<loop:rows>
-<div class="<tag:rows.cname />">
- &nbsp;<input type="checkbox" class="checkbox" name="folder_list[]" <if:rows.nocheckbox>disabled="disabled" </if:rows.nocheckbox>value="<tag:rows.mbox_val />" /> <tag:rows.line /> <tag:rows.name /><if:rows.polled> (<tag:rows.unseen />/<tag:rows.msgs />)</if:rows.polled> <if:rows.editvfolder>&nbsp;&nbsp;[<tag:rows.delvfolder />] [<tag:rows.editvfolder />]</if:rows.editvfolder>
-</div>
-</loop:rows>
diff --git a/imp/templates/folders/folders_confirm.html b/imp/templates/folders/folders_confirm.html
deleted file mode 100644 (file)
index d7c0599..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-<form name="fmanager" method="post" action="<tag:folders_url />">
-<input type="hidden" name="actionID" value="<if:delete>delete_folder</if:delete><if:empty>folders_empty_mailbox</if:empty>" />
-<input type="hidden" id="folders_token" name="folders_token" value="<tag:folders_token />" />
-
-<div class="header leftAlign">
- <gettext>Folder Actions - Confirmation</gettext>
-</div>
-
-<div class="control leftAlign">
- <if:delete><gettext>You are attempting to delete the following folder(s).</gettext></if:delete>
- <if:empty><gettext>You are attempting to delete all messages contained in the following folder(s).</gettext></if:empty>
- <br />
- <gettext>If you continue, all messages in the folder(s) will be lost!</gettext>
-</div>
-
-<loop:folders>
-<div class="<tag:folders.class />">
- &nbsp;<label><input type="checkbox" class="checkbox" name="folder_list[]" value="<tag:folders.val />" checked="checked" /> <tag:folders.name /> (<tag:folders.msgs /> <gettext>messages</gettext>)</label>
-</div>
-</loop:folders>
-
-<div class="control leftAlign">
- <input type="submit" name="submit" class="button" value="<if:delete><gettext>Delete Selected Folders</gettext></if:delete><if:empty><gettext>Empty Selected Folders</gettext></if:empty>" />&nbsp;
- <input id="btn_return" type="button" class="button" value="<gettext>Cancel</gettext>" />
-</div>
-
-</form>
diff --git a/imp/templates/folders/folders_size.html b/imp/templates/folders/folders_size.html
deleted file mode 100644 (file)
index df6b461..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-<div class="header leftAlign"><gettext>Folder Sizes</gettext></div>
-
-<table class="striped sortable" id="foldersizes">
- <thead>
-  <tr>
-   <th class="leftAlign"><gettext>Folder</gettext></th>
-   <th class="leftAlign"><gettext>Size</gettext></th>
-  </tr>
- </thead>
-
- <tbody>
-<loop:folders>
-  <tr>
-   <td class="leftAlign"><tag:folders.name /></td>
-   <td class="rightAlign" sortval="<tag:folders.sort />"><tag:folders.size /></td>
-  </tr>
-</loop:folders>
- </tbody>
-
- <tfoot>
-  <tr>
-   <td class="leftAlign"><strong><gettext>Sum</gettext></strong></td>
-   <td class="rightAlign"><strong><tag:folders_sum /></strong></td>
-  </tr>
- </tfoot>
-</table>
-
-<form name="returnform">
-<div class="control leftAlign">
- <input id="btn_return" type="button" class="button" value="<gettext>Return to Folders</gettext>" />
-</div>
-</form>
diff --git a/imp/templates/folders/head.html b/imp/templates/folders/head.html
deleted file mode 100644 (file)
index 6c6fb4c..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<h1 class="header">
- <gettext>Folder Navigator</gettext>&nbsp;<tag:refresh /><span class="reloadImg"></span></a>
-</h1>
-<div class="headerbox folders">
- <form id="fmanager" name="fmanager" method="post" action="<tag:folders_url />">
- <input type="hidden" id="actionID" name="actionID" value="" />
- <input type="hidden" id="folders_token" name="folders_token" value="<tag:folders_token />" />
- <input type="hidden" id="new_mailbox" name="new_mailbox" value="" />
- <input type="hidden" id="new_names" name="new_names" value="" />
- <input type="hidden" id="old_names" name="old_names" value="" />
- <input type="hidden" name="view_subscribed" value="" />
diff --git a/imp/templates/folders/import.html b/imp/templates/folders/import.html
deleted file mode 100644 (file)
index b8223a8..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<form name="fmanager" id="fmanager" method="post" enctype="multipart/form-data" action="<tag:folders_url />">
- <input type="hidden" name="import_folder" value="<tag:import_folder />" />
- <input type="hidden" name="actionID" id="actionID" value="" />
- <input type="hidden" id="folders_token" name="folders_token" value="<tag:folders_token />" />
-
- <div class="header">
-  <gettext>Import mbox File</gettext>
- </div>
-
- <div class="item">
-  <br />&nbsp;&nbsp;
-  <label for="mbox_upload"><gettext>Import mbox file</gettext></label>&nbsp;
-  <input id="mbox_upload" name="mbox_upload" type="file" size="30" />&nbsp;
-  <gettext>into folder</gettext>
-  <strong><tag:folder_name /></strong>.
-  <input id="btn_import" type="button" class="button" value="<gettext>Import</gettext>" />
-  <input id="btn_return" type="button" class="button" value="<gettext>Cancel</gettext>" />
- </div>
-</form>
diff --git a/imp/templates/imp/acl/acl.html b/imp/templates/imp/acl/acl.html
new file mode 100644 (file)
index 0000000..9fd0a26
--- /dev/null
@@ -0,0 +1,102 @@
+<form method="post" name="folders" id="folders" action="<tag:aclurl />">
+<input type="hidden" name="actionID" value="" />
+<tag:forminput />
+
+<div class="header">
+ <tag:aclnavcell />
+ <gettext>Share mail folders</gettext>
+</div>
+
+<div class="header">
+ <ul>
+  <li>
+   <label for="aclfolder" class="hidden"><gettext>Change Folder</gettext></label>
+   <tag:changefolder /><span class="folderImg"></span></a> <select id="aclfolder" name="folder"><tag:options /></select>
+  </li>
+ </ul>
+ <span class="smallheader"><tag:current /></span>
+</div>
+</form>
+
+<form method="post" name="acl" id="acl" action="<tag:aclurl />">
+<input type="hidden" name="actionID" value="imp_acl_set" />
+<input type="hidden" name="folder" value="<tag:folder />" />
+<tag:forminput />
+<table cellspacing="0" width="100%">
+<if:noacl>
+ <tr>
+  <td colspan="<tag:maxrule />" class="item leftAlign">
+   <em><strong> <gettext>The current list of users with access to this folder could not be retrieved.</gettext></strong></em>
+  </td>
+  <td class="item leftAlign">&nbsp;</td>
+ </tr>
+ <tr>
+  <td colspan="<tag:maxrule />" class="header">
+   <input type="button" class="button" name="back" onclick="$('acl').disable(); document.location.href='<tag:prefsurl />'" value="<gettext>Return to Options</gettext>" />
+  </td>
+  <td class="header">&nbsp;</td>
+ </tr>
+<else:noacl>
+<tr>
+ <th class="item" width="<tag:width />">
+  <h3><strong><gettext>User</gettext></strong></h3>
+ </th>
+<loop:rights>
+ <th class="item" width="<tag:width />">
+  <h4><strong><span title="<tag:rights.desc />"><tag:rights.title /></span></strong></h4>
+ </th>
+</loop:rights>
+</tr>
+<loop:curr_acl>
+<tr>
+ <td class="item"><tag:curr_acl.index /><input id="<tag:curr_acl.index />" type="hidden" name="acl[<tag:curr_acl.index />][]" value="" /></td>
+<loop:curr_acl.rule>
+ <td class="item" align="center">
+  <label class="hidden" for="<tag:curr_acl.index />:<tag:curr_acl.rule.val />">Rule <tag:curr_acl.rule.val /> for user <tag:curr_acl.index /></label>
+  <input type="checkbox" class="checkbox" id="<tag:curr_acl.index />:<tag:curr_acl.rule.val />"
+  <if:curr_acl.disabled> disabled="disabled"<else:curr_acl.disabled><if:canedit> name="acl[<tag:curr_acl.index />][]" value="<tag:curr_acl.rule.val />"<else:canedit> disabled="disabled"</else:canedit></if:canedit></else:curr_acl.disabled></if:curr_acl.disabled><if:curr_acl.rule.enabled> checked="checked"</if:curr_acl.rule.enabled> />
+ </td>
+</loop:curr_acl.rule>
+</tr>
+</loop:curr_acl>
+
+<if:canedit>
+<tr>
+ <td class="item">
+  <label for="new_user" class="hidden">New User</label><tag:new_user />
+ </td>
+<loop:rights>
+ <td class="item" align="center">
+  <label class="hidden" for="new_user:<tag:rights.right />">Rule <tag:rights.right /> for the new user</label><input id="new_user:<tag:rights.right />" type="checkbox" name="new_acl[]" value="<tag:rights.right />" class="checkbox" />
+ </td>
+</loop:rights>
+</tr>
+<tr>
+ <td>&nbsp;</td>
+</tr>
+<tr>
+ <td colspan="<tag:maxrule />" class="header">
+  <input type="button" class="button" id="fbutton" name="fbutton" onclick="$('acl').submit(); $('acl').disable();" value="<gettext>Save</gettext>" />
+  <input type="button" class="button" id="resetbut" name="resetbut" value="<gettext>Reset</gettext>" />
+  <input type="button" class="button" id="back" name="back" onclick="$('acl').disable(); document.location.href='<tag:prefsurl />'" value="<gettext>Return to Options</gettext>" />
+ </td>
+ <td class="header">&nbsp;</td>
+</tr>
+<else:canedit>
+<tr>
+ <td colspan="<tag:maxrule />" class="item leftAlign">
+  <em><strong><gettext>You do not have permission to change access to this folder.</gettext></strong></em>
+ </td>
+ <td class="item leftAlign">&nbsp;</td>
+</tr>
+
+<tr>
+ <td colspan="<tag:maxrule />" class="header">
+  <input type="button" class="button" name="back" onclick="$('acl').disable(); document.location.href='<tag:prefsurl />'" value="<gettext>Return to Options</gettext>" />
+ </td>
+ <td class="header">&nbsp;</td>
+</tr>
+</else:canedit></if:canedit>
+</else:noacl></if:noacl>
+</table>
+</form>
diff --git a/imp/templates/imp/compose.html b/imp/templates/imp/compose.html
deleted file mode 100644 (file)
index bb42ada..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<body>
- <div id="dimpLoading"><gettext>Loading...</gettext></div>
- <div id="pageContainer" style="display:none">
-  <div class="header">
-   <div class="headercloseimg closeImg" id="compose_close"></div>
-   <tag:title />
-  </div>
-  <tag:compose_html />
- </div>
diff --git a/imp/templates/imp/compose/compose.html b/imp/templates/imp/compose/compose.html
new file mode 100644 (file)
index 0000000..371db3e
--- /dev/null
@@ -0,0 +1,308 @@
+<form method="post" id="compose" name="compose" <if:file_upload>enctype="multipart/form-data" </if:file_upload> action="<tag:post_action />">
+<tag:forminput />
+<loop:hidden>
+<input type="hidden" name="<tag:hidden.n />" value="<tag:hidden.v />" id="<tag:hidden.n />" />
+</loop:hidden>
+
+<h1 class="header">
+ <div class="rightFloat"><tag:help /></div>
+ <tag:title />
+</h1>
+
+<br />
+
+<tag:status />
+
+<table cellspacing="0">
+ <tr>
+  <td>&nbsp;</td>
+  <td class="nowrap">
+<if:allow_compose>
+   <input name="btn_send_message" type="submit" <tag:send_msg_ak /> class="button" value="<gettext>Send Message</gettext>" />
+</if:allow_compose>
+<if:save_draft_ak>
+   <input name="btn_save_draft" type="submit" <tag:save_draft_ak /> class="button" value="<gettext>Save Draft</gettext>" />
+</if:save_draft_ak>
+   <input name="btn_cancel_compose" type="submit" title="<gettext>Cancel Message</gettext>" class="button" value="<gettext>Cancel Message</gettext>" />
+  </td>
+ </tr>
+
+ <tr>
+  <td class="light rightAlign"><strong><if:di_locked><gettext>From</gettext><else:di_locked><tag:identity_label /></else:di_locked></if:di_locked>&nbsp;</strong></td>
+  <td class="item">
+<if:di_locked>
+<if:fromaddr_locked>
+   <strong>&nbsp;<tag:from /></strong>
+<else:fromaddr_locked>
+   <input id="text_identity" type="text" tabindex="<tag:fromaddr_tabindex />" name="from" value="<tag:from />" style="direction:ltr" />
+</else:fromaddr_locked></if:fromaddr_locked>
+<else:di_locked>
+   <input type="hidden" id="last_identity" name="last_identity" value="<tag:last_identity />" />
+<if:count_select_list>
+   <select id="identity" name="identity" tabindex="<tag:selectlist_tabindex />">
+<loop:select_list>
+    <option value="<tag:select_list.value />" <if:select_list.selected>selected="selected" </if:select_list.selected>><tag:select_list.label /></option>
+</loop:select_list>
+   </select>
+<else:count_select_list>
+   <input type="hidden" name="identity" value="tag:identity_default />" />
+   <tag:identity_text />
+</else:count_select_list></if:count_select_list>
+</else:di_locked></if:di_locked>
+  </td>
+ </tr>
+
+<loop:addr>
+ <tr>
+  <td class="light rightAlign"><strong><tag:addr.label />&nbsp;</strong></td>
+  <td class="item addressTr">
+   <input type="text" id="<tag:addr.id />" autocomplete="off" tabindex="<tag:addr.input_tabindex />" style="direction:ltr" name="<tag:addr.id />" value="<tag:addr.input_value />" />
+   <span id="<tag:addr.id />_loading_img" style="display:none;" class="loadingImg"></span>
+  </td>
+ </tr>
+</loop:addr>
+
+ <tr>
+  <td class="light rightAlign"><strong><tag:subject_label />&nbsp;</strong></td>
+  <td class="item">
+   <input type="text" id="subject" tabindex="<tag:subject_tabindex />" name="subject" value="<tag:subject />" />
+  </td>
+ </tr>
+
+<if:unlocked_charset>
+ <tr>
+  <td class="light rightAlign">
+   <strong><tag:charset_label />&nbsp;</strong>
+  </td>
+  <td class="item">
+   <select id="charset" name="charset" tabindex="<tag:charset_tabindex />">
+<loop:charset_array>
+    <option value="<tag:charset_array.value />" <if:charset_array.selected>selected="selected" </if:charset_array.selected>><tag:charset_array.label /></option>
+</loop:charset_array>
+   </select>
+  </td>
+ </tr>
+</if:unlocked_charset>
+
+<if:set_priority>
+ <tr>
+  <td class="light rightAlign">
+   <strong><tag:priority_label />&nbsp;</strong>
+  </td>
+  <td class="item">
+   <select id="priority" name="priority" tabindex="<tag:priority_tabindex />">
+<loop:pri_opt>
+    <option value="<tag:pri_opt.val />" <if:pri_opt.selected>selected="selected" </if:pri_opt.selected>><tag:pri_opt.label /></option>
+</loop:pri_opt>
+   </select>
+  </td>
+ </tr>
+</if:set_priority>
+
+<if:stationery>
+ <tr>
+  <td class="light rightAlign"><strong><tag:stationery_label />&nbsp;</strong></td>
+  <td class="item">
+   <select name="stationery" id="stationery">
+    <option value=""><gettext>Select stationery:</gettext></option>
+<loop:stationeries>
+    <option value="<tag:stationeries.val />" <if:stationeries.selected>selected="selected" </if:stationeries.selected>><tag:stationeries.label /></option>
+</loop:stationeries>
+   </select>
+  </td>
+ </tr>
+</if:stationery>
+
+ <tr>
+  <td>&nbsp;</td>
+  <td class="item">
+   <table width="100%" cellspacing="0">
+    <tr>
+<loop:compose_options>
+     <td align="center">
+      <tag:compose_options.url /><tag:compose_options.img /><br /><tag:compose_options.label /></a>
+     </td>
+</loop:compose_options>
+    </tr>
+   </table>
+  </td>
+ </tr>
+
+<if:ssm>
+ <tr>
+  <td>&nbsp;</td>
+  <td class="item">
+   <input id="ssm" type="checkbox" class="checkbox" name="save_sent_mail" <if:ssm_selected>checked="checked" </if:ssm_selected>/>
+   <tag:ssm_label />
+<if:ssm_folders>
+   <select tabindex="<tag:ssm_tabindex />" id="sent_mail_folder" name="sent_mail_folder"><tag:ssm_folders /></select>
+<else:ssm_folders>
+   <span id="sent_mail_folder"><tag:ssm_folder /></span>
+</else:ssm_folders></if:ssm_folders>
+  </td>
+ </tr>
+</if:ssm>
+
+<if:rrr>
+ <tr>
+  <td>&nbsp;</td>
+  <td class="item">
+   <input id="rrr" type="checkbox" class="checkbox" name="request_read_receipt" <if:rrr_selected>checked="checked" </if:rrr_selected>/> <tag:rrr_label />
+  </td>
+ </tr>
+</if:rrr>
+
+<if:compose_html>
+ <tr>
+  <td>&nbsp;</td>
+  <td class="item">
+   <tag:html_img />
+   <tag:html_switch />
+   <if:rtemode><gettext>Switch to plain text composition</gettext><else:rtemode><gettext>Switch to HTML composition</gettext></else:rtemode></if:rtemode></a>
+  </td>
+ </tr>
+</if:compose_html>
+
+ <tr>
+  <td class="light rightAlign"><strong><tag:message_label />&nbsp;</strong></td>
+  <td class="item" id="composeMessageParent">
+   <textarea class="fixed composebody" tabindex="<tag:message_tabindex />" name="message" id="composeMessage" rows="20" cols="80"><tag:message /></textarea>
+  </td>
+ </tr>
+
+ <tr>
+  <td>&nbsp;</td>
+  <td class="nowrap">
+<if:allow_compose>
+   <input name="btn_send_message" type="submit" <tag:send_msg_ak /> class="button" value="<gettext>Send Message</gettext>" />
+</if:allow_compose>
+<if:save_draft_ak>
+   <input name="btn_save_draft" type="submit" <tag:save_draft_ak /> class="button" value="<gettext>Save Draft</gettext>" />
+</if:save_draft_ak>
+   <input name="btn_cancel_compose" type="submit" title="<gettext>Cancel Message</gettext>" class="button" value="<gettext>Cancel Message</gettext>" />
+  </td>
+ </tr>
+
+<if:use_encrypt>
+ <tr>
+  <td>&nbsp;</td>
+  <td class="item nowrap">
+   <tag:encrypt_label />:&nbsp;
+   <select id="encrypt_options" name="encrypt_options">
+    <tag:encrypt_options />
+   </select>
+  </td>
+ </tr>
+</if:use_encrypt>
+
+<if:pgp_options>
+ <tr>
+  <td>&nbsp;</td>
+  <td class="item nowrap">
+   <input id="pap" type="checkbox" class="checkbox" name="pgp_attach_pubkey" <if:pgp_attach_pubkey>checked="checked" </if:pgp_attach_pubkey>/>
+   <tag:pap />
+  </td>
+ </tr>
+</if:pgp_options>
+
+<if:vcard>
+ <tr>
+  <td>&nbsp;</td>
+  <td class="item nowrap">
+   <input id="vcard" type="checkbox" class="checkbox" name="vcard" <if:attach_vcard>checked="checked" </if:attach_vcard>/>
+   <tag:vcard />
+  </td>
+ </tr>
+</if:vcard>
+</table>
+
+<if:file_upload>
+<br />
+
+<h1 class="header">
+ <strong>&nbsp;<a id="attachments"></a><gettext>Attachments</gettext></strong>
+<if:selectlistlink>
+ &nbsp;<tag:selectlistlink />
+ <input type="hidden" name="selectlist_selectid" value="" />
+</if:selectlistlink>
+</h1>
+
+<table width="100%" cellspacing="0">
+ <tr class="item" id="upload_atc">
+<if:maxattachsize>
+  <td><gettext>Maximum total attachment size reached.</gettext></td>
+<else:maxattachsize>
+<if:maxattachmentnumber>
+  <td><gettext>Maximum number of attachments reached.</gettext></td>
+<else:maxattachmentnumber>
+  <td>
+   <table>
+    <tr id="attachment_row_1">
+     <td>
+      <strong><label for="upload_1"><gettext>File</gettext> 1:</label></strong> <input id="upload_1" name="upload_1" tabindex="<tag:file_tabindex />" type="file" size="25" />
+     </td>
+    </tr>
+    <tr>
+     <td>
+      (<gettext>Maximum Attachment Size</gettext>: <tag:attach_size /> <gettext>bytes</gettext>)
+     </td>
+    </tr>
+   </table>
+  </td>
+</else:maxattachmentnumber></if:maxattachmentnumber>
+</else:maxattachsize></if:maxattachsize>
+  <td class="rightAlign">
+   <input type="submit" name="btn_add_attachment" class="button" value="<gettext>Update</gettext>" />
+  </td>
+ </tr>
+
+<if:show_link_save_attach>
+<loop:attach_options>
+ <tr class="item">
+  <td colspan="3">
+   <strong><label for="<tag:attach_options.name />"><tag:attach_options.label /></label></strong>&nbsp;
+   <select id="<tag:attach_options.name />" name="<tag:attach_options.name />">
+    <option value="1"<if:attach_options.select_yes> selected="selected"</if:attach_options.select_yes>><gettext>Yes</gettext></option>
+    <option value="0"<if:attach_options.select_no> selected="selected"</if:attach_options.select_no>><gettext>No</gettext></option>
+   </select>
+  </td>
+ </tr>
+</loop:attach_options>
+</if:show_link_save_attach>
+</table>
+
+<if:numberattach>
+<br />
+
+<div class="smallheader leftAlign">
+ <gettext>Current Attachments</gettext> (<gettext>Total Size:</gettext> <tag:total_attach_size /> <gettext>KB</gettext><if:perc_attach> / <tag:perc_attach /></if:perc_attach>)
+</div>
+
+<table class="leftAlign attachList">
+<loop:atc>
+ <tr class="item">
+  <td>
+   <img style="padding-right:5px" src="<tag:atc.icon />" alt="[Icon]" />
+   <strong><tag:atc.name /></strong> &nbsp;(<tag:atc.type />) &nbsp;&nbsp;<strong><gettext>Size:</gettext></strong> <tag:atc.size /> <gettext>KB</gettext>
+  </td>
+ </tr>
+ <tr class="item">
+  <td style="padding-left:30px">
+   <table>
+    <tr>
+     <td class="rightAlign"><strong><label for="file_description_<tag:atc.number />"><gettext>Description:</gettext></label></strong>&nbsp;</td>
+     <td><input type="text" size="40" id="file_description_<tag:atc.number />" name="file_description_<tag:atc.number />" value="<tag:atc.description />" /></td>
+    </tr>
+    <tr>
+     <td class="rightAlign"><strong><label for="delattachment<tag:atc.number />"><gettext>Delete?</gettext></label></strong></td>
+     <td><input type="checkbox" class="checkbox" id="delattachment<tag:atc.number />" name="delattachments[]" value="<tag:atc.number />" /></td>
+    </tr>
+   </table>
+  </td>
+ </tr>
+</loop:atc>
+</table>
+</if:numberattach>
+</if:file_upload>
+
+</form>
diff --git a/imp/templates/imp/compose/redirect.html b/imp/templates/imp/compose/redirect.html
new file mode 100644 (file)
index 0000000..b96392e
--- /dev/null
@@ -0,0 +1,52 @@
+<form method="post" action="<tag:post_action />" id="redirect" name="redirect">
+<input type="hidden" name="thismailbox" value="<tag:mailbox />" />
+<input type="hidden" name="uid" value="<tag:uid />" />
+<input type="hidden" id="actionID" name="actionID" value="redirect_send" />
+<input type="hidden" name="compose_requestToken" value="<tag:token />" />
+
+<tag:status />
+
+<h1 class="header">
+ <tag:title />
+</h1>
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<if:has_search>
+ <tr>
+  <td>&nbsp;</td>
+  <td class="item">
+   <table cellspacing="0" width="100%">
+    <tr>
+     <td align="center"><tag:abook /></td>
+    </tr>
+   </table>
+  </td>
+ </tr>
+</if:has_search>
+
+ <tr>
+  <td class="light rightAlign"><strong><tag:to />&nbsp;</strong></td>
+  <td class="item leftAlign">
+   <table border="0" width="100%" cellpadding="0">
+    <tr>
+     <td class="leftAlign">
+      <input type="text" id="to" size="55" name="to" value="<tag:input_value />" />
+      <span id="to_loading_img" style="display:none;"><tag:loading_img /></span>
+     </td>
+     <td class="rightAlign"><tag:help />&nbsp;</td>
+    </tr>
+   </table>
+  </td>
+ </tr>
+ <tr>
+  <td>&nbsp;</td>
+  <td>
+<if:allow_compose>
+   <input name="btn_redirect" type="submit" class="button" value="<gettext>Redirect Message</gettext>" />
+</if:allow_compose>
+   <input name="btn_cancel_compose" type="button" class="button" value="<gettext>Cancel Message</gettext>" />
+  </td>
+ </tr>
+</table>
+</form>
+
+<br />
diff --git a/imp/templates/imp/compose/success.html b/imp/templates/imp/compose/success.html
new file mode 100644 (file)
index 0000000..8e505cf
--- /dev/null
@@ -0,0 +1 @@
+<div id="menu"><tag:menu /></div>
diff --git a/imp/templates/imp/contacts/contacts.html b/imp/templates/imp/contacts/contacts.html
new file mode 100644 (file)
index 0000000..1e74a9e
--- /dev/null
@@ -0,0 +1,73 @@
+<form method="post" id="contacts" action="<tag:action />">
+<input type="hidden" name="formname" value="<tag:formname />" />
+<input type="hidden" name="searched" value="1" />
+<input type="hidden" id="sa" name="sa" />
+<tag:formInput />
+
+<h1 class="header">
+ <gettext>Address Book</gettext>
+</h1>
+
+<div id="contactstable" class="headerbox item">
+ <p class="control">
+  <label for="search"><strong><gettext>Find:</gettext></strong></label>
+  <input value="<tag:search />" id="search" name="search" />
+<if:multiple_source>
+  <strong><label for="source"><gettext>from</gettext></label></strong>
+  <select id="source" name="source">
+<loop:source_list>
+   <option value="<tag:source_list.val />"<if:source_list.selected> selected="selected"</if:source_list.selected>><tag:source_list.label /></option>
+</loop:source_list>
+  </select>
+<else:multiple_source>
+  <input name="source" type="hidden" value="<tag:source_list />" />
+</else:multiple_source></if:multiple_source>
+  <input type="submit" class="button" value="<gettext>Search</gettext>" />
+  <input id="btn_clear" type="submit" class="button" style="display:none" value="<gettext>Reset</gettext>" />
+ </p>
+
+ <table width="100%" cellspacing="2">
+  <tr>
+   <td width="33%">
+    <label for="search_results" class="hidden"><gettext>Search Results</gettext></label>
+    <select id="search_results" name="search_results" multiple="multiple" size="10">
+     <option value=""><gettext>* Please select address(es) *</gettext></option>
+<loop:a_list>
+     <option title="<tag:a_list />" value="<tag:a_list />"><tag:a_list /></option>
+</loop:a_list>
+    </select>
+   </td>
+   <td width="33%" class="contactsButtons">
+    <input id="btn_add_to" type="button" class="button" value="<gettext>To</gettext> &gt;&gt;" /><br />&nbsp;<br />
+<if:cc>
+    <input id="btn_add_cc" type="button" class="button" value="<gettext>Cc</gettext> &gt;&gt;" /><br />&nbsp;<br />
+    <input id="btn_add_bcc" type="button" class="button" value="<gettext>Bcc</gettext> &gt;&gt;" />
+</if:cc>
+   </td>
+   <td width="33%">
+    <label for="selected_addresses" class="hidden"><gettext>Selected Addresses</gettext></label>
+    <select id="selected_addresses" name="selected_addresses" multiple="multiple" size="10">
+     <option value=""><gettext>* Add these by clicking OK *</gettext></option>
+<loop:sa>
+     <option value="<tag:sa />"><tag:sa /></option>
+</loop:sa>
+    </select>
+   </td>
+  </tr>
+  <tr>
+   <td colspan="2">&nbsp;</td>
+   <td>
+    <input type="button" class="button" value="<gettext>Delete</gettext>" />
+   </td>
+  </tr>
+ </table>
+</div>
+
+<br class="spacer" />
+
+<div>
+ <input id="btn_update" type="button" class="button" value="<gettext>OK</gettext>" />
+ <input id="btn_cancel" type="button" class="button" value="<gettext>Cancel</gettext>" />
+</div>
+
+</form>
diff --git a/imp/templates/imp/folders/actions.html b/imp/templates/imp/folders/actions.html
new file mode 100644 (file)
index 0000000..4a58c67
--- /dev/null
@@ -0,0 +1,60 @@
+<table>
+ <tr class="control">
+  <td>
+<if:javascript>
+   <div class="leftFloat">
+    <label for="checkAll<tag:id />" class="hidden"><gettext>Check All/None</gettext></label>
+    &nbsp;<input type="checkbox" class="checkbox" id="checkAll<tag:id />" name="checkAll" <tag:check_ak /> />
+   </div>
+</if:javascript>
+   <div class="leftFloat folderChoose">
+    <label for="action_choose<tag:id />" class="hidden"><gettext>Choose Action</gettext></label>
+    <select id="action_choose<tag:id />">
+     <option selected="selected"><gettext>Choose Action</gettext></option>
+     <option value="" disabled="disabled">--------------------</option>
+<if:create_folder>
+     <option value="create_folder"><gettext>Create</gettext></option>
+</if:create_folder>
+     <option value="rename_folder"><gettext>Rename</gettext></option>
+     <option value="delete_folder_confirm"><gettext>Delete</gettext></option>
+     <option value="folders_empty_mailbox_confirm"><gettext>Empty</gettext></option>
+<if:notrash>
+     <option value="expunge_folder"><gettext>Purge</gettext></option>
+</if:notrash>
+<if:subscribe>
+     <option value="subscribe_folder"><gettext>Subscribe</gettext></option>
+     <option value="unsubscribe_folder"><gettext>Unsubscribe</gettext></option>
+</if:subscribe>
+<if:nav_poll>
+     <option value="poll_folder"><gettext>Check for New Mail</gettext></option>
+     <option value="nopoll_folder"><gettext>Do Not Check for New Mail</gettext></option>
+</if:nav_poll>
+     <option value="mark_folder_seen"><gettext>Mark All Messages as Seen</gettext></option>
+     <option value="mark_folder_unseen"><gettext>Mark All Messages as Unseen</gettext></option>
+     <option value="download_folder"><gettext>Download</gettext></option>
+     <option value="download_folder_zip"><gettext>Download [.zip format]</gettext></option>
+<if:file_upload>
+     <option value="import_mbox"><gettext>Import Messages</gettext></option>
+</if:file_upload>
+     <option value="mbox_size"><gettext>Show Size</gettext></option>
+     <option value="rebuild_tree"><gettext>Rebuild Folder Tree</gettext></option>
+    </select>
+<if:javascript><else:javascript>
+    <input name="btn_action" type="submit" class="button" value="<tag:go />" />
+</else:javascript></if:javascript>
+   </div>
+   <div class="leftFloat folderActions">
+    <ul class="msgactions">
+<if:subscribe>
+     <li><tag:toggle_subscribe /></li>
+</if:subscribe>
+     <li><tag:expand_all /></li>
+     <li class="lastnavbar"><tag:collapse_all /></li>
+    </ul>
+   </div>
+   <div class="rightFloat">
+    <tag:help />
+   </div>
+  </td>
+ </tr>
+</table>
diff --git a/imp/templates/imp/folders/folders.html b/imp/templates/imp/folders/folders.html
new file mode 100644 (file)
index 0000000..3c9d5f9
--- /dev/null
@@ -0,0 +1,5 @@
+<loop:rows>
+<div class="<tag:rows.cname />">
+ &nbsp;<input type="checkbox" class="checkbox" name="folder_list[]" <if:rows.nocheckbox>disabled="disabled" </if:rows.nocheckbox>value="<tag:rows.mbox_val />" /> <tag:rows.line /> <tag:rows.name /><if:rows.polled> (<tag:rows.unseen />/<tag:rows.msgs />)</if:rows.polled> <if:rows.editvfolder>&nbsp;&nbsp;[<tag:rows.delvfolder />] [<tag:rows.editvfolder />]</if:rows.editvfolder>
+</div>
+</loop:rows>
diff --git a/imp/templates/imp/folders/folders_confirm.html b/imp/templates/imp/folders/folders_confirm.html
new file mode 100644 (file)
index 0000000..d7c0599
--- /dev/null
@@ -0,0 +1,27 @@
+<form name="fmanager" method="post" action="<tag:folders_url />">
+<input type="hidden" name="actionID" value="<if:delete>delete_folder</if:delete><if:empty>folders_empty_mailbox</if:empty>" />
+<input type="hidden" id="folders_token" name="folders_token" value="<tag:folders_token />" />
+
+<div class="header leftAlign">
+ <gettext>Folder Actions - Confirmation</gettext>
+</div>
+
+<div class="control leftAlign">
+ <if:delete><gettext>You are attempting to delete the following folder(s).</gettext></if:delete>
+ <if:empty><gettext>You are attempting to delete all messages contained in the following folder(s).</gettext></if:empty>
+ <br />
+ <gettext>If you continue, all messages in the folder(s) will be lost!</gettext>
+</div>
+
+<loop:folders>
+<div class="<tag:folders.class />">
+ &nbsp;<label><input type="checkbox" class="checkbox" name="folder_list[]" value="<tag:folders.val />" checked="checked" /> <tag:folders.name /> (<tag:folders.msgs /> <gettext>messages</gettext>)</label>
+</div>
+</loop:folders>
+
+<div class="control leftAlign">
+ <input type="submit" name="submit" class="button" value="<if:delete><gettext>Delete Selected Folders</gettext></if:delete><if:empty><gettext>Empty Selected Folders</gettext></if:empty>" />&nbsp;
+ <input id="btn_return" type="button" class="button" value="<gettext>Cancel</gettext>" />
+</div>
+
+</form>
diff --git a/imp/templates/imp/folders/folders_size.html b/imp/templates/imp/folders/folders_size.html
new file mode 100644 (file)
index 0000000..df6b461
--- /dev/null
@@ -0,0 +1,32 @@
+<div class="header leftAlign"><gettext>Folder Sizes</gettext></div>
+
+<table class="striped sortable" id="foldersizes">
+ <thead>
+  <tr>
+   <th class="leftAlign"><gettext>Folder</gettext></th>
+   <th class="leftAlign"><gettext>Size</gettext></th>
+  </tr>
+ </thead>
+
+ <tbody>
+<loop:folders>
+  <tr>
+   <td class="leftAlign"><tag:folders.name /></td>
+   <td class="rightAlign" sortval="<tag:folders.sort />"><tag:folders.size /></td>
+  </tr>
+</loop:folders>
+ </tbody>
+
+ <tfoot>
+  <tr>
+   <td class="leftAlign"><strong><gettext>Sum</gettext></strong></td>
+   <td class="rightAlign"><strong><tag:folders_sum /></strong></td>
+  </tr>
+ </tfoot>
+</table>
+
+<form name="returnform">
+<div class="control leftAlign">
+ <input id="btn_return" type="button" class="button" value="<gettext>Return to Folders</gettext>" />
+</div>
+</form>
diff --git a/imp/templates/imp/folders/head.html b/imp/templates/imp/folders/head.html
new file mode 100644 (file)
index 0000000..6c6fb4c
--- /dev/null
@@ -0,0 +1,11 @@
+<h1 class="header">
+ <gettext>Folder Navigator</gettext>&nbsp;<tag:refresh /><span class="reloadImg"></span></a>
+</h1>
+<div class="headerbox folders">
+ <form id="fmanager" name="fmanager" method="post" action="<tag:folders_url />">
+ <input type="hidden" id="actionID" name="actionID" value="" />
+ <input type="hidden" id="folders_token" name="folders_token" value="<tag:folders_token />" />
+ <input type="hidden" id="new_mailbox" name="new_mailbox" value="" />
+ <input type="hidden" id="new_names" name="new_names" value="" />
+ <input type="hidden" id="old_names" name="old_names" value="" />
+ <input type="hidden" name="view_subscribed" value="" />
diff --git a/imp/templates/imp/folders/import.html b/imp/templates/imp/folders/import.html
new file mode 100644 (file)
index 0000000..b8223a8
--- /dev/null
@@ -0,0 +1,19 @@
+<form name="fmanager" id="fmanager" method="post" enctype="multipart/form-data" action="<tag:folders_url />">
+ <input type="hidden" name="import_folder" value="<tag:import_folder />" />
+ <input type="hidden" name="actionID" id="actionID" value="" />
+ <input type="hidden" id="folders_token" name="folders_token" value="<tag:folders_token />" />
+
+ <div class="header">
+  <gettext>Import mbox File</gettext>
+ </div>
+
+ <div class="item">
+  <br />&nbsp;&nbsp;
+  <label for="mbox_upload"><gettext>Import mbox file</gettext></label>&nbsp;
+  <input id="mbox_upload" name="mbox_upload" type="file" size="30" />&nbsp;
+  <gettext>into folder</gettext>
+  <strong><tag:folder_name /></strong>.
+  <input id="btn_import" type="button" class="button" value="<gettext>Import</gettext>" />
+  <input id="btn_return" type="button" class="button" value="<gettext>Cancel</gettext>" />
+ </div>
+</form>
diff --git a/imp/templates/imp/javascript_defs.php b/imp/templates/imp/javascript_defs.php
new file mode 100644 (file)
index 0000000..300e1cc
--- /dev/null
@@ -0,0 +1,72 @@
+<?php
+/**
+ * IMP base JS file.
+ *
+ * Copyright 2005-2010 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (GPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ */
+
+$code = array(
+/* Variables used in core javascript files. */
+    'conf' => array(
+        'pop3' => intval((isset($_SESSION['imp']) && ($_SESSION['imp']['protocol'] == 'pop'))),
+        'fixed_folders' => empty($GLOBALS['conf']['server']['fixed_folders'])
+            ? array()
+            : $GLOBALS['conf']['server']['fixed_folders'],
+    ),
+
+    /* Gettext strings used in core javascript files. */
+    'text' => array(
+        /* Strings used in compose.js */
+        'compose_cancel' => _("Cancelling this message will permanently discard its contents.") . "\n" . _("Are you sure you want to do this?"),
+        'compose_discard' => _("Doing so will discard this message permanently."),
+        'compose_recipient' => _("You must specify a recipient."),
+        'compose_nosubject' => _("The message does not have a Subject entered.") . "\n" . _("Send message without a Subject?"),
+        'compose_file' => _("File"),
+        'compose_attachment' => _("Attachment"),
+        'compose_inline' => _("Inline"),
+
+        /* Strings used in mailbox.js */
+        'mailbox_submit' => _("You must select at least one message first."),
+        'mailbox_delete' => _("Are you sure you wish to PERMANENTLY delete these messages?"),
+        'mailbox_selectone' => _("You must select at least one message first."),
+        'yes' => _("Yes"),
+        'no' => _("No"),
+
+        /* Strings used in contacts.js */
+        'contacts_select' => _("You must select an address first."),
+        'contacts_closed' => _("The message being composed has been closed."),
+        'contacts_called' => _("This window must be called from a compose window."),
+
+        /* Strings used in folders.js */
+        'folders_select' => _("Please select a folder before you perform this action."),
+        'folders_oneselect' => _("Only one folder should be selected for this action."),
+        'folders_subfolder1' => _("You are creating a sub-folder to"),
+        'folders_subfolder2' => _("Please enter the name of the new folder:"),
+        'folders_toplevel' => _("You are creating a top-level folder.") . "\n" . _("Please enter the name of the new folder:"),
+        'folders_download1' => _("All messages in the following folder(s) will be downloaded into one MBOX file:"),
+        'folders_download2' => _("This may take some time. Are you sure you want to continue?"),
+        'folders_rename1' => _("You are renaming the folder:"),
+        'folders_rename2' => _("Please enter the new name:"),
+        'folders_no_rename' => _("This folder may not be renamed:"),
+
+        /* Strings used in imp.js */
+        'popup_block' => _("A popup window could not be opened. Perhaps you have set your browser to block popup windows?"),
+
+        /* Strings used in login.js */
+        'login_username' => _("Please provide your username."),
+        'login_password' => _("Please provide your password."),
+
+        /* Strings used in multiple pages. */
+        'spam_report' => _("Are you sure you wish to report this message as spam?"),
+        'notspam_report' => _("Are you sure you wish to report this message as innocent?"),
+        'newfolder' => _("You are copying/moving to a new folder.") . "\n" . _("Please enter a name for the new folder:") . "\n",
+        'target_mbox' => _("You must select a target mailbox first."),
+    )
+);
+
+Horde::addInlineScript(array(
+    'var IMP = ' . Horde_Serialize::serialize($code, Horde_Serialize::JSON, Horde_Nls::getCharset())
+), null, true);
diff --git a/imp/templates/imp/mailbox/actions.html b/imp/templates/imp/mailbox/actions.html
new file mode 100644 (file)
index 0000000..226a383
--- /dev/null
@@ -0,0 +1,28 @@
+<table width="100%" cellspacing="0">
+ <tr>
+  <td class="mboxcontrol <if:isbottom>topborder<else:isbottom>bottombordercollapse</else:isbottom></if:isbottom>">
+   <div class="rightFloat">
+    <ul class="msgactions">
+     <if:hide_deleted><li<if:purge_deleted><else:purge_deleted> class="lastnavbar"</else:purge_deleted></if:purge_deleted>><tag:hide_deleted /></li></if:hide_deleted>
+     <if:purge_deleted><li class="lastnavbar"><tag:purge_deleted /></li></if:purge_deleted>
+    </ul>
+   </div>
+   <div class="leftFloat">
+    <ul class="msgactions">
+<if:readonly><else:readonly>
+     <if:delete><li><tag:delete /></li></if:delete>
+     <if:undelete><li><tag:undelete /></li></if:undelete>
+     <if:blacklist><li><tag:blacklist /></li></if:blacklist>
+     <if:whitelist><li><tag:whitelist /></li></if:whitelist>
+</else:readonly></if:readonly>
+     <if:forward><li><tag:forward /></li></if:forward>
+<if:readonly><else:readonly>
+     <if:spam><li><tag:spam /></li></if:spam>
+     <if:notspam><li><tag:notspam /></li></if:notspam>
+</else:readonly></if:readonly>
+     <li class="lastnavbar"><tag:view_messages /></li>
+    </ul>
+   </div>
+  </td>
+ </tr>
+</table>
diff --git a/imp/templates/imp/mailbox/actions_deleted.html b/imp/templates/imp/mailbox/actions_deleted.html
new file mode 100644 (file)
index 0000000..76072dd
--- /dev/null
@@ -0,0 +1,6 @@
+<div class="control">
+ <ul class="rightFloat msgactions">
+  <li><tag:hide /></li>
+  <if:purge><li class="lastnavbar"><tag:purge /></li></if:purge>
+ </ul>
+</div>
diff --git a/imp/templates/imp/mailbox/empty_mailbox.html b/imp/templates/imp/mailbox/empty_mailbox.html
new file mode 100644 (file)
index 0000000..2dfa252
--- /dev/null
@@ -0,0 +1,3 @@
+<div class="text">
+ <em><if:search_mbox><gettext>No messages matched your search criteria.</gettext><else:search_mbox><gettext>There are no messages in this mailbox.</gettext></else:search_mbox></if:search_mbox></em>
+</div>
diff --git a/imp/templates/imp/mailbox/header.html b/imp/templates/imp/mailbox/header.html
new file mode 100644 (file)
index 0000000..f02bd1b
--- /dev/null
@@ -0,0 +1,23 @@
+<div class="header mboxheader">
+ <div <if:page>style="width:40%" </if:page>class="leftFloat">
+  <span dir="ltr"><tag:pagetitle /></span>
+  <if:readonly><tag:readonly /></if:readonly>
+  <tag:refresh /><span class="reloadImg"></span></a>
+  <if:filter><tag:filter /></if:filter>
+  <if:search><tag:search /></if:search>
+  <if:searchclose><tag:searchclose /><span class="closeImg"></span></a></if:searchclose>
+  <if:empty><tag:empty /></if:empty>
+  <if:delete_vfolder><tag:delete_vfolder /></if:delete_vfolder>
+ </div>
+<if:page>
+ <div style="width:20%" class="leftFloat">
+  <tag:page />
+ </div>
+ <div style="width:40%" class="rightFloat rightAlign">
+<else:page>
+ <div class="rightFloat rightAlign">
+</else:page></if:page>
+  <tag:msgcount />
+ </div>
+ <div class="clear"></div>
+</div>
diff --git a/imp/templates/imp/mailbox/mailbox.html b/imp/templates/imp/mailbox/mailbox.html
new file mode 100644 (file)
index 0000000..0109704
--- /dev/null
@@ -0,0 +1,12 @@
+<loop:messages>
+ <tr id="row<tag:messages.id />"<if:messages.class> class="<tag:messages.class />"</if:messages.class><if:messages.bg> style="background-color:<tag:messages.bg />"</if:messages.bg>>
+  <td>
+   <tag:overflow_begin /><label><input type="checkbox" class="checkbox" name="indices[]" value="<tag:messages.uid />" /><tag:messages.status />&nbsp;</label><tag:overflow_end />
+  </td>
+  <td><tag:overflow_begin /><tag:messages.date />&nbsp;<tag:overflow_end /></td>
+  <td><tag:overflow_begin /><tag:messages.from />&nbsp;<tag:overflow_end /></td>
+  <td><tag:overflow_begin /><tag:messages.subject /><tag:overflow_end /></td>
+  <td class="rightAlign"><tag:overflow_begin /><tag:messages.size /><tag:overflow_end /></td>
+ </tr>
+</loop:messages>
+</table>
diff --git a/imp/templates/imp/mailbox/message_footers.html b/imp/templates/imp/mailbox/message_footers.html
new file mode 100644 (file)
index 0000000..fe2785d
--- /dev/null
@@ -0,0 +1,6 @@
+<input type="hidden" name="page" value="<tag:page />" />
+<input type="hidden" id="actionID" name="actionID" value="" />
+<input type="hidden" id="targetMbox" name="targetMbox" value="" />
+<input type="hidden" id="newMbox" name="newMbox" value="0" />
+<input type="hidden" id="flag" name="flag" value="" />
+</form>
diff --git a/imp/templates/imp/mailbox/message_headers.html b/imp/templates/imp/mailbox/message_headers.html
new file mode 100644 (file)
index 0000000..cd5c70b
--- /dev/null
@@ -0,0 +1,22 @@
+<if:form_tag>
+<form method="post" id="messages" name="messages" action="<tag:mailbox_url />">
+<input type="hidden" name="mailbox" value="<tag:mailbox />" />
+<input type="hidden" name="mailbox_token" value="<tag:mailbox_token />" />
+<tag:sessiontag />
+</if:form_tag>
+<table class="messageList" width="100%" cellspacing="0">
+ <tr class="item">
+<if:mh_count>
+  <th width="8%">&nbsp;</th>
+<else:mh_count>
+  <th id="checkheader" width="8%">
+   <label for="checkAll" class="hidden"><gettext>Check All/None</gettext></label>
+   <input type="checkbox" class="checkbox" id="checkAll" name="checkAll" <tag:check_all /> />
+  </th>
+</else:mh_count></if:mh_count>
+<loop:headers>
+  <th class="<tag:headers.class />" width="<tag:headers.width />">
+   <tag:headers.change_sort_link /> <tag:headers.change_sort_widget /> <tag:headers.extra />
+  </th>
+</loop:headers>
+ </tr>
diff --git a/imp/templates/imp/mailbox/navbar.html b/imp/templates/imp/mailbox/navbar.html
new file mode 100644 (file)
index 0000000..dc211fb
--- /dev/null
@@ -0,0 +1,56 @@
+<table width="100%" cellspacing="0">
+ <tr class="mboxcontrol">
+  <td<if:isbottom> class="bottomborder"</if:isbottom>>
+<if:readonly><else:readonly>
+<if:use_pop><else:use_pop>
+   <div class="leftFloat">
+    <form id="select<tag:id />">
+    <input type="hidden" name="mailbox" value="<tag:mailbox />" />
+    <label for="flag<tag:id />" class="hidden"><gettext>Mark Messages</gettext></label>
+    <select id="flag<tag:id />" name="flag">
+     <option value="" selected="selected"><gettext>Mark Messages</gettext></option>
+     <option value="" disabled="disabled">- - - - - - - -</option>
+     <option value=""><gettext>Mark as:</gettext></option>
+<loop:flaglist_set>
+     <option value="<tag:flaglist_set.f />">&nbsp;&nbsp;<tag:flaglist_set.l /></option>
+</loop:flaglist_set>
+     <option value="" disabled="disabled">- - - - - - - -</option>
+     <option value=""><gettext>Unmark as:</gettext></option>
+<loop:flaglist_unset>
+     <option value="<tag:flaglist_unset.f />">&nbsp;&nbsp;<tag:flaglist_unset.l /></option>
+</loop:flaglist_unset>
+    </select>
+    </form>
+   </div>
+</else:use_pop></if:use_pop>
+<if:use_folders>
+   <div class="leftFloat" style="padding-left:10px">
+    <form method="post" action="<tag:mailbox_url />">
+    <input type="hidden" name="mailbox" value="<tag:mailbox />" />
+    <ul class="msgactions" style="display:inline">
+     <li><tag:move /></li>
+     <li class="lastnavbar"><tag:copy /></li>
+    </ul>
+    <label for="targetMailbox<tag:id />" class="hidden"><gettext>Target Mailbox:</gettext></label>
+    <select id="targetMailbox<tag:id />" name="targetMailbox">
+     <tag:folder_options />
+    </select>
+    </form>
+   </div>
+</if:use_folders>
+</else:readonly></if:readonly>
+   <div class="rightFloat">
+<if:multiple_page>
+    <form method="get" action="<tag:mailbox_url />">
+    <input type="hidden" name="mailbox" value="<tag:mailbox />" />
+    <tag:sessiontag />
+    <tag:pages_first /> <tag:pages_prev />
+    <label for="page<tag:id />" class="hidden"><gettext>Page:</gettext></label>
+    <input type="text" id="page<tag:id />" name="page" value="<tag:page_val />" size="<tag:page_size />" />
+    <tag:pages_next /> <tag:pages_last />
+    </form>
+</if:multiple_page>
+   </div>
+  </td>
+ </tr>
+</table>
diff --git a/imp/templates/imp/mailbox/searchfolder.html b/imp/templates/imp/mailbox/searchfolder.html
new file mode 100644 (file)
index 0000000..2c065b5
--- /dev/null
@@ -0,0 +1,3 @@
+<div class="smallheader ohide searchfolder">
+ <tag:folder_link />
+</div>
diff --git a/imp/templates/imp/menu/menu.html b/imp/templates/imp/menu/menu.html
new file mode 100644 (file)
index 0000000..79aeb91
--- /dev/null
@@ -0,0 +1,22 @@
+<form action="mailbox.php" method="get" name="menuform" id="menuform">
+<tag:forminput />
+<div id="menu">
+<if:use_folders>
+ <div class="rightFloat">
+  <input type="hidden" name="no_newmail_popup" value="1" />
+  <label for="mailbox">
+   <select name="mailbox"<if:ak> accesskey="<tag:ak />"</if:ak>><tag:flist /></select>
+  </label>
+ </div>
+ <div class="rightFloat">
+  <ul>
+   <li class="rightFloat" id="openfoldericon"><tag:flink /></li>
+  </ul>
+ </div>
+</if:use_folders>
+ <div class="leftFloat">
+  <tag:menu_string />
+ </div>
+ <br class="clear" />
+</div>
+</form>
diff --git a/imp/templates/imp/message/message.html b/imp/templates/imp/message/message.html
new file mode 100644 (file)
index 0000000..9ee0597
--- /dev/null
@@ -0,0 +1,14 @@
+<div id="msgheaders">
+ <table cellspacing="0">
+<loop:headers>
+  <tr<if:headers.class> class="<tag:headers.class />"</if:headers.class>>
+   <td class="item<tag:headers.i /> rightAlign nowrap"><strong><tag:headers.name />:</strong>&nbsp;</td>
+   <td class="item<tag:headers.i /> msgheader"><tag:headers.val /></td>
+  </tr>
+</loop:headers>
+ </table>
+</div>
+
+<div id="messageBody" class="messageBody">
+ <tag:msgtext />
+</div>
diff --git a/imp/templates/imp/message/navbar_actions.html b/imp/templates/imp/message/navbar_actions.html
new file mode 100644 (file)
index 0000000..1ee06f2
--- /dev/null
@@ -0,0 +1,59 @@
+<table class="navbaractions" width="100%" cellspacing="0">
+ <tr>
+  <td class="mboxcontrol <if:isbottom>topborder<else:isbottom>bottomborder</else:isbottom></if:isbottom>">
+   <ul class="msgactions">
+<if:readonly><else:readonly>
+    <li><tag:delete /></li>
+</else:readonly></if:readonly>
+<if:reply>
+    <li><tag:reply />
+     <ul>
+      <li><tag:reply_sender /></li>
+      <if:reply_list><li><tag:reply_list /></li></if:reply_list>
+      <if:show_reply_all><li><tag:show_reply_all /></li></if:show_reply_all>
+     </ul>
+    </li>
+    <li><tag:forward />
+<if:forward_attach>
+     <ul>
+      <li><tag:forward_attach /></li>
+      <li><tag:forward_body /></li>
+      <li><tag:forward_both /></li>
+     </ul>
+</if:forward_attach>
+    </li>
+    <li><tag:redirect /></li>
+</if:reply>
+    <if:show_thread><li><tag:show_thread /></li></if:show_thread>
+<if:readonly><else:readonly>
+    <if:blacklist><li><tag:blacklist /></li></if:blacklist>
+    <if:whitelist><li><tag:whitelist /></li></if:whitelist>
+</else:readonly></if:readonly>
+    <if:view_source><li><tag:view_source /></li></if:view_source>
+    <if:resume><li><tag:resume /></li></if:resume>
+    <li><tag:save_as /></li>
+<if:readonly><else:readonly>
+    <if:spam><li><tag:spam /></li></if:spam>
+    <if:notspam><li><tag:notspam /></li></if:notspam>
+</else:readonly></if:readonly>
+    <li<if:atc><else:atc> class="lastnavbar"</else:atc></if:atc>><tag:headers />
+     <ul>
+      <if:common_headers><li><tag:common_headers /></li></if:common_headers>
+      <if:all_headers><li><tag:all_headers /></li></if:all_headers>
+      <if:list_headers><li><tag:list_headers /></li></if:list_headers>
+     </ul>
+    </li>
+<if:atc>
+    <li class="lastnavbar"><tag:atc />
+     <ul>
+      <if:show_parts_all><li><tag:show_parts_all /></li></if:show_parts_all>
+      <if:show_parts_atc><li><tag:show_parts_atc /></li></if:show_parts_atc>
+      <if:download_all><li><tag:download_all /></li></if:download_all>
+      <if:strip_all><li><tag:strip_all /></li></if:strip_all>
+     </ul>
+    </li>
+</if:atc>
+   </ul>
+  </td>
+ </tr>
+</table>
diff --git a/imp/templates/imp/message/navbar_navigate.html b/imp/templates/imp/message/navbar_navigate.html
new file mode 100644 (file)
index 0000000..e9f8446
--- /dev/null
@@ -0,0 +1,54 @@
+<table class="msgActionTable">
+ <tr class="mboxcontrol">
+  <td>
+<if:readonly><else:readonly>
+<if:usepop><else:usepop>
+   <div class="leftFloat">
+    <form id="select<tag:id />">
+    <input type="hidden" name="mailbox" value="<tag:mailbox />" />
+    <label for="flag<tag:id />" class="hidden"><gettext>Mark Message</gettext></label>
+    <select id="flag<tag:id />" name="flag">
+     <option value="" selected="selected"><gettext>Mark Message</gettext></option>
+     <option value="" disabled="disabled">- - - - - - - -</option>
+     <option value=""><gettext>Mark as:</gettext></option>
+<loop:flaglist_set>
+     <option value="<tag:flaglist_set.f />">&nbsp;&nbsp;<tag:flaglist_set.l /></option>
+</loop:flaglist_set>
+     <option value="" disabled="disabled">- - - - - - - -</option>
+     <option value=""><gettext>Unmark as:</gettext></option>
+<loop:flaglist_unset>
+     <option value="<tag:flaglist_unset.f />">&nbsp;&nbsp;<tag:flaglist_unset.l /></option>
+</loop:flaglist_unset>
+    </select>
+    </form>
+   </div>
+<if:move>
+   <div class="leftFloat msgActions">
+    <ul class="msgactions">
+     <li><tag:move /></li>
+     <li class="lastnavbar"><tag:copy /></li>
+    </ul>
+   </div>
+   <div class="leftFloat">
+    <label for="target<tag:id />" class="hidden"><gettext>Target Folder</gettext></label>
+    <select id="target<tag:id />" name="target<tag:id />">
+     <tag:options />
+    </select>
+   </div>
+</if:move>
+</else:usepop></if:usepop>
+</else:readonly></if:readonly>
+   <div class="rightFloat nowrap">
+    <tag:back_to />&nbsp;
+    <if:prev><tag:prev /></if:prev><tag:prev_img /><if:prev></a></if:prev>
+    <if:next><tag:next /></if:next><tag:next_img /><if:next></a></if:next>
+   </div>
+  </td>
+ </tr>
+<if:isbottom>
+ <tr>
+  <td class="bottomborder" colspan="3"></td>
+ </tr>
+</if:isbottom>
+</table>
+<if:isbottom></form></if:isbottom>
diff --git a/imp/templates/imp/message/navbar_top.html b/imp/templates/imp/message/navbar_top.html
new file mode 100644 (file)
index 0000000..c8f66fe
--- /dev/null
@@ -0,0 +1,14 @@
+<form method="post" id="messages" name="messages" action="<tag:message_url />">
+<tag:form_input />
+<input type="hidden" id="targetMbox" name="targetMbox" />
+<input type="hidden" id="actionID" name="actionID" />
+<input type="hidden" id="message_token" name="message_token" value="<tag:message_token />" />
+<input type="hidden" name="mailbox" value="<tag:mailbox />" />
+<input type="hidden" name="thismailbox" value="<tag:thismailbox />" />
+<input type="hidden" name="start" value="<tag:start />" />
+<input type="hidden" name="uid" value="<tag:uid />" />
+<input type="hidden" id="newMbox" name="newMbox" />
+<input type="hidden" name="flag" />
+<h1 class="header">
+ <tag:label /> <span style="unicode-bidi: embed"><tag:msg_count /></span> <tag:status />
+</h1>
diff --git a/imp/templates/imp/portal.html b/imp/templates/imp/portal.html
deleted file mode 100644 (file)
index 8110283..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<div id="portalchunk">
-<loop:block>
- <div class="<tag:block.class />"<if:block.domid> id="<tag:block.domid />"</if:block.domid>>
-  <h1 class="header"><a app="<tag:block.app />"><tag:block.title /></a></h1>
-  <tag:block.content />
- </div>
-  <br class="clear" /><br />
-</loop:block>
-</div>
diff --git a/imp/templates/imp/search/search-basic.html b/imp/templates/imp/search/search-basic.html
new file mode 100644 (file)
index 0000000..f9a701f
--- /dev/null
@@ -0,0 +1,49 @@
+<form method="post" action="<tag:action />">
+<input type="hidden" name="search_basic_mbox" value="<tag:mbox />" />
+
+<h1 class="header">
+ <strong><tag:search_title /></strong>
+</h1>
+
+<table class="item">
+ <tr>
+  <td class="searchUILabel"><gettext>Search Criteria:</gettext></td>
+  <td>
+   <select name="search_criteria">
+    <option value=""><gettext>None</gettext></option>
+    <option value="" disabled="disabled">- - - - - - - - - -</option>
+<loop:s_fields>
+    <option value="<tag:s_fields.val />"><tag:s_fields.label /></option>
+</loop:s_fields>
+   </select>
+   <span<if:hide_criteria> style="display:none"</if:hide_criteria>>
+    <input type="text" name="search_criteria_text" size="30" />
+    <input type="checkbox" class="checkbox" name="search_criteria_not" />
+    <label for="search_criteria_not"><gettext>Do NOT Match</gettext></label>
+   </span>
+  </td>
+ </tr>
+ <tr>
+  <td class="searchUILabel"><gettext>Search Flags:</gettext></td>
+  <td>
+   <select name="search_flags">
+    <option value=""><gettext>None</gettext></option>
+    <option value="" disabled="disabled">- - - - - - - - - -</option>
+<loop:f_fields>
+    <option value="<tag:f_fields.val />"><tag:f_fields.label /></option>
+</loop:f_fields>
+   </select>
+  </td>
+ </tr>
+<if:advsearch>
+<tr>
+  <td colspan="2"><tag:advsearch /><gettext>Go to Advanced Search Page...</gettext></td>
+ </tr>
+</if:advsearch>
+</table>
+
+<div>
+ <input type="submit" class="button basicSearchSubmit" value="<gettext>Submit</gettext>" />
+ <input type="reset" class="button basicSearchReset" value="<gettext>Reset</gettext>" />
+</div>
+</form>
diff --git a/imp/templates/imp/search/search.html b/imp/templates/imp/search/search.html
new file mode 100644 (file)
index 0000000..409b652
--- /dev/null
@@ -0,0 +1,106 @@
+<form id="search_form" action="<tag:action />" method="post">
+ <input class="hidden" name="criteria_form" id="criteria_form" value="" />
+
+ <h1 class="header">
+  <strong><if:edit_query_vfolder><gettext>Edit Virtual Folder</gettext><else:edit_query_vfolder><gettext>Search</gettext></else:edit_query_vfolder></if:edit_query_vfolder></strong>
+ </h1>
+
+ <div id="recent_searches_div" class="smallheader leftAlign" style="display:none">
+  <span class="searchuiImg arrowExpanded" style="display:none"></span>
+  <span class="searchuiImg arrowCollapsed"></span>
+  <gettext>Recent Searches</gettext>
+ </div>
+
+ <div class="item" style="display:none">
+  <label for="recent_searches" class="hidden"><gettext>Recent Searches:</gettext></label>
+  <select id="recent_searches">
+   <option value=""><gettext>Recent Searches:</gettext></option>
+  </select>
+ </div>
+
+ <div class="smallheader leftAlign">
+  <span class="searchuiImg arrowExpanded"></span>
+  <span class="searchuiImg arrowCollapsed" style="display:none"></span>
+ <gettext>Search Criteria</gettext>
+ </div>
+
+ <div class="item">
+  <table id="search_criteria_table"></table>
+  <div>
+   <select id="search_criteria">
+    <option value=""><gettext>Add search criteria:</gettext></option>
+    <option value="" disabled="disabled">- - - - - - - - -</option>
+    <option value="or" style="display:none"><gettext>Add OR clause</gettext></option>
+    <option value="" disabled="disabled" style="display:none">- - - - - - - - -</option>
+<loop:s_fields>
+    <option value="<tag:s_fields.val />"><tag:s_fields.label /></option>
+</loop:s_fields>
+    <option value="" disabled="disabled">- - - - - - - - -</option>
+<loop:f_fields>
+    <option value="<tag:f_fields.val />"><tag:f_fields.label /></option>
+</loop:f_fields>
+   </select>
+  </div>
+ </div>
+
+ <div class="smallheader leftAlign" id="search_folders_hdr">
+  <span class="searchuiImg arrowExpanded" style="display:none"></span>
+  <span class="searchuiImg arrowCollapsed"></span>
+  <gettext>Search Folders</gettext>
+  <span class="searchuiFoldersActions" style="display:none">
+   <a id="link_sel_all" href="#"><gettext>Select all</gettext></a> |
+   <a id="link_sel_none" href="#"><gettext>Select none</gettext></a>
+<if:subscribe>
+| <a id="link_sub" href="#"><span><gettext>Show All</gettext></span><span style="display:none"><gettext>Show Subscribed Only</gettext></span></a>
+</if:subscribe>
+  </span>
+ </div>
+
+ <div class="item striped" style="display:none">
+ </div>
+
+<if:virtualfolder>
+ <div class="smallheader leftAlign">
+  <span class="searchuiImg arrowExpanded" style="display:none"></span>
+  <span class="searchuiImg arrowCollapsed"></span>
+  <gettext>Saved Searches</gettext>
+ </div>
+
+ <div style="display:none">
+<if:edit_query_vfolder>
+  <input type="hidden" name="edit_query_vfolder" value="" />
+<else:edit_query_vfolder>
+  <div class="item">
+   <input type="checkbox" class="checkbox" id="search_save" name="search_save" /> <label for="search_save"><gettext>Save search?</gettext></label>
+  </div>
+  <div class="item">
+   <label for="search_type"><gettext>Type:</gettext></label>
+   <select id="search_type" name="search_type">
+    <option value="vfolder"><gettext>Virtual Folder</gettext></option>
+   </select>
+  </div>
+</else:edit_query_vfolder></if:edit_query_vfolder>
+  <div class="item">
+   <label for="search_label"><gettext>Label:</gettext></label> <input type="text" name="search_label" id="search_label" />
+  </div>
+ </div>
+</if:virtualfolder>
+
+ <div class="searchuiButtons">
+  <input type="button" id="search_submit" class="button" value="<if:edit_query_vfolder><gettext>Save</gettext><else:edit_query_vfolder><gettext>Submit</gettext></else:edit_query_vfolder></if:edit_query_vfolder>" />
+  <input type="button" id="search_reset" class="button" value="<gettext>Reset</gettext>" />
+<if:return_mailbox_text>
+  <input type="button" id="search_dimp_return" class="button" value="<gettext>Return to</gettext> <tag:return_mailbox_text />" />
+</if:return_mailbox_text>
+ </div>
+</form>
+
+<div id="folder_row" style="display:none">
+ <input type="checkbox" class="checkbox" name="search_folders_form[]" />
+</div>
+
+<select id="within_criteria" style="display:none">
+ <option value="d"><gettext>Days</gettext></option>
+ <option value="m"><gettext>Months</gettext></option>
+ <option value="y"><gettext>Years</gettext></option>
+</select>
diff --git a/imp/templates/imp/thread/thread.html b/imp/templates/imp/thread/thread.html
new file mode 100644 (file)
index 0000000..61d940b
--- /dev/null
@@ -0,0 +1,26 @@
+<h1 class="header">
+ <if:thread><gettext>Thread Display:</gettext><else:thread><gettext>Multiple Message View:</gettext></else:thread></if:thread> <tag:subject /> <tag:delete />
+</h1>
+
+<a id="display"></a>
+<div class="solidbox striped threadSummary">
+<loop:tree>
+ <div><tag:tree.subject /></div>
+</loop:tree>
+</div>
+
+<loop:messages>
+<a id="i<tag:messages.idx />"></a>
+<div class="solidbox threadBox">
+ <div class="item0">
+  <span class="threadlink"><tag:messages.link /></span>
+  <strong><if:messages.addr_to><gettext>To:</gettext><else:messages.addr_to><gettext>From:</gettext></else:messages.addr_to></if:messages.addr_to></strong>
+  <tag:messages.addr />
+  (<small><tag:messages.date /></small>)
+ </div>
+
+ <div class="messageBody">
+  <tag:messages.body />
+ </div>
+</div>
+</loop:messages>
diff --git a/imp/templates/index/index-dimp.inc b/imp/templates/index/index-dimp.inc
deleted file mode 100644 (file)
index 730260b..0000000
+++ /dev/null
@@ -1,498 +0,0 @@
-<?php
-/**
- * Dynamic view (dimp) index template.
- *
- * Copyright 2005-2010 The Horde Project (http://www.horde.org/)
- *
- * See the enclosed file COPYING for license information (GPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
- */
-
-$usetrash = $prefs->getValue('use_trash');
-$use_sub = $prefs->getValue('subscribe');
-
-$has_blacklist = $registry->hasMethod('mail/blacklistFrom');
-$has_whitelist = $registry->hasMethod('mail/whitelistFrom');
-
-// Quota information
-$show_quota = (isset($_SESSION['imp']['imap']['quota']) && is_array($_SESSION['imp']['imap']['quota']));
-
-// Get the list of available IMAP flags
-$flag_list = $injector->getInstance('IMP_Imap_Flags')->getList(array('imap' => true));
-
-function _simpleButton($id, $text, $image, $nodisplay = false)
-{
-    $ak = Horde::getAccessKey($text, true);
-    return '<li class="servicelink"' .
-        (strlen($id) ? ' id="' . $id . '"' : '') .
-        (strlen($ak) ? ' accesskey="' . $ak . '"' : '') .
-        ($nodisplay ? ' style="display:none"' : '') . '>' .
-        '<span class="iconSpan ' . $image . '"></span>' .
-        '<a>' . Horde::highlightAccessKey($text, $ak) . '</a></li>';
-}
-?>
-<div id="dimpLoading">
- <?php echo _("Loading...") ?>
- <noscript>
-  <div class="nojserror"><?php echo _("Error! This application requires javascript to be available and enabled in your browser.") ?></div>
- </noscript>
-</div>
-
-<div id="dimpPage" style="display:none">
- <div id="header"></div>
- <div id="pageContainer">
-  <div id="sidebar">
-   <div id="logo">
-    <a id="logolink"><?php echo _("Horde") ?></a>
-   </div>
-   <ul id="dimpbarActions">
-    <?php echo _simpleButton('composelink', _("_New Message"), 'dimpactionCompose') ?>
-    <?php echo _simpleButton('checkmaillink', _("_Get Mail"), 'dimpactionCheckmail') ?>
-    <?php echo _simpleButton('refreshlink', _("_Refresh Search"), 'dimpactionRefresh', true) ?>
-    <?php echo _simpleButton('alertsloglink', _("Alerts _Log"), 'infoIcon') ?>
-<?php if (!empty($_SESSION['imp']['filteravail'])): ?>
-    <?php echo _simpleButton('applyfilterlink', _("Apply Filters"), 'filtersIcon') ?>
-<?php endif; ?>
-   </ul>
-   <div class="sepfull"></div>
-   <ul id="serviceActions">
-<?php if (($registry->get('status', 'horde') != 'hidden') && ($registry->get('status', 'horde') != 'notoolbar')): ?>
-    <?php echo _simpleButton('appportal', _("_Portal"), 'hordeIcon') ?>
-<?php endif; ?>
-<?php if (Horde_Menu::showService('options')): ?>
-    <?php echo _simpleButton('appoptions', _("_Options"), 'prefsIcon') ?>
-<?php endif; ?>
-<?php if (Horde_Menu::showService('logout')): ?>
-    <?php echo _simpleButton('applogout', _("_Log Out"), 'logoutIcon') ?>
-<?php endif; ?>
-   </ul>
-   <div class="sepfull"></div>
-   <div id="foldersLoading"><?php echo _("Loading...") ?></div>
-   <div id="foldersSidebar" style="display:none">
-    <ul class="folderlist" id="specialfolders"></ul>
-<?php if (!empty($application_folders)): ?>
-    <div class="sepfull"></div>
-    <ul id="applicationfolders">
-<?php foreach ($application_folders as $val): ?>
-     <li class="custom">
-      <img src="<?php echo $val['icon'] ?>" alt="<?php echo $val['name'] ?>" />
-      <a title="<?php echo $val['name'] ?>" id="app<?php echo $val['app'] ?>"><?php echo $val['name'] ?></a>
-     </li>
-<?php endforeach; ?>
-    </ul>
-<?php endif; ?>
-<?php if (!empty($site_menu)): ?>
-    <div id="sitemenu">
-     <div class="sepfull"></div>
-     <ul>
-<?php foreach ($site_menu as $key => $menu_item): ?>
-<?php if ($menu_item == 'separator'): ?>
-     </ul>
-     <div class="sepfull"></div>
-     <ul>
-<?php else: ?>
-      <li class="custom">
-       <img src="<?php echo $menu_item['icon'] ?>" alt="<?php echo $menu_item['text'] ?>" />
-       <a title="<?php echo $menu_item['text'] ?>" id="menu<?php echo $key ?>"><?php echo $menu_item['text'] ?></a>
-      </li>
-<?php endif; ?>
-<?php endforeach; ?>
-     </ul>
-    </div>
-<?php endif; ?>
-    <div class="sepfull"></div>
-    <ul class="folderlist" id="normalfolders">
-     <li class="folder" id="folderopts">
-      <span class="iconSpan folderImg"></span>
-      <a title="<?php echo _("Folder Options") ?>"><?php echo _("Folder Options") ?></a>
-     </li>
-     <li class="folder" id="dropbase" style="display:none">
-      <span class="iconSpan folderImg"></span>
-      <a title="<?php echo _("Move to Base Level") ?>"><?php echo _("Move to Base Level") ?></a>
-     </li>
-    </ul>
-   </div>
-  </div>
-
-  <div id="dimpmain">
-   <div id="dimpmain_portal"><?php echo _("Loading...") ?></div>
-   <div id="dimpmain_folder" style="display:none">
-    <div id="dimpmain_folder_top">
-     <div id="tabbar">
-<?php if (!empty($application_folders) || !empty($site_menu)): ?>
-      <div class="tabset">
-       <ul>
-        <li>
-         <a id="hometab"><img src="<?php echo $registry->get('icon', 'horde') ?>" alt="<?php echo _("Home") ?>" /><?php echo _("Home") ?></a>
-        </li>
-<?php foreach ($application_folders as $val): ?>
-        <li<?php if ($val['app'] == 'dimp') echo ' class="activeTab"' ?>>
-         <a class="applicationtab" id="apptab<?php echo $val['app'] ?>"><img src="<?php echo $val['icon'] ?>" alt="<?php echo $val['name'] ?>" /><?php echo $val['name'] ?></a>
-        </li>
-<?php endforeach; ?>
-<?php foreach ($site_menu as $key => $menu_item): if ($menu_item == 'separator') continue; ?>
-        <li>
-         <a id="tab<?php echo $key ?>"><img src="<?php echo $menu_item['icon'] ?>" alt="<?php echo $menu_item['text'] ?>" /><?php echo $menu_item['text'] ?></a>
-        </li>
-<?php endforeach; ?>
-<?php if ($show_quota): ?>
-        <li id="quota">
-         <span class="used"><?php echo Horde::img('quotauncover.gif') ?></span>
-        </li>
-<?php endif; ?>
-       </ul>
-      </div>
-<?php elseif ($show_quota): ?>
-      <div id="quota">
-        <span class="used"><?php echo Horde::img('quotauncover.gif') ?></span>
-      </div>
-<?php endif; ?>
-     </div>
-     <div class="header mboxheader">
-      <div>
-       <span class="rightFloat" id="msgHeader"></span>
-       <span id="folderName"></span>
-       <span class="iconImg readonlyImg" style="display:none" title="<?php echo htmlspecialchars(_("Read-Only")) ?>"></span>
-      </div>
-     </div>
-
-     <div class="dimpActions">
-<?php if ($_SESSION['imp']['protocol'] != 'pop'): ?>
-      <div id="qsearch">
-       <span id="qsearch_icon"></span>
-       <form action="#" method="post">
-        <input autocomplete="off" id="qsearch_input" type="text" />
-       </form>
-       <span class="closeImg" id="qsearch_close" style="display:none" title="<?php echo _("Clear Search") ?>"></span>
-       <span id="qsearch_close_filter" style="display:none">Clear Filter</span>
-      </div>
-<?php endif; ?>
-      <div><?php echo IMP_Dimp::actionButton(array('class' => 'noselectDisable', 'icon' => 'Reply', 'id' => 'button_reply', 'title' => _("Reply"))) ?></div>
-      <div><?php echo IMP_Dimp::actionButton(array('class' => 'noselectDisable', 'icon' => 'Forward', 'id' => 'button_forward', 'title' => _("Forward"))) ?></div>
-<?php if (!empty($conf['spam']['reporting'])): ?>
-      <div><?php echo IMP_Dimp::actionButton(array('class' => 'noselectDisable', 'icon' => 'Spam', 'id' => 'button_spam', 'title' => _("Spam"))) ?></div>
-<?php endif; ?>
-<?php if (!empty($conf['notspam']['reporting'])): ?>
-      <div><?php echo IMP_Dimp::actionButton(array('class' => 'noselectDisable', 'icon' => 'Ham', 'id' => 'button_ham', 'title' => _("Innocent"))) ?></div>
-<?php endif; ?>
-      <div><?php echo IMP_Dimp::actionButton(array('class' => 'noselectDisable', 'icon' => 'Delete', 'id' => 'button_deleted', 'title' => _("Delete"))) ?></div>
-      <div id="button_compose"><?php echo IMP_Dimp::actionButton(array('icon' => 'Compose', 'title' => _("Compose"))) ?></div>
-      <div id="button_checkmail"><?php echo IMP_Dimp::actionButton(array('icon' => 'Checkmail', 'title' => _("Get Mail"))) ?></div>
-      <div><?php echo IMP_Dimp::actionButton(array('icon' => 'Other', 'id' => 'button_other', 'title' => _("Other Actions"))) ?></div>
-     </div>
-
-     <div id="msglistHeader" class="item">
-      <div class="msgStatus"></div>
-      <div class="msgFrom sep"></div>
-      <div class="msgSubject sep"></div>
-      <div class="msgDate sep"></div>
-      <div class="msgSize sep"></div>
-     </div>
-    </div>
-
-    <div id="msgSplitPane"></div>
-    <span id="viewportLoading" class="loadingImg" style="display:none"></span>
-
-    <div id="previewPane" style="display:none">
-     <span id="msgLoading" class="loadingImg" style="display:none"></span>
-     <div id="previewInfo" style="display:none">
-      <?php echo _("To preview a message, select it from the message list.") ?>
-      <br />
-<?php if ($browser->isBrowser('opera')): ?>
-      <?php echo _("A left click") ?> + <span class="kbd"><?php echo _("Shift") ?></span> + <span class="kbd"><?php echo _("Ctrl") ?></span> <?php echo _("will display available actions.") ?>
-<?php else: ?>
-      <?php echo _("A right-click on a message or a folder will display available actions.") ?>
-<?php endif; ?>
-      <br />
-      <?php printf(_("Click on a message while holding down the %s key to select multiple messages.  To select a range of messages, click the first message of the range, navigate to the last message of the range, and then click on the last message while holding down the %s key."), '<span class="kbd">' . _("Ctrl") . '</span>', '<span class="kbd">' . _("Shift") . '</span>') ?><br /><br />
-      <?php echo _("The following keyboard shortcuts are available:") ?><br />
-      <span class="iconImg keyupImg"></span> / <span class="iconImg keydownImg"></span> : <?php echo _("Move up/down through the message list.") ?><br />
-      <span class="kbd"><?php echo _("PgUp") ?></span> / <span class="kbd"><?php echo _("PgDown") ?></span> : <?php echo _("Move one page up/down through the message list.") ?><br />
-      <span class="kbd"><?php echo _("Alt") ?></span> + <span class="kbd"><?php echo _("PgUp") ?></span> / <span class="kbd"><?php echo _("PgDown") ?></span> : <?php echo _("Scroll up/down through the display of the previewed message.") ?><br />
-      <span class="kbd"><?php echo _("Home") ?></span> / <span class="kbd"><?php echo _("End") ?></span> : <?php echo  _("Move to the beginning/end of the message list.") ?><br />
-      <span class="kbd"><?php echo _("Del") ?></span> : <?php echo _("Delete the currently selected message(s).") ?> <?php printf(_("%s will delete the current message and move to the next message if a single message is selected."), '<span class="kbd">' . _("Shift") . '</span> + <span class="kbd">' . _("Del") . '</span>') ?><br />
-      <span class="kbd"><?php echo _("Shift") ?></span> + <span class="kbd"><?php echo _("N") ?></span> : <?php echo _("Move to the next unseen message (non-search folders only).") ?><br />
-      <span class="kbd"><?php echo _("Enter") ?></span> : <?php echo _("Open message in a popup window.") ?><br />
-      <span class="kbd"><?php echo _("Ctrl") ?></span> + <span class="kbd"><?php echo 'A' ?></span> : <?php echo _("Select all messages in the current mailbox.") ?><br />
-     </div>
-
-     <div id="previewMsg" style="display:none">
-      <div class="msgHeaders">
-       <div id="toggleHeaders">
-        <a id="th_expand"><span class="iconImg" title="<?php echo htmlspecialchars(_("Expand Headers")) ?>"></span></a>
-        <a id="th_collapse" style="display:none"><span class="iconImg" title="<?php echo htmlspecialchars(_("Collapse Headers")) ?>"></span></a>
-       </div>
-       <div id="msgHeadersColl">
-        <a id="msg_newwin"><span class="iconImg" title="<?php echo htmlspecialchars(_("Open in new window")) ?>"></span></a>
-        <span class="date"></span>
-        <span class="subject"></span>
-        <span class="fromcontainer"><?php echo _("from") ?> <span class="from"></span></span>
-       </div>
-       <div id="msgHeaders" style="display:none">
-        <div class="dimpOptions">
-         <div>
-          <span id="msg_newwin_options">
-           <span class="iconImg"></span>
-           <a><?php echo _("Open in new window") ?></a>
-          </span>
-         </div>
-<?php if (!empty($conf['user']['allow_view_source'])): ?>
-         <div>
-          <span id="msg_view_source">
-           <span class="iconImg"></span>
-           <a><?php echo _("View Source") ?></a>
-          </span>
-         </div>
-<?php endif; ?>
-        </div>
-        <div id="msgHeadersContent">
-         <table>
-          <thead>
-           <tr>
-            <td class="label"><?php echo _("Subject") ?>:</td>
-            <td class="subject"></td>
-           </tr>
-           <tr id="msgHeaderFrom">
-            <td class="label"><?php echo _("From") ?>:</td>
-            <td class="from"></td>
-           </tr>
-           <tr id="msgHeaderDate">
-            <td class="label"><?php echo _("Date") ?>:</td>
-            <td class="date"></td>
-           </tr>
-           <tr id="msgHeaderTo">
-            <td class="label"><?php echo _("To") ?>:</td>
-            <td class="to"></td>
-           </tr>
-           <tr id="msgHeaderCc">
-            <td class="label"><?php echo _("Cc") ?>:</td>
-            <td class="cc"></td>
-           </tr>
-           <tr id="msgAtc" style="display:none">
-            <td class="label" id="partlist_toggle">
-             <span class="iconImg attachmentImg attachmentImage"></span>
-             <span class="iconImg" id="partlist_col"></span>
-             <span class="iconImg" id="partlist_exp" style="display:none"></span>
-             </td>
-            <td>
-             <div></div>
-             <div id="partlist" style="display:none">
-              <table></table>
-             </div>
-            </td>
-           </tr>
-           <tr id="msgLogInfo" style="display:none">
-            <td class="label" id="msgloglist_toggle">
-             <span class="iconImg" id="msgloglist_col"></span>
-             <span class="iconImg" id="msgloglist_exp" style="display:none"></span>
-            </td>
-            <td>
-             <div><span class="msgLogLabel"><?php echo _("Message Log") ?></span></div>
-             <div id="msgloglist" style="display:none">
-              <ul></ul>
-             </div>
-            </td>
-           </tr>
-          </thead>
-         </table>
-        </div>
-       </div>
-      </div>
-      <div id="messageBody" class="messageBody"></div>
-     </div>
-    </div>
-   </div>
-  </div>
- </div>
-</div>
-
-<div class="context" id="ctx_folder" style="display:none">
- <a id="ctx_folder_create"><span class="contextImg"></span><?php echo _("Create subfolder") ?></a>
- <a id="ctx_folder_rename"><span class="contextImg"></span><?php echo _("Rename Folder") ?></a>
- <a id="ctx_folder_empty"><span class="contextImg"></span><?php echo _("Empty Folder") ?></a>
- <a id="ctx_folder_delete"><span class="contextImg"></span><?php echo _("Delete Folder") ?></a>
- <div class="sep"></div>
- <a id="ctx_folder_setflag"><span class="contextImg"></span><?php echo _("Mark all as") ?></a>
- <div class="sep"></div>
- <a id="ctx_folder_poll"><span class="contextImg"></span><?php echo _("Check for New Mail") ?></a>
- <a id="ctx_folder_nopoll"><span class="contextImg"></span><?php echo _("Do Not Check for New Mail") ?></a>
-<?php if ($use_sub): ?>
- <a id="ctx_folder_sub"><span class="contextImg"></span><?php echo _("Subscribe") ?></a>
- <a id="ctx_folder_unsub"><span class="contextImg"></span><?php echo _("Unsubscribe") ?></a>
-<?php endif; ?>
- <div style="display:none">
-  <div class="sep"></div>
-  <a id="ctx_folder_expand"><span class="contextImg"></span><?php echo _("Expand All") ?></a>
-  <a id="ctx_folder_collapse"><span class="contextImg"></span><?php echo _("Collapse All") ?></a>
- </div>
-</div>
-
-<div class="context" id="ctx_folder_flag" style="display:none">
- <a id="ctx_folder_seen"><span class="contextImg"></span><?php echo _("Read") ?></a>
- <a id="ctx_folder_unseen"><span class="contextImg"></span><?php echo _("Unseen") ?></a>
-</div>
-
-<div class="context" id="ctx_container" style="display:none">
- <a id="ctx_container_create"><span class="contextImg"></span><?php echo _("Create subfolder") ?></a>
- <a id="ctx_container_rename"><span class="contextImg"></span><?php echo _("Rename Folder") ?></a>
- <div class="sep"></div>
- <a id="ctx_container_expand"><span class="contextImg"></span><?php echo _("Expand All") ?></a>
- <a id="ctx_container_collapse"><span class="contextImg"></span><?php echo _("Collapse All") ?></a>
-</div>
-
-<?php if ($conf['user']['allow_folders']): ?>
-<div class="context" id="ctx_folderopts" style="display:none">
- <a id="ctx_folderopts_new"><span class="contextImg"></span><?php echo _("New Folder") ?></a>
-<?php if ($use_sub): ?>
- <a id="ctx_folderopts_sub" style="display:none"><span class="contextImg"></span><?php echo _("Hide Unsubscribed") ?></a>
- <a id="ctx_folderopts_unsub"><span class="contextImg"></span><?php echo _("Show Unsubscribed") ?></a>
-<?php endif; ?>
- <a id="ctx_folderopts_expand"><span class="contextImg"></span><?php echo _("Expand All") ?></a>
- <a id="ctx_folderopts_collapse"><span class="contextImg"></span><?php echo _("Collapse All") ?></a>
- <div class="sep"></div>
- <a id="ctx_folderopts_reload"><span class="contextImg"></span><?php echo _("Rebuild Folder List") ?></a>
-</div>
-<?php endif; ?>
-
-<div class="context" id="ctx_noactions" style="display:none">
- <div><?php echo _("No actions available") ?></div>
-</div>
-
-<div class="context" id="ctx_vfolder" style="display:none">
- <a id="ctx_vfolder_edit"><span class="contextImg"></span><?php echo _("Edit Virtual Folder") ?></a>
- <a id="ctx_vfolder_delete"><span class="contextImg"></span><?php echo _("Delete Virtual Folder") ?></a>
-</div>
-
-<div class="context" id="ctx_message" style="display:none">
- <a id="ctx_message_resume" style="display:none"><span class="contextImg"></span><?php echo _("Resume Draft") ?></a>
- <a id="ctx_message_reply"><span class="contextImg"></span><?php echo _("Reply") ?></a>
- <a id="ctx_message_forward"><span class="contextImg"></span><?php echo _("Forward") ?></a>
-<?php if (!empty($flag_list)): ?>
- <div>
-  <div class="sep"></div>
-  <a id="ctx_message_setflag"><span class="contextImg"></span><?php echo _("Mark as") ?></a>
-  <a id="ctx_message_unsetflag"><span class="contextImg"></span><?php echo _("Unmark as") ?></a>
- </div>
-<?php endif; ?>
- <div class="sep"></div>
-<?php if (!empty($conf['spam']['reporting'])): ?>
- <a id="ctx_message_spam"><span class="contextImg"></span><?php echo _("Report as Spam") ?></a>
-<?php endif; ?>
-<?php if (!empty($conf['notspam']['reporting'])): ?>
- <a id="ctx_message_ham"><span class="contextImg"></span><?php echo _("Report as Innocent") ?></a>
-<?php endif; ?>
-<?php if ($has_blacklist): ?>
- <a id="ctx_message_blacklist"><span class="contextImg"></span><?php echo _("Blacklist") ?></a>
-<?php endif; ?>
-<?php if ($has_whitelist): ?>
- <a id="ctx_message_whitelist"><span class="contextImg"></span><?php echo _("Whitelist") ?></a>
-<?php endif; ?>
- <a id="ctx_message_deleted"><span class="contextImg"></span><?php echo _("Delete") ?></a>
-<?php if (!$usetrash): ?>
- <a id="ctx_message_undeleted"><span class="contextImg"></span><?php echo _("Undelete") ?></a>
-<?php endif; ?>
- <div style="display:none">
-  <div class="sep"></div>
-  <a id="ctx_message_source"><span class="contextImg"></span><?php echo _("View Source") ?></a>
- </div>
-</div>
-
-<div class="context" id="ctx_reply" style="display:none;">
- <a id="ctx_reply_reply"><span class="contextImg"></span><?php echo _("To Sender") ?></a>
- <a id="ctx_reply_reply_all"><span class="contextImg"></span><?php echo _("To All") ?></a>
- <a id="ctx_reply_reply_list"><span class="contextImg"></span><?php echo _("To List") ?></a>
-</div>
-
-<?php if (!$prefs->isLocked('forward_default')): ?>
-<div class="context" id="ctx_forward" style="display:none;">
- <a id="ctx_forward_attach"><span class="contextImg"></span><?php echo _("As Attachment") ?></a>
- <a id="ctx_forward_body"><span class="contextImg"></span><?php echo _("In Body Text") ?></a>
- <a id="ctx_forward_both"><span class="contextImg"></span><?php echo _("Attachment and Body Text") ?></a>
-</div>
-<?php endif; ?>
-
-<div class="context" id="ctx_otheractions" style="display:none">
- <a id="oa_preview_hide"><span class="contextImg"></span><?php echo _("Hide Preview") ?></a>
- <a id="oa_preview_show"><span class="contextImg"></span><?php echo _("Show Preview") ?></a>
- <a id="oa_layout_horiz"><span class="contextImg"></span><?php echo _("Horizontal Layout") ?></a>
- <a id="oa_layout_vert"><span class="contextImg"></span><?php echo _("Vertical Layout") ?></a>
-<?php if (!empty($flag_list)): ?>
- <div>
-  <div class="sep"></div>
-  <a id="oa_setflag"><span class="contextImg"></span><?php echo _("Mark as") ?></a>
-  <a id="oa_unsetflag"><span class="contextImg"></span><?php echo _("Unmark as") ?></a>
- </div>
-<?php endif; ?>
-<?php if ($has_blacklist || $has_whitelist): ?>
-<?php if ($has_blacklist): ?>
- <div>
-  <div class="sep"></div>
-  <a id="oa_blacklist"><span class="contextImg"></span><?php echo _("Blacklist") ?></a>
- </div>
-<?php endif; ?>
-<?php if ($has_whitelist): ?>
- <div>
-  <div<?php if (!$has_blacklist) echo ' class="sep"'; ?>></div>
-  <a id="oa_whitelist"><span class="contextImg"></span><?php echo _("Whitelist") ?></a>
- </div>
-<?php endif; ?>
-<?php endif; ?>
- <div class="sep"></div>
- <a id="oa_selectall"><span class="contextImg"></span><?php echo _("Select All") ?></a>
-<?php if (!$usetrash): ?>
- <div class="sep"></div>
- <a id="oa_purge_deleted"><span class="contextImg"></span><?php echo _("Purge Deleted") ?></a>
- <a id="oa_undeleted"><span class="contextImg"></span><?php echo _("Undelete") ?></a>
-<?php endif; ?>
-</div>
-
-<?php if (!empty($flag_list)): ?>
-<div class="context" id="ctx_flag" style="display:none">
-<?php foreach ($flag_list as $key => $val): ?>
- <a flag="<?php echo htmlspecialchars($key) ?>"><span class="contextImg <?php echo htmlspecialchars($val['c']) ?>"<?php echo ($val['t'] == 'imapp') ? ' style="background:' . htmlspecialchars($val['b']) . '"' : '' ?>></span><?php echo htmlspecialchars($val['l']) ?></a>
-<?php endforeach; ?>
-</div>
-<?php endif; ?>
-
-<div class="context" id="ctx_contacts" style="display:none">
- <a id="ctx_contacts_new"><span class="contextImg"></span><?php echo _("New Message") ?></a>
- <a id="ctx_contacts_add"><span class="contextImg"></span><?php echo _("Add to Address Book") ?></a>
-</div>
-
-<?php if ($_SESSION['imp']['protocol'] != 'pop'): ?>
-<div class="context" id="ctx_qsearchopts" style="display:none">
- <a id="ctx_qsearchopts_by"><?php echo _("Search By") ?></a>
- <div class="sep"></div>
- <a id="ctx_qsearchopts_filter"><?php echo _("Show Only") ?></a>
- <a id="ctx_qsearchopts_filternot"><?php echo _("Don't Show") ?></a>
- <div class="sep"></div>
- <a id="ctx_qsearchopts_advanced"><?php echo _("Advanced Search...") ?></a>
-</div>
-
-<div class="context" id="ctx_qsearchby" style="display:none">
- <a id="ctx_qsearchby_all"><?php echo _("Entire Message") ?></a>
- <a id="ctx_qsearchby_body"><?php echo _("Body") ?></a>
- <a id="ctx_qsearchby_from"><?php echo _("From") ?></a>
- <a id="ctx_qsearchby_to"><?php echo _("To") ?></a>
- <a id="ctx_qsearchby_subject"><?php echo _("Subject") ?></a>
-</div>
-<?php endif; ?>
-
-<div style="display:none">
- <span id="largeaddrspan">
-  <span class="largeaddrtoggle">
-   <span class="largeaddrlist">[<?php echo _("Show Addresses - %d recipients") ?>]</span>
-   <span class="largeaddrlist" style="display:none">[<?php echo _("Hide Addresses") ?>]</span>
-  </span>
-  <span class="dispaddrlist" style="display:none"></span>
- </span>
-</div>
-
-<div id="folderform" style="display:none">
- <form action="#" class="RBForm">
-  <p></p>
-  <input type="text" size="15" />
-  <input type="button" class="button RBFolderOk" value="<?php echo _("Ok") ?>" />
-  <input type="button" class="button RBFolderCancel" value="<?php echo _("Cancel") ?>" />
- </form>
-</div>
diff --git a/imp/templates/javascript_defs.php b/imp/templates/javascript_defs.php
deleted file mode 100644 (file)
index 300e1cc..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * IMP base JS file.
- *
- * Copyright 2005-2010 The Horde Project (http://www.horde.org/)
- *
- * See the enclosed file COPYING for license information (GPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
- */
-
-$code = array(
-/* Variables used in core javascript files. */
-    'conf' => array(
-        'pop3' => intval((isset($_SESSION['imp']) && ($_SESSION['imp']['protocol'] == 'pop'))),
-        'fixed_folders' => empty($GLOBALS['conf']['server']['fixed_folders'])
-            ? array()
-            : $GLOBALS['conf']['server']['fixed_folders'],
-    ),
-
-    /* Gettext strings used in core javascript files. */
-    'text' => array(
-        /* Strings used in compose.js */
-        'compose_cancel' => _("Cancelling this message will permanently discard its contents.") . "\n" . _("Are you sure you want to do this?"),
-        'compose_discard' => _("Doing so will discard this message permanently."),
-        'compose_recipient' => _("You must specify a recipient."),
-        'compose_nosubject' => _("The message does not have a Subject entered.") . "\n" . _("Send message without a Subject?"),
-        'compose_file' => _("File"),
-        'compose_attachment' => _("Attachment"),
-        'compose_inline' => _("Inline"),
-
-        /* Strings used in mailbox.js */
-        'mailbox_submit' => _("You must select at least one message first."),
-        'mailbox_delete' => _("Are you sure you wish to PERMANENTLY delete these messages?"),
-        'mailbox_selectone' => _("You must select at least one message first."),
-        'yes' => _("Yes"),
-        'no' => _("No"),
-
-        /* Strings used in contacts.js */
-        'contacts_select' => _("You must select an address first."),
-        'contacts_closed' => _("The message being composed has been closed."),
-        'contacts_called' => _("This window must be called from a compose window."),
-
-        /* Strings used in folders.js */
-        'folders_select' => _("Please select a folder before you perform this action."),
-        'folders_oneselect' => _("Only one folder should be selected for this action."),
-        'folders_subfolder1' => _("You are creating a sub-folder to"),
-        'folders_subfolder2' => _("Please enter the name of the new folder:"),
-        'folders_toplevel' => _("You are creating a top-level folder.") . "\n" . _("Please enter the name of the new folder:"),
-        'folders_download1' => _("All messages in the following folder(s) will be downloaded into one MBOX file:"),
-        'folders_download2' => _("This may take some time. Are you sure you want to continue?"),
-        'folders_rename1' => _("You are renaming the folder:"),
-        'folders_rename2' => _("Please enter the new name:"),
-        'folders_no_rename' => _("This folder may not be renamed:"),
-
-        /* Strings used in imp.js */
-        'popup_block' => _("A popup window could not be opened. Perhaps you have set your browser to block popup windows?"),
-
-        /* Strings used in login.js */
-        'login_username' => _("Please provide your username."),
-        'login_password' => _("Please provide your password."),
-
-        /* Strings used in multiple pages. */
-        'spam_report' => _("Are you sure you wish to report this message as spam?"),
-        'notspam_report' => _("Are you sure you wish to report this message as innocent?"),
-        'newfolder' => _("You are copying/moving to a new folder.") . "\n" . _("Please enter a name for the new folder:") . "\n",
-        'target_mbox' => _("You must select a target mailbox first."),
-    )
-);
-
-Horde::addInlineScript(array(
-    'var IMP = ' . Horde_Serialize::serialize($code, Horde_Serialize::JSON, Horde_Nls::getCharset())
-), null, true);
diff --git a/imp/templates/javascript_defs_dimp.php b/imp/templates/javascript_defs_dimp.php
deleted file mode 100644 (file)
index c94aa84..0000000
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-/**
- * DIMP base JS file.
- *
- * Copyright 2005-2010 The Horde Project (http://www.horde.org/)
- *
- * See the enclosed file COPYING for license information (GPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
- */
-
-$app_urls = $code = $flags = array();
-
-foreach (IMP_Dimp::menuList() as $app) {
-    $app_urls[$app] = (string) Horde::url($GLOBALS['registry']->getInitialPage($app), true);
-}
-
-include IMP_BASE . '/config/portal.php';
-foreach ($dimp_block_list as $block) {
-    if ($block['ob'] instanceof Horde_Block) {
-        $app = $block['ob']->getApp();
-        if (empty($app_urls[$app])) {
-            $app_urls[$app] = (string) Horde::url($GLOBALS['registry']->getInitialPage($app), true);
-        }
-    }
-}
-
-/* Generate flag array. */
-foreach ($GLOBALS['injector']->getInstance('IMP_Imap_Flags')->getList(array('fgcolor' => true)) as $val) {
-    $flags[$val['flag']] = array_filter(array(
-        'b' => isset($val['b']) ? $val['b'] : null,
-        'c' => $val['c'],
-        'f' => $val['f'],
-        'l' => $val['l'],
-        'n' => isset($val['n']) ? $val['n'] : null,
-        // Indicate if this is a user *P*ref flag
-        'p' => intval($val['t'] == 'imapp')
-    ));
-}
-
-/* Variables used in core javascript files. */
-$code['conf'] = array_filter(array(
-    // URL variables
-    'URI_AJAX' => (string) Horde::getServiceLink('ajax', 'imp'),
-    'URI_COMPOSE' => (string) Horde::applicationUrl('compose-dimp.php'),
-    'URI_DIMP' => (string) Horde::applicationUrl('index-dimp.php'),
-    'URI_MESSAGE' => (string) Horde::applicationUrl('message-dimp.php'),
-    'URI_PREFS' => (string) Horde::getServiceLink('prefsapi', 'imp'),
-    'URI_PREFS_IMP' => str_replace('&amp;', '&', (string) Horde::getServiceLink('options', 'imp')),
-    'URI_SEARCH' => (string) Horde::applicationUrl('search.php'),
-    'URI_VIEW' => (string) Horde::applicationUrl('view.php'),
-
-    'IDX_SEP' => IMP::IDX_SEP,
-    'SESSION_ID' => defined('SID') ? SID : '',
-
-    // Other variables
-    'app_urls' => $app_urls,
-    'buffer_pages' => intval($GLOBALS['conf']['dimp']['viewport']['buffer_pages']),
-    'disable_compose' => !IMP::canCompose(),
-    'filter_any' => intval($GLOBALS['prefs']->getValue('filter_any_mailbox')),
-    'fixed_folders' => empty($GLOBALS['conf']['server']['fixed_folders'])
-        ? array()
-        : array_map(array('IMP_Dimp', 'appendedFolderPref'), $GLOBALS['conf']['server']['fixed_folders']),
-    'flags' => $flags,
-    'fsearchid' => IMP_Search::MBOX_PREFIX . IMP_Search::DIMP_FILTERSEARCH,
-    'ham_spammbox' => intval(!empty($GLOBALS['conf']['notspam']['spamfolder'])),
-    'login_view' => $GLOBALS['prefs']->getValue('dimp_login_view'),
-    'name' => $GLOBALS['registry']->get('name', 'imp'),
-    'popup_height' => 610,
-    'popup_width' => 820,
-    'preview_pref' => $GLOBALS['prefs']->getValue('dimp_show_preview') === true ? 'horiz' : $GLOBALS['prefs']->getValue('dimp_show_preview'),
-    'qsearchid' => IMP_Search::MBOX_PREFIX . IMP_Search::DIMP_QUICKSEARCH,
-    'qsearchfield' => $GLOBALS['prefs']->getValue('dimp_qsearch_field'),
-    'refresh_time' => intval($GLOBALS['prefs']->getValue('refresh_time')),
-    'searchprefix' => IMP_Search::MBOX_PREFIX,
-    'sidebar_width' => max((int)$GLOBALS['prefs']->getValue('sidebar_width'), 150) . 'px',
-    'sort' => array(
-        'from' => array(
-            't' => _("From"),
-            'v' => Horde_Imap_Client::SORT_FROM
-        ),
-        'to' => array(
-            't' => _("To"),
-            'v' => Horde_Imap_Client::SORT_TO
-        ),
-        'subject' => array(
-            't' => _("Subject"),
-            'v' => Horde_Imap_Client::SORT_SUBJECT
-        ),
-        'thread' => array(
-            't' => _("Thread"),
-            'v' => Horde_Imap_Client::SORT_THREAD
-        ),
-        'date' => array(
-            't' => _("Date"),
-            'v' => Horde_Imap_Client::SORT_DATE
-        ),
-        'arrival' => array(
-            't' => _("Arrival"),
-            'v' => Horde_Imap_Client::SORT_ARRIVAL
-        ),
-        'size' => array(
-            't' => _("Size"),
-            'v' => Horde_Imap_Client::SORT_SIZE
-        )
-    ),
-    'spam_mbox' => IMP::folderPref($GLOBALS['prefs']->getValue('spam_folder'), true),
-    'spam_spammbox' => intval(!empty($GLOBALS['conf']['spam']['spamfolder'])),
-    'splitbar_pos' => intval($GLOBALS['prefs']->getValue('dimp_splitbar')),
-
-    'toggle_pref' => intval($GLOBALS['prefs']->getValue('dimp_toggle_headers')),
-    'viewport_wait' => intval($GLOBALS['conf']['dimp']['viewport']['viewport_wait']),
-));
-
-/* Gettext strings used in core javascript files. */
-$code['text'] = array(
-    'ajax_error' => _("Error when communicating with the server."),
-    'ajax_recover' => _("The connection to the server has been restored."),
-    'ajax_timeout' => _("There has been no contact with the server for several minutes. The server may be temporarily unavailable or network problems may be interrupting your session. You will not see any updates until the connection is restored."),
-    'badaddr' => _("Invalid Address"),
-    'badsubject' => _("Invalid Subject"),
-    'baselevel' => _("base level of the folder tree"),
-    'cancel' => _("Cancel"),
-    'check' => _("Checking..."),
-    'copyto' => _("Copy %s to %s"),
-    'create_prompt' => _("Create folder:"),
-    'createsub_prompt' => _("Create subfolder:"),
-    'delete_folder' => _("Permanently delete %s?"),
-    'empty_folder' => _("Permanently delete all messages in %s?"),
-    'hidealog' => Horde::highlightAccessKey(_("Hide Alerts _Log"), Horde::getAccessKey(_("Alerts _Log"), true)),
-    'listmsg_wait' => _("The server is still generating the message list."),
-    'listmsg_timeout' => _("The server was unable to generate the message list."),
-    'loading' => _("Loading..."),
-    'message' => _("Message"),
-    'messages' => _("Messages"),
-    'moveto' => _("Move %s to %s"),
-    'noalerts' => _("No Alerts"),
-    'nomessages' => _("No Messages"),
-    'of' => _("of"),
-    'ok' => _("Ok"),
-    'onlogout' => _("Logging Out..."),
-    'popup_block' => _("A popup window could not be opened. Your browser may be blocking popups."),
-    'portal' => ("Portal"),
-    'prefs' => _("User Options"),
-    'rename_prompt' => _("Rename folder to:"),
-    'search' => _("Search"),
-    'verify' => _("Verifying..."),
-    'vp_empty' => _("There are no messages in this mailbox."),
-);
-
-if (in_array(basename($_SERVER['PHP_SELF']), array('compose-dimp.php', 'message-dimp.php'))){
-    $compose_cursor = $GLOBALS['prefs']->getValue('compose_cursor');
-
-    /* Variables used in compose page. */
-    $code['conf_compose'] = array_filter(array(
-        'attach_limit' => ($GLOBALS['conf']['compose']['attach_count_limit'] ? intval($GLOBALS['conf']['compose']['attach_count_limit']) : -1),
-        'auto_save_interval_val' => intval($GLOBALS['prefs']->getValue('auto_save_drafts')),
-        'bcc' => intval($GLOBALS['prefs']->getValue('compose_bcc')),
-        'cc' => intval($GLOBALS['prefs']->getValue('compose_cc')),
-        'close_draft' => intval($GLOBALS['prefs']->getValue('close_draft')),
-        'compose_cursor' => ($compose_cursor ? $compose_cursor : 'top'),
-        'drafts_mbox' => IMP::folderPref($GLOBALS['prefs']->getValue('drafts_folder'), true),
-        'rte_avail' => intval($GLOBALS['browser']->hasFeature('rte')),
-        'spellcheck' => intval($GLOBALS['prefs']->getValue('compose_spellcheck')),
-    ));
-
-    /* Gettext strings used in compose page. */
-    $code['text_compose'] = array(
-        'atc_limit' => _("The attachment limit has been reached."),
-        'cancel' => _("Cancelling this message will permanently discard its contents and will delete auto-saved drafts.\nAre you sure you want to do this?"),
-        'nosubject' => _("The message does not have a Subject entered.") . "\n" . _("Send message without a Subject?"),
-        'remove' => _("Remove"),
-        'spell_noerror' => _("No spelling errors found."),
-        'toggle_html' => _("Really discard all formatting information? This operation cannot be undone."),
-        'uploading' => _("Uploading..."),
-    );
-
-    if ($GLOBALS['registry']->hasMethod('contacts/search')) {
-        $code['conf_compose']['URI_ABOOK'] = (string) Horde::applicationUrl('contacts.php');
-    }
-
-    if ($GLOBALS['prefs']->getValue('set_priority')) {
-        $code['conf_compose']['priority'] = array(
-            array(
-                'l' => _("High"),
-                'v' => 'high'
-            ),
-            array(
-                'l' => _("Normal"),
-                's' => true,
-                'v' => 'normal'
-            ),
-            array(
-                'l' => _("Low"),
-                'v' => 'low'
-            )
-        );
-    }
-}
-
-Horde::addInlineScript(array(
-    'var DIMP = ' . Horde_Serialize::serialize($code, Horde_Serialize::JSON, Horde_Nls::getCharset())
-), null, true);
diff --git a/imp/templates/mailbox/actions.html b/imp/templates/mailbox/actions.html
deleted file mode 100644 (file)
index 226a383..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<table width="100%" cellspacing="0">
- <tr>
-  <td class="mboxcontrol <if:isbottom>topborder<else:isbottom>bottombordercollapse</else:isbottom></if:isbottom>">
-   <div class="rightFloat">
-    <ul class="msgactions">
-     <if:hide_deleted><li<if:purge_deleted><else:purge_deleted> class="lastnavbar"</else:purge_deleted></if:purge_deleted>><tag:hide_deleted /></li></if:hide_deleted>
-     <if:purge_deleted><li class="lastnavbar"><tag:purge_deleted /></li></if:purge_deleted>
-    </ul>
-   </div>
-   <div class="leftFloat">
-    <ul class="msgactions">
-<if:readonly><else:readonly>
-     <if:delete><li><tag:delete /></li></if:delete>
-     <if:undelete><li><tag:undelete /></li></if:undelete>
-     <if:blacklist><li><tag:blacklist /></li></if:blacklist>
-     <if:whitelist><li><tag:whitelist /></li></if:whitelist>
-</else:readonly></if:readonly>
-     <if:forward><li><tag:forward /></li></if:forward>
-<if:readonly><else:readonly>
-     <if:spam><li><tag:spam /></li></if:spam>
-     <if:notspam><li><tag:notspam /></li></if:notspam>
-</else:readonly></if:readonly>
-     <li class="lastnavbar"><tag:view_messages /></li>
-    </ul>
-   </div>
-  </td>
- </tr>
-</table>
diff --git a/imp/templates/mailbox/actions_deleted.html b/imp/templates/mailbox/actions_deleted.html
deleted file mode 100644 (file)
index 76072dd..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="control">
- <ul class="rightFloat msgactions">
-  <li><tag:hide /></li>
-  <if:purge><li class="lastnavbar"><tag:purge /></li></if:purge>
- </ul>
-</div>
diff --git a/imp/templates/mailbox/empty_mailbox.html b/imp/templates/mailbox/empty_mailbox.html
deleted file mode 100644 (file)
index 2dfa252..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="text">
- <em><if:search_mbox><gettext>No messages matched your search criteria.</gettext><else:search_mbox><gettext>There are no messages in this mailbox.</gettext></else:search_mbox></if:search_mbox></em>
-</div>
diff --git a/imp/templates/mailbox/header.html b/imp/templates/mailbox/header.html
deleted file mode 100644 (file)
index f02bd1b..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<div class="header mboxheader">
- <div <if:page>style="width:40%" </if:page>class="leftFloat">
-  <span dir="ltr"><tag:pagetitle /></span>
-  <if:readonly><tag:readonly /></if:readonly>
-  <tag:refresh /><span class="reloadImg"></span></a>
-  <if:filter><tag:filter /></if:filter>
-  <if:search><tag:search /></if:search>
-  <if:searchclose><tag:searchclose /><span class="closeImg"></span></a></if:searchclose>
-  <if:empty><tag:empty /></if:empty>
-  <if:delete_vfolder><tag:delete_vfolder /></if:delete_vfolder>
- </div>
-<if:page>
- <div style="width:20%" class="leftFloat">
-  <tag:page />
- </div>
- <div style="width:40%" class="rightFloat rightAlign">
-<else:page>
- <div class="rightFloat rightAlign">
-</else:page></if:page>
-  <tag:msgcount />
- </div>
- <div class="clear"></div>
-</div>
diff --git a/imp/templates/mailbox/mailbox-mimp.html b/imp/templates/mailbox/mailbox-mimp.html
deleted file mode 100644 (file)
index 0356fc8..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-  <div><tag:title /></div>
-  <hr />
-<if:checkbox>
-  <form action="<tag:checkbox />" method="post">
-  <input type="hidden" name="mt" value="<tag:mt />" />
-  <tag:forminput />
-</if:checkbox>
-<if:msgs>
-  <table>
-   <tr>
-<if:checkbox>
-    <th></th>
-</if:checkbox>
-    <th><tag:hdr_arrival /></th>
-    <th><tag:hdr_from /></th>
-    <th><tag:hdr_subject /><if:hdr_subject_minor> <small>[<tag:hdr_subject_minor />]</small></if:hdr_subject_minor></th>
-   </tr>
-<loop:msgs>
-   <tr>
-<if:checkbox>
-    <td><input type="checkbox" name="indices[]" value="<tag:msgs.uid />" /></td>
-</if:checkbox>
-    <td><tag:msgs.status /></td>
-    <td><tag:msgs.from /></td>
-    <td><tag:msgs.thread /> <a href="<tag:msgs.target />"><tag:msgs.subject /></a></td>
-   </tr>
-</loop:msgs>
-  </table>
-<else:msgs>
-<div><gettext>No messages.</gettext></div>
-</else:msgs></if:msgs>
-  <hr />
-<if:checkbox>
-  <div>
-   <select name="checkbox">
-    <option value="" selected="selected"><gettext>Action:</gettext></option>
-    <option value="d">&nbsp;<gettext>Delete</gettext></option>
-    <option value="u">&nbsp;<gettext>Undelete</gettext></option>
-    <option value="s">&nbsp;<gettext>Report As Spam</gettext></option>
-    <option value="i">&nbsp;<gettext>Report As Innocent</gettext></option>
-   </select>
-   <input type="submit" value="<gettext>Do Action</gettext>" />
-  </div>
-  </form>
-  <hr />
-</if:checkbox>
-  <div><gettext>Menu</gettext></div>
-  <tag:menu />
- </body>
-</html>
diff --git a/imp/templates/mailbox/mailbox.html b/imp/templates/mailbox/mailbox.html
deleted file mode 100644 (file)
index 0109704..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<loop:messages>
- <tr id="row<tag:messages.id />"<if:messages.class> class="<tag:messages.class />"</if:messages.class><if:messages.bg> style="background-color:<tag:messages.bg />"</if:messages.bg>>
-  <td>
-   <tag:overflow_begin /><label><input type="checkbox" class="checkbox" name="indices[]" value="<tag:messages.uid />" /><tag:messages.status />&nbsp;</label><tag:overflow_end />
-  </td>
-  <td><tag:overflow_begin /><tag:messages.date />&nbsp;<tag:overflow_end /></td>
-  <td><tag:overflow_begin /><tag:messages.from />&nbsp;<tag:overflow_end /></td>
-  <td><tag:overflow_begin /><tag:messages.subject /><tag:overflow_end /></td>
-  <td class="rightAlign"><tag:overflow_begin /><tag:messages.size /><tag:overflow_end /></td>
- </tr>
-</loop:messages>
-</table>
diff --git a/imp/templates/mailbox/message_footers.html b/imp/templates/mailbox/message_footers.html
deleted file mode 100644 (file)
index fe2785d..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<input type="hidden" name="page" value="<tag:page />" />
-<input type="hidden" id="actionID" name="actionID" value="" />
-<input type="hidden" id="targetMbox" name="targetMbox" value="" />
-<input type="hidden" id="newMbox" name="newMbox" value="0" />
-<input type="hidden" id="flag" name="flag" value="" />
-</form>
diff --git a/imp/templates/mailbox/message_headers.html b/imp/templates/mailbox/message_headers.html
deleted file mode 100644 (file)
index cd5c70b..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<if:form_tag>
-<form method="post" id="messages" name="messages" action="<tag:mailbox_url />">
-<input type="hidden" name="mailbox" value="<tag:mailbox />" />
-<input type="hidden" name="mailbox_token" value="<tag:mailbox_token />" />
-<tag:sessiontag />
-</if:form_tag>
-<table class="messageList" width="100%" cellspacing="0">
- <tr class="item">
-<if:mh_count>
-  <th width="8%">&nbsp;</th>
-<else:mh_count>
-  <th id="checkheader" width="8%">
-   <label for="checkAll" class="hidden"><gettext>Check All/None</gettext></label>
-   <input type="checkbox" class="checkbox" id="checkAll" name="checkAll" <tag:check_all /> />
-  </th>
-</else:mh_count></if:mh_count>
-<loop:headers>
-  <th class="<tag:headers.class />" width="<tag:headers.width />">
-   <tag:headers.change_sort_link /> <tag:headers.change_sort_widget /> <tag:headers.extra />
-  </th>
-</loop:headers>
- </tr>
diff --git a/imp/templates/mailbox/navbar.html b/imp/templates/mailbox/navbar.html
deleted file mode 100644 (file)
index dc211fb..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-<table width="100%" cellspacing="0">
- <tr class="mboxcontrol">
-  <td<if:isbottom> class="bottomborder"</if:isbottom>>
-<if:readonly><else:readonly>
-<if:use_pop><else:use_pop>
-   <div class="leftFloat">
-    <form id="select<tag:id />">
-    <input type="hidden" name="mailbox" value="<tag:mailbox />" />
-    <label for="flag<tag:id />" class="hidden"><gettext>Mark Messages</gettext></label>
-    <select id="flag<tag:id />" name="flag">
-     <option value="" selected="selected"><gettext>Mark Messages</gettext></option>
-     <option value="" disabled="disabled">- - - - - - - -</option>
-     <option value=""><gettext>Mark as:</gettext></option>
-<loop:flaglist_set>
-     <option value="<tag:flaglist_set.f />">&nbsp;&nbsp;<tag:flaglist_set.l /></option>
-</loop:flaglist_set>
-     <option value="" disabled="disabled">- - - - - - - -</option>
-     <option value=""><gettext>Unmark as:</gettext></option>
-<loop:flaglist_unset>
-     <option value="<tag:flaglist_unset.f />">&nbsp;&nbsp;<tag:flaglist_unset.l /></option>
-</loop:flaglist_unset>
-    </select>
-    </form>
-   </div>
-</else:use_pop></if:use_pop>
-<if:use_folders>
-   <div class="leftFloat" style="padding-left:10px">
-    <form method="post" action="<tag:mailbox_url />">
-    <input type="hidden" name="mailbox" value="<tag:mailbox />" />
-    <ul class="msgactions" style="display:inline">
-     <li><tag:move /></li>
-     <li class="lastnavbar"><tag:copy /></li>
-    </ul>
-    <label for="targetMailbox<tag:id />" class="hidden"><gettext>Target Mailbox:</gettext></label>
-    <select id="targetMailbox<tag:id />" name="targetMailbox">
-     <tag:folder_options />
-    </select>
-    </form>
-   </div>
-</if:use_folders>
-</else:readonly></if:readonly>
-   <div class="rightFloat">
-<if:multiple_page>
-    <form method="get" action="<tag:mailbox_url />">
-    <input type="hidden" name="mailbox" value="<tag:mailbox />" />
-    <tag:sessiontag />
-    <tag:pages_first /> <tag:pages_prev />
-    <label for="page<tag:id />" class="hidden"><gettext>Page:</gettext></label>
-    <input type="text" id="page<tag:id />" name="page" value="<tag:page_val />" size="<tag:page_size />" />
-    <tag:pages_next /> <tag:pages_last />
-    </form>
-</if:multiple_page>
-   </div>
-  </td>
- </tr>
-</table>
diff --git a/imp/templates/mailbox/search-mimp.html b/imp/templates/mailbox/search-mimp.html
deleted file mode 100644 (file)
index ab5e9e9..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-  <div><tag:title /></div>
-  <hr />
-  <form action="<tag:url />" method="post">
-   <input type="hidden" name="a" value="rs" />
-   <input type="hidden" name="mailbox" value="<tag:mailbox />" />
-   <p>
-    <gettext>Search:</gettext> <input name="search" />
-   </p>
-   <p>
-    <input type="submit" name="a" value="<gettext>Run Search</gettext>" />
-   </p>
-  </form>
-  <hr />
-  <div><gettext>Menu</gettext></div>
-  <tag:menu />
- </body>
-</html>
diff --git a/imp/templates/mailbox/searchfolder.html b/imp/templates/mailbox/searchfolder.html
deleted file mode 100644 (file)
index 2c065b5..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="smallheader ohide searchfolder">
- <tag:folder_link />
-</div>
diff --git a/imp/templates/menu.html b/imp/templates/menu.html
deleted file mode 100644 (file)
index 79aeb91..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<form action="mailbox.php" method="get" name="menuform" id="menuform">
-<tag:forminput />
-<div id="menu">
-<if:use_folders>
- <div class="rightFloat">
-  <input type="hidden" name="no_newmail_popup" value="1" />
-  <label for="mailbox">
-   <select name="mailbox"<if:ak> accesskey="<tag:ak />"</if:ak>><tag:flist /></select>
-  </label>
- </div>
- <div class="rightFloat">
-  <ul>
-   <li class="rightFloat" id="openfoldericon"><tag:flink /></li>
-  </ul>
- </div>
-</if:use_folders>
- <div class="leftFloat">
-  <tag:menu_string />
- </div>
- <br class="clear" />
-</div>
-</form>
diff --git a/imp/templates/message/message-mimp.html b/imp/templates/message/message-mimp.html
deleted file mode 100644 (file)
index fcf1073..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-  <div><tag:title /></div>
-  <hr />
-  <p>
-<loop:hdrs>
-   <div><em><tag:hdrs.label />:</em> <tag:hdrs.val /><if:hdrs.all_to> [<a href="<tag:hdrs.all_to />"><gettext>Show All</gettext></a>]</if:hdrs.all_to></div>
-</loop:hdrs>
-<loop:atc>
-   <div>
-    <em><gettext>Attachment</gettext>:</em> <tag:atc.descrip /> (<tag:atc.type />) <tag:atc.size />
-<if:atc.view>
-    [<a href="<tag:atc.view />">View</a>]
-</if:atc.view>
-<if:atc.download>
-    [<a href="<tag:atc.download />">Download</a>]
-</if:atc.download>
-   </div>
-</loop:atc>
-  </p>
-  <p>
-   <tag:msg />
-  </p>
-<if:fullmsg_link>
-  <p>
-   <a href="<tag:fullmsg_link />"><gettext>View Full Message</gettext></a>
-  </p>
-</if:fullmsg_link>
-  <hr />
-  <div><gettext>Menu</gettext></div>
-  <tag:menu />
- </body>
-</html>
diff --git a/imp/templates/message/message.html b/imp/templates/message/message.html
deleted file mode 100644 (file)
index 9ee0597..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<div id="msgheaders">
- <table cellspacing="0">
-<loop:headers>
-  <tr<if:headers.class> class="<tag:headers.class />"</if:headers.class>>
-   <td class="item<tag:headers.i /> rightAlign nowrap"><strong><tag:headers.name />:</strong>&nbsp;</td>
-   <td class="item<tag:headers.i /> msgheader"><tag:headers.val /></td>
-  </tr>
-</loop:headers>
- </table>
-</div>
-
-<div id="messageBody" class="messageBody">
- <tag:msgtext />
-</div>
diff --git a/imp/templates/message/navbar_actions.html b/imp/templates/message/navbar_actions.html
deleted file mode 100644 (file)
index 1ee06f2..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-<table class="navbaractions" width="100%" cellspacing="0">
- <tr>
-  <td class="mboxcontrol <if:isbottom>topborder<else:isbottom>bottomborder</else:isbottom></if:isbottom>">
-   <ul class="msgactions">
-<if:readonly><else:readonly>
-    <li><tag:delete /></li>
-</else:readonly></if:readonly>
-<if:reply>
-    <li><tag:reply />
-     <ul>
-      <li><tag:reply_sender /></li>
-      <if:reply_list><li><tag:reply_list /></li></if:reply_list>
-      <if:show_reply_all><li><tag:show_reply_all /></li></if:show_reply_all>
-     </ul>
-    </li>
-    <li><tag:forward />
-<if:forward_attach>
-     <ul>
-      <li><tag:forward_attach /></li>
-      <li><tag:forward_body /></li>
-      <li><tag:forward_both /></li>
-     </ul>
-</if:forward_attach>
-    </li>
-    <li><tag:redirect /></li>
-</if:reply>
-    <if:show_thread><li><tag:show_thread /></li></if:show_thread>
-<if:readonly><else:readonly>
-    <if:blacklist><li><tag:blacklist /></li></if:blacklist>
-    <if:whitelist><li><tag:whitelist /></li></if:whitelist>
-</else:readonly></if:readonly>
-    <if:view_source><li><tag:view_source /></li></if:view_source>
-    <if:resume><li><tag:resume /></li></if:resume>
-    <li><tag:save_as /></li>
-<if:readonly><else:readonly>
-    <if:spam><li><tag:spam /></li></if:spam>
-    <if:notspam><li><tag:notspam /></li></if:notspam>
-</else:readonly></if:readonly>
-    <li<if:atc><else:atc> class="lastnavbar"</else:atc></if:atc>><tag:headers />
-     <ul>
-      <if:common_headers><li><tag:common_headers /></li></if:common_headers>
-      <if:all_headers><li><tag:all_headers /></li></if:all_headers>
-      <if:list_headers><li><tag:list_headers /></li></if:list_headers>
-     </ul>
-    </li>
-<if:atc>
-    <li class="lastnavbar"><tag:atc />
-     <ul>
-      <if:show_parts_all><li><tag:show_parts_all /></li></if:show_parts_all>
-      <if:show_parts_atc><li><tag:show_parts_atc /></li></if:show_parts_atc>
-      <if:download_all><li><tag:download_all /></li></if:download_all>
-      <if:strip_all><li><tag:strip_all /></li></if:strip_all>
-     </ul>
-    </li>
-</if:atc>
-   </ul>
-  </td>
- </tr>
-</table>
diff --git a/imp/templates/message/navbar_navigate.html b/imp/templates/message/navbar_navigate.html
deleted file mode 100644 (file)
index e9f8446..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-<table class="msgActionTable">
- <tr class="mboxcontrol">
-  <td>
-<if:readonly><else:readonly>
-<if:usepop><else:usepop>
-   <div class="leftFloat">
-    <form id="select<tag:id />">
-    <input type="hidden" name="mailbox" value="<tag:mailbox />" />
-    <label for="flag<tag:id />" class="hidden"><gettext>Mark Message</gettext></label>
-    <select id="flag<tag:id />" name="flag">
-     <option value="" selected="selected"><gettext>Mark Message</gettext></option>
-     <option value="" disabled="disabled">- - - - - - - -</option>
-     <option value=""><gettext>Mark as:</gettext></option>
-<loop:flaglist_set>
-     <option value="<tag:flaglist_set.f />">&nbsp;&nbsp;<tag:flaglist_set.l /></option>
-</loop:flaglist_set>
-     <option value="" disabled="disabled">- - - - - - - -</option>
-     <option value=""><gettext>Unmark as:</gettext></option>
-<loop:flaglist_unset>
-     <option value="<tag:flaglist_unset.f />">&nbsp;&nbsp;<tag:flaglist_unset.l /></option>
-</loop:flaglist_unset>
-    </select>
-    </form>
-   </div>
-<if:move>
-   <div class="leftFloat msgActions">
-    <ul class="msgactions">
-     <li><tag:move /></li>
-     <li class="lastnavbar"><tag:copy /></li>
-    </ul>
-   </div>
-   <div class="leftFloat">
-    <label for="target<tag:id />" class="hidden"><gettext>Target Folder</gettext></label>
-    <select id="target<tag:id />" name="target<tag:id />">
-     <tag:options />
-    </select>
-   </div>
-</if:move>
-</else:usepop></if:usepop>
-</else:readonly></if:readonly>
-   <div class="rightFloat nowrap">
-    <tag:back_to />&nbsp;
-    <if:prev><tag:prev /></if:prev><tag:prev_img /><if:prev></a></if:prev>
-    <if:next><tag:next /></if:next><tag:next_img /><if:next></a></if:next>
-   </div>
-  </td>
- </tr>
-<if:isbottom>
- <tr>
-  <td class="bottomborder" colspan="3"></td>
- </tr>
-</if:isbottom>
-</table>
-<if:isbottom></form></if:isbottom>
diff --git a/imp/templates/message/navbar_top.html b/imp/templates/message/navbar_top.html
deleted file mode 100644 (file)
index c8f66fe..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<form method="post" id="messages" name="messages" action="<tag:message_url />">
-<tag:form_input />
-<input type="hidden" id="targetMbox" name="targetMbox" />
-<input type="hidden" id="actionID" name="actionID" />
-<input type="hidden" id="message_token" name="message_token" value="<tag:message_token />" />
-<input type="hidden" name="mailbox" value="<tag:mailbox />" />
-<input type="hidden" name="thismailbox" value="<tag:thismailbox />" />
-<input type="hidden" name="start" value="<tag:start />" />
-<input type="hidden" name="uid" value="<tag:uid />" />
-<input type="hidden" id="newMbox" name="newMbox" />
-<input type="hidden" name="flag" />
-<h1 class="header">
- <tag:label /> <span style="unicode-bidi: embed"><tag:msg_count /></span> <tag:status />
-</h1>
diff --git a/imp/templates/message/part-mimp.html b/imp/templates/message/part-mimp.html
deleted file mode 100644 (file)
index 322349b..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<if:view_data>
-  <tag:view_data />
-<else:view_data>
-  <p>
-   <gettext>Download attachment</gettext>:
-   <a href="<tag:download />"><tag:descrip /></a>
-   [<tag:type />] <tag:size />
-  </p>
-</else:view_data></if:view_data>
-  <hr />
-  <p>
-   <a href="<tag:self_link />"><gettext>Return to message view</gettext></a>
-  </p>
- </body>
-</html>
diff --git a/imp/templates/mimp/compose/compose.html b/imp/templates/mimp/compose/compose.html
new file mode 100644 (file)
index 0000000..80f34ab
--- /dev/null
@@ -0,0 +1,63 @@
+  <div><tag:title /></div>
+  <hr />
+  <form action="<tag:url />" method="post">
+   <input type="hidden" name="composeCache" value="<tag:cacheid />" />
+<if:redirect>
+   <input type="hidden" name="action" value="rc" />
+<else:redirect>
+   <p>
+    <label for="identity">
+     <gettext>From:</gettext>
+     <select id="identity" name="identity">
+<loop:identities>
+      <option value="<tag:identities.key />"<if:identities.sel> selected="selected"</if:identities.sel>><tag:identities.val /></option>
+</loop:identities>
+     </select>
+    </label>
+   </p>
+</if:redirect>
+<loop:hdrs>
+   <p>
+    <label for="<tag:hdrs.key />">
+     <tag:hdrs.label />
+     <input id="<tag:hdrs.key />" name="<tag:hdrs.key />" value="<tag:hdrs.val />" />
+    </label>
+   </p>
+<if:hdrs.matchlabel>
+   <blockquote>
+    <div><tag:hdrs.matchlabel /></div>
+<loop:hdrs.match>
+    <div><label for="<tag:hdrs.match.id />"><input type="checkbox" name="<tag:hdrs.match.id />" id="<tag:hdrs.match.id />" value="<tag:hdrs.match.val />" /><tag:hdrs.match.val /></label></div>
+</loop:hdrs.match>
+   </blockquote>
+</if:hdrs.matchlabel>
+</loop:hdrs>
+<if:redirect>
+   <p>
+    <input type="submit" name="a" value="<gettext>Redirect</gettext>" />
+<else:redirect>
+   <p>
+    <gettext>Subject:</gettext> <input name="subject" value="<tag:subject />" />
+   </p>
+   <p>
+    <gettext>Message:</gettext>
+    <br />
+    <textarea name="message" rows="10" cols="80"><tag:msg /></textarea>
+   </p>
+   <p>
+<if:compose_enable>
+    <input type="submit" name="a" value="<gettext>Send</gettext>" />
+</if:compose_enable>
+<if:save_draft>
+    <input type="submit" name="a" value="<gettext>Save Draft</gettext>" />
+</if:save_draft>
+</else:redirect></if:redirect>
+    <input type="submit" name="a" value="<gettext>Expand Names</gettext>" />
+    <input type="submit" name="a" value="<gettext>Cancel</gettext>" />
+   </p>
+  </form>
+  <hr />
+  <div><gettext>Menu</gettext></div>
+  <tag:menu />
+ </body>
+</html>
diff --git a/imp/templates/mimp/folders/folders.html b/imp/templates/mimp/folders/folders.html
new file mode 100644 (file)
index 0000000..4a99017
--- /dev/null
@@ -0,0 +1,10 @@
+  <div><tag:title /></div>
+  <hr />
+<loop:rows>
+  <div><tag:rows.level /><if:rows.link><a href="<tag:rows.link />"><tag:rows.label /></a><else:rows.link><tag:rows.label /></else:rows.link></if:rows.link><if:rows.msgs> (<tag:rows.msgs />)</if:rows.msgs></div>
+</loop:rows>
+  <hr />
+  <div><gettext>Menu</gettext></div>
+  <tag:menu />
+ </body>
+</html>
diff --git a/imp/templates/mimp/mailbox/mailbox.html b/imp/templates/mimp/mailbox/mailbox.html
new file mode 100644 (file)
index 0000000..0356fc8
--- /dev/null
@@ -0,0 +1,50 @@
+  <div><tag:title /></div>
+  <hr />
+<if:checkbox>
+  <form action="<tag:checkbox />" method="post">
+  <input type="hidden" name="mt" value="<tag:mt />" />
+  <tag:forminput />
+</if:checkbox>
+<if:msgs>
+  <table>
+   <tr>
+<if:checkbox>
+    <th></th>
+</if:checkbox>
+    <th><tag:hdr_arrival /></th>
+    <th><tag:hdr_from /></th>
+    <th><tag:hdr_subject /><if:hdr_subject_minor> <small>[<tag:hdr_subject_minor />]</small></if:hdr_subject_minor></th>
+   </tr>
+<loop:msgs>
+   <tr>
+<if:checkbox>
+    <td><input type="checkbox" name="indices[]" value="<tag:msgs.uid />" /></td>
+</if:checkbox>
+    <td><tag:msgs.status /></td>
+    <td><tag:msgs.from /></td>
+    <td><tag:msgs.thread /> <a href="<tag:msgs.target />"><tag:msgs.subject /></a></td>
+   </tr>
+</loop:msgs>
+  </table>
+<else:msgs>
+<div><gettext>No messages.</gettext></div>
+</else:msgs></if:msgs>
+  <hr />
+<if:checkbox>
+  <div>
+   <select name="checkbox">
+    <option value="" selected="selected"><gettext>Action:</gettext></option>
+    <option value="d">&nbsp;<gettext>Delete</gettext></option>
+    <option value="u">&nbsp;<gettext>Undelete</gettext></option>
+    <option value="s">&nbsp;<gettext>Report As Spam</gettext></option>
+    <option value="i">&nbsp;<gettext>Report As Innocent</gettext></option>
+   </select>
+   <input type="submit" value="<gettext>Do Action</gettext>" />
+  </div>
+  </form>
+  <hr />
+</if:checkbox>
+  <div><gettext>Menu</gettext></div>
+  <tag:menu />
+ </body>
+</html>
diff --git a/imp/templates/mimp/mailbox/search.html b/imp/templates/mimp/mailbox/search.html
new file mode 100644 (file)
index 0000000..ab5e9e9
--- /dev/null
@@ -0,0 +1,17 @@
+  <div><tag:title /></div>
+  <hr />
+  <form action="<tag:url />" method="post">
+   <input type="hidden" name="a" value="rs" />
+   <input type="hidden" name="mailbox" value="<tag:mailbox />" />
+   <p>
+    <gettext>Search:</gettext> <input name="search" />
+   </p>
+   <p>
+    <input type="submit" name="a" value="<gettext>Run Search</gettext>" />
+   </p>
+  </form>
+  <hr />
+  <div><gettext>Menu</gettext></div>
+  <tag:menu />
+ </body>
+</html>
diff --git a/imp/templates/mimp/message/message.html b/imp/templates/mimp/message/message.html
new file mode 100644 (file)
index 0000000..fcf1073
--- /dev/null
@@ -0,0 +1,31 @@
+  <div><tag:title /></div>
+  <hr />
+  <p>
+<loop:hdrs>
+   <div><em><tag:hdrs.label />:</em> <tag:hdrs.val /><if:hdrs.all_to> [<a href="<tag:hdrs.all_to />"><gettext>Show All</gettext></a>]</if:hdrs.all_to></div>
+</loop:hdrs>
+<loop:atc>
+   <div>
+    <em><gettext>Attachment</gettext>:</em> <tag:atc.descrip /> (<tag:atc.type />) <tag:atc.size />
+<if:atc.view>
+    [<a href="<tag:atc.view />">View</a>]
+</if:atc.view>
+<if:atc.download>
+    [<a href="<tag:atc.download />">Download</a>]
+</if:atc.download>
+   </div>
+</loop:atc>
+  </p>
+  <p>
+   <tag:msg />
+  </p>
+<if:fullmsg_link>
+  <p>
+   <a href="<tag:fullmsg_link />"><gettext>View Full Message</gettext></a>
+  </p>
+</if:fullmsg_link>
+  <hr />
+  <div><gettext>Menu</gettext></div>
+  <tag:menu />
+ </body>
+</html>
diff --git a/imp/templates/mimp/message/part.html b/imp/templates/mimp/message/part.html
new file mode 100644 (file)
index 0000000..322349b
--- /dev/null
@@ -0,0 +1,15 @@
+<if:view_data>
+  <tag:view_data />
+<else:view_data>
+  <p>
+   <gettext>Download attachment</gettext>:
+   <a href="<tag:download />"><tag:descrip /></a>
+   [<tag:type />] <tag:size />
+  </p>
+</else:view_data></if:view_data>
+  <hr />
+  <p>
+   <a href="<tag:self_link />"><gettext>Return to message view</gettext></a>
+  </p>
+ </body>
+</html>
diff --git a/imp/templates/pgp/import_key.html b/imp/templates/pgp/import_key.html
deleted file mode 100644 (file)
index 8233115..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-<form enctype="multipart/form-data" method="post" name="import_pgp_key" action="<tag:selfurl />">
-<if:broken_mp_form>
-<input type="hidden" name="msie_formdata_is_broken" value="" />
-</if:broken_mp_form>
-<input type="hidden" name="reload" value="<tag:reload />" />
-<input type="hidden" name="actionID" value="<tag:target />" />
-<tag:forminput />
-
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
- <tr>
-  <td class="header leftAlign nowrap"><if:import_public_key><gettext>Import Public PGP Key</gettext></if:import_public_key><if:import_personal_public_key><gettext>Import Personal Public PGP Key</gettext></if:import_personal_public_key><if:import_personal_private_key><gettext>Import Personal Private PGP Key</gettext></if:import_personal_private_key></td>
- </tr>
-
- <tr>
-  <td class="item leftAlign">
-   <table border="0" cellpadding="0" width="100%">
-    <tr>
-     <td class="item leftAlign"><label for="import_key"><strong><if:import_public_key><gettext>Import Public PGP Key Here:</gettext></if:import_public_key><if:import_personal_public_key><gettext>Import Personal Public PGP Key Here:</gettext></if:import_personal_public_key><if:import_personal_private_key><gettext>Import Personal Private PGP Key Here:</gettext></if:import_personal_private_key></strong></label></td>
-    </tr>
-    <tr>
-     <td class="item leftAlign">
-      <textarea id="import_key" name="import_key" rows="6" cols="80" class="fixed"></textarea>
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-
- <tr>
-  <td class="item leftAlign"><font color="red"><strong>--<gettext>OR</gettext>--</strong></font></td>
- </tr>
-
- <tr>
-  <td class="item leftAlign">
-   <table border="0" cellpadding="0" width="100%">
-    <tr>
-     <td class="item leftAlign">
-      <label for="upload_key"><strong><gettext>Upload:</gettext></strong></label>&nbsp;
-      <input id="upload_key" name="upload_key" type="file" size="40" />
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-
- <tr>
-  <td align="center" class="header nowrap">
-   <input type="submit" name="import" class="button" value="<gettext>Import Key</gettext>" />
-   <input type="submit" name="import" class="button" onclick="window.close();" value="<gettext>Cancel</gettext>" />
-  </td>
- </tr>
-</table>
-
-</form>
-</body>
-</html>
diff --git a/imp/templates/pgp/pgp.html b/imp/templates/pgp/pgp.html
deleted file mode 100644 (file)
index b80386c..0000000
+++ /dev/null
@@ -1,185 +0,0 @@
-<if:pgpactive>
- <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>
- <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>
- <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>
- <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>
-  <input type="submit" name="save" class="button" onclick="document.prefs.actionID.value='save_options'; return true;" value="<gettext>Save Options</gettext>" />
-  <input id="prefs_return" type="button" name="back" class="button" onclick="document.location.href='<tag:prefsurl />'" value="<gettext>Return to Options</gettext>" />
- </p>
-</div>
-
-<br class="spacer" />
-
-<div class="header">
- <ul><li><tag:manage_pubkey-help /></li></ul>
- <gettext>PGP Public Keyring</gettext>
-</div>
-
-<div class="prefsContainer item">
-<if:empty_pubkey_list>
- <div>
-  <em><gettext>No Keys in Keyring</gettext></em>
- </div>
-<else:empty_pubkey_list>
- <div>
-  <table>
-<loop:pubkey_list>
-   <tr>
-    <td><tag:pubkey_list.name /> (<tag:pubkey_list.email />)</td>
-    <td>&nbsp;&nbsp;[<tag:pubkey_list.view /><gettext>View</gettext></a>]&nbsp;[<tag:pubkey_list.info /><gettext>Details</gettext></a>]&nbsp;[<tag:pubkey_list.delete /><gettext>Delete</gettext></a>]</td>
-   </tr>
-</loop:pubkey_list>
-  </table>
- </div>
-</else:empty_pubkey_list></if:empty_pubkey_list>
-
-<if:no_file_upload>
- <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>
- <div>
-  <em><gettext>Key import is not available. You have no address book defined to add your contacts.</gettext></em>
- </div>
-<else:no_source>
- <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>
-
-<br class="spacer" />
-
-<div class="header">
- <ul><li><tag:personalkey-help /></li></ul>
- <gettext>Your PGP Public/Private Keys</gettext>
-</div>
-
-<div class="prefsContainer item">
-<if:secure_check>
- <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>&nbsp;&nbsp;[<tag:viewpublic /><gettext>View</gettext></a>]&nbsp;[<tag:infopublic /><gettext>Details</gettext></a>]&nbsp;[<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>&nbsp;&nbsp;[<tag:passphrase /></a>]&nbsp;[<tag:viewprivate /><gettext>View</gettext></a>]&nbsp;[<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>&nbsp;&nbsp;<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>&nbsp;&nbsp;<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>&nbsp;&nbsp;<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>&nbsp;
-     <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>&nbsp;&nbsp;<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>&nbsp;&nbsp;<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>" />
-<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>" />
-</else:no_file_upload></if:no_file_upload>
-   <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>
- <div>
-  <em><gettext>PGP support is disabled on this system.</gettext></em>
- </div>
-<else:use_pgp_locked>
- <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>
-  <input type="submit" name="save" class="button" onclick="document.prefs.actionID.value='save_options'; return true;" value="<gettext>Save Options</gettext>" />
-  <input id="prefs_return" type="button" name="back" class="button" onclick="document.location.href='<tag:prefsurl />'" value="<gettext>Return to Options</gettext>" />
- </p>
-</else:pgpactive></if:pgpactive>
-</div>
-</form>
diff --git a/imp/templates/prefs/filters/filters.html b/imp/templates/prefs/filters/filters.html
new file mode 100644 (file)
index 0000000..5864cc1
--- /dev/null
@@ -0,0 +1,37 @@
+<div class="header">
+ <tag:navcell /> <gettext>Filter Settings</gettext>
+</div>
+
+<if:notactive>
+<div class="prefsContainer item">
+ <em><gettext>Filter support is disabled on this system.</gettext></em>
+
+ <p><input type="button" name="back" class="button" onclick="document.location.href='<tag:prefsurl />'" value="<tag:return_text />" /></p>
+</div>
+<else:notactive>
+<div class="prefsContainer item">
+<form method="post" name="prefs" action="<tag:selfurl />">
+<tag:forminput />
+<input type="hidden" name="actionID" value="update_prefs" />
+<input type="hidden" name="group" value="<tag:group />" />
+<input type="hidden" name="app" value="<tag:app />" />
+
+<loop:links>
+<tag:links.img /> &nbsp;<tag:links.link /><tag:links.text /></a> &nbsp;<tag:links.help /><br />
+</loop:links>
+
+<if:opts>
+<br />
+<loop:opts>
+<input type="checkbox" id="filter_<tag:opts.key />" name="filter_<tag:opts.key />" <if:opts.checked>checked="checked" </if:opts.checked>/> &nbsp;<tag:opts.label /> &nbsp;<tag:opts.help /><br />
+</loop:opts>
+
+<p>
+ <input type="submit" name="save" class="button" onclick="document.prefs.actionID.value='update_prefs';return true;" value="<tag:save_opts />" />&nbsp;&nbsp;
+ <input id="prefs_return" type="button" name="back" class="button" onclick="document.location.href='<tag:prefsurl />'" value="<tag:return_text />" />
+</p>
+</if:opts>
+
+</form>
+</div>
+</else:notactive></if:notactive>
diff --git a/imp/templates/prefs/pgp/import_key.html b/imp/templates/prefs/pgp/import_key.html
new file mode 100644 (file)
index 0000000..8233115
--- /dev/null
@@ -0,0 +1,56 @@
+<form enctype="multipart/form-data" method="post" name="import_pgp_key" action="<tag:selfurl />">
+<if:broken_mp_form>
+<input type="hidden" name="msie_formdata_is_broken" value="" />
+</if:broken_mp_form>
+<input type="hidden" name="reload" value="<tag:reload />" />
+<input type="hidden" name="actionID" value="<tag:target />" />
+<tag:forminput />
+
+<table border="0" cellspacing="0" cellpadding="2" width="100%">
+ <tr>
+  <td class="header leftAlign nowrap"><if:import_public_key><gettext>Import Public PGP Key</gettext></if:import_public_key><if:import_personal_public_key><gettext>Import Personal Public PGP Key</gettext></if:import_personal_public_key><if:import_personal_private_key><gettext>Import Personal Private PGP Key</gettext></if:import_personal_private_key></td>
+ </tr>
+
+ <tr>
+  <td class="item leftAlign">
+   <table border="0" cellpadding="0" width="100%">
+    <tr>
+     <td class="item leftAlign"><label for="import_key"><strong><if:import_public_key><gettext>Import Public PGP Key Here:</gettext></if:import_public_key><if:import_personal_public_key><gettext>Import Personal Public PGP Key Here:</gettext></if:import_personal_public_key><if:import_personal_private_key><gettext>Import Personal Private PGP Key Here:</gettext></if:import_personal_private_key></strong></label></td>
+    </tr>
+    <tr>
+     <td class="item leftAlign">
+      <textarea id="import_key" name="import_key" rows="6" cols="80" class="fixed"></textarea>
+     </td>
+    </tr>
+   </table>
+  </td>
+ </tr>
+
+ <tr>
+  <td class="item leftAlign"><font color="red"><strong>--<gettext>OR</gettext>--</strong></font></td>
+ </tr>
+
+ <tr>
+  <td class="item leftAlign">
+   <table border="0" cellpadding="0" width="100%">
+    <tr>
+     <td class="item leftAlign">
+      <label for="upload_key"><strong><gettext>Upload:</gettext></strong></label>&nbsp;
+      <input id="upload_key" name="upload_key" type="file" size="40" />
+     </td>
+    </tr>
+   </table>
+  </td>
+ </tr>
+
+ <tr>
+  <td align="center" class="header nowrap">
+   <input type="submit" name="import" class="button" value="<gettext>Import Key</gettext>" />
+   <input type="submit" name="import" class="button" onclick="window.close();" value="<gettext>Cancel</gettext>" />
+  </td>
+ </tr>
+</table>
+
+</form>
+</body>
+</html>
diff --git a/imp/templates/prefs/pgp/pgp.html b/imp/templates/prefs/pgp/pgp.html
new file mode 100644 (file)
index 0000000..b80386c
--- /dev/null
@@ -0,0 +1,185 @@
+<if:pgpactive>
+ <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>
+ <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>
+ <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>
+ <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>
+  <input type="submit" name="save" class="button" onclick="document.prefs.actionID.value='save_options'; return true;" value="<gettext>Save Options</gettext>" />
+  <input id="prefs_return" type="button" name="back" class="button" onclick="document.location.href='<tag:prefsurl />'" value="<gettext>Return to Options</gettext>" />
+ </p>
+</div>
+
+<br class="spacer" />
+
+<div class="header">
+ <ul><li><tag:manage_pubkey-help /></li></ul>
+ <gettext>PGP Public Keyring</gettext>
+</div>
+
+<div class="prefsContainer item">
+<if:empty_pubkey_list>
+ <div>
+  <em><gettext>No Keys in Keyring</gettext></em>
+ </div>
+<else:empty_pubkey_list>
+ <div>
+  <table>
+<loop:pubkey_list>
+   <tr>
+    <td><tag:pubkey_list.name /> (<tag:pubkey_list.email />)</td>
+    <td>&nbsp;&nbsp;[<tag:pubkey_list.view /><gettext>View</gettext></a>]&nbsp;[<tag:pubkey_list.info /><gettext>Details</gettext></a>]&nbsp;[<tag:pubkey_list.delete /><gettext>Delete</gettext></a>]</td>
+   </tr>
+</loop:pubkey_list>
+  </table>
+ </div>
+</else:empty_pubkey_list></if:empty_pubkey_list>
+
+<if:no_file_upload>
+ <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>
+ <div>
+  <em><gettext>Key import is not available. You have no address book defined to add your contacts.</gettext></em>
+ </div>
+<else:no_source>
+ <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>
+
+<br class="spacer" />
+
+<div class="header">
+ <ul><li><tag:personalkey-help /></li></ul>
+ <gettext>Your PGP Public/Private Keys</gettext>
+</div>
+
+<div class="prefsContainer item">
+<if:secure_check>
+ <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>&nbsp;&nbsp;[<tag:viewpublic /><gettext>View</gettext></a>]&nbsp;[<tag:infopublic /><gettext>Details</gettext></a>]&nbsp;[<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>&nbsp;&nbsp;[<tag:passphrase /></a>]&nbsp;[<tag:viewprivate /><gettext>View</gettext></a>]&nbsp;[<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>&nbsp;&nbsp;<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>&nbsp;&nbsp;<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>&nbsp;&nbsp;<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>&nbsp;
+     <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>&nbsp;&nbsp;<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>&nbsp;&nbsp;<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>" />
+<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>" />
+</else:no_file_upload></if:no_file_upload>
+   <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>
+ <div>
+  <em><gettext>PGP support is disabled on this system.</gettext></em>
+ </div>
+<else:use_pgp_locked>
+ <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>
+  <input type="submit" name="save" class="button" onclick="document.prefs.actionID.value='save_options'; return true;" value="<gettext>Save Options</gettext>" />
+  <input id="prefs_return" type="button" name="back" class="button" onclick="document.location.href='<tag:prefsurl />'" value="<gettext>Return to Options</gettext>" />
+ </p>
+</else:pgpactive></if:pgpactive>
+</div>
+</form>
diff --git a/imp/templates/prefs/smime/import_key.html b/imp/templates/prefs/smime/import_key.html
new file mode 100644 (file)
index 0000000..cdd7b1f
--- /dev/null
@@ -0,0 +1,77 @@
+<form enctype="multipart/form-data" method="post" name="import_pgp_key" action="<tag:selfurl />">
+<if:broken_mp_form>
+<input type="hidden" name="msie_formdata_is_broken" value="" />
+</if:broken_mp_form>
+<input type="hidden" name="reload" value="<tag:reload />" />
+<input type="hidden" name="actionID" value="<tag:target />" />
+<tag:forminput />
+
+<table cellspacing="0" width="100%">
+ <tr>
+  <td class="header leftAlign nowrap"<if:import_personal_certs> colspan="2"</if:import_personal_certs>><if:import_public_key><gettext>Import Public S/MIME Key</gettext></if:import_public_key><if:import_personal_certs><gettext>Import Personal S/MIME Certificates</gettext></if:import_personal_certs></td>
+ </tr>
+
+<if:import_public_key>
+ <tr>
+  <td class="item leftAlign">
+   <table width="100%">
+    <tr>
+     <td class="item leftAlign"><label for="import_key"><strong><gettext>Insert Certificate Here:</gettext></strong></label></td>
+    </tr>
+    <tr>
+     <td class="item leftAlign">
+      <textarea id="import_key" name="import_key" rows="6" cols="80" class="fixed"></textarea>
+     </td>
+    </tr>
+   </table>
+  </td>
+ </tr>
+
+ <tr>
+  <td class="item leftAlign"><font color="red"><strong>--<gettext>OR</gettext>--</strong></font></td>
+ </tr>
+</if:import_public_key>
+
+ <tr>
+  <td class="item leftAlign"<if:import_personal_certs> colspan="2"</if:import_personal_certs>>
+   <table width="100%">
+    <tr>
+     <td class="item leftAlign">
+      <label for="upload_key"><strong><gettext>Upload:</gettext></strong></label>&nbsp;
+      <input id="upload_key" name="upload_key" type="file" size="40" />
+     </td>
+    </tr>
+   </table>
+  </td>
+ </tr>
+
+<if:import_personal_certs>
+ <tr>
+  <td class="item leftAlign" colspan="2">
+   <table width="100%">
+    <tr>
+     <td class="item leftAlign">
+      <label for="upload_key_pass"><strong><gettext>Password:</gettext></strong></label>&nbsp;<input id="upload_key_pass" name="upload_key_pass" type="password" size="30" />
+     </td>
+    </tr>
+    <tr>
+     <td class="item leftAlign">
+      <label for="upload_key_pk_pass"><strong><gettext>Private Key Password:</gettext></strong></label>&nbsp;<input id="upload_key_pk_pass" name="upload_key_pk_pass" type="password" size="30" />
+     </td>
+    </tr>
+   </table>
+  </td>
+ </tr>
+</if:import_personal_certs>
+
+ <tr>
+  <td align="center" class="header nowrap">
+   <input type="submit" name="import" class="button" value="<gettext>Import Key</gettext>" />
+   <input type="submit" name="import" class="button" onclick="window.close();" value="<gettext>Cancel</gettext>" />
+  </td>
+ </tr>
+</table>
+
+</form>
+</body>
+</html>
diff --git a/imp/templates/prefs/smime/smime.html b/imp/templates/prefs/smime/smime.html
new file mode 100644 (file)
index 0000000..b3206c9
--- /dev/null
@@ -0,0 +1,130 @@
+<if:smimeactive>
+ <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>
+ <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>
+  <input type="submit" name="save" class="button" onclick="document.prefs.actionID.value='save_options'; return true;" value="<gettext>Save Options</gettext>" />
+  <input id="prefs_return" type="button" name="back" class="button" onclick="document.location.href='<tag:prefsurl />'" value="<gettext>Return to Options</gettext>" />
+ </p>
+</div>
+
+<br class="spacer" />
+
+<div class="header">
+ <ul><li><tag:manage_pubkey-help /></li></ul>
+ <gettext>S/MIME Public Keyring</gettext>
+</div>
+
+<div class="prefsContainer item">
+ <div>
+<if:empty_pubkey_list>
+  <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>&nbsp;&nbsp;[<tag:pubkey_list.view /><gettext>View</gettext></a>]&nbsp;[<tag:pubkey_list.info /><gettext>Details</gettext></a>]&nbsp;[<tag:pubkey_list.delete /><gettext>Delete</gettext></a>]</td>
+   </tr>
+</loop:pubkey_list>
+  </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>
+<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>
+<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>
+</else:no_source></if:no_source></else:no_file_upload></if:no_file_upload>
+ </div>
+</div>
+
+<br class="spacer" />
+
+<div class="header">
+ <ul><li><tag:personalkey-help /></li></ul>
+ <gettext>Your S/MIME Public/Private Certificate</gettext>
+</div>
+
+<div class="prefsContainer item">
+<if:secure_check>
+<if:has_key>
+ <div>
+  <table>
+   <tr>
+    <td><gettext>Your Public Key:</gettext></td>
+    <td>&nbsp;&nbsp;[<tag:viewpublic /><gettext>View</gettext></a>]&nbsp;[<tag:infopublic /><gettext>Details</gettext></a>]</td>
+   </tr>
+   <tr>
+    <td><gettext>Your Private Key:</gettext></td>
+    <td>&nbsp;&nbsp;[<tag:passphrase /></a>]&nbsp;[<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>
+<else:has_key>
+<if:no_file_upload>
+ <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>
+ <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>
+ <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>
+ <div>
+  <em><gettext>S/MIME support is disabled on this system.</gettext></em>
+ </div>
+<else:use_smime_locked>
+ <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>
+  <input type="submit" name="save" class="button" onclick="document.prefs.actionID.value='save_options'; return true;" value="<gettext>Save Options</gettext>" />
+  <input id="prefs_return" type="button" name="back" class="button" onclick="document.location.href='<tag:prefsurl />'" value="<gettext>Return to Options</gettext>" />
+ </p>
+</else:smimeactive></if:smimeactive>
+</div>
+</form>
diff --git a/imp/templates/prefs/stationery/stationery.html b/imp/templates/prefs/stationery/stationery.html
new file mode 100644 (file)
index 0000000..e493005
--- /dev/null
@@ -0,0 +1,49 @@
+<form method="post" name="prefs" action="<tag:action />">
+<tag:forminput />
+<input type="hidden" name="actionID" value="update" />
+<input type="hidden" name="group" value="compose" />
+<input type="hidden" name="app" value="imp" />
+
+<div class="header">
+ <tag:navcell /> <gettext>Stationery</gettext>
+</div>
+
+<p class="item">
+<label for="stationery" class="hidden"><gettext>Stationery</gettext></label>
+<select id="stationery" name="stationery" onchange="document.prefs.edit.click()">
+ <option value=""><gettext>Create new stationery</gettext></option>
+<loop:slist>
+ <option value="<tag:slist.val />"<if:slist.selected> selected="selected"</if:slist.selected>><tag:slist.text /></option>
+</loop:slist>
+</select>
+<input type="submit" name="edit" class="button" value="<gettext>Edit</gettext>" />
+
+<br />
+
+<input type="hidden" name="last_type" value="<tag:last_type />" />
+<tag:name_label />
+<br />
+<input type="text" name="name" id="name" value="<tag:name />" />
+<br />
+<tag:type_label />
+<br />
+<select name="type" id="type" onchange="if (document.prefs.onsubmit) document.prefs.onsubmit(); document.prefs.submit()">
+ <option value="plain"<if:plain> selected="selected"</if:plain>><gettext>Text</gettext></option>
+ <option value="html"<if:html> selected="selected"</if:html>><gettext>HTML</gettext></option>
+</select>
+<br />
+<tag:content_label />
+<br />
+<textarea name="content" id="content" rows="15" cols="80" class="fixed"><tag:content /></textarea>
+<br />
+<em><gettext>You can use the following placeholders in the stationery text: %c for the current message content; %s for the signature.</gettext></em>
+</p>
+
+<input type="submit" name="save" class="button" value="<gettext>Save Stationery</gettext>" />&nbsp;&nbsp;
+<if:selected>
+<input type="submit" name="delete" class="button" value="<gettext>Delete Stationery</gettext>" />&nbsp;&nbsp;
+</if:selected>
+
+<input type="button" name="back" class="button" onclick="document.location.href='<tag:button_href />'" value="<tag:button_val />" />
+
+</form>
diff --git a/imp/templates/search/search-basic.html b/imp/templates/search/search-basic.html
deleted file mode 100644 (file)
index f9a701f..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-<form method="post" action="<tag:action />">
-<input type="hidden" name="search_basic_mbox" value="<tag:mbox />" />
-
-<h1 class="header">
- <strong><tag:search_title /></strong>
-</h1>
-
-<table class="item">
- <tr>
-  <td class="searchUILabel"><gettext>Search Criteria:</gettext></td>
-  <td>
-   <select name="search_criteria">
-    <option value=""><gettext>None</gettext></option>
-    <option value="" disabled="disabled">- - - - - - - - - -</option>
-<loop:s_fields>
-    <option value="<tag:s_fields.val />"><tag:s_fields.label /></option>
-</loop:s_fields>
-   </select>
-   <span<if:hide_criteria> style="display:none"</if:hide_criteria>>
-    <input type="text" name="search_criteria_text" size="30" />
-    <input type="checkbox" class="checkbox" name="search_criteria_not" />
-    <label for="search_criteria_not"><gettext>Do NOT Match</gettext></label>
-   </span>
-  </td>
- </tr>
- <tr>
-  <td class="searchUILabel"><gettext>Search Flags:</gettext></td>
-  <td>
-   <select name="search_flags">
-    <option value=""><gettext>None</gettext></option>
-    <option value="" disabled="disabled">- - - - - - - - - -</option>
-<loop:f_fields>
-    <option value="<tag:f_fields.val />"><tag:f_fields.label /></option>
-</loop:f_fields>
-   </select>
-  </td>
- </tr>
-<if:advsearch>
-<tr>
-  <td colspan="2"><tag:advsearch /><gettext>Go to Advanced Search Page...</gettext></td>
- </tr>
-</if:advsearch>
-</table>
-
-<div>
- <input type="submit" class="button basicSearchSubmit" value="<gettext>Submit</gettext>" />
- <input type="reset" class="button basicSearchReset" value="<gettext>Reset</gettext>" />
-</div>
-</form>
diff --git a/imp/templates/search/search.html b/imp/templates/search/search.html
deleted file mode 100644 (file)
index 409b652..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-<form id="search_form" action="<tag:action />" method="post">
- <input class="hidden" name="criteria_form" id="criteria_form" value="" />
-
- <h1 class="header">
-  <strong><if:edit_query_vfolder><gettext>Edit Virtual Folder</gettext><else:edit_query_vfolder><gettext>Search</gettext></else:edit_query_vfolder></if:edit_query_vfolder></strong>
- </h1>
-
- <div id="recent_searches_div" class="smallheader leftAlign" style="display:none">
-  <span class="searchuiImg arrowExpanded" style="display:none"></span>
-  <span class="searchuiImg arrowCollapsed"></span>
-  <gettext>Recent Searches</gettext>
- </div>
-
- <div class="item" style="display:none">
-  <label for="recent_searches" class="hidden"><gettext>Recent Searches:</gettext></label>
-  <select id="recent_searches">
-   <option value=""><gettext>Recent Searches:</gettext></option>
-  </select>
- </div>
-
- <div class="smallheader leftAlign">
-  <span class="searchuiImg arrowExpanded"></span>
-  <span class="searchuiImg arrowCollapsed" style="display:none"></span>
- <gettext>Search Criteria</gettext>
- </div>
-
- <div class="item">
-  <table id="search_criteria_table"></table>
-  <div>
-   <select id="search_criteria">
-    <option value=""><gettext>Add search criteria:</gettext></option>
-    <option value="" disabled="disabled">- - - - - - - - -</option>
-    <option value="or" style="display:none"><gettext>Add OR clause</gettext></option>
-    <option value="" disabled="disabled" style="display:none">- - - - - - - - -</option>
-<loop:s_fields>
-    <option value="<tag:s_fields.val />"><tag:s_fields.label /></option>
-</loop:s_fields>
-    <option value="" disabled="disabled">- - - - - - - - -</option>
-<loop:f_fields>
-    <option value="<tag:f_fields.val />"><tag:f_fields.label /></option>
-</loop:f_fields>
-   </select>
-  </div>
- </div>
-
- <div class="smallheader leftAlign" id="search_folders_hdr">
-  <span class="searchuiImg arrowExpanded" style="display:none"></span>
-  <span class="searchuiImg arrowCollapsed"></span>
-  <gettext>Search Folders</gettext>
-  <span class="searchuiFoldersActions" style="display:none">
-   <a id="link_sel_all" href="#"><gettext>Select all</gettext></a> |
-   <a id="link_sel_none" href="#"><gettext>Select none</gettext></a>
-<if:subscribe>
-| <a id="link_sub" href="#"><span><gettext>Show All</gettext></span><span style="display:none"><gettext>Show Subscribed Only</gettext></span></a>
-</if:subscribe>
-  </span>
- </div>
-
- <div class="item striped" style="display:none">
- </div>
-
-<if:virtualfolder>
- <div class="smallheader leftAlign">
-  <span class="searchuiImg arrowExpanded" style="display:none"></span>
-  <span class="searchuiImg arrowCollapsed"></span>
-  <gettext>Saved Searches</gettext>
- </div>
-
- <div style="display:none">
-<if:edit_query_vfolder>
-  <input type="hidden" name="edit_query_vfolder" value="" />
-<else:edit_query_vfolder>
-  <div class="item">
-   <input type="checkbox" class="checkbox" id="search_save" name="search_save" /> <label for="search_save"><gettext>Save search?</gettext></label>
-  </div>
-  <div class="item">
-   <label for="search_type"><gettext>Type:</gettext></label>
-   <select id="search_type" name="search_type">
-    <option value="vfolder"><gettext>Virtual Folder</gettext></option>
-   </select>
-  </div>
-</else:edit_query_vfolder></if:edit_query_vfolder>
-  <div class="item">
-   <label for="search_label"><gettext>Label:</gettext></label> <input type="text" name="search_label" id="search_label" />
-  </div>
- </div>
-</if:virtualfolder>
-
- <div class="searchuiButtons">
-  <input type="button" id="search_submit" class="button" value="<if:edit_query_vfolder><gettext>Save</gettext><else:edit_query_vfolder><gettext>Submit</gettext></else:edit_query_vfolder></if:edit_query_vfolder>" />
-  <input type="button" id="search_reset" class="button" value="<gettext>Reset</gettext>" />
-<if:return_mailbox_text>
-  <input type="button" id="search_dimp_return" class="button" value="<gettext>Return to</gettext> <tag:return_mailbox_text />" />
-</if:return_mailbox_text>
- </div>
-</form>
-
-<div id="folder_row" style="display:none">
- <input type="checkbox" class="checkbox" name="search_folders_form[]" />
-</div>
-
-<select id="within_criteria" style="display:none">
- <option value="d"><gettext>Days</gettext></option>
- <option value="m"><gettext>Months</gettext></option>
- <option value="y"><gettext>Years</gettext></option>
-</select>
diff --git a/imp/templates/smime/import_key.html b/imp/templates/smime/import_key.html
deleted file mode 100644 (file)
index cdd7b1f..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-<form enctype="multipart/form-data" method="post" name="import_pgp_key" action="<tag:selfurl />">
-<if:broken_mp_form>
-<input type="hidden" name="msie_formdata_is_broken" value="" />
-</if:broken_mp_form>
-<input type="hidden" name="reload" value="<tag:reload />" />
-<input type="hidden" name="actionID" value="<tag:target />" />
-<tag:forminput />
-
-<table cellspacing="0" width="100%">
- <tr>
-  <td class="header leftAlign nowrap"<if:import_personal_certs> colspan="2"</if:import_personal_certs>><if:import_public_key><gettext>Import Public S/MIME Key</gettext></if:import_public_key><if:import_personal_certs><gettext>Import Personal S/MIME Certificates</gettext></if:import_personal_certs></td>
- </tr>
-
-<if:import_public_key>
- <tr>
-  <td class="item leftAlign">
-   <table width="100%">
-    <tr>
-     <td class="item leftAlign"><label for="import_key"><strong><gettext>Insert Certificate Here:</gettext></strong></label></td>
-    </tr>
-    <tr>
-     <td class="item leftAlign">
-      <textarea id="import_key" name="import_key" rows="6" cols="80" class="fixed"></textarea>
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-
- <tr>
-  <td class="item leftAlign"><font color="red"><strong>--<gettext>OR</gettext>--</strong></font></td>
- </tr>
-</if:import_public_key>
-
- <tr>
-  <td class="item leftAlign"<if:import_personal_certs> colspan="2"</if:import_personal_certs>>
-   <table width="100%">
-    <tr>
-     <td class="item leftAlign">
-      <label for="upload_key"><strong><gettext>Upload:</gettext></strong></label>&nbsp;
-      <input id="upload_key" name="upload_key" type="file" size="40" />
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-
-<if:import_personal_certs>
- <tr>
-  <td class="item leftAlign" colspan="2">
-   <table width="100%">
-    <tr>
-     <td class="item leftAlign">
-      <label for="upload_key_pass"><strong><gettext>Password:</gettext></strong></label>&nbsp;<input id="upload_key_pass" name="upload_key_pass" type="password" size="30" />
-     </td>
-    </tr>
-    <tr>
-     <td class="item leftAlign">
-      <label for="upload_key_pk_pass"><strong><gettext>Private Key Password:</gettext></strong></label>&nbsp;<input id="upload_key_pk_pass" name="upload_key_pk_pass" type="password" size="30" />
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-</if:import_personal_certs>
-
- <tr>
-  <td align="center" class="header nowrap">
-   <input type="submit" name="import" class="button" value="<gettext>Import Key</gettext>" />
-   <input type="submit" name="import" class="button" onclick="window.close();" value="<gettext>Cancel</gettext>" />
-  </td>
- </tr>
-</table>
-
-</form>
-</body>
-</html>
diff --git a/imp/templates/smime/smime.html b/imp/templates/smime/smime.html
deleted file mode 100644 (file)
index b3206c9..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-<if:smimeactive>
- <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>
- <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>
-  <input type="submit" name="save" class="button" onclick="document.prefs.actionID.value='save_options'; return true;" value="<gettext>Save Options</gettext>" />
-  <input id="prefs_return" type="button" name="back" class="button" onclick="document.location.href='<tag:prefsurl />'" value="<gettext>Return to Options</gettext>" />
- </p>
-</div>
-
-<br class="spacer" />
-
-<div class="header">
- <ul><li><tag:manage_pubkey-help /></li></ul>
- <gettext>S/MIME Public Keyring</gettext>
-</div>
-
-<div class="prefsContainer item">
- <div>
-<if:empty_pubkey_list>
-  <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>&nbsp;&nbsp;[<tag:pubkey_list.view /><gettext>View</gettext></a>]&nbsp;[<tag:pubkey_list.info /><gettext>Details</gettext></a>]&nbsp;[<tag:pubkey_list.delete /><gettext>Delete</gettext></a>]</td>
-   </tr>
-</loop:pubkey_list>
-  </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>
-<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>
-<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>
-</else:no_source></if:no_source></else:no_file_upload></if:no_file_upload>
- </div>
-</div>
-
-<br class="spacer" />
-
-<div class="header">
- <ul><li><tag:personalkey-help /></li></ul>
- <gettext>Your S/MIME Public/Private Certificate</gettext>
-</div>
-
-<div class="prefsContainer item">
-<if:secure_check>
-<if:has_key>
- <div>
-  <table>
-   <tr>
-    <td><gettext>Your Public Key:</gettext></td>
-    <td>&nbsp;&nbsp;[<tag:viewpublic /><gettext>View</gettext></a>]&nbsp;[<tag:infopublic /><gettext>Details</gettext></a>]</td>
-   </tr>
-   <tr>
-    <td><gettext>Your Private Key:</gettext></td>
-    <td>&nbsp;&nbsp;[<tag:passphrase /></a>]&nbsp;[<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>
-<else:has_key>
-<if:no_file_upload>
- <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>
- <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>
- <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>
- <div>
-  <em><gettext>S/MIME support is disabled on this system.</gettext></em>
- </div>
-<else:use_smime_locked>
- <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>
-  <input type="submit" name="save" class="button" onclick="document.prefs.actionID.value='save_options'; return true;" value="<gettext>Save Options</gettext>" />
-  <input id="prefs_return" type="button" name="back" class="button" onclick="document.location.href='<tag:prefsurl />'" value="<gettext>Return to Options</gettext>" />
- </p>
-</else:smimeactive></if:smimeactive>
-</div>
-</form>
diff --git a/imp/templates/stationery/stationery.html b/imp/templates/stationery/stationery.html
deleted file mode 100644 (file)
index e493005..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-<form method="post" name="prefs" action="<tag:action />">
-<tag:forminput />
-<input type="hidden" name="actionID" value="update" />
-<input type="hidden" name="group" value="compose" />
-<input type="hidden" name="app" value="imp" />
-
-<div class="header">
- <tag:navcell /> <gettext>Stationery</gettext>
-</div>
-
-<p class="item">
-<label for="stationery" class="hidden"><gettext>Stationery</gettext></label>
-<select id="stationery" name="stationery" onchange="document.prefs.edit.click()">
- <option value=""><gettext>Create new stationery</gettext></option>
-<loop:slist>
- <option value="<tag:slist.val />"<if:slist.selected> selected="selected"</if:slist.selected>><tag:slist.text /></option>
-</loop:slist>
-</select>
-<input type="submit" name="edit" class="button" value="<gettext>Edit</gettext>" />
-
-<br />
-
-<input type="hidden" name="last_type" value="<tag:last_type />" />
-<tag:name_label />
-<br />
-<input type="text" name="name" id="name" value="<tag:name />" />
-<br />
-<tag:type_label />
-<br />
-<select name="type" id="type" onchange="if (document.prefs.onsubmit) document.prefs.onsubmit(); document.prefs.submit()">
- <option value="plain"<if:plain> selected="selected"</if:plain>><gettext>Text</gettext></option>
- <option value="html"<if:html> selected="selected"</if:html>><gettext>HTML</gettext></option>
-</select>
-<br />
-<tag:content_label />
-<br />
-<textarea name="content" id="content" rows="15" cols="80" class="fixed"><tag:content /></textarea>
-<br />
-<em><gettext>You can use the following placeholders in the stationery text: %c for the current message content; %s for the signature.</gettext></em>
-</p>
-
-<input type="submit" name="save" class="button" value="<gettext>Save Stationery</gettext>" />&nbsp;&nbsp;
-<if:selected>
-<input type="submit" name="delete" class="button" value="<gettext>Delete Stationery</gettext>" />&nbsp;&nbsp;
-</if:selected>
-
-<input type="button" name="back" class="button" onclick="document.location.href='<tag:button_href />'" value="<tag:button_val />" />
-
-</form>
diff --git a/imp/templates/thread/thread.html b/imp/templates/thread/thread.html
deleted file mode 100644 (file)
index 61d940b..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<h1 class="header">
- <if:thread><gettext>Thread Display:</gettext><else:thread><gettext>Multiple Message View:</gettext></else:thread></if:thread> <tag:subject /> <tag:delete />
-</h1>
-
-<a id="display"></a>
-<div class="solidbox striped threadSummary">
-<loop:tree>
- <div><tag:tree.subject /></div>
-</loop:tree>
-</div>
-
-<loop:messages>
-<a id="i<tag:messages.idx />"></a>
-<div class="solidbox threadBox">
- <div class="item0">
-  <span class="threadlink"><tag:messages.link /></span>
-  <strong><if:messages.addr_to><gettext>To:</gettext><else:messages.addr_to><gettext>From:</gettext></else:messages.addr_to></if:messages.addr_to></strong>
-  <tag:messages.addr />
-  (<small><tag:messages.date /></small>)
- </div>
-
- <div class="messageBody">
-  <tag:messages.body />
- </div>
-</div>
-</loop:messages>
index 5093bd7..de4be45 100644 (file)
@@ -162,5 +162,5 @@ IMP::prepareMenu();
 require IMP_TEMPLATES . '/common-header.inc';
 IMP::menu();
 IMP::status();
-echo $template->fetch(IMP_TEMPLATES . '/thread/thread.html');
+echo $template->fetch(IMP_TEMPLATES . '/imp/thread/thread.html');
 require $registry->get('templates', 'horde') . '/common-footer.inc';