From: James Moger Date: Fri, 30 Sep 2011 23:49:03 +0000 (-0400) Subject: Clarified page hierarchy. Fixed TicGit pages. X-Git-Tag: v0.7.0~95^2~2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d376abaca317746fed3b557045432302b8f0b82f;p=gitblit.git Clarified page hierarchy. Fixed TicGit pages. --- diff --git a/src/com/gitblit/wicket/WicketUtils.java b/src/com/gitblit/wicket/WicketUtils.java index 3ffd6cd7..e5b7f697 100644 --- a/src/com/gitblit/wicket/WicketUtils.java +++ b/src/com/gitblit/wicket/WicketUtils.java @@ -88,13 +88,13 @@ public class WicketUtils { public static void setTicketCssClass(Component container, String state) { String css = null; if (state.equals("open")) { - css = "bug_open"; + css = "label important"; } else if (state.equals("hold")) { - css = "bug_hold"; + css = "label warning"; } else if (state.equals("resolved")) { - css = "bug_resolved"; + css = "label success"; } else if (state.equals("invalid")) { - css = "bug_invalid"; + css = "label"; } if (css != null) { setCssClass(container, css); diff --git a/src/com/gitblit/wicket/pages/ChangePasswordPage.java b/src/com/gitblit/wicket/pages/ChangePasswordPage.java index 660a8131..fec24144 100644 --- a/src/com/gitblit/wicket/pages/ChangePasswordPage.java +++ b/src/com/gitblit/wicket/pages/ChangePasswordPage.java @@ -32,7 +32,7 @@ import com.gitblit.models.UserModel; import com.gitblit.utils.StringUtils; import com.gitblit.wicket.GitBlitWebSession; -public class ChangePasswordPage extends StandardPage { +public class ChangePasswordPage extends RootSubPage { IModel password = new Model(""); IModel confirmPassword = new Model(""); diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/com/gitblit/wicket/pages/EditRepositoryPage.java index ae7966d0..2afe014c 100644 --- a/src/com/gitblit/wicket/pages/EditRepositoryPage.java +++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.java @@ -47,7 +47,7 @@ import com.gitblit.utils.StringUtils; import com.gitblit.wicket.GitBlitWebSession; import com.gitblit.wicket.WicketUtils; -public class EditRepositoryPage extends StandardPage { +public class EditRepositoryPage extends RootSubPage { private final boolean isCreate; diff --git a/src/com/gitblit/wicket/pages/EditUserPage.java b/src/com/gitblit/wicket/pages/EditUserPage.java index 8dbb0d90..446ab898 100644 --- a/src/com/gitblit/wicket/pages/EditUserPage.java +++ b/src/com/gitblit/wicket/pages/EditUserPage.java @@ -44,7 +44,7 @@ import com.gitblit.wicket.RequiresAdminRole; import com.gitblit.wicket.WicketUtils; @RequiresAdminRole -public class EditUserPage extends StandardPage { +public class EditUserPage extends RootSubPage { private final boolean isCreate; @@ -157,8 +157,8 @@ public class EditUserPage extends StandardPage { userModel.username)); setResponsePage(EditUserPage.class); } else { - // back to home - setResponsePage(RepositoriesPage.class); + // back to users page + setResponsePage(UsersPage.class); } } }; diff --git a/src/com/gitblit/wicket/pages/FederationPage.html b/src/com/gitblit/wicket/pages/FederationPage.html index ab8a9417..bb39d345 100644 --- a/src/com/gitblit/wicket/pages/FederationPage.html +++ b/src/com/gitblit/wicket/pages/FederationPage.html @@ -6,12 +6,12 @@ -

[federation proposals panel]

[federation tokens panel]

+ +

[federation proposals panel]

[federation registrations panel]

[federation tokens panel]

- \ No newline at end of file diff --git a/src/com/gitblit/wicket/pages/FederationPage.java b/src/com/gitblit/wicket/pages/FederationPage.java index b993f718..1f98c172 100644 --- a/src/com/gitblit/wicket/pages/FederationPage.java +++ b/src/com/gitblit/wicket/pages/FederationPage.java @@ -25,6 +25,7 @@ public class FederationPage extends RootPage { public FederationPage() { super(); + setupPage("", ""); boolean showFederation = showAdmin && GitBlit.canFederate(); add(new FederationTokensPanel("federationTokensPanel", showFederation) diff --git a/src/com/gitblit/wicket/pages/FederationRegistrationPage.java b/src/com/gitblit/wicket/pages/FederationRegistrationPage.java index aed94a41..e480eb76 100644 --- a/src/com/gitblit/wicket/pages/FederationRegistrationPage.java +++ b/src/com/gitblit/wicket/pages/FederationRegistrationPage.java @@ -25,24 +25,15 @@ import org.apache.wicket.markup.repeater.data.DataView; import org.apache.wicket.markup.repeater.data.ListDataProvider; import com.gitblit.GitBlit; -import com.gitblit.Keys; import com.gitblit.models.FederationModel; import com.gitblit.models.FederationModel.RepositoryStatus; -import com.gitblit.wicket.GitBlitWebSession; import com.gitblit.wicket.WicketUtils; -public class FederationRegistrationPage extends StandardPage { +public class FederationRegistrationPage extends RootSubPage { public FederationRegistrationPage(PageParameters params) { super(params); - - final boolean showAdmin; - if (GitBlit.getBoolean(Keys.web.authenticateAdminPages, true)) { - boolean allowAdmin = GitBlit.getBoolean(Keys.web.allowAdministration, false); - showAdmin = allowAdmin && GitBlitWebSession.get().canAdmin(); - } else { - showAdmin = false; - } + setStatelessHint(true); String url = WicketUtils.getUrlParameter(params); diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.java b/src/com/gitblit/wicket/pages/RepositoriesPage.java index 5339760e..289006fa 100644 --- a/src/com/gitblit/wicket/pages/RepositoriesPage.java +++ b/src/com/gitblit/wicket/pages/RepositoriesPage.java @@ -35,6 +35,7 @@ public class RepositoriesPage extends RootPage { public RepositoriesPage() { super(); + setupPage("", ""); // Load the markdown welcome message String messageSource = GitBlit.getString(Keys.web.repositoriesMessage, "gitblit"); diff --git a/src/com/gitblit/wicket/pages/ReviewProposalPage.html b/src/com/gitblit/wicket/pages/ReviewProposalPage.html index 7f26f281..6487a0ac 100644 --- a/src/com/gitblit/wicket/pages/ReviewProposalPage.html +++ b/src/com/gitblit/wicket/pages/ReviewProposalPage.html @@ -16,7 +16,7 @@ proposal[definition] -

diff --git a/src/com/gitblit/wicket/pages/ReviewProposalPage.java b/src/com/gitblit/wicket/pages/ReviewProposalPage.java index 2f2d6f39..1d9092a5 100644 --- a/src/com/gitblit/wicket/pages/ReviewProposalPage.java +++ b/src/com/gitblit/wicket/pages/ReviewProposalPage.java @@ -33,7 +33,7 @@ import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.panels.RepositoriesPanel; @RequiresAdminRole -public class ReviewProposalPage extends StandardPage { +public class ReviewProposalPage extends RootSubPage { private final String PROPS_PATTERN = "{0} = {1}\n"; @@ -91,7 +91,7 @@ public class ReviewProposalPage extends StandardPage { List repositories = new ArrayList( proposal.repositories.values()); - RepositoriesPanel repositoriesPanel = new RepositoriesPanel("repositories", false, + RepositoriesPanel repositoriesPanel = new RepositoriesPanel("repositoriesPanel", false, repositories, getAccessRestrictions()); add(repositoriesPanel); } diff --git a/src/com/gitblit/wicket/pages/RootPage.java b/src/com/gitblit/wicket/pages/RootPage.java index dd64de66..37f6ad1b 100644 --- a/src/com/gitblit/wicket/pages/RootPage.java +++ b/src/com/gitblit/wicket/pages/RootPage.java @@ -17,15 +17,13 @@ package com.gitblit.wicket.pages; 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; @@ -35,23 +33,30 @@ import com.gitblit.models.UserModel; import com.gitblit.utils.StringUtils; import com.gitblit.wicket.GitBlitWebSession; +/** + * 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 username = new Model(""); IModel password = new Model(""); 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(); @@ -122,19 +127,8 @@ public abstract class RootPage extends BasePage { 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) { diff --git a/src/com/gitblit/wicket/pages/RootSubPage.html b/src/com/gitblit/wicket/pages/RootSubPage.html new file mode 100644 index 00000000..554da111 --- /dev/null +++ b/src/com/gitblit/wicket/pages/RootSubPage.html @@ -0,0 +1,18 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/com/gitblit/wicket/pages/RootSubPage.java b/src/com/gitblit/wicket/pages/RootSubPage.java new file mode 100644 index 00000000..f7572b14 --- /dev/null +++ b/src/com/gitblit/wicket/pages/RootSubPage.java @@ -0,0 +1,48 @@ +/* + * Copyright 2011 gitblit.com. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.gitblit.wicket.pages; + +import org.apache.wicket.PageParameters; +import org.apache.wicket.markup.html.basic.Label; + +import com.gitblit.utils.StringUtils; + +/** + * RootSubPage is a non-topbar navigable RootPage. It also has a page header. + * + * @author James Moger + * + */ +public abstract class RootSubPage extends RootPage { + + public RootSubPage() { + super(); + } + + public RootSubPage(PageParameters params) { + super(params); + } + + @Override + protected void setupPage(String pageName, String subName) { + add(new Label("pageName", pageName)); + if (!StringUtils.isEmpty(subName)) { + subName = "/ " + subName; + } + add(new Label("pageSubName", subName)); + super.setupPage("", pageName); + } +} diff --git a/src/com/gitblit/wicket/pages/SendProposalPage.html b/src/com/gitblit/wicket/pages/SendProposalPage.html index 794cb702..8a289068 100644 --- a/src/com/gitblit/wicket/pages/SendProposalPage.html +++ b/src/com/gitblit/wicket/pages/SendProposalPage.html @@ -18,7 +18,7 @@ -

\ No newline at end of file diff --git a/src/com/gitblit/wicket/pages/SendProposalPage.java b/src/com/gitblit/wicket/pages/SendProposalPage.java index 11f97a08..ed200499 100644 --- a/src/com/gitblit/wicket/pages/SendProposalPage.java +++ b/src/com/gitblit/wicket/pages/SendProposalPage.java @@ -37,7 +37,7 @@ import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.panels.RepositoriesPanel; @RequiresAdminRole -public class SendProposalPage extends StandardPage { +public class SendProposalPage extends RootSubPage { public String myUrl; @@ -139,7 +139,7 @@ public class SendProposalPage extends StandardPage { @Override public void onSubmit() { - setResponsePage(RepositoriesPage.class); + setResponsePage(FederationPage.class); } }; cancel.setDefaultFormProcessing(false); @@ -148,7 +148,7 @@ public class SendProposalPage extends StandardPage { List repositories = new ArrayList( proposal.repositories.values()); - RepositoriesPanel repositoriesPanel = new RepositoriesPanel("repositories", false, + RepositoriesPanel repositoriesPanel = new RepositoriesPanel("repositoriesPanel", false, repositories, getAccessRestrictions()); add(repositoriesPanel); } diff --git a/src/com/gitblit/wicket/pages/StandardPage.html b/src/com/gitblit/wicket/pages/StandardPage.html deleted file mode 100644 index 14ec15c8..00000000 --- a/src/com/gitblit/wicket/pages/StandardPage.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - -

[Feedback Panel]

- - - - - - - - - \ No newline at end of file diff --git a/src/com/gitblit/wicket/pages/StandardPage.java b/src/com/gitblit/wicket/pages/StandardPage.java deleted file mode 100644 index 45989317..00000000 --- a/src/com/gitblit/wicket/pages/StandardPage.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2011 gitblit.com. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gitblit.wicket.pages; - -import org.apache.wicket.PageParameters; -import org.apache.wicket.markup.html.basic.Label; - -import com.gitblit.utils.StringUtils; - -public abstract class StandardPage extends BasePage { - - public StandardPage() { - // create constructor - super(); - setStatelessHint(true); - } - - public StandardPage(PageParameters params) { - // edit constructor - super(params); - setStatelessHint(true); - } - - protected void setupPage(String pageName, String subName) { - add(new Label("pageName", pageName)); - if (!StringUtils.isEmpty(subName)) { - subName = "/ " + subName; - } - add(new Label("pageSubName", subName)); - super.setupPage("", pageName); - } -} diff --git a/src/com/gitblit/wicket/pages/TicketPage.html b/src/com/gitblit/wicket/pages/TicketPage.html index 160bc0cf..ed3eb229 100644 --- a/src/com/gitblit/wicket/pages/TicketPage.html +++ b/src/com/gitblit/wicket/pages/TicketPage.html @@ -8,7 +8,7 @@ -

[ticket title]

diff --git a/src/com/gitblit/wicket/pages/TicketPage.java b/src/com/gitblit/wicket/pages/TicketPage.java index 48db1cea..d250a452 100644 --- a/src/com/gitblit/wicket/pages/TicketPage.java +++ b/src/com/gitblit/wicket/pages/TicketPage.java @@ -34,7 +34,7 @@ public class TicketPage extends RepositoryPage { public TicketPage(PageParameters params) { super(params); - final String ticketFolder = WicketUtils.getPath(params); + final String ticketFolder = WicketUtils.getObject(params); Repository r = getRepository(); TicketModel t = TicgitUtils.getTicket(r, ticketFolder); diff --git a/src/com/gitblit/wicket/pages/UsersPage.java b/src/com/gitblit/wicket/pages/UsersPage.java index 9a7f8a58..b54b968d 100644 --- a/src/com/gitblit/wicket/pages/UsersPage.java +++ b/src/com/gitblit/wicket/pages/UsersPage.java @@ -23,6 +23,7 @@ public class UsersPage extends RootPage { public UsersPage() { super(); + setupPage("", ""); add(new UsersPanel("usersPanel", showAdmin).setVisible(showAdmin)); }

[page name] [sub name]

[page name] [sub name]