From f604b92571e8dd2ea9b1490ce70726fd8149e888 Mon Sep 17 00:00:00 2001
From: Alex Eng <aeng@redhat.com>
Date: Thu, 23 Oct 2014 10:45:57 +1000
Subject: [PATCH] Fix editor toggle issue:
 https://bugzilla.redhat.com/show_bug.cgi?id=1154451

---
 .../org/zanata/seam/interceptor/MonitoringWrapper.java   | 2 +-
 .../main/java/org/zanata/webtrans/client/ui/Editor.java  | 5 ++++-
 .../java/org/zanata/webtrans/client/ui/Editor.ui.xml     | 4 ++--
 zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml        | 9 ---------
 .../src/main/webapp/resources/fontello/css/fontello.css  | 2 +-
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/zanata-war/src/main/java/org/zanata/seam/interceptor/MonitoringWrapper.java b/zanata-war/src/main/java/org/zanata/seam/interceptor/MonitoringWrapper.java
index 089300944b..573fea5716 100644
--- a/zanata-war/src/main/java/org/zanata/seam/interceptor/MonitoringWrapper.java
+++ b/zanata-war/src/main/java/org/zanata/seam/interceptor/MonitoringWrapper.java
@@ -53,7 +53,7 @@ public void process() throws Exception {
                     if (identity == null || !identity.isLoggedIn()) {
                         String signInUrl =
                                 httpRequest.getContextPath()
-                                        + "/account/sign_form";
+                                        + "/account/sign_in";
                         httpResponse.sendRedirect(signInUrl);
                     } else if (!identity.hasRole("admin")) {
                         httpResponse.sendError(
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
index 89b64aa682..a8e0d2100a 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
+++ b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
@@ -45,7 +45,7 @@ public class Editor extends Composite implements ToggleEditor {
     FocusPanel rootContainer;
 
     @UiField
-    HTMLPanel textAreaTable;
+    HTMLPanel textAreaTable, textAreaWrapper;
 
     @UiField
     InlineLabel copyIcon;
@@ -230,6 +230,7 @@ public TransUnitId getId() {
 
     @Override
     public void toggleType() {
+        textAreaWrapper.clear();
         String currentText = textArea.getText();
         int cursorPos = textArea.getCursorPos();
         boolean editing = textArea.isEditing();
@@ -244,6 +245,8 @@ public void toggleType() {
             textArea.setCursorPos(cursorPos);
             textArea.setEditing(true);
         }
+        textAreaWrapper.add(textArea);
+        textArea.refresh();
     }
 
     @Override
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
index b5f8e03232..fa8fef966c 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
+++ b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
@@ -35,9 +35,9 @@
           title="{tableMessages.copyFromSource}"
           styleName="icon-right-1 {style.copyButton} fadeElement" />
       </div>
-      <div class="w--11-12 g__item {style.textAreaWrapper}">
+      <g:HTMLPanel styleName="w--11-12 g__item {style.textAreaWrapper}" ui:field="textAreaWrapper">
         <fui:TextAreaWrapper ui:field="textArea"/>
-      </div>
+      </g:HTMLPanel>
     </g:HTMLPanel>
   </g:FocusPanel>
 </ui:UiBinder>
diff --git a/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml b/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
index 7cfedb8181..2bbfc43ca3 100644
--- a/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
+++ b/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
@@ -138,11 +138,6 @@
     <to last="true">/account/klogin.seam$1</to>
   </rule>
 
-  <rule>
-    <from casesensitive="true">^/account/sign_form(.+)?$</from>
-    <to last="true">/account/login_input.seam$1</to>
-  </rule>
-
   <rule>
     <from casesensitive="true">^/account/sign_out(.+)?$</from>
     <to last="true">/account/logout.seam$1</to>
@@ -383,10 +378,6 @@
     <from>^(/.+)?/account/klogin.seam(.+)?$</from>
     <to>$1/account/klogin$2</to>
   </outbound-rule>
-  <outbound-rule>
-    <from>^(/.+)?/account/login_input.seam(.+)?$</from>
-    <to>$1/account/sign_form$2</to>
-  </outbound-rule>
   <outbound-rule>
     <from>^(/.+)?/account/logout.seam(.+)?$</from>
     <to>$1/account/sign_out$2</to>
diff --git a/zanata-war/src/main/webapp/resources/fontello/css/fontello.css b/zanata-war/src/main/webapp/resources/fontello/css/fontello.css
index a09ba5c88e..062795f804 100644
--- a/zanata-war/src/main/webapp/resources/fontello/css/fontello.css
+++ b/zanata-war/src/main/webapp/resources/fontello/css/fontello.css
@@ -3,7 +3,7 @@
 @font-face {
   font-family: 'fontello';
   src: url("../font/fontello.eot");
-  src: url("../font/fontello.eot?#iefix") format('embedded-opentype'), url("../font/fontello.woff") format('woff'), url("../../../../images/fontello/font/fontello.ttf") format('truetype'), url("../font/fontello.svg#fontello") format('svg');
+  src: url("../font/fontello.eot?#iefix") format('embedded-opentype'), url("../font/fontello.woff") format('woff'), url("../font/fontello.ttf") format('truetype'), url("../font/fontello.svg#fontello") format('svg');
   font-weight: normal;
   font-style: normal;
 }