diff options
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/style/acp_attachments.html | 22 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_board.html | 3 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_ext_disable.html | 8 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_ext_enable.html | 8 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_groups.html | 6 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_logs.html | 10 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_search.html | 4 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_users.html | 10 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_users_avatar.html | 6 | ||||
| -rw-r--r-- | phpBB/adm/style/admin.css | 9 | ||||
| -rw-r--r-- | phpBB/adm/style/auth_provider_ldap.html | 67 | ||||
| -rw-r--r-- | phpBB/adm/style/auth_provider_oauth.html | 31 | ||||
| -rw-r--r-- | phpBB/adm/style/avatars.js | 15 | ||||
| -rw-r--r-- | phpBB/adm/style/install_footer.html | 2 | ||||
| -rw-r--r-- | phpBB/adm/style/overall_footer.html | 2 | ||||
| -rw-r--r-- | phpBB/adm/style/simple_footer.html | 3 | ||||
| -rw-r--r-- | phpBB/adm/style/simple_header.html | 1 | 
17 files changed, 103 insertions, 104 deletions
| diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index 5d35666fdd..0e3b5ff3b2 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -331,15 +331,15 @@  	<fieldset class="tabulated">  	<legend>{L_TITLE}</legend> -	<table class="table1 zebra-table"> +	<table class="table1 zebra-table fixed-width-table">  	<thead>  	<tr>  		<th>{L_FILENAME}</th> -		<th>{L_FILEDATE}</th> -		<th>{L_FILESIZE}</th> -		<th>{L_ATTACH_POST_ID}</th> -		<th>{L_ATTACH_TO_POST}</th> -		<th>{L_DELETE}</th> +		<th style="width: 15%;">{L_FILEDATE}</th> +		<th style="width: 15%;">{L_FILESIZE}</th> +		<th style="width: 15%;">{L_ATTACH_POST_ID}</th> +		<th style="width: 15%;">{L_ATTACH_TO_POST}</th> +		<th style="width: 15%;">{L_DELETE}</th>  	</tr>  	</thead>  	<tbody> @@ -348,7 +348,7 @@  			<td><a href="{orphan.U_FILE}">{orphan.REAL_FILENAME}</a></td>  			<td>{orphan.FILETIME}</td>  			<td>{orphan.FILESIZE}</td> -			<td><strong>{L_ATTACH_ID}{L_COLON} </strong><input type="number" name="post_id[{orphan.ATTACH_ID}]" size="7" maxlength="10" value="{orphan.POST_ID}" /></td> +			<td><strong>{L_ATTACH_ID}{L_COLON} </strong><input type="number" name="post_id[{orphan.ATTACH_ID}]" maxlength="10" value="{orphan.POST_ID}" style="width: 75%;" /></td>  			<td><input type="checkbox" class="radio" name="add[{orphan.ATTACH_ID}]" /></td>  			<td><input type="checkbox" class="radio" name="delete[{orphan.ATTACH_ID}]" /></td>  		</tr> @@ -390,13 +390,13 @@  	</div>  <!-- IF .attachments --> -	<table class="table1 zebra-table"> +	<table class="table1 zebra-table fixed-width-table">  	<thead>  	<tr>  		<th>{L_FILENAME}</th> -		<th>{L_POSTED}</th> -		<th class="centered-text">{L_FILESIZE}</th> -		<th class="centered-text">{L_MARK}</th> +		<th style="width: 15%;">{L_POSTED}</th> +		<th style="width: 15%;" class="centered-text">{L_FILESIZE}</th> +		<th style="width: 10%;" class="centered-text">{L_MARK}</th>  	</tr>  	</thead>  	<tbody> diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html index 1a09c4eee6..64592a5de2 100644 --- a/phpBB/adm/style/acp_board.html +++ b/phpBB/adm/style/acp_board.html @@ -33,9 +33,12 @@  <!-- END options -->  <!-- IF S_AUTH --> +	</fieldset>  	<!-- BEGIN auth_tpl -->  		<!-- INCLUDE {auth_tpl.TEMPLATE_FILE} -->  	<!-- END auth_tpl --> +	<fieldset> +		<legend>{L_ACP_SUBMIT_CHANGES}</legend>  <!-- ENDIF -->  	<p class="submit-buttons"> diff --git a/phpBB/adm/style/acp_ext_disable.html b/phpBB/adm/style/acp_ext_disable.html index d650544ff7..d2b5c46fe8 100644 --- a/phpBB/adm/style/acp_ext_disable.html +++ b/phpBB/adm/style/acp_ext_disable.html @@ -8,19 +8,19 @@  	<p>{L_EXTENSION_DISABLE_EXPLAIN}</p>  	<!-- IF PRE --> -	<div class="errorbox"> +	<fieldset> +		<h2>{L_CONFIRM}</h2>  		<p>{L_CONFIRM_MESSAGE}</p> -	</div> +	</fieldset>  	<form id="acp_extensions" method="post" action="{U_DISABLE}">  	<fieldset class="submit-buttons"> -		<legend>{L_EXTENSION_DISABLE}</legend>  		<input class="button1" type="submit" name="disable" value="{L_EXTENSION_DISABLE}" />  		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />  	</fieldset>  	</form>  	<!-- ELSEIF S_NEXT_STEP --> -		<div class="errorbox"> +		<div class="successbox notice">  			<p>{L_EXTENSION_DISABLE_IN_PROGRESS}</p>  		</div>  	<!-- ELSE --> diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html index 42523f1f58..8a4a35359e 100644 --- a/phpBB/adm/style/acp_ext_enable.html +++ b/phpBB/adm/style/acp_ext_enable.html @@ -14,19 +14,19 @@  		<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>  	</div>  	<!-- ELSEIF PRE --> -	<div class="errorbox"> +	<fieldset> +		<h2>{L_CONFIRM}</h2>  		<p>{L_CONFIRM_MESSAGE}</p> -	</div> +	</fieldset>  	<form id="acp_extensions" method="post" action="{U_ENABLE}">  	<fieldset class="submit-buttons"> -		<legend>{L_EXTENSION_ENABLE}</legend>  		<input class="button1" type="submit" name="enable" value="{L_EXTENSION_ENABLE}" />  		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />  	</fieldset>  	</form>  	<!-- ELSEIF S_NEXT_STEP --> -		<div class="errorbox"> +		<div class="successbox notice">  			<p>{L_EXTENSION_ENABLE_IN_PROGRESS}</p>  		</div>  	<!-- ELSE --> diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index 72f4f2b239..cf189f979f 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -114,10 +114,10 @@  	</dl>  	<dl>  		<dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt> -		<dd><select name="avatar_driver" id="avatar_driver"> +		<dd><select name="avatar_driver" id="avatar_driver" data-togglable-settings="true">  			<option value="">{L_NO_AVATAR_CATEGORY}</option>  			<!-- BEGIN avatar_drivers --> -			<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option> +			<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>  			<!-- END avatar_drivers -->  		</select></dd>  	</dl> @@ -139,8 +139,6 @@  	</fieldset>  	</form> -	<!-- INCLUDEJS avatars.js --> -  <!-- ELSEIF S_LIST -->  	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html index 9343b9b509..ec2065f906 100644 --- a/phpBB/adm/style/acp_logs.html +++ b/phpBB/adm/style/acp_logs.html @@ -22,15 +22,15 @@  <div><br style="clear: both;" /></div>  <!-- IF .log --> -	<table class="table1 zebra-table"> +	<table class="table1 zebra-table fixed-width-table">  	<thead>  	<tr> -		<th>{L_USERNAME}</th> -		<th>{L_IP}</th> -		<th>{L_TIME}</th> +		<th style="width: 15%;">{L_USERNAME}</th> +		<th style="width: 15%;">{L_IP}</th> +		<th style="width: 20%;">{L_TIME}</th>  		<th>{L_ACTION}</th>  		<!-- IF S_CLEARLOGS --> -			<th>{L_MARK}</th> +			<th style="width: 50px;">{L_MARK}</th>  		<!-- ENDIF -->  	</tr>  	</thead> diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html index 496a8b2675..1cde52acf3 100644 --- a/phpBB/adm/style/acp_search.html +++ b/phpBB/adm/style/acp_search.html @@ -46,13 +46,13 @@  		<legend>{L_SEARCH_TYPE}</legend>  	<dl>  		<dt><label for="search_type">{L_SEARCH_TYPE}{L_COLON}</label><br /><span>{L_SEARCH_TYPE_EXPLAIN}</span></dt> -		<dd><select id="search_type" name="config[search_type]">{S_SEARCH_TYPES}</select></dd> +		<dd><select id="search_type" name="config[search_type]" data-togglable-settings="true">{S_SEARCH_TYPES}</select></dd>  	</dl>  	</fieldset>  	<!-- BEGIN backend --> -		<fieldset> +		<fieldset id="search_{backend.IDENTIFIER}_settings">  			<legend>{backend.NAME}</legend>  		{backend.SETTINGS}  		</fieldset> diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index b84e32013f..25064c6f3a 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -164,14 +164,14 @@  	</div>  	<!-- IF .attach --> -	<table class="table1 zebra-table"> +	<table class="table1 zebra-table fixed-width-table">  	<thead>  	<tr>  		<th>{L_FILENAME}</th> -		<th>{L_POST_TIME}</th> -		<th>{L_FILESIZE}</th> -		<th>{L_DOWNLOADS}</th> -		<th>{L_MARK}</th> +		<th style="width: 20%;">{L_POST_TIME}</th> +		<th style="width: 20%;">{L_FILESIZE}</th> +		<th style="width: 20%;">{L_DOWNLOADS}</th> +		<th style="width: 50px;">{L_MARK}</th>  	</tr>  	</thead>  	<tbody> diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html index 0a72bb0b62..0d06d088e8 100644 --- a/phpBB/adm/style/acp_users_avatar.html +++ b/phpBB/adm/style/acp_users_avatar.html @@ -13,10 +13,10 @@  		<legend>{L_AVATAR_SELECT}</legend>  		<dl>  			<dt><label>{L_AVATAR_TYPE}</label></dt> -			<dd><select name="avatar_driver" id="avatar_driver"> +			<dd><select name="avatar_driver" id="avatar_driver" data-togglable-settings="true">  				<option value="">{L_NO_AVATAR_CATEGORY}</option>  				<!-- BEGIN avatar_drivers --> -				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option> +				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>  				<!-- END avatar_drivers -->  			</select></dd>  		</dl> @@ -35,5 +35,3 @@  	{S_FORM_TOKEN}  	</fieldset>  	</form> - -	<!-- INCLUDEJS avatars.js --> diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 6f2d65afc0..a61890bc75 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -911,6 +911,11 @@ table.styles td.users, table td.mark {  	text-align: center;  } +table.fixed-width-table { +	table-layout: fixed; +	word-break: break-word; +} +  @media only screen and (max-width: 700px), only screen and (max-device-width: 700px)  {  	table.responsive, table.responsive tbody, table.responsive tr, table.responsive td { @@ -1071,6 +1076,10 @@ fieldset {  	border-radius: 3px;  } +fieldset h2 { +	margin-top: 0; +} +  .rtl fieldset {  	border-top: 1px solid #D7D7D7;  	border-right: 1px solid #D7D7D7; diff --git a/phpBB/adm/style/auth_provider_ldap.html b/phpBB/adm/style/auth_provider_ldap.html index 81afa44373..9e0567dfed 100644 --- a/phpBB/adm/style/auth_provider_ldap.html +++ b/phpBB/adm/style/auth_provider_ldap.html @@ -1,32 +1,35 @@ -<dl> -	<dt><label for="ldap_server">{L_LDAP_SERVER}{L_COLON}</label><br /><span>{L_LDAP_SERVER_EXPLAIN}</span></dt> -	<dd><input type="text" id="ldap_server" size="40" name="config[ldap_server]" value="{AUTH_LDAP_SERVER}" /></dd> -</dl> -<dl> -	<dt><label for="ldap_port">{L_LDAP_PORT}{L_COLON}</label><br /><span>{L_LDAP_PORT_EXPLAIN}</span></dt> -	<dd><input type="text" id="ldap_port" size="40" name="config[ldap_port]" value="{AUTH_LDAP_PORT}" /></dd> -</dl> -<dl> -	<dt><label for="ldap_dn">{L_LDAP_DN}{L_COLON}</label><br /><span>{L_LDAP_DN_EXPLAIN}</span></dt> -	<dd><input type="text" id="ldap_dn" size="40" name="config[ldap_base_dn]" value="{AUTH_LDAP_BASE_DN}" /></dd> -</dl> -<dl> -	<dt><label for="ldap_uid">{L_LDAP_UID}{L_COLON}</label><br /><span>{L_LDAP_UID_EXPLAIN}</span></dt> -	<dd><input type="text" id="ldap_uid" size="40" name="config[ldap_uid]" value="{AUTH_LDAP_UID}" /></dd> -</dl> -<dl> -	<dt><label for="ldap_user_filter">{L_LDAP_USER_FILTER}{L_COLON}</label><br /><span>{L_LDAP_USER_FILTER_EXPLAIN}</span></dt> -	<dd><input type="text" id="ldap_user_filter" size="40" name="config[ldap_user_filter]" value="{AUTH_LDAP_USER_FILTER}" /></dd> -</dl> -<dl> -	<dt><label for="ldap_email">{L_LDAP_EMAIL}{L_COLON}</label><br /><span>{L_LDAP_EMAIL_EXPLAIN}</span></dt> -	<dd><input type="email" id="ldap_email" size="40" name="config[ldap_email]" value="{AUTH_LDAP_EMAIL}" /></dd> -</dl> -<dl> -	<dt><label for="ldap_user">{L_LDAP_USER}{L_COLON}</label><br /><span>{L_LDAP_USER_EXPLAIN}</span></dt> -	<dd><input type="text" id="ldap_user" size="40" name="config[ldap_user]" value="{AUTH_LDAP_USER}" /></dd> -</dl> -<dl> -	<dt><label for="ldap_password">{L_LDAP_PASSWORD}{L_COLON}</label><br /><span>{L_LDAP_PASSWORD_EXPLAIN}</span></dt> -	<dd><input type="password" id="ldap_password" size="40" name="config[ldap_password]" value="{AUTH_LDAP_PASSWORD}" autocomplete="off" /></dd> -</dl> +<fieldset id="auth_ldap_settings"> +	<legend>{L_LDAP}</legend> +	<dl> +		<dt><label for="ldap_server">{L_LDAP_SERVER}{L_COLON}</label><br /><span>{L_LDAP_SERVER_EXPLAIN}</span></dt> +		<dd><input type="text" id="ldap_server" size="40" name="config[ldap_server]" value="{AUTH_LDAP_SERVER}" /></dd> +	</dl> +	<dl> +		<dt><label for="ldap_port">{L_LDAP_PORT}{L_COLON}</label><br /><span>{L_LDAP_PORT_EXPLAIN}</span></dt> +		<dd><input type="text" id="ldap_port" size="40" name="config[ldap_port]" value="{AUTH_LDAP_PORT}" /></dd> +	</dl> +	<dl> +		<dt><label for="ldap_dn">{L_LDAP_DN}{L_COLON}</label><br /><span>{L_LDAP_DN_EXPLAIN}</span></dt> +		<dd><input type="text" id="ldap_dn" size="40" name="config[ldap_base_dn]" value="{AUTH_LDAP_BASE_DN}" /></dd> +	</dl> +	<dl> +		<dt><label for="ldap_uid">{L_LDAP_UID}{L_COLON}</label><br /><span>{L_LDAP_UID_EXPLAIN}</span></dt> +		<dd><input type="text" id="ldap_uid" size="40" name="config[ldap_uid]" value="{AUTH_LDAP_UID}" /></dd> +	</dl> +	<dl> +		<dt><label for="ldap_user_filter">{L_LDAP_USER_FILTER}{L_COLON}</label><br /><span>{L_LDAP_USER_FILTER_EXPLAIN}</span></dt> +		<dd><input type="text" id="ldap_user_filter" size="40" name="config[ldap_user_filter]" value="{AUTH_LDAP_USER_FILTER}" /></dd> +	</dl> +	<dl> +		<dt><label for="ldap_email">{L_LDAP_EMAIL}{L_COLON}</label><br /><span>{L_LDAP_EMAIL_EXPLAIN}</span></dt> +		<dd><input type="email" id="ldap_email" size="40" name="config[ldap_email]" value="{AUTH_LDAP_EMAIL}" /></dd> +	</dl> +	<dl> +		<dt><label for="ldap_user">{L_LDAP_USER}{L_COLON}</label><br /><span>{L_LDAP_USER_EXPLAIN}</span></dt> +		<dd><input type="text" id="ldap_user" size="40" name="config[ldap_user]" value="{AUTH_LDAP_USER}" /></dd> +	</dl> +	<dl> +		<dt><label for="ldap_password">{L_LDAP_PASSWORD}{L_COLON}</label><br /><span>{L_LDAP_PASSWORD_EXPLAIN}</span></dt> +		<dd><input type="password" id="ldap_password" size="40" name="config[ldap_password]" value="{AUTH_LDAP_PASSWORD}" autocomplete="off" /></dd> +	</dl> +</fieldset> diff --git a/phpBB/adm/style/auth_provider_oauth.html b/phpBB/adm/style/auth_provider_oauth.html index 25e40ff596..4c8ff4d36c 100644 --- a/phpBB/adm/style/auth_provider_oauth.html +++ b/phpBB/adm/style/auth_provider_oauth.html @@ -1,17 +1,18 @@ -<h2>{L_AUTH_PROVIDER_OAUTH_TITLE}</h2> -<p>{L_AUTH_PROVIDER_OAUTH_EXPLAIN}</p> +<div id="auth_oauth_settings"> +	<p>{L_AUTH_PROVIDER_OAUTH_EXPLAIN}</p> -<!-- BEGIN oauth_services --> -<fieldset> -	<legend>{oauth_services.ACTUAL_NAME}</legend> -	<dl> -		<dt><label for="oauth_service_{oauth_services.NAME}_key">{L_AUTH_PROVIDER_OAUTH_KEY}{L_COLON}</label></dt> -		<dd><input type="text" id="oauth_service_{oauth_services.NAME}_key" size="40" name="config[auth_oauth_{oauth_services.NAME}_key]" value="{oauth_services.KEY}" /></dd> -	</dl> -	<dl> -		<dt><label for="oauth_service_{oauth_services.NAME}_secret">{L_AUTH_PROVIDER_OAUTH_SECRET}{L_COLON}</label></dt> -		<dd><input type="text" id="oauth_service_{oauth_services.NAME}_secret" size="40" name="config[auth_oauth_{oauth_services.NAME}_secret]" value="{oauth_services.SECRET}" /></dd> -	</dl> -</fieldset> -<!-- END oauth_services --> +	<!-- BEGIN oauth_services --> +	<fieldset> +		<legend>{oauth_services.ACTUAL_NAME}</legend> +		<dl> +			<dt><label for="oauth_service_{oauth_services.NAME}_key">{L_AUTH_PROVIDER_OAUTH_KEY}{L_COLON}</label></dt> +			<dd><input type="text" id="oauth_service_{oauth_services.NAME}_key" size="40" name="config[auth_oauth_{oauth_services.NAME}_key]" value="{oauth_services.KEY}" /></dd> +		</dl> +		<dl> +			<dt><label for="oauth_service_{oauth_services.NAME}_secret">{L_AUTH_PROVIDER_OAUTH_SECRET}{L_COLON}</label></dt> +			<dd><input type="text" id="oauth_service_{oauth_services.NAME}_secret" size="40" name="config[auth_oauth_{oauth_services.NAME}_secret]" value="{oauth_services.SECRET}" /></dd> +		</dl> +	</fieldset> +	<!-- END oauth_services --> +</div> diff --git a/phpBB/adm/style/avatars.js b/phpBB/adm/style/avatars.js deleted file mode 100644 index 26ea24c0db..0000000000 --- a/phpBB/adm/style/avatars.js +++ /dev/null @@ -1,15 +0,0 @@ -(function($) {  // Avoid conflicts with other libraries - -"use strict"; - -function avatarHide() { -    $('#avatar_options > div').hide(); - -    var selected = $('#avatar_driver').val(); -    $('#avatar_option_' + selected).show(); -} - -avatarHide(); -$('#avatar_driver').bind('change', avatarHide); - -})(jQuery); // Avoid conflicts with other libraries diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html index 822ab76313..c3d148966d 100644 --- a/phpBB/adm/style/install_footer.html +++ b/phpBB/adm/style/install_footer.html @@ -10,7 +10,7 @@  </div>  <script type="text/javascript" src="{T_JQUERY_LINK}"></script> -<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF --> +<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->  <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>  <!-- INCLUDEJS admin.js -->  {$SCRIPTS} diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html index 8810414fc2..0f4589f5d4 100644 --- a/phpBB/adm/style/overall_footer.html +++ b/phpBB/adm/style/overall_footer.html @@ -32,7 +32,7 @@  </div>  <script type="text/javascript" src="{T_JQUERY_LINK}"></script> -<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF --> +<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->  <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>  <!-- INCLUDEJS ajax.js -->  <!-- INCLUDEJS admin.js --> diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html index c549a2df4e..c08fd931a0 100644 --- a/phpBB/adm/style/simple_footer.html +++ b/phpBB/adm/style/simple_footer.html @@ -17,10 +17,11 @@  </div>  <script type="text/javascript" src="{T_JQUERY_LINK}"></script> -<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF --> +<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->  <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>  <!-- EVENT acp_simple_footer_after --> +{$SCRIPTS}  </body>  </html> diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html index ae25f28d32..bf8f41cd7a 100644 --- a/phpBB/adm/style/simple_header.html +++ b/phpBB/adm/style/simple_header.html @@ -83,6 +83,7 @@ function find_username(url)  // ]]>  </script>  <!-- EVENT acp_simple_header_head_append --> +{$STYLESHEETS}  </head>  <body class="{S_CONTENT_DIRECTION} {BODY_CLASS}"> | 
