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

Merge branch 'develop-ascraeus' into develop

Browse source
This commit is contained in:
Joas Schilling 2014-10-15 18:47:53 +02:00
commit 2fbaffa561
4 changed files with 35 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/styles/prosilver/template/captcha_default.html
View file

@ -1,5 +1,5 @@
<!-- IF S_TYPE == 1 --> <!-- IF S_TYPE == 1 -->
<div class="panel"> <div class="panel captcha-panel">
<div class="inner"> <div class="inner">
<h3 class="captcha-title">{L_CONFIRMATION}</h3> <h3 class="captcha-title">{L_CONFIRMATION}</h3>
@ -10,7 +10,7 @@
<dl> <dl>
<dt><label for="confirm_code">{L_CONFIRM_CODE}{L_COLON}</label></dt> <dt><label for="confirm_code">{L_CONFIRM_CODE}{L_COLON}</label></dt>
<dd><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /></dd> <dd class="captcha captcha-image"><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /></dd>
<dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="{$CAPTCHA_TAB_INDEX}" class="inputbox narrow" title="{L_CONFIRM_CODE}" /> <dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="{$CAPTCHA_TAB_INDEX}" class="inputbox narrow" title="{L_CONFIRM_CODE}" />
<!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF --> <!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF -->
<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd> <input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd>

4
phpBB/styles/prosilver/template/captcha_qa.html
View file

@ -1,5 +1,5 @@
<!-- IF S_TYPE == 1 --> <!-- IF S_TYPE == 1 -->
<div class="panel"> <div class="panel captcha-panel">
<div class="inner"> <div class="inner">
<h3 class="captcha-title">{L_CONFIRMATION}</h3> <h3 class="captcha-title">{L_CONFIRMATION}</h3>
@ -8,7 +8,7 @@
<dl> <dl>
<dt><label>{QA_CONFIRM_QUESTION}{L_COLON}</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt> <dt><label>{QA_CONFIRM_QUESTION}{L_COLON}</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
<dd> <dd class="captcha">
<input type="text" tabindex="{$CAPTCHA_TAB_INDEX}" name="qa_answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" /> <input type="text" tabindex="{$CAPTCHA_TAB_INDEX}" name="qa_answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" />
<input type="hidden" name="qa_confirm_id" id="qa_confirm_id" value="{QA_CONFIRM_ID}" /> <input type="hidden" name="qa_confirm_id" id="qa_confirm_id" value="{QA_CONFIRM_ID}" />
</dd> </dd>

19
phpBB/styles/prosilver/template/captcha_recaptcha.html
View file

@ -1,5 +1,5 @@
<!-- IF S_TYPE == 1 --> <!-- IF S_TYPE == 1 -->
<div class="panel"> <div class="panel captcha-panel">
<div class="inner"> <div class="inner">
<h3 class="captcha-title">{L_CONFIRMATION}</h3> <h3 class="captcha-title">{L_CONFIRMATION}</h3>
@ -11,24 +11,16 @@
<!-- IF S_RECAPTCHA_AVAILABLE --> <!-- IF S_RECAPTCHA_AVAILABLE -->
<dl> <dl>
<dt><label>{L_CONFIRM_CODE}{L_COLON}</label><br /><span>{L_RECAPTCHA_EXPLAIN}</span></dt> <dt><label>{L_CONFIRM_CODE}{L_COLON}</label><br /><span>{L_RECAPTCHA_EXPLAIN}</span></dt>
<dd> <dd class="captcha">
<script type="text/javascript"> <script>
// <![CDATA[
var RecaptchaOptions = { var RecaptchaOptions = {
lang : '{LA_RECAPTCHA_LANG}', lang : '{LA_RECAPTCHA_LANG}',
theme : 'clean', theme : 'clean',
tabindex : <!-- IF $CAPTCHA_TAB_INDEX -->{$CAPTCHA_TAB_INDEX}<!-- ELSE -->10<!-- ENDIF --> tabindex : <!-- IF $CAPTCHA_TAB_INDEX -->{$CAPTCHA_TAB_INDEX}<!-- ELSE -->10<!-- ENDIF -->
}; };
// ]]>
</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> </script>
<script src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}"></script>
<noscript> <noscript>
<div> <div>
<object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br /> <object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br />
@ -37,6 +29,7 @@
</div> </div>
</noscript> </noscript>
<a href="http://www.google.com/intl/{LA_RECAPTCHA_LANG}/policies/" target="_blank"><img class="recaptcha-responsive" style="display: none" alt="" width="71" height="36" src="{RECAPTCHA_SERVER}/img/clean/logo.png"></a>
</dd> </dd>
</dl> </dl>
<!-- ELSE --> <!-- ELSE -->

25
phpBB/styles/prosilver/theme/responsive.css
View file

@ -350,6 +350,31 @@ fieldset.quick-login label[for="autologin"] {
select, .inputbox { select, .inputbox {
max-width: 260px; max-width: 260px;
} }
.captcha-panel dd.captcha {
margin-left: 0;
}
.captcha-panel dd.captcha-image img {
width: 100%;
}
#recaptcha_challenge_image,
#recaptcha_response_field,
.recaptchatable #recaptcha_image {
width: 100% !important;
height: auto !important;
}
.recaptchatable tr td:last-child {
display: none;
}
.captcha-panel .recaptcha-responsive {
display: inline-block !important;
margin-top: 10px;
vertical-align: middle;
}
} }
@media only screen and (max-width: 430px), only screen and (max-device-width: 430px) { @media only screen and (max-width: 430px), only screen and (max-device-width: 430px) {