launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #25634
[Merge] ~cristiangsp/launchpad:bugfix-1158242-translations-ui-changes into launchpad:master
Cristian Gonzalez has proposed merging ~cristiangsp/launchpad:bugfix-1158242-translations-ui-changes into launchpad:master.
Commit message:
Reordering "Contributors" column in the distribution's Translations page and converting the "Length" column into "Total" in the distribution series language page.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~cristiangsp/launchpad/+git/launchpad/+merge/393639
This branch introduces the 2 changes requested in bug: https://bugs.launchpad.net/launchpad/+bug/1158242
- Moving the "Contributors" column to the end of the table in the distribution's Translations page.
- Converting the "Length" column into "Total" an move it to the end of the table in the distribution series language page.
--
Your team Launchpad code reviewers is requested to review the proposed merge of ~cristiangsp/launchpad:bugfix-1158242-translations-ui-changes into launchpad:master.
diff --git a/lib/lp/translations/templates/distroseries-langchart.pt b/lib/lp/translations/templates/distroseries-langchart.pt
index 47f9a40..87e67b5 100644
--- a/lib/lp/translations/templates/distroseries-langchart.pt
+++ b/lib/lp/translations/templates/distroseries-langchart.pt
@@ -21,11 +21,11 @@
<thead>
<tr>
<th>Language</th>
- <th>Contributors</th>
<th>Status</th>
<th>Untranslated</th>
<th>Need review</th>
<th>Changed</th>
+ <th>Contributors</th>
</tr>
</thead>
@@ -48,15 +48,6 @@
Language Name
</a>
</td>
- <td>
- <span class="sortkey" tal:content="drlang/contributor_count">0</span>
- <tal:count
- tal:condition="drlang/contributor_count"
- tal:replace="drlang/contributor_count">0</tal:count>
- <tal:count condition="not: drlang/contributor_count">
- —
- </tal:count>
- </td>
<td style="white-space: nowrap">
<div tal:replace="structure drlang/@@+barchart" />
</td>
@@ -87,6 +78,15 @@
—
</tal:count>
</td>
+ <td>
+ <span class="sortkey" tal:content="drlang/contributor_count">0</span>
+ <tal:count
+ tal:condition="drlang/contributor_count"
+ tal:replace="drlang/contributor_count">0</tal:count>
+ <tal:count condition="not: drlang/contributor_count">
+ —
+ </tal:count>
+ </td>
</tr>
</tal:loop>
</tbody>
diff --git a/lib/lp/translations/templates/serieslanguage-index.pt b/lib/lp/translations/templates/serieslanguage-index.pt
index 6c59d4f..e8359da 100644
--- a/lib/lp/translations/templates/serieslanguage-index.pt
+++ b/lib/lp/translations/templates/serieslanguage-index.pt
@@ -65,12 +65,12 @@
<table class="listing sortable translation-stats">
<thead>
<tr>
- <th>Template Name</th>
- <th>Length</th>
+ <th>Template Name</th>
<th>Status</th>
<th>Untranslated</th>
<th>Need review</th>
<th>Changed</th>
+ <th>Total</th>
<th>Last Edited</th>
<th>By</th>
</tr>
@@ -83,8 +83,7 @@
tal:content="entry/potemplate/name">
apache2-dev
</a>
- </td>
- <td tal:content="entry/potemplate/messageCount">87</td>
+ </td>
<td>
<tal:comment condition="nothing">
This text is used for the sorting.
@@ -138,6 +137,7 @@
—
</tal:count>
</td>
+ <td tal:content="entry/potemplate/messageCount">87</td>
<td tal:attributes="id string:${entry/potemplate/name}-time">
<span class="sortkey"
tal:condition="entry/date_changed"
@@ -157,7 +157,7 @@
<tal:block condition="not: entry/date_changed">
—
</tal:block>
- </td>
+ </td>
<td tal:attributes="id string:${entry/potemplate/name}-person">
<tal:block condition="entry/lasttranslator">
<a tal:condition="entry/lasttranslator"
@@ -171,8 +171,7 @@
</tr>
<tfoot>
<tr>
- <th>Overall statistics:</th>
- <td><span tal:replace="context/messageCount">N</span></td>
+ <th>Overall statistics:</th>
<td>
<span style="white-space: nowrap"
tal:content="structure context/@@+barchart">--</span>
@@ -180,6 +179,7 @@
<td><span tal:replace="context/untranslatedCount">N</span></td>
<td><span tal:replace="context/unreviewedCount">N</span></td>
<td><span tal:replace="context/updatesCount">N</span></td>
+ <td><span tal:replace="context/messageCount">N</span></td>
<td colspan="2"></td>
</tr>
</tfoot>