Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Merge branch 'master' of github.com:zanata/zanata
Browse files Browse the repository at this point in the history
  • Loading branch information
@jamesni
jamesni committed Jul 27, 2011
2 parents 274e471 + 86c33e6 commit 1a01172
Show file tree
Hide file tree
Showing 9 changed files with 52 additions and 68 deletions.
10 changes: 5 additions & 5 deletions copyright.txt
View file
Expand Up @@ -5,11 +5,6 @@ header.
A summary of the individual contributors is given below. Any omission should
be sent to Sean Flanigan <sflaniga@redhat.com>.

Libraries
---------
* Crystal Project Icons http://www.everaldo.com/crystal/ (Copyright (c) 2006-2007 Everaldo Coelho, LGPL)
* TODO

Contributor Name <email@address> Role
------------------------------------------------------------------------------
Asgeir Frimannsson <asgeirf@redhat.com> Project Founder and Lead
Expand All @@ -19,6 +14,11 @@ Ding-Yi Chen <dchen@redhat.com> Project Contributor
Caius Carlos Chance <cchance@redhat.com> Project Contributor
Helen Ding <hding@redhat.com> Project Contributor
Alex Eng <aeng@redhat.com> Project Contributor
David Mason <damason@redhat.com> Project Contributor



Libraries
---------
* Crystal Project Icons http://www.everaldo.com/crystal/ (Copyright (c) 2006-2007 Everaldo Coelho, LGPL)
* TODO
2 changes: 0 additions & 2 deletions server/zanata-war/pom.xml
View file
Expand Up @@ -959,7 +959,6 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.5</version>
</dependency>

<dependency>
Expand All @@ -980,7 +979,6 @@
<dependency>
<groupId>org.fedorahosted.openprops</groupId>
<artifactId>openprops</artifactId>
<version>0.5</version>
</dependency>

<!-- okapi-lib-search would otherwise use lucene 3.0.0 -->
Expand Down
1 change: 0 additions & 1 deletion server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentNode.ui.xml
View file
Expand Up @@ -9,7 +9,6 @@
padding-right:25px;
width: 120px;
height: 1.2em;
top:3px;
}

</ui:style>
Expand Down
6 changes: 3 additions & 3 deletions server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountBar.ui.xml
View file
Expand Up @@ -3,17 +3,17 @@
xmlns:g="urn:import:com.google.gwt.user.client.ui">
<ui:style>
.approved {
background: #90cd95;
background: #099b09;
z-index: 0;
}

.needReview {
background: #f7f488;
background: #ffc000;
z-index: 0;
}

.untranslated {
background: #aecbde;
background: #e5e5e5;
z-index: 0;
}

Expand Down
2 changes: 1 addition & 1 deletion server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountGraph.ui.xml
View file
Expand Up @@ -45,7 +45,7 @@
<g:layer left='0' width='100%'>
<g:FlowPanel ui:field='undefinedPanel' styleName="{style.undefined}" />
</g:layer>
<g:layer right='2px' margin-left="auto" width="25px">
<g:layer right='2px' margin-left="auto" width="25px" top="3px" bottom="0">
<g:Label ui:field='label' styleName='{style.label}' />
</g:layer>
</g:LayoutPanel>
Expand Down
11 changes: 4 additions & 7 deletions server/zanata-war/src/main/java/org/zanata/webtrans/client/WebTransMessages.java
View file
Expand Up @@ -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();

Expand Down Expand Up @@ -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();
}
48 changes: 13 additions & 35 deletions server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
View file
Expand Up @@ -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());
}
Expand All @@ -55,8 +55,7 @@ else if (event.getType().equalsIgnoreCase("mouseout"))

private static Column<DocumentNode, String> getFolderColumn(final Resources resources)
{
IconCellDecorator<String> folderIconCell = new IconCellDecorator<String>(resources.folderImage(), new TextCell());
Column<DocumentNode, String> folderColumn = new Column<DocumentNode, String>(folderIconCell)
TextColumn<DocumentNode> folderColumn = new TextColumn<DocumentNode>()
{
@Override
public String getValue(DocumentNode object)
Expand All @@ -80,7 +79,6 @@ public String getValue(DocumentNode object)
}
};
docColumn.setSortable(true);

return docColumn;
}

Expand All @@ -95,7 +93,6 @@ public TransUnitCountGraph getValue(DocumentNode object)
}
};
statisticColumn.setSortable(true);

return statisticColumn;
}

Expand All @@ -106,11 +103,10 @@ private static Column<DocumentNode, String> 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;
}

Expand All @@ -121,11 +117,10 @@ private static Column<DocumentNode, String> 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;
}

Expand All @@ -140,7 +135,6 @@ public String getValue(DocumentNode object)
}
};
remainingColumn.setSortable(true);

return remainingColumn;
}

Expand Down Expand Up @@ -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<DocumentNode>()
{
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<DocumentNode>()
{
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<DocumentNode>()
Expand Down Expand Up @@ -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;
}
}
18 changes: 9 additions & 9 deletions server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.java
View file
Expand Up @@ -37,9 +37,6 @@ private String getHTMLTooltip(TransUnitCountGraph graph)
sb.append("<th>");
sb.append("</th>");
sb.append("<th>");
sb.append("Total");
sb.append("</th>");
sb.append("<th>");
sb.append("Translated");
sb.append("</th>");
sb.append("<th>");
Expand All @@ -48,16 +45,16 @@ private String getHTMLTooltip(TransUnitCountGraph graph)
sb.append("<th>");
sb.append("Untranslated");
sb.append("</th>");
sb.append("<th>");
sb.append("Total");
sb.append("</th>");
sb.append("</tr>");

sb.append("<tr>");
sb.append("<th>");
sb.append("Words");
sb.append("</th>");
sb.append("<td>");
sb.append(graph.getWordsTotal());
sb.append("</td>");
sb.append("<td>");
sb.append(graph.getWordsApproved());
sb.append("</td>");
sb.append("<td>");
Expand All @@ -66,16 +63,16 @@ private String getHTMLTooltip(TransUnitCountGraph graph)
sb.append("<td>");
sb.append(graph.getWordsUntranslated());
sb.append("</td>");
sb.append("<td>");
sb.append(graph.getWordsTotal());
sb.append("</td>");
sb.append("</tr>");

sb.append("<tr>");
sb.append("<th>");
sb.append("Units");
sb.append("</th>");
sb.append("<td>");
sb.append(graph.getUnitTotal());
sb.append("</td>");
sb.append("<td>");
sb.append(graph.getUnitApproved());
sb.append("</td>");
sb.append("<td>");
Expand All @@ -84,6 +81,9 @@ private String getHTMLTooltip(TransUnitCountGraph graph)
sb.append("<td>");
sb.append(graph.getUnitUntranslated());
sb.append("</td>");
sb.append("<td>");
sb.append(graph.getUnitTotal());
sb.append("</td>");
sb.append("</tr>");

sb.append("</table>");
Expand Down
22 changes: 17 additions & 5 deletions server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
View file
Expand Up @@ -356,15 +356,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 {
Expand All @@ -373,5 +382,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;
}

0 comments on commit 1a01172

Please sign in to comment.