From 7b01b5f3f8a45b9121c6c20ac6e5b56fbd5f0767 Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Wed, 27 Jul 2011 14:22:42 +1000 Subject: [PATCH 1/2] tweak UI layout for 723081, 720536, 723361 --- server/zanata-war/pom.xml | 2 - .../webtrans/client/DocumentNode.ui.xml | 1 - .../webtrans/client/TransUnitCountBar.ui.xml | 6 +-- .../client/TransUnitCountGraph.ui.xml | 2 +- .../webtrans/client/WebTransMessages.java | 11 ++--- .../webtrans/client/ui/DocumentListTable.java | 48 +++++-------------- .../webtrans/client/ui/TooltipPopupPanel.java | 18 +++---- .../zanata/webtrans/public/Application.css | 22 +++++++-- 8 files changed, 47 insertions(+), 63 deletions(-) diff --git a/server/zanata-war/pom.xml b/server/zanata-war/pom.xml index 3a124f8df4..3479737b57 100644 --- a/server/zanata-war/pom.xml +++ b/server/zanata-war/pom.xml @@ -959,7 +959,6 @@ commons-lang commons-lang - 2.5 @@ -980,7 +979,6 @@ org.fedorahosted.openprops openprops - 0.5 diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentNode.ui.xml b/server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentNode.ui.xml index efa27eb329..62d3ede8d5 100644 --- a/server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentNode.ui.xml +++ b/server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentNode.ui.xml @@ -9,7 +9,6 @@ padding-right:25px; width: 120px; height: 1.2em; - top:3px; } diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountBar.ui.xml b/server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountBar.ui.xml index abe103d9b8..08a3cf8a75 100644 --- a/server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountBar.ui.xml +++ b/server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountBar.ui.xml @@ -3,17 +3,17 @@ xmlns:g="urn:import:com.google.gwt.user.client.ui"> .approved { - background: #90cd95; + background: #099b09; z-index: 0; } .needReview { - background: #f7f488; + background: #ffc000; z-index: 0; } .untranslated { - background: #aecbde; + background: #e5e5e5; z-index: 0; } diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountGraph.ui.xml b/server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountGraph.ui.xml index f18844d726..75775ad6e4 100644 --- a/server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountGraph.ui.xml +++ b/server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountGraph.ui.xml @@ -45,7 +45,7 @@ - + diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/WebTransMessages.java b/server/zanata-war/src/main/java/org/zanata/webtrans/client/WebTransMessages.java index a3dbf3aa6a..edfea25fbc 100644 --- a/server/zanata-war/src/main/java/org/zanata/webtrans/client/WebTransMessages.java +++ b/server/zanata-war/src/main/java/org/zanata/webtrans/client/WebTransMessages.java @@ -29,12 +29,9 @@ public interface WebTransMessages extends Messages @DefaultMessage("{0}%") String statusGraphLabelPercentage(int approved, @Optional int needReview, @Optional int untranslated); - @DefaultMessage("{0,number,#.#} hrs") + @DefaultMessage("{0,number,#.#}") String statusGraphLabelHours(double remainingHours); - @DefaultMessage("{0} wds") - String statusGraphLabelWords(int stat); - @DefaultMessage("http://zanata.org/") String hrefHelpLink(); @@ -95,12 +92,12 @@ public interface WebTransMessages extends Messages @DefaultMessage("Statistic") String columnHeaderStatistic(); - @DefaultMessage("Translated") + @DefaultMessage("Translated words") String columnHeaderTranslated(); - @DefaultMessage("Untranslated") + @DefaultMessage("Untranslated words") String columnHeaderUntranslated(); - @DefaultMessage("Remaining") + @DefaultMessage("Remaining hours") String columnHeaderRemaining(); } diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java b/server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java index 55837f72a9..011cd019d7 100644 --- a/server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java +++ b/server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java @@ -34,7 +34,7 @@ public TransUnitCountGraphCell() } @Override - public void render(com.google.gwt.cell.client.Cell.Context arg0, TransUnitCountGraph arg1, SafeHtmlBuilder arg2) + public void render(Context arg0, TransUnitCountGraph arg1, SafeHtmlBuilder arg2) { arg2.appendHtmlConstant(arg1.getElement().getString()); } @@ -55,8 +55,7 @@ else if (event.getType().equalsIgnoreCase("mouseout")) private static Column getFolderColumn(final Resources resources) { - IconCellDecorator folderIconCell = new IconCellDecorator(resources.folderImage(), new TextCell()); - Column folderColumn = new Column(folderIconCell) + TextColumn folderColumn = new TextColumn() { @Override public String getValue(DocumentNode object) @@ -80,7 +79,6 @@ public String getValue(DocumentNode object) } }; docColumn.setSortable(true); - return docColumn; } @@ -95,7 +93,6 @@ public TransUnitCountGraph getValue(DocumentNode object) } }; statisticColumn.setSortable(true); - return statisticColumn; } @@ -106,11 +103,10 @@ private static Column getTranslatedColumn(final WebTransMe @Override public String getValue(DocumentNode object) { - return messages.statusGraphLabelWords(object.getTransUnitCountGraph().getWordsApproved()); + return String.valueOf(object.getTransUnitCountGraph().getWordsApproved()); } }; translatedColumn.setSortable(true); - return translatedColumn; } @@ -121,11 +117,10 @@ private static Column getUntranslatedColumn(final WebTrans @Override public String getValue(DocumentNode object) { - return messages.statusGraphLabelWords(object.getTransUnitCountGraph().getWordsUntranslated()); + return String.valueOf(object.getTransUnitCountGraph().getWordsUntranslated()); } }; unTranslatedColumn.setSortable(true); - return unTranslatedColumn; } @@ -140,7 +135,6 @@ public String getValue(DocumentNode object) } }; remainingColumn.setSortable(true); - return remainingColumn; } @@ -182,45 +176,28 @@ public void onSelectionChange(SelectionChangeEvent event) { public int compare(DocumentNode o1, DocumentNode o2) { - if (o1.getDataItem().getPath().equals(o2.getDataItem().getPath())) + if (o1.getDataItem().getPath() == null || o2.getDataItem().getPath() == null) { - return 0; + return (o1.getDataItem().getPath() == null) ? -1 : 1; } - if (o1 != null) + else { - return (o2 != null) ? o1.getDataItem().getPath().compareTo(o2.getDataItem().getPath()) : 1; + return o1.getDataItem().getPath().compareTo(o2.getDataItem().getPath()); } - return -1; } }); columnSortHandler.setComparator(documentColumn, new Comparator() { public int compare(DocumentNode o1, DocumentNode o2) { - if (o1.getDataItem().getName().equals(o2.getDataItem().getName())) - { - return 0; - } - if (o1 != null) - { - return (o2 != null) ? o1.getDataItem().getName().compareTo(o2.getDataItem().getName()) : 1; - } - return -1; + return o1.getDataItem().getName().compareTo(o2.getDataItem().getName()); } }); columnSortHandler.setComparator(statisticColumn, new Comparator() { public int compare(DocumentNode o1, DocumentNode o2) { - if (o1.getTransUnitCountGraph().getLabelText().equals(o2.getTransUnitCountGraph().getLabelText())) - { - return 0; - } - if (o1 != null) - { - return (o2 != null) ? o1.getTransUnitCountGraph().getLabelText().compareTo(o2.getTransUnitCountGraph().getLabelText()) : 1; - } - return -1; + return o1.getTransUnitCountGraph().getLabelText().compareTo(o2.getTransUnitCountGraph().getLabelText()); } }); columnSortHandler.setComparator(translatedColumn, new Comparator() @@ -268,10 +245,11 @@ public int compare(DocumentNode o1, DocumentNode o2) return -1; } }); - + documentListTable.addColumnStyleName(documentListTable.getColumnIndex(folderColumn), "DocumentListTable_folderCol"); + documentListTable.addColumnStyleName(documentListTable.getColumnIndex(documentColumn), "DocumentListTable_docCol"); documentListTable.addColumnSortHandler(columnSortHandler); - documentListTable.getColumnSortList().push(statisticColumn); + documentListTable.getColumnSortList().push(folderColumn); return documentListTable; } } diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.java b/server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.java index 62b0e8f155..66e2da0a2e 100644 --- a/server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.java +++ b/server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.java @@ -37,9 +37,6 @@ private String getHTMLTooltip(TransUnitCountGraph graph) sb.append(""); sb.append(""); sb.append(""); - sb.append("Total"); - sb.append(""); - sb.append(""); sb.append("Translated"); sb.append(""); sb.append(""); @@ -48,6 +45,9 @@ private String getHTMLTooltip(TransUnitCountGraph graph) sb.append(""); sb.append("Untranslated"); sb.append(""); + sb.append(""); + sb.append("Total"); + sb.append(""); sb.append(""); sb.append(""); @@ -55,9 +55,6 @@ private String getHTMLTooltip(TransUnitCountGraph graph) sb.append("Words"); sb.append(""); sb.append(""); - sb.append(graph.getWordsTotal()); - sb.append(""); - sb.append(""); sb.append(graph.getWordsApproved()); sb.append(""); sb.append(""); @@ -66,6 +63,9 @@ private String getHTMLTooltip(TransUnitCountGraph graph) sb.append(""); sb.append(graph.getWordsUntranslated()); sb.append(""); + sb.append(""); + sb.append(graph.getWordsTotal()); + sb.append(""); sb.append(""); sb.append(""); @@ -73,9 +73,6 @@ private String getHTMLTooltip(TransUnitCountGraph graph) sb.append("Units"); sb.append(""); sb.append(""); - sb.append(graph.getUnitTotal()); - sb.append(""); - sb.append(""); sb.append(graph.getUnitApproved()); sb.append(""); sb.append(""); @@ -84,6 +81,9 @@ private String getHTMLTooltip(TransUnitCountGraph graph) sb.append(""); sb.append(graph.getUnitUntranslated()); sb.append(""); + sb.append(""); + sb.append(graph.getUnitTotal()); + sb.append(""); sb.append(""); sb.append(""); diff --git a/server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css b/server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css index 358b537e50..4a944b3368 100644 --- a/server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css +++ b/server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css @@ -348,15 +348,24 @@ tr.TableEditorRow.selected td { .DocumentListTable td { font-size:16px; cursor:pointer; - width:16.6%; +} + +.DocumentListTable_folderCol{ + width:25%; +} + +.DocumentListTable_docCol{ + width:25%; } .transUnitCountGraphTooltipPanel { background-color: #F7F488; - color: black; + color: #2A2A04; text-align: center; - border: 1px solid black; - height: 60px; + border: 1px outset #999966; + height: 65px; + -moz-border-radius:8px; + -webkit-border-radius: 8px; } .transUnitCountGraphTooltipTable { @@ -365,5 +374,8 @@ tr.TableEditorRow.selected td { } .transUnitCountGraphTooltipTable TD { - border: 1px dotted black; + border: 1px solid #999966; + width:75px; + -moz-border-radius:4px; + -webkit-border-radius: 4px; } \ No newline at end of file From 86c33e629590ca944a904c77eed2f0d8e442bfbb Mon Sep 17 00:00:00 2001 From: Sean Flanigan Date: Wed, 27 Jul 2011 15:54:34 +1000 Subject: [PATCH 2/2] Edited copyright.txt via GitHub --- copyright.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/copyright.txt b/copyright.txt index 0da443667d..9275ba1c5b 100644 --- a/copyright.txt +++ b/copyright.txt @@ -5,11 +5,6 @@ header. A summary of the individual contributors is given below. Any omission should be sent to Sean Flanigan . -Libraries ---------- -* Crystal Project Icons http://www.everaldo.com/crystal/ (Copyright (c) 2006-2007 Everaldo Coelho, LGPL) -* TODO - Contributor Name Role ------------------------------------------------------------------------------ Asgeir Frimannsson Project Founder and Lead @@ -19,6 +14,11 @@ Ding-Yi Chen Project Contributor Caius Carlos Chance Project Contributor Helen Ding Project Contributor Alex Eng Project Contributor +David Mason Project Contributor +Libraries +--------- +* Crystal Project Icons http://www.everaldo.com/crystal/ (Copyright (c) 2006-2007 Everaldo Coelho, LGPL) +* TODO