diff options
| author | Xavier Roche <xroche@users.noreply.github.com> | 2014-10-15 19:17:29 +0000 |
|---|---|---|
| committer | Xavier Roche <xroche@users.noreply.github.com> | 2014-10-15 19:17:29 +0000 |
| commit | 9b5c6cf86ed8dbf749bc2e401d4f87d340b6413d (patch) | |
| tree | 38e035f0b797edeb5bdbc708681eacedeef53887 | |
| parent | cce112d40a6e36b2c437418e84c57490818603cb (diff) | |
Fixed webhttrack incompatibility with Chrome
* closes:#53
Also fixed HTML-escaping issues inside webhttrack
Rationale: The webhttrack script made the wrong assumption that once the "browse" command returned, it meant the user killed the navigation window, and it had to kill the server itself. However, modern browsers tend to "attach" to an existing session (creating a new tab, for example, within an existing window), causing the browsing command to return immediately, thus causing the server to be killed immediately by the webhttrack script. I have rewritten the logic behind, and now the server is able to kill himself if the parent script dies, AND if the browsing client did not make any activity for two minutes. The "activity" can be any browser/refreshed page, or the internal "ping" iframe (which pings the server every 30 seconds). With this model, we *should* be compatible with old browsers, and modern ones.
32 files changed, 915 insertions, 2362 deletions
diff --git a/html/Makefile.am b/html/Makefile.am index 26d82a4..605d6f0 100755 --- a/html/Makefile.am +++ b/html/Makefile.am @@ -20,7 +20,7 @@ HelpHtmldiv_DATA = div/search.sh HelpHtmlimg_DATA = img/* HelpHtmlimages_DATA = images/* HelpHtmlTxt_DATA = ../greetings.txt ../history.txt ../license.txt -WebHtml_DATA = server/*.html +WebHtml_DATA = server/*.html server/*.js server/*.css WebHtmlimages_DATA = server/images/* WebHtmlsfx_DATA = server/sfx/* # note: converted & normalized by @@ -41,6 +41,6 @@ EXTRA_DIST = $(HelpHtml_DATA) $(HelpHtmlimg_DATA) $(HelpHtmlimages_DATA) \ install-data-hook: if test ! -L $(DESTDIR)$(prefix)/share/httrack/html ; then \ ( cd $(DESTDIR)$(prefix)/share/httrack \ - && $(LN_S) $(htmldir) html \ + && $(LN_S) ../doc/httrack html \ ) \ fi diff --git a/html/Makefile.in b/html/Makefile.in index 5b8baf9..1a86bde 100644 --- a/html/Makefile.in +++ b/html/Makefile.in @@ -265,7 +265,7 @@ HelpHtmldiv_DATA = div/search.sh HelpHtmlimg_DATA = img/* HelpHtmlimages_DATA = images/* HelpHtmlTxt_DATA = ../greetings.txt ../history.txt ../license.txt -WebHtml_DATA = server/*.html +WebHtml_DATA = server/*.html server/*.js server/*.css WebHtmlimages_DATA = server/images/* WebHtmlsfx_DATA = server/sfx/* # note: converted & normalized by @@ -800,7 +800,7 @@ uninstall-am: uninstall-HelpHtmlDATA uninstall-HelpHtmlTxtDATA \ install-data-hook: if test ! -L $(DESTDIR)$(prefix)/share/httrack/html ; then \ ( cd $(DESTDIR)$(prefix)/share/httrack \ - && $(LN_S) $(htmldir) html \ + && $(LN_S) ../doc/httrack html \ ) \ fi diff --git a/html/server/about.html b/html/server/about.html index 82af482..2190ad2 100755 --- a/html/server/about.html +++ b/html/server/about.html @@ -6,79 +6,9 @@ <meta name="keywords" content="${LANG_METAKEYW}" /> <title>'${projname}' - HTTrack Website Copier</title> - <style type="text/css"> - <!-- -body { - margin: 0; padding: 0; margin-bottom: 15px; margin-top: 8px; - background: #77b; -} -body, td { - font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; - } - -#subTitle { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -.tabCtrl { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -#siteNavigation a, #siteNavigation .current { - font-weight: bold; color: #448; - } -#siteNavigation a:link { text-decoration: none; } -#siteNavigation a:visited { text-decoration: none; } - -#siteNavigation .current { background-color: #ccd; } - -#siteNavigation a:hover { text-decoration: none; background-color: #fff; color: #000; } -#siteNavigation a:active { text-decoration: none; background-color: #ccc; } - - -a:link { text-decoration: underline; color: #00f; } -a:visited { text-decoration: underline; color: #000; } -a:hover { text-decoration: underline; color: #c00; } -a:active { text-decoration: underline; } - -#pageContent { - clear: both; - border-bottom: 6px solid #000; - padding: 10px; padding-top: 20px; - line-height: 1.65em; - background-image: url(images/bg_rings.gif); - background-repeat: no-repeat; - background-position: top right; - } - -#pageContent, #siteNavigation { - background-color: #ccd; - } - - -.imgLeft { float: left; margin-right: 10px; margin-bottom: 10px; } -.imgRight { float: right; margin-left: 10px; margin-bottom: 10px; } - -hr { height: 1px; color: #000; background-color: #000; margin-bottom: 15px; } - -h1 { margin: 0; font-weight: bold; font-size: 2em; } -h2 { margin: 0; font-weight: bold; font-size: 1.6em; } -h3 { margin: 0; font-weight: bold; font-size: 1.3em; } -h4 { margin: 0; font-weight: bold; font-size: 1.18em; } - -.blak { background-color: #000; } -.hide { display: none; } -.tableWidth { min-width: 400px; } - -.tblRegular { border-collapse: collapse; } -.tblRegular td { padding: 6px; background-image: url(fade.gif); border: 2px solid #99c; } -.tblHeaderColor, .tblHeaderColor td { background: #99c; } -.tblNoBorder td { border: 0; } - - -// --> -</style> + <link rel="stylesheet" type="text/css" media="screen" href="style.css"> + <script type="text/javascript" src="ping.js" defer></script> <script language="javascript"> <!-- @@ -139,7 +69,7 @@ ${LANG_K3} : ${HTTRACK_WEB} <form> <input type="button" value="OK" onClick="window.close();" - onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info(' '); return true" > </form> diff --git a/html/server/addurl.html b/html/server/addurl.html index 41b0f07..d2f8889 100755 --- a/html/server/addurl.html +++ b/html/server/addurl.html @@ -6,75 +6,10 @@ <meta name="keywords" content="${LANG_METAKEYW}" /> <title>'${projname}' - HTTrack Website Copier</title> - <style type="text/css"> - <!-- -body { - margin: 0; padding: 0; margin-bottom: 15px; margin-top: 8px; - background: #77b; -} -body, td { - font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; - } - -#subTitle { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -#siteNavigation a, #siteNavigation .current { - font-weight: bold; color: #448; - } -#siteNavigation a:link { text-decoration: none; } -#siteNavigation a:visited { text-decoration: none; } - -#siteNavigation .current { background-color: #ccd; } - -#siteNavigation a:hover { text-decoration: none; background-color: #fff; color: #000; } -#siteNavigation a:active { text-decoration: none; background-color: #ccc; } - - -a:link { text-decoration: underline; color: #00f; } -a:visited { text-decoration: underline; color: #000; } -a:hover { text-decoration: underline; color: #c00; } -a:active { text-decoration: underline; } - -#pageContent { - clear: both; - border-bottom: 6px solid #000; - padding: 10px; padding-top: 20px; - line-height: 1.65em; - background-image: url(images/bg_rings.gif); - background-repeat: no-repeat; - background-position: top right; - } - -#pageContent, #siteNavigation { - background-color: #ccd; - } - - -.imgLeft { float: left; margin-right: 10px; margin-bottom: 10px; } -.imgRight { float: right; margin-left: 10px; margin-bottom: 10px; } - -hr { height: 1px; color: #000; background-color: #000; margin-bottom: 15px; } -h1 { margin: 0; font-weight: bold; font-size: 2em; } -h2 { margin: 0; font-weight: bold; font-size: 1.6em; } -h3 { margin: 0; font-weight: bold; font-size: 1.3em; } -h4 { margin: 0; font-weight: bold; font-size: 1.18em; } - -.blak { background-color: #000; } -.hide { display: none; } -.tableWidth { min-width: 400px; } - -.tblRegular { border-collapse: collapse; } -.tblRegular td { padding: 6px; background-image: url(fade.gif); border: 2px solid #99c; } -.tblHeaderColor, .tblHeaderColor td { background: #99c; } -.tblNoBorder td { border: 0; } - - -// --> -</style> + <link rel="stylesheet" type="text/css" media="screen" href="style.css"> + <script type="text/javascript" src="ping.js" defer></script> <script language="javascript"> <!-- @@ -138,7 +73,7 @@ function info(str) { <td id="subTitle" align="right"> <a href="/server/file.html" target="_blank" onClick="window.open('/server/file.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_O1}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_O1}'); return true" onMouseOut="info(' '); return true" style="color:#FFFFFF" > ${LANG_O1} @@ -150,7 +85,7 @@ ${do:if-file-exists:html/index.html} <td id="subTitle" align="right"> <a href="/index.html" target="_blank" onClick="window.open('/server/help.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" style="color:#FFFFFF" > ${LANG_O5} @@ -183,20 +118,20 @@ ${do:end-if} <form action="${thisfile}" name="form"> <table width="100%"> <tr><td>${LANG_T2}</td><td>http://<input name="urladr" - onMouseOver="info('${LANG_T10}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_T10}'); return true" onMouseOut="info(' '); return true" ></td></tr> <tr><td colspan=2> <table width="100%"> <th>${LANG_T4}</th> <tr><td>${LANG_T5}:</td><td><input name="urllogin" - onMouseOver="info('${LANG_T12}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_T12}'); return true" onMouseOut="info(' '); return true" ></td></tr> <tr><td>${LANG_T6}:</td><td><input name="urlpass" - onMouseOver="info('${LANG_T13}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_T13}'); return true" onMouseOut="info(' '); return true" ></td></tr> <tr><td>${LANG_T7}:</td><td><input type="button" value="${LANG_T8}" onClick="alert('not yet implemented!')" - onMouseOver="info('${LANG_T14}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_T14}'); return true" onMouseOut="info(' '); return true" ></td></tr> </table> @@ -204,7 +139,7 @@ ${do:end-if} <tr><td> <input type="button" value="OK" onClick="if (do_add()) { window.close(); }" - onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info(' '); return true" > </td></tr> diff --git a/html/server/error.html b/html/server/error.html index c600805..0ccd756 100755 --- a/html/server/error.html +++ b/html/server/error.html @@ -6,75 +6,8 @@ <meta name="keywords" content="${LANG_METAKEYW}" /> <title>'${projname}' - HTTrack Website Copier</title> - <style type="text/css"> - <!-- - -body { - margin: 0; padding: 0; margin-bottom: 15px; margin-top: 8px; - background: #77b; -} -body, td { - font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; - } - -#subTitle { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -#siteNavigation a, #siteNavigation .current { - font-weight: bold; color: #448; - } -#siteNavigation a:link { text-decoration: none; } -#siteNavigation a:visited { text-decoration: none; } - -#siteNavigation .current { background-color: #ccd; } - -#siteNavigation a:hover { text-decoration: none; background-color: #fff; color: #000; } -#siteNavigation a:active { text-decoration: none; background-color: #ccc; } - - -a:link { text-decoration: underline; color: #00f; } -a:visited { text-decoration: underline; color: #000; } -a:hover { text-decoration: underline; color: #c00; } -a:active { text-decoration: underline; } - -#pageContent { - clear: both; - border-bottom: 6px solid #000; - padding: 10px; padding-top: 20px; - line-height: 1.65em; - background-image: url(images/bg_rings.gif); - background-repeat: no-repeat; - background-position: top right; - } - -#pageContent, #siteNavigation { - background-color: #ccd; - } - - -.imgLeft { float: left; margin-right: 10px; margin-bottom: 10px; } -.imgRight { float: right; margin-left: 10px; margin-bottom: 10px; } - -hr { height: 1px; color: #000; background-color: #000; margin-bottom: 15px; } - -h1 { margin: 0; font-weight: bold; font-size: 2em; } -h2 { margin: 0; font-weight: bold; font-size: 1.6em; } -h3 { margin: 0; font-weight: bold; font-size: 1.3em; } -h4 { margin: 0; font-weight: bold; font-size: 1.18em; } - -.blak { background-color: #000; } -.hide { display: none; } -.tableWidth { min-width: 400px; } - -.tblRegular { border-collapse: collapse; } -.tblRegular td { padding: 6px; background-image: url(fade.gif); border: 2px solid #99c; } -.tblHeaderColor, .tblHeaderColor td { background: #99c; } -.tblNoBorder td { border: 0; } - - -// --> -</style> + <link rel="stylesheet" type="text/css" media="screen" href="style.css"> + <script type="text/javascript" src="ping.js" defer></script> <script language="javascript"> <!-- diff --git a/html/server/exit.html b/html/server/exit.html index eafdf0d..11c7924 100755 --- a/html/server/exit.html +++ b/html/server/exit.html @@ -7,10 +7,10 @@ <title>'${projname}' - HTTrack Website Copier</title> <script language="javascript"> -<!--
+<!-- function do_load() { window.status=' '; - window.close();
+ window.close(); } function do_unload() { } diff --git a/html/server/file.html b/html/server/file.html index 4108afd..5521cae 100755 --- a/html/server/file.html +++ b/html/server/file.html @@ -6,79 +6,8 @@ <meta name="keywords" content="${LANG_METAKEYW}" /> <title>'${projname}' - HTTrack Website Copier</title> - <style type="text/css"> - <!-- - -body { - margin: 0; padding: 0; margin-bottom: 15px; margin-top: 8px; - background: #77b; -} -body, td { - font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; - } - -#subTitle { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -.tabCtrl { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -#siteNavigation a, #siteNavigation .current { - font-weight: bold; color: #448; - } -#siteNavigation a:link { text-decoration: none; } -#siteNavigation a:visited { text-decoration: none; } - -#siteNavigation .current { background-color: #ccd; } - -#siteNavigation a:hover { text-decoration: none; background-color: #fff; color: #000; } -#siteNavigation a:active { text-decoration: none; background-color: #ccc; } - - -a:link { text-decoration: underline; color: #00f; } -a:visited { text-decoration: underline; color: #000; } -a:hover { text-decoration: underline; color: #c00; } -a:active { text-decoration: underline; } - -#pageContent { - clear: both; - border-bottom: 6px solid #000; - padding: 10px; padding-top: 20px; - line-height: 1.65em; - background-image: url(images/bg_rings.gif); - background-repeat: no-repeat; - background-position: top right; - } - -#pageContent, #siteNavigation { - background-color: #ccd; - } - - -.imgLeft { float: left; margin-right: 10px; margin-bottom: 10px; } -.imgRight { float: right; margin-left: 10px; margin-bottom: 10px; } - -hr { height: 1px; color: #000; background-color: #000; margin-bottom: 15px; } - -h1 { margin: 0; font-weight: bold; font-size: 2em; } -h2 { margin: 0; font-weight: bold; font-size: 1.6em; } -h3 { margin: 0; font-weight: bold; font-size: 1.3em; } -h4 { margin: 0; font-weight: bold; font-size: 1.18em; } - -.blak { background-color: #000; } -.hide { display: none; } -.tableWidth { min-width: 400px; } - -.tblRegular { border-collapse: collapse; } -.tblRegular td { padding: 6px; background-image: url(fade.gif); border: 2px solid #99c; } -.tblHeaderColor, .tblHeaderColor td { background: #99c; } -.tblNoBorder td { border: 0; } - - -// --> -</style> + <link rel="stylesheet" type="text/css" media="screen" href="style.css"> + <script type="text/javascript" src="ping.js" defer></script> <script language="javascript"> <!-- diff --git a/html/server/finished.html b/html/server/finished.html index 27130de..66ecd03 100755 --- a/html/server/finished.html +++ b/html/server/finished.html @@ -6,75 +6,8 @@ <meta name="keywords" content="${LANG_METAKEYW}" /> <title>'${projname}' - HTTrack Website Copier</title> - <style type="text/css"> - <!-- - -body { - margin: 0; padding: 0; margin-bottom: 15px; margin-top: 8px; - background: #77b; -} -body, td { - font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; - } - -#subTitle { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -#siteNavigation a, #siteNavigation .current { - font-weight: bold; color: #448; - } -#siteNavigation a:link { text-decoration: none; } -#siteNavigation a:visited { text-decoration: none; } - -#siteNavigation .current { background-color: #ccd; } - -#siteNavigation a:hover { text-decoration: none; background-color: #fff; color: #000; } -#siteNavigation a:active { text-decoration: none; background-color: #ccc; } - - -a:link { text-decoration: underline; color: #00f; } -a:visited { text-decoration: underline; color: #000; } -a:hover { text-decoration: underline; color: #c00; } -a:active { text-decoration: underline; } - -#pageContent { - clear: both; - border-bottom: 6px solid #000; - padding: 10px; padding-top: 20px; - line-height: 1.65em; - background-image: url(images/bg_rings.gif); - background-repeat: no-repeat; - background-position: top right; - } - -#pageContent, #siteNavigation { - background-color: #ccd; - } - - -.imgLeft { float: left; margin-right: 10px; margin-bottom: 10px; } -.imgRight { float: right; margin-left: 10px; margin-bottom: 10px; } - -hr { height: 1px; color: #000; background-color: #000; margin-bottom: 15px; } - -h1 { margin: 0; font-weight: bold; font-size: 2em; } -h2 { margin: 0; font-weight: bold; font-size: 1.6em; } -h3 { margin: 0; font-weight: bold; font-size: 1.3em; } -h4 { margin: 0; font-weight: bold; font-size: 1.18em; } - -.blak { background-color: #000; } -.hide { display: none; } -.tableWidth { min-width: 400px; } - -.tblRegular { border-collapse: collapse; } -.tblRegular td { padding: 6px; background-image: url(fade.gif); border: 2px solid #99c; } -.tblHeaderColor, .tblHeaderColor td { background: #99c; } -.tblNoBorder td { border: 0; } - - -// --> -</style> + <link rel="stylesheet" type="text/css" media="screen" href="style.css"> + <script type="text/javascript" src="ping.js" defer></script> <script language="javascript"> <!-- @@ -103,7 +36,7 @@ function info(str) { <td id="subTitle" align="right"> <a href="/server/file.html" target="_blank" onClick="window.open('/server/file.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_O1}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_O1}'); return true" onMouseOut="info(' '); return true" style="color:#FFFFFF" > ${LANG_O1} @@ -115,7 +48,7 @@ ${do:if-file-exists:html/index.html} <td id="subTitle" align="right"> <a href="/index.html" target="_blank" onClick="window.open('/server/help.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" style="color:#FFFFFF" > ${LANG_O5} @@ -147,23 +80,23 @@ ${do:end-if} <br> -<pre>
-
-${do:if-not-empty:commandReturn}
-${LANG_F19}
-<font color="red">
-${commandReturnMsg}
-</font>
-${LANG_F20}
-<font color="blue">
-httrack ${commandReturnCmdl}
-</font>
-${LANG_F21}
-${do:end-if}
-
-${do:if-empty:commandReturn}
+<pre> + +${do:if-not-empty:commandReturn} +${LANG_F19} +<font color="red"> +${commandReturnMsg} +</font> +${LANG_F20} +<font color="blue"> +httrack ${commandReturnCmdl} +</font> +${LANG_F21} +${do:end-if} + +${do:if-empty:commandReturn} ${LANG_F22} -${do:end-if}
+${do:end-if} </pre> ${LANG_G8} : @@ -177,7 +110,7 @@ ${path}/${projname} <li><a href="/website/hts-log.txt" target="_new">${LANG_D4}</a></li> </ul> -<form method="POST" action="exit.html" name="form">
+<form method="POST" action="exit.html" name="form"> <input type="hidden" name="sid" value="${sid}"> <input type="hidden" name="command" value="quit"> @@ -191,8 +124,8 @@ ${path}/${projname} <table width="100%" border="0"><tr><td align="left"> </td><td align="right"> - <input type="submit" value=" ${LANG_QUIT} "
- onClick="form.submit()">
+ <input type="submit" value=" ${LANG_QUIT} " + onClick="form.submit()"> </td></tr></table> </td></tr> diff --git a/html/server/help.html b/html/server/help.html index 19decdb..5b55586 100755 --- a/html/server/help.html +++ b/html/server/help.html @@ -6,79 +6,8 @@ <meta name="keywords" content="${LANG_METAKEYW}" /> <title>'${projname}' - HTTrack Website Copier</title> - <style type="text/css"> - <!-- - -body { - margin: 0; padding: 0; margin-bottom: 15px; margin-top: 8px; - background: #77b; -} -body, td { - font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; - } - -#subTitle { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -.tabCtrl { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -#siteNavigation a, #siteNavigation .current { - font-weight: bold; color: #448; - } -#siteNavigation a:link { text-decoration: none; } -#siteNavigation a:visited { text-decoration: none; } - -#siteNavigation .current { background-color: #ccd; } - -#siteNavigation a:hover { text-decoration: none; background-color: #fff; color: #000; } -#siteNavigation a:active { text-decoration: none; background-color: #ccc; } - - -a:link { text-decoration: underline; color: #00f; } -a:visited { text-decoration: underline; color: #000; } -a:hover { text-decoration: underline; color: #c00; } -a:active { text-decoration: underline; } - -#pageContent { - clear: both; - border-bottom: 6px solid #000; - padding: 10px; padding-top: 20px; - line-height: 1.65em; - background-image: url(images/bg_rings.gif); - background-repeat: no-repeat; - background-position: top right; - } - -#pageContent, #siteNavigation { - background-color: #ccd; - } - - -.imgLeft { float: left; margin-right: 10px; margin-bottom: 10px; } -.imgRight { float: right; margin-left: 10px; margin-bottom: 10px; } - -hr { height: 1px; color: #000; background-color: #000; margin-bottom: 15px; } - -h1 { margin: 0; font-weight: bold; font-size: 2em; } -h2 { margin: 0; font-weight: bold; font-size: 1.6em; } -h3 { margin: 0; font-weight: bold; font-size: 1.3em; } -h4 { margin: 0; font-weight: bold; font-size: 1.18em; } - -.blak { background-color: #000; } -.hide { display: none; } -.tableWidth { min-width: 400px; } - -.tblRegular { border-collapse: collapse; } -.tblRegular td { padding: 6px; background-image: url(fade.gif); border: 2px solid #99c; } -.tblHeaderColor, .tblHeaderColor td { background: #99c; } -.tblNoBorder td { border: 0; } - - -// --> -</style> + <link rel="stylesheet" type="text/css" media="screen" href="style.css"> + <script type="text/javascript" src="ping.js" defer></script> <script language="javascript"> <!-- @@ -129,7 +58,7 @@ function info(str) { <table class="tableWidth" border="0" width="100%" cellspacing="0"> <tr><td class="tabCtrl" align="left"> <a style="background:black;color: white" href="about.html" target="_new" - onMouseOver="info('${LANG_G21}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_G21}'); return true" onMouseOut="info(' '); return true" > ${LANG_O16}... </a> @@ -138,7 +67,7 @@ ${LANG_O16}... <tr><td class="tabCtrl" align="left"> <a style="background:black;color: white" href="http://www.httrack.com/update.php3?Product=HTTrack&Version=${HTTRACK_VERSIONID}&VersionStr=${HTTRACK_VERSION}&Platform=${HTS_PLATFORM}&LanguageId=${lang}" target="_new" - onMouseOver="info('${LANG_O17}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_O17}'); return true" onMouseOut="info(' '); return true" > ${LANG_O17}... </a> @@ -149,7 +78,7 @@ ${do:if-file-exists:html/index.html} <tr><td class="tabCtrl" align="left"> <a style="background:black;color: white" href="/index.html" target="_new" - onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" > ${LANG_P16} </a> diff --git a/html/server/index.html b/html/server/index.html index 6998976..a29c95d 100755 --- a/html/server/index.html +++ b/html/server/index.html @@ -6,75 +6,8 @@ <meta name="keywords" content="${LANG_METAKEYW}" /> <title>HTTrack Website Copier - Offline Browser</title> - <style type="text/css"> - <!-- - -body { - margin: 0; padding: 0; margin-bottom: 15px; margin-top: 8px; - background: #77b; -} -body, td { - font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; - } - -#subTitle { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -#siteNavigation a, #siteNavigation .current { - font-weight: bold; color: #448; - } -#siteNavigation a:link { text-decoration: none; } -#siteNavigation a:visited { text-decoration: none; } - -#siteNavigation .current { background-color: #ccd; } - -#siteNavigation a:hover { text-decoration: none; background-color: #fff; color: #000; } -#siteNavigation a:active { text-decoration: none; background-color: #ccc; } - - -a:link { text-decoration: underline; color: #00f; } -a:visited { text-decoration: underline; color: #000; } -a:hover { text-decoration: underline; color: #c00; } -a:active { text-decoration: underline; } - -#pageContent { - clear: both; - border-bottom: 6px solid #000; - padding: 10px; padding-top: 20px; - line-height: 1.65em; - background-image: url(images/bg_rings.gif); - background-repeat: no-repeat; - background-position: top right; - } - -#pageContent, #siteNavigation { - background-color: #ccd; - } - - -.imgLeft { float: left; margin-right: 10px; margin-bottom: 10px; } -.imgRight { float: right; margin-left: 10px; margin-bottom: 10px; } - -hr { height: 1px; color: #000; background-color: #000; margin-bottom: 15px; } - -h1 { margin: 0; font-weight: bold; font-size: 2em; } -h2 { margin: 0; font-weight: bold; font-size: 1.6em; } -h3 { margin: 0; font-weight: bold; font-size: 1.3em; } -h4 { margin: 0; font-weight: bold; font-size: 1.18em; } - -.blak { background-color: #000; } -.hide { display: none; } -.tableWidth { min-width: 400px; } - -.tblRegular { border-collapse: collapse; } -.tblRegular td { padding: 6px; background-image: url(fade.gif); border: 2px solid #99c; } -.tblHeaderColor, .tblHeaderColor td { background: #99c; } -.tblNoBorder td { border: 0; } - - -// --> -</style> + <link rel="stylesheet" type="text/css" media="screen" href="style.css"> + <script type="text/javascript" src="ping.js" defer></script> <script language="javascript"> <!-- @@ -110,7 +43,7 @@ function info(str) { <td id="subTitle" align="right"> <a href="/server/file.html" target="_blank" onClick="window.open('/server/file.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_O1}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_O1}'); return true" onMouseOut="info(' '); return true" style="color:#FFFFFF" > ${LANG_O1} @@ -122,7 +55,7 @@ ${do:if-file-exists:html/index.html} <td id="subTitle" align="right"> <a href="/index.html" target="_blank" onClick="window.open('/server/help.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" style="color:#FFFFFF" > ${LANG_O5} @@ -180,7 +113,7 @@ ${LANG_THANKYOU}! <tr><td align="right"> <input name="nextBtn" type="submit" value=" ${LANG_NEXT} >> " - onMouseOver="info('${LANG_TIPNEXT}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPNEXT}'); return true" onMouseOut="info(' '); return true" > </td></tr> </table> diff --git a/html/server/option1.html b/html/server/option1.html index 9ba1d5b..7bcbf7e 100755 --- a/html/server/option1.html +++ b/html/server/option1.html @@ -6,88 +6,17 @@ <meta name="keywords" content="${LANG_METAKEYW}" /> <title>'${projname}' - HTTrack Website Copier</title> - <style type="text/css"> - <!-- - -body { - margin: 0; padding: 0; margin-bottom: 15px; margin-top: 8px; - background: #77b; -} -body, td { - font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; - } - -#subTitle { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -.tabCtrl { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -#siteNavigation a, #siteNavigation .current { - font-weight: bold; color: #448; - } -#siteNavigation a:link { text-decoration: none; } -#siteNavigation a:visited { text-decoration: none; } - -#siteNavigation .current { background-color: #ccd; } - -#siteNavigation a:hover { text-decoration: none; background-color: #fff; color: #000; } -#siteNavigation a:active { text-decoration: none; background-color: #ccc; } - - -a:link { text-decoration: underline; color: #00f; } -a:visited { text-decoration: underline; color: #000; } -a:hover { text-decoration: underline; color: #c00; } -a:active { text-decoration: underline; } - -#pageContent { - clear: both; - border-bottom: 6px solid #000; - padding: 10px; padding-top: 20px; - line-height: 1.65em; - background-image: url(images/bg_rings.gif); - background-repeat: no-repeat; - background-position: top right; - } - -#pageContent, #siteNavigation { - background-color: #ccd; - } - - -.imgLeft { float: left; margin-right: 10px; margin-bottom: 10px; } -.imgRight { float: right; margin-left: 10px; margin-bottom: 10px; } - -hr { height: 1px; color: #000; background-color: #000; margin-bottom: 15px; } - -h1 { margin: 0; font-weight: bold; font-size: 2em; } -h2 { margin: 0; font-weight: bold; font-size: 1.6em; } -h3 { margin: 0; font-weight: bold; font-size: 1.3em; } -h4 { margin: 0; font-weight: bold; font-size: 1.18em; } - -.blak { background-color: #000; } -.hide { display: none; } -.tableWidth { min-width: 400px; } - -.tblRegular { border-collapse: collapse; } -.tblRegular td { padding: 6px; background-image: url(fade.gif); border: 2px solid #99c; } -.tblHeaderColor, .tblHeaderColor td { background: #99c; } -.tblNoBorder td { border: 0; } - - -// --> -</style> + <link rel="stylesheet" type="text/css" media="screen" href="style.css"> + <script type="text/javascript" src="ping.js" defer></script> <script language="javascript"> <!-- function do_load() { window.status=' '; -${do:if-not-empty:closeme}
- window.close();
-${do:end-if}
-${do:set:closeme:}
+${do:if-not-empty:closeme} + window.close(); +${do:end-if} +${do:set:closeme:} } function do_unload() { } @@ -131,7 +60,7 @@ ${do:if-file-exists:html/index.html} <td> <a href="/step9_opt1.html" target="_blank" onClick="window.open('/step9_opt1.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" >${LANG_TIPHELP}</a> </td> ${do:end-if} @@ -142,18 +71,18 @@ ${do:end-if} <table class="tableWidth" border="0" width="100%" cellspacing="0"> <tr> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT1}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT1}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT2}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT2}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT3}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT3}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT4}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT4}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT5}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT5}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT11}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT11}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT1}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT1}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT2}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT2}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT3}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT3}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT4}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT4}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT5}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT5}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT11}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT11}</a></td> </tr><tr> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT6}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT6}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT7}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT7}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT8}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT8}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT9}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT9}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT10}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT10}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT6}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT6}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT7}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT7}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT8}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT8}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT9}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT9}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT10}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT10}</a></td> <td class="tabCtrl" align="center"> </td> </tr> @@ -167,7 +96,7 @@ ${do:end-if} <form method="POST" action="${thisfile}" name="form"> <input type="hidden" name="sid" value="${sid}"> <input type="hidden" name="redirect" value=""> -<input type="hidden" name="closeme" value="">
+<input type="hidden" name="closeme" value=""> <!-- clear if not checked --> <input type="hidden" name="parseall" value=""> @@ -178,34 +107,34 @@ ${do:end-if} <!-- checkboxes --> <table border="0" width="100%" cellspacing="0"> <tr><td><input type="checkbox" name="parseall" ${checked:parseall} - onMouseOver="info('${LANG_I1}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I1}'); return true" onMouseOut="info(' '); return true" > ${LANG_I31}</td></tr> <tr><td><input type="checkbox" name="link" ${checked:link} - onMouseOver="info('${LANG_I2}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I2}'); return true" onMouseOut="info(' '); return true" > ${LANG_I32}</td></tr> <tr><td><input type="checkbox" name="testall" ${checked:testall} - onMouseOver="info('${LANG_I2b}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I2b}'); return true" onMouseOut="info(' '); return true" > ${LANG_I32b}</td></tr> <tr><td><input type="checkbox" name="htmlfirst" ${checked:htmlfirst} - onMouseOver="info('${LANG_I2c}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I2c}'); return true" onMouseOut="info(' '); return true" > ${LANG_I32c}</td></tr> </table> -<tr><td>
- <table width="100%">
- <tr><td align="left">
- <input type="submit" value="${LANG_OK}"
- onClick="form.closeme.value=1; form.submit(); return false;"
- onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info(' '); return true"
- >
- </td><td align="right">
- <input type="button" value="${LANG_CANCEL}"
- onClick="window.close();"
- onMouseOver="info('${LANG_TIPCANCEL}'); return true" onMouseOut="info(' '); return true"
- >
- </td></tr>
- </table>
-</td></tr>
+<tr><td> + <table width="100%"> + <tr><td align="left"> + <input type="submit" value="${LANG_OK}" + onClick="form.closeme.value=1; form.submit(); return false;" + onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info(' '); return true" + > + </td><td align="right"> + <input type="button" value="${LANG_CANCEL}" + onClick="window.close();" + onMouseOver="info('${html:LANG_TIPCANCEL}'); return true" onMouseOut="info(' '); return true" + > + </td></tr> + </table> +</td></tr> </form> diff --git a/html/server/option10.html b/html/server/option10.html index 99d0a4d..2e72e68 100755 --- a/html/server/option10.html +++ b/html/server/option10.html @@ -6,88 +6,17 @@ <meta name="keywords" content="${LANG_METAKEYW}" /> <title>'${projname}' - HTTrack Website Copier</title> - <style type="text/css"> - <!-- - -body { - margin: 0; padding: 0; margin-bottom: 15px; margin-top: 8px; - background: #77b; -} -body, td { - font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; - } - -#subTitle { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -.tabCtrl { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -#siteNavigation a, #siteNavigation .current { - font-weight: bold; color: #448; - } -#siteNavigation a:link { text-decoration: none; } -#siteNavigation a:visited { text-decoration: none; } - -#siteNavigation .current { background-color: #ccd; } - -#siteNavigation a:hover { text-decoration: none; background-color: #fff; color: #000; } -#siteNavigation a:active { text-decoration: none; background-color: #ccc; } - - -a:link { text-decoration: underline; color: #00f; } -a:visited { text-decoration: underline; color: #000; } -a:hover { text-decoration: underline; color: #c00; } -a:active { text-decoration: underline; } - -#pageContent { - clear: both; - border-bottom: 6px solid #000; - padding: 10px; padding-top: 20px; - line-height: 1.65em; - background-image: url(images/bg_rings.gif); - background-repeat: no-repeat; - background-position: top right; - } - -#pageContent, #siteNavigation { - background-color: #ccd; - } - - -.imgLeft { float: left; margin-right: 10px; margin-bottom: 10px; } -.imgRight { float: right; margin-left: 10px; margin-bottom: 10px; } - -hr { height: 1px; color: #000; background-color: #000; margin-bottom: 15px; } - -h1 { margin: 0; font-weight: bold; font-size: 2em; } -h2 { margin: 0; font-weight: bold; font-size: 1.6em; } -h3 { margin: 0; font-weight: bold; font-size: 1.3em; } -h4 { margin: 0; font-weight: bold; font-size: 1.18em; } - -.blak { background-color: #000; } -.hide { display: none; } -.tableWidth { min-width: 400px; } - -.tblRegular { border-collapse: collapse; } -.tblRegular td { padding: 6px; background-image: url(fade.gif); border: 2px solid #99c; } -.tblHeaderColor, .tblHeaderColor td { background: #99c; } -.tblNoBorder td { border: 0; } - - -// --> -</style> + <link rel="stylesheet" type="text/css" media="screen" href="style.css"> + <script type="text/javascript" src="ping.js" defer></script> <script language="javascript"> <!-- function do_load() { window.status=' '; -${do:if-not-empty:closeme}
- window.close();
-${do:end-if}
-${do:set:closeme:}
+${do:if-not-empty:closeme} + window.close(); +${do:end-if} +${do:set:closeme:} } function do_unload() { } @@ -131,7 +60,7 @@ ${do:if-file-exists:html/index.html} <td> <a href="/step9_opt7.html" target="_blank" onClick="window.open('/step9_opt7.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" >${LANG_TIPHELP}</a> </td> ${do:end-if} @@ -142,18 +71,18 @@ ${do:end-if} <table class="tableWidth" border="0" width="100%" cellspacing="0"> <tr> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT1}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT1}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT2}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT2}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT3}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT3}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT4}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT4}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT5}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT5}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT11}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT11}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT1}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT1}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT2}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT2}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT3}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT3}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT4}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT4}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT5}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT5}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT11}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT11}</a></td> </tr><tr> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT6}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT6}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT7}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT7}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT8}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT8}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT9}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT9}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT10}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT10}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT6}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT6}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT7}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT7}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT8}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT8}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT9}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT9}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT10}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT10}</a></td> <td class="tabCtrl" align="center"> </td> </tr> @@ -167,37 +96,37 @@ ${do:end-if} <form method="POST" action="${thisfile}" name="form"> <input type="hidden" name="sid" value="${sid}"> <input type="hidden" name="redirect" value=""> -<input type="hidden" name="closeme" value="">
+<input type="hidden" name="closeme" value=""> ${LANG_IOPT10}: <input name="prox" value="${prox}" size="32" - onMouseOver="info('${LANG_G14}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_G14}'); return true" onMouseOut="info(' '); return true" >: <input name="portprox" value="${portprox}" size="4" - onMouseOver="info('${LANG_G15}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_G15}'); return true" onMouseOut="info(' '); return true" > <br> <input type="checkbox" name="ftpprox" ${checked:ftpprox} - onMouseOver="info('${LANG_G15c}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_G15c}'); return true" onMouseOut="info(' '); return true" > ${LANG_I47c} <br><br> -<tr><td>
- <table width="100%">
- <tr><td align="left">
- <input type="submit" value="${LANG_OK}"
- onClick="form.closeme.value=1; form.submit(); return false;"
- onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info(' '); return true"
- >
- </td><td align="right">
- <input type="button" value="${LANG_CANCEL}"
- onClick="window.close();"
- onMouseOver="info('${LANG_TIPCANCEL}'); return true" onMouseOut="info(' '); return true"
- >
- </td></tr>
- </table>
-</td></tr>
+<tr><td> + <table width="100%"> + <tr><td align="left"> + <input type="submit" value="${LANG_OK}" + onClick="form.closeme.value=1; form.submit(); return false;" + onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info(' '); return true" + > + </td><td align="right"> + <input type="button" value="${LANG_CANCEL}" + onClick="window.close();" + onMouseOver="info('${html:LANG_TIPCANCEL}'); return true" onMouseOut="info(' '); return true" + > + </td></tr> + </table> +</td></tr> </form> diff --git a/html/server/option11.html b/html/server/option11.html index 4b688e8..9571538 100755 --- a/html/server/option11.html +++ b/html/server/option11.html @@ -6,88 +6,17 @@ <meta name="keywords" content="${LANG_METAKEYW}" /> <title>'${projname}' - HTTrack Website Copier</title> - <style type="text/css"> - <!-- - -body { - margin: 0; padding: 0; margin-bottom: 15px; margin-top: 8px; - background: #77b; -} -body, td { - font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; - } - -#subTitle { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -.tabCtrl { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -#siteNavigation a, #siteNavigation .current { - font-weight: bold; color: #448; - } -#siteNavigation a:link { text-decoration: none; } -#siteNavigation a:visited { text-decoration: none; } - -#siteNavigation .current { background-color: #ccd; } - -#siteNavigation a:hover { text-decoration: none; background-color: #fff; color: #000; } -#siteNavigation a:active { text-decoration: none; background-color: #ccc; } - - -a:link { text-decoration: underline; color: #00f; } -a:visited { text-decoration: underline; color: #000; } -a:hover { text-decoration: underline; color: #c00; } -a:active { text-decoration: underline; } - -#pageContent { - clear: both; - border-bottom: 6px solid #000; - padding: 10px; padding-top: 20px; - line-height: 1.65em; - background-image: url(images/bg_rings.gif); - background-repeat: no-repeat; - background-position: top right; - } - -#pageContent, #siteNavigation { - background-color: #ccd; - } - - -.imgLeft { float: left; margin-right: 10px; margin-bottom: 10px; } -.imgRight { float: right; margin-left: 10px; margin-bottom: 10px; } - -hr { height: 1px; color: #000; background-color: #000; margin-bottom: 15px; } - -h1 { margin: 0; font-weight: bold; font-size: 2em; } -h2 { margin: 0; font-weight: bold; font-size: 1.6em; } -h3 { margin: 0; font-weight: bold; font-size: 1.3em; } -h4 { margin: 0; font-weight: bold; font-size: 1.18em; } - -.blak { background-color: #000; } -.hide { display: none; } -.tableWidth { min-width: 400px; } - -.tblRegular { border-collapse: collapse; } -.tblRegular td { padding: 6px; background-image: url(fade.gif); border: 2px solid #99c; } -.tblHeaderColor, .tblHeaderColor td { background: #99c; } -.tblNoBorder td { border: 0; } - - -// --> -</style> + <link rel="stylesheet" type="text/css" media="screen" href="style.css"> + <script type="text/javascript" src="ping.js" defer></script> <script language="javascript"> <!-- function do_load() { window.status=' '; -${do:if-not-empty:closeme}
- window.close();
-${do:end-if}
-${do:set:closeme:}
+${do:if-not-empty:closeme} + window.close(); +${do:end-if} +${do:set:closeme:} } function do_unload() { } @@ -131,7 +60,7 @@ ${do:if-file-exists:html/index.html} <td> <a href="/step9_opt9.html" target="_blank" onClick="window.open('/step9_opt9.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" >${LANG_TIPHELP}</a> </td> ${do:end-if} @@ -142,18 +71,18 @@ ${do:end-if} <table class="tableWidth" border="0" width="100%" cellspacing="0"> <tr> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT1}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT1}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT2}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT2}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT3}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT3}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT4}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT4}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT5}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT5}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT11}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT11}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT1}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT1}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT2}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT2}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT3}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT3}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT4}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT4}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT5}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT5}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT11}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT11}</a></td> </tr><tr> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT6}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT6}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT7}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT7}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT8}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT8}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT9}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT9}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT10}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT10}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT6}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT6}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT7}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT7}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT8}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT8}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT9}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT9}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT10}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT10}</a></td> <td class="tabCtrl" align="center"> </td> </tr> @@ -167,7 +96,7 @@ ${do:end-if} <form method="POST" action="${thisfile}" name="form"> <input type="hidden" name="sid" value="${sid}"> <input type="hidden" name="redirect" value=""> -<input type="hidden" name="closeme" value="">
+<input type="hidden" name="closeme" value=""> ${LANG_W1}: <br> @@ -183,97 +112,97 @@ ${LANG_W3} <td align="left"> <input name="ext1" value="${ext1}" - onMouseOver="info('${LANG_W4}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_W4}'); return true" onMouseOut="info(' '); return true" > </td><td align="left"> ⇔ </td><td align="left"> <input name="mime1" value="${mime1}" - onMouseOver="info('${LANG_W5}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_W5}'); return true" onMouseOut="info(' '); return true" > </td></tr> <!-- --> <td align="left"> <input name="ext2" value="${ext2}" - onMouseOver="info('${LANG_W4}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_W4}'); return true" onMouseOut="info(' '); return true" > </td><td align="left"> ⇔ </td><td align="left"> <input name="mime2" value="${mime2}" - onMouseOver="info('${LANG_W5}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_W5}'); return true" onMouseOut="info(' '); return true" > </td></tr> <!-- --> <td align="left"> <input name="ext3" value="${ext3}" - onMouseOver="info('${LANG_W4}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_W4}'); return true" onMouseOut="info(' '); return true" > </td><td align="left"> ⇔ </td><td align="left"> <input name="mime3" value="${mime3}" - onMouseOver="info('${LANG_W5}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_W5}'); return true" onMouseOut="info(' '); return true" > </td></tr> <!-- --> <td align="left"> <input name="ext4" value="${ext4}" - onMouseOver="info('${LANG_W4}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_W4}'); return true" onMouseOut="info(' '); return true" > </td><td align="left"> ⇔ </td><td align="left"> <input name="mime4" value="${mime4}" - onMouseOver="info('${LANG_W5}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_W5}'); return true" onMouseOut="info(' '); return true" > </td></tr> <!-- --> <td align="left"> <input name="ext5" value="${ext5}" - onMouseOver="info('${LANG_W4}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_W4}'); return true" onMouseOut="info(' '); return true" > </td><td align="left"> ⇔ </td><td align="left"> <input name="mime5" value="${mime5}" - onMouseOver="info('${LANG_W5}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_W5}'); return true" onMouseOut="info(' '); return true" > </td></tr> <!-- --> <td align="left"> <input name="ext6" value="${ext6}" - onMouseOver="info('${LANG_W4}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_W4}'); return true" onMouseOut="info(' '); return true" > </td><td align="left"> ⇔ </td><td align="left"> <input name="mime6" value="${mime6}" - onMouseOver="info('${LANG_W5}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_W5}'); return true" onMouseOut="info(' '); return true" > </td></tr> <!-- --> <td align="left"> <input name="ext7" value="${ext7}" - onMouseOver="info('${LANG_W4}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_W4}'); return true" onMouseOut="info(' '); return true" > </td><td align="left"> ⇔ </td><td align="left"> <input name="mime7" value="${mime7}" - onMouseOver="info('${LANG_W5}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_W5}'); return true" onMouseOut="info(' '); return true" > </td></tr> <!-- --> <td align="left"> <input name="ext8" value="${ext8}" - onMouseOver="info('${LANG_W4}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_W4}'); return true" onMouseOut="info(' '); return true" > </td><td align="left"> ⇔ </td><td align="left"> <input name="mime8" value="${mime8}" - onMouseOver="info('${LANG_W5}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_W5}'); return true" onMouseOut="info(' '); return true" > </td></tr> <!-- --> @@ -283,21 +212,21 @@ ${LANG_W3} <br><br> -<tr><td>
- <table width="100%">
- <tr><td align="left">
- <input type="submit" value="${LANG_OK}"
- onClick="form.closeme.value=1; form.submit(); return false;"
- onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info(' '); return true"
- >
- </td><td align="right">
- <input type="button" value="${LANG_CANCEL}"
- onClick="window.close();"
- onMouseOver="info('${LANG_TIPCANCEL}'); return true" onMouseOut="info(' '); return true"
- >
- </td></tr>
- </table>
-</td></tr>
+<tr><td> + <table width="100%"> + <tr><td align="left"> + <input type="submit" value="${LANG_OK}" + onClick="form.closeme.value=1; form.submit(); return false;" + onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info(' '); return true" + > + </td><td align="right"> + <input type="button" value="${LANG_CANCEL}" + onClick="window.close();" + onMouseOver="info('${html:LANG_TIPCANCEL}'); return true" onMouseOut="info(' '); return true" + > + </td></tr> + </table> +</td></tr> </form> diff --git a/html/server/option2.html b/html/server/option2.html index 6df78f3..3338686 100755 --- a/html/server/option2.html +++ b/html/server/option2.html @@ -6,94 +6,23 @@ <meta name="keywords" content="${LANG_METAKEYW}" /> <title>'${projname}' - HTTrack Website Copier</title> - <style type="text/css"> - <!-- - -body { - margin: 0; padding: 0; margin-bottom: 15px; margin-top: 8px; - background: #77b; -} -body, td { - font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; - } - -#subTitle { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -.tabCtrl { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -#siteNavigation a, #siteNavigation .current { - font-weight: bold; color: #448; - } -#siteNavigation a:link { text-decoration: none; } -#siteNavigation a:visited { text-decoration: none; } - -#siteNavigation .current { background-color: #ccd; } - -#siteNavigation a:hover { text-decoration: none; background-color: #fff; color: #000; } -#siteNavigation a:active { text-decoration: none; background-color: #ccc; } - - -a:link { text-decoration: underline; color: #00f; } -a:visited { text-decoration: underline; color: #000; } -a:hover { text-decoration: underline; color: #c00; } -a:active { text-decoration: underline; } - -#pageContent { - clear: both; - border-bottom: 6px solid #000; - padding: 10px; padding-top: 20px; - line-height: 1.65em; - background-image: url(images/bg_rings.gif); - background-repeat: no-repeat; - background-position: top right; - } - -#pageContent, #siteNavigation { - background-color: #ccd; - } - - -.imgLeft { float: left; margin-right: 10px; margin-bottom: 10px; } -.imgRight { float: right; margin-left: 10px; margin-bottom: 10px; } - -hr { height: 1px; color: #000; background-color: #000; margin-bottom: 15px; } - -h1 { margin: 0; font-weight: bold; font-size: 2em; } -h2 { margin: 0; font-weight: bold; font-size: 1.6em; } -h3 { margin: 0; font-weight: bold; font-size: 1.3em; } -h4 { margin: 0; font-weight: bold; font-size: 1.18em; } - -.blak { background-color: #000; } -.hide { display: none; } -.tableWidth { min-width: 400px; } - -.tblRegular { border-collapse: collapse; } -.tblRegular td { padding: 6px; background-image: url(fade.gif); border: 2px solid #99c; } -.tblHeaderColor, .tblHeaderColor td { background: #99c; } -.tblNoBorder td { border: 0; } - - -// --> -</style> + <link rel="stylesheet" type="text/css" media="screen" href="style.css"> + <script type="text/javascript" src="ping.js" defer></script> <script language="javascript"> <!-- function do_load() { - window.status=' ';
-${do:if-not-empty:closeme}
- window.close();
-${do:end-if}
-${do:set:closeme:}
+ window.status=' '; +${do:if-not-empty:closeme} + window.close(); +${do:end-if} +${do:set:closeme:} } function do_unload() { } function info(str) { window.status = str; -}
+} // --> </script> @@ -131,7 +60,7 @@ ${do:if-file-exists:html/index.html} <td> <a href="/step9_opt5.html" target="_blank" onClick="window.open('/step9_opt5.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" >${LANG_TIPHELP}</a> </td> ${do:end-if} @@ -142,18 +71,18 @@ ${do:end-if} <table class="tableWidth" border="0" width="100%" cellspacing="0"> <tr> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT1}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT1}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT2}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT2}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT3}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT3}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT4}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT4}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT5}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT5}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT11}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT11}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT1}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT1}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT2}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT2}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT3}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT3}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT4}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT4}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT5}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT5}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT11}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT11}</a></td> </tr><tr> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT6}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT6}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT7}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT7}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT8}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT8}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT9}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT9}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT10}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT10}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT6}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT6}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT7}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT7}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT8}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT8}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT9}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT9}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT10}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT10}</a></td> <td class="tabCtrl" align="center"> </td> </tr> @@ -167,62 +96,62 @@ ${do:end-if} <form method="POST" action="${thisfile}" name="form"> <input type="hidden" name="sid" value="${sid}"> <input type="hidden" name="redirect" value=""> -<input type="hidden" name="closeme" value="">
+<input type="hidden" name="closeme" value=""> ${LANG_I33} <br> <select name="build" - onMouseOver="info('${LANG_I3}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I3}'); return true" onMouseOut="info(' '); return true" > ${listid:build:LISTDEF_3} </select> <input type="button" value="${LANG_O2}" onClick="form.build.selectedIndex=14; window.open('option2b.html', 'option2b', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480').wparent=document; form.submit();" - onMouseOver="info('${LANG_I4}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I4}'); return true" onMouseOut="info(' '); return true" > <!-- checkboxes --> <table border="0" width="100%" cellspacing="0"> -<tr><td>
-<select name="dos"
- onMouseOver="info('${LANG_I8}\r\n${LANG_I8b}'); return true" onMouseOut="info(' '); return true"
->
-<option value="0"${ztest:dos: selected::}> </option>
-<option value="1"${ztest:dos:: selected:}>${LANG_I37}</option>
-<option value="2"${ztest:dos::: selected}>${LANG_I37b}</option>
-</select>
+<tr><td> +<select name="dos" + onMouseOver="info('${html:LANG_I8}\r\n${LANG_I8b}'); return true" onMouseOut="info(' '); return true" +> +<option value="0"${ztest:dos: selected::}> </option> +<option value="1"${ztest:dos:: selected:}>${LANG_I37}</option> +<option value="2"${ztest:dos::: selected}>${LANG_I37b}</option> +</select> </td></tr> <tr><td><input type="checkbox" name="errpage" ${checked:errpage} - onMouseOver="info('${LANG_I9}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I9}'); return true" onMouseOut="info(' '); return true" > ${LANG_I38}</td></tr> <tr><td><input type="checkbox" name="external" ${checked:external} - onMouseOver="info('${LANG_I29}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I29}'); return true" onMouseOut="info(' '); return true" > ${LANG_I56}</td></tr> <tr><td><input type="checkbox" name="hidepwd" ${checked:hidepwd} - onMouseOver="info('${LANG_I30}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I30}'); return true" onMouseOut="info(' '); return true" > ${LANG_I66}</td></tr> <tr><td><input type="checkbox" name="hidequery" ${checked:hidequery} - onMouseOver="info('${LANG_I30b}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I30b}'); return true" onMouseOut="info(' '); return true" > ${LANG_I67}</td></tr> <tr><td><input type="checkbox" name="nopurge" ${checked:nopurge} - onMouseOver="info('${LANG_I1a}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I1a}'); return true" onMouseOut="info(' '); return true" > ${LANG_I57}</td></tr> </table> -<tr><td>
- <table width="100%">
- <tr><td align="left">
- <input type="submit" value="${LANG_OK}"
+<tr><td> + <table width="100%"> + <tr><td align="left"> + <input type="submit" value="${LANG_OK}" onClick="form.closeme.value=1; form.submit(); return false;" - onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info(' '); return true" - >
- </td><td align="right">
- <input type="button" value="${LANG_CANCEL}"
- onClick="window.close();"
- onMouseOver="info('${LANG_TIPCANCEL}'); return true" onMouseOut="info(' '); return true"
- >
- </td></tr>
- </table>
+ onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info(' '); return true" + > + </td><td align="right"> + <input type="button" value="${LANG_CANCEL}" + onClick="window.close();" + onMouseOver="info('${html:LANG_TIPCANCEL}'); return true" onMouseOut="info(' '); return true" + > + </td></tr> + </table> </td></tr> </form> diff --git a/html/server/option2b.html b/html/server/option2b.html index ef6d0b2..6afd048 100755 --- a/html/server/option2b.html +++ b/html/server/option2b.html @@ -6,88 +6,17 @@ <meta name="keywords" content="${LANG_METAKEYW}" /> <title>'${projname}' - HTTrack Website Copier</title> - <style type="text/css"> - <!-- - -body { - margin: 0; padding: 0; margin-bottom: 15px; margin-top: 8px; - background: #77b; -} -body, td { - font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; - } - -#subTitle { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -.tabCtrl { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -#siteNavigation a, #siteNavigation .current { - font-weight: bold; color: #448; - } -#siteNavigation a:link { text-decoration: none; } -#siteNavigation a:visited { text-decoration: none; } - -#siteNavigation .current { background-color: #ccd; } - -#siteNavigation a:hover { text-decoration: none; background-color: #fff; color: #000; } -#siteNavigation a:active { text-decoration: none; background-color: #ccc; } - - -a:link { text-decoration: underline; color: #00f; } -a:visited { text-decoration: underline; color: #000; } -a:hover { text-decoration: underline; color: #c00; } -a:active { text-decoration: underline; } - -#pageContent { - clear: both; - border-bottom: 6px solid #000; - padding: 10px; padding-top: 20px; - line-height: 1.65em; - background-image: url(images/bg_rings.gif); - background-repeat: no-repeat; - background-position: top right; - } - -#pageContent, #siteNavigation { - background-color: #ccd; - } - - -.imgLeft { float: left; margin-right: 10px; margin-bottom: 10px; } -.imgRight { float: right; margin-left: 10px; margin-bottom: 10px; } - -hr { height: 1px; color: #000; background-color: #000; margin-bottom: 15px; } - -h1 { margin: 0; font-weight: bold; font-size: 2em; } -h2 { margin: 0; font-weight: bold; font-size: 1.6em; } -h3 { margin: 0; font-weight: bold; font-size: 1.3em; } -h4 { margin: 0; font-weight: bold; font-size: 1.18em; } - -.blak { background-color: #000; } -.hide { display: none; } -.tableWidth { min-width: 400px; } - -.tblRegular { border-collapse: collapse; } -.tblRegular td { padding: 6px; background-image: url(fade.gif); border: 2px solid #99c; } -.tblHeaderColor, .tblHeaderColor td { background: #99c; } -.tblNoBorder td { border: 0; } - - -// --> -</style> + <link rel="stylesheet" type="text/css" media="screen" href="style.css"> + <script type="text/javascript" src="ping.js" defer></script> <script language="javascript"> <!-- function do_load() { window.status=' '; -${do:if-not-empty:closeme}
- window.close();
-${do:end-if}
-${do:set:closeme:}
+${do:if-not-empty:closeme} + window.close(); +${do:end-if} +${do:set:closeme:} } function do_unload() { } @@ -141,7 +70,7 @@ ${do:if-file-exists:html/index.html} <td> <a href="/step9_opt5.html" target="_blank" onClick="window.open('/step9_opt5.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" >${LANG_TIPHELP}</a> </td> ${do:end-if} @@ -155,7 +84,7 @@ ${do:end-if} <form method="POST" action="${thisfile}" name="form"> <input type="hidden" name="sid" value="${sid}"> <input type="hidden" name="redirect" value=""> -<input type="hidden" name="closeme" value="">
+<input type="hidden" name="closeme" value=""> <input name="BuildString" size="60" value="${BuildString}"> @@ -170,25 +99,25 @@ ${LANG_Q3} </pre> <br> -
-<tr><td>
- <table width="100%">
- <tr><td align="left">
- <input type="submit" value="${LANG_OK]"
-${do:output-mode:html-urlescaped}
- onClick="if (confirm(str_replace(str_replace('${LANG_DIAL7}', '%20', ' '), '%0a', ' '))) { form.closeme.value=1; form.submit(); } return false;"
-${do:output-mode:}
- onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info(' '); return true"
- >
- </td><td align="right">
- <input type="button" value="${LANG_CANCEL}"
- onClick="window.close();"
- onMouseOver="info('${LANG_TIPCANCEL}'); return true" onMouseOut="info(' '); return true"
- >
- </td></tr>
- </table>
-</td></tr>
-
+ +<tr><td> + <table width="100%"> + <tr><td align="left"> + <input type="submit" value="${LANG_OK]" +${do:output-mode:html-urlescaped} + onClick="if (confirm(str_replace(str_replace('${LANG_DIAL7}', '%20', ' '), '%0a', ' '))) { form.closeme.value=1; form.submit(); } return false;" +${do:output-mode:} + onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info(' '); return true" + > + </td><td align="right"> + <input type="button" value="${LANG_CANCEL}" + onClick="window.close();" + onMouseOver="info('${html:LANG_TIPCANCEL}'); return true" onMouseOut="info(' '); return true" + > + </td></tr> + </table> +</td></tr> + </form> </td></tr> diff --git a/html/server/option3.html b/html/server/option3.html index 9c6149e..cef03fc 100755 --- a/html/server/option3.html +++ b/html/server/option3.html @@ -6,88 +6,17 @@ <meta name="keywords" content="${LANG_METAKEYW}" /> <title>'${projname}' - HTTrack Website Copier</title> - <style type="text/css"> - <!-- - -body { - margin: 0; padding: 0; margin-bottom: 15px; margin-top: 8px; - background: #77b; -} -body, td { - font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; - } - -#subTitle { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -.tabCtrl { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -#siteNavigation a, #siteNavigation .current { - font-weight: bold; color: #448; - } -#siteNavigation a:link { text-decoration: none; } -#siteNavigation a:visited { text-decoration: none; } - -#siteNavigation .current { background-color: #ccd; } - -#siteNavigation a:hover { text-decoration: none; background-color: #fff; color: #000; } -#siteNavigation a:active { text-decoration: none; background-color: #ccc; } - - -a:link { text-decoration: underline; color: #00f; } -a:visited { text-decoration: underline; color: #000; } -a:hover { text-decoration: underline; color: #c00; } -a:active { text-decoration: underline; } - -#pageContent { - clear: both; - border-bottom: 6px solid #000; - padding: 10px; padding-top: 20px; - line-height: 1.65em; - background-image: url(images/bg_rings.gif); - background-repeat: no-repeat; - background-position: top right; - } - -#pageContent, #siteNavigation { - background-color: #ccd; - } - - -.imgLeft { float: left; margin-right: 10px; margin-bottom: 10px; } -.imgRight { float: right; margin-left: 10px; margin-bottom: 10px; } - -hr { height: 1px; color: #000; background-color: #000; margin-bottom: 15px; } - -h1 { margin: 0; font-weight: bold; font-size: 2em; } -h2 { margin: 0; font-weight: bold; font-size: 1.6em; } -h3 { margin: 0; font-weight: bold; font-size: 1.3em; } -h4 { margin: 0; font-weight: bold; font-size: 1.18em; } - -.blak { background-color: #000; } -.hide { display: none; } -.tableWidth { min-width: 400px; } - -.tblRegular { border-collapse: collapse; } -.tblRegular td { padding: 6px; background-image: url(fade.gif); border: 2px solid #99c; } -.tblHeaderColor, .tblHeaderColor td { background: #99c; } -.tblNoBorder td { border: 0; } - - -// --> -</style> + <link rel="stylesheet" type="text/css" media="screen" href="style.css"> + <script type="text/javascript" src="ping.js" defer></script> <script language="javascript"> <!-- function do_load() { window.status=' '; -${do:if-not-empty:closeme}
- window.close();
-${do:end-if}
-${do:set:closeme:}
+${do:if-not-empty:closeme} + window.close(); +${do:end-if} +${do:set:closeme:} } function do_unload() { } @@ -131,7 +60,7 @@ ${do:if-file-exists:html/index.html} <td> <a href="/step9_opt10.html" target="_blank" onClick="window.open('/step9_opt10.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" >${LANG_TIPHELP}</a> </td> ${do:end-if} @@ -142,18 +71,18 @@ ${do:end-if} <table class="tableWidth" border="0" width="100%" cellspacing="0"> <tr> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT1}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT1}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT2}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT2}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT3}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT3}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT4}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT4}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT5}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT5}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT11}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT11}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT1}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT1}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT2}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT2}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT3}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT3}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT4}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT4}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT5}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT5}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT11}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT11}</a></td> </tr><tr> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT6}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT6}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT7}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT7}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT8}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT8}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT9}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT9}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT10}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT10}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT6}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT6}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT7}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT7}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT8}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT8}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT9}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT9}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT10}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT10}</a></td> <td class="tabCtrl" align="center"> </td> </tr> @@ -167,7 +96,7 @@ ${do:end-if} <form method="POST" action="${thisfile}" name="form"> <input type="hidden" name="sid" value="${sid}"> <input type="hidden" name="redirect" value=""> -<input type="hidden" name="closeme" value="">
+<input type="hidden" name="closeme" value=""> ${LANG_I40c} <br> @@ -175,7 +104,7 @@ ${LANG_I40c} <!-- checkboxes --> <table border="0" width="100%" cellspacing="0"> <tr><td><input type="checkbox" name="cache" ${checked:cache} - onMouseOver="info('${LANG_I5}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I5}'); return true" onMouseOut="info(' '); return true" > ${LANG_I34}</td></tr> </table> <br> @@ -183,7 +112,7 @@ ${LANG_I40c} ${LANG_I39} <br> <select name="filter" - onMouseOver="info('${LANG_I29}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I29}'); return true" onMouseOut="info(' '); return true" > ${listid:filter:LISTDEF_4} </select> @@ -192,7 +121,7 @@ ${listid:filter:LISTDEF_4} ${LANG_I40} <br> <select name="travel" - onMouseOver="info('${LANG_I11}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I11}'); return true" onMouseOut="info(' '); return true" > ${listid:travel:LISTDEF_5} </select> @@ -201,7 +130,7 @@ ${listid:travel:LISTDEF_5} ${LANG_I40b} <br> <select name="travel2" - onMouseOver="info('${LANG_I11b}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I11b}'); return true" onMouseOut="info(' '); return true" > ${listid:travel2:LISTDEF_6} </select> @@ -210,7 +139,7 @@ ${listid:travel2:LISTDEF_6} ${LANG_I40e} <br> <select name="travel3" - onMouseOver="info('${LANG_I11c}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I11c}'); return true" onMouseOut="info(' '); return true" > ${listid:travel3:LISTDEF_11} </select> @@ -219,26 +148,26 @@ ${listid:travel3:LISTDEF_11} <!-- checkboxes --> <table border="0" width="100%" cellspacing="0"> <tr><td><input type="checkbox" name="windebug" ${checked:windebug} - onMouseOver="info('${LANG_I1h}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I1h}'); return true" onMouseOut="info(' '); return true" > ${LANG_I40d}</td></tr> </table> <br> -<tr><td>
- <table width="100%">
- <tr><td align="left">
- <input type="submit" value="${LANG_OK}"
- onClick="form.closeme.value=1; form.submit(); return false;"
- onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info(' '); return true"
- >
- </td><td align="right">
- <input type="button" value="${LANG_CANCEL}"
- onClick="window.close();"
- onMouseOver="info('${LANG_TIPCANCEL}'); return true" onMouseOut="info(' '); return true"
- >
- </td></tr>
- </table>
-</td></tr>
+<tr><td> + <table width="100%"> + <tr><td align="left"> + <input type="submit" value="${LANG_OK}" + onClick="form.closeme.value=1; form.submit(); return false;" + onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info(' '); return true" + > + </td><td align="right"> + <input type="button" value="${LANG_CANCEL}" + onClick="window.close();" + onMouseOver="info('${html:LANG_TIPCANCEL}'); return true" onMouseOut="info(' '); return true" + > + </td></tr> + </table> +</td></tr> </form> diff --git a/html/server/option4.html b/html/server/option4.html index c2176c3..a95a7b0 100755 --- a/html/server/option4.html +++ b/html/server/option4.html @@ -6,88 +6,17 @@ <meta name="keywords" content="${LANG_METAKEYW}" /> <title>'${projname}' - HTTrack Website Copier</title> - <style type="text/css"> - <!-- - -body { - margin: 0; padding: 0; margin-bottom: 15px; margin-top: 8px; - background: #77b; -} -body, td { - font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; - } - -#subTitle { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -.tabCtrl { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -#siteNavigation a, #siteNavigation .current { - font-weight: bold; color: #448; - } -#siteNavigation a:link { text-decoration: none; } -#siteNavigation a:visited { text-decoration: none; } - -#siteNavigation .current { background-color: #ccd; } - -#siteNavigation a:hover { text-decoration: none; background-color: #fff; color: #000; } -#siteNavigation a:active { text-decoration: none; background-color: #ccc; } - - -a:link { text-decoration: underline; color: #00f; } -a:visited { text-decoration: underline; color: #000; } -a:hover { text-decoration: underline; color: #c00; } -a:active { text-decoration: underline; } - -#pageContent { - clear: both; - border-bottom: 6px solid #000; - padding: 10px; padding-top: 20px; - line-height: 1.65em; - background-image: url(images/bg_rings.gif); - background-repeat: no-repeat; - background-position: top right; - } - -#pageContent, #siteNavigation { - background-color: #ccd; - } - - -.imgLeft { float: left; margin-right: 10px; margin-bottom: 10px; } -.imgRight { float: right; margin-left: 10px; margin-bottom: 10px; } - -hr { height: 1px; color: #000; background-color: #000; margin-bottom: 15px; } - -h1 { margin: 0; font-weight: bold; font-size: 2em; } -h2 { margin: 0; font-weight: bold; font-size: 1.6em; } -h3 { margin: 0; font-weight: bold; font-size: 1.3em; } -h4 { margin: 0; font-weight: bold; font-size: 1.18em; } - -.blak { background-color: #000; } -.hide { display: none; } -.tableWidth { min-width: 400px; } - -.tblRegular { border-collapse: collapse; } -.tblRegular td { padding: 6px; background-image: url(fade.gif); border: 2px solid #99c; } -.tblHeaderColor, .tblHeaderColor td { background: #99c; } -.tblNoBorder td { border: 0; } - - -// --> -</style> + <link rel="stylesheet" type="text/css" media="screen" href="style.css"> + <script type="text/javascript" src="ping.js" defer></script> <script language="javascript"> <!-- function do_load() { window.status=' '; -${do:if-not-empty:closeme}
- window.close();
-${do:end-if}
-${do:set:closeme:}
+${do:if-not-empty:closeme} + window.close(); +${do:end-if} +${do:set:closeme:} } function do_unload() { } @@ -131,7 +60,7 @@ ${do:if-file-exists:html/index.html} <td> <a href="/step9_opt3.html" target="_blank" onClick="window.open('/step9_opt3.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" >${LANG_TIPHELP}</a> </td> ${do:end-if} @@ -142,18 +71,18 @@ ${do:end-if} <table class="tableWidth" border="0" width="100%" cellspacing="0"> <tr> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT1}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT1}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT2}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT2}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT3}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT3}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT4}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT4}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT5}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT5}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT11}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT11}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT1}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT1}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT2}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT2}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT3}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT3}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT4}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT4}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT5}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT5}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT11}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT11}</a></td> </tr><tr> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT6}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT6}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT7}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT7}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT8}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT8}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT9}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT9}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT10}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT10}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT6}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT6}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT7}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT7}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT8}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT8}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT9}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT9}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT10}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT10}</a></td> <td class="tabCtrl" align="center"> </td> </tr> @@ -167,7 +96,7 @@ ${do:end-if} <form method="POST" action="refresh.html" name="form"> <input type="hidden" name="sid" value="${sid}"> <input type="hidden" name="redirect" value=""> -<input type="hidden" name="closeme" value="">
+<input type="hidden" name="closeme" value=""> <table border="0" width="100%" cellspacing="0"> @@ -175,11 +104,11 @@ ${do:end-if} ${LANG_I44} </td><td> <input name="connexion" value="${connexion}" size="4" - onMouseOver="info('${LANG_I12}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I12}'); return true" onMouseOut="info(' '); return true" > </td></tr><tr><td></td><td> <input type="checkbox" name="ka" ${checked:ka} - onMouseOver="info('${LANG_I47f}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I47f}'); return true" onMouseOut="info(' '); return true" > ${LANG_I47e} </td></tr> @@ -187,11 +116,11 @@ ${LANG_I44} ${LANG_I47d} </td><td> <input name="timeout" value="${timeout}" size="4" - onMouseOver="info('${LANG_I13}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I13}'); return true" onMouseOut="info(' '); return true" > </td></tr><tr><td></td><td> <input type="checkbox" name="remt" ${checked:remt} - onMouseOver="info('${LANG_I14}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I14}'); return true" onMouseOut="info(' '); return true" > ${LANG_I45} </td></tr> @@ -199,7 +128,7 @@ ${LANG_I47d} ${LANG_I48} </td><td> <input name="retry" value="${retry}" size="4" - onMouseOver="info('${LANG_I17}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I17}'); return true" onMouseOut="info(' '); return true" > </td></tr> @@ -207,31 +136,31 @@ ${LANG_I48} ${LANG_I46} </td><td> <input name="rate" value="${rate}" size="4" - onMouseOver="info('${LANG_I15}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I15}'); return true" onMouseOut="info(' '); return true" > </td></tr><tr><td></td><td> <input type="checkbox" name="rems" ${checked:rems} - onMouseOver="info('${LANG_I16}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I16}'); return true" onMouseOut="info(' '); return true" > ${LANG_I47} </td></tr> </table> -<tr><td>
- <table width="100%">
- <tr><td align="left">
- <input type="submit" value="${LANG_OK}"
- onClick="form.closeme.value=1; form.submit(); return false;"
- onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info(' '); return true"
- >
- </td><td align="right">
- <input type="button" value="${LANG_CANCEL}"
- onClick="window.close();"
- onMouseOver="info('${LANG_TIPCANCEL}'); return true" onMouseOut="info(' '); return true"
- >
- </td></tr>
- </table>
-</td></tr>
+<tr><td> + <table width="100%"> + <tr><td align="left"> + <input type="submit" value="${LANG_OK}" + onClick="form.closeme.value=1; form.submit(); return false;" + onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info(' '); return true" + > + </td><td align="right"> + <input type="button" value="${LANG_CANCEL}" + onClick="window.close();" + onMouseOver="info('${html:LANG_TIPCANCEL}'); return true" onMouseOut="info(' '); return true" + > + </td></tr> + </table> +</td></tr> </form> diff --git a/html/server/option5.html b/html/server/option5.html index 0da4e32..d13b438 100755 --- a/html/server/option5.html +++ b/html/server/option5.html @@ -6,88 +6,17 @@ <meta name="keywords" content="${LANG_METAKEYW}" /> <title>'${projname}' - HTTrack Website Copier</title> - <style type="text/css"> - <!-- - -body { - margin: 0; padding: 0; margin-bottom: 15px; margin-top: 8px; - background: #77b; -} -body, td { - font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; - } - -#subTitle { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -.tabCtrl { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -#siteNavigation a, #siteNavigation .current { - font-weight: bold; color: #448; - } -#siteNavigation a:link { text-decoration: none; } -#siteNavigation a:visited { text-decoration: none; } - -#siteNavigation .current { background-color: #ccd; } - -#siteNavigation a:hover { text-decoration: none; background-color: #fff; color: #000; } -#siteNavigation a:active { text-decoration: none; background-color: #ccc; } - - -a:link { text-decoration: underline; color: #00f; } -a:visited { text-decoration: underline; color: #000; } -a:hover { text-decoration: underline; color: #c00; } -a:active { text-decoration: underline; } - -#pageContent { - clear: both; - border-bottom: 6px solid #000; - padding: 10px; padding-top: 20px; - line-height: 1.65em; - background-image: url(images/bg_rings.gif); - background-repeat: no-repeat; - background-position: top right; - } - -#pageContent, #siteNavigation { - background-color: #ccd; - } - - -.imgLeft { float: left; margin-right: 10px; margin-bottom: 10px; } -.imgRight { float: right; margin-left: 10px; margin-bottom: 10px; } - -hr { height: 1px; color: #000; background-color: #000; margin-bottom: 15px; } - -h1 { margin: 0; font-weight: bold; font-size: 2em; } -h2 { margin: 0; font-weight: bold; font-size: 1.6em; } -h3 { margin: 0; font-weight: bold; font-size: 1.3em; } -h4 { margin: 0; font-weight: bold; font-size: 1.18em; } - -.blak { background-color: #000; } -.hide { display: none; } -.tableWidth { min-width: 400px; } - -.tblRegular { border-collapse: collapse; } -.tblRegular td { padding: 6px; background-image: url(fade.gif); border: 2px solid #99c; } -.tblHeaderColor, .tblHeaderColor td { background: #99c; } -.tblNoBorder td { border: 0; } - - -// --> -</style> + <link rel="stylesheet" type="text/css" media="screen" href="style.css"> + <script type="text/javascript" src="ping.js" defer></script> <script language="javascript"> <!-- function do_load() { window.status=' '; -${do:if-not-empty:closeme}
- window.close();
-${do:end-if}
-${do:set:closeme:}
+${do:if-not-empty:closeme} + window.close(); +${do:end-if} +${do:set:closeme:} } function do_unload() { } @@ -131,7 +60,7 @@ ${do:if-file-exists:html/index.html} <td> <a href="/step9_opt2.html" target="_blank" onClick="window.open('/step9_opt2.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" >${LANG_TIPHELP}</a> </td> ${do:end-if} @@ -142,18 +71,18 @@ ${do:end-if} <table class="tableWidth" border="0" width="100%" cellspacing="0"> <tr> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT1}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT1}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT2}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT2}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT3}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT3}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT4}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT4}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT5}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT5}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT11}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT11}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT1}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT1}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT2}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT2}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT3}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT3}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT4}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT4}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT5}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT5}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT11}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT11}</a></td> </tr><tr> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT6}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT6}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT7}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT7}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT8}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT8}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT9}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT9}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT10}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT10}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT6}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT6}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT7}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT7}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT8}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT8}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT9}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT9}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT10}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT10}</a></td> <td class="tabCtrl" align="center"> </td> </tr> @@ -167,7 +96,7 @@ ${do:end-if} <form method="POST" action="${thisfile}" name="form"> <input type="hidden" name="sid" value="${sid}"> <input type="hidden" name="redirect" value=""> -<input type="hidden" name="closeme" value="">
+<input type="hidden" name="closeme" value=""> <table border="0" width="100%" cellspacing="0"> @@ -175,7 +104,7 @@ ${do:end-if} ${LANG_G32} </td><td> <input name="depth" value="${depth}" size="4" - onMouseOver="info('${LANG_I1g}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I1g}'); return true" onMouseOut="info(' '); return true" > </td></tr> @@ -183,7 +112,7 @@ ${LANG_G32} ${LANG_G32b} </td><td> <input name="depth2" value="${depth2}" size="4" - onMouseOver="info('${LANG_I1g2}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I1g2}'); return true" onMouseOut="info(' '); return true" > </td></tr> @@ -191,7 +120,7 @@ ${LANG_G32b} ${LANG_I50} </td><td> <input name="maxhtml" value="${maxhtml}" size="4" - onMouseOver="info('${LANG_I18}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I18}'); return true" onMouseOut="info(' '); return true" > </td></tr> @@ -199,7 +128,7 @@ ${LANG_I50} ${LANG_I50b} </td><td> <input name="othermax" value="${othermax}" size="4" - onMouseOver="info('${LANG_I19}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I19}'); return true" onMouseOut="info(' '); return true" > </td></tr> @@ -207,7 +136,7 @@ ${LANG_I50b} ${LANG_I51} </td><td> <input name="sizemax" value="${sizemax}" size="4" - onMouseOver="info('${LANG_I20}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I20}'); return true" onMouseOut="info(' '); return true" > </td></tr> @@ -215,7 +144,7 @@ ${LANG_I51} ${LANG_I65} </td><td> <input name="pausebytes" value="${pausebytes}" size="4" - onMouseOver="info('${LANG_I20b}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I20b}'); return true" onMouseOut="info(' '); return true" > </td></tr> @@ -223,7 +152,7 @@ ${LANG_I65} ${LANG_I52} </td><td> <input name="maxtime" value="${maxtime}" size="4" - onMouseOver="info('${LANG_I21}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I21}'); return true" onMouseOut="info(' '); return true" > </td></tr> @@ -231,7 +160,7 @@ ${LANG_I52} ${LANG_I54} </td><td> <input name="maxrate" value="${maxrate}" size="4" - onMouseOver="info('${LANG_I22}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I22}'); return true" onMouseOut="info(' '); return true" > </td></tr> @@ -239,7 +168,7 @@ ${LANG_I54} ${LANG_I64} </td><td> <input name="maxconn" value="${maxconn}" size="4" - onMouseOver="info('${LANG_I22b}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I22b}'); return true" onMouseOut="info(' '); return true" > </td></tr> @@ -247,25 +176,25 @@ ${LANG_I64} ${LANG_I64b} </td><td> <input name="maxlinks" value="${maxlinks}" size="4" - onMouseOver="info('${LANG_I22c}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I22c}'); return true" onMouseOut="info(' '); return true" > </td></tr> -<tr><td>
- <table width="100%">
- <tr><td align="left">
- <input type="submit" value="${LANG_OK}"
- onClick="form.closeme.value=1; form.submit(); return false;"
- onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info(' '); return true"
- >
- </td><td align="right">
- <input type="button" value="${LANG_CANCEL}"
- onClick="window.close();"
- onMouseOver="info('${LANG_TIPCANCEL}'); return true" onMouseOut="info(' '); return true"
- >
- </td></tr>
- </table>
-</td></tr>
+<tr><td> + <table width="100%"> + <tr><td align="left"> + <input type="submit" value="${LANG_OK}" + onClick="form.closeme.value=1; form.submit(); return false;" + onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info(' '); return true" + > + </td><td align="right"> + <input type="button" value="${LANG_CANCEL}" + onClick="window.close();" + onMouseOver="info('${html:LANG_TIPCANCEL}'); return true" onMouseOut="info(' '); return true" + > + </td></tr> + </table> +</td></tr> </table> diff --git a/html/server/option6.html b/html/server/option6.html index c0a18c5..926280d 100755 --- a/html/server/option6.html +++ b/html/server/option6.html @@ -6,88 +6,17 @@ <meta name="keywords" content="${LANG_METAKEYW}" /> <title>'${projname}' - HTTrack Website Copier</title> - <style type="text/css"> - <!-- - -body { - margin: 0; padding: 0; margin-bottom: 15px; margin-top: 8px; - background: #77b; -} -body, td { - font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; - } - -#subTitle { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -.tabCtrl { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -#siteNavigation a, #siteNavigation .current { - font-weight: bold; color: #448; - } -#siteNavigation a:link { text-decoration: none; } -#siteNavigation a:visited { text-decoration: none; } - -#siteNavigation .current { background-color: #ccd; } - -#siteNavigation a:hover { text-decoration: none; background-color: #fff; color: #000; } -#siteNavigation a:active { text-decoration: none; background-color: #ccc; } - - -a:link { text-decoration: underline; color: #00f; } -a:visited { text-decoration: underline; color: #000; } -a:hover { text-decoration: underline; color: #c00; } -a:active { text-decoration: underline; } - -#pageContent { - clear: both; - border-bottom: 6px solid #000; - padding: 10px; padding-top: 20px; - line-height: 1.65em; - background-image: url(images/bg_rings.gif); - background-repeat: no-repeat; - background-position: top right; - } - -#pageContent, #siteNavigation { - background-color: #ccd; - } - - -.imgLeft { float: left; margin-right: 10px; margin-bottom: 10px; } -.imgRight { float: right; margin-left: 10px; margin-bottom: 10px; } - -hr { height: 1px; color: #000; background-color: #000; margin-bottom: 15px; } - -h1 { margin: 0; font-weight: bold; font-size: 2em; } -h2 { margin: 0; font-weight: bold; font-size: 1.6em; } -h3 { margin: 0; font-weight: bold; font-size: 1.3em; } -h4 { margin: 0; font-weight: bold; font-size: 1.18em; } - -.blak { background-color: #000; } -.hide { display: none; } -.tableWidth { min-width: 400px; } - -.tblRegular { border-collapse: collapse; } -.tblRegular td { padding: 6px; background-image: url(fade.gif); border: 2px solid #99c; } -.tblHeaderColor, .tblHeaderColor td { background: #99c; } -.tblNoBorder td { border: 0; } - - -// --> -</style> + <link rel="stylesheet" type="text/css" media="screen" href="style.css"> + <script type="text/javascript" src="ping.js" defer></script> <script language="javascript"> <!-- function do_load() { window.status=' '; -${do:if-not-empty:closeme}
- window.close();
-${do:end-if}
-${do:set:closeme:}
+${do:if-not-empty:closeme} + window.close(); +${do:end-if} +${do:set:closeme:} } function do_unload() { } @@ -131,7 +60,7 @@ ${do:if-file-exists:html/index.html} <td> <a href="/step9_opt8.html" target="_blank" onClick="window.open('/step9_opt8.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" >${LANG_TIPHELP}</a> </td> ${do:end-if} @@ -142,18 +71,18 @@ ${do:end-if} <table class="tableWidth" border="0" width="100%" cellspacing="0"> <tr> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT1}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT1}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT2}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT2}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT3}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT3}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT4}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT4}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT5}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT5}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT11}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT11}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT1}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT1}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT2}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT2}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT3}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT3}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT4}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT4}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT5}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT5}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT11}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT11}</a></td> </tr><tr> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT6}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT6}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT7}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT7}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT8}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT8}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT9}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT9}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT10}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT10}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT6}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT6}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT7}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT7}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT8}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT8}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT9}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT9}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT10}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT10}</a></td> <td class="tabCtrl" align="center"> </td> </tr> @@ -167,7 +96,7 @@ ${do:end-if} <form method="POST" action="${thisfile}" name="form"> <input type="hidden" name="sid" value="${sid}"> <input type="hidden" name="redirect" value=""> -<input type="hidden" name="closeme" value="">
+<input type="hidden" name="closeme" value=""> <table border="0" width="100%" cellspacing="0"> @@ -175,7 +104,7 @@ ${do:end-if} ${LANG_I43} </td><td> <input name="user" value="${user}" size="60" - onMouseOver="info('${LANG_I23}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I23}'); return true" onMouseOut="info(' '); return true" > </td></tr> @@ -183,27 +112,27 @@ ${LANG_I43} ${LANG_I43b} </td><td> <input name="footer" value="${footer}" size="60" - onMouseOver="info('${LANG_I23b}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I23b}'); return true" onMouseOut="info(' '); return true" > </td></tr> </table> -<tr><td>
- <table width="100%">
- <tr><td align="left">
- <input type="submit" value="${LANG_OK}"
- onClick="form.closeme.value=1; form.submit(); return false;"
- onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info(' '); return true"
- >
- </td><td align="right">
- <input type="button" value="${LANG_CANCEL}"
- onClick="window.close();"
- onMouseOver="info('${LANG_TIPCANCEL}'); return true" onMouseOut="info(' '); return true"
- >
- </td></tr>
- </table>
-</td></tr>
+<tr><td> + <table width="100%"> + <tr><td align="left"> + <input type="submit" value="${LANG_OK}" + onClick="form.closeme.value=1; form.submit(); return false;" + onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info(' '); return true" + > + </td><td align="right"> + <input type="button" value="${LANG_CANCEL}" + onClick="window.close();" + onMouseOver="info('${html:LANG_TIPCANCEL}'); return true" onMouseOut="info(' '); return true" + > + </td></tr> + </table> +</td></tr> </form> diff --git a/html/server/option7.html b/html/server/option7.html index 676c11b..115081a 100755 --- a/html/server/option7.html +++ b/html/server/option7.html @@ -6,88 +6,17 @@ <meta name="keywords" content="${LANG_METAKEYW}" /> <title>'${projname}' - HTTrack Website Copier</title> - <style type="text/css"> - <!-- - -body { - margin: 0; padding: 0; margin-bottom: 15px; margin-top: 8px; - background: #77b; -} -body, td { - font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; - } - -#subTitle { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -.tabCtrl { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -#siteNavigation a, #siteNavigation .current { - font-weight: bold; color: #448; - } -#siteNavigation a:link { text-decoration: none; } -#siteNavigation a:visited { text-decoration: none; } - -#siteNavigation .current { background-color: #ccd; } - -#siteNavigation a:hover { text-decoration: none; background-color: #fff; color: #000; } -#siteNavigation a:active { text-decoration: none; background-color: #ccc; } - - -a:link { text-decoration: underline; color: #00f; } -a:visited { text-decoration: underline; color: #000; } -a:hover { text-decoration: underline; color: #c00; } -a:active { text-decoration: underline; } - -#pageContent { - clear: both; - border-bottom: 6px solid #000; - padding: 10px; padding-top: 20px; - line-height: 1.65em; - background-image: url(images/bg_rings.gif); - background-repeat: no-repeat; - background-position: top right; - } - -#pageContent, #siteNavigation { - background-color: #ccd; - } - - -.imgLeft { float: left; margin-right: 10px; margin-bottom: 10px; } -.imgRight { float: right; margin-left: 10px; margin-bottom: 10px; } - -hr { height: 1px; color: #000; background-color: #000; margin-bottom: 15px; } - -h1 { margin: 0; font-weight: bold; font-size: 2em; } -h2 { margin: 0; font-weight: bold; font-size: 1.6em; } -h3 { margin: 0; font-weight: bold; font-size: 1.3em; } -h4 { margin: 0; font-weight: bold; font-size: 1.18em; } - -.blak { background-color: #000; } -.hide { display: none; } -.tableWidth { min-width: 400px; } - -.tblRegular { border-collapse: collapse; } -.tblRegular td { padding: 6px; background-image: url(fade.gif); border: 2px solid #99c; } -.tblHeaderColor, .tblHeaderColor td { background: #99c; } -.tblNoBorder td { border: 0; } - - -// --> -</style> + <link rel="stylesheet" type="text/css" media="screen" href="style.css"> + <script type="text/javascript" src="ping.js" defer></script> <script language="javascript"> <!-- function do_load() { window.status=' '; -${do:if-not-empty:closeme}
- window.close();
-${do:end-if}
-${do:set:closeme:}
+${do:if-not-empty:closeme} + window.close(); +${do:end-if} +${do:set:closeme:} } function do_unload() { } @@ -131,7 +60,7 @@ ${do:if-file-exists:html/index.html} <td> <a href="/step9_opt4.html" target="_blank" onClick="window.open('/step9_opt4.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" >${LANG_TIPHELP}</a> </td> ${do:end-if} @@ -142,18 +71,18 @@ ${do:end-if} <table class="tableWidth" border="0" width="100%" cellspacing="0"> <tr> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT1}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT1}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT2}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT2}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT3}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT3}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT4}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT4}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT5}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT5}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT11}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT11}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT1}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT1}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT2}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT2}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT3}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT3}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT4}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT4}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT5}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT5}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT11}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT11}</a></td> </tr><tr> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT6}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT6}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT7}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT7}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT8}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT8}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT9}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT9}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT10}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT10}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT6}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT6}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT7}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT7}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT8}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT8}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT9}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT9}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT10}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT10}</a></td> <td class="tabCtrl" align="center"> </td> </tr> @@ -167,13 +96,13 @@ ${do:end-if} <form method="POST" action="${thisfile}" name="form"> <input type="hidden" name="sid" value="${sid}"> <input type="hidden" name="redirect" value=""> -<input type="hidden" name="closeme" value="">
+<input type="hidden" name="closeme" value=""> <tt> ${LANG_B10} </tt> <textarea name="url2" cols="60" rows="8" - onMouseOver="info('${LANG_C3}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_C3}'); return true" onMouseOut="info(' '); return true" >${url2}</textarea> <br> @@ -181,21 +110,21 @@ ${LANG_B10} ${LANG_B13} </tt> -<tr><td>
- <table width="100%">
- <tr><td align="left">
- <input type="submit" value="${LANG_OK}"
- onClick="form.closeme.value=1; form.submit(); return false;"
- onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info(' '); return true"
- >
- </td><td align="right">
- <input type="button" value="${LANG_CANCEL}"
- onClick="window.close();"
- onMouseOver="info('${LANG_TIPCANCEL}'); return true" onMouseOut="info(' '); return true"
- >
- </td></tr>
- </table>
-</td></tr>
+<tr><td> + <table width="100%"> + <tr><td align="left"> + <input type="submit" value="${LANG_OK}" + onClick="form.closeme.value=1; form.submit(); return false;" + onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info(' '); return true" + > + </td><td align="right"> + <input type="button" value="${LANG_CANCEL}" + onClick="window.close();" + onMouseOver="info('${html:LANG_TIPCANCEL}'); return true" onMouseOut="info(' '); return true" + > + </td></tr> + </table> +</td></tr> </form> diff --git a/html/server/option8.html b/html/server/option8.html index 5f32e0e..50735ae 100755 --- a/html/server/option8.html +++ b/html/server/option8.html @@ -6,88 +6,17 @@ <meta name="keywords" content="${LANG_METAKEYW}" /> <title>'${projname}' - HTTrack Website Copier</title> - <style type="text/css"> - <!-- - -body { - margin: 0; padding: 0; margin-bottom: 15px; margin-top: 8px; - background: #77b; -} -body, td { - font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; - } - -#subTitle { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -.tabCtrl { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -#siteNavigation a, #siteNavigation .current { - font-weight: bold; color: #448; - } -#siteNavigation a:link { text-decoration: none; } -#siteNavigation a:visited { text-decoration: none; } - -#siteNavigation .current { background-color: #ccd; } - -#siteNavigation a:hover { text-decoration: none; background-color: #fff; color: #000; } -#siteNavigation a:active { text-decoration: none; background-color: #ccc; } - - -a:link { text-decoration: underline; color: #00f; } -a:visited { text-decoration: underline; color: #000; } -a:hover { text-decoration: underline; color: #c00; } -a:active { text-decoration: underline; } - -#pageContent { - clear: both; - border-bottom: 6px solid #000; - padding: 10px; padding-top: 20px; - line-height: 1.65em; - background-image: url(images/bg_rings.gif); - background-repeat: no-repeat; - background-position: top right; - } - -#pageContent, #siteNavigation { - background-color: #ccd; - } - - -.imgLeft { float: left; margin-right: 10px; margin-bottom: 10px; } -.imgRight { float: right; margin-left: 10px; margin-bottom: 10px; } - -hr { height: 1px; color: #000; background-color: #000; margin-bottom: 15px; } - -h1 { margin: 0; font-weight: bold; font-size: 2em; } -h2 { margin: 0; font-weight: bold; font-size: 1.6em; } -h3 { margin: 0; font-weight: bold; font-size: 1.3em; } -h4 { margin: 0; font-weight: bold; font-size: 1.18em; } - -.blak { background-color: #000; } -.hide { display: none; } -.tableWidth { min-width: 400px; } - -.tblRegular { border-collapse: collapse; } -.tblRegular td { padding: 6px; background-image: url(fade.gif); border: 2px solid #99c; } -.tblHeaderColor, .tblHeaderColor td { background: #99c; } -.tblNoBorder td { border: 0; } - - -// --> -</style> + <link rel="stylesheet" type="text/css" media="screen" href="style.css"> + <script type="text/javascript" src="ping.js" defer></script> <script language="javascript"> <!-- function do_load() { window.status=' '; -${do:if-not-empty:closeme}
- window.close();
-${do:end-if}
-${do:set:closeme:}
+${do:if-not-empty:closeme} + window.close(); +${do:end-if} +${do:set:closeme:} } function do_unload() { } @@ -131,7 +60,7 @@ ${do:if-file-exists:html/index.html} <td> <a href="/step9_opt6.html" target="_blank" onClick="window.open('/step9_opt6.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" >${LANG_TIPHELP}</a> </td> ${do:end-if} @@ -142,18 +71,18 @@ ${do:end-if} <table class="tableWidth" border="0" width="100%" cellspacing="0"> <tr> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT1}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT1}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT2}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT2}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT3}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT3}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT4}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT4}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT5}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT5}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT11}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT11}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT1}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT1}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT2}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT2}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT3}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT3}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT4}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT4}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT5}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT5}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT11}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT11}</a></td> </tr><tr> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT6}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT6}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT7}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT7}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT8}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT8}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT9}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT9}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT10}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT10}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT6}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT6}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT7}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT7}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT8}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT8}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT9}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT9}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT10}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT10}</a></td> <td class="tabCtrl" align="center"> </td> </tr> @@ -167,72 +96,72 @@ ${do:end-if} <form method="POST" action="${thisfile}" name="form"> <input type="hidden" name="sid" value="${sid}"> <input type="hidden" name="redirect" value=""> -<input type="hidden" name="closeme" value="">
+<input type="hidden" name="closeme" value=""> <input type="checkbox" name="cookies" ${checked:cookies} - onMouseOver="info('${LANG_I1b}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I1b}'); return true" onMouseOut="info(' '); return true" > ${LANG_I58} <br><br> ${LANG_I59} <br> <select name="checktype" - onMouseOver="info('${LANG_I1c}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I1c}'); return true" onMouseOut="info(' '); return true" > ${listid:checktype:LISTDEF_7} </select> <br><br> <input type="checkbox" name="parsejava" ${checked:parsejava} - onMouseOver="info('${LANG_I1d}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I1d}'); return true" onMouseOut="info(' '); return true" > ${LANG_I60} <br><br> ${LANG_I55} <br> <select name="robots" - onMouseOver="info('${LANG_I28}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I28}'); return true" onMouseOut="info(' '); return true" > ${listid:robots:LISTDEF_8} </select> <br><br> <input type="checkbox" name="updhack" ${checked:updhack} - onMouseOver="info('${LANG_I1k}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I1k}'); return true" onMouseOut="info(' '); return true" > ${LANG_I62b} <br><br> <input type="checkbox" name="urlhack" ${checked:urlhack} - onMouseOver="info('${LANG_I1k2}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I1k2}'); return true" onMouseOut="info(' '); return true" > ${LANG_I62b2} <br><br> <input type="checkbox" name="toler" ${checked:toler} - onMouseOver="info('${LANG_I1i}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I1i}'); return true" onMouseOut="info(' '); return true" > ${LANG_I62} <br><br> <input type="checkbox" name="http10" ${checked:http10} - onMouseOver="info('${LANG_I1j}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I1j}'); return true" onMouseOut="info(' '); return true" > ${LANG_I63} <br><br> -<tr><td>
- <table width="100%">
- <tr><td align="left">
- <input type="submit" value="${LANG_OK}"
- onClick="form.closeme.value=1; form.submit(); return false;"
- onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info(' '); return true"
- >
- </td><td align="right">
- <input type="button" value="${LANG_CANCEL}"
- onClick="window.close();"
- onMouseOver="info('${LANG_TIPCANCEL}'); return true" onMouseOut="info(' '); return true"
- >
- </td></tr>
- </table>
-</td></tr>
+<tr><td> + <table width="100%"> + <tr><td align="left"> + <input type="submit" value="${LANG_OK}" + onClick="form.closeme.value=1; form.submit(); return false;" + onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info(' '); return true" + > + </td><td align="right"> + <input type="button" value="${LANG_CANCEL}" + onClick="window.close();" + onMouseOver="info('${html:LANG_TIPCANCEL}'); return true" onMouseOut="info(' '); return true" + > + </td></tr> + </table> +</td></tr> </form> diff --git a/html/server/option9.html b/html/server/option9.html index 2185f9f..2a98334 100755 --- a/html/server/option9.html +++ b/html/server/option9.html @@ -6,88 +6,17 @@ <meta name="keywords" content="${LANG_METAKEYW}" /> <title>'${projname}' - HTTrack Website Copier</title> - <style type="text/css"> - <!-- - -body { - margin: 0; padding: 0; margin-bottom: 15px; margin-top: 8px; - background: #77b; -} -body, td { - font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; - } - -#subTitle { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -.tabCtrl { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -#siteNavigation a, #siteNavigation .current { - font-weight: bold; color: #448; - } -#siteNavigation a:link { text-decoration: none; } -#siteNavigation a:visited { text-decoration: none; } - -#siteNavigation .current { background-color: #ccd; } - -#siteNavigation a:hover { text-decoration: none; background-color: #fff; color: #000; } -#siteNavigation a:active { text-decoration: none; background-color: #ccc; } - - -a:link { text-decoration: underline; color: #00f; } -a:visited { text-decoration: underline; color: #000; } -a:hover { text-decoration: underline; color: #c00; } -a:active { text-decoration: underline; } - -#pageContent { - clear: both; - border-bottom: 6px solid #000; - padding: 10px; padding-top: 20px; - line-height: 1.65em; - background-image: url(images/bg_rings.gif); - background-repeat: no-repeat; - background-position: top right; - } - -#pageContent, #siteNavigation { - background-color: #ccd; - } - - -.imgLeft { float: left; margin-right: 10px; margin-bottom: 10px; } -.imgRight { float: right; margin-left: 10px; margin-bottom: 10px; } - -hr { height: 1px; color: #000; background-color: #000; margin-bottom: 15px; } - -h1 { margin: 0; font-weight: bold; font-size: 2em; } -h2 { margin: 0; font-weight: bold; font-size: 1.6em; } -h3 { margin: 0; font-weight: bold; font-size: 1.3em; } -h4 { margin: 0; font-weight: bold; font-size: 1.18em; } - -.blak { background-color: #000; } -.hide { display: none; } -.tableWidth { min-width: 400px; } - -.tblRegular { border-collapse: collapse; } -.tblRegular td { padding: 6px; background-image: url(fade.gif); border: 2px solid #99c; } -.tblHeaderColor, .tblHeaderColor td { background: #99c; } -.tblNoBorder td { border: 0; } - - -// --> -</style> + <link rel="stylesheet" type="text/css" media="screen" href="style.css"> + <script type="text/javascript" src="ping.js" defer></script> <script language="javascript"> <!-- function do_load() { window.status=' '; -${do:if-not-empty:closeme}
- window.close();
-${do:end-if}
-${do:set:closeme:}
+${do:if-not-empty:closeme} + window.close(); +${do:end-if} +${do:set:closeme:} } function do_unload() { } @@ -131,7 +60,7 @@ ${do:if-file-exists:html/index.html} <td> <a href="/step9_opt9.html" target="_blank" onClick="window.open('/step9_opt9.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" >${LANG_TIPHELP}</a> </td> ${do:end-if} @@ -142,18 +71,18 @@ ${do:end-if} <table class="tableWidth" border="0" width="100%" cellspacing="0"> <tr> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT1}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT1}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT2}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT2}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT3}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT3}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT4}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT4}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT5}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT5}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT11}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT11}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT1}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT1}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT2}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT2}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT3}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT3}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT4}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT4}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT5}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT5}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT11}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT11}</a></td> </tr><tr> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT6}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT6}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT7}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT7}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT8}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT8}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT9}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT9}</a></td> -<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT10}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT10}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT6}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT6}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT7}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT7}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT8}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT8}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT9}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT9}</a></td> +<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT10}'); return true" onMouseOut="info(' '); return true">${LANG_IOPT10}</a></td> <td class="tabCtrl" align="center"> </td> </tr> @@ -167,53 +96,53 @@ ${do:end-if} <form method="POST" action="${thisfile}" name="form"> <input type="hidden" name="sid" value="${sid}"> <input type="hidden" name="redirect" value=""> -<input type="hidden" name="closeme" value="">
+<input type="hidden" name="closeme" value=""> <input type="checkbox" name="cache2" ${checked:cache2} - onMouseOver="info('${LANG_I1e}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I1e}'); return true" onMouseOut="info(' '); return true" > ${LANG_I61} <br><br> <input type="checkbox" name="norecatch" ${checked:norecatch} - onMouseOver="info('${LANG_I5b}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I5b}'); return true" onMouseOut="info(' '); return true" > ${LANG_I34b} <br><br> <input type="checkbox" name="logf" ${checked:logf} - onMouseOver="info('${LANG_I7}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I7}'); return true" onMouseOut="info(' '); return true" > ${LANG_I36} <select name="logtype" - onMouseOver="info('${LANG_I1f}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I1f}'); return true" onMouseOut="info(' '); return true" > ${listid:logtype:LISTDEF_9} </select> <br><br> <input type="checkbox" name="index" ${checked:index} - onMouseOver="info('${LANG_I6}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I6}'); return true" onMouseOut="info(' '); return true" > ${LANG_I35} <br><br> <input type="checkbox" name="index2" ${checked:index2} - onMouseOver="info('${LANG_I6b}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_I6b}'); return true" onMouseOut="info(' '); return true" > ${LANG_I35b} <br><br> -<tr><td>
- <table width="100%">
- <tr><td align="left">
- <input type="submit" value="${LANG_OK}"
- onClick="form.closeme.value=1; form.submit(); return false;"
- onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info(' '); return true"
- >
- </td><td align="right">
- <input type="button" value="${LANG_CANCEL}"
- onClick="window.close();"
- onMouseOver="info('${LANG_TIPCANCEL}'); return true" onMouseOut="info(' '); return true"
- >
- </td></tr>
- </table>
-</td></tr>
+<tr><td> + <table width="100%"> + <tr><td align="left"> + <input type="submit" value="${LANG_OK}" + onClick="form.closeme.value=1; form.submit(); return false;" + onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info(' '); return true" + > + </td><td align="right"> + <input type="button" value="${LANG_CANCEL}" + onClick="window.close();" + onMouseOver="info('${html:LANG_TIPCANCEL}'); return true" onMouseOut="info(' '); return true" + > + </td></tr> + </table> +</td></tr> </form> diff --git a/html/server/ping.js b/html/server/ping.js new file mode 100644 index 0000000..c7760f7 --- /dev/null +++ b/html/server/ping.js @@ -0,0 +1,26 @@ +// Function aimed to ping the webhttrack server regularly to keep it alive +// If the browser window is closed, the server will eventually shutdown +function ping_server() { + var iframe = document.getElementById('pingiframe'); + if (iframe && iframe.src) { + iframe.src = iframe.src; + setTimeout(ping_server, 30000); + } +} + +// Create an invisible iframe to hold the server ping result +// Only modern browsers will support that, but old browsers are compatible +// with the legacy "wait for browser PID" mode +if (document && document.createElement && document.body + && document.body.appendChild && document.getElementById) { + var iframe = document.createElement('iframe'); + if (iframe) { + iframe.id = 'pingiframe'; + iframe.style.display = "none"; + iframe.style.visibility = "hidden"; + iframe.width = iframe.height = 0; + iframe.src = "/ping"; + document.body.appendChild(iframe); + ping_server(); + } +} diff --git a/html/server/refresh.html b/html/server/refresh.html index ca840a6..3e59ab9 100755 --- a/html/server/refresh.html +++ b/html/server/refresh.html @@ -7,122 +7,55 @@ <META http-equiv="refresh" content="30; URL=finished.html"> <title>'${projname}' - HTTrack Website Copier</title> - <style type="text/css"> - <!-- + <link rel="stylesheet" type="text/css" media="screen" href="style.css"> + <script type="text/javascript" src="ping.js" defer></script> -body { - margin: 0; padding: 0; margin-bottom: 15px; margin-top: 8px; - background: #77b; +<script language="javascript"> +<!-- +var freeze=0; +setTimeout(do_refresh, 1000); +function do_load() { + window.status=' '; + enable_timer(); } -body, td { - font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; - } - -#subTitle { - background: #000; color: #fff; padding: 4px; font-weight: bold; +function disable_timer() { + if (freeze == 0) { + freeze=1; } - -#siteNavigation a, #siteNavigation .current { - font-weight: bold; color: #448; - } -#siteNavigation a:link { text-decoration: none; } -#siteNavigation a:visited { text-decoration: none; } - -#siteNavigation .current { background-color: #ccd; } - -#siteNavigation a:hover { text-decoration: none; background-color: #fff; color: #000; } -#siteNavigation a:active { text-decoration: none; background-color: #ccc; } - - -a:link { text-decoration: underline; color: #00f; } -a:visited { text-decoration: underline; color: #000; } -a:hover { text-decoration: underline; color: #c00; } -a:active { text-decoration: underline; } - -#pageContent { - clear: both; - border-bottom: 6px solid #000; - padding: 10px; padding-top: 20px; - line-height: 1.65em; - background-image: url(images/bg_rings.gif); - background-repeat: no-repeat; - background-position: top right; +} +function lock_timer() { + freeze=2; +} +function enable_timer() { + if (freeze == 1) { + freeze=0; } - -#pageContent, #siteNavigation { - background-color: #ccd; +} +function unlock_timer() { + freeze=0; +} +function do_confirm(str) { + lock_timer(); + ret=confirm(str); + if (!ret) { + unlock_timer(); } - - -.imgLeft { float: left; margin-right: 10px; margin-bottom: 10px; } -.imgRight { float: right; margin-left: 10px; margin-bottom: 10px; } - -hr { height: 1px; color: #000; background-color: #000; margin-bottom: 15px; } - -h1 { margin: 0; font-weight: bold; font-size: 2em; } -h2 { margin: 0; font-weight: bold; font-size: 1.6em; } -h3 { margin: 0; font-weight: bold; font-size: 1.3em; } -h4 { margin: 0; font-weight: bold; font-size: 1.18em; } - -.blak { background-color: #000; } -.hide { display: none; } -.tableWidth { min-width: 400px; } - -.tblRegular { border-collapse: collapse; } -.tblRegular td { padding: 6px; background-image: url(fade.gif); border: 2px solid #99c; } -.tblHeaderColor, .tblHeaderColor td { background: #99c; } -.tblNoBorder td { border: 0; } - - -// --> -</style> - -<script language="javascript"> -<!--
-var freeze=0; -setTimeout(do_refresh, 1000);
-function do_load() { - window.status=' ';
- enable_timer();
-}
-function disable_timer() {
- if (freeze == 0) {
- freeze=1;
- }
+ return ret; } -function lock_timer() {
- freeze=2;
-}
-function enable_timer() {
- if (freeze == 1) {
- freeze=0;
- }
-}
-function unlock_timer() {
- freeze=0;
-}
-function do_confirm(str) {
- lock_timer();
- ret=confirm(str);
- if (!ret) {
- unlock_timer();
- }
- return ret;
-}
function do_unload() { } function info(str) { window.status = str; -}
-function do_refresh() {
- if (!freeze) {
- document.location.reload();
- } else {
- setTimeout(do_refresh, 1000);
- }
} -function no_refresh() {
-}
+function do_refresh() { + if (!freeze) { + document.location.reload(); + } else { + setTimeout(do_refresh, 1000); + } +} +function no_refresh() { +} // --> </script> @@ -140,7 +73,7 @@ function no_refresh() { <td id="subTitle" align="right"> <a href="/server/file.html" target="_blank" onClick="window.open('/server/file.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_O1}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_O1}'); return true" onMouseOut="info(' '); return true" style="color:#FFFFFF" > ${LANG_O1} @@ -152,7 +85,7 @@ ${do:if-file-exists:html/index.html} <td id="subTitle" align="right"> <a href="/index.html" target="_blank" onClick="window.open('/server/help.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" style="color:#FFFFFF" > ${LANG_O5} @@ -198,8 +131,8 @@ ${do:end-if} </tr> </table> -
-<br>
+ +<br> <table border="0" width="100%"> <tr> @@ -210,8 +143,8 @@ ${LANG_H20} ${info.currentjob} </td> </tr> </table> -
-<br>
+ +<br> <form method="POST" action="step4.html" name="form"> <input type="hidden" name="sid" value="${sid}"> @@ -219,20 +152,20 @@ ${LANG_H20} ${info.currentjob} <table border="0" width="100%"> -<tr><td>${info.state[0]}</td><td>${info.name[0]}</td><td>${info.file[0]}</td><td>${info.size[0]}/${info.sizetot[0]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[0]}'; form.submit()" onMouseOver="info('${LANG_H6}'); return true" onMouseOut="info(' '); return true"></td></tr> -<tr><td>${info.state[1]}</td><td>${info.name[1]}</td><td>${info.file[1]}</td><td>${info.size[1]}/${info.sizetot[1]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[1]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> -<tr><td>${info.state[2]}</td><td>${info.name[2]}</td><td>${info.file[2]}</td><td>${info.size[2]}/${info.sizetot[2]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[2]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> -<tr><td>${info.state[3]}</td><td>${info.name[3]}</td><td>${info.file[3]}</td><td>${info.size[3]}/${info.sizetot[3]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[3]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> -<tr><td>${info.state[4]}</td><td>${info.name[4]}</td><td>${info.file[4]}</td><td>${info.size[4]}/${info.sizetot[4]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[4]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> -<tr><td>${info.state[5]}</td><td>${info.name[5]}</td><td>${info.file[5]}</td><td>${info.size[5]}/${info.sizetot[5]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[5]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> -<tr><td>${info.state[6]}</td><td>${info.name[6]}</td><td>${info.file[6]}</td><td>${info.size[6]}/${info.sizetot[6]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[6]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> -<tr><td>${info.state[7]}</td><td>${info.name[7]}</td><td>${info.file[7]}</td><td>${info.size[7]}/${info.sizetot[7]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[7]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> -<tr><td>${info.state[8]}</td><td>${info.name[8]}</td><td>${info.file[8]}</td><td>${info.size[8]}/${info.sizetot[8]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[8]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> -<tr><td>${info.state[9]}</td><td>${info.name[9]}</td><td>${info.file[9]}</td><td>${info.size[9]}/${info.sizetot[9]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[9]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> -<tr><td>${info.state[10]}</td><td>${info.name[10]}</td><td>${info.file[10]}</td><td>${info.size[10]}/${info.sizetot[10]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[10]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> -<tr><td>${info.state[11]}</td><td>${info.name[11]}</td><td>${info.file[11]}</td><td>${info.size[11]}/${info.sizetot[11]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[11]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> -<tr><td>${info.state[12]}</td><td>${info.name[12]}</td><td>${info.file[12]}</td><td>${info.size[12]}/${info.sizetot[12]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[12]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> -<tr><td>${info.state[13]}</td><td>${info.name[13]}</td><td>${info.file[13]}</td><td>${info.size[13]}/${info.sizetot[13]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[13]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> +<tr><td>${info.state[0]}</td><td>${info.name[0]}</td><td>${info.file[0]}</td><td>${info.size[0]}/${info.sizetot[0]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[0]}'; form.submit()" onMouseOver="info('${html:LANG_H6}'); return true" onMouseOut="info(' '); return true"></td></tr> +<tr><td>${info.state[1]}</td><td>${info.name[1]}</td><td>${info.file[1]}</td><td>${info.size[1]}/${info.sizetot[1]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[1]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> +<tr><td>${info.state[2]}</td><td>${info.name[2]}</td><td>${info.file[2]}</td><td>${info.size[2]}/${info.sizetot[2]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[2]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> +<tr><td>${info.state[3]}</td><td>${info.name[3]}</td><td>${info.file[3]}</td><td>${info.size[3]}/${info.sizetot[3]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[3]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> +<tr><td>${info.state[4]}</td><td>${info.name[4]}</td><td>${info.file[4]}</td><td>${info.size[4]}/${info.sizetot[4]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[4]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> +<tr><td>${info.state[5]}</td><td>${info.name[5]}</td><td>${info.file[5]}</td><td>${info.size[5]}/${info.sizetot[5]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[5]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> +<tr><td>${info.state[6]}</td><td>${info.name[6]}</td><td>${info.file[6]}</td><td>${info.size[6]}/${info.sizetot[6]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[6]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> +<tr><td>${info.state[7]}</td><td>${info.name[7]}</td><td>${info.file[7]}</td><td>${info.size[7]}/${info.sizetot[7]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[7]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> +<tr><td>${info.state[8]}</td><td>${info.name[8]}</td><td>${info.file[8]}</td><td>${info.size[8]}/${info.sizetot[8]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[8]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> +<tr><td>${info.state[9]}</td><td>${info.name[9]}</td><td>${info.file[9]}</td><td>${info.size[9]}/${info.sizetot[9]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[9]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> +<tr><td>${info.state[10]}</td><td>${info.name[10]}</td><td>${info.file[10]}</td><td>${info.size[10]}/${info.sizetot[10]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[10]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> +<tr><td>${info.state[11]}</td><td>${info.name[11]}</td><td>${info.file[11]}</td><td>${info.size[11]}/${info.sizetot[11]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[11]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> +<tr><td>${info.state[12]}</td><td>${info.name[12]}</td><td>${info.file[12]}</td><td>${info.size[12]}/${info.sizetot[12]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[12]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> +<tr><td>${info.state[13]}</td><td>${info.name[13]}</td><td>${info.file[13]}</td><td>${info.size[13]}/${info.sizetot[13]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[13]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info(' '); return true"></td></tr> </table> @@ -246,10 +179,10 @@ ${LANG_H20} ${info.currentjob} <table width="100%" border="0"><tr><td align="left"> </td><td align="right"> - <input type="submit" value=" ${LANG_V4} "
- onMouseOver="disable_timer(); info('${LANG_D3}'); return true"
- onMouseOut="info(' '); enable_timer(); return true"
- onClick="if (do_confirm('${LANG_G1}')) { form.command.value='cancel'; form.submit(); } return false"
+ <input type="submit" value=" ${LANG_V4} " + onMouseOver="disable_timer(); info('${LANG_D3}'); return true" + onMouseOut="info(' '); enable_timer(); return true" + onClick="if (do_confirm('${LANG_G1}')) { form.command.value='cancel'; form.submit(); } return false" > </td></tr></table> diff --git a/html/server/step2.html b/html/server/step2.html index e2d74db..4f194dd 100755 --- a/html/server/step2.html +++ b/html/server/step2.html @@ -6,75 +6,8 @@ <meta name="keywords" content="${LANG_METAKEYW}" /> <title>'${projname}' - HTTrack Website Copier</title> - <style type="text/css"> - <!-- - -body { - margin: 0; padding: 0; margin-bottom: 15px; margin-top: 8px; - background: #77b; -} -body, td { - font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; - } - -#subTitle { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -#siteNavigation a, #siteNavigation .current { - font-weight: bold; color: #448; - } -#siteNavigation a:link { text-decoration: none; } -#siteNavigation a:visited { text-decoration: none; } - -#siteNavigation .current { background-color: #ccd; } - -#siteNavigation a:hover { text-decoration: none; background-color: #fff; color: #000; } -#siteNavigation a:active { text-decoration: none; background-color: #ccc; } - - -a:link { text-decoration: underline; color: #00f; } -a:visited { text-decoration: underline; color: #000; } -a:hover { text-decoration: underline; color: #c00; } -a:active { text-decoration: underline; } - -#pageContent { - clear: both; - border-bottom: 6px solid #000; - padding: 10px; padding-top: 20px; - line-height: 1.65em; - background-image: url(images/bg_rings.gif); - background-repeat: no-repeat; - background-position: top right; - } - -#pageContent, #siteNavigation { - background-color: #ccd; - } - - -.imgLeft { float: left; margin-right: 10px; margin-bottom: 10px; } -.imgRight { float: right; margin-left: 10px; margin-bottom: 10px; } - -hr { height: 1px; color: #000; background-color: #000; margin-bottom: 15px; } - -h1 { margin: 0; font-weight: bold; font-size: 2em; } -h2 { margin: 0; font-weight: bold; font-size: 1.6em; } -h3 { margin: 0; font-weight: bold; font-size: 1.3em; } -h4 { margin: 0; font-weight: bold; font-size: 1.18em; } - -.blak { background-color: #000; } -.hide { display: none; } -.tableWidth { min-width: 400px; } - -.tblRegular { border-collapse: collapse; } -.tblRegular td { padding: 6px; background-image: url(fade.gif); border: 2px solid #99c; } -.tblHeaderColor, .tblHeaderColor td { background: #99c; } -.tblNoBorder td { border: 0; } - - -// --> -</style> + <link rel="stylesheet" type="text/css" media="screen" href="style.css"> + <script type="text/javascript" src="ping.js" defer></script> <script language="javascript"> <!-- @@ -119,7 +52,7 @@ function info(str) { <td id="subTitle" align="right"> <a href="/server/file.html" target="_blank" onClick="window.open('/server/file.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_O1}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:html:LANG_O1}'); return true" onMouseOut="info(' '); return true" style="color:#FFFFFF" > ${LANG_O1} @@ -131,7 +64,7 @@ ${do:if-file-exists:html/index.html} <td id="subTitle" align="right"> <a href="/index.html" target="_blank" onClick="window.open('/server/help.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:html:LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" style="color:#FFFFFF" > ${LANG_O5} @@ -160,18 +93,18 @@ ${do:if-file-exists:html/index.html} <td> <a href="/step1.html" target="_blank" onClick="window.open('/step1.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:html:LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" >${LANG_TIPHELP}</a> </td> ${do:end-if} </tr></table> -
+ ${/* Default values for empty settings */} -${do:set:cache:1}
+${do:set:cache:1} ${/* Convert winprofile.ini into internal variables */} -${do:copy:CurrentUrl:urls}
-${do:copy:Category:projcateg}
+${do:copy:CurrentUrl:urls} +${do:copy:Category:projcateg} ${do:copy:CurrentAction:todo} ${do:copy:CurrentURLList:filelist} ${do:copy:Proxy:proxy} @@ -267,7 +200,7 @@ ${do:end-if} ${do:loadhash} -
+ ${LANG_S11b} <select name="loadprojname" onChange="form.redirect.value='step2.html'; form.submit()"> <option value=""> </option> @@ -278,30 +211,30 @@ ${do:loadhash} ${LANG_S11} <input name="projname" value="${projname}" - onMouseOver="info('${LANG_S1}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:html:LANG_S1}'); return true" onMouseOut="info(' '); return true" > -<br>
-
-<table border="0">
-<tr><td>
-
- ${LANG_S13}
- <select name="loadprojcateg" onChange="form.redirect.value='step2.html'; form.submit()">
- <option value=""> </option>
- ${liststr:wincateg}
- </select>
-</td><td>
- <input name="projcateg" value="${projcateg}"
- onMouseOver="info('${LANG_S5}'); return true" onMouseOut="info(' '); return true"
- >
-
-</td></tr></table>
-
+<br> + +<table border="0"> +<tr><td> + + ${LANG_S13} + <select name="loadprojcateg" onChange="form.redirect.value='step2.html'; form.submit()"> + <option value=""> </option> + ${liststr:wincateg} + </select> +</td><td> + <input name="projcateg" value="${projcateg}" + onMouseOver="info('${html:html:LANG_S5}'); return true" onMouseOut="info(' '); return true" + > + +</td></tr></table> + <br> ${LANG_S12} <input name="path" value="${path}" - onMouseOver="info('${LANG_S2}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:html:LANG_S2}'); return true" onMouseOut="info(' '); return true" > <input type="button" value="refresh" onClick="form.redirect.value='step2.html'; form.submit()"> @@ -310,11 +243,11 @@ ${do:loadhash} <tr><td> <table width="100%" border="0"><tr><td align="left"> <input type="submit" value=" << ${LANG_PREVIOUS} " onClick="form.redirect.value='index.html'; form.submit()" - onMouseOver="info('${LANG_TIPPREV}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:html:LANG_TIPPREV}'); return true" onMouseOut="info(' '); return true" > </td><td align="right"> <input name="nextBtn" type="submit" value=" ${LANG_NEXT} >> " onClick="return checkname();" default - onMouseOver="info('${LANG_TIPNEXT}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:html:LANG_TIPNEXT}'); return true" onMouseOut="info(' '); return true" > </td></tr></table> diff --git a/html/server/step3.html b/html/server/step3.html index f085101..40dd977 100755 --- a/html/server/step3.html +++ b/html/server/step3.html @@ -6,75 +6,8 @@ <meta name="keywords" content="${LANG_METAKEYW}" /> <title>'${projname}' - HTTrack Website Copier</title> - <style type="text/css"> - <!-- - -body { - margin: 0; padding: 0; margin-bottom: 15px; margin-top: 8px; - background: #77b; -} -body, td { - font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; - } - -#subTitle { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -#siteNavigation a, #siteNavigation .current { - font-weight: bold; color: #448; - } -#siteNavigation a:link { text-decoration: none; } -#siteNavigation a:visited { text-decoration: none; } - -#siteNavigation .current { background-color: #ccd; } - -#siteNavigation a:hover { text-decoration: none; background-color: #fff; color: #000; } -#siteNavigation a:active { text-decoration: none; background-color: #ccc; } - - -a:link { text-decoration: underline; color: #00f; } -a:visited { text-decoration: underline; color: #000; } -a:hover { text-decoration: underline; color: #c00; } -a:active { text-decoration: underline; } - -#pageContent { - clear: both; - border-bottom: 6px solid #000; - padding: 10px; padding-top: 20px; - line-height: 1.65em; - background-image: url(images/bg_rings.gif); - background-repeat: no-repeat; - background-position: top right; - } - -#pageContent, #siteNavigation { - background-color: #ccd; - } - - -.imgLeft { float: left; margin-right: 10px; margin-bottom: 10px; } -.imgRight { float: right; margin-left: 10px; margin-bottom: 10px; } - -hr { height: 1px; color: #000; background-color: #000; margin-bottom: 15px; } - -h1 { margin: 0; font-weight: bold; font-size: 2em; } -h2 { margin: 0; font-weight: bold; font-size: 1.6em; } -h3 { margin: 0; font-weight: bold; font-size: 1.3em; } -h4 { margin: 0; font-weight: bold; font-size: 1.18em; } - -.blak { background-color: #000; } -.hide { display: none; } -.tableWidth { min-width: 400px; } - -.tblRegular { border-collapse: collapse; } -.tblRegular td { padding: 6px; background-image: url(fade.gif); border: 2px solid #99c; } -.tblHeaderColor, .tblHeaderColor td { background: #99c; } -.tblNoBorder td { border: 0; } - - -// --> -</style> + <link rel="stylesheet" type="text/css" media="screen" href="style.css"> + <script type="text/javascript" src="ping.js" defer></script> <script language="javascript"> <!-- @@ -128,7 +61,7 @@ function do_check_child() { <td id="subTitle" align="right"> <a href="/server/file.html" target="_blank" onClick="window.open('/server/file.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_O1}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_O1}'); return true" onMouseOut="info(' '); return true" style="color:#FFFFFF" > ${LANG_O1} @@ -140,7 +73,7 @@ ${do:if-file-exists:html/index.html} <td id="subTitle" align="right"> <a href="/index.html" target="_blank" onClick="window.open('/server/help.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" style="color:#FFFFFF" > ${LANG_O5} @@ -169,7 +102,7 @@ ${do:if-file-exists:html/index.html} <td> <a href="/step2.html" target="_blank" onClick="window.open('/step2.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" >${LANG_TIPHELP}</a> </td> ${do:end-if} @@ -185,7 +118,7 @@ ${do:end-if} <tr><td> ${LANG_G31} <select name="todo" - onMouseOver="info('${LANG_G9}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_G9}'); return true" onMouseOut="info(' '); return true" > ${listid:todo:LISTDEF_10} </select> @@ -198,12 +131,12 @@ ${do:end-if} </td><td> <input type="button" value="${LANG_G43}" onClick="doOpenWindow()" - onMouseOver="info('${LANG_G24b}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_G24b}'); return true" onMouseOut="info(' '); return true" > </td></tr></table> <br> <textarea name="urls" cols="50" rows="8" - onMouseOver="info('${LANG_G11}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_G11}'); return true" onMouseOut="info(' '); return true" > ${do:output-mode:html} ${urls} @@ -217,7 +150,7 @@ ${do:output-mode:} ${LANG_URLLIST}: </td><td> <input name="filelist" value="${filelist}" size="40" - onMouseOver="info('${LANG_G24c}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_G24c}'); return true" onMouseOut="info(' '); return true" > </td></tr></table> @@ -228,7 +161,7 @@ ${do:output-mode:} ${LANG_G41} </td><td> <input type="button" value="${LANG_G40}" onClick="window.open('option1.html', 'option1', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_G24}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_G24}'); return true" onMouseOut="info(' '); return true" > </td></tr></table> @@ -237,11 +170,11 @@ ${do:output-mode:} <tr><td align="right"> <table width="100%" border="0"><tr><td align="left"> <input type="submit" value=" << ${LANG_PREVIOUS} " onClick="form.redirect.value='step2.html'; form.submit()" - onMouseOver="info('${LANG_TIPPREV}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPPREV}'); return true" onMouseOut="info(' '); return true" > </td><td align="right"> <input name="nextBtn" type="submit" value=" ${LANG_NEXT} >> " - onMouseOver="info('${LANG_TIPNEXT}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPNEXT}'); return true" onMouseOut="info(' '); return true" > </td></tr></table> diff --git a/html/server/step4.html b/html/server/step4.html index 452edac..2620c97 100755 --- a/html/server/step4.html +++ b/html/server/step4.html @@ -6,75 +6,8 @@ <meta name="keywords" content="${LANG_METAKEYW}" /> <title>'${projname}' - HTTrack Website Copier</title> - <style type="text/css"> - <!-- - -body { - margin: 0; padding: 0; margin-bottom: 15px; margin-top: 8px; - background: #77b; -} -body, td { - font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; - } - -#subTitle { - background: #000; color: #fff; padding: 4px; font-weight: bold; - } - -#siteNavigation a, #siteNavigation .current { - font-weight: bold; color: #448; - } -#siteNavigation a:link { text-decoration: none; } -#siteNavigation a:visited { text-decoration: none; } - -#siteNavigation .current { background-color: #ccd; } - -#siteNavigation a:hover { text-decoration: none; background-color: #fff; color: #000; } -#siteNavigation a:active { text-decoration: none; background-color: #ccc; } - - -a:link { text-decoration: underline; color: #00f; } -a:visited { text-decoration: underline; color: #000; } -a:hover { text-decoration: underline; color: #c00; } -a:active { text-decoration: underline; } - -#pageContent { - clear: both; - border-bottom: 6px solid #000; - padding: 10px; padding-top: 20px; - line-height: 1.65em; - background-image: url(images/bg_rings.gif); - background-repeat: no-repeat; - background-position: top right; - } - -#pageContent, #siteNavigation { - background-color: #ccd; - } - - -.imgLeft { float: left; margin-right: 10px; margin-bottom: 10px; } -.imgRight { float: right; margin-left: 10px; margin-bottom: 10px; } - -hr { height: 1px; color: #000; background-color: #000; margin-bottom: 15px; } - -h1 { margin: 0; font-weight: bold; font-size: 2em; } -h2 { margin: 0; font-weight: bold; font-size: 1.6em; } -h3 { margin: 0; font-weight: bold; font-size: 1.3em; } -h4 { margin: 0; font-weight: bold; font-size: 1.18em; } - -.blak { background-color: #000; } -.hide { display: none; } -.tableWidth { min-width: 400px; } - -.tblRegular { border-collapse: collapse; } -.tblRegular td { padding: 6px; background-image: url(fade.gif); border: 2px solid #99c; } -.tblHeaderColor, .tblHeaderColor td { background: #99c; } -.tblNoBorder td { border: 0; } - - -// --> -</style> + <link rel="stylesheet" type="text/css" media="screen" href="style.css"> + <script type="text/javascript" src="ping.js" defer></script> <script language="javascript"> <!-- @@ -110,7 +43,7 @@ function info(str) { <td id="subTitle" align="right"> <a href="/server/file.html" target="_blank" onClick="window.open('/server/file.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_O1}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_O1}'); return true" onMouseOut="info(' '); return true" style="color:#FFFFFF" > ${LANG_O1} @@ -122,7 +55,7 @@ ${do:if-file-exists:html/index.html} <td id="subTitle" align="right"> <a href="/index.html" target="_blank" onClick="window.open('/server/help.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" style="color:#FFFFFF" > ${LANG_O5} @@ -151,7 +84,7 @@ ${do:if-file-exists:html/index.html} <td> <a href="/step3.html" target="_blank" onClick="window.open('/step3.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false" - onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info(' '); return true" >${LANG_TIPHELP}</a> </td> ${do:end-if} @@ -163,34 +96,34 @@ ${do:end-if} <input type="hidden" name="sid" value="${sid}"> <input type="hidden" name="redirect" value=""> <input type="hidden" name="projpath" value="${path}/${projname}/"> -
-<input type="hidden" name="command_arg_profile" value="path,lang">
+ +<input type="hidden" name="command_arg_profile" value="path,lang"> <table border="0" width="100%"> <tr><td> -</td></tr>
-
+</td></tr> + +<tr><td> +<input type="radio" name="command_do" value="start" checked><b>${LANG_J10}</b> +</td></tr> +<tr><td> +<input type="radio" name="command_do" value="save">${LANG_J10b} +</td></tr> <tr><td> -<input type="radio" name="command_do" value="start" checked><b>${LANG_J10}</b>
-</td></tr>
-<tr><td>
-<input type="radio" name="command_do" value="save">${LANG_J10b}
-</td></tr>
-<tr><td>
-
-${/* Real commands and ini file generated below */}
+ +${/* Real commands and ini file generated below */} <!-- engine commandline --> ${do:output-mode:html} <textarea name="command" cols="50" rows="4" style="visibility:hidden"> httrack \ - --quiet \
+ --quiet \ --build-top-index \ ${test:todo:--mirror:--mirror:--mirror-wizard:--get:--mirrorlinks:--testlinks:--continue:--update} ${urls} ${test:filelist:-%L "}${filelist}${test:filelist:"} - --path "${path}/${projname}" + --path "${html:path}/${html:projname}" \ ${test:parseall:--near} ${test:link:--test} @@ -203,8 +136,8 @@ ${do:end-if} ${test:build:-N0:-N0:-N1:-N2:-N3:-N4:-N5:-N100:-N101:-N102:-N103:-N104:-N105:-N99:-N199:} \ ${ztest:dos::--long-names=0:--long-names=2} - ${test:robots:--robots=0:--robots=0:--robots=1:--robots=2}
- ${test:errpage:--generate-errors:--generate-errors=0}
+ ${test:robots:--robots=0:--robots=0:--robots=1:--robots=2} + ${test:errpage:--generate-errors:--generate-errors=0} ${test:external:--replace-external} ${test:hidepwd:--disable-passwords} ${test:hidequery:--include-query-string=1:--include-query-string=0} @@ -236,8 +169,8 @@ ${do:end-if} ${test:maxconn:--connection-per-second=}${maxconn} ${test:maxlinks:--advanced-maxlinks=}${maxlinks} \ - --user-agent "${user}" - --footer "${footer}" + --user-agent "${html:user}" + --footer "${html:footer}" \ ${url2} \ @@ -261,7 +194,7 @@ ${do:end-if} ${do:output-mode:inifile} <textarea name="winprofile" cols="50" rows="4" style="visibility:hidden"> CurrentUrl=${urls} -Category=${projcateg}
+Category=${projcateg} CurrentAction=${todo} CurrentURLList=${filelist} Proxy=${proxy} @@ -338,25 +271,25 @@ MIMEDefsMime7=${mime7} MIMEDefsMime8=${mime8} </textarea> ${do:output-mode:} -<!-- winprofile.ini -->
-
-<!-- httrack.ini -->
-${do:output-mode:inifile}
-<textarea name="userprofile" cols="50" rows="4" style="visibility:hidden">
-path=${path}
-lang=${lang_}
-</textarea>
-${do:output-mode:}
-<!-- httrack.ini -->
+<!-- winprofile.ini --> + +<!-- httrack.ini --> +${do:output-mode:inifile} +<textarea name="userprofile" cols="50" rows="4" style="visibility:hidden"> +path=${path} +lang=${lang_} +</textarea> +${do:output-mode:} +<!-- httrack.ini --> </td></tr><tr><td> <table width="100%" border="0"><tr><td align="left"> <input type="submit" value=" << ${LANG_PREVIOUS} " onClick="form.command.value=''; form.redirect.value='step3.html'; form.submit()" - onMouseOver="info('${LANG_TIPPREV}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPPREV}'); return true" onMouseOut="info(' '); return true" > </td><td align="right"> <input name="nextBtn" type="submit" value=" ${LANG_J9} >> " - onMouseOver="info('${LANG_TIPNEXT}'); return true" onMouseOut="info(' '); return true" + onMouseOver="info('${html:LANG_TIPNEXT}'); return true" onMouseOut="info(' '); return true" > </td></tr></table> diff --git a/html/server/style.css b/html/server/style.css new file mode 100644 index 0000000..add8240 --- /dev/null +++ b/html/server/style.css @@ -0,0 +1,66 @@ +body { + margin: 0; padding: 0; margin-bottom: 15px; margin-top: 8px; + background: #77b; +} +body, td { + font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; + } + +#subTitle { + background: #000; color: #fff; padding: 4px; font-weight: bold; + } + +.tabCtrl { + background: #000; color: #fff; padding: 4px; font-weight: bold; + } + +#siteNavigation a, #siteNavigation .current { + font-weight: bold; color: #448; + } +#siteNavigation a:link { text-decoration: none; } +#siteNavigation a:visited { text-decoration: none; } + +#siteNavigation .current { background-color: #ccd; } + +#siteNavigation a:hover { text-decoration: none; background-color: #fff; color: #000; } +#siteNavigation a:active { text-decoration: none; background-color: #ccc; } + + +a:link { text-decoration: underline; color: #00f; } +a:visited { text-decoration: underline; color: #000; } +a:hover { text-decoration: underline; color: #c00; } +a:active { text-decoration: underline; } + +#pageContent { + clear: both; + border-bottom: 6px solid #000; + padding: 10px; padding-top: 20px; + line-height: 1.65em; + background-image: url(images/bg_rings.gif); + background-repeat: no-repeat; + background-position: top right; + } + +#pageContent, #siteNavigation { + background-color: #ccd; + } + + +.imgLeft { float: left; margin-right: 10px; margin-bottom: 10px; } +.imgRight { float: right; margin-left: 10px; margin-bottom: 10px; } + +hr { height: 1px; color: #000; background-color: #000; margin-bottom: 15px; } + +h1 { margin: 0; font-weight: bold; font-size: 2em; } +h2 { margin: 0; font-weight: bold; font-size: 1.6em; } +h3 { margin: 0; font-weight: bold; font-size: 1.3em; } +h4 { margin: 0; font-weight: bold; font-size: 1.18em; } + +.blak { background-color: #000; } +.hide { display: none; } +.tableWidth { min-width: 400px; } + +.tblRegular { border-collapse: collapse; } +.tblRegular td { padding: 6px; background-image: url(images/fade.gif); border: 2px solid #99c; } +.tblHeaderColor, .tblHeaderColor td { background: #99c; } +.tblNoBorder td { border: 0; } diff --git a/src/htsserver.c b/src/htsserver.c index 0ee5907..e358d1e 100644 --- a/src/htsserver.c +++ b/src/htsserver.c @@ -92,13 +92,17 @@ int commandReturnSet = 0; httrackp *global_opt = NULL; +static void (*pingFun)(void*) = NULL; +static void* pingFunArg = NULL; + /* Extern */ extern void webhttrack_main(char *cmd); extern void webhttrack_lock(void); extern void webhttrack_release(void); static int is_image(const char *file) { - return ((strstr(file, ".gif") != NULL)); + return strstr(file, ".gif") != NULL + || strstr(file, ".png") != NULL; } static int is_text(const char *file) { return ((strstr(file, ".txt") != NULL)); @@ -106,6 +110,12 @@ static int is_text(const char *file) { static int is_html(const char *file) { return ((strstr(file, ".htm") != NULL)); } +static int is_css(const char *file) { + return ((strstr(file, ".css") != NULL)); +} +static int is_js(const char *file) { + return ((strstr(file, ".js") != NULL)); +} static void sig_brpipe(int code) { /* ignore */ @@ -409,6 +419,11 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) { /* Accept */ while((soc_c = (T_SOC) accept(soc, NULL, NULL)) == INVALID_SOCKET) ; + /* Ping */ + if (pingFun != NULL) { + pingFun(pingFunArg); + } + /* Lock */ webhttrack_lock(); @@ -811,12 +826,13 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) { virtualpath = 1; } + /* override */ if (commandRunning) { - if (!is_image(file)) { + if (is_html(file)) { file = "/server/refresh.html"; } } else if (commandEnd && !virtualpath && !willexit) { - if (!is_image(file)) { + if (is_html(file)) { file = "/server/finished.html"; } } @@ -843,9 +859,18 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) { char ok_img[] = "HTTP/1.0 200 OK\r\n" "Connection: close\r\n" "Server: httrack small server\r\n" "Content-type: image/gif\r\n"; + char ok_js[] = + "HTTP/1.0 200 OK\r\n" "Connection: close\r\n" + "Server: httrack small server\r\n" "Content-type: text/javascript\r\n"; + char ok_css[] = + "HTTP/1.0 200 OK\r\n" "Connection: close\r\n" + "Server: httrack small server\r\n" "Content-type: text/css\r\n"; char ok_text[] = "HTTP/1.0 200 OK\r\n" "Connection: close\r\n" "Server: httrack small server\r\n" "Content-type: text/plain\r\n"; + char ok_unknown[] = + "HTTP/1.0 200 OK\r\n" "Connection: close\r\n" + "Server: httrack small server\r\n" "Content-type: application/octet-stream\r\n"; /* register current page */ coucal_write(NewLangList, "thisfile", (intptr_t) strdup(file)); @@ -911,6 +936,7 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) { name[0] = '\0'; strncatbuff(name, str, n); + if (strncmp(name, "/*", 2) == 0) { /* comments */ } else if ((p = strfield(name, "html:"))) { @@ -1179,6 +1205,8 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) { StringCat(output, ">"); } else if (outputmode && a[0] == '&') { StringCat(output, "&"); + } else if (outputmode && a[0] == '\'') { + StringCat(output, "'"); } else if (outputmode == 3 && a[0] == ' ') { StringCat(output, "%20"); } else if (outputmode >= 2 @@ -1252,6 +1280,9 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) { case '&': StringCat(tmpbuff, "&"); break; + case '\'': + StringCat(tmpbuff, "'"); + break; default: StringMemcat(tmpbuff, fstr, 1); break; @@ -1292,17 +1323,18 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) { assert(len == (int) StringLength(output)); } #endif - } else if (is_text(file)) { - StringMemcat(headers, ok_text, sizeof(ok_text) - 1); - while(!feof(fp)) { - int n = (int) fread(line, 1, sizeof(line) - 2, fp); - - if (n > 0) { - StringMemcat(output, line, n); - } - } } else { - StringMemcat(headers, ok_img, sizeof(ok_img) - 1); + if (is_text(file)) { + StringMemcat(headers, ok_text, sizeof(ok_text) - 1); + } else if (is_js(file)) { + StringMemcat(headers, ok_js, sizeof(ok_js) - 1); + } else if (is_css(file)) { + StringMemcat(headers, ok_css, sizeof(ok_css) - 1); + } else if (is_image(file)) { + StringMemcat(headers, ok_img, sizeof(ok_img) - 1); + } else { + StringMemcat(headers, ok_unknown, sizeof(ok_unknown) - 1); + } while(!feof(fp)) { int n = (int) fread(line, 1, sizeof(line) - 2, fp); @@ -1312,6 +1344,13 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) { } } fclose(fp); + } else if (strcmp(file, "/ping") == 0 + || strncmp(file, "/ping?", 6) == 0) { + char error_hdr[] = + "HTTP/1.0 200 Pong\r\n" "Server: httrack small server\r\n" + "Content-type: text/html\r\n"; + + StringCat(headers, error_hdr); } else { char error_hdr[] = "HTTP/1.0 404 Not Found\r\n" "Server: httrack small server\r\n" @@ -1429,6 +1468,11 @@ int htslang_uninit(void) { return 1; } +void smallserver_setpinghandler(void (*fun)(void*), void*arg) { + pingFun = fun; + pingFunArg = arg; +} + int smallserver_setkey(const char *key, const char *value) { return coucal_write(NewLangList, key, (intptr_t) strdup(value)); } diff --git a/src/htsserver.h b/src/htsserver.h index 9b3b125..b5decfd 100644 --- a/src/htsserver.h +++ b/src/htsserver.h @@ -91,6 +91,7 @@ extern httrackp *global_opt; #define min(a,b) ((a)>(b)?(b):(a)) #define max(a,b) ((a)>(b)?(a):(b)) +extern void smallserver_setpinghandler(void (*fun)(void*), void*arg); extern int smallserver_setkey(const char *key, const char *value); extern int smallserver_setkeyint(const char *key, LLint value); extern int smallserver_setkeyarr(const char *key, int id, const char *key2, const char *value); diff --git a/src/htsweb.c b/src/htsweb.c index c695f3a..c189c0a 100644 --- a/src/htsweb.c +++ b/src/htsweb.c @@ -77,6 +77,13 @@ Please visit our Website: http://www.httrack.com #else #endif +#undef DEBUG +#if 0 +#define DEBUG(A) do { A; } while(0) +#else +#define DEBUG(A) do {} while(0) +#endif + static htsmutex refreshMutex = HTSMUTEX_INIT; static int help_server(char *dest_path, int defaultPort); @@ -91,10 +98,59 @@ static void htsweb_sig_brpipe(int code) { /* ignore */ } +/* Number of background threads */ +static int background_threads = 0; + +/* Server/client ping handling */ +static htsmutex pingMutex = HTSMUTEX_INIT; +static unsigned int pingId = 0; +static unsigned int getPingId(void) { + unsigned int id; + hts_mutexlock(&pingMutex); + id = pingId; + hts_mutexrelease(&pingMutex); + return id; +} +static void ping(void) { + hts_mutexlock(&pingMutex); + pingId++; + hts_mutexrelease(&pingMutex); +} + +static void client_ping(void *pP) { +#ifndef _WIN32 + /* Timeout to 120s ; normally client pings every 30 second */ + static int timeout = 120; + /* Wait for parent to die (legacy browser mode). */ + const pid_t ppid = (pid_t) (uintptr_t) pP; + while (!kill(ppid, 0)) { + sleep(1); + } + /* Parent (webhttrack script) is dead: is client pinging ? */ + for(;;) { + unsigned int id = getPingId(); + sleep(timeout); + if (getPingId() == id) { + break; + } + } + /* Die! */ + fprintf(stderr, + "Parent process %d died, and client did not ping for %ds: exiting!\n", + (int) ppid, timeout); + exit(EXIT_FAILURE); +#endif +} + +static void pingHandler(void*arg) { + ping(); +} + int main(int argc, char *argv[]) { int i; int ret = 0; int defaultPort = 0; + int parentPid = 0; printf("Initialzing the server..\n"); @@ -120,7 +176,7 @@ int main(int argc, char *argv[]) { if (argc < 2 || (argc % 2) != 0) { fprintf(stderr, "** Warning: use the webhttrack frontend if available\n"); fprintf(stderr, - "usage: %s [--port <port>] <path-to-html-root-dir> [key value [key value]..]\n", + "usage: %s [--port <port>] [--ppid parent-pid] <path-to-html-root-dir> [key value [key value]..]\n", argv[0]); fprintf(stderr, "example: %s /usr/share/httrack/\n", argv[0]); return 1; @@ -200,14 +256,22 @@ int main(int argc, char *argv[]) { /* set commandline keys */ for(i = 2; i < argc; i += 2) { - if (strcmp(argv[i], "--port") == 0) { + if (strcmp(argv[i], "--port") == 0 && i + 1 < argc) { if (sscanf(argv[i + 1], "%d", &defaultPort) != 1 || defaultPort < 0 || defaultPort >= 65535) { fprintf(stderr, "couldn't set the port number to %s\n", argv[i + 1]); return -1; } - } else { + } else if (strcmp(argv[i], "--ppid") == 0 && i + 1 < argc) { + if (sscanf(argv[i + 1], "%u", &parentPid) != 1) { + fprintf(stderr, "couldn't set the parent PID to %s\n", argv[i + 1]); + return -1; + } + } else if (i + 1 < argc) { smallserver_setkey(argv[i], argv[i + 1]); + } else { + fprintf(stderr, "Error in commandline!\n"); + return -1; } } @@ -216,6 +280,13 @@ int main(int argc, char *argv[]) { signal(SIGPIPE, htsweb_sig_brpipe); // broken pipe (write into non-opened socket) #endif + /* pinger */ + if (parentPid > 0) { + hts_newthread(client_ping, (void *) (uintptr_t) parentPid); + background_threads++; /* Do not wait for this thread! */ + smallserver_setpinghandler(pingHandler, NULL); + } + /* launch */ ret = help_server(argv[1], defaultPort); @@ -292,6 +363,7 @@ static void back_launch_cmd(void *pP) { /* finished */ commandEnd = 1; + DEBUG(fprintf(stderr, "commandEnd=1\n")); /* free */ free(cmd); @@ -301,7 +373,9 @@ static void back_launch_cmd(void *pP) { void webhttrack_main(char *cmd) { commandRunning = 1; + DEBUG(fprintf(stderr, "commandRunning=1\n")); hts_newthread(back_launch_cmd, (void *) strdup(cmd)); + background_threads++; /* Do not wait for this thread! */ } void webhttrack_lock(void) { @@ -339,8 +413,11 @@ static int webhttrack_runmain(httrackp * opt, int argc, char **argv) { CHAIN_FUNCTION(opt, sendhead, htsshow_sendheader, NULL); CHAIN_FUNCTION(opt, receivehead, htsshow_receiveheader, NULL); + /* Rock'in! */ ret = hts_main2(argc, argv, opt); - htsthread_wait_n(1); + + /* Wait for pending threads to finish */ + htsthread_wait_n(background_threads); return ret; } @@ -404,12 +481,14 @@ void __cdecl htsshow_init(t_hts_callbackarg * carg) { void __cdecl htsshow_uninit(t_hts_callbackarg * carg) { } int __cdecl htsshow_start(t_hts_callbackarg * carg, httrackp * opt) { + DEBUG(fprintf(stderr, "htsshow_start()\n")); return 1; } int __cdecl htsshow_chopt(t_hts_callbackarg * carg, httrackp * opt) { return htsshow_start(carg, opt); } int __cdecl htsshow_end(t_hts_callbackarg * carg, httrackp * opt) { + DEBUG(fprintf(stderr, "htsshow_end()\n")); return 1; } int __cdecl htsshow_preprocesshtml(t_hts_callbackarg * carg, httrackp * opt, diff --git a/src/webhttrack b/src/webhttrack index e41991a..879a5d8 100755 --- a/src/webhttrack +++ b/src/webhttrack @@ -29,81 +29,15 @@ echo "$0($$): $@" >&2 return 0 } -function mozillabrowser { -# returns 0, if the browser is mozilla type -echo "$1" | grep -q "iceape" -[ $? -eq 0 ] && return 0 -echo "$1" | grep -q "mozilla" -[ $? -eq 0 ] && return 0 -echo "$1" | grep -q "netscape" -[ $? -eq 0 ] && return 0 -echo "$1" | grep -q "firebird" -[ $? -eq 0 ] && return 0 -echo "$1" | grep -q "firefox" -[ $? -eq 0 ] && return 0 -echo "$1" | grep -q "iceweasel" -[ $? -eq 0 ] && return 0 -echo "$1" | grep -q "abrowser" -[ $? -eq 0 ] && return 0 -echo "$1" | grep -q "icecat" -[ $? -eq 0 ] && return 0 -return 1; -} -function mozillaloaded { -user_name=`logname 2>/dev/null` -if ! test -n "${user_name}"; then -user_name=`id -un` -fi -if test -n "${user_name}"; then -ps -e -U "$user_name" | grep -E "(iceape|mozilla|netscape|firebird|firefox)" | grep -qv "grep -E" -else -false -fi -} - function launch_browser { log "launching $1" -start_t=`date +%s` browser=$1 url=$2 -moz= -if mozillaloaded; then -moz=1 -fi -# launch any browser -# if it is a mozilla like browser, check if the browser is running and use -# -remote if needed. Change the URL into openURL($url) too. -# (thanks to Torsten Werner for the patch) -# see http://www.mozilla.org/unix/remote.html -# 04/2006: openurl() fix from Samuel Suther -if mozillabrowser ${browser}; then - if ! ${browser} -remote "openurl(${url})"; then - log "spawning browser.." - ${browser} "${url}" - fi -else - log "spawning regular browser.." - ${browser} "${url}" -fi -# this is a real pain in the neck: browser can hiddenly use the -remote feature of +log "spawning browser.." +${browser} "${url}" +# note: browser can hiddenly use the -remote feature of # mozilla and therefore return immediately -# this loop is the only reliable solution AFAIK -end_t=`date +%s` -if test -n "$start_t" -a -n "$end_t"; then - int_t=$[$end_t-$start_t] -else - int_t=0 -fi -if test -n "${int_t}" -a "${int_t}" -lt 60; then - if test -n "$moz"; then - log "waiting for browser to terminate.." - while mozillaloaded; do - sleep 3 - done - log "browser seems to have been closed.." - fi -fi -log "browser exited" +log "browser (or helper) exited" } # First ensure that we can launch the server @@ -164,7 +98,7 @@ fi # Create a temporary filename TMPSRVFILE="$(mktemp ${TMPDIR:-/tmp}/.webhttrack.XXXXXXXX)" || ! log "cound not create the temporary file ${TMPSRVFILE}" || exit 1 # Launch htsserver binary and setup the server -(${BINPATH}/htsserver "${DISTPATH}/" path "${HOME}/websites" lang "${LANGN}" $@; echo SRVURL=error) > ${TMPSRVFILE}& +(${BINPATH}/htsserver "${DISTPATH}/" --ppid "$$" path "${HOME}/websites" lang "${LANGN}" $@; echo SRVURL=error) > ${TMPSRVFILE}& # Find the generated SRVURL SRVURL= MAXCOUNT=60 @@ -180,7 +114,8 @@ done # Cleanup function function cleanup { test -n "$1" && log "nasty signal caught, cleaning up.." -test -f ${TMPSRVFILE} && SRVPID=`grep -E PID= ${TMPSRVFILE} | cut -f2- -d=` +# Do not kill if browser exited (chrome bug issue) ; server will die itself +test -n "$1" && test -f ${TMPSRVFILE} && SRVPID=`grep -E PID= ${TMPSRVFILE} | cut -f2- -d=` test -n "${SRVPID}" && kill -9 ${SRVPID} test -f ${TMPSRVFILE} && rm ${TMPSRVFILE} test -n "$1" && log "..done" |