fix ssmall glitches in the user pages

git-svn-id: https://svn.argeo.org/commons/trunk@8044 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.cms/src/org/argeo/cms/maintenance/Browse.java b/org.argeo.cms/src/org/argeo/cms/maintenance/Browse.java
index e0bba81682ba09c7ab402a77cdd108c59ecb1304..83f62fc8a433dd0d5848fba33b59c4f39fdefb63 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/maintenance/Browse.java
+++ b/org.argeo.cms/src/org/argeo/cms/maintenance/Browse.java
@@ -17,7 +17,6 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Value;
 
 import org.argeo.ArgeoException;
-import org.argeo.cms.CmsException;
 import org.argeo.cms.CmsTypes;
 import org.argeo.cms.CmsUiProvider;
 import org.argeo.cms.text.Img;
@@ -60,8 +59,8 @@ public class Browse implements CmsUiProvider {
        private final static String BROWSE_PREFIX = "browse#";
        private final static int THUMBNAIL_WIDTH = 400;
        private final static int COLUMN_WIDTH = 160;
-       private DateFormat timeFormatter = new SimpleDateFormat("dd-MM-yyyy', 'HH:mm");
-       
+       private DateFormat timeFormatter = new SimpleDateFormat(
+                       "dd-MM-yyyy', 'HH:mm");
 
        // keep a cache of the opened nodes
        // Key is the path
@@ -79,7 +78,8 @@ public class Browse implements CmsUiProvider {
        public Control createUi(Composite parent, Node context)
                        throws RepositoryException {
                if (context == null)
-                       throw new CmsException("Context cannot be null");
+                       // return null;
+               throw new CmsException("Context cannot be null");
                GridLayout layout = CmsUtils.noSpaceGridLayout();
                layout.numColumns = 2;
                parent.setLayout(layout);
@@ -266,7 +266,8 @@ public class Browse implements CmsUiProvider {
                                boolean leaveOpened = path.startsWith(currNodePath);
 
                                // workaround for same name siblings
-                               // fix me weird side effect when we go left or click on anb already selected, unfocused node
+                               // fix me weird side effect when we go left or click on anb
+                               // already selected, unfocused node
                                if (leaveOpened
                                                && (path.lastIndexOf("/") == 0
                                                                && currNodePath.lastIndexOf("/") == 0 || JcrUtils
@@ -530,7 +531,7 @@ public class Browse implements CmsUiProvider {
                                                } else if (e.keyCode == SWT.ARROW_LEFT) {
                                                        try {
                                                                selected = getNode().getParent();
-                                                               String newPath = selected.getPath(); //getNode().getParent()
+                                                               String newPath = selected.getPath(); // getNode().getParent()
                                                                setEdited(selected);
                                                                if (browserCols.containsKey(newPath))
                                                                        browserCols.get(newPath).setFocus();

diff --git a/org.argeo.cms/src/org/argeo/cms/users/UserPart.java b/org.argeo.cms/src/org/argeo/cms/users/UserPart.java
index ea544c97c79edb711b9965c6a13a72074e7b4619..93561473763d6050f75d031524478f7e83c3c441 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/users/UserPart.java
+++ b/org.argeo.cms/src/org/argeo/cms/users/UserPart.java
@@ -90,7 +90,7 @@ public class UserPart extends StyledControl implements EditablePart, NodePart,
 
                // header
                Label header = new Label(body, SWT.NONE);
-               header.setText(" General");
+               header.setText(" Main user information");
                header.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2,
                                1));
                CmsUtils.style(header, UserStyles.USER_FORM_TITLE);
@@ -105,7 +105,7 @@ public class UserPart extends StyledControl implements EditablePart, NodePart,
                // Change password link
                // header
                header = new Label(body, SWT.NONE);
-               header.setText(" Change password");
+               header.setText(" Reset password");
                header.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2,
                                1));
                CmsUtils.style(header, UserStyles.USER_FORM_TITLE);
@@ -287,12 +287,6 @@ public class UserPart extends StyledControl implements EditablePart, NodePart,
                }
        }
 
-       /* DEPENDENCY INJECTION */
-       // public void setUserDetailsManager(UserDetailsManager userDetailsManager)
-       // {
-       // this.userDetailsManager = userDetailsManager;
-       // }
-
        public void setUserAdminService(UserAdminService userAdminService) {
                this.userAdminService = userAdminService;
        }

diff --git a/org.argeo.cms/src/org/argeo/cms/users/UsersPage.java b/org.argeo.cms/src/org/argeo/cms/users/UsersPage.java
index d5bfeb7cdb1b3d481997d32e566831bfc13b8b1d..600b3daff00cfa7fbaaab61606e22e16a093f6f3 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/users/UsersPage.java
+++ b/org.argeo.cms/src/org/argeo/cms/users/UsersPage.java
@@ -136,8 +136,13 @@ public class UsersPage implements CmsUiProvider {
                final Button addBtn = new Button(buttonCmp, SWT.PUSH);
                addBtn.setText("Create");
 
+               Composite bottomCmp = new Composite(parent, SWT.NO_FOCUS);
+               bottomCmp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
+               bottomCmp.setLayout(new GridLayout());
+               
+               
                // Create the composite that displays the list and a filter
-               final UsersTable userTableCmp = new UsersTable(parent, SWT.BORDER,
+               final UsersTable userTableCmp = new UsersTable(bottomCmp, SWT.BORDER,
                                session);
                userTableCmp.populate(true, false);
                userTableCmp.setLayoutData(CmsUtils.fillAll());