Merge branch 'rhbz845904' into integration/master

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenter.java
	zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
	zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
	zanata-war/src/main/java/org/zanata/webtrans/client/ui/OptionsPanelView.ui.xml
	zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
	zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java

zanata-war/pom.xml

@@ -96,10 +96,10 @@
 			        <fileset>
 			          <directory>src/main/webapp/WEB-INF/deploy</directory>
 			        </fileset>
-			        <fileset>
+			      </filesets>
+			      <fileset>
 			          <directory>src/main/webapp/webtrans</directory>
 			        </fileset>
-			      </filesets>
 		          <followSymlinks>false</followSymlinks>
 			    </configuration>
 			</plugin>

zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java

@@ -106,6 +106,7 @@ public class ProjectIterationFilesAction
 
    private DocumentFileUploadHelper documentFileUpload;
 
+   private HProjectIteration projectIteration;
 
    public void initialize()
    {
@@ -293,6 +294,30 @@ public DocumentFileUploadHelper getDocumentFileUpload()
       return documentFileUpload;
    }
 
+   public HProjectIteration getProjectIteration()
+   {
+      if (this.projectIteration == null)
+      {
+         this.projectIteration = projectIterationDAO.getBySlug(projectSlug, iterationSlug);
+      }
+      return this.projectIteration;
+   }
+
+   public boolean isUserAllowedToTranslate()
+   {
+      return !isIterationReadOnly() && !isIterationObsolete() && identity.hasPermission("add-translation", getProjectIteration().getProject(), getLocale());
+   }
+
+   public boolean isIterationReadOnly()
+   {
+      return getProjectIteration().getProject().getStatus() == EntityStatus.READONLY || getProjectIteration().getStatus() == EntityStatus.READONLY;
+   }
+
+   public boolean isIterationObsolete()
+   {
+      return getProjectIteration().getProject().getStatus() == EntityStatus.OBSOLETE || getProjectIteration().getStatus() == EntityStatus.OBSOLETE;
+   }
+
    /**
     * Helper class to upload translation files.
     */

zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java

@@ -20,6 +20,8 @@
  */
 package org.zanata.action;
 
+import static org.zanata.rest.dto.stats.TranslationStatistics.StatUnit.WORD;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -40,8 +42,6 @@
 import org.joda.time.format.PeriodFormatterBuilder;
 import org.zanata.annotation.CachedMethodResult;
 import org.zanata.annotation.CachedMethods;
-import org.zanata.common.EntityStatus;
-import org.zanata.common.TransUnitWords;
 import org.zanata.dao.ProjectIterationDAO;
 import org.zanata.model.HAccount;
 import org.zanata.model.HIterationGroup;
@@ -58,8 +58,6 @@
 import org.zanata.service.LocaleService;
 import org.zanata.service.VersionGroupService;
 
-import static org.zanata.rest.dto.stats.TranslationStatistics.StatUnit.WORD;
-
 @Name("viewAllStatusAction")
 @Scope(ScopeType.PAGE)
 @CachedMethods
@@ -256,21 +254,6 @@ public HProject getProject()
       return this.getProjectIteration().getProject();
    }
 
-   public boolean isIterationReadOnly()
-   {
-      return this.getProjectIteration().getProject().getStatus() == EntityStatus.READONLY || this.getProjectIteration().getStatus() == EntityStatus.READONLY;
-   }
-
-   public boolean isIterationObsolete()
-   {
-      return this.getProjectIteration().getProject().getStatus() == EntityStatus.OBSOLETE || this.getProjectIteration().getStatus() == EntityStatus.OBSOLETE;
-   }
-
-   public boolean isUserAllowedToTranslate(String localeId)
-   {
-      return !isIterationReadOnly() && !isIterationObsolete() && identity.hasPermission("add-translation", getProject(), localeServiceImpl.getByLocaleId(localeId));
-   }
-
    public boolean isCopyTransRunning()
    {
       return copyTransManager.isCopyTransRunning( getProjectIteration() );

zanata-war/src/main/java/org/zanata/webtrans/client/Application.java

@@ -10,9 +10,9 @@
 import org.zanata.webtrans.shared.model.ProjectIterationId;
 import org.zanata.webtrans.shared.model.UserWorkspaceContext;
 import org.zanata.webtrans.shared.model.WorkspaceId;
-import org.zanata.webtrans.shared.rpc.EventServiceConnectedAction;
 import org.zanata.webtrans.shared.rpc.ActivateWorkspaceAction;
 import org.zanata.webtrans.shared.rpc.ActivateWorkspaceResult;
+import org.zanata.webtrans.shared.rpc.EventServiceConnectedAction;
 import org.zanata.webtrans.shared.rpc.ExitWorkspaceAction;
 import org.zanata.webtrans.shared.rpc.ExitWorkspaceResult;
 import org.zanata.webtrans.shared.rpc.NoOpResult;
@@ -30,7 +30,7 @@
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.RootLayoutPanel;
+import com.google.gwt.user.client.ui.RootPanel;
 
 /**
  * Entry point classes define <code>onModuleLoad()</code>.
@@ -137,7 +137,7 @@ public void onSuccess(String connectionId)
                @Override
                public void onFailure(Throwable e)
                {
-                  RootLayoutPanel.get().add(new HTML("<h1>Server communication failed...</h1>" + "<b>Exception:</b> " + e.getMessage()));
+                  RootPanel.get("contentDiv").add(new HTML("<h1>Server communication failed...</h1>" + "<b>Exception:</b> " + e.getMessage()));
                }
                @Override
                public void onSuccess(NoOpResult result)
@@ -150,17 +150,19 @@ public void onSuccess(NoOpResult result)
          @Override
          public void onFailure(Throwable e)
          {
-            RootLayoutPanel.get().add(new HTML("<h1>Failed to start Event Service...</h1>" + "<b>Exception:</b> " + e.getMessage()));
+            RootPanel.get("contentDiv").add(new HTML("<h1>Failed to start Event Service...</h1>" + "<b>Exception:</b> " + e.getMessage()));
          }
       });
 
+      Window.enableScrolling(true);
    }
 
    private void delayedStartApp()
    {
       final AppPresenter appPresenter = injector.getAppPresenter();
-      RootLayoutPanel.get().add(appPresenter.getDisplay().asWidget());
+      RootPanel.get("contentDiv").add(appPresenter.getDisplay().asWidget());
       appPresenter.bind();
+      Window.enableScrolling(true);
    }
 
    public static ProjectIterationId getProjectIterationId()
@@ -204,6 +206,10 @@ public static native void redirectToUrl(String url)/*-{
 		$wnd.location = url;
    }-*/;
 
+   public static native void openNewWindowToUrl(String url)/*-{
+		$wnd.open(url);
+   }-*/;
+
    public static native void closeWindow()/*-{
 		$wnd.close();
    }-*/;
@@ -272,7 +278,7 @@ private static void showErrorWithLink(String message, Throwable e, String linkTe
          layoutPanel.add(stackTracePanel);
       }
 
-      RootLayoutPanel.get().add(layoutPanel);
+      RootPanel.get("contentDiv").get().add(layoutPanel);
    }
 
    private void registerUncaughtExceptionHandler()

zanata-war/src/main/java/org/zanata/webtrans/client/events/ShowSideMenuEvent.java

@@ -0,0 +1,54 @@
+package org.zanata.webtrans.client.events;
+
+import com.google.gwt.event.shared.GwtEvent;
+
+public class ShowSideMenuEvent extends GwtEvent<ShowSideMenuEventHandler>
+{
+
+   /**
+    * Handler type.
+    */
+   private static Type<ShowSideMenuEventHandler> TYPE;
+
+   /**
+    * Gets the type associated with this event.
+    * 
+    * @return returns the handler type
+    */
+   public static Type<ShowSideMenuEventHandler> getType()
+   {
+      if (TYPE == null)
+      {
+         TYPE = new Type<ShowSideMenuEventHandler>();
+      }
+      return TYPE;
+   }
+
+   private boolean isShowing;
+
+   public ShowSideMenuEvent(boolean isShowing)
+   {
+      this.isShowing = isShowing;
+   }
+
+
+   public boolean isShowing()
+   {
+      return isShowing;
+   }
+
+   @Override
+   public Type<ShowSideMenuEventHandler> getAssociatedType()
+   {
+      return getType();
+   }
+
+
+   @Override
+   protected void dispatch(ShowSideMenuEventHandler handler)
+   {
+      handler.onShowSideMenu(this);
+   }
+
+
+}

zanata-war/src/main/java/org/zanata/webtrans/client/events/ShowSideMenuEventHandler.java

@@ -0,0 +1,8 @@
+package org.zanata.webtrans.client.events;
+
+import com.google.gwt.event.shared.EventHandler;
+
+public interface ShowSideMenuEventHandler extends EventHandler
+{
+   void onShowSideMenu(ShowSideMenuEvent event);
+}

zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java

@@ -38,15 +38,15 @@
 import org.zanata.webtrans.client.keys.EventWrapper;
 import org.zanata.webtrans.client.keys.EventWrapperImpl;
 import org.zanata.webtrans.client.presenter.AppPresenter;
-import org.zanata.webtrans.client.presenter.DashboardPresenter;
 import org.zanata.webtrans.client.presenter.DocumentListPresenter;
 import org.zanata.webtrans.client.presenter.GlossaryDetailsPresenter;
 import org.zanata.webtrans.client.presenter.GlossaryPresenter;
 import org.zanata.webtrans.client.presenter.KeyShortcutPresenter;
 import org.zanata.webtrans.client.presenter.LayoutSelectorPresenter;
 import org.zanata.webtrans.client.presenter.NotificationPresenter;
-import org.zanata.webtrans.client.presenter.OptionsPanelPresenter;
+import org.zanata.webtrans.client.presenter.EditorOptionsPresenter;
 import org.zanata.webtrans.client.presenter.SearchResultsPresenter;
+import org.zanata.webtrans.client.presenter.SideMenuPresenter;
 import org.zanata.webtrans.client.presenter.SourceContentsPresenter;
 import org.zanata.webtrans.client.presenter.TransMemoryDetailsPresenter;
 import org.zanata.webtrans.client.presenter.TransMemoryMergePresenter;
@@ -62,18 +62,18 @@
 import org.zanata.webtrans.client.rpc.CachingDispatchAsync;
 import org.zanata.webtrans.client.rpc.DelegatingDispatchAsync;
 import org.zanata.webtrans.client.service.ValidationService;
-import org.zanata.webtrans.client.ui.OptionsPanelView;
 import org.zanata.webtrans.client.ui.TransMemoryMergePopupPanelDisplay;
 import org.zanata.webtrans.client.ui.TransMemoryMergePopupPanelView;
 import org.zanata.webtrans.client.view.AppView;
-import org.zanata.webtrans.client.view.DashboardView;
 import org.zanata.webtrans.client.view.DocumentListView;
 import org.zanata.webtrans.client.view.GlossaryDetailsView;
 import org.zanata.webtrans.client.view.GlossaryView;
 import org.zanata.webtrans.client.view.KeyShortcutView;
 import org.zanata.webtrans.client.view.LayoutSelectorView;
 import org.zanata.webtrans.client.view.NotificationView;
+import org.zanata.webtrans.client.view.EditorOptionsView;
 import org.zanata.webtrans.client.view.SearchResultsView;
+import org.zanata.webtrans.client.view.SideMenuView;
 import org.zanata.webtrans.client.view.TransMemoryDetailsView;
 import org.zanata.webtrans.client.view.TransMemoryView;
 import org.zanata.webtrans.client.view.TransUnitEditDisplay;
@@ -111,7 +111,6 @@ protected void configure()
       bind(ValidationService.class).in(Singleton.class);
 
       bindPresenter(AppPresenter.class, AppPresenter.Display.class, AppView.class);
-      bindPresenter(DashboardPresenter.class, DashboardPresenter.Display.class, DashboardView.class);
       bindPresenter(KeyShortcutPresenter.class, KeyShortcutPresenter.Display.class, KeyShortcutView.class);
       bindPresenter(DocumentListPresenter.class, DocumentListPresenter.Display.class, DocumentListView.class);
       bindPresenter(SearchResultsPresenter.class, SearchResultsPresenter.Display.class, SearchResultsView.class);
@@ -123,13 +122,14 @@ protected void configure()
       bindPresenter(GlossaryDetailsPresenter.class, GlossaryDetailsPresenter.Display.class, GlossaryDetailsView.class);
       bindPresenter(TransMemoryDetailsPresenter.class, TransMemoryDetailsPresenter.Display.class, TransMemoryDetailsView.class);
       bindPresenter(TransUnitNavigationPresenter.class, TransUnitNavigationPresenter.Display.class, TransUnitNavigationView.class);
-      bindPresenter(OptionsPanelPresenter.class, OptionsPanelPresenter.Display.class, OptionsPanelView.class);
+      bindPresenter(EditorOptionsPresenter.class, EditorOptionsPresenter.Display.class, EditorOptionsView.class);
       bindPresenter(TranslationEditorPresenter.class, TranslationEditorPresenter.Display.class, TranslationEditorView.class);
       bindPresenter(ValidationOptionsPresenter.class, ValidationOptionsPresenter.Display.class, ValidationOptionsView.class);
       bindPresenter(NotificationPresenter.class, NotificationPresenter.Display.class, NotificationView.class);
       bindPresenter(TransUnitEditPresenter.class, TransUnitEditDisplay.class, TransUnitEditView.class);
       bindPresenter(LayoutSelectorPresenter.class, LayoutSelectorPresenter.Display.class, LayoutSelectorView.class);
-
+      bindPresenter(SideMenuPresenter.class, SideMenuPresenter.Display.class, SideMenuView.class);
+
       bind(SourceContentsPresenter.class).in(Singleton.class);
       bind(TargetContentsDisplay.class).to(TargetContentsView.class);
       bind(SourceContentsDisplay.class).to(SourceContentsView.class);

zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java

@@ -19,7 +19,6 @@ public class HistoryToken
 
    public static final String KEY_VIEW = "view";
    public static final String VALUE_SEARCH_RESULTS_VIEW = "search";
-   public static final String VALUE_DASHBOARD_VIEW = "dashboard";
    public static final String VALUE_EDITOR_VIEW = "doc";
 
    public static final String KEY_SEARCH_DOC_TEXT = "search";
@@ -130,10 +129,6 @@ else if (value.equals(VALUE_SEARCH_RESULTS_VIEW))
             {
                historyToken.setView(MainView.Search);
             }
-            else if (value.equals(VALUE_DASHBOARD_VIEW))
-            {
-               historyToken.setView(MainView.Dashboard);
-            }
             // else default (document list) will be used
          }
          else if (key.equals(KEY_DOC_FILTER_OPTION))
@@ -343,10 +338,6 @@ public String toTokenString()
          {
             token = addTokenToTokenString(token, KEY_VIEW, VALUE_SEARCH_RESULTS_VIEW);
          }
-         else if(view == MainView.Dashboard)
-         {
-            token = addTokenToTokenString(token, KEY_VIEW, VALUE_DASHBOARD_VIEW);
-         }
          else
          {
             // must be editor