Fix 'Settings' anchor href in CurrentUserPopupPanel

Settings href was not self-redirected, this was causing 404 error when
gerrit wasn't installed in server root. This patch fixes this issue by
ensuring that '/settings' href would always be self-redirected.

Change-Id: I2cfe7f3b0b09d4359881a0ce97cb8f7408d74b6b
Signed-off-by: Dariusz Luksza <dariusz@luksza.org>

gerrit-gwtui/src/main/java/com/google/gerrit/client/CurrentUserPopupPanel.java

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/CurrentUserPopupPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/CurrentUserPopupPanel.java
index e559d38..e30c366 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/CurrentUserPopupPanel.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/CurrentUserPopupPanel.java
@@ -14,6 +14,7 @@
 
 package com.google.gerrit.client;
 
+import com.google.gerrit.common.PageLinks;
 import com.google.gerrit.reviewdb.client.Account;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.uibinder.client.UiBinder;
@@ -35,11 +36,14 @@
   Label userEmail;
   @UiField
   Anchor logout;
+  @UiField
+  Anchor settings;
 
   public CurrentUserPopupPanel(Account account, boolean canLogOut) {
     super(/* auto hide */true, /* modal */false);
     setWidget(binder.createAndBindUi(this));
     setStyleName(Gerrit.RESOURCES.css().userInfoPopup());
+    settings.setHref(Gerrit.selfRedirect(PageLinks.SETTINGS));
     if (account.getFullName() != null) {
       userName.setText(account.getFullName());
     }

gerrit-gwtui/src/main/java/com/google/gerrit/client/CurrentUserPopupPanel.ui.xml

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/CurrentUserPopupPanel.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/CurrentUserPopupPanel.ui.xml
index a50f11c..4dbfc23 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/CurrentUserPopupPanel.ui.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/CurrentUserPopupPanel.ui.xml
@@ -18,7 +18,6 @@
 <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
   xmlns:g='urn:import:com.google.gwt.user.client.ui'>
   <ui:with field='constants' type='com.google.gerrit.client.GerritConstants'/>
-  <ui:import field='com.google.gerrit.common.PageLinks.SETTINGS'/>
 
   <ui:style>
     .panel {
@@ -39,7 +38,7 @@
   <g:FlowPanel styleName="{style.panel}">
     <g:Label ui:field='userName' styleName="{style.userName}" />
     <g:Label ui:field='userEmail' styleName="{style.email}" />
-    <g:Anchor href='{SETTINGS}'>
+    <g:Anchor ui:field='settings'>
       <ui:text from='{constants.menuSettings}' />
     </g:Anchor>
     <g:Anchor ui:field='logout' styleName="{style.logout}">