| Submitter | Angel Ezquerra |
|---|---|
| Date | Dec. 20, 2012, 6:25 p.m. |
| Message ID | <5a516a9dd2b5367c1537.1356027906@Lucia-PC> |
| Download | mbox | patch |
| Permalink | /patch/221/ |
| State | Superseded |
| Commit | b31266671918c4b7e9015219705bd36470f6b586 |
| Headers | show |
Comments
On Thu, 2012-12-20 at 19:25 +0100, Angel Ezquerra wrote: > # HG changeset patch > # User Angel Ezquerra <angel.ezquerra at gmail.com> > # Date 1354578089 -3600 > # Node ID 5a516a9dd2b5367c1537180ec207bc0688235c11 > # Parent 8ceabb34f1cb5469b7dd6b2d7b1ce4727d719e65 > 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. I think we should drop the 'subscribe' bit or move it to alt-text. Also, looks like you missed at least the filelog page.
On Thu, Dec 20, 2012 at 8:51 PM, Matt Mackall <mpm at selenic.com> wrote: > On Thu, 2012-12-20 at 19:25 +0100, Angel Ezquerra wrote: >> # HG changeset patch >> # User Angel Ezquerra <angel.ezquerra at gmail.com> >> # Date 1354578089 -3600 >> # Node ID 5a516a9dd2b5367c1537180ec207bc0688235c11 >> # Parent 8ceabb34f1cb5469b7dd6b2d7b1ce4727d719e65 >> 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. > > I think we should drop the 'subscribe' bit or move it to alt-text. I will send a patch that removes the subscribe text and sets the title of the link to "subscribe to atom feed". Personally I kind of liked it a little bit better with the "subscribe" text, but it does not look bad without it either. > Also, > looks like you missed at least the filelog page. Since the feeds are now "page specific", I decided to leave the feed link out of those pages that do not have a "page specific" feed. In particular, I purposely left the link out of the following pages: changeset, error, filelog, help, helptopics, notfound and search. I think that adding links that point to the global feed when there isn't a page specific feed is confusing. For example, showing a feed link on the search page suggests (IMHO) that you can create a feed for the results of your search, which would be quite cool but is just not possible today. So I believe that it would be best to be consistent and have hgweb only show feeds in those pages that have a corresponding feed. The alternative is always having a link that sometimes points to the current page feed and sometimes to the log (repository) feed. That being said, if you want me to add links to the missing pages I can do so. If so, should I also add it to the error and search pages or can I leave those out? Whatever you decide I can change the other templates so that they all are consistent. Cheers, Angel
On Thu, 2012-12-20 at 22:26 +0100, Angel Ezquerra wrote: > On Thu, Dec 20, 2012 at 8:51 PM, Matt Mackall <mpm at selenic.com> wrote: > > On Thu, 2012-12-20 at 19:25 +0100, Angel Ezquerra wrote: > >> # HG changeset patch > >> # User Angel Ezquerra <angel.ezquerra at gmail.com> > >> # Date 1354578089 -3600 > >> # Node ID 5a516a9dd2b5367c1537180ec207bc0688235c11 > >> # Parent 8ceabb34f1cb5469b7dd6b2d7b1ce4727d719e65 > >> 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. > > > > I think we should drop the 'subscribe' bit or move it to alt-text. > > I will send a patch that removes the subscribe text and sets the title > of the link to "subscribe to atom feed". Personally I kind of liked it > a little bit better with the "subscribe" text, but it does not look > bad without it either. > > > Also, > > looks like you missed at least the filelog page. > > Since the feeds are now "page specific", I decided to leave the feed > link out of those pages that do not have a "page specific" feed. In > particular, I purposely left the link out of the following pages: > changeset, error, filelog, help, helptopics, notfound and search. Except filelog DOES have such a feed, hence my repeating myself. Here's an example: http://www.selenic.com/hg/atom-log/tip/tests/test-pathencode.py The help and helptopics are apparently cut-and-paste nonsense that no one noticed (though I noticed them about an hour ago) as they link to the tags feed. I've queued a patch to drop 'em.
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 {