# HG changeset patch # User Steve Losh # Date 1269704699 14400 # Node ID 52b91476473291c8e9610bbdb2f1dea802820bb8 # Parent 1f723957f6e54ed8afe5363e3313ab9d3f2a0e67 Display a list of signoffs on the web UI changeset pages. diff -r 1f723957f6e5 -r 52b914764732 review/web_media/style.css --- a/review/web_media/style.css Sat Mar 27 11:22:26 2010 -0400 +++ b/review/web_media/style.css Sat Mar 27 11:44:59 2010 -0400 @@ -118,6 +118,35 @@ background-color: #FBEAD0; } +/* Signoffs. */ +.signoff { + white-space: normal; + border: 1px dashed #666; + font-family: Consolas, Monaco, "Courier New", Courier, monospace; + padding: 0.75em; + margin-bottom: 1.5em; +} +.signoff.yes { + background-color: #B4FF9D; +} +.signoff.no { + background-color: #FC9696; +} +.signoff.neutral { + background-color: #F0F0F0; +} +.signoff div.avatar { + border: 1px solid black; + float: right; +} +.signoff div.message { + margin-top: 1.5em; + white-space: pre; +} +.signoff .opinion { + font-weight: bold; +} + /* Diffs. */ div.diff { overflow: auto; diff -r 1f723957f6e5 -r 52b914764732 review/web_templates/base.html --- a/review/web_templates/base.html Sat Mar 27 11:22:26 2010 -0400 +++ b/review/web_templates/base.html Sat Mar 27 11:44:59 2010 -0400 @@ -1,6 +1,8 @@ +{% import 'macros.html' as macros %} + Reviewing {{ utils["basename"](datastore.target.root) }}{% block title %}{% endblock %} diff -r 1f723957f6e5 -r 52b914764732 review/web_templates/changeset.html --- a/review/web_templates/changeset.html Sat Mar 27 11:22:26 2010 -0400 +++ b/review/web_templates/changeset.html Sat Mar 27 11:44:59 2010 -0400 @@ -8,11 +8,7 @@ {% for comment in rcset.review_level_comments() %}
-
- -
+ {{ macros.gravatar(comment, utils) }}
{{ utils['templatefilters'].person(comment.author) }} @@ -36,6 +32,26 @@
+ +

Signoffs

+ + {% for signoff in rcset.signoffs %} +
+ {{ macros.gravatar(signoff, utils) }} +
+
+ {{ utils['templatefilters'].person(signoff.author) }} + signed off as {{ signoff.opinion }} on this changeset, saying: +
+
{{ signoff.message }}
+
+
+ {% endfor %} + + +

Files

{% for filename in rcset.files() %} @@ -48,9 +64,7 @@
{% for comment in rcset.file_level_comments(filename) %}
-
- -
+ {{ macros.gravatar(comment, utils) }}
@@ -93,7 +107,7 @@ {% for comment in line['comments'] %} -
+ {{ macros.gravatar(comment, utils) }}
@@ -110,7 +124,7 @@ {{ line['number'] }}: {{ line['content'][1:]|escape }} {% for comment in line['comments'] %} -
+ {{ macros.gravatar(comment, utils) }}
diff -r 1f723957f6e5 -r 52b914764732 review/web_templates/macros.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/review/web_templates/macros.html Sat Mar 27 11:44:59 2010 -0400 @@ -0,0 +1,7 @@ +{% macro gravatar(item, utils) -%} +
+ +
+{%- endmacro %} \ No newline at end of file diff -r 1f723957f6e5 -r 52b914764732 review/web_ui.py --- a/review/web_ui.py Sat Mar 27 11:22:26 2010 -0400 +++ b/review/web_ui.py Sat Mar 27 11:44:59 2010 -0400 @@ -30,8 +30,8 @@ LOG_PAGE_LEN = 1000000 -def _comment_gravatar(comment): - return 'http://www.gravatar.com/avatar/%s/' % md5(email(comment.author)).hexdigest() +def _item_gravatar(item): + return 'http://www.gravatar.com/avatar/%s/' % md5(email(item.author)).hexdigest() def _line_type(line): return 'rem' if line[0] == '-' else 'add' if line[0] == '+' else 'con' @@ -43,7 +43,7 @@ 'email': email, 'templatefilters': templatefilters, 'len': len, - 'comment_gravatar': _comment_gravatar, + 'item_gravatar': _item_gravatar, 'line_type': _line_type, }