Mercurial > kallithea

changeset 3295:2e618376cef8 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't show rss links - atom is the present and the future - following the reasoning on http://selenic.com/pipermail/mercurial-devel/2012-December/046542.html
author Mads Kiilerich <madski@unity3d.com>
date Thu, 31 Jan 2013 23:27:21 +0100
parents d204788c5677
children 6893b65d9760
files rhodecode/templates/index_base.html rhodecode/templates/journal/journal.html rhodecode/templates/journal/public_journal.html rhodecode/templates/summary/summary.html
diffstat 4 files changed, 1 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/templates/index_base.html	Thu Jan 31 23:27:21 2013 +0100
+++ b/rhodecode/templates/index_base.html	Thu Jan 31 23:27:21 2013 +0100
@@ -80,7 +80,6 @@
                     <th class="left">${_('Last change')}</th>
                     <th class="left">${_('Tip')}</th>
                     <th class="left">${_('Owner')}</th>
-                    <th class="left">${_('RSS')}</th>
                     <th class="left">${_('Atom')}</th>
                 </tr>
             </thead>
@@ -114,9 +113,6 @@
                     ##
                     <td title="${repo['contact']}">${h.person(repo['contact'])}</td>
                     <td>
-                      ${dt.rss(repo['name'])}
-                    </td>
-                    <td>
                       ${dt.atom(repo['name'])}
                     </td>
                 </tr>
@@ -183,7 +179,6 @@
           {key:"tip",label:"${_('Tip')}",sortable:true,
               sortOptions: { sortFunction: revisionSort }},
           {key:"owner",label:"${_('Owner')}",sortable:true},
-          {key:"rss",label:"",sortable:false},
           {key:"atom",label:"",sortable:false},
       ];
 
@@ -200,7 +195,6 @@
               {key:"last_change"},
               {key:"tip"},
               {key:"owner"},
-              {key:"rss"},
               {key:"atom"},
           ]
       };
@@ -241,7 +235,6 @@
                {key:"last_change"},
                {key:"last_changeset"},
                {key:"owner"},
-               {key:"rss"},
                {key:"atom"},
             ]
          };
@@ -276,7 +269,6 @@
             {key:"last_changeset",label:"${_('Tip')}",sortable:true,
                 sortOptions: { sortFunction: revisionSort }},
             {key:"owner",label:"${_('Owner')}",sortable:true},
-            {key:"rss",label:"",sortable:false},
             {key:"atom",label:"",sortable:false},
         ];
 
--- a/rhodecode/templates/journal/journal.html	Thu Jan 31 23:27:21 2013 +0100
+++ b/rhodecode/templates/journal/journal.html	Thu Jan 31 23:27:21 2013 +0100
@@ -32,10 +32,7 @@
              <span><a id="refresh" href="${h.url('journal')}"><img class="icon" title="${_('Refresh')}" alt="${_('Refresh')}" src="${h.url('/images/icons/arrow_refresh.png')}"/></a></span>
            </li>
            <li>
-             <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.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/rss_16.png')}"/></a></span>
            </li>
          </ul>
         </div>
--- a/rhodecode/templates/journal/public_journal.html	Thu Jan 31 23:27:21 2013 +0100
+++ b/rhodecode/templates/journal/public_journal.html	Thu Jan 31 23:27:21 2013 +0100
@@ -20,9 +20,6 @@
   <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>
--- a/rhodecode/templates/summary/summary.html	Thu Jan 31 23:27:21 2013 +0100
+++ b/rhodecode/templates/summary/summary.html	Thu Jan 31 23:27:21 2013 +0100
@@ -45,10 +45,8 @@
               <div class="input ${summary(c.show_stats)}">
                   <div style="float:right;padding:5px 0px 0px 5px">
                      %if c.rhodecode_user.username != 'default':
-                      ${h.link_to(_('RSS'),h.url('rss_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key),class_='rss_icon')}
                       ${h.link_to(_('ATOM'),h.url('atom_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key),class_='atom_icon')}
                      %else:
-                      ${h.link_to(_('RSS'),h.url('rss_feed_home',repo_name=c.dbrepo.repo_name),class_='rss_icon')}
                       ${h.link_to(_('ATOM'),h.url('atom_feed_home',repo_name=c.dbrepo.repo_name),class_='atom_icon')}
                      %endif
                   </div>