makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2018-02-14 20:11:44 +01:00
commit 00a35827b0
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
4 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/adm/style/admin.css
View file

@ -2710,6 +2710,10 @@ fieldset.permissions .permissions-switch {
margin: 0; margin: 0;
} }
.rtl .dropdown li {
text-align: right;
}
.wrap .dropdown li, .wrap .dropdown li,
.dropdown.wrap li { .dropdown.wrap li {
white-space: normal; white-space: normal;
@ -2726,6 +2730,10 @@ fieldset.permissions .permissions-switch {
width: 250px; width: 250px;
} }
.rtl .roles-options > .dropdown {
right: auto;
}
.roles-options { .roles-options {
width: 250px; width: 250px;
-webkit-user-select: none; -webkit-user-select: none;
@ -2744,6 +2752,10 @@ fieldset.permissions .permissions-switch {
padding: 4px; padding: 4px;
} }
.rtl .roles-options > span {
background: url('../images/arrow_down.gif') no-repeat 7px .7em;
}
.roles-options li { .roles-options li {
list-style: none; list-style: none;
} }

2
phpBB/adm/style/permission_mask.html
View file

@ -41,7 +41,7 @@
<dt style="width: 20%"><label for="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">{L_ROLE}{L_COLON}</label></dt> <dt style="width: 20%"><label for="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">{L_ROLE}{L_COLON}</label></dt>
{% if p_mask.f_mask.role_options %} {% if p_mask.f_mask.role_options %}
<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 20%"> <dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 20%">
<div class="dropdown-container dropdown-right dropdown-button-control roles-options" data-alt-text="{LA_ROLE_DESCRIPTION}"> <div class="dropdown-container dropdown-{S_CONTENT_FLOW_END} 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}]">{p_mask.f_mask.S_ROLE_OPTIONS}</select> <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}]">{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> <span title="Roles" class="button icon-button tools-icon dropdown-trigger dropdown-select">{L_NO_ROLE_ASSIGNED}</span>
<div class="dropdown hidden"> <div class="dropdown hidden">

7
phpBB/adm/style/tooltip.js
View file

@ -130,10 +130,17 @@ phpbb.positionTooltip = function ($element) {
$element = $element.parent(); $element = $element.parent();
offset = $element.offset(); offset = $element.offset();
if ($('body').hasClass('rtl')) {
$('#_tooltip_container').css({
top: offset.top + 30,
left: offset.left + 255
});
} else {
$('#_tooltip_container').css({ $('#_tooltip_container').css({
top: offset.top + 30, top: offset.top + 30,
left: offset.left - 205 left: offset.left - 205
}); });
}
}; };
/** /**

2
phpBB/assets/javascript/core.js
View file

@ -1327,6 +1327,8 @@ phpbb.toggleDropdown = function() {
$this.css({ $this.css({
marginLeft: 0, marginLeft: 0,
left: 0, left: 0,
marginRight: 0,
right: 0,
maxWidth: (windowWidth - 4) + 'px' maxWidth: (windowWidth - 4) + 'px'
}); });