MozReview: Add 'review_request_actions_primary_mozreview.html' in anticipation for template changes. (Bug 1328280) r?smacleod draft
authorDavid Walsh <dwalsh@mozilla.com>
Tue, 03 Jan 2017 09:27:07 -0600
changeset 244 27adf6b7eea045ba9e20bd12c761251758fee54d
parent 240 a43db95e351dc88abf039c8c9ddeadd1dfa29189
child 245 4a955c098422b8cacaf874c632cd92878ab703dd
child 257 65d75dd8779b0b4103957abc959c78bd0ef8e6f6
push idunknown
push userunknown
push dateunknown
reviewerssmacleod
bugs1328280
MozReview: Add 'review_request_actions_primary_mozreview.html' in anticipation for template changes. (Bug 1328280) r?smacleod MozReview-Commit-ID: 1qdPWCBwlmF
reviewboard/reviewboard/templates/diffviewer/view_diff_mozreview.html
reviewboard/reviewboard/templates/reviews/review_detail_mozreview.html
reviewboard/reviewboard/templates/reviews/review_request_actions_primary_mozreview.html
reviewboard/reviewboard/templates/reviews/ui/base_mozreview.html
--- a/reviewboard/reviewboard/templates/diffviewer/view_diff_mozreview.html
+++ b/reviewboard/reviewboard/templates/diffviewer/view_diff_mozreview.html
@@ -48,17 +48,17 @@
    <ul class="actions actions-right-container">
 {%    diffviewer_dropdown_action_hooks %}
     <li class="has-menu">
      <a href="#" class="mobile-actions-menu-label"><span class="fa fa-ellipsis-h fa-lg"></span></a>
      <ul class="actions actions-right">
 {%    include "reviews/review_request_actions_secondary.html" %}
 {%    diffviewer_action_hooks %}
       <li id="download-diff" {% if interdiffset %}style="display: none;"{% endif %}><a href="raw/">{% trans "Download Diff" %}</a></li>
-{%    include "reviews/review_request_actions_primary.html" %}
+{%    include "reviews/review_request_actions_primary_mozreview.html" %}
      </ul>
     </li>
    </ul>
   </div>
  </div>
 
 <div class="main">
 {%    include "reviews/review_request_box.html" %}
new file mode 100644
--- /dev/null
+++ b/reviewboard/reviewboard/templates/reviews/review_detail_mozreview.html
@@ -0,0 +1,128 @@
+{% extends "reviews/reviewable_base_mozreview.html" %}
+{% load i18n djblets_deco djblets_extensions djblets_js rb_extensions reviewtags staticfiles tz %}
+
+{% block title %}{{review_request_details.summary}} | {% trans "Review Request" %}{% endblock %}
+
+{% block css %}
+{{block.super}}
+
+{%  if siteconfig_settings.diffviewer_show_trailing_whitespace %}
+<style type="text/css">
+  .ew { background: #ee3434; }
+</style>
+{%  endif %}
+{% endblock css %}
+
+{% block content %}
+<div id="review_request">
+ <div id="review_request_banners"></div>
+{% display_review_request_trophies review_request %}
+
+{% template_hook_point "mozreview-pre-review-request-box" %}
+
+{%  box "review-request" %}
+ <div class="review-request-header">
+  <ul class="actions page-tabs">
+   <li class="active"><a href="{{review_request.get_absolute_url}}">{% trans "Reviews" %}</a></li>
+{%   if has_diffs %}
+   <li><a href="{% url 'view-diff' review_request.display_id %}#index_header">{% trans "Diff" %}</a></li>
+{%   endif %}
+  </ul>
+
+  <div class="actions-container">
+   <ul class="actions actions-left">
+{%   if request.user.is_authenticated and review_request.status == 'P' %}
+    <li>{% star review_request %}</li>
+    <li class="has-menu">
+     <a class="menu-title" id="hide-review-request-link" href="#"><span class="rb-icon rb-icon-archive-off"></span></a>
+     <ul class="menu" id="hide-review-request-menu" style="display: none;"></ul>
+    </li>
+{%   endif %}
+   </ul>
+   <ul class="actions actions-right-container">
+    <li class="has-menu">
+     <a href="#" class="mobile-actions-menu-label"><span class="fa fa-ellipsis-h fa-lg"></span></a>
+     <ul class="actions actions-right">
+{%   review_request_action_hooks %}
+{%   review_request_dropdown_action_hooks %}
+{%   include "reviews/review_request_actions_secondary.html" %}
+{%   if has_diffs %}
+      <li><a href="diff/raw/">{% trans "Download Diff" %}</a></li>
+{%   endif %}
+{%   include "reviews/review_request_actions_primary_mozreview.html" %}
+     </ul>
+    </li>
+   </ul>
+  </div>
+ </div>
+
+ <div class="main">
+{%   include "reviews/review_request_box.html" %}
+ </div>
+{%  endbox "review-request" %}
+</div>
+
+<div id="reviews">
+ <ul id="view_controls">
+{%  if entries %}
+  <li>
+   <a href="#" id="expand-all">
+    <span class="fa fa-plus"></span>
+    <span>{% trans "Expand All" %}</span>
+   </a>
+  </li>
+  <li>
+   <a href="#" id="collapse-all">
+    <span class="fa fa-minus"></span>
+    <span>{% trans "Collapse All" %}</span>
+   </a>
+  </li>
+{%  endif %}
+ </ul>
+
+{%  for entry in entries %}
+{%   if entry.review %}
+{%    include "reviews/boxes/review.html" %}
+{%   elif entry.changedesc %}
+{%    include "reviews/boxes/change.html" %}
+{%   endif %}
+{%  endfor %}
+{% endblock content %}
+</div>
+
+{% block scripts-post %}
+{{block.super}}
+
+<script>
+    RB.PageManager.setPage(new RB.ReviewRequestPageView({
+{%  localtime off %}
+        lastActivityTimestamp: {{last_activity_time|json_dumps}},
+{%  endlocaltime %}
+{%  include "reviews/reviewable_page_data.js" %}
+    }));
+
+    RB.PageManager.beforeRender(function(page) {
+{%  for entry in entries %}
+{%   if entry.review %}
+{%    for comment in entry.comments.diff_comments %}
+        page.queueLoadDiff(
+            "{{comment.id}}",
+{%     if comment.interfilediff %}
+            "{{comment.filediff.id}}-{{comment.interfilediff.id}}"
+{%     else %}
+            "{{comment.filediff.id}}"
+{%     endif %}
+        );
+{%    endfor %}
+{%   endif %}
+{%  endfor %}
+    });
+
+{%  if request.GET.reply_id and request.GET.reply_type %}
+    RB.PageManager.ready(function(page) {
+        page.openCommentEditor("{{request.GET.reply_type}}",
+                               {{request.GET.reply_id}});
+    });
+{%  endif %}
+</script>
+{% endblock scripts-post %}
new file mode 100644
--- /dev/null
+++ b/reviewboard/reviewboard/templates/reviews/review_request_actions_primary_mozreview.html
@@ -0,0 +1,5 @@
+{% load i18n %}
+{% if request.user.is_authenticated %}
+ <li class="primary"><a id="review-link" href="#">{% trans "Review" %}</a></li>
+ <li class="primary"><a id="shipit-link" href="#">{% trans "Ship It!" %}</a></li>
+{% endif %}
new file mode 100644
--- /dev/null
+++ b/reviewboard/reviewboard/templates/reviews/ui/base_mozreview.html
@@ -0,0 +1,72 @@
+{% extends "reviews/reviewable_base_mozreview.html" %}
+{% load djblets_deco djblets_extensions djblets_js djblets_utils i18n reviewtags tz %}
+
+{% block title %}
+ {{review_ui.name}}{% if caption %}: {{caption}}{% endif %}
+{% endblock %}
+
+{% block css %}
+{{block.super}}
+{%  block review_ui_css %}{% endblock %}
+{% endblock %}
+
+{% block content %}
+{%  definevar "review_ui_box_content" %}{% block review_ui_box_content %}{% endblock %}{% enddefinevar %}
+
+<div id="review_request" class="review-ui-box{% if review_ui_box_content %} has-review-ui-box-content{% endif %}">
+{%  include "reviews/trophy_box.html" %}
+ <div id="review_request_banners"></div>
+
+{% template_hook_point "mozreview-pre-review-request-box" %}
+
+{%  box "review-request" %}
+ <div class="review-request-header">
+  <ul class="actions page-tabs">
+   <li><a href="{{review_request.get_absolute_url}}">{% trans "Reviews" %}</a></li>
+   <li class="active"><a href=".">{% trans "File" %}</a></li>
+{%   if has_diffs %}
+   <li><a href="{% url 'view-diff' review_request.display_id %}#index_header">{% trans "Diff" %}</a></li>
+{%   endif %}
+  </ul>
+
+  <div class="actions-container">
+   {% star review_request %}
+   <ul class="actions actions-right-container">
+    <li class="has-menu">
+     <a href="#" class="mobile-actions-menu-label"><span class="fa fa-ellipsis-h fa-lg"></span></a>
+     <ul class="actions actions-right">
+{%   include "reviews/review_request_actions_secondary.html" %}
+{%   if has_diffs %}
+      <li><a href="{% url 'raw-diff' review_request.display_id %}">{% trans "Download Diff" %}</a></li>
+{%   endif %}
+{%   include "reviews/review_request_actions_primary_mozreview.html" %}
+     </ul>
+    </li>
+   </ul>
+  </div>
+ </div>
+ <div class="content review-ui-box-content">
+  {{review_ui_box_content}}
+ </div>
+{%  endbox %}
+</div>
+
+<div class="review-ui-standalone">
+{%  block review_ui_content %}{% endblock %}
+</div>
+{% endblock %}
+
+{% block scripts-post %}
+{{block.super}}
+
+<script>
+    RB.PageManager.setPage(new RB.ReviewablePageView({
+{%  localtime off %}
+        lastActivityTimestamp: {{last_activity_time|json_dumps}},
+{%  endlocaltime %}
+{%  include "reviews/reviewable_page_data.js" %}
+    }));
+</script>
+
+{%  block review_ui_scripts %}{% endblock %}
+{% endblock %}