From: Michael M Slusarz Date: Tue, 16 Mar 2010 03:14:47 +0000 (-0600) Subject: More coherent organization of IMP templates X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=55b00688ec61efc6d4b74eb5d7bd928ffb9a541a;p=horde.git More coherent organization of IMP templates Better separates the three views. --- diff --git a/imp/acl.php b/imp/acl.php index b4e03adc2..5588927d4 100644 --- a/imp/acl.php +++ b/imp/acl.php @@ -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'; } diff --git a/imp/compose-dimp.php b/imp/compose-dimp.php index ce11c81d8..33044736b 100644 --- a/imp/compose-dimp.php +++ b/imp/compose-dimp.php @@ -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']; diff --git a/imp/compose-mimp.php b/imp/compose-mimp.php index 73bb8db02..e4ed60310 100644 --- a/imp/compose-mimp.php +++ b/imp/compose-mimp.php @@ -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'); diff --git a/imp/compose.php b/imp/compose.php index 483674a89..5e89cdfe8 100644 --- a/imp/compose.php +++ b/imp/compose.php @@ -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) { diff --git a/imp/config/hooks.php.dist b/imp/config/hooks.php.dist index b5de25f38..1bd35a58f 100644 --- a/imp/config/hooks.php.dist +++ b/imp/config/hooks.php.dist @@ -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 diff --git a/imp/contacts.php b/imp/contacts.php index f391af752..30b91048f 100644 --- a/imp/contacts.php +++ b/imp/contacts.php @@ -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'; diff --git a/imp/filterprefs.php b/imp/filterprefs.php index 25e3432af..cbda88b78 100644 --- a/imp/filterprefs.php +++ b/imp/filterprefs.php @@ -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'; } diff --git a/imp/folders-mimp.php b/imp/folders-mimp.php index 92a85b851..ff960c005 100644 --- a/imp/folders-mimp.php +++ b/imp/folders-mimp.php @@ -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'); diff --git a/imp/folders.php b/imp/folders.php index 50893b5d8..c31261409 100644 --- a/imp/folders.php +++ b/imp/folders.php @@ -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. */ diff --git a/imp/index-dimp.php b/imp/index-dimp.php index 3fe736455..4acf8dbc1 100644 --- a/imp/index-dimp.php +++ b/imp/index-dimp.php @@ -62,7 +62,7 @@ foreach (IMP_Dimp::menuList() as $app) { } echo "\n"; -require IMP_TEMPLATES . '/index/index-dimp.inc'; +require IMP_TEMPLATES . '/dimp/index.inc'; Horde::includeScriptFiles(); Horde::outputInlineScript(); echo "\n"; diff --git a/imp/lib/Crypt/Pgp.php b/imp/lib/Crypt/Pgp.php index b8f940f84..7d4de5e9f 100644 --- a/imp/lib/Crypt/Pgp.php +++ b/imp/lib/Crypt/Pgp.php @@ -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'); } /** diff --git a/imp/lib/Crypt/Smime.php b/imp/lib/Crypt/Smime.php index b094c3cc9..fd9756605 100644 --- a/imp/lib/Crypt/Smime.php +++ b/imp/lib/Crypt/Smime.php @@ -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'); } /** diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php index ec4510b8b..ea6b13a56 100644 --- a/imp/lib/IMP.php +++ b/imp/lib/IMP.php @@ -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'); } /** diff --git a/imp/lib/Ui/Compose.php b/imp/lib/Ui/Compose.php index 87f009b4b..378764503 100644 --- a/imp/lib/Ui/Compose.php +++ b/imp/lib/Ui/Compose.php @@ -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'; } diff --git a/imp/lib/Views/Compose.php b/imp/lib/Views/Compose.php index f78e1cc8c..16c6c1f54 100644 --- a/imp/lib/Views/Compose.php +++ b/imp/lib/Views/Compose.php @@ -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(); diff --git a/imp/mailbox-mimp.php b/imp/mailbox-mimp.php index 95f863494..9c6e106b8 100644 --- a/imp/mailbox-mimp.php +++ b/imp/mailbox-mimp.php @@ -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'); diff --git a/imp/mailbox.php b/imp/mailbox.php index df0cd0c2f..2463f6724 100644 --- a/imp/mailbox.php +++ b/imp/mailbox.php @@ -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( diff --git a/imp/message-dimp.php b/imp/message-dimp.php index 489884d44..b36d0c06d 100644 --- a/imp/message-dimp.php +++ b/imp/message-dimp.php @@ -89,7 +89,7 @@ Horde::addInlineScript(array_filter($js_onload), 'load'); IMP::status(); IMP_Dimp::header($show_msg_result['title'], $scripts); echo "\n"; -require IMP_TEMPLATES . '/chunks/message.php'; +require IMP_TEMPLATES . '/dimp/chunks/message.php'; Horde::includeScriptFiles(); Horde::outputInlineScript(); if (!$disable_compose) { diff --git a/imp/message-mimp.php b/imp/message-mimp.php index 3e9b6154a..4082d0910 100644 --- a/imp/message-mimp.php +++ b/imp/message-mimp.php @@ -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'); diff --git a/imp/message.php b/imp/message.php index e7203bc85..f31d05441 100644 --- a/imp/message.php +++ b/imp/message.php @@ -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'; diff --git a/imp/pgp.php b/imp/pgp.php index 751cc8aa2..28f576c9c 100644 --- a/imp/pgp.php +++ b/imp/pgp.php @@ -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'; } diff --git a/imp/search-basic.php b/imp/search-basic.php index b24875e7a..87ce1cdf1 100644 --- a/imp/search-basic.php +++ b/imp/search-basic.php @@ -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'; diff --git a/imp/search.php b/imp/search.php index 8c4ef4dc0..97d72b4a8 100644 --- a/imp/search.php +++ b/imp/search.php @@ -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'; diff --git a/imp/stationery.php b/imp/stationery.php index 81f9af3f0..2a818c364 100644 --- a/imp/stationery.php +++ b/imp/stationery.php @@ -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 index 9fd0a26df..000000000 --- a/imp/templates/acl/acl.html +++ /dev/null @@ -1,102 +0,0 @@ -
- - - -
- - Share mail folders -
- -
-
    -
  • - - -
    • -
- -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- The current list of users with access to this folder could not be retrieved. -  
- -  
-

User

- 		-

-
- - disabled="disabled" name="acl[][]" value="" disabled="disabled" checked="checked" /> -
- - - -
 
- - - -  
- You do not have permission to change access to this folder. -  
- -  
- diff --git a/imp/templates/chunks/compose.php b/imp/templates/chunks/compose.php deleted file mode 100644 index 32ec64c77..000000000 --- a/imp/templates/chunks/compose.php +++ /dev/null @@ -1,146 +0,0 @@ -getValue('disposition_request_read'); -$save_attach = $GLOBALS['prefs']->getValue('save_attachments'); - -/* Determine if compose mode is disabled. */ -$compose_disable = !IMP::canCompose(); - -?> -
- - - - - -
- -
'Forward', 'id' => 'send_button', 'title' => _("Send"))); ?>
- -
'Spellcheck', 'id' => 'spellcheck', 'title' => _("Check Spelling"))); ?>
-
'Drafts', 'id' => 'draft_button', 'title' => _("Save as Draft"))); ?>
-
- -
-
-
-
- -
-
- -
- -
- -
- - -
- -
- -isLocked('save_sent_mail')): ?> -
- - -
- -getValue('set_priority')): ?> -
- - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - -
: - - -
- - -
-
- -
- -
-
-
- - - - diff --git a/imp/templates/chunks/message.php b/imp/templates/chunks/message.php deleted file mode 100644 index b0a4a8ed4..000000000 --- a/imp/templates/chunks/message.php +++ /dev/null @@ -1,149 +0,0 @@ - -
- - - - -isLocked('forward_default')): ?> - - - - - - -
- - - [] - - - - -
diff --git a/imp/templates/common-header.inc b/imp/templates/common-header.inc index 23bc4f8fe..d534b9b6b 100644 --- a/imp/templates/common-header.inc +++ b/imp/templates/common-header.inc @@ -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 index 80f34ab6e..000000000 --- a/imp/templates/compose/compose-mimp.html +++ /dev/null @@ -1,63 +0,0 @@ -
-
-
- - - - -

- -

- - -

- -

- -
-
- -
- -
- - - -

- - -

- Subject: -

-

- Message: -
- -

-

- - - - - - - - - -

- -
-
Menu
- - - diff --git a/imp/templates/compose/compose.html b/imp/templates/compose/compose.html deleted file mode 100644 index 371db3e9c..000000000 --- a/imp/templates/compose/compose.html +++ /dev/null @@ -1,308 +0,0 @@ -
enctype="multipart/form-data" action=""> - - - - - -

-
- -

- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  - - class="button" value="Send Message" /> - - - class="button" value="Save Draft" /> - - -
From  - - -   - - - - - - - - - - - - -
  - - -
  - -
-   - - -
-   - - -
  - -
  - - - - - - -
-
-
-
  - checked="checked" /> - - - - - - -
  - checked="checked" /> -
  - - - Switch to plain text compositionSwitch to HTML composition -
  - -
  - - class="button" value="Send Message" /> - - - class="button" value="Save Draft" /> - - -
  - :  - -
  - checked="checked" /> - -
  - checked="checked" /> - -
- - -
- -

-  Attachments - -   - - -

- - - - - - - - - - - - - - - - - - - - - - -
Maximum total attachment size reached.Maximum number of attachments reached. - - - - - - - -
- -
- (Maximum Attachment Size: bytes) -
- 		- -
-   - -
- - -
- -
- Current Attachments (Total Size: KB / ) -
- - - - - - - - - - -
- [Icon] -  ()   Size: KB -
- - - - - - - - - -
 
-
- - - - diff --git a/imp/templates/compose/redirect.html b/imp/templates/compose/redirect.html deleted file mode 100644 index b96392e8f..000000000 --- a/imp/templates/compose/redirect.html +++ /dev/null @@ -1,52 +0,0 @@ -
- - - - - - - -

- -

- - - - - - - - - - - - - - - - -
  - - - - -
-
  - - - - - -
- - -  
-
  - - - - -
- - -
diff --git a/imp/templates/compose/success.html b/imp/templates/compose/success.html deleted file mode 100644 index 8e505cf4c..000000000 --- a/imp/templates/compose/success.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/imp/templates/contacts/contacts.html b/imp/templates/contacts/contacts.html deleted file mode 100644 index 1e74a9e73..000000000 --- a/imp/templates/contacts/contacts.html +++ /dev/null @@ -1,73 +0,0 @@ -
- - - - - -

- Address Book -

- -
-

- - - - - - - - - - -

- - - - - - - - - - - -
- - - -
 
- -
 
- - - 		- - -
  - -
-
- -
- -
- - -
- - diff --git a/imp/templates/dimp/chunks/compose.php b/imp/templates/dimp/chunks/compose.php new file mode 100644 index 000000000..32ec64c77 --- /dev/null +++ b/imp/templates/dimp/chunks/compose.php @@ -0,0 +1,146 @@ +getValue('disposition_request_read'); +$save_attach = $GLOBALS['prefs']->getValue('save_attachments'); + +/* Determine if compose mode is disabled. */ +$compose_disable = !IMP::canCompose(); + +?> +
+ + + + + +
+ +
'Forward', 'id' => 'send_button', 'title' => _("Send"))); ?>
+ +
'Spellcheck', 'id' => 'spellcheck', 'title' => _("Check Spelling"))); ?>
+
'Drafts', 'id' => 'draft_button', 'title' => _("Save as Draft"))); ?>
+
+ +
+
+
+
+ +
+
+ +
+ +
+ +
+ + +
+ +
+ +isLocked('save_sent_mail')): ?> +
+ + +
+ +getValue('set_priority')): ?> +
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + +
: + + +
+ + +
+
+ +
+ +
+
+
+ + + + diff --git a/imp/templates/dimp/chunks/message.php b/imp/templates/dimp/chunks/message.php new file mode 100644 index 000000000..b0a4a8ed4 --- /dev/null +++ b/imp/templates/dimp/chunks/message.php @@ -0,0 +1,149 @@ + +
+ + + + +isLocked('forward_default')): ?> + + + + + + +
+ + + [] + + + + +
diff --git a/imp/templates/dimp/compose/compose.html b/imp/templates/dimp/compose/compose.html new file mode 100644 index 000000000..bb42ada2f --- /dev/null +++ b/imp/templates/dimp/compose/compose.html @@ -0,0 +1,9 @@ + +
Loading...
+ diff --git a/imp/templates/dimp/index.inc b/imp/templates/dimp/index.inc new file mode 100644 index 000000000..730260bed --- /dev/null +++ b/imp/templates/dimp/index.inc @@ -0,0 +1,498 @@ +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 ''; +} +?> +
+ + +
+ + + + + + + + + + + + + + + + + + + + + +isLocked('forward_default')): ?> + + + + + + +
+ + +
+ + + + + + + + + + + + + + + + + +
+ + + [] + + + + +
+ + diff --git a/imp/templates/dimp/javascript_defs_dimp.php b/imp/templates/dimp/javascript_defs_dimp.php new file mode 100644 index 000000000..c94aa841c --- /dev/null +++ b/imp/templates/dimp/javascript_defs_dimp.php @@ -0,0 +1,202 @@ +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('&', '&', (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 index 000000000..811028361 --- /dev/null +++ b/imp/templates/dimp/portal/portal.html @@ -0,0 +1,9 @@ +
+ +
id=""> +

+ +
+

+ +
diff --git a/imp/templates/filters/prefs.html b/imp/templates/filters/prefs.html deleted file mode 100644 index 5864cc1a9..000000000 --- a/imp/templates/filters/prefs.html +++ /dev/null @@ -1,37 +0,0 @@ -
- Filter Settings -
- - -
- Filter support is disabled on this system. - -

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

-    - -

- - - -
- diff --git a/imp/templates/folders/actions.html b/imp/templates/folders/actions.html deleted file mode 100644 index 4a58c675c..000000000 --- a/imp/templates/folders/actions.html +++ /dev/null @@ -1,60 +0,0 @@ - - - - -
- -
- -   /> -
- -
- - - - - -
-
-
    - -
    • -     -
    • -
    • -
-
-
- -
-
diff --git a/imp/templates/folders/folders-mimp.html b/imp/templates/folders/folders-mimp.html deleted file mode 100644 index 4a99017d1..000000000 --- a/imp/templates/folders/folders-mimp.html +++ /dev/null @@ -1,10 +0,0 @@ -
-
- -
()
- -
-
Menu
- - - diff --git a/imp/templates/folders/folders.html b/imp/templates/folders/folders.html deleted file mode 100644 index 3c9d5f9b2..000000000 --- a/imp/templates/folders/folders.html +++ /dev/null @@ -1,5 +0,0 @@ - -
-  disabled="disabled" value="" /> (/)   [] [] -
- diff --git a/imp/templates/folders/folders_confirm.html b/imp/templates/folders/folders_confirm.html deleted file mode 100644 index d7c05990b..000000000 --- a/imp/templates/folders/folders_confirm.html +++ /dev/null @@ -1,27 +0,0 @@ -
- - - -
- Folder Actions - Confirmation -
- -
- You are attempting to delete the following folder(s). - You are attempting to delete all messages contained in the following folder(s). -
- If you continue, all messages in the folder(s) will be lost! -
- - -
-   -
- - -
-   - -
- -
diff --git a/imp/templates/folders/folders_size.html b/imp/templates/folders/folders_size.html deleted file mode 100644 index df6b4614f..000000000 --- a/imp/templates/folders/folders_size.html +++ /dev/null @@ -1,32 +0,0 @@ -
Folder Sizes
- - - - - - - - - - - - - - - - - - - - - - - - -
FolderSize
Sum
- -
-
- -
-
diff --git a/imp/templates/folders/head.html b/imp/templates/folders/head.html deleted file mode 100644 index 6c6fb4cb5..000000000 --- a/imp/templates/folders/head.html +++ /dev/null @@ -1,11 +0,0 @@ -

- Folder Navigator  -

-
-
- - - - - - diff --git a/imp/templates/folders/import.html b/imp/templates/folders/import.html deleted file mode 100644 index b8223a8a5..000000000 --- a/imp/templates/folders/import.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - - -
- Import mbox File -
- -
-
   -   -   - into folder - . - - -
-
diff --git a/imp/templates/imp/acl/acl.html b/imp/templates/imp/acl/acl.html new file mode 100644 index 000000000..9fd0a26df --- /dev/null +++ b/imp/templates/imp/acl/acl.html @@ -0,0 +1,102 @@ +
+ + + +
+ + Share mail folders +
+ +
+
    +
  • + + +
    • +
+ +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ The current list of users with access to this folder could not be retrieved. +  
+ +  
+

User

+ 		+

+
+ + disabled="disabled" name="acl[][]" value="" disabled="disabled" checked="checked" /> +
+ + + +
 
+ + + +  
+ You do not have permission to change access to this folder. +  
+ +  
+ diff --git a/imp/templates/imp/compose.html b/imp/templates/imp/compose.html deleted file mode 100644 index bb42ada2f..000000000 --- a/imp/templates/imp/compose.html +++ /dev/null @@ -1,9 +0,0 @@ - -
Loading...
- diff --git a/imp/templates/imp/compose/compose.html b/imp/templates/imp/compose/compose.html new file mode 100644 index 000000000..371db3e9c --- /dev/null +++ b/imp/templates/imp/compose/compose.html @@ -0,0 +1,308 @@ +
enctype="multipart/form-data" action=""> + + + + + +

+
+ +

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  + + class="button" value="Send Message" /> + + + class="button" value="Save Draft" /> + + +
From  + + +   + + + + + + + + + + + + +
  + + +
  + +
+   + + +
+   + + +
  + +
  + + + + + + +
+
+
+
  + checked="checked" /> + + + + + + +
  + checked="checked" /> +
  + + + Switch to plain text compositionSwitch to HTML composition +
  + +
  + + class="button" value="Send Message" /> + + + class="button" value="Save Draft" /> + + +
  + :  + +
  + checked="checked" /> + +
  + checked="checked" /> + +
+ + +
+ +

+  Attachments + +   + + +

+ + + + + + + + + + + + + + + + + + + + + + +
Maximum total attachment size reached.Maximum number of attachments reached. + + + + + + + +
+ +
+ (Maximum Attachment Size: bytes) +
+ 		+ +
+   + +
+ + +
+ +
+ Current Attachments (Total Size: KB / ) +
+ + + + + + + + + + +
+ [Icon] +  ()   Size: KB +
+ + + + + + + + + +
 
+
+ + + + diff --git a/imp/templates/imp/compose/redirect.html b/imp/templates/imp/compose/redirect.html new file mode 100644 index 000000000..b96392e8f --- /dev/null +++ b/imp/templates/imp/compose/redirect.html @@ -0,0 +1,52 @@ +
+ + + + + + + +

+ +

+ + + + + + + + + + + + + + + + +
  + + + + +
+
  + + + + + +
+ + +  
+
  + + + + +
+ + +
diff --git a/imp/templates/imp/compose/success.html b/imp/templates/imp/compose/success.html new file mode 100644 index 000000000..8e505cf4c --- /dev/null +++ b/imp/templates/imp/compose/success.html @@ -0,0 +1 @@ + diff --git a/imp/templates/imp/contacts/contacts.html b/imp/templates/imp/contacts/contacts.html new file mode 100644 index 000000000..1e74a9e73 --- /dev/null +++ b/imp/templates/imp/contacts/contacts.html @@ -0,0 +1,73 @@ +
+ + + + + +

+ Address Book +

+ +
+

+ + + + + + + + + + +

+ + + + + + + + + + + +
+ + + +
 
+ +
 
+ + + 		+ + +
  + +
+
+ +
+ +
+ + +
+ + diff --git a/imp/templates/imp/folders/actions.html b/imp/templates/imp/folders/actions.html new file mode 100644 index 000000000..4a58c675c --- /dev/null +++ b/imp/templates/imp/folders/actions.html @@ -0,0 +1,60 @@ + + + + +
+ +
+ +   /> +
+ +
+ + + + + +
+
+
    + +
    • +     +
    • +
    • +
+
+
+ +
+
diff --git a/imp/templates/imp/folders/folders.html b/imp/templates/imp/folders/folders.html new file mode 100644 index 000000000..3c9d5f9b2 --- /dev/null +++ b/imp/templates/imp/folders/folders.html @@ -0,0 +1,5 @@ + +
+  disabled="disabled" value="" /> (/)   [] [] +
+ diff --git a/imp/templates/imp/folders/folders_confirm.html b/imp/templates/imp/folders/folders_confirm.html new file mode 100644 index 000000000..d7c05990b --- /dev/null +++ b/imp/templates/imp/folders/folders_confirm.html @@ -0,0 +1,27 @@ +
+ + + +
+ Folder Actions - Confirmation +
+ +
+ You are attempting to delete the following folder(s). + You are attempting to delete all messages contained in the following folder(s). +
+ If you continue, all messages in the folder(s) will be lost! +
+ + +
+   +
+ + +
+   + +
+ +
diff --git a/imp/templates/imp/folders/folders_size.html b/imp/templates/imp/folders/folders_size.html new file mode 100644 index 000000000..df6b4614f --- /dev/null +++ b/imp/templates/imp/folders/folders_size.html @@ -0,0 +1,32 @@ +
Folder Sizes
+ + + + + + + + + + + + + + + + + + + + + + + + +
FolderSize
Sum
+ +
+
+ +
+
diff --git a/imp/templates/imp/folders/head.html b/imp/templates/imp/folders/head.html new file mode 100644 index 000000000..6c6fb4cb5 --- /dev/null +++ b/imp/templates/imp/folders/head.html @@ -0,0 +1,11 @@ +

+ Folder Navigator  +

+
+
+ + + + + + diff --git a/imp/templates/imp/folders/import.html b/imp/templates/imp/folders/import.html new file mode 100644 index 000000000..b8223a8a5 --- /dev/null +++ b/imp/templates/imp/folders/import.html @@ -0,0 +1,19 @@ + + + + + +
+ Import mbox File +
+ +
+
   +   +   + into folder + . + + +
+
diff --git a/imp/templates/imp/javascript_defs.php b/imp/templates/imp/javascript_defs.php new file mode 100644 index 000000000..300e1cce7 --- /dev/null +++ b/imp/templates/imp/javascript_defs.php @@ -0,0 +1,72 @@ + 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 index 000000000..226a38376 --- /dev/null +++ b/imp/templates/imp/mailbox/actions.html @@ -0,0 +1,28 @@ + + + + +
+
+
    + class="lastnavbar"> +
    • +
+
+
+
    + +
    • +
    • +
    • +
    • +     +
    • + +
    • +
    • +     +
    • +
+
+
diff --git a/imp/templates/imp/mailbox/actions_deleted.html b/imp/templates/imp/mailbox/actions_deleted.html new file mode 100644 index 000000000..76072ddd0 --- /dev/null +++ b/imp/templates/imp/mailbox/actions_deleted.html @@ -0,0 +1,6 @@ +
+
    +
    • +
    • +
+
diff --git a/imp/templates/imp/mailbox/empty_mailbox.html b/imp/templates/imp/mailbox/empty_mailbox.html new file mode 100644 index 000000000..2dfa25234 --- /dev/null +++ b/imp/templates/imp/mailbox/empty_mailbox.html @@ -0,0 +1,3 @@ +
+ No messages matched your search criteria.There are no messages in this mailbox. +
diff --git a/imp/templates/imp/mailbox/header.html b/imp/templates/imp/mailbox/header.html new file mode 100644 index 000000000..f02bd1bc0 --- /dev/null +++ b/imp/templates/imp/mailbox/header.html @@ -0,0 +1,23 @@ +
+
style="width:40%" class="leftFloat"> + + + + + + + + +
+ +
+ +
+
+ +
+ + +
+
+
diff --git a/imp/templates/imp/mailbox/mailbox.html b/imp/templates/imp/mailbox/mailbox.html new file mode 100644 index 000000000..01097049a --- /dev/null +++ b/imp/templates/imp/mailbox/mailbox.html @@ -0,0 +1,12 @@ + + class="" style="background-color:"> + + + +   +   + + + + + diff --git a/imp/templates/imp/mailbox/message_footers.html b/imp/templates/imp/mailbox/message_footers.html new file mode 100644 index 000000000..fe2785d12 --- /dev/null +++ b/imp/templates/imp/mailbox/message_footers.html @@ -0,0 +1,6 @@ + + + + + + diff --git a/imp/templates/imp/mailbox/message_headers.html b/imp/templates/imp/mailbox/message_headers.html new file mode 100644 index 000000000..cd5c70b28 --- /dev/null +++ b/imp/templates/imp/mailbox/message_headers.html @@ -0,0 +1,22 @@ + +
+ + + + + + + + + + + + + + + diff --git a/imp/templates/imp/mailbox/navbar.html b/imp/templates/imp/mailbox/navbar.html new file mode 100644 index 000000000..dc211fb97 --- /dev/null +++ b/imp/templates/imp/mailbox/navbar.html @@ -0,0 +1,56 @@ +
  + + /> + + +
+ + class="bottomborder"> + + +
+ + + + + +
+ + +
+
+ +
    +
    • +
    • +
+ + + +
+ + +
+ +
+ + + + + + + + +
+ + +
diff --git a/imp/templates/imp/mailbox/searchfolder.html b/imp/templates/imp/mailbox/searchfolder.html new file mode 100644 index 000000000..2c065b52d --- /dev/null +++ b/imp/templates/imp/mailbox/searchfolder.html @@ -0,0 +1,3 @@ +
+ +
diff --git a/imp/templates/imp/menu/menu.html b/imp/templates/imp/menu/menu.html new file mode 100644 index 000000000..79aeb9147 --- /dev/null +++ b/imp/templates/imp/menu/menu.html @@ -0,0 +1,22 @@ +
- - - - - - - - - - - - - -
- - - [] - - - - -
- - diff --git a/imp/templates/javascript_defs.php b/imp/templates/javascript_defs.php deleted file mode 100644 index 300e1cce7..000000000 --- a/imp/templates/javascript_defs.php +++ /dev/null @@ -1,72 +0,0 @@ - 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 index c94aa841c..000000000 --- a/imp/templates/javascript_defs_dimp.php +++ /dev/null @@ -1,202 +0,0 @@ -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('&', '&', (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 index 226a38376..000000000 --- a/imp/templates/mailbox/actions.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - -
-
-
    - class="lastnavbar"> -
    • -
-
-
-
    - -
    • -
    • -
    • -
    • -     -
    • - -
    • -
    • -     -
    • -
-
-
diff --git a/imp/templates/mailbox/actions_deleted.html b/imp/templates/mailbox/actions_deleted.html deleted file mode 100644 index 76072ddd0..000000000 --- a/imp/templates/mailbox/actions_deleted.html +++ /dev/null @@ -1,6 +0,0 @@ -
-
    -
    • -
    • -
-
diff --git a/imp/templates/mailbox/empty_mailbox.html b/imp/templates/mailbox/empty_mailbox.html deleted file mode 100644 index 2dfa25234..000000000 --- a/imp/templates/mailbox/empty_mailbox.html +++ /dev/null @@ -1,3 +0,0 @@ -
- No messages matched your search criteria.There are no messages in this mailbox. -
diff --git a/imp/templates/mailbox/header.html b/imp/templates/mailbox/header.html deleted file mode 100644 index f02bd1bc0..000000000 --- a/imp/templates/mailbox/header.html +++ /dev/null @@ -1,23 +0,0 @@ -
-
style="width:40%" class="leftFloat"> - - - - - - - - -
- -
- -
-
- -
- - -
-
-
diff --git a/imp/templates/mailbox/mailbox-mimp.html b/imp/templates/mailbox/mailbox-mimp.html deleted file mode 100644 index 0356fc83a..000000000 --- a/imp/templates/mailbox/mailbox-mimp.html +++ /dev/null @@ -1,50 +0,0 @@ -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - -
[]
- -
No messages.
- -
- -
- - -
- -
- -
Menu
- - - diff --git a/imp/templates/mailbox/mailbox.html b/imp/templates/mailbox/mailbox.html deleted file mode 100644 index 01097049a..000000000 --- a/imp/templates/mailbox/mailbox.html +++ /dev/null @@ -1,12 +0,0 @@ - - class="" style="background-color:"> - - - -   -   - - - - - diff --git a/imp/templates/mailbox/message_footers.html b/imp/templates/mailbox/message_footers.html deleted file mode 100644 index fe2785d12..000000000 --- a/imp/templates/mailbox/message_footers.html +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/imp/templates/mailbox/message_headers.html b/imp/templates/mailbox/message_headers.html deleted file mode 100644 index cd5c70b28..000000000 --- a/imp/templates/mailbox/message_headers.html +++ /dev/null @@ -1,22 +0,0 @@ - -
- - - - - - - - - - - - - - - diff --git a/imp/templates/mailbox/navbar.html b/imp/templates/mailbox/navbar.html deleted file mode 100644 index dc211fb97..000000000 --- a/imp/templates/mailbox/navbar.html +++ /dev/null @@ -1,56 +0,0 @@ -
  - - /> - - -
- - class="bottomborder"> - - -
- - - - - -
- - -
-
- -
    -
    • -
    • -
- - - -
- - -
- -
- - - - - - - - -
- - -
diff --git a/imp/templates/mailbox/search-mimp.html b/imp/templates/mailbox/search-mimp.html deleted file mode 100644 index ab5e9e9ca..000000000 --- a/imp/templates/mailbox/search-mimp.html +++ /dev/null @@ -1,17 +0,0 @@ -
-
-
- - -

- Search: -

-

- -

-
-
-
Menu
- - - diff --git a/imp/templates/mailbox/searchfolder.html b/imp/templates/mailbox/searchfolder.html deleted file mode 100644 index 2c065b52d..000000000 --- a/imp/templates/mailbox/searchfolder.html +++ /dev/null @@ -1,3 +0,0 @@ -
- -
diff --git a/imp/templates/menu.html b/imp/templates/menu.html deleted file mode 100644 index 79aeb9147..000000000 --- a/imp/templates/menu.html +++ /dev/null @@ -1,22 +0,0 @@ -
- -
- -
-
- PGP Public Keyring -
- -
- -
- No Keys in Keyring -
- -
- - - - - - - -
()  [View] [Details] [Delete]
-
- - - -
- Key import is not available. File upload is not enabled on this server. -
- - -
- Key import is not available. You have no address book defined to add your contacts. -
- -
-

- - -

-
- -
- -
- -
-
- Your PGP Public/Private Keys -
- -
- -
- PGP Personal Keypair support requires a secure web connection. -
- -
- - - - - - - - - - - - -
Your Public Key:  [View] [Details] [Send Key to Public Keyserver]
Your Private Key:  [] [View] [Details]
-
- -

- - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  
  
  
  - -
  
  
- -

- - - - - -

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

- - -

- -
- diff --git a/imp/templates/prefs/filters/filters.html b/imp/templates/prefs/filters/filters.html new file mode 100644 index 000000000..5864cc1a9 --- /dev/null +++ b/imp/templates/prefs/filters/filters.html @@ -0,0 +1,37 @@ +
+ Filter Settings +
+ + +
+ Filter support is disabled on this system. + +

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

+    + +

+ + + +
+ diff --git a/imp/templates/prefs/pgp/import_key.html b/imp/templates/prefs/pgp/import_key.html new file mode 100644 index 000000000..823311590 --- /dev/null +++ b/imp/templates/prefs/pgp/import_key.html @@ -0,0 +1,56 @@ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Import Public PGP KeyImport Personal Public PGP KeyImport Personal Private PGP Key
+ + + + + + + +
+ +
+
--OR--
+ + + + +
+   + +
+
+ + +
+ + + + diff --git a/imp/templates/prefs/pgp/pgp.html b/imp/templates/prefs/pgp/pgp.html new file mode 100644 index 000000000..b80386cee --- /dev/null +++ b/imp/templates/prefs/pgp/pgp.html @@ -0,0 +1,185 @@ + +
+ + + +
+
+

+ NOTE: PGP support requires popup windows to be used. If your browser is currently set to disable popup windows, you must change this setting or else the PGP features will not work correctly. +

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

+ + +

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

+ + +

+
+ +
+ +
+ +
+
+ Your PGP Public/Private Keys +
+ +
+ +
+ PGP Personal Keypair support requires a secure web connection. +
+ +
+ + + + + + + + + + + + +
Your Public Key:  [View] [Details] [Send Key to Public Keyserver]
Your Private Key:  [] [View] [Details]
+
+ +

+ + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  
  
  
  + +
  
  
+ +

+ + + + + +

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

+ + +

+ + + diff --git a/imp/templates/prefs/smime/import_key.html b/imp/templates/prefs/smime/import_key.html new file mode 100644 index 000000000..cdd7b1fc9 --- /dev/null +++ b/imp/templates/prefs/smime/import_key.html @@ -0,0 +1,77 @@ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
colspan="2">Import Public S/MIME KeyImport Personal S/MIME Certificates
+ + + + + + + +
+ +
+
--OR--
colspan="2"> + + + + +
+   + +
+
+ + + + + + + +
+   +
+   +
+
+ + +
+ + + + diff --git a/imp/templates/prefs/smime/smime.html b/imp/templates/prefs/smime/smime.html new file mode 100644 index 000000000..b3206c9d5 --- /dev/null +++ b/imp/templates/prefs/smime/smime.html @@ -0,0 +1,130 @@ + +
+ + + +
+
+

+ NOTE: S/MIME support requires popup windows to be used. If your browser is currently set to disable popup windows, you must change this setting or else the S/MIME features will not work correctly. +

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

+ + +

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

+ + +

+ +
+
+ +
+ +
+
+ Your S/MIME Public/Private Certificate +
+ +
+ + +
+ + + + + + + + + +
Your Public Key:  [View] [Details]
Your Private Key:  [] [View]
+
+ +

+ + +

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

+ + +

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

+ + +

+ +
+ diff --git a/imp/templates/prefs/stationery/stationery.html b/imp/templates/prefs/stationery/stationery.html new file mode 100644 index 000000000..e493005cf --- /dev/null +++ b/imp/templates/prefs/stationery/stationery.html @@ -0,0 +1,49 @@ +
+ + + + + +
+ Stationery +
+ +

+ + + + +
+ + + +
+ +
+ +
+ +
+ +
+ +
+You can use the following placeholders in the stationery text: %c for the current message content; %s for the signature. +

+ +   + +   + + + + + diff --git a/imp/templates/search/search-basic.html b/imp/templates/search/search-basic.html deleted file mode 100644 index f9a701f75..000000000 --- a/imp/templates/search/search-basic.html +++ /dev/null @@ -1,49 +0,0 @@ -
- - -

- -

- - - - - - - - - - - - - - - -
Search Criteria: - - style="display:none"> - - - - -
Search Flags: - -
Go to Advanced Search Page...
- -
- - -
-
diff --git a/imp/templates/search/search.html b/imp/templates/search/search.html deleted file mode 100644 index 409b65225..000000000 --- a/imp/templates/search/search.html +++ /dev/null @@ -1,106 +0,0 @@ -
- - -

- Edit Virtual FolderSearch -

- - - - - -
- - - Search Criteria -
- -
-
-
- -
-
- -
- - - Search Folders - -
- - - - -
- - - Saved Searches -
- -
- - - -
- -
-
- - -
- -
- -
-
- - -
- - - - - -
-
- - - - diff --git a/imp/templates/smime/import_key.html b/imp/templates/smime/import_key.html deleted file mode 100644 index cdd7b1fc9..000000000 --- a/imp/templates/smime/import_key.html +++ /dev/null @@ -1,77 +0,0 @@ -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
colspan="2">Import Public S/MIME KeyImport Personal S/MIME Certificates
- - - - - - - -
- -
-
--OR--
colspan="2"> - - - - -
-   - -
-
- - - - - - - -
-   -
-   -
-
- - -
- - - - diff --git a/imp/templates/smime/smime.html b/imp/templates/smime/smime.html deleted file mode 100644 index b3206c9d5..000000000 --- a/imp/templates/smime/smime.html +++ /dev/null @@ -1,130 +0,0 @@ - -
- - - -
-
-

- NOTE: S/MIME support requires popup windows to be used. If your browser is currently set to disable popup windows, you must change this setting or else the S/MIME features will not work correctly. -

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

- - -

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

- - -

- -
-
- -
- -
-
- Your S/MIME Public/Private Certificate -
- -
- - -
- - - - - - - - - -
Your Public Key:  [View] [Details]
Your Private Key:  [] [View]
-
- -

- - -

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

- - -

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

- - -

- -
- diff --git a/imp/templates/stationery/stationery.html b/imp/templates/stationery/stationery.html deleted file mode 100644 index e493005cf..000000000 --- a/imp/templates/stationery/stationery.html +++ /dev/null @@ -1,49 +0,0 @@ -
- - - - - -
- Stationery -
- -

- - - - -
- - - -
- -
- -
- -
- -
- -
-You can use the following placeholders in the stationery text: %c for the current message content; %s for the signature. -

- -   - -   - - - - - diff --git a/imp/templates/thread/thread.html b/imp/templates/thread/thread.html deleted file mode 100644 index 61d940b04..000000000 --- a/imp/templates/thread/thread.html +++ /dev/null @@ -1,26 +0,0 @@ -

- Thread Display:Multiple Message View: -

- - -
- -
- -
- - - -
-
- - To:From: - - () -
- -
- -
-
- diff --git a/imp/thread.php b/imp/thread.php index 5093bd786..de4be45dd 100644 --- a/imp/thread.php +++ b/imp/thread.php @@ -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';