diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java index be1b5382f4..a016447f1d 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java @@ -119,7 +119,10 @@ public void focusEditor(final int currentEditorIndex) @Override public void execute() { - editors.get(currentEditorIndex).setFocus(); + if(editors.size() > currentEditorIndex) + { + editors.get(currentEditorIndex).setFocus(); + } } }); } diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java index 7bb95ce111..06f696299f 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java @@ -40,10 +40,6 @@ public interface Display extends WidgetDisplay HasText getTargetComment(); - HasText getProjectName(); - - HasText getIterationName(); - HasText getDocumentName(); HasChangeHandlers getDocumentListBox(); @@ -57,6 +53,8 @@ public interface Display extends WidgetDisplay void addDoc(String text); HasText getLastModified(); + + HasText getProjectIterationName(); } TransMemoryDetailsList tmDetails; @@ -140,8 +138,7 @@ protected void selectDoc(int selected) } display.getSourceComment().setText(sourceComment); display.getTargetComment().setText(targetComment); - display.getProjectName().setText(project); - display.getIterationName().setText(iter); + display.getProjectIterationName().setText(project + " / " + iter); display.getDocumentName().setText(doc); if (!Strings.isNullOrEmpty(lastModifiedBy)) { diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java b/zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java index 7f06f963a3..2f82e38ef2 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java @@ -64,6 +64,9 @@ public interface UiMessages extends Messages @DefaultMessage("Translation Memory") String translationMemoryHeading(); + + @DefaultMessage("Translation Memory Details") + String translationMemoryDetails(); @DefaultMessage("Glossary") String glossaryHeading(); diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.java index 8f74ebd88b..b19159a987 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.java @@ -32,7 +32,7 @@ public class GlossaryDetailsView implements GlossaryDetailsPresenter.Display { - interface GlossaryIUiBinder extends UiBinder + interface GlossaryDetailsIUiBinder extends UiBinder { } @@ -43,7 +43,7 @@ interface Styles extends CssResource String targetCommentTextArea(); } - private static GlossaryIUiBinder uiBinder = GWT.create(GlossaryIUiBinder.class); + private static GlossaryDetailsIUiBinder uiBinder = GWT.create(GlossaryDetailsIUiBinder.class); DialogBox dialogBox; @@ -70,7 +70,7 @@ interface Styles extends CssResource @UiField Styles style; - + private final int VISIBLE_COMMENTS = 4; private boolean hasGlossaryUpdateAccess; diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.ui.xml b/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.ui.xml index bccba46858..0ca9726611 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.ui.xml +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.ui.xml @@ -2,26 +2,11 @@ + xmlns:fui="urn:import:org.zanata.webtrans.client.ui"> - .headerLabel - { - padding-right:5px; - color:#C35817; - font-weight:bold; - } - - .alignTop - { - vertical-align:top; - } - .textArea { width:280px; @@ -35,19 +20,6 @@ margin:0; } - .button - { - width:70px; - margin:1px; - padding:2px; - } - - .lastModifiedLabel - { - color:#C35817; - font-weight:bold; - } - .targetCommentList { background:#FFFFFF; @@ -95,42 +67,42 @@ - Entries: + - Source Reference: + - + - Comments: + - + - Comments: + @@ -139,21 +111,21 @@ - New target comment: + - + - - + + diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.java index a4852f3bde..6fa9be8a90 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.java @@ -1,6 +1,7 @@ package org.zanata.webtrans.client.view; import org.zanata.webtrans.client.presenter.TransMemoryDetailsPresenter; +import org.zanata.webtrans.client.resources.UiMessages; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.HasChangeHandlers; @@ -10,10 +11,12 @@ import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.DialogBox; import com.google.gwt.user.client.ui.HasText; +import com.google.gwt.user.client.ui.InlineLabel; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.ListBox; import com.google.gwt.user.client.ui.TextArea; import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; public class TransMemoryDetailsView implements TransMemoryDetailsPresenter.Display { @@ -27,30 +30,29 @@ interface TMIUiBinder extends UiBinder DialogBox dialogBox; @UiField - TextArea sourceText; + TextArea sourceText, targetText; + @UiField - TextArea targetText; + TextArea sourceComment, targetComment; + @UiField - TextArea sourceComment; - @UiField - TextArea targetComment; - @UiField - Label projectName; - @UiField - Label iterationName; - @UiField - Label docName; + InlineLabel projectIterationName, docName; + @UiField Label lastModified; + @UiField Button dismissButton; @UiField ListBox documentListBox; - - public TransMemoryDetailsView() + + @Inject + public TransMemoryDetailsView(UiMessages messages) { dialogBox = uiBinder.createAndBindUi(this); + dialogBox.setText(messages.translationMemoryDetails()); + dismissButton.setText(messages.dismiss()); } public void hide() @@ -70,16 +72,11 @@ public Widget asWidget() } @Override - public HasText getProjectName() + public HasText getProjectIterationName() { - return projectName; + return projectIterationName; } - @Override - public HasText getIterationName() - { - return iterationName; - } @Override public HasText getDocumentName() diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.ui.xml b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.ui.xml index e1a3f978d1..d2b27ecd8b 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.ui.xml +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.ui.xml @@ -9,43 +9,82 @@ - - Translation Memory Details - - - - Locations: - - - - Project: - Project Name - - - Iteration: - Iteration Name - - - Document: - Document Name - - - - Source: - Source Text - Comment: - Source Comment - - - Target: - Target Text - Comment: - Target Comment - - - Last modified - - Dismiss - + + .buttonDiv + { + text-align:right; + } + + .textArea + { + width:280px; + height:40px; + resize:none; + } + + .button + { + float:right; + } + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml index 5bd6669ba1..ec9159fa04 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml @@ -13,13 +13,21 @@ width: 1em; text-align:center; } + + .searchBox + { + border:1px solid #A7A7A7; + border-radius:3px; + padding:2px; + } + - + diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java index 1066634807..47718ddcdb 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java @@ -75,7 +75,7 @@ public TranslationView(Resources resources, WebTransMessages messages, Translati tmGlossaryPanel = new SplitLayoutPanel(3); - mainSplitPanel = new SplitLayoutPanel(3); + mainSplitPanel = new SplitLayoutPanel(8); initWidget(uiBinder.createAndBindUi(this)); mainSplitPanel.setWidgetMinSize(southPanelContainer, (int) MIN_SOUTH_PANEL_HEIGHT); diff --git a/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css b/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css index 204f25f9d1..708b635337 100644 --- a/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css +++ b/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css @@ -1006,3 +1006,28 @@ td.ApprovedStateDecoration div div div width:100%; } +.GWTDialogBox .headerLabel +{ + padding-right:5px; + color:#C35817; + font-weight:bold; +} + +.GWTDialogBox .alignTop +{ + vertical-align:top; +} + +.GWTDialogBox .lastModifiedLabel +{ + color:#C35817; + font-weight:bold; +} + +.GWTDialogBox .button +{ + width:70px; + margin:1px; + padding:2px; +} + diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java index 7387af719e..0ac86c4be6 100644 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java +++ b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java @@ -29,8 +29,10 @@ public void execute() ArrayList matches = new ArrayList(); ArrayList source = new ArrayList(); source.add("source1"); + source.add("source2"); ArrayList target1 = new ArrayList(); target1.add(" <target1"); + target1.add(" <target1-1"); ArrayList target2 = new ArrayList(); target2.add(" <target2"); ArrayList target3 = new ArrayList();