From 10177fb0a59cc9fc61fb78c724f7b0816b69b798 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 01 Oct 2011 15:50:22 -0400
Subject: [PATCH] CSS fixes for palette buttons
---
src/com/gitblit/wicket/pages/RootPage.java | 47 +++++++++++++++++++++++------------------------
1 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/RootPage.java b/src/com/gitblit/wicket/pages/RootPage.java
index dd64de6..69ac25d 100644
--- a/src/com/gitblit/wicket/pages/RootPage.java
+++ b/src/com/gitblit/wicket/pages/RootPage.java
@@ -17,15 +17,13 @@
import java.text.MessageFormat;
-import javax.servlet.http.Cookie;
-
+import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.form.StatelessForm;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.protocol.http.WebResponse;
import com.gitblit.Constants;
@@ -34,24 +32,32 @@
import com.gitblit.models.UserModel;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.GitBlitWebSession;
+import com.gitblit.wicket.WicketUtils;
+/**
+ * Root page is a topbar, navigable page like Repositories, Users, or
+ * Federation.
+ *
+ * @author James Moger
+ *
+ */
public abstract class RootPage extends BasePage {
- final boolean showAdmin;
+ boolean showAdmin;
IModel<String> username = new Model<String>("");
IModel<String> password = new Model<String>("");
public RootPage() {
super();
- setupPage("", "");
+ }
- // try to automatically login from cookie
- if (!GitBlitWebSession.get().isLoggedIn()
- && GitBlit.getBoolean(Keys.web.allowCookieAuthentication, false)) {
- loginByCookie();
- }
+ public RootPage(PageParameters params) {
+ super(params);
+ }
+ @Override
+ protected void setupPage(String repositoryName, String pageName) {
if (GitBlit.getBoolean(Keys.web.authenticateAdminPages, true)) {
boolean allowAdmin = GitBlit.getBoolean(Keys.web.allowAdministration, false);
showAdmin = allowAdmin && GitBlitWebSession.get().canAdmin();
@@ -99,8 +105,12 @@
}
}
};
- loginForm.add(new TextField<String>("username", username));
- loginForm.add(new PasswordTextField("password", password));
+ TextField<String> unameField = new TextField<String>("username", username);
+ WicketUtils.setInputPlaceholder(unameField, getString("gb.username"));
+ loginForm.add(unameField);
+ PasswordTextField pwField = new PasswordTextField("password", password);
+ WicketUtils.setInputPlaceholder(pwField, getString("gb.password"));
+ loginForm.add(pwField);
add(loginForm);
if (GitBlit.getBoolean(Keys.web.authenticateViewPages, true)
|| GitBlit.getBoolean(Keys.web.authenticateAdminPages, true)) {
@@ -122,19 +132,8 @@
pendingProposals));
}
}
- }
- private void loginByCookie() {
- UserModel user = null;
-
- // Grab cookie from Browser Session
- Cookie[] cookies = ((WebRequest) getRequestCycle().getRequest()).getCookies();
- if (cookies != null && cookies.length > 0) {
- user = GitBlit.self().authenticate(cookies);
- }
-
- // Login the user
- loginUser(user);
+ super.setupPage(repositoryName, pageName);
}
private void loginUser(UserModel user) {
--
Gitblit v1.9.1