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.3.x'

Browse source
This commit is contained in:
Marc Alexander 2019-10-07 20:58:31 +02:00
commit f2698da41b
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
23 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -110,7 +110,7 @@
<!-- ELSEIF S_EXTENSION_GROUPS --> <!-- ELSEIF S_EXTENSION_GROUPS -->
<!-- IF S_EDIT_GROUP --> <!-- IF S_EDIT_GROUP -->
<script type="text/javascript" defer="defer"> <script>
// <![CDATA[ // <![CDATA[
function update_image(newimage) function update_image(newimage)
{ {

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

@ -8,7 +8,7 @@
<p>{L_EXPLAIN}</p> <p>{L_EXPLAIN}</p>
<script type="text/javascript"> <script>
// <![CDATA[ // <![CDATA[
var ban_length = new Array(); var ban_length = new Array();

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

@ -1,6 +1,6 @@
<!-- INCLUDE overall_header.html --> <!-- INCLUDE overall_header.html -->
<script type="text/javascript"> <script>
// <![CDATA[ // <![CDATA[
var form_name = 'acp_contact'; var form_name = 'acp_contact';

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

@ -35,7 +35,7 @@
<p>{L_ACP_BACKUP_EXPLAIN}</p> <p>{L_ACP_BACKUP_EXPLAIN}</p>
<script type="text/javascript"> <script>
// <![CDATA[ // <![CDATA[
function selector(bool) function selector(bool)

8
phpBB/adm/style/acp_forums.html
View file

@ -4,7 +4,7 @@
<!-- IF S_EDIT_FORUM --> <!-- IF S_EDIT_FORUM -->
<script type="text/javascript"> <script>
// <![CDATA[ // <![CDATA[
/** /**
* Handle displaying/hiding several options based on the forum type * Handle displaying/hiding several options based on the forum type
@ -405,7 +405,7 @@
<!-- ELSEIF S_CONTINUE_SYNC --> <!-- ELSEIF S_CONTINUE_SYNC -->
<script type="text/javascript"> <script>
// <![CDATA[ // <![CDATA[
var close_waitscreen = 0; var close_waitscreen = 0;
// no scrollbars... // no scrollbars...
@ -421,7 +421,7 @@
<!-- ELSE --> <!-- ELSE -->
<script type="text/javascript"> <script>
// <![CDATA[ // <![CDATA[
/** /**
* Popup search progress bar * Popup search progress bar
@ -447,7 +447,7 @@
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_RESYNCED --> <!-- IF S_RESYNCED -->
<script type="text/javascript"> <script>
// <![CDATA[ // <![CDATA[
var close_waitscreen = 1; var close_waitscreen = 1;
// ]]> // ]]>

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

@ -4,7 +4,7 @@
<!-- IF S_EDIT --> <!-- IF S_EDIT -->
<script type="text/javascript" defer="defer"> <script>
// <![CDATA[ // <![CDATA[
<!-- IF S_ADD_CODE --> <!-- IF S_ADD_CODE -->

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

@ -4,7 +4,7 @@
<!-- IF S_EDIT_MODULE --> <!-- IF S_EDIT_MODULE -->
<script type="text/javascript"> <script>
// <![CDATA[ // <![CDATA[
function display_options(value) function display_options(value)
{ {

4
phpBB/adm/style/acp_permission_roles.html
View file

@ -4,7 +4,7 @@
<!-- IF S_EDIT --> <!-- IF S_EDIT -->
<script type="text/javascript"> <script>
// <![CDATA[ // <![CDATA[
var active_pmask = '0'; var active_pmask = '0';
var active_fmask = '0'; var active_fmask = '0';
@ -20,7 +20,7 @@
// ]]> // ]]>
</script> </script>
<script type="text/javascript" src="style/permissions.js"></script> <script src="style/permissions.js"></script>
<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a> <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>

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

@ -1,4 +1,4 @@
<script type="text/javascript"> <script>
// <![CDATA[ // <![CDATA[
// Define the bbCode tags // Define the bbCode tags

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

@ -6,7 +6,7 @@
<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a> <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
<script type="text/javascript"> <script>
// <![CDATA[ // <![CDATA[
function update_image(newimage) function update_image(newimage)
{ {

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

@ -69,7 +69,7 @@
<!-- ELSEIF S_INDEX --> <!-- ELSEIF S_INDEX -->
<script type="text/javascript"> <script>
// <![CDATA[ // <![CDATA[
/** /**
* Popup search progress bar * Popup search progress bar

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

@ -79,7 +79,7 @@
<!-- IF not S_USER_FOUNDER or S_FOUNDER --> <!-- IF not S_USER_FOUNDER or S_FOUNDER -->
<script type="text/javascript"> <script>
// <![CDATA[ // <![CDATA[
function display_reason(option) function display_reason(option)

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

@ -1,4 +1,4 @@
<script type="text/javascript"> <script>
// <![CDATA[ // <![CDATA[
var default_dateformat = '{A_DEFAULT_DATEFORMAT}'; var default_dateformat = '{A_DEFAULT_DATEFORMAT}';
// ]]> // ]]>

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

@ -1,4 +1,4 @@
<script type="text/javascript"> <script>
// <![CDATA[ // <![CDATA[
var form_name = 'user_signature'; var form_name = 'user_signature';

8
phpBB/adm/style/installer_footer.html
View file

@ -13,7 +13,7 @@
</div> </div>
</div> </div>
<script type="text/javascript"> <script>
<!-- <!--
installLang = { installLang = {
title: '{LA_TIMEOUT_DETECTED_TITLE}', title: '{LA_TIMEOUT_DETECTED_TITLE}',
@ -22,9 +22,9 @@ installLang = {
//--> //-->
</script> </script>
<script type="text/javascript" src="{T_JQUERY_LINK}"></script> <script src="{T_JQUERY_LINK}"></script>
<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js">\x3C/script>');</script><!-- ENDIF --> <!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js">\x3C/script>');</script><!-- ENDIF -->
<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script> <script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
<!-- INCLUDEJS admin.js --> <!-- INCLUDEJS admin.js -->
{$SCRIPTS} {$SCRIPTS}

6
phpBB/adm/style/overall_footer.html
View file

@ -40,9 +40,9 @@
</div> </div>
</div> </div>
<script type="text/javascript" src="{T_JQUERY_LINK}"></script> <script src="{T_JQUERY_LINK}"></script>
<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF --> <!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script> <script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
<!-- INCLUDEJS ajax.js --> <!-- INCLUDEJS ajax.js -->
<!-- INCLUDEJS admin.js --> <!-- INCLUDEJS admin.js -->

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

@ -10,7 +10,7 @@
<link href="{T_FONT_AWESOME_LINK}" rel="stylesheet"> <link href="{T_FONT_AWESOME_LINK}" rel="stylesheet">
<link href="style/admin.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen" /> <link href="style/admin.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen" />
<script type="text/javascript"> <script>
// <![CDATA[ // <![CDATA[
var jump_page = '{LA_JUMP_PAGE}{L_COLON}'; var jump_page = '{LA_JUMP_PAGE}{L_COLON}';
var on_page = '{CURRENT_PAGE}'; var on_page = '{CURRENT_PAGE}';

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

@ -1,5 +1,5 @@
<script type="text/javascript"> <script>
// <![CDATA[ // <![CDATA[
var active_pmask = '0'; var active_pmask = '0';
var active_fmask = '0'; var active_fmask = '0';
@ -16,7 +16,7 @@
<!-- ENDIF --> <!-- ENDIF -->
// ]]> // ]]>
</script> </script>
<script type="text/javascript" src="style/permissions.js"></script> <script src="style/permissions.js"></script>
<!-- BEGIN p_mask --> <!-- BEGIN p_mask -->
<div class="clearfix"></div> <div class="clearfix"></div>

4
phpBB/adm/style/progress_bar.html
View file

@ -1,6 +1,6 @@
<!-- INCLUDE simple_header.html --> <!-- INCLUDE simple_header.html -->
<script type="text/javascript"> <script>
// <![CDATA[ // <![CDATA[
/** /**
* Close previously opened popup * Close previously opened popup
@ -31,7 +31,7 @@
<p>{L_PROGRESS_EXPLAIN}</p> <p>{L_PROGRESS_EXPLAIN}</p>
</div> </div>
<script type="text/javascript"> <script>
// <![CDATA[ // <![CDATA[
close_popup(); close_popup();
// ]]> // ]]>

6
phpBB/adm/style/simple_footer.html
View file

@ -16,9 +16,9 @@
</div> </div>
<script type="text/javascript" src="{T_JQUERY_LINK}"></script> <script src="{T_JQUERY_LINK}"></script>
<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF --> <!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script> <script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
<!-- EVENT acp_simple_footer_after --> <!-- EVENT acp_simple_footer_after -->
{$SCRIPTS} {$SCRIPTS}

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

@ -9,7 +9,7 @@
<link href="style/admin.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen" /> <link href="style/admin.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen" />
<script type="text/javascript"> <script>
// <![CDATA[ // <![CDATA[
var jump_page = '{LA_JUMP_PAGE}{L_COLON}'; var jump_page = '{LA_JUMP_PAGE}{L_COLON}';
var on_page = '{CURRENT_PAGE}'; var on_page = '{CURRENT_PAGE}';

6
phpBB/styles/prosilver/template/navbar_header.html
View file

@ -183,16 +183,16 @@
<!-- EVENT overall_header_breadcrumbs_before --> <!-- EVENT overall_header_breadcrumbs_before -->
<li class="breadcrumbs" itemscope itemtype="http://schema.org/BreadcrumbList"> <li class="breadcrumbs" itemscope itemtype="http://schema.org/BreadcrumbList">
<!-- IF U_SITE_HOME --> <!-- IF U_SITE_HOME -->
<span class="crumb" {$MICRODATA}><a href="{U_SITE_HOME}" itemtype="https://schema.org/Thing" itemprop="item" data-navbar-reference="home"><i class="icon fa-home fa-fw" aria-hidden="true"></i><span itemprop="name">{L_SITE_HOME}</span></a><meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}" /></span> <span class="crumb" {$MICRODATA}><a href="{U_SITE_HOME}" itemtype="https://schema.org/Thing" itemscope itemprop="item" data-navbar-reference="home"><i class="icon fa-home fa-fw" aria-hidden="true"></i><span itemprop="name">{L_SITE_HOME}</span></a><meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}" /></span>
<!-- ENDIF --> <!-- ENDIF -->
<!-- EVENT overall_header_breadcrumb_prepend --> <!-- EVENT overall_header_breadcrumb_prepend -->
<span class="crumb" {$MICRODATA}><a href="{U_INDEX}" itemtype="https://schema.org/Thing" itemprop="item" accesskey="h" data-navbar-reference="index"><!-- IF not U_SITE_HOME --><i class="icon fa-home fa-fw"></i><!-- ENDIF --><span itemprop="name">{L_INDEX}</span></a><meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}" /></span> <span class="crumb" {$MICRODATA}><a href="{U_INDEX}" itemtype="https://schema.org/Thing" itemscope itemprop="item" accesskey="h" data-navbar-reference="index"><!-- IF not U_SITE_HOME --><i class="icon fa-home fa-fw"></i><!-- ENDIF --><span itemprop="name">{L_INDEX}</span></a><meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}" /></span>
<!-- BEGIN navlinks --> <!-- BEGIN navlinks -->
{% set NAVLINK_NAME = navlinks.BREADCRUMB_NAME | default(navlinks.FORUM_NAME) %} {% set NAVLINK_NAME = navlinks.BREADCRUMB_NAME | default(navlinks.FORUM_NAME) %}
{% set NAVLINK_LINK = navlinks.U_BREADCRUMB | default(navlinks.U_VIEW_FORUM) %} {% set NAVLINK_LINK = navlinks.U_BREADCRUMB | default(navlinks.U_VIEW_FORUM) %}
<!-- EVENT overall_header_navlink_prepend --> <!-- EVENT overall_header_navlink_prepend -->
<span class="crumb" {$MICRODATA}<!-- IF navlinks.MICRODATA --> {navlinks.MICRODATA}<!-- ENDIF -->><a href="{{ NAVLINK_LINK }}" itemtype="https://schema.org/Thing" itemprop="item"><span itemprop="name">{{ NAVLINK_NAME }}</span></a><meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}" /></span> <span class="crumb" {$MICRODATA}<!-- IF navlinks.MICRODATA --> {navlinks.MICRODATA}<!-- ENDIF -->><a href="{{ NAVLINK_LINK }}" itemtype="https://schema.org/Thing" itemscope itemprop="item"><span itemprop="name">{{ NAVLINK_NAME }}</span></a><meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}" /></span>
<!-- EVENT overall_header_navlink_append --> <!-- EVENT overall_header_navlink_append -->
<!-- END navlinks --> <!-- END navlinks -->
<!-- EVENT overall_header_breadcrumb_append --> <!-- EVENT overall_header_breadcrumb_append -->

2
phpBB/styles/prosilver/template/overall_footer.html
View file

@ -17,7 +17,7 @@
</p> </p>
<!-- ENDIF --> <!-- ENDIF -->
<!-- EVENT overall_footer_copyright_append --> <!-- EVENT overall_footer_copyright_append -->
<p class="footer-row"> <p class="footer-row" role="menu">
<a class="footer-link" href="{{ U_PRIVACY }}" title="{{ lang('PRIVACY_LINK') }}" role="menuitem"> <a class="footer-link" href="{{ U_PRIVACY }}" title="{{ lang('PRIVACY_LINK') }}" role="menuitem">
<span class="footer-link-text">{{ lang('PRIVACY_LINK') }}</span> <span class="footer-link-text">{{ lang('PRIVACY_LINK') }}</span>
</a> </a>