diff --git a/mozilla/mailnews/ui/messenger/resources/content1.xul b/mozilla/mailnews/ui/messenger/resources/content1.xul index ea0be6e6359..28a01ec4c68 100644 --- a/mozilla/mailnews/ui/messenger/resources/content1.xul +++ b/mozilla/mailnews/ui/messenger/resources/content1.xul @@ -11,56 +11,40 @@ - - - - - - - - - - - - - - - - +Communicator Profile Manager +

+Creating a New Profile +

+Communicator stores information about your settings, preferences, bookmarks and +

+stored messages in your personal profile. +

- - - +

+If you are sharing this copy of Communicator with other users, you can use profiles +

+to keep each user's information separate. To do this, each user should create his or +

+her own profile and optionally protect it with a password. +

- - - +

+If you are the only person using this copy of Communicator, you must create atleast +

+one profile. If you would like, you can create multiple profiles for yourself to store +

+different sets of setting and preferences. For example, you may want to have separate +

+profiles for business and personal use. +

-
- If you create several profile you can tell them apart by the profile names -
- Enter New Profile name -
- -
- Your user settings will be stored in the directory below -
- -
- Please click Next to continue -
- +

+To begin Creating your profile, click Next. +

+ \ No newline at end of file diff --git a/mozilla/mailnews/ui/messenger/resources/content2.xul b/mozilla/mailnews/ui/messenger/resources/content2.xul index 00e81588ffb..8309ccbbb79 100644 --- a/mozilla/mailnews/ui/messenger/resources/content2.xul +++ b/mozilla/mailnews/ui/messenger/resources/content2.xul @@ -12,64 +12,41 @@ function commit() { var element; - var value; - var data; - element = document.getElementById("name"); - data = "ProfileName="+element.value+"%"; - parent.SetValue("pname", element.value); + element = document.getElementById("ProfileName"); + parent.SetValue(element.id, element.value); - element = document.getElementById("email"); + element = document.getElementById("ProfileDir"); data += "ProfileDir="+element.value+"%"; - parent.SetValue("setting", element.value); + parent.SetValue(element.id, element.value); } - - - - +

+If you create several profiles you can tell them apart by the profile names. +

+You may use the name provided here or use one of your own. +

- - - +

+Enter New Profile name +

+ +

- - +

+Your user settings, preferences, bookmarks and stored messages will be +

+stored in the directory below. We recommend that you use the default +

+directory (by leaving the box blank). +

+ +

- - - - - - - - - - - - - - - - -
- Please Enter name and information for the profile -
- Full name -
- - - (e.g. John Smith) -
- Email Address if available -
- - - (e.g. jsmith@company.com) -
- Please click Next to continue -
+

+Please click Next to continue +

\ No newline at end of file diff --git a/mozilla/mailnews/ui/messenger/resources/content3.xul b/mozilla/mailnews/ui/messenger/resources/content3.xul index 10349604d1f..2e7172ff312 100644 --- a/mozilla/mailnews/ui/messenger/resources/content3.xul +++ b/mozilla/mailnews/ui/messenger/resources/content3.xul @@ -7,14 +7,42 @@ xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.w3.org/TR/REC-html40"> + -Communicator Profile Manager -Start creating your profile +

+Please Enter name and information for the profile. This information will be +

+saved in the preferences of the new profile. +

+ +

+Full name +

+ (e.g. John Smith) +

+ +

+Email Address if available +

+ (e.g. jsmith@company.com) +

+ +

+Please click Next to continue +

\ No newline at end of file diff --git a/mozilla/mailnews/ui/messenger/resources/content4.xul b/mozilla/mailnews/ui/messenger/resources/content4.xul index faa913512b7..a5e2cb58315 100644 --- a/mozilla/mailnews/ui/messenger/resources/content4.xul +++ b/mozilla/mailnews/ui/messenger/resources/content4.xul @@ -12,47 +12,36 @@ function commit() { var element; - var value; - var data; -dump("GRRRRRR.....frame 4 commit called\n"); - element = document.getElementById("smtp"); - parent.SetValue("smtp", element.value); + element = document.getElementById("SMTP"); + parent.SetValue(element.id, element.value); } - - - - - - - - +

+Communicator now has enough information to setup your basic profile. +

+However, Communicator needs additional information if you want to +

+send or receive email or use newsgroups. If you do not know the +

+information requested, please contact your system administrator or +

+Internet Service Provider. +

- - - +

+Outgoing SMTP server +

+ +

- - - - - - - - -
- Please Enter information about your mail servers -
- Outgoing SMTP server -
- -
- Please click Next to continue entering information -
- Click Finish if you want to start communicator and enter your mail preferences later -
+

+ +Click Exit and start apprunner again for this new profile +to be used. + +

\ No newline at end of file diff --git a/mozilla/mailnews/ui/messenger/resources/cpw.xul b/mozilla/mailnews/ui/messenger/resources/cpw.xul index 8a99572cc06..30a64ed9843 100644 --- a/mozilla/mailnews/ui/messenger/resources/cpw.xul +++ b/mozilla/mailnews/ui/messenger/resources/cpw.xul @@ -15,6 +15,7 @@ var toolkitCore; nameGlobal = new Array(); +nameArray = new Array(); count = 0; function Startup() @@ -32,8 +33,27 @@ function Startup() function SetValue(name, value) { - nameGlobal[count] = name+"="+value+"%"; - count++; + dump("Inside SetValue\n"); + var found = false; + for (i = 0; i !=count; i++) { + if (nameArray[i] == name) { + dump("Name exists: "+nameGlobal[i]+"\n"); + nameGlobal[i] = name+"="+value+"%"; + dump("New values: "+name+" "+value+"\n"); + found = true; + break; + } + } + + + if (!found) { + dump("Name does not exist\n"); + nameGlobal[count] = name+"="+value+"%"; + dump("Name Value: "+name+" "+value+"\n"); + + nameArray[count] = name; + count++; + } } function Finish()