diff options
Diffstat (limited to 'phpBB/adm/style')
91 files changed, 2990 insertions, 2267 deletions
| diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index 9573c34248..9ce9fb5f13 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF U_BACK -->  	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> @@ -54,7 +54,7 @@  		<!-- ELSE -->  			<dl> -				<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt> +				<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>  				<dd>{options.CONTENT}</dd>  			</dl> @@ -78,11 +78,11 @@  		<legend>{L_SECURE_TITLE}</legend>  		<p>{L_DOWNLOAD_ADD_IPS_EXPLAIN}</p>  	<dl> -		<dt><label for="ip_hostname">{L_IP_HOSTNAME}:</label></dt> +		<dt><label for="ip_hostname">{L_IP_HOSTNAME}{L_COLON}</label></dt>  		<dd><textarea id="ip_hostname" cols="40" rows="3" name="ips"></textarea></dd>  	</dl>  	<dl> -		<dt><label for="exclude">{L_IP_EXCLUDE}:</label><br /><span>{L_EXCLUDE_ENTERED_IP}</span></dt> +		<dt><label for="exclude">{L_IP_EXCLUDE}{L_COLON}</label><br /><span>{L_EXCLUDE_ENTERED_IP}</span></dt>  		<dd><label><input type="radio" id="exclude" name="ipexclude" value="1" class="radio" /> {L_YES}</label>  			<label><input type="radio" name="ipexclude" value="0" checked="checked" class="radio" /> {L_NO}</label></dd>  	</dl> @@ -97,7 +97,7 @@  	<!-- IF S_DEFINED_IPS -->  			<p>{L_DOWNLOAD_REMOVE_IPS_EXPLAIN}</p>  		<dl> -			<dt><label for="remove_ip_hostname">{L_IP_HOSTNAME}:</label></dt> +			<dt><label for="remove_ip_hostname">{L_IP_HOSTNAME}{L_COLON}</label></dt>  			<dd><select name="unip[]" id="remove_ip_hostname" multiple="multiple" size="10">{DEFINED_IPS}</select></dd>  		</dl> @@ -122,11 +122,11 @@  			{  				if (newimage == 'no_image')  				{ -					document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}images/spacer.gif"; +					document.getElementById('image_upload_icon').src = "{ROOT_PATH}images/spacer.gif";  				}  				else  				{ -					document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}{IMG_PATH}/" + newimage; +					document.getElementById('image_upload_icon').src = "{ROOT_PATH}{IMG_PATH}/" + newimage;  				}  			} @@ -172,39 +172,39 @@  			<legend>{L_LEGEND}</legend>  		<dl> -			<dt><label for="group_name">{L_GROUP_NAME}:</label></dt> +			<dt><label for="group_name">{L_GROUP_NAME}{L_COLON}</label></dt>  			<dd><input type="text" id="group_name" size="20" maxlength="100" name="group_name" value="{GROUP_NAME}" /></dd>  		</dl>  		<dl> -			<dt><label for="category">{L_SPECIAL_CATEGORY}:</label><br /><span>{L_SPECIAL_CATEGORY_EXPLAIN}</span></dt> +			<dt><label for="category">{L_SPECIAL_CATEGORY}{L_COLON}</label><br /><span>{L_SPECIAL_CATEGORY_EXPLAIN}</span></dt>  			<dd>{S_CATEGORY_SELECT}</dd>  		</dl>  		<dl> -			<dt><label for="allowed">{L_ALLOWED}:</label></dt> +			<dt><label for="allowed">{L_ALLOWED}{L_COLON}</label></dt>  			<dd><input type="checkbox" class="radio" id="allowed" name="allow_group" value="1"<!-- IF ALLOW_GROUP --> checked="checked"<!-- ENDIF --> /></dd>  		</dl>  		<dl> -			<dt><label for="allow_in_pm">{L_ALLOW_IN_PM}:</label></dt> +			<dt><label for="allow_in_pm">{L_ALLOW_IN_PM}{L_COLON}</label></dt>  			<dd><input type="checkbox" class="radio" id="allow_in_pm" name="allow_in_pm" value="1"<!-- IF ALLOW_IN_PM --> checked="checked"<!-- ENDIF --> /></dd>  		</dl>  		<dl> -			<dt><label for="upload_icon">{L_UPLOAD_ICON}:</label></dt> +			<dt><label for="upload_icon">{L_UPLOAD_ICON}{L_COLON}</label></dt>  			<dd><select name="upload_icon" id="upload_icon" onchange="update_image(this.options[selectedIndex].value);">  					<option value="no_image"<!-- IF S_NO_IMAGE --> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option>{S_FILENAME_LIST}  			</select></dd> -			<dd> <img <!-- IF S_NO_IMAGE -->src="{PHPBB_ROOT_PATH}images/spacer.gif"<!-- ELSE -->src="{UPLOAD_ICON_SRC}"<!-- ENDIF --> id="image_upload_icon" alt="" title="" /> </dd> +			<dd> <img <!-- IF S_NO_IMAGE -->src="{ROOT_PATH}images/spacer.gif"<!-- ELSE -->src="{UPLOAD_ICON_SRC}"<!-- ENDIF --> id="image_upload_icon" alt="" title="" /> </dd>  		</dl>  		<dl> -			<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}:</label></dt> -			<dd><input type="text" id="extgroup_filesize" size="3" maxlength="15" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd> +			<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}{L_COLON}</label></dt> +			<dd><input type="number" id="extgroup_filesize" size="3" maxlength="15" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd>  		</dl>  		<dl> -			<dt><label for="assigned_extensions">{L_ASSIGNED_EXTENSIONS}:</label></dt> +			<dt><label for="assigned_extensions">{L_ASSIGNED_EXTENSIONS}{L_COLON}</label></dt>  			<dd><div id="ext">{ASSIGNED_EXTENSIONS}</div> <span>[<a href="{U_EXTENSIONS}">{L_GO_TO_EXTENSIONS}</a> ]</span></dd>  			<dd><select name="extensions[]" id="assigned_extensions" class="narrow" onchange="show_extensions(this);" multiple="multiple" size="8">{S_EXTENSION_OPTIONS}</select></dd>  		</dl>  		<dl> -			<dt><label for="allowed_forums">{L_ALLOWED_FORUMS}:</label><br /><span>{L_ALLOWED_FORUMS_EXPLAIN}</span></dt> +			<dt><label for="allowed_forums">{L_ALLOWED_FORUMS}{L_COLON}</label><br /><span>{L_ALLOWED_FORUMS_EXPLAIN}</span></dt>  			<dd><label><input type="radio" id="allowed_forums" class="radio" name="forum_select" value="0"<!-- IF not S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_ALL_FORUMS}</label>  				<label><input type="radio" class="radio" name="forum_select" value="1"<!-- IF S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_SELECTED_FORUMS}</label></dd>  			<dd><select name="allowed_forums[]" multiple="multiple" size="8">{S_FORUM_ID_OPTIONS}</select></dd> @@ -224,7 +224,7 @@  		<fieldset class="tabulated">  		<legend>{L_TITLE}</legend> -		<table cellspacing="1"> +		<table class="table1">  			<col class="row1" /><col class="row1" /><col class="row2" />  		<thead>  		<tr> @@ -248,13 +248,13 @@  					<!-- ELSE --><br /><span>» {L_ALLOWED_IN_PM_POST}</span><!-- ENDIF -->  				</td>  				<td>{groups.CATEGORY}</td> -				<td align="center" valign="middle" style="white-space: nowrap;"> <a href="{groups.U_EDIT}">{ICON_EDIT}</a>  <a href="{groups.U_DELETE}">{ICON_DELETE}</a> </td> +				<td align="center" valign="middle" style="white-space: nowrap;"> <a href="{groups.U_EDIT}">{ICON_EDIT}</a>  <a href="{groups.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a> </td>  			</tr>  		<!-- END groups -->  		</tbody>  		</table>  		<p class="quick"> -				{L_CREATE_GROUP}: <input type="text" name="group_name" maxlength="30" /> +				{L_CREATE_GROUP}{L_COLON} <input type="text" name="group_name" maxlength="30" />  				<input class="button2" name="add" type="submit" value="{L_SUBMIT}" />  		</p>  		{S_FORM_TOKEN} @@ -291,7 +291,7 @@  	<fieldset class="tabulated">  	<legend>{L_TITLE}</legend> -	<table cellspacing="1"> +	<table class="table1">  		<col class="row1" /><col class="row1" /><col class="row2" />  	<thead>  	<tr> @@ -331,7 +331,7 @@  	<fieldset class="tabulated">  	<legend>{L_TITLE}</legend> -	<table cellspacing="1"> +	<table class="table1">  	<thead>  	<tr>  		<th>{L_FILENAME}</th> @@ -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}: </strong><input type="text" 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}]" size="7" maxlength="10" value="{orphan.POST_ID}" /></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> @@ -371,6 +371,89 @@  	</fieldset>  	</form> +<!-- ELSEIF S_MANAGE --> + +	<form id="attachments" method="post" action="{U_ACTION}"> + +	<fieldset class="tabulated"> +	<legend>{L_TITLE}</legend> + +	<div class="pagination"> +	<!-- IF .pagination or TOTAL_FILES --> +		{L_NUMBER_FILES}{L_COLON} {TOTAL_FILES} • {L_TOTAL_SIZE}{L_COLON} {TOTAL_SIZE} +		<!-- IF .pagination --> +			• <!-- INCLUDE pagination.html --> +		<!-- ELSE --> +			• {S_ON_PAGE} +		<!-- ENDIF --> +	<!-- ENDIF --> +	</div> + +	<table class="table1"> +	<thead> +	<tr> +		<th>{L_FILENAME}</th> +		<th>{L_POSTED}</th> +		<th>{L_FILESIZE}</th> +		<th>{L_DELETE}</th> +	</tr> +	</thead> +	<tbody> +	<!-- BEGIN attachments --> +		<!-- IF attachments.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> +			<td> +				<!-- IF attachments.S_IN_MESSAGE -->{L_EXTENSION_GROUP}{L_COLON} <strong><!-- IF attachments.EXT_GROUP_NAME -->{attachments.EXT_GROUP_NAME}<!-- ELSE -->{L_NO_EXT_GROUP}<!-- ENDIF --></strong><br />{attachments.L_DOWNLOAD_COUNT}<br />{L_IN} {L_PRIVATE_MESSAGE} +				<!-- ELSE --><a href="{attachments.U_FILE}" style="font-weight: bold;">{attachments.REAL_FILENAME}</a><br /><!-- IF attachments.COMMENT -->{attachments.COMMENT}<br /><!-- ENDIF -->{attachments.L_DOWNLOAD_COUNT}<br />{L_TOPIC}{L_COLON} <a href="{attachments.U_VIEW_TOPIC}">{attachments.TOPIC_TITLE}</a><!-- ENDIF --> +			</td> +			<td>{attachments.FILETIME}<br />{L_POST_BY_AUTHOR} {attachments.ATTACHMENT_POSTER}</td> +			<td>{attachments.FILESIZE}</td> +			<td><input type="checkbox" class="radio" name="delete[{attachments.ATTACH_ID}]" /></td> +		</tr> +	<!-- END attachments --> +	<tr class="row4"> +		<td colspan="3"> </td> +		<td class="small"><a href="#" onclick="marklist('attachments', 'delete', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('attachments', 'delete', false); return false;">{L_UNMARK_ALL}</a></td> +	</tr> +	</tbody> +	</table> + +	<!-- IF TOTAL_FILES --> +	<fieldset class="display-options"> +		{L_DISPLAY_LOG}{L_COLON}  {S_LIMIT_DAYS} {L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR} +		<input class="button2" type="submit" value="{L_GO}" name="sort" /> +	</fieldset> + +	<hr /> + +	<div class="pagination"> +		{L_NUMBER_FILES}{L_COLON} {TOTAL_FILES} • {L_TOTAL_SIZE}{L_COLON} {TOTAL_SIZE} +		<!-- IF .pagination --> +			• <!-- INCLUDE pagination.html --> +		<!-- ELSE --> +			• {S_ON_PAGE} +		<!-- ENDIF --> +	</div> +	<!-- ENDIF --> + +	<p class="submit-buttons"> +		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />  +		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> +	</p> +	{S_FORM_TOKEN} +	</fieldset> +	</form> + +	<!-- IF S_ACTION_OPTIONS --> +	<fieldset> +		<legend>{L_RESYNC_STATS}</legend> +		<form id="action_stats_form" method="post" action="{U_ACTION}"> +			<dl> +				<dt><label for="action_stats">{L_RESYNC_FILES_STATS}</label><br /><span>{L_RESYNC_FILES_STATS_EXPLAIN}</span></dt> +				<dd><input type="hidden" name="action" value="stats" /><input class="button2" type="submit" id="action_stats" name="action_stats" value="{L_RUN}" /></dd> +			</dl> +		</form> +	</fieldset> +	<!-- ENDIF -->  <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_avatar_options_gravatar.html b/phpBB/adm/style/acp_avatar_options_gravatar.html new file mode 100644 index 0000000000..0c2e8cc984 --- /dev/null +++ b/phpBB/adm/style/acp_avatar_options_gravatar.html @@ -0,0 +1,11 @@ +<dl> +	<dt><label for="avatar_gravatar_email">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></dt> +	<dd><input type="email" name="avatar_gravatar_email" id="avatar_gravatar_email" value="{AVATAR_GRAVATAR_EMAIL}" class="inputbox" /></dd> +</dl> +<dl> +	<dt><label for="avatar_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt> +	<dd> +		<input type="number" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} ×   +		<input type="number" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL} +	</dd> +</dl> diff --git a/phpBB/adm/style/acp_avatar_options_local.html b/phpBB/adm/style/acp_avatar_options_local.html new file mode 100644 index 0000000000..0cdb3644d7 --- /dev/null +++ b/phpBB/adm/style/acp_avatar_options_local.html @@ -0,0 +1,21 @@ +<dl> +	<dt><label for="category">{L_AVATAR_CATEGORY}{L_COLON}</label></dt> +	<dd><select name="avatar_local_cat" id="category"> +		<option value="">{L_NO_AVATAR_CATEGORY}</option> +		<!-- BEGIN avatar_local_cats --> +		<option value="{avatar_local_cats.NAME}"<!-- IF avatar_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_local_cats.NAME}</option> +		<!-- END avatar_local_cats --> +	</select> <input type="submit" value="{L_GO}" name="avatar_local_go" class="button2" /></dd> +</dl> +	<!-- IF AVATAR_LOCAL_SHOW --> +	<ul id="gallery"> +	<!-- BEGIN avatar_local_row --> +	<!-- BEGIN avatar_local_col --> +		<li> +			<label for="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}"><img src="{avatar_local_row.avatar_local_col.AVATAR_IMAGE}" alt="" /><br /> +			<input type="radio" name="avatar_local_file" id="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}" value="{avatar_local_row.avatar_local_col.AVATAR_FILE}" /></label> +		</li> +	<!-- END avatar_local_col --> +	<!-- END avatar_local_row --> +	</ul> +	<!-- ENDIF --> diff --git a/phpBB/adm/style/acp_avatar_options_remote.html b/phpBB/adm/style/acp_avatar_options_remote.html new file mode 100644 index 0000000000..1c0e3db599 --- /dev/null +++ b/phpBB/adm/style/acp_avatar_options_remote.html @@ -0,0 +1,11 @@ +<dl> +	<dt><label for="avatar_remote_url">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt> +	<dd><input type="url" name="avatar_remote_url" id="avatar_remote_url" value="{AVATAR_REMOTE_URL}" class="inputbox" /></dd> +</dl> +<dl> +	<dt><label for="avatar_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt> +	<dd> +		<input type="number" name="avatar_remote_width" id="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} ×   +		<input type="number" name="avatar_remote_height" id="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL} +	</dd> +</dl> diff --git a/phpBB/adm/style/acp_avatar_options_upload.html b/phpBB/adm/style/acp_avatar_options_upload.html new file mode 100644 index 0000000000..63a734ea7d --- /dev/null +++ b/phpBB/adm/style/acp_avatar_options_upload.html @@ -0,0 +1,11 @@ +<dl> +	<dt><label for="avatar_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt> +	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}" /><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth" /></dd> +</dl> + +<!-- IF S_UPLOAD_AVATAR_URL --> +	<dl> +		<dt><label for="avatar_upload_url">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt> +		<dd><input type="url" name="avatar_upload_url" id="avatar_upload_url" value="" class="inputbox" /></dd> +	</dl> +<!-- ENDIF --> diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html index 0e2e71822e..71c737de70 100644 --- a/phpBB/adm/style/acp_ban.html +++ b/phpBB/adm/style/acp_ban.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <p>{L_ACP_BAN_EXPLAIN}</p> @@ -44,26 +44,26 @@  <fieldset>  	<legend>{L_TITLE}</legend>  <dl> -	<dt><label for="ban">{L_BAN_CELL}:</label></dt> +	<dt><label for="ban">{L_BAN_CELL}{L_COLON}</label></dt>  	<dd><textarea name="ban" cols="40" rows="3" id="ban"></textarea></dd>  	<!-- IF S_USERNAME_BAN --><dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd><!-- ENDIF -->  </dl>  <dl> -	<dt><label for="banlength">{L_BAN_LENGTH}:</label></dt> +	<dt><label for="banlength">{L_BAN_LENGTH}{L_COLON}</label></dt>  	<dd><label for="banlength"><select name="banlength" id="banlength" onchange="if(this.value==-1){document.getElementById('banlengthother').style.display = 'block';}else{document.getElementById('banlengthother').style.display='none';}">{S_BAN_END_OPTIONS}</select></label></dd>  	<dd id="banlengthother" style="display: none;"><label><input type="text" name="banlengthother" class="inputbox" /><br /><span>{L_YEAR_MONTH_DAY}</span></label></dd>  </dl>  <dl> -	<dt><label for="banexclude">{L_BAN_EXCLUDE}:</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt> +	<dt><label for="banexclude">{L_BAN_EXCLUDE}{L_COLON}</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt>  	<dd><label><input type="radio" name="banexclude" value="1" class="radio" /> {L_YES}</label>  		<label><input type="radio" name="banexclude" id="banexclude" value="0" checked="checked" class="radio" /> {L_NO}</label></dd>  </dl>  <dl> -	<dt><label for="banreason">{L_BAN_REASON}:</label></dt> +	<dt><label for="banreason">{L_BAN_REASON}{L_COLON}</label></dt>  	<dd><input name="banreason" type="text" class="text medium" maxlength="255" id="banreason" /></dd>  </dl>  <dl> -	<dt><label for="bangivereason">{L_BAN_GIVE_REASON}:</label></dt> +	<dt><label for="bangivereason">{L_BAN_GIVE_REASON}{L_COLON}</label></dt>  	<dd><input name="bangivereason" type="text" class="text medium" maxlength="255" id="bangivereason" /></dd>  </dl> @@ -88,19 +88,19 @@  <!-- IF S_BANNED_OPTIONS -->  	<dl> -		<dt><label for="unban">{L_BAN_CELL}:</label></dt> +		<dt><label for="unban">{L_BAN_CELL}{L_COLON}</label></dt>  		<dd><select id="unban" name="unban[]" multiple="multiple" size="10" style="width: 50%" onchange="if (this.selectedIndex > -1) display_details(this.options[this.selectedIndex].value); else display_details(-1);">{BANNED_OPTIONS}</select></dd>  	</dl>  	<dl> -		<dt><label for="unbanlength">{L_BAN_LENGTH}:</label></dt> +		<dt><label for="unbanlength">{L_BAN_LENGTH}{L_COLON}</label></dt>  		<dd><input style="border: 0;" type="text" class="text full" readonly="readonly" name="unbanlength" id="unbanlength" /></dd>  	</dl>  	<dl> -		<dt><label for="unbanreason">{L_BAN_REASON}:</label></dt> +		<dt><label for="unbanreason">{L_BAN_REASON}{L_COLON}</label></dt>  		<dd><textarea style="border: 0;" class="text full" readonly="readonly" name="unbanreason" id="unbanreason" rows="5" cols="80"> </textarea></dd>  	</dl>  	<dl> -		<dt><label for="unbangivereason">{L_BAN_GIVE_REASON}:</label></dt> +		<dt><label for="unbangivereason">{L_BAN_GIVE_REASON}{L_COLON}</label></dt>  		<dd><textarea style="border: 0;" class="text full" readonly="readonly" name="unbangivereason" id="unbangivereason" rows="5" cols="80"> </textarea></dd>  	</dl> @@ -121,4 +121,4 @@  </form> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html index c81c198fd5..c22ed395e7 100644 --- a/phpBB/adm/style/acp_bbcodes.html +++ b/phpBB/adm/style/acp_bbcodes.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_EDIT_BBCODE --> @@ -56,7 +56,7 @@  	<br /> -	<table cellspacing="1" id="down"> +	<table class="table1" id="down">  	<thead>  	<tr>  		<th colspan="2">{L_TOKENS}</th> @@ -90,7 +90,7 @@  	<fieldset class="tabulated">  	<legend>{L_ACP_BBCODES}</legend> -	<table cellspacing="1" id="down"> +	<table class="table1" id="down">  	<thead>  	<tr>  		<th>{L_BBCODE_TAG}</th> @@ -101,7 +101,7 @@  	<!-- BEGIN bbcodes -->  		<!-- IF bbcodes.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->  			<td style="text-align: center;">{bbcodes.BBCODE_TAG}</td> -			<td style="text-align: right; width: 40px;"><a href="{bbcodes.U_EDIT}">{ICON_EDIT}</a> <a href="{bbcodes.U_DELETE}">{ICON_DELETE}</a></td> +			<td style="text-align: right; width: 40px;"><a href="{bbcodes.U_EDIT}">{ICON_EDIT}</a> <a href="{bbcodes.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a></td>  		</tr>  	<!-- BEGINELSE -->  		<tr class="row3"> diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html index bb16204801..1a09c4eee6 100644 --- a/phpBB/adm/style/acp_board.html +++ b/phpBB/adm/style/acp_board.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <h1>{L_TITLE}</h1> @@ -25,7 +25,7 @@  	<!-- ELSE -->  		<dl> -			<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt> +			<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>  			<dd>{options.CONTENT}</dd>  		</dl> @@ -34,7 +34,7 @@  <!-- IF S_AUTH -->  	<!-- BEGIN auth_tpl --> -		{auth_tpl.TPL} +		<!-- INCLUDE {auth_tpl.TEMPLATE_FILE} -->  	<!-- END auth_tpl -->  <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html index 7783356574..eeda13303d 100644 --- a/phpBB/adm/style/acp_bots.html +++ b/phpBB/adm/style/acp_bots.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_EDIT_BOT --> @@ -22,27 +22,27 @@  	<fieldset>  		<legend>{L_TITLE}</legend>  	<dl> -		<dt><label for="bot_name">{L_BOT_NAME}:</label><br /><span>{L_BOT_NAME_EXPLAIN}</span></dt> +		<dt><label for="bot_name">{L_BOT_NAME}{L_COLON}</label><br /><span>{L_BOT_NAME_EXPLAIN}</span></dt>  		<dd><input name="bot_name" type="text" id="bot_name" value="{BOT_NAME}" maxlength="255" /></dd>  	</dl>  	<dl> -		<dt><label for="bot_style">{L_BOT_STYLE}:</label><br /><span>{L_BOT_STYLE_EXPLAIN}</span></dt> +		<dt><label for="bot_style">{L_BOT_STYLE}{L_COLON}</label><br /><span>{L_BOT_STYLE_EXPLAIN}</span></dt>  		<dd><select id="bot_style" name="bot_style">{S_STYLE_OPTIONS}</select></dd>  	</dl>  	<dl> -		<dt><label for="bot_lang">{L_BOT_LANG}:</label><br /><span>{L_BOT_LANG_EXPLAIN}</span></dt> +		<dt><label for="bot_lang">{L_BOT_LANG}{L_COLON}</label><br /><span>{L_BOT_LANG_EXPLAIN}</span></dt>  		<dd><select id="bot_lang" name="bot_lang">{S_LANG_OPTIONS}</select></dd>  	</dl>  	<dl> -		<dt><label for="bot_active">{L_BOT_ACTIVE}:</label></dt> +		<dt><label for="bot_active">{L_BOT_ACTIVE}{L_COLON}</label></dt>  		<dd><select id="bot_active" name="bot_active">{S_ACTIVE_OPTIONS}</select></dd>  	</dl>  	<dl> -		<dt><label for="bot_agent">{L_BOT_AGENT}:</label><br /><span>{L_BOT_AGENT_EXPLAIN}</span></dt> +		<dt><label for="bot_agent">{L_BOT_AGENT}{L_COLON}</label><br /><span>{L_BOT_AGENT_EXPLAIN}</span></dt>  		<dd><input name="bot_agent" type="text" id="bot_agent" value="{BOT_AGENT}" maxlength="255" /></dd>  	</dl>  	<dl> -		<dt><label for="bot_ip">{L_BOT_IP}:</label><br /><span>{L_BOT_IP_EXPLAIN}</span></dt> +		<dt><label for="bot_ip">{L_BOT_IP}{L_COLON}</label><br /><span>{L_BOT_IP_EXPLAIN}</span></dt>  		<dd><input name="bot_ip" type="text" id="bot_ip" value="{BOT_IP}" maxlength="255" /></dd>  	</dl> @@ -62,7 +62,7 @@  	<form id="acp_bots" method="post" action="{U_ACTION}"> -	<table cellspacing="1"> +	<table class="table1">  	<thead>  	<tr>  		<th>{L_BOT_NAME}</th> @@ -76,9 +76,9 @@  		<!-- IF bots.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->  			<td style="width: 50%;">{bots.BOT_NAME}</td>  			<td style="width: 15%; white-space: nowrap;" align="center"> {bots.LAST_VISIT} </td> -			<td style="text-align: center;"> <a href="{bots.U_ACTIVATE_DEACTIVATE}">{bots.L_ACTIVATE_DEACTIVATE}</a> </td> +			<td style="text-align: center;"> <a href="{bots.U_ACTIVATE_DEACTIVATE}" data-ajax="activate_deactivate">{bots.L_ACTIVATE_DEACTIVATE}</a> </td>  			<td style="text-align: center;"> <a href="{bots.U_EDIT}">{L_EDIT}</a> </td> -			<td style="text-align: center;"> <a href="{bots.U_DELETE}">{L_DELETE}</a> </td> +			<td style="text-align: center;"> <a href="{bots.U_DELETE}" data-ajax="row_delete">{L_DELETE}</a> </td>  			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{bots.BOT_ID}" /></td>  		</tr>  	<!-- END bots --> diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html index 8eee370284..df4c675209 100644 --- a/phpBB/adm/style/acp_captcha.html +++ b/phpBB/adm/style/acp_captcha.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <h1>{L_ACP_VC_SETTINGS}</h1> @@ -13,25 +13,25 @@  <legend>{L_GENERAL_OPTIONS}</legend>  <dl> -	<dt><label for="enable_confirm">{L_VISUAL_CONFIRM_REG}:</label><br /><span>{L_VISUAL_CONFIRM_REG_EXPLAIN}</span></dt> +	<dt><label for="enable_confirm">{L_VISUAL_CONFIRM_REG}{L_COLON}</label><br /><span>{L_VISUAL_CONFIRM_REG_EXPLAIN}</span></dt>  	<dd><label><input type="radio" class="radio" id="enable_confirm" name="enable_confirm" value="1"<!-- IF REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>  		<label><input type="radio" class="radio" name="enable_confirm" value="0"<!-- IF not REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>  </dl>  <dl> -	<dt><label for="max_reg_attempts">{L_REG_LIMIT}:</label><br /><span>{L_REG_LIMIT_EXPLAIN}</span></dt> -	<dd><input id="max_reg_attempts" type="text" size="4" maxlength="4" name="max_reg_attempts" value="{REG_LIMIT}" /></dd> +	<dt><label for="max_reg_attempts">{L_REG_LIMIT}{L_COLON}</label><br /><span>{L_REG_LIMIT_EXPLAIN}</span></dt> +	<dd><input id="max_reg_attempts" type="number" size="4" maxlength="4" min="0" max="9999" name="max_reg_attempts" value="{REG_LIMIT}" /></dd>  </dl>  <dl> -	<dt><label for="max_login_attempts">{L_MAX_LOGIN_ATTEMPTS}:</label><br /><span>{L_MAX_LOGIN_ATTEMPTS_EXPLAIN}</span></dt> -	<dd><input id="max_login_attempts" type="text" size="4" maxlength="4" name="max_login_attempts" value="{MAX_LOGIN_ATTEMPTS}" /></dd> +	<dt><label for="max_login_attempts">{L_MAX_LOGIN_ATTEMPTS}{L_COLON}</label><br /><span>{L_MAX_LOGIN_ATTEMPTS_EXPLAIN}</span></dt> +	<dd><input id="max_login_attempts" type="number" size="4" maxlength="4" min="0" max="9999" name="max_login_attempts" value="{MAX_LOGIN_ATTEMPTS}" /></dd>  </dl>  <dl> -	<dt><label for="enable_post_confirm">{L_VISUAL_CONFIRM_POST}:</label><br /><span>{L_VISUAL_CONFIRM_POST_EXPLAIN}</span></dt> +	<dt><label for="enable_post_confirm">{L_VISUAL_CONFIRM_POST}{L_COLON}</label><br /><span>{L_VISUAL_CONFIRM_POST_EXPLAIN}</span></dt>  	<dd><label><input type="radio" class="radio" id="enable_post_confirm" name="enable_post_confirm" value="1"<!-- IF POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>  		<label><input type="radio" class="radio" name="enable_post_confirm" value="0"<!-- IF not POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>  </dl>  <dl> -	<dt><label for="confirm_refresh">{L_VISUAL_CONFIRM_REFRESH}:</label><br /><span>{L_VISUAL_CONFIRM_REFRESH_EXPLAIN}</span></dt> +	<dt><label for="confirm_refresh">{L_VISUAL_CONFIRM_REFRESH}{L_COLON}</label><br /><span>{L_VISUAL_CONFIRM_REFRESH_EXPLAIN}</span></dt>  	<dd><label><input type="radio" class="radio" id="confirm_refresh" name="confirm_refresh" value="1"<!-- IF CONFIRM_REFRESH --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>  		<label><input type="radio" class="radio" name="confirm_refresh" value="0"<!-- IF not CONFIRM_REFRESH --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>  </dl> @@ -40,12 +40,12 @@  <fieldset>  <legend>{L_AVAILABLE_CAPTCHAS}</legend>  <dl> -	<dt><label for="captcha_select">{L_CAPTCHA_SELECT}:</label><br /><span>{L_CAPTCHA_SELECT_EXPLAIN}</span></dt> +	<dt><label for="captcha_select">{L_CAPTCHA_SELECT}{L_COLON}</label><br /><span>{L_CAPTCHA_SELECT_EXPLAIN}</span></dt>  	<dd><select id="captcha_select" name="select_captcha" onchange="(document.getElementById('acp_captcha')).submit()" >{CAPTCHA_SELECT}</select></dd>  </dl>   <!-- IF S_CAPTCHA_HAS_CONFIG -->  <dl> -	<dt><label for="configure">{L_CAPTCHA_CONFIGURE}:</label><br /><span>{L_CAPTCHA_CONFIGURE_EXPLAIN}</span></dt> +	<dt><label for="configure">{L_CAPTCHA_CONFIGURE}{L_COLON}</label><br /><span>{L_CAPTCHA_CONFIGURE_EXPLAIN}</span></dt>  	<dd><input class="button2" type="submit" id="configure" name="configure" value="{L_CONFIGURE}" /></dd>  </dl>  <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html index de02ac6dbe..bf0c80bcd9 100644 --- a/phpBB/adm/style/acp_database.html +++ b/phpBB/adm/style/acp_database.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF MODE eq 'restore' -->  	<h1>{L_ACP_RESTORE}</h1> @@ -13,7 +13,7 @@  	<fieldset>  		<legend>{L_RESTORE_OPTIONS}</legend>  	<dl> -		<dt><label for="file">{L_SELECT_FILE}:</label></dt> +		<dt><label for="file">{L_SELECT_FILE}{L_COLON}</label></dt>  		<dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_LAST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd>  	</dl> @@ -57,26 +57,26 @@  	<fieldset>  		<legend>{L_BACKUP_OPTIONS}</legend>  	<dl> -		<dt><label for="type">{L_BACKUP_TYPE}:</label></dt> +		<dt><label for="type">{L_BACKUP_TYPE}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="type" value="full" id="type" checked="checked" /> {L_FULL_BACKUP}</label>  			<label><input type="radio" name="type" class="radio" value="structure" /> {L_STRUCTURE_ONLY}</label>  			<label><input type="radio" class="radio" name="type" value="data" /> {L_DATA_ONLY}</label></dd>  	</dl>  	<dl> -		<dt><label for="method">{L_FILE_TYPE}:</label></dt> +		<dt><label for="method">{L_FILE_TYPE}{L_COLON}</label></dt>  		<dd><!-- BEGIN methods -->  		<label><input name="method"<!-- IF methods.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> type="radio" class="radio" value="{methods.TYPE}" /> {methods.TYPE}</label>  		<!-- END methods --></dd>  	</dl>  	<dl> -		<dt><label for="where">{L_ACTION}:</label></dt> +		<dt><label for="where">{L_ACTION}{L_COLON}</label></dt>  		<dd>  			<label><input id="where" type="radio" class="radio" name="where" value="store" checked="checked" /> {L_STORE_LOCAL}</label>  			<label><input type="radio" class="radio" name="where" value="download" /> {L_DOWNLOAD}</label>  		</dd>  	</dl>  	<dl> -		<dt><label for="table">{L_TABLE_SELECT}:</label></dt> +		<dt><label for="table">{L_TABLE_SELECT}{L_COLON}</label></dt>  		<dd><select id="table" name="table[]" size="10" multiple="multiple">  		<!-- BEGIN tables -->  			<option value="{tables.TABLE}">{tables.TABLE}</option> diff --git a/phpBB/adm/style/acp_disallow.html b/phpBB/adm/style/acp_disallow.html index b68d3ab3c0..0608f29474 100644 --- a/phpBB/adm/style/acp_disallow.html +++ b/phpBB/adm/style/acp_disallow.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <h1>{L_ACP_DISALLOW_USERNAMES}</h1> @@ -11,7 +11,7 @@  <fieldset>  	<legend>{L_ADD_DISALLOW_TITLE}</legend>  <dl> -	<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_ADD_DISALLOW_EXPLAIN}</span></dt> +	<dt><label for="user">{L_USERNAME}{L_COLON}</label><br /><span>{L_ADD_DISALLOW_EXPLAIN}</span></dt>  	<dd><input id="user" type="text" class="text medium" maxlength="255" name="disallowed_user" /></dd>  </dl> @@ -28,7 +28,7 @@  	<legend>{L_DELETE_DISALLOW_TITLE}</legend>  <!-- IF S_DISALLOWED_NAMES -->  	<dl> -		<dt><label for="disallowed">{L_USERNAME}:</label></dt> +		<dt><label for="disallowed">{L_USERNAME}{L_COLON}</label></dt>  		<dd><select name="disallowed_id" id="disallowed">{S_DISALLOWED_NAMES}</select></dd>  	</dl> diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html index ff52500dca..950ecb40b0 100644 --- a/phpBB/adm/style/acp_email.html +++ b/phpBB/adm/style/acp_email.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <h1>{L_ACP_MASS_EMAIL}</h1> @@ -18,32 +18,32 @@  <fieldset>  	<legend>{L_COMPOSE}</legend>  <dl> -	<dt><label for="group">{L_SEND_TO_GROUP}:</label></dt> +	<dt><label for="group">{L_SEND_TO_GROUP}{L_COLON}</label></dt>  	<dd><select id="group" name="g">{S_GROUP_OPTIONS}</select></dd>  </dl>  <dl> -	<dt><label for="usernames">{L_SEND_TO_USERS}:</label><br /><span>{L_SEND_TO_USERS_EXPLAIN}</span></dt> +	<dt><label for="usernames">{L_SEND_TO_USERS}{L_COLON}</label><br /><span>{L_SEND_TO_USERS_EXPLAIN}</span></dt>  	<dd><textarea name="usernames" id="usernames" rows="5" cols="40">{USERNAMES}</textarea></dd>  	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>  </dl>  <dl> -	<dt><label for="subject">{L_SUBJECT}:</label></dt> +	<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>  	<dd><input name="subject" type="text" id="subject" value="{SUBJECT}" /></dd>  </dl>  <dl> -	<dt><label for="message">{L_MASS_MESSAGE}:</label><br /><span>{L_MASS_MESSAGE_EXPLAIN}</span></dt> +	<dt><label for="message">{L_MASS_MESSAGE}{L_COLON}</label><br /><span>{L_MASS_MESSAGE_EXPLAIN}</span></dt>  	<dd><textarea id="message" name="message" rows="10" cols="60">{MESSAGE}</textarea></dd>  </dl>  <dl> -	<dt><label for="priority">{L_MAIL_PRIORITY}:</label></dt> +	<dt><label for="priority">{L_MAIL_PRIORITY}{L_COLON}</label></dt>  	<dd><select id="priority" name="mail_priority_flag">{S_PRIORITY_OPTIONS}</select></dd>  </dl>  <dl> -	<dt><label for="banned">{L_MAIL_BANNED}:</label><br /><span>{L_MAIL_BANNED_EXPLAIN}</span></dt> +	<dt><label for="banned">{L_MAIL_BANNED}{L_COLON}</label><br /><span>{L_MAIL_BANNED_EXPLAIN}</span></dt>  	<dd><input id="banned" name="mail_banned_flag" type="checkbox" class="radio" /></dd>  </dl>  <dl> -	<dt><label for="send">{L_SEND_IMMEDIATELY}:</label></dt> +	<dt><label for="send">{L_SEND_IMMEDIATELY}{L_COLON}</label></dt>  	<dd><input id="send" type="checkbox" class="radio" name="send_immediately" checked="checked" /></dd>  </dl> diff --git a/phpBB/adm/style/acp_ext_delete_data.html b/phpBB/adm/style/acp_ext_delete_data.html new file mode 100644 index 0000000000..5b38d9b8d0 --- /dev/null +++ b/phpBB/adm/style/acp_ext_delete_data.html @@ -0,0 +1,40 @@ +<!-- INCLUDE overall_header.html --> + +	<a name="maincontent"></a> + +	<h1>{L_EXTENSIONS_ADMIN}</h1> + +	<p>{L_EXTENSIONS_EXPLAIN}</p> +	<p>{L_EXTENSION_DELETE_DATA_EXPLAIN}</p> + +	<!-- IF MIGRATOR_ERROR --> +	<div class="errorbox"> +		<p><strong>{L_MIGRATION_EXCEPTION_ERROR}</strong></p> +		<p>{MIGRATOR_ERROR}</p> +		<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p> +	</div> +	<!-- ELSEIF PRE --> +	<div class="errorbox"> +		<p>{L_CONFIRM_MESSAGE}</p> +	</div> + +	<form id="acp_extensions" method="post" action="{U_PURGE}"> +	<fieldset class="submit-buttons"> +		<legend>{L_EXTENSION_DELETE_DATA}</legend> +		<input class="button1" type="submit" name="delete_data" value="{L_EXTENSION_DELETE_DATA}" /> +		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" /> +	</fieldset> +	</form> +	<!-- ELSEIF S_NEXT_STEP --> +		<div class="errorbox"> +			<p>{L_EXTENSION_DELETE_DATA_IN_PROGRESS}</p> +		</div> +	<!-- ELSE --> +		<div class="successbox"> +			<p>{L_EXTENSION_DELETE_DATA_SUCCESS}</p> +			<br /> +			<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p> +		</div> +	<!-- ENDIF --> + +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html new file mode 100644 index 0000000000..18786d80f9 --- /dev/null +++ b/phpBB/adm/style/acp_ext_details.html @@ -0,0 +1,97 @@ +<!-- INCLUDE overall_header.html --> + +<a name="maincontent"></a> + +	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> + +	<h1>{L_EXTENSIONS_ADMIN}</h1> + +	<fieldset> +		<legend>{L_EXT_DETAILS}</legend> +		<!-- IF META_DISPLAY_NAME --> +		<dl> +			<dt><label for="meta_display_name">{L_DISPLAY_NAME}{L_COLON}</label></dt> +			<dd><strong id="meta_display_name">{META_DISPLAY_NAME}</strong></dd> +		</dl> +		<!-- ENDIF --> +		<dl> +			<dt><label for="meta_name">{L_CLEAN_NAME}{L_COLON}</label></dt> +			<dd><strong id="meta_name">{META_NAME}</strong></dd> +		</dl> +		<!-- IF META_DESCRIPTION --> +		<dl> +			<dt><label for="meta_description">{L_DESCRIPTION}{L_COLON}</label></dt> +			<dd><p id="meta_description">{META_DESCRIPTION}</p></dd> +		</dl> +		<!-- ENDIF --> +		<dl> +			<dt><label for="meta_version">{L_VERSION}{L_COLON}</label></dt> +			<dd><p id="meta_version">{META_VERSION}</p></dd> +		</dl> +		<!-- IF META_HOMEPAGE --> +		<dl> +			<dt><label for="meta_homepage">{L_HOMEPAGE}{L_COLON}</label></dt> +			<dd><p id="meta_homepage">{META_HOMEPAGE}</p></dd> +		</dl> +		<!-- ENDIF --> +		<!-- IF META_TIME --> +		<dl> +			<dt><label for="meta_time">{L_TIME}{L_COLON}</label></dt> +			<dd><p id="meta_time">{META_TIME}</p></dd> +		</dl> +		<!-- ENDIF --> +		<dl> +			<dt><label for="meta_license">{L_LICENCE}{L_COLON}</label></dt> +			<dd><p id="meta_license">{META_LICENCE}</p></dd> +		</dl> +	</fieldset> + +	<!-- IF META_REQUIRE_PHPBB || META_REQUIRE_PHP --> +	<fieldset> +		<legend>{L_REQUIREMENTS}</legend> +		<!-- IF META_REQUIRE_PHPBB --> +		<dl<!-- IF META_REQUIRE_PHPBB_FAIL --> class="requirements_not_met"<!-- ENDIF -->> +			<dt><label for="require_phpbb">{L_PHPBB_VERSION}{L_COLON}</label></dt> +			<dd><p id="require_phpbb">{META_REQUIRE_PHPBB}</p></dd> +		</dl> +		<!-- ENDIF --> +		<!-- IF META_REQUIRE_PHP --> +		<dl<!-- IF META_REQUIRE_PHP_FAIL --> class="requirements_not_met"<!-- ENDIF -->> +			<dt><label for="require_php">{L_PHP_VERSION}{L_COLON}</label></dt> +			<dd><p id="require_php">{META_REQUIRE_PHP}</p></dd> +		</dl> +		<!-- ENDIF --> +	</fieldset> +	<!-- ENDIF --> + +	<fieldset> +		<legend>{L_AUTHOR_INFORMATION}</legend> +		<!-- BEGIN meta_authors --> +		<fieldset> +			<dl> +				<dt><label for="meta_author_name">{L_AUTHOR_NAME}{L_COLON}</label></dt> +				<dd><strong id="meta_author_name">{meta_authors.AUTHOR_NAME}</strong></dd> +			</dl> +			<!-- IF meta_authors.AUTHOR_EMAIL --> +			<dl> +				<dt><label for="meta_author_email">{L_AUTHOR_EMAIL}{L_COLON}</label></dt> +				<dd><strong id="meta_author_email"><a href="mailto:{meta_authors.AUTHOR_EMAIL}">{meta_authors.AUTHOR_EMAIL}</a></strong></dd> +			</dl> +			<!-- ENDIF --> +			<!-- IF meta_authors.AUTHOR_HOMEPAGE --> +			<dl> +				<dt><label for="meta_author_url">{L_AUTHOR_HOMEPAGE}{L_COLON}</label></dt> +				<dd><strong id="meta_author_url"><a href="{meta_authors.AUTHOR_HOMEPAGE}">{meta_authors.AUTHOR_HOMEPAGE}</a></strong></dd> +			</dl> +			<!-- ENDIF --> +			<!-- IF meta_authors.AUTHOR_ROLE --> +			<dl> +				<dt><label for="author_role">{L_AUTHOR_ROLE}{L_COLON}</label></dt> +				<dd><strong id="meta_author_role">{meta_authors.AUTHOR_ROLE}</strong></dd> +			</dl> +			<!-- ENDIF --> +		</fieldset> +		<!-- END meta_authors --> +	</fieldset> + +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_ext_disable.html b/phpBB/adm/style/acp_ext_disable.html new file mode 100644 index 0000000000..4fa0893be7 --- /dev/null +++ b/phpBB/adm/style/acp_ext_disable.html @@ -0,0 +1,34 @@ +<!-- INCLUDE overall_header.html --> + +	<a name="maincontent"></a> + +	<h1>{L_EXTENSIONS_ADMIN}</h1> + +	<p>{L_EXTENSIONS_EXPLAIN}</p> +	<p>{L_EXTENSION_DISABLE_EXPLAIN}</p> + +	<!-- IF PRE --> +	<div class="errorbox"> +		<p>{L_CONFIRM_MESSAGE}</p> +	</div> + +	<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"> +			<p>{L_EXTENSION_DISABLE_IN_PROGRESS}</p> +		</div> +	<!-- ELSE --> +		<div class="successbox"> +			<p>{L_EXTENSION_DISABLE_SUCCESS}</p> +			<br /> +			<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p> +		</div> +	<!-- ENDIF --> + +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html new file mode 100644 index 0000000000..670904a2ce --- /dev/null +++ b/phpBB/adm/style/acp_ext_enable.html @@ -0,0 +1,40 @@ +<!-- INCLUDE overall_header.html --> + +	<a name="maincontent"></a> + +	<h1>{L_EXTENSIONS_ADMIN}</h1> + +	<p>{L_EXTENSIONS_EXPLAIN}</p> +	<p>{L_EXTENSION_ENABLE_EXPLAIN}</p> + +	<!-- IF MIGRATOR_ERROR --> +	<div class="errorbox"> +		<p><strong>{L_MIGRATION_EXCEPTION_ERROR}</strong></p> +		<p>{MIGRATOR_ERROR}</p> +		<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p> +	</div> +	<!-- ELSEIF PRE --> +	<div class="errorbox"> +		<p>{L_CONFIRM_MESSAGE}</p> +	</div> + +	<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"> +			<p>{L_EXTENSION_ENABLE_IN_PROGRESS}</p> +		</div> +	<!-- ELSE --> +		<div class="successbox"> +			<p>{L_EXTENSION_ENABLE_SUCCESS}</p> +			<br /> +			<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p> +		</div> +	<!-- ENDIF --> + +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html new file mode 100644 index 0000000000..8408ebe748 --- /dev/null +++ b/phpBB/adm/style/acp_ext_list.html @@ -0,0 +1,59 @@ +<!-- INCLUDE overall_header.html --> + +<a name="maincontent"></a> + +	<h1>{L_EXTENSIONS_ADMIN}</h1> + +	<p>{L_EXTENSIONS_EXPLAIN}</p> + +	<table class="table1"> +		<col class="row1" ><col class="row2" ><col class="row2" > +	<thead> +		<tr> +			<th>{L_EXTENSION_NAME}</th> +			<th>{L_EXTENSION_OPTIONS}</th> +			<th>{L_EXTENSION_ACTIONS}</th> +		</tr> +	</thead> +	<tbody> +		<!-- IF .enabled --> +		<tr> +			<td class="row3" colspan="3"><strong>{L_EXTENSIONS_ENABLED}</strong></td> +		</tr> +		<!-- BEGIN enabled --> +		<tr class="ext_enabled"> +			<td><strong>{enabled.META_DISPLAY_NAME}</strong></td> +			<td style="text-align: center;"><a href="{enabled.U_DETAILS}">{L_DETAILS}</a></td> +			<td style="text-align: center;"> +				<!-- BEGIN actions --> +					<a href="{enabled.actions.U_ACTION}"<!-- IF enabled.actions.L_ACTION_EXPLAIN --> title="{enabled.actions.L_ACTION_EXPLAIN}"<!-- ENDIF -->>{enabled.actions.L_ACTION}</a> +					<!-- IF not enabled.actions.S_LAST_ROW --> | <!-- ENDIF --> +				<!-- END actions --> +			</td> +		</tr> +		<!-- END enabled --> +		<!-- ENDIF --> + +		<!-- IF .disabled --> +		<tr> +			<td class="row3" colspan="3"><strong>{L_EXTENSIONS_DISABLED}</strong></td> +		</tr> +		<!-- BEGIN disabled --> +		<tr class="ext_disabled"> +			<td><strong>{disabled.META_DISPLAY_NAME}</strong></td> +			<td style="text-align: center;"> +				<!-- IF disabled.U_DETAILS --><a href="{disabled.U_DETAILS}">{L_DETAILS}</a><!-- ENDIF --> +			</td> +			<td style="text-align: center;"> +				<!-- BEGIN actions --> +					<a href="{disabled.actions.U_ACTION}"<!-- IF disabled.actions.L_ACTION_EXPLAIN --> title="{disabled.actions.L_ACTION_EXPLAIN}"<!-- ENDIF -->>{disabled.actions.L_ACTION}</a> +					<!-- IF not disabled.actions.S_LAST_ROW --> | <!-- ENDIF --> +				<!-- END actions --> +			</td> +		</tr> +		<!-- END disabled --> +		<!-- ENDIF --> +	</tbody> +	</table> + +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 8577c08860..e8b20007dc 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_EDIT_FORUM --> @@ -112,13 +112,13 @@  	<fieldset>  		<legend>{L_FORUM_SETTINGS}</legend>  	<dl> -		<dt><label for="forum_type">{L_FORUM_TYPE}:</label></dt> +		<dt><label for="forum_type">{L_FORUM_TYPE}{L_COLON}</label></dt>  		<dd><select id="forum_type" name="forum_type" onchange="display_options(this.options[this.selectedIndex].value);">{S_FORUM_TYPE_OPTIONS}</select></dd>  	</dl>  	<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->  	<div id="type_actions">  		<dl> -			<dt><label for="type_action">{L_DECIDE_MOVE_DELETE_CONTENT}:</label></dt> +			<dt><label for="type_action">{L_DECIDE_MOVE_DELETE_CONTENT}{L_COLON}</label></dt>  			<dd><label><input type="radio" class="radio" name="type_action" value="delete"<!-- IF not S_MOVE_FORUM_OPTIONS --> checked="checked" id="type_action"<!-- ENDIF --> /> {L_DELETE_ALL_POSTS}</label></dd>  			<!-- IF S_MOVE_FORUM_OPTIONS --><dd><label><input type="radio" class="radio" name="type_action" id="type_action" value="move" checked="checked" /> {L_MOVE_POSTS_TO}</label> <select name="to_forum_id">{S_MOVE_FORUM_OPTIONS}</select></dd><!-- ENDIF -->  		</dl> @@ -127,7 +127,7 @@  	<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS -->  	<div id="cat_to_link_actions">  		<dl> -			<dt><label for="action_subforums">{L_DECIDE_MOVE_DELETE_SUBFORUMS}:</label></dt> +			<dt><label for="action_subforums">{L_DECIDE_MOVE_DELETE_SUBFORUMS}{L_COLON}</label></dt>  			<!-- IF S_FORUMS_LIST -->  				<dd><label><input type="radio" class="radio" id="action_subforums" name="action_subforums" value="move" checked="checked" /> {L_MOVE_SUBFORUMS_TO}</label> <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>  			<!-- ELSE --> @@ -137,49 +137,49 @@  	</div>  	<!-- ENDIF -->  	<dl> -		<dt><label for="parent">{L_FORUM_PARENT}:</label></dt> +		<dt><label for="parent">{L_FORUM_PARENT}{L_COLON}</label></dt>  		<dd><select id="parent" name="forum_parent_id"><option value="0"<!-- IF not S_FORUM_PARENT_ID --> selected="selected"<!-- ENDIF -->>{L_NO_PARENT}</option>{S_PARENT_OPTIONS}</select></dd>  	</dl>  	<!-- IF S_CAN_COPY_PERMISSIONS -->  		<dl> -			<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt> +			<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}{L_COLON}</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>  	<!-- ENDIF -->  	<dl> -		<dt><label for="forum_name">{L_FORUM_NAME}:</label></dt> +		<dt><label for="forum_name">{L_FORUM_NAME}{L_COLON}</label></dt>  		<dd><input class="text medium" type="text" id="forum_name" name="forum_name" value="{FORUM_NAME}" maxlength="255" /></dd>  	</dl>  	<dl> -		<dt><label for="forum_desc">{L_FORUM_DESC}:</label><br /><span>{L_FORUM_DESC_EXPLAIN}</span></dt> -		<dd><textarea id="forum_desc" name="forum_desc" rows="5" cols="45">{FORUM_DESC}</textarea></dd> +		<dt><label for="forum_desc">{L_FORUM_DESC}{L_COLON}</label><br /><span>{L_FORUM_DESC_EXPLAIN}</span></dt> +		<dd><textarea id="forum_desc" name="forum_desc" rows="5" cols="45" data-bbcode="true">{FORUM_DESC}</textarea></dd>  		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>  			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>  			<label><input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>  	</dl>  	<dl> -		<dt><label for="forum_image">{L_FORUM_IMAGE}:</label><br /><span>{L_FORUM_IMAGE_EXPLAIN}</span></dt> +		<dt><label for="forum_image">{L_FORUM_IMAGE}{L_COLON}</label><br /><span>{L_FORUM_IMAGE_EXPLAIN}</span></dt>  		<dd><input class="text medium" type="text" id="forum_image" name="forum_image" value="{FORUM_IMAGE}" maxlength="255" /></dd>  		<!-- IF FORUM_IMAGE_SRC -->  			<dd><img src="{FORUM_IMAGE_SRC}" alt="{L_FORUM_IMAGE}" /></dd>  		<!-- ENDIF -->  	</dl>  	<dl> -		<dt><label for="forum_password">{L_FORUM_PASSWORD}:</label><br /><span>{L_FORUM_PASSWORD_EXPLAIN}</span></dt> +		<dt><label for="forum_password">{L_FORUM_PASSWORD}{L_COLON}</label><br /><span>{L_FORUM_PASSWORD_EXPLAIN}</span></dt>  		<dd><input type="password" id="forum_password" name="forum_password" value="<!-- IF S_FORUM_PASSWORD_SET -->      <!-- ENDIF -->" autocomplete="off" /></dd>  	</dl>  	<dl> -		<dt><label for="forum_password_confirm">{L_FORUM_PASSWORD_CONFIRM}:</label><br /><span>{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}</span></dt> +		<dt><label for="forum_password_confirm">{L_FORUM_PASSWORD_CONFIRM}{L_COLON}</label><br /><span>{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}</span></dt>  		<dd><input type="password" id="forum_password_confirm" name="forum_password_confirm" value="<!-- IF S_FORUM_PASSWORD_SET -->      <!-- ENDIF -->" autocomplete="off" /></dd>  	</dl>  	<!-- IF S_FORUM_PASSWORD_SET -->  	<dl> -		<dt><label for="forum_password_unset">{L_FORUM_PASSWORD_UNSET}:</label><br /><span>{L_FORUM_PASSWORD_UNSET_EXPLAIN}</span></dt> +		<dt><label for="forum_password_unset">{L_FORUM_PASSWORD_UNSET}{L_COLON}</label><br /><span>{L_FORUM_PASSWORD_UNSET_EXPLAIN}</span></dt>  		<dd><input id="forum_password_unset" name="forum_password_unset" type="checkbox" /></dd>  	</dl>  	<!-- ENDIF -->  	<dl> -		<dt><label for="forum_style">{L_FORUM_STYLE}:</label></dt> +		<dt><label for="forum_style">{L_FORUM_STYLE}{L_COLON}</label></dt>  		<dd><select id="forum_style" name="forum_style"><option value="0">{L_DEFAULT_STYLE}</option>{S_STYLES_OPTIONS}</select></dd>  	</dl>  	</fieldset> @@ -188,7 +188,7 @@  		<fieldset>  			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>  		<dl> -			<dt><label for="display_active">{L_DISPLAY_ACTIVE_TOPICS}:</label><br /><span>{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}</span></dt> +			<dt><label for="display_active">{L_DISPLAY_ACTIVE_TOPICS}{L_COLON}</label><br /><span>{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" name="display_active" value="1"<!-- IF S_ENABLE_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="display_active" value="0"<!-- IF not S_ENABLE_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl> @@ -199,81 +199,82 @@  		<fieldset>  			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>  		<dl> -			<dt><label for="forum_status">{L_FORUM_STATUS}:</label></dt> +			<dt><label for="forum_status">{L_FORUM_STATUS}{L_COLON}</label></dt>  			<dd><select id="forum_status" name="forum_status">{S_STATUS_OPTIONS}</select></dd>  		</dl>  		<dl> -			<dt><label for="display_subforum_list">{L_LIST_SUBFORUMS}:</label><br /><span>{L_LIST_SUBFORUMS_EXPLAIN}</span></dt> +			<dt><label for="display_subforum_list">{L_LIST_SUBFORUMS}{L_COLON}</label><br /><span>{L_LIST_SUBFORUMS_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" name="display_subforum_list" value="1"<!-- IF S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="display_subforum_list" value="0"<!-- IF not S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl>  		<dl> -			<dt><label for="display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt> +			<dt><label for="display_on_index">{L_LIST_INDEX}{L_COLON}</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" name="display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl>  		<dl> -			<dt><label for="enable_post_review">{L_ENABLE_POST_REVIEW}:</label><br /><span>{L_ENABLE_POST_REVIEW_EXPLAIN}</span></dt> +			<dt><label for="enable_post_review">{L_ENABLE_POST_REVIEW}{L_COLON}</label><br /><span>{L_ENABLE_POST_REVIEW_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" name="enable_post_review" value="1"<!-- IF S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="enable_post_review" value="0"<!-- IF not S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl>  		<dl> -			<dt><label for="enable_quick_reply">{L_ENABLE_QUICK_REPLY}:</label><br /><span>{L_ENABLE_QUICK_REPLY_EXPLAIN}</span></dt> +			<dt><label for="enable_quick_reply">{L_ENABLE_QUICK_REPLY}{L_COLON}</label><br /><span>{L_ENABLE_QUICK_REPLY_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" name="enable_quick_reply" value="1"<!-- IF S_ENABLE_QUICK_REPLY --> id="enable_quick_reply" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="enable_quick_reply" value="0"<!-- IF not S_ENABLE_QUICK_REPLY --> id="enable_quick_reply" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl>  		<dl> -			<dt><label for="enable_indexing">{L_ENABLE_INDEXING}:</label><br /><span>{L_ENABLE_INDEXING_EXPLAIN}</span></dt> +			<dt><label for="enable_indexing">{L_ENABLE_INDEXING}{L_COLON}</label><br /><span>{L_ENABLE_INDEXING_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" name="enable_indexing" value="1"<!-- IF S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="enable_indexing" value="0"<!-- IF not S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl>  		<dl> -			<dt><label for="enable_icons">{L_ENABLE_TOPIC_ICONS}:</label></dt> +			<dt><label for="enable_icons">{L_ENABLE_TOPIC_ICONS}{L_COLON}</label></dt>  			<dd><label><input type="radio" class="radio" name="enable_icons" value="1"<!-- IF S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="enable_icons" value="0"<!-- IF not S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl>  		<dl> -			<dt><label for="display_recent">{L_ENABLE_RECENT}:</label><br /><span>{L_ENABLE_RECENT_EXPLAIN}</span></dt> +			<dt><label for="display_recent">{L_ENABLE_RECENT}{L_COLON}</label><br /><span>{L_ENABLE_RECENT_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" name="display_recent" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="display_recent" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl>  		<dl> -			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}:</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt> -			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd> +			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}{L_COLON}</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt> +			<dd><input type="number" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" min="0" max="9999" /></dd>  		</dl> +		<!-- EVENT acp_forums_normal_settings_append -->  		</fieldset>  		<fieldset>  			<legend>{L_FORUM_PRUNE_SETTINGS}</legend>  		<dl> -			<dt><label for="enable_prune">{L_FORUM_AUTO_PRUNE}:</label><br /><span>{L_FORUM_AUTO_PRUNE_EXPLAIN}</span></dt> +			<dt><label for="enable_prune">{L_FORUM_AUTO_PRUNE}{L_COLON}</label><br /><span>{L_FORUM_AUTO_PRUNE_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" name="enable_prune" value="1"<!-- IF S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="enable_prune" value="0"<!-- IF not S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl>  		<dl> -			<dt><label for="prune_freq">{L_AUTO_PRUNE_FREQ}:</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt> -			<dd><input type="text" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" /> {L_DAYS}</dd> +			<dt><label for="prune_freq">{L_AUTO_PRUNE_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt> +			<dd><input type="number" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>  		</dl>  		<dl> -			<dt><label for="prune_days">{L_AUTO_PRUNE_DAYS}:</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt> -			<dd><input type="text" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" maxlength="4" size="4" /> {L_DAYS}</dd> +			<dt><label for="prune_days">{L_AUTO_PRUNE_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt> +			<dd><input type="number" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>  		</dl>  		<dl> -			<dt><label for="prune_viewed">{L_AUTO_PRUNE_VIEWED}:</label><br /><span>{L_AUTO_PRUNE_VIEWED_EXPLAIN}</span></dt> -			<dd><input type="text" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" maxlength="4" size="4" /> {L_DAYS}</dd> +			<dt><label for="prune_viewed">{L_AUTO_PRUNE_VIEWED}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_VIEWED_EXPLAIN}</span></dt> +			<dd><input type="number" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>  		</dl>  		<dl> -			<dt><label for="prune_old_polls">{L_PRUNE_OLD_POLLS}:</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt> +			<dt><label for="prune_old_polls">{L_PRUNE_OLD_POLLS}{L_COLON}</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" name="prune_old_polls" value="1"<!-- IF S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="prune_old_polls" value="0"<!-- IF not S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl>  		<dl> -			<dt><label for="prune_announce">{L_PRUNE_ANNOUNCEMENTS}:</label></dt> +			<dt><label for="prune_announce">{L_PRUNE_ANNOUNCEMENTS}{L_COLON}</label></dt>  			<dd><label><input type="radio" class="radio" name="prune_announce" value="1"<!-- IF S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="prune_announce" value="0"<!-- IF not S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl>  		<dl> -			<dt><label for="prune_sticky">{L_PRUNE_STICKY}:</label></dt> +			<dt><label for="prune_sticky">{L_PRUNE_STICKY}{L_COLON}</label></dt>  			<dd><label><input type="radio" class="radio" name="prune_sticky" value="1"<!-- IF S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="prune_sticky" value="0"<!-- IF not S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl> @@ -284,16 +285,16 @@  		<fieldset>  			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>  		<dl> -			<dt><label for="link_display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt> +			<dt><label for="link_display_on_index">{L_LIST_INDEX}{L_COLON}</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" name="link_display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="link_display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl>  		<dl> -			<dt><label for="forum_link">{L_FORUM_LINK}:</label><br /><span>{L_FORUM_LINK_EXPLAIN}</span></dt> +			<dt><label for="forum_link">{L_FORUM_LINK}{L_COLON}</label><br /><span>{L_FORUM_LINK_EXPLAIN}</span></dt>  			<dd><input class="text medium" type="text" id="forum_link" name="forum_link" value="{FORUM_DATA_LINK}" maxlength="255" /></dd>  		</dl>  		<dl> -			<dt><label for="forum_link_track">{L_FORUM_LINK_TRACK}:</label><br /><span>{L_FORUM_LINK_TRACK_EXPLAIN}</span></dt> +			<dt><label for="forum_link_track">{L_FORUM_LINK_TRACK}{L_COLON}</label><br /><span>{L_FORUM_LINK_TRACK_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" name="forum_link_track" value="1"<!-- IF S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="forum_link_track" value="0"<!-- IF not S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl> @@ -304,18 +305,18 @@  		<fieldset>  			<legend>{L_FORUM_RULES}</legend>  		<dl> -			<dt><label for="forum_rules_link">{L_FORUM_RULES_LINK}:</label><br /><span>{L_FORUM_RULES_LINK_EXPLAIN}</span></dt> +			<dt><label for="forum_rules_link">{L_FORUM_RULES_LINK}{L_COLON}</label><br /><span>{L_FORUM_RULES_LINK_EXPLAIN}</span></dt>  			<dd><input class="text medium" type="text" id="forum_rules_link" name="forum_rules_link" value="{FORUM_RULES_LINK}" maxlength="255" /></dd>  		</dl>  	<!-- IF FORUM_RULES_PREVIEW -->  		<dl> -			<dt><label>{L_FORUM_RULES_PREVIEW}:</label></dt> +			<dt><label>{L_FORUM_RULES_PREVIEW}{L_COLON}</label></dt>  			<dd>{FORUM_RULES_PREVIEW}</dd>  		</dl>  	<!-- ENDIF -->  		<dl> -			<dt><label for="forum_rules">{L_FORUM_RULES}:</label><br /><span>{L_FORUM_RULES_EXPLAIN}</span></dt> -			<dd><textarea id="forum_rules" name="forum_rules" rows="4" cols="70">{FORUM_RULES_PLAIN}</textarea></dd> +			<dt><label for="forum_rules">{L_FORUM_RULES}{L_COLON}</label><br /><span>{L_FORUM_RULES_EXPLAIN}</span></dt> +			<dd><textarea id="forum_rules" name="forum_rules" rows="4" cols="70" data-bbcode="true">{FORUM_RULES_PLAIN}</textarea></dd>  			<dd><label><input type="checkbox" class="radio" name="rules_parse_bbcode"<!-- IF S_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>  				<label><input type="checkbox" class="radio" name="rules_parse_smilies"<!-- IF S_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>  				<label><input type="checkbox" class="radio" name="rules_parse_urls"<!-- IF S_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd> @@ -351,12 +352,12 @@  	<fieldset>  		<legend>{L_FORUM_DELETE}</legend>  	<dl> -		<dt><label>{L_FORUM_NAME}:</label></dt> +		<dt><label>{L_FORUM_NAME}{L_COLON}</label></dt>  		<dd><strong>{FORUM_NAME}</strong></dd>  	</dl>  	<!-- IF S_FORUM_POST -->  		<dl> -			<dt><label for="delete_action">{L_ACTION}:</label></dt> +			<dt><label for="delete_action">{L_ACTION}{L_COLON}</label></dt>  			<dd><label><input type="radio" class="radio" id="delete_action" name="action_posts" value="delete" checked="checked" /> {L_DELETE_ALL_POSTS}</label></dd>  			<!-- IF S_MOVE_FORUM_OPTIONS -->  				<dd><label><input type="radio" class="radio" name="action_posts" value="move" /> {L_MOVE_POSTS_TO}</label> <select name="posts_to_id">{S_MOVE_FORUM_OPTIONS}</select></dd> @@ -365,7 +366,7 @@  	<!-- ENDIF -->  	<!-- IF S_HAS_SUBFORUMS -->  		<dl> -			<dt><label for="sub_delete_action">{L_ACTION}:</label></dt> +			<dt><label for="sub_delete_action">{L_ACTION}{L_COLON}</label></dt>  			<dd><label><input type="radio" class="radio" id="sub_delete_action" name="action_subforums" value="delete" checked="checked" /> {L_DELETE_SUBFORUMS}</label></dd>  			<!-- IF S_FORUMS_LIST -->  				<dd><label><input type="radio" class="radio" name="action_subforums" value="move" /> {L_MOVE_SUBFORUMS_TO}</label> <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd> @@ -436,35 +437,26 @@  		</div>  	<!-- ENDIF --> -	<p><strong>{NAVIGATION}<!-- IF S_NO_FORUMS --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a><!-- IF not S_LINK --> | <a href="{U_SYNC}">{L_RESYNC}</a><!-- ENDIF --->]<!-- ENDIF --></strong></p> +	<p><strong>{NAVIGATION}<!-- IF S_NO_FORUMS --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a><!-- IF not S_LINK --> | <a href="{U_SYNC}">{L_RESYNC}</a><!-- ENDIF -->]<!-- ENDIF --></strong></p>  	<!-- IF .forums --> -		<table cellspacing="1"> +		<table class="table1 forums">  			<col class="row1" /><col class="row1" /><col class="row2" />  		<tbody>  		<!-- BEGIN forums -->  			<tr> -				<td style="width: 5%; text-align: center;">{forums.FOLDER_IMAGE}</td> -				<td> +				<td class="folder">{forums.FOLDER_IMAGE}</td> +				<td class="forum-desc">  					<!-- IF forums.FORUM_IMAGE --><div style="float: {S_CONTENT_FLOW_BEGIN}; margin-right: 5px;">{forums.FORUM_IMAGE}</div><!-- ENDIF -->  					<strong><!-- IF forums.S_FORUM_LINK -->{forums.FORUM_NAME}<!-- ELSE --><a href="{forums.U_FORUM}">{forums.FORUM_NAME}</a><!-- ENDIF --></strong>  					<!-- IF forums.FORUM_DESCRIPTION --><br /><span>{forums.FORUM_DESCRIPTION}</span><!-- ENDIF --> -					<!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}: <strong>{forums.FORUM_TOPICS}</strong> / {L_POSTS}: <strong>{forums.FORUM_POSTS}</strong></span><!-- ENDIF --> +					<!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}{L_COLON} <strong>{forums.FORUM_TOPICS}</strong> / {L_POSTS}{L_COLON} <strong>{forums.FORUM_POSTS}</strong></span><!-- ENDIF -->  				</td> -				<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;"> -					<!-- IF forums.S_FIRST_ROW && not forums.S_LAST_ROW --> -						{ICON_MOVE_UP_DISABLED} -						<a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> -					<!-- ELSEIF not forums.S_FIRST_ROW && not forums.S_LAST_ROW --> -						<a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a> -						<a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> -					<!-- ELSEIF forums.S_LAST_ROW && not forums.S_FIRST_ROW --> -						<a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a> -						{ICON_MOVE_DOWN_DISABLED} -					<!-- ELSE --> -						{ICON_MOVE_UP_DISABLED} -						{ICON_MOVE_DOWN_DISABLED} -					<!-- ENDIF --> +				<td class="actions"> +					<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span> +					<span class="up"><a href="{forums.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span> +					<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span> +					<span class="down"><a href="{forums.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>  					<a href="{forums.U_EDIT}">{ICON_EDIT}</a>  					<!-- IF not forums.S_FORUM_LINK -->  						<a href="{forums.U_SYNC}" onclick="popup_progress_bar();">{ICON_SYNC}</a> @@ -482,7 +474,7 @@  	<form id="fselect" method="post" action="{U_SEL_ACTION}">  	<fieldset class="quick"> -		{L_SELECT_FORUM}: <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{FORUM_BOX}</select> +		{L_SELECT_FORUM}{L_COLON} <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{FORUM_BOX}</select>  		<input class="button2" type="submit" value="{L_GO}" />  		{S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_forums_copy_perm.html b/phpBB/adm/style/acp_forums_copy_perm.html index acec3c1967..1fcf2f62a4 100644 --- a/phpBB/adm/style/acp_forums_copy_perm.html +++ b/phpBB/adm/style/acp_forums_copy_perm.html @@ -9,7 +9,7 @@  <fieldset>  	<dl> -		<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt> +		<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}{L_COLON}</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} diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index 07f7d072e8..925d24f3a3 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_EDIT --> @@ -17,16 +17,16 @@  		</div>  	<!-- ENDIF --> -	<form id="settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->> +	<form id="settings" method="post" action="{U_ACTION}" enctype="multipart/form-data">  	<fieldset>  		<legend>{L_GROUP_DETAILS}</legend>  	<dl> -		<dt><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}:</label></dt> +		<dt><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}{L_COLON}</label></dt>  		<dd><!-- IF S_SPECIAL_GROUP --><strong>{GROUP_NAME}</strong><!-- ENDIF --><input name="group_name" type="<!-- IF S_SPECIAL_GROUP -->hidden<!-- ELSE -->text<!-- ENDIF -->" id="group_name" value="{GROUP_INTERNAL_NAME}" /></dd>  	</dl>  	<dl> -		<dt><label for="group_desc">{L_GROUP_DESC}:</label></dt> +		<dt><label for="group_desc">{L_GROUP_DESC}{L_COLON}</label></dt>  		<dd><textarea id="group_desc" name="group_desc" rows="5" cols="45">{GROUP_DESC}</textarea></dd>  		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>  			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label> @@ -34,7 +34,7 @@  	</dl>  	<!-- IF not S_SPECIAL_GROUP -->  		<dl> -			<dt><label for="group_type">{L_GROUP_TYPE}:</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt> +			<dt><label for="group_type">{L_GROUP_TYPE}{L_COLON}</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>  			<dd>  				<label><input name="group_type" type="radio" class="radio" id="group_type" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN}</label>  				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST}</label> @@ -48,7 +48,7 @@  	<!-- IF S_ADD_GROUP and S_GROUP_PERM -->  		<dl> -			<dt><label for="group_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt> +			<dt><label for="group_perm_from">{L_COPY_PERMISSIONS}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>  			<dd><select id="group_perm_from" name="group_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_GROUP_OPTIONS}</select></dd>  		</dl>  	<!-- ENDIF --> @@ -58,20 +58,24 @@  		<legend>{L_GROUP_OPTIONS_SAVE}</legend>  	<!-- IF S_USER_FOUNDER -->  	<dl> -		<dt><label for="group_founder_manage">{L_GROUP_FOUNDER_MANAGE}:</label><br /><span>{L_GROUP_FOUNDER_MANAGE_EXPLAIN}</span></dt> +		<dt><label for="group_founder_manage">{L_GROUP_FOUNDER_MANAGE}{L_COLON}</label><br /><span>{L_GROUP_FOUNDER_MANAGE_EXPLAIN}</span></dt>  		<dd><input name="group_founder_manage" type="checkbox" value="1" class="radio" id="group_founder_manage"{GROUP_FOUNDER_MANAGE} /></dd>  	</dl>  	<!-- ENDIF -->  	<dl> -		<dt><label for="group_skip_auth">{L_GROUP_SKIP_AUTH}:</label><br /><span>{L_GROUP_SKIP_AUTH_EXPLAIN}</span></dt> +		<dt><label for="group_skip_auth">{L_GROUP_SKIP_AUTH}{L_COLON}</label><br /><span>{L_GROUP_SKIP_AUTH_EXPLAIN}</span></dt>  		<dd><input name="group_skip_auth" type="checkbox" value="1" class="radio" id="group_skip_auth"{GROUP_SKIP_AUTH} /></dd>  	</dl>  	<dl> -		<dt><label for="group_legend">{L_GROUP_LEGEND}:</label></dt> +		<dt><label for="group_legend">{L_GROUP_LEGEND}{L_COLON}</label></dt>  		<dd><input name="group_legend" type="checkbox" value="1" class="radio" id="group_legend"{GROUP_LEGEND} /></dd>  	</dl>  	<dl> -		<dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}:</label><br /><span>{L_GROUP_RECEIVE_PM_EXPLAIN}</span></dt> +		<dt><label for="group_teampage">{L_GROUP_TEAMPAGE}{L_COLON}</label></dt> +		<dd><input name="group_teampage" type="checkbox" value="1" class="radio" id="group_teampage"{GROUP_TEAMPAGE} /></dd> +	</dl> +	<dl> +		<dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}{L_COLON}</label><br /><span>{L_GROUP_RECEIVE_PM_EXPLAIN}</span></dt>  		<dd><input name="group_receive_pm" type="checkbox" value="1" class="radio" id="group_receive_pm"{GROUP_RECEIVE_PM} /></dd>  	</dl>  	</fieldset> @@ -79,19 +83,24 @@  	<fieldset>  		<legend>{L_GROUP_SETTINGS_SAVE}</legend>  	<dl> -		<dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}:</label><br /><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt> -		<dd><input name="group_message_limit" type="text" id="group_message_limit" maxlength="4" size="4" value="{GROUP_MESSAGE_LIMIT}" /></dd> +		<dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}{L_COLON}</label><br /><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt> +		<dd><input name="group_message_limit" type="number" id="group_message_limit" maxlength="4" size="4" min="0" max="9999" value="{GROUP_MESSAGE_LIMIT}" /></dd>  	</dl>  	<dl> -		<dt><label for="group_max_recipients">{L_GROUP_MAX_RECIPIENTS}:</label><br /><span>{L_GROUP_MAX_RECIPIENTS_EXPLAIN}</span></dt> -		<dd><input name="group_max_recipients" type="text" id="group_max_recipients" maxlength="10" size="4" value="{GROUP_MAX_RECIPIENTS}" /></dd> +		<dt><label for="group_max_recipients">{L_GROUP_MAX_RECIPIENTS}{L_COLON}</label><br /><span>{L_GROUP_MAX_RECIPIENTS_EXPLAIN}</span></dt> +		<dd><input name="group_max_recipients" type="number" id="group_max_recipients" maxlength="10" size="4" value="{GROUP_MAX_RECIPIENTS}" /></dd>  	</dl>  	<dl> -		<dt><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt> -		<dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" /><!-- IF GROUP_COLOUR --> <span style="background-color: #{GROUP_COLOUR}">   </span><!-- ENDIF -->  <span>[ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd> +		<dt><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt> +		<dd> +			<input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" /> +			<!-- IF GROUP_COLOUR --> <span style="background-color: #{GROUP_COLOUR}">   </span><!-- ENDIF -->  <span> +			[ <a href="#" id="color_palette_toggle">{L_COLOUR_SWATCH}</a> ]</span> +			<div id="color_palette_placeholder" style="display: none;" data-orientation="h" data-height="12" data-width="15" data-target="#group_colour"></div> +		</dd>  	</dl>  	<dl> -		<dt><label for="group_rank">{L_GROUP_RANK}:</label></dt> +		<dt><label for="group_rank">{L_GROUP_RANK}{L_COLON}</label></dt>  		<dd><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></dd>  	</dl>  	</fieldset> @@ -99,67 +108,27 @@  	<fieldset>  		<legend>{L_GROUP_AVATAR}</legend>  	<dl> -		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt> -		<dd>{AVATAR_IMAGE}</dd> -		<dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd> +		<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt> +		<dd>{AVATAR}</dd> +		<dd><label for="avatar_delete"><input type="checkbox" name="avatar_delete" id="avatar_delete" /> {L_DELETE_AVATAR}</label></dd>  	</dl> -	<!-- IF not S_IN_AVATAR_GALLERY --> -		<!-- IF S_CAN_UPLOAD --> -			<dl> -				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt> -				<dd><input type="file" id="uploadfile" name="uploadfile" /></dd> -			</dl> -			<dl> -				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt> -				<dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd> -			</dl> -		<!-- ENDIF --> -		<dl> -			<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt> -			<dd><input name="remotelink" type="text" id="remotelink" value="" /></dd> -		</dl> -		<dl> -			<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt> -			<dd><input name="width" type="text" id="width" size="3" value="{AVATAR_WIDTH}" /> <span>{L_PIXEL} × </span> <input type="text" name="height" size="3" value="{AVATAR_HEIGHT}" /> <span>{L_PIXEL}</span></dd> -		</dl> -		<!-- IF S_DISPLAY_GALLERY --> -			<dl> -				<dt><label>{L_AVATAR_GALLERY}:</label></dt> -				<dd><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></dd> -			</dl> -		<!-- ENDIF --> -	<!-- ELSE --> -		</fieldset> - -		<fieldset> -			<legend>{L_AVATAR_GALLERY}</legend> -		<dl> -			<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt> -			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd> -		</dl> -		<dl> -			<table cellspacing="1"> -			<!-- BEGIN avatar_row --> -			<tr> -				<!-- BEGIN avatar_column --> -					<td class="row1" style="text-align: center;"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td> -				<!-- END avatar_column --> -			</tr> -			<tr> -				<!-- BEGIN avatar_option_column --> -					<td class="row2" style="text-align: center;"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td> -				<!-- END avatar_option_column --> -			</tr> -			<!-- END avatar_row --> -			</table> -		</dl> -		</fieldset> - -		<fieldset class="quick" style="margin-top: -15px;"> -			<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" /> -		</fieldset> - -	<!-- ENDIF --> +	<dl> +		<dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt> +		<dd><select name="avatar_driver" id="avatar_driver"> +			<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> +			<!-- END avatar_drivers --> +		</select></dd> +	</dl> +	<div id="avatar_options"> +	<!-- BEGIN avatar_drivers --> +	<div id="avatar_option_{avatar_drivers.DRIVER}"> +		<p>{avatar_drivers.L_EXPLAIN}</p> +		{avatar_drivers.OUTPUT} +	</div> +	<!-- END avatar_drivers --> +	</div>  	</fieldset>  	<fieldset class="submit-buttons"> @@ -170,6 +139,8 @@  	</fieldset>  	</form> +	<!-- INCLUDEJS avatars.js --> +  <!-- ELSEIF S_LIST -->  	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> @@ -184,7 +155,7 @@  		<a href="{U_DEFAULT_ALL}">» {L_MAKE_DEFAULT_FOR_ALL}</a>  	</fieldset> -	<table cellspacing="1"> +	<table class="table1">  	<thead>  	<tr>  		<th>{L_USERNAME}</th> @@ -235,11 +206,11 @@  	<!-- END member -->  	</tbody>  	</table> -	<!-- IF PAGINATION -->  	<div class="pagination"> -			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> -	</div> +	<!-- IF .pagination --> +		<!-- INCLUDE pagination.html -->  	<!-- ENDIF --> +	</div>  	<fieldset class="quick">  		<select name="action"><option class="sep" value="">{L_SELECT_OPTION}</option>{S_ACTION_OPTIONS}</select> @@ -254,17 +225,17 @@  	<fieldset>  		<legend>{L_ADD_USERS}</legend>  	<dl> -		<dt><label for="leader">{L_USER_GROUP_LEADER}:</label></dt> +		<dt><label for="leader">{L_USER_GROUP_LEADER}{L_COLON}</label></dt>  		<dd><label><input name="leader" type="radio" class="radio" value="1" /> {L_YES}</label>  			<label><input name="leader" type="radio" class="radio" id="leader" value="0" checked="checked" /> {L_NO}</label></dd>  	</dl>  	<dl> -		<dt><label for="default">{L_USER_GROUP_DEFAULT}:</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt> +		<dt><label for="default">{L_USER_GROUP_DEFAULT}{L_COLON}</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt>  		<dd><label><input name="default" type="radio" class="radio" value="1" /> {L_YES}</label>  			<label><input name="default" type="radio" class="radio" id="default" value="0" checked="checked" /> {L_NO}</label></dd>  	</dl>  	<dl> -		<dt><label for="usernames">{L_USERNAME}:</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt> +		<dt><label for="usernames">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>  		<dd><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea></dd>  		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>  	</dl> @@ -295,7 +266,7 @@  	<form id="acp_groups" method="post" action="{U_ACTION}"> -	<table cellspacing="1"> +	<table class="table1">  		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />  	<thead>  	<tr> @@ -318,7 +289,7 @@  	<fieldset class="quick">  		<!-- IF S_GROUP_ADD --> -			{L_CREATE_GROUP}: <input type="text" name="group_name" value="" /> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" /> +			{L_CREATE_GROUP}{L_COLON} <input type="text" name="group_name" value="" /> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />  			<input type="hidden" name="add" value="1" />  		<!-- ENDIF -->  		{S_FORM_TOKEN} @@ -329,7 +300,7 @@  	<p>{L_SPECIAL_GROUPS_EXPLAIN}</p> -	<table cellspacing="1"> +	<table class="table1">  		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />  	<thead>  	<tr> @@ -346,7 +317,7 @@  			<td style="text-align: center;">{groups.TOTAL_MEMBERS}</td>  			<td style="text-align: center;"><a href="{groups.U_EDIT}">{L_SETTINGS}</a></td>  			<td style="text-align: center;"><a href="{groups.U_LIST}">{L_MEMBERS}</a></td> -			<td style="text-align: center;"><!-- IF not groups.S_GROUP_SPECIAL and groups.U_DELETE --><a href="{groups.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td> +			<td style="text-align: center;"><!-- IF not groups.S_GROUP_SPECIAL and groups.U_DELETE --><a href="{groups.U_DELETE}" data-ajax="row_delete">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>  		</tr>  		<!-- ENDIF -->  	<!-- END groups --> diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html new file mode 100644 index 0000000000..b1df6b6162 --- /dev/null +++ b/phpBB/adm/style/acp_groups_position.html @@ -0,0 +1,171 @@ +<!-- INCLUDE overall_header.html --> + +<a id="maincontent"></a> + +	<h1>{L_MANAGE_LEGEND}</h1> + +	<form id="legend_settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->> + +	<fieldset> +		<legend>{L_LEGEND_SETTINGS}</legend> +		<dl> +			<dt><label for="legend_sort_groupname">{L_LEGEND_SORT_GROUPNAME}{L_COLON}</label><br /><span>{L_LEGEND_SORT_GROUPNAME_EXPLAIN}</span></dt> +			<dd> +				<label><input type="radio" name="legend_sort_groupname" class="radio" value="1"<!-- IF LEGEND_SORT_GROUPNAME --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> +				<label><input type="radio" name="legend_sort_groupname" class="radio" value="0"<!-- IF not LEGEND_SORT_GROUPNAME --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> +			</dd> +		</dl> + +	<p class="submit-buttons"> +		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />  +		<input class="button2" type="reset" name="reset" value="{L_RESET}" /> +		<input type="hidden" name="action" value="set_config_legend" /> +		{S_FORM_TOKEN} +	</p> +	</fieldset> +	</form> + +	<p>{L_LEGEND_EXPLAIN}</p> + +	<table class="table1"> +		<col class="col1" /><col class="col2" /><col class="col2" /> +	<thead> +	<tr> +		<th style="width: 50%">{L_GROUP}</th> +		<th>{L_GROUP_TYPE}</th> +		<th>{L_ACTION}</th> +	</tr> +	</thead> +	<tbody> +	<!-- BEGIN legend --> +		<tr> +			<td><strong<!-- IF legend.GROUP_COLOUR --> style="color: {legend.GROUP_COLOUR}"<!-- ENDIF -->>{legend.GROUP_NAME}</strong></td> +			<td style="text-align: center;">{legend.GROUP_TYPE}</td> +			<td class="actions"> +				<span class="up-disabled" style="display: none;">{ICON_MOVE_UP_DISABLED}</span> +				<span class="up"><a href="{legend.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span> +				<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span> +				<span class="down"><a href="{legend.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span> +				<a href="{legend.U_DELETE}">{ICON_DELETE}</a> +			</td> +		</tr> +	<!-- BEGINELSE --> +		<tr> +			<td colspan="3" class="row3">{L_NO_GROUPS_ADDED}</td> +		</tr> +	<!-- END legend --> +	</tbody> +	</table> + +	<form id="legend_add_group" method="post" action="{U_ACTION_LEGEND}"> +		<fieldset class="quick"> +			<select name="g"> +				<option value="0">{L_SELECT_GROUP}</option> +				<!-- BEGIN add_legend --> +					<option<!-- IF add_legend.GROUP_SPECIAL --> class="sep"<!-- ENDIF --> value="{add_legend.GROUP_ID}">{add_legend.GROUP_NAME}</option> +				<!-- END add_legend --> +			</select> +			<input class="button2" type="submit" name="submit" value="{L_ADD}" /> +			<input type="hidden" name="action" value="add" /> +			{S_FORM_TOKEN} +		</fieldset> +	</form> + +	<h1>{L_MANAGE_TEAMPAGE}</h1> + +	<form id="teampage_settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->> + +	<fieldset> +		<legend>{L_TEAMPAGE_SETTINGS}</legend> +		<dl> +			<dt><label for="teampage_memberships">{L_TEAMPAGE_MEMBERSHIPS}{L_COLON}</label></dt> +			<dd> +				<label><input type="radio" name="teampage_memberships" class="radio" value="0"<!-- IF DISPLAY_MEMBERSHIPS == 0 --> checked="checked"<!-- ENDIF --> /> {L_TEAMPAGE_DISP_FIRST}</label><br /> +				<label><input type="radio" name="teampage_memberships" class="radio" value="1"<!-- IF DISPLAY_MEMBERSHIPS == 1 --> checked="checked"<!-- ENDIF --> /> {L_TEAMPAGE_DISP_DEFAULT}</label><br /> +				<label><input type="radio" name="teampage_memberships" class="radio" value="2"<!-- IF DISPLAY_MEMBERSHIPS == 2 --> checked="checked"<!-- ENDIF --> /> {L_TEAMPAGE_DISP_ALL}</label> +			</dd> +		</dl> +		<dl> +			<dt><label for="teampage_forums">{L_TEAMPAGE_FORUMS}{L_COLON}</label><br /><span>{L_TEAMPAGE_FORUMS_EXPLAIN}</span></dt> +			<dd> +				<label><input type="radio" name="teampage_forums" class="radio" value="1"<!-- IF DISPLAY_FORUMS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> +				<label><input type="radio" name="teampage_forums" class="radio" value="0"<!-- IF not DISPLAY_FORUMS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> +			</dd> +		</dl> + +	<p class="submit-buttons"> +		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />  +		<input class="button2" type="reset" name="reset" value="{L_RESET}" /> +		<input type="hidden" name="action" value="set_config_teampage" /> +		{S_FORM_TOKEN} +	</p> +	</fieldset> +	</form> + +	<p>{L_TEAMPAGE_EXPLAIN}</p> + +	<!-- IF S_TEAMPAGE_CATEGORY and CURRENT_CATEGORY_NAME --><p><strong><a href="{U_ACTION}">{L_TEAMPAGE}</a> » {CURRENT_CATEGORY_NAME}</strong></p><!-- ENDIF --> + +	<table class="table1"> +		<col class="col1" /><col class="col2" /><col class="col2" /> +	<thead> +	<tr> +		<th style="width: 50%">{L_GROUP}</th> +		<th>{L_GROUP_TYPE}</th> +		<th>{L_ACTION}</th> +	</tr> +	</thead> +	<tbody> +	<!-- BEGIN teampage --> +		<tr> +			<td> +				<!-- IF teampage.U_CATEGORY --> +					<a href="{teampage.U_CATEGORY}">{teampage.GROUP_NAME}</a> +				<!-- ELSE --> +					<strong<!-- IF teampage.GROUP_COLOUR --> style="color: {teampage.GROUP_COLOUR}"<!-- ENDIF -->>{teampage.GROUP_NAME}</strong> +				<!-- ENDIF --> +			</td> +			<td style="text-align: center;"><!-- IF teampage.GROUP_TYPE -->{teampage.GROUP_TYPE}<!-- ELSE -->-<!-- ENDIF --> +			</td></td> +			<td class="actions"> +				<span class="up-disabled" style="display: none;">{ICON_MOVE_UP_DISABLED}</span> +				<span class="up"><a href="{teampage.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span> +				<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span> +				<span class="down"><a href="{teampage.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span> +				<a href="{teampage.U_DELETE}">{ICON_DELETE}</a> +			</td> +		</tr> +	<!-- BEGINELSE --> +		<tr> +			<td colspan="3" class="row3">{L_NO_GROUPS_ADDED}</td> +		</tr> +	<!-- END teampage --> +	</tbody> +	</table> + +	<!-- IF not S_TEAMPAGE_CATEGORY --> +	<form id="teampage_add_category" method="post" action="{U_ACTION_TEAMPAGE}"> +		<fieldset class="quick"> +			<input class="inputbox autowidth" type="text" maxlength="255" name="category_name" placeholder="{L_GROUP_CATEGORY_NAME}" /> +			<input class="button2" type="submit" name="submit" value="{L_ADD_GROUP_CATEGORY}" /> +			<input type="hidden" name="action" value="add_category" /> +			{S_FORM_TOKEN} +		</fieldset> +	</form> +	<!-- ENDIF --> + +	<form id="teampage_add_group" method="post" action="{U_ACTION_TEAMPAGE}"> +		<fieldset class="quick"> +			<select name="g"> +				<option value="0">{L_SELECT_GROUP}</option> +				<!-- BEGIN add_teampage --> +					<option<!-- IF add_teampage.GROUP_SPECIAL --> class="sep"<!-- ENDIF --> value="{add_teampage.GROUP_ID}">{add_teampage.GROUP_NAME}</option> +				<!-- END add_teampage --> +			</select> +			<input class="button2" type="submit" name="submit" value="{L_ADD}" /> +			<input type="hidden" name="action" value="add" /> +			{S_FORM_TOKEN} +		</fieldset> +	</form> + +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html index a34a91043c..bfe4878ba5 100644 --- a/phpBB/adm/style/acp_icons.html +++ b/phpBB/adm/style/acp_icons.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_EDIT --> @@ -22,7 +22,7 @@  			{  				var use_element = smiley[newimage]; -				document.getElementById('add_image_src').src = '{PHPBB_ROOT_PATH}{IMG_PATH}/' + encodeURI(newimage); +				document.getElementById('add_image_src').src = '{ROOT_PATH}{IMG_PATH}/' + encodeURI(newimage);  				document.getElementById('add_code').value = use_element['code'];  				document.getElementById('add_emotion').value = use_element['emotion'];  				document.getElementById('add_width').value = use_element['width']; @@ -74,7 +74,7 @@  	<fieldset class="tabulated">  	<legend>{L_TITLE}</legend> -	<table cellspacing="1" id="smilies"> +	<table class="table1" id="smilies">  	<thead>  	<tr>  		<th colspan="{COLSPAN}">{L_CONFIG}</th> @@ -108,8 +108,8 @@  			<td><input class="text post" type="text" name="code[{items.IMG}]" value="{items.CODE}" size="10" maxlength="50" /></td>  			<td><input class="text post" type="text" name="emotion[{items.IMG}]" value="{items.EMOTION}" size="10" maxlength="50" /></td>  		<!-- ENDIF --> -		<td><input class="text post" type="text" size="3" name="width[{items.IMG}]" value="{items.WIDTH}" /></td> -		<td><input class="text post" type="text" size="3" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td> +		<td><input class="text post" type="number" size="3" name="width[{items.IMG}]" value="{items.WIDTH}" /></td> +		<td><input class="text post" type="number" size="3" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td>  		<td>  			<input type="checkbox" class="radio" name="display_on_posting[{items.IMG}]"{items.POSTING_CHECKED} onclick="toggle_select('{items.A_IMG}', this.checked, '{items.S_ROW_COUNT}');"/>  			<!-- IF items.S_ID --> @@ -136,8 +136,8 @@  		<td style="vertical-align: top;"><img src="{IMG_SRC}" id="add_image_src" alt="" title="" /></td>  		<td><input class="text post" type="text" name="add_code" id="add_code" value="{CODE}" size="10" maxlength="50" /></td>  		<td><input class="text post" type="text" name="add_emotion" id="add_emotion" value="{EMOTION}" size="10" maxlength="50" /></td> -		<td><input class="text post" type="text" size="3" name="add_width" id="add_width" value="{WIDTH}" /></td> -		<td><input class="text post" type="text" size="3" name="add_height" id="add_height" value="{HEIGHT}" /></td> +		<td><input class="text post" type="number" size="3" name="add_width" id="add_width" value="{WIDTH}" /></td> +		<td><input class="text post" type="number" size="3" name="add_height" id="add_height" value="{HEIGHT}" /></td>  		<td><input type="checkbox" class="radio" name="add_display_on_posting" checked="checked" onclick="toggle_select('add', this.checked, 'add_order');"/></td>   		<td><select id="order_add_order" name="add_order">  				<optgroup id="order_disp_add_order" label="{L_DISPLAY_POSTING}">{S_ADD_ORDER_LIST_DISPLAY}</optgroup> @@ -218,7 +218,7 @@  	<legend>{L_TITLE}</legend> -	<table cellspacing="1"> +	<table class="table1">  	<thead>  	<tr>  		<th>{L_TITLE}</th> @@ -243,9 +243,9 @@  				<td style="text-align: center;">{items.EMOTION}</td>  			<!-- ENDIF -->  			<td style="text-align: right; white-space: nowrap;"> -				<!-- IF items.S_FIRST_ROW and not PREVIOUS_PAGE -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF -->  -				<!-- IF items.S_LAST_ROW and not NEXT_PAGE -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF --> -				 <a href="{items.U_EDIT}">{ICON_EDIT}</a> <a href="{items.U_DELETE}">{ICON_DELETE}</a> +				<!-- IF items.S_FIRST_ROW and not U_PREVIOUS_PAGE -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF -->  +				<!-- IF items.S_LAST_ROW and not U_NEXT_PAGE -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF --> +				 <a href="{items.U_EDIT}">{ICON_EDIT}</a> <a href="{items.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>  			</td>  		</tr>  	<!-- BEGINELSE --> @@ -255,7 +255,11 @@  	<!-- END items -->  	</tbody>  	</table> -	<div>{PAGINATION}</div> +	<div class="pagination"> +	<!-- IF .pagination --> +		<!-- INCLUDE pagination.html -->	 +	<!-- ENDIF --> +	</div>  	<p class="quick">  		<input class="button2" name="add" type="submit" value="{L_ICON_ADD}" />   <input class="button2" type="submit" name="edit" value="{L_ICON_EDIT}" />  	</p> diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html index b8e46a6e53..1c42c93f76 100644 --- a/phpBB/adm/style/acp_inactive.html +++ b/phpBB/adm/style/acp_inactive.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <h2>{L_INACTIVE_USERS}</h2> @@ -10,13 +10,13 @@  <div class="clearfix"></div> -<!-- IF PAGINATION --> +<!-- IF .pagination -->  <div class="pagination"> -	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> +	<!-- INCLUDE pagination.html -->  </div>  <!-- ENDIF --> -<table cellspacing="1"> +<table class="table1">  <thead>  <tr>  	<th>{L_USERNAME}</th> @@ -33,7 +33,7 @@  		<td style="vertical-align: top;">  			{inactive.USERNAME_FULL} -			<!-- IF inactive.POSTS --><br />{L_POSTS}: <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF --> +			<!-- IF inactive.POSTS --><br />{L_POSTS}{L_COLON} <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->  		</td>  		<td style="vertical-align: top;">{inactive.JOINED}</td>  		<td style="vertical-align: top;">{inactive.INACTIVE_DATE}</td> @@ -53,15 +53,15 @@  </table>  <fieldset class="display-options"> -	{L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}<!-- IF PAGINATION --> {L_USERS_PER_PAGE}: <input class="inputbox autowidth" type="text" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF --> +	{L_DISPLAY_LOG}{L_COLON}  {S_LIMIT_DAYS} {L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}<!-- IF .pagination --> {L_USERS_PER_PAGE}{L_COLON} <input class="inputbox autowidth" type="number" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF -->  	<input class="button2" type="submit" value="{L_GO}" name="sort" />  </fieldset>  <hr /> -<!-- IF PAGINATION --> +<!-- IF .pagination -->  	<div class="pagination"> -		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> +		<!-- INCLUDE pagination.html -->  	</div>  <!-- ENDIF --> @@ -74,4 +74,4 @@  </form> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html index 0c4512ba98..4d0b1b0d97 100644 --- a/phpBB/adm/style/acp_jabber.html +++ b/phpBB/adm/style/acp_jabber.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <h1>{L_ACP_JABBER_SETTINGS}</h1> @@ -21,36 +21,36 @@  	<p>{L_JAB_GTALK_NOTE}</p>  <!-- ENDIF -->  <dl> -	<dt><label for="jab_enable">{L_JAB_ENABLE}:</label><br /><span>{L_JAB_ENABLE_EXPLAIN}</span></dt> +	<dt><label for="jab_enable">{L_JAB_ENABLE}{L_COLON}</label><br /><span>{L_JAB_ENABLE_EXPLAIN}</span></dt>  	<dd><label><input type="radio" class="radio" id="jab_enable" name="jab_enable" value="1"<!-- IF JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>  		<label><input type="radio" class="radio" name="jab_enable" value="0"<!-- IF not JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>  </dl>  <dl> -	<dt><label for="jab_host">{L_JAB_SERVER}:</label><br /><span>{L_JAB_SERVER_EXPLAIN}</span></dt> +	<dt><label for="jab_host">{L_JAB_SERVER}{L_COLON}</label><br /><span>{L_JAB_SERVER_EXPLAIN}</span></dt>  	<dd><input type="text" id="jab_host" name="jab_host" value="{JAB_HOST}" /></dd>  </dl>  <dl> -	<dt><label for="jab_port">{L_JAB_PORT}:</label><br /><span>{L_JAB_PORT_EXPLAIN}</span></dt> -	<dd><input type="text" id="jab_port" name="jab_port" value="{JAB_PORT}" maxlength="5" size="5" /></dd> +	<dt><label for="jab_port">{L_JAB_PORT}{L_COLON}</label><br /><span>{L_JAB_PORT_EXPLAIN}</span></dt> +	<dd><input type="number" id="jab_port" name="jab_port" value="{JAB_PORT}" maxlength="5" size="5" /></dd>  </dl>  <dl> -	<dt><label for="jab_username">{L_JAB_USERNAME}:</label><br /><span>{L_JAB_USERNAME_EXPLAIN}</span></dt> +	<dt><label for="jab_username">{L_JAB_USERNAME}{L_COLON}</label><br /><span>{L_JAB_USERNAME_EXPLAIN}</span></dt>  	<dd><input type="text" id="jab_username" name="jab_username" value="{JAB_USERNAME}" /></dd>  </dl>  <dl> -	<dt><label for="jab_password">{L_JAB_PASSWORD}:</label><br /><span>{L_JAB_PASSWORD_EXPLAIN}</span></dt> +	<dt><label for="jab_password">{L_JAB_PASSWORD}{L_COLON}</label><br /><span>{L_JAB_PASSWORD_EXPLAIN}</span></dt>  	<dd><input type="password" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" /></dd>  </dl>  <!-- IF S_CAN_USE_SSL -->  <dl> -	<dt><label for="jab_use_ssl">{L_JAB_USE_SSL}:</label><br /><span>{L_JAB_USE_SSL_EXPLAIN}</span></dt> +	<dt><label for="jab_use_ssl">{L_JAB_USE_SSL}{L_COLON}</label><br /><span>{L_JAB_USE_SSL_EXPLAIN}</span></dt>  	<dd><label><input type="radio" class="radio" id="jab_use_ssl" name="jab_use_ssl" value="1"<!-- IF JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  		<label><input type="radio" class="radio" name="jab_use_ssl" value="0"<!-- IF not JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  </dl>  <!-- ENDIF -->  <dl> -	<dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}:</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt> -	<dd><input type="text" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" maxlength="5" size="5" /></dd> +	<dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}{L_COLON}</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt> +	<dd><input type="number" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" maxlength="5" size="5" min="0" max="99999" /></dd>  </dl>  </fieldset> diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html index 95ac1d5852..d4fd572376 100644 --- a/phpBB/adm/style/acp_language.html +++ b/phpBB/adm/style/acp_language.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_SELECT_METHOD --> @@ -13,7 +13,7 @@  	<fieldset>  		<legend>{L_DOWNLOAD_AS}</legend>  	<dl> -		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt> +		<dt><label for="use_method">{L_DOWNLOAD_AS}{L_COLON}</label></dt>  		<dd>{RADIO_BUTTONS}</dd>  	</dl> @@ -35,19 +35,19 @@  	<fieldset>  		<legend>{LANG_LOCAL_NAME}</legend>  	<dl> -		<dt><label for="lang_english_name">{L_LANG_ENGLISH_NAME}:</label></dt> +		<dt><label for="lang_english_name">{L_LANG_ENGLISH_NAME}{L_COLON}</label></dt>  		<dd><input type="text" id="lang_english_name" name="lang_english_name" value="{LANG_ENGLISH_NAME}" maxlength="100" /></dd>  	</dl>  	<dl> -		<dt><label for="lang_local_name">{L_LANG_LOCAL_NAME}:</label></dt> +		<dt><label for="lang_local_name">{L_LANG_LOCAL_NAME}{L_COLON}</label></dt>  		<dd><input type="text" id="lang_local_name" name="lang_local_name" value="{LANG_LOCAL_NAME}" maxlength="255" /></dd>  	</dl>  	<dl> -		<dt><label>{L_LANG_ISO_CODE}:</label></dt> +		<dt><label>{L_LANG_ISO_CODE}{L_COLON}</label></dt>  		<dd><strong>{LANG_ISO}</strong></dd>  	</dl>  	<dl> -		<dt><label for="lang_author">{L_LANG_AUTHOR}:</label></dt> +		<dt><label for="lang_author">{L_LANG_AUTHOR}{L_COLON}</label></dt>  		<dd><input type="text" id="lang_author" name="lang_author" value="{LANG_AUTHOR}" maxlength="255" /></dd>  	</dl> @@ -75,7 +75,7 @@  		<form id="missing" method="post" action="{U_MISSING_ACTION}"> -		<table cellspacing="1"> +		<table class="table1">  		<thead>  		<tr>  			<th>{L_LANGUAGE_KEY}</th> @@ -98,7 +98,7 @@  		<br /><br />  	<!-- ENDIF --> -	<a name="entries"></a> +	<a id="entries"></a>  	<h1>{L_LANGUAGE_ENTRIES}</h1> @@ -129,7 +129,7 @@  	</style>  	<![endif]--> -	<table cellspacing="1"> +	<table class="table1">  	<thead>  	<!-- IF S_EMAIL_FILE -->  		<tr> @@ -147,7 +147,7 @@  	</tr>  	<tr>  		<td class="row3" style="text-align: right;">	 -		<!-- IF ALLOW_UPLOAD -->  {L_UPLOAD_METHOD}: <!-- BEGIN buttons--><input type="radio" class="radio"<!-- IF buttons.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> value="{buttons.VALUE}" name="method" /> {buttons.VALUE} <!-- END buttons --><input type="submit" name="upload_file" class="button2" value="{L_SUBMIT_AND_UPLOAD}" /><!-- ENDIF --></td> +		<!-- IF ALLOW_UPLOAD -->  {L_UPLOAD_METHOD}{L_COLON} <!-- BEGIN buttons--><input type="radio" class="radio"<!-- IF buttons.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> value="{buttons.VALUE}" name="method" /> {buttons.VALUE} <!-- END buttons --><input type="submit" name="upload_file" class="button2" value="{L_SUBMIT_AND_UPLOAD}" /><!-- ENDIF --></td>  	</tr>  	</thead>  	<tbody> @@ -186,12 +186,12 @@  	<fieldset>  		<legend>{L_UPLOAD_SETTINGS}</legend>  	<dl> -		<dt><label>{L_UPLOAD_METHOD}:</label></dt> +		<dt><label>{L_UPLOAD_METHOD}{L_COLON}</label></dt>  		<dd><strong>{NAME}</strong></dd>  	</dl>  	<!-- BEGIN data -->  	<dl> -		<dt><label for="{data.DATA}">{data.NAME}:</label><br /><span>{data.EXPLAIN}</span></dt> +		<dt><label for="{data.DATA}">{data.NAME}{L_COLON}</label><br /><span>{data.EXPLAIN}</span></dt>  		<dd><input type="<!-- IF data.DATA == 'password' -->password<!-- ELSE -->text<!-- ENDIF -->" id="{data.DATA}" name="{data.DATA}" value="{data.DEFAULT}" /></dd>  	</dl>  	<!-- END data --> @@ -211,7 +211,7 @@  	<p>{L_ACP_LANGUAGE_PACKS_EXPLAIN}</p> -	<table cellspacing="1"> +	<table class="table1">  	<thead>  	<tr>  		<th>{L_LANGUAGE_PACK_NAME}</th> diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html index f2fa5dbc26..f22eb67a72 100644 --- a/phpBB/adm/style/acp_logs.html +++ b/phpBB/adm/style/acp_logs.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <h1>{L_TITLE}</h1> @@ -9,12 +9,12 @@  <form id="list" method="post" action="{U_ACTION}">  <fieldset class="display-options" style="float: left"> -	{L_SEARCH_KEYWORDS}: <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" /> +	{L_SEARCH_KEYWORDS}{L_COLON} <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" />  </fieldset> -<!-- IF PAGINATION --> +<!-- IF .pagination -->  <div class="pagination" style="float: right; margin: 15px 0 2px 0"> -	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> +	<!-- INCLUDE pagination.html -->  </div>  <!-- ENDIF --> @@ -22,7 +22,7 @@  <div><br style="clear: both;" /></div>  <!-- IF .log --> -	<table cellspacing="1"> +	<table class="table1">  	<thead>  	<tr>  		<th>{L_USERNAME}</th> @@ -54,9 +54,9 @@  	</tbody>  	</table> -<!-- IF PAGINATION --> +<!-- IF .pagination -->  	<div class="pagination"> -		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> +		<!-- INCLUDE pagination.html -->  	</div>  <!-- ENDIF --> @@ -67,7 +67,7 @@  <!-- ENDIF -->  <fieldset class="display-options"> -	{L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} +	{L_DISPLAY_LOG}{L_COLON}  {S_LIMIT_DAYS} {L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}  	<input class="button2" type="submit" value="{L_GO}" name="sort" />  	{S_FORM_TOKEN}  </fieldset> @@ -75,7 +75,7 @@  <!-- IF S_SHOW_FORUMS -->  	<fieldset class="quick"> -		{L_SELECT_FORUM}: <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select> +		{L_SELECT_FORUM}{L_COLON} <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select>  		<input class="button2" type="submit" value="{L_GO}" />  	</fieldset>  <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index c665c9d893..bb39ffe050 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_RESTORE_PERMISSIONS --> @@ -76,7 +76,9 @@  		</div>  	<!-- ENDIF --> -	<table cellspacing="1"> +	<!-- EVENT acp_main_notice_after --> + +	<table class="table1 two-columns no-header" data-no-responsive-header="true">  		<caption>{L_FORUM_STATS}</caption>  		<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />  	<thead> @@ -89,56 +91,56 @@  	</thead>  	<tbody>  	<tr> -		<td>{L_NUMBER_POSTS}: </td> +		<td>{L_NUMBER_POSTS}{L_COLON} </td>  		<td><strong>{TOTAL_POSTS}</strong></td> -		<td>{L_POSTS_PER_DAY}: </td> +		<td>{L_POSTS_PER_DAY}{L_COLON} </td>  		<td><strong>{POSTS_PER_DAY}</strong></td>  	</tr>  	<tr> -		<td>{L_NUMBER_TOPICS}: </td> +		<td>{L_NUMBER_TOPICS}{L_COLON} </td>  		<td><strong>{TOTAL_TOPICS}</strong></td> -		<td>{L_TOPICS_PER_DAY}: </td> +		<td>{L_TOPICS_PER_DAY}{L_COLON} </td>  		<td><strong>{TOPICS_PER_DAY}</strong></td>  	</tr>  	<tr> -		<td>{L_NUMBER_USERS}: </td> +		<td>{L_NUMBER_USERS}{L_COLON} </td>  		<td><strong>{TOTAL_USERS}</strong></td> -		<td>{L_USERS_PER_DAY}: </td> +		<td>{L_USERS_PER_DAY}{L_COLON} </td>  		<td><strong>{USERS_PER_DAY}</strong></td>  	</tr>  	<tr> -		<td>{L_NUMBER_FILES}: </td> +		<td>{L_NUMBER_FILES}{L_COLON} </td>  		<td><strong>{TOTAL_FILES}</strong></td> -		<td>{L_FILES_PER_DAY}: </td> +		<td>{L_FILES_PER_DAY}{L_COLON} </td>  		<td><strong>{FILES_PER_DAY}</strong></td>  	</tr>  	<tr> -		<td>{L_BOARD_STARTED}: </td> +		<td>{L_BOARD_STARTED}{L_COLON} </td>  		<td><strong>{START_DATE}</strong></td> -		<td>{L_AVATAR_DIR_SIZE}: </td> +		<td>{L_AVATAR_DIR_SIZE}{L_COLON} </td>  		<td><strong>{AVATAR_DIR_SIZE}</strong></td>  	</tr>  	<tr> -		<td>{L_DATABASE_SIZE}: </td> +		<td>{L_DATABASE_SIZE}{L_COLON} </td>  		<td><strong>{DBSIZE}</strong></td> -		<td>{L_UPLOAD_DIR_SIZE}: </td> +		<td>{L_UPLOAD_DIR_SIZE}{L_COLON} </td>  		<td><strong>{UPLOAD_DIR_SIZE}</strong></td>  	</tr>  	<tr> -		<td>{L_DATABASE_SERVER_INFO}: </td> +		<td>{L_DATABASE_SERVER_INFO}{L_COLON} </td>  		<td><strong>{DATABASE_INFO}</strong></td> -		<td>{L_GZIP_COMPRESSION}: </td> +		<td>{L_GZIP_COMPRESSION}{L_COLON} </td>  		<td><strong>{GZIP_COMPRESSION}</strong></td>  	</tr>  	<tr> -		<td>{L_BOARD_VERSION}: </td> +		<td>{L_BOARD_VERSION}{L_COLON} </td>  		<td>  			<strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF --> title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [ <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> ]  		</td>  	<!-- IF S_TOTAL_ORPHAN --> -		<td>{L_NUMBER_ORPHAN}: </td> +		<td>{L_NUMBER_ORPHAN}{L_COLON} </td>  		<td><strong>{TOTAL_ORPHAN}</strong></td>  	<!-- ELSE -->  		<td> </td> @@ -152,14 +154,14 @@  		<fieldset>  			<legend>{L_STATISTIC_RESYNC_OPTIONS}</legend> -			<form id="action_online_form" method="post" action="{U_ACTION}"> +			<form id="action_online_form" method="post" action="{U_ACTION}" data-ajax="true">  				<dl>  					<dt><label for="action_online">{L_RESET_ONLINE}</label><br /><span> </span></dt>  					<dd><input type="hidden" name="action" value="online" /><input class="button2" type="submit" id="action_online" name="action_online" value="{L_RUN}" /></dd>  				</dl>  			</form> -			<form id="action_date_form" method="post" action="{U_ACTION}"> +			<form id="action_date_form" method="post" action="{U_ACTION}" data-ajax="true">  				<dl>  					<dt><label for="action_date">{L_RESET_DATE}</label><br /><span> </span></dt>  					<dd><input type="hidden" name="action" value="date" /><input class="button2" type="submit" id="action_date" name="action_date" value="{L_RUN}" /></dd> @@ -188,19 +190,22 @@  			</form>  			<!-- IF S_FOUNDER --> -			<form id="action_purge_sessions_form" method="post" action="{U_ACTION}"> +			<form id="action_purge_sessions_form" method="post" action="{U_ACTION}" data-ajax="true">  				<dl>  					<dt><label for="action_purge_sessions">{L_PURGE_SESSIONS}</label><br /><span>{L_PURGE_SESSIONS_EXPLAIN}</span></dt>  					<dd><input type="hidden" name="action" value="purge_sessions" /><input class="button2" type="submit" id="action_purge_sessions" name="action_purge_sessions" value="{L_RUN}" /></dd>  				</dl>  			</form> -			<form id="action_purge_cache_form" method="post" action="{U_ACTION}"> +			<!-- ENDIF --> + +			<form id="action_purge_cache_form" method="post" action="{U_ACTION}" data-ajax="true">  				<dl>  					<dt><label for="action_purge_cache">{L_PURGE_CACHE}</label><br /><span>{L_PURGE_CACHE_EXPLAIN}</span></dt>  					<dd><input type="hidden" name="action" value="purge_cache" /><input class="button2" type="submit" id="action_purge_cache" name="action_purge_cache" value="{L_RUN}" /></dd>  				</dl>  			</form> -			<!-- ENDIF --> + +			<!-- EVENT acp_main_actions_append -->    		</fieldset>  	<!-- ENDIF --> @@ -211,7 +216,7 @@  		<div style="text-align: right;"><a href="{U_ADMIN_LOG}">» {L_VIEW_ADMIN_LOG}</a></div> -		<table cellspacing="1"> +		<table class="table1">  		<thead>  		<tr>  			<th>{L_USERNAME}</th> @@ -244,7 +249,7 @@  		<div style="text-align: right;"><a href="{U_INACTIVE_USERS}">» {L_VIEW_INACTIVE_USERS}</a></div> -		<table cellspacing="1"> +		<table class="table1">  		<thead>  		<tr>  			<th>{L_USERNAME}</th> @@ -260,7 +265,7 @@  				<td style="vertical-align: top;">  					{inactive.USERNAME_FULL} -					<!-- IF inactive.POSTS --><br />{L_POSTS}: <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF --> +					<!-- IF inactive.POSTS --><br />{L_POSTS}{L_COLON} <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->  				</td>  				<td style="vertical-align: top;">{inactive.JOINED}</td>  				<td style="vertical-align: top;">{inactive.INACTIVE_DATE}</td> @@ -282,4 +287,4 @@  <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index 5396e78557..8870c815af 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_EDIT_MODULE --> @@ -72,37 +72,37 @@  	<fieldset>  		<legend>{L_GENERAL_OPTIONS}</legend>  	<dl> -		<dt><label for="module_langname">{L_MODULE_LANGNAME}:</label><br /> +		<dt><label for="module_langname">{L_MODULE_LANGNAME}{L_COLON}</label><br />  		<span>{L_MODULE_LANGNAME_EXPLAIN}</span></dt>  		<dd><input name="module_langname" type="text" class="text medium" id="module_langname" value="{MODULE_LANGNAME}" /></dd>  	</dl>  	<dl> -		<dt><label for="module_type">{L_MODULE_TYPE}:</label></dt> +		<dt><label for="module_type">{L_MODULE_TYPE}{L_COLON}</label></dt>  		<dd><select name="module_type" id="module_type" onchange="display_options(this.value);"><option value="category"<!-- IF S_IS_CAT --> selected="selected"<!-- ENDIF -->>{L_CATEGORY}</option><option value="module"<!-- IF not S_IS_CAT --> selected="selected"<!-- ENDIF -->>{L_MODULE}</option></select></dd>  	</dl>  	<dl> -		<dt><label for="parent_id">{L_PARENT}:</label></dt> +		<dt><label for="parent_id">{L_PARENT}{L_COLON}</label></dt>  		<dd><select name="module_parent_id" id="parent_id">{S_CAT_OPTIONS}</select></dd>  	</dl>  	<hr />  	<dl> -		<dt><label for="module_enabled">{L_MODULE_ENABLED}:</label></dt> +		<dt><label for="module_enabled">{L_MODULE_ENABLED}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="module_enabled" id="module_enabled" value="1"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="module_enabled" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<div id="modoptions"<!-- IF S_IS_CAT --> style="display: none;"<!-- ENDIF -->>  		<dl> -			<dt><label for="module_display">{L_MODULE_DISPLAYED}:</label><br /><span>{L_MODULE_DISPLAYED_EXPLAIN}</span></dt> +			<dt><label for="module_display">{L_MODULE_DISPLAYED}{L_COLON}</label><br /><span>{L_MODULE_DISPLAYED_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" name="module_display" id="module_display" value="1"<!-- IF MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="module_display" value="0"<!-- IF not MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl>  		<dl> -			<dt><label for="module_basename">{L_CHOOSE_MODULE}:</label><br /> +			<dt><label for="module_basename">{L_CHOOSE_MODULE}{L_COLON}</label><br />  			<span>{L_CHOOSE_MODULE_EXPLAIN}</span></dt>  			<dd><select name="module_basename" id="module_basename" onchange="display_modes(this.value);">{S_MODULE_NAMES}</select></dd>  		</dl>  		<dl> -			<dt><label for="module_mode">{L_CHOOSE_MODE}:</label><br /> +			<dt><label for="module_mode">{L_CHOOSE_MODE}{L_COLON}</label><br />  			<span>{L_CHOOSE_MODE_EXPLAIN}</span></dt>  			<dd><select name="module_mode" id="module_mode">{S_MODULE_MODES}</select></dd>  		</dl> @@ -132,7 +132,7 @@  		</div>  	<!-- ENDIF --> -	<table cellspacing="1"> +	<table class="table1">  	<tbody>  	<tr>  		<td class="row3">{NAVIGATION}<!-- IF S_NO_MODULES --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a> | <!-- IF MODULE_ENABLED --><a href="{U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->]<!-- ENDIF --></td> @@ -141,7 +141,7 @@  	</table>  	<!-- IF .modules --> -		<table cellspacing="1"> +		<table class="table1">  			<col class="row1" /><col class="row1" /><col class="row2" /><col class="row2" />  		<tbody>  		<!-- BEGIN modules --> @@ -149,22 +149,13 @@  				<td style="width: 5%; text-align: center;">{modules.MODULE_IMAGE}</td>  				<td><a href="{modules.U_MODULE}">{modules.MODULE_TITLE}</a><!-- IF not modules.MODULE_DISPLAYED --> <span class="small">[{L_HIDDEN_MODULE}]</span><!-- ENDIF --></td>  				<td style="width: 15%; white-space: nowrap; text-align: center; vertical-align: middle;"> <!-- IF modules.MODULE_ENABLED --><a href="{modules.U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{modules.U_ENABLE}">{L_ENABLE}</a><!-- ENDIF --> </td> -				<td style="width:90px; white-space: nowrap; text-align: right; vertical-align: middle;"> -					<!-- IF modules.S_FIRST_ROW && not modules.S_LAST_ROW --> -						{ICON_MOVE_UP_DISABLED} -						<a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> -					<!-- ELSEIF not modules.S_FIRST_ROW && not modules.S_LAST_ROW--> -						<a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a>  -						<a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>  -					<!-- ELSEIF modules.S_LAST_ROW && not modules.S_FIRST_ROW --> -						<a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a>	 -						{ICON_MOVE_DOWN_DISABLED} -					<!-- ELSE --> -						{ICON_MOVE_UP_DISABLED} -						{ICON_MOVE_DOWN_DISABLED} -					<!-- ENDIF --> +				<td class="actions"> +					<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span> +					<span class="up"><a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a></span> +					<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span> +					<span class="down"><a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a></span>  					<a href="{modules.U_EDIT}">{ICON_EDIT}</a>  -					<a href="{modules.U_DELETE}">{ICON_DELETE}</a> +					<a href="{modules.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>  				</td>  			</tr>  		<!-- END modules --> @@ -201,7 +192,7 @@  	<form id="mselect" method="post" action="{U_SEL_ACTION}">  	<fieldset class="quick"> -		{L_SELECT_MODULE}: <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{MODULE_BOX}</select>  +		{L_SELECT_MODULE}{L_COLON} <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{MODULE_BOX}</select>   		<input class="button2" type="submit" value="{L_GO}" />  	</fieldset> diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html index 220e7dafbe..b8fdaeb837 100644 --- a/phpBB/adm/style/acp_permission_roles.html +++ b/phpBB/adm/style/acp_permission_roles.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_EDIT --> @@ -36,11 +36,11 @@  	<fieldset>  		<legend>{L_ROLE_DETAILS}</legend>  	<dl> -		<dt><label for="role_name">{L_ROLE_NAME}:</label></dt> +		<dt><label for="role_name">{L_ROLE_NAME}{L_COLON}</label></dt>  		<dd><input name="role_name" type="text" id="role_name" value="{ROLE_NAME}" maxlength="255" /></dd>  	</dl>  	<dl> -		<dt><label for="role_description">{L_ROLE_DESCRIPTION}:</label><br /><span>{L_ROLE_DESCRIPTION_EXPLAIN}</span></dt> +		<dt><label for="role_description">{L_ROLE_DESCRIPTION}{L_COLON}</label><br /><span>{L_ROLE_DESCRIPTION_EXPLAIN}</span></dt>  		<dd><textarea id="role_description" name="role_description" rows="3" cols="45">{ROLE_DESCRIPTION}</textarea></dd>  	</dl> @@ -60,7 +60,7 @@  	<p> -	<a name="acl"></a> +	<a id="acl"></a>  	<a href="#maincontent">» {L_BACK_TO_TOP}</a><br />  	<br /><br /> @@ -90,9 +90,8 @@  			</div>  			<!-- BEGIN auth -->  			<div class="permissions-panel" id="options00{auth.S_ROW_COUNT}"<!-- IF auth.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->> -				<span class="corners-top"><span></span></span>  				<div class="tablewrap"> -					<table id="table00{auth.S_ROW_COUNT}" cellspacing="1"> +					<table id="table00{auth.S_ROW_COUNT}" class="table1 not-responsive">  					<colgroup>  						<col class="permissions-name" />  						<col class="permissions-yes" /> @@ -120,7 +119,6 @@  					</tbody>  					</table>  				</div> -				<span class="corners-bottom"><span></span></span>  			</div>  			<!-- END auth -->  		</div> @@ -144,7 +142,7 @@  	<form id="acp_roles" method="post" action="{U_ACTION}"> -	<table cellspacing="1"> +	<table class="table1">  		<col class="col2" /><col class="col2" /><col class="col1" /><col class="col2" /><col class="col2" />  	<thead>  	<tr> @@ -174,7 +172,7 @@  				{ICON_MOVE_DOWN_DISABLED}  			<!-- ENDIF -->	  			<a href="{roles.U_EDIT}" title="{L_EDIT_ROLE}">{ICON_EDIT}</a>  -			<a href="{roles.U_REMOVE}" title="{L_REMOVE_ROLE}">{ICON_DELETE}</a> +			<a href="{roles.U_REMOVE}" title="{L_REMOVE_ROLE}" data-ajax="row_delete">{ICON_DELETE}</a>  		</td>  	</tr>  	<!-- END roles --> @@ -182,14 +180,14 @@  	</table>  	<fieldset class="quick"> -		{L_CREATE_ROLE}: <input type="text" name="role_name" value="" maxlength="255" /><!-- IF S_ROLE_OPTIONS --> <select name="options_from"><option value="0" selected="selected">{L_CREATE_ROLE_FROM}</option>{S_ROLE_OPTIONS}</select><!-- ENDIF --> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" /><br /> +		{L_CREATE_ROLE}{L_COLON} <input type="text" name="role_name" value="" maxlength="255" /><!-- IF S_ROLE_OPTIONS --> <select name="options_from"><option value="0" selected="selected">{L_CREATE_ROLE_FROM}</option>{S_ROLE_OPTIONS}</select><!-- ENDIF --> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" /><br />  		{S_FORM_TOKEN}  	</fieldset>  	</form>  	<!-- IF S_DISPLAY_ROLE_MASK --> -		<a name="assigned_to"></a> +		<a id="assigned_to"></a>  		<h1>{L_ROLE_ASSIGNED_TO}</h1> @@ -199,4 +197,4 @@  <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html index 63583093b0..6dc9dca2e7 100644 --- a/phpBB/adm/style/acp_permissions.html +++ b/phpBB/adm/style/acp_permissions.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_INTRO --> @@ -19,7 +19,7 @@  	<p>{L_EXPLAIN}</p>  	<!-- IF S_FORUM_NAMES --> -		<p><strong>{L_FORUMS}:</strong> {FORUM_NAMES}</p> +		<p><strong>{L_FORUMS}{L_COLON}</strong> {FORUM_NAMES}</p>  	<!-- ENDIF -->  	<!-- IF S_SELECT_FORUM --> @@ -30,7 +30,7 @@  			<legend>{L_LOOK_UP_FORUM}</legend>  			<!-- IF S_FORUM_MULTIPLE --><p>{L_LOOK_UP_FORUMS_EXPLAIN}</p><!-- ENDIF -->  		<dl> -			<dt><label for="forum">{L_LOOK_UP_FORUM}:</label></dt> +			<dt><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>  			<dd><select id="forum" name="forum_id[]"<!-- IF S_FORUM_MULTIPLE --> multiple="multiple"<!-- ENDIF --> size="10">{S_FORUM_OPTIONS}</select></dd>  			<!-- IF S_FORUM_ALL --><dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd><!-- ENDIF -->  		</dl> @@ -52,7 +52,7 @@  				<legend>{L_LOOK_UP_FORUM}</legend>  				<p>{L_SELECT_FORUM_SUBFORUM_EXPLAIN}</p>  			<dl> -				<dt><label for="sforum">{L_LOOK_UP_FORUM}:</label></dt> +				<dt><label for="sforum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>  				<dd><select id="sforum" name="subforum_id">{S_SUBFORUM_OPTIONS}</select></dd>  			</dl> @@ -74,7 +74,7 @@  		<fieldset>  			<legend>{L_LOOK_UP_USER}</legend>  		<dl> -			<dt><label for="username">{L_FIND_USERNAME}:</label></dt> +			<dt><label for="username">{L_FIND_USERNAME}{L_COLON}</label></dt>  			<dd><input class="text medium" type="text" id="username" name="username[]" /></dd>  			<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>  			<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd> @@ -95,7 +95,7 @@  		<fieldset>  			<legend>{L_LOOK_UP_GROUP}</legend>  		<dl> -			<dt><label for="group">{L_LOOK_UP_GROUP}:</label></dt> +			<dt><label for="group">{L_LOOK_UP_GROUP}{L_COLON}</label></dt>  			<dd><select name="group_id[]" id="group">{S_GROUP_OPTIONS}</select></dd>  		</dl> @@ -110,7 +110,7 @@  		<!-- ELSEIF S_SELECT_USERGROUP --> -		<div style="float: {S_CONTENT_FLOW_BEGIN}; width: 48%;"> +		<div class="column1">  		<!-- IF S_CAN_SELECT_USER --> @@ -155,7 +155,7 @@  		</div> -		<div style="float: {S_CONTENT_FLOW_END}; width: 48%"> +		<div class="column2">  		<!-- IF S_CAN_SELECT_GROUP --> @@ -200,7 +200,7 @@  	<!-- ELSEIF S_SELECT_USERGROUP_VIEW --> -		<div style="float: {S_CONTENT_FLOW_BEGIN}; width: 48%;"> +		<div class="column1">  			<h1>{L_USERS}</h1> @@ -225,7 +225,7 @@  			<fieldset>  				<legend>{L_LOOK_UP_USER}</legend>  			<dl> -				<dt><label for="username">{L_FIND_USERNAME}:</label></dt> +				<dt><label for="username">{L_FIND_USERNAME}{L_COLON}</label></dt>  				<dd><input type="text" id="username" name="username[]" /></dd>  				<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>  				<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd> @@ -241,7 +241,7 @@  		</div> -		<div style="float: {S_CONTENT_FLOW_END}; width: 48%"> +		<div class="column2">  			<h1>{L_USERGROUPS}</h1> @@ -266,7 +266,7 @@  			<fieldset>  				<legend>{L_LOOK_UP_GROUP}</legend>  			<dl> -				<dt><label for="group_select">{L_LOOK_UP_GROUP}:</label></dt> +				<dt><label for="group_select">{L_LOOK_UP_GROUP}{L_COLON}</label></dt>  				<dd><select name="group_id[]" id="group_select">{S_ADD_GROUP_OPTIONS}</select></dd>  				<dd> </dd>  			</dl> @@ -317,14 +317,14 @@  		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">  			{S_HIDDEN_FIELDS}  			{S_FORM_TOKEN} -			{L_SELECT_TYPE}: <select name="type">{S_PERMISSION_DROPDOWN}</select> +			{L_SELECT_TYPE}{L_COLON} <select name="type">{S_PERMISSION_DROPDOWN}</select>  			<input class="button2" type="submit" name="submit" value="{L_GO}" />  		</fieldset>  		</form>  	<!-- ENDIF --> -	<br /><br /> +	<br class="responsive-hide" /><br class="responsive-hide" />  	<!-- include tooltip file -->  	<script type="text/javascript" src="style/tooltip.js"></script> @@ -340,7 +340,7 @@  	<!-- INCLUDE permission_mask.html --> -	<br /><br /> +	<br class="responsive-hide" /><br class="responsive-hide" />  	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">  		<input class="button1" type="submit" name="action[apply_all_permissions]" value="{L_APPLY_ALL_PERMISSIONS}" /> @@ -348,10 +348,10 @@  		{S_FORM_TOKEN}  	</fieldset> -	<br /><br /> +	<br class="responsive-hide" /><br class="responsive-hide" />  	</form>  <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_php_info.html b/phpBB/adm/style/acp_php_info.html index de065c4896..760cd0e9f6 100644 --- a/phpBB/adm/style/acp_php_info.html +++ b/phpBB/adm/style/acp_php_info.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <h1>{L_ACP_PHP_INFO}</h1> @@ -10,4 +10,4 @@  	{PHPINFO}  </div> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html index 1c9c038f8f..3546873f6c 100644 --- a/phpBB/adm/style/acp_profile.html +++ b/phpBB/adm/style/acp_profile.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_EDIT --> @@ -24,22 +24,22 @@  		<fieldset>  			<legend>{L_TITLE}</legend>  		<dl> -			<dt><label>{L_FIELD_TYPE}:</label><br /><span>{L_FIELD_TYPE_EXPLAIN}</span></dt> +			<dt><label>{L_FIELD_TYPE}{L_COLON}</label><br /><span>{L_FIELD_TYPE_EXPLAIN}</span></dt>  			<dd><strong>{FIELD_TYPE}</strong></dd>  		</dl>  		<!-- IF S_EDIT_MODE -->  		<dl> -			<dt><label>{L_FIELD_IDENT}:</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt> +			<dt><label>{L_FIELD_IDENT}{L_COLON}</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>  			<dd><input type="hidden" name="field_ident" value="{FIELD_IDENT}" /><strong>{FIELD_IDENT}</strong></dd>  		</dl>  		<!-- ELSE -->  		<dl> -			<dt><label for="field_ident">{L_FIELD_IDENT}:</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt> +			<dt><label for="field_ident">{L_FIELD_IDENT}{L_COLON}</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>  			<dd><input class="text medium" type="text" id="field_ident" name="field_ident" value="{FIELD_IDENT}" /></dd>  		</dl>  		<!-- ENDIF -->  		<dl> -			<dt><label for="field_no_view">{L_DISPLAY_PROFILE_FIELD}:</label><br /><span>{L_DISPLAY_PROFILE_FIELD_EXPLAIN}</span></dt> +			<dt><label for="field_no_view">{L_DISPLAY_PROFILE_FIELD}{L_COLON}</label><br /><span>{L_DISPLAY_PROFILE_FIELD_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" id="field_no_view" name="field_no_view" value="0"<!-- IF not S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="field_no_view" value="1"<!-- IF S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl> @@ -48,27 +48,31 @@  		<fieldset>  			<legend>{L_VISIBILITY_OPTION}</legend>  		<dl> -			<dt><label for="field_show_profile">{L_DISPLAY_AT_PROFILE}:</label><br /><span>{L_DISPLAY_AT_PROFILE_EXPLAIN}</span></dt> +			<dt><label for="field_show_profile">{L_DISPLAY_AT_PROFILE}{L_COLON}</label><br /><span>{L_DISPLAY_AT_PROFILE_EXPLAIN}</span></dt>  			<dd><input type="checkbox" class="radio" id="field_show_profile" name="field_show_profile" value="1"<!-- IF S_SHOW_PROFILE --> checked="checked"<!-- ENDIF --> /></dd>  		</dl>  		<dl> -			<dt><label for="field_show_on_reg">{L_DISPLAY_AT_REGISTER}:</label><br /><span>{L_DISPLAY_AT_REGISTER_EXPLAIN}</span></dt> +			<dt><label for="field_show_on_reg">{L_DISPLAY_AT_REGISTER}{L_COLON}</label><br /><span>{L_DISPLAY_AT_REGISTER_EXPLAIN}</span></dt>  			<dd><input type="checkbox" class="radio" id="field_show_on_reg" name="field_show_on_reg" value="1"<!-- IF S_SHOW_ON_REG --> checked="checked"<!-- ENDIF --> /></dd>  		</dl>  		<dl> -			<dt><label for="field_show_on_vt">{L_DISPLAY_ON_VT}:</label><br /><span>{L_DISPLAY_ON_VT_EXPLAIN}</span></dt> +			<dt><label for="field_show_on_pm">{L_DISPLAY_ON_PM}{L_COLON}</label><br /><span>{L_DISPLAY_ON_PM_EXPLAIN}</span></dt> +			<dd><input type="checkbox" class="radio" id="field_show_on_pm" name="field_show_on_pm" value="1"<!-- IF S_SHOW_ON_PM --> checked="checked"<!-- ENDIF --> /></dd> +		</dl> +		<dl> +			<dt><label for="field_show_on_vt">{L_DISPLAY_ON_VT}{L_COLON}</label><br /><span>{L_DISPLAY_ON_VT_EXPLAIN}</span></dt>  			<dd><input type="checkbox" class="radio" id="field_show_on_vt" name="field_show_on_vt" value="1"<!-- IF S_SHOW_ON_VT --> checked="checked"<!-- ENDIF --> /></dd>  		</dl>  		<dl> -			<dt><label for="field_required">{L_REQUIRED_FIELD}:</label><br /><span>{L_REQUIRED_FIELD_EXPLAIN}</span></dt> +			<dt><label for="field_required">{L_REQUIRED_FIELD}{L_COLON}</label><br /><span>{L_REQUIRED_FIELD_EXPLAIN}</span></dt>  			<dd><input type="checkbox" class="radio" id="field_required" name="field_required" value="1"<!-- IF S_FIELD_REQUIRED --> checked="checked"<!-- ENDIF --> /></dd>  		</dl>  		<dl> -			<dt><label for="field_show_novalue">{L_SHOW_NOVALUE_FIELD}:</label><br /><span>{L_SHOW_NOVALUE_FIELD_EXPLAIN}</span></dt> +			<dt><label for="field_show_novalue">{L_SHOW_NOVALUE_FIELD}{L_COLON}</label><br /><span>{L_SHOW_NOVALUE_FIELD_EXPLAIN}</span></dt>  			<dd><input type="checkbox" class="radio" id="field_show_novalue" name="field_show_novalue" value="1"<!-- IF S_FIELD_SHOW_NOVALUE --> checked="checked"<!-- ENDIF --> /></dd>  		</dl>  		<dl> -			<dt><label for="field_hide">{L_HIDE_PROFILE_FIELD}:</label><br /><span>{L_HIDE_PROFILE_FIELD_EXPLAIN}</span></dt> +			<dt><label for="field_hide">{L_HIDE_PROFILE_FIELD}{L_COLON}</label><br /><span>{L_HIDE_PROFILE_FIELD_EXPLAIN}</span></dt>  			<dd><input type="checkbox" class="radio" id="field_hide" name="field_hide" value="1"<!-- IF S_FIELD_HIDE --> checked="checked"<!-- ENDIF --> /></dd>  		</dl>  		</fieldset> @@ -82,22 +86,22 @@  		<fieldset>  			<legend>{L_LANG_SPECIFIC}</legend>  		<dl> -			<dt><label for="lang_name">{L_USER_FIELD_NAME}:</label></dt> +			<dt><label for="lang_name">{L_USER_FIELD_NAME}{L_COLON}</label></dt>  			<dd><input class="text medium" type="text" id="lang_name" name="lang_name" value="{LANG_NAME}" /></dd>  		</dl>  		<dl> -			<dt><label for="lang_explain">{L_FIELD_DESCRIPTION}:</label><br /><span>{L_FIELD_DESCRIPTION_EXPLAIN}</span></dt> +			<dt><label for="lang_explain">{L_FIELD_DESCRIPTION}{L_COLON}</label><br /><span>{L_FIELD_DESCRIPTION_EXPLAIN}</span></dt>  			<dd><textarea id="lang_explain" name="lang_explain" rows="3" cols="80">{LANG_EXPLAIN}</textarea></dd>  		</dl>  		<!-- IF S_TEXT or S_STRING -->  			<dl> -				<dt><label for="lang_default_value">{L_DEFAULT_VALUE}:</label><br /><span>{L_DEFAULT_VALUE_EXPLAIN}</span></dt> +				<dt><label for="lang_default_value">{L_DEFAULT_VALUE}{L_COLON}</label><br /><span>{L_DEFAULT_VALUE_EXPLAIN}</span></dt>  				<dd><!-- IF S_STRING --><input class="text medium" type="text" id="lang_default_value" name="lang_default_value" value="{LANG_DEFAULT_VALUE}" /><!-- ELSE --><textarea id="lang_default_value" name="lang_default_value" rows="5" cols="80">{LANG_DEFAULT_VALUE}</textarea><!-- ENDIF --></dd>  			</dl>  		<!-- ENDIF -->  		<!-- IF S_BOOL or S_DROPDOWN -->  			<dl> -				<dt><label for="lang_options">{L_ENTRIES}:</label> +				<dt><label for="lang_options">{L_ENTRIES}{L_COLON}</label>  					<!-- IF S_EDIT_MODE and S_DROPDOWN -->  						<br /><span>{L_EDIT_DROPDOWN_LANG_EXPLAIN}</span>  					<!-- ELSE --> @@ -126,7 +130,7 @@  			<legend>{L_TITLE}</legend>  		<!-- BEGIN option -->  			<dl> -				<dt><label>{option.TITLE}:</label><!-- IF option.EXPLAIN --><br /><span>{option.EXPLAIN}</span><!-- ENDIF --></dt> +				<dt><label>{option.TITLE}{L_COLON}</label><!-- IF option.EXPLAIN --><br /><span>{option.EXPLAIN}</span><!-- ENDIF --></dt>  				<dd>{option.FIELD}</dd>  			</dl>  		<!-- END option --> @@ -149,7 +153,7 @@  				<legend>{options.LANGUAGE}</legend>  			<!-- BEGIN field -->  				<dl> -					<dt><label>{options.field.L_TITLE}:</label><!-- IF options.field.L_EXPLAIN --><br /><span>{options.field.L_EXPLAIN}</span><!-- ENDIF --></dt> +					<dt><label>{options.field.L_TITLE}{L_COLON}</label><!-- IF options.field.L_EXPLAIN --><br /><span>{options.field.L_EXPLAIN}</span><!-- ENDIF --></dt>  					{options.field.FIELD}  				</dl>  			<!-- END field --> @@ -181,7 +185,7 @@  		</div>  	<!-- ENDIF --> -	<table cellspacing="1"> +	<table class="table1">  	<thead>  	<tr>  		<th>{L_FIELD_IDENT}</th> @@ -195,7 +199,7 @@  		<td>{fields.FIELD_IDENT}</td>  		<td>{fields.FIELD_TYPE}</td> -		<td style="text-align: center;"><a href="{fields.U_ACTIVATE_DEACTIVATE}">{fields.L_ACTIVATE_DEACTIVATE}</a><!-- IF fields.S_NEED_EDIT --> | <a href="{fields.U_TRANSLATE}" style="color: red;">{L_TRANSLATE}</a><!-- ENDIF --></td> +		<td style="text-align: center;"><a href="{fields.U_ACTIVATE_DEACTIVATE}" data-ajax="activate_deactivate">{fields.L_ACTIVATE_DEACTIVATE}</a><!-- IF fields.S_NEED_EDIT --> | <a href="{fields.U_TRANSLATE}" style="color: red;">{L_TRANSLATE}</a><!-- ENDIF --></td>  		<td style="width: 80px; text-align: right; white-space: nowrap;">  			<!-- IF fields.S_FIRST_ROW && not fields.S_LAST_ROW --> @@ -213,7 +217,7 @@  			<!-- ELSE -->  				{ICON_EDIT_DISABLED}  			<!-- ENDIF --> -			<a href="{fields.U_DELETE}">{ICON_DELETE}</a> +			<a href="{fields.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>  		</td>  	</tr> diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html index 069d2c91c3..1be9689cc7 100644 --- a/phpBB/adm/style/acp_prune_forums.html +++ b/phpBB/adm/style/acp_prune_forums.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_PRUNED --> @@ -8,7 +8,7 @@  	<p>{L_PRUNE_SUCCESS}</p> -	<table cellspacing="1"> +	<table class="table1">  	<thead>  	<tr>  		<th>{L_FORUM}</th> @@ -43,7 +43,7 @@  		<legend>{L_SELECT_FORUM}</legend>  		<p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>  	<dl> -		<dt><label for="forum">{L_LOOK_UP_FORUM}:</label></dt> +		<dt><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>  		<dd><select id="forum" name="f[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>  		<dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd>  	</dl> @@ -65,32 +65,32 @@  	<h2>{L_FORUM}</h2> -	<p>{L_SELECTED_FORUMS}: {FORUM_LIST}</p> +	<p>{L_SELECTED_FORUMS}{L_COLON} {FORUM_LIST}</p>  	<form id="acp_prune" method="post" action="{U_ACTION}">  	<fieldset>  		<legend>{L_FORUM_PRUNE}</legend>  	<dl> -		<dt><label for="prune_days">{L_PRUNE_NOT_POSTED}:</label></dt> -		<dd><input type="text" id="prune_days" name="prune_days" /></dd> +		<dt><label for="prune_days">{L_PRUNE_NOT_POSTED}{L_COLON}</label></dt> +		<dd><input type="number" id="prune_days" name="prune_days" /></dd>  	</dl>  	<dl> -		<dt><label for="prune_vieweddays">{L_PRUNE_NOT_VIEWED}:</label></dt> -		<dd><input type="text" id="prune_vieweddays" name="prune_vieweddays" /></dd> +		<dt><label for="prune_vieweddays">{L_PRUNE_NOT_VIEWED}{L_COLON}</label></dt> +		<dd><input type="number" id="prune_vieweddays" name="prune_vieweddays" /></dd>  	</dl>  	<dl> -		<dt><label for="polls">{L_PRUNE_OLD_POLLS}:</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt> +		<dt><label for="polls">{L_PRUNE_OLD_POLLS}{L_COLON}</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>  		<dd><label><input type="radio" class="radio" name="prune_old_polls" value="1" /> {L_YES}</label>  			<label><input type="radio" class="radio" id="polls" name="prune_old_polls" value="0" checked="checked" /> {L_NO}</label></dd>  	</dl>  	<dl> -		<dt><label for="announce">{L_PRUNE_ANNOUNCEMENTS}:</label></dt> +		<dt><label for="announce">{L_PRUNE_ANNOUNCEMENTS}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="prune_announce" value="1" /> {L_YES}</label>  			<label><input type="radio" class="radio" id="announce" name="prune_announce" value="0" checked="checked" /> {L_NO}</label></dd>  	</dl>  	<dl> -		<dt><label for="sticky">{L_PRUNE_STICKY}:</label></dt> +		<dt><label for="sticky">{L_PRUNE_STICKY}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="prune_sticky" value="1" /> {L_YES}</label>  			<label><input type="radio" class="radio" id="sticky" name="prune_sticky" value="0" checked="checked" /> {L_NO}</label></dd>  	</dl> diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html index 0f2b23dcef..1257f3fb3d 100644 --- a/phpBB/adm/style/acp_prune_users.html +++ b/phpBB/adm/style/acp_prune_users.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <h1>{L_ACP_PRUNE_USERS}</h1> @@ -9,39 +9,64 @@  <form id="acp_prune" method="post" action="{U_ACTION}">  <fieldset> -	<legend>{L_ACP_PRUNE_USERS}</legend> +	<legend>{L_CRITERIA}</legend>  <dl> -	<dt><label for="username">{L_USERNAME}:</label></dt> +	<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>  	<dd><input type="text" id="username" name="username" /></dd>  </dl>  <dl> -	<dt><label for="email">{L_EMAIL}:</label></dt> +	<dt><label for="email">{L_EMAIL}{L_COLON}</label></dt>  	<dd><input type="text" id="email" name="email" /></dd>  </dl>  <dl> -	<dt><label for="joined">{L_JOINED}:</label><br /><span>{L_JOINED_EXPLAIN}</span></dt> -	<dd><select name="joined_select">{S_JOINED_OPTIONS}</select> <input type="text" id="joined" name="joined" /></dd> +	<dt><label for="email">{L_WEBSITE}{L_COLON}</label></dt> +	<dd><input type="text" id="website" name="website" /></dd>  </dl>  <dl> -	<dt><label for="active">{L_LAST_ACTIVE}:</label><br /><span>{L_LAST_ACTIVE_EXPLAIN}</span></dt> +	<dt><label for="joined">{L_JOINED}{L_COLON}</label><br /><span>{L_JOINED_EXPLAIN}</span></dt> +	<dd> +		<strong>{L_AFTER}</strong> <input type="text" id="joined_after" name="joined_after" /> +		<br /> <br /> <strong>{L_BEFORE}</strong> <input type="text" id="joined_before" name="joined_before" /> +	</dd> +</dl> +<dl> +	<dt><label for="active">{L_LAST_ACTIVE}{L_COLON}</label><br /><span>{L_LAST_ACTIVE_EXPLAIN}</span></dt>  	<dd><select name="active_select">{S_ACTIVE_OPTIONS}</select> <input type="text" id="active" name="active" /></dd>  </dl>  <dl> -	<dt><label for="count">{L_POSTS}:</label></dt> -	<dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input type="text" id="count" name="count" /></dd> +	<dt><label for="count">{L_POSTS}{L_COLON}</label></dt> +	<dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input type="number" id="count" name="count" /></dd> +</dl> +<dl> +	<dt><label for="posts_on_queue">{L_POSTS_ON_QUEUE}{L_COLON}</label></dt> +	<dd><select name="queue_select">{S_COUNT_OPTIONS}</select> <input type="number" id="posts_on_queue" name="posts_on_queue" /></select> +</dl> +<!-- IF S_GROUP_LIST --> +<dl> +	<dt><label for="group_id">{L_GROUP}{L_COLON}</label><br /><span>{L_PRUNE_USERS_GROUP_EXPLAIN}</dt> +	<dd><select name="group_id">{S_GROUP_LIST}</select></dd>  </dl> +<!-- ENDIF --> +</fieldset> + +<fieldset> +	<legend>{L_USERNAMES}</legend>  <dl> -	<dt><label for="users">{L_ACP_PRUNE_USERS}:</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt> +	<dt><label for="users">{L_ACP_PRUNE_USERS}{L_COLON}</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt>  	<dd><textarea id="users" name="users" cols="40" rows="5"></textarea></dd>  	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>  </dl> +</fieldset> + +<fieldset> +	<legend>{L_OPTIONS}</legend>  <dl> -	<dt><label for="deleteposts">{L_DELETE_USER_POSTS}:</label><br /><span>{L_DELETE_USER_POSTS_EXPLAIN}</span></dt> +	<dt><label for="deleteposts">{L_DELETE_USER_POSTS}{L_COLON}</label><br /><span>{L_DELETE_USER_POSTS_EXPLAIN}</span></dt>  	<dd><label><input type="radio" class="radio" name="deleteposts" value="1" /> {L_YES}</label>  		<label><input type="radio" class="radio" id="deleteposts" name="deleteposts" value="0" checked="checked" /> {L_NO}</label></dd>  </dl>  <dl> -	<dt><label for="deactivate">{L_DEACTIVATE_DELETE}:</label><br /><span>{L_DEACTIVATE_DELETE_EXPLAIN}</span></dt> +	<dt><label for="deactivate">{L_DEACTIVATE_DELETE}{L_COLON}</label><br /><span>{L_DEACTIVATE_DELETE_EXPLAIN}</span></dt>  	<dd><label><input type="radio" class="radio" name="action" value="delete" /> {L_DELETE_USERS}</label>  		<label><input type="radio" class="radio" id="deactivate" name="action" value="deactivate" checked="checked" /> {L_DEACTIVATE}</label></dd>  </dl> diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html index 1f45109517..a1409b15ef 100644 --- a/phpBB/adm/style/acp_ranks.html +++ b/phpBB/adm/style/acp_ranks.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_EDIT --> @@ -25,23 +25,23 @@  	<fieldset>  		<legend>{L_ACP_RANKS}</legend>  	<dl> -		<dt><label for="title">{L_RANK_TITLE}:</label></dt> +		<dt><label for="title">{L_RANK_TITLE}{L_COLON}</label></dt>  		<dd><input name="title" type="text" id="title" value="{RANK_TITLE}" maxlength="255" /></dd>  	</dl>  	<dl> -		<dt><label for="rank_image">{L_RANK_IMAGE}:</label></dt> +		<dt><label for="rank_image">{L_RANK_IMAGE}{L_COLON}</label></dt>  		<dd><select name="rank_image" id="rank_image" onchange="update_image(this.options[selectedIndex].value);">{S_FILENAME_LIST}</select></dd>  		<dd><img src="{RANK_IMAGE}" id="image" alt="" /></dd>  	</dl>  	<dl> -		<dt><label for="special_rank">{L_RANK_SPECIAL}:</label></dt> +		<dt><label for="special_rank">{L_RANK_SPECIAL}{L_COLON}</label></dt>  		<dd><label><input onclick="dE('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input onclick="dE('posts', 1)" type="radio" class="radio" name="special_rank" value="0"<!-- IF not S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<!-- IF S_SPECIAL_RANK --><div id="posts" style="display: none;"><!-- ELSE --><div id="posts"><!-- ENDIF -->  	<dl> -		<dt><label for="min_posts">{L_RANK_MINIMUM}:</label></dt> -		<dd><input name="min_posts" type="text" id="min_posts" maxlength="10" value="{MIN_POSTS}" /></dd> +		<dt><label for="min_posts">{L_RANK_MINIMUM}{L_COLON}</label></dt> +		<dd><input name="min_posts" type="number" id="min_posts" maxlength="10" value="{MIN_POSTS}" /></dd>  	</dl>  	</div> @@ -65,7 +65,7 @@  	<fieldset class="tabulated">  	<legend>{L_ACP_MANAGE_RANKS}</legend> -	<table cellspacing="1"> +	<table class="table1">  	<thead>  	<tr>  		<th>{L_RANK_IMAGE}</th> @@ -80,7 +80,7 @@  		<td style="text-align: center;"><!-- IF ranks.S_RANK_IMAGE --><img src="{ranks.RANK_IMAGE}" alt="{ranks.RANK_TITLE}" title="{ranks.RANK_TITLE}" /><!-- ELSE -->  -  <!-- ENDIF --></td>  		<td style="text-align: center;">{ranks.RANK_TITLE}</td>  		<td style="text-align: center;"><!-- IF ranks.S_SPECIAL_RANK -->  -  <!-- ELSE -->{ranks.MIN_POSTS}<!-- ENDIF --></td> -		<td style="text-align: center;"><a href="{ranks.U_EDIT}">{ICON_EDIT}</a> <a href="{ranks.U_DELETE}">{ICON_DELETE}</a></td> +		<td style="text-align: center;"><a href="{ranks.U_EDIT}">{ICON_EDIT}</a> <a href="{ranks.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a></td>  	</tr>  	<!-- END ranks -->  	</tbody> diff --git a/phpBB/adm/style/acp_reasons.html b/phpBB/adm/style/acp_reasons.html index 23fcfbdeb8..ca3aebb338 100644 --- a/phpBB/adm/style/acp_reasons.html +++ b/phpBB/adm/style/acp_reasons.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_EDIT_REASON --> @@ -29,7 +29,7 @@  		<legend>{L_TITLE}</legend>  		<p><!-- IF S_TRANSLATED -->{L_IS_TRANSLATED_EXPLAIN}<!-- ELSE -->{L_IS_NOT_TRANSLATED_EXPLAIN}<!-- ENDIF --></p>  	<dl> -		<dt><label for="reason_title">{L_REASON_TITLE}:</label></dt> +		<dt><label for="reason_title">{L_REASON_TITLE}{L_COLON}</label></dt>  		<dd><input name="reason_title" type="text" id="reason_title" value="{REASON_TITLE}" maxlength="255" /></dd>  	</dl>  	<!-- IF S_TRANSLATED --> @@ -39,7 +39,7 @@  	</dl>  	<!-- ENDIF -->  	<dl> -		<dt><label for="reason_description">{L_REASON_DESCRIPTION}:</label></dt> +		<dt><label for="reason_description">{L_REASON_DESCRIPTION}{L_COLON}</label></dt>  		<dd><textarea name="reason_description" id="reason_description" rows="8" cols="80">{REASON_DESCRIPTION}</textarea></dd>  	</dl>  	<!-- IF S_TRANSLATED --> @@ -68,7 +68,7 @@  	<legend>{L_ACP_REASONS}</legend>  	<!-- IF .reasons --> -		<table cellspacing="1"> +		<table class="table1">  			<col class="row1" /><col class="row1" /><col class="row2" />  		<thead>  		<tr> @@ -99,7 +99,7 @@  					<!-- ENDIF -->  					<a href="{reasons.U_EDIT}">{ICON_EDIT}</a>   					<!-- IF reasons.U_DELETE --> -						<a href="{reasons.U_DELETE}">{ICON_DELETE}</a> +						<a href="{reasons.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>  					<!-- ELSE -->  						{ICON_DELETE_DISABLED}  					<!-- ENDIF --> diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html index 5fd7a23d97..496a8b2675 100644 --- a/phpBB/adm/style/acp_search.html +++ b/phpBB/adm/style/acp_search.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_SETTINGS -->  	<h1>{L_ACP_SEARCH_SETTINGS}</h1> @@ -12,40 +12,40 @@  	<fieldset>  		<legend>{L_GENERAL_SEARCH_SETTINGS}</legend>  	<dl> -		<dt><label for="load_search">{L_YES_SEARCH}:</label><br /><span>{L_YES_SEARCH_EXPLAIN}</span></dt> +		<dt><label for="load_search">{L_YES_SEARCH}{L_COLON}</label><br /><span>{L_YES_SEARCH_EXPLAIN}</span></dt>  		<dd><label><input type="radio" class="radio" id="load_search" name="config[load_search]" value="1"<!-- IF S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="config[load_search]" value="0"<!-- IF not S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl> -		<dt><label for="search_interval">{L_SEARCH_INTERVAL}:</label><br /><span>{L_SEARCH_INTERVAL_EXPLAIN}</span></dt> -		<dd><input id="search_interval" type="text" size="4" maxlength="4" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd> +		<dt><label for="search_interval">{L_SEARCH_INTERVAL}{L_COLON}</label><br /><span>{L_SEARCH_INTERVAL_EXPLAIN}</span></dt> +		<dd><input id="search_interval" type="number" size="4" maxlength="4" min="0" max="9999" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd>  	</dl>  	<dl> -		<dt><label for="search_anonymous_interval">{L_SEARCH_GUEST_INTERVAL}:</label><br /><span>{L_SEARCH_GUEST_INTERVAL_EXPLAIN}</span></dt> -		<dd><input id="search_anonymous_interval" type="text" size="4" maxlength="4" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd> +		<dt><label for="search_anonymous_interval">{L_SEARCH_GUEST_INTERVAL}{L_COLON}</label><br /><span>{L_SEARCH_GUEST_INTERVAL_EXPLAIN}</span></dt> +		<dd><input id="search_anonymous_interval" type="number" size="4" maxlength="4" min="0" max="9999" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd>  	</dl>  	<dl> -		<dt><label for="limit_search_load">{L_LIMIT_SEARCH_LOAD}:</label><br /><span>{L_LIMIT_SEARCH_LOAD_EXPLAIN}</span></dt> +		<dt><label for="limit_search_load">{L_LIMIT_SEARCH_LOAD}{L_COLON}</label><br /><span>{L_LIMIT_SEARCH_LOAD_EXPLAIN}</span></dt>  		<dd><input id="limit_search_load" type="text" size="4" maxlength="4" name="config[limit_search_load]" value="{LIMIT_SEARCH_LOAD}" /></dd>  	</dl>  	<dl> -		<dt><label for="min_search_author_chars">{L_MIN_SEARCH_AUTHOR_CHARS}:</label><br /><span>{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}</span></dt> -		<dd><input id="min_search_author_chars" type="text" size="4" maxlength="4" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd> +		<dt><label for="min_search_author_chars">{L_MIN_SEARCH_AUTHOR_CHARS}{L_COLON}</label><br /><span>{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}</span></dt> +		<dd><input id="min_search_author_chars" type="number" size="4" maxlength="4" min="0" max="9999" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd>  	</dl>  	<dl> -		<dt><label for="max_num_search_keywords">{L_MAX_NUM_SEARCH_KEYWORDS}:</label><br /><span>{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}</span></dt> -		<dd><input id="max_num_search_keywords" type="text" size="4" maxlength="4" name="config[max_num_search_keywords]" value="{MAX_NUM_SEARCH_KEYWORDS}" /></dd> +		<dt><label for="max_num_search_keywords">{L_MAX_NUM_SEARCH_KEYWORDS}{L_COLON}</label><br /><span>{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}</span></dt> +		<dd><input id="max_num_search_keywords" type="number" size="4" maxlength="4" min="0" max="9999" name="config[max_num_search_keywords]" value="{MAX_NUM_SEARCH_KEYWORDS}" /></dd>  	</dl>  	<dl> -		<dt><label for="search_store_results">{L_SEARCH_STORE_RESULTS}:</label><br /><span>{L_SEARCH_STORE_RESULTS_EXPLAIN}</span></dt> -		<dd><input id="search_store_results" type="text" size="4" maxlength="6" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd> +		<dt><label for="search_store_results">{L_SEARCH_STORE_RESULTS}{L_COLON}</label><br /><span>{L_SEARCH_STORE_RESULTS_EXPLAIN}</span></dt> +		<dd><input id="search_store_results" type="number" size="4" maxlength="6" min="0" max="999999" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd>  	</dl>  	</fieldset>  	<fieldset>  		<legend>{L_SEARCH_TYPE}</legend>  	<dl> -		<dt><label for="search_type">{L_SEARCH_TYPE}:</label><br /><span>{L_SEARCH_TYPE_EXPLAIN}</span></dt> +		<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>  	</dl>  	</fieldset> @@ -110,9 +110,9 @@  				{backend.S_HIDDEN_FIELDS} -				<legend>{L_INDEX_STATS}: {backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></legend> +				<legend>{L_INDEX_STATS}{L_COLON} {backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></legend> -				<table cellspacing="1"> +				<table class="table1">  					<caption>{backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></caption>  					<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />  				<thead> @@ -126,9 +126,9 @@  				<tbody>  				<!-- BEGIN data -->  					<tr> -						<td>{backend.data.STATISTIC_1}:</td> +						<td>{backend.data.STATISTIC_1}{L_COLON}</td>  						<td>{backend.data.VALUE_1}</td> -						<td>{backend.data.STATISTIC_2}<!-- IF backend.data.STATISTIC_2 -->:<!-- ENDIF --></td> +						<td>{backend.data.STATISTIC_2}<!-- IF backend.data.STATISTIC_2 -->{L_COLON}<!-- ENDIF --></td>  						<td>{backend.data.VALUE_2}</td>  					</tr>  				<!-- END data --> @@ -139,9 +139,11 @@  			<p class="quick">  			<!-- IF backend.S_INDEXED --> -				<input class="button2" type="submit" name="action[delete]" value="{L_DELETE_INDEX}" onclick="popup_progress_bar('delete');" /> +				<input type="hidden" name="action" value="delete" /> +				<input class="button2" type="submit" value="{L_DELETE_INDEX}" onclick="popup_progress_bar('delete');" />  			<!-- ELSE --> -				<input class="button2" type="submit" name="action[create]" value="{L_CREATE_INDEX}" onclick="popup_progress_bar('create');" /> +				<input type="hidden" name="action" value="create" /> +				<input class="button2" type="submit" value="{L_CREATE_INDEX}" onclick="popup_progress_bar('create');" />  			<!-- ENDIF -->  			</p>  			{S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_send_statistics.html b/phpBB/adm/style/acp_send_statistics.html index 2a9b61f314..2d6c4837fd 100644 --- a/phpBB/adm/style/acp_send_statistics.html +++ b/phpBB/adm/style/acp_send_statistics.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <h1>{L_SEND_STATISTICS}</h1> @@ -68,4 +68,4 @@ function iframe_updated()  //]]>  </script> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index 6aa1c0ccc9..b5c691b36b 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -1,541 +1,168 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a> -<!-- IF S_DELETE --> +<!-- IF S_CONFIRM_ACTION --> +<form id="confirm" method="post" action="{S_CONFIRM_ACTION}"> -	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> - -	<h1>{L_TITLE}</h1> - -	<p>{L_EXPLAIN}</p> - -	<form id="acp_styles" method="post" action="{U_ACTION}"> - -	<fieldset> -		<legend>{L_TITLE}</legend> -	<dl> -		<dt><label>{L_NAME}:</label></dt> -		<dd><strong>{NAME}</strong></dd> -	</dl> -	<dl> -		<dt><label for="new_id">{L_REPLACE}:</label><br /><span>{L_REPLACE_EXPLAIN}</span></dt> -		<dd><select id="new_id" name="new_id">{S_REPLACE_OPTIONS}</select></dd> -	</dl> -	<!-- IF S_DELETE_STYLE --> -		<hr /> -		<dl> -			<dt><label for="new_template_id">{L_DELETE_TEMPLATE}:</label><br /><span>{L_REPLACE_TEMPLATE_EXPLAIN}</span></dt> -			<dd><select id="new_template_id" name="new_template_id">{S_REPLACE_TEMPLATE_OPTIONS}</select></dd> -		</dl> -		<dl> -			<dt><label for="new_theme_id">{L_DELETE_THEME}:</label><br /><span>{L_REPLACE_THEME_EXPLAIN}</span></dt> -			<dd><select id="new_theme_id" name="new_theme_id">{S_REPLACE_THEME_OPTIONS}</select></dd> -		</dl> -		<dl> -			<dt><label for="new_imageset_id">{L_DELETE_IMAGESET}:</label><br /><span>{L_REPLACE_IMAGESET_EXPLAIN}</span></dt> -			<dd><select id="new_imageset_id" name="new_imageset_id">{S_REPLACE_IMAGESET_OPTIONS}</select></dd> -		</dl> +<fieldset> +	<h1>{MESSAGE_TITLE}</h1> +	<p>{MESSAGE_TEXT}</p> +	<!-- IF S_CONFIRM_DELETE --> +	<label><input type="checkbox" class="checkbox" name="confirm_delete_files" /> {L_DELETE_FROM_FS}</label>  	<!-- ENDIF --> -	<p class="quick"> -		<input class="button1" type="submit" name="update" value="{L_DELETE}" /> -		{S_FORM_TOKEN} -	</p> -	</fieldset> -	</form> +	{S_HIDDEN_FIELDS} -<!-- ELSEIF S_EDIT_IMAGESET --> - -	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> - -	<h1>{L_TITLE}</h1> - -	<p>{L_EXPLAIN}</p> - -	<!-- IF SUCCESS --> -		<div class="successbox"> -			<p>{L_IMAGESET_UPDATED}</p> -		</div> -	<!-- ENDIF --> - -	<!-- IF ERROR --> -		<div class="errorbox"> -			<p>{L_NO_IMAGE}</p> -		</div> -	<!-- ENDIF --> +	<div style="text-align: center;"> +		<input type="submit" name="confirm" value="{L_YES}" class="button2" />   +		<input type="submit" name="cancel" value="{L_NO}" class="button2" /> +	</div> -	<script type="text/javascript" defer="defer"> -	// <![CDATA[ -		function update_image(newimage) -		{ -			document.getElementById('newimg').src = (newimage) ? '../styles/{A_PATH}/imageset/' + encodeURI(newimage) : 'images/no_image.png'; -		} -	// ]]> -	</script> -	<script type="text/javascript"> -	// <![CDATA[ -		/** -		* Handle displaying/hiding the dimension fields -		*/ -		function display_options(value) -		{ -			if (value == 0) -			{ -				dE('img_dimensions', -1); -			} -			else -			{ -				dE('img_dimensions', 1); -			} -		} +</fieldset> +		 +</form> +<!-- ELSE --> -		/** -		* Init the wanted display functionality if javascript is enabled. -		* If javascript is not available, the user is still able to properly administer. -		*/ -		onload = function() -		{ -			<!-- IF not IMAGE_SIZE --> -				dE('img_dimensions', -1); -			<!-- ENDIF --> -		} -	// ]]> -	</script> +<!-- IF L_TITLE --><h1>{L_TITLE}</h1><!-- ENDIF --> -	<form method="post" action="{U_ACTION}"> +<!-- IF L_EXPLAIN --><p>{L_EXPLAIN}</p><!-- ENDIF --> -	<fieldset class="quick" style="text-align: left;"> -		<legend>{L_SELECT_IMAGE}</legend> -		{L_SELECT_IMAGE}: <select name="imgname" onchange="this.form.submit();"> -		<!-- BEGIN category --> -			<option class="sep" value="" disabled="disabled">{category.NAME}</option> -				<!-- BEGIN images --><option value="{category.images.VALUE}"<!-- IF category.images.SELECTED--> selected="selected"<!-- ENDIF -->>    {category.images.TEXT}</option> -				<!-- END images --> -			<!-- END category --> -		</select>  <input class="button1" type="submit" value="{L_SELECT}" tabindex="100" /> -	</fieldset> +<form id="acp_styles" method="post" action="{U_ACTION}"> +{S_HIDDEN_FIELDS} +{S_FORM_TOKEN} +<!-- IF S_STYLE_DETAILS --> +	<input type="hidden" name="id" value="{STYLE_ID}" />  	<fieldset> -		<legend>{L_EDIT_IMAGESET}</legend>  	<dl> -		<dt><label>{L_CURRENT_IMAGE}:</label></dt> -		<dd><img src="<!-- IF IMAGE_REQUEST -->{IMAGE_REQUEST}<!-- ELSE -->images/no_image.png<!-- ENDIF -->" alt="" /></dd> +		<dt><label for="name">{L_STYLE_NAME}{L_COLON}</label></dt> +		<dd><input type="text" id="name" name="style_name" value="{STYLE_NAME}" /></dd>  	</dl>  	<dl> -		<dt><label>{L_SELECTED_IMAGE}:</label></dt> -		<dd><img src="{IMG_SRC}" id="newimg" alt="" /></dd> +		<dt><label>{L_STYLE_PATH}</label></dt> +		<dd><strong>{STYLE_PATH}</strong></dd>  	</dl> -	</fieldset> - -	<fieldset> -	<legend>{L_IMAGE}</legend>  	<dl> -		<dt><label for="imgpath">{L_IMAGE}:</label></dt> -		<dd><select id="imgpath" name="imgpath" onchange="update_image(this.options[selectedIndex].value);"><option value=""<!-- IF not IMAGE_SELECT--> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option> -			<!-- BEGIN imagesetlist --> -			<option class="sep" value=""><!-- IF imagesetlist.TYPE -->{L_LOCALISED_IMAGES}<!-- ELSE -->{L_GLOBAL_IMAGES}<!-- ENDIF --></option> -				<!-- BEGIN images --> -				<option value="{imagesetlist.images.VALUE}"<!-- IF imagesetlist.images.SELECTED--> selected="selected"<!-- ENDIF -->>{imagesetlist.images.TEXT}</option> -				<!-- END images --> -			<!-- END imagesetlist --> -			</select> -		</dd> +		<dt><label for="name">{L_COPYRIGHT}{L_COLON}</label></dt> +		<dd><strong>{STYLE_COPYRIGHT}</strong></dd>  	</dl>  	<dl> -		<dt><label for="imgsize">{L_INCLUDE_DIMENSIONS}:</label><br /><span>{L_DIMENSIONS_EXPLAIN}</span></dt> -		<dd><label><input type="radio" class="radio" name="imgsize" id="imgsize" onclick="display_options(1);" value="1"<!-- IF IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> -			<label><input type="radio" class="radio" name="imgsize" onclick="display_options(0);" value="0"<!-- IF not IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd> +		<dt><label for="style_parent">{L_INHERITING_FROM}{L_COLON}</label></dt> +		<dd><select id="style_parent" name="style_parent"> +			<option value=""<!-- IF STYLE_PARENT == 0 --> selected="selected"<!-- ENDIF -->> - </option> +			<!-- BEGIN parent_styles --> +				<option value="{parent_styles.STYLE_ID}"<!-- IF parent_styles.STYLE_ID == STYLE_PARENT --> selected="selected"<!-- ENDIF -->>{parent_styles.SPACER}{parent_styles.STYLE_NAME}</option> +			<!-- END parent_styles --> +		</select></dd>  	</dl> -	<div id="img_dimensions"> -		<dl> -			<dt><label for="imgwidth">{L_IMAGE_WIDTH}:</label><br /><span>{L_AUTOMATIC_EXPLAIN}</span></dt> -			<dd><input id="imgwidth" type="text" name="imgwidth" value="{IMAGE_SIZE}" /></dd> -		</dl> -		<dl> -			<dt><label for="imgheight">{L_IMAGE_HEIGHT}:</label><br /><span>{L_AUTOMATIC_EXPLAIN}</span></dt> -			<dd><input id="imgheight" type="text" name="imgheight" value="{IMAGE_HEIGHT}" /></dd> -		</dl> -	</div> -	</fieldset> - -	<fieldset class="submit-buttons"> -		<legend>{L_SUBMIT}</legend> -		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />  <input class="button2" type="reset" value="{L_RESET}" /> -		{S_FORM_TOKEN} -	</fieldset> -	</form> - -<!-- ELSEIF S_EDIT_TEMPLATE or S_EDIT_THEME --> - -	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> - -	<h1>{L_EDIT}</h1> - -	<p>{L_EDIT_EXPLAIN}</p> - -	<p>{L_SELECTED}: <strong>{SELECTED_TEMPLATE}</strong></p> - -	<form id="acp_styles" method="post" action="{U_ACTION}"> - -	<!-- IF S_EDIT_TEMPLATE or (S_EDIT_THEME and not S_THEME_IN_DB) --> -	<fieldset> -		<legend>{L_SELECT}</legend>  	<dl> -		<dt><label for="template_file">{L_FILE}:</label></dt> -		<dd><select id="template_file" name="template_file" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_TEMPLATES}</select> <input class="button2" type="submit" value="{L_SELECT}" /></dd> +		<dt><label for="style_active">{L_STYLE_ACTIVE}{L_COLON}</label></dt> +		<dd><label><input type="radio" class="radio" name="style_active" value="1"<!-- IF S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label> +			<label><input type="radio" class="radio" name="style_active" value="0"<!-- IF not S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl> -	{S_FORM_TOKEN} -	</fieldset> -	<!-- ENDIF --> -	</form> - -	<!-- IF TEMPLATE_FILE or (S_EDIT_THEME and S_THEME_IN_DB) --> -		<script type="text/javascript" defer="defer"> -		// <![CDATA[ - -			function change_editor_height(height) -			{ -				height = Number(height); - -				if (isNaN(height)) -				{ -					return; -				} - -				editor = document.getElementById('template_data'); -				editor.rows = Math.max(5, Math.min(height, 999)); - -				append_text_rows('acp_styles', height); -				append_text_rows('acp_template', height); -			} - -			function append_text_rows(form_name, value) -			{ -				value = Number(value); - -				if (isNaN(value)) -				{ -					return; -				} - -				url = document.getElementById(form_name).action; - -				// Make sure & is actually... & -				url = url.replace(/&/g, '&'); - -				var_start = url.indexOf('&text_rows='); -				if (var_start == -1) -				{ -					document.getElementById(form_name).action = url + "&text_rows=" + value; -				} -				else -				{ -					url_start = url.substring(0, var_start + 1); -					var_end = url.substring(var_start + 1).indexOf('&'); -					if (var_end == -1) -					{ -						document.getElementById(form_name).action = url_start + "text_rows=" + value; -					} -					else -					{ -						document.getElementById(form_name).action = url_start + url.substring(var_end + var_start + 2) + "&text_rows=" + value; -					} -				} -			} - -		// ]]> -		</script> - -		<form id="acp_template" method="post" action="{U_ACTION}"> - -		<fieldset> -			<legend>{L_EDITOR}</legend> -		<!-- IF S_EDIT_TEMPLATE or (S_EDIT_THEME and not S_THEME_IN_DB) --> +	<!-- IF not S_STYLE_DEFAULT -->  		<dl> -			<dt><label>{L_SELECTED_FILE}:</label></dt> -			<dd>{TEMPLATE_FILE}</dd> +			<dt><label for="style_default">{L_STYLE_DEFAULT}{L_COLON}</label></dt> +			<dd><label><input type="radio" class="radio" name="style_default" value="1" /> {L_YES}</label> +				<label><input type="radio" class="radio" id="style_default" name="style_default" value="0" checked="checked" /> {L_NO}</label></dd>  		</dl> -		<!-- ENDIF --> -		<dl> -			<dt><label for="text_rows">{L_EDITOR_HEIGHT}:</label></dt> -			<dd><input id="text_rows" type="text" maxlength="3" value="{TEXT_ROWS}" /> <input class="button2" type="button" name="update" onclick="change_editor_height(this.form.text_rows.value);" value="{L_UPDATE}" /></dd> -		</dl> -		<textarea id="template_data" name="template_data" style="font-family:'Courier New', monospace;font-size:9pt;line-height:125%;width:100%;" cols="80" rows="{TEXT_ROWS}">{TEMPLATE_DATA}</textarea> -		</fieldset> - -		<fieldset class="submit-buttons"> -			<legend>{L_SUBMIT}</legend> -			{S_HIDDEN_FIELDS} -			{S_FORM_TOKEN} -			<input class="button1" id="save" type="submit" name="save" value="{L_SUBMIT}" /> -		</fieldset> -		</form>  	<!-- ENDIF --> - -<!-- ELSEIF S_CACHE --> - -	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> - -	<h1>{L_TEMPLATE_CACHE}</h1> - -	<p>{L_TEMPLATE_CACHE_EXPLAIN}</p> - -	<form id="acp_styles" method="post" action="{U_ACTION}"> -	<fieldset class="tabulated"> -	<legend>{L_TEMPLATE_CACHE}</legend> - -	<table cellspacing="1"> -	<thead> -	<tr> -		<th>{L_CACHE_FILENAME}</th> -		<th>{L_CACHE_FILESIZE}</th> -		<th>{L_CACHE_CACHED}</th> -		<th>{L_CACHE_MODIFIED}</th> -		<th>{L_MARK}</th> -	</tr> -	</thead> -	<tbody> -	<!-- BEGIN file --> -		<!-- IF file.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> -			<td><a href="{file.U_VIEWSOURCE}" onclick="popup(this.href, 750, 550, '_source'); return false;">{file.FILENAME_PATH}</a></td> -			<td>{file.FILESIZE}</td> -			<td>{file.CACHED}</td> -			<td>{file.MODIFIED}</td> -			<td><input type="checkbox" class="radio" name="delete[]" value="{file.FILENAME}" /></td> -		</tr> -	<!-- BEGINELSE --> -		<tr class="row1"> -			<td colspan="5">{L_TEMPLATE_CACHE_EMPTY}</td> -		</tr> -	<!-- END file --> -	</tbody> -	</table> - -	<p class="quick"> -		<span class="small"><a href="#" onclick="marklist('acp_styles', 'delete', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('acp_styles', 'delete', false); return false;">{L_UNMARK_ALL}</a></span><br /> -		{S_FORM_TOKEN} -		<input class="button1" type="submit" id="submit" name="submit" value="{L_DELETE_MARKED}" /> -	</p>  	</fieldset> -	</form> - -<!-- ELSEIF S_EXPORT --> - -	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> - -	<h1>{L_TITLE}</h1> -	<p>{L_EXPLAIN}</p> - -	<!-- IF S_ERROR_MSG --> -		<div class="errorbox"> -			<h3>{L_WARNING}</h3> -			<p>{ERROR_MSG}</p> -		</div> -	<!-- ENDIF --> - -	<form id="acp_styles" method="post" action="{U_ACTION}"> - -	<fieldset> -		<legend>{L_TITLE}</legend> -	<dl> -		<dt><label>{L_NAME}:</label></dt> -		<dd><strong>{NAME}</strong></dd> -	</dl> -	<!-- IF S_STYLE --> -		<dl> -			<dt><label for="inc_template">{L_INCLUDE_TEMPLATE}:</label></dt> -			<dd><label><input type="radio" class="radio" id="inc_template" name="inc_template" value="1" checked="checked" /> {L_YES}</label> -				<label><input type="radio" class="radio" name="inc_template" value="0" /> {L_NO}</label></dd> -		</dl> -		<dl> -			<dt><label for="inc_theme">{L_INCLUDE_THEME}:</label></dt> -			<dd><label><input type="radio" class="radio" id="inc_theme" name="inc_theme" value="1" checked="checked" /> {L_YES}</label> -				<label><input type="radio" class="radio" name="inc_theme" value="0" /> {L_NO}</label></dd> -		</dl> -		<dl> -			<dt><label for="inc_imageset">{L_INCLUDE_IMAGESET}:</label></dt> -			<dd><label><input type="radio" class="radio" id="inc_imageset" name="inc_imageset" value="1" checked="checked" /> {L_YES}</label> -				<label><input type="radio" class="radio" name="inc_imageset" value="0" /> {L_NO}</label></dd> -		</dl> -	<!-- ENDIF --> -	<dl> -		<dt><label for="store">{L_DOWNLOAD_STORE}:</label><br /><span>{L_DOWNLOAD_STORE_EXPLAIN}</span></dt> -		<dd><label><input type="radio" class="radio" id="store" name="store" value="1" checked="checked" /> {L_EXPORT_STORE}</label> -			<label><input type="radio" class="radio" name="store" value="0" /> {L_EXPORT_DOWNLOAD}</label></dd> -	</dl> -	<dl> -		<dt><label for="format">{L_ARCHIVE_FORMAT}:</label></dt> -		<dd>{FORMAT_BUTTONS}</dd> -	</dl> - -	<p class="quick"> -		{S_FORM_TOKEN} +	<fieldset class="submit-buttons"> +		<legend>{L_SUBMIT}</legend>  		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> -	</p> +		<a href="{U_ACTION}" class="button2">{L_BACK}</a> +		{S_FORM_TOKEN}  	</fieldset> +<!-- ENDIF --> - -	</form> - -<!-- ELSEIF S_FRONTEND --> - -	<h1>{L_TITLE}</h1> - -	<p>{L_EXPLAIN}</p> - -	<!-- IF S_STYLE --> <!-- DEFINE $COLSPAN = 5 --> <!-- ELSE --> <!-- DEFINE $COLSPAN = 4 --> <!-- ENDIF --> - -	<table cellspacing="1"> -		<col class="row1" /><!-- IF S_STYLE --><col class="row1" /><!-- ENDIF --><col class="row2" /><col class="row2" /> +<!-- IF .styles_list --> +	<table class="table1 styles">  	<thead>  	<tr> -		<th>{L_NAME}</th> -		<!-- IF S_STYLE --><th>{L_STYLE_USED_BY}</th><!-- ENDIF --> -		<th>{L_OPTIONS}</th> -		<th>{L_ACTIONS}</th> +		<th>{L_STYLE_NAME}</th> +		<!-- IF not STYLES_LIST_HIDE_COUNT --><th width="10%" style="white-space: nowrap; text-align: center;">{L_STYLE_USED_BY}</th><!-- ENDIF --> +		<th width="25%" style="white-space: nowrap; text-align: center;">{L_ACTIONS}</th> +		{STYLES_LIST_EXTRA} +		<th> </th>  	</tr>  	</thead> -	<tbody> -	<tr> -		<td class="row3" colspan="{$COLSPAN}"><strong>{L_INSTALLED}</strong></td> -	</tr> -	<!-- BEGIN installed --> -	<!-- IF installed.S_INACTIVE and not $INACTIVE_STYLES --> -		<!-- DEFINE $INACTIVE_STYLES = 1 --> -		<tr> -			<td class="row3" colspan="{$COLSPAN}"><strong>{L_INACTIVE_STYLES}</strong></td> -		</tr> -	<!-- ENDIF --> -	<tr> -		<td><strong>{installed.NAME}</strong><!-- IF installed.S_DEFAULT_STYLE --> *<!-- ENDIF --></td> -		<!-- IF S_STYLE --> -			<td style="text-align: center;">{installed.STYLE_COUNT}</td> +	<!-- BEGIN styles_list --> +	<tbody id="styles-list-{styles_list.S_ROW_COUNT}"> +	<tr<!-- IF styles_list.STYLE_ID and not styles_list.STYLE_ACTIVE --> class="row-inactive"<!-- ENDIF -->> +		<!-- IF styles_list.LEVEL is odd --> +			<!-- IF $ROW_CLASS == 'row1a' --><!-- DEFINE $ROW_CLASS = 'row1b' --><!-- ELSE --><!-- DEFINE $ROW_CLASS = 'row1a' --><!-- ENDIF --> +		<!-- ELSE --> +			<!-- IF $ROW_CLASS == 'row2a' --><!-- DEFINE $ROW_CLASS = 'row2b' --><!-- ELSE --><!-- DEFINE $ROW_CLASS = 'row2a' --><!-- ENDIF -->  		<!-- ENDIF --> -		<td style="text-align: center;"> -			{installed.S_OPTIONS} -		</td> -		<td style="text-align: center;"> -			<!-- IF S_STYLE --> -				<a href="{installed.U_STYLE_ACT_DEACT}">{installed.L_STYLE_ACT_DEACT}</a> | +		<td class="{$ROW_CLASS}" style="padding-{S_CONTENT_FLOW_BEGIN}: {styles_list.PADDING}px;"> +			<!-- IF styles_list.STYLE_ID and styles_list.COMMENT == '' and styles_list.STYLE_ACTIVE --> +				<div class="default-style" style="display: none; float: {S_CONTENT_FLOW_END};"> +					<input class="radio" type="radio" name="default" value="{styles_list.STYLE_ID}"<!-- IF styles_list.DEFAULT --> checked="checked"<!-- ELSE --><!-- DEFINE $S_DEFAULT = 1 --><!-- ENDIF --> title="{L_STYLE_DEFAULT}" /> +				</div> +			<!-- ENDIF --> +			<!-- IF styles_list.DEFAULT or styles_list.SHOW_COPYRIGHT --> +				<strong>{styles_list.STYLE_NAME}</strong> +				<!-- IF styles_list.SHOW_COPYRIGHT and styles_list.COMMENT == '' --><span><br />{styles_list.STYLE_COPYRIGHT}</span><!-- ENDIF --> +			<!-- ELSE --> +				<span>{styles_list.STYLE_NAME}</span>  			<!-- ENDIF --> -			{installed.S_ACTIONS} -			<!-- IF S_STYLE --> -				| <a href="{installed.U_PREVIEW}">{L_PREVIEW}</a> +			<!-- IF styles_list.COMMENT != '' --> +				<span class="error"><br />{styles_list.COMMENT}</span> +			<!-- ENDIF --> +			<!-- IF not styles_list.STYLE_ID and styles_list.COMMENT == '' --> +				<span class="style-path"><br />{L_STYLE_PATH} {styles_list.STYLE_PATH_FULL}</span> +			<!-- ENDIF --> +		</td> +		<!-- IF not STYLES_LIST_HIDE_COUNT --> +			<td class="{$ROW_CLASS} users">{styles_list.USERS}</td> +		<!-- ENDIF --> +		<td class="{$ROW_CLASS} actions"> +			<!-- BEGIN actions --> +				<!-- IF styles_list.actions.S_ROW_COUNT > 0 --> | <!-- ENDIF --> +				<!-- IF styles_list.actions.U_ACTION --> +					<a href="{styles_list.actions.U_ACTION}"{styles_list.actions.U_ACTION_ATTR}>{styles_list.actions.L_ACTION}</a> +				<!-- ENDIF --> +				{styles_list.actions.HTML} +			<!-- END actions --> +		</td> +		{styles_list.EXTRA} +		<td class="{$ROW_CLASS} mark" width="20"> +			<!-- IF styles_list.STYLE_ID --> +				<input class="checkbox" type="checkbox" name="ids[]" value="{styles_list.STYLE_ID}" /> +			<!-- ELSE --> +				<!-- IF styles_list.COMMENT != '' --> +					  +				<!-- ELSE --> +					<input class="checkbox" type="checkbox" name="dirs[]" value="{styles_list.STYLE_PATH}" /> +				<!-- ENDIF -->  			<!-- ENDIF -->  		</td>  	</tr> -	<!-- END installed --> -	<tr> -		<td class="row3" colspan="{$COLSPAN}"><strong>{L_UNINSTALLED}</strong></td> -	</tr> -	<!-- IF not .uninstalled --> -		<tr> -			<td class="row1" colspan="{$COLSPAN}" style="text-align: center;">{L_NO_UNINSTALLED}</td> -		</tr> -	<!-- ENDIF --> -	<!-- BEGIN uninstalled --> -		<tr> -			<td<!-- IF S_STYLE --> colspan="2"<!-- ENDIF -->><strong>{uninstalled.NAME}</strong><br /><span>{L_COPYRIGHT}: {uninstalled.COPYRIGHT}</span></td> -			<td style="text-align: center;" colspan="2"><a href="{uninstalled.U_INSTALL}">{L_INSTALL}</a></td> -		</tr> -	<!-- END uninstalled -->  	</tbody> +	<!-- END styles_list -->  	</table> +<!-- ENDIF --> -	<!-- IF S_STYLE --> -		<form id="acp_styles" method="post" action="{U_ACTION}"> - -		<fieldset class="quick"> -			<legend>{L_CREATE}</legend> -			{L_CREATE}: <input type="text" name="name" value="" /> {L_FROM} <select name="basis">{S_BASIS_OPTIONS}</select> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" /> -		</fieldset> - -		</form> -	<!-- ENDIF --> - -<!-- ELSEIF S_DETAILS --> - -	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> - -	<h1>{L_TITLE}</h1> - -	<p>{L_EXPLAIN}</p> - -	<!-- IF S_ERROR_MSG --> -		<div class="errorbox"> -			<h3>{L_WARNING}</h3> -			<p>{ERROR_MSG}</p> -		</div> -	<!-- ENDIF --> - -	<form id="acp_styles" method="post" action="{U_ACTION}"> - -	<fieldset> -		<legend>{L_TITLE}</legend> -	<dl> -		<dt><label for="name">{L_NAME}:</label></dt> -		<dd><!-- IF S_INSTALL --><strong id="name">{NAME}</strong><!-- ELSE --><input type="text" id="name" name="name" value="{NAME}" /><!-- ENDIF --></dd> -	</dl> -	<dl> -		<dt><label for="copyright">{L_COPYRIGHT}:</label></dt> -		<dd><!-- IF S_INSTALL --><strong id="copyright">{COPYRIGHT}</strong><!-- ELSE --><input type="text" id="copyright" name="copyright" value="{COPYRIGHT}" /><!-- ENDIF --></dd> -	</dl> -	<!-- IF S_SUPERTEMPLATE --> -	<dl> -		<dt><label for="inheriting">{L_INHERITING_FROM}:</label></dt> -		<dd><strong id="inheriting">{S_SUPERTEMPLATE}</strong></dd> -	</dl> -	<!-- ENDIF --> -	<!-- IF S_STYLE and not S_BASIS --> -		<dl> -			<dt><label for="template_id">{L_STYLE_TEMPLATE}:</label></dt> -			<dd><!-- IF S_INSTALL --><strong id="template_id">{TEMPLATE_NAME}</strong><!-- ELSE --><select id="template_id" name="template_id">{S_TEMPLATE_OPTIONS}</select><!-- ENDIF --></dd> -		</dl> -		<dl> -			<dt><label for="theme_id">{L_STYLE_THEME}:</label></dt> -			<dd><!-- IF S_INSTALL --><strong id="theme_id">{THEME_NAME}</strong><!-- ELSE --><select id="theme_id" name="theme_id">{S_THEME_OPTIONS}</select><!-- ENDIF --></dd> -		</dl> -		<dl> -			<dt><label for="imageset_id">{L_STYLE_IMAGESET}:</label></dt> -			<dd><!-- IF S_INSTALL --><strong id="imageset_id">{IMAGESET_NAME}</strong><!-- ELSE --><select id="imageset_id" name="imageset_id">{S_IMAGESET_OPTIONS}</select><!-- ENDIF --></dd> -		</dl> -	<!-- ENDIF --> -	<!-- IF (S_TEMPLATE or S_THEME) and (S_LOCATION or not S_INSTALL) --> -		<dl> -			<dt><label for="store_db">{L_LOCATION}:</label><br /><span><!-- IF S_STORE_DB_DISABLED -->{L_LOCATION_DISABLED_EXPLAIN}<!-- ELSE -->{L_LOCATION_EXPLAIN}<!-- ENDIF --></span></dt> -			<dd><label><input type="radio" class="radio" name="store_db" value="0"<!-- IF not S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> <!-- IF S_STORE_DB_DISABLED -->disabled="disabled" <!-- ENDIF --> />{L_STORE_FILESYSTEM}</label> -				<label><input type="radio" class="radio" name="store_db" value="1"<!-- IF S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> <!-- IF S_STORE_DB_DISABLED -->disabled="disabled" <!-- ENDIF -->/> {L_STORE_DATABASE}</label></dd> -		</dl> -	<!-- ENDIF --> -	<!-- IF S_STYLE --> -		</fieldset> - -		<fieldset> -			<legend>{L_OPTIONS}</legend> -		<dl> -			<dt><label for="style_active">{L_STYLE_ACTIVE}:</label></dt> -			<dd><label><input type="radio" class="radio" name="style_active" value="1"<!-- IF S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label> -				<label><input type="radio" class="radio" name="style_active" value="0"<!-- IF not S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd> -		</dl> -		<!-- IF not S_STYLE_DEFAULT --> -			<dl> -				<dt><label for="style_default">{L_STYLE_DEFAULT}:</label></dt> -				<dd><label><input type="radio" class="radio" name="style_default" value="1" /> {L_YES}</label> -					<label><input type="radio" class="radio" id="style_default" name="style_default" value="0" checked="checked" /> {L_NO}</label></dd> -			</dl> -		<!-- ENDIF --> -	<!-- ENDIF --> +<!-- IF .extra_actions --> +	<fieldset class="quick"> +		<!-- BEGIN extra_actions --> +			<input type="submit" name="{extra_actions.ACTION_NAME}" class="button2" value="{extra_actions.L_ACTION}" /> +		<!-- END extra_actions -->  	</fieldset> +<!-- ENDIF --> -	<fieldset class="submit-buttons"> -		<legend>{L_SUBMIT}</legend> -		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> -		{S_FORM_TOKEN} +<!-- IF .extra_links --> +	<fieldset class="quick"> +		<!-- BEGIN extra_links --> +			<a class="button2" href="{extra_links.U_ACTION}">{extra_links.L_ACTION}</a> +		<!-- END extra_links -->  	</fieldset> +<!-- ENDIF --> -	</form> +</form>  <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_update.html b/phpBB/adm/style/acp_update.html index a87366a78b..00d37515b3 100644 --- a/phpBB/adm/style/acp_update.html +++ b/phpBB/adm/style/acp_update.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_VERSION_CHECK --> @@ -49,4 +49,4 @@  <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index d5a29a21cc..b213587def 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_SELECT_USER --> @@ -13,7 +13,7 @@  	<fieldset>  		<legend>{L_SELECT_USER}</legend>  	<dl> -		<dt><label for="username">{L_ENTER_USERNAME}:</label></dt> +		<dt><label for="username">{L_ENTER_USERNAME}{L_COLON}</label></dt>  		<dd><input class="text medium" type="text" id="username" name="username" /></dd>  		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>  		<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="u" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd> @@ -68,7 +68,7 @@  	<form id="mode_select" method="post" action="{U_MODE_SELECT}">  	<fieldset class="quick"> -		{L_SELECT_FORM}: <select name="mode" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_FORM_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" /> +		{L_SELECT_FORM}{L_COLON} <select name="mode" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_FORM_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" />  		{S_FORM_TOKEN}  	</fieldset>  	</form> @@ -106,7 +106,7 @@  	<fieldset>  		<legend>{L_ACP_USER_RANK}</legend>  	<dl> -		<dt><label for="user_rank">{L_USER_RANK}:</label></dt> +		<dt><label for="user_rank">{L_USER_RANK}{L_COLON}</label></dt>  		<dd><select name="user_rank" id="user_rank">{S_RANK_OPTIONS}</select></dd>  	</dl>  	</fieldset> @@ -125,7 +125,7 @@  	<form id="user_groups" method="post" action="{U_ACTION}"> -	<table cellspacing="1"> +	<table class="table1">  	<tbody>  	<!-- BEGIN group -->  		<!-- IF group.S_NEW_GROUP_TYPE --> @@ -146,7 +146,7 @@  	<!-- IF S_GROUP_OPTIONS -->  		<fieldset class="quick"> -			{L_USER_GROUP_ADD}: <select name="g">{S_GROUP_OPTIONS}</select> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> +			{L_USER_GROUP_ADD}{L_COLON} <select name="g">{S_GROUP_OPTIONS}</select> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" />  			{S_FORM_TOKEN}  		</fieldset>  	<!-- ENDIF --> @@ -157,14 +157,14 @@  	<form id="user_attachments" method="post" action="{U_ACTION}"> -	<!-- IF PAGINATION -->  	<div class="pagination"> -		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> -	</div> +	<!-- IF .pagination --> +		<!-- INCLUDE pagination.html -->  	<!-- ENDIF --> +	</div>  	<!-- IF .attach --> -	<table cellspacing="1"> +	<table class="table1">  	<thead>  	<tr>  		<th>{L_FILENAME}</th> @@ -177,7 +177,7 @@  	<tbody>  	<!-- BEGIN attach -->  		<!-- IF attach.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> -		<td><a href="{attach.U_DOWNLOAD}">{attach.REAL_FILENAME}</a><br /><span class="small"><!-- IF attach.S_IN_MESSAGE --><strong>{L_PM}: </strong><!-- ELSE --><strong>{L_POST}: </strong><!-- ENDIF --><a href="{attach.U_VIEW_TOPIC}">{attach.TOPIC_TITLE}</a></span></td> +		<td><a href="{attach.U_DOWNLOAD}">{attach.REAL_FILENAME}</a><br /><span class="small"><!-- IF attach.S_IN_MESSAGE --><strong>{L_PM}{L_COLON} </strong><!-- ELSE --><strong>{L_POST}{L_COLON} </strong><!-- ENDIF --><a href="{attach.U_VIEW_TOPIC}">{attach.TOPIC_TITLE}</a></span></td>  		<td style="text-align: center">{attach.POST_TIME}</td>  		<td style="text-align: center">{attach.SIZE}</td>  		<td style="text-align: center">{attach.DOWNLOAD_COUNT}</td> @@ -192,15 +192,15 @@  	</div>  	<!-- ENDIF -->  	<fieldset class="display-options"> -		{L_SORT_BY}: <select name="sk">{S_SORT_KEY}</select> <select name="sd">{S_SORT_DIR}</select> +		{L_SORT_BY}{L_COLON} <select name="sk">{S_SORT_KEY}</select> <select name="sd">{S_SORT_DIR}</select>  		<input class="button2" type="submit" value="{L_GO}" name="sort" />  	</fieldset>  	<hr /> -	<!-- IF PAGINATION -->  	<div class="pagination"> -		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> -	</div> +	<!-- IF .pagination --> +		<!-- INCLUDE pagination.html -->  	<!-- ENDIF --> +	</div>  	<fieldset class="quick">  		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" /> @@ -219,7 +219,7 @@  	<form id="select_forum" method="post" action="{U_ACTION}">  		<fieldset class="quick" style="text-align: left;"> -			{L_SELECT_FORUM}: <select name="f">{S_FORUM_OPTIONS}</select> +			{L_SELECT_FORUM}{L_COLON} <select name="f">{S_FORUM_OPTIONS}</select>  			<input class="button2" type="submit" value="{L_GO}" name="select" />  			{S_FORM_TOKEN}  		</fieldset> diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html index 2b2676a19a..0a72bb0b62 100644 --- a/phpBB/adm/style/acp_users_avatar.html +++ b/phpBB/adm/style/acp_users_avatar.html @@ -1,78 +1,39 @@ -	<form id="avatar_settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->> +	<form id="avatar_settings" method="post" action="{U_ACTION}" enctype="multipart/form-data">  	<fieldset>  		<legend>{L_ACP_USER_AVATAR}</legend> -	<dl> -		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt> -		<dd>{AVATAR_IMAGE}</dd> -		<dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd> -	</dl> -	<!-- IF not S_IN_AVATAR_GALLERY --> -		<!-- IF S_UPLOAD_FILE --> -			<dl>  -				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt> -				<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_MAX_FILESIZE}" /><input type="file" id="uploadfile" name="uploadfile" /></dd> -			</dl> -		<!-- ENDIF --> -		<!-- IF S_REMOTE_UPLOAD --> -			<dl> -				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt> -				<dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd> -			</dl> -		<!-- ENDIF --> -		<!-- IF S_ALLOW_REMOTE --> -			<dl> -				<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt> -				<dd><input name="remotelink" type="text" id="remotelink" value="" /></dd> -			</dl> -			<dl> -				<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt> -				<dd><input name="width" type="text" id="width" size="3" value="{USER_AVATAR_WIDTH}" /> <span>{L_PIXEL} × </span> <input type="text" name="height" size="3" value="{USER_AVATAR_HEIGHT}" /> <span>{L_PIXEL}</span></dd> -			</dl> -		<!-- ENDIF --> -		<!-- IF S_DISPLAY_GALLERY --> -			<dl>  -				<dt><label>{L_AVATAR_GALLERY}:</label></dt> -				<dd><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></dd> -			</dl> -		<!-- ENDIF --> -	<!-- ELSE --> -		</fieldset> - -		<fieldset> -			<legend>{L_AVATAR_GALLERY}</legend> +	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->  		<dl> -			<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt> -			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd> +			<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt> +			<dd>{AVATAR}</dd> +			<dd><label for="avatar_delete"><input type="checkbox" name="avatar_delete" id="avatar_delete" /> {L_DELETE_AVATAR}</label></dd>  		</dl> +	</fieldset> +	<fieldset> +		<legend>{L_AVATAR_SELECT}</legend>  		<dl> -			<table cellspacing="1"> -			<!-- BEGIN avatar_row --> -			<tr>  -				<!-- BEGIN avatar_column --> -					<td class="row1" style="text-align: center;"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td> -				<!-- END avatar_column --> -			</tr> -			<tr> -				<!-- BEGIN avatar_option_column --> -					<td class="row2" style="text-align: center;"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td> -				<!-- END avatar_option_column --> -			</tr> -			<!-- END avatar_row --> -			</table> +			<dt><label>{L_AVATAR_TYPE}</label></dt> +			<dd><select name="avatar_driver" id="avatar_driver"> +				<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> +				<!-- END avatar_drivers --> +			</select></dd>  		</dl> -		</fieldset> -		 -		<fieldset class="quick" style="margin-top: -15px;"> -			<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" /> -		</fieldset> -	 -	<!-- ENDIF --> +		<div id="avatar_options"> +		<!-- BEGIN avatar_drivers --> +			<div id="avatar_option_{avatar_drivers.DRIVER}"> +				<p>{avatar_drivers.L_EXPLAIN}</p> +				{avatar_drivers.OUTPUT} +			</div> +		<!-- END avatar_drivers --> +		</div>  	</fieldset>  	<fieldset class="quick"> -		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> -		{S_FORM_TOKEN} +		<input type="submit" name="update" value="{L_SUBMIT}" class="button1" /> +	{S_FORM_TOKEN}  	</fieldset> -	 -	</form>
\ No newline at end of file +	</form> + +	<!-- INCLUDEJS avatars.js --> diff --git a/phpBB/adm/style/acp_users_feedback.html b/phpBB/adm/style/acp_users_feedback.html index e11a8e6ec1..95892f2822 100644 --- a/phpBB/adm/style/acp_users_feedback.html +++ b/phpBB/adm/style/acp_users_feedback.html @@ -1,13 +1,13 @@  	<form id="list" method="post" action="{U_ACTION}"> -	<!-- IF PAGINATION -->  	<div class="pagination"> -			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> -	</div> +	<!-- IF .pagination --> +		<!-- INCLUDE pagination.html -->  	<!-- ENDIF --> +	</div>  	<!-- IF .log --> -	<table cellspacing="1"> +	<table class="table1">  	<thead>  	<tr>  		<th>{L_REPORT_BY}</th> @@ -40,15 +40,15 @@  	<!-- ENDIF -->  	<fieldset class="display-options"> -		{L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} +		{L_DISPLAY_LOG}{L_COLON}  {S_LIMIT_DAYS} {L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}  		<input class="button2" type="submit" value="{L_GO}" name="sort" />  	</fieldset>  	<hr /> -	<!-- IF PAGINATION -->  	<div class="pagination"> -			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> -	</div> +	<!-- IF .pagination --> +		<!-- INCLUDE pagination.html -->  	<!-- ENDIF --> +	</div>  	<!-- IF S_CLEARLOGS -->  		<fieldset class="quick"> @@ -73,4 +73,4 @@  		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />  	</fieldset>  	{S_FORM_TOKEN} -	</form>
\ No newline at end of file +	</form> diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html index ba350a13fb..1caa6e5e13 100644 --- a/phpBB/adm/style/acp_users_overview.html +++ b/phpBB/adm/style/acp_users_overview.html @@ -3,60 +3,57 @@  <fieldset>  	<legend>{L_ACP_USER_OVERVIEW}</legend>  <dl> -	<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_NAME_CHARS_EXPLAIN}</span></dt> +	<dt><label for="user">{L_USERNAME}{L_COLON}</label><br /><span>{L_NAME_CHARS_EXPLAIN}</span></dt>  	<dd><input type="text" id="user" name="user" value="{USER}" /></dd>  	<!-- IF U_SWITCH_PERMISSIONS --><dd>[ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]</dd><!-- ENDIF -->  </dl>  <!-- IF S_USER_INACTIVE -->  <dl> -	<dt><label>{L_USER_IS_INACTIVE}:</label></dt> +	<dt><label>{L_USER_IS_INACTIVE}{L_COLON}</label></dt>  	<dd><strong>{USER_INACTIVE_REASON}</strong></dd>  </dl>  <!-- ENDIF -->  <dl> -	<dt><label>{L_REGISTERED}:</label></dt> +	<dt><label>{L_REGISTERED}{L_COLON}</label></dt>  	<dd><strong>{USER_REGISTERED}</strong></dd>  </dl>  <!-- IF S_USER_IP -->  <dl> -	<dt><label>{L_REGISTERED_IP}:</label></dt> +	<dt><label>{L_REGISTERED_IP}{L_COLON}</label></dt>  	<dd><a href="{U_SHOW_IP}">{REGISTERED_IP}</a></dd>  	<dd>[ <a href="{U_WHOIS}" onclick="popup(this.href, 700, 500, '_whois'); return false;">{L_WHOIS}</a> ]</dd>  </dl>  <!-- ENDIF -->  <dl> -	<dt><label>{L_LAST_ACTIVE}:</label></dt> +	<dt><label>{L_LAST_ACTIVE}{L_COLON}</label></dt>  	<dd><strong>{USER_LASTACTIVE}</strong></dd>  </dl>  <dl> -	<dt><label>{L_POSTS}:</label></dt> +	<dt><label>{L_POSTS}{L_COLON}</label></dt>  	<dd><strong>{USER_POSTS}</strong><!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --> (<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>)<!-- ELSEIF POSTS_IN_QUEUE --> ({L_POSTS_IN_QUEUE})<!-- ENDIF --></dd>  </dl>  <dl> -	<dt><label>{L_WARNINGS}:</label></dt> +	<dt><label>{L_WARNINGS}{L_COLON}</label></dt>  	<dd><strong>{USER_WARNINGS}</strong></dd>  </dl>  <dl> -	<dt><label for="user_founder">{L_FOUNDER}:</label><br /><span>{L_FOUNDER_EXPLAIN}</span></dt> +	<dt><label for="user_founder">{L_FOUNDER}{L_COLON}</label><br /><span>{L_FOUNDER_EXPLAIN}</span></dt>  	<dd><label><input type="radio" class="radio" name="user_founder" value="1"<!-- IF S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> /> {L_YES}</label>  		<label><input type="radio" class="radio" name="user_founder" value="0"<!-- IF not S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> /> {L_NO}</label></dd>  </dl>  <dl> -	<dt><label for="user_email">{L_EMAIL}:</label></dt> -	<dd><input class="text medium" type="text" id="user_email" name="user_email" value="{USER_EMAIL}" autocomplete="off" /></dd> +	<dt><label for="user_email">{L_EMAIL}{L_COLON}</label></dt> +	<dd><input class="text medium" type="email" id="user_email" name="user_email" value="{USER_EMAIL}" autocomplete="off" /></dd>  </dl>  <dl> -	<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label><br /><span>{L_CONFIRM_EMAIL_EXPLAIN}</span></dt> -	<dd><input class="text medium" type="text" id="email_confirm" name="email_confirm" value="" autocomplete="off" /></dd> -</dl> -<dl> -	<dt><label for="new_password">{L_NEW_PASSWORD}:</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt> +	<dt><label for="new_password">{L_NEW_PASSWORD}{L_COLON}</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>  	<dd><input type="password" id="new_password" name="new_password" value="" autocomplete="off" /></dd>  </dl>  <dl> -	<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt> +	<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}{L_COLON}</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>  	<dd><input type="password" id="password_confirm" name="password_confirm" value="" autocomplete="off" /></dd>  </dl> +<!-- EVENT acp_users_overview_options_append -->  <p class="quick">  	<input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> @@ -111,16 +108,16 @@  	<fieldset>  		<legend>{L_USER_TOOLS}</legend>  	<dl> -		<dt><label for="quicktools">{L_QUICK_TOOLS}:</label></dt> +		<dt><label for="quicktools">{L_QUICK_TOOLS}{L_COLON}</label></dt>  		<dd><select id="quicktools" name="action" onchange="display_reason(this.options[this.selectedIndex].value);">{S_ACTION_OPTIONS}</select></dd>  	</dl>  	<div style="display: none;" id="reasons">  		<dl> -			<dt><label for="ban_reason">{L_BAN_REASON}:</label></dt> +			<dt><label for="ban_reason">{L_BAN_REASON}{L_COLON}</label></dt>  			<dd><input name="ban_reason" type="text" class="text medium" maxlength="3000" id="ban_reason" /></dd>  		</dl>  		<dl> -			<dt><label for="ban_give_reason">{L_BAN_GIVE_REASON}:</label></dt> +			<dt><label for="ban_give_reason">{L_BAN_GIVE_REASON}{L_COLON}</label></dt>  			<dd><input name="ban_give_reason" type="text" class="text medium" maxlength="3000" id="ban_give_reason" /></dd>  		</dl>  	</div> @@ -139,7 +136,7 @@  			<fieldset>  				<legend>{L_DELETE_USER}</legend>  				<dl> -					<dt><label for="delete_type">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt> +					<dt><label for="delete_type">{L_DELETE_USER}{L_COLON}</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>  					<dd>  					<!-- IF USER_HAS_POSTS -->  						<select id="delete_type" name="delete_type"><option class="sep" value="">{L_SELECT_OPTION}</option><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select> diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html index 07a9bc5c78..1092b25b04 100644 --- a/phpBB/adm/style/acp_users_prefs.html +++ b/phpBB/adm/style/acp_users_prefs.html @@ -9,60 +9,47 @@  	<fieldset>  		<legend>{L_UCP_PREFS_PERSONAL}</legend>  	<dl>  -		<dt><label for="viewemail">{L_SHOW_EMAIL}:</label></dt> +		<dt><label for="viewemail">{L_SHOW_EMAIL}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="viewemail" value="1"<!-- IF VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="viewemail" value="0"<!-- IF not VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="massemail">{L_ADMIN_EMAIL}:</label></dt> +		<dt><label for="massemail">{L_ADMIN_EMAIL}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="massemail" value="1"<!-- IF MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="massemail" value="0"<!-- IF not MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="allowpm">{L_ALLOW_PM}:</label><br /><span>{L_ALLOW_PM_EXPLAIN}</span></dt> +		<dt><label for="allowpm">{L_ALLOW_PM}{L_COLON}</label><br /><span>{L_ALLOW_PM_EXPLAIN}</span></dt>  		<dd><label><input type="radio" class="radio" name="allowpm" value="1"<!-- IF ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="allowpm" value="0"<!-- IF not ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="hideonline">{L_HIDE_ONLINE}:</label></dt> +		<dt><label for="hideonline">{L_HIDE_ONLINE}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="hideonline" value="1"<!-- IF HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="hideonline" value="0"<!-- IF not HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="notifymethod">{L_NOTIFY_METHOD}:</label><br /><span>{L_NOTIFY_METHOD_EXPLAIN}</span></dt> +		<dt><label for="notifymethod">{L_NOTIFY_METHOD}{L_COLON}</label><br /><span>{L_NOTIFY_METHOD_EXPLAIN}</span></dt>  		<dd><label><input type="radio" class="radio" name="notifymethod" value="0"<!-- IF NOTIFY_EMAIL --> id="notifymethod" checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label>  			<label><input type="radio" class="radio" name="notifymethod" value="1"<!-- IF NOTIFY_IM --> id="notifymethod" checked="checked"<!-- ENDIF --><!-- IF S_JABBER_DISABLED --> disabled="disabled"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label>  			<label><input type="radio" class="radio" name="notifymethod" value="2"<!-- IF NOTIFY_BOTH --> id="notifymethod" checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_BOTH}</label></dd>  	</dl>  	<dl>  -		<dt><label for="notifypm">{L_NOTIFY_ON_PM}:</label></dt> +		<dt><label for="notifypm">{L_NOTIFY_ON_PM}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="notifypm" value="1"<!-- IF NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="notifypm" value="0"<!-- IF not NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="popuppm">{L_POPUP_ON_PM}:</label></dt> -		<dd><label><input type="radio" class="radio" name="popuppm" value="1"<!-- IF POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> /> {L_YES}</label> -			<label><input type="radio" class="radio" name="popuppm" value="0"<!-- IF not POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd> -	</dl> -	<dl>  -		<dt><label for="lang">{L_BOARD_LANGUAGE}:</label></dt> +		<dt><label for="lang">{L_BOARD_LANGUAGE}{L_COLON}</label></dt>  		<dd><select id="lang" name="lang">{S_LANG_OPTIONS}</select></dd>  	</dl>  	<dl>  -		<dt><label for="style">{L_BOARD_STYLE}:</label></dt> +		<dt><label for="style">{L_BOARD_STYLE}{L_COLON}</label></dt>  		<dd><select id="style" name="style">{S_STYLE_OPTIONS}</select></dd>  	</dl> +	<!-- INCLUDE timezone_option.html -->  	<dl>  -		<dt><label for="tz">{L_BOARD_TIMEZONE}:</label></dt> -		<dd><select id="tz" name="tz" style="width: 100%;">{S_TZ_OPTIONS}</select></dd> -	</dl> -	<dl>  -		<dt><label for="dst">{L_BOARD_DST}:</label></dt> -		<dd><label><input type="radio" class="radio" name="dst" value="1"<!-- IF DST --> id="dst" checked="checked"<!-- ENDIF --> /> {L_YES}</label> -			<label><input type="radio" class="radio" name="dst" value="0"<!-- IF not DST --> id="dst" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd> -	</dl> -	<dl>  -		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}:</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt> +		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}{L_COLON}</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>  		<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>  		<dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" /></div></dd>  	</dl> @@ -71,22 +58,22 @@  	<fieldset>  		<legend>{L_UCP_PREFS_POST}</legend>  	<dl>  -		<dt><label for="bbcode">{L_DEFAULT_BBCODE}:</label></dt> +		<dt><label for="bbcode">{L_DEFAULT_BBCODE}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="bbcode" value="1"<!-- IF BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="bbcode" value="0"<!-- IF not BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="smilies">{L_DEFAULT_SMILIES}:</label></dt> +		<dt><label for="smilies">{L_DEFAULT_SMILIES}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="smilies" value="1"<!-- IF SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="smilies" value="0"<!-- IF not SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="sig">{L_DEFAULT_ADD_SIG}:</label></dt> +		<dt><label for="sig">{L_DEFAULT_ADD_SIG}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="sig" value="1"<!-- IF ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="sig" value="0"<!-- IF not ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="notify">{L_DEFAULT_NOTIFY}:</label></dt> +		<dt><label for="notify">{L_DEFAULT_NOTIFY}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="notify" value="1"<!-- IF NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="notify" value="0"<!-- IF not NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl> @@ -95,57 +82,57 @@  	<fieldset>  		<legend>{L_UCP_PREFS_VIEW}</legend>  	<dl>  -		<dt><label for="view_images">{L_VIEW_IMAGES}:</label></dt> +		<dt><label for="view_images">{L_VIEW_IMAGES}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="view_images" value="1"<!-- IF VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="view_images" value="0"<!-- IF not VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="view_flash">{L_VIEW_FLASH}:</label></dt> +		<dt><label for="view_flash">{L_VIEW_FLASH}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="view_flash" value="1"<!-- IF VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="view_flash" value="0"<!-- IF not VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="view_smilies">{L_VIEW_SMILIES}:</label></dt> +		<dt><label for="view_smilies">{L_VIEW_SMILIES}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="view_smilies" value="1"<!-- IF VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="view_smilies" value="0"<!-- IF not VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="view_sigs">{L_VIEW_SIGS}:</label></dt> +		<dt><label for="view_sigs">{L_VIEW_SIGS}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="view_sigs" value="1"<!-- IF VIEW_SIGS --> id="view_sigs" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="view_sigs" value="0"<!-- IF not VIEW_SIGS --> id="view_sigss" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="view_avatars">{L_VIEW_AVATARS}:</label></dt> +		<dt><label for="view_avatars">{L_VIEW_AVATARS}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="view_avatars" value="1"<!-- IF VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="view_avatars" value="0"<!-- IF not VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="view_wordcensor">{L_DISABLE_CENSORS}:</label></dt> +		<dt><label for="view_wordcensor">{L_DISABLE_CENSORS}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="view_wordcensor" value="1"<!-- IF VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="view_wordcensor" value="0"<!-- IF not VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label>{L_VIEW_TOPICS_DAYS}:</label></dt> +		<dt><label>{L_VIEW_TOPICS_DAYS}{L_COLON}</label></dt>  		<dd>{S_TOPIC_SORT_DAYS}</dd>  	</dl>  	<dl>  -		<dt><label>{L_VIEW_TOPICS_KEY}:</label></dt> +		<dt><label>{L_VIEW_TOPICS_KEY}{L_COLON}</label></dt>  		<dd>{S_TOPIC_SORT_KEY}</dd>  	</dl>  	<dl>  -		<dt><label>{L_VIEW_TOPICS_DIR}:</label></dt> +		<dt><label>{L_VIEW_TOPICS_DIR}{L_COLON}</label></dt>  		<dd>{S_TOPIC_SORT_DIR}</dd>  	</dl>  	<dl>  -		<dt><label>{L_VIEW_POSTS_DAYS}:</label></dt> +		<dt><label>{L_VIEW_POSTS_DAYS}{L_COLON}</label></dt>  		<dd>{S_POST_SORT_DAYS}</dd>  	</dl>  	<dl>  -		<dt><label>{L_VIEW_POSTS_KEY}:</label></dt> +		<dt><label>{L_VIEW_POSTS_KEY}{L_COLON}</label></dt>  		<dd>{S_POST_SORT_KEY}</dd>  	</dl>  	<dl>  -		<dt><label>{L_VIEW_POSTS_DIR}:</label></dt> +		<dt><label>{L_VIEW_POSTS_DIR}{L_COLON}</label></dt>  		<dd>{S_POST_SORT_DIR}</dd>  	</dl>  	</fieldset> @@ -155,4 +142,4 @@  		{S_FORM_TOKEN}  	</fieldset> -	</form>
\ No newline at end of file +	</form> diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html index 0d1c6f8e46..cad1dca9d8 100644 --- a/phpBB/adm/style/acp_users_profile.html +++ b/phpBB/adm/style/acp_users_profile.html @@ -3,44 +3,44 @@  	<fieldset>  		<legend>{L_USER_PROFILE}</legend>  	<dl> -		<dt><label for="icq">{L_UCP_ICQ}:</label></dt> +		<dt><label for="icq">{L_UCP_ICQ}{L_COLON}</label></dt>  		<dd><input type="text" id="icq" name="icq" value="{ICQ}" /></dd>  	</dl>  	<dl> -		<dt><label for="aim">{L_UCP_AIM}:</label></dt> +		<dt><label for="aim">{L_UCP_AIM}{L_COLON}</label></dt>  		<dd><input type="text" id="aim" name="aim" value="{AIM}" /></dd>  	</dl>  	<dl> -		<dt><label for="msn">{L_UCP_MSNM}:</label></dt> -		<dd><input type="text" id="msn" name="msn" value="{MSN}" /></dd> +		<dt><label for="msn">{L_UCP_MSNM}{L_COLON}</label></dt> +		<dd><input type="email" id="msn" name="msn" value="{MSN}" /></dd>  	</dl>  	<dl> -		<dt><label for="yim">{L_UCP_YIM}:</label></dt> +		<dt><label for="yim">{L_UCP_YIM}{L_COLON}</label></dt>  		<dd><input type="text" id="yim" name="yim" value="{YIM}" /></dd>  	</dl>  	<dl> -		<dt><label for="jabber">{L_UCP_JABBER}:</label></dt> -		<dd><input type="text" id="jabber" name="jabber" value="{JABBER}" /></dd> +		<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt> +		<dd><input type="email" id="jabber" name="jabber" value="{JABBER}" /></dd>  	</dl>  	<dl> -		<dt><label for="website">{L_WEBSITE}:</label></dt> -		<dd><input type="text" id="website" name="website" value="{WEBSITE}" /></dd> +		<dt><label for="website">{L_WEBSITE}{L_COLON}</label></dt> +		<dd><input type="url" id="website" name="website" value="{WEBSITE}" /></dd>  	</dl>  	<dl> -		<dt><label for="location">{L_LOCATION}:</label></dt> +		<dt><label for="location">{L_LOCATION}{L_COLON}</label></dt>  		<dd><input type="text" id="location" name="location" value="{LOCATION}" /></dd>  	</dl>  	<dl> -		<dt><label for="occupation">{L_OCCUPATION}:</label></dt> +		<dt><label for="occupation">{L_OCCUPATION}{L_COLON}</label></dt>  		<dd><textarea id="occupation" name="occupation" rows="3" cols="30">{OCCUPATION}</textarea></dd>  	</dl>  	<dl> -		<dt><label for="interests">{L_INTERESTS}:</label></dt> +		<dt><label for="interests">{L_INTERESTS}{L_COLON}</label></dt>  		<dd><textarea id="interests" name="interests" rows="3" cols="30">{INTERESTS}</textarea></dd>  	</dl> -	<dl>  -		<dt><label for="birthday">{L_BIRTHDAY}:</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt> -		<dd>{L_DAY}: <select id="birthday" name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> {L_MONTH}: <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> {L_YEAR}: <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></dd> +	<dl> +		<dt><label for="birthday">{L_BIRTHDAY}{L_COLON}</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt> +		<dd>{L_DAY}{L_COLON} <select id="birthday" name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> {L_MONTH}{L_COLON} <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> {L_YEAR}{L_COLON} <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></dd>  	</dl>  	</fieldset> @@ -48,8 +48,8 @@  		<fieldset>  			<legend>{L_USER_CUSTOM_PROFILE_FIELDS}</legend>  		<!-- BEGIN profile_fields --> -		<dl>  -			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}:</label><!-- IF profile_fields.LANG_EXPLAIN --><br /><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF --></dt> +		<dl> +			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}{L_COLON}</label><!-- IF profile_fields.LANG_EXPLAIN --><br /><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF --></dt>  			<dd>{profile_fields.FIELD}</dd>  			<!-- IF profile_fields.ERROR -->  				<dd><span class="small" style="color: red;">{profile_fields.ERROR}</span></dd> @@ -63,4 +63,4 @@  		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />  		{S_FORM_TOKEN}  	</fieldset> -	</form>
\ No newline at end of file +	</form> diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html index 0fd6c04fa5..0a04c411d2 100644 --- a/phpBB/adm/style/acp_users_signature.html +++ b/phpBB/adm/style/acp_users_signature.html @@ -3,6 +3,8 @@  	var form_name = 'user_signature';  	var text_name = 'signature'; +	var load_draft = false; +	var upload = false;  	// Define the bbCode tags  	var bbcode = new Array(); @@ -20,19 +22,19 @@  		o: '{LA_BBCODE_O_HELP}',  		p: '{LA_BBCODE_P_HELP}',  		w: '{LA_BBCODE_W_HELP}', +		a: '{LA_BBCODE_A_HELP}',  		s: '{LA_BBCODE_S_HELP}',  		f: '{LA_BBCODE_F_HELP}',  		y: '{LA_BBCODE_Y_HELP}', -		d: '{LA_BBCODE_D_HELP}', -		tip: '{L_STYLES_TIP}' +		d: '{LA_BBCODE_D_HELP}'  		<!-- BEGIN custom_tags --> -			,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}' +			,cb_{custom_tags.BBCODE_ID}{L_COLON} '{custom_tags.A_BBCODE_HELPLINE}'  		<!-- END custom_tags -->  	}  // ]]>  </script> -<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script> +<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->  <form id="user_signature" method="post" action="{U_ACTION}"> @@ -48,51 +50,45 @@  		<p>{L_SIGNATURE_EXPLAIN}</p>  		<div id="format-buttons"> -			<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" onmouseout="helpline('tip')" /> -			<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px;" onclick="bbstyle(2)" onmouseover="helpline('i')" onmouseout="helpline('tip')" /> -			<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px;" onclick="bbstyle(4)" onmouseover="helpline('u')" onmouseout="helpline('tip')" /> -			<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" onmouseover="helpline('q')" onmouseout="helpline('tip')" /> -			<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" onmouseout="helpline('tip')" /> -			<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" onmouseout="helpline('tip')" /> -			<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" onmouseout="helpline('tip')" /> -			<input type="button" class="button2" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('y')" onmouseout="helpline('tip')" /> +			<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" /> +			<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" /> +			<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}" /> +			<!-- IF S_BBCODE_QUOTE --> +				<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}" /> +			<!-- ENDIF --> +			<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}" /> +			<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}" /> +			<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}" /> +			<input type="button" class="button2" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}" />  			<!-- IF S_BBCODE_IMG --> -				<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" onmouseover="helpline('p')" onmouseout="helpline('tip')" /> +				<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}" />  			<!-- ENDIF -->  			<!-- IF S_LINKS_ALLOWED --> -				<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" onmouseover="helpline('w')" onmouseout="helpline('tip')" /> +				<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}" />  			<!-- ENDIF -->  			<!-- IF S_BBCODE_FLASH --> -				<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" onmouseover="helpline('d')" onmouseout="helpline('tip')" /> +				<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}" />  			<!-- ENDIF --> - -			{L_FONT_SIZE}: <select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_FONT_SIZE}" onmouseover="helpline('f')" onmouseout="helpline('tip')"> +			<select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">  				<option value="50">{L_FONT_TINY}</option>  				<option value="85">{L_FONT_SMALL}</option>  				<option value="100" selected="selected">{L_FONT_NORMAL}</option> -				<option value="150">{L_FONT_LARGE}</option> -				<option value="200">{L_FONT_HUGE}</option> +				<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 150 --> +					<option value="150">{L_FONT_LARGE}</option> +					<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 200 --> +						<option value="200">{L_FONT_HUGE}</option> +					<!-- ENDIF --> +				<!-- ENDIF -->  			</select> -		<!-- IF .custom_tags --> -			<br /><br />  			<!-- BEGIN custom_tags --> -				<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})"<!-- IF custom_tags.BBCODE_HELPLINE !== '' --> onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')" onmouseout="helpline('tip')"<!-- ENDIF --> /> +				<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" />  			<!-- END custom_tags --> -		<!-- ENDIF --> -  		</div> -		<p><input type="text" class="text full" style="border: 0; background: none;" name="helpbox" value="{L_STYLES_TIP}" /></p> -  		<dl> -			<dt style="width: 90px;"> -				<script type="text/javascript"> -				// <![CDATA[ -					colorPalette('v', 12, 10); -				// ]]> -				</script> +			<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15" data-bbcode="true">  			</dt> -			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();">{SIGNATURE}</textarea></dd> +			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" data-bbcode="true">{SIGNATURE}</textarea></dd>  			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 5px;">  			<!-- IF S_BBCODE_ALLOWED -->  				<label><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label> @@ -104,7 +100,7 @@  				<label><input type="checkbox" class="radio" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL}</label>  			<!-- ENDIF -->  			</dd> -			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 10px;"><strong>{L_OPTIONS}: </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd> +			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 10px;"><strong>{L_OPTIONS}{L_COLON} </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd>  		</dl>  	</fieldset> @@ -113,4 +109,4 @@  		<input class="button2" type="submit" name="preview" value="{L_PREVIEW}" />  		{S_FORM_TOKEN}  	</fieldset> -</form>
\ No newline at end of file +</form> diff --git a/phpBB/adm/style/acp_users_warnings.html b/phpBB/adm/style/acp_users_warnings.html index d27f3800fc..9d082eda6d 100644 --- a/phpBB/adm/style/acp_users_warnings.html +++ b/phpBB/adm/style/acp_users_warnings.html @@ -1,7 +1,7 @@  	<form id="list" method="post" action="{U_ACTION}">  	<!-- IF .warn --> -	<table cellspacing="1"> +	<table class="table1">  	<thead>  	<tr>  		<th>{L_REPORT_BY}</th> diff --git a/phpBB/adm/style/acp_words.html b/phpBB/adm/style/acp_words.html index 3fa4cfc91c..7e91bc4367 100644 --- a/phpBB/adm/style/acp_words.html +++ b/phpBB/adm/style/acp_words.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_EDIT_WORD --> @@ -47,7 +47,7 @@  		<input class="button2" name="add" type="submit" value="{L_ADD_WORD}" />  	</p> -	<table cellspacing="1"> +	<table class="table1">  	<thead>  	<tr>  		<th>{L_WORD}</th> @@ -60,7 +60,7 @@  		<!-- IF words.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->  		<td style="text-align: center;">{words.WORD}</td>  		<td style="text-align: center;">{words.REPLACEMENT}</td> -		<td> <a href="{words.U_EDIT}">{ICON_EDIT}</a>  <a href="{words.U_DELETE}">{ICON_DELETE}</a> </td> +		<td> <a href="{words.U_EDIT}">{ICON_EDIT}</a>  <a href="{words.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a> </td>  	</tr>  	<!-- BEGINELSE -->  	<tr class="row3"> diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index a0e14d65a1..c7f91d9a8a 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -1,4 +1,4 @@ -/*  phpBB 3.0 Admin Style Sheet +/*  phpBB 3.1 Admin Style Sheet  	------------------------------------------------------------------------  	Original author:	subBlue ( http://www.subblue.com/ )  	Copyright 2007 phpBB Group ( http://www.phpbb.com/ ) @@ -18,11 +18,11 @@ body, div, p, th, td, li, dd {  	font-size: x-small;  	voice-family: "\"}\"";  	voice-family: inherit; -	font-size: small +	font-size: small;  }  html>body, html>div, html>p, html>th, html>td, html>li, html>dd { -	font-size: small +	font-size: small;  }  html { @@ -31,6 +31,7 @@ html {  	/* Always show a scrollbar for short pages - stops the jump when the scrollbar appears. non-ie browsers */  	height: 100%;  	margin-bottom: 1px; +	word-wrap: break-word;  }  body { @@ -101,6 +102,27 @@ hr {  	font-size: 0.85em;  } +.hidden { +	display: none; +} + +@media only screen and (max-width: 800px), only screen and (max-device-width: 800px) +{ +	body { +		margin: 5px 5px 0; +	} +} + +@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +{ +	html, body { +		height: auto; +		margin: 0; +		padding: 0; +	} +} + +  /* General links  */  a:link, a:visited {  	color: #105289; @@ -132,6 +154,7 @@ li {  	list-style-type: inherit;  } +  /* Main blocks  ---------------------------------------- */  #wrap { @@ -170,7 +193,7 @@ li {  #page-body {  	clear: both; -	min-width: 700px; +	min-width: 650px;  }  #page-footer { @@ -191,19 +214,23 @@ li {  }  #main { -	float: left; -	width: 76%; -	margin: 0 0 0 3%; -	min-height: 350px; +	float: right; +	width: 100%; +	margin: 0 0 0 -210px;  }  .rtl #main {  	float: right; -	margin: 0 3% 0 0; +	margin: 0 -210px 0 0; +} + +.main { +	margin-left: 210px;  } -* html #main { -	height: 350px; +.rtl .main { +	margin-left: 0; +	margin-right: 210px;  }  #page-body.simple-page-body { @@ -212,17 +239,81 @@ li {  	min-width: 0;  } +@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +{ +	#wrap, #page-body, #page-body.simple-page-body { +		padding: 0; +		min-width: 300px; +	} + +	#page-header { +		margin: 5px; +		padding-left: 160px; +		height: auto; +		min-height: 54px; +		overflow: hidden; +	} + +	.rtl #page-header { +		padding-right: 160px; +		padding-left: 0; +	} + +	#page-header h1 { +		font-size: 1.2em; +		white-space: nowrap; +		overflow: hidden; +		text-overflow: ellipsis; +	} + +	#page-header fieldset { +		margin-top: 5px; +	} + +	#main, .rtl #main, .main, .rtl .main { +		float: none; +		width: auto; +		margin: 0; +	} + +	#content { +		background: #F3F3F3 url("../images/innerbox_bg.gif") repeat-x top; +		padding: 5px; +	} + +	#page-footer { +		padding: 0 5px 5px; +	} +} + +@media only screen and (max-width: 400px), only screen and (max-device-width: 400px) +{ +	#page-header { +		background-size: 76px 26.5px; +		padding-left: 80px; +		min-height: 30px; +	} + +	.rtl #page-header { +		padding-right: 80px; +	} + +	#page-header h1 { +		padding-top: 0; +		font-size: 1.1em; +	} +} + +  /* Tabbed menu  	Based on: http://www.alistapart.com/articles/slidingdoors2/  ----------------------------------------*/  #tabs {  	line-height: normal; -	margin: 0 0 -6px 7px; +	margin: 0 7px;  	min-width: 600px; -} - -.rtl #tabs { -	margin: 0 7px -6px 0; +	position: relative; +	z-index: 2;  }  #tabs ul { @@ -231,14 +322,27 @@ li {  	list-style: none;  } +#tabs ul:after { +	content: ''; +	display: block; +	clear: both; +} +  #tabs li { -	display: inline; +	display: block; +	float: left;  	margin: 0;  	padding: 0;  	font-size: 0.85em;  	font-weight: bold;  } +#tabs li:after { +	content: ''; +	display: block; +	clear: both; +} +  #tabs a {  	float: left;  	background:url("../images/bg_tabs1.gif") no-repeat 0% -34px; @@ -257,6 +361,7 @@ li {  	display: block;  	background: url("../images/bg_tabs2.gif") no-repeat 100% -34px;  	padding: 7px 10px 4px 4px; +	min-height: 14px;  	color: #767676;  	white-space: nowrap;  	font-family: Arial, Helvetica, sans-serif; @@ -276,122 +381,154 @@ li {  	color: #BC2A4D;  } -#tabs #activetab a { +#tabs a:hover { +	background-position: 0 -69px; +} + +#tabs a:hover span { +	background-position: 100% -69px; +} + +#tabs .activetab a {  	background-position: 0 0;  	border-bottom: 1px solid #DCDEE2;  } -#tabs #activetab a span { +#tabs .activetab a span {  	background-position: 100% 0;  	padding-bottom: 5px;  	color: #23649F;  } -#tabs a:hover { -	background-position: 0 -69px; +#tabs .activetab a:hover span { +	color: #115098;  } -#tabs a:hover span { -	background-position: 100% -69px; +.responsive-tab { +	position: relative;  } -#tabs #activetab a:hover span { -	color: #115098; +.responsive-tab .responsive-tab-link span { +	display: inline-block; +	font-size: 16px; +	position: relative; +	width: 16px; +	line-height: 14px; +	text-decoration: none;  } +.responsive-tab .responsive-tab-link span:before { +	content: ''; +	position: absolute; +	left: 5px; +	top: 8px; +	height: .125em; +	width: 14px; +	border-bottom: 0.125em solid #767676; +	border-top: 0.375em double #767676; +} -/* Main Panel ----------------------------------------- */ -#acp { -	margin: 4px 0; -	padding: 3px 1px; -	min-width: 550px; -	background-color: #FFFFFF; -	border: 1px #999999 solid; +.responsive-tab .responsive-tab-link:hover span:before { +	border-color: #BC2A4D;  } -.panel { -	background: #F3F3F3 url("../images/innerbox_bg.gif") repeat-x top; -	padding: 0; +.responsive-tab.activetab .responsive-tab-link span:before { +	border-color: #23649F;  } -span.corners-top, span.corners-bottom, -span.corners-top span, span.corners-bottom span { -	font-size: 1px; -	line-height: 1px; -	display: block; -	height: 5px; -	background-repeat: no-repeat; +.responsive-tab.activetab .responsive-tab-link:hover span:before { +	border-color: #115098;  } -span.corners-top { -	background-image: url("../images/corners_left.gif"); -	background-position: 0 0; -	margin: -4px -2px 0; +#tabs .dropdown { +	top: 18px; +	margin-right: -1px;  } -span.corners-top span { -	background-image: url("../images/corners_right.gif"); -	background-position: 100% 0; +#tabs .dropdown-right .dropdown { +	margin-left: -2px;  } -span.corners-bottom { -	background-image: url("../images/corners_left.gif"); -	background-position: 0 100%; -	margin: 0 -2px -4px; -	clear: both; +#tabs .dropdown li { +	display: block !important; +	float: none; +	background: transparent none; +	padding: 0;  } -span.corners-bottom span { -	background-image: url("../images/corners_right.gif"); -	background-position: 100% 100%; +#tabs .dropdown a, #tabs .dropdown a span { +	background: transparent; +	display: block; +	border-width: 0; +	float: none; +	margin: 0; +	padding: 0; +	text-align: right;  } -/* WinIE tweaks \*/ -* html span.corners-top, * html span.corners-bottom { background-image: url("../images/corners_left.gif"); } -* html span.corners-top span, * html span.corners-bottom span { background-image: url("../images/corners_right.gif"); } -/* End tweaks */ +#tabs .dropdown a span { +	padding: 4px 8px; +	color: inherit !important; +} -/* Sub-navigation Menu ----------------------------------------- */ +@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +{ +	#tabs { +		min-width: 0; +	} +} -/* Toggle */ -#toggle { -	padding: 5px; -	width: 5%; -	height: 100px; -	position: absolute; -	left: 15%; -	top: 28px; -	margin-left: 2px; +/* Main Panel +---------------------------------------- */ +#acp { +	clear: both; +	position: relative; +	top: -2px; +	margin: 0 0 2px; +	padding: 3px 1px; +	min-width: 550px; +	background: #F3F3F3 url("../images/innerbox_bg.gif") repeat-x top; +	border: 1px #999999 solid; +	border-radius: 5px; +	box-shadow: #FFF 0 0 0 1px inset;  } -.rtl #toggle { -	left: 75%; -	margin-right: 0; -	margin-left: 6px; +#acp:first-child { +	top: 0;  } -#toggle-handle { -	display: block; -	width: 18px; -	height: 19px; -	float: right; -	background-image: url(../images/toggle.gif); +.panel { +	background: #F3F3F3 url("../images/innerbox_bg.gif") repeat-x top; +	padding: 5px 0; +	border-radius: 5px; +	overflow: hidden;  } -.rtl #toggle-handle { -	background-image: url(../images/toggle.gif); -	background-position: 100% 50%; +@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +{ +	#acp { +		min-width: 0; +		min-height: 0; +		border-radius: 0; +		border-width: 1px 0; +		background: #fff; +		padding: 1px 0; +		box-shadow: none; +	}  } +/* Sub-navigation Menu +---------------------------------------- */ +  /* Menu */  #menu {  	float: left; -	width: 20%; +	width: 200px;  	font-size: 1.00em;  	padding: 0;  	border-right: 1px solid #CCCFD3; +	position: relative; +	z-index: 1;  }  .rtl #menu { @@ -408,15 +545,16 @@ span.corners-bottom span {  	list-style: none;  	margin: 0;  	padding: 0; +	word-wrap: normal;  }  /* Default list state */ -#menu li { +#menu li, #menu .header {  	padding: 0;  	margin: 0;  	font-size: 0.85em;  	font-weight: bold; -	display: inline; +	display: block;  }  /* Link styles for the sub-section links */ @@ -433,6 +571,12 @@ span.corners-bottom span {  	padding: 3px 8px 3px 3px;  } +#menu li span, #menu .header { +	white-space: nowrap; +	overflow: hidden; +	text-overflow: ellipsis; +} +  #menu li a:hover, #menu li a:hover span {  	text-decoration: none;  	background-color: #FFFFFF; @@ -481,7 +625,7 @@ span.corners-bottom span {  	background: url("../images/arrow_down.gif") 99% 50% no-repeat;  } -#menu li.header { +#menu .header {  	font-family: Tahoma, Helvetica, sans-serif;  	display: block;  	font-weight: bold; @@ -491,8 +635,71 @@ span.corners-bottom span {  	margin-top: 15px;  	text-transform: uppercase;  	font-size: 0.75em; +	text-decoration: none; +	cursor: inherit; +	outline-style: none; +} + +@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +{ +	#menu, .rtl #menu { +		float: none; +		width: auto; +		border-width: 0; +		max-width: 200px; +		margin: 0 auto 10px; +	} + +	#menu p { +		text-align: center; +	} + +	#menu .menu-block.active { +		margin: 0 -5px; +		padding: 0 5px 3px; +		background: rgba(255, 255, 255, .5); +		border-radius: 5px; +	} + +	#menu .menu-block.no-header.active { +		padding-top: 3px; +	} + +	#menu .menu-block .header { +		margin-top: 5px; +		cursor: pointer; +		border-bottom-width: 0; +		position: relative; +		text-decoration: underline; +	} + +	#menu .menu-block .header:focus, #menu .menu-block.active .header { +		color: #D31141; +		text-decoration: none; +	} + +	#menu .menu-block ul { +		display: none; +	} + +	.nojs #menu .menu-block:hover ul, #menu .menu-block.active ul, #menu .menu-block.no-header ul { +		display: block; +	} + +	#menu .menu-block li:last-child { +		border-bottom: 1px solid #327AA5; +	} + +	#menu .menu-block:last-child li:last-child, #menu .menu-block.active li:last-child { +		border-bottom-width: 0; +	} + +	#menu .menu-block li a span { +		border-radius: 2px; +	}  } +  /* Table styles  ---------------------------------------- */ @@ -525,6 +732,20 @@ td {  	text-align: right;  } +.table1 { +	border-collapse: separate; +	border-spacing: 1px; +} + +dt#color_palette_placeholder table { +	margin-right: 5px; +	width: 80px; +} + +#color_palette_placeholder td { +	padding: 0; +} +  table.type2 {  	border: none;  	background: none; @@ -626,12 +847,192 @@ td.name {  .col1 { background-color: #DCEBFE; }  .col2 { background-color: #F9F9F9; } +/* 4 row background colours for trees */ +.row1a { background-color: #F9F9F9; } +.row1b { background-color: #F6F6F6; } +.row2a { background-color: #E7EEF4; } +.row2b { background-color: #E3EBF2; } +  .spacer {  	background-color: #DBDFE2;  	height: 1px;  	line-height: 1px;  } +/* Deactivated row */ +.row-inactive {  +	color: #999;  +} +.row-inactive a, .row-inactive strong {  +	color: #888; +} +.row-inactive a:hover { +	color: #BC2A4D; +} + +/* Specific tables */ +table.forums td.folder { +	width: 27px; +	text-align: center; +} + +table td.actions { +	vertical-align: middle; +	width: 100px; +	text-align: center; +	white-space: nowrap; +} + +table tr:first-child td.actions .up, table tr:last-child td.actions .down { +	display: none; +} + +table tr:first-child td.actions .up-disabled, table tr:last-child td.actions .down-disabled { +	display: inline !important; +} + +table.styles td.users, table td.mark { +	text-align: center; +} + +@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 { +		display: block; +	} + +	table.responsive thead, table.responsive th, table.responsive colgroup { +		display: none; +	} + +	table.responsive.show-header thead, table.responsive.show-header th:first-child, table.responsive caption { +		display: block; +		width: auto !important; +		text-align: left !important; +		margin: 0; +	} + +	table.responsive { +		background: transparent none; +		border-width: 0; +		padding: 0; +	} + +	table.responsive caption { +		padding: 3px 4px; +		color: #FFFFFF; +		background: #70AED3 url("../images/gradient2b.gif") bottom left repeat-x; +		border-top: 1px solid #6DACD2; +		border-bottom: 1px solid #327AA5; +		text-align: left; +		font-size: 0.75em; +		font-weight: bold; +		text-transform: uppercase; +	} + +	table.responsive.show-header th:first-child span.rank-img, table.responsive.no-caption caption, table.responsive.no-header thead { +		display: none; +	} + +	table.responsive tr { +		margin: 2px 0; +		border: 1px solid #CCCFD3; +		background-color: #FFFFFF; +		padding: 1px 1px 0; +		overflow: hidden; +	} + +	table.responsive tr.row1 td { background-color: #F9F9F9; } +	table.responsive tr.row2 td { background-color: #DCEBFE; } +	table.responsive tr.row3 td { background-color: #DBDFE2; } +	table.responsive tr.row4 td { background-color: #E4E8EB; } +	table.responsive tr.col1 td { background-color: #DCEBFE; } +	table.responsive tr.col2 td { background-color: #F9F9F9; } +	table.responsive tr.row1a td { background-color: #F9F9F9; } +	table.responsive tr.row1b td { background-color: #F6F6F6; } +	table.responsive tr.row2a td { background-color: #E7EEF4; } +	table.responsive tr.row2b td { background-color: #E3EBF2; } + +	table.responsive td { +		width: auto !important; +		text-align: left !important; +		padding: 4px; +		margin-bottom: 1px; +	} + +	table.responsive td.empty { +		display: none !important; +	} + +	table.responsive td > dfn { +		display: inline-block !important; +	} + +	table.responsive td > dfn:after { +		content: ':'; +		padding-right: 5px; +	} + +	table.responsive.two-columns td { +		width: 50% !important; +		float: left; +		-moz-box-sizing: border-box; +		box-sizing: border-box; +	} + +	table.responsive.two-columns td:nth-child(2n+1) { +		clear: left; +	} + +	table.responsive span.rank-img { +		float: none; +		padding-right: 5px; +	} + +	table.responsive#memberlist td:first-child input[type="checkbox"] { +		float: right; +	} + +	/* Specific tables */ +	table.responsive.forums td.folder { +		float: left; +		width: 27px; +		background: transparent; +	} +	.rtl table.responsive.forums td.folder { +		float: right; +	} + +	table.responsive.forums td.forum-desc { +		margin-left: 35px; +		min-height: 27px; +		background: transparent; +	} + +	.rtl table.responsive.forums td.forum-desc { +		margin-left: 0; +		margin-right: 35px; +	} + +	table.responsive td.actions { +		clear: both; +		text-align: right !important; +	} + +	.rtl table.responsive td.actions { +		text-align: left !important; +	} + +	table.responsive.styles tr.responsive-style-row td:first-child { +		padding-left: 4px !important; +		padding-right: 4px !important; +	} + +	table.responsive.styles td:first-child > dfn, table.responsive td.actions > dfn { +		display: none !important; +	} +} +  /* General form styles  ----------------------------------------*/  fieldset { @@ -643,6 +1044,7 @@ fieldset {  	border-left: 1px solid #D7D7D7;  	background-color: #FFFFFF;  	position: relative; +	border-radius: 3px;  }  .rtl fieldset { @@ -652,10 +1054,6 @@ fieldset {  	border-left: 1px solid #CCCCCC;  } -* html fieldset { -	padding: 0 10px 5px 10px; -} -  fieldset p {  	font-size: 0.85em;  } @@ -674,23 +1072,10 @@ legend {  	vertical-align: middle;  } -* html legend { -	margin: 0 0 -10px -7px; -	line-height: 1em; -	font-size: .85em; -} - -/* Holly hack, .rtl comes after html */ -* html .rtl legend { -	margin: 0; -	margin-right: -7px; -} -  input, textarea {  	font-family: Verdana, Helvetica, Arial, sans-serif;  	font-size: 0.90em;  	font-weight: normal; -	cursor: text;  	vertical-align: middle;  	padding: 2px;  	color: #111111; @@ -852,6 +1237,22 @@ select#full_folder_action {  	width: 95%;  } +@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +{ +	fieldset { +		padding: 5px; +	} + +	fieldset.quick, p.quick { +		float: none !important; +		text-align: center; +	} + +	fieldset.display-options { +		clear: both; +	} +} +  /* Definition list layout for forms  	Other general def. list properties defined in prosilver_main.css  ---------------------------------------- */ @@ -983,6 +1384,51 @@ input:focus, textarea:focus {  	outline-style: none;  } +@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +{ +	fieldset dl { +		margin-bottom: 5px; +		padding-bottom: 5px; +		border-bottom: 1px solid #e8e8e8; +	} + +	fieldset > dl:last-child, fieldset > form:last-child > dl:last-child { +		border-bottom-width: 0; +		margin-bottom: 0; +	} + +	fieldset dt, .rtl fieldset dt, fieldset dd, .rtl fieldset dd { +		border-width: 0; +		margin-left: 0; +		margin-right: 0; +		float: none; +		width: auto; +	} + +	.ltr fieldset dd { +		padding-left: 20px; +	} + +	.rtl fieldset dd { +		padding-right: 20px; +	} + +	select, dd select, dd input { +		max-width: 300px; +	} + +	input[type="number"], dd input[type="number"] { +		max-width: 70px; +	} +} + +@media only screen and (max-width: 400px), only screen and (max-device-width: 400px) +{ +	select, dd select, dd input { +		max-width: 240px; +	}	 +} +  /* Submit button fieldset or paragraph  ---------------------------------------- */  fieldset.submit-buttons { @@ -1009,14 +1455,21 @@ fieldset.submit-buttons legend {  	display: none;  } +@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +{ +	p.submit-buttons { +		margin-top: 0; +	} +} +  /* Input field styles  ---------------------------------------- */ -input.radio, input.permissions-checkbox { +input.radio, input.checkbox, input.permissions-checkbox {  	width: auto !important;  	background-color: transparent;  	border: none; -	cursor: default; +	cursor: pointer;  }  input.full, @@ -1024,7 +1477,6 @@ textarea.full {  	width: 99%;  } -* html input.full, * html textarea.full { width: 95%;}  input.medium { width: 50%;}  input.narrow { width: 25%;}  input.tiny { width: 10%;} @@ -1080,6 +1532,104 @@ input.button1:focus, input.button2:focus, input.button3:focus {  	outline-style: none;  } +/* jQuery popups +---------------------------------------- */ +.phpbb_alert { +	background-color: #FFFFFF; +	border: 1px solid #999999; +	position: fixed; +	display: none; +	top: 150px; +	left: 0; +	right: 0; +	max-width: 600px; +	margin: 0 auto; +	z-index: 50; +	padding: 25px; +	padding: 0 25px 20px 25px; +	text-align: left; +} + +.phpbb_alert .alert_close { +	display: block; +	float: right; +	width: 16px; +	height: 16px; +	overflow: hidden; +	text-decoration: none !important; +	background: transparent url("../images/alert_close.png") 0 0 no-repeat; +	margin-top: -7px; +	margin-right: -31px; +} +.phpbb_alert .alert_close:hover { +	background-position: 0 -16px; +} + + +.phpbb_alert p { +	margin: 8px 0; +	padding-bottom: 8px; +} + +.phpbb_alert label { +	display: block; +	margin: 8px 0; +	padding-bottom: 8px; +} + +.phpbb_alert div.alert_text > p, +.phpbb_alert div.alert_text > label, +.phpbb_alert div.alert_text > select, +.phpbb_alert div.alert_text > textarea, +.phpbb_alert div.alert_text > input { +	font-size: 0.9em; +} + +#darkenwrapper { +	display: none; +} + +#darken { +	position: fixed; +	left: 0; +	top: 0; +	width: 100%; +	height: 100%; +	background-color: #000000; +	opacity: 0.5; +	z-index: 45; +} + +@media only screen and (max-height: 500px), only screen and (max-device-width: 500px) +{ +	.phpbb_alert { +		top: 25px; +	} +} + +@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +{ +	.phpbb_alert { +		max-width: none; +		margin: 0 25px; +	} +} + +#loading_indicator { +	background: #000000 url("../images/loading.gif") center center no-repeat; +	border-radius: 5px; +	display: none; +	opacity: 0.8; +	margin-top: -50px; +	margin-left: -50px; +	height: 50px; +	width: 50px; +	position: fixed; +	left: 50%; +	top: 50%; +	z-index: 51; +} +  /* Pagination  ---------------------------------------- */  .pagination { @@ -1087,55 +1637,93 @@ input.button1:focus, input.button2:focus, input.button3:focus {  	width: auto;  	text-align: right;  	margin-top: 5px; -	font-size: 0.85em; -	padding-bottom: 2px; +	float: right;  }  .rtl .pagination {  	text-align: left; +	float: left;  } -.pagination strong, -.pagination b { -	font-weight: normal; +li.pagination { +	margin-top: 0;  } -.pagination span.page-sep { -	display:none; +.pagination img { +	vertical-align: middle;  } -.pagination span strong { -	padding: 0 2px; -	margin: 0 2px; -	font-weight: normal; -	font-size: 0.85em; -	color: #FFFFFF; -	background: #4692BF; -	border: 1px solid #4692BF; +.pagination ul { +	display: inline-block; +	*display: inline; /* IE7 inline-block hack */ +	*zoom: 1; +	margin-left: 0; +	margin-bottom: 0; +} + +li.pagination ul { +	margin-top: -2px; +	vertical-align: middle;  } -.pagination span a, .pagination span a:link, .pagination span a:visited, .pagination span a:active { +.pagination ul li, dl .pagination ul li, dl.icon .pagination ul li { +	display: inline; +	padding: 0; +	font-size: 100%; +	line-height: normal; +} + +.pagination li a, .pagnation li span, li .pagination li a, li .pagnation li span, .pagination li.active span, .pagination li.ellipsis span {  	font-weight: normal; -	font-size: 0.85em;  	text-decoration: none; -	color: #5C758C; -	margin: 0 2px;  	padding: 0 2px; -	background: #ECEDEE; -	border: 1px solid #B4BAC0; +	border: 1px solid transparent; +	font-size: 0.9em; +	line-height: 1.5em;  } -.pagination span a:hover { -	border-color: #368AD2; -	background: #368AD2; +.pagination li a, .pagination li a:link, .pagination li a:visited { +	color: #5C758C; +	background-color: #ECEDEE; +	border-color: #B4BAC0; +} + +.pagination li.ellipsis  span { +	background-color: transparent; +	color: #000000; +} + +.pagination li.active span {  	color: #FFFFFF; -	text-decoration: none; +	background-color: #4692BF; +	border-color: #4692BF;  } -.pagination img { -	vertical-align: middle; +.pagination li a:hover, .pagination .active a:hover { +	color: #FFFFFF; +	background-color: #368AD2; +	border-color: #368AD2;  } +.pagination li a:active, .pagination li.active a:active { +	color: #5C758C; +	background-color: #ECEDEE; +	border-color: #B4BAC0; +} + +@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +{ +	.pagination, .rtl .pagination { +		float: none; +		text-align: center; +		margin: 5px 0; +	} + +	.pagination li a, .pagination li span { +		display: inline-block; +		min-width: 10px; +	} +}  /* Action Highlighting  ---------------------------------------- */ @@ -1162,8 +1750,6 @@ input.button1:focus, input.button2:focus, input.button3:focus {  	background-color: #BC2A4D;  } -* html .errorbox, * html .successbox { height: 1%; } /* Pixel shift fix for IE */ -  .successbox h3, .errorbox h3 {  	color: #FFFFFF;  	margin: 0 0 0.5em; @@ -1257,7 +1843,7 @@ input.button1:focus, input.button2:focus, input.button3:focus {  	visibility: hidden;  }*/ -.clearfix, #tabs, .row, #content, fieldset dl, #page-body { +.clearfix, .row, #content, fieldset dl, #page-body {  	height: 1%;  	overflow: hidden;  } @@ -1312,6 +1898,15 @@ input.button1:focus, input.button2:focus, input.button3:focus {  /* Permission interface  ---------------------------------------- */ +.column1, .column2 { +	width: 48%; +	float: left; +} + +.ltr .column2, .rtl .column1 { +	float: right; +} +  fieldset.permissions legend {  	text-transform: none;  } @@ -1509,60 +2104,15 @@ fieldset.permissions .padding {  	float: left;  	background-color: #CADCEB;  	width: 100%; +	border-radius: 5px; +	overflow: hidden; +	padding: 5px 0;  }  .rtl .permissions-panel {  	float: right;  } -.permissions-panel span.corners-top { -	background-image: url("../images/corners_left2.gif"); -} - -.permissions-panel span.corners-top span { -	background-image: url("../images/corners_right2.gif"); -} - -.permissions-panel span.corners-bottom { -	background-image: url("../images/corners_left2.gif"); -} - -.permissions-panel span.corners-bottom span { -	background-image: url("../images/corners_right2.gif"); -} - -.permissions-panel span.corners-top, .permissions-panel span.corners-bottom, -.permissions-panel span.corners-top span, .permissions-panel span.corners-bottom span { -	font-size: 1px; -	line-height: 1px; -	display: block; -	height: 5px; -	background-repeat: no-repeat; -} - -.permissions-panel span.corners-top { -	background-image: url("../images/corners_left2.gif"); -	background-position: 0 0; -	margin: 0 0; -} - -.permissions-panel span.corners-top span { -	background-image: url("../images/corners_right2.gif"); -	background-position: 100% 0; -} - -.permissions-panel span.corners-bottom { -	background-image: url("../images/corners_left2.gif"); -	background-position: 0 100%; -	margin: 0 0; -	clear: both; -} - -.permissions-panel span.corners-bottom span { -	background-image: url("../images/corners_right2.gif"); -	background-position: 100% 100%; -} -  /* Permission table  ---------------------------------------- */  .permissions-panel .tablewrap { @@ -1645,6 +2195,205 @@ fieldset.permissions .padding {  	padding: 0;  } +@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +{ +	.column1, .column2 { +		float: none !important; +		width: auto; +	} + +	.permissions-simple { +		clear: both; +	} + +	.permissions-simple td, .permissions-simple dd { +		width: auto !important; +		margin-left: 0 !important; +		margin-right: 0 !important; +	} + +	.permissions-simple dd { +		margin-top: 5px; +	} + +	.permissions-panel .tablewrap { +		margin: 0 5px; +	} + +	.permissions-category { +		min-width: 0; +		margin: 0 !important; +	} + +	.permissions-category a, .permissions-category a span.tabbg { +		display: block; +		float: none !important; +		background: transparent none; +	} + +	.permissions-category a { +		background: #d9e5ee; +		margin: 5px 0; +		padding: 0 !important; +		border-radius: 3px; +		text-decoration: underline; +	} + +	.permissions-category .activetab a { +		background-color: #dd6900; +		color: #fff; +	} + +	.permissions-category a span.tabbg { +		color: inherit !important; +		padding-top: 6px !important; +		padding-bottom: 6px !important; +	} + +	.permissions-category .activetab span.colour { +		border-color: #fff; +	} +} + +/* Avatars gallery +---------------------------------------- */ +#gallery { +	display: block; +	margin: 0 -5px; +	padding: 0; +	overflow: hidden; +} + +#gallery li { +	display: block; +	float: left; +	border: 1px solid #ccc; +	border-radius: 2px; +	background: #fff; +	padding: 5px; +	margin: 5px; +} + +#gallery li:hover { +	background-color: #eee; +} + +#gallery li label { +	display: block; +	text-align: center; +	padding: 0; +} + +/* Dropdown menu +----------------------------------------*/ +.dropdown { +	position: absolute; +	left: 0; +	top: 22px; +	z-index: 2; +	border: 1px solid transparent; +	border-radius: 5px; +	padding: 9px 0 0; +} + +.dropdown-up .dropdown { +	top: auto; +	bottom: 18px; +	padding: 0 0 9px; +} + +.dropdown-left .dropdown { +	left: auto; +	right: 0; +} + +.dropdown .pointer, .dropdown .pointer-inner { +	position: absolute; +	width: 0; +	height: 0; +	border-top-width: 0; +	border-bottom: 10px solid transparent; +	border-left: 10px dashed transparent; +	border-right: 10px dashed transparent; +	-webkit-transform: rotate(360deg); /* better anti-aliasing in webkit */ +	display: block; +} + +.dropdown-up .pointer, .dropdown-up .pointer-inner { +	border-bottom-width: 0; +	border-top: 10px solid transparent; +} + +.dropdown .pointer { +	right: auto; +	left: 10px; +	top: 0; +	z-index: 3; +} + +.dropdown-up .pointer { +	bottom: 0; +	top: auto; +} + +.dropdown-left .dropdown .pointer { +	left: auto; +	right: 10px; +} + +.dropdown .pointer-inner { +	top: auto; +	bottom: -11px; +	left: -10px; +} + +.dropdown-up .pointer-inner { +	bottom: auto; +	top: -11px; +} + +.dropdown .pointer { +	border-color: #B9B9B9 transparent; +} + +.dropdown .pointer-inner { +	border-color: #FFF transparent; +} + +.dropdown .dropdown-contents { +	z-index: 2; +	overflow: hidden; +	background: #fff; +	border: 1px solid #b9b9b9; +	border-radius: 5px; +	padding: 5px; +	position: relative; +	box-shadow: 1px 3px 5px rgba(0, 0, 0, 0.2); +	-webkit-box-sizing: border-box; +	-moz-box-sizing: border-box; +	box-sizing: border-box; +} + +.dropdown-up .dropdown-contents { +	box-shadow: 1px 0 5px rgba(0, 0, 0, 0.2); +} + +.dropdown li { +	float: none; +	margin: 0; +	white-space: nowrap; +	text-align: left; +} + +.wrap .dropdown li, .dropdown.wrap li { +	white-space: normal; +} + +.dropdown li:before, .dropdown li:after { +	display: none !important; +} + +  /* Classes for additional tasks  ---------------------------------------- */ @@ -1657,3 +2406,21 @@ fieldset.permissions .padding {  .phpinfo td, .phpinfo th, .phpinfo h2, .phpinfo h1 {  	text-align: left;  } + +.requirements_not_met { +	padding: 5px; +	background-color: #BC2A4D; +} + +.requirements_not_met dt label, .requirements_not_met dd p { +	color: #FFFFFF; +	font-size: 1.4em; +} + +@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +{ +	.responsive-hide { display: none !important; } +	.responsive-show { display: block !important; } +	.responsive-show-inline { display: inline !important; } +	.responsive-show-inline-block { display: inline-block !important; } +} diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js new file mode 100644 index 0000000000..dd46124f97 --- /dev/null +++ b/phpBB/adm/style/admin.js @@ -0,0 +1,246 @@ +/** +* phpBB3 ACP functions +*/ + +/** +* Parse document block +*/ +function parse_document(container)  +{ +	var test = document.createElement('div'), +		oldBrowser = (typeof test.style.borderRadius == 'undefined'); + +	delete test; + +	/** +	* Navigation +	*/ +	container.find('#menu').each(function() { +		var menu = $(this), +			blocks = menu.children('.menu-block'); + +		if (!blocks.length) { +			return; +		} + +		// Set onclick event +		blocks.children('a.header').click(function() { +			var parent = $(this).parent(); +			if (!parent.hasClass('active')) { +				parent.siblings().removeClass('active'); +			} +			parent.toggleClass('active'); +		}); + +		// Set active menu +		menu.find('#activemenu').parents('.menu-block').addClass('active'); + +		// Check if there is active menu +		if (!blocks.filter('.active').length) { +			blocks.filter(':first').addClass('active'); +		} +	}); + +	/** +	* Responsive tables +	*/ +	container.find('table').not('.not-responsive').each(function() { +		var $this = $(this), +			th = $this.find('thead > tr > th'), +			columns = th.length, +			headers = [], +			totalHeaders = 0, +			i, headersLength; + +		// Find columns +		$this.find('colgroup:first').children().each(function(i) { +			var column = $(this); +			$this.find('td:nth-child(' + (i + 1) + ')').addClass(column.prop('className')); +		}); + +		// Styles table +		if ($this.hasClass('styles')) { +			$this.find('td:first-child[style]').each(function() { +				var style = $(this).attr('style'); +				if (style.length) { +					$(this).parent('tr').attr('style', style.toLowerCase().replace('padding', 'margin')).addClass('responsive-style-row'); +				} +			}); +		} + +		// Find each header +		if (!$this.data('no-responsive-header')) +		{ +			th.each(function(column) { +				var cell = $(this), +					colspan = parseInt(cell.attr('colspan')), +					dfn = cell.attr('data-dfn'), +					text = dfn ? dfn : cell.text().trim(); + +				if (text == ' ') text = ''; +				colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan; + +				for (i=0; i<colspan; i++) { +					headers.push(text); +				} +				totalHeaders ++; + +				if (dfn && !column) { +					$this.addClass('show-header'); +				} +			}); +		} +		 +		headersLength = headers.length; + +		// Add header text to each cell as <dfn> +		$this.addClass('responsive'); + +		if (totalHeaders < 2) { +			$this.addClass('show-header'); +			return; +		} + +		$this.find('tbody > tr').each(function() { +			var row = $(this), +				cells = row.children('td'), +				column = 0; + +			if (cells.length == 1) { +				row.addClass('big-column'); +				return; +			} + +			cells.each(function() { +				var cell = $(this), +					colspan = parseInt(cell.attr('colspan')), +					text = cell.text().trim(); + +				if (headersLength <= column) { +					return; +				} + +				if ((text.length && text !== '-') || cell.children().length) { +					if (headers[column] != '') { +						cell.prepend('<dfn style="display: none;">' + headers[column] + '</dfn>'); +					} +				} +				else { +					cell.addClass('empty'); +				} + +				colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan; +				column += colspan; +			}); +		}); + +		// Remove <dfn> in disabled extensions list +		$this.find('tr.ext_disabled > .empty:nth-child(2) + .empty').siblings(':first-child').children('dfn').remove(); +	}); + +	/** +	* Hide empty responsive tables +	*/ +	container.find('table.responsive > tbody').each(function() { +		var items = $(this).children('tr'); +		if (items.length == 0) +		{ +			$(this).parent('table:first').addClass('responsive-hide'); +		} +	}); + +	/** +	* Fieldsets with empty <span> +	*/ +	container.find('fieldset dt > span:last-child').each(function() { +		var $this = $(this); +		if ($this.html() == ' ') { +			$this.addClass('responsive-hide'); +		} +		 +	}); + +	/** +	* Responsive tabs +	*/ +	container.find('#tabs').not('[data-skip-responsive]').each(function() { +		var $this = $(this), +			$body = $('body'), +			ul = $this.children(), +			tabs = ul.children().not('[data-skip-responsive]'), +			links = tabs.children('a'), +			item = ul.append('<li class="responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link"><span> </span></a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab'), +			menu = item.find('.dropdown-contents'), +			maxHeight = 0, +			lastWidth = false, +			responsive = false; + +		links.each(function() { +			var link = $(this); +			maxHeight = Math.max(maxHeight, Math.max(link.outerHeight(true), link.parent().outerHeight(true))); +		}) + +		function check() { +			var width = $body.width(), +				height = $this.height(); + +			if (arguments.length == 0 && (!responsive || width <= lastWidth) && height <= maxHeight) { +				return; +			} + +			tabs.show(); +			item.hide(); + +			lastWidth = width; +			height = $this.height(); +			if (height <= maxHeight) { +				responsive = false; +				if (item.hasClass('dropdown-visible')) { +					phpbb.toggleDropdown.call(item.find('a.responsive-tab-link').get(0)); +				} +				return; +			} + +			responsive = true; +			item.show(); +			menu.html(''); + +			var availableTabs = tabs.filter(':not(.activetab, .responsive-tab)'), +				total = availableTabs.length, +				i, tab; + +			for (i = total - 1; i >= 0; i --) { +				tab = availableTabs.eq(i); +				menu.prepend(tab.clone(true)); +				tab.hide(); +				if ($this.height() <= maxHeight) { +					menu.find('a').click(function() { check(true); }); +					return; +				} +			} +			menu.find('a').click(function() { check(true); }); +		} + +		phpbb.registerDropdown(item.find('a.responsive-tab-link'), item.find('.dropdown'), {visibleClass: 'activetab', verticalDirection: 'down'}); + +		check(true); +		$(window).resize(check); +	}); +} + +/** +* Run onload functions +*/ +(function($) { +	$(document).ready(function() { +		// Swap .nojs and .hasjs +		$('body.nojs').toggleClass('nojs hasjs'); + +		// Focus forms +		$('form[data-focus]:first').each(function() { +			$('#' + this.getAttribute('data-focus')).focus(); +		}); + +		parse_document($('body')); +	}); +})(jQuery); diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js new file mode 100644 index 0000000000..78fcbd88fd --- /dev/null +++ b/phpBB/adm/style/ajax.js @@ -0,0 +1,82 @@ +(function($) {  // Avoid conflicts with other libraries + +"use strict"; + +/** + * The following callbacks are for reording items. row_down + * is triggered when an item is moved down, and row_up is triggered when + * an item is moved up. It moves the row up or down, and deactivates / + * activates any up / down icons that require it (the ones at the top or bottom). + */ +phpbb.addAjaxCallback('row_down', function() { +	var el = $(this), +		tr = el.parents('tr'), +		trSwap = tr.next(); + +	tr.insertAfter(trSwap); +}); + +phpbb.addAjaxCallback('row_up', function() { +	var el = $(this), +		tr = el.parents('tr'), +		trSwap = tr.prev(); + +	tr.insertBefore(trSwap); +}); + +/** + * This callback replaces activate links with deactivate links and vice versa. + * It does this by replacing the text, and replacing all instances of "activate" + * in the href with "deactivate", and vice versa. + */ +phpbb.addAjaxCallback('activate_deactivate', function(res) { +	var el = $(this), +		newHref = el.attr('href'); + +	el.text(res.text); + +	if (newHref.indexOf('deactivate') !== -1) { +		newHref = newHref.replace('deactivate', 'activate'); +	} else { +		newHref = newHref.replace('activate', 'deactivate'); +	} + +	el.attr('href', newHref); +}); + +/** + * The removes the parent row of the link or form that triggered the callback, + * and is good for stuff like the removal of forums. + */ +phpbb.addAjaxCallback('row_delete', function(res) { +	if (res.SUCCESS !== false) { +		$(this).parents('tr').remove(); +	} +}); + + + +$('[data-ajax]').each(function() { +	var $this = $(this), +		ajax = $this.attr('data-ajax'), +		fn; + +	if (ajax !== 'false') { +		fn = (ajax !== 'true') ? ajax : null; +		phpbb.ajaxify({ +			selector: this, +			refresh: $this.attr('data-refresh') !== undefined, +			callback: fn +		}); +	} +}); + +/** +* Automatically resize textarea +*/ +$(document).ready(function() { +	phpbb.resizeTextArea($('textarea:not(.no-auto-resize)'), {minHeight: 75}); +}); + + +})(jQuery); // Avoid conflicts with other libraries diff --git a/phpBB/adm/style/auth_provider_ldap.html b/phpBB/adm/style/auth_provider_ldap.html new file mode 100644 index 0000000000..81afa44373 --- /dev/null +++ b/phpBB/adm/style/auth_provider_ldap.html @@ -0,0 +1,32 @@ +<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> diff --git a/phpBB/adm/style/auth_provider_oauth.html b/phpBB/adm/style/auth_provider_oauth.html new file mode 100644 index 0000000000..25e40ff596 --- /dev/null +++ b/phpBB/adm/style/auth_provider_oauth.html @@ -0,0 +1,17 @@ +<h2>{L_AUTH_PROVIDER_OAUTH_TITLE}</h2> + +<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 --> diff --git a/phpBB/adm/style/avatars.js b/phpBB/adm/style/avatars.js new file mode 100644 index 0000000000..26ea24c0db --- /dev/null +++ b/phpBB/adm/style/avatars.js @@ -0,0 +1,15 @@ +(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/captcha_default_acp_demo.html b/phpBB/adm/style/captcha_default_acp_demo.html index 0b1434f7e0..0f137f28df 100644 --- a/phpBB/adm/style/captcha_default_acp_demo.html +++ b/phpBB/adm/style/captcha_default_acp_demo.html @@ -1,4 +1,4 @@  <dl> -	<dt><label for="captcha_preview">{L_PREVIEW}:</label><br /><span>{L_CAPTCHA_PREVIEW_EXPLAIN}</span></dt> +	<dt><label for="captcha_preview">{L_PREVIEW}{L_COLON}</label><br /><span>{L_CAPTCHA_PREVIEW_EXPLAIN}</span></dt>  	<dd><img src="{CONFIRM_IMAGE}" alt="{L_PREVIEW}" width="360" height="96" id="captcha_preview" /></dd>  </dl> diff --git a/phpBB/adm/style/captcha_gd_acp.html b/phpBB/adm/style/captcha_gd_acp.html index d0bb758cfe..43d54adc0b 100644 --- a/phpBB/adm/style/captcha_gd_acp.html +++ b/phpBB/adm/style/captcha_gd_acp.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  	<a href="{U_ACTION}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a>  <h1>{L_ACP_VC_SETTINGS}</h1> @@ -14,32 +14,32 @@  <legend>{L_GENERAL_OPTIONS}</legend>  <dl> -	<dt><label for="captcha_gd_foreground_noise">{L_CAPTCHA_GD_FOREGROUND_NOISE}:</label><br /><span>{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}</span></dt> +	<dt><label for="captcha_gd_foreground_noise">{L_CAPTCHA_GD_FOREGROUND_NOISE}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}</span></dt>  	<dd><label><input id="captcha_gd_foreground_noise" name="captcha_gd_foreground_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  		<label><input name="captcha_gd_foreground_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  </dl>  <dl> -	<dt><label for="captcha_gd_x_grid">{L_CAPTCHA_GD_X_GRID}:</label><br /><span>{L_CAPTCHA_GD_X_GRID_EXPLAIN}</span></dt> -	<dd><input id="captcha_gd_x_grid" name="captcha_gd_x_grid" value="{CAPTCHA_GD_X_GRID}" type="text" /></dd> +	<dt><label for="captcha_gd_x_grid">{L_CAPTCHA_GD_X_GRID}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_X_GRID_EXPLAIN}</span></dt> +	<dd><input id="captcha_gd_x_grid" name="captcha_gd_x_grid" value="{CAPTCHA_GD_X_GRID}" type="number" /></dd>  </dl>  <dl> -	<dt><label for="captcha_gd_y_grid">{L_CAPTCHA_GD_Y_GRID}:</label><br /><span>{L_CAPTCHA_GD_Y_GRID_EXPLAIN}</span></dt> -	<dd><input id="captcha_gd_y_grid" name="captcha_gd_y_grid" value="{CAPTCHA_GD_Y_GRID}" type="text" /></dd> +	<dt><label for="captcha_gd_y_grid">{L_CAPTCHA_GD_Y_GRID}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_Y_GRID_EXPLAIN}</span></dt> +	<dd><input id="captcha_gd_y_grid" name="captcha_gd_y_grid" value="{CAPTCHA_GD_Y_GRID}" type="number" /></dd>  </dl>  <dl> -	<dt><label for="captcha_gd_wave">{L_CAPTCHA_GD_WAVE}:</label><br /><span>{L_CAPTCHA_GD_WAVE_EXPLAIN}</span></dt> +	<dt><label for="captcha_gd_wave">{L_CAPTCHA_GD_WAVE}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_WAVE_EXPLAIN}</span></dt>  	<dd><label><input id="captcha_gd_wave" name="captcha_gd_wave" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  		<label><input name="captcha_gd_wave" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  </dd>  </dl>  <dl> -	<dt><label for="captcha_gd_3d_noise">{L_CAPTCHA_GD_3D_NOISE}:</label><br /><span>{L_CAPTCHA_GD_3D_NOISE_EXPLAIN}</span></dt> +	<dt><label for="captcha_gd_3d_noise">{L_CAPTCHA_GD_3D_NOISE}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_3D_NOISE_EXPLAIN}</span></dt>  	<dd><label><input id="captcha_gd_3d_noise" name="captcha_gd_3d_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  		<label><input name="captcha_gd_3d_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  </dd>  </dl>  <dl> -	<dt><label for="captcha_gd_fonts">{L_CAPTCHA_GD_FONTS}:</label><br /><span>{L_CAPTCHA_GD_FONTS_EXPLAIN}</span></dt> +	<dt><label for="captcha_gd_fonts">{L_CAPTCHA_GD_FONTS}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_FONTS_EXPLAIN}</span></dt>  	<dd><label><input id="captcha_gd_fonts" name="captcha_gd_fonts" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 1 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_DEFAULT}</label>  		<label><input name="captcha_gd_fonts" value="2" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 2 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_NEW}</label>  		<label><input name="captcha_gd_fonts" value="3" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 3 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_LOWER}</label> diff --git a/phpBB/adm/style/captcha_qa_acp.html b/phpBB/adm/style/captcha_qa_acp.html index e0fc6fc67e..4ff7c328fc 100644 --- a/phpBB/adm/style/captcha_qa_acp.html +++ b/phpBB/adm/style/captcha_qa_acp.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  	<a href="<!-- IF U_LIST -->{U_LIST}<!-- ELSE -->{U_ACTION}<!-- ENDIF -->" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> @@ -14,7 +14,7 @@  	<fieldset class="tabulated">  	<legend>{L_QUESTIONS}</legend> -	<table cellspacing="1"> +	<table class="table1">  	<thead>  	<tr>  		<th colspan="3">{L_QUESTIONS}</th> @@ -59,7 +59,7 @@  	<fieldset>  		<legend>{L_EDIT_QUESTION}</legend>  	<dl> -		<dt><label for="strict">{L_QUESTION_STRICT}:</label><br /><span>{L_QUESTION_STRICT_EXPLAIN}</span></dt> +		<dt><label for="strict">{L_QUESTION_STRICT}{L_COLON}</label><br /><span>{L_QUESTION_STRICT_EXPLAIN}</span></dt>  		<dd><label><input type="radio" class="radio" name="strict" value="1"<!-- IF STRICT --> id="strict" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="strict" value="0"<!-- IF not STRICT --> id="strict" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl> diff --git a/phpBB/adm/style/captcha_qa_acp_demo.html b/phpBB/adm/style/captcha_qa_acp_demo.html index 0ea2d6a024..79170e27c6 100644 --- a/phpBB/adm/style/captcha_qa_acp_demo.html +++ b/phpBB/adm/style/captcha_qa_acp_demo.html @@ -1,5 +1,5 @@  <dl> -	<dt><label for="answer"><!-- IF QA_CONFIRM_QUESTION --> {QA_CONFIRM_QUESTION} <!-- ELSE --> {L_CONFIRM_QUESTION} <!-- ENDIF -->:</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt> +	<dt><label for="answer"><!-- IF QA_CONFIRM_QUESTION --> {QA_CONFIRM_QUESTION} <!-- ELSE --> {L_CONFIRM_QUESTION} <!-- ENDIF -->{L_COLON}</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>  	<dd>  		<input type="text" tabindex="10" name="answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}"  /> diff --git a/phpBB/adm/style/captcha_recaptcha_acp.html b/phpBB/adm/style/captcha_recaptcha_acp.html index 5b97cff984..67176ebd07 100644 --- a/phpBB/adm/style/captcha_recaptcha_acp.html +++ b/phpBB/adm/style/captcha_recaptcha_acp.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <h1>{L_ACP_VC_SETTINGS}</h1> @@ -13,11 +13,11 @@  <legend>{L_GENERAL_OPTIONS}</legend>  <dl> -	<dt><label for="recaptcha_pubkey">{L_RECAPTCHA_PUBLIC}:</label><br /><span>{L_RECAPTCHA_PUBLIC_EXPLAIN}</span></dt> +	<dt><label for="recaptcha_pubkey">{L_RECAPTCHA_PUBLIC}{L_COLON}</label><br /><span>{L_RECAPTCHA_PUBLIC_EXPLAIN}</span></dt>  	<dd><input id="recaptcha_pubkey" name="recaptcha_pubkey" value="{RECAPTCHA_PUBKEY}" size="50" type="text" /></dd>  </dl>  <dl> -	<dt><label for="recaptcha_privkey">{L_RECAPTCHA_PRIVATE}:</label><br /><span>{L_RECAPTCHA_PRIVATE_EXPLAIN}</span></dt> +	<dt><label for="recaptcha_privkey">{L_RECAPTCHA_PRIVATE}{L_COLON}</label><br /><span>{L_RECAPTCHA_PRIVATE_EXPLAIN}</span></dt>  	<dd><input id="recaptcha_privkey" name="recaptcha_privkey" value="{RECAPTCHA_PRIVKEY}" size="50" type="text" /></dd>  </dl> diff --git a/phpBB/adm/style/colour_swatch.html b/phpBB/adm/style/colour_swatch.html deleted file mode 100644 index c9e89980d8..0000000000 --- a/phpBB/adm/style/colour_swatch.html +++ /dev/null @@ -1,78 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" /> -<meta http-equiv="Content-Style-Type" content="text/css" /> -<meta http-equiv="Content-Language" content="{S_USER_LANG}" /> -<meta http-equiv="imagetoolbar" content="no" /> -<title>{L_COLOUR_SWATCH}</title> - -<style type="text/css"> -/* <![CDATA[ */ -	body { -		background-color: #404040; -		color: #fff; -	} - -	td { -		border: solid 1px #333;  -	} - -	.over {  -		border-color: white;  -	} - -	.out { -		border-color: #333333;  -	} - -	img { -		border: 0; -	} -/* ]]> */ -</style> -</head> - -<body> - -<script type="text/javascript"> -// <![CDATA[ -	var r = 0, g = 0, b = 0; - -	var numberList = new Array(6); -	numberList[0] = '00'; -	numberList[1] = '33'; -	numberList[2] = '66'; -	numberList[3] = '99'; -	numberList[4] = 'CC'; -	numberList[5] = 'FF'; - -	document.writeln('<table cellspacing="0" cellpadding="0" border="0">'); - -	for (r = 0; r < 6; r++) -	{ -		document.writeln('<tr>'); - -		for (g = 0; g < 6; g++) -		{ -			for (b = 0; b < 6; b++) -			{ -				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]); -				document.write('<td style="background-color: #' + color + ';" onmouseover="this.className=\'over\'" onmouseout="this.className=\'out\'">'); -				document.write('<a href="#" onclick="cell(\'' + color + '\'); return false;"><img src="{T_IMAGES_PATH}spacer.gif" width="15" height="12" alt="#' + color + '" title="#' + color + '" \/><\/a>'); -				document.writeln('<\/td>'); -			} -		} -		document.writeln('<\/tr>'); -	} -	document.writeln('<\/table>'); - -	function cell(color) -	{ -		opener.document.forms["{OPENER}"].{NAME}.value = color; -	} -// ]]> -</script> - -</body> -</html>
\ No newline at end of file diff --git a/phpBB/adm/style/confirm_body.html b/phpBB/adm/style/confirm_body.html index 2fbb1a60d7..d0360d1b3a 100644 --- a/phpBB/adm/style/confirm_body.html +++ b/phpBB/adm/style/confirm_body.html @@ -1,3 +1,15 @@ +<!-- IF S_AJAX_REQUEST --> + +	<h3>{MESSAGE_TITLE}</h3> +	<p>{MESSAGE_TEXT}</p> + +	<fieldset class="submit-buttons"> +		<input type="button" name="confirm" value="{L_YES}" class="button2" />  +		<input type="button" name="cancel" value="{L_NO}" class="button2" /> +	</fieldset> + +<!-- ELSE --> +  <!-- INCLUDE overall_header.html -->  <form id="confirm" method="post" action="{S_CONFIRM_ACTION}"> @@ -14,7 +26,7 @@  	</div>  </fieldset> -		  </form>  <!-- INCLUDE overall_footer.html --> +<!-- ENDIF --> diff --git a/phpBB/adm/style/confirm_body_prune.html b/phpBB/adm/style/confirm_body_prune.html index 9481386231..4c00ac2c3d 100644 --- a/phpBB/adm/style/confirm_body_prune.html +++ b/phpBB/adm/style/confirm_body_prune.html @@ -2,6 +2,23 @@  <form id="confirm" method="post" action="{S_CONFIRM_ACTION}"> +<fieldset id="userlist"> +	<h2>{L_PRUNE_USERS_LIST}</h2> +	<!-- IF S_DEACTIVATE --><p>{L_PRUNE_USERS_LIST_DEACTIVATE}</p><!-- ELSE --><p>{L_PRUNE_USERS_LIST_DELETE}</p><!-- ENDIF --> + +	<br /> +	<!-- BEGIN users --> +	» <input type="checkbox" name="user_ids[]" value="{users.USER_ID}" checked="checked" /> +	<a href="{users.U_PROFILE}">{users.USERNAME}</a> +	<!-- IF users.U_USER_ADMIN --> [ <a href="{users.U_USER_ADMIN}">{L_USER_ADMIN}</a> ]<!-- ENDIF --><br /> +	<!-- END users --> +	<br /> +	<span class="small"> +	<a href="#" onclick="marklist('userlist', 'user_ids', true)">{L_MARK_ALL}</a> • +	<a href="#" onclick="marklist('userlist', 'user_ids', false)">{L_UNMARK_ALL}</a> +	</span> +</fieldset> +  <fieldset>  	<h1>{MESSAGE_TITLE}</h1>  	<p>{MESSAGE_TEXT}</p> @@ -12,17 +29,6 @@  		<input type="submit" name="confirm" value="{L_YES}" class="button2" />    		<input type="submit" name="cancel" value="{L_NO}" class="button2" />  	</div> - -	<h2>{L_PRUNE_USERS_LIST}</h2> -	<!-- IF S_DEACTIVATE --><p>{L_PRUNE_USERS_LIST_DEACTIVATE}</p><!-- ELSE --><p>{L_PRUNE_USERS_LIST_DELETE}</p><!-- ENDIF --> - -	<br /> -	<!-- BEGIN users --> -	» <a href="{users.U_PROFILE}">{users.USERNAME}</a><!-- IF users.U_USER_ADMIN --> [<a href="{users.U_USER_ADMIN}">{L_USER_ADMIN}</a>]<!-- ENDIF --><br /> -	<!-- END users --> - -	<br /><br /> -  </fieldset>  </form> diff --git a/phpBB/adm/style/custom_profile_fields.html b/phpBB/adm/style/custom_profile_fields.html index 351397d3c7..982356bfa7 100644 --- a/phpBB/adm/style/custom_profile_fields.html +++ b/phpBB/adm/style/custom_profile_fields.html @@ -26,7 +26,7 @@  <!-- END int -->  <!-- BEGIN date --> -	<span>{L_DAY}:</span> <select name="{date.FIELD_IDENT}_day" id="{date.FIELD_IDENT}_day">{date.S_DAY_OPTIONS}</select> -	<span>{L_MONTH}:</span> <select name="{date.FIELD_IDENT}_month" id="{date.FIELD_IDENT}_month">{date.S_MONTH_OPTIONS}</select> -	<span>{L_YEAR}:</span> <select name="{date.FIELD_IDENT}_year" id="{date.FIELD_IDENT}_year">{date.S_YEAR_OPTIONS}</select> +	<span>{L_DAY}{L_COLON}</span> <select name="{date.FIELD_IDENT}_day" id="{date.FIELD_IDENT}_day">{date.S_DAY_OPTIONS}</select> +	<span>{L_MONTH}{L_COLON}</span> <select name="{date.FIELD_IDENT}_month" id="{date.FIELD_IDENT}_month">{date.S_MONTH_OPTIONS}</select> +	<span>{L_YEAR}{L_COLON}</span> <select name="{date.FIELD_IDENT}_year" id="{date.FIELD_IDENT}_year">{date.S_YEAR_OPTIONS}</select>  <!-- END date --> diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js deleted file mode 100644 index 217aa699e2..0000000000 --- a/phpBB/adm/style/editor.js +++ /dev/null @@ -1,403 +0,0 @@ -/** -* bbCode control by subBlue design [ www.subBlue.com ] -* Includes unixsafe colour palette selector by SHS` -*/ - -// Startup variables -var imageTag = false; -var theSelection = false; - -// Check for Browser & Platform for PC & IE specific bits -// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html -var clientPC = navigator.userAgent.toLowerCase(); // Get client info -var clientVer = parseInt(navigator.appVersion); // Get browser version - -var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1)); -var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1)); - -var baseHeight; - -/** -* Shows the help messages in the helpline window -*/ -function helpline(help) -{ -	document.forms[form_name].helpbox.value = help_line[help]; -} - -/** -* Fix a bug involving the TextRange object. From -* http://www.frostjedi.com/terra/scripts/demo/caretBug.html -*/  -function initInsertions()  -{ -	var doc; -	if(document.forms[form_name]) -	{ -		doc = document; -	} -	else -	{ -		doc = opener.document; -	} - -	var textarea = doc.forms[form_name].elements[text_name]; -	if (is_ie && typeof(baseHeight) != 'number') -	{ -		textarea.focus(); -		baseHeight = doc.selection.createRange().duplicate().boundingHeight; - -		if (!document.forms[form_name]) -		{ -			document.body.focus(); -		} -	} -} - -/** -* bbstyle -*/ -function bbstyle(bbnumber) -{ -	if (bbnumber != -1) -	{ -		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]); -	} -	else -	{ -		insert_text('[*]'); -		document.forms[form_name].elements[text_name].focus();		 -	} -} - -/** -* Apply bbcodes -*/ -function bbfontstyle(bbopen, bbclose) -{ -	theSelection = false; -		 -	var textarea = document.forms[form_name].elements[text_name]; - -	textarea.focus(); - -	if ((clientVer >= 4) && is_ie && is_win) -	{ -		// Get text selection -		theSelection = document.selection.createRange().text; - -		if (theSelection) -		{ -			// Add tags around selection -			document.selection.createRange().text = bbopen + theSelection + bbclose; -			document.forms[form_name].elements[text_name].focus(); -			theSelection = ''; -			return; -		} -	} -	else if (document.forms[form_name].elements[text_name].selectionEnd && (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0)) -	{ -		mozWrap(document.forms[form_name].elements[text_name], bbopen, bbclose); -		document.forms[form_name].elements[text_name].focus(); -		theSelection = ''; -		return; -	} -	 -	//The new position for the cursor after adding the bbcode -	var caret_pos = getCaretPosition(textarea).start; -	var new_pos = caret_pos + bbopen.length;		 - -	// Open tag -	insert_text(bbopen + bbclose); - -	// Center the cursor when we don't have a selection -	// Gecko and proper browsers -	if (!isNaN(textarea.selectionStart)) -	{ -		textarea.selectionStart = new_pos; -		textarea.selectionEnd = new_pos; -	}	 -	// IE -	else if (document.selection) -	{ -		var range = textarea.createTextRange();  -		range.move("character", new_pos);  -		range.select(); -		storeCaret(textarea); -	} - -	textarea.focus(); -	return; -} - -/** -* Insert text at position -*/ -function insert_text(text, spaces, popup) -{ -	var textarea; -	 -	if (!popup) -	{ -		textarea = document.forms[form_name].elements[text_name]; -	} -	else -	{ -		textarea = opener.document.forms[form_name].elements[text_name]; -	} - -	if (spaces) -	{ -		text = ' ' + text + ' '; -	} - -	if (!isNaN(textarea.selectionStart)) -	{ -		var sel_start = textarea.selectionStart; -		var sel_end = textarea.selectionEnd; - -		mozWrap(textarea, text, ''); -		textarea.selectionStart = sel_start + text.length; -		textarea.selectionEnd = sel_end + text.length; -	}	 -	 -	else if (textarea.createTextRange && textarea.caretPos) -	{ -		if (baseHeight != textarea.caretPos.boundingHeight)  -		{ -			textarea.focus(); -			storeCaret(textarea); -		} -		var caret_pos = textarea.caretPos; -		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text; -		 -	} -	else -	{ -		textarea.value = textarea.value + text; -	} - -	if (!popup) -	{ -		textarea.focus(); -	} - -} - -/** -* Add inline attachment at position -*/ -function attach_inline(index, filename) -{ -	insert_text('[attachment=' + index + ']' + filename + '[/attachment]'); -	document.forms[form_name].elements[text_name].focus(); -} - -/** -* Add quote text to message -*/ -function addquote(post_id, username) -{ -	var message_name = 'message_' + post_id; -	var theSelection = ''; -	var divarea = false; - -	if (document.all) -	{ -		divarea = document.all[message_name]; -	} -	else -	{ -		divarea = document.getElementById(message_name); -	} - -	// Get text selection - not only the post content :( -	if (window.getSelection) -	{ -		theSelection = window.getSelection().toString(); -	} -	else if (document.getSelection) -	{ -		theSelection = document.getSelection(); -	} -	else if (document.selection) -	{ -		theSelection = document.selection.createRange().text; -	} - -	if (theSelection == '' || typeof theSelection == 'undefined' || theSelection == null) -	{ -		if (divarea.innerHTML) -		{ -			theSelection = divarea.innerHTML.replace(/<br>/ig, '\n'); -			theSelection = theSelection.replace(/<br\/>/ig, '\n'); -			theSelection = theSelection.replace(/<\;/ig, '<'); -			theSelection = theSelection.replace(/>\;/ig, '>'); -			theSelection = theSelection.replace(/&\;/ig, '&');			 -			theSelection = theSelection.replace(/ \;/ig, ' '); -		} -		else if (document.all) -		{ -			theSelection = divarea.innerText; -		} -		else if (divarea.textContent) -		{ -			theSelection = divarea.textContent; -		} -		else if (divarea.firstChild.nodeValue) -		{ -			theSelection = divarea.firstChild.nodeValue; -		} -	} - -	if (theSelection) -	{ -		insert_text('[quote="' + username + '"]' + theSelection + '[/quote]'); -	} - -	return; -} - -/** -* From http://www.massless.org/mozedit/ -*/ -function mozWrap(txtarea, open, close) -{ -	var selLength = (typeof(txtarea.textLength) == 'undefined') ? txtarea.value.length : txtarea.textLength; -	var selStart = txtarea.selectionStart; -	var selEnd = txtarea.selectionEnd; -	var scrollTop = txtarea.scrollTop; - -	if (selEnd == 1 || selEnd == 2)  -	{ -		selEnd = selLength; -	} - -	var s1 = (txtarea.value).substring(0,selStart); -	var s2 = (txtarea.value).substring(selStart, selEnd); -	var s3 = (txtarea.value).substring(selEnd, selLength); - -	txtarea.value = s1 + open + s2 + close + s3; -	txtarea.selectionStart = selStart + open.length; -	txtarea.selectionEnd = selEnd + open.length; -	txtarea.focus(); -	txtarea.scrollTop = scrollTop; - -	return; -} - -/** -* Insert at Caret position. Code from -* http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130 -*/ -function storeCaret(textEl) -{ -	if (textEl.createTextRange) -	{ -		textEl.caretPos = document.selection.createRange().duplicate(); -	} -} - -/** -* Color pallette -*/ -function colorPalette(dir, width, height) -{ -	var r = 0, g = 0, b = 0; -	var numberList = new Array(6); -	var color = ''; - -	numberList[0] = '00'; -	numberList[1] = '40'; -	numberList[2] = '80'; -	numberList[3] = 'BF'; -	numberList[4] = 'FF'; - -	document.writeln('<table class="type2">'); - -	for (r = 0; r < 5; r++) -	{ -		if (dir == 'h') -		{ -			document.writeln('<tr>'); -		} - -		for (g = 0; g < 5; g++) -		{ -			if (dir == 'v') -			{ -				document.writeln('<tr>'); -			} -			 -			for (b = 0; b < 5; b++) -			{ -				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]); -				document.write('<td bgcolor="#' + color + '" style="width: ' + width + 'px; height: ' + height + 'px;">'); -				document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" alt="#' + color + '" title="#' + color + '" /></a>'); -				document.writeln('</td>'); -			} - -			if (dir == 'v') -			{ -				document.writeln('</tr>'); -			} -		} - -		if (dir == 'h') -		{ -			document.writeln('</tr>'); -		} -	} -	document.writeln('</table>'); -} - - -/** -* Caret Position object -*/ -function caretPosition() -{ -	var start = null; -	var end = null; -} - - -/** -* Get the caret position in an textarea -*/ -function getCaretPosition(txtarea) -{ -	var caretPos = new caretPosition(); -	 -	// simple Gecko/Opera way -	if (txtarea.selectionStart || txtarea.selectionStart == 0) -	{ -		caretPos.start = txtarea.selectionStart; -		caretPos.end = txtarea.selectionEnd; -	} -	// dirty and slow IE way -	else if (document.selection) -	{ -		// get current selection -		var range = document.selection.createRange(); - -		// a new selection of the whole textarea -		var range_all = document.body.createTextRange(); -		range_all.moveToElementText(txtarea); -		 -		// calculate selection start point by moving beginning of range_all to beginning of range -		var sel_start; -		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++) -		{ -			range_all.moveStart('character', 1); -		} -	 -		txtarea.sel_start = sel_start; -	 -		// we ignore the end value for IE, this is already dirty enough and we don't need it -		caretPos.start = txtarea.sel_start; -		caretPos.end = txtarea.sel_start;			 -	} - -	return caretPos; -}
\ No newline at end of file diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html index 783e89d6bf..7e22404f56 100644 --- a/phpBB/adm/style/install_convert.html +++ b/phpBB/adm/style/install_convert.html @@ -22,7 +22,7 @@  	<!-- ENDIF -->  	<!-- IF S_LIST --> -		<table cellspacing="1"> +		<table class="table1">  			<caption>{L_AVAILABLE_CONVERTORS}</caption>  			<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />  		<thead> @@ -86,7 +86,7 @@  			<!-- ELSE -->  				<dl> -					<dt><label>{checks.TITLE}:</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt> +					<dt><label>{checks.TITLE}{L_COLON}</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>  					<dd>{checks.RESULT}</dd>  				</dl>  			<!-- ENDIF --> @@ -109,7 +109,7 @@  			<!-- ELSE -->  				<dl> -					<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt> +					<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>  					<dd>{options.CONTENT}</dd>  				</dl> @@ -131,4 +131,4 @@  	</form>  <!-- ENDIF --> -<!-- INCLUDE install_footer.html -->
\ No newline at end of file +<!-- INCLUDE install_footer.html --> diff --git a/phpBB/adm/style/install_error.html b/phpBB/adm/style/install_error.html index ad53433207..3f7c8b9ed4 100644 --- a/phpBB/adm/style/install_error.html +++ b/phpBB/adm/style/install_error.html @@ -5,4 +5,4 @@  	<p>{MESSAGE_TEXT}</p>  </div> -<!-- INCLUDE install_footer.html -->
\ No newline at end of file +<!-- INCLUDE install_footer.html --> diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html index 319f7e06c7..c5356e7b9d 100644 --- a/phpBB/adm/style/install_footer.html +++ b/phpBB/adm/style/install_footer.html @@ -1,10 +1,7 @@ - -					</div> +						</div> +					</div><!-- /#main -->  				</div> -			<span class="corners-bottom"><span></span></span> -			<div class="clear"></div> -		</div> -		</div> +		</div><!-- /#acp -->  	</div>  	<div id="page-footer"> @@ -12,5 +9,10 @@  	</div>  </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 --> +<!-- INCLUDEJS admin.js --> +{$SCRIPTS} +  </body> -</html>
\ No newline at end of file +</html> diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html index fbb6a7b409..560bf501e9 100644 --- a/phpBB/adm/style/install_header.html +++ b/phpBB/adm/style/install_header.html @@ -1,15 +1,12 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}"> +<!DOCTYPE html> +<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">  <head> - -<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" /> -<meta http-equiv="Content-Style-Type" content="text/css" /> -<meta http-equiv="Content-Language" content="{S_USER_LANG}" /> -<meta http-equiv="imagetoolbar" content="no" /> +<meta charset="utf-8"> +<meta name="viewport" content="width=device-width" />  <!-- IF META -->{META}<!-- ENDIF -->  <title>{PAGE_TITLE}</title> -<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" /> +<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />  <script type="text/javascript">  // <![CDATA[ @@ -38,7 +35,7 @@ function dE(n, s, type)  </head> -<body class="{S_CONTENT_DIRECTION}"> +<body class="{S_CONTENT_DIRECTION} nojs">  <div id="wrap">  	<div id="page-header">  		<h1>{L_INSTALL_PANEL}</h1> @@ -46,28 +43,27 @@ function dE(n, s, type)  		<!-- IF S_LANG_SELECT -->  		<form method="post" action="">  			<fieldset class="nobg"> -				<label for="language">{L_SELECT_LANG}:</label> +				<label for="language">{L_SELECT_LANG}{L_COLON}</label>  				{S_LANG_SELECT}  				<input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}" />  			</fieldset>  		</form>  		<!-- ENDIF -->  	</div> -	 +  	<div id="page-body">  		<div id="tabs">  			<ul>  			<!-- BEGIN t_block1 --> -				<li<!-- IF t_block1.S_SELECTED --> id="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li> +				<li<!-- IF t_block1.S_SELECTED --> class="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li>  			<!-- END t_block1 -->  			</ul>  		</div>  		<div id="acp"> -		<div class="panel"> -			<span class="corners-top"><span></span></span>  				<div id="content">  					<div id="menu"> +						<div class="menu-block no-header">  						<ul>  						<!-- BEGIN l_block1 -->  							<li<!-- IF l_block1.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li> @@ -76,6 +72,8 @@ function dE(n, s, type)  							<li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF -->>{l_block2.L_TITLE}</span></li>  						<!-- END l_block2 -->  						</ul> +						</div>  					</div> -	 +  					<div id="main" class="install-body"> +						<div class="main"> diff --git a/phpBB/adm/style/install_install.html b/phpBB/adm/style/install_install.html index 79006fba69..1a809a3588 100644 --- a/phpBB/adm/style/install_install.html +++ b/phpBB/adm/style/install_install.html @@ -20,7 +20,7 @@  		<!-- ELSE -->  			<dl> -				<dt>{checks.TITLE}:<!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt> +				<dt>{checks.TITLE}{L_COLON}<!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>  				<dd>{checks.RESULT}</dd>  			</dl>  		<!-- ENDIF --> @@ -43,7 +43,7 @@  		<!-- ELSE -->  			<dl> -				<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt> +				<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>  				<dd>{options.CONTENT}</dd>  			</dl> diff --git a/phpBB/adm/style/install_main.html b/phpBB/adm/style/install_main.html index 2c318bfd65..73e73ad578 100644 --- a/phpBB/adm/style/install_main.html +++ b/phpBB/adm/style/install_main.html @@ -3,4 +3,4 @@  	<h1>{TITLE}</h1>  	<p>{BODY}</p> -<!-- INCLUDE install_footer.html -->
\ No newline at end of file +<!-- INCLUDE install_footer.html --> diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html index 818889c89b..d746226753 100644 --- a/phpBB/adm/style/install_update.html +++ b/phpBB/adm/style/install_update.html @@ -109,27 +109,14 @@  	<!-- ENDIF -->  	</fieldset> -	<!-- IF not S_UP_TO_DATE --> - -		<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}"> - -		<fieldset class="submit-buttons"> -			<p>{L_UPDATE_DATABASE_EXPLAIN}</p> -			<input class="button1" type="submit" name="db_update" value="{L_UPDATE_DATABASE}" /> -		</fieldset> - -		</form> - -	<!-- ELSE --> -		<form id="install_update" method="post" action="{U_ACTION}"> +	<form id="install_update" method="post" action="{U_ACTION}"> -		<fieldset class="submit-buttons"> -			<p>{L_CHECK_FILES_UP_TO_DATE}</p> -			<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" /> -		</fieldset> +	<fieldset class="submit-buttons"> +		<p>{L_CHECK_FILES_EXPLAIN}</p> +		<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" /> +	</fieldset> -		</form> -	<!-- ENDIF --> +	</form>  <!-- ELSEIF S_DB_UPDATE --> @@ -155,29 +142,29 @@  	<!-- ELSE --> -		<h1>{L_UPDATE_DB_SUCCESS}</h1> +		<div class="successbox"> +			<h3>{L_UPDATE_SUCCESS}</h3> +			<p>{L_EVERYTHING_UP_TO_DATE}</p> +		</div> -		<br /><br /> +	<!-- ENDIF --> -		<form id="install_update" method="post" action="{U_ACTION}"> +<!-- ELSEIF S_FILE_CHECK --> -		<fieldset class="submit-buttons"> -			<p>{L_CHECK_FILES_EXPLAIN}</p> -			<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" /> -		</fieldset> +	<!-- IF S_ALL_UP_TO_DATE --> -		</form> +		<h1>{L_UPDATE_FILE_SUCCESS}</h1> +		<p>{L_ALL_FILES_UP_TO_DATE}</p> -	<!-- ENDIF --> +		<p>{L_UPDATE_DATABASE_EXPLAIN}</p> -<!-- ELSEIF S_FILE_CHECK --> +		<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}"> -	<!-- IF S_ALL_UP_TO_DATE --> +		<fieldset class="submit-buttons"> +			<input class="button1" type="submit" name="db_update" value="{L_UPDATE_DATABASE}" /> +		</fieldset> -		<div class="successbox"> -			<h3>{L_UPDATE_SUCCESS}</h3> -			<p>{L_ALL_FILES_UP_TO_DATE}</p> -		</div> +		</form>  	<!-- ELSE -->  		<h1>{L_COLLECTED_INFORMATION}</h1> @@ -221,13 +208,13 @@  			<!-- BEGIN new -->  				<dl>  					<dt style="width: 60%;"><strong><!-- IF new.DIR_PART -->{new.DIR_PART}<br /><!-- ENDIF -->{new.FILE_PART}</strong> -					<!-- IF new.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{new.CUSTOM_ORIGINAL}</span><!-- ENDIF --> +					<!-- IF new.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{new.CUSTOM_ORIGINAL}</span><!-- ENDIF -->  				</dt> -				<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"> +				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">  					<!-- IF not new.S_BINARY -->[<a href="{new.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->  				</dd>  				<!-- IF new.S_CUSTOM --> -					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><label><input type="checkbox" name="no_update[]" value="{new.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd> +					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{new.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>  				<!-- ENDIF -->  				</dl>  			<!-- END new --> @@ -245,11 +232,11 @@  			<!-- BEGIN not_modified -->  				<dl>  					<dt style="width: 60%;"><strong><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<br /><!-- ENDIF -->{not_modified.FILE_PART}</strong> -						<!-- IF not_modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{not_modified.CUSTOM_ORIGINAL}</span><!-- ENDIF --> +						<!-- IF not_modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{not_modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->  					</dt> -					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><!-- IF not not_modified.S_BINARY -->[<a href="{not_modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{not_modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd> +					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not not_modified.S_BINARY -->[<a href="{not_modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{not_modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>  					<!-- IF not_modified.S_CUSTOM --> -						<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><label><input type="checkbox" name="no_update[]" value="{not_modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd> +						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{not_modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>  					<!-- ENDIF -->  				</dl>  			<!-- END not_modified --> @@ -266,24 +253,24 @@  				<legend><img src="{T_IMAGE_PATH}file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>  				<dl>  					<dt style="width: 60%;"><strong><!-- IF modified.DIR_PART -->{modified.DIR_PART}<br /><!-- ENDIF -->{modified.FILE_PART}</strong> -					<!-- IF modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{modified.CUSTOM_ORIGINAL}</span><!-- ENDIF --> +					<!-- IF modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->  				</dt> -				<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"> </dd> +				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"> </dd>  				<!-- IF modified.S_CUSTOM --> -					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><label><input type="checkbox" name="no_update[]" value="{modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd> +					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>  				<!-- ENDIF -->  				</dl>  				<dl>  					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt> -					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd> +					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>  				</dl>  				<dl>  					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt> -					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE --> <!-- ENDIF --></dd> +					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE --> <!-- ENDIF --></dd>  				</dl>  				<dl>  					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt> -					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE --> <!-- ENDIF --></dd> +					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE --> <!-- ENDIF --></dd>  				</dl>  			</fieldset>  			<!-- END modified --> @@ -299,13 +286,13 @@  			<!-- BEGIN new_conflict -->  				<dl>  					<dt style="width: 60%;"><strong><!-- IF new_conflict.DIR_PART -->{new_conflict.DIR_PART}<br /><!-- ENDIF -->{new_conflict.FILE_PART}</strong> -					<!-- IF new_conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{new_conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF --> +					<!-- IF new_conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{new_conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->  				</dt> -				<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"> +				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">  					<!-- IF not new_conflict.S_BINARY -->[<a href="{new_conflict.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new_conflict.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->  				</dd>  				<!-- IF new_conflict.S_CUSTOM --> -					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><label><input type="checkbox" name="no_update[]" value="{new_conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd> +					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{new_conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>  				<!-- ENDIF -->  				</dl>  			<!-- END new_conflict --> @@ -322,38 +309,38 @@  				<legend><img src="{T_IMAGE_PATH}file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>  				<dl>  					<dt style="width: 60%;"><strong><!-- IF conflict.DIR_PART -->{conflict.DIR_PART}<br /><!-- ENDIF -->{conflict.FILE_PART}</strong> -						<!-- IF conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF --> -						<!-- IF conflict.NUM_CONFLICTS --><br /><span>{L_NUM_CONFLICTS}: {conflict.NUM_CONFLICTS}</span><!-- ENDIF --> +						<!-- IF conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF --> +						<!-- IF conflict.NUM_CONFLICTS --><br /><span>{L_NUM_CONFLICTS}{L_COLON} {conflict.NUM_CONFLICTS}</span><!-- ENDIF -->  					</dt> -					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"> +					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">  						<!-- IF not conflict.S_BINARY -->[<a href="{conflict.U_SHOW_DIFF}">{L_DOWNLOAD_CONFLICTS}</a>]<br />{L_DOWNLOAD_CONFLICTS_EXPLAIN}  						<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->  					</dd>  					<!-- IF conflict.S_CUSTOM --> -						<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><label><input type="checkbox" name="no_update[]" value="{conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd> +						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>  					<!-- ENDIF -->  				</dl>  				<!-- IF conflict.S_BINARY -->  					<dl>  						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt> -						<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"> </dd> +						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"> </dd>  					</dl>  				<!-- ELSE -->  					<dl>  						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="3" checked="checked" /> {L_MERGE_NEW_FILE_OPTION}</label></dt> -						<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;">[<a href="{conflict.U_VIEW_NEW_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd> +						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NEW_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>  					</dl>  					<dl>  						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</label></dt> -						<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;">[<a href="{conflict.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd> +						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>  					</dl>  					<dl>  						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt> -						<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd> +						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>  					</dl>  					<dl>  						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt> -						<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd> +						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>  					</dl>  				<!-- ENDIF -->  			</fieldset> @@ -392,7 +379,7 @@  	<fieldset>  		<legend>{L_SELECT_DOWNLOAD_FORMAT}</legend>  	<dl> -		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt> +		<dt><label for="use_method">{L_DOWNLOAD_AS}{L_COLON}</label></dt>  		<dd>{RADIO_BUTTONS}</dd>  	</dl>  	</fieldset> @@ -408,7 +395,7 @@  	<p>{L_MAPPING_FILE_STRUCTURE}</p> -	<table cellspacing="1"> +	<table class="table1">  		<col class="row1" /><col class="row2" /><col class="row1" />  	<thead>  	<tr> @@ -455,12 +442,12 @@  	<fieldset>  		<legend>{L_FTP_SETTINGS}</legend>  	<dl> -		<dt><label>{L_UPLOAD_METHOD}:</label></dt> +		<dt><label>{L_UPLOAD_METHOD}{L_COLON}</label></dt>  		<dd><strong>{UPLOAD_METHOD}</strong></dd>  	</dl>  	<!-- BEGIN data -->  	<dl> -		<dt><label for="{data.DATA}">{data.NAME}:</label><br /><span>{data.EXPLAIN}</span></dt> +		<dt><label for="{data.DATA}">{data.NAME}{L_COLON}</label><br /><span>{data.EXPLAIN}</span></dt>  		<dd><input type="<!-- IF data.DATA == 'password' -->password<!-- ELSE -->text<!-- ENDIF -->" id="{data.DATA}" name="{data.DATA}" value="{data.DEFAULT}" /></dd>  	</dl>  	<!-- END data --> diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html index 922b4aca31..c27304a425 100644 --- a/phpBB/adm/style/install_update_diff.html +++ b/phpBB/adm/style/install_update_diff.html @@ -1,15 +1,12 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}"> +<!DOCTYPE html> +<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">  <head> - -<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" /> -<meta http-equiv="Content-Style-Type" content="text/css" /> -<meta http-equiv="Content-Language" content="{S_USER_LANG}" /> -<meta http-equiv="imagetoolbar" content="no" /> +<meta charset="utf-8"> +<meta name="viewport" content="width=device-width" />  <!-- IF META -->{META}<!-- ENDIF -->  <title>{PAGE_TITLE}</title> -<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" /> +<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />  <script type="text/javascript">  // <![CDATA[ @@ -37,7 +34,7 @@ window.onresize = resize_panel;  <style type="text/css">  /* <![CDATA[ */ -#main { +#main, .rtl #main {  	font-size: 1em;  	line-height: 0.7em;  	margin: 0; @@ -47,6 +44,7 @@ window.onresize = resize_panel;  #diff_content {  	padding: 30px 10px 10px; +	overflow: hidden;  }  <!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' --> @@ -227,7 +225,7 @@ table.hrdiff caption span {  		<p id="skip"><a href="#acp">{L_SKIP}</a></p>  		<form method="post" action="">  		<fieldset class="quick"> -			<label for="diff_mode">{L_SELECT_DIFF_MODE}:</label> +			<label for="diff_mode">{L_SELECT_DIFF_MODE}{L_COLON}</label>  			<select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select>  			<input class="button1" type="submit" id="submit" name="submit" value="{L_CHANGE}" /> @@ -235,24 +233,22 @@ table.hrdiff caption span {  		</form>  <!-- ENDIF -->  <!-- IF S_DIFF_CONFLICT_FILE --> -		<div style="float: {S_CONTENT_FLOW_BEGIN};"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div> +		<div style="float: {S_CONTENT_FLOW_BEGIN};"><strong>{L_NUM_CONFLICTS}{L_COLON} {NUM_CONFLICTS}</strong></div>  		<br style="clear: both;" />  <!-- ENDIF -->  	</div>  	<div id="page-body">  		<div id="acp"> -		<div class="panel" id="codepanel"> -			<span class="corners-top"><span></span></span> +			<div id="codepanel">  				<div id="diff_content">  					<div id="main">  						{DIFF_CONTENT}  					</div>  				</div> -			<span class="corners-bottom"><span></span></span> -		</div> +			</div>  		</div>  	</div> -<!-- INCLUDE simple_footer.html -->
\ No newline at end of file +<!-- INCLUDE simple_footer.html --> diff --git a/phpBB/adm/style/message_body.html b/phpBB/adm/style/message_body.html index 5d907e911c..3ea9e5bc24 100644 --- a/phpBB/adm/style/message_body.html +++ b/phpBB/adm/style/message_body.html @@ -5,4 +5,4 @@  	<p>{MESSAGE_TEXT}</p>  </div> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html index 361d3185fd..72af9d3388 100644 --- a/phpBB/adm/style/overall_footer.html +++ b/phpBB/adm/style/overall_footer.html @@ -1,10 +1,7 @@ - -					</div> +						</div> +					</div><!-- /#main -->  				</div> -			<span class="corners-bottom"><span></span></span> -			<div class="clear"></div> -		</div> -		</div> +		</div><!-- /#acp -->  	</div>  	<div id="page-footer"> @@ -17,8 +14,31 @@  			<!-- IF S_COPYRIGHT_HTML --><br /><!-- ENDIF -->  			{DEBUG_OUTPUT}  		<!-- ENDIF --> + +		<div id="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}"> +			<div id="darken"> </div> +		</div> +		<div id="loading_indicator"></div> + +		<div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}"> +			<a href="#" class="alert_close"></a> +			<h3 class="alert_title"></h3><p class="alert_text"></p> +		</div> +		<div id="phpbb_confirm" class="phpbb_alert"> +			<a href="#" class="alert_close"></a> +			<div class="alert_text"></div> +		</div>  	</div>  </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 --> +<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script> +<!-- INCLUDEJS ajax.js --> +<!-- INCLUDEJS admin.js --> +{$SCRIPTS} + +<!-- EVENT acp_overall_footer_after --> +  </body> -</html>
\ No newline at end of file +</html> diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index a376884507..fcef3bb8ac 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -1,25 +1,19 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}"> +<!DOCTYPE html> +<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">  <head> - -<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" /> -<meta http-equiv="Content-Style-Type" content="text/css" /> -<meta http-equiv="Content-Language" content="{S_USER_LANG}" /> -<meta http-equiv="imagetoolbar" content="no" /> +<meta charset="utf-8"> +<meta name="viewport" content="width=device-width" />  <!-- IF META -->{META}<!-- ENDIF -->  <title>{PAGE_TITLE}</title> -<link href="style/admin.css" 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">  // <![CDATA[ -var jump_page = '{LA_JUMP_PAGE}:'; +var jump_page = '{LA_JUMP_PAGE}{L_COLON}';  var on_page = '{ON_PAGE}';  var per_page = '{PER_PAGE}'; -var base_url = '{A_BASE_URL}'; - -var menu_state = 'shown'; - +var base_url = '{BASE_URL|e('js')}';  /**  * Jump to page @@ -66,11 +60,7 @@ function dE(n, s, type)  */  function marklist(id, name, state)  { -	var parent = document.getElementById(id); -	if (!parent) -	{ -		eval('parent = document.' + id); -	} +	var parent = document.getElementById(id) || document[id];  	if (!parent)  	{ @@ -111,61 +101,12 @@ function popup(url, width, height, name)  	return false;  } -/** -* Hiding/Showing the side menu -*/ -function switch_menu() -{ -	var menu = document.getElementById('menu'); -	var main = document.getElementById('main'); -	var toggle = document.getElementById('toggle'); -	var handle = document.getElementById('toggle-handle'); - -	switch (menu_state) -	{ -		// hide -		case 'shown': -			main.style.width = '93%'; -			menu_state = 'hidden'; -			menu.style.display = 'none'; -			toggle.style.width = '20px'; -			handle.style.backgroundImage = 'url(images/toggle.gif)'; -			handle.style.backgroundRepeat = 'no-repeat'; - -			<!-- IF S_CONTENT_DIRECTION eq 'rtl' --> -				handle.style.backgroundPosition = '0% 50%'; -				toggle.style.left = '96%'; -			<!-- ELSE --> -				handle.style.backgroundPosition = '100% 50%'; -				toggle.style.left = '0'; -			<!-- ENDIF --> -		break; - -		// show -		case 'hidden': -			main.style.width = '76%'; -			menu_state = 'shown'; -			menu.style.display = 'block'; -			toggle.style.width = '5%'; -			handle.style.backgroundImage = 'url(images/toggle.gif)'; -			handle.style.backgroundRepeat = 'no-repeat'; - -			<!-- IF S_CONTENT_DIRECTION eq 'rtl' --> -				handle.style.backgroundPosition = '100% 50%'; -				toggle.style.left = '75%'; -			<!-- ELSE --> -				handle.style.backgroundPosition = '0% 50%'; -				toggle.style.left = '15%'; -			<!-- ENDIF --> -		break; -	} -} -  // ]]>  </script> +<!-- EVENT acp_overall_header_head_append -->  </head> -<body class="{S_CONTENT_DIRECTION}"> +<body class="{S_CONTENT_DIRECTION} nojs">  <div id="wrap">  	<div id="page-header"> @@ -178,29 +119,25 @@ function switch_menu()  		<div id="tabs">  			<ul>  			<!-- BEGIN t_block1 --> -				<li<!-- IF t_block1.S_SELECTED --> id="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li> +				<li<!-- IF t_block1.S_SELECTED --> class="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li>  			<!-- END t_block1 -->  			</ul>  		</div>  		<div id="acp"> -		<div class="panel"> -			<span class="corners-top"><span></span></span>  				<div id="content"> -					<!-- IF not S_USER_NOTICE -->  -					<div id="toggle"> -						<a id="toggle-handle" accesskey="m" title="{L_MENU_TOGGLE}" onclick="switch_menu(); return false;" href="#"></a></div> -					<!-- ENDIF -->  					<div id="menu">  						<p>{L_LOGGED_IN_AS}<br /><strong>{USERNAME}</strong> [ <a href="{U_LOGOUT}">{L_LOGOUT}</a> ][ <a href="{U_ADM_LOGOUT}">{L_ADM_LOGOUT}</a> ]     </p> -						<ul>  						<!-- DEFINE $LI_USED = 0 -->  						<!-- BEGIN l_block1 -->  							<!-- IF l_block1.S_SELECTED -->  						<!-- BEGIN l_block2 -->  							<!-- IF .l_block1.l_block2.l_block3 --> -							<li class="header">{l_block1.l_block2.L_TITLE}</li> +							<!-- IF $LI_USED --></ul></div><!-- ENDIF --> +							<div class="menu-block"> +								<a class="header" href="javascript:void(0);">{l_block1.l_block2.L_TITLE}</a> +								<ul>  							<!-- DEFINE $LI_USED = 1 -->  							<!-- ENDIF --> @@ -212,10 +149,11 @@ function switch_menu()  							<!-- ENDIF -->  						<!-- END l_block1 --> -						<!-- IF not $LI_USED --> -							<li></li> +						<!-- IF $LI_USED --> +								</ul> +							</div>  						<!-- ENDIF --> -						</ul>  					</div>  					<div id="main"> +						<div class="main"> diff --git a/phpBB/adm/style/pagination.html b/phpBB/adm/style/pagination.html new file mode 100644 index 0000000000..d62d0b6a81 --- /dev/null +++ b/phpBB/adm/style/pagination.html @@ -0,0 +1,12 @@ + + 	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> •  +	<ul> +	<!-- BEGIN pagination --> +		<!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li> +		<!-- ELSEIF pagination.S_IS_CURRENT --><li class="active"><span>{pagination.PAGE_NUMBER}</span></li> +		<!-- ELSEIF pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li> +		<!-- ELSEIF pagination.S_IS_NEXT --><li><a href="{pagination.PAGE_URL}">{L_NEXT}</a></li> +		<!-- ELSE --><li><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a></li> +		<!-- ENDIF --> +	<!-- END pagination --> +	</ul> diff --git a/phpBB/adm/style/permission_forum_copy.html b/phpBB/adm/style/permission_forum_copy.html index c919310035..1e012a9347 100644 --- a/phpBB/adm/style/permission_forum_copy.html +++ b/phpBB/adm/style/permission_forum_copy.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  	<h1>{L_ACP_FORUM_PERMISSIONS_COPY}</h1> @@ -12,7 +12,7 @@  		<legend>{L_LOOK_UP_FORUM}</legend>  		<dl> -			<dt><label for="src_forum">{L_COPY_PERMISSIONS_FROM}:</label><br /><span>{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}</span></dt> +			<dt><label for="src_forum">{L_COPY_PERMISSIONS_FROM}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}</span></dt>  			<dd><select id="src_forum" name="src_forum_id"><option value="0">{L_SELECT_FORUM}</option><option value="-1">------------------</option>{S_FORUM_OPTIONS}</select></dd>  		</dl>  	</fieldset> @@ -22,7 +22,7 @@  		<p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>  		<dl> -			<dt><label for="dest_forums">{L_COPY_PERMISSIONS_TO}:</label><br /><span>{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}</span></dt> +			<dt><label for="dest_forums">{L_COPY_PERMISSIONS_TO}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}</span></dt>  			<dd><select id="dest_forums" name="dest_forum_ids[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>  		</dl>  	</fieldset> diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html index e29609b8b6..7b5c071693 100644 --- a/phpBB/adm/style/permission_mask.html +++ b/phpBB/adm/style/permission_mask.html @@ -38,9 +38,9 @@  			<a href="#" onclick="swap_options('{p_mask.S_ROW_COUNT}', '{p_mask.f_mask.S_ROW_COUNT}', '0', true); return false;">{L_ADVANCED_PERMISSIONS}</a><!-- IF not p_mask.S_VIEW and p_mask.f_mask.S_CUSTOM --> *<!-- ENDIF -->  		</div>  		<dl class="permissions-simple"> -			<dt style="width: 20%"><label for="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">{L_ROLE}:</label></dt> +			<dt style="width: 20%"><label for="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">{L_ROLE}{L_COLON}</label></dt>  			<!-- IF p_mask.f_mask.S_ROLE_OPTIONS --> -				<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 20%"><select id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" onchange="set_role_settings(this.options[selectedIndex].value, 'advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')">{p_mask.f_mask.S_ROLE_OPTIONS}</select></dd> +				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 20%"><select id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" onchange="set_role_settings(this.options[selectedIndex].value, 'advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')">{p_mask.f_mask.S_ROLE_OPTIONS}</select></dd>  			<!-- ELSE -->  				<dd>{L_NO_ROLE_AVAILABLE}</dd>  			<!-- ENDIF --> @@ -75,9 +75,8 @@  	<!-- BEGIN category -->  		<div class="permissions-panel" id="options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" <!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->> -			<span class="corners-top"><span></span></span>  			<div class="tablewrap"> -				<table id="table{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" cellspacing="1"> +				<table id="table{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" class="table1 not-responsive">  				<colgroup>  					<col class="permissions-name" />  					<col class="permissions-yes" /> @@ -118,7 +117,7 @@  			</div>  			<!-- IF not p_mask.S_VIEW --> -			<fieldset class="quick" style="margin-{S_CONTENT_FLOW_END}: 11px;"> +			<fieldset class="quick" style="margin-{S_CONTENT_FLOW_END}{L_COLON} 11px;">  				<p class="small">{L_APPLY_PERMISSIONS_EXPLAIN}</p>  				<input class="button1" type="submit" name="psubmit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" value="{L_APPLY_PERMISSIONS}" />  				<!-- IF .p_mask.f_mask gt 1 or .p_mask gt 1 --> @@ -128,7 +127,6 @@  			<!-- ENDIF --> -			<span class="corners-bottom"><span></span></span>  		</div>  	<!-- END category -->  			<div class="clearfix"></div> diff --git a/phpBB/adm/style/permission_roles_mask.html b/phpBB/adm/style/permission_roles_mask.html index e88c5fd2ba..3a14e65004 100644 --- a/phpBB/adm/style/permission_roles_mask.html +++ b/phpBB/adm/style/permission_roles_mask.html @@ -1,8 +1,8 @@  <!-- BEGIN role_mask --> -	<table cellspacing="1"> -		<caption><!-- IF role_mask.FORUM_ID -->{L_FORUM}: <!-- ENDIF -->{role_mask.NAME}</caption> +	<table class="table1"> +		<caption><!-- IF role_mask.FORUM_ID -->{L_FORUM}{L_COLON} <!-- ENDIF -->{role_mask.NAME}</caption>  	<tbody>  	<tr>  		<th>{L_USERS}</th> @@ -25,7 +25,7 @@  				<a href="{role_mask.groups.U_PROFILE}">{role_mask.groups.GROUP_NAME}</a><!-- IF not role_mask.groups.S_LAST_ROW --> :: <!-- ENDIF -->  			<!-- BEGINELSE -->  				{L_GROUPS_NOT_ASSIGNED} -			<!-- END users --> +			<!-- END groups -->  		</td>  	</tr>  	</tbody> @@ -35,4 +35,4 @@  	<p>{L_ROLE_NOT_ASSIGNED}</p> -<!-- END role_mask -->
\ No newline at end of file +<!-- END role_mask --> diff --git a/phpBB/adm/style/permission_trace.html b/phpBB/adm/style/permission_trace.html index 186bb28b67..7330ffee41 100644 --- a/phpBB/adm/style/permission_trace.html +++ b/phpBB/adm/style/permission_trace.html @@ -4,11 +4,11 @@  	<!-- IF U_BACK --><a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a><!-- ENDIF --> -	<h3>{L_TRACE_FOR}: {PERMISSION_USERNAME} / <!-- IF FORUM_NAME -->{FORUM_NAME} / <!-- ENDIF -->{PERMISSION} </h3> +	<h3>{L_TRACE_FOR}{L_COLON} {PERMISSION_USERNAME} / <!-- IF FORUM_NAME -->{FORUM_NAME} / <!-- ENDIF -->{PERMISSION} </h3>  	<br /> -	<table cellspacing="1" class="type1"> +	<table class="table1">  	<thead>  	<tr>  		<th>{L_TRACE_WHO}</th> diff --git a/phpBB/adm/style/permissions.js b/phpBB/adm/style/permissions.js index adc8995c23..1c85fbd9ef 100644 --- a/phpBB/adm/style/permissions.js +++ b/phpBB/adm/style/permissions.js @@ -2,35 +2,27 @@  * Hide and show all checkboxes  * status = true (show boxes), false (hide boxes)  */ -function display_checkboxes(status)  -{ +function display_checkboxes(status) {  	var form = document.getElementById('set-permissions');  	var cb = document.getElementsByTagName('input');  	var display;  	//show -	if (status) -	{ +	if (status) {  		display = 'inline';  	}  	//hide -	else -	{ +	else {  		display = 'none';  	} -	 -	for (var i = 0; i < cb.length; i++ ) -	{ -		if (cb[i].className == 'permissions-checkbox') -		{ + +	for (var i = 0; i < cb.length; i++ ) { +		if (cb[i].className === 'permissions-checkbox') {  			cb[i].style.display = display;  		} -		 -	}	 -	 +	}  } -  /**  * Change opacity of element  * e = element @@ -38,7 +30,7 @@ function display_checkboxes(status)  */  function set_opacity(e, value) {  	e.style.opacity = value/10; -	 +  	//IE opacity currently turned off, because of its astronomical stupidity  	//e.style.filter = 'alpha(opacity=' + value*10 + ')';  } @@ -50,13 +42,10 @@ function set_opacity(e, value) {  function toggle_opacity(block_id) {  	var cb = document.getElementById('checkbox' + block_id);  	var fs = document.getElementById('perm' + block_id); -	 -	if (cb.checked)  -	{ + +	if (cb.checked) {  		set_opacity(fs, 5); -	}  -	else  -	{ +	} else {  		set_opacity(fs, 10);  	}  } @@ -71,21 +60,17 @@ function reset_opacity(status, except_id) {  	var fs = perm.getElementsByTagName('fieldset');  	var opacity = 5; -	if (status) -	{ -		opacity = 10;	 +	if (status) { +		opacity = 10;  	} -	 -	for (var i = 0; i < fs.length; i++ ) -	{ -		if (fs[i].className != 'quick') -		{ + +	for (var i = 0; i < fs.length; i++ ) { +		if (fs[i].className !== 'quick') {  			set_opacity(fs[i], opacity);  		}  	} -	if (typeof(except_id) != 'undefined') -	{ +	if (typeof(except_id) !== 'undefined') {  		set_opacity(document.getElementById('perm' + except_id), 10);  	} @@ -93,20 +78,15 @@ function reset_opacity(status, except_id) {  	marklist('set-permissions', 'inherit', !status);  } -  /**  * Check whether we have a full radiobutton row of true  * index = offset for the row of inputs (0 == first row, 1 == second, 2 == third),  * rb = array of radiobuttons  */ -function get_radio_status(index, rb)  -{ -	for (var i = index; i < rb.length; i = i + 3 ) -	{ -		if (rb[i].checked != true) -		{ -			if (i > index) -			{ +function get_radio_status(index, rb) { +	for (var i = index; i < rb.length; i = i + 3 ) { +		if (rb[i].checked !== true) { +			if (i > index) {  				//at least one is true, but not all (custom)  				return 2;  			} @@ -121,17 +101,15 @@ function get_radio_status(index, rb)  /**  * Set tab colours -* id = panel the tab needs to be set for,  -* init = initialising on open,  +* id = panel the tab needs to be set for, +* init = initialising on open,  * quick = If no calculation needed, this contains the colour  */ -function set_colours(id, init, quick) -{ +function set_colours(id, init, quick) {  	var table = document.getElementById('table' + id);  	var tab = document.getElementById('tab' + id); -	if (typeof(quick) != 'undefined')  -	{ +	if (typeof(quick) !== 'undefined') {  		tab.className = 'permissions-preset-' + quick + ' activetab';  		return;  	} @@ -141,37 +119,27 @@ function set_colours(id, init, quick)  	var status = get_radio_status(0, rb); -	if (status == 1) -	{ +	if (status === 1) {  		colour = 'yes'; -	} -	else if (status == 0)  -	{ +	} else if (status === 0) {  		// We move on to No  		status = get_radio_status(1, rb); -		if (status == 1) -		{ +		if (status === 1) {  			colour = 'no'; -		} -		else if (status == 0)  -		{ +		} else if (status === 0) {  			// We move on to Never  			status = get_radio_status(2, rb); -			if (status == 1) -			{ +			if (status === 1) {  				colour = 'never';  			}  		}  	} -	if (init) -	{ +	if (init) {  		tab.className = 'permissions-preset-' + colour; -	} -	else -	{ +	} else {  		tab.className = 'permissions-preset-' + colour + ' activetab';  	}  } @@ -180,16 +148,13 @@ function set_colours(id, init, quick)  * Initialise advanced tab colours on first load  * block_id = block that is opened  */ -function init_colours(block_id) -{	 +function init_colours(block_id) {  	var block = document.getElementById('advanced' + block_id);  	var panels = block.getElementsByTagName('div');  	var tab = document.getElementById('tab' + id); -	for (var i = 0; i < panels.length; i++) -	{ -		if(panels[i].className == 'permissions-panel') -		{ +	for (var i = 0; i < panels.length; i++) { +		if (panels[i].className === 'permissions-panel') {  			set_colours(panels[i].id.replace(/options/, ''), true);  		}  	} @@ -203,17 +168,15 @@ function init_colours(block_id)  * adv = we are opening advanced permissions  * view = called from view permissions  */ -function swap_options(pmask, fmask, cat, adv, view) -{ +function swap_options(pmask, fmask, cat, adv, view) {  	id = pmask + fmask + cat;  	active_option = active_pmask + active_fmask + active_cat; -	var	old_tab = document.getElementById('tab' + active_option);	 +	var	old_tab = document.getElementById('tab' + active_option);  	var new_tab = document.getElementById('tab' + id);  	var adv_block = document.getElementById('advanced' + pmask + fmask); -	if (adv_block.style.display == 'block' && adv == true) -	{ +	if (adv_block.style.display === 'block' && adv === true) {  		dE('advanced' + pmask + fmask, -1);  		reset_opacity(1);  		display_checkboxes(false); @@ -221,20 +184,16 @@ function swap_options(pmask, fmask, cat, adv, view)  	}  	// no need to set anything if we are clicking on the same tab again -	if (new_tab == old_tab && !adv) -	{ +	if (new_tab === old_tab && !adv) {  		return;  	}  	// init colours -	if (adv && (pmask + fmask) != (active_pmask + active_fmask)) -	{ +	if (adv && (pmask + fmask) !== (active_pmask + active_fmask)) {  		init_colours(pmask + fmask);  		display_checkboxes(true);  		reset_opacity(1); -	}  -	else if (adv)  -	{ +	} else if (adv) {  		//Checkbox might have been clicked, but we need full visibility  		display_checkboxes(true);  		reset_opacity(1); @@ -244,31 +203,26 @@ function swap_options(pmask, fmask, cat, adv, view)  	old_tab.className = old_tab.className.replace(/\ activetab/g, '');  	new_tab.className = new_tab.className + ' activetab'; -	if (id == active_option && adv != true) -	{ +	if (id === active_option && adv !== true) {  		return;  	}  	dE('options' + active_option, -1); -	 +  	//hiding and showing the checkbox -	if (document.getElementById('checkbox' + active_pmask + active_fmask)) -	{ -		dE('checkbox' + pmask + fmask, -1);	 -		 -		if ((pmask + fmask) != (active_pmask + active_fmask)) -		{ +	if (document.getElementById('checkbox' + active_pmask + active_fmask)) { +		dE('checkbox' + pmask + fmask, -1); + +		if ((pmask + fmask) !== (active_pmask + active_fmask)) {  			document.getElementById('checkbox' + active_pmask + active_fmask).style.display = 'inline';  		}  	} -	if (!view) -	{ +	if (!view) {  		dE('advanced' + active_pmask + active_fmask, -1);  	} -	if (!view) -	{ +	if (!view) {  		dE('advanced' + pmask + fmask, 1);  	}  	dE('options' + id, 1); @@ -282,41 +236,33 @@ function swap_options(pmask, fmask, cat, adv, view)  * Mark all radio buttons in one panel  * id = table ID container, s = status ['y'/'u'/'n']  */ -function mark_options(id, s) -{ +function mark_options(id, s) {  	var t = document.getElementById(id); -	if (!t) -	{ +	if (!t) {  		return;  	}  	var rb = t.getElementsByTagName('input'); -	for (var r = 0; r < rb.length; r++) -	{ -		if (rb[r].id.substr(rb[r].id.length-1) == s) -		{ +	for (var r = 0; r < rb.length; r++) { +		if (rb[r].id.substr(rb[r].id.length-1) === s) {  			rb[r].checked = true;  		}  	}  } -function mark_one_option(id, field_name, s) -{ +function mark_one_option(id, field_name, s) {  	var t = document.getElementById(id); -	if (!t) -	{ +	if (!t) {  		return;  	}  	var rb = t.getElementsByTagName('input'); -	for (var r = 0; r < rb.length; r++) -	{ -		if (rb[r].id.substr(rb[r].id.length-field_name.length-3, field_name.length) == field_name && rb[r].id.substr(rb[r].id.length-1) == s) -		{ +	for (var r = 0; r < rb.length; r++) { +		if (rb[r].id.substr(rb[r].id.length-field_name.length-3, field_name.length) === field_name && rb[r].id.substr(rb[r].id.length-1) === s) {  			rb[r].checked = true;  		}  	} @@ -325,12 +271,10 @@ function mark_one_option(id, field_name, s)  /**  * Reset role dropdown field to Select role... if an option gets changed  */ -function reset_role(id) -{ +function reset_role(id) {  	var t = document.getElementById(id); -	if (!t) -	{ +	if (!t) {  		return;  	} @@ -340,20 +284,17 @@ function reset_role(id)  /**  * Load role and set options accordingly  */ -function set_role_settings(role_id, target_id) -{ +function set_role_settings(role_id, target_id) {  	settings = role_options[role_id]; -	if (!settings) -	{ +	if (!settings) {  		return;  	}  	// Mark all options to no (unset) first...  	mark_options(target_id, 'u'); -	for (var r in settings) -	{ -		mark_one_option(target_id, r, (settings[r] == 1) ? 'y' : 'n'); +	for (var r in settings) { +		mark_one_option(target_id, r, (settings[r] === 1) ? 'y' : 'n');  	}  } diff --git a/phpBB/adm/style/progress_bar.html b/phpBB/adm/style/progress_bar.html index 00e1e5e885..1822675c15 100644 --- a/phpBB/adm/style/progress_bar.html +++ b/phpBB/adm/style/progress_bar.html @@ -37,4 +37,4 @@  // ]]>  </script> -<!-- INCLUDE simple_footer.html -->
\ No newline at end of file +<!-- INCLUDE simple_footer.html --> diff --git a/phpBB/adm/style/simple_body.html b/phpBB/adm/style/simple_body.html index 0b1e11b9a2..ca06bc4f10 100644 --- a/phpBB/adm/style/simple_body.html +++ b/phpBB/adm/style/simple_body.html @@ -5,4 +5,4 @@  	<p>{MESSAGE_TEXT}</p>  </div> -<!-- INCLUDE simple_footer.html -->
\ No newline at end of file +<!-- INCLUDE simple_footer.html --> diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html index 6395eace6c..a559b25b72 100644 --- a/phpBB/adm/style/simple_footer.html +++ b/phpBB/adm/style/simple_footer.html @@ -16,5 +16,9 @@  </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 --> +<!-- EVENT acp_simple_footer_after --> +  </body>  </html> diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html index 2339b70a93..9c4c8a2960 100644 --- a/phpBB/adm/style/simple_header.html +++ b/phpBB/adm/style/simple_header.html @@ -1,22 +1,18 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}"> +<!DOCTYPE html> +<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">  <head> - -<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" /> -<meta http-equiv="Content-Style-Type" content="text/css" /> -<meta http-equiv="Content-Language" content="{S_USER_LANG}" /> -<meta http-equiv="imagetoolbar" content="no" /> +<meta charset="utf-8">  <!-- IF META -->{META}<!-- ENDIF -->  <title>{PAGE_TITLE}</title> -<link href="style/admin.css" 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">  // <![CDATA[ -var jump_page = '{LA_JUMP_PAGE}:'; +var jump_page = '{LA_JUMP_PAGE}{L_COLON}';  var on_page = '{ON_PAGE}';  var per_page = '{PER_PAGE}'; -var base_url = '{A_BASE_URL}'; +var base_url = '{BASE_URL|e('js')}';  /**  * Window popup @@ -105,6 +101,7 @@ function find_username(url)  // ]]>  </script> +<!-- EVENT acp_simple_header_head_append -->  </head>  <body class="{S_CONTENT_DIRECTION}"> diff --git a/phpBB/adm/style/timezone.js b/phpBB/adm/style/timezone.js new file mode 100644 index 0000000000..b5e27c907c --- /dev/null +++ b/phpBB/adm/style/timezone.js @@ -0,0 +1,13 @@ +(function($) { // Avoid conflicts with other libraries + +"use strict"; + +$('#tz_date').change(function() { +	phpbb.timezoneSwitchDate(false); +}); + +$(document).ready( +	phpbb.timezoneEnableDateSelection +); + +})(jQuery); // Avoid conflicts with other libraries diff --git a/phpBB/adm/style/timezone_option.html b/phpBB/adm/style/timezone_option.html new file mode 100644 index 0000000000..7a799b69c6 --- /dev/null +++ b/phpBB/adm/style/timezone_option.html @@ -0,0 +1,19 @@ +<dl> +	<dt><label for="timezone">{L_BOARD_TIMEZONE}{L_COLON}</label></dt> +	<!-- IF S_TZ_DATE_OPTIONS --> +	<dd id="tz_select_date" style="display: none;"> +		<select name="tz_date" id="tz_date" class="autowidth tz_select"> +			<option value="">{L_SELECT_CURRENT_TIME}</option> +			{S_TZ_DATE_OPTIONS} +		</select> +	</dd> +	<!-- ENDIF --> +	<dd> +		<select name="tz" id="timezone" class="autowidth tz_select"> +			<option value="">{L_SELECT_TIMEZONE}</option> +			{S_TZ_OPTIONS} +		</select> + +		<!-- INCLUDEJS timezone.js --> +	</dd> +</dl> diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js index 20610b52fe..3a89008706 100644 --- a/phpBB/adm/style/tooltip.js +++ b/phpBB/adm/style/tooltip.js @@ -1,6 +1,6 @@  /*  javascript for Bubble Tooltips by Alessandro Fulciniti -- http://pro.html.it - http://web-graphics.com  +- http://pro.html.it - http://web-graphics.com  obtained from: http://web-graphics.com/mtarchive/001717.php  phpBB Development Team: @@ -15,14 +15,12 @@ var head_text, tooltip_mode;  /**  * Enable tooltip replacements for links  */ -function enable_tooltips_link(id, headline, sub_id) -{ +function enable_tooltips_link(id, headline, sub_id) {  	var links, i, hold; -	 +  	head_text = headline; -	if (!document.getElementById || !document.getElementsByTagName) -	{ +	if (!document.getElementById || !document.getElementsByTagName) {  		return;  	} @@ -33,26 +31,18 @@ function enable_tooltips_link(id, headline, sub_id)  	document.getElementsByTagName('body')[0].appendChild(hold); -	if (id == null) -	{ +	if (id === null) {  		links = document.getElementsByTagName('a'); -	} -	else -	{ +	} else {  		links = document.getElementById(id).getElementsByTagName('a');  	} -	for (i = 0; i < links.length; i++) -	{ -		if (sub_id) -		{ -			if (links[i].id.substr(0, sub_id.length) == sub_id) -			{ +	for (i = 0; i < links.length; i++) { +		if (sub_id) { +			if (links[i].id.substr(0, sub_id.length) === sub_id) {  				prepare(links[i]);  			} -		} -		else -		{ +		} else {  			prepare(links[i]);  		}  	} @@ -63,14 +53,12 @@ function enable_tooltips_link(id, headline, sub_id)  /**  * Enable tooltip replacements for selects  */ -function enable_tooltips_select(id, headline, sub_id) -{ +function enable_tooltips_select(id, headline, sub_id) {  	var links, i, hold; -	 +  	head_text = headline; -	if (!document.getElementById || !document.getElementsByTagName) -	{ +	if (!document.getElementById || !document.getElementsByTagName) {  		return;  	} @@ -81,26 +69,18 @@ function enable_tooltips_select(id, headline, sub_id)  	document.getElementsByTagName('body')[0].appendChild(hold); -	if (id == null) -	{ +	if (id === null) {  		links = document.getElementsByTagName('option'); -	} -	else -	{ +	} else {  		links = document.getElementById(id).getElementsByTagName('option');  	} -	for (i = 0; i < links.length; i++) -	{ -		if (sub_id) -		{ -			if (links[i].parentNode.id.substr(0, sub_id.length) == sub_id) -			{ +	for (i = 0; i < links.length; i++) { +		if (sub_id) { +			if (links[i].parentNode.id.substr(0, sub_id.length) === sub_id) {  				prepare(links[i]);  			} -		} -		else -		{ +		} else {  			prepare(links[i]);  		}  	} @@ -111,14 +91,12 @@ function enable_tooltips_select(id, headline, sub_id)  /**  * Prepare elements to replace  */ -function prepare(element) -{ +function prepare(element) {  	var tooltip, text, desc, title;  	text = element.getAttribute('title'); -	if (text == null || text.length == 0) -	{ +	if (text === null || text.length === 0) {  		return;  	} @@ -139,8 +117,7 @@ function prepare(element)  	element.onmouseover = show_tooltip;  	element.onmouseout = hide_tooltip; -	if (tooltip_mode == 'link') -	{ +	if (tooltip_mode === 'link') {  		element.onmousemove = locate;  	}  } @@ -148,8 +125,7 @@ function prepare(element)  /**  * Show tooltip  */ -function show_tooltip(e) -{ +function show_tooltip(e) {  	document.getElementById('_tooltip_container').appendChild(this.tooltip);  	locate(this);  } @@ -157,11 +133,9 @@ function show_tooltip(e)  /**  * Hide tooltip  */ -function hide_tooltip(e) -{ +function hide_tooltip(e) {  	var d = document.getElementById('_tooltip_container'); -	if (d.childNodes.length > 0) -	{ +	if (d.childNodes.length > 0) {  		d.removeChild(d.firstChild);  	}  } @@ -169,8 +143,7 @@ function hide_tooltip(e)  /**  * Set opacity on tooltip element  */ -function set_opacity(element) -{ +function set_opacity(element) {  	element.style.filter = 'alpha(opacity:95)';  	element.style.KHTMLOpacity = '0.95';  	element.style.MozOpacity = '0.95'; @@ -180,8 +153,7 @@ function set_opacity(element)  /**  * Create new element  */ -function create_element(tag, c) -{ +function create_element(tag, c) {  	var x = document.createElement(tag);  	x.className = c;  	x.style.display = 'block'; @@ -191,34 +163,26 @@ function create_element(tag, c)  /**  * Correct positioning of tooltip container  */ -function locate(e) -{ +function locate(e) {  	var posx = 0;  	var posy = 0;  	e = e.parentNode; -	if (e.offsetParent) -	{ -		for (var posx = 0, posy = 0; e.offsetParent; e = e.offsetParent) -		{ +	if (e.offsetParent) { +		for (posx = 0, posy = 0; e.offsetParent; e = e.offsetParent) {  			posx += e.offsetLeft;  			posy += e.offsetTop;  		} -	} -	else -	{ +	} else {  		posx = e.offsetLeft;  		posy = e.offsetTop;  	} -	if (tooltip_mode == 'link') -	{ +	if (tooltip_mode === 'link') {  		document.getElementById('_tooltip_container').style.top=(posy+20) + 'px';  		document.getElementById('_tooltip_container').style.left=(posx-20) + 'px'; -	} -	else -	{ +	} else {  		document.getElementById('_tooltip_container').style.top=(posy+30) + 'px';  		document.getElementById('_tooltip_container').style.left=(posx-205) + 'px';  	} diff --git a/phpBB/adm/style/viewsource.html b/phpBB/adm/style/viewsource.html index f127c9626f..03e9ff50e5 100644 --- a/phpBB/adm/style/viewsource.html +++ b/phpBB/adm/style/viewsource.html @@ -18,4 +18,4 @@  </div>  </div>  </div> -<!-- INCLUDE simple_footer.html -->
\ No newline at end of file +<!-- INCLUDE simple_footer.html --> | 
