Implement Account model; small style changes; Twig debug setting

This commit is contained in:
Lexi / Zoe 2021-08-14 23:37:23 +02:00
parent 7859ef77ee
commit 32add30c9d
Signed by: binaryDiv
GPG key ID: F8D4956E224DA232
10 changed files with 263 additions and 56 deletions

View file

@ -18,15 +18,15 @@
<table class="bordered_table vertical_table_headers">
<tr>
<th style="min-width: 10em">User ID</th>
<td style="min-width: 20em">{{ accountData['user_id'] }}</td>
<td style="min-width: 20em">{{ account.getId() }}</td>
</tr>
<tr>
<th>Username</th>
<td>{{ accountData['username'] }}</td>
<td>{{ account.getUsername() }}</td>
</tr>
<tr>
<th>Domain</th>
<td><a href="/accounts?domain={{ accountData['domain'] | escape('url') }}">{{ accountData['domain'] }}</a></td>
<td><a href="/accounts?domain={{ account.getDomain() | escape('url') }}">{{ account.getDomain() }}</a></td>
</tr>
<tr>
<th>Password</th>
@ -42,23 +42,23 @@
</tr>
<tr>
<th>Status</th>
<td>{{ accountData['is_active'] == '1' ? '<span class="green">Active</span>' : '<span class="red">Inactive</span>' }}</td>
<td>{{ account.isActive() ? '<span class="green">Active</span>' : '<span class="red">Inactive</span>' }}</td>
</tr>
<tr>
<th>Home directory</th>
<td><span class="gray">/srv/vmail/</span>{{ accountData['home_dir'] }}</td>
<td><span class="gray">/srv/vmail/</span>{{ account.getHomeDir() }}</td>
</tr>
<tr>
<th>Admin memo</th>
<td>{{ accountData['memo'] | nl2br }}</td>
<td>{{ account.getMemo() | nl2br }}</td>
</tr>
<tr>
<th>Created at</th>
<td>{{ accountData['created_at'] }}</td>
<td>{{ account.getCreatedAt() | date }}</td>
</tr>
<tr>
<th>Last modified at</th>
<td>{{ accountData['modified_at'] }}</td>
<td>{{ account.getModifiedAt() | date }}</td>
</tr>
</table>

View file

@ -28,7 +28,7 @@
<table>
<tr>
<td>Current username:</td>
<td>{{ accountData['username'] }}</td>
<td>{{ account.getUsername() }}</td>
</tr>
<tr>
<td><label for="edit_username">New username:</label></td>
@ -67,13 +67,13 @@
<table>
<tr>
<td>Current status:</td>
<td>{{ accountData['is_active'] == '1' ? '<span class="green">Active</span>' : '<span class="red">Inactive</span>' }}</td>
<td>{{ account.isActive() ? '<span class="green">Active</span>' : '<span class="red">Inactive</span>' }}</td>
</tr>
<tr>
<td>New status:</td>
<td>
<label>
<input type="checkbox" name="is_active" {{ accountData['is_active'] == '1' ? 'checked' : '' }}/> Active
<input type="checkbox" name="is_active" {{ account.isActive() ? 'checked' : '' }}/> Active
</label>
</td>
</tr>
@ -87,7 +87,7 @@
<table>
<tr>
<td>Current home directory:</td>
<td><span class="gray">/srv/vmail/</span>{{ accountData['home_dir'] }}</td>
<td><span class="gray">/srv/vmail/</span>{{ account.getHomeDir() }}</td>
</tr>
<tr>
<td><label for="edit_home_dir">New home directory:</label></td>
@ -104,7 +104,7 @@
<table>
<tr>
<td><label for="edit_memo">Admin memo:</label></td>
<td><textarea id="edit_memo" name="memo" style="min-width: 40em;">{{ accountData['memo'] }}</textarea></td>
<td><textarea id="edit_memo" name="memo" style="min-width: 40em;">{{ account.getMemo() }}</textarea></td>
</tr>
</table>
</div>

View file

@ -37,15 +37,15 @@
</tr>
{% if accountList %}
{% for account in accountList -%}
<tr{% if account['is_active'] != 1 %} class="inactive"{% endif %}>
<td><a href="/accounts/{{ account['user_id'] }}">{{ account['username'] }}</a></td>
<td><a href="/accounts?domain={{ account['domain'] }}">{{ account['domain'] }}</a></td>
<td>{{ account['alias_count'] }}</td>
<td>{{ account['is_active'] == 1 ? 'Yes' : 'No' }}</td>
<td class="detail_column"><span class="gray">vmail/</span>{{ account['home_dir'] }}</td>
<td class="detail_column">{{ account['memo'] }}</td>
<td>{{ account['created_at'] }}</td>
<td class="detail_column">{{ account['modified_at'] }}</td>
<tr{% if not account.isActive() %} class="inactive"{% endif %}>
<td><a href="/accounts/{{ account.getId() }}">{{ account.getUsername() }}</a></td>
<td><a href="/accounts?domain={{ account.getDomain() }}">{{ account.getDomain() }}</a></td>
<td>{{ account.getAliasCount() }}</td>
<td>{{ account.isActive() ? 'Yes' : 'No' }}</td>
<td class="detail_column"><span class="gray">vmail/</span>{{ account.getHomeDir() }}</td>
<td class="detail_column">{{ account.getMemo() }}</td>
<td>{{ account.getCreatedAt() | date }}</td>
<td class="detail_column">{{ account.getModifiedAt() | date }}</td>
</tr>
{% endfor %}
{% else %}