##// 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:

r4116:ffd45b18 rhodecode-2.2.5-gpl
r4125:aa3b5594 rhodecode-2.2.5-gpl
Show More
tags.html
97 lines | 3.0 KiB | text/html | HtmlLexer
renamed project to rhodecode
r547 ## -*- coding: utf-8 -*-
<%inherit file="/base/base.html"/>
<%def name="title()">
Bradley M. Kuhn
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....
r4116 ${_('%s Tags') % c.repo_name}
%if c.rhodecode_name:
&middot; ${c.rhodecode_name}
%endif
renamed project to rhodecode
r547 </%def>
<%def name="breadcrumbs_links()">
use placeholders in qfilter, not the ugly JS logic
r3665 <input class="q_filter_box" id="q_filter_tags" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
Leonardo
Fixing missing icons....
r3532 ${_('Tags')}
renamed project to rhodecode
r547 </%def>
<%def name="page_nav()">
Mads Kiilerich
use valid options for the top menu: repositories, journal, search and admin
r3603 ${self.menu('repositories')}
renamed project to rhodecode
r547 </%def>
Mads Kiilerich
repository pages: cleanup of use of repository context menu
r3601
renamed project to rhodecode
r547 <%def name="main()">
Mads Kiilerich
templates: drop context_bar, use repo_context_bar directly
r3988 ${self.repo_context_bar('switch-to')}
renamed project to rhodecode
r547 <div class="box">
<!-- box / title -->
<div class="title">
${self.breadcrumbs()}
</div>
<!-- end box / title -->
Enabled compare engine for tags...
r3010 %if c.repo_tags:
Bradley M. Kuhn
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....
r4116 <div class="info_box" id="compare_tags" style="clear: both;padding: 10px 19px;text-align: right;"><a href="#" class="btn btn-small">${_('Compare tags')}</a></div>
White space cleanup
r3029 %endif
renamed project to rhodecode
r547 <div class="table">
<%include file='tags_data.html'/>
</div>
added quick filters into branches and tags
r1654 </div>
<script type="text/javascript">
Enabled compare engine for tags...
r3010 YUE.on('compare_tags','click',function(e){
YUE.preventDefault(e);
var org = YUQ('input[name=compare_org]:checked')[0];
var other = YUQ('input[name=compare_other]:checked')[0];
if(org && other){
var compare_url = "${h.url('compare_url',repo_name=c.repo_name,org_ref_type='tag',org_ref='__ORG__',other_ref_type='tag',other_ref='__OTHER__')}";
var u = compare_url.replace('__ORG__',org.value)
.replace('__OTHER__',other.value);
window.location=u;
}
});
added sorting to bookmarks tags and branches
r1782
// main table sorting
var myColumnDefs = [
Bradley M. Kuhn
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....
r4116 {key:"name",label:"${_('Name')}",sortable:true,
sortOptions: { sortFunction: nameSort }},
added sorting to bookmarks tags and branches
r1782 {key:"date",label:"${_('Date')}",sortable:true,
sortOptions: { sortFunction: dateSort }},
{key:"author",label:"${_('Author')}",sortable:true},
{key:"revision",label:"${_('Revision')}",sortable:true,
sortOptions: { sortFunction: revisionSort }},
White space cleanup
r3029 {key:"compare",label:"${_('Compare')}",sortable:false,},
added sorting to bookmarks tags and branches
r1782 ];
var myDataSource = new YAHOO.util.DataSource(YUD.get("tags_data"));
myDataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE;
myDataSource.responseSchema = {
fields: [
Bradley M. Kuhn
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....
r4116 {key:"raw_name"},
added sorting to bookmarks tags and branches
r1782 {key:"name"},
Bradley M. Kuhn
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....
r4116 {key:"raw_date"},
added sorting to bookmarks tags and branches
r1782 {key:"date"},
{key:"author"},
Bradley M. Kuhn
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....
r4116 {key:"last_rev_raw"},
added sorting to bookmarks tags and branches
r1782 {key:"revision"},
Enabled compare engine for tags...
r3010 {key:"compare"},
added sorting to bookmarks tags and branches
r1782 ]
};
var myDataTable = new YAHOO.widget.DataTable("table_wrap", myColumnDefs, myDataSource,
{
sortedBy:{key:"name",dir:"asc"},
MSG_SORTASC:"${_('Click to sort ascending')}",
MSG_SORTDESC:"${_('Click to sort descending')}",
MSG_EMPTY:"${_('No records found.')}",
MSG_ERROR:"${_('Data error.')}",
White-space cleanup
r1888 MSG_LOADING:"${_('Loading...')}",
added sorting to bookmarks tags and branches
r1782 }
);
myDataTable.subscribe('postRenderEvent',function(oArgs) {
tooltip_activate();
var func = function(node){
return node.parentNode.parentNode.parentNode.parentNode.parentNode;
}
White-space cleanup
r1888 q_filter('q_filter_tags',YUQ('div.table tr td .logtags .tagtag a'),func);
});
added sorting to bookmarks tags and branches
r1782
added quick filters into branches and tags
r1654 </script>
White-space cleanup
r1888 </%def>