[Easymod-cvs] easymod2/mods/easymod/templates ftp_settings.tpl,1.2,1.3 page_header.tpl,1.1,1.2 step1
Status: Beta
Brought to you by:
wgeric
From: Eric F. <wg...@us...> - 2005-06-05 23:37:15
|
Update of /cvsroot/easymod/easymod2/mods/easymod/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17019/mods/easymod/templates Modified Files: ftp_settings.tpl page_header.tpl step1_classic.tpl step1_simple.tpl step1b_ftp.tpl step1b_nowrite_nocopy.tpl step1b_simple.tpl step1b_write_copy.tpl step1b_write_nocopy.tpl step1c_empw.tpl Log Message: - Removed all hardcoded language from installer (I think I got it all). I know I really shouldn't but I have tested it so some things might not be working correctly. - Template updates to make XHTML compatible (only the ones I saw, I didn't go looking) - Other minor changes Index: ftp_settings.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/ftp_settings.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ftp_settings.tpl 1 May 2005 07:24:36 -0000 1.2 --- ftp_settings.tpl 5 Jun 2005 23:37:05 -0000 1.3 *************** *** 8,12 **** <tr> <td class="row1" align="right"><span class="gen">{{EM_ftp_dir}}</span></td> ! <td class="row2"><input type="text" name="ftp_dir"> <span class="gen">({{DIR_EX}}) (<a href="x" target="_blank">more info</a>)</span></td> </tr> <tr> --- 8,12 ---- <tr> <td class="row1" align="right"><span class="gen">{{EM_ftp_dir}}</span></td> ! <td class="row2"><input type="text" name="ftp_dir"> <span class="gen">({{DIR_EX}}) (<a href="#" target="_blank">{{EM_more_info}}</a>)</span></td> </tr> <tr> *************** *** 20,31 **** <tr> <td class="row1" align="right"><span class="gen">{{EM_ftp_host}}</span></td> ! <td class="row2"><input type="text" name="ftp_host" value="localhost"> <span class="gen">{{EM_ftp_host_info}} (<a href="x" target="_blank">more info</a>)</span></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{{EM_ftp_port}}</span></td> ! <td class="row2"><input type="text" size="5" maxlength="5" name="ftp_port" value="21"> <span class="gen">{{EM_ftp_port_info}} (<a href="x" target="_blank">more info</a>)</span></td> </tr> <tr> ! <th colspan="2">{{EM_ftp_titlex}} Advanced FTP Settings (optional!)</th> </tr> <tr> --- 20,31 ---- <tr> <td class="row1" align="right"><span class="gen">{{EM_ftp_host}}</span></td> ! <td class="row2"><input type="text" name="ftp_host" value="localhost"> <span class="gen">{{EM_ftp_host_info}} (<a href="#" target="_blank">{{EM_more_info}}</a>)</span></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{{EM_ftp_port}}</span></td> ! <td class="row2"><input type="text" size="5" maxlength="5" name="ftp_port" value="21"> <span class="gen">{{EM_ftp_port_info}} (<a href="#" target="_blank">{{EM_more_info}}</a>)</span></td> </tr> <tr> ! <th colspan="2">{{EM_ftp_advance_settings}} Advanced FTP Settings (optional!)</th> </tr> <tr> *************** *** 40,52 **** <td class="row2">{{FTP_EXT_MSG}} <input type="radio" name="ftp_type" value="ext" {{EXT_YES}}><span class="gen">{{EM_yes}}</span> ! <input type="radio" name="ftp_type" value="fsock" {{EXT_NO}}>{{EM_no}}</span> <span class="gen">{{EM_ftp_ext_not}} (<a href="x" target="_blank">more info</a>)</span> {{FTP_EXT_CLOSE}} </td> </tr> <tr> ! <td class="row1" align="right"><span class="gen">{{EM_ftp_use_extX}} Use Cache</span></td> <td class="row2">{{FTP_CACHE_MSG}} <input type="radio" name="ftp_cache" value="1" {{CACHE_YES}}><span class="gen">{{EM_yes}}</span> ! <input type="radio" name="ftp_cache" value="0" {{CACHE_NO}}>{{EM_no}}</span> <span class="gen">{{EM_ftp_ext_notX}}(only change if instructed to) (<a href="x" target="_blank">more info</a>)</span> {{FTP_CACHE_CLOSE}} </td> --- 40,52 ---- <td class="row2">{{FTP_EXT_MSG}} <input type="radio" name="ftp_type" value="ext" {{EXT_YES}}><span class="gen">{{EM_yes}}</span> ! <input type="radio" name="ftp_type" value="fsock" {{EXT_NO}}>{{EM_no}}</span> <span class="gen">{{EM_ftp_ext_not}} (<a href="#" target="_blank">{{EM_more_info}}</a>)</span> {{FTP_EXT_CLOSE}} </td> </tr> <tr> ! <td class="row1" align="right"><span class="gen">{{EM_ftp_use_cache}}</span></td> <td class="row2">{{FTP_CACHE_MSG}} <input type="radio" name="ftp_cache" value="1" {{CACHE_YES}}><span class="gen">{{EM_yes}}</span> ! <input type="radio" name="ftp_cache" value="0" {{CACHE_NO}}>{{EM_no}}</span> <span class="gen">{{EM_ftp_ext_not}} (<a href="#" target="_blank">{{EM_more_info}}</a>)</span> {{FTP_CACHE_CLOSE}} </td> Index: step1_classic.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/step1_classic.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** step1_classic.tpl 25 May 2005 01:10:51 -0000 1.2 --- step1_classic.tpl 5 Jun 2005 23:37:05 -0000 1.3 *************** *** 1,3 **** ! <span class="gen"><a href="easymod_install.php?setup=simple">Simple Mode</a> :: Advanced Mode</span><br> <table width="100%" border="1" cellpadding="5"> <tr> --- 1,3 ---- ! <span class="gen"><a href="easymod_install.php?setup=simple">{{EM_simple_mode}}</a> :: {{EM_advanced_mode}}</span><br> <table width="100%" border="1" cellpadding="5"> <tr> Index: step1b_write_copy.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/step1b_write_copy.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** step1b_write_copy.tpl 24 Apr 2005 14:59:53 -0000 1.1 --- step1b_write_copy.tpl 5 Jun 2005 23:37:05 -0000 1.2 *************** *** 2,21 **** {{WRITE_COPY_START}} <tr> ! <td class="row1" align="center" colspan="2"><span class="gen">{{EM_password_descX}} ! <br> ! Good news! EasyMOD has detected that it has the necessary access to automatically install MODs. You should select yes below.<br> ! <br> </span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="write_copy" checked="checked"></td> ! <td class="row1" align="left" width="100%"><span class="gen">{{EM_yesX}} Yes, use this automated method. (<a href="http://www.phpbb.com" target="_blank">learn more</a>)</span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="advanced"></td> ! <td class="row1" align="left" width="100%"><span class="gen">{{EM_yesX}} No, I'd like to select something else. (advanced mode)</span></td> </tr> <tr> ! <td class="row1" align="center" colspan="2"><br></td> </tr> {{WRITE_COPY_END}} --- 2,21 ---- {{WRITE_COPY_START}} <tr> ! <td class="row1" align="center" colspan="2"><span class="gen"> ! <br /> ! {{EM_write_copy_desc}}<br /> ! <br /> </span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="write_copy" checked="checked" /></td> ! <td class="row1" align="left" width="100%"><span class="gen">{{EM_yes_use_auto}}</span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="advanced" /></td> ! <td class="row1" align="left" width="100%"><span class="gen">{{EM_no_use_else}}</span></td> </tr> <tr> ! <td class="row1" align="center" colspan="2"><br /></td> </tr> {{WRITE_COPY_END}} Index: step1_simple.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/step1_simple.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** step1_simple.tpl 24 Apr 2005 14:59:53 -0000 1.1 --- step1_simple.tpl 5 Jun 2005 23:37:05 -0000 1.2 *************** *** 1,3 **** ! <span class="gen">Simple Mode :: <a href="easymod_install.php?setup=advanced">Advanced Mode</a></span><br> <table width="100%" border="1" cellpadding="5"> <tr> --- 1,3 ---- ! <span class="gen">{{EM_simple_mode}} :: <a href="easymod_install.php?setup=advanced">{{EM_advance_mode}}</a></span><br> <table width="100%" border="1" cellpadding="5"> <tr> *************** *** 13,17 **** </td><td valign="top" class="row2"> ! <h2>{{EM_SettingsX}}Server Style</h2> --- 13,17 ---- </td><td valign="top" class="row2"> ! <h2>{{EM_server_style}}</h2> *************** *** 19,35 **** <table width="100%" cellpadding="2" cellspacing="0" border="0" class="forumline"> <tr> ! <th>{{EM_password_titleX}}About your server</th> </tr> <tr> ! <td class="row2" align="center"><span class="gen">{{EM_password_descX}}<b>Which of the following choices best describes your phpBB server:</b></span></td> </tr> <tr> ! <td class="row1" align="left"><span class="gen"><input type="radio" name="option" value="ftp" checked="checked"><span class="gen">{{EM_yesX}} I have FTP access to my phpBB files on the server.</span> </span></td> </tr> <tr> ! <td class="row1" align="left"><span class="gen"><input type="radio" name="option" value="windoze"><span class="gen">{{EM_yesX}} This is a Windows server and I don't have to worry about file permissions.</span> </span></td> </tr> <tr> ! <td class="row1" align="left"><span class="gen"><input type="radio" name="option" value="idunno"><span class="gen">{{EM_yesX}} I don't have FTP access. Have EasyMOD suggest what to do please!</span> </span></td> </tr> <tr> --- 19,35 ---- <table width="100%" cellpadding="2" cellspacing="0" border="0" class="forumline"> <tr> ! <th>{{EM_about_server}}</th> </tr> <tr> ! <td class="row2" align="center"><span class="gen"><strong>{{EM_describes_server}}</strong></span></td> </tr> <tr> ! <td class="row1" align="left"><span class="gen"><input type="radio" name="option" value="ftp" checked="checked">{{EM_have_ftp}}</span></td> </tr> <tr> ! <td class="row1" align="left"><span class="gen"><input type="radio" name="option" value="windoze">{{EM_have_windows}}</span></td> </tr> <tr> ! <td class="row1" align="left"><span class="gen"><input type="radio" name="option" value="idunno">{{EM_no_ftp_suggest}}</span></td> </tr> <tr> Index: step1b_write_nocopy.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/step1b_write_nocopy.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** step1b_write_nocopy.tpl 24 Apr 2005 14:59:53 -0000 1.1 --- step1b_write_nocopy.tpl 5 Jun 2005 23:37:05 -0000 1.2 *************** *** 2,37 **** {{WRITE_NOCOPY_START}} <tr> ! <td class="row1" align="left" colspan="2"><span class="gen">{{EM_password_descX}} ! <br> ! Problem. EasyMOD has permission to create new files, but does not have permission to replace the old files with the new ones. There are several things you can do:<br> ! <ol> ! <li>If you have FTP access, then use the FTP option.</li> ! {{SAFE_MODE}}<li>Your server has "safe mode" enabled which means EasyMOD cannot automaticly replace your phpBB files. You might consider using <a href="z" target="_blank">chmod</a> or <a href="z" target="_blank">chown</a> to allow access.</li> ! <li>You might consider using <a href="z" target="_blank">chmod</a> to allow access. However, this is not advised in a shared server environment.</li> ! <li>Otherwise you have to use the <a href="x" target="_blank">post_process script</a> or manually move files into place.</li> ! </ol> ! <br> </span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="ftp" checked="checked"></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_yesX}} I'll try using the FTP option. (requires FTP access)</span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="idunno"></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_yesX}} I have now modified my file permissions, try rescanning to see if EasyMOD has access.</span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="post_process"></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_yesX}} I will use the post_process script to automatically move files into place. (requires knowledge of how to execute a script)</span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="manual"></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_yesX}} I will have to manually move files into place :(</span></td> </tr> ! <td class="row1" align="left"><input type="radio" name="option" value="advanced"></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_yesX}} I'd like to select something else. (advanced mode)</span></td> <tr> ! <td class="row1" align="center" colspan="2"><br></td> </tr> {{WRITE_NOCOPY_END}} --- 2,31 ---- {{WRITE_NOCOPY_START}} <tr> ! <td class="row1" align="left" colspan="2"><span class="gen"> ! <br /> ! {{EM_write_nocopy_desc}} ! <br /> </span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="ftp" checked="checked" /></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_try_ftp}}</span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="idunno" /></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_perms_mod_rescan}}</span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="post_process" /></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_use_post_process}}</span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="manual" /></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_download_manual}}</span></td> </tr> ! <td class="row1" align="left"><input type="radio" name="option" value="advanced" /></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_select_else}}</span></td> <tr> ! <td class="row1" align="center" colspan="2"><br /></td> </tr> {{WRITE_NOCOPY_END}} Index: step1b_nowrite_nocopy.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/step1b_nowrite_nocopy.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** step1b_nowrite_nocopy.tpl 24 Apr 2005 14:59:53 -0000 1.1 --- step1b_nowrite_nocopy.tpl 5 Jun 2005 23:37:05 -0000 1.2 *************** *** 2,36 **** {{NOWRITE_NOCOPY_START}} <tr> ! <td class="row1" align="left" colspan="2"><span class="gen">{{EM_password_descX}} ! <br> ! This is the worst case scenario. EasyMOD does not have permission to either create new files or to replace the old files with the new ones. There are several things you can do:<br> ! <ol> ! <li>If you have FTP access, then use the FTP option.</li> ! {{SAFE_MODE}}<li>Your server has "safe mode" enabled which means EasyMOD cannot automaticly replace your phpBB files. You might consider using <a href="z" target="_blank">chmod</a> or <a href="z" target="_blank">chown</a> to allow access.</li> ! <li>You might consider using <a href="z" target="_blank">chmod</a> to allow access. However, this is not advised in a shared server environment.</li> ! <li>Otherwise you will have to download the files and then manually move them into place.</li> ! </ol> ! <br> ! <b>Select One:</b><br> </span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="ftp"></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_yesX}} I'll try using the FTP option. (requires FTP access)</span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="idunno"></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_yesX}} I have now modified my file permissions, try rescanning to see if EasyMOD has access.</span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="download"></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_yesX}} I will have to download the files and manually move them into place :(</span></td> </tr> </tr> ! <td class="row1" align="left"><input type="radio" name="option" value="advanced"></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_yesX}} I'd like to select something else. (advanced mode)</span></td> <tr> <tr> ! <td class="row1" align="center" colspan="2"><br></td> </tr> {{NOWRITE_NOCOPY_END}} --- 2,30 ---- {{NOWRITE_NOCOPY_START}} <tr> ! <td class="row1" align="left" colspan="2"><span class="gen"> ! <br /> ! {{EM_nowrite_nocopy_desc}} ! <br /> ! <b>{{SELECT_ONE}}</b><br /> </span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="ftp" /></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_try_ftp}}</span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="idunno" /></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_perms_mod_rescan}}</span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="download" /></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_download_manual}}</span></td> </tr> </tr> ! <td class="row1" align="left"><input type="radio" name="option" value="advanced" /></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_select_else}}</span></td> <tr> <tr> ! <td class="row1" align="center" colspan="2"><br /></td> </tr> {{NOWRITE_NOCOPY_END}} Index: step1b_simple.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/step1b_simple.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** step1b_simple.tpl 24 Apr 2005 14:59:53 -0000 1.1 --- step1b_simple.tpl 5 Jun 2005 23:37:05 -0000 1.2 *************** *** 7,15 **** <!-- FILE ACCESS --> ! <br> <span class="gen">{{EM_support}}</class><br> </td><td valign="top" class="row2"> ! <h2>{{EM_SettingsX}}Diagnosis</h2> --- 7,15 ---- <!-- FILE ACCESS --> ! <br /> <span class="gen">{{EM_support}}</class><br> </td><td valign="top" class="row2"> ! <h2>{{EM_diagnosis}}</h2> *************** *** 17,21 **** <table width="100%" cellpadding="2" cellspacing="0" border="0" class="forumline"> <tr> ! <th colspan="2">{{EM_password_titleX}}Automation Technique detected!</th> </tr> --- 17,21 ---- <table width="100%" cellpadding="2" cellspacing="0" border="0" class="forumline"> <tr> ! <th colspan="2">{{EM_auto_tech_detected}}</th> </tr> *************** *** 41,48 **** {{[./templates/hidden_access.tpl]}} ! <input type="hidden" name="install_step" value="1"> ! <input type="hidden" name="substep" value="b"> <input class="mainoption" type="submit" value="{{Submit}}" /> ! <input class="mainoption" type="submit" value="{{Rescan}}" name="rescan"/> </td> </tr> --- 41,48 ---- {{[./templates/hidden_access.tpl]}} ! <input type="hidden" name="install_step" value="1" /> ! <input type="hidden" name="substep" value="b" /> <input class="mainoption" type="submit" value="{{Submit}}" /> ! <input class="mainoption" type="submit" value="{{Rescan}}" name="rescan" /> </td> </tr> Index: step1b_ftp.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/step1b_ftp.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** step1b_ftp.tpl 24 Apr 2005 14:59:53 -0000 1.1 --- step1b_ftp.tpl 5 Jun 2005 23:37:05 -0000 1.2 *************** *** 9,13 **** <br> ! <span class="gen">{{EM_support}}</class><br> </td><td valign="top" class="row2"> --- 9,13 ---- <br> ! <span class="gen">{{EM_support}}</span><br> </td><td valign="top" class="row2"> Index: step1c_empw.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/step1c_empw.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** step1c_empw.tpl 1 May 2005 07:24:36 -0000 1.2 --- step1c_empw.tpl 5 Jun 2005 23:37:05 -0000 1.3 *************** *** 6,10 **** <img src="./templates/nuttzy.jpg"> <br> ! <span class="gen">{{EM_support}}</class><br> </td><td valign="top" class="row2"> --- 6,10 ---- <img src="./templates/nuttzy.jpg"> <br> ! <span class="gen">{{EM_support}}</span><br> </td><td valign="top" class="row2"> Index: page_header.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/page_header.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** page_header.tpl 24 Apr 2005 14:59:53 -0000 1.1 --- page_header.tpl 5 Jun 2005 23:37:05 -0000 1.2 *************** *** 16,20 **** <td colspan="2"><table width="90%" border="0" align="center" cellspacing="0" cellpadding="0"> <tr> ! <td><span class="gen">{{TEXT}}</span></tsd> </tr> </table></td> --- 16,20 ---- <td colspan="2"><table width="90%" border="0" align="center" cellspacing="0" cellpadding="0"> <tr> ! <td><span class="gen">{{TEXT}}</span></td> </tr> </table></td> |