SchoolTool

Merge lp:~replaceafill/schooltool/done_links into lp:schooltool/flourish

  1. done_links
  2. Merge into flourish
Proposed by Douglas Cerna
Status: Merged
Merged at revision: 3493
Proposed branch: lp:~replaceafill/schooltool/done_links
Merge into: lp:schooltool/flourish
Diff against target: 678 lines (+200/-40)
39 files modified
src/schooltool/app/browser/app.py (+3/-1)
src/schooltool/app/browser/templates/f_edit_relationships.pt (+1/-1)
src/schooltool/app/browser/templates/f_errors.pt (+1/-1)
src/schooltool/app/browser/templates/f_errors_entry.pt (+1/-1)
src/schooltool/app/browser/templates/f_managers.pt (+1/-1)
src/schooltool/app/browser/templates/f_tabled_edit_relationships.pt (+1/-1)
src/schooltool/app/browser/templates/f_translationdomaincontrol.pt (+1/-1)
src/schooltool/basicperson/browser/flourish.zcml (+11/-2)
src/schooltool/basicperson/browser/person.py (+5/-0)
src/schooltool/basicperson/browser/templates/f_container_table_filter.pt (+86/-0)
src/schooltool/basicperson/browser/templates/f_demographics_reorder.pt (+1/-1)
src/schooltool/basicperson/browser/templates/f_demographics_view.pt (+1/-1)
src/schooltool/basicperson/browser/templates/f_person_view_details.pt (+1/-1)
src/schooltool/calendar/browser/templates/event_booking.pt (+1/-1)
src/schooltool/course/browser/course.py (+12/-1)
src/schooltool/course/browser/flourish.zcml (+11/-2)
src/schooltool/course/browser/templates/f_course_view.pt (+0/-4)
src/schooltool/course/browser/templates/f_section_linkage.pt (+1/-1)
src/schooltool/course/browser/templates/f_section_view.pt (+1/-1)
src/schooltool/course/browser/templates/f_sections.pt (+1/-1)
src/schooltool/email/browser/templates/f_email_container.pt (+1/-1)
src/schooltool/email/browser/templates/f_email_queue.pt (+1/-1)
src/schooltool/email/browser/templates/f_email_view.pt (+1/-1)
src/schooltool/group/browser/templates/f_group_view.pt (+1/-1)
src/schooltool/group/browser/templates/f_groups.pt (+2/-1)
src/schooltool/level/browser/templates/f_levels_reorder.pt (+1/-1)
src/schooltool/level/browser/templates/f_levels_view.pt (+1/-1)
src/schooltool/report/browser/templates/f_report_reference.pt (+1/-1)
src/schooltool/resource/browser/templates/f_resource_view.pt (+1/-1)
src/schooltool/schoolyear/browser/templates/f_schoolyear.pt (+1/-1)
src/schooltool/schoolyear/browser/templates/f_table_container.pt (+1/-1)
src/schooltool/securitypolicy/browser/templates/f_security_descriptions.pt (+1/-1)
src/schooltool/skin/flourish/resources/colors.css (+19/-0)
src/schooltool/skin/flourish/resources/flourish.css (+21/-0)
src/schooltool/table/templates/f_table_container.pt (+1/-1)
src/schooltool/term/browser/templates/f_term.pt (+1/-1)
src/schooltool/term/browser/templates/f_terms.pt (+1/-1)
src/schooltool/timetable/browser/templates/f_schedule_container_view.pt (+1/-1)
src/schooltool/timetable/browser/templates/f_timetables.pt (+2/-1)
To merge this branch: bzr merge lp:~replaceafill/schooltool/done_links
Reviewer Review Type Date Requested Status
Gediminas Paulauskas Pending
Review via email: mp+128604@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/schooltool/app/browser/app.py'
2--- src/schooltool/app/browser/app.py 2012-10-05 14:22:48 +0000
3+++ src/schooltool/app/browser/app.py 2012-10-08 23:47:35 +0000
4@@ -1127,7 +1127,9 @@
5
6 class ManageItemDoneLink(flourish.viewlet.Viewlet):
7 template = InlineViewPageTemplate('''
8- <h3 tal:define="can_manage context/schooltool:app/schooltool:can_edit">
9+ <h3 tal:define="can_manage context/schooltool:app/schooltool:can_edit"
10+ class="done-link"
11+ i18n:domain="schooltool">
12 <tal:block condition="can_manage">
13 <a tal:attributes="href string:${context/schooltool:app/@@absolute_url}/manage"
14 i18n:translate="">Done</a>
15
16=== modified file 'src/schooltool/app/browser/templates/f_edit_relationships.pt'
17--- src/schooltool/app/browser/templates/f_edit_relationships.pt 2012-02-27 14:53:02 +0000
18+++ src/schooltool/app/browser/templates/f_edit_relationships.pt 2012-10-08 23:47:35 +0000
19@@ -22,7 +22,7 @@
20 tal:attributes="value view/selected_table/batch/size" />
21 </tal:if>
22 </form>
23- <h3>
24+ <h3 class="done-link">
25 <a tal:attributes="href view/nextURL"
26 i18n:translate="">Done</a>
27 </h3>
28
29=== modified file 'src/schooltool/app/browser/templates/f_errors.pt'
30--- src/schooltool/app/browser/templates/f_errors.pt 2011-09-21 10:06:55 +0000
31+++ src/schooltool/app/browser/templates/f_errors.pt 2012-10-08 23:47:35 +0000
32@@ -77,7 +77,7 @@
33 i18n:attributes="value" />
34 </div>
35 </form>
36- <h3>
37+ <h3 class="done-link">
38 <a tal:attributes="href string:${context/@@absolute_url}/settings"
39 i18n:translate="">
40 Done
41
42=== modified file 'src/schooltool/app/browser/templates/f_errors_entry.pt'
43--- src/schooltool/app/browser/templates/f_errors_entry.pt 2011-08-16 13:38:25 +0000
44+++ src/schooltool/app/browser/templates/f_errors_entry.pt 2012-10-08 23:47:35 +0000
45@@ -47,7 +47,7 @@
46 tal:content="structure entry/req_html" />
47 </metal:block>
48 </metal:block>
49- <h3>
50+ <h3 class="done-link">
51 <a tal:attributes="href string:${context/@@absolute_url}/errors"
52 i18n:translate="">
53 Done
54
55=== modified file 'src/schooltool/app/browser/templates/f_managers.pt'
56--- src/schooltool/app/browser/templates/f_managers.pt 2011-09-30 17:37:08 +0000
57+++ src/schooltool/app/browser/templates/f_managers.pt 2012-10-08 23:47:35 +0000
58@@ -44,7 +44,7 @@
59 </tbody>
60 </table>
61 </form>
62-<h3>
63+<h3 class="done-link" i18n:domain="schooltool">
64 <a tal:attributes="href context/@@absolute_url" i18n:translate="">
65 Done
66 </a>
67
68=== modified file 'src/schooltool/app/browser/templates/f_tabled_edit_relationships.pt'
69--- src/schooltool/app/browser/templates/f_tabled_edit_relationships.pt 2012-02-28 12:11:23 +0000
70+++ src/schooltool/app/browser/templates/f_tabled_edit_relationships.pt 2012-10-08 23:47:35 +0000
71@@ -1,7 +1,7 @@
72 <tal:block i18n:domain="schooltool">
73 <h2 tal:content="view/current_title" />
74 <tal:block content="structure context/schooltool:content/ajax/current_table" />
75- <h3>
76+ <h3 class="done-link">
77 <a tal:attributes="href view/nextURL"
78 i18n:translate="">Done</a>
79 </h3>
80
81=== modified file 'src/schooltool/app/browser/templates/f_translationdomaincontrol.pt'
82--- src/schooltool/app/browser/templates/f_translationdomaincontrol.pt 2011-09-30 17:37:08 +0000
83+++ src/schooltool/app/browser/templates/f_translationdomaincontrol.pt 2012-10-08 23:47:35 +0000
84@@ -35,7 +35,7 @@
85 </tbody>
86 </table>
87 </tal:block>
88-<h3>
89+<h3 class="done-link">
90 <a tal:attributes="href context/@@absolute_url" i18n:translate="">
91 Done
92 </a>
93
94=== modified file 'src/schooltool/basicperson/browser/flourish.zcml'
95--- src/schooltool/basicperson/browser/flourish.zcml 2012-08-10 23:01:22 +0000
96+++ src/schooltool/basicperson/browser/flourish.zcml 2012-10-08 23:47:35 +0000
97@@ -37,6 +37,16 @@
98 />
99
100 <flourish:viewlet
101+ name="filter"
102+ before="batch table"
103+ class=".person.PersonContainerViewTableFilter"
104+ view=".person.FlourishBasicPersonContainerView"
105+ render="template"
106+ manager=".person.BasicPersonTable"
107+ permission="schooltool.view"
108+ />
109+
110+ <flourish:viewlet
111 name="person_container"
112 manager="schooltool.skin.flourish.page.IPageRefineManager"
113 class="schooltool.basicperson.browser.person.PersonContainerLinks"
114@@ -610,8 +620,7 @@
115
116 <flourish:viewlet
117 name="done"
118- before="table batch"
119- after="filter"
120+ after="*"
121 manager=".person.BasicPersonTable"
122 view=".person.FlourishBasicPersonContainerView"
123 class="schooltool.app.browser.app.ManageItemDoneLink"
124
125=== modified file 'src/schooltool/basicperson/browser/person.py'
126--- src/schooltool/basicperson/browser/person.py 2012-10-05 10:23:29 +0000
127+++ src/schooltool/basicperson/browser/person.py 2012-10-08 23:47:35 +0000
128@@ -67,6 +67,7 @@
129 from schooltool.group.interfaces import IGroupContainer
130 from schooltool.person.interfaces import IPerson, IPersonFactory
131 from schooltool.person.browser.person import PersonTable, PersonTableFormatter
132+from schooltool.person.browser.person import PersonTableFilter
133 from schooltool.schoolyear.interfaces import ISchoolYearContainer, ISchoolYear
134 from schooltool.skin.containers import TableContainerView
135 from schooltool.skin import flourish
136@@ -1367,3 +1368,7 @@
137 class PhotoView(flourish.widgets.ImageView):
138 attribute = "photo"
139
140+
141+class PersonContainerViewTableFilter(PersonTableFilter):
142+
143+ template = ViewPageTemplateFile('templates/f_container_table_filter.pt')
144
145=== added file 'src/schooltool/basicperson/browser/templates/f_container_table_filter.pt'
146--- src/schooltool/basicperson/browser/templates/f_container_table_filter.pt 1970-01-01 00:00:00 +0000
147+++ src/schooltool/basicperson/browser/templates/f_container_table_filter.pt 2012-10-08 23:47:35 +0000
148@@ -0,0 +1,86 @@
149+<tal:block condition="not:view/manager/fromPublication"
150+ replace="resource_library:schooltool.table" />
151+
152+<script>ST.state.push()</script>
153+<tal:script tal:replace="structure scriptlocal:container_id view/manager/html_id" />
154+
155+<tal:block i18n:domain="schooltool"
156+ define="batch nocall:view/manager/batch|nothing;
157+ search_id string:${view/manager/html_id}-search">
158+ <tal:if condition="batch">
159+ <div class="count" i18n:translate="">
160+ Showing
161+ <span i18n:name="count" tal:content="batch/length"/>
162+ of
163+ <span i18n:name="total" tal:content="batch/full_size"/>
164+ items
165+ </div>
166+ </tal:if>
167+ <fieldset>
168+ <legend><span i18n:translate="">Search</span></legend>
169+ <div class="row" tal:define="title_id view/search_title_id">
170+ <div class="label">
171+ <label tal:attributes="for title_id">
172+ <span tal:content="view/title">[title]</span>
173+ </label>
174+ </div>
175+ <div class="widget">
176+ <input type="text" class="text-widget"
177+ tal:attributes="
178+ id title_id;
179+ name title_id;
180+ value python:request.get(title_id)"
181+ />
182+ </div>
183+ </div>
184+ <div class="row" tal:define="group_id view/search_group_id">
185+ <div class="label">
186+ <label tal:attributes="for group_id">
187+ <span i18n:translate="">Filter by...</span>
188+ </label>
189+ </div>
190+ <div class="widget">
191+ <select tal:attributes="id group_id; name group_id"
192+ class="select-widget">
193+ <option i18n:translate="">All groups</option>
194+ <option tal:repeat="group view/groups"
195+ tal:content="group/title"
196+ tal:attributes="value group/id;
197+ selected python:group['id'] == request.get(group_id)"/>
198+ </select>
199+ <tal:script replace="structure scriptlocal: group_id" />
200+ <script>
201+ $(ST.dialogs.jquery_id(ST.local.group_id)).change(
202+ function(){
203+ var group_id = ST.local.group_id;
204+ var container_id = ST.local.container_id;
205+ var search_id = ST.local.search_id;
206+ return function(element) {
207+ return ST.table.on_form_submit(
208+ container_id, document.getElementById(search_id));
209+ }}());
210+ </script>
211+
212+ </div>
213+ </div>
214+ </fieldset>
215+ <div class="buttons">
216+ <input type="submit" name="SEARCH_BUTTON" value="Search"
217+ tal:attributes="id search_id"
218+ class="button-ok" i18n:attributes="value" />
219+ <h3 class="done-link">
220+ <a tal:attributes="href string:${context/schooltool:app/@@absolute_url}/manage" i18n:translate="">Done</a>
221+ </h3>
222+ <tal:script replace="structure scriptlocal: search_id" />
223+ <script>
224+ $(ST.dialogs.jquery_id(ST.local.search_id)).click(
225+ function(){
226+ var search_id = ST.local.search_id;
227+ var container_id = ST.local.container_id;
228+ return function(button) {
229+ return ST.table.on_form_submit(container_id, button);
230+ }}());
231+ </script>
232+ </div>
233+</tal:block>
234+<script>ST.state.pop()</script>
235
236=== modified file 'src/schooltool/basicperson/browser/templates/f_demographics_reorder.pt'
237--- src/schooltool/basicperson/browser/templates/f_demographics_reorder.pt 2011-10-01 07:08:16 +0000
238+++ src/schooltool/basicperson/browser/templates/f_demographics_reorder.pt 2012-10-08 23:47:35 +0000
239@@ -42,7 +42,7 @@
240 </table>
241 </form>
242 <h3 i18n:translate="" tal:condition="not:demographics">There are none.</h3>
243- <h3>
244+ <h3 class="done-link">
245 <a tal:attributes="href context/@@absolute_url"
246 i18n:translate="">Done</a>
247 </h3>
248
249=== modified file 'src/schooltool/basicperson/browser/templates/f_demographics_view.pt'
250--- src/schooltool/basicperson/browser/templates/f_demographics_view.pt 2011-08-26 16:06:42 +0000
251+++ src/schooltool/basicperson/browser/templates/f_demographics_view.pt 2012-10-08 23:47:35 +0000
252@@ -29,7 +29,7 @@
253 </tr>
254 </table>
255 <h3 i18n:translate="" tal:condition="not:rows">There are none.</h3>
256- <h3>
257+ <h3 class="done-link">
258 <a tal:attributes="href string:${context/schooltool:app/@@absolute_url}/manage"
259 i18n:translate="">Done</a>
260 </h3>
261
262=== modified file 'src/schooltool/basicperson/browser/templates/f_person_view_details.pt'
263--- src/schooltool/basicperson/browser/templates/f_person_view_details.pt 2012-09-13 05:33:45 +0000
264+++ src/schooltool/basicperson/browser/templates/f_person_view_details.pt 2012-10-08 23:47:35 +0000
265@@ -1,7 +1,7 @@
266 <div class="person-info">
267 <tal:block tal:replace="structure context/schooltool:content/schooltool.person.FlourishInfo"/>
268 </div>
269-<h3 tal:condition="view/canModify">
270+<h3 tal:condition="view/canModify" class="done-link">
271 <a tal:attributes="href view/done_link" i18n:domain="schooltool" i18n:translate="">Done</a>
272 </h3>
273 <script>
274
275=== modified file 'src/schooltool/calendar/browser/templates/event_booking.pt'
276--- src/schooltool/calendar/browser/templates/event_booking.pt 2011-09-12 13:09:25 +0000
277+++ src/schooltool/calendar/browser/templates/event_booking.pt 2012-10-08 23:47:35 +0000
278@@ -59,7 +59,7 @@
279
280 </tal:block>
281
282-<h3>
283+<h3 class="done-link">
284 <a tal:attributes="href string:${context/@@absolute_url}/edit.html"
285 i18n:translate="">Done</a>
286 </h3>
287
288=== modified file 'src/schooltool/course/browser/course.py'
289--- src/schooltool/course/browser/course.py 2012-07-11 08:46:42 +0000
290+++ src/schooltool/course/browser/course.py 2012-10-08 23:47:35 +0000
291@@ -480,7 +480,8 @@
292
293 class CourseTableDoneLink(flourish.viewlet.Viewlet):
294 template = InlineViewPageTemplate('''
295- <h3 tal:define="can_manage context/schooltool:app/schooltool:can_edit">
296+ <h3 tal:define="can_manage context/schooltool:app/schooltool:can_edit"
297+ class="done-link" i18n:domain="schooltool">
298 <tal:block condition="can_manage">
299 <a tal:attributes="href string:${context/schooltool:app/@@absolute_url}/manage"
300 i18n:translate="">Done</a>
301@@ -558,6 +559,16 @@
302 return bool(list(self.context.leaders))
303
304
305+class FlourishCourseViewDoneLink(flourish.viewlet.Viewlet):
306+
307+ template = InlineViewPageTemplate('''
308+ <h3 class="done-link" i18n:domain="schooltool">
309+ <a tal:attributes="href view/view/done_link"
310+ i18n:translate="">Done</a>
311+ </h3>
312+ ''')
313+
314+
315 class FlourishCourseAddView(AddForm):
316
317 template = InheritTemplate(Page.template)
318
319=== modified file 'src/schooltool/course/browser/flourish.zcml'
320--- src/schooltool/course/browser/flourish.zcml 2012-09-11 01:08:52 +0000
321+++ src/schooltool/course/browser/flourish.zcml 2012-10-08 23:47:35 +0000
322@@ -33,8 +33,7 @@
323
324 <flourish:viewlet
325 name="done"
326- before="table batch"
327- after="filter"
328+ after="*"
329 manager=".course.CoursesTable"
330 class=".course.CourseTableDoneLink"
331 render="template"
332@@ -284,6 +283,16 @@
333 permission="schooltool.view"
334 />
335
336+ <flourish:viewlet
337+ name="done"
338+ after="*"
339+ view=".course.FlourishCourseView"
340+ permission="schooltool.view"
341+ manager="schooltool.skin.flourish.page.IPageContentManager"
342+ render="template"
343+ class=".course.FlourishCourseViewDoneLink"
344+ />
345+
346 <flourish:page
347 name="delete.html"
348 for="schooltool.course.interfaces.ICourse"
349
350=== modified file 'src/schooltool/course/browser/templates/f_course_view.pt'
351--- src/schooltool/course/browser/templates/f_course_view.pt 2012-07-11 08:46:42 +0000
352+++ src/schooltool/course/browser/templates/f_course_view.pt 2012-10-08 23:47:35 +0000
353@@ -96,8 +96,4 @@
354 This course has no responsible parties
355 </p>
356 </metal:block>
357- <h3>
358- <a tal:attributes="href view/done_link"
359- i18n:translate="">Done</a>
360- </h3>
361 </metal:block>
362
363=== modified file 'src/schooltool/course/browser/templates/f_section_linkage.pt'
364--- src/schooltool/course/browser/templates/f_section_linkage.pt 2011-09-21 10:06:55 +0000
365+++ src/schooltool/course/browser/templates/f_section_linkage.pt 2012-10-08 23:47:35 +0000
366@@ -140,7 +140,7 @@
367 </tal:block>
368 </tbody>
369 </table>
370- <h3>
371+ <h3 class="done-link">
372 <a tal:attributes="href view/done_link"
373 i18n:translate="">Done</a>
374 </h3>
375
376=== modified file 'src/schooltool/course/browser/templates/f_section_view.pt'
377--- src/schooltool/course/browser/templates/f_section_view.pt 2012-10-08 20:48:02 +0000
378+++ src/schooltool/course/browser/templates/f_section_view.pt 2012-10-08 23:47:35 +0000
379@@ -170,7 +170,7 @@
380 This section has no equipment
381 </p>
382 </tal:block>
383- <h3>
384+ <h3 class="done-link">
385 <a tal:attributes="href view/done_link"
386 i18n:translate="">Done</a>
387 </h3>
388
389=== modified file 'src/schooltool/course/browser/templates/f_sections.pt'
390--- src/schooltool/course/browser/templates/f_sections.pt 2011-09-13 02:36:58 +0000
391+++ src/schooltool/course/browser/templates/f_sections.pt 2012-10-08 23:47:35 +0000
392@@ -16,7 +16,7 @@
393 </div>
394 </tal:if>
395 <tal:block tal:replace="structure view/table/filter_widget/render" />
396- <h3>
397+ <h3 class="done-link">
398 <a tal:attributes="href string:${context/schooltool:app/@@absolute_url}/manage"
399 i18n:translate="">Done</a>
400 </h3>
401
402=== modified file 'src/schooltool/email/browser/templates/f_email_container.pt'
403--- src/schooltool/email/browser/templates/f_email_container.pt 2012-02-17 21:39:26 +0000
404+++ src/schooltool/email/browser/templates/f_email_container.pt 2012-10-08 23:47:35 +0000
405@@ -21,7 +21,7 @@
406 </tal:loop>
407 </tbody>
408 </table>
409- <h3>
410+ <h3 class="done-link">
411 <a tal:attributes="href view/done_link" i18n:translate="">
412 Done
413 </a>
414
415=== modified file 'src/schooltool/email/browser/templates/f_email_queue.pt'
416--- src/schooltool/email/browser/templates/f_email_queue.pt 2011-07-15 18:59:18 +0000
417+++ src/schooltool/email/browser/templates/f_email_queue.pt 2012-10-08 23:47:35 +0000
418@@ -8,5 +8,5 @@
419 <h3 tal:condition="not:batch" i18n:translate="">
420 There are no messages queued.
421 </h3>
422- <h3><a tal:attributes="href context/@@absolute_url">Done</a></h3>
423+ <h3 class="done-link"><a tal:attributes="href context/@@absolute_url">Done</a></h3>
424 </div>
425
426=== modified file 'src/schooltool/email/browser/templates/f_email_view.pt'
427--- src/schooltool/email/browser/templates/f_email_view.pt 2011-11-25 18:23:47 +0000
428+++ src/schooltool/email/browser/templates/f_email_view.pt 2012-10-08 23:47:35 +0000
429@@ -8,7 +8,7 @@
430 </tr>
431 </tbody>
432 </table>
433- <h3>
434+ <h3 class="done-link">
435 <a tal:attributes="href view/nextURL" i18n:translate="">
436 Done
437 </a>
438
439=== modified file 'src/schooltool/group/browser/templates/f_group_view.pt'
440--- src/schooltool/group/browser/templates/f_group_view.pt 2012-10-08 20:48:02 +0000
441+++ src/schooltool/group/browser/templates/f_group_view.pt 2012-10-08 23:47:35 +0000
442@@ -107,7 +107,7 @@
443 This group has no responsible parties
444 </p>
445 </tal:block>
446- <h3>
447+ <h3 class="done-link">
448 <a tal:attributes="href view/done_link"
449 i18n:translate="">Done</a>
450 </h3>
451
452=== modified file 'src/schooltool/group/browser/templates/f_groups.pt'
453--- src/schooltool/group/browser/templates/f_groups.pt 2011-11-21 10:07:28 +0000
454+++ src/schooltool/group/browser/templates/f_groups.pt 2012-10-08 23:47:35 +0000
455@@ -16,7 +16,8 @@
456 </div>
457 </tal:if>
458 <tal:block tal:replace="structure view/table/filter_widget/render" />
459- <h3 tal:define="can_manage context/schooltool:app/schooltool:can_edit">
460+ <h3 tal:define="can_manage context/schooltool:app/schooltool:can_edit"
461+ class="done-link">
462 <tal:block condition="can_manage">
463 <a tal:attributes="href string:${context/schooltool:app/@@absolute_url}/manage"
464 i18n:translate="">Done</a>
465
466=== modified file 'src/schooltool/level/browser/templates/f_levels_reorder.pt'
467--- src/schooltool/level/browser/templates/f_levels_reorder.pt 2012-01-18 16:35:26 +0000
468+++ src/schooltool/level/browser/templates/f_levels_reorder.pt 2012-10-08 23:47:35 +0000
469@@ -34,7 +34,7 @@
470 </table>
471 </form>
472 <h3 i18n:translate="" tal:condition="not:levels">There are none.</h3>
473- <h3>
474+ <h3 class="done-link">
475 <a tal:attributes="href context/@@absolute_url"
476 i18n:translate="">Done</a>
477 </h3>
478
479=== modified file 'src/schooltool/level/browser/templates/f_levels_view.pt'
480--- src/schooltool/level/browser/templates/f_levels_view.pt 2011-09-21 10:06:55 +0000
481+++ src/schooltool/level/browser/templates/f_levels_view.pt 2012-10-08 23:47:35 +0000
482@@ -22,7 +22,7 @@
483 </tr>
484 </table>
485 <h3 i18n:translate="" tal:condition="not:rows">There are none.</h3>
486- <h3>
487+ <h3 class="done-link">
488 <a tal:attributes="href string:${context/schooltool:app/@@absolute_url}/manage"
489 i18n:translate="">Done</a>
490 </h3>
491
492=== modified file 'src/schooltool/report/browser/templates/f_report_reference.pt'
493--- src/schooltool/report/browser/templates/f_report_reference.pt 2011-08-24 20:04:40 +0000
494+++ src/schooltool/report/browser/templates/f_report_reference.pt 2012-10-08 23:47:35 +0000
495@@ -17,7 +17,7 @@
496 </tr>
497 </tbody>
498 </table>
499- <h3>
500+ <h3 class="done-link">
501 <a tal:attributes="href view/done_link" i18n:translate="">Done</a>
502 </h3>
503 </div>
504
505=== modified file 'src/schooltool/resource/browser/templates/f_resource_view.pt'
506--- src/schooltool/resource/browser/templates/f_resource_view.pt 2012-02-27 12:14:11 +0000
507+++ src/schooltool/resource/browser/templates/f_resource_view.pt 2012-10-08 23:47:35 +0000
508@@ -87,7 +87,7 @@
509 <p tal:condition="not:view/has_leaders" i18n:translate="">
510 This resource has no responsible parties
511 </p>
512- <h3>
513+ <h3 class="done-link">
514 <a tal:attributes="href string:${context/schooltool:app/@@absolute_url}/resources"
515 i18n:translate="">Done</a>
516 </h3>
517
518=== modified file 'src/schooltool/schoolyear/browser/templates/f_schoolyear.pt'
519--- src/schooltool/schoolyear/browser/templates/f_schoolyear.pt 2012-02-10 14:39:36 +0000
520+++ src/schooltool/schoolyear/browser/templates/f_schoolyear.pt 2012-10-08 23:47:35 +0000
521@@ -20,7 +20,7 @@
522 </tbody>
523 </table>
524 </div>
525- <h3>
526+ <h3 class="done-link">
527 <a tal:attributes="href string:${context/schooltool:app/@@absolute_url}/schoolyears"
528 i18n:translate="">Done</a>
529 </h3>
530
531=== modified file 'src/schooltool/schoolyear/browser/templates/f_table_container.pt'
532--- src/schooltool/schoolyear/browser/templates/f_table_container.pt 2011-11-21 10:07:28 +0000
533+++ src/schooltool/schoolyear/browser/templates/f_table_container.pt 2012-10-08 23:47:35 +0000
534@@ -6,7 +6,7 @@
535 </tal:block>
536 </form>
537 <h3 tal:condition="not:batch" i18n:translate="">There are none.</h3>
538- <h3>
539+ <h3 class="done-link">
540 <a tal:attributes="href string:${context/schooltool:app/@@absolute_url}/manage"
541 i18n:translate="">Done</a>
542 </h3>
543
544=== modified file 'src/schooltool/securitypolicy/browser/templates/f_security_descriptions.pt'
545--- src/schooltool/securitypolicy/browser/templates/f_security_descriptions.pt 2011-08-07 20:24:40 +0000
546+++ src/schooltool/securitypolicy/browser/templates/f_security_descriptions.pt 2012-10-08 23:47:35 +0000
547@@ -63,7 +63,7 @@
548 <p>
549 <a href="#">Back to top</a>
550 </p>
551- <h3>
552+ <h3 class="done-link">
553 <a tal:attributes="href view/done_link" i18n:translate="">
554 Done
555 </a>
556
557=== modified file 'src/schooltool/skin/flourish/resources/colors.css'
558--- src/schooltool/skin/flourish/resources/colors.css 2012-10-05 08:01:47 +0000
559+++ src/schooltool/skin/flourish/resources/colors.css 2012-10-08 23:47:35 +0000
560@@ -41,6 +41,25 @@
561 color: #333333;
562 }
563
564+h3.done-link a {
565+ background-color: #6C7B7C;
566+ border-color: #6C7B7C;
567+ box-shadow: 0px 1px 6px #bbbbbb;
568+ color: #ffffff;
569+}
570+
571+h3.done-link a:hover {
572+ background-color: #026b6e;
573+ border-color: #026b6e;
574+}
575+
576+h3.done-link a:active {
577+ background-color: #056163;
578+ border-color: #056163;
579+ color: #aea79f;
580+ outline: none;
581+}
582+
583 /*
584
585 Main containers:
586
587=== modified file 'src/schooltool/skin/flourish/resources/flourish.css'
588--- src/schooltool/skin/flourish/resources/flourish.css 2012-10-05 13:07:53 +0000
589+++ src/schooltool/skin/flourish/resources/flourish.css 2012-10-08 23:47:35 +0000
590@@ -350,3 +350,24 @@
591 .tree_list li a.leaf_url:hover {
592 text-decoration: underline;
593 }
594+
595+/* XXX: used in Done links */
596+
597+h3.done-link a {
598+ -moz-border-radius: 4px 4px 4px 4px;
599+ border-radius: 4px 4px 4px 4px;
600+ border-style: solid;
601+ border-width: 1px;
602+ cursor: default;
603+ display: inline-block;
604+ font-size: 14px;
605+ height: 20px;
606+ line-height: 20px;
607+ padding: 0 6px;
608+ text-decoration: none;
609+}
610+
611+.buttons h3.done-link {
612+ display: inline;
613+ margin: 0px;
614+}
615
616=== modified file 'src/schooltool/table/templates/f_table_container.pt'
617--- src/schooltool/table/templates/f_table_container.pt 2012-02-21 11:34:24 +0000
618+++ src/schooltool/table/templates/f_table_container.pt 2012-10-08 23:47:35 +0000
619@@ -12,7 +12,7 @@
620 </div>
621 </tal:if>
622 <tal:block tal:replace="structure view/table/filter_widget/render" />
623- <h3 tal:condition="view/done_link">
624+ <h3 class="done-link" tal:condition="view/done_link">
625 <a tal:attributes="href view/done_link" i18n:translate="">Done</a>
626 </h3>
627 <tal:block replace="structure batch/render" />
628
629=== modified file 'src/schooltool/term/browser/templates/f_term.pt'
630--- src/schooltool/term/browser/templates/f_term.pt 2012-07-21 00:16:00 +0000
631+++ src/schooltool/term/browser/templates/f_term.pt 2012-10-08 23:47:35 +0000
632@@ -55,5 +55,5 @@
633 </td>
634 </tr>
635 </table>
636- <h3><a tal:attributes="href string:${context/schooltool:app/@@absolute_url}/terms" i18n:translate="">Done</a></h3>
637+ <h3 class="done-link"><a tal:attributes="href string:${context/schooltool:app/@@absolute_url}/terms" i18n:translate="">Done</a></h3>
638 </div>
639
640=== modified file 'src/schooltool/term/browser/templates/f_terms.pt'
641--- src/schooltool/term/browser/templates/f_terms.pt 2012-07-20 23:13:09 +0000
642+++ src/schooltool/term/browser/templates/f_terms.pt 2012-10-08 23:47:35 +0000
643@@ -3,7 +3,7 @@
644 <div tal:condition="not:year/empty"
645 tal:content="structure context/schooltool:content/ajax/view/schoolyear/terms_table" />
646 <h3 tal:condition="year/empty" i18n:translate="">There are no terms.</h3>
647- <h3>
648+ <h3 class="done-link">
649 <a tal:attributes="href string:${context/schooltool:app/@@absolute_url}/manage"
650 i18n:translate="">Done</a>
651 </h3>
652
653=== modified file 'src/schooltool/timetable/browser/templates/f_schedule_container_view.pt'
654--- src/schooltool/timetable/browser/templates/f_schedule_container_view.pt 2011-09-21 10:06:55 +0000
655+++ src/schooltool/timetable/browser/templates/f_schedule_container_view.pt 2012-10-08 23:47:35 +0000
656@@ -45,7 +45,7 @@
657
658 </tal:if>
659
660- <h3>
661+ <h3 class="done-link">
662 <a tal:attributes="href view/owner/@@absolute_url"
663 i18n:translate="">Done</a>
664 </h3>
665
666=== modified file 'src/schooltool/timetable/browser/templates/f_timetables.pt'
667--- src/schooltool/timetable/browser/templates/f_timetables.pt 2011-11-21 10:07:28 +0000
668+++ src/schooltool/timetable/browser/templates/f_timetables.pt 2012-10-08 23:47:35 +0000
669@@ -24,7 +24,8 @@
670 </tal:block>
671 </form>
672 <h3 tal:condition="not:batch" tal:content="view/empty_message" />
673- <h3 tal:define="can_manage context/schooltool:app/schooltool:can_edit">
674+ <h3 tal:define="can_manage context/schooltool:app/schooltool:can_edit"
675+ class="done-link">
676 <tal:block condition="can_manage">
677 <a tal:attributes="href string:${context/schooltool:app/@@absolute_url}/manage"
678 i18n:translate="">Done</a>

Subscribers

People subscribed via source and target branches