From a0f8e1323a0fb50e6a4b7449f93b493377eddd2c Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Mon, 17 Apr 2006 13:09:50 +0000
Subject: - clean up marklist calls (global function) - added new feature: test
 out others permissions (admin permissions will not be copied) - changed
 attachment processing by directly using the template engine - fixed some
 attachment related bugs - additional tiny fixes

git-svn-id: file:///svn/phpbb/trunk@5790 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_main.html       | 60 ++++++++++++++++++++-----------------
 phpBB/adm/style/acp_users.html      |  1 +
 phpBB/adm/style/overall_header.html |  5 ++++
 3 files changed, 38 insertions(+), 28 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 1b521e1ec9..f293c31147 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -61,39 +61,43 @@
 	</tbody>
 </table>
 
-<form id="stats" method="post" action="{U_ACTION}">
-<fieldset class="quick">
-	<select name="action">{S_ACTION_OPTIONS}</select>
+<!-- IF S_ACTION_OPTIONS -->
+	<form id="stats" method="post" action="{U_ACTION}">
+	<fieldset class="quick">
+		<select name="action">{S_ACTION_OPTIONS}</select>
 
-	<input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
-</fieldset>
-</form>
+		<input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
+	</fieldset>
+	</form>
+<!-- ENDIF -->
 
-<h2>{L_ADMIN_LOG}</h2>
+<!-- IF .log -->
+	<h2>{L_ADMIN_LOG}</h2>
 
-<p>{L_ADMIN_LOG_INDEX_EXPLAIN}</p>
+	<p>{L_ADMIN_LOG_INDEX_EXPLAIN}</p>
 
-<table cellspacing="1">
-<thead>
-<tr>
-	<th>{L_USERNAME}</th>
-	<th>{L_IP}</th>
-	<th>{L_TIME}</th>
-	<th>{L_ACTION}</th>
-</tr>
-</thead>
-<tbody>
-<!-- BEGIN log -->
-	<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-		<td>{log.USERNAME}</td>
-		<td style="text-align: center;">{log.IP}</td>
-		<td style="text-align: center;">{log.DATE}</td>
-		<td>{log.ACTION}</td>
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_USERNAME}</th>
+		<th>{L_IP}</th>
+		<th>{L_TIME}</th>
+		<th>{L_ACTION}</th>
 	</tr>
-<!-- END log -->
-</tbody>
-</table>
+	</thead>
+	<tbody>
+	<!-- BEGIN log -->
+		<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
+			<td>{log.USERNAME}</td>
+			<td style="text-align: center;">{log.IP}</td>
+			<td style="text-align: center;">{log.DATE}</td>
+			<td>{log.ACTION}</td>
+		</tr>
+	<!-- END log -->
+	</tbody>
+	</table>
+<!-- ENDIF -->
 
 <!-- IF S_INACTIVE_USERS -->
 	<h2>{L_INACTIVE_USERS}</h2>
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index 0df5e86b97..a7a66f5d5e 100644
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -84,6 +84,7 @@
 	<dl>
 		<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_NAME_CHARS_EXPLAIN}</span></dt>
 		<dd><input type="text" id="user" name="user" value="{USER}" /></dd>
+		<!-- IF U_SWITCH_PERMISSIONS --><dd>[ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]</dd><!-- ENDIF -->
 	</dl>
 	<dl>
 		<dt><label>{L_REGISTERED}:</label></dt>
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 9345ae0682..f719ec8074 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -50,6 +50,11 @@ function dE(n, s, type)
 function marklist(id, name, state)
 {
 	var parent = document.getElementById(id);
+	if (!parent)
+	{
+		eval('parent = document.' + id);
+	}
+
 	if (!parent)
 	{
 		return;
-- 
cgit v1.2.1