Author: toad
Date: 2008-03-28 15:19:01 +0000 (Fri, 28 Mar 2008)
New Revision: 18805
Added:
trunk/apps/new_installer/res/dont-close-me.html
Modified:
trunk/apps/new_installer/install.xml
trunk/apps/new_installer/res/unix/bin/browse.sh
trunk/apps/new_installer/res/windows/browse.cmd
Log:
Add don't-close-me page. Open this instead of about:blank, prior to opening the
freenet window.
Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml 2008-03-28 13:34:01 UTC (rev
18804)
+++ trunk/apps/new_installer/install.xml 2008-03-28 15:19:01 UTC (rev
18805)
@@ -120,6 +120,7 @@
<include name="wrapper.conf"/>
<include name="welcome.html"/>
<include name="welcome.*.html"/>
+ <include name="dont-close-me.html"/>
</fileset>
</pack>
Added: trunk/apps/new_installer/res/dont-close-me.html
===================================================================
--- trunk/apps/new_installer/res/dont-close-me.html
(rev 0)
+++ trunk/apps/new_installer/res/dont-close-me.html 2008-03-28 15:19:01 UTC
(rev 18805)
@@ -0,0 +1,111 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml"; lang="en" xml:lang="en">
+ <head>
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+ <title>Please don't close me</title>
+ <link rel="shortcut icon" href="freenet.ico" type="image/x-icon" />
+ <style type="text/css">
+p, span, div, td, th, li, h1, h2, h3, h4, h5 {
+ font-family: Arial;
+ font-weight: normal;
+ font-size: 11pt;
+}
+
+body {
+ margin: 0;
+ padding: 0;
+ background-color: #f0f0f0;
+}
+
+/* page's topbar */
+
+#topbar {
+ margin: 0;
+ padding: 5px;
+ min-height: 50px;
+ background-color: #e8e8e8;
+ background-image: url(http://127.0.0.1:8888/static/themes/clean/logo.png);
+ background-repeat: no-repeat;
+ background-position: 30px 3px;
+ border-bottom: 1px solid #d0d0d0;
+}
+
+#topbar h1 {
+ margin: 0;
+ padding: 7px 0 0 0;
+ text-align: center;
+ font-size: 20pt;
+}
+
+/* content */
+
+#content {
+ margin: 10px 50px;
+ padding: 0;
+}
+
+a {
+ color: #000000;
+}
+
+a:hover {
+ color: #ff0000;
+}
+
+abbr {
+ cursor: help;
+ border-bottom: dotted 1px black;
+}
+
+#copyright {
+ font-size: 8pt;
+ text-align: center;
+}
+
+/* infoboxes */
+
+div.infobox {
+ margin: 0 0 5px 0;
+ padding: 10px;
+ background-color: #f0f0f0;
+ border: 1px solid #d0d0d0;
+}
+
+div.infobox div.infobox-header {
+ margin: -10px -10px 10px -10px;
+ padding: 10px 35px 10px 10px;
+ border-bottom: 1px dotted #a0a0a0;
+ font-weight: bold;
+ font-size: 11pt;
+ background-color: #e8e8e8;
+ background-repeat: no-repeat;
+ background-position: right;
+}
+
+#started {
+ font-weight: bold;
+ font-size: 20pt;
+ text-align: center;
+}
+ </style>
+ </head>
+ <body>
+ <div id="page">
+ <div id="topbar">
+ <h1>Please don't close this page</h1>
+ </div>
+ <div id="content">
+ <div class="infobox">
+ <p><b>Please don't close this browser window until you have finished
browsing Freenet.</b></p>
+ <p>To maximise security and performance, we have created a custom
profile for
+ Firefox for browsing Freenet. But because of a problem in Firefox, if
you close
+ this window before you close the Freenet window (with the black
theme), you may
+ not be able to get back into Firefox. If this happens please shutdown
the Freenet
+ window and if necessary reboot. We will try to find a better solution
for
+ version 0.8. Thank you for using Freenet.</p>
+ <p><i>The Freenet Development Team</i></p>
+ </div>
+ </div>
+ </div>
+ </body>
+</html>
Modified: trunk/apps/new_installer/res/unix/bin/browse.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/browse.sh 2008-03-28 13:34:01 UTC
(rev 18804)
+++ trunk/apps/new_installer/res/unix/bin/browse.sh 2008-03-28 15:19:01 UTC
(rev 18805)
@@ -28,7 +28,7 @@
then
echo $TRY > firefox.location
echo Firefox found, creating a profile for freenet
- $TRY -no-remote "about:blank" &
+ $TRY -no-remote "file:$INSTALL_PATH/dont-close-me.html"
&
$TRY -no-remote -CreateProfile "freenet
$PWD/firefox_profile" >/dev/null
browseURL "$URL"
exit
Modified: trunk/apps/new_installer/res/windows/browse.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/browse.cmd 2008-03-28 13:34:01 UTC
(rev 18804)
+++ trunk/apps/new_installer/res/windows/browse.cmd 2008-03-28 15:19:01 UTC
(rev 18805)
@@ -32,7 +32,7 @@
:: creation of the profile
@echo Creating a Firefox profile for freenet
- at start "" /B %FIREFOX% -no-remote "about:blank"
+ at start "" /B %FIREFOX% -no-remote "file:%INSTALL_PATH%\dont-close-me.html"
@%FIREFOX% -no-remote -CreateProfile "freenet %INSTALL_PATH%\firefox_profile"
> NUL
@start "" /B %FIREFOX% -no-remote -P freenet "%URL%"
@goto end
