Mercurial > kallithea

changeset 2413:6bef2a9f73e2 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added discoverable rss/atom links in pages
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 07 Jun 2012 14:23:28 +0200
parents 708f70d4f8ef
children 2dc4cfa44b25
files rhodecode/templates/base/root.html rhodecode/templates/journal/journal.html rhodecode/templates/journal/public_journal.html rhodecode/templates/summary/summary.html
diffstat 4 files changed, 40 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/templates/base/root.html	Thu Jun 07 13:09:59 2012 +0200
+++ b/rhodecode/templates/base/root.html	Thu Jun 07 14:23:28 2012 +0200
@@ -137,6 +137,8 @@
         </%def>
         <%def name="js_extra()"></%def>
         ${self.js()}
+        <%def name="head_extra()"></%def>
+        ${self.head_extra()}
     </head>
     <body id="body">
      ## IE hacks
--- a/rhodecode/templates/journal/journal.html	Thu Jun 07 13:09:59 2012 +0200
+++ b/rhodecode/templates/journal/journal.html	Thu Jun 07 14:23:28 2012 +0200
@@ -9,6 +9,10 @@
 <%def name="page_nav()">
 	${self.menu('home')}
 </%def>
+<%def name="head_extra()">
+<link href="${h.url('journal_atom', api_key=c.rhodecode_user.api_key)}" rel="alternate" title="${_('ATOM journal feed')}" type="application/atom+xml" />
+<link href="${h.url('journal_rss', api_key=c.rhodecode_user.api_key)}" rel="alternate" title="${_('RSS journal feed')}" type="application/rss+xml" />
+</%def>
 <%def name="main()">
 
     <div class="box box-left">
@@ -23,7 +27,7 @@
                  <span><a href="${h.url('journal_rss', api_key=c.rhodecode_user.api_key)}"><img class="icon" title="${_('RSS feed')}" alt="${_('RSS feed')}" src="${h.url('/images/icons/rss_16.png')}"/></a></span>
                </li>
                <li>
-                 <span><a href="${h.url('journal_atom', api_key=c.rhodecode_user.api_key)}"><img class="icon" title="${_('ATOM feed')}" alt="${_('ATOM feed')}" src="${h.url('/images/icons/atom_16.png')}"/></a></span>
+                 <span><a href="${h.url('journal_atom', api_key=c.rhodecode_user.api_key)}"><img class="icon" title="${_('ATOM feed')}" alt="${_('ATOM feed')}" src="${h.url('/images/icons/atom.png')}"/></a></span>
                </li>
              </ul>
 	    </div>
--- a/rhodecode/templates/journal/public_journal.html	Thu Jun 07 13:09:59 2012 +0200
+++ b/rhodecode/templates/journal/public_journal.html	Thu Jun 07 14:23:28 2012 +0200
@@ -9,32 +9,35 @@
 <%def name="page_nav()">
 	${self.menu('home')}
 </%def>
+<%def name="head_extra()">
+<link href="${h.url('public_journal_atom')}" rel="alternate" title="${_('ATOM public journal feed')}" type="application/atom+xml" />
+<link href="${h.url('public_journal_rss')}" rel="alternate" title="${_('RSS public journal feed')}" type="application/rss+xml" />
+</%def>
 <%def name="main()">
 
-    <div class="box">
-	    <!-- box / title -->
-	    <div class="title">
-	        <h5>${_('Public Journal')}</h5>
-                <ul class="links">
-<li>
-                 <span><a href="${h.url('public_journal_rss')}"><img class="icon" title="${_('RSS feed')}" alt="${_('RSS feed')}" src="${h.url('/images/icons/atom.png')}"/></a></span>
-               </li>
-               <li>
-                 <span><a href="${h.url('public_journal_atom')}"><img class="icon" title="${_('ATOM feed')}" alt="${_('ATOM feed')}" src="${h.url('/images/icons/rss_16.png')}"/></a></span>
-               </li>
-                </ul>
-
-	    </div>
-		<script type="text/javascript">
-		function show_more_event(){
-		YUE.on(YUD.getElementsByClassName('show_more'),'click',function(e){
-		    var el = e.target;
-		    YUD.setStyle(YUD.get(el.id.substring(1)),'display','');
-		    YUD.setStyle(el.parentNode,'display','none');
-		});
-		}
-		</script>
-	    <div id="journal">${c.journal_data}</div>
-    </div>
+<div class="box">
+  <!-- box / title -->
+  <div class="title">
+    <h5>${_('Public Journal')}</h5>
+      <ul class="links">
+      <li>
+       <span><a href="${h.url('public_journal_rss')}"><img class="icon" title="${_('RSS feed')}" alt="${_('RSS feed')}" src="${h.url('/images/icons/atom.png')}"/></a></span>
+     </li>
+     <li>
+       <span><a href="${h.url('public_journal_atom')}"><img class="icon" title="${_('ATOM feed')}" alt="${_('ATOM feed')}" src="${h.url('/images/icons/rss_16.png')}"/></a></span>
+     </li>
+     </ul>
+  </div>
+  <script type="text/javascript">
+  function show_more_event(){
+  YUE.on(YUD.getElementsByClassName('show_more'),'click',function(e){
+      var el = e.target;
+      YUD.setStyle(YUD.get(el.id.substring(1)),'display','');
+      YUD.setStyle(el.parentNode,'display','none');
+  });
+  }
+  </script>
+  <div id="journal">${c.journal_data}</div>
+</div>
 
 </%def>
--- a/rhodecode/templates/summary/summary.html	Thu Jun 07 13:09:59 2012 +0200
+++ b/rhodecode/templates/summary/summary.html	Thu Jun 07 14:23:28 2012 +0200
@@ -16,6 +16,11 @@
 	${self.menu('summary')}
 </%def>
 
+<%def name="head_extra()">
+<link href="${h.url('atom_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key)}" rel="alternate" title="${_('repo %s ATOM feed') % c.repo_name}" type="application/atom+xml" />
+<link href="${h.url('rss_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key)}" rel="alternate" title="${_('repo %s RSS feed') % c.repo_name}" type="application/rss+xml" />
+</%def>
+
 <%def name="main()">
     <%
     summary = lambda n:{False:'summary-short'}.get(n)