diff --git a/Theme/Backend/Components/GroupTagSelector/group-selector.tpl.php b/Theme/Backend/Components/GroupTagSelector/group-selector.tpl.php index 1fe1336..3847348 100755 --- a/Theme/Backend/Components/GroupTagSelector/group-selector.tpl.php +++ b/Theme/Backend/Components/GroupTagSelector/group-selector.tpl.php @@ -1,10 +1,10 @@
- - printHtml($this->getId()); ?>", "delay": 500, "resets": true}, - {"key": 3, "type": "dom.datalist.clear", "id": "printHtml($this->getId()); ?>-datalist"}, - {"key": 4, "type": "message.request", "uri": "{/base}/{/lang}/api/admin/find/group?search={!#printHtml($this->getId()); ?>}", "method": "GET", "request_type": "json"}, - {"key": 5, "type": "dom.datalist.append", "id": "printHtml($this->getId()); ?>-datalist", "value": "id", "text": "name"} + {"key": 2, "type": "utils.timer", "id": "getId(); ?>", "delay": 500, "resets": true}, + {"key": 3, "type": "dom.datalist.clear", "id": "getId(); ?>-datalist"}, + {"key": 4, "type": "message.request", "uri": "{/base}/{/lang}/api/admin/find/group?search={!#getId(); ?>}", "method": "GET", "request_type": "json"}, + {"key": 5, "type": "dom.datalist.append", "id": "getId(); ?>-datalist", "value": "id", "text": "name"} ] }, { "key": 2, "listener": "keydown", "action" : [ {"key": 1, "type": "validate.keypress", "pressed": "13|9"}, - {"key": 2, "type": "message.request", "uri": "{/base}/{/lang}/api/admin/find/group?search={!#printHtml($this->getId()); ?>}", "method": "GET", "request_type": "json"}, - {"key": 3, "type": "dom.setvalue", "overwrite": true, "selector": "#printHtml($this->getId()); ?>-idlist", "value": "{0/id}", "data": ""}, - {"key": 4, "type": "dom.setvalue", "overwrite": true, "selector": "#printHtml($this->getId()); ?>-taglist", "value": "printHtml($this->getId()); ?>-taglist-{0/id}\" class=\"tag red\" data-id=\"{0/id}\"> {0/name}", "data": ""}, - {"key": 5, "type": "dom.setvalue", "overwrite": true, "selector": "#printHtml($this->getId()); ?>", "value": "", "data": ""} + {"key": 2, "type": "message.request", "uri": "{/base}/{/lang}/api/admin/find/group?search={!#getId(); ?>}", "method": "GET", "request_type": "json"}, + {"key": 3, "type": "dom.setvalue", "overwrite": true, "selector": "#getId(); ?>-idlist", "value": "{0/id}", "data": ""}, + {"key": 4, "type": "dom.setvalue", "overwrite": true, "selector": "#getId(); ?>-taglist", "value": "getId(); ?>-taglist-{0/id}\" class=\"tag red\" data-id=\"{0/id}\"> {0/name}", "data": ""}, + {"key": 5, "type": "dom.setvalue", "overwrite": true, "selector": "#getId(); ?>", "value": "", "data": ""} ] } ]'> - - isRequired() ? ' required' : ''; ?>> + + isRequired() ? ' required' : ''; ?>>
-
printHtml($this->getId()); ?>-taglist span fa", "action": [ + "key": 1, "listener": "click", "selector": "#getId(); ?>-taglist span fa", "action": [ {"key": 1, "type": "dom.getvalue", "base": "self"}, - {"key": 2, "type": "dom.removevalue", "selector": "#printHtml($this->getId()); ?>-idlist", "data": ""}, + {"key": 2, "type": "dom.removevalue", "selector": "#getId(); ?>-idlist", "data": ""}, {"key": 3, "type": "dom.remove", "base": "self"} ] } diff --git a/Theme/Backend/accounts-list.tpl.php b/Theme/Backend/accounts-list.tpl.php index 9a0c972..301f89a 100755 --- a/Theme/Backend/accounts-list.tpl.php +++ b/Theme/Backend/accounts-list.tpl.php @@ -57,7 +57,7 @@ echo $this->getData('nav')->render(); ?> elseif ($value->getStatus() === AccountStatus::TIMEOUT) { $color = 'purple'; } elseif ($value->getStatus() === AccountStatus::BANNED) { $color = 'red'; } ?> - printHtml($value->getId()); ?> + getId(); ?> getHtml('Status'. $value->getStatus()); ?> printHtml( \sprintf('%3$s %2$s %1$s', $value->name1, $value->name2, $value->name3) diff --git a/Theme/Backend/accounts-single.tpl.php b/Theme/Backend/accounts-single.tpl.php index 1ca5f3f..4690d5a 100755 --- a/Theme/Backend/accounts-single.tpl.php +++ b/Theme/Backend/accounts-single.tpl.php @@ -50,18 +50,18 @@ echo $this->getData('nav')->render(); ?>
-
+
@@ -137,7 +137,7 @@ echo $this->getData('nav')->render(); ?> $url = UriFactory::build('{/prefix}admin/group/settings?{?}&id=' . $value->getId()); ?>
- printHtml($value->getId()); ?> + getId(); ?> printHtml($value->name); ?> @@ -157,7 +157,7 @@ echo $this->getData('nav')->render(); ?>
- +
@@ -250,7 +250,7 @@ echo $this->getData('nav')->render(); ?>
- +
diff --git a/Theme/Backend/groups-create.tpl.php b/Theme/Backend/groups-create.tpl.php index 67f86a4..21ab1f2 100755 --- a/Theme/Backend/groups-create.tpl.php +++ b/Theme/Backend/groups-create.tpl.php @@ -12,6 +12,7 @@ */ declare(strict_types=1); +use phpOMS\Account\GroupStatus; use phpOMS\Uri\UriFactory; /** @var \phpOMS\Views\View $this */ @@ -28,8 +29,8 @@ echo $this->getData('nav')->render(); ?> diff --git a/Theme/Backend/groups-list.tpl.php b/Theme/Backend/groups-list.tpl.php index a78de2a..b4e77ab 100755 --- a/Theme/Backend/groups-list.tpl.php +++ b/Theme/Backend/groups-list.tpl.php @@ -44,7 +44,7 @@ echo $this->getData('nav')->render(); ?> elseif ($value->getStatus() === \phpOMS\Account\GroupStatus::INACTIVE) { $color = 'darkblue'; } elseif ($value->getStatus() === \phpOMS\Account\GroupStatus::HIDDEN) { $color = 'purple'; } ?> -
printHtml($value->getId()); ?> + getId(); ?> getHtml('Status'. $value->getStatus()); ?> printHtml($value->name); ?> diff --git a/Theme/Backend/groups-single.tpl.php b/Theme/Backend/groups-single.tpl.php index 0856b0a..34d8040 100755 --- a/Theme/Backend/groups-single.tpl.php +++ b/Theme/Backend/groups-single.tpl.php @@ -48,7 +48,7 @@ echo $this->getData('nav')->render(); ?>
getHtml('Group'); ?>
- + @@ -215,7 +215,7 @@ echo $this->getData('nav')->render(); ?>
- +
diff --git a/Theme/Backend/modules-list.tpl.php b/Theme/Backend/modules-list.tpl.php index 141c53a..98655ed 100755 --- a/Theme/Backend/modules-list.tpl.php +++ b/Theme/Backend/modules-list.tpl.php @@ -49,7 +49,7 @@ $isntalled = $this->getData('isntalled') ?? []; } ?> - printHtml($module->getId()); ?> + getId(); ?> printHtml($module->getExternalName()); ?> printHtml($module->getVersion()); ?> diff --git a/Theme/Backend/settings-general.tpl.php b/Theme/Backend/settings-general.tpl.php index 3f3c830..7476e19 100755 --- a/Theme/Backend/settings-general.tpl.php +++ b/Theme/Backend/settings-general.tpl.php @@ -61,7 +61,7 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization(); @@ -249,19 +249,19 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization(); - + - + - + - + - +