aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/adm')
-rw-r--r--phpBB/adm/index.php2
-rw-r--r--phpBB/adm/style/acp_forums_copy_perm.html13
-rw-r--r--phpBB/adm/style/admin.css2
-rw-r--r--phpBB/adm/style/captcha_recaptcha.html12
4 files changed, 18 insertions, 11 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index b6b251d2fc..26f934f6bf 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -246,7 +246,7 @@ function h_radio($name, &$input_ary, $input_default = false, $id = false, $key =
foreach ($input_ary as $value => $title)
{
$selected = ($input_default !== false && $value == $input_default) ? ' checked="checked"' : '';
- $html .= '<label><input type="radio" name="' . $name . '"' . (($id && !$id_assigned) ? ' id="' . $id . '"' : '') . ' value="' . $value . '"' . $selected . (($key) ? ' accesskey="' . $key . '"' : '') . ' class="radio" /> ' . $user->lang[$title] . '</label> ';
+ $html .= '<label><input type="radio" name="' . $name . '"' . (($id && !$id_assigned) ? ' id="' . $id . '"' : '') . ' value="' . $value . '"' . $selected . (($key) ? ' accesskey="' . $key . '"' : '') . ' class="radio" /> ' . $user->lang[$title] . '</label>';
$id_assigned = true;
}
diff --git a/phpBB/adm/style/acp_forums_copy_perm.html b/phpBB/adm/style/acp_forums_copy_perm.html
index 73d9e70918..acec3c1967 100644
--- a/phpBB/adm/style/acp_forums_copy_perm.html
+++ b/phpBB/adm/style/acp_forums_copy_perm.html
@@ -1,21 +1,22 @@
<!-- INCLUDE overall_header.html -->
+<h1>{L_COPY_PERMISSIONS}</h1>
+
+<p>{L_COPY_PERMISSIONS_EXPLAIN}</p>
+<p>{L_ACL_LINK}</p>
+
<form id="confirm" method="post" action="{S_COPY_ACTION}">
<fieldset>
- <h1>{L_COPY_PERMISSIONS}</h1>
- <p>{L_COPY_PERMISSIONS_EXPLAIN}</p>
- <p>{L_ACL_LINK}</p>
<dl>
<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
<dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd>
</dl>
<div style="text-align: center;">{S_FORM_TOKEN}{S_HIDDEN_FIELDS}
- <input type="submit" name="update" value="{L_CONTINUE}" class="button2" />&nbsp;
+ <input type="submit" name="update" value="{L_CONTINUE}" class="button2" />&nbsp;
</div>
-
</fieldset>
-
+
</form>
<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 9888ad3797..5f1f01c0a9 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -195,7 +195,6 @@ li {
width: 76%;
margin: 0 0 0 3%;
min-height: 350px;
- overflow-x: auto;
}
.rtl #main {
@@ -205,7 +204,6 @@ li {
* html #main {
height: 350px;
- overflow-x: visible;
}
#page-body.simple-page-body {
diff --git a/phpBB/adm/style/captcha_recaptcha.html b/phpBB/adm/style/captcha_recaptcha.html
index 93fc6e7499..e4fa5dd426 100644
--- a/phpBB/adm/style/captcha_recaptcha.html
+++ b/phpBB/adm/style/captcha_recaptcha.html
@@ -1,13 +1,21 @@
<!-- IF S_RECAPTCHA_AVAILABLE -->
<dl>
<dd>
- <script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}">
+ <script type="text/javascript">
// <![CDATA[
var RecaptchaOptions = {
- lang : {L_RECAPTCHA_LANG}
+ lang : '{L_RECAPTCHA_LANG}',
};
// ]]>
</script>
+ <script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}"></script>
+ <script type="text/javascript">
+ // <![CDATA[
+ <!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
+ document.getElementById('recaptcha_table').style.direction = 'ltr';
+ <!-- ENDIF -->
+ // ]]>
+ </script>
<noscript>