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 924787af6835b6fd65f5a5ece9cc7999511558f6..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,13 +1,27 @@
 <%
   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 = "User's email: " + current_user.email + "\n" +
-                    "Current Location: " + @popup_params[:current_location]
+  additional_info = {}
+  additional_info['Current Location'] = @popup_params[:current_location]
+  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
+  additional_info['generated_at'] = generated_at
+  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">
 
@@ -32,43 +46,43 @@
         <div class="form-group">
           <label for="support_version" class="col-sm-4 control-label"> Support email </label>
           <div class="col-sm-8">
-            <p class="form-control-static" id="support_version" name="support_version"><%=support_email%></p>
+            <p class="form-control-static" name="support_version"><%=support_email%></p>
           </div>
         </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" id="server_version" name="server_version"><%=api_version%></p>
+            <p class="form-control-static" name="server_version"><%=api_version%></p>
           </div>
         </div>
 
         <div class="form-group">
           <label for="generated_at" class="col-sm-4 control-label"> Server restarted at </label>
           <div class="col-sm-8">
-            <p class="form-control-static" id="generated_at" name="generated_at"><%=generated_at%></p>
+            <p class="form-control-static" name="generated_at"><%=generated_at%></p>
           </div>
         </div>
 
         <div class="form-group">
           <label for="wb_version" class="col-sm-4 control-label"> Workbench version </label>
           <div class="col-sm-8">
-            <p class="form-control-static" id="wb_version" name="wb_version"><%=wb_version%></p>
+            <p class="form-control-static" name="wb_version"><%=wb_version%></p>
           </div>
         </div>
 
         <div class="form-group">
           <label for="arvados_base" class="col-sm-4 control-label"> Arvados base </label>
           <div class="col-sm-8">
-            <p class="form-control-static" id="arvados_base" name="arvados_base"><%=arvados_base%></p>
+            <p class="form-control-static" name="arvados_base"><%=arvados_base%></p>
           </div>
         </div>
 
         <% 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" id="report_text" 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 %>
@@ -76,8 +90,9 @@
         <div class="form-group">
           <label for="additional_info" class="col-sm-4 control-label"> Additional info </label>
           <div class="col-sm-8">
-            <textarea readonly class="form-control" id="additional_info" rows="1" name="additional_info" type="text"><%=additional_info%></textarea>
+            <textarea readonly class="form-control" rows="1" name="additional_info" type="text"><%=additional_info_str%></textarea>
         </div>
+        <input type="hidden" name="report_additional_info" value="<%=additional_info.to_json%>">
       </div>
 
       <div class="modal-footer">