Changeset 3902:861a3d1a15f3

Timestamp:

10/22/18 14:46:15 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Use numeric fields (with min/max) for sortering items (categories, …), fix ordering of simple menu items when drag'n'drop is disabled

Files:

• admin/preferences.php (modified) (1 diff)
• plugins/antispam/index.php (modified) (2 diffs)
• plugins/blogroll/index.php (modified) (1 diff)
• plugins/simpleMenu/index.php (modified) (3 diffs)
• themes/ductile/_config.php (modified) (1 diff)

admin/preferences.php

@@ -700 +700 @@
         echo '<li id="fu-' . $id . '">' . '<label for="fuk-' . $id . '">' .
         '<img src="' . dc_admin_icon_url($fav['small-icon']) . '" alt="" /> ' . '<span class="zoom"><img src="' . dc_admin_icon_url($fav['large-icon']) . '" alt="" /></span>' .
-        form::field(['order[' . $id . ']'], 2, 3, [
+        form::number(['order[' . $id . ']'], [
+            'min'        => 1,
+            'max'        => count($user_fav),
             'default'    => $count,
             'class'      => 'position',

plugins/antispam/index.php

@@ -192 +192 @@
         '<tbody id="filters-list" >';
 
-    $i = 0;
+    $i = 1;
     foreach ($filters as $fid => $f) {
         $gui_link = '&nbsp;';
@@ -205 +205 @@
         '<tr class="line' . ($f->active ? '' : ' offline') . '" id="f_' . $fid . '">' .
         '<td class="handle">' . form::number(['f_order[' . $fid . ']'], [
-            'min'        => 0,
+            'min'        => 1,
+            'max'        => count($filters),
             'default'    => $i,
             'class'      => 'position',

plugins/blogroll/index.php

@@ -208 +208 @@
         echo
         '<tr class="line" id="l_' . $rs->link_id . '">' .
-        '<td class="handle minimal">' . form::field(['order[' . $rs->link_id . ']'], 2, 5, [
+        '<td class="handle minimal">' . form::number(['order[' . $rs->link_id . ']'], [
+            'min'        => 1,
+            'max'        => $rs->count(),
             'default'    => $position,
             'class'      => 'position',

plugins/simpleMenu/index.php

@@ -321 +321 @@
                 }
                 $menu = $newmenu;
+
+                $core->auth->user_prefs->addWorkspace('accessibility');
+                if ($core->auth->user_prefs->accessibility->nodragdrop) {
+                    # Order menu items
+                    $order = [];
+                    if (empty($_POST['im_order']) && !empty($_POST['order'])) {
+                        $order = $_POST['order'];
+                        asort($order);
+                        $order = array_keys($order);
+                    } elseif (!empty($_POST['im_order'])) {
+                        $order = $_POST['im_order'];
+                        if (substr($order, -1) == ',') {
+                            $order = substr($order, 0, strlen($order) - 1);
+                        }
+                        $order = explode(',', $order);
+                    }
+                    if (!empty($order)) {
+                        $newmenu = [];
+                        foreach ($order as $i => $k) {
+                            $newmenu[] = [
+                                'label' => $menu[$k]['label'],
+                                'descr' => $menu[$k]['descr'],
+                                'url'   => $menu[$k]['url']];
+                        }
+                        $menu = $newmenu;
+                    }
+                }
+
                 // Save menu in blog settings
                 $core->blog->settings->system->put('simpleMenu', $menu);
@@ -332 +360 @@
             }
         }
-
-        # Order menu items
-        $order = [];
-        if (empty($_POST['im_order']) && !empty($_POST['order'])) {
-            $order = $_POST['order'];
-            asort($order);
-            $order = array_keys($order);
-        } elseif (!empty($_POST['im_order'])) {
-            $order = $_POST['im_order'];
-            if (substr($order, -1) == ',') {
-                $order = substr($order, 0, strlen($order) - 1);
-            }
-            $order = explode(',', $order);
-        }
-
-        if (!empty($_POST['updateaction']) && !empty($order)) {
-            try {
-                $newmenu = [];
-                foreach ($order as $i => $k) {
-                    $newmenu[] = [
-                        'label' => $menu[$k]['label'],
-                        'descr' => $menu[$k]['descr'],
-                        'url'   => $menu[$k]['url']];
-                }
-                $menu = $newmenu;
-                // Save menu in blog settings
-                $core->blog->settings->system->put('simpleMenu', $menu);
-                $core->blog->triggerBlog();
-
-                // All done successfully, return to menu items list
-                dcPage::addSuccessNotice(__('Menu items have been successfully updated.'));
-                http::redirect($p_url);
-            } catch (Exception $e) {
-                $core->error->add($e->getMessage());
-            }
-        }
-
     }
 }
@@ -573 +564 @@
             form::number(['order[' . $i . ']'], [
                 'min'        => 1,
+                'max'        => count($menu),
                 'default'    => $count,
                 'class'      => 'position',

themes/ductile/_config.php

@@ -359 +359 @@
     '<td class="handle minimal">' . form::number(['order[' . $i . ']'], [
         'min'     => 0,
+        'max'     => count($ductile_stickers),
         'default' => $count,
         'class'   => 'position'