Changeset 19200

Timestamp:

2009-04-22T16:38:40+12:00 (15 years ago)

Author:

oranfry

Message:

language and ant-installer changes for the installer pages about the admin pages

Location:

release-kits/shared/core

Files:

• ant-installer/lib/ant-installer-ext.jar (modified) ( previous)
• ant-installer/lib/ant-installer.jar (modified) ( previous)
• ant-installer/src/org/tp23/antinstaller/renderer/swing/CheckboxInputRenderer.java (modified) (2 diffs)
• ant-installer/src/org/tp23/antinstaller/renderer/swing/ValidatedTextInputRenderer.java (modified) (3 diffs)
• language-strings/LanguagePack.properties (modified) (1 diff)

release-kits/shared/core/ant-installer/src/org/tp23/antinstaller/renderer/swing/CheckboxInputRenderer.java

@@ -19 +19 @@
 import java.awt.event.ActionListener;
 
+import java.awt.FlowLayout;
+import java.awt.GridLayout;
+import java.awt.BorderLayout;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import java.awt.Dimension;
+import java.awt.Insets;
+import javax.swing.JTextField;
+
 
 import org.tp23.antinstaller.input.CheckboxInput;
@@ -75 +82 @@
     }
     public int addSelf(JPanel content, GBCF cf,  int row, boolean overflow) {
-        content.add(fieldLabel, cf.getCell(row, 0));
-        content.add(checkBox, cf.getCell(row, 1));
+        JPanel p;
+
+        //p = new JPanel(new FlowLayout(FlowLayout.LEFT));
+        BorderLayout l = new BorderLayout();
+        p = new JPanel(l);
+        p.add( fieldLabel, BorderLayout.WEST );
+        p.add( checkBox, BorderLayout.CENTER );
+        content.add(p);
+
+        p = new JPanel();
+        p.setMinimumSize( new Dimension(0,1) );
+        content.add(p);
+        return ++row;
+/*
+        JPanel p = new JPanel();
+        p.add(fieldLabel);
+        p.add(checkBox);
         if(overflow){
             checkBox.setOverflow(SizeConstants.OVERFLOW_FIELD_SIZE);
         }
-        return ++row;
+        content.add(p);
+
+*/
     }
 

release-kits/shared/core/ant-installer/src/org/tp23/antinstaller/renderer/swing/ValidatedTextInputRenderer.java

@@ -23 +23 @@
 import java.util.ResourceBundle;
 
+import java.awt.Dimension;
+import java.awt.Insets;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
+import java.awt.FlowLayout;
+import java.awt.GridLayout;
+import java.awt.BorderLayout;
+
 
 import org.tp23.antinstaller.input.OutputField;
@@ -88 +94 @@
 
     public int addSelf(JPanel content, GBCF cf, int row, boolean overflow) {
-        content.add(fieldLabel, cf.getCell(row, 0));
-        content.add(jTextField, cf.getCell(row, 1));
-        if (overflow) {
-            ((AITextfield) jTextField).setOverflow(SizeConstants.OVERFLOW_FIELD_SIZE);
-        }
-        return ++row;
+
+        JPanel p;
+
+        //p = new JPanel(new FlowLayout(FlowLayout.LEFT));
+        BorderLayout l = new BorderLayout();
+        p = new JPanel(l);
+        p.add( fieldLabel, BorderLayout.WEST );
+        p.add( jTextField, BorderLayout.CENTER );
+        content.add(p);
+
+        p = new JPanel();
+        p.setMinimumSize( new Dimension(0,1) );
+        content.add(p);
+
+        return ++row;
     }
 
@@ -101 +116 @@
     public void renderError() {
         MessageRenderer mr = ctx.getMessageRenderer();
-        mr.printMessage(org.tp23.antinstaller.Installer.langPack.getString("notCorrectFormat") + "\n\n e.g. "
-                + inputField.getDefaultValue());
+        mr.printMessage( org.tp23.antinstaller.Installer.langPack.getString("notCorrectFormat") );
         this.jTextField.requestFocus();
         this.jTextField.setForeground(Color.red);

release-kits/shared/core/language-strings/LanguagePack.properties

@@ -92 +92 @@
 
 ### Admin password page
-page.admin-password.displayText = Please set the Admin Password
+
+
+page.admin-pages.displayText = Administrations Pages
+admin-expl.displayText = The administration pages of the Greenstone interface allow you to manage the users database, which required if you wish to set up remote greenstone. They also provide an easy way to view log files and to edit the file 'main.cfg'.
+admin-expl-2.displayText = Do you wish to the enable the administration pages of Greenstone? (You will be asked for a password on the next page.)
+admin-expl-3.displayText = NOTE: If you enable the administration pages, they may be accessible over the internet. Please choose a secure password to protect them.
+enable.admin.pages.displayText = Enable Admin Pages
+
+page.admin-password.displayText = Admin Password
+admin-password-expl.displayText =  A user with the username 'admin' will be created for you with the password you provide. Please enter the admin password. The password must be between 3 and 20 characters long.
 admin.password.displayText = Admin Password
-admin-password-expl.displayText = In order to access certain parts of the Greenstone interface you need a password. A user with the username 'admin' will be created for you with the password you provide. The password must be between 3 and 20 characters long.
+
+
+
 
 ### Tomcat config page