summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--edit_interface.php7
-rw-r--r--includes/media_reorder.php30
2 files changed, 13 insertions, 24 deletions
diff --git a/edit_interface.php b/edit_interface.php
index f7a463bdda..a2505e4f37 100644
--- a/edit_interface.php
+++ b/edit_interface.php
@@ -1762,8 +1762,6 @@ case 'paste':
//------------------------------------------------------------------------------
case 'reorder_media': // Sort page using Popup
- require_once WT_ROOT.'js/prototype.js.htm';
- require_once WT_ROOT.'js/scriptaculous.js.htm';
require_once WT_ROOT.'includes/media_reorder.php';
break;
@@ -2269,8 +2267,6 @@ case 'reorder_update':
break;
//------------------------------------------------------------------------------
case 'reorder_fams':
- require_once WT_ROOT.'js/prototype.js.htm';
- require_once WT_ROOT.'js/scriptaculous.js.htm';
echo "<br /><b>", WT_I18N::translate('Reorder families'), "</b>", help_link('reorder_families');
?>
<form name="reorder_form" method="post" action="edit_interface.php">
@@ -2296,7 +2292,6 @@ case 'reorder_fams':
?>
</ul>
<?php echo WT_JS_START; ?>
-
jQuery(document).ready(function() {
jQuery("#reorder_list").sortable({forceHelperSize: true, forcePlaceholderSize: true, opacity: 0.7, cursor: 'move', axis: 'y'});
@@ -2309,8 +2304,6 @@ case 'reorder_fams':
);
});
});
-
-
<?php echo WT_JS_END; ?>
<button type="submit"><?php echo WT_I18N::translate('Save'); ?></button>
<button type="submit" onclick="document.reorder_form.action.value='reorder_fams'; document.reorder_form.submit();"><?php echo WT_I18N::translate('sort by date of marriage'); ?></button>
diff --git a/includes/media_reorder.php b/includes/media_reorder.php
index f30ece47f6..8200ca4617 100644
--- a/includes/media_reorder.php
+++ b/includes/media_reorder.php
@@ -164,24 +164,20 @@ require_once WT_ROOT.'includes/functions/functions_print_facts.php';
}
?>
</ul>
-<?php
-?>
- <script type="text/javascript">
- // <![CDATA[
- new Effect.BlindDown('reorder_media_list', {duration: .5});
- Sortable.create('reorder_media_list',
- {
- scroll:window,
- onUpdate : function() {
- inputs = $('reorder_media_list').getElementsByTagName('input');
- for (var i = 0; i < inputs.length; i++) {
- inputs[i].value = i;
+ <?php echo WT_JS_START; ?>
+ jQuery(document).ready(function() {
+ jQuery("#reorder_media_list").sortable({forceHelperSize: true, forcePlaceholderSize: true, opacity: 0.7, cursor: 'move', axis: 'y'});
+
+ //-- update the order numbers after drag-n-drop sorting is complete
+ jQuery('#reorder_media_list').bind('sortupdate', function(event, ui) {
+ jQuery('#'+jQuery(this).attr('id')+' input').each(
+ function (index, value) {
+ value.value = index+1;
}
- }
- }
- );
- // ]]>
- </script>
+ );
+ });
+ });
+ <?php echo WT_JS_END; ?>
<center>
<?php
if (WT_USER_IS_ADMIN) {