# HG changeset patch # User Mads Kiilerich # Date 2016-12-04 22:53:36 # Node ID 72b234ec4ff44c2b7abfdd36f8a3d102762c012d # Parent fb2c6f734ac93be825ade77e56a32c9b1e4d99ed style: introduce well markup - preparing for Bootstrap but so far not used Based on work by Dominik Ruf. diff --git a/kallithea/templates/admin/notifications/show_notification.html b/kallithea/templates/admin/notifications/show_notification.html --- a/kallithea/templates/admin/notifications/show_notification.html +++ b/kallithea/templates/admin/notifications/show_notification.html @@ -34,9 +34,11 @@
${h.literal(c.notification.subject)}
+
%if c.notification.body: ${h.render_w_mentions(c.notification.body)} %endif +
diff --git a/kallithea/templates/changeset/changeset_file_comment.html b/kallithea/templates/changeset/changeset_file_comment.html --- a/kallithea/templates/changeset/changeset_file_comment.html +++ b/kallithea/templates/changeset/changeset_file_comment.html @@ -53,7 +53,7 @@
%if c.authuser.username != 'default': ${h.form('#', class_='inline-form')} -
+
${_('Commenting on line.')} ${_('Comments are in plain text. Use @username inside this text to notify another user.')|n}