Submitter | Angel Ezquerra |
---|---|
Date | Dec. 4, 2012, 10:58 p.m. |
Message ID | <7535a4d5ad374e483f15.1354661889@Lucia-PC> |
Download | mbox | patch |
Permalink | /patch/21/ |
State | Superseded |
Commit | b31266671918c4b7e9015219705bd36470f6b586 |
Headers | show |
Comments
On Tue, Dec 4, 2012 at 11:58 PM, Angel Ezquerra <angel.ezquerra at gmail.com> wrote: > # HG changeset patch > # User Angel Ezquerra <angel.ezquerra at gmail.com> > # Date 1354578089 -3600 > # Node ID 7535a4d5ad374e483f15e0c7a91e313614ce345f > # Parent 26303ce529e72c952f7b1a7a6410cc4b273e3a8b > hgweb: add (Atom) subscribe link to the main paper template pages > > The subscribe link is found at the bottom of the navigation sidebar. > This uses a free icon from http://feedicons.com. > > diff --git a/mercurial/templates/paper/bookmarks.tmpl b/mercurial/templates/paper/bookmarks.tmpl > --- a/mercurial/templates/paper/bookmarks.tmpl > +++ b/mercurial/templates/paper/bookmarks.tmpl > @@ -23,6 +23,12 @@ > <ul> > <li><a href="{url}help{sessionvars%urlparameter}">help</a></li> > </ul> > +<p> > +<div class="atom-logo"> > +<a href="{url}atom-bookmarks"> > +<img class="atom-logo" src="{staticurl}feed-icon-14x14.png" alt="atom feed"> subscribe > +</a> > +</div> > </div> > > <div class="main"> > diff --git a/mercurial/templates/paper/branches.tmpl b/mercurial/templates/paper/branches.tmpl > --- a/mercurial/templates/paper/branches.tmpl > +++ b/mercurial/templates/paper/branches.tmpl > @@ -23,6 +23,12 @@ > <ul> > <li><a href="{url}help{sessionvars%urlparameter}">help</a></li> > </ul> > +<p> > +<div class="atom-logo"> > +<a href="{url}atom-branches"> > +<img class="atom-logo" src="{staticurl}feed-icon-14x14.png" alt="atom feed"> subscribe > +</a> > +</div> > </div> > > <div class="main"> > diff --git a/mercurial/templates/paper/graph.tmpl b/mercurial/templates/paper/graph.tmpl > --- a/mercurial/templates/paper/graph.tmpl > +++ b/mercurial/templates/paper/graph.tmpl > @@ -28,6 +28,12 @@ > <ul> > <li><a href="{url}help{sessionvars%urlparameter}">help</a></li> > </ul> > +<p> > +<div class="atom-logo"> > +<a href="{url}atom-log"> > +<img class="atom-logo" src="{staticurl}feed-icon-14x14.png" alt="atom feed"> subscribe > +</a> > +</div> > </div> > > <div class="main"> > diff --git a/mercurial/templates/paper/shortlog.tmpl b/mercurial/templates/paper/shortlog.tmpl > --- a/mercurial/templates/paper/shortlog.tmpl > +++ b/mercurial/templates/paper/shortlog.tmpl > @@ -30,6 +30,12 @@ > <ul> > <li><a href="{url}help{sessionvars%urlparameter}">help</a></li> > </ul> > +<p> > +<div class="atom-logo"> > +<a href="{url}atom-log"> > +<img class="atom-logo" src="{staticurl}feed-icon-14x14.png" alt="atom feed"> subscribe > +</a> > +</div> > </div> > > <div class="main"> > diff --git a/mercurial/templates/paper/tags.tmpl b/mercurial/templates/paper/tags.tmpl > --- a/mercurial/templates/paper/tags.tmpl > +++ b/mercurial/templates/paper/tags.tmpl > @@ -23,6 +23,12 @@ > <ul> > <li><a href="{url}help{sessionvars%urlparameter}">help</a></li> > </ul> > +<p> > +<div class="atom-logo"> > +<a href="{url}atom-tags"> > +<img class="atom-logo" src="{staticurl}feed-icon-14x14.png" alt="atom feed"> > + subscribe</a> > +</div> > </div> > > <div class="main"> > diff --git a/mercurial/templates/static/feed-icon-14x14.png b/mercurial/templates/static/feed-icon-14x14.png > new file mode 100644 > index 0000000000000000000000000000000000000000..b3c949d2244f2c0c81d65e74719af2a1b56d06a3 > GIT binary patch > literal 689 > zc$@*T0#5yjP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00004XF*Lt006JZ > zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!LrFwIRCwBq > zl1)eyVHn4M^Ulo9v at t~@+ZN^_p-4n3!zl8WhftwQbP(%Mhi;zwxJA&VI<E(BK|x3b > zLQ)Y?)FFfX%E%>(tky!*UETcH-TCU7SrqEjJM#?B`_A)!p7(kFf9-P@=@15kkTkGK > zgFusyy#KECqZzRdBLb=P?$(kUP;>kYTDeG&{|a+iOiRbI6nbQ)j#7bOf>iF=<d6}D > z?Dawoy?!4%yRZFKV)gwa+~EwmpT{&6=we<e`gOpNYbirA8ivozol9s+l59<pY-qu0 > z?gX*Q=xu`Wev~FaWyML2sJ1dSyv6T?3l6vif*(sPO%1T}v5jp<&tV-ri<_|FT_0iK > zZvZ6=gthh5_1=%Sr7y2>C+|_py<&Fo1F5cC*iEM?zZGC{ejNg4LWYp=S$L6Qaby6y > zp$+F`250{%tU{Lg$5*ROH}y!1UKJS4*xqd7P(Y3JQF?lrnf?yerr%&6yGXLG1ur*B > z{$&R1 at Oj)yl@%rY5rh?j(j10Yz_DBs`AKFU_QnB;)(aqQmGi&ieOS|21^NP9UMpa< > zU&p!f6RZ6Owp^X!EXA=0SbN&h?CrQK%Q3(=YBqqHD^9ZUM0Hxt-6-KT;>lf at j?Z+v > zHm(}`>85I&E<7e}oz?6UwjAogowzGO8kSN7+2`b^$Az9L{K5*ko87EV45LT-`_##3 > z>d3AGh@>=mbg34|6}+-gT9N+6Dr at 44VEl44O&{&|w=qpbzC#iWMKa?5)>tI+KLQK@ > Xq0QFqn(9Yl00000NkvXXu0mjfZ8t<K > > diff --git a/mercurial/templates/static/style-paper.css b/mercurial/templates/static/style-paper.css > --- a/mercurial/templates/static/style-paper.css > +++ b/mercurial/templates/static/style-paper.css > @@ -60,6 +60,12 @@ > border: 0; > } > > +.atom-logo img{ > + width: 14px; > + height: 14px; > + border: 0; > +} > + > .menu a { color: black; display: block; } > > .search { > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel at selenic.com > http://selenic.com/mailman/listinfo/mercurial-devel Did anybody have a look at this last version of this patch? I don't think there are any past comments left for me to address. I got a similar patch ready that changes the existing RSS and Atom buttons on the Monoblue hgweb template into a single feed icon that links to the Atom feed. If this patch is fine I could send that monoblue patch and work on a gitweb patch as well. Cheers, Angel
On Wed, 2012-12-19 at 22:42 +0100, Angel Ezquerra wrote: > On Tue, Dec 4, 2012 at 11:58 PM, Angel Ezquerra > <angel.ezquerra at gmail.com> wrote: > > # HG changeset patch > > # User Angel Ezquerra <angel.ezquerra at gmail.com> > > # Date 1354578089 -3600 > > # Node ID 7535a4d5ad374e483f15e0c7a91e313614ce345f > > # Parent 26303ce529e72c952f7b1a7a6410cc4b273e3a8b > > hgweb: add (Atom) subscribe link to the main paper template pages Got lost in a previous pile of related patches, please resend.
Patch
diff --git a/mercurial/templates/paper/bookmarks.tmpl b/mercurial/templates/paper/bookmarks.tmpl --- a/mercurial/templates/paper/bookmarks.tmpl +++ b/mercurial/templates/paper/bookmarks.tmpl @@ -23,6 +23,12 @@ <ul> <li><a href="{url}help{sessionvars%urlparameter}">help</a></li> </ul> +<p> +<div class="atom-logo"> +<a href="{url}atom-bookmarks"> +<img class="atom-logo" src="{staticurl}feed-icon-14x14.png" alt="atom feed"> subscribe +</a> +</div> </div> <div class="main"> diff --git a/mercurial/templates/paper/branches.tmpl b/mercurial/templates/paper/branches.tmpl --- a/mercurial/templates/paper/branches.tmpl +++ b/mercurial/templates/paper/branches.tmpl @@ -23,6 +23,12 @@ <ul> <li><a href="{url}help{sessionvars%urlparameter}">help</a></li> </ul> +<p> +<div class="atom-logo"> +<a href="{url}atom-branches"> +<img class="atom-logo" src="{staticurl}feed-icon-14x14.png" alt="atom feed"> subscribe +</a> +</div> </div> <div class="main"> diff --git a/mercurial/templates/paper/graph.tmpl b/mercurial/templates/paper/graph.tmpl --- a/mercurial/templates/paper/graph.tmpl +++ b/mercurial/templates/paper/graph.tmpl @@ -28,6 +28,12 @@ <ul> <li><a href="{url}help{sessionvars%urlparameter}">help</a></li> </ul> +<p> +<div class="atom-logo"> +<a href="{url}atom-log"> +<img class="atom-logo" src="{staticurl}feed-icon-14x14.png" alt="atom feed"> subscribe +</a> +</div> </div> <div class="main"> diff --git a/mercurial/templates/paper/shortlog.tmpl b/mercurial/templates/paper/shortlog.tmpl --- a/mercurial/templates/paper/shortlog.tmpl +++ b/mercurial/templates/paper/shortlog.tmpl @@ -30,6 +30,12 @@ <ul> <li><a href="{url}help{sessionvars%urlparameter}">help</a></li> </ul> +<p> +<div class="atom-logo"> +<a href="{url}atom-log"> +<img class="atom-logo" src="{staticurl}feed-icon-14x14.png" alt="atom feed"> subscribe +</a> +</div> </div> <div class="main"> diff --git a/mercurial/templates/paper/tags.tmpl b/mercurial/templates/paper/tags.tmpl --- a/mercurial/templates/paper/tags.tmpl +++ b/mercurial/templates/paper/tags.tmpl @@ -23,6 +23,12 @@ <ul> <li><a href="{url}help{sessionvars%urlparameter}">help</a></li> </ul> +<p> +<div class="atom-logo"> +<a href="{url}atom-tags"> +<img class="atom-logo" src="{staticurl}feed-icon-14x14.png" alt="atom feed"> + subscribe</a> +</div> </div> <div class="main"> diff --git a/mercurial/templates/static/feed-icon-14x14.png b/mercurial/templates/static/feed-icon-14x14.png new file mode 100644 index 0000000000000000000000000000000000000000..b3c949d2244f2c0c81d65e74719af2a1b56d06a3 GIT binary patch literal 689 zc$@*T0#5yjP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00004XF*Lt006JZ zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!LrFwIRCwBq zl1)eyVHn4M^Ulo9v at t~@+ZN^_p-4n3!zl8WhftwQbP(%Mhi;zwxJA&VI<E(BK|x3b zLQ)Y?)FFfX%E%>(tky!*UETcH-TCU7SrqEjJM#?B`_A)!p7(kFf9-P@=@15kkTkGK zgFusyy#KECqZzRdBLb=P?$(kUP;>kYTDeG&{|a+iOiRbI6nbQ)j#7bOf>iF=<d6}D z?Dawoy?!4%yRZFKV)gwa+~EwmpT{&6=we<e`gOpNYbirA8ivozol9s+l59<pY-qu0 z?gX*Q=xu`Wev~FaWyML2sJ1dSyv6T?3l6vif*(sPO%1T}v5jp<&tV-ri<_|FT_0iK zZvZ6=gthh5_1=%Sr7y2>C+|_py<&Fo1F5cC*iEM?zZGC{ejNg4LWYp=S$L6Qaby6y zp$+F`250{%tU{Lg$5*ROH}y!1UKJS4*xqd7P(Y3JQF?lrnf?yerr%&6yGXLG1ur*B z{$&R1 at Oj)yl@%rY5rh?j(j10Yz_DBs`AKFU_QnB;)(aqQmGi&ieOS|21^NP9UMpa< zU&p!f6RZ6Owp^X!EXA=0SbN&h?CrQK%Q3(=YBqqHD^9ZUM0Hxt-6-KT;>lf at j?Z+v zHm(}`>85I&E<7e}oz?6UwjAogowzGO8kSN7+2`b^$Az9L{K5*ko87EV45LT-`_##3 z>d3AGh@>=mbg34|6}+-gT9N+6Dr at 44VEl44O&{&|w=qpbzC#iWMKa?5)>tI+KLQK@ Xq0QFqn(9Yl00000NkvXXu0mjfZ8t<K diff --git a/mercurial/templates/static/style-paper.css b/mercurial/templates/static/style-paper.css --- a/mercurial/templates/static/style-paper.css +++ b/mercurial/templates/static/style-paper.css @@ -60,6 +60,12 @@ border: 0; } +.atom-logo img{ + width: 14px; + height: 14px; + border: 0; +} + .menu a { color: black; display: block; } .search {