loggerhead

Merge lp:~cruzjbishop/loggerhead/Fix-1053340 into lp:loggerhead

  1. Fix-1053340
  2. Merge into trunk-rich
Proposed by Cruz Bishop
Status: Merged
Approved by: j.c.sackett
Approved revision: 479
Merged at revision: 478
Proposed branch: lp:~cruzjbishop/loggerhead/Fix-1053340
Merge into: lp:loggerhead
Diff against target: 35 lines (+8/-3)
2 files modified
loggerhead/static/css/global.css (+7/-2)
loggerhead/templates/revisionfilechanges.pt (+1/-1)
To merge this branch: bzr merge lp:~cruzjbishop/loggerhead/Fix-1053340
Reviewer Review Type Date Requested Status
j.c.sackett (community) Approve
Review via email: mp+125484@code.launchpad.net

Description of the change

This merge request fixes bug #1053340, allowing directories to be displayed with their respective icon in revision summaries and change logs.

This also adds a new icon (ico_folder.png), since the old one (ico_folder.gif) played havoc with the blue backgrounds.

I have not replaced the other folder icons, since I am not sure if that is what is wanted - That, and they have no issues with background colors.

Examples of this change are:

http://i.imgur.com/NsppV.png
http://i.imgur.com/Wq3wi.png

To post a comment you must log in.
Revision history for this message
j.c.sackett (jcsackett) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loggerhead/static/css/global.css'
2--- loggerhead/static/css/global.css 2011-11-23 17:21:39 +0000
3+++ loggerhead/static/css/global.css 2012-09-20 13:31:18 +0000
4@@ -270,9 +270,14 @@
5 color: #666;
6 }
7 ul.expandrev li.files {
8+ margin-left: 8px;
9+ }
10+li.files#file {
11 background: url(../images/ico_file.gif) 2px 0 no-repeat;
12- margin-left: 8px;
13- }
14+}
15+li.files#directory {
16+ background: url(../images/ico_folder.png) 2px 0 no-repeat;
17+}
18 .revnolink a {
19 color: #000;
20 }
21
22=== added file 'loggerhead/static/images/ico_folder.png'
23Binary files loggerhead/static/images/ico_folder.png 1970-01-01 00:00:00 +0000 and loggerhead/static/images/ico_folder.png 2012-09-20 13:31:18 +0000 differ
24=== modified file 'loggerhead/templates/revisionfilechanges.pt'
25--- loggerhead/templates/revisionfilechanges.pt 2012-01-08 23:01:10 +0000
26+++ loggerhead/templates/revisionfilechanges.pt 2012-09-20 13:31:18 +0000
27@@ -3,7 +3,7 @@
28 <tal:block condition="repeat/added/start">
29 <li class="desc">files added:</li>
30 </tal:block>
31- <li class="files">
32+ <li class="files" tal:attributes="id python:'file' if (added.kind == 'file') else 'directory'">
33 <tal:revision condition="python:added.kind == 'file'"
34 content="structure python:file_link(added.filename)" />
35 <tal:revision condition="python:added.kind != 'file'"

Subscribers

People subscribed via source and target branches