From 9fd68af15157e5dbce95f50f486082619ecdeebe Mon Sep 17 00:00:00 2001
From: Alex Eng <aeng@redhat.com>
Date: Thu, 4 Sep 2014 15:46:44 +1000
Subject: [PATCH] WIP: fix focus transunit issue

---
 .../zanata/webtrans/client/view/SourceContentsView.java    | 7 ++++---
 .../zanata/webtrans/client/view/SourceContentsView.ui.xml  | 4 ++--
 .../zanata/webtrans/client/view/TransUnitsTableView.java   | 3 ++-
 .../resources/org/zanata/webtrans/public/Application.xhtml | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.java
index 328d403885..2444327efe 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.java
+++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.java
@@ -42,6 +42,7 @@
 import com.google.gwt.resources.client.CssResource;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.user.client.ui.Anchor;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.HTMLPanel;
 import com.google.gwt.user.client.ui.InlineLabel;
@@ -62,7 +63,7 @@ public class SourceContentsView extends Composite implements
     Styles style;
 
     @UiField(provided = true)
-    InlineLabel bookmarkIcon;
+    Anchor bookmarkIcon;
 
     @UiField(provided = true)
     ReferencePanel referencePanel;
@@ -98,8 +99,8 @@ public SourceContentsView(
         rootPanel = binder.createAndBindUi(this);
     }
 
-    private InlineLabel createBookmarkIcon() {
-        InlineLabel bookmarkIcon = new InlineLabel();
+    private Anchor createBookmarkIcon() {
+        Anchor bookmarkIcon = new Anchor();
         bookmarkIcon.addClickHandler(new ClickHandler() {
             @Override
             public void onClick(ClickEvent event) {
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.ui.xml b/zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.ui.xml
index 85a37decbb..e9135e303e 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.ui.xml
+++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.ui.xml
@@ -20,9 +20,9 @@
       <fui:ReferencePanel ui:field="referencePanel" />
     </li>
     <li>
-      <g:InlineLabel ui:field="bookmarkIcon"
+      <g:Anchor ui:field="bookmarkIcon"
         styleName="{style.bookmark} i i--star l--float-left l--push-top-quarter" />
-      <fui:TransUnitDetailsPanel ui:field="transUnitDetailsPanel"/>
+      <fui:TransUnitDetailsPanel ui:field="transUnitDetailsPanel" styleName="l--push-left-half"/>
     </li>
   </g:HTMLPanel>
 </ui:UiBinder>
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
index 991ccbb061..be58930440 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
+++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
@@ -6,6 +6,7 @@
 import org.zanata.webtrans.client.ui.FilterViewConfirmationDisplay;
 import org.zanata.webtrans.client.ui.LoadingPanel;
 
+import com.allen_sauer.gwt.log.client.Log;
 import com.google.gwt.core.shared.GWT;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
@@ -176,7 +177,7 @@ public void delayRefresh() {
     @Override
     public void ensureVisible(TargetContentsDisplay currentDisplay) {
         int rootBottom =
-                root.getAbsoluteTop() + root.getElement().getClientHeight();
+                root.getElement().getClientHeight();
         Widget transUnitRow = currentDisplay.asWidget();
         int rowBottom =
                 transUnitRow.getAbsoluteTop()
diff --git a/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml b/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
index 25eee39c08..7ea3ae54ef 100644
--- a/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
+++ b/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
@@ -50,7 +50,7 @@
   <!-- you can leave the body empty if you want  -->
   <!-- to create a completely dynamic UI.        -->
   <!--                                           -->
-  <body class="new-zanata-body">
+  <h:body styleClass="new-zanata-body">
   <script type="text/javascript">
     var zanataSessionId = '#{request.session.id}';
   </script>
@@ -67,7 +67,7 @@
 
   <ui:include src="../WEB-INF/template/scripts.xhtml"/>
 
-  </body>
+  </h:body>
 
   </html>
 </f:view>