fixed build to allow builds where a proxy is needed for access to outside r...

Jason Pyeron

2012-08-19 d1231c63669f4bc3643985b9032de7f998612e08

 src/com/gitblit/wicket/pages/BasePage.java

@@ -17,6 +17,7 @@


import java.util.LinkedHashMap;

import java.util.Map;

import java.util.ResourceBundle;

import java.util.TimeZone;



import javax.servlet.http.Cookie;

@@ -27,6 +28,7 @@
import org.apache.wicket.PageParameters;

import org.apache.wicket.RestartResponseAtInterceptPageException;

import org.apache.wicket.RestartResponseException;

import org.apache.wicket.markup.html.CSSPackageResource;

import org.apache.wicket.markup.html.WebPage;

import org.apache.wicket.markup.html.basic.Label;

import org.apache.wicket.markup.html.link.BookmarkablePageLink;

@@ -46,6 +48,7 @@
import com.gitblit.Keys;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.UserModel;

import com.gitblit.utils.TimeUtils;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.LinkPanel;

@@ -53,17 +56,44 @@
public abstract class BasePage extends WebPage {



   private final Logger logger;

	
   private transient TimeUtils timeUtils;



   public BasePage() {

      super();

      logger = LoggerFactory.getLogger(getClass());

      customizeHeader();

      loginByCookie();

   }



   public BasePage(PageParameters params) {

      super(params);

      logger = LoggerFactory.getLogger(getClass());

      customizeHeader();

      loginByCookie();

   }

	
   private void customizeHeader() {

      if (GitBlit.getBoolean(Keys.web.useResponsiveLayout, true)) {

         add(CSSPackageResource.getHeaderContribution("bootstrap/css/bootstrap-responsive.css"));

      }

   }

	
   protected String getLanguageCode() {

      return GitBlitWebSession.get().getLocale().getLanguage();

   }

	
   protected TimeUtils getTimeUtils() {

      if (timeUtils == null) {

         ResourceBundle bundle;		
         try {

            bundle = ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp", GitBlitWebSession.get().getLocale());

         } catch (Throwable t) {

            bundle = ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp");

         }

         timeUtils = new TimeUtils(bundle);

      }

      return timeUtils;

   }

   

   @Override

@@ -251,12 +281,14 @@


         if (GitBlitWebSession.get().isLoggedIn()) {

            // username, logout, and change password

            add(new Label("username", GitBlitWebSession.get().getUser().toString() + ":"));

            add(new Label("username", GitBlitWebSession.get().getUser().getDisplayName() + ":"));

            add(new LinkPanel("loginLink", null, markupProvider.getString("gb.logout"),

                  LogoutPage.class));

            boolean editCredentials = GitBlit.self().supportsCredentialChanges();

            // quick and dirty hack for showing a separator

            add(new Label("separator", "|"));

            add(new BookmarkablePageLink<Void>("changePasswordLink", ChangePasswordPage.class));

            add(new Label("separator", "|").setVisible(editCredentials));

            add(new BookmarkablePageLink<Void>("changePasswordLink", 
                  ChangePasswordPage.class).setVisible(editCredentials));

         } else {

            // login

            add(new Label("username").setVisible(false));