diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index adb8716..75cb759 100755 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -9,5 +9,5 @@ jobs: - uses: actions/first-interaction@v1 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - issue-message: 'Thank you for createing this issue. We will check it as soon as possible.' + issue-message: 'Thank you for creating this issue. We will check it as soon as possible.' pr-message: 'Thank you for your pull request. We will check it as soon as possible.' diff --git a/Admin/Installer.php b/Admin/Installer.php index 8e6d6b0..b35185f 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -126,7 +126,14 @@ final class Installer extends InstallerAbstract /** @noinspection PhpIncludeInspection */ $moduleRoutes = include $data['path']; - self::$commands = \array_merge_recursive(self::$commands, $moduleRoutes); + $tmp = \array_merge_recursive(self::$commands, $moduleRoutes); + foreach ($tmp as $route => $endpoints) { + \usort($endpoints, function (array $a, array $b) { + return ($a['order'] ?? 0) <=> ($b['order'] ?? 0); + }); + + self::$commands[$route] = $endpoints; + } \file_put_contents(__DIR__ . '/SearchCommands.php', 'routeSearch($internalRequest, $internalResponse, $data); - $response->header = $internalResponse->header; - $responseData = \reset($temp); $view->data = empty($temp) || !\is_array($responseData) ? [] : $responseData; diff --git a/Theme/Backend/search-result.tpl.php b/Theme/Backend/search-result.tpl.php index cd1c7ee..0536c5c 100644 --- a/Theme/Backend/search-result.tpl.php +++ b/Theme/Backend/search-result.tpl.php @@ -1,4 +1,5 @@ data as $controller) : $first = \reset($controller); ?> -
-
-

-
-
-
-
-
- - - -
- - printHtml(\trim($data['title'])); ?> - - - -
- - - icon) ? '' : '' . $this->printHtml($tag->icon) . ''; ?> - printHtml($tag->getL11n()); ?> - - -
- - -
-
+
+

+ +
+
+
+ + + + +
+ + printHtml(\trim($data['title'])); ?> + + + +
+ + + icon) ? '' : '' . $this->printHtml($tag->icon) . ''; ?> + printHtml($tag->getL11n()); ?> + + +
+ + +
+
+
+
-
-
- - -
-
- -
printHtml($data['email']); ?> -
printHtml($data['phone']); ?> -
printHtml($data['city']); ?> -
+ $isEmpty = false; + ?> + - -
-
- -
+ +
+
+ + + + +
printHtml($data['email']); ?> + +
printHtml($data['phone']); ?> + +
printHtml($data['city']); ?> +
+
+
+ + +
+ +