From 301d19127a5b9d96337e8b5be57de87bc09e2853 Mon Sep 17 00:00:00 2001 From: stevetruckstuff Date: Wed, 9 Aug 2006 18:01:22 +0000 Subject: [PATCH] Add CSS support to folder manipulation templates. Also make subscribe folder list checkboxes rather than select per TODO in folders.php git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11500 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/folder_manip.php | 10 +- src/folders.php | 48 +-- templates/default/folder_manip.tpl | 355 ++++++++++++---------- templates/default/folder_manip_dialog.tpl | 113 ++++--- templates/default/stylesheet.tpl | 53 ++++ 5 files changed, 347 insertions(+), 232 deletions(-) diff --git a/functions/folder_manip.php b/functions/folder_manip.php index c080f1c7..1cb81741 100644 --- a/functions/folder_manip.php +++ b/functions/folder_manip.php @@ -124,11 +124,10 @@ function folders_rename_getname ($imapConnection, $delimiter, $old) { sqimap_logout($imapConnection); $oTemplate->assign('dialog_type', 'rename'); - $oTemplate->assign('color', $color); - $oTemplate->assign('old_parent', htmlspecialchars($old_parent)); - $oTemplate->assign('old', htmlspecialchars($old)); - $oTemplate->assign('old_name', htmlspecialchars($old_name)); - $oTemplate->assign('isfolder', $isfolder); + $oTemplate->assign('parent_folder', htmlspecialchars($old_parent)); + $oTemplate->assign('current_full_name', htmlspecialchars($old)); + $oTemplate->assign('current_folder_name', htmlspecialchars($old_name)); + $oTemplate->assign('is_folder', $isfolder); $oTemplate->display('folder_manip_dialog.tpl'); $oTemplate->display('footer.tpl'); @@ -199,7 +198,6 @@ function folders_delete_ask ($imapConnection, $folder_name) sqimap_logout($imapConnection); $oTemplate->assign('dialog_type', 'delete'); - $oTemplate->assign('color', $color); $oTemplate->assign('folder_name', htmlspecialchars($folder_name)); $oTemplate->assign('visible_folder_name', htmlspecialchars($visible_folder_name)); diff --git a/src/folders.php b/src/folders.php index afa22032..02bd5dd8 100644 --- a/src/folders.php +++ b/src/folders.php @@ -1,5 +1,4 @@ assign('note', htmlspecialchars($td_str)); + $oTemplate->display('note.tpl'); +} + $boxes = sqimap_mailbox_list($imapConnection,true); /** CREATING FOLDERS **/ @@ -146,11 +149,13 @@ foreach ($boxes as $index => $aBoxData) { $rendel_folder_list = sqimap_mailbox_option_list($imapConnection, 0, $skip_folders, $boxes, NULL, true); -$subbox_option_list = ''; +$subbox_option_list = array(); if ($show_only_subscribed_folders && !$no_list_for_subscribe) { // FIXME: fix subscription options when top folder is not subscribed and sub folder is subscribed + // TODO: use checkboxes instead of select options. + // DONE Steve Brown 2006-08-08 /** SUBSCRIBE TO FOLDERS **/ $boxes_all = sqimap_mailbox_list_all ($imapConnection); @@ -159,34 +164,33 @@ if ($show_only_subscribed_folders && !$no_list_for_subscribe) { // so we keep only the unsubscribed ones. foreach ($boxes_all as $box_a) { - $use_folder = true; - foreach ( $boxes as $box ) { - if ($box_a['unformatted'] == $box['unformatted'] || - $box_a['unformatted-dm'] == $folder_prefix ) { - $use_folder = false; - } - } - - if ($use_folder) { - $box_enc = htmlspecialchars($box_a['unformatted-dm']); - $box_disp = htmlspecialchars(imap_utf7_decode_local($box_a['unformatted-disp'])); - $subbox_option_list .= '\n"; - } + $use_folder = true; + foreach ( $boxes as $box ) { + if ($box_a['unformatted'] == $box['unformatted'] || + $box_a['unformatted-dm'] == $folder_prefix ) { + $use_folder = false; + } + } + + if ($use_folder) { + $box_enc = htmlspecialchars($box_a['unformatted-dm']); + $box_disp = htmlspecialchars(imap_utf7_decode_local($box_a['unformatted-disp'])); + $subbox_option_list[] = array( 'Value' => $box_enc, 'Display' => $box_disp); + } } } sqimap_logout($imapConnection); -$oTemplate->assign('td_str', @$td_str); -$oTemplate->assign('color', $color); +$oTemplate->assign('show_subfolders_option', $show_contain_subfolders_option); +$oTemplate->assign('show_only_subscribed_folders', $show_only_subscribed_folders==1); +$oTemplate->assign('no_list_for_subscribe', $no_list_for_subscribe); + $oTemplate->assign('mbx_option_list', $mbx_option_list); -$oTemplate->assign('show_contain_subfolders_option', $show_contain_subfolders_option); -$oTemplate->assign('show_only_subscribed_folders', $show_only_subscribed_folders); $oTemplate->assign('rendel_folder_list', $rendel_folder_list); $oTemplate->assign('subbox_option_list', $subbox_option_list); -$oTemplate->assign('no_list_for_subscribe', $no_list_for_subscribe); $oTemplate->display('folder_manip.tpl'); $oTemplate->display('footer.tpl'); - +?> \ No newline at end of file diff --git a/templates/default/folder_manip.tpl b/templates/default/folder_manip.tpl index 3b56d1d0..f06cc102 100644 --- a/templates/default/folder_manip.tpl +++ b/templates/default/folder_manip.tpl @@ -4,6 +4,26 @@ * * Template for folder management (create, rename, delete, (un)subscribe) * + * The following variables are available in this template: + * + $mbx_option_list - string containing all mailboxes as