##// END OF EJS Templates
git: use force fetch and update for target ref. This solves a case...
git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.

File last commit:

r2351:59272121 default
r2784:e8c62649 default
Show More
journal.mako
56 lines | 2.2 KiB | application/x-mako | MakoHtmlLexer
templating: use .mako as extensions for template files.
r1282 ## -*- coding: utf-8 -*-
<%inherit file="/base/base.mako"/>
<%def name="title()">
${_('Journal')}
%if c.rhodecode_name:
&middot; ${h.branding(c.rhodecode_name)}
%endif
</%def>
journal: ported controller to pyramid code
r1933
templating: use .mako as extensions for template files.
r1282 <%def name="breadcrumbs()">
<h1 class="block-left">
${h.form(None, id_="filter_form", method="get")}
<input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term}" placeholder="${_('quick filter...')}"/>
<input type='submit' value="${_('Filter')}" class="btn" />
journal: ported controller to pyramid code
r1933 ${_('Journal')} - ${_ungettext('%s entry', '%s entries', c.journal_pager.item_count) % (c.journal_pager.item_count)}
templating: use .mako as extensions for template files.
r1282 ${h.end_form()}
</h1>
pylons: remove pylons as dependency...
r2351 <p class="tooltip filterexample" title="${h.tooltip(h.journal_filter_help(request))}">${_('Example Queries')}</p>
templating: use .mako as extensions for template files.
r1282 </%def>
<%def name="menu_bar_nav()">
${self.menu_items(active='journal')}
</%def>
<%def name="head_extra()">
journal: ported controller to pyramid code
r1933 <link href="${h.route_path('journal_atom', _query=dict(auth_token=c.rhodecode_user.feed_token))}" rel="alternate" title="${_('ATOM journal feed')}" type="application/atom+xml" />
<link href="${h.route_path('journal_rss', _query=dict(auth_token=c.rhodecode_user.feed_token))}" rel="alternate" title="${_('RSS journal feed')}" type="application/rss+xml" />
templating: use .mako as extensions for template files.
r1282 </%def>
journal: ported controller to pyramid code
r1933
templating: use .mako as extensions for template files.
r1282 <%def name="main()">
<div class="box">
<!-- box / title -->
<div class="title journal">
${self.breadcrumbs()}
<ul class="links icon-only-links block-right">
<li>
journal: ported controller to pyramid code
r1933 <span><a id="refresh" href="${h.route_path('journal')}"><i class="icon-refresh"></i></a></span>
templating: use .mako as extensions for template files.
r1282 </li>
<li>
journal: ported controller to pyramid code
r1933 <span><a href="${h.route_path('journal_atom', _query=dict(auth_token=c.rhodecode_user.feed_token))}"><i class="icon-rss-sign"></i></a></span>
templating: use .mako as extensions for template files.
r1282 </li>
</ul>
</div>
journal: ported controller to pyramid code
r1933 <div id="journal">${c.journal_data|n}</div>
templating: use .mako as extensions for template files.
r1282 </div>
<script type="text/javascript">
$('#j_filter').autoGrowInput();
$(document).on('pjax:success',function(){
show_more_event();
});
$(document).pjax('#refresh', '#journal',
journal: ported controller to pyramid code
r1933 {url: "${request.current_route_path(_query=dict(filter=c.search_term))}", push: false});
templating: use .mako as extensions for template files.
r1282
</script>
</%def>