diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-02-16 17:32:33 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-02-16 18:21:04 +0100 |
| commit | 6f41fcb3d615557c79892bc8d0c43d523a2c1959 (patch) | |
| tree | c11d39f8874aede49ac8cf5b1853dc9a82fa0aa7 /phpBB/adm | |
| parent | 32815faa3357e307a7459a88baabeb2c9cd5de0d (diff) | |
| download | forums-6f41fcb3d615557c79892bc8d0c43d523a2c1959.tar forums-6f41fcb3d615557c79892bc8d0c43d523a2c1959.tar.gz forums-6f41fcb3d615557c79892bc8d0c43d523a2c1959.tar.bz2 forums-6f41fcb3d615557c79892bc8d0c43d523a2c1959.tar.xz forums-6f41fcb3d615557c79892bc8d0c43d523a2c1959.zip | |
[ticket/14315] Add back roles select for disable javascript
The javascript will hide the old select and show the version using
the span and showing the tooltips.
PHPBB3-14315
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/style/admin.css | 2 | ||||
| -rw-r--r-- | phpBB/adm/style/permission_mask.html | 1 | ||||
| -rw-r--r-- | phpBB/adm/style/tooltip.js | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index e537e970a3..e1668bf70b 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -2489,7 +2489,7 @@ fieldset.permissions .padding { border-radius: 3px; padding: 4px; width: 250px; - display: block; + display: none; background: url('../images/arrow_down.gif') no-repeat 245px .7em; } diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html index 721fc42473..cddcac170f 100644 --- a/phpBB/adm/style/permission_mask.html +++ b/phpBB/adm/style/permission_mask.html @@ -42,6 +42,7 @@ {% if p_mask.f_mask.role_options %} <dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 20%"> <div class="dropdown-container dropdown-button-control roles-options" data-alt-text="{LA_ROLE_DESCRIPTION}"> + <select id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" onchange="set_role_settings(this.options[selectedIndex].value, 'advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')">{p_mask.f_mask.S_ROLE_OPTIONS}</select> <span title="Roles" class="button icon-button tools-icon dropdown-trigger dropdown-select">{L_NO_ROLE_ASSIGNED}</span> <div class="dropdown hidden"> <ul class="dropdown-contents" id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" > diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js index 3abeefbffe..b38418876d 100644 --- a/phpBB/adm/style/tooltip.js +++ b/phpBB/adm/style/tooltip.js @@ -142,6 +142,10 @@ phpbb.positionTooltip = function ($element) { phpbb.prepareRolesDropdown = function () { var $options = $('.roles-options li'); + // Display span and hide select + $('.roles-options > span').css('display', 'block'); + $('.roles-options > select').hide(); + // Prepare highlighting of select options and settings update $options.each(function () { var $this = $(this); |