aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-04-22 16:18:40 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-04-22 16:18:40 +0000
commit856650861f0c454b800fe816ba2592444ef13894 (patch)
treed73a41902d1d58784c7502c94ce4d03998131e0a /phpBB/adm
parent68c349fdc1ad29ff3c80961297db31b1e725973f (diff)
downloadforums-856650861f0c454b800fe816ba2592444ef13894.tar
forums-856650861f0c454b800fe816ba2592444ef13894.tar.gz
forums-856650861f0c454b800fe816ba2592444ef13894.tar.bz2
forums-856650861f0c454b800fe816ba2592444ef13894.tar.xz
forums-856650861f0c454b800fe816ba2592444ef13894.zip
- removed group settings from roles
- added forum icon in front of forums in permissions acp - added trace permissions in permission masks (thanks naderman for writing the first code and for the idea... :)) - some bugfixes - PHP6 fix git-svn-id: file:///svn/phpbb/trunk@5824 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm')
-rw-r--r--phpBB/adm/images/icon_folder_link_small.gifbin0 -> 1207 bytes
-rw-r--r--phpBB/adm/images/icon_folder_lock_small.gifbin0 -> 333 bytes
-rw-r--r--phpBB/adm/images/icon_folder_small.gifbin0 -> 344 bytes
-rw-r--r--phpBB/adm/images/icon_folder_sub_small.gifbin0 -> 1206 bytes
-rw-r--r--phpBB/adm/images/icon_trace.gifbin0 -> 307 bytes
-rw-r--r--phpBB/adm/style/acp_permission_roles.html20
-rw-r--r--phpBB/adm/style/acp_permissions.html2
-rw-r--r--phpBB/adm/style/overall_header.html8
-rw-r--r--phpBB/adm/style/permission_mask.html4
-rw-r--r--phpBB/adm/style/permission_trace.html49
-rw-r--r--phpBB/adm/style/simple_header.html2
11 files changed, 60 insertions, 25 deletions
diff --git a/phpBB/adm/images/icon_folder_link_small.gif b/phpBB/adm/images/icon_folder_link_small.gif
new file mode 100644
index 0000000000..babe1e03cf
--- /dev/null
+++ b/phpBB/adm/images/icon_folder_link_small.gif
Binary files differ
diff --git a/phpBB/adm/images/icon_folder_lock_small.gif b/phpBB/adm/images/icon_folder_lock_small.gif
new file mode 100644
index 0000000000..10eb776972
--- /dev/null
+++ b/phpBB/adm/images/icon_folder_lock_small.gif
Binary files differ
diff --git a/phpBB/adm/images/icon_folder_small.gif b/phpBB/adm/images/icon_folder_small.gif
new file mode 100644
index 0000000000..c16bfa75d5
--- /dev/null
+++ b/phpBB/adm/images/icon_folder_small.gif
Binary files differ
diff --git a/phpBB/adm/images/icon_folder_sub_small.gif b/phpBB/adm/images/icon_folder_sub_small.gif
new file mode 100644
index 0000000000..355ee9c708
--- /dev/null
+++ b/phpBB/adm/images/icon_folder_sub_small.gif
Binary files differ
diff --git a/phpBB/adm/images/icon_trace.gif b/phpBB/adm/images/icon_trace.gif
new file mode 100644
index 0000000000..5c622e9a9d
--- /dev/null
+++ b/phpBB/adm/images/icon_trace.gif
Binary files differ
diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html
index 4a8654f82c..8e1076d701 100644
--- a/phpBB/adm/style/acp_permission_roles.html
+++ b/phpBB/adm/style/acp_permission_roles.html
@@ -70,13 +70,6 @@
<dt><label for="role_description">{L_ROLE_DESCRIPTION}:</label><br /><span>{L_ROLE_DESCRIPTION_EXPLAIN}</span></dt>
<dd><textarea id="role_description" name="role_description" rows="3" cols="45">{ROLE_DESCRIPTION}</textarea></dd>
</dl>
- <dl>
- <dt><label for="pre_select">{L_DISPLAY_FOR_GROUP}:</label><br /><span>{L_DISPLAY_FOR_GROUP_EXPLAIN}</span></dt>
- <dd><select name="pre_select" id="pre_select" onchange="if(this.value=='custom'){dE('custom_group',1);}else{dE('custom_group',-1);}">{S_PRESELECT_OPTIONS}</select></dd>
- <dd id="custom_group"<!-- IF not S_CUSTOM_GROUP_IDS --> style="display:none;"<!-- ENDIF -->>
- <select name="role_group_ids[]" id="role_group_id" style="width: 100%;" multiple="multiple" size="10">{S_GROUP_OPTIONS}</select>
- </dd>
- </dl>
</fieldset>
<fieldset class="quick">
@@ -180,7 +173,6 @@
<thead>
<tr>
<th style="width: 50%">{L_ROLE_NAME}</th>
- <th>{L_DISPLAY_FOR_GROUP}</th>
<th colspan="2">{L_OPTIONS}</th>
</tr>
</thead>
@@ -190,18 +182,6 @@
<td style="vertical-align: top;"><b>{roles.ROLE_NAME}</b>
<!-- IF roles.ROLE_DESCRIPTION --><br /><span>{roles.ROLE_DESCRIPTION}</span><!-- ENDIF -->
</td>
- <td style="vertical-align: top;">
- <!-- IF roles.S_GROUP -->
- <!-- a href="{roles.groups.U_GROUP}">{roles.groups.GROUP_NAME}</a><br / -->
- <select name="r_groups">
- <!-- BEGIN groups -->
- <option<!-- IF roles.groups.S_SPECIAL_GROUP --> class="sep"<!-- ENDIF -->>{roles.groups.GROUP_NAME}</option>
- <!-- END groups -->
- </select>
- <!-- ELSE -->
- {L_EVERY_USER_GROUP}
- <!-- ENDIF -->
- </td>
<td style="vertical-align: top; white-space: nowrap;"><!-- IF roles.U_DISPLAY_ITEMS --><a href="{roles.U_DISPLAY_ITEMS}">{L_VIEW_ASSIGNED_ITEMS}</a><!-- ELSE -->{L_VIEW_ASSIGNED_ITEMS}<!-- ENDIF --></td>
<td style="vertical-align: top; white-space: nowrap;">
<!-- IF not roles.S_FIRST_ROW --><a href="{roles.U_MOVE_UP}"><img src="images/icon_up.gif" alt="{L_MOVE_UP}" title="{L_MOVE_UP}" width="16" height="16" /></a> <!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html
index ad0e97cccd..e54eb81d47 100644
--- a/phpBB/adm/style/acp_permissions.html
+++ b/phpBB/adm/style/acp_permissions.html
@@ -347,7 +347,7 @@
<script type="text/javascript" src="style/tooltip.js"></script>
<script type="text/javascript">
<!--
- window.onload = function(){enable_tooltips_select('set_permissions', 'Role Description', 'role')};
+ window.onload = function(){enable_tooltips_select('set_permissions', '{L_ROLE_DESCRIPTION}', 'role')};
//-->
</script>
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index f719ec8074..232e8bd3ea 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -24,7 +24,7 @@ function jumpto()
if (page !== null && !isNaN(page) && page > 0)
{
- document.location.href = base_url.replace('&amp;', '&') + '&start=' + ((page - 1) * per_page);
+ document.location.href = base_url.replace(/&amp;/g, '&') + '&start=' + ((page - 1) * per_page);
}
}
@@ -71,6 +71,12 @@ function marklist(id, name, state)
}
}
+function trace(link)
+{
+ window.open(link, '_trace', 'height=515, resizable=yes, scrollbars=yes, width=680');
+ return false;
+}
+
<!-- IF S_INCLUDE_SWATCH -->
function swatch()
{
diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index 8999c2b9da..5df845702d 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -150,7 +150,7 @@
<!-- IF not p_mask.S_VIEW --><input type="checkbox" name="inherit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" value="1" /><!-- ELSE -->&nbsp;<!-- ENDIF -->
</span>
</td>
- <td>{p_mask.f_mask.PADDING}<a href="javascript:swap_options('{p_mask.S_ROW_COUNT}', '{p_mask.f_mask.S_ROW_COUNT}', '0');">{p_mask.f_mask.NAME}</a></span></td>
+ <td>{p_mask.f_mask.PADDING}<!-- IF p_mask.f_mask.FOLDER_IMAGE --> {p_mask.f_mask.FOLDER_IMAGE} <!-- ENDIF --><a href="javascript:swap_options('{p_mask.S_ROW_COUNT}', '{p_mask.f_mask.S_ROW_COUNT}', '0');">{p_mask.f_mask.NAME}</a></span></td>
<td style="text-align: right;">
<!-- IF p_mask.S_VIEW -->
&nbsp;
@@ -219,7 +219,7 @@
<tbody>
<!-- BEGIN mask -->
<!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
- <th>{p_mask.f_mask.category.mask.PERMISSION}</th>
+ <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>
diff --git a/phpBB/adm/style/permission_trace.html b/phpBB/adm/style/permission_trace.html
new file mode 100644
index 0000000000..25c7054dde
--- /dev/null
+++ b/phpBB/adm/style/permission_trace.html
@@ -0,0 +1,49 @@
+<!-- INCLUDE simple_header.html -->
+
+<div style="background-color: #fff; padding: 10px; margin-top: 10px;" class="permissions">
+
+ <h3>Trace for: {PERMISSION_USERNAME} / {PERMISSION}</h3>
+
+ <br />
+
+ <table cellspacing="1" class="type1">
+ <thead>
+ <tr>
+ <th>Who</th>
+ <th style="width: 50px;">Setting</th>
+ <th style="width: 50px;">Total</th>
+ <th>Information</th>
+ </tr>
+ </thead>
+ <tbody>
+ <!-- BEGIN trace -->
+ <!-- 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>
+ <!-- ELSEIF trace.S_SETTING_YES -->
+ <td class="yes">{L_ACL_YES}</td>
+ <!-- ELSE -->
+ <td class="unset">{L_ACL_UNSET}</td>
+ <!-- ENDIF -->
+
+ <!-- IF trace.S_TOTAL_NO -->
+ <td class="no">{L_ACL_NO}</td>
+ <!-- ELSEIF trace.S_TOTAL_YES -->
+ <td class="yes">{L_ACL_YES}</td>
+ <!-- ELSE -->
+ <td class="unset">{L_ACL_UNSET}</td>
+ <!-- ENDIF -->
+
+ <td>{trace.INFORMATION}</td>
+ </tr>
+ <!-- END trace -->
+ </tbody>
+</table>
+
+<br />
+
+<!-- INCLUDE simple_footer.html -->
+
+</div>
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 3a21c3bdab..5672e1d64b 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -24,7 +24,7 @@ function jumpto()
if (page !== null && !isNaN(page) && page > 0)
{
- document.location.href = base_url.replace('&amp;', '&') + '&start=' + ((page - 1) * per_page);
+ document.location.href = base_url.replace(/&amp;/g, '&') + '&start=' + ((page - 1) * per_page);
}
}
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-11 06:44:37 +0000