diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html index fd787dbe10..9a53800d4e 100644 --- a/phpBB/adm/style/acp_permission_roles.html +++ b/phpBB/adm/style/acp_permission_roles.html @@ -6,53 +6,22 @@ + + « {L_BACK}

{L_TITLE}

@@ -96,62 +65,64 @@

{L_ACL_TYPE}

- {L_ALL_YES} • {L_ALL_NEVER} • {L_ALL_NO} + {L_ALL_YES} • {L_ALL_NEVER} • {L_ALL_NO}
-
+
- - - - - - - - - - - - - - - - - - - -
{auth.CAT_NAME}
- - - - - - - -
+
+
+ +
- - - - - - - - - - - - - - - - - - - -
{L_ACL_SETTING} [{auth.CAT_NAME}]{L_ACL_YES}{L_ACL_NO}{L_ACL_NEVER}
{auth.mask.PERMISSION} checked="checked" value="1" /> checked="checked" value="-1" /> checked="checked" value="0" />
+
style="display: none;"> + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_ACL_SETTING}{L_ACL_YES}{L_ACL_NO}{L_ACL_NEVER}
{auth.mask.PERMISSION}
+
+ +
-
+
@@ -190,11 +161,11 @@ {ICON_MOVE_UP_DISABLED} - {ICON_MOVE_DOWN} + {ICON_MOVE_DOWN} {ICON_MOVE_UP} {ICON_MOVE_DOWN} - + {ICON_MOVE_UP} {ICON_MOVE_DOWN_DISABLED} @@ -216,7 +187,7 @@ - +

{L_ROLE_ASSIGNED_TO}

@@ -225,8 +196,6 @@ - - - + \ No newline at end of file diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html index 9b301f8f5c..f5a5f78c6b 100644 --- a/phpBB/adm/style/acp_permissions.html +++ b/phpBB/adm/style/acp_permissions.html @@ -337,14 +337,9 @@

-
- {L_PERMISSION_APPLIED_TO_ALL}
- {L_MARK_ALL} • {L_UNMARK_ALL} -
-
- +


diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index ee0977e51b..678265ec8b 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -183,7 +183,7 @@ a:hover { } /* Commented Backslash Hack hides rule from IE5-Mac \*/ -#tabs a span { float:none; } +#tabs a span { float:none;} /* End hack */ #tabs a:hover span { @@ -329,12 +329,12 @@ td { line-height: 1.2em; } -.row1 { background-color: #EFEFEF; } -.row2 { background-color: #DEE3E7; } -.row3 { background-color: #D1D7DC; } -.row4 { background-color: #E4E8EB; } -.col1 { background-color: #DEE3E7; } -.col2 { background-color: #EFEFEF; } +.row1 { background-color: #EFEFEF;} +.row2 { background-color: #DEE3E7;} +.row3 { background-color: #D1D7DC;} +.row4 { background-color: #E4E8EB;} +.col1 { background-color: #DEE3E7;} +.col2 { background-color: #EFEFEF;} .spacer { background-color: #D1D7DC; @@ -364,44 +364,33 @@ table.type2 td { /* General form styles ----------------------------------------*/ -fieldset { +fieldset { + background-color: #DDD; + padding: 10px; margin: 15px 0; - padding: 10px; border-right: 1px solid #AFAEAA; border-bottom: 1px solid #AFAEAA; border-left: 1px solid #D5D5C8; border-top: 1px solid #D5D5C8; - background-color: #ECECEC; + background-color: #ECECEC; position: relative; } - -* html fieldset { - padding: 0 10px 5px 10px; +legend { + position: absolute; + top: -0.5em; + font-size: 1.1em; + color:#006699; + font-family: "Lucida Grande",Arial,Verdana,Sans-serif; + font-weight: bold; + line-height: 100%; + text-transform: uppercase; + } fieldset p { font-size: 1.1em; } -legend { - padding: 1px 0; - font-family: "Lucida Grande", Arial, Verdana,Sans-serif; - font-size: 1.1em; - font-weight: bold; - color: #006699; - position: relative; - text-transform: uppercase; - line-height: 100%; - top: 0em; - vertical-align:middle; -} - -* html legend { - margin-bottom: -10px; - margin-left: -7px; - top: -1.2em; -} - input { font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; font-size: 100%; @@ -440,7 +429,7 @@ option { .sep { color: black; - background-color: #FFA34F; + font-weight: bold; } textarea { @@ -543,11 +532,11 @@ dt { width: auto; } -dd { color: #000; } -dd + dd { padding-top: 5px; } -dt span { padding-right: 5px; } +dd { color: #000;} +dd + dd { padding-top: 5px;} +dt span { padding-right: 5px;} -dt .explain { font-style: italic; } +dt .explain { font-style: italic;} dt label { font-size: 100%; @@ -560,7 +549,7 @@ dd label { margin-right: 10px; } -html>body dd label input { vertical-align: text-bottom; } /* Tweak for Moz to align checkboxes/radio buttons nicely */ +html>body dd label input { vertical-align: text-bottom;} /* Tweak for Moz to align checkboxes/radio buttons nicely */ dd input, dd select { @@ -687,12 +676,12 @@ textarea.full { width: 99%; } -* html input.full, * html textarea.full { width: 95%; } -input.medium { width: 50%; } -input.narrow { width: 25%; } -input.tiny { width: 10%; } -input.autowidth { width: auto !important; } -.box2 .inputbox { background-color: #E9E9E9; } +* html input.full, * html textarea.full { width: 95%;} +input.medium { width: 50%;} +input.narrow { width: 25%;} +input.tiny { width: 10%;} +input.autowidth { width: auto !important;} +.box2 .inputbox { background-color: #E9E9E9;} /* Pagination @@ -771,169 +760,6 @@ a.button2, a.button2:link, a.button2:visited, a.button2:active { padding: 4px 8px; } -/* Permission related ----------------------------------------- */ - -.permissions { - margin: 15px 0 0 0; - padding: 0; - border: none; - background-color: transparent; -} - -.permissions table { - width: 100%; - /*empty-cells: hide;*/ - border: 1px solid #CCCFD3; - background-color: #FFFFFF; - padding: 1px; -} - -.permissions th { - padding: 3px 4px; - color: #FFFFFF; - background: #DDE1E4 url("../images/gradient2b.gif") bottom left repeat-x; - border-top: 1px solid #6DACD2; - border-bottom: 1px solid #327AA5; - text-align: left; - font-size: .85em; - text-transform: uppercase; -} - -.permissions td { - text-align: left; - font-size: 1.1em; - padding: 4px; - line-height: 120%; -} - -table.pmask { - border: none; - background: none; - padding: 0; -} - -table.pmask th { - background: none; - border-top: none; - text-align: center; - vertical-align: bottom; - color: #115098; - padding: 2px 0; -} - -table.pmask td { - padding: 0px; -} - -table.pmask td.name { - padding: 2px; - vertical-align: middle; -} - -.permissions th.name { - text-align: left; - width: auto; - padding-left: 4px; -} - -.permissions .entry { - text-align: left; - font-weight: normal; -} - -.permissions td.name { - text-align: left; - font-weight: bold; -} - -.permissions table.type3 { - float: right; - width: 350px; /* Setting the length of the permission view box */ - border: none; - background-color: transparent; - padding: 0; -} - -.permissions table.type3 thead th { - background-color: transparent; - border-top: none; - text-align: center; - color: #115098; - padding: 0 3px; - font-size: .9em; - font-weight: normal; - text-transform: none; -} - -.permissions table.type3 tbody th { - border-top: none; - text-align: left; - text-transform: none; - padding: 0; - border: none; - font-size: 1em; - font-weight: normal; - width: 100%; - vertical-align: middle; -} - -.permissions table.type3 td { - text-align: center; - padding: 1px; -} - -.permissions td.yes { - width: 20px; - background-color: #40C53D; -} - -.permissions td.never { - width: 20px; - background-color: #EC7181; -} - -.permissions td.no { - width: 20px; - background-color: transparent; -} - -/* Preset Styles ----------------------------------------- */ -.preset { - width: 60px; -} - -.preset a { - float: left; - display: block; - width: 100%; - height: 20px; - cursor: pointer; - background: transparent; -} - -.preset a:hover { - background: url("../images/arrow_down.gif") no-repeat 50% 50%; - text-decoration: none; -} - -.preset_yes { - background: #D3F3D2 url("../images/bg_hash1.gif") repeat; -} - -.preset_custom { - background: #DAE4EC url("../images/bg_hash2.gif") repeat; -} - -.preset_never { - background: #ECD7DA url("../images/bg_hash3.gif") repeat; -} - -.preset_no { - background: #ECD7DA url("../images/bg_hash4.gif") repeat; -} - /* Action Highlighting ---------------------------------------- */ .success { @@ -1086,3 +912,264 @@ table.pmask td.name { .syntaxstring { color: #DD0000; } + +/* Permission interface +---------------------------------------- */ + +fieldset.perm legend { + text-transform: none; +} + +/* Permission sections */ +fieldset.perm .perm_simple { + text-align: left; + padding-top: 3px; +} + +fieldset.perm .perm_advanced { + padding-left: 5px; + vertical-align: top; + clear: right; + padding-top: 10px; +} + +fieldset.perm .perm_switch { + float: right; + font-size: 1.1em; +} + +.perm_switch a { + text-decoration: underline; +} + +/* Tabbed menu */ +.perm_cat { + line-height: normal; + margin: 0 0 0px 7px; + min-width: 570px; + font-size: 1em; +} + +.perm_cat ul { + margin:0; + padding: 0; + list-style: none; +} + +.perm_cat li { + display: inline; + margin: 0; + padding: 0; + font-size: 1em; + font-weight: bold; +} + +.perm_cat a { + float: left; + background: url("../images/bg_tabs1.gif") no-repeat 0% -35px; + margin: 0 1px 0 0; + padding: 0 0 0 6px; + text-decoration: none; + position: relative; +} + +.perm_cat a span.tabbg { + float: left; + display: block; + background: url("../images/bg_tabs2.gif") no-repeat 100% -35px; + padding: 7px 12px 6px 6px; + color: #536482; + white-space: nowrap; +} + +/* Commented Backslash Hack hides rule from IE5-Mac \*/ +.perm_cat a span.tabbg { float:none;} +/* End hack */ + +.perm_cat a:hover span.tabbg { + color: #DD6900; +} + +.perm_cat .activetab a { + background-position: 0 0px; +} + +.perm_cat .activetab a span.tabbg { + background-position: 100% 0px; + padding-bottom: 7px; + color: #333333; +} + +.perm_cat a:hover { + background-position: 0 -70px; +} + +.perm_cat a:hover span.tabbg { + background-position: 100% -70px; +} + +.perm_cat .activetab a:hover span.tabbg { + color: #333333; + background-position: 100% 0px; +} + +.perm_cat .activetab a:hover { + background-position: 0 0px; +} + +.perm_cat a span.colour { + border: 1px solid #536482; + display: block; + float: left; + width: 10px; + height: 10px; + margin-right: 5px; +} + +.perm_cat .activetab span.colour { + border-color: #333333; +} + +.perm_cat a:hover span.colour { + border-color: #DD6900; +} + +.perm_cat .activetab a:hover span.colour { + border-color: #333333; +} + +/* Permission preset colours */ +.perm_preset_yes span.colour, +.yes { + background-color: #86F786; +} + +.perm_preset_custom span.colour { + background-color: #B2BBDD; +} + +.perm_preset_never span.colour { + background-color: #DD0000; +} + +.perm_preset_no span.colour, +.never { + background-color: #EFB0B2; +} + +/* Pemrission panel +---------------------------------------- */ +.perm_panel { + float: left; + background-color: #FFF; + width: 100%; + border: 1px solid #A9B8C2; + margin-top: -1px; +} + +.perm_panel span.corners-top { + background-image: url("../images/corners_left2.gif"); +} + +.perm_panel span.corners-top span { + background-image: url("../images/corners_right2.gif"); +} + +.perm_panel span.corners-bottom { + background-image: url("../images/corners_left2.gif"); +} + +.perm_panel span.corners-bottom span { + background-image: url("../images/corners_right2.gif"); +} + +.perm_panel span.corners-top, .perm_panel span.corners-bottom, +.perm_panel span.corners-top span, .perm_panel span.corners-bottom span { + font-size: 1px; + line-height: 1px; + display: block; + height: 5px; + background-repeat: no-repeat; +} + +.perm_panel span.corners-top { + background-image: url("../images/corners_left2.gif"); + background-position: 0 0; + margin: 0 0; +} + +.perm_panel span.corners-top span { + background-image: url("../images/corners_right2.gif"); + background-position: 100% 0; +} + +.perm_panel span.corners-bottom { + background-image: url("../images/corners_left2.gif"); + background-position: 0 100%; + margin: 0 0; + clear: both; +} + +.perm_panel span.corners-bottom span { + background-image: url("../images/corners_right2.gif"); + background-position: 100% 100%; +} + +/* Permission table +---------------------------------------- */ +.perm_panel .tablewrap { + margin: 0 10px; +} + +.perm_panel table { + width: 100%; +} + +.perm_panel th { + text-transform: none; +} + +.perm_panel th.value { + text-align: center; +} + +.perm_panel th.name { + text-align: left; + width: auto; + text-transform: none; +} + +.perm_panel th.permission_name { + border: none; + color: #536482; + font-weight: normal; +} + +.perm_panel th.permission_name a.trace { + display: inline; +} + +.perm_panel th.row3 { + background-image: none; + background-color: #D1D7DC; +} + +.perm_panel th.row4 { + background-image: none; + background-color: #E4E8EB; +} + +.perm_panel th a { + display: block; + color: #FFA34F; + text-decoration: underline; +} + +.perm_panel td { + padding: 0; + text-align: center; +} + +.perm_panel td label { + display: block; +} diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html index 51b5bf9c63..86dbc0a5ee 100644 --- a/phpBB/adm/style/permission_mask.html +++ b/phpBB/adm/style/permission_mask.html @@ -5,251 +5,110 @@ var active_fmask = '0'; var active_cat = '0'; + var id = '000'; + var role_options = new Array(); {S_ROLE_JS_ARRAY} - - /** - * Show/hide option panels - * value = suffix for ID to show - */ - function swap_options(pmask, fmask, cat) - { - id = pmask + fmask + cat; - active_option = active_pmask + active_fmask + active_cat; - - if (id == active_option) - { - return; - } - - // Hide active options - dE('options' + active_option, -1); - dE('head' + active_pmask + active_fmask, 1, 'inline'); - dE('apply' + active_pmask + active_fmask, -1); - - // Display container - dE('options' + id, 1); - dE('head' + pmask + fmask, -1, 'inline'); - dE('apply' + pmask + fmask, 1); - - active_pmask = pmask; - active_fmask = fmask; - active_cat = cat; - } - - /** - * Mark all radio buttons in one panel - * id = table ID container, s = status ['y'/'u'/'n'] - */ - function mark_options(id, s) - { - var t = document.getElementById(id); - - if (!t) - { - return; - } - - var rb = t.getElementsByTagName('input'); - - for (var r = 0; r < rb.length; r++ ) - { - if (rb[r].id.substr(rb[r].id.length-1) == s) - { - rb[r].checked = true; - } - } - } - - /** - * Mark one radio button in one panel - * id = table ID container, field_name = the auth option, s = status ['y'/'u'/'n'] - */ - function mark_one_option(id, field_name, s) - { - var t = document.getElementById(id); - - if (!t) - { - return; - } - - var rb = t.getElementsByTagName('input'); - - for (var r = 0; r < rb.length; r++ ) - { - if (rb[r].id.substr(rb[r].id.length-field_name.length-3, field_name.length) == field_name && rb[r].id.substr(rb[r].id.length-1) == s) - { - rb[r].checked = true; - } - } - } - - /** - * Reset role dropdown field to Select role... if an option gets changed - */ - function reset_role(id) - { - var t = document.getElementById(id); - - if (!t) - { - return; - } - - t.options[0].selected = true; - } - - /** - * Load role and set options accordingly - */ - function set_role_settings(role_id, target_id) - { - settings = role_options[role_id]; - - if (!settings) - { - return; - } - - // Mark all options to no (unset) first... - mark_options(target_id, 'u'); - - for (var r in settings) - { - mark_one_option(target_id, r, (settings[r] == 1) ? 'y' : 'n'); - } - } - //--> +
+

{p_mask.NAME} [{p_mask.L_ACL_TYPE}]

-
- -
-

- {p_mask.NAME} {L_USER_IS_MEMBER_OF_DEFAULT}: {p_mask.USER_GROUPS_DEFAULT}
- {p_mask.NAME} {L_USER_IS_MEMBER_OF_CUSTOM}: {p_mask.USER_GROUPS_CUSTOM} -

+ +
+ {p_mask.f_mask.NAME} + + +
+ {L_ADVANCED_PERMISSIONS} +
+
+
+ +
+ +
{L_NO_ROLE_AVAILABLE}
+ +
- - - - - - - - + + +
style="display: none;"> - -
- - - - - - - - - - - - - -
{p_mask.NAME} [{p_mask.L_ACL_TYPE}]{p_mask.CATEGORIES}
- - - - - - - - -
- style="display: none;"> -   - - {p_mask.f_mask.PADDING} {p_mask.f_mask.FOLDER_IMAGE} {p_mask.f_mask.NAME} - -   - - - {L_ROLE}:    - - {L_ROLE}: {L_NO_ROLE_AVAILABLE} - - -
- 		- - - - - - - -  
-
- -
-

{L_APPLY_PERMISSIONS_EXPLAIN}

- -
- - -   - +
+
-
-
 
- - style="display: none;"> + + +
style="display: none;"> + +
+
+ + + + + + + + - + - - + + - - - + + + - + - class="yes" class="no">  - class="never" class="no">  + class="yes">  + class="never"> - - - + + +
{L_ACL_SETTING} [{p_mask.f_mask.category.CAT_NAME}]{L_ACL_SETTING} {L_ACL_YES}{L_ACL_NEVER}{L_ACL_YES}{L_ACL_NEVER} {L_ACL_YES}{L_ACL_NO}{L_ACL_NEVER}{L_ACL_YES}{L_ACL_NO}{L_ACL_NEVER}
{L_TRACE_SETTING} {p_mask.f_mask.category.mask.PERMISSION}{L_TRACE_SETTING} {p_mask.f_mask.category.mask.PERMISSION} checked="checked" value="1" /> checked="checked" value="-1" /> checked="checked" value="0" />
- -
- + + + + +
+