From abcb146f0c4e5c99e5e44349a65e6fd49e9296d9 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Tue, 30 Oct 2012 17:03:02 -0400 Subject: [PATCH] Moved owner field onto access permissions tab --- src/com/gitblit/client/EditRepositoryDialog.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/com/gitblit/client/EditRepositoryDialog.java b/src/com/gitblit/client/EditRepositoryDialog.java index d91d18d..b4b6629 100644 --- a/src/com/gitblit/client/EditRepositoryDialog.java +++ b/src/com/gitblit/client/EditRepositoryDialog.java @@ -298,7 +298,6 @@ fieldsPanel .add(newFieldPanel(Translation.get("gb.origin"), originField)); fieldsPanel.add(newFieldPanel(Translation.get("gb.headRef"), headRefField)); - fieldsPanel.add(newFieldPanel(Translation.get("gb.owner"), ownerField)); fieldsPanel.add(newFieldPanel(Translation.get("gb.gcPeriod"), gcPeriod)); fieldsPanel.add(newFieldPanel(Translation.get("gb.gcThreshold"), gcThreshold)); @@ -327,9 +326,14 @@ .add(newFieldPanel(Translation.get("gb.verifyCommitter"), verifyCommitter)); usersPalette = new RegistrantPermissionsPanel(RegistrantType.USER); - JPanel northAccessPanel = new JPanel(new BorderLayout(5, 5)); - northAccessPanel.add(newFieldPanel(Translation.get("gb.accessRestriction"), + + JPanel northFieldsPanel = new JPanel(new GridLayout(0, 1, 0, 5)); + northFieldsPanel.add(newFieldPanel(Translation.get("gb.owner"), ownerField)); + northFieldsPanel.add(newFieldPanel(Translation.get("gb.accessRestriction"), accessRestriction), BorderLayout.NORTH); + + JPanel northAccessPanel = new JPanel(new BorderLayout(5, 5)); + northAccessPanel.add(northFieldsPanel, BorderLayout.NORTH); northAccessPanel.add(newFieldPanel(Translation.get("gb.authorizationControl"), authorizationPanel), BorderLayout.CENTER); northAccessPanel.add(clonePushPanel, BorderLayout.SOUTH); -- Gitblit v1.9.1