[ARVADOS] updated: b9b45283eb987cb59419b8714f8a06d7f7b6b8c3

git at public.curoverse.com git at public.curoverse.com
Mon Aug 18 11:15:50 EDT 2014


Summary of changes:
 apps/workbench/app/views/application/report_issue_popup.js.erb |  4 ++--
 apps/workbench/app/views/layouts/body.html.erb                 |  2 +-
 sdk/python/arvados/keep.py                                     | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

       via  b9b45283eb987cb59419b8714f8a06d7f7b6b8c3 (commit)
       via  eec85fb5cb128190d0c1eaf7f93b80de2c4cb0dc (commit)
       via  2077daccf5001f6b5564b52c3acd7f57d7b7d75e (commit)
       via  cd5fd1322bd1d38a6f478760df02b004b290d885 (commit)
      from  f563d941785cf9a4b3654d24b3c5d3da36557711 (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 b9b45283eb987cb59419b8714f8a06d7f7b6b8c3
Merge: eec85fb 2077dac
Author: radhika <radhika at curoverse.com>
Date:   Mon Aug 18 11:15:42 2014 -0400

    Merge branch 'master' into 3112-report-bug


commit eec85fb5cb128190d0c1eaf7f93b80de2c4cb0dc
Author: radhika <radhika at curoverse.com>
Date:   Mon Aug 18 11:15:06 2014 -0400

    3112: use alert-success and alert-danger when reporting ajax events after submitting a report.

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 48b66dc..799a881 100644
--- a/apps/workbench/app/views/application/report_issue_popup.js.erb
+++ b/apps/workbench/app/views/application/report_issue_popup.js.erb
@@ -28,14 +28,14 @@ $(document).
       var text = document.getElementById('report-issue-submit').firstChild;
       text.data = "Report sent";
       $('div').remove('.modal-footer-status');
-      $('.modal-footer').append('<div class="modal-footer-status pull-left"><div><p>Thanks for reporting this issue!</p></div></div>');
+      $('.modal-footer').append('<div class="modal-footer-status pull-left alert alert-success"><div><p>Thanks for reporting this issue!</p></div></div>');
     }
   }).
   on('ajax:failure', function() {
     var sendButton = document.getElementById('report-issue-submit');
     if (sendButton && sendButton.disabled) {
       $('div').remove('.modal-footer-status');
-      $('.modal-footer').append('<div class="modal-footer-status pull-left"></br><p>We are sorry. We could not submit your report! We really want this to work, though -- please try again.</p></div>');
+      $('.modal-footer').append('<div class="modal-footer-status pull-left alert alert-danger"></br><p>We are sorry. We could not submit your report! We really want this to work, though -- please try again.</p></div>');
       var text = document.getElementById('report-issue-submit').firstChild;
       text.data = "Report issue";
       sendButton.disabled = false;
diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index dd80822..5444676 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -40,7 +40,7 @@
           <li class="dropdown notification-menu">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="notifications-menu">
               <span class="badge badge-alert notification-count"><%= @notification_count %></span>
-              <%= current_user.email %>
+              <%= current_user.email %>▼
             </a>
             <ul class="dropdown-menu" role="menu">
               <li role="presentation" class="dropdown-header">

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list