mirror of
https://github.com/phpbb/phpbb.git
synced 2025-03-22 16:40:21 +01:00
Merge branch 'prep-release-3.2.3' into 3.2.x
* prep-release-3.2.3: [ticket/15676] Use paragraphs and classes as suggested by hanakin [ticket/15676] Use twig syntax [ticket/15676] Simplify link text and use privacy link in cookie notice [ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACY
This commit is contained in:
Tristan Darricau
commit
bc7b998632
phpBB
includes
language/en
styles/prosilver
@ -2469,7 +2469,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
|
||||
|
||||
$s_hidden_fields = build_hidden_fields($s_hidden_fields);
|
||||
|
||||
$template->assign_vars(array(
|
||||
$login_box_template_data = array(
|
||||
'LOGIN_ERROR' => $err,
|
||||
'LOGIN_EXPLAIN' => $l_explain,
|
||||
|
||||
@ -2477,6 +2477,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
|
||||
'U_RESEND_ACTIVATION' => ($config['require_activation'] == USER_ACTIVATION_SELF && $config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=resend_act') : '',
|
||||
'U_TERMS_USE' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'),
|
||||
'U_PRIVACY' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'),
|
||||
'UA_PRIVACY' => addslashes(append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy')),
|
||||
|
||||
'S_DISPLAY_FULL_LOGIN' => ($s_display) ? true : false,
|
||||
'S_HIDDEN_FIELDS' => $s_hidden_fields,
|
||||
@ -2486,7 +2487,29 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
|
||||
|
||||
'USERNAME_CREDENTIAL' => 'username',
|
||||
'PASSWORD_CREDENTIAL' => ($admin) ? 'password_' . $credential : 'password',
|
||||
));
|
||||
);
|
||||
|
||||
/**
|
||||
* Event to add/modify login box template data
|
||||
*
|
||||
* @event core.login_box_modify_template_data
|
||||
* @var int admin Flag whether user is admin
|
||||
* @var string username User name
|
||||
* @var int autologin Flag whether autologin is enabled
|
||||
* @var string redirect Redirect URL
|
||||
* @var array login_box_template_data Array with the login box template data
|
||||
* @since 3.2.3-RC2
|
||||
*/
|
||||
$vars = array(
|
||||
'admin',
|
||||
'username',
|
||||
'autologin',
|
||||
'redirect',
|
||||
'login_box_template_data',
|
||||
);
|
||||
extract($phpbb_dispatcher->trigger_event('core.login_box_modify_template_data', compact($vars)));
|
||||
|
||||
$template->assign_vars($login_box_template_data);
|
||||
|
||||
page_header($user->lang['LOGIN']);
|
||||
|
||||
@ -4410,6 +4433,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
|
||||
'U_TEAM' => ($user->data['user_id'] != ANONYMOUS && !$auth->acl_get('u_viewprofile')) ? '' : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=team'),
|
||||
'U_TERMS_USE' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'),
|
||||
'U_PRIVACY' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'),
|
||||
'UA_PRIVACY' => addslashes(append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy')),
|
||||
'U_RESTORE_PERMISSIONS' => ($user->data['user_perm_from'] && $auth->acl_get('a_switchperm')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm') : '',
|
||||
'U_FEED' => $controller_helper->route('phpbb_feed_index'),
|
||||
|
||||
|
||||
@ -193,7 +193,7 @@ $lang = array_merge($lang, array(
|
||||
'DAYS' => 'Days',
|
||||
'DELETE' => 'Delete',
|
||||
'DELETE_ALL' => 'Delete all',
|
||||
'DELETE_COOKIES' => 'Delete all board cookies',
|
||||
'DELETE_COOKIES' => 'Delete cookies',
|
||||
'DELETE_MARKED' => 'Delete marked',
|
||||
'DELETE_POST' => 'Delete post',
|
||||
'DELIMITER' => 'Delimiter',
|
||||
@ -608,6 +608,7 @@ $lang = array_merge($lang, array(
|
||||
'PREVIOUS' => 'Previous', // Used in pagination
|
||||
'PREVIOUS_STEP' => 'Previous',
|
||||
'PRIVACY' => 'Privacy policy',
|
||||
'PRIVACY_LINK' => 'Privacy',
|
||||
'PRIVATE_MESSAGE' => 'Private message',
|
||||
'PRIVATE_MESSAGES' => 'Private messages',
|
||||
'PRIVATE_MESSAGING' => 'Private messaging',
|
||||
@ -732,6 +733,7 @@ $lang = array_merge($lang, array(
|
||||
'SUBMIT' => 'Submit',
|
||||
|
||||
'TB' => 'TB',
|
||||
'TERMS_LINK' => 'Terms',
|
||||
'TERMS_USE' => 'Terms of use',
|
||||
'TEST_CONNECTION' => 'Test connection',
|
||||
'THE_TEAM' => 'The team',
|
||||
|
||||
@ -111,8 +111,8 @@ $lang = array_merge($lang, array(
|
||||
'HELP_FAQ_LOGIN_CANNOT_REGISTER_QUESTION' => 'Why can’t I register?',
|
||||
'HELP_FAQ_LOGIN_COPPA_ANSWER' => 'COPPA, or the Children’s Online Privacy Protection Act of 1998, is a law in the United States requiring websites which can potentially collect information from minors under the age of 13 to have written parental consent or some other method of legal guardian acknowledgment, allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register or to the website you are trying to register on, contact legal counsel for assistance. Please note that phpBB Limited and the owners of this board cannot provide legal advice and is not a point of contact for legal concerns of any kind, except as outlined in question “Who do I contact about abusive and/or legal matters related to this board?”.',
|
||||
'HELP_FAQ_LOGIN_COPPA_QUESTION' => 'What is COPPA?',
|
||||
'HELP_FAQ_LOGIN_DELETE_COOKIES_ANSWER' => '“Delete all board cookies” deletes the cookies created by phpBB which keep you authenticated and logged into the board. Cookies also provide functions such as read tracking if they have been enabled by a board administrator. If you are having login or logout problems, deleting board cookies may help.',
|
||||
'HELP_FAQ_LOGIN_DELETE_COOKIES_QUESTION' => 'What does the “Delete all board cookies” do?',
|
||||
'HELP_FAQ_LOGIN_DELETE_COOKIES_ANSWER' => '“Delete cookies” deletes the cookies created by phpBB which keep you authenticated and logged into the board. Cookies also provide functions such as read tracking if they have been enabled by a board administrator. If you are having login or logout problems, deleting board cookies may help.',
|
||||
'HELP_FAQ_LOGIN_DELETE_COOKIES_QUESTION' => 'What does the “Delete cookies” do?',
|
||||
'HELP_FAQ_LOGIN_LOST_PASSWORD_ANSWER' => 'Don’t panic! While your password cannot be retrieved, it can easily be reset. Visit the login page and click <em>I forgot my password</em>. Follow the instructions and you should be able to log in again shortly.<br />However, if you are not able to reset your password, contact a board administrator.',
|
||||
'HELP_FAQ_LOGIN_LOST_PASSWORD_QUESTION' => 'I’ve lost my password!',
|
||||
'HELP_FAQ_LOGIN_REGISTER_ANSWER' => 'You may not have to, it is up to the administrator of the board as to whether you need to register in order to post messages. However; registration will give you access to additional features not available to guest users such as definable avatar images, private messaging, emailing of fellow users, usergroup subscription, etc. It only takes a few moments to register so it is recommended you do so.',
|
||||
|
||||
@ -8,11 +8,34 @@
|
||||
|
||||
<div class="copyright">
|
||||
<!-- EVENT overall_footer_copyright_prepend -->
|
||||
{CREDIT_LINE}
|
||||
<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
|
||||
<p class="footer-row">
|
||||
<span class="footer-copyright">{{ CREDIT_LINE }}</span>
|
||||
</p>
|
||||
<!-- IF TRANSLATION_INFO -->
|
||||
<p class="footer-row">
|
||||
<span class="footer-copyright">{{ TRANSLATION_INFO }}</span>
|
||||
</p>
|
||||
<!-- ENDIF -->
|
||||
<!-- EVENT overall_footer_copyright_append -->
|
||||
<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
|
||||
<!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF -->
|
||||
<p class="footer-row">
|
||||
<a class="footer-link" href="{{ U_PRIVACY }}" title="{{ lang('PRIVACY_LINK') }}" role="menuitem">
|
||||
<span class="footer-link-text">Privacy</span>
|
||||
</a>
|
||||
|
|
||||
<a class="footer-link" href="{{ U_TERMS_USE }}" title="{{ lang('TERMS_LINK') }}" role="menuitem">
|
||||
<span class="footer-link-text">Terms</span>
|
||||
</a>
|
||||
</p>
|
||||
<!-- IF DEBUG_OUTPUT -->
|
||||
<p class="footer-row">
|
||||
<span class="footer-info">{{ DEBUG_OUTPUT }}</span>
|
||||
</p>
|
||||
<!-- ENDIF -->
|
||||
<!-- IF U_ACP -->
|
||||
<p class="footer-row">
|
||||
<a class="footer-link text-strong" href="{{ U_ACP }}">{{ lang('ACP') }}</a>
|
||||
</p>
|
||||
<!-- ENDIF -->
|
||||
</div>
|
||||
|
||||
<div id="darkenwrapper" class="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}">
|
||||
@ -78,7 +101,7 @@
|
||||
"message": "{LA_COOKIE_CONSENT_MSG}",
|
||||
"dismiss": "{LA_COOKIE_CONSENT_OK}",
|
||||
"link": "{LA_COOKIE_CONSENT_INFO}",
|
||||
"href": "{LA_COOKIE_CONSENT_HREF}"
|
||||
"href": "{UA_PRIVACY}"
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
@ -981,8 +981,15 @@ fieldset.fields1 dl.pmlist dd.recipients {
|
||||
/* Miscellaneous styles
|
||||
---------------------------------------- */
|
||||
.copyright {
|
||||
padding: 5px;
|
||||
font-size: 10px;
|
||||
text-align: center;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
.footer-row {
|
||||
font-size: 10px;
|
||||
line-height: 1.8;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.small {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user