Menu
▾
▴
[popfile-commit] engine/skins/default imap-bucket-folders.thtml,1.7,1.8 imap-connection-details.thtml,1.5,1.6 imap-options.thtml,1.8,1.9 imap-update-mailbox-list.thtml,1.4,1.5 imap-watch-folders.thtml,1.5,1.6 imap-watch-more-folders.thtml,1.4,1.5
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1620/skins/default Modified Files: imap-bucket-folders.thtml imap-connection-details.thtml imap-options.thtml imap-update-mailbox-list.thtml imap-watch-folders.thtml imap-watch-more-folders.thtml Log Message: Make use of the status and error message feature. Add a couple of previously hard-coded strings to the language file(s). Fix html labels so that they now have the 'for' attribute and let the according input widgets have the corresponding id. Index: imap-bucket-folders.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/imap-bucket-folders.thtml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** imap-bucket-folders.thtml 15 Feb 2005 04:23:54 -0000 1.7 --- imap-bucket-folders.thtml 16 Mar 2005 21:49:46 -0000 1.8 *************** *** 3,15 **** <TMPL_IF NAME="IMAP_if_mailboxes"> <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> <TMPL_LOOP NAME="IMAP_loop_buckets"> ! <label class="configurationLabel"> <TMPL_VAR NAME="IMAP_Bucket_Header"> </label> <br /> ! <select name="imap_folder_for_<TMPL_VAR NAME="IMAP_bucket">"> <TMPL_UNLESS NAME="IMAP_mailbox_defined"> --- 3,16 ---- <TMPL_IF NAME="IMAP_if_mailboxes"> + <hr width="60%" align="center" /> <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> <TMPL_LOOP NAME="IMAP_loop_buckets"> ! <label for="folder_for_<TMPL_VAR NAME="IMAP_bucket">" class="configurationLabel"> <TMPL_VAR NAME="IMAP_Bucket_Header"> </label> <br /> ! <select id="folder_for_<TMPL_VAR NAME="IMAP_bucket">" name="imap_folder_for_<TMPL_VAR NAME="IMAP_bucket">"> <TMPL_UNLESS NAME="IMAP_mailbox_defined"> *************** *** 25,46 **** </TMPL_LOOP> ! </select><br /> </TMPL_LOOP> ! <TMPL_IF NAME="IMAP_buckets_to_folders_if_error"> ! <blockquote> ! <div class="error01"> ! <TMPL_VAR NAME="Localize_Imap_MapError"> ! </div> ! </blockquote> ! </TMPL_IF> ! <input type="submit" class="submit" name="imap_3_bucket_folders" value="<TMPL_VAR NAME="Localize_Apply">" /> </form> ! ! <TMPL_ELSE> ! ! <!-- Nothing to do for imap-bucket-folders.thtml --> </TMPL_IF> --- 26,38 ---- </TMPL_LOOP> ! </select> ! <br /> </TMPL_LOOP> ! <br /> <input type="submit" class="submit" name="imap_3_bucket_folders" value="<TMPL_VAR NAME="Localize_Apply">" /> </form> ! <hr width="60%" align="center" /> </TMPL_IF> Index: imap-watch-more-folders.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/imap-watch-more-folders.thtml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** imap-watch-more-folders.thtml 15 Feb 2005 04:23:54 -0000 1.4 --- imap-watch-more-folders.thtml 16 Mar 2005 21:49:46 -0000 1.5 *************** *** 4,9 **** <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <input type="submit" class="submit" name="imap_2_watch_more_folders" value="<TMPL_VAR NAME="Localize_Add">" /> ! <label class="configurationLabel"> <TMPL_VAR NAME="Localize_Imap_WatchMore"> </label> --- 4,9 ---- <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <input id="imap_watch_more" type="submit" class="submit" name="imap_2_watch_more_folders" value="<TMPL_VAR NAME="Localize_Add">" /> ! <label for="imap_watch_more" class="configurationLabel"> <TMPL_VAR NAME="Localize_Imap_WatchMore"> </label> *************** *** 11,18 **** </form> - <TMPL_ELSE> - - <!-- Nothing to do for imap-watch-more-folders.thtml --> - </TMPL_IF> --- 11,14 ---- Index: imap-connection-details.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/imap-connection-details.thtml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** imap-connection-details.thtml 15 Feb 2005 04:23:54 -0000 1.5 --- imap-connection-details.thtml 16 Mar 2005 21:49:46 -0000 1.6 *************** *** 2,62 **** <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <label class="configurationLabel"> <TMPL_VAR NAME="Localize_Imap_Server"> </label> <br /> ! <input name="imap_hostname" type="text" value="<TMPL_VAR NAME="IMAP_hostname">" /> <br /> ! ! <TMPL_IF NAME="IMAP_connection_if_hostname_error"> ! <blockquote> ! <div class="error01"> ! <TMPL_VAR NAME="Localize_Imap_ServerNameError"> ! </div> ! </blockquote> ! </TMPL_IF> ! ! <label class="configurationLabel"> <TMPL_VAR NAME="Localize_Imap_Port"> </label> <br /> ! <input name="imap_port" type="text" value="<TMPL_VAR NAME="IMAP_port">" /><br /> ! ! <TMPL_IF NAME="IMAP_connection_if_port_error"> ! <blockquote> ! <div class="error01"> ! <TMPL_VAR NAME="Localize_Imap_PortError"> ! </div> ! </blockquote> ! </TMPL_IF> ! ! <label class="configurationLabel"> <TMPL_VAR NAME="Localize_Imap_Login"> </label> <br /> ! <input name="imap_login" type="text" value="<TMPL_VAR NAME="IMAP_login">" /><br /> ! ! <TMPL_IF NAME="IMAP_connection_if_login_error"> ! <blockquote> ! <div class="error01"> ! <TMPL_VAR NAME="Localize_Imap_LoginError"> ! </div> ! </blockquote> ! </TMPL_IF> ! ! <label class="configurationLabel"> <TMPL_VAR NAME="Localize_Imap_Password"> </label> <br /> ! <input type="password" name="imap_password" value="<TMPL_VAR NAME="IMAP_password">" /><br /> ! ! <TMPL_IF NAME="IMAP_connection_if_password_error"> ! <blockquote> ! <div class="error01"> ! <TMPL_VAR NAME="Localize_Imap_PasswordError"> ! </div> ! </blockquote> ! </TMPL_IF> ! ! <p /> <input type="submit" class="submit" name="update_imap_0_connection_details" value="<TMPL_VAR NAME="Localize_Apply">" /> <hr width="60%" align="center" /> --- 2,29 ---- <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <label for="imap_hostname" class="configurationLabel"> <TMPL_VAR NAME="Localize_Imap_Server"> </label> <br /> ! <input id="imap_hostname" name="imap_hostname" type="text" value="<TMPL_VAR NAME="IMAP_hostname">" /> ! <br /> ! <label for="imap_port" class="configurationLabel"> <TMPL_VAR NAME="Localize_Imap_Port"> </label> <br /> ! <input id="imap_port" name="imap_port" type="text" value="<TMPL_VAR NAME="IMAP_port">" /> ! <br /> ! <label for="imap_login" class="configurationLabel"> <TMPL_VAR NAME="Localize_Imap_Login"> </label> <br /> ! <input id="imap_login" name="imap_login" type="text" value="<TMPL_VAR NAME="IMAP_login">" /> ! <br /> ! <label for="imap_password" class="configurationLabel"> <TMPL_VAR NAME="Localize_Imap_Password"> </label> <br /> ! <input id="imap_password" type="password" name="imap_password" value="<TMPL_VAR NAME="IMAP_password">" /> ! <br /> <input type="submit" class="submit" name="update_imap_0_connection_details" value="<TMPL_VAR NAME="Localize_Apply">" /> <hr width="60%" align="center" /> Index: imap-update-mailbox-list.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/imap-update-mailbox-list.thtml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** imap-update-mailbox-list.thtml 15 Feb 2005 04:23:54 -0000 1.4 --- imap-update-mailbox-list.thtml 16 Mar 2005 21:49:46 -0000 1.5 *************** *** 4,29 **** <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <label class="configurationLabel"> <TMPL_VAR NAME="Localize_Imap_RefreshFolders"> </label> ! ! <TMPL_IF NAME="IMAP_update_list_failed"> ! ! <blockquote> ! <div class="error01"> ! <TMPL_VAR NAME="IMAP_update_list_failed"> ! </div> ! </blockquote> ! ! </TMPL_IF> ! ! <input type="submit" class="submit" name="do_imap_4_update_mailbox_list" value="<TMPL_VAR NAME="Localize_Imap_Now">" /> </form> ! ! <TMPL_ELSE> ! ! <p> ! <TMPL_VAR NAME="Localize_Imap_NoConnectionMessage"> ! </p> </TMPL_IF> --- 4,13 ---- <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <label for="update_mailbox_list" class="configurationLabel"> <TMPL_VAR NAME="Localize_Imap_RefreshFolders"> </label> ! <input id="update_mailbox_list" type="submit" class="submit" name="do_imap_4_update_mailbox_list" value="<TMPL_VAR NAME="Localize_Imap_Now">" /> </form> ! <hr width="60%" align="center" /> </TMPL_IF> Index: imap-watch-folders.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/imap-watch-folders.thtml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** imap-watch-folders.thtml 15 Feb 2005 04:23:54 -0000 1.5 --- imap-watch-folders.thtml 16 Mar 2005 21:49:46 -0000 1.6 *************** *** 7,15 **** <TMPL_LOOP NAME="IMAP_loop_watched_folders"> ! <label class="configurationLabel"> <TMPL_VAR NAME="IMAP_WatchedFolder_Msg"><TMPL_VAR NAME="IMAP_loop_counter"> </label> <br /> ! <select name="imap_folder_<TMPL_VAR NAME="IMAP_loop_counter">"> <TMPL_LOOP NAME="IMAP_loop_mailboxes"> --- 7,15 ---- <TMPL_LOOP NAME="IMAP_loop_watched_folders"> ! <label for="imap_folder_<TMPL_VAR NAME="IMAP_loop_counter">" class="configurationLabel"> <TMPL_VAR NAME="IMAP_WatchedFolder_Msg"><TMPL_VAR NAME="IMAP_loop_counter"> </label> <br /> ! <select id="imap_folder_<TMPL_VAR NAME="IMAP_loop_counter">" name="imap_folder_<TMPL_VAR NAME="IMAP_loop_counter">"> <TMPL_LOOP NAME="IMAP_loop_mailboxes"> Index: imap-options.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/imap-options.thtml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** imap-options.thtml 15 Feb 2005 04:23:54 -0000 1.8 --- imap-options.thtml 16 Mar 2005 21:49:46 -0000 1.9 *************** *** 3,32 **** <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <input type="checkbox" class="checkbox" name="imap_options_expunge" value="1" <TMPL_VAR NAME="IMAP_expunge_is_checked"> /> ! <label class="configurationLabel"> <TMPL_VAR NAME="Localize_Imap_Expunge"> </label> <p /> ! <label class="configurationLabel"> <TMPL_VAR NAME="Localize_Imap_Interval"> </label> - - <TMPL_IF NAME="IMAP_if_interval_error"> - - <blockquote> - <div class="error01"> - <TMPL_VAR NAME="Localize_Imap_IntervalError"> - </div> - </blockquote> - - </TMPL_IF> - <br /> ! <input type="text" name="imap_options_update_interval" value="<TMPL_VAR NAME="IMAP_interval">" /> <p /> <input type="submit" class="submit" name="update_imap_5_options" value="<TMPL_VAR NAME="Localize_Apply">" /> - <hr width="60%" align="center" /> </form> --- 3,20 ---- <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <input id="imap_expunge" type="checkbox" class="checkbox" name="imap_options_expunge" value="1" <TMPL_VAR NAME="IMAP_expunge_is_checked"> /> ! <label for="imap_expunge" class="configurationLabel"> <TMPL_VAR NAME="Localize_Imap_Expunge"> </label> <p /> ! <label for="imap_update_interval" class="configurationLabel"> <TMPL_VAR NAME="Localize_Imap_Interval"> </label> <br /> ! <input id="imap_update_interval" type="text" name="imap_options_update_interval" value="<TMPL_VAR NAME="IMAP_interval">" /> <p /> <input type="submit" class="submit" name="update_imap_5_options" value="<TMPL_VAR NAME="Localize_Apply">" /> </form> |
