Fix sortable for modern browsers.

diff --git a/lib/delivery.php b/lib/delivery.php
index 6d7643b..006112c 100644 (file)
--- a/lib/delivery.php
+++ b/lib/delivery.php
@@ -122,15 +122,15 @@
     }
 
     if ($count > 1) {
-      echo "<div class=\"sortable\">\n";
       echo "<p class=\"noprint\">Drag delivery details to reorder the schedule.</p>\n";
+      echo "<div class=\"sortable\">\n";
     }
 
     foreach ($orders as $order) {
       $contact = get_contact_by_id($order->getBeneficiaryId());
       if (! $contact) continue;
 
-      echo "<span>\n";
+      echo "<div>";
 
       $phones = array();
       $area = get_contact_area($contact);
@@ -169,7 +169,7 @@
       }
 
       echo "<hr>\n";
-      echo "</span>\n\n";
+      echo "</div>\n\n";
     }
 
     if ($count > 1) echo "</div>\n";

diff --git a/lib/header.php b/lib/header.php
index a2432d3..7c9cc08 100644 (file)
--- a/lib/header.php
+++ b/lib/header.php
@@ -2,9 +2,9 @@
 <link rel="stylesheet" type="text/css" href="/style.css">
 <title><?php echo "$charity"; if ($module) echo " - $module"; ?></title>
 <?php
-  echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"$http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css\">\n";
-  echo "<script src=\"$http://code.jquery.com/jquery-1.9.1.js\"></script>\n";
-  echo "<script src=\"$http://code.jquery.com/ui/1.10.3/jquery-ui.js\"></script>\n";
+  echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"$http://code.jquery.com/ui/1.12.1/themes/smoothness/jquery-ui.css\">\n";
+  echo "<script src=\"$http://code.jquery.com/jquery-1.12.4.js\"></script>\n";
+  echo "<script src=\"$http://code.jquery.com/ui/1.12.1/jquery-ui.js\"></script>\n";
 ?>
 <script src="/jquery.autosize.js"></script>
 <script src="/jquery.sortable.js"></script>

diff --git a/www/jquery.sortable.js b/www/jquery.sortable.js
index 3e59fe6..6395b52 100644 (file)
--- a/www/jquery.sortable.js
+++ b/www/jquery.sortable.js
@@ -1,7 +1,7 @@
 $(function() {
  $(".sortable").sortable({
    axis: "y",
-   containment: "parent",
+   containment: "document",
    placeholder: "sortplaceholder",
    forcePlaceholderSize: true,
    start: function( event, ui ) { ui.item.addClass('sortdragging'); },

diff --git a/www/style.css b/www/style.css
index 96c3cda..bda32bf 100644 (file)
--- a/www/style.css
+++ b/www/style.css
@@ -116,6 +116,7 @@ table.report > * > tr > td {
   border-radius: 0.5em;
   padding-bottom: 1em;
   background: #eeeeee;
+  opacity: 0.75;
 }
 
 span.sortdragging hr {