9 files changed, 26 insertions, 22 deletions
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index d7b232b915e..9e2f9cf2df4 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -14,6 +14,8 @@ script(
 	]
 );
 /** @var array $_ */
+/** @var \OCP\IURLGenerator $urlGenerator */
+$urlGenerator = $_['urlGenerator'];
 ?>
 <script id="categories-template" type="text/x-handlebars-template">
 {{#each this}}
@@ -29,7 +31,7 @@ script(
 
 <?php if($_['appstoreEnabled']): ?>
 	<li>
-		<a class="app-external icon-info" target="_blank" rel="noreferrer noopener" href="https://docs.nextcloud.org/server/12/developer_manual/"><?php p($l->t('Developer documentation'));?> ↗</a>
+		<a class="app-external icon-info" target="_blank" rel="noreferrer noopener" href="<?php p($urlGenerator->linkToDocs('developer-manual')); ?>"><?php p($l->t('Developer documentation'));?> ↗</a>
 	</li>
 <?php endif; ?>
 </script>
diff --git a/settings/templates/certificates.php b/settings/templates/certificates.php
index ac0a2293800..d9587f97946 100644
--- a/settings/templates/certificates.php
+++ b/settings/templates/certificates.php
@@ -10,7 +10,7 @@
 		</thead>
 		<tbody>
 		<?php foreach ($_['certs'] as $rootCert): /**@var \OCP\ICertificate $rootCert */ ?>
-			<tr class="<?php echo ($rootCert->isExpired()) ? 'expired' : 'valid' ?>"
+			<tr class="<?php echo $rootCert->isExpired() ? 'expired' : 'valid' ?>"
 				data-name="<?php p($rootCert->getName()) ?>">
 				<td class="rootCert"
 					title="<?php p($rootCert->getOrganization()) ?>">
diff --git a/settings/templates/settings.php b/settings/templates/settings.php
index 48b4e6b3234..44011af2884 100644
--- a/settings/templates/settings.php
+++ b/settings/templates/settings.php
@@ -6,4 +6,4 @@
 
 <?php foreach($_['forms'] as $form) {
 	print_unescaped($form);
-};
+}
diff --git a/settings/templates/settings/additional.php b/settings/templates/settings/additional.php
index 2ad2c5af4e5..3af78adde71 100644
--- a/settings/templates/settings/additional.php
+++ b/settings/templates/settings/additional.php
@@ -30,4 +30,4 @@
 	if (isset($form['form'])) {?>
 		<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p('');?>"><?php print_unescaped($form['form']);?></div>
 	<?php }
-};?>
+} ?>
diff --git a/settings/templates/settings/admin/server.development.notice.php b/settings/templates/settings/admin/server.development.notice.php
index d1af82bc9a9..42599c54459 100644
--- a/settings/templates/settings/admin/server.development.notice.php
+++ b/settings/templates/settings/admin/server.development.notice.php
@@ -1,3 +1,3 @@
 <div class="section">
-	<p><?php include(__DIR__ . '/../../settings.development.notice.php'); ?></p>
+	<p><?php include __DIR__ . '/../../settings.development.notice.php'; ?></p>
 </div>
diff --git a/settings/templates/settings/admin/server.php b/settings/templates/settings/admin/server.php
index 2805eb72ce1..4350a7105c8 100644
--- a/settings/templates/settings/admin/server.php
+++ b/settings/templates/settings/admin/server.php
@@ -132,7 +132,7 @@
 				<ol>
 					<?php foreach(json_decode($_['cronErrors']) as $error) { if(isset($error->error)) {?>
 						<li><?php p($error->error) ?> <?php p($error->hint) ?></li>
-					<?php }};?>
+					<?php }} ?>
 				</ol>
 			</li>
 			<?php
diff --git a/settings/templates/settings/admin/tipstricks.php b/settings/templates/settings/admin/tipstricks.php
index cf5c6c71104..3ab337e06f8 100644
--- a/settings/templates/settings/admin/tipstricks.php
+++ b/settings/templates/settings/admin/tipstricks.php
@@ -41,7 +41,6 @@
 			</li>
 		<?php } ?>
 		<li><a target="_blank" rel="noreferrer noopener" href="<?php p(link_to_docs('admin-backup')); ?>"><?php p($l->t('How to do backups'));?> ↗</a></li>
-		<li><a target="_blank" rel="noreferrer noopener" href="<?php p(link_to_docs('admin-monitoring')); ?>"><?php p($l->t('Advanced monitoring'));?> ↗</a></li>
 		<li><a target="_blank" rel="noreferrer noopener" href="<?php p(link_to_docs('admin-performance')); ?>"><?php p($l->t('Performance tuning'));?> ↗</a></li>
 		<li><a target="_blank" rel="noreferrer noopener" href="<?php p(link_to_docs('admin-config')); ?>"><?php p($l->t('Improving the config.php'));?> ↗</a></li>
 		<li><a target="_blank" rel="noreferrer noopener" href="<?php p(link_to_docs('developer-theming')); ?>"><?php p($l->t('Theming'));?> ↗</a></li>
diff --git a/settings/templates/settings/personal/personal.info.php b/settings/templates/settings/personal/personal.info.php
index c2dd0b64644..9f1f83621d2 100644
--- a/settings/templates/settings/personal/personal.info.php
+++ b/settings/templates/settings/personal/personal.info.php
@@ -240,7 +240,7 @@ vendor_style('jcrop/css/jquery.Jcrop');
 					</div>
 				</div>
 				<?php } ?>
-				<input type="text" name="website" id="website" value="<?php p($_['website']); ?>"
+				<input type="url" name="website" id="website" value="<?php p($_['website']); ?>"
 				       placeholder="<?php p($l->t('Link https://…')); ?>"
 				       autocomplete="on" autocapitalize="none" autocorrect="off"
 					   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
diff --git a/settings/templates/users/part.userlist.php b/settings/templates/users/part.userlist.php
index 146e35d11ac..aaf20b6eaef 100644
--- a/settings/templates/users/part.userlist.php
+++ b/settings/templates/users/part.userlist.php
@@ -1,4 +1,4 @@
-<table id="userlist" class="hascontrols grid" data-groups="<?php p($_['allGroups']);?>">
+<table id="userlist" class="grid" data-groups="<?php p($_['allGroups']);?>">
 	<thead>
 		<tr>
 			<th id="headerAvatar" scope="col"></th>
@@ -64,19 +64,22 @@
 			<td class="storageLocation"></td>
 			<td class="userBackend"></td>
 			<td class="lastLogin"></td>
-			<td class="userActions"><span></span>
-				<div class="popovermenu bubble menu">
-					<ul class="userActionsMenu">
-						<li>
-							<a href="#" class="menuitem action-togglestate permanent" data-action="togglestate"></a>
-						</li>
-						<li>
-							<a href="#" class="menuitem action-remove permanent" data-action="remove">
-								<span class="icon icon-delete"></span>
-								<span><?php p($l->t('Delete')); ?></span>
-							</a>
-						</li>
-					</ul>
+			<td class="userActions">
+				<div class="toggleUserActions">
+					<a class="action"><span class="icon-more"></span></a>
+					<div class="popovermenu bubble menu">
+						<ul class="userActionsMenu">
+							<li>
+								<a href="#" class="menuitem action-togglestate permanent" data-action="togglestate"></a>
+							</li>
+							<li>
+								<a href="#" class="menuitem action-remove permanent" data-action="remove">
+									<span class="icon icon-delete"></span>
+									<span><?php p($l->t('Delete')); ?></span>
+								</a>
+							</li>
+						</ul>
+					</div>
 				</div>
 			</td>
 		</tr>