From 2ff764eb531b402d64cae36502c9b340a57fd62d Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Thu, 12 Apr 2018 22:32:28 +0200
Subject: [PATCH] General template fixes

---
 .../Components/AccountGroupSelector/base.tpl.php       | 10 +++++-----
 Theme/Backend/profile-single.tpl.php                   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Theme/Backend/Components/AccountGroupSelector/base.tpl.php b/Theme/Backend/Components/AccountGroupSelector/base.tpl.php
index 4999be7..a0cf272 100644
--- a/Theme/Backend/Components/AccountGroupSelector/base.tpl.php
+++ b/Theme/Backend/Components/AccountGroupSelector/base.tpl.php
@@ -31,9 +31,9 @@
                         {"key": 5, "type": "dom.setvalue", "overwrite": true, "selector": "#<?= $this->printHtml($this->getId()); ?>", "value": "", "data": ""}
                     ]
                 }
-            ]'<?= $this->isRequired() ? ' required' : ''; ?>>
+            ]'>
             <datalist id="<?= $this->printHtml($this->getId()); ?>-datalist"></datalist>
-            <input type="hidden" id="<?= $this->printHtml($this->getId()); ?>-idlist">
+            <input type="hidden" id="<?= $this->printHtml($this->getId()); ?>-idlist"<?= $this->isRequired() ? ' required' : ''; ?>>
         </span>
     </div>
     <div class="ipt-second"><button><?= $this->getHtml('Add', 0, 0); ?></button></div>
@@ -41,9 +41,9 @@
 <div class="box taglist" id="<?= $this->printHtml($this->getId()); ?>-taglist" data-action='[
     {
         "key": 1, "listener": "click", "selector": "#<?= $this->printHtml($this->getId()); ?>-taglist span fa", "action": [
-            {"key": 2, "type": "dom.getvalue", "base": "self"},
-            {"key": 3, "type": "dom.removevalue", "selector": "#<?= $this->printHtml($this->getId()); ?>-idlist", "data": ""}
-            {"key": 1, "type": "dom.remove", "base": "self"},
+            {"key": 1, "type": "dom.getvalue", "base": "self"},
+            {"key": 2, "type": "dom.removevalue", "selector": "#<?= $this->printHtml($this->getId()); ?>-idlist", "data": ""},
+            {"key": 3, "type": "dom.remove", "base": "self"}
         ]
     }
 ]'></div>
\ No newline at end of file
diff --git a/Theme/Backend/profile-single.tpl.php b/Theme/Backend/profile-single.tpl.php
index 7d124d4..8b24417 100644
--- a/Theme/Backend/profile-single.tpl.php
+++ b/Theme/Backend/profile-single.tpl.php
@@ -28,7 +28,7 @@ echo $this->getData('nav')->render();
 <div class="row">
     <div class="col-xs-12 col-md-6">
         <section itemscope itemtype="http://schema.org/Person" class="box wf-100">
-            <header><h1><span itemprop="familyName"><?= $this->printHtml($account->getAccount()->getName3()); ?></span>, <span itemprop="givenName"><?= $this->printHtml($account->getAccount()->getName1()); ?></span></h1></header>
+            <header><h1><span itemprop="familyName"><?= $this->printHtml(empty($account->getAccount()->getName3()) ? $account->getAccount()->getName2() : $account->getAccount()->getName3()); ?></span>, <span itemprop="givenName"><?= $this->printHtml($account->getAccount()->getName1()); ?></span></h1></header>
             <div class="inner">
                 <!-- @formatter:off -->
                     <span class="rf"><img class="m-profile rf" alt="<?= $this->getHtml('ProfileImage'); ?>" data-lazyload="<?= $account->getImage() instanceof \Modules\Media\Models\NullMedia ? \phpOMS\Uri\UriFactory::build('/Web/Backend/img/user_default_' . mt_rand(1, 6) .'.png') : \phpOMS\Uri\UriFactory::build('/' . $account->getImage()->getPath()); ?>">