projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 4026-project-move-admin
[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 fbb7a117582e7f527cb1c9266d98df14a543c8c4..fe47fb08a5d0b355a83f90cd2f96abd9f3f7530c 100644
(file)
--- a/
apps/workbench/app/views/application/_report_issue_popup.html.erb
+++ b/
apps/workbench/app/views/application/_report_issue_popup.html.erb
@@
-43,7
+43,7
@@
<br/>
</div>
<br/>
</div>
- <div class="modal-body" style="
overflow-y:auto
">
+ <div class="modal-body" style="
height: 25em; overflow-y: scroll
">
<div class="form-group">
<label for="support_email" class="col-sm-4 control-label"> Support email </label>
<div class="col-sm-8">
<div class="form-group">
<label for="support_email" class="col-sm-4 control-label"> Support email </label>
<div class="col-sm-8">
@@
-62,35
+62,35
@@
<div class="form-group">
<label for="report_text_label" class="col-sm-4 control-label"> Describe the problem </label>
<div class="col-sm-8">
<div class="form-group">
<label for="report_text_label" class="col-sm-4 control-label"> Describe the problem </label>
<div class="col-sm-8">
- <textarea class="form-control" rows="4" id="report_issue_text" name="report_issue_text" type="text"/>
+ <textarea class="form-control" rows="4" id="report_issue_text" name="report_issue_text" type="text"
placeholder="Describe the problem"
/>
</div>
<input type="hidden" name="report_additional_info" value="<%=additional_info.to_json%>">
</div>
<% end %>
<div class="form-group">
</div>
<input type="hidden" name="report_additional_info" value="<%=additional_info.to_json%>">
</div>
<% end %>
<div class="form-group">
- <label for="
server_version" class="col-sm-4 control-label"> API
version </label>
+ <label for="
wb_version" class="col-sm-4 control-label"> Workbench
version </label>
<div class="col-sm-8">
<div class="col-sm-8">
- <p class="form-control-static" name="
server_version"><%=api
_version%></p>
+ <p class="form-control-static" name="
wb_version"><%=wb
_version%></p>
</div>
</div>
<div class="form-group">
</div>
</div>
<div class="form-group">
- <label for="
generated_at" class="col-sm-4 control-label"> API startup time
</label>
+ <label for="
server_version" class="col-sm-4 control-label"> API version
</label>
<div class="col-sm-8">
<div class="col-sm-8">
- <p class="form-control-static" name="
generated_at"><%=generated_at
%></p>
+ <p class="form-control-static" name="
server_version"><%=api_version
%></p>
</div>
</div>
<div class="form-group">
</div>
</div>
<div class="form-group">
- <label for="
wb_version" class="col-sm-4 control-label"> Workbench version
</label>
+ <label for="
generated_at" class="col-sm-4 control-label"> API startup time
</label>
<div class="col-sm-8">
<div class="col-sm-8">
- <p class="form-control-static" name="
wb_version"><%=wb_version
%></p>
+ <p class="form-control-static" name="
generated_at"><%=generated_at
%></p>
</div>
</div>
<div class="form-group">
</div>
</div>
<div class="form-group">
- <label for="arvados_base" class="col-sm-4 control-label">
Workbench URI
</label>
+ <label for="arvados_base" class="col-sm-4 control-label">
API address
</label>
<div class="col-sm-8">
<p class="form-control-static" name="arvados_base"><%=arvados_base%></p>
</div>
<div class="col-sm-8">
<p class="form-control-static" name="arvados_base"><%=arvados_base%></p>
</div>