Merge branch '4.0-dev' into workflow-preinstalled-default-category

joomla · Jan 29, 2019 · e9b8a0a · e9b8a0a
2 parents cdf846a + a42d60d
commit e9b8a0a
Showing 1 changed file with 34 additions and 33 deletions.
diff --git a/administrator/modules/mod_logged/tmpl/default.php b/administrator/modules/mod_logged/tmpl/default.php
@@ -29,39 +29,40 @@
 		</tr>
 	</thead>
 	<tbody>
-	<?php foreach ($users as $user) : ?>
-		<tr>
-			<th scope="row">
-				<?php if (isset($user->editLink)) : ?>
-					<a href="<?php echo $user->editLink; ?>">
-						<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span><?php echo htmlspecialchars($user->name, ENT_QUOTES, 'UTF-8'); ?>
-					</a>
-				<?php else : ?>
-					<?php echo htmlspecialchars($user->name, ENT_QUOTES, 'UTF-8'); ?>
-				<?php endif; ?>
-			</th>
-			<td>
-				<?php if ($user->client_id === null) : ?>
-					<?php // Don't display a client ?>
-				<?php elseif ($user->client_id) : ?>
-					<?php echo Text::_('JADMINISTRATION'); ?>
-				<?php else : ?>
-					<?php echo Text::_('JSITE'); ?>
-					<a href="<?php echo $user->logoutLink; ?>" class="mr-2 btn btn-danger btn-sm" role="button">
-						<span class="icon-remove icon-white" aria-hidden="true"></span>
-						<?php echo Text::_('JLOGOUT'); ?>
-					</a>
-				<?php endif; ?>
-			</td>
-			<td>
-				<span class="badge badge-secondary badge-pill">
-					<span class="small">
-						<span class="icon-calendar" aria-hidden="true"></span>
-						<?php echo HTMLHelper::_('date', $user->time, Text::_('DATE_FORMAT_LC5')); ?>
+		<?php foreach ($users as $user) : ?>
+			<tr>
+				<th scope="row">
+					<?php if (isset($user->editLink)) : ?>
+						<a href="<?php echo $user->editLink; ?>">
+							<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span><?php echo htmlspecialchars($user->name, ENT_QUOTES, 'UTF-8'); ?>
+						</a>
+					<?php else : ?>
+						<?php echo htmlspecialchars($user->name, ENT_QUOTES, 'UTF-8'); ?>
+					<?php endif; ?>
+				</th>
+				<td>
+					<?php if ($user->client_id === null) : ?>
+						<?php // Don't display a client ?>
+					<?php elseif ($user->client_id) : ?>
+						<?php echo Text::_('JADMINISTRATION'); ?>
+					<?php else : ?>
+						<form action="<?php echo $user->logoutLink; ?>" method="post" name="adminForm">
+							<?php echo Text::_('JSITE'); ?>
+							<button type="submit" class="mr-2 btn btn-danger btn-sm">
+								<?php echo Text::_('JLOGOUT'); ?>
+							</button>
+						</form>
+					<?php endif; ?>
+				</td>
+				<td>
+					<span class="badge badge-secondary badge-pill">
+						<span class="small">
+							<span class="icon-calendar" aria-hidden="true"></span>
+							<?php echo HTMLHelper::_('date', $user->time, Text::_('DATE_FORMAT_LC5')); ?>
+						</span>
 					</span>
-				</span>
-			</td>
-		</tr>
-	<?php endforeach; ?>
+				</td>
+			</tr>
+		<?php endforeach; ?>
 	</tbody>
 </table>