[ARVADOS] updated: 1f225f2c8479adcaaa918df25455b69464263b2c

[git at public.curoverse.com]

Summary of changes:
 .../app/assets/javascripts/modal_pager.js          |  7 ++++
 .../application/_getting_started_popup.html.erb    |  1 +
 .../arvnodeman/computenode/driver/gce.py           | 45 ++++++++++++++++++----
 .../tests/test_computenode_driver_ec2.py           |  2 +-
 .../tests/test_computenode_driver_gce.py           | 38 +++++++++++++++++-
 services/nodemanager/tests/testutil.py             |  7 ++--
 6 files changed, 87 insertions(+), 13 deletions(-)

       via  1f225f2c8479adcaaa918df25455b69464263b2c (commit)
       via  dd532a66ecc0d7ac4a90786d3a4de0c5c00c414e (commit)
       via  d176328c5a9f95a3e7295d1341b4e6d88c0025f7 (commit)
       via  5dfdd042f8931fa7f001256471c0b624f768504c (commit)
       via  b8261deb6e1035134d7ce8f004cc49deeed1bd27 (commit)
      from  e59bc286dd018450cce0b662eeff8effe393d8ae (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 1f225f2c8479adcaaa918df25455b69464263b2c
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Sun Mar 29 09:26:27 2015 -0400

    5493: add pager-count where text such as "1 of 10" is shown.

diff --git a/apps/workbench/app/assets/javascripts/modal_pager.js b/apps/workbench/app/assets/javascripts/modal_pager.js
index 8d2bf2f..58cf7e4 100644
--- a/apps/workbench/app/assets/javascripts/modal_pager.js
+++ b/apps/workbench/app/assets/javascripts/modal_pager.js
@@ -4,6 +4,9 @@
 // one with class="pager-prev".
 //
 // 2. Put multiple .modal-body sections in your modal.
+//
+// 3. Add a "pager-count" div where page count is shown.
+// For ex: "1 of 10" when showing first page of 10 pages.
 
 $(document).on('click', '.modal .pager-next', function() {
     var $modal = $(this).parents('.modal');
@@ -26,6 +29,10 @@ $(document).on('click', '.modal .pager-next', function() {
     } else if (page < 0) {
         page = 0;
     }
+
+    var $pager_count = $('.pager-count', $modal);
+    $pager_count.text((page+1) + " of " + $panes.length);
+
     var selected = $panes.hide().eq(page).show();
     enableButton($('.pager-prev', $modal), page > 0);
     enableButton($('.pager-next', $modal), page < $panes.length - 1);
diff --git a/apps/workbench/app/views/application/_getting_started_popup.html.erb b/apps/workbench/app/views/application/_getting_started_popup.html.erb
index a12ae21..be20362 100644
--- a/apps/workbench/app/views/application/_getting_started_popup.html.erb
+++ b/apps/workbench/app/views/application/_getting_started_popup.html.erb
@@ -37,6 +37,7 @@
         <div style="text-align:center">
           <button class="btn btn-default pager-prev"><i class="fa fa-fw fa-chevron-left"></i><span style="font-weight: bold;"> Prev</span></button>
           <button class="btn btn-default pager-next"><span style="font-weight: bold;">Next </span><i class="fa fa-fw fa-chevron-right"></i></button>
+          <div class="pager-count pull-right"><span style="margin:5px"></span></div>
         </div>
       </div>
     </div>

commit dd532a66ecc0d7ac4a90786d3a4de0c5c00c414e
Merge: e59bc28 d176328
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Fri Mar 27 19:45:53 2015 -0400

    Merge branch 'master' into 5493-getting-started-modal


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


hooks/post-receive
--