Files
@ 631e8000eae8
Branch filter:
Location: kallithea/rhodecode/templates/admin/admin.html - annotation
631e8000eae8
1.7 KiB
text/html
diff parser: match the header order of hg diff --git patches
The output might look like:
diff --git a/A b/B
old mode 100644
new mode 100755
rename from A
rename to B
--- a/A
+++ b/B
Such files were shown as 'modified binary file chmod 100644 => 100755' without
diff.
Now the chmod and diff will be shown ... but still not the rename.
Correct parsing of headers do require a better parser - one do not just use a
regexp.
The output might look like:
diff --git a/A b/B
old mode 100644
new mode 100755
rename from A
rename to B
--- a/A
+++ b/B
Such files were shown as 'modified binary file chmod 100644 => 100755' without
diff.
Now the chmod and diff will be shown ... but still not the rename.
Correct parsing of headers do require a better parser - one do not just use a
regexp.
1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 1f334a68d057 1e757ac98988 1e757ac98988 1e757ac98988 a08624dd675e cc7eedb5323c cc7eedb5323c ca2b21819dfd ca2b21819dfd a08624dd675e a08624dd675e 1e757ac98988 1e757ac98988 1e757ac98988 b4f401524060 1e757ac98988 1e757ac98988 1e757ac98988 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 f91d3f9b7230 a08624dd675e a08624dd675e cc7eedb5323c b4f401524060 b4f401524060 b4f401524060 b4f401524060 9dca99ffd495 cc7eedb5323c cc7eedb5323c 9dca99ffd495 cc7eedb5323c b4f401524060 a08624dd675e a08624dd675e b4f401524060 cc7eedb5323c b4f401524060 9dca99ffd495 cc7eedb5323c a08624dd675e f91d3f9b7230 | ## -*- coding: utf-8 -*-
<%inherit file="/base/base.html"/>
<%def name="title()">
${_('Admin journal')} · ${c.rhodecode_name}
</%def>
<%def name="breadcrumbs_links()">
<form id="filter_form">
<input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('journal filter...')}"/>
<span class="tooltip" title="${h.tooltip(h.journal_filter_help())}">?</span>
<input type='submit' value="${_('filter')}" class="ui-btn" style="padding:0px 2px 0px 2px;margin:0px"/>
${_('Admin journal')} - ${ungettext('%s entry', '%s entries', c.users_log.item_count) % (c.users_log.item_count)}
</form>
${h.end_form()}
</%def>
<%def name="page_nav()">
${self.menu('admin')}
</%def>
<%def name="main()">
<div class="box">
<!-- box / title -->
<div class="title">
${self.breadcrumbs()}
</div>
<!-- end box / title -->
<div class="table">
<div id="user_log">
${c.log_data}
</div>
</div>
</div>
<script>
YUE.on('j_filter','click',function(){
var jfilter = YUD.get('j_filter');
if(YUD.hasClass(jfilter, 'initial')){
jfilter.value = '';
}
});
var fix_j_filter_width = function(len){
YUD.setStyle(YUD.get('j_filter'),'width',Math.max(80, len*6.50)+'px');
}
YUE.on('j_filter','keyup',function(){
fix_j_filter_width(YUD.get('j_filter').value.length);
});
YUE.on('filter_form','submit',function(e){
YUE.preventDefault(e)
var val = YUD.get('j_filter').value;
window.location = "${url.current(filter='__FILTER__')}".replace('__FILTER__',val);
});
fix_j_filter_width(YUD.get('j_filter').value.length);
</script>
</%def>
|