SchoolTool

Merge lp:~replaceafill/schooltool/schooltool.virginia_done_links into lp:~schooltool-owners/schooltool/schooltool.virginia

Proposed by Douglas Cerna on 2012-10-08

Status:	Merged
Merged at revision:	87
Proposed branch:	lp:~replaceafill/schooltool/schooltool.virginia_done_links
Merge into:	lp:~schooltool-owners/schooltool/schooltool.virginia
Diff against target:	25 lines (+2/-2) 2 files modified src/schooltool/virginia/browser/report.py (+1/-1) src/schooltool/virginia/browser/templates/va_section_report_chart.pt (+1/-1)
To merge this branch:	bzr merge lp:~replaceafill/schooltool/schooltool.virginia_done_links
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Gediminas Paulauskas		2012-10-08	Pending
Review via email: mp+128609@code.launchpad.net

This proposal supersedes a proposal from 2012-10-08.

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'src/schooltool/virginia/browser/report.py'
2	--- src/schooltool/virginia/browser/report.py 2012-09-25 18:08:24 +0000
3	+++ src/schooltool/virginia/browser/report.py 2012-10-08 23:53:20 +0000
4	@@ -788,7 +788,7 @@
5	class SectionReportDoneButtonViewlet(flourish.viewlet.Viewlet):
6
7	template = InlineViewPageTemplate('''
8	- <h3 i18n:domain="schooltool.virginia">
9	+ <h3 i18n:domain="schooltool">
10	<a tal:attributes="href view/nextURL" i18n:translate="">
11	Done
12	</a>
13
14	=== modified file 'src/schooltool/virginia/browser/templates/va_section_report_chart.pt'
15	--- src/schooltool/virginia/browser/templates/va_section_report_chart.pt 2012-08-14 14:18:12 +0000
16	+++ src/schooltool/virginia/browser/templates/va_section_report_chart.pt 2012-10-08 23:53:20 +0000
17	@@ -268,7 +268,7 @@
18	</tr>
19	</tbody>
20	</table>
21	- <h3>
22	+ <h3 class="done-link" i18n:domain="schooltool">
23	<a tal:attributes="href view/next_url" i18n:translate="">
24	Done
25	</a>