From 26a6bd3896e8ff42c1772102bbc2acb1de6866a6 Mon Sep 17 00:00:00 2001
From: Banana <mail@bananas-playground.net>
Date: Sun, 30 Apr 2023 11:12:09 +0200
Subject: [PATCH] cleaner edit views

---
 .../98/managecolletions/managecolletions.html | 339 ++++++++----------
 .../view/98/managegroups/managegroups.html    |  17 +-
 .../view/98/manageusers/manageusers.html      |  31 +-
 webclient/view/98/profile/profile.html        |  26 +-
 webclient/view/98/ui/css/style.css            |  19 +
 5 files changed, 208 insertions(+), 224 deletions(-)

diff --git a/webclient/view/98/managecolletions/managecolletions.html b/webclient/view/98/managecolletions/managecolletions.html
index b44a137..b0d7232 100644
--- a/webclient/view/98/managecolletions/managecolletions.html
+++ b/webclient/view/98/managecolletions/managecolletions.html
@@ -4,215 +4,174 @@
 	Any default field or any option which needs a field get its content after the fields are configured.
 </blockquote>
 
-<form method="post">
-	<div class="sunken-panel">
-		<table width="100%">
+<form method="post" class="maxSizeForm">
+	<div class="field-row-stacked">
+		<label for="name">Name *</label>
+		<input id="name" type="text" autocomplete="off" name="fdata[name]"
+            placeholder="Unique name. No special chars." size="30"
+			value="<?php echo Summoner::ifset($TemplateData['editData'], 'name'); ?>">
+    </div>
+	<div class="field-row-stacked">
+		<label for="description">Description</label>
+		<input id="description" type="text" autocomplete="off" size="30" name="fdata[description]"
+		       value="<?php echo Summoner::ifset($TemplateData['editData'], 'description'); ?>">
+   </div>
+	<div class="field-row-stacked">
+		<label for="defaultSearchField">Default global search field</label>
+		<select id="defaultSearchField" name="fdata[defaultSearchField]">
+			<option value="">Please select</option>
+			<?php foreach($TemplateData['simpleSearchFields'] as $k=>$v) { ?>
+			<option value="<?php echo $v['identifier']; ?>"
+			<?php if(Summoner::ifsetValue($TemplateData['editData'], 'defaultSearchField', $v['identifier'])) echo 'selected'; ?>
+			><?php echo $v['displayname']; ?> (<?php echo $v['type']; ?>)</option>
+			<?php } ?>
+		</select>
+	</div>
+	<div class="field-row-stacked">
+		<label>
+			The field is used in the global search. Altering the default search field results in
+			a DB reindex. This could take some time, depending on the amount of data.
+		</label>
+	</div>
+	<div class="field-row-stacked">
+		<label for="defaultSortField">Default sort field</label>
+		<select id="defaultSortField" name="fdata[defaultSortField]">
+			<option value="">Please select</option>
+			<?php foreach($TemplateData['simpleSearchFields'] as $k=>$v) { ?>
+			<option value="<?php echo $v['identifier']; ?>"
+			<?php if(Summoner::ifsetValue($TemplateData['editData'], 'defaultSortField', $v['identifier'])) echo 'selected'; ?>
+			><?php echo $v['displayname']; ?> (<?php echo $v['type']; ?>)</option>
+			<?php } ?>
+		</select>
+	</div>
+	<div class="field-row-stacked">
+		<label for="defaultSortOrder">Default sort order</label>
+		<select id="defaultSortOrder" name="fdata[defaultSortOrder]">
+			<option value="ASC" <?php if(Summoner::ifsetValue($TemplateData['editData'], 'defaultSortOrder', 'ASC')) echo 'selected'; ?>>ASCENDING</option>
+			<option value="DESC" <?php if(Summoner::ifsetValue($TemplateData['editData'], 'defaultSortOrder', 'DESC')) echo 'selected'; ?>>DESCENDING</option>
+		</select>
+	</div>
+	<div class="field-row-stacked">
+		<label for="advancedSearchTableFields">Table advanced search view</label>
+		<select id="advancedSearchTableFields" name="fdata[advancedSearchTableFields][]" multiple="multiple" size="5">
+			<?php foreach($TemplateData['existingFields'] as $k=>$v) { ?>
+			<option value="<?php echo $v['id']; ?>"
+			<?php if(Summoner::ifset($TemplateData['editData']['advancedSearchTableFields'], $v['id'])) echo 'selected'; ?>
+			><?php echo $v['displayname']; ?> (<?php echo $v['type']; ?>)</option>
+			<?php } ?>
+		</select>
+	</div>
+	<div class="field-row-stacked">
+		<label>Make sure that the default global search field is in this list. This does not limit the fields to search in.</label>
+	</div>
+	<div class="field-row-stacked">
+			<label for="tool">Tools</label>
+			<select id="tool" name="fdata[tool][]" multiple="multiple" size="5">
+				<option value="">None</option>
+				<?php foreach($TemplateData['toolSelection'] as $k=>$v) { ?>
+				<option value="<?php echo $k; ?>"
+				<?php if(Summoner::ifset($TemplateData['editData']['tool'],$k)) echo 'selected'; ?>
+				><?php echo $v['name']; ?> (<?php echo $v['description']; ?>)</option>
+				<?php } ?>
+			</select>
+	</div>
+	<div class="field-row-stacked">
+		<label for="owner">Owner *</label>
+		<select id="owner" name="fdata[owner]">
+			<option value="">Please select</option>
+			<?php foreach($TemplateData['ownerSelection'] as $k=>$v) { ?>
+			<option value="<?php echo $k; ?>"
+			<?php if(Summoner::ifsetValue($TemplateData['editData'], 'owner',$k)) echo 'selected'; ?>
+			><?php echo $v['login']; ?> (<?php echo $v['name']; ?>)</option>
+			<?php } ?>
+		</select>
+	</div>
+	<div class="field-row-stacked">
+		<label for="group">Group *</label>
+		<select id="group" name="fdata[group]">
+			<option value="">Please select</option>
+			<?php foreach($TemplateData['groupSelection'] as $k=>$v) { ?>
+			<option value="<?php echo $k; ?>"
+			<?php if(Summoner::ifsetValue($TemplateData['editData'], 'group',$k)) echo 'selected'; ?>
+			><?php echo $v['name']; ?> (<?php echo $v['description']; ?>)</option>
+			<?php } ?>
+		</select>
+	</div>
+	<div class="field-row-stacked">
+		<label>Rights *</label></td>
+
+		<table>
 			<thead>
 				<tr>
-					<th width="200px"></th>
-					<th></th>
-					<th>Note</th>
+					<th>User</th>
+					<th>Group</th>
+					<th>Other</th>
 				</tr>
 			</thead>
 			<tbody>
 				<tr>
-					<td><label for="name">Name *</label>
-					<td>
-						<input id="name" type="text" autocomplete="off" name="fdata[name]"
-		                    placeholder="Unique name. No special chars." size="30"
-			                value="<?php echo Summoner::ifset($TemplateData['editData'], 'name'); ?>">
-					</td>
-					<td></td>
-				</tr>
-				<tr>
-					<td><label for="description">Description</label></td>
-					<td>
-						<input id="description" type="text" autocomplete="off" size="30" name="fdata[description]"
-					       value="<?php echo Summoner::ifset($TemplateData['editData'], 'description'); ?>">
-			       </td>
-			       <td></td>
-				</tr>
-				<tr >
-					<td><label for="defaultSearchField">Default global search field</label></td>
-					<td>
-						<select id="defaultSearchField" name="fdata[defaultSearchField]">
-							<option value="">Please select</option>
-							<?php foreach($TemplateData['simpleSearchFields'] as $k=>$v) { ?>
-							<option value="<?php echo $v['identifier']; ?>"
-							<?php if(Summoner::ifsetValue($TemplateData['editData'], 'defaultSearchField', $v['identifier'])) echo 'selected'; ?>
-							><?php echo $v['displayname']; ?> (<?php echo $v['type']; ?>)</option>
-							<?php } ?>
-						</select>
-					</td>
-					<td>
-						The field is used in the global search. Altering the default search field results in
-						a DB reindex. This could take some time, depending on the amount of data.
-					</td>
-				</tr>
-				<tr>
-					<td><label for="defaultSortField">Default sort field</label></td>
-					<td>
-						<select id="defaultSortField" name="fdata[defaultSortField]">
-							<option value="">Please select</option>
-							<?php foreach($TemplateData['simpleSearchFields'] as $k=>$v) { ?>
-							<option value="<?php echo $v['identifier']; ?>"
-							<?php if(Summoner::ifsetValue($TemplateData['editData'], 'defaultSortField', $v['identifier'])) echo 'selected'; ?>
-							><?php echo $v['displayname']; ?> (<?php echo $v['type']; ?>)</option>
-							<?php } ?>
-						</select>
-					</td>
-					<td></td>
-				</tr>
-				<tr>
-					<td><label for="defaultSortOrder">Default sort order</label></td>
-					<td>
-						<select id="defaultSortOrder" name="fdata[defaultSortOrder]">
-							<option value="ASC" <?php if(Summoner::ifsetValue($TemplateData['editData'], 'defaultSortOrder', 'ASC')) echo 'selected'; ?>>ASCENDING</option>
-							<option value="DESC" <?php if(Summoner::ifsetValue($TemplateData['editData'], 'defaultSortOrder', 'DESC')) echo 'selected'; ?>>DESCENDING</option>
-						</select>
-					</td>
-					<td></td>
-				</tr>
-				<tr>
-					<td><label for="advancedSearchTableFields">Table advanced search view</label></td>
-					<td>
-						<select id="advancedSearchTableFields" name="fdata[advancedSearchTableFields][]" multiple="multiple" size="5">
-							<?php foreach($TemplateData['existingFields'] as $k=>$v) { ?>
-							<option value="<?php echo $v['id']; ?>"
-							<?php if(Summoner::ifset($TemplateData['editData']['advancedSearchTableFields'], $v['id'])) echo 'selected'; ?>
-							><?php echo $v['displayname']; ?> (<?php echo $v['type']; ?>)</option>
-							<?php } ?>
-						</select>
-					</td>
-					<td>Make sure that the default global search field is in this list. This does not limit the fields to search in.</td>
-				</tr>
-				<tr>
-					<td><label for="tool">Tools</label></td>
-					<td>
-						<select id="tool" name="fdata[tool][]" multiple="multiple" size="5">
-							<option value="">None</option>
-							<?php foreach($TemplateData['toolSelection'] as $k=>$v) { ?>
-							<option value="<?php echo $k; ?>"
-							<?php if(Summoner::ifset($TemplateData['editData']['tool'],$k)) echo 'selected'; ?>
-							><?php echo $v['name']; ?> (<?php echo $v['description']; ?>)</option>
-							<?php } ?>
-						</select>
-					</td>
-					<td></td>
-				</tr>
-				<tr>
-					<td><label for="owner">Owner *</label></td>
 					<td>
-						<select id="owner" name="fdata[owner]">
-							<option value="">Please select</option>
-							<?php foreach($TemplateData['ownerSelection'] as $k=>$v) { ?>
-							<option value="<?php echo $k; ?>"
-							<?php if(Summoner::ifsetValue($TemplateData['editData'], 'owner',$k)) echo 'selected'; ?>
-							><?php echo $v['login']; ?> (<?php echo $v['name']; ?>)</option>
-							<?php } ?>
-						</select>
-					</td>
-					<td></td>
-				</tr>
-				<tr>
-					<td><label for="group">Group *</label></td>
-					<td>
-						<select id="group" name="fdata[group]">
-							<option value="">Please select</option>
-							<?php foreach($TemplateData['groupSelection'] as $k=>$v) { ?>
-							<option value="<?php echo $k; ?>"
-							<?php if(Summoner::ifsetValue($TemplateData['editData'], 'group',$k)) echo 'selected'; ?>
-							><?php echo $v['name']; ?> (<?php echo $v['description']; ?>)</option>
-							<?php } ?>
-						</select>
-					</td>
-					<td></td>
-				</tr>
-				<tr>
-					<td><label>Rights *</label></td>
-					<td>
-						<div class="sunken-panel">
-							<table>
-								<thead>
-									<tr>
-										<th>User</th>
-										<th>Group</th>
-										<th>Other</th>
-									</tr>
-								</thead>
-								<tbody>
-									<tr>
-										<td>
-											<input id="user_read" type="checkbox" name="fdata[rights][user][read]" value="1"
-											<?php if(Summoner::ifsetValue($TemplateData['editData']['rights']['user'], 'read', 'r')) echo "checked"; ?>>
-											<label for="user_read">r &nbsp; &nbsp; &nbsp;</label>
-
-											<input id="user_write" type="checkbox" name="fdata[rights][user][write]" value="1"
-											<?php if(Summoner::ifsetValue($TemplateData['editData']['rights']['user'], 'write', 'w')) echo "checked"; ?>>
-											<label for="user_write">w &nbsp; &nbsp; &nbsp;</label>
+						<input id="user_read" type="checkbox" name="fdata[rights][user][read]" value="1"
+						<?php if(Summoner::ifsetValue($TemplateData['editData']['rights']['user'], 'read', 'r')) echo "checked"; ?>>
+						<label for="user_read">r &nbsp; &nbsp; &nbsp;</label>
 
-											<input id="user_delete" type="checkbox" name="fdata[rights][user][delete]" value="1"
-											<?php if(Summoner::ifsetValue($TemplateData['editData']['rights']['user'], 'delete', 'x')) echo "checked"; ?>>
-											<label for="user_delete">x &nbsp; &nbsp; &nbsp;</label>
-										</td>
-										<td>
-											<input id="group_read" type="checkbox" name="fdata[rights][group][read]" value="1"
-											<?php if(Summoner::ifsetValue($TemplateData['editData']['rights']['group'], 'read', 'r')) echo "checked"; ?>>
-											<label for="group_read">r &nbsp; &nbsp; &nbsp;</label>
+						<input id="user_write" type="checkbox" name="fdata[rights][user][write]" value="1"
+						<?php if(Summoner::ifsetValue($TemplateData['editData']['rights']['user'], 'write', 'w')) echo "checked"; ?>>
+						<label for="user_write">w &nbsp; &nbsp; &nbsp;</label>
 
-											<input id="group_write" type="checkbox" name="fdata[rights][group][write]" value="1"
-											<?php if(Summoner::ifsetValue($TemplateData['editData']['rights']['group'], 'write', 'w')) echo "checked"; ?>>
-											<label for="group_write">w &nbsp; &nbsp; &nbsp;</label>
-
-											<input id="group_delete" type="checkbox" name="fdata[rights][group][delete]" value="1"
-											<?php if(Summoner::ifsetValue($TemplateData['editData']['rights']['group'], 'delete', 'x')) echo "checked"; ?>>
-											<label for="group_delete">x &nbsp; &nbsp; &nbsp;</label>
-										</td>
-										<td>
-											<input id="other_read" type="checkbox" name="fdata[rights][other][read]" value="1"
-											<?php if(Summoner::ifsetValue($TemplateData['editData']['rights']['other'], 'read', 'r')) echo "checked"; ?>>
-											<label for="other_read">r &nbsp; &nbsp; &nbsp;</label>
-
-											<input id="other_write" type="checkbox" name="fdata[rights][other][write]" value="1"
-											<?php if(Summoner::ifsetValue($TemplateData['editData']['rights']['other'], 'write', 'w')) echo "checked"; ?>>
-											<label for="other_write">w &nbsp; &nbsp; &nbsp;</label>
-
-											<input id="other_delete" type="checkbox" name="fdata[rights][other][delete]" value="1"
-											<?php if(Summoner::ifsetValue($TemplateData['editData']['rights']['other'], 'delete', 'x')) echo "checked"; ?>>
-											<label for="other_delete">x &nbsp; &nbsp; &nbsp;</label>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-						</div>
+						<input id="user_delete" type="checkbox" name="fdata[rights][user][delete]" value="1"
+						<?php if(Summoner::ifsetValue($TemplateData['editData']['rights']['user'], 'delete', 'x')) echo "checked"; ?>>
+						<label for="user_delete">x &nbsp; &nbsp; &nbsp;</label>
 					</td>
-					<td></td>
-				</tr>
-				<?php if(Summoner::ifset($TemplateData['editData'], 'name')) { ?>
-				<tr>
-					<td>Update entry with collection rights</td>
 					<td>
-						<input id="doRightsForEntries" type="checkbox" name="fdata[doRightsForEntries]" value="1">
-						<label for="doRightsForEntries">&nbsp;</label>
+						<input id="group_read" type="checkbox" name="fdata[rights][group][read]" value="1"
+						<?php if(Summoner::ifsetValue($TemplateData['editData']['rights']['group'], 'read', 'r')) echo "checked"; ?>>
+						<label for="group_read">r &nbsp; &nbsp; &nbsp;</label>
+
+						<input id="group_write" type="checkbox" name="fdata[rights][group][write]" value="1"
+						<?php if(Summoner::ifsetValue($TemplateData['editData']['rights']['group'], 'write', 'w')) echo "checked"; ?>>
+						<label for="group_write">w &nbsp; &nbsp; &nbsp;</label>
+
+						<input id="group_delete" type="checkbox" name="fdata[rights][group][delete]" value="1"
+						<?php if(Summoner::ifsetValue($TemplateData['editData']['rights']['group'], 'delete', 'x')) echo "checked"; ?>>
+						<label for="group_delete">x &nbsp; &nbsp; &nbsp;</label>
 					</td>
 					<td>
-						Warning: This will overwrite existing entry rights (user, group, rights) with the ones from the collection!
-					</td>
-				</tr>
-				<tr>
-					<td>Delete</td>
-					<td>
-						<input id="doDelete" type="checkbox" name="fdata[doDelete]" value="1">
-						<label for="doDelete">&nbsp;</label>
+						<input id="other_read" type="checkbox" name="fdata[rights][other][read]" value="1"
+						<?php if(Summoner::ifsetValue($TemplateData['editData']['rights']['other'], 'read', 'r')) echo "checked"; ?>>
+						<label for="other_read">r &nbsp; &nbsp; &nbsp;</label>
+
+						<input id="other_write" type="checkbox" name="fdata[rights][other][write]" value="1"
+						<?php if(Summoner::ifsetValue($TemplateData['editData']['rights']['other'], 'write', 'w')) echo "checked"; ?>>
+						<label for="other_write">w &nbsp; &nbsp; &nbsp;</label>
+
+						<input id="other_delete" type="checkbox" name="fdata[rights][other][delete]" value="1"
+						<?php if(Summoner::ifsetValue($TemplateData['editData']['rights']['other'], 'delete', 'x')) echo "checked"; ?>>
+						<label for="other_delete">x &nbsp; &nbsp; &nbsp;</label>
 					</td>
-					<td>Warning: This will delete ALL the data in this collection!</td>
 				</tr>
-				<?php } ?>
 			</tbody>
 		</table>
 	</div>
+	<?php if(Summoner::ifset($TemplateData['editData'], 'name')) { ?>
+	<div class="field-row-stacked">
+		<input id="doRightsForEntries" type="checkbox" name="fdata[doRightsForEntries]" value="1">
+		<label for="doRightsForEntries">
+			Overwrite existing rights<br />
+			Warning: This will overwrite existing entry rights (user, group, rights) with the ones from the collection!
+		</label>
+	</div>
+	<div class="field-row-stacked">
+		<input id="doDelete" type="checkbox" name="fdata[doDelete]" value="1">
+		<label for="doDelete">
+			Delete<br />
+			Warning: This will delete ALL the data in this collection!
+		</label>
+	</div>
+	<?php } ?>
+
 
-	<div class="field-row">
+	<div class="field-row-stacked">
 		<input type="submit" name="submitForm" value="Save" />
 	</div>
 </form>
diff --git a/webclient/view/98/managegroups/managegroups.html b/webclient/view/98/managegroups/managegroups.html
index b32b320..fdd151f 100644
--- a/webclient/view/98/managegroups/managegroups.html
+++ b/webclient/view/98/managegroups/managegroups.html
@@ -1,30 +1,31 @@
 <h3 class="uk-h3">Group management</h3>
 <h4 class="uk-h4">Add or modify a group</h4>
-<form class="uk-form-horizontal uk-margin-small" method="post">
-	<div class="field-row">
+
+<form class="maxSizeForm" method="post">
+	<div class="field-row-stacked">
 		<label for="name">Name *</label>
 		<input id="name" type="text" autocomplete="off" name="fdata[name]"
 			value="<?php echo Summoner::ifset($TemplateData['editData'], 'name'); ?>">
 	</div>
-	<div class="field-row">
+	<div class="field-row-stacked">
 		<label for="description">Description *</label>
-		<input class="uk-input" id="description" type="text" autocomplete="off" name="fdata[description]"
+		<input id="description" type="text" autocomplete="off" name="fdata[description]"
 		       value="<?php echo Summoner::ifset($TemplateData['editData'], 'description'); ?>">
 	</div>
 
 	<?php if(Summoner::ifset($TemplateData['editData'], 'name') && Summoner::ifsetValue($TemplateData['editData'], 'protected', '0')) { ?>
-	<div class="field-row">
+	<div class="field-row-stacked">
 		<p>
 			Warning: Content owned by this group will not be deleted and thus only manageable by admin!<br />
 			Right now don't do this. Only if you are sure there is no usage of this group.
 		</p>
 	</div>
-	<div class="field-row">
-		<input id="doDelete" class="uk-checkbox" type="checkbox" name="fdata[doDelete]" value="1">
+	<div class="field-row-stacked">
+		<input id="doDelete" type="checkbox" name="fdata[doDelete]" value="1">
 		<label for="doDelete">Delete</label>
 	</div>
 	<?php } ?>
-	<div class="field-row">
+	<div class="field-row-stacked">
 		<input type="submit" name="submitForm" value="Save" />
 	</div>
 </form>
diff --git a/webclient/view/98/manageusers/manageusers.html b/webclient/view/98/manageusers/manageusers.html
index 74dc7e9..8b13ffd 100644
--- a/webclient/view/98/manageusers/manageusers.html
+++ b/webclient/view/98/manageusers/manageusers.html
@@ -1,22 +1,22 @@
 <h3 class="uk-h3">User management</h3>
 <h4 class="uk-h4">Add or modify a user</h4>
 
-<form method="post">
-	<div class="field-row">
+<form method="post" class="maxSizeForm">
+	<div class="field-row-stacked">
 		<label for="username">Username *</label>
 		<input id="username" type="text" autocomplete="off" name="fdata[username]"
 			value="<?php echo Summoner::ifset($TemplateData['editData'], 'name'); ?>">
 	</div>
-	<div class="field-row">
+	<div class="field-row-stacked">
 		<label for="login">Login *</label>
 		<input id="login" type="text" autocomplete="off" name="fdata[login]"
 			value="<?php echo Summoner::ifset($TemplateData['editData'], 'login'); ?>">
 	</div>
-	<div class="field-row">
+	<div class="field-row-stacked">
 		<label for="password">Password *</label>
 		<input id="password" type="password" autocomplete="off" name="fdata[password]">
 	</div>
-	<div class="field-row">
+	<div class="field-row-stacked">
 		<label for="group">Main group *</label>
 		<select id="group" name="fdata[group]">
 			<option value="">Please select</option>
@@ -27,7 +27,7 @@
 			<?php } ?>
 		</select>
 	</div>
-	<div class="field-row">
+	<div class="field-row-stacked">
 		<label for="groups">Additional groups</label>
 		<select id="groups" name="fdata[groups][]" multiple="multiple"
 			size="5">
@@ -39,29 +39,32 @@
 			<?php } ?>
 		</select>
 	</div>
-	<div class="field-row">
+	<div class="field-row-stacked">
 		<input id="active" type="checkbox" name="fdata[active]" value="1"
 			<?php if(Summoner::ifset($TemplateData['editData'], 'active')) echo "checked"; ?>>
 		<label for="active">Can login</label>
 	</div>
 	<?php if(Summoner::ifset($TemplateData['editData'], 'name') && Summoner::ifsetValue($TemplateData['editData'], 'protected', '0')) { ?>
-	<div class="field-row">
+	<div class="field-row-stacked">
 		<input id="delete" type="checkbox" name="fdata[doDelete]" value="1">
 		<label for="delete">Delete. Warning: Content owned by this user will not be deleted and thus only manageable by admin! Better disable the user if there is content.</label>
 	</div>
-	<div class="field-row">
+	<div class="field-row-stacked">
 		<input id="refreshApiToken" type="checkbox" name="fdata[refreshApiToken]" value="1">
-		<label for="refreshApiToken">Create API Token Valid until:
-			<?php echo Summoner::ifset($TemplateData['editData'], 'apiTokenValidDate'); ?>
-			<?php echo Summoner::ifset($TemplateData['editData'], 'apiToken'); ?></label>
+		<label for="refreshApiToken">Create API Token</label>
+	</div>
+	<div class="field-row-stacked">
+		<label>
+			Current Token: <?php echo Summoner::ifset($TemplateData['editData'], 'apiToken'); ?><br />
+			Valid until: <?php echo Summoner::ifset($TemplateData['editData'], 'apiTokenValidDate'); ?>
+		</label>
 	</div>
 	<?php } ?>
-	<div class="field-row">
+	<div class="field-row-stacked">
 		<input type="submit" name="submitForm" value="Save">
 	</div>
 </form>
 
-
 <h4 class="uk-h4">Available users</h4>
 <div class="sunken-panel">
 	<table width="100%">
diff --git a/webclient/view/98/profile/profile.html b/webclient/view/98/profile/profile.html
index 13e9b02..a95be20 100644
--- a/webclient/view/98/profile/profile.html
+++ b/webclient/view/98/profile/profile.html
@@ -1,34 +1,36 @@
 <h3>Manage your profile</h3>
 
-<form method="post">
-	<div class="field-row">
+<form method="post" class="maxSizeForm">
+	<div class="field-row-stacked">
 		<label for="username">Username</label>
 		<input id="username" type="text" autocomplete="off" name="fdata[username]"
 		       value="<?php echo Summoner::ifset($TemplateData['editData'], 'name'); ?>">
 	</div>
-	<div class="field-row">
+	<div class="field-row-stacked">
 		<label for="password">Password</label>
 		<input id="password" type="password" autocomplete="off" name="fdata[password]">
 	</div>
-	<div class="field-row">
+	<div class="field-row-stacked">
 		<label for="group">Main group</label>
-		<input class="uk-input" id="group" type="text" name="fdata[group]" disabled
+		<input  id="group" type="text" name="fdata[group]" disabled
 			value="<?php echo Summoner::ifset($TemplateData['editData'], 'baseGroupName'); ?>">
 	</div>
-	<div class="field-row">
+	<div class="field-row-stacked">
 		<label for="additionalGroups">Additional groups</label>
-		<input class="uk-input" id="additionalGroups" type="text" name="fdata[additionalGroups]" disabled
+		<input id="additionalGroups" type="text" name="fdata[additionalGroups]" disabled
 			value="To be done">
 	</div>
-	<div class="field-row">
+	<div class="field-row-stacked">
 		<input id="refreshApiToken" type="checkbox" name="fdata[refreshApiToken]" value="1">
 		<label for="refreshApiToken">Create API Token</label>
 	</div>
-	<div class="field-row">
-		Valid until: <?php echo Summoner::ifset($TemplateData['editData'], 'apiTokenValidDate'); ?><br />
-		Key: <?php echo Summoner::ifset($TemplateData['editData'], 'apiToken'); ?>
+	<div class="field-row-stacked">
+		<label>
+			Valid until: <?php echo Summoner::ifset($TemplateData['editData'], 'apiTokenValidDate'); ?><br />
+			Token: <?php echo Summoner::ifset($TemplateData['editData'], 'apiToken'); ?>
+		</label>
 	</div>
-	<div class="field-row">
+	<div class="field-row-stacked">
 		<input type="submit" name="submitForm" value="Save">
 	</div>
 </form>
diff --git a/webclient/view/98/ui/css/style.css b/webclient/view/98/ui/css/style.css
index 79c1578..cca07e7 100644
--- a/webclient/view/98/ui/css/style.css
+++ b/webclient/view/98/ui/css/style.css
@@ -2,6 +2,7 @@ body {
     background: #c0c0c0;
 }
 
+/** 98.css overwrites */
 blockquote {
     background-color: #dfdfdf;
     margin: 0 0 20px;
@@ -11,6 +12,7 @@ blockquote {
 select[multiple="multiple"] {
     height: initial;
     background-image: initial;
+    padding-right: inherit;
 }
 
 h1 {
@@ -43,6 +45,19 @@ h5 {
     font-family: Arial;
 }
 
+.field-row-stacked *+* {
+    margin-top: 0;
+}
+
+.field-row-stacked input[type="submit"] {
+    width: max-content;
+}
+
+.field-row-stacked label {
+    margin-top: 6px;
+}
+
+/** custom */
 #navSearchWindow {
     width: 400px;
 }
@@ -80,3 +95,7 @@ h5 {
     cursor: grab;
     padding: 5px;
 }
+
+.maxSizeForm {
+    width: 500px;
+}
-- 
2.39.5