diff options
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/style/acp_attachments.html | 8 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_bbcodes.html | 4 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_bots.html | 4 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_groups.html | 10 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_icons.html | 18 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_inactive.html | 5 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_language.html | 8 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_logs.html | 4 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_main.html | 10 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_modules.html | 4 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_permission_roles.html | 19 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_profile.html | 21 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_prune_forums.html | 4 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_ranks.html | 4 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_reasons.html | 16 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_users.html | 8 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_users_feedback.html | 5 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_users_warnings.html | 4 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_words.html | 4 | ||||
| -rw-r--r-- | phpBB/adm/style/admin.css | 14 | ||||
| -rw-r--r-- | phpBB/adm/style/ajax.js | 12 | ||||
| -rw-r--r-- | phpBB/adm/style/captcha_qa_acp.html | 10 | 
22 files changed, 92 insertions, 104 deletions
| diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index 9ce9fb5f13..9db0fc6521 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -331,7 +331,7 @@  	<fieldset class="tabulated">  	<legend>{L_TITLE}</legend> -	<table class="table1"> +	<table class="table1 zebra-table">  	<thead>  	<tr>  		<th>{L_FILENAME}</th> @@ -344,7 +344,7 @@  	</thead>  	<tbody>  	<!-- BEGIN orphan --> -		<!-- IF orphan.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> +		<tr>  			<td><a href="{orphan.U_FILE}">{orphan.REAL_FILENAME}</a></td>  			<td>{orphan.FILETIME}</td>  			<td>{orphan.FILESIZE}</td> @@ -389,7 +389,7 @@  	<!-- ENDIF -->  	</div> -	<table class="table1"> +	<table class="table1 zebra-table">  	<thead>  	<tr>  		<th>{L_FILENAME}</th> @@ -400,7 +400,7 @@  	</thead>  	<tbody>  	<!-- BEGIN attachments --> -		<!-- IF attachments.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> +		<tr>  			<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 --> diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html index d4ed5cfd10..8c8b805975 100644 --- a/phpBB/adm/style/acp_bbcodes.html +++ b/phpBB/adm/style/acp_bbcodes.html @@ -92,7 +92,7 @@  	<fieldset class="tabulated">  	<legend>{L_ACP_BBCODES}</legend> -	<table class="table1" id="down"> +	<table class="table1 zebra-table" id="down">  	<thead>  	<tr>  		<th>{L_BBCODE_TAG}</th> @@ -101,7 +101,7 @@  	</thead>  	<tbody>  	<!-- BEGIN bbcodes --> -		<!-- IF bbcodes.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> +		<tr>  			<td style="text-align: center;">{bbcodes.BBCODE_TAG}</td>  			<td class="actions"><!-- EVENT acp_bbcodes_actions_prepend --> <a href="{bbcodes.U_EDIT}">{ICON_EDIT}</a> <a href="{bbcodes.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a> <!-- EVENT acp_bbcodes_actions_append --></td>  		</tr> diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html index eeda13303d..b0e61015b6 100644 --- a/phpBB/adm/style/acp_bots.html +++ b/phpBB/adm/style/acp_bots.html @@ -62,7 +62,7 @@  	<form id="acp_bots" method="post" action="{U_ACTION}"> -	<table class="table1"> +	<table class="table1 zebra-table">  	<thead>  	<tr>  		<th>{L_BOT_NAME}</th> @@ -73,7 +73,7 @@  	</thead>  	<tbody>  	<!-- BEGIN bots --> -		<!-- IF bots.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> +		<tr>  			<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}" data-ajax="activate_deactivate">{bots.L_ACTIVATE_DEACTIVATE}</a> </td> diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index 925d24f3a3..72f4f2b239 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -155,7 +155,7 @@  		<a href="{U_DEFAULT_ALL}">» {L_MAKE_DEFAULT_FOR_ALL}</a>  	</fieldset> -	<table class="table1"> +	<table class="table1 zebra-table">  	<thead>  	<tr>  		<th>{L_USERNAME}</th> @@ -170,7 +170,7 @@  		<td class="row3" colspan="5"><strong>{L_GROUP_LEAD}</strong></td>  	</tr>  	<!-- BEGIN leader --> -		<!-- IF leader.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> +		<tr>  			<td><!-- IF leader.USERNAME_COLOUR --><a href="{leader.U_USER_EDIT}" style="color: #{leader.USERNAME_COLOUR};" class="username-coloured">{leader.USERNAME}</a><!-- ELSE --><a href="{leader.U_USER_EDIT}">{leader.USERNAME}</a><!-- ENDIF --></td>  			<td style="text-align: center;"><!-- IF leader.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>  			<td style="text-align: center;">{leader.JOINED}</td> @@ -179,7 +179,7 @@  		</tr>  	<!-- BEGINELSE -->  		<tr> -			<td class="row1" colspan="5" style="text-align: center;">{L_GROUPS_NO_MODS}</td> +			<td colspan="5" style="text-align: center;">{L_GROUPS_NO_MODS}</td>  		</tr>  	<!-- END leader -->  	<tr> @@ -191,7 +191,7 @@  			<td class="row3" colspan="5"><strong>{L_GROUP_PENDING}</strong></td>  		</tr>  		<!-- ELSE --> -			<!-- IF member.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> +		<tr>  			<td><!-- IF member.USERNAME_COLOUR --><a href="{member.U_USER_EDIT}" style="color: #{member.USERNAME_COLOUR};" class="username-coloured">{member.USERNAME}</a><!-- ELSE --><a href="{member.U_USER_EDIT}">{member.USERNAME}</a><!-- ENDIF --></td>  			<td style="text-align: center;"><!-- IF member.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>  			<td style="text-align: center;">{member.JOINED}</td> @@ -201,7 +201,7 @@  		<!-- ENDIF -->  	<!-- BEGINELSE -->  		<tr> -			<td class="row1" colspan="5" style="text-align: center;">{L_GROUPS_NO_MEMBERS}</td> +			<td colspan="5" style="text-align: center;">{L_GROUPS_NO_MEMBERS}</td>  		</tr>  	<!-- END member -->  	</tbody> diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html index bfe4878ba5..9117052d87 100644 --- a/phpBB/adm/style/acp_icons.html +++ b/phpBB/adm/style/acp_icons.html @@ -74,7 +74,7 @@  	<fieldset class="tabulated">  	<legend>{L_TITLE}</legend> -	<table class="table1" id="smilies"> +	<table class="table1 zebra-table" id="smilies">  	<thead>  	<tr>  		<th colspan="{COLSPAN}">{L_CONFIG}</th> @@ -100,7 +100,7 @@  	</thead>  	<tbody>  	<!-- BEGIN items --> -		<!-- IF items.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> +		<tr>  		<td style="text-align: center;"><img src="{items.IMG_SRC}" alt="" title="" /><input type="hidden" name="image[{items.IMG}]" value="1" /></td>  		<td style="vertical-align: top;">[{items.IMG}]</td> @@ -218,7 +218,7 @@  	<legend>{L_TITLE}</legend> -	<table class="table1"> +	<table class="table1 zebra-table">  	<thead>  	<tr>  		<th>{L_TITLE}</th> @@ -236,16 +236,18 @@  				<td class="row3" colspan="{COLSPAN}" style="text-align: center;">{L_NOT_DISPLAYED}</td>  			</tr>  		<!-- ENDIF --> -		<!-- IF items.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> +		<tr>  			<td style="width: 85%; text-align: center;"><img src="{items.IMG_SRC}" width="{items.WIDTH}" height="{items.HEIGHT}" alt="{items.ALT_TEXT}" title="{items.ALT_TEXT}" /></td>  			<!-- IF S_SMILIES -->  				<td style="text-align: center;">{items.CODE}</td>  				<td style="text-align: center;">{items.EMOTION}</td>  			<!-- ENDIF --> -			<td style="text-align: right; white-space: nowrap;"> -				<!-- 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 class="actions" style="text-align: right;"> +				<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span> +				<span class="up"><a href="{items.U_MOVE_UP}" data-ajax="row_up">{ICON_MOVE_UP}</a></span> +				<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span> +				<span class="down"><a href="{items.U_MOVE_DOWN}" data-ajax="row_down">{ICON_MOVE_DOWN}</a></span> +				<a href="{items.U_EDIT}">{ICON_EDIT}</a> <a href="{items.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>  			</td>  		</tr>  	<!-- BEGINELSE --> diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html index 1c42c93f76..1cdc1abe6b 100644 --- a/phpBB/adm/style/acp_inactive.html +++ b/phpBB/adm/style/acp_inactive.html @@ -16,7 +16,7 @@  </div>  <!-- ENDIF --> -<table class="table1"> +<table class="table1 zebra-table">  <thead>  <tr>  	<th>{L_USERNAME}</th> @@ -29,8 +29,7 @@  </thead>  <tbody>  <!-- BEGIN inactive --> -	<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - +	<tr>  		<td style="vertical-align: top;">  			{inactive.USERNAME_FULL}  			<!-- IF inactive.POSTS --><br />{L_POSTS}{L_COLON} <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF --> diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html index d4fd572376..d32f6b7eac 100644 --- a/phpBB/adm/style/acp_language.html +++ b/phpBB/adm/style/acp_language.html @@ -147,7 +147,7 @@  	</tr>  	<tr>  		<td class="row3" style="text-align: right;">	 -		<!-- 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> +		<!-- 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> @@ -211,7 +211,7 @@  	<p>{L_ACP_LANGUAGE_PACKS_EXPLAIN}</p> -	<table class="table1"> +	<table class="table1 zebra-table">  	<thead>  	<tr>  		<th>{L_LANGUAGE_PACK_NAME}</th> @@ -226,7 +226,7 @@  		<td class="row3" colspan="5"><strong>{L_INSTALLED_LANGUAGE_PACKS}</strong></td>  	</tr>  	<!-- BEGIN lang --> -		<!-- IF lang.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> +	<tr>  		<td><a href="{lang.U_DETAILS}">{lang.ENGLISH_NAME}</a> {lang.TAG}</td>  		<td>{lang.LOCAL_NAME}</td>  		<td style="text-align: center;"><strong>{lang.ISO}</strong></td> @@ -240,7 +240,7 @@  	</tr>  	<!-- ENDIF -->  	<!-- BEGIN notinst --> -		<!-- IF notinst.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> +	<tr>  		<td>{notinst.NAME}</td>  		<td>{notinst.LOCAL_NAME}</td>  		<td style="text-align: center;"><strong>{notinst.ISO}</strong></td> diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html index f22eb67a72..592b5bbc16 100644 --- a/phpBB/adm/style/acp_logs.html +++ b/phpBB/adm/style/acp_logs.html @@ -22,7 +22,7 @@  <div><br style="clear: both;" /></div>  <!-- IF .log --> -	<table class="table1"> +	<table class="table1 zebra-table">  	<thead>  	<tr>  		<th>{L_USERNAME}</th> @@ -36,7 +36,7 @@  	</thead>  	<tbody>  	<!-- BEGIN log --> -		<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> +		<tr>  			<td>  				{log.USERNAME}  				<!-- IF log.REPORTEE_USERNAME --> diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index f5b030d954..6e28c7a0cc 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -222,7 +222,7 @@  		<div style="text-align: right;"><a href="{U_ADMIN_LOG}">» {L_VIEW_ADMIN_LOG}</a></div> -		<table class="table1"> +		<table class="table1 zebra-table">  		<thead>  		<tr>  			<th>{L_USERNAME}</th> @@ -233,8 +233,7 @@  		</thead>  		<tbody>  		<!-- BEGIN log --> -			<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - +			<tr>  				<td>{log.USERNAME}</td>  				<td style="text-align: center;">{log.IP}</td>  				<td style="text-align: center;">{log.DATE}</td> @@ -255,7 +254,7 @@  		<div style="text-align: right;"><a href="{U_INACTIVE_USERS}">» {L_VIEW_INACTIVE_USERS}</a></div> -		<table class="table1"> +		<table class="table1 zebra-table">  		<thead>  		<tr>  			<th>{L_USERNAME}</th> @@ -267,8 +266,7 @@  		</thead>  		<tbody>  		<!-- BEGIN inactive --> -			<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - +			<tr>  				<td style="vertical-align: top;">  					{inactive.USERNAME_FULL}  					<!-- IF inactive.POSTS --><br />{L_POSTS}{L_COLON} <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF --> diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index 5024a950b9..c7688a610c 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -151,9 +151,9 @@  				<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 class="actions">  					<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span> -					<span class="up"><a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a></span> +					<span class="up"><a href="{modules.U_MOVE_UP}" data-ajax="row_up">{ICON_MOVE_UP}</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> +					<span class="down"><a href="{modules.U_MOVE_DOWN}" data-ajax="row_down">{ICON_MOVE_DOWN}</a></span>  					<a href="{modules.U_EDIT}">{ICON_EDIT}</a>   					<a href="{modules.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>  				</td> diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html index b8fdaeb837..b3137f134c 100644 --- a/phpBB/adm/style/acp_permission_roles.html +++ b/phpBB/adm/style/acp_permission_roles.html @@ -157,20 +157,11 @@  			<!-- IF roles.ROLE_DESCRIPTION --><br /><span>{roles.ROLE_DESCRIPTION}</span><!-- ENDIF -->  		</td>  		<td style="width: 30%; text-align: center; vertical-align: top; white-space: nowrap;"><!-- IF roles.U_DISPLAY_ITEMS --><a href="{roles.U_DISPLAY_ITEMS}">{L_VIEW_ASSIGNED_ITEMS}</a><!-- ELSE -->{L_VIEW_ASSIGNED_ITEMS}<!-- ENDIF --></td> -		<td style="width: 80px; text-align: right; vertical-align: top; white-space: nowrap;"> -			<!-- IF roles.S_FIRST_ROW && not roles.S_LAST_ROW --> -				{ICON_MOVE_UP_DISABLED} -				<a href="{roles.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> -			<!-- ELSEIF not roles.S_FIRST_ROW && not roles.S_LAST_ROW--> -				<a href="{roles.U_MOVE_UP}">{ICON_MOVE_UP}</a>  -				<a href="{roles.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>  -			<!-- ELSEIF roles.S_LAST_ROW && not roles.S_FIRST_ROW --> -				<a href="{roles.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="{roles.U_MOVE_UP}" data-ajax="row_up">{ICON_MOVE_UP}</a></span> +			<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span> +			<span class="down"><a href="{roles.U_MOVE_DOWN}" data-ajax="row_down">{ICON_MOVE_DOWN}</a></span>  			<a href="{roles.U_EDIT}" title="{L_EDIT_ROLE}">{ICON_EDIT}</a>   			<a href="{roles.U_REMOVE}" title="{L_REMOVE_ROLE}" data-ajax="row_delete">{ICON_DELETE}</a>  		</td> diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html index 3546873f6c..44c9cb6d49 100644 --- a/phpBB/adm/style/acp_profile.html +++ b/phpBB/adm/style/acp_profile.html @@ -185,7 +185,7 @@  		</div>  	<!-- ENDIF --> -	<table class="table1"> +	<table class="table1 zebra-table">  	<thead>  	<tr>  		<th>{L_FIELD_IDENT}</th> @@ -195,23 +195,16 @@  	</thead>  	<tbody>  	<!-- BEGIN fields --> -		<!-- IF fields.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - +	<tr>  		<td>{fields.FIELD_IDENT}</td>  		<td>{fields.FIELD_TYPE}</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 --> -				{ICON_MOVE_UP_DISABLED} -				<a href="{fields.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> -			<!-- ELSEIF not fields.S_FIRST_ROW && not fields.S_LAST_ROW--> -				<a href="{fields.U_MOVE_UP}">{ICON_MOVE_UP}</a> -				<a href="{fields.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> -			<!-- ELSEIF fields.S_LAST_ROW && not fields.S_FIRST_ROW --> -				<a href="{fields.U_MOVE_UP}">{ICON_MOVE_UP}</a> -				{ICON_MOVE_DOWN_DISABLED} -			<!-- ENDIF --> +		<td class="actions" style="width: 80px;"> +			<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span> +			<span class="up"><a href="{fields.U_MOVE_UP}" data-ajax="row_up">{ICON_MOVE_UP}</a></span> +			<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span> +			<span class="down"><a href="{fields.U_MOVE_DOWN}" data-ajax="row_down">{ICON_MOVE_DOWN}</a></span>  			<!-- IF not fields.S_NEED_EDIT -->  				<a href="{fields.U_EDIT}">{ICON_EDIT}</a>  			<!-- ELSE --> diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html index 1be9689cc7..4d748f1cce 100644 --- a/phpBB/adm/style/acp_prune_forums.html +++ b/phpBB/adm/style/acp_prune_forums.html @@ -8,7 +8,7 @@  	<p>{L_PRUNE_SUCCESS}</p> -	<table class="table1"> +	<table class="table1 zebra-table">  	<thead>  	<tr>  		<th>{L_FORUM}</th> @@ -18,7 +18,7 @@  	</thead>  	<tbody>  	<!-- BEGIN pruned --> -		<!-- IF pruned.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> +	<tr>  		<td style="text-align: center;">{pruned.FORUM_NAME}</td>  		<td style="text-align: center;">{pruned.NUM_TOPICS}</td>  		<td style="text-align: center;">{pruned.NUM_POSTS}</td> diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html index a1409b15ef..be68dda695 100644 --- a/phpBB/adm/style/acp_ranks.html +++ b/phpBB/adm/style/acp_ranks.html @@ -65,7 +65,7 @@  	<fieldset class="tabulated">  	<legend>{L_ACP_MANAGE_RANKS}</legend> -	<table class="table1"> +	<table class="table1 zebra-table">  	<thead>  	<tr>  		<th>{L_RANK_IMAGE}</th> @@ -76,7 +76,7 @@  	</thead>  	<tbody>  	<!-- BEGIN ranks --> -		<!-- IF ranks.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> +	<tr>  		<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> diff --git a/phpBB/adm/style/acp_reasons.html b/phpBB/adm/style/acp_reasons.html index ca3aebb338..d629a9553f 100644 --- a/phpBB/adm/style/acp_reasons.html +++ b/phpBB/adm/style/acp_reasons.html @@ -86,17 +86,11 @@  					<br /><span>{reasons.REASON_DESCRIPTION}</span>  				</td>  				<td style="width: 100px;">{reasons.REASON_COUNT}</td> -				<td style="width: 80px; text-align: right; white-space: nowrap;"> -					<!-- IF reasons.S_FIRST_ROW && not reasons.S_LAST_ROW --> -						{ICON_MOVE_UP_DISABLED} -						<a href="{reasons.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> -					<!-- ELSEIF not reasons.S_FIRST_ROW && not reasons.S_LAST_ROW--> -						<a href="{reasons.U_MOVE_UP}">{ICON_MOVE_UP}</a>  -						<a href="{reasons.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>  -					<!-- ELSEIF reasons.S_LAST_ROW && not reasons.S_FIRST_ROW --> -						<a href="{reasons.U_MOVE_UP}">{ICON_MOVE_UP}</a>	 -						{ICON_MOVE_DOWN_DISABLED} -					<!-- ENDIF --> +				<td class="actions" style="width: 80px;"> +					<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span> +					<span class="up"><a href="{reasons.U_MOVE_UP}" data-ajax="row_up">{ICON_MOVE_UP}</a></span> +					<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span> +					<span class="down"><a href="{reasons.U_MOVE_DOWN}" data-ajax="row_down">{ICON_MOVE_DOWN}</a></span>  					<a href="{reasons.U_EDIT}">{ICON_EDIT}</a>   					<!-- IF reasons.U_DELETE -->  						<a href="{reasons.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a> diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index b213587def..b84e32013f 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -125,7 +125,7 @@  	<form id="user_groups" method="post" action="{U_ACTION}"> -	<table class="table1"> +	<table class="table1 zebra-table">  	<tbody>  	<!-- BEGIN group -->  		<!-- IF group.S_NEW_GROUP_TYPE --> @@ -133,7 +133,7 @@  			<td class="row3" colspan="4"><strong>{group.GROUP_TYPE}</strong></td>  		</tr>  		<!-- ELSE --> -			<!-- IF group.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> +			<tr>  				<td><a href="{group.U_EDIT_GROUP}">{group.GROUP_NAME}</a></td>  				<td><!-- IF group.S_IS_MEMBER --><!-- IF group.S_NO_DEFAULT --><a href="{group.U_DEFAULT}">{L_GROUP_DEFAULT}</a><!-- ELSE --><strong>{L_GROUP_DEFAULT}</strong><!-- ENDIF --><!-- ELSEIF not group.S_IS_MEMBER and group.U_APPROVE --><a href="{group.U_APPROVE}">{L_GROUP_APPROVE}</a><!-- ELSE --> <!-- ENDIF --></td>  				<td><!-- IF group.S_IS_MEMBER and not group.S_SPECIAL_GROUP --><a href="{group.U_DEMOTE_PROMOTE}">{group.L_DEMOTE_PROMOTE}</a><!-- ELSE --> <!-- ENDIF --></td> @@ -164,7 +164,7 @@  	</div>  	<!-- IF .attach --> -	<table class="table1"> +	<table class="table1 zebra-table">  	<thead>  	<tr>  		<th>{L_FILENAME}</th> @@ -176,7 +176,7 @@  	</thead>  	<tbody>  	<!-- BEGIN attach --> -		<!-- IF attach.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> +	<tr>  		<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> diff --git a/phpBB/adm/style/acp_users_feedback.html b/phpBB/adm/style/acp_users_feedback.html index 95892f2822..f251724cd2 100644 --- a/phpBB/adm/style/acp_users_feedback.html +++ b/phpBB/adm/style/acp_users_feedback.html @@ -7,7 +7,7 @@  	</div>  	<!-- IF .log --> -	<table class="table1"> +	<table class="table1 zebra-table">  	<thead>  	<tr>  		<th>{L_REPORT_BY}</th> @@ -19,8 +19,7 @@  	</thead>  	<tbody>  	<!-- BEGIN log --> -		<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - +		<tr>  			<td>{log.USERNAME}</td>  			<td style="text-align: center;">{log.IP}</td>  			<td style="text-align: center;">{log.DATE}</td> diff --git a/phpBB/adm/style/acp_users_warnings.html b/phpBB/adm/style/acp_users_warnings.html index 9d082eda6d..6e7f521415 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 class="table1"> +	<table class="table1 zebra-table">  	<thead>  	<tr>  		<th>{L_REPORT_BY}</th> @@ -12,7 +12,7 @@  	</thead>  	<tbody>  	<!-- BEGIN warn --> -		<!-- IF warn.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> +		<tr>  			<td>{warn.USERNAME}</td>  			<td style="text-align: center; nowrap: nowrap;">{warn.DATE}</td>  			<td>{warn.ACTION}</td> diff --git a/phpBB/adm/style/acp_words.html b/phpBB/adm/style/acp_words.html index 7e91bc4367..6038fc6161 100644 --- a/phpBB/adm/style/acp_words.html +++ b/phpBB/adm/style/acp_words.html @@ -47,7 +47,7 @@  		<input class="button2" name="add" type="submit" value="{L_ADD_WORD}" />  	</p> -	<table class="table1"> +	<table class="table1 zebra-table">  	<thead>  	<tr>  		<th>{L_WORD}</th> @@ -57,7 +57,7 @@  	</thead>  	<tbody>  	<!-- BEGIN words --> -		<!-- IF words.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> +	<tr>  		<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}" data-ajax="row_delete">{ICON_DELETE}</a> </td> diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index c4f1caf722..f10e32a1bb 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -220,7 +220,7 @@ li {  }  .rtl #main { -	float: right; +	float: left;  	margin: 0 -210px 0 0;  } @@ -352,7 +352,7 @@ li {  	position: relative;  } -.rtl #tabs a { +.rtl #tabs li {  	float: right;  } @@ -840,8 +840,14 @@ td.name {  	text-align: right;  } -.row1 { background-color: #F9F9F9; } -.row2 { background-color: #DCEBFE; } +.row1, table.zebra-table tbody tr:nth-child(odd) { +	background-color: #F9F9F9; +} + +.row2, table.zebra-table tbody tr:nth-child(even) { +	background-color: #DCEBFE; +} +  .row3 { background-color: #DBDFE2; }  .row4 { background-color: #E4E8EB; }  .col1 { background-color: #DCEBFE; } diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js index 78fcbd88fd..959580d6c2 100644 --- a/phpBB/adm/style/ajax.js +++ b/phpBB/adm/style/ajax.js @@ -8,7 +8,11 @@   * 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() { +phpbb.addAjaxCallback('row_down', function(res) { +	if (typeof res.success === 'undefined' || !res.success) { +		return; +	} +  	var el = $(this),  		tr = el.parents('tr'),  		trSwap = tr.next(); @@ -16,7 +20,11 @@ phpbb.addAjaxCallback('row_down', function() {  	tr.insertAfter(trSwap);  }); -phpbb.addAjaxCallback('row_up', function() { +phpbb.addAjaxCallback('row_up', function(res) { +	if (typeof res.success === 'undefined' || !res.success) { +		return; +	} +  	var el = $(this),  		tr = el.parents('tr'),  		trSwap = tr.prev(); diff --git a/phpBB/adm/style/captcha_qa_acp.html b/phpBB/adm/style/captcha_qa_acp.html index 4ff7c328fc..6235f9a104 100644 --- a/phpBB/adm/style/captcha_qa_acp.html +++ b/phpBB/adm/style/captcha_qa_acp.html @@ -14,7 +14,7 @@  	<fieldset class="tabulated">  	<legend>{L_QUESTIONS}</legend> -	<table class="table1"> +	<table class="table1 zebra-table">  	<thead>  	<tr>  		<th colspan="3">{L_QUESTIONS}</th> @@ -27,14 +27,12 @@  	</thead>  	<tbody>  	<!-- BEGIN questions --> - -		<!-- IF questions.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - +	<tr>  		<td style="text-align: left;">{questions.QUESTION_TEXT}</td>  		<td style="text-align: center;">{questions.QUESTION_LANG}</td>  		<td style="text-align: center;"><a href="{questions.U_EDIT}">{ICON_EDIT}</a> <a href="{questions.U_DELETE}">{ICON_DELETE}</a></td> -		</tr> -		<!-- END questions --> +	</tr> +	<!-- END questions -->  	</tbody>  	</table>  	<fieldset class="quick"> | 
