Files
@ 631e8000eae8
Branch filter:
Location: kallithea/rhodecode/templates/admin/notifications/show_notification.html - annotation
631e8000eae8
1.9 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.
cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 1f334a68d057 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 f91d3f9b7230 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 f91d3f9b7230 93d4e3eb7d84 93d4e3eb7d84 93d4e3eb7d84 93d4e3eb7d84 93d4e3eb7d84 cac5109ac3b6 cac5109ac3b6 7ff304d3028f 7ff304d3028f 7ff304d3028f c25cc1c7c65f 7ff304d3028f 7ff304d3028f 7ff304d3028f 7ff304d3028f 7ff304d3028f 7ff304d3028f 7ff304d3028f cac5109ac3b6 f60a07dbe2f0 f60a07dbe2f0 f60a07dbe2f0 f60a07dbe2f0 f60a07dbe2f0 f60a07dbe2f0 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 7ff304d3028f cac5109ac3b6 cac5109ac3b6 7ff304d3028f cac5109ac3b6 cac5109ac3b6 f91d3f9b7230 | ## -*- coding: utf-8 -*-
<%inherit file="/base/base.html"/>
<%def name="title()">
${_('Show notification')} ${c.rhodecode_user.username} · ${c.rhodecode_name}
</%def>
<%def name="breadcrumbs_links()">
${h.link_to(_('Notifications'),h.url('notifications'))}
»
${_('Show notification')}
</%def>
<%def name="page_nav()">
${self.menu('admin')}
</%def>
<%def name="main()">
<div class="box">
<!-- box / title -->
<div class="title">
${self.breadcrumbs()}
##<ul class="links">
## <li>
## <span style="text-transform: uppercase;"><a href="#">${_('Compose message')}</a></span>
## </li>
##</ul>
</div>
<div class="table">
<div id="notification_${c.notification.notification_id}">
<div class="notification-header">
<div class="gravatar">
<img alt="gravatar" src="${h.gravatar_url(h.email_or_none(c.notification.created_by_user.email),24)}"/>
</div>
<div class="desc">
${c.notification.description}
</div>
<div class="delete-notifications">
<span id="${c.notification.notification_id}" class="delete-notification delete_icon action"></span>
</div>
</div>
<div class="notification-body">
<div class="notification-subject">${h.literal(c.notification.subject)}</div>
%if c.notification.body:
${h.rst_w_mentions(c.notification.body)}
%endif
</div>
</div>
</div>
</div>
<script type="text/javascript">
var url = "${url('notification', notification_id='__NOTIFICATION_ID__')}";
var main = "${url('notifications')}";
YUE.on(YUQ('.delete-notification'),'click',function(e){
var notification_id = e.currentTarget.id;
deleteNotification(url,notification_id,[function(){window.location=main}])
})
</script>
</%def>
|