##// END OF EJS Templates
Migrate to Mergely 3.3.4....
Migrate to Mergely 3.3.4. RhodeCode 2.2.5 distributed Mergely 3.3.4 with some of the changes that Mergely 3.3.3 in RhodeCode 1.7.2 also had. That do however not seem to be changes we want for Kallithea this way and we take the 3.3.4 files as they are. I've also included the Mergely license file, as downloaded from: http://www.mergely.com/license.php That LICENSE file is kept in HTML just as it was downloaded from their website. While it's a bit annoying to keep the license file in HTML, this is the way it came from upstream so we'll leave it that way. Since the Javascript code is used with other GPLv3 Javascript, we are using the GPL option of Mergely's tri-license. Finally, note that previously, this was incorrectly called "mergerly", so the opportunity is taken here to correct the name. That required changes to diff_2way.html. As commands:: $ wget -N --output-document LICENSE-MERGELY.html http://www.mergely.com/license.php $ hg add LICENSE-MERGELY.html $ hg mv rhodecode/public/css/mergerly.css rhodecode/public/css/mergely.css $ hg mv rhodecode/public/js/mergerly.js rhodecode/public/js/mergely.js $ sed -i 's,mergerly\.,mergely,g' rhodecode/templates/files/diff_2way.html $ ( cd /tmp; \ wget -N http://www.mergely.com/releases/mergely-3.3.4.zip; \ unzip mergely-3.3.4.zip ) $ sha256sum /tmp/mergely-3.3.4.zip 87415d30494bbe829c248881aa7cdc0303f7e70b458a5f687615564d4498cc82 mergely-3.3.4.zip $ cp /tmp/mergely-3.3.4/lib/mergely.js rhodecode/public/js/mergely.js $ cp /tmp/mergely-3.3.4/lib/mergely.css rhodecode/public/css/mergely.css $ sed -i -e '/^ \* Version/a\ *\n * NOTE by bkuhn@sfconservancy.org for Kallithea:\n * Mergely license appears at http://www.mergely.com/license.php and in LICENSE-MERGELY.html' rhodecode/public/js/mergely.js rhodecode/public/css/mergely.css

File last commit:

r3776:13241a40 beta
r4125:aa3b5594 rhodecode-2.2.5-gpl
Show More
journal_data.html
57 lines | 2.4 KiB | text/html | HtmlLexer
Added missing journal_data template
r996 ## -*- coding: utf-8 -*-
%if c.journal_day_aggreagate:
%for day,items in c.journal_day_aggreagate:
fixed some issues with paginators on chrome, and made them look nicer
r3775 <div class="journal_day">${day}</div>
Updated new Journal with users and dates aggregates
r1041 % for user,entries in items:
Mads Kiilerich
html: don't use tabs
r3197 <div class="journal_container">
<div class="gravatar">
<img alt="gravatar" src="${h.gravatar_url(user.email if user else 'anonymous@rhodecode.org',24)}"/>
</div>
added handling of deleted users in journal data
r3068 %if user:
Mads Kiilerich
html: don't use tabs
r3197 <div class="journal_user">${user.name} ${user.lastname}</div>
added handling of deleted users in journal data
r3068 %else:
<div class="journal_user deleted">${entries[0].username}</div>
%endif
Mads Kiilerich
html: don't use tabs
r3197 <div class="journal_action_container">
% for entry in entries:
<div class="journal_icon"> ${h.action_parser(entry)[2]()}</div>
<div class="journal_action">${h.action_parser(entry)[0]()}</div>
<div class="journal_repo">
<span class="journal_repo_name">
%if entry.repository is not None:
${h.link_to(entry.repository.repo_name,
h.url('summary_home',repo_name=entry.repository.repo_name))}
%else:
${entry.repository_name}
%endif
</span>
</div>
<div class="journal_action_params">${h.literal(h.action_parser(entry)[1]())}</div>
<div class="date"><span class="tooltip" title="${h.tooltip(h.fmt_date(entry.action_date))}">${h.age(entry.action_date)}</span></div>
%endfor
</div>
</div>
Added missing journal_data template
r996 %endfor
%endfor
Unified the paginators for pylons and YUI....
r3776
fixed some issues with paginators on chrome, and made them look nicer
r3775 <div class="pagination-wh pagination-left" style="padding: 0px 0px 0px 10px;">
Unified the paginators for pylons and YUI....
r3776 ${c.journal_pager.pager('$link_previous ~2~ $link_next')}
fixed some issues with paginators on chrome, and made them look nicer
r3775 </div>
Journal refresh button
r1746 <script type="text/javascript">
YUE.onDOMReady(function(){
YUE.delegate("journal","click",function(e, matchedEl, container){
Mads Kiilerich
html: don't use tabs
r3197 ypjax(e.target.href,"journal",function(){
show_more_event();
tooltip_activate();
show_changeset_tooltip();
});
Journal refresh button
r1746 YUE.preventDefault(e);
},'.pager_link');
});
Unified the paginators for pylons and YUI....
r3776 </script>
Added missing journal_data template
r996 %else:
Journal refresh button
r1746 <div style="padding:5px 0px 10px 10px;">
${_('No entries yet')}
White-space cleanup
r1888 </div>
%endif