Bug 571333 - "Mixed-content SSL warning on hg.mozilla.org due to livemarks image from www.mozilla.org" [r=dveditz]
authorReed Loden <reed@reedloden.com>
Thu, 10 Jun 2010 15:50:59 -0500
changeset 359402 0a326b7c3906ac87bea95b4f0ca8f7d0c84c9dc3
parent 359401 1f2142c1a43e5134b7a53501a2147806b627d6ec
child 359403 f6189c87a358233b90a224241dc96b554f3d5258
push id16998
push userrwood@mozilla.com
push dateMon, 02 May 2016 19:42:03 +0000
reviewersdveditz
bugs571333
Bug 571333 - "Mixed-content SSL warning on hg.mozilla.org due to livemarks image from www.mozilla.org" [r=dveditz]
hgtemplates/gitweb_mozilla/filelog.tmpl
hgtemplates/gitweb_mozilla/footer.tmpl
hgtemplates/gitweb_mozilla/map
hgtemplates/static/livemarks16.png
--- a/hgtemplates/gitweb_mozilla/filelog.tmpl
+++ b/hgtemplates/gitweb_mozilla/filelog.tmpl
@@ -13,17 +13,17 @@
 <a href="{url}summary{sessionvars%urlparameter}">summary</a> |
 <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |
 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
 <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> |
 revisions |
 <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> |
 <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
-<a href="{url}atom-log/{node|short}/{file|urlescape}"><img src="http://www.mozilla.org/images/livemarks16.png" alt="Feed" title="Feed of repository changes"/></a>
+<a href="{url}atom-log/{node|short}/{file|urlescape}"><img src="{staticurl}livemarks16.png" alt="Feed" title="Feed of repository changes"/></a>
 <br/>
 {nav%filenaventry}
 </div>
 
 <div class="title" >{file|urlescape}</div>
 
 <table>
 {entries%filelogentry}
--- a/hgtemplates/gitweb_mozilla/footer.tmpl
+++ b/hgtemplates/gitweb_mozilla/footer.tmpl
@@ -1,10 +1,10 @@
 <div class="page_footer">
 <div class="page_footer_text">{repo|escape}</div>
 <div class="feed">
-<a href="{url}atom-log"><img src="http://www.mozilla.org/images/livemarks16.png" alt="Feed" title="Feed of repository changes"/></a>
+<a href="{url}atom-log"><img src="{staticurl}livemarks16.png" alt="Feed" title="Feed of repository changes"/></a>
 </div>
 <br />
 {motd}
 </div>
 </body>
 </html>
--- a/hgtemplates/gitweb_mozilla/map
+++ b/hgtemplates/gitweb_mozilla/map
@@ -59,15 +59,15 @@ branchtag = '<span class="branchtag" tit
 inbranchtag = '<span class="inbranchtag" title="{name}">{name}</span> '
 shortlogentry = '<tr class="parity{parity}"><td class="link"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">diff</a><br/><a href="{url}file/{node|short}{sessionvars%urlparameter}">browse</a></td><td class="age">{node|short}<br/><i>{date|isodate}</i></td><td><strong><cite>{author|person}</cite> - {desc|strip|firstline|escape|buglink}</strong> <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span></td></tr>'
 pushinfo = '<cite>{user}<br/><span class="date">{date|date}</span></cite>'
 mergehidden = '<br/>← {count} hidden changesets <a class="expand hideid{id}" href="#">[Expand]</a>'
 pushlogentry = '<tr class="parity{parity} {hidden} id{id}"><td>{push%pushinfo}</td><td class="age"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td><td><strong>{author|person} &mdash; {desc|strip|escape|buglink}</strong> <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span>{mergerollup%mergehidden}</td></tr>\n'
 filelogentry = '<tr class="parity{parity}"><td class="link"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">diff</a><br/><a href="{url}file/{node|short}{sessionvars%urlparameter}">browse</a><br/><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></td><td class="age">{node|short}<br/><i>{date|isodate}</i>{rename%filelogrename}</td><td><strong><cite>{author|person}</cite> - {desc|strip|firstline|escape|buglink}</strong></td></tr>'
 filelogentry_old = '<tr class="parity{parity}"><td class="age"><i>at {date|date}</i></td><td><a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}"><b>{desc|strip|firstline|escape|buglink}</b></a></td><td class="link"><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a>&nbsp;|&nbsp;<a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a>&nbsp;|&nbsp;<a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> {rename%filelogrename}</td></tr>'
 archiveentry = ' | <a href="{url}archive/{node|short}{extension}">{type|escape}</a> '
-indexentry = '<tr class="parity{parity}"><td><a class="list" href="{url}{sessionvars%urlparameter}"><b>{name|escape}</b></a></td><td>{description}</td><td class="age">at {lastchange|date}</td><td class="indexlinks">{archives%indexarchiveentry}</td><td><a href="{url}atom-log"><img src="http://www.mozilla.org/images/livemarks16.png" alt="Feed" title="Feed of repository changes"/></a></td></tr>\n'
+indexentry = '<tr class="parity{parity}"><td><a class="list" href="{url}{sessionvars%urlparameter}"><b>{name|escape}</b></a></td><td>{description}</td><td class="age">at {lastchange|date}</td><td class="indexlinks">{archives%indexarchiveentry}</td><td><a href="{url}atom-log"><img src="{staticurl}livemarks16.png" alt="Feed" title="Feed of repository changes"/></a></td></tr>\n'
 indexarchiveentry = ' <a href="{url}archive/{node|short}{extension}">{type|escape}</a> '
 index = index.tmpl
 urlparameter = '{separator}{name}={value|urlescape}'
 hiddenformentry = '<input type="hidden" name="{name}" value="{value|escape}" />'
 
 graph = graph.tmpl
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..54c25324930225ec07c526cb5076ffd244a8762b
GIT binary patch
literal 745
zc$@+00v7#=P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)C&g^CIX!fXeR&w0(MD6
zK~#9!rISl+Oko_wf8WeEFVj{#Rgbn(s@k#ewje4<Ed)V=#7-nOwY6w15H`dH8ze$v
z<q-=jv1=m6b6SZ7sd_ZSU}ie6&g<T}-@Tv3R1_f+|Mkf)=lpYy&|339Cnv6lLsmQy
zsiyN`%c#M`AH*KNKsGnLi543+?mGQ3rM0%D75g0V2XxrAVJDu@Iy_Pkltpy>K0Ygs
z+a-Pi=En2g%e}b>&?|&U%4(tzp0jo~@5=$Yb`MOGp2GO_kjk@T1S_v`O;Kjfn?e3@
zvJ+?o(o&fqs*3tbgy-kBU^^P$++}q19w5}wi@$w{%)Nf<<G1k0nj2--;sdyFKv;@q
zk*D2!%mV8v;q+Cko9l_)J%Ulp5!!Z%WYZoTLqS!6^TVeL1sIBnl*zoo5_1QOu=fFh
z&h5+^yF~1AA4VZd+ukb_JUwVbftn6*fU1qO71`HAB*sPvw636G-)+iE2WYLlBzf;7
z0N%}Ku?_1N2M%CbG<!7un|+uUS2J{UJ(WV1SzAv~Y1@u3dV$Ql5dw=gQ4;OH1GMR2
zmK`SZn${q!(~o$0b{hbJzT?yhFrHqkb!735-vOl}h{MCoIj<4@BS;(Or=E};9j2~h
z71<ofFE0Qn>jw0%fP~Y6Z~iI(+-)n#<e<q7(#QeuH4Swx8vw_$e|n;n4)`)D3U8y-
zcdfzvFibt*wIO|FA7)D@J&j<+$9Q$)42`KbxTn=k#P>5AfNlkhXJJVT1iiIAe4m*B
z91W&|QWf$xv93Gp07hkWl8wv!JQ9k9AulBIe_5UY<tBFM2?v=9A^<lqd#c;=A6Kk^
b9FY75alZ^U+--GN00000NkvXXu0mjf{Pjj~