SchoolTool

Merge lp:~replaceafill/schooltool/schooltool_footer_nobugbutton into lp:schooltool/1.7

  1. schooltool_footer_nobugbutton
  2. Merge into 1.7
Proposed by Douglas Cerna
Status: Merged
Merged at revision: 2763
Proposed branch: lp:~replaceafill/schooltool/schooltool_footer_nobugbutton
Merge into: lp:schooltool/1.7
Diff against target: 64 lines (+2/-14)
3 files modified
src/schooltool/skin/configure.zcml (+0/-3)
src/schooltool/skin/resources/layout.css (+1/-6)
src/schooltool/skin/templates/view_macros.pt (+1/-5)
To merge this branch: bzr merge lp:~replaceafill/schooltool/schooltool_footer_nobugbutton
Reviewer Review Type Date Requested Status
SchoolTool Owners Pending
Review via email: mp+53263@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/skin/configure.zcml'
2--- src/schooltool/skin/configure.zcml 2011-02-08 12:58:38 +0000
3+++ src/schooltool/skin/configure.zcml 2011-03-14 15:46:09 +0000
4@@ -170,9 +170,6 @@
5 <resource name="zonki-angry.png" file="resources/zonki-angry.png"
6 layer="schooltool.skin.ISchoolToolLayer" />
7
8- <resource name="bugs.gif" file="resources/bugs.gif"
9- layer="schooltool.skin.ISchoolToolLayer" />
10-
11 <resource name="downarrow.png" file="resources/downarrow.png"
12 layer="schooltool.skin.ISchoolToolLayer" />
13 <resource name="rightarrow.png" file="resources/rightarrow.png"
14
15=== removed file 'src/schooltool/skin/resources/bugs.gif'
16Binary files src/schooltool/skin/resources/bugs.gif 2008-04-11 15:42:59 +0000 and src/schooltool/skin/resources/bugs.gif 1970-01-01 00:00:00 +0000 differ
17=== modified file 'src/schooltool/skin/resources/layout.css'
18--- src/schooltool/skin/resources/layout.css 2011-02-09 15:18:00 +0000
19+++ src/schooltool/skin/resources/layout.css 2011-03-14 15:46:09 +0000
20@@ -614,7 +614,7 @@
21
22 #footer P {
23 position: absolute;
24- left: 170px;
25+ left: 85px;
26 }
27
28 #footer IMG.logo {
29@@ -622,11 +622,6 @@
30 left: 10px;
31 }
32
33-#footer IMG.bug {
34- position: absolute;
35- left: 85px;
36-}
37-
38 /*
39 * Calendar Views
40 */
41
42=== modified file 'src/schooltool/skin/templates/view_macros.pt'
43--- src/schooltool/skin/templates/view_macros.pt 2011-02-21 14:00:37 +0000
44+++ src/schooltool/skin/templates/view_macros.pt 2011-03-14 15:46:09 +0000
45@@ -112,10 +112,6 @@
46 <div class="clearer">&nbsp;</div>
47 </div>
48 <div id="footer">
49- <a href="https://bugs.launchpad.net/schooltool/+filebug"
50- i18n:attributes="alt" alt="Report a bug on Launchpad.">
51- <img class="bug" tal:attributes="src context/++resource++bugs.gif" />
52- </a>
53 <a tal:attributes="href string:${context/schooltool:app/@@absolute_url}/@@about.html">
54 <img class="logo" tal:attributes="src context/++resource++zonki-regular.png" />
55 </a>
56@@ -131,7 +127,7 @@
57 </span>
58 <br />
59 <span i18n:translate="">
60- <a href="http://www.schooltool.org">SchoolTool</a>&trade; is a Trademark of The <a href="http://www.shuttleworthfoundation.org">Shuttleworth Foundation</a>.
61+ <a href="http://www.schooltool.org">SchoolTool</a>&trade; is a Trademark of the <a href="http://www.shuttleworthfoundation.org">Shuttleworth Foundation</a>.
62 </span>
63 </p>
64 <div class="clearer"></div>

Subscribers

People subscribed via source and target branches