loggerhead

Merge lp://staging/~razamatan/loggerhead/favicon into lp://staging/loggerhead

favicon
Merge into trunk-rich

Proposed by razamatan on 2011-02-17

Status:	Merged
Merged at revision:	431
Proposed branch:	lp://staging/~razamatan/loggerhead/favicon
Merge into:	lp://staging/loggerhead
Diff against target:	40 lines (+6/-0) 3 files modified loggerhead/templates/browse.pt (+2/-0) loggerhead/templates/directory.pt (+2/-0) loggerhead/templates/macros.pt (+2/-0)
To merge this branch:	bzr merge lp://staging/~razamatan/loggerhead/favicon
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Martin Albisetti		Approve on 2011-02-18
Martin Pool	2011-02-17	Pending
Review via email: mp+50220@code.staging.launchpad.net

Description of the change

explicitly sets favicons in the templates... per:

https://answers.launchpad.net/loggerhead/+question/140647

Revision history for this message

Martin Albisetti (beuno) wrote on 2011-02-17:

Yay favicons!
One question:

10 + <link rel="shortcut icon"
11 + tal:attributes="href python:branch.static_url('/static/images/favicon.ico')" />

and

23 + <link rel="shortcut icon"
24 + tal:attributes="href python:branch.static_url('/static/images/favicon.ico')" />

Shouldn't these be .png?

review: Needs Information

Revision history for this message

John A Meinel (jameinel) wrote on 2011-02-17:

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 2/17/2011 2:11 PM, Martin Albisetti wrote:
> Review: Needs Information
> Yay favicons!
> One question:
>
>
> 10 + <link rel="shortcut icon"
> 11 + tal:attributes="href python:branch.static_url('/static/images/favicon.ico')" />
>
> and
>
> 23 + <link rel="shortcut icon"
> 24 + tal:attributes="href python:branch.static_url('/static/images/favicon.ico')" />
>
> Shouldn't these be .png?

Yeah, given that you added "favicon.png" it seems like it should point
there.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk1dlYgACgkQJdeBCYSNAAMC4ACg1Y+YgwgVtBvpXPLlXRi5+/rA
uzMAniy3XyBCSxrmm02yuAwslS3p0q/z
=2lCr
-----END PGP SIGNATURE-----

Revision history for this message

razamatan (razamatan) wrote on 2011-02-18:

actually.. there's both favicon.ico and favicon.png... the effect of having these 2 favicons specified this way allows for the loggerhead turtle icon (favicon.ico) to be the favicon whilst browsing non-bzr branches. once you hit a bzr branch, it uses the stock bzr favicon (favicon.png) to signal that you're in a bzr branch.

make sense? try merging it on your own installation to see the effect.

Revision history for this message

Martin Albisetti (beuno) wrote on 2011-02-18:

You're right, it's already there.
This looks good, thanks for fixing it!

review: Approve