----------------------------------------------------------------------

Edited the Rules of Use and changed the layout of the "Key Word"
prompting dialog to match the appearence of the account coupon.

Committing in regapplet

Modified Files:
	Regapplet.java mybundle.java
----------------------------------------------------------------------

diff --git a/clients/regapplet/regapplet/Regapplet.java b/clients/regapplet/regapplet/Regapplet.java
index 9c47d663dc9c0d396ea80ce1622979a0a266fd60..2798c3012436fb16be61623651f3fdf06e8999f0 100755 (executable)
--- a/clients/regapplet/regapplet/Regapplet.java
+++ b/clients/regapplet/regapplet/Regapplet.java
@@ -14,6 +14,7 @@ import java.io.InputStream;
 import java.io.IOException;
 import java.awt.event.*;
 import java.applet.*;
+import mit.cipher.test;
 import mit.cipher.MITCipherException;
 import mit.cipher.Encap;
 
@@ -46,15 +47,7 @@ public class Regapplet extends Applet {
   Button WordCancelButton = new Button();
   Button LoginCancelButton = new Button();
   Button PasswordCancelButton = new Button();
-  Label Word1Label = new Label();
-  Label Word2Label = new Label();
-  Label Word3Label = new Label();
-  Label Word4Label = new Label();
-  Label Word5Label = new Label();
-  Label Word6Label = new Label();
-  Label Wordtl1 = new Label();
-  Label Wordtl2 = new Label();
-  Label Wordtl3 = new Label();
+  Label WordLabel = new Label();
   TextField Word1 = new TextField("", 6);
   TextField Word2 = new TextField("", 6);
   TextField Word3 = new TextField("", 6);
@@ -137,18 +130,8 @@ public class Regapplet extends Applet {
     NameContButton.setBackground(Color.white);
     NameCancelButton.setLabel("Cancel");
     NameCancelButton.setBackground(Color.white);
-    Word1Label.setText("Please enter the first word");
-    Word1Label.setBackground(Color.white);
-    Word2Label.setText("Please enter the second word");
-    Word2Label.setBackground(Color.white);
-    Word3Label.setText("Please enter the third word");
-    Word3Label.setBackground(Color.white);
-    Word4Label.setText("Please enter the fourth word");
-    Word4Label.setBackground(Color.white);
-    Word5Label.setText("Please enter the fifth word");
-    Word5Label.setBackground(Color.white);
-    Word6Label.setText("Please enter the sixth word");
-    Word6Label.setBackground(Color.white);
+    WordLabel.setText("Key Words:");
+    WordLabel.setBackground(Color.white);
     WordContButton.setLabel("Continue");
     WordContButton.setBackground(Color.white);
     WordCancelButton.setLabel("Cancel");
@@ -221,47 +204,32 @@ public class Regapplet extends Applet {
     WordPanel.add(WordInstructions);
     gridBagLayout1.setConstraints(WordInstructions, new GridBagConstraints2(0, 0, 7, 1, 0.0, 0.0
             ,GridBagConstraints.NORTH, GridBagConstraints.NONE, new Insets(19, 31, 10, 31), 0, 0));
-    WordPanel.add(Word1Label);
-    gridBagLayout1.setConstraints(Word1Label, new GridBagConstraints2(0, 1, 4, 1, 0.0, 0.0
-            ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 10, 0, 0), 0, 0));
-    WordPanel.add(Word2Label);
-    gridBagLayout1.setConstraints(Word2Label, new GridBagConstraints2(0, 2, 4, 1, 0.0, 0.0
-            ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 10, 0, 0), 0, 0));
-    WordPanel.add(Word3Label);
-    gridBagLayout1.setConstraints(Word3Label, new GridBagConstraints2(0, 3, 4, 1, 0.0, 0.0
-            ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 10, 0, 0), 0, 0));
-    WordPanel.add(Word4Label);
-    gridBagLayout1.setConstraints(Word4Label, new GridBagConstraints2(0, 4, 4, 1, 0.0, 0.0
-            ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 10, 0, 0), 0, 0));
-    WordPanel.add(Word5Label);
-    gridBagLayout1.setConstraints(Word5Label, new GridBagConstraints2(0, 5, 4, 1, 0.0, 0.0
-            ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 10, 0, 0), 0, 0));
-    WordPanel.add(Word6Label);
-    gridBagLayout1.setConstraints(Word6Label, new GridBagConstraints2(0, 6, 4, 1, 0.0, 0.0
+    WordPanel.add(WordLabel);
+    gridBagLayout1.setConstraints(WordLabel, new GridBagConstraints2(0, 1, 1, 2, 0.0, 0.0
             ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 10, 0, 0), 0, 0));
     WordPanel.add(Word1);
-    gridBagLayout1.setConstraints(Word1, new GridBagConstraints2(5, 1, 3, 1, 0.0, 0.0
+    gridBagLayout1.setConstraints(Word1, new GridBagConstraints2(1, 1, 1, 1, 0.0, 0.0
             ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 10), 0, 0));
     WordPanel.add(Word2);
-    gridBagLayout1.setConstraints(Word2, new GridBagConstraints2(5, 2, 3, 1, 0.0, 0.0
+    gridBagLayout1.setConstraints(Word2, new GridBagConstraints2(2, 1, 1, 1, 0.0, 0.0
             ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 10), 0, 0));
     WordPanel.add(Word3);
-    gridBagLayout1.setConstraints(Word3, new GridBagConstraints2(5, 3, 3, 1, 0.0, 0.0
+    gridBagLayout1.setConstraints(Word3, new GridBagConstraints2(3, 1, 1, 1, 0.0, 0.0
             ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 10), 0, 0));
     WordPanel.add(Word4);
-    gridBagLayout1.setConstraints(Word4, new GridBagConstraints2(5, 4, 3, 1, 0.0, 0.0
+    gridBagLayout1.setConstraints(Word4, new GridBagConstraints2(1, 2, 1, 1, 0.0, 0.0
             ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 10), 0, 0));
     WordPanel.add(Word5);
-    gridBagLayout1.setConstraints(Word5, new GridBagConstraints2(5, 5, 3, 1, 0.0, 0.0
+    gridBagLayout1.setConstraints(Word5, new GridBagConstraints2(2, 2, 1, 1, 0.0, 0.0
             ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 10), 0, 0));
     WordPanel.add(Word6);
-    gridBagLayout1.setConstraints(Word6, new GridBagConstraints2(5, 6, 3, 1, 0.0, 0.0
+    gridBagLayout1.setConstraints(Word6, new GridBagConstraints2(3, 2, 1, 1, 0.0, 0.0
             ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 10), 0, 0));
     WordPanel.add(WordContButton);
-    gridBagLayout1.setConstraints(WordContButton, new GridBagConstraints2(4, 7, 2, 2, 0.0, 1.0
+    gridBagLayout1.setConstraints(WordContButton, new GridBagConstraints2(2, 3, 2, 2, 0.0, 1.0
             ,GridBagConstraints.NORTH, GridBagConstraints.NONE, new Insets(10, 0, 10, 0), 0, 0));
     WordPanel.add(WordCancelButton);
-    gridBagLayout1.setConstraints(WordCancelButton, new GridBagConstraints2(5, 7, 2, 2, 0.0, 1.0
+    gridBagLayout1.setConstraints(WordCancelButton, new GridBagConstraints2(4, 3, 2, 2, 0.0, 1.0
             ,GridBagConstraints.NORTH, GridBagConstraints.NONE, new Insets(10, 0, 10, 0), 0, 0));
     this.add("LoginPanel", LoginPanel);
     LoginPanel.add(LoginNameBanner);

diff --git a/clients/regapplet/regapplet/mybundle.java b/clients/regapplet/regapplet/mybundle.java
index f91473935a745d750250b7583afed081997bc6ea..3a323fa0cc930eb5a1e169f12d2f9a8ccd8cb0b3 100644 (file)
--- a/clients/regapplet/regapplet/mybundle.java
+++ b/clients/regapplet/regapplet/mybundle.java
@@ -20,7 +20,7 @@ public class mybundle {
     ht.put("err1","We were unable to contact the Athena Registration Server. This may indicate a temporary problem with the registration system, or with the network.\nPlease try again later. If this problem persists, contact the Athena User Accounts Office in N42-105A, x3-1325.");
     ht.put("bale","By hitting CANCEL you have requested that we terminate your registration session. However if you have already gone past the screen where you choose your login name, your choice has been set and cannot be unset.\nIf you really want to quit, then click on the \"Yes\" button below. Otherwise choose \"No\" and we will go back to where you were.");
 
-    ht.put("rules", "MITnet Rules of Use\n\n     Comply with Intended Use of the System\n\n     1. Don't violate the intended use of MITnet.\n\n     Assure Ethical Use of the System\n\n     2. Don't let anyone know your password(s).\n\n     3. Don't violate the privacy of other users.\n\n     4. Don't copy or misuse copyrighted material (including software).\n\n     5. Don't use MITnet to harass anyone in any way.\n\n     Assure Proper Use of System Resources\n\n     6. Don't overload the communication servers; in particular, don't\nabuse your electronic mail (email) or Zephyr privileges.\n\nAdditional Rules for Athena Facilities\n\n     Comply with Intended Use of the System\n\n     A1. Don't violate the intended use of the Athena system.\n\n     Protect Athena Equipment\n\n     A2. Don't eat, drink, or bring food or liquids into the Athena clusters.\n\n     A3. Don't turn the power off on Athena equipment.\n\n     A4. Don't reconfigure the cluster, either hardware or software.\n\n     Assure Fair Access to Workstations in Athena Clusters\n\n     A5. Don't violate the official priorities for the use of\nworkstations; in particular, don't play games or engage in other\nnon-academic activity if the cluster is busy, and don't log on to more\nthan one workstation at a time.\n\n     A6. Don't leave your workstation unattended for more than 20 minutes.\n\n     A7. Don't make a lot of noise in the Athena clusters.\n\n     Assure Fair Access to Athena Printers\n\n     A8. Don't violate the official priorities for the use of\nprinters; in particular, don't be a printer hog or use the Athena\nprinters as copy machines.\n");
+    ht.put("rules", "MITnet Rules of Use\n\nAll users of Athena and MITnet (MIT's campus network) agree to abide by\nthe Athena/MITnet rules of use. These rules are summarized here. For the\ncomplete text, see the document \"Welcome to Athena\" or\nhttp://web.mit.edu/olh/Rules/.\n\n     Comply with Intended Use of the System\n\n     1. Don't violate the intended use of MITnet.\n\n        * Don't try to interfere with or alter the integrity of the\n          system at large.\n        * Don't try to restrict or deny access to the system by legitimate\n          users.\n        * Don't use MITnet for private financial gain.\n\n     Assure Ethical Use of the System\n\n     2. Don't let anyone know your password(s).\n\n     3. Don't violate the privacy of other users.\n\n     4. Don't copy or misuse copyrighted material (including software).\n\n     5. Don't use MITnet to harass anyone in any way.\n\n     Assure Proper Use of System Resources\n\n     6. Don't overload the communication servers; in particular, don't\nabuse your electronic mail (email) or Zephyr privileges.\n\nAdditional Rules for Athena Facilities\n\n     Comply with Intended Use of the System\n\n     A1. Don't violate the intended use of the Athena system.\n\n     Protect Athena Equipment\n\n     A2. Don't eat, drink, or bring food or liquids into the Athena clusters.\n\n     A3. Don't turn the power off on Athena equipment.\n\n     A4. Don't reconfigure the cluster, either hardware or software.\n\n     Assure Fair Access to Workstations in Athena Clusters\n\n     A5. Don't violate the official priorities for the use of\nworkstations; in particular, don't play games or engage in other\nnon-academic activity if the cluster is busy, and don't log on to more\nthan one workstation at a time.\n\n     A6. Don't leave your workstation unattended for more than 20 minutes.\n\n     A7. Don't make a lot of noise in the Athena clusters.\n\n     Assure Fair Access to Athena Printers\n\n     A8. Don't violate the official priorities for the use of\nprinters; in particular, don't be a printer hog or use the Athena\nprinters as copy machines.\n\n\n\n\n\n\n\n\n");
   }
   public String getString(String key) {
     return ((String) ht.get(key));