From 3585dbd42c114a63d585e68e14f52f2a2918632a Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 14 Jul 2007 15:44:10 +0000
Subject: a bunch of fixes

git-svn-id: file:///svn/phpbb/trunk@7884 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/admin.css             | 3 +++
 phpBB/adm/style/permission_mask.html  | 4 ++--
 phpBB/adm/style/permission_trace.html | 9 ++++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style')

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 76875bf412..f7bea46942 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1322,6 +1322,9 @@ fieldset.permissions .permissions-switch {
 	float: left;
 }
 
+fieldset.permissions .padding {
+}
+
 .permissions-switch a {
 	text-decoration: underline;
 	font-size: 0.90em;
diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index 81f889b390..05368cbc78 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -18,7 +18,7 @@
 
 <!-- BEGIN p_mask -->
 <div class="clearfix"></div>
-<h3>{p_mask.PADDING}{p_mask.NAME}<!-- IF p_mask.S_LOCAL --> <span class="small"> [{p_mask.L_ACL_TYPE}]</span><!-- ENDIF --></h3>
+<h3>{p_mask.NAME}<!-- IF p_mask.S_LOCAL --> <span class="small"> [{p_mask.L_ACL_TYPE}]</span><!-- ENDIF --></h3>
 
 <!-- BEGIN f_mask -->
 <div class="clearfix"></div>
@@ -28,7 +28,7 @@
 			<input type="checkbox" style="display: none;" class="permissions-checkbox" name="inherit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" id="checkbox{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" value="1" onclick="toggle_opacity('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')" /> 
 		<!-- ELSE -->
 		<!-- ENDIF -->
-		<!-- {p_mask.f_mask.PADDING} -->{p_mask.f_mask.NAME}
+		<!-- IF p_mask.f_mask.PADDING --><span class="padding">{p_mask.f_mask.PADDING}{p_mask.f_mask.PADDING}</span><!-- ENDIF -->{p_mask.f_mask.NAME}
 	</legend>
 	<!-- IF not p_mask.S_VIEW -->
 		<div class="permissions-switch">
diff --git a/phpBB/adm/style/permission_trace.html b/phpBB/adm/style/permission_trace.html
index 7f7079cc8f..5d0e359c2f 100644
--- a/phpBB/adm/style/permission_trace.html
+++ b/phpBB/adm/style/permission_trace.html
@@ -19,7 +19,7 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN trace -->
-		<!-- IF trace.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
+		<!-- IF trace.S_ROW_COUNT is even --><tr class="row3"><!-- ELSE --><tr class="row4"><!-- ENDIF -->
 		<td style="white-space: nowrap;"><strong>{trace.WHO}</strong></td>
 
 		<!-- IF trace.S_SETTING_NEVER -->
@@ -41,6 +41,13 @@
 		<td>{trace.INFORMATION}</td>
 	</tr>
 	<!-- END trace -->
+	<tr class="row2">
+		<td style="white-space: nowrap;"><strong>{L_TRACE_RESULT}</strong></td>
+		<td colspan="2" style="text-align: center;" class="<!-- IF S_RESULT_NEVER -->never<!-- ELSEIF S_RESULT_YES -->yes<!-- ELSE -->no<!-- ENDIF -->">
+		<!-- IF S_RESULT_NEVER -->{L_ACL_NEVER}<!-- ELSEIF S_RESULT_YES -->{L_ACL_YES}<!-- ELSE -->{L_ACL_NO}<!-- ENDIF -->
+		</td>
+		<td>{L_RESULTING_PERMISSION}</td>
+	</tr>
 	</tbody>
 	</table>
 
-- 
cgit v1.2.1