diff --git a/reviewboard/static/rb/css/pages/text-review-ui.less b/reviewboard/static/rb/css/pages/text-review-ui.less index 73bd6c3bac417c140e045b2c2475d41433b83c90..c55bc89e3644e0d0471d071e781f581968234649 100644 --- a/reviewboard/static/rb/css/pages/text-review-ui.less +++ b/reviewboard/static/rb/css/pages/text-review-ui.less @@ -4,39 +4,53 @@ /**************************************************************************** * General text-based review styles ****************************************************************************/ -.text-review-ui { +.review-ui-box .text-review-ui { @header-padding: 8px; + .border-radius(@box-border-radius); + .review-ui-header { - .text-review-ui-views { - list-style: none; - margin: 1em 0 0 5em; - padding: 0; + /* + * We set this instead of turning off the border to keep the gradient from + * stopping too soon on Chrome and Firefox. + */ + border-bottom-color: transparent; - li { - background: lighten(@diff-file-color, 2%); - cursor: pointer; - display: inline-block; - margin: 0; - border: 1px @diff-file-border-color solid; - border-bottom: 0; - vertical-align: bottom; - .border-radius(@box-border-radius @box-border-radius 0 0); + .text-review-ui-views { + border-bottom: 1px @diff-file-border-color solid; - &.active { - background: lighten(@diff-file-color, 5%); + ul { + list-style: none; + margin: 1em 0 0 5em; + padding: 0; + + li { + background: lighten(@diff-file-color, 2%); + cursor: pointer; + display: inline-block; + margin: 0; + border: 1px @diff-file-border-color solid; + border-bottom: 0; + font-size: 110%; + font-weight: normal; + vertical-align: bottom; + .border-radius(@box-border-radius @box-border-radius 0 0); + + &.active { + background: lighten(@diff-file-color, 5%); + + a { + padding: 6px 12px; + } + } a { - padding: 6px 12px; + color: black; + display: block; + padding: 4px 12px; + text-decoration: none; } } - - a { - color: black; - display: block; - padding: 4px 12px; - text-decoration: none; - } } } } @@ -45,12 +59,16 @@ .text-review-ui-rendered-table { .border-radius(0 0 @box-inner-border-radius @box-inner-border-radius); + .revision-row th { + font-weight: bold; + } + tr:last-child { - td { + td:last-child { .border-radius(0 0 @box-inner-border-radius 0); } - th { + th:first-child { .border-radius(0 0 0 @box-inner-border-radius); } } @@ -64,6 +82,11 @@ text-align: center; padding: 2em; } + + .sidebyside { + .border-radius(0 0 @box-border-radius @box-border-radius); + margin-bottom: 0; + } } .text-review-ui-comment-thumbnail { diff --git a/reviewboard/static/rb/js/views/textBasedReviewableView.js b/reviewboard/static/rb/js/views/textBasedReviewableView.js index d4c8b0ce4a30d8f5ccd30c37af94f5a56f30ac39..507263ca6f95f3a3c728cc8f816178026c858b0c 100644 --- a/reviewboard/static/rb/js/views/textBasedReviewableView.js +++ b/reviewboard/static/rb/js/views/textBasedReviewableView.js @@ -102,32 +102,16 @@ RB.TextBasedReviewableView = RB.FileAttachmentReviewableView.extend({ $fileHeader = this.$('.review-ui-header'); if (this.model.get('numRevisions') > 1) { - $tr = $('') - .prependTo($fileHeader); - $td = $('') - .attr('colspan', hasDiff ? 4 : 2) - .appendTo($tr); - - $revisionSelector = $('
') - .appendTo($td); this._revisionSelectorView = new RB.FileAttachmentRevisionSelectorView({ - el: $revisionSelector, + el: $fileHeader.find('#attachment_revision_selector'), model: this.model }); this._revisionSelectorView.render(); this.listenTo(this._revisionSelectorView, 'revisionSelected', this._onRevisionSelected); - $tr = $('') - .prependTo($fileHeader); - $td = $('') - .attr('colspan', hasDiff ? 4 : 2) - .appendTo($tr); - - $revisionLabel = $('
') - .prependTo($td); this._revisionLabelView = new RB.FileAttachmentRevisionLabelView({ - el: $revisionLabel, + el: $fileHeader.find('#revision_label'), model: this.model }); this._revisionLabelView.render(); @@ -140,14 +124,13 @@ RB.TextBasedReviewableView = RB.FileAttachmentReviewableView.extend({ }); }, - /* + /* * Callback for when a new file revision is selected. * * This supports single revisions and diffs. If `base is 0, a * single revision is selected, If not, the diff between `base` and * `tip` will be shown. */ - _onRevisionSelected: function(revisions) { var revisionIDs = this.model.get('attachmentRevisionIDs'), base = revisions[0], diff --git a/reviewboard/templates/reviews/ui/_text_rendered_table.html b/reviewboard/templates/reviews/ui/_text_rendered_table.html new file mode 100644 index 0000000000000000000000000000000000000000..1eb4de48d6472e7713888b178d39be70e3de694d --- /dev/null +++ b/reviewboard/templates/reviews/ui/_text_rendered_table.html @@ -0,0 +1,29 @@ +{% extends "reviews/ui/_text_table.html" %} + +{% load i18n %} + +{% block table_class %}text-review-ui-rendered-table{% endblock %} + +{% block table_content %} +{% if diff_type_mismatch %} + + +{% if is_diff %} + +{% else %} + +{% endif %} +
+
+{% blocktrans %} + These revisions cannot be compared because they are different + file types. +{% endblocktrans %} +
+ + + +{% else %} +{{block.super}} +{% endif %} +{% endblock table_content %} diff --git a/reviewboard/templates/reviews/ui/_text_table.html b/reviewboard/templates/reviews/ui/_text_table.html new file mode 100644 index 0000000000000000000000000000000000000000..09964e4bf2c9fd66c46bcae23448cc0486ac615a --- /dev/null +++ b/reviewboard/templates/reviews/ui/_text_table.html @@ -0,0 +1,58 @@ +{% load i18n %} + + + +{% if is_diff %} + + +{% endif %} + + + + + + +{% if is_diff %} + + +{% endif %} + + + + + + +{% block table_content %} + +{% if is_diff %} +{% for line1, line2 in lines %} + + + + + + +{% endfor %} +{% else %} +{% for line in lines %} + + + + +{% endfor %} +{% endif %} + +{% endblock %} + diff --git a/reviewboard/templates/reviews/ui/text.html b/reviewboard/templates/reviews/ui/text.html index 0d1299bcf8b3c296c69b2b19e95b9bea54c6215a..c3a9ba78fea9447103d8b9b7e1a5c00fc4eb3029 100644 --- a/reviewboard/templates/reviews/ui/text.html +++ b/reviewboard/templates/reviews/ui/text.html @@ -7,113 +7,27 @@ {% block review_ui_box_content_inner %}
- - - -{% if is_diff %} - - -{% endif %} - - - - - - -{% if is_diff %} - -{% endif %} - - - {% if review_ui.can_render_text and not diff_type_mismatch %} - - - +
+ +
{% endif %} - - -{% if diff_type_mismatch %} - - -{% if is_diff %} - - - -{% else %} -{% if review_ui.can_render_text %} - -{% if is_diff %} -{% for line1, line2 in rendered_lines %} - - - - - - -{% endfor %} -{% else %} -{% for line in rendered_lines %} - - - - -{% endfor %} -{% endif %} - -{% endif %} + - -{% if is_diff %} -{% for line1, line2 in text_lines %} - - - - - - -{% endfor %} -{% else %} -{% for line in text_lines %} - - - - -{% endfor %} -{% endif %} - +{% if review_ui.can_render_text %} +{% include "reviews/ui/_text_rendered_table.html" with lines=rendered_lines %} {% endif %} -
-

- {{diff_caption|default:diff_filename}} -{% blocktrans %} - (revision {{diff_revision}}) -{% endblocktrans %} -

- 		-

- {{caption|default:filename}} +
{% if num_revisions > 1 %} -{% blocktrans %} - (revision {{revision}}) -{% endblocktrans %} +
+
{% endif %} -

-
- -
-{% else %} - -{% endif %} -
-
- {% trans "These revisions cannot be compared because they are different file types." %} -
-
{{forloop.counter}}{{line1}}{{forloop.counter}}{{line2}}
{{forloop.counter}}{{line}}
+ +{% include "reviews/ui/_text_table.html" with hide=review_ui.can_render_text lines=text_lines %}