change ACL_NO to ACL_NEVER and ACL_UNSET to ACL_NO to let our users get what is meant on the first look.

the downside is that the information is no more accurate (permissions are still unset, defaulting to no) - someone might to overlook all explanations. :) git-svn-id: file:///svn/phpbb/trunk@6115 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Meik Sievertsen <acydburn@phpbb.com> 2006-06-22 16:49:04 +0000
committer: Meik Sievertsen <acydburn@phpbb.com> 2006-06-22 16:49:04 +0000
commit: 8b1555c15bbfe153570600f95259fb286db4cdee (patch)
tree: 82d2d4b326be82368f5535b74aeb706bc5f5da01 /phpBB/adm/style
parent: 725b21f2d206efb4b34eb95ec3329bc81f66b805 (diff)
download: forums-8b1555c15bbfe153570600f95259fb286db4cdee.tar
forums-8b1555c15bbfe153570600f95259fb286db4cdee.tar.gz
forums-8b1555c15bbfe153570600f95259fb286db4cdee.tar.bz2
forums-8b1555c15bbfe153570600f95259fb286db4cdee.tar.xz
forums-8b1555c15bbfe153570600f95259fb286db4cdee.zip
4 files changed, 31 insertions, 31 deletions
diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html
index 6cbbcde8d2..0eca7e9273 100644
--- a/phpBB/adm/style/acp_permission_roles.html
+++ b/phpBB/adm/style/acp_permission_roles.html
@@ -96,7 +96,7 @@
 	<h1>{L_ACL_TYPE}</h1>
 
 	<fieldset class="quick">
-		<a href="javascript: mark_options('a_options', 'y');">{L_ALL_YES}</a> &bull; <a href="javascript: mark_options('a_options', 'n');">{L_ALL_NO}</a> &bull; <a href="javascript: mark_options('a_options', 'u');">{L_ALL_UNSET}</a>
+		<a href="javascript: mark_options('a_options', 'y');">{L_ALL_YES}</a> &bull; <a href="javascript: mark_options('a_options', 'n');">{L_ALL_NEVER}</a> &bull; <a href="javascript: mark_options('a_options', 'u');">{L_ALL_NO}</a>
 	</fieldset>
 
 	<fieldset class="permissions">
@@ -114,10 +114,10 @@
 		<!-- BEGIN auth -->
 			<!-- IF auth.S_YES -->
 				<td class="preset preset_yes">
+			<!-- ELSEIF auth.S_NEVER -->
+				<td class="preset preset_never">
 			<!-- ELSEIF auth.S_NO -->
 				<td class="preset preset_no">
-			<!-- ELSEIF auth.S_UNSET -->
-				<td class="preset preset_unset">
 			<!-- ELSE -->
 				<td class="preset preset_custom">
 			<!-- ENDIF -->
@@ -132,17 +132,17 @@
 				<tr>
 					<th scope="col" style="text-align: left; padding-left: 0;"><strong>{L_ACL_SETTING} [{auth.CAT_NAME}]</strong></th>
 					<th scope="col"><a href="javascript: mark_options('options{auth.S_ROW_COUNT}', 'y');">{L_ACL_YES}</a></th>
-					<th scope="col"><a href="javascript: mark_options('options{auth.S_ROW_COUNT}', 'u');">{L_ACL_UNSET}</a></th>
-					<th scope="col"><a href="javascript: mark_options('options{auth.S_ROW_COUNT}', 'n');">{L_ACL_NO}</a></th>
+					<th scope="col"><a href="javascript: mark_options('options{auth.S_ROW_COUNT}', 'u');">{L_ACL_NO}</a></th>
+					<th scope="col"><a href="javascript: mark_options('options{auth.S_ROW_COUNT}', 'n');">{L_ACL_NEVER}</a></th>
 				</tr>
 				</thead>
 				<tbody>
 				<!-- BEGIN mask -->
 					<!-- IF auth.mask.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
 					<th>{auth.mask.PERMISSION}</th>
-					<td class="unset"><input id="setting[{auth.mask.FIELD_NAME}]_y" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1" /></td>
-					<td class="unset"><input id="setting[{auth.mask.FIELD_NAME}]_u" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_UNSET --> checked="checked"<!-- ENDIF --> value="-1" /></td>
-					<td class="unset"><input id="setting[{auth.mask.FIELD_NAME}]_n" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_NO --> checked="checked"<!-- ENDIF --> value="0" /></td>
+					<td class="no"><input id="setting[{auth.mask.FIELD_NAME}]_y" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1" /></td>
+					<td class="no"><input id="setting[{auth.mask.FIELD_NAME}]_u" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_NO --> checked="checked"<!-- ENDIF --> value="-1" /></td>
+					<td class="no"><input id="setting[{auth.mask.FIELD_NAME}]_n" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_NEVER --> checked="checked"<!-- ENDIF --> value="0" /></td>
 				</tr>
 				<!-- END mask -->
 				</tbody>
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 759a5e0749..c1bac3d3c6 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -851,12 +851,12 @@ table.pmask td.name {
 	background-color: #40C53D;
 }
 
-.permissions td.no {
+.permissions td.never {
 	width: 20px;
 	background-color: #EC7181;
 }
 
-.permissions td.unset {
+.permissions td.no {
 	width: 20px;
 	background-color: transparent;
 }
@@ -889,11 +889,11 @@ table.pmask td.name {
 	background: #DAE4EC url("../images/bg_hash2.gif") repeat;
 }
 
-.preset_no {
+.preset_never {
 	background: #ECD7DA url("../images/bg_hash3.gif") repeat;
 }
 
-.preset_unset {
+.preset_no {
 	background: #ECD7DA url("../images/bg_hash4.gif") repeat;
 }
 
diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index b98af2dfa4..c521d7f33d 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -115,7 +115,7 @@
 			return;
 		}
 
-		// Mark all options to unset first...
+		// Mark all options to no (unset) first...
 		mark_options(target_id, 'u');
 
 		for (var r in settings)
@@ -179,10 +179,10 @@
 		<!-- BEGIN category -->
 			<!-- IF p_mask.f_mask.category.S_YES -->
 				<td class="preset preset_yes">
+			<!-- ELSEIF p_mask.f_mask.category.S_NEVER -->
+				<td class="preset preset_never">
 			<!-- ELSEIF p_mask.f_mask.category.S_NO -->
 				<td class="preset preset_no">
-			<!-- ELSEIF p_mask.f_mask.category.S_UNSET -->
-				<td class="preset preset_unset">
 			<!-- ELSE -->
 				<td class="preset preset_custom">
 			<!-- ENDIF -->
@@ -200,8 +200,8 @@
 				<div style="float: right; text-align: right; width: 35%;">
 					<p class="small">
 						[<a href="javascript: mark_options('a_options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}', 'y'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}');">{L_ALL_YES}</a>]<br />
-						[<a href="javascript: mark_options('a_options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}', 'n'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}');">{L_ALL_NO}</a>]<br />
-						[<a href="javascript: mark_options('a_options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}', 'u'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}');">{L_ALL_UNSET}</a>]
+						[<a href="javascript: mark_options('a_options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}', 'n'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}');">{L_ALL_NEVER}</a>]<br />
+						[<a href="javascript: mark_options('a_options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}', 'u'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}');">{L_ALL_NO}</a>]
 					</p>
 				</div>
 			<!-- ELSE -->
@@ -218,11 +218,11 @@
 					<th scope="col" style="text-align: left; padding-left: 0;"><strong>{L_ACL_SETTING} [{p_mask.f_mask.category.CAT_NAME}]</strong></th>
 				<!-- IF p_mask.S_VIEW -->
 					<th scope="col">{L_ACL_YES}</th>
-					<th scope="col">{L_ACL_NO}</th>
+					<th scope="col">{L_ACL_NEVER}</th>
 				<!-- ELSE -->
 					<th scope="col"><a href="javascript: mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'y'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}');">{L_ACL_YES}</a></th>
-					<th scope="col"><a href="javascript: mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'u'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}');">{L_ACL_UNSET}</a></th>
-					<th scope="col"><a href="javascript: mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'n'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}');">{L_ACL_NO}</a></th>
+					<th scope="col"><a href="javascript: mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'u'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}');">{L_ACL_NO}</a></th>
+					<th scope="col"><a href="javascript: mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'n'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}');">{L_ACL_NEVER}</a></th>
 				<!-- ENDIF -->
 				</tr>
 				</thead>
@@ -231,12 +231,12 @@
 					<!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
 					<th><!-- IF p_mask.f_mask.category.mask.U_TRACE --><a href="#" onclick="javascript:trace('{p_mask.f_mask.category.mask.U_TRACE}')" title="{L_TRACE_SETTING}"><img src="images/icon_trace.gif" alt="{L_TRACE_SETTING}" /></a> <!-- ENDIF -->{p_mask.f_mask.category.mask.PERMISSION}</th>
 					<!-- IF p_mask.S_VIEW -->
-						<td<!-- IF p_mask.f_mask.category.mask.S_YES --> class="yes"<!-- ELSE --> class="unset"<!-- ENDIF -->>&nbsp;</td>
-						<td<!-- IF p_mask.f_mask.category.mask.S_NO --> class="no"<!-- ELSE --> class="unset"<!-- ENDIF -->>&nbsp;</td>
+						<td<!-- IF p_mask.f_mask.category.mask.S_YES --> class="yes"<!-- ELSE --> class="no"<!-- ENDIF -->>&nbsp;</td>
+						<td<!-- IF p_mask.f_mask.category.mask.S_NEVER --> class="never"<!-- ELSE --> class="no"<!-- ENDIF -->>&nbsp;</td>
 					<!-- ELSE -->
-						<td class="unset"><input onchange="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_y" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1" /></td>
-						<td class="unset"><input onchange="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_u" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_UNSET --> checked="checked"<!-- ENDIF --> value="-1" /></td>
-						<td class="unset"><input onchange="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_n" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_NO --> checked="checked"<!-- ENDIF --> value="0" /></td>
+						<td class="no"><input onchange="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_y" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1" /></td>
+						<td class="no"><input onchange="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_u" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_NO --> checked="checked"<!-- ENDIF --> value="-1" /></td>
+						<td class="no"><input onchange="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_n" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_NEVER --> checked="checked"<!-- ENDIF --> value="0" /></td>
 					<!-- ENDIF -->
 				</tr>
 				<!-- END mask -->
diff --git a/phpBB/adm/style/permission_trace.html b/phpBB/adm/style/permission_trace.html
index 6b21865562..96e18c396a 100644
--- a/phpBB/adm/style/permission_trace.html
+++ b/phpBB/adm/style/permission_trace.html
@@ -22,20 +22,20 @@
 		<!-- IF trace.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
 		<td style="white-space: nowrap;"><strong>{trace.WHO}</strong></td>
 
-		<!-- IF trace.S_SETTING_NO -->
-			<td class="no">{L_ACL_NO}</td>
+		<!-- IF trace.S_SETTING_NEVER -->
+			<td class="never">{L_ACL_NEVER}</td>
 		<!-- ELSEIF trace.S_SETTING_YES -->
 			<td class="yes">{L_ACL_YES}</td>
 		<!-- ELSE -->
-			<td class="unset">{L_ACL_UNSET}</td>
+			<td class="no">{L_ACL_NO}</td>
 		<!-- ENDIF -->
 
-		<!-- IF trace.S_TOTAL_NO -->
-			<td class="no">{L_ACL_NO}</td>
+		<!-- IF trace.S_TOTAL_NEVER -->
+			<td class="never">{L_ACL_NEVER}</td>
 		<!-- ELSEIF trace.S_TOTAL_YES -->
 			<td class="yes">{L_ACL_YES}</td>
 		<!-- ELSE -->
-			<td class="unset">{L_ACL_UNSET}</td>
+			<td class="no">{L_ACL_NO}</td>
 		<!-- ENDIF -->
 
 		<td>{trace.INFORMATION}</td>
author	Meik Sievertsen <acydburn@phpbb.com>	2006-06-22 16:49:04 +0000
committer	Meik Sievertsen <acydburn@phpbb.com>	2006-06-22 16:49:04 +0000
commit	8b1555c15bbfe153570600f95259fb286db4cdee (patch)
tree	82d2d4b326be82368f5535b74aeb706bc5f5da01 /phpBB/adm/style
parent	725b21f2d206efb4b34eb95ec3329bc81f66b805 (diff)
download	forums-8b1555c15bbfe153570600f95259fb286db4cdee.tar forums-8b1555c15bbfe153570600f95259fb286db4cdee.tar.gz forums-8b1555c15bbfe153570600f95259fb286db4cdee.tar.bz2 forums-8b1555c15bbfe153570600f95259fb286db4cdee.tar.xz forums-8b1555c15bbfe153570600f95259fb286db4cdee.zip