[ARVADOS] updated: f108142420e8d8376a822a8337074e084e8d90ca
git at public.curoverse.com
git at public.curoverse.com
Fri Aug 22 15:53:44 EDT 2014
Summary of changes:
.../app/views/application/_report_issue_popup.html.erb | 11 +++++++----
.../workbench/app/views/application/report_issue_popup.js.erb | 9 ++++-----
apps/workbench/app/views/layouts/body.html.erb | 6 +++---
3 files changed, 14 insertions(+), 12 deletions(-)
via f108142420e8d8376a822a8337074e084e8d90ca (commit)
via 23ba171bdbb34c78741b0a18cb6cf5a163158b10 (commit)
from a73e28177b78feb357070cf4f217fdff42615605 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit f108142420e8d8376a822a8337074e084e8d90ca
Author: radhika <radhika at curoverse.com>
Date: Fri Aug 22 15:51:08 2014 -0400
3112: reload current location when error report modal is closing. otherwise, the modal does not show up if the help menu dropdown option is used right after sending an error report from within the 404 page.
diff --git a/apps/workbench/app/views/application/report_issue_popup.js.erb b/apps/workbench/app/views/application/report_issue_popup.js.erb
index 5c15db3..5cfe502 100644
--- a/apps/workbench/app/views/application/report_issue_popup.js.erb
+++ b/apps/workbench/app/views/application/report_issue_popup.js.erb
@@ -1,2 +1,6 @@
$("#report-issue-modal-window").html("<%= escape_javascript(render partial: 'report_issue_popup') %>");
$("#report-issue-modal-window .modal").modal('show');
+
+$('#report-issue-modal-window').on('hidden.bs.modal', function () {
+ location.reload();
+})
commit 23ba171bdbb34c78741b0a18cb6cf5a163158b10
Author: radhika <radhika at curoverse.com>
Date: Fri Aug 22 15:31:32 2014 -0400
3112: modal is shown by js
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 f4f8551..e636550 100644
--- a/apps/workbench/app/views/application/_report_issue_popup.html.erb
+++ b/apps/workbench/app/views/application/_report_issue_popup.html.erb
@@ -23,7 +23,8 @@
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">
+ <div class="modal-dialog modal-with-loading-spinner">
<div class="modal-content">
<%= form_tag report_issue_path, {name: 'report-issue-form', method: 'post',
@@ -35,7 +36,7 @@
%>
<div class="modal-header">
- <button type="button" class="close" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">×</button>
+ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<div>
<div class="col-sm-8"> <h4 class="modal-title"><%=title%></h4> </div>
<div class="spinner spinner-32px spinner-h-center col-sm-1" hidden="true"></div>
@@ -143,11 +144,13 @@
<div class="modal-footer">
<% if @popup_params[:popup_type] == 'report' %>
<button type="submit" id="report-issue-submit" class="btn btn-primary report-issue-submit" autofocus>Send problem report</button>
- <button class="btn btn-default report-issue-cancel" id="report-issue-cancel" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">Cancel</button>
+ <button class="btn btn-default report-issue-cancel" id="report-issue-cancel" data-dismiss="modal" aria-hidden="true">Cancel</button>
<% else %>
- <button class="btn btn-default" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">Close</button>
+ <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
<% end %>
</div>
<% end #form %>
</div>
+ </div>
</div>
+
diff --git a/apps/workbench/app/views/application/report_issue_popup.js.erb b/apps/workbench/app/views/application/report_issue_popup.js.erb
index 59aedbc..5c15db3 100644
--- a/apps/workbench/app/views/application/report_issue_popup.js.erb
+++ b/apps/workbench/app/views/application/report_issue_popup.js.erb
@@ -1,7 +1,2 @@
$("#report-issue-modal-window").html("<%= escape_javascript(render partial: 'report_issue_popup') %>");
-
-// reset form input fields, for the next time around
-function reset_form() {
- $('#report_issue_text').val("");
- $('#additional_info').val("");
-}
+$("#report-issue-modal-window .modal").modal('show');
diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index ec8cdf2..3f95be3 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -138,12 +138,12 @@
<li><%= link_to raw('<i class="fa fa-book fa-fw"></i> SDK Reference'), "#{Rails.configuration.arvados_docsite}/sdk", target: "_blank" %></li>
<li role="presentation" class="divider"></li>
<li> <%= link_to report_issue_popup_path(popup_type: 'version', current_location: request.url, current_path: request.fullpath, action_method: 'post'),
- {class: 'report-issue-modal-window', 'data-toggle' => "modal", 'data-target' => '#report-issue-modal-window', :remote => true, return_to: request.url} do %>
+ {class: 'report-issue-modal-window', :remote => true, return_to: request.url} do %>
<i class="fa fa-fw fa-support"></i> Show version / debugging info ...
<% end %>
</li>
<li> <%= link_to report_issue_popup_path(popup_type: 'report', current_location: request.url, current_path: request.fullpath, action_method: 'post'),
- {class: 'report-issue-modal-window', 'data-toggle' => "modal", 'data-target' => '#report-issue-modal-window', :remote => true, return_to: request.url} do %>
+ {class: 'report-issue-modal-window', :remote => true, return_to: request.url} do %>
<i class="fa fa-fw fa-support"></i> Report a problem ...
<% end %>
</li>
@@ -213,4 +213,4 @@
<%= yield :footer_html %>
<div class="modal-container"></div>
-<div id="report-issue-modal-window" class="modal fade" role="dialog" aria-labelledby="report-issue-modal" aria-hidden="true"></div>
+<div id="report-issue-modal-window"></div>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list