3112: minor label updates

[arvados.git] / apps / workbench / app / views / application / _report_issue_popup.html.erb

diff --git a/apps/workbench/app/views/application/_report_issue_popup.html.erb b/apps/workbench/app/views/application/_report_issue_popup.html.erb
index c1534a162dc4e005f50e3faede49bd07f58958ba..31c76d09d9dedb545e7184b3c8b8e8524961c08f 100644 (file)
--- a/apps/workbench/app/views/application/_report_issue_popup.html.erb
+++ b/apps/workbench/app/views/application/_report_issue_popup.html.erb
@@ -1,15 +1,15 @@
 <%
   api_version = arvados_api_client.discovery[:source_version]
   generated_at = arvados_api_client.discovery[:generatedAt]
-  wb_version = Rails.configuration.source_version + ' ' + Rails.configuration.local_modified
+  wb_version = Rails.configuration.source_version
+  wb_version += Rails.configuration.source_version if Rails.configuration.local_modified
   arvados_base = Rails.configuration.arvados_v1_base
   support_email = Rails.configuration.support_email_address
 
   additional_info = {}
   additional_info['Current Location'] = @popup_params[:current_location]
-  if current_user
-    additional_info['User email'] = current_user.email
-  end
+  additional_info['User email'] = current_user.email if current_user
+
   additional_info_str = additional_info.map {|k,v| "#{k}=#{v}"}.join("\n")
 
   additional_info['api_version'] = api_version
@@ -17,7 +17,11 @@
   additional_info['workbench_version'] = wb_version
   additional_info['arvados_base'] = arvados_base
   additional_info['support_email'] = support_email
+  additional_info['error_message'] = @popup_params[:error_message] if @popup_params[:error_message]
+  additional_info['api_error_request_url'] = @popup_params[:api_error_request_url] if @popup_params[:api_error_request_url]
+  additional_info['api_error_response'] = @popup_params[:api_error_response] if @popup_params[:api_error_response]
 %>
+
 <div class="modal-dialog modal-with-loading-spinner">
   <div class="modal-content">
 
@@ -47,7 +51,7 @@
         </div>
 
         <div class="form-group">
-          <label for="server_version" class="col-sm-4 control-label"> Server Version </label>
+          <label for="server_version" class="col-sm-4 control-label"> Server version </label>
           <div class="col-sm-8">
             <p class="form-control-static" name="server_version"><%=api_version%></p>
           </div>
@@ -76,9 +80,9 @@
 
         <% if @popup_params[:popup_type] == 'report' %>
           <div class="form-group">
-            <label for="report_text" class="col-sm-4 control-label"> Report text </label>
+            <label for="report_text_label" class="col-sm-4 control-label"> Found a problem? Tell us what happened </label>
             <div class="col-sm-8">
-              <textarea class="form-control" rows="1" name="report_text" type="text"/>
+              <textarea class="form-control" rows="1" id="report_issue_text" name="report_issue_text" type="text"/>
             </div>
           </div>
         <% end %>