From adac80cbbdadf6f520a1ef744534db9286e8219e Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 12 May 2024 00:06:29 +0000 Subject: [PATCH] bug fixes --- .github/workflows/greetings.yml | 2 +- Admin/Install/Tag.install.json | 9 ++ Admin/Install/Tag.php | 43 ++++++++ Admin/Install/db.json | 5 + Admin/Installer.php | 101 +++++++++++++++++++ Controller/ApiController.php | 1 + Models/Tag.php | 2 + Models/TagListTrait.php | 117 ++++++++++++++++++++++ Models/TagMapper.php | 1 + Theme/Backend/Lang/Navigation.ar.lang.php | 19 ---- Theme/Backend/Lang/Navigation.cs.lang.php | 19 ---- Theme/Backend/Lang/Navigation.da.lang.php | 19 ---- Theme/Backend/Lang/Navigation.el.lang.php | 19 ---- Theme/Backend/Lang/Navigation.es.lang.php | 19 ---- Theme/Backend/Lang/Navigation.fi.lang.php | 19 ---- Theme/Backend/Lang/Navigation.fr.lang.php | 19 ---- Theme/Backend/Lang/Navigation.hu.lang.php | 19 ---- Theme/Backend/Lang/Navigation.it.lang.php | 19 ---- Theme/Backend/Lang/Navigation.ja.lang.php | 19 ---- Theme/Backend/Lang/Navigation.ko.lang.php | 19 ---- Theme/Backend/Lang/Navigation.no.lang.php | 19 ---- Theme/Backend/Lang/Navigation.pl.lang.php | 19 ---- Theme/Backend/Lang/Navigation.pt.lang.php | 19 ---- Theme/Backend/Lang/Navigation.ru.lang.php | 19 ---- Theme/Backend/Lang/Navigation.sv.lang.php | 19 ---- Theme/Backend/Lang/Navigation.th.lang.php | 19 ---- Theme/Backend/Lang/Navigation.tr.lang.php | 19 ---- Theme/Backend/Lang/Navigation.uk.lang.php | 19 ---- Theme/Backend/Lang/Navigation.zh.lang.php | 19 ---- Theme/Backend/Lang/ar.lang.php | 24 ----- Theme/Backend/Lang/cs.lang.php | 24 ----- Theme/Backend/Lang/da.lang.php | 24 ----- Theme/Backend/Lang/de.lang.php | 1 + Theme/Backend/Lang/el.lang.php | 24 ----- Theme/Backend/Lang/en.lang.php | 1 + Theme/Backend/Lang/es.lang.php | 24 ----- Theme/Backend/Lang/fi.lang.php | 24 ----- Theme/Backend/Lang/fr.lang.php | 24 ----- Theme/Backend/Lang/hu.lang.php | 24 ----- Theme/Backend/Lang/it.lang.php | 24 ----- Theme/Backend/Lang/ja.lang.php | 24 ----- Theme/Backend/Lang/ko.lang.php | 24 ----- Theme/Backend/Lang/no.lang.php | 24 ----- Theme/Backend/Lang/pl.lang.php | 24 ----- Theme/Backend/Lang/pt.lang.php | 24 ----- Theme/Backend/Lang/ru.lang.php | 24 ----- Theme/Backend/Lang/sv.lang.php | 24 ----- Theme/Backend/Lang/th.lang.php | 24 ----- Theme/Backend/Lang/tr.lang.php | 24 ----- Theme/Backend/Lang/uk.lang.php | 24 ----- Theme/Backend/Lang/zh.lang.php | 24 ----- Theme/Backend/tag-list.tpl.php | 11 +- Theme/Backend/tag-view.tpl.php | 9 +- info.json | 3 +- 54 files changed, 297 insertions(+), 869 deletions(-) create mode 100644 Admin/Install/Tag.install.json create mode 100644 Admin/Install/Tag.php create mode 100644 Models/TagListTrait.php delete mode 100755 Theme/Backend/Lang/Navigation.ar.lang.php delete mode 100755 Theme/Backend/Lang/Navigation.cs.lang.php delete mode 100755 Theme/Backend/Lang/Navigation.da.lang.php delete mode 100755 Theme/Backend/Lang/Navigation.el.lang.php delete mode 100755 Theme/Backend/Lang/Navigation.es.lang.php delete mode 100755 Theme/Backend/Lang/Navigation.fi.lang.php delete mode 100755 Theme/Backend/Lang/Navigation.fr.lang.php delete mode 100755 Theme/Backend/Lang/Navigation.hu.lang.php delete mode 100755 Theme/Backend/Lang/Navigation.it.lang.php delete mode 100755 Theme/Backend/Lang/Navigation.ja.lang.php delete mode 100755 Theme/Backend/Lang/Navigation.ko.lang.php delete mode 100755 Theme/Backend/Lang/Navigation.no.lang.php delete mode 100755 Theme/Backend/Lang/Navigation.pl.lang.php delete mode 100755 Theme/Backend/Lang/Navigation.pt.lang.php delete mode 100755 Theme/Backend/Lang/Navigation.ru.lang.php delete mode 100755 Theme/Backend/Lang/Navigation.sv.lang.php delete mode 100755 Theme/Backend/Lang/Navigation.th.lang.php delete mode 100755 Theme/Backend/Lang/Navigation.tr.lang.php delete mode 100755 Theme/Backend/Lang/Navigation.uk.lang.php delete mode 100755 Theme/Backend/Lang/Navigation.zh.lang.php delete mode 100755 Theme/Backend/Lang/ar.lang.php delete mode 100755 Theme/Backend/Lang/cs.lang.php delete mode 100755 Theme/Backend/Lang/da.lang.php delete mode 100755 Theme/Backend/Lang/el.lang.php delete mode 100755 Theme/Backend/Lang/es.lang.php delete mode 100755 Theme/Backend/Lang/fi.lang.php delete mode 100755 Theme/Backend/Lang/fr.lang.php delete mode 100755 Theme/Backend/Lang/hu.lang.php delete mode 100755 Theme/Backend/Lang/it.lang.php delete mode 100755 Theme/Backend/Lang/ja.lang.php delete mode 100755 Theme/Backend/Lang/ko.lang.php delete mode 100755 Theme/Backend/Lang/no.lang.php delete mode 100755 Theme/Backend/Lang/pl.lang.php delete mode 100755 Theme/Backend/Lang/pt.lang.php delete mode 100755 Theme/Backend/Lang/ru.lang.php delete mode 100755 Theme/Backend/Lang/sv.lang.php delete mode 100755 Theme/Backend/Lang/th.lang.php delete mode 100755 Theme/Backend/Lang/tr.lang.php delete mode 100755 Theme/Backend/Lang/uk.lang.php delete mode 100755 Theme/Backend/Lang/zh.lang.php 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/Install/Tag.install.json b/Admin/Install/Tag.install.json new file mode 100644 index 0000000..040588b --- /dev/null +++ b/Admin/Install/Tag.install.json @@ -0,0 +1,9 @@ +[ + { + "name": "profile_image", + "l11n": { + "en": "Profile Image", + "de": "Profilbild" + } + } +] \ No newline at end of file diff --git a/Admin/Install/Tag.php b/Admin/Install/Tag.php new file mode 100644 index 0000000..fd50888 --- /dev/null +++ b/Admin/Install/Tag.php @@ -0,0 +1,43 @@ + __DIR__ . '/Tag.install.json']); + } +} diff --git a/Admin/Install/db.json b/Admin/Install/db.json index 89a6679..a4b59ed 100755 --- a/Admin/Install/db.json +++ b/Admin/Install/db.json @@ -9,6 +9,11 @@ "primary": true, "autoincrement": true }, + "tag_name": { + "name": "tag_name", + "type": "VARCHAR(255)", + "null": false + }, "tag_color": { "name": "tag_color", "type": "VARCHAR(9)", diff --git a/Admin/Installer.php b/Admin/Installer.php index 2988ba4..92ab2d9 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -14,7 +14,15 @@ declare(strict_types=1); namespace Modules\Tag\Admin; +use Modules\Admin\Models\AccountMapper; +use Modules\Admin\Models\NullAccount; +use phpOMS\Application\ApplicationAbstract; +use phpOMS\Config\SettingsInterface; +use phpOMS\Message\Http\HttpRequest; +use phpOMS\Message\Http\HttpResponse; use phpOMS\Module\InstallerAbstract; +use phpOMS\Module\ModuleInfo; +use phpOMS\System\File\PathException; /** * Installer class. @@ -33,4 +41,97 @@ final class Installer extends InstallerAbstract * @since 1.0.0 */ public const PATH = __DIR__; + + /** + * {@inheritdoc} + */ + public static function install(ApplicationAbstract $app, ModuleInfo $info, SettingsInterface $cfgHandler) : void + { + parent::install($app, $info, $cfgHandler); + } + + /** + * Install data from providing modules. + * + * The data can be either directories which should be created or files which should be "uploaded" + * + * @param ApplicationAbstract $app Application + * @param array $data Additional data + * + * @return array + * + * @throws PathException + * @throws \Exception + * + * @since 1.0.0 + */ + public static function installExternal(ApplicationAbstract $app, array $data) : array + { + if (!\is_file($data['path'] ?? '')) { + throw new PathException($data['path'] ?? ''); + } + + $tagFile = \file_get_contents($data['path'] ?? ''); + if ($tagFile === false) { + throw new PathException($data['path'] ?? ''); // @codeCoverageIgnore + } + + $tagData = \json_decode($tagFile, true) ?? []; + if ($tagData === false) { + throw new \Exception(); // @codeCoverageIgnore + } + + /** @var \Modules\Tag\Controller\ApiController $module */ + $module = $app->moduleManager->get('Tag', 'Api'); + + $tags = []; + + foreach ($tagData as $tag) { + $response = new HttpResponse(); + $request = new HttpRequest(); + + $request->header->account = 1; + $request->setData('name', $tag['name'] ?? ''); + $request->setData('color', $tag['color'] ?? '#3697db'); + + if (!empty($tag['l11n'])) { + $request->setData('title', \reset($tag['l11n'])); + $request->setData('lang', \array_keys($tag['l11n'])[0] ?? 'en'); + } + + $module->apiTagCreate($request, $response); + + $responseData = $response->getData(''); + if (!\is_array($responseData)) { + return []; + } + + $type = $responseData['response']; + $id = $type->id; + + $isFirst = true; + foreach ($tag['l11n'] as $language => $l11n) { + if ($isFirst) { + $isFirst = false; + continue; + } + + $response = new HttpResponse(); + $request = new HttpRequest(); + + $request->header->account = 1; + $request->setData('title', $l11n); + $request->setData('lang', $language); + $request->setData('type', $id); + + $module->apiTagL11nCreate($request, $response); + } + + $tags[] = \is_array($type) + ? $type + : $type->toArray(); + } + + return $tags; + } } diff --git a/Controller/ApiController.php b/Controller/ApiController.php index c2e7a88..dbac84c 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -223,6 +223,7 @@ final class ApiController extends Controller private function createTagFromRequest(RequestAbstract $request) : Tag { $tag = new Tag(); + $tag->name = $request->getDataString('name') ?? ''; $tag->color = \str_pad($request->getDataString('color') ?? '#000000ff', 9, 'f'); $tag->icon = $request->getDataString('icon') ?? ''; diff --git a/Models/Tag.php b/Models/Tag.php index 4b476ac..0569afd 100755 --- a/Models/Tag.php +++ b/Models/Tag.php @@ -36,6 +36,8 @@ class Tag implements \JsonSerializable */ public int $id = 0; + public string $name = ''; + /** * Title. * diff --git a/Models/TagListTrait.php b/Models/TagListTrait.php new file mode 100644 index 0000000..ce2857d --- /dev/null +++ b/Models/TagListTrait.php @@ -0,0 +1,117 @@ +tags as $tag) { + if ($tag->id === $type) { + return $tag; + } + } + + return new NullTag(); + } + + /** + * Get all media tags by type name + * + * @param string $type Tag type + * + * @return Tag + * + * @since 1.0.0 + */ + public function getTagByTypeName(string $type) : Tag + { + foreach ($this->tags as $tag) { + if ($tag->name === $type) { + return $tag; + } + } + + return new NullTag(); + } + + /** + * Get all media tags by type name + * + * @param string $type Tag type + * + * @return Tag[] + * + * @since 1.0.0 + */ + public function getTagsByTypeName(string $type) : array + { + $tags = []; + foreach ($this->tags as $tag) { + if ($tag->name === $type) { + $tags[] = $tag; + } + } + + return $tags; + } + + /** + * Check if tag with a certain type name exists + * + * @param string $type Type name + * + * @return bool + * + * @since 1.0.0 + */ + public function hasTagTypeName(string $type) : bool + { + foreach ($this->tags as $tag) { + if ($tag->name === $type) { + return true; + } + } + + return false; + } +} diff --git a/Models/TagMapper.php b/Models/TagMapper.php index bb1fb74..e65dbee 100755 --- a/Models/TagMapper.php +++ b/Models/TagMapper.php @@ -37,6 +37,7 @@ final class TagMapper extends DataMapperFactory */ public const COLUMNS = [ 'tag_id' => ['name' => 'tag_id', 'type' => 'int', 'internal' => 'id'], + 'tag_name' => ['name' => 'tag_name', 'type' => 'string', 'internal' => 'name'], 'tag_color' => ['name' => 'tag_color', 'type' => 'string', 'internal' => 'color'], 'tag_icon' => ['name' => 'tag_icon', 'type' => 'string', 'internal' => 'icon'], 'tag_type' => ['name' => 'tag_type', 'type' => 'int', 'internal' => 'type'], diff --git a/Theme/Backend/Lang/Navigation.ar.lang.php b/Theme/Backend/Lang/Navigation.ar.lang.php deleted file mode 100755 index 47855a6..0000000 --- a/Theme/Backend/Lang/Navigation.ar.lang.php +++ /dev/null @@ -1,19 +0,0 @@ - [ - 'Create' => 'يخلق', - 'List' => 'قائمة', - 'Tag' => 'بطاقة شعار', -]]; diff --git a/Theme/Backend/Lang/Navigation.cs.lang.php b/Theme/Backend/Lang/Navigation.cs.lang.php deleted file mode 100755 index 8d0d5a6..0000000 --- a/Theme/Backend/Lang/Navigation.cs.lang.php +++ /dev/null @@ -1,19 +0,0 @@ - [ - 'Create' => 'Vytvořit', - 'List' => 'Seznam', - 'Tag' => 'Štítek', -]]; diff --git a/Theme/Backend/Lang/Navigation.da.lang.php b/Theme/Backend/Lang/Navigation.da.lang.php deleted file mode 100755 index 339d13c..0000000 --- a/Theme/Backend/Lang/Navigation.da.lang.php +++ /dev/null @@ -1,19 +0,0 @@ - [ - 'Create' => 'skab', - 'List' => 'Liste', - 'Tag' => 'Tag.', -]]; diff --git a/Theme/Backend/Lang/Navigation.el.lang.php b/Theme/Backend/Lang/Navigation.el.lang.php deleted file mode 100755 index f14fc2d..0000000 --- a/Theme/Backend/Lang/Navigation.el.lang.php +++ /dev/null @@ -1,19 +0,0 @@ - [ - 'Create' => 'Δημιουργώ', - 'List' => 'Λίστα', - 'Tag' => 'Ετικέτα', -]]; diff --git a/Theme/Backend/Lang/Navigation.es.lang.php b/Theme/Backend/Lang/Navigation.es.lang.php deleted file mode 100755 index 6353f12..0000000 --- a/Theme/Backend/Lang/Navigation.es.lang.php +++ /dev/null @@ -1,19 +0,0 @@ - [ - 'Create' => 'Crear', - 'List' => 'Lista', - 'Tag' => 'Etiqueta', -]]; diff --git a/Theme/Backend/Lang/Navigation.fi.lang.php b/Theme/Backend/Lang/Navigation.fi.lang.php deleted file mode 100755 index 978a940..0000000 --- a/Theme/Backend/Lang/Navigation.fi.lang.php +++ /dev/null @@ -1,19 +0,0 @@ - [ - 'Create' => 'Luoda', - 'List' => 'Lista', - 'Tag' => 'Tag', -]]; diff --git a/Theme/Backend/Lang/Navigation.fr.lang.php b/Theme/Backend/Lang/Navigation.fr.lang.php deleted file mode 100755 index 2b1fe76..0000000 --- a/Theme/Backend/Lang/Navigation.fr.lang.php +++ /dev/null @@ -1,19 +0,0 @@ - [ - 'Create' => 'Créer', - 'List' => 'Lister', - 'Tag' => 'Étiqueter', -]]; diff --git a/Theme/Backend/Lang/Navigation.hu.lang.php b/Theme/Backend/Lang/Navigation.hu.lang.php deleted file mode 100755 index f1528c2..0000000 --- a/Theme/Backend/Lang/Navigation.hu.lang.php +++ /dev/null @@ -1,19 +0,0 @@ - [ - 'Create' => 'Teremt', - 'List' => 'Lista', - 'Tag' => 'Címke', -]]; diff --git a/Theme/Backend/Lang/Navigation.it.lang.php b/Theme/Backend/Lang/Navigation.it.lang.php deleted file mode 100755 index e363fb2..0000000 --- a/Theme/Backend/Lang/Navigation.it.lang.php +++ /dev/null @@ -1,19 +0,0 @@ - [ - 'Create' => 'Creare', - 'List' => 'Elenco', - 'Tag' => 'Etichetta', -]]; diff --git a/Theme/Backend/Lang/Navigation.ja.lang.php b/Theme/Backend/Lang/Navigation.ja.lang.php deleted file mode 100755 index 5976692..0000000 --- a/Theme/Backend/Lang/Navigation.ja.lang.php +++ /dev/null @@ -1,19 +0,0 @@ - [ - 'Create' => '作成', - 'List' => 'リスト', - 'Tag' => '鬼ごっこ', -]]; diff --git a/Theme/Backend/Lang/Navigation.ko.lang.php b/Theme/Backend/Lang/Navigation.ko.lang.php deleted file mode 100755 index fe75620..0000000 --- a/Theme/Backend/Lang/Navigation.ko.lang.php +++ /dev/null @@ -1,19 +0,0 @@ - [ - 'Create' => '만들다', - 'List' => '목록', - 'Tag' => '꼬리표', -]]; diff --git a/Theme/Backend/Lang/Navigation.no.lang.php b/Theme/Backend/Lang/Navigation.no.lang.php deleted file mode 100755 index 904fed4..0000000 --- a/Theme/Backend/Lang/Navigation.no.lang.php +++ /dev/null @@ -1,19 +0,0 @@ - [ - 'Create' => 'Skape', - 'List' => 'Liste', - 'Tag' => 'stikkord', -]]; diff --git a/Theme/Backend/Lang/Navigation.pl.lang.php b/Theme/Backend/Lang/Navigation.pl.lang.php deleted file mode 100755 index 18b1aed..0000000 --- a/Theme/Backend/Lang/Navigation.pl.lang.php +++ /dev/null @@ -1,19 +0,0 @@ - [ - 'Create' => 'Tworzyć', - 'List' => 'Lista', - 'Tag' => 'Etykietka', -]]; diff --git a/Theme/Backend/Lang/Navigation.pt.lang.php b/Theme/Backend/Lang/Navigation.pt.lang.php deleted file mode 100755 index 4547842..0000000 --- a/Theme/Backend/Lang/Navigation.pt.lang.php +++ /dev/null @@ -1,19 +0,0 @@ - [ - 'Create' => 'Crio', - 'List' => 'Lista', - 'Tag' => 'Marcação', -]]; diff --git a/Theme/Backend/Lang/Navigation.ru.lang.php b/Theme/Backend/Lang/Navigation.ru.lang.php deleted file mode 100755 index aa93df3..0000000 --- a/Theme/Backend/Lang/Navigation.ru.lang.php +++ /dev/null @@ -1,19 +0,0 @@ - [ - 'Create' => 'Создавать', - 'List' => 'Список', - 'Tag' => 'Тег', -]]; diff --git a/Theme/Backend/Lang/Navigation.sv.lang.php b/Theme/Backend/Lang/Navigation.sv.lang.php deleted file mode 100755 index b2720ff..0000000 --- a/Theme/Backend/Lang/Navigation.sv.lang.php +++ /dev/null @@ -1,19 +0,0 @@ - [ - 'Create' => 'Skapa', - 'List' => 'Lista', - 'Tag' => 'Märka', -]]; diff --git a/Theme/Backend/Lang/Navigation.th.lang.php b/Theme/Backend/Lang/Navigation.th.lang.php deleted file mode 100755 index 213f808..0000000 --- a/Theme/Backend/Lang/Navigation.th.lang.php +++ /dev/null @@ -1,19 +0,0 @@ - [ - 'Create' => 'สร้าง', - 'List' => 'รายการ', - 'Tag' => 'แท็ก', -]]; diff --git a/Theme/Backend/Lang/Navigation.tr.lang.php b/Theme/Backend/Lang/Navigation.tr.lang.php deleted file mode 100755 index 57ce9a7..0000000 --- a/Theme/Backend/Lang/Navigation.tr.lang.php +++ /dev/null @@ -1,19 +0,0 @@ - [ - 'Create' => 'Yaratmak', - 'List' => 'Liste', - 'Tag' => 'Etiket', -]]; diff --git a/Theme/Backend/Lang/Navigation.uk.lang.php b/Theme/Backend/Lang/Navigation.uk.lang.php deleted file mode 100755 index 06efe8f..0000000 --- a/Theme/Backend/Lang/Navigation.uk.lang.php +++ /dev/null @@ -1,19 +0,0 @@ - [ - 'Create' => 'Створювати', - 'List' => 'Список', - 'Tag' => 'Тег', -]]; diff --git a/Theme/Backend/Lang/Navigation.zh.lang.php b/Theme/Backend/Lang/Navigation.zh.lang.php deleted file mode 100755 index 36a4575..0000000 --- a/Theme/Backend/Lang/Navigation.zh.lang.php +++ /dev/null @@ -1,19 +0,0 @@ - [ - 'Create' => '创建', - 'List' => '列表', - 'Tag' => '标签', -]]; diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php deleted file mode 100755 index cf0b71a..0000000 --- a/Theme/Backend/Lang/ar.lang.php +++ /dev/null @@ -1,24 +0,0 @@ - [ - 'Color' => 'اللون', - 'Create' => 'يخلق', - 'Icon' => 'أيقونة', - 'Language' => 'لغة', - 'List' => 'قائمة', - 'Tag' => 'بطاقة شعار', - 'Tags' => 'كذا', - 'Title' => 'عنوان', -]]; diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php deleted file mode 100755 index d0ceb35..0000000 --- a/Theme/Backend/Lang/cs.lang.php +++ /dev/null @@ -1,24 +0,0 @@ - [ - 'Color' => 'Barva', - 'Create' => 'Vytvořit', - 'Icon' => 'Ikona', - 'Language' => 'Jazyk', - 'List' => 'Seznam', - 'Tag' => 'Štítek', - 'Tags' => 'Tagy', - 'Title' => 'Titul', -]]; diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php deleted file mode 100755 index bd7c7e5..0000000 --- a/Theme/Backend/Lang/da.lang.php +++ /dev/null @@ -1,24 +0,0 @@ - [ - 'Color' => 'Farve', - 'Create' => 'skab', - 'Icon' => 'Ikon.', - 'Language' => 'Sprog', - 'List' => 'Liste', - 'Tag' => 'Tag.', - 'Tags' => 'Tags.', - 'Title' => 'Titel', -]]; diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index 31c5195..073fb70 100755 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -21,4 +21,5 @@ return ['Tag' => [ 'Tag' => 'Stichwort', 'Tags' => 'Stichworte', 'Title' => 'Titel', + 'InternalName' => 'Interner Name', ]]; diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php deleted file mode 100755 index 300a3fc..0000000 --- a/Theme/Backend/Lang/el.lang.php +++ /dev/null @@ -1,24 +0,0 @@ - [ - 'Color' => 'Χρώμα', - 'Create' => 'Δημιουργώ', - 'Icon' => 'Εικόνισμα', - 'Language' => 'Γλώσσα', - 'List' => 'Λίστα', - 'Tag' => 'Ετικέτα', - 'Tags' => 'Ετικέτες', - 'Title' => 'Τίτλος', -]]; diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 498b2aa..1719a46 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -21,4 +21,5 @@ return ['Tag' => [ 'Tag' => 'Tag', 'Tags' => 'Tags', 'Title' => 'Title', + 'InternalName' => 'Internal Name', ]]; diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php deleted file mode 100755 index 4e5cc08..0000000 --- a/Theme/Backend/Lang/es.lang.php +++ /dev/null @@ -1,24 +0,0 @@ - [ - 'Color' => 'Color', - 'Create' => 'Crear', - 'Icon' => 'Icono', - 'Language' => 'Idioma', - 'List' => 'Lista', - 'Tag' => 'Etiqueta', - 'Tags' => 'Etiquetas', - 'Title' => 'Título', -]]; diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php deleted file mode 100755 index 3a1f44e..0000000 --- a/Theme/Backend/Lang/fi.lang.php +++ /dev/null @@ -1,24 +0,0 @@ - [ - 'Color' => 'Väri', - 'Create' => 'Luoda', - 'Icon' => 'Kuvake', - 'Language' => 'Kieli', - 'List' => 'Lista', - 'Tag' => 'Tag', - 'Tags' => 'Tunnisteet', - 'Title' => 'Otsikko', -]]; diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php deleted file mode 100755 index a786734..0000000 --- a/Theme/Backend/Lang/fr.lang.php +++ /dev/null @@ -1,24 +0,0 @@ - [ - 'Color' => 'Couleur', - 'Create' => 'Créer', - 'Icon' => 'Icône', - 'Language' => 'Langue', - 'List' => 'Lister', - 'Tag' => 'Étiqueter', - 'Tags' => 'Mots clés', - 'Title' => 'Titre', -]]; diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php deleted file mode 100755 index a771127..0000000 --- a/Theme/Backend/Lang/hu.lang.php +++ /dev/null @@ -1,24 +0,0 @@ - [ - 'Color' => 'Szín', - 'Create' => 'Teremt', - 'Icon' => 'Ikon', - 'Language' => 'Nyelv', - 'List' => 'Lista', - 'Tag' => 'Címke', - 'Tags' => 'Címkék', - 'Title' => 'Cím', -]]; diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php deleted file mode 100755 index 196a6b7..0000000 --- a/Theme/Backend/Lang/it.lang.php +++ /dev/null @@ -1,24 +0,0 @@ - [ - 'Color' => 'Colore', - 'Create' => 'Creare', - 'Icon' => 'Icona', - 'Language' => 'Lingua', - 'List' => 'Elenco', - 'Tag' => 'Etichetta', - 'Tags' => 'Tags.', - 'Title' => 'Titolo', -]]; diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php deleted file mode 100755 index 615f761..0000000 --- a/Theme/Backend/Lang/ja.lang.php +++ /dev/null @@ -1,24 +0,0 @@ - [ - 'Color' => '色', - 'Create' => '作成', - 'Icon' => 'アイコン', - 'Language' => '言語', - 'List' => 'リスト', - 'Tag' => '鬼ごっこ', - 'Tags' => 'タグ', - 'Title' => 'タイトル', -]]; diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php deleted file mode 100755 index 559d1b4..0000000 --- a/Theme/Backend/Lang/ko.lang.php +++ /dev/null @@ -1,24 +0,0 @@ - [ - 'Color' => '색상', - 'Create' => '만들다', - 'Icon' => '상', - 'Language' => '언어', - 'List' => '목록', - 'Tag' => '꼬리표', - 'Tags' => '태그', - 'Title' => '제목', -]]; diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php deleted file mode 100755 index 98ea1d1..0000000 --- a/Theme/Backend/Lang/no.lang.php +++ /dev/null @@ -1,24 +0,0 @@ - [ - 'Color' => 'Farge', - 'Create' => 'Skape', - 'Icon' => 'Ikon', - 'Language' => 'Språk', - 'List' => 'Liste', - 'Tag' => 'stikkord', - 'Tags' => 'Tags.', - 'Title' => 'Tittel', -]]; diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php deleted file mode 100755 index 7a525c7..0000000 --- a/Theme/Backend/Lang/pl.lang.php +++ /dev/null @@ -1,24 +0,0 @@ - [ - 'Color' => 'Kolor', - 'Create' => 'Tworzyć', - 'Icon' => 'Ikona', - 'Language' => 'Język', - 'List' => 'Lista', - 'Tag' => 'Etykietka', - 'Tags' => 'Tagi.', - 'Title' => 'Tytuł', -]]; diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php deleted file mode 100755 index 83e8d48..0000000 --- a/Theme/Backend/Lang/pt.lang.php +++ /dev/null @@ -1,24 +0,0 @@ - [ - 'Color' => 'Cor', - 'Create' => 'Crio', - 'Icon' => 'Ícone', - 'Language' => 'Língua', - 'List' => 'Lista', - 'Tag' => 'Marcação', - 'Tags' => 'Tag', - 'Title' => 'Título', -]]; diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php deleted file mode 100755 index 73ad792..0000000 --- a/Theme/Backend/Lang/ru.lang.php +++ /dev/null @@ -1,24 +0,0 @@ - [ - 'Color' => 'Цвет', - 'Create' => 'Создавать', - 'Icon' => 'Значок', - 'Language' => 'Язык', - 'List' => 'Список', - 'Tag' => 'Тег', - 'Tags' => 'Теги', - 'Title' => 'Заголовок', -]]; diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php deleted file mode 100755 index 283f499..0000000 --- a/Theme/Backend/Lang/sv.lang.php +++ /dev/null @@ -1,24 +0,0 @@ - [ - 'Color' => 'Färg', - 'Create' => 'Skapa', - 'Icon' => 'Ikon', - 'Language' => 'Språk', - 'List' => 'Lista', - 'Tag' => 'Märka', - 'Tags' => 'Tagg', - 'Title' => 'Titel', -]]; diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php deleted file mode 100755 index 59a0a63..0000000 --- a/Theme/Backend/Lang/th.lang.php +++ /dev/null @@ -1,24 +0,0 @@ - [ - 'Color' => 'สี', - 'Create' => 'สร้าง', - 'Icon' => 'ไอคอน', - 'Language' => 'ภาษา', - 'List' => 'รายการ', - 'Tag' => 'แท็ก', - 'Tags' => 'แท็ก', - 'Title' => 'ชื่อ', -]]; diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php deleted file mode 100755 index ffb3f8a..0000000 --- a/Theme/Backend/Lang/tr.lang.php +++ /dev/null @@ -1,24 +0,0 @@ - [ - 'Color' => 'Renk', - 'Create' => 'Yaratmak', - 'Icon' => 'Simge', - 'Language' => 'Dilim', - 'List' => 'Liste', - 'Tag' => 'Etiket', - 'Tags' => 'Etiketler', - 'Title' => 'Başlık', -]]; diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php deleted file mode 100755 index cab18b3..0000000 --- a/Theme/Backend/Lang/uk.lang.php +++ /dev/null @@ -1,24 +0,0 @@ - [ - 'Color' => 'Колір', - 'Create' => 'Створювати', - 'Icon' => 'Значок', - 'Language' => 'Мову', - 'List' => 'Список', - 'Tag' => 'Тег', - 'Tags' => 'Теги', - 'Title' => 'Заголовок', -]]; diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php deleted file mode 100755 index ecc2d35..0000000 --- a/Theme/Backend/Lang/zh.lang.php +++ /dev/null @@ -1,24 +0,0 @@ - [ - 'Color' => '颜色', - 'Create' => '创建', - 'Icon' => '图标', - 'Language' => '语', - 'List' => '列表', - 'Tag' => '标签', - 'Tags' => '标签', - 'Title' => '标题', -]]; diff --git a/Theme/Backend/tag-list.tpl.php b/Theme/Backend/tag-list.tpl.php index 98d28ac..ad2afd9 100755 --- a/Theme/Backend/tag-list.tpl.php +++ b/Theme/Backend/tag-list.tpl.php @@ -24,7 +24,7 @@ $next = empty($tags) ? '{/base}/tag/list' : '{/base}/tag/list?{?}&offset=' . echo $this->data['nav']->render(); ?>
-
+
getHtml('Tags'); ?>download
@@ -33,8 +33,9 @@ echo $this->data['nav']->render(); ?> - data['tags'] as $key => $value) : ++$count; - $url = UriFactory::build('{/base}/tag/view?{?}&id=' . $value->id); ?> + data['tags'] as $key => $value) : ++$count; + $url = UriFactory::build('{/base}/tag/view?{?}&id=' . $value->id); ?>
getHtml('Color'); ?> getHtml('Title'); ?>
   icon !== null ? '' . $this->printHtml($value->icon ?? '') . '' : '      '; ?>  printHtml($value->getL11n()); ?> @@ -43,8 +44,8 @@ echo $this->data['nav']->render(); ?>
getHtml('Empty', '0', '0'); ?> -
-
+ +
getHtml('Previous', '0', '0'); ?> getHtml('Next', '0', '0'); ?> diff --git a/Theme/Backend/tag-view.tpl.php b/Theme/Backend/tag-view.tpl.php index 673f609..e3c6866 100644 --- a/Theme/Backend/tag-view.tpl.php +++ b/Theme/Backend/tag-view.tpl.php @@ -52,7 +52,7 @@ $icons = [ echo $this->data['nav']->render(); ?>
-
+
data['nav']->render(); ?> >
getHtml('Tag'); ?>
+
+ + > +
+
@@ -88,7 +93,7 @@ echo $this->data['nav']->render(); ?>
-
+
diff --git a/info.json b/info.json index af7de95..b82c007 100755 --- a/info.json +++ b/info.json @@ -22,7 +22,8 @@ }, "providing": { "Admin": "*", - "Navigation": "*" + "Navigation": "*", + "Tag": "*" }, "load": [ {