From cbece78f7b180253af95071ab859c468ed061ff5 Mon Sep 17 00:00:00 2001
From: Graham Eames <grahamje@users.sourceforge.net>
Date: Sat, 23 Sep 2006 12:27:51 +0000
Subject: A reworking of how we handle inactive users

git-svn-id: file:///svn/phpbb/trunk@6394 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_inactive.html | 75 +++++++++++++++++++++++++++++++++++++++
 phpBB/adm/style/acp_main.html     | 25 +++++--------
 2 files changed, 83 insertions(+), 17 deletions(-)
 create mode 100755 phpBB/adm/style/acp_inactive.html

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html
new file mode 100755
index 0000000000..b4e617b864
--- /dev/null
+++ b/phpBB/adm/style/acp_inactive.html
@@ -0,0 +1,75 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<h2>{L_INACTIVE_USERS}</h2>
+
+<p>{L_INACTIVE_USERS_EXPLAIN}</p>
+
+<form id="inactive" method="post" action="{U_ACTION}">
+
+<div class="clearfix"></div>
+
+<div class="pagination">
+	<!-- IF PAGINATION -->
+		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+	<!-- ELSE -->
+		{S_ON_PAGE}
+	<!-- ENDIF -->
+</div>
+
+<table cellspacing="1">
+<thead>
+<tr>
+	<th>{L_USERNAME}</th>
+	<th>{L_JOINED}</th>
+	<th>{L_INACTIVE_DATE}</th>
+	<th>{L_INACTIVE_REASON}</th>
+	<th>{L_LAST_VISIT}</th>
+	<th>{L_MARK}</th>
+</tr>
+</thead>
+<tbody>
+<!-- BEGIN inactive -->
+	<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
+		<td><a href="{inactive.U_USER_ADMIN}">{inactive.USERNAME}</a></td>
+		<td>{inactive.JOINED}</td>
+		<td>{inactive.INACTIVE_DATE}</td>
+		<td>{inactive.REASON}</td>
+		<td>{inactive.LAST_VISIT}</td>
+		<td>&nbsp;<input type="checkbox" class="radio" name="mark[]" value="{inactive.USER_ID}" />&nbsp;</td>
+	</tr>
+<!-- BEGINELSE -->
+	<tr>
+		<td colspan="5" style="text-align: center;">{L_NO_INACTIVE_USERS}</td>
+	</tr>
+<!-- END inactive -->
+</tbody>
+</table>
+
+<!-- IF .inactive -->
+	<fieldset class="quick" style="float: left;">
+		{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
+		<input class="button2" type="submit" value="{L_GO}" name="sort" />
+	</fieldset>
+
+	<fieldset class="quick">
+		<p><a href="#" onclick="marklist('inactive', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('inactive', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>
+		<select name="action">{S_INACTIVE_OPTIONS}</select>
+
+		<input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
+	</fieldset>
+<!-- ENDIF -->
+
+<div class="pagination">
+	<!-- IF PAGINATION -->
+		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+	<!-- ELSE -->
+		{S_ON_PAGE}
+	<!-- ENDIF -->
+</div>
+
+</form>
+
+<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index af1623146e..ce4dde47b0 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -133,17 +133,18 @@
 	<!-- IF S_INACTIVE_USERS -->
 		<h2>{L_INACTIVE_USERS}</h2>
 
-		<p>{L_INACTIVE_USERS_EXPLAIN}</p>
+		<p>{L_INACTIVE_USERS_EXPLAIN_INDEX}</p>
 
-		<form id="inactive" method="post" action="{U_ACTION}">
+		<div style="text-align: right;"><a href="{U_INACTIVE_USERS}">&raquo; {L_VIEW_INACTIVE_USERS}</a></div>
 
 		<table cellspacing="1">
 		<thead>
 		<tr>
 			<th>{L_USERNAME}</th>
 			<th>{L_JOINED}</th>
+			<th>{L_INACTIVE_DATE}</th>
+			<th>{L_INACTIVE_REASON}</th>
 			<th>{L_LAST_VISIT}</th>
-			<th>{L_MARK}</th>
 		</tr>
 		</thead>
 		<tbody>
@@ -151,29 +152,19 @@
 			<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 
 				<td><a href="{inactive.U_USER_ADMIN}">{inactive.USERNAME}</a></td>
-				<td>{inactive.DATE}</td>
+				<td>{inactive.JOINED}</td>
+				<td>{inactive.INACTIVE_DATE}</td>
+				<td>{inactive.REASON}</td>
 				<td>{inactive.LAST_VISIT}</td>
-				<td>&nbsp;<input type="checkbox" class="radio" name="mark[]" value="{inactive.USER_ID}" />&nbsp;</td>
 			</tr>
 		<!-- BEGINELSE -->
 			<tr>
-				<td colspan="3" style="text-align: center;">{L_NO_INACTIVE_USERS}</td>
+				<td colspan="4" style="text-align: center;">{L_NO_INACTIVE_USERS}</td>
 			</tr>
 		<!-- END inactive -->
 		</tbody>
 		</table>
 
-		<!-- IF .inactive -->
-			<fieldset class="quick">
-				<p><a href="#" onclick="marklist('inactive', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('inactive', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>
-				<select name="action">{S_INACTIVE_OPTIONS}</select>
-
-				<input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
-			</fieldset>
-		<!-- ENDIF -->
-
-		</form>
-
 	<!-- ENDIF -->
 
 <!-- ENDIF -->
-- 
cgit v1.2.1