convert admin templates to twig

st-universe · Dec 7, 2023 · c6b44fe · c6b44fe
1 parent fef648f
commit c6b44fe
Show file tree

Hide file tree

Showing 24 changed files with 270 additions and 376 deletions.
diff --git a/src/Module/Admin/Lib/UserlistEntry.php b/src/Module/Admin/Lib/UserlistEntry.php
@@ -38,14 +38,4 @@ public function getUserStateColor(): string
         }
         return '#dddddd';
     }
-
-    public function isUserActive(): bool
-    {
-        return $this->user->getState() === UserEnum::USER_STATE_ACTIVE;
-    }
-
-    public function isUserLocked(): bool
-    {
-        return $this->user->isLocked();
-    }
 }
diff --git a/src/Module/Admin/View/Map/ShowMapInfluenceAreas.php b/src/Module/Admin/View/Map/ShowMapInfluenceAreas.php
@@ -50,7 +50,7 @@ public function handle(GameControllerInterface $game): void
             ),
             _('Einflussgebiete')
         );
-        $game->setTemplateFile('html/admin/influenceareas.xhtml');
+        $game->setTemplateFile('html/admin/influenceareas.twig');
 
         $game->setTemplateVar('GRAPH', $this->imageCreation->gdImageInSrc($this->buildImage($layer, $showAllyAreas !== 0)));
     }

diff --git a/src/Module/Admin/View/MassMail/MassMail.php b/src/Module/Admin/View/MassMail/MassMail.php
@@ -20,7 +20,7 @@ public function handle(GameControllerInterface $game): void
             ),
             _('Massen-Mails')
         );
-        $game->setTemplateFile('html/admin/massmail.xhtml');
+        $game->setTemplateFile('html/admin/massMail.twig');
         $game->setPageTitle(_('Massen-Mails'));
     }
 }
diff --git a/src/Module/Admin/View/Playerlist/Playerlist.php b/src/Module/Admin/View/Playerlist/Playerlist.php
@@ -31,7 +31,7 @@ public function handle(GameControllerInterface $game): void
             ),
             _('Spielerliste')
         );
-        $game->setTemplateFile('html/admin/playerlist.xhtml');
+        $game->setTemplateFile('html/admin/playerList.twig');
         $game->setPageTitle(_('Spielerliste'));
         $game->setTemplateVar(
             'LIST',

diff --git a/src/Module/Admin/View/ResearchTree/ShowResearchTree.php b/src/Module/Admin/View/ResearchTree/ShowResearchTree.php
@@ -78,7 +78,7 @@ public function handle(GameControllerInterface $game): void
             ),
             _('Forschungsbaum')
         );
-        $game->setTemplateFile('html/admin/tree.xhtml');
+        $game->setTemplateFile('html/admin/researchTree.twig');
         $game->setPageTitle(_('Forschungsbaum'));
         $game->setTemplateVar('TREE', $graphviz->createImageHtml($graph));
     }

diff --git a/src/Module/Admin/View/ShowSignatures/ShowSignatures.php b/src/Module/Admin/View/ShowSignatures/ShowSignatures.php
@@ -55,7 +55,7 @@ public function handle(GameControllerInterface $game): void
 
         $game->setTemplateVar('DONOTHING', true);
 
-        $game->showMacro('html/admin/adminmacros.xhtml/signaturescan');
+        $game->setTemplateFile('html/admin/signatureScan.twig');
 
         $signatureRange = [];
 

diff --git a/src/Module/Admin/View/ShowUserLock/ShowUserLock.php b/src/Module/Admin/View/ShowUserLock/ShowUserLock.php
@@ -26,7 +26,7 @@ public function handle(GameControllerInterface $game): void
         $userIdToLock = request::getIntFatal('uid');
 
         $game->setPageTitle(_('User-Lock setzen'));
-        $game->setMacroInAjaxWindow('html/admin/adminmacros.xhtml/user_lock');
+        $game->setMacroInAjaxWindow('html/admin/userLock.twig');
 
         $game->setTemplateVar('USERID', $userIdToLock);
         $game->setTemplateVar('LOCK', $this->userLockRepository->getActiveByUser($userIdToLock));

diff --git a/src/Module/Admin/View/Ticks/ShowTicks.php b/src/Module/Admin/View/Ticks/ShowTicks.php
@@ -13,7 +13,7 @@ final class ShowTicks implements ViewControllerInterface
 
     public function handle(GameControllerInterface $game): void
     {
-        $game->setTemplateFile('html/admin/ticks.xhtml');
+        $game->setTemplateFile('html/admin/ticks.twig');
         $game->appendNavigationPart('/admin/?SHOW_TICKS=1', _('Ticks'));
         $game->setPageTitle(_('Ticks'));
     }

diff --git a/src/Orm/Repository/UserRepositoryInterface.php b/src/Orm/Repository/UserRepositoryInterface.php
@@ -26,7 +26,7 @@ public function getByResetToken(string $resetToken): ?UserInterface;
     /**
      * @param array<int> $ignoreIds
      *
-     * @return iterable<UserInterface>
+     * @return array<UserInterface>
      */
     public function getDeleteable(
         int $idleTimeThreshold,
@@ -35,7 +35,7 @@ public function getDeleteable(
     ): iterable;
 
     /**
-     * @return iterable<UserInterface>
+     * @return array<UserInterface>
      */
     public function getIdleRegistrations(
         int $idleTimeThreshold
@@ -50,7 +50,7 @@ public function getByLogin(string $loginName): ?UserInterface;
     /**
      * Returns all members of the given alliance
      *
-     * @return iterable<UserInterface>
+     * @return array<UserInterface>
      */
     public function getByAlliance(AllianceInterface $alliance): iterable;
 
@@ -65,12 +65,12 @@ public function getList(
     ): array;
 
     /**
-     * @return iterable<UserInterface>
+     * @return array<UserInterface>
      */
     public function getFriendsByUserAndAlliance(UserInterface $user, ?AllianceInterface $alliance): iterable;
 
     /**
-     * @return iterable<UserInterface>
+     * @return array<UserInterface>
      */
     public function getOrderedByLastaction(int $limit, int $ignoreUserId, int $lastActionThreshold): iterable;
 
@@ -83,12 +83,12 @@ public function getVacationAmount(): int;
     public function getActiveAmountRecentlyOnline(int $threshold): int;
 
     /**
-     * @return iterable<UserInterface>
+     * @return array<UserInterface>
      */
     public function getNpcList(): iterable;
 
     /**
-     * @return iterable<UserInterface>
+     * @return array<UserInterface>
      */
     public function getNonNpcList(): iterable;
 

diff --git a/src/html/admin/adminmacros.xhtml b/src/html/admin/adminmacros.xhtml
diff --git a/src/html/admin/influenceareas.twig b/src/html/admin/influenceareas.twig
@@ -0,0 +1,12 @@
+{% extends "html/admindefaults.twig" %}
+
+{% block body %}
+{% include 'html/breadcrumb.twig' %}
+<div>
+  <div>
+    {% autoescape false %}
+    {{ GRAPH }}
+    {% endautoescape %}
+  </div>
+</div>
+{% endblock %}
diff --git a/src/html/admin/influenceareas.xhtml b/src/html/admin/influenceareas.xhtml
diff --git a/src/html/admin/massMail.twig b/src/html/admin/massMail.twig
@@ -0,0 +1,43 @@
+{% extends "html/admindefaults.twig" %}
+
+{% block body %}
+{% include 'html/breadcrumb.twig' %}
+<form action="/admin/index.php" method="post" name="massmailform" id="massmailform">
+  <input type="hidden" name="SHOW_MASS_MAIL" value="1" />
+  <input type="hidden" name="sstr" value="{{ SESSIONSTRING }}" />
+  <div style="float: left; width: 75%;">
+    <table class="tcal">
+      <tr>
+        <th>Empfangsmedium</th>
+      </tr>
+      <tr>
+        <td>
+          <label>
+            <input type="radio" name="medium" value="1" /> via E-Mail
+          </label>
+          <label>
+            <input type="radio" name="medium" value="2" /> via PM
+          </label>
+        </td>
+      </tr>
+      <tr>
+        <th>Betreff</th>
+      </tr>
+      <tr>
+        <td><input type="text" style="width: 100%" name="subject" value="Wichtige Information" /></td>
+      </tr>
+      <tr>
+        <th>Text</th>
+      </tr>
+      <tr>
+        <td><textarea name="text" style="width: 100%; height: 300px;"></textarea></td>
+      </tr>
+      <tr>
+        <td>
+          <input type="submit" name="B_MASS_MAIL" value="Absenden" />
+        </td>
+      </tr>
+    </table>
+  </div>
+</form>
+{% endblock %}
diff --git a/src/html/admin/massmail.xhtml b/src/html/admin/massmail.xhtml
diff --git a/src/html/admin/playerList.twig b/src/html/admin/playerList.twig
@@ -0,0 +1,62 @@
+{% from 'html/macros.twig' import userAvatar, userInfo, pmWindow, userProfile %}
+
+{% extends "html/admindefaults.twig" %}
+
+{% block body %}
+{% include 'html/breadcrumb.twig' %}
+<div class="userList">
+  {% for listEntry in LIST %}
+  {% set user = listEntry.getUser %}
+  {% set userId = user.getId %}
+  <div class="userListItem">
+    <div>
+      {{ userAvatar(user) }}
+    </div>
+    <div>
+      <div class="userListItemName">
+        {{ userInfo(user) }}
+      </div>
+      <div class="userListItemAllianceName">
+        {% set alliance = user.getAlliance %}
+        {% if alliance %}
+        <a href="/alliance.php?id={{ alliance.getId }}">{{ alliance.getName|bbcode }}</a>
+        {% else %}
+        <span>-</span>
+        {% endif %}
+      </div>
+      <div class="userListItemButtons">
+        <img src="/assets/rassen/{{ user.getFactionId }}s.png" />
+        {{ userProfile(userId) }}
+        {{ pmWindow(USER, userId) }}
+      </div>
+      <div class="userBoxDetailAddendum">
+        <div>
+          <img title="Zuletzt online" src="/assets/buttons/time.png" />
+          {{ user.getLastAction|stuDateTime }}
+        </div>
+        <div>STATUS:
+          <span style="color: {{ listEntry.getUserStateColor }};">{{ listEntry.getUserStateDescription }}</span>
+          {% if user.isLocked %}
+          <a href="javascript:void(0)" onclick="showUserLock({{ userId }});"
+            onmouseover="cp('lock{{ userId }}','buttons/block1', 'png');"
+            onmouseout="cp('lock{{ userId }}','buttons/block2', 'png');"><img src="/assets/buttons/block2.png"
+              name="lock{{ userId }}" title="Spielersperre editieren" /></a>
+          <a href="/admin/?B_UNLOCK_USER=1&uid={{ userId }}&sstr={{ SESSIONSTRING }}"
+            onmouseover="cp('activate{{ userId }}','buttons/update1', 'png');"
+            onmouseout="cp('activate{{ userId }}','buttons/update0', 'png');"><img src="/assets/buttons/update0.png"
+              name="activate{{ userId }}" title="Spieler entsperren" /></a>
+          {% else %}
+          <a href="javascript:void(0)" onclick="showUserLock({{ userId }});"
+            onmouseover="cp('lock{{ userId }}','buttons/block1', 'png');"
+            onmouseout="cp('lock{{ userId }}','buttons/block2', 'png');"><img src="/assets/buttons/block2.png"
+              name="lock{{ userId }}" title="Spielersperre setzen" /></a>
+          {% endif %}
+          <a href="/admin/?B_BLOCK_USER=1&uid={{ userId }}&sstr={{ SESSIONSTRING }}"><img
+              src="/assets/buttons/selfdes2.png" name="block{{ userId }}" title="Spieler blockieren" /></a>
+        </div>
+      </div>
+    </div>
+  </div>
+  {% endfor %}
+</div>
+{% endblock %}