2 files changed, 11 insertions, 3 deletions
diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index 86dbc0a5ee..dca218fc90 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -23,7 +23,7 @@
 
 <!-- BEGIN f_mask -->
 <fieldset class="perm">
-	<legend>{p_mask.f_mask.NAME}</legend>
+	<legend><!-- IF not p_mask.S_VIEW --><input type="checkbox" class="radio" 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" /> <!-- ELSE --><!-- ENDIF -->{p_mask.f_mask.NAME}</legend>
 
 	<!-- IF not p_mask.S_VIEW -->
 		<div class="perm_switch">
@@ -65,7 +65,7 @@
 		<div class="perm_panel" id="options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" <!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
 			<span class="corners-top"><span></span></span>
 			<div class="tablewrap">
-				<table cellspacing="1">
+				<table id="table{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" cellspacing="1">
 				<colgroup>
 					<col class="permissions_name" />
 					<col class="permissions_yes" />
@@ -104,6 +104,12 @@
 				</tbody>
 				</table>
 			</div>
+			<!-- IF not p_mask.S_VIEW -->
+			<fieldset class="quick" style="margin-right: 11px;">
+				<p class="small">{L_APPLY_PERMISSIONS_EXPLAIN}</p>
+				<input class="button1" type="submit" name="psubmit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" value="{L_APPLY_PERMISSIONS}" />
+			</fieldset>
+			<!-- ENDIF -->
 			<span class="corners-bottom"><span></span></span>
 		</div>
 	<!-- END category -->
diff --git a/phpBB/adm/style/permissions.js b/phpBB/adm/style/permissions.js
index 36f2a49e4d..27a1a89ee8 100644
--- a/phpBB/adm/style/permissions.js
+++ b/phpBB/adm/style/permissions.js
@@ -32,7 +32,7 @@ function get_radio_status(index, rb)
 */
 function set_colours(id, init, quick)
 {
-	var table = document.getElementById('options' + id);
+	var table = document.getElementById('table' + id);
 	var tab = document.getElementById('tab' + id);
 
 	if (typeof(quick) != 'undefined') 
@@ -120,12 +120,14 @@ function swap_options(pmask, fmask, cat, adv, view)
 	if (adv_block.style.display == 'block' && adv == true)
 	{
 		dE('advanced' + pmask + fmask, -1);
+		document.getElementById('checkbox' + pmask + fmask).style.display = 'inline';
 		return;
 	}
 
 	// init colours
 	if (adv)
 	{
+		dE('checkbox' + pmask + fmask, -1);
 		init_colours(pmask + fmask);
 	}