Completed
Pull Request — release-2.1 (#4953)
by
unknown
08:09
created
Themes/default/GenericList.template.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	}
73 73
 
74 74
 	echo '
75
-		<table class="table_grid" ', !empty($list_id) ? 'id="'.$list_id.'"' : '', ' ', !empty($cur_list['width']) ? ' style="width:' . $cur_list['width'] . '"' : '', '>';
75
+		<table class="table_grid" ', !empty($list_id) ? 'id="' . $list_id . '"' : '', ' ', !empty($cur_list['width']) ? ' style="width:' . $cur_list['width'] . '"' : '', '>';
76 76
 
77 77
 	// Show the column headers.
78 78
 	$header_count = count($cur_list['headers']);
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 		// Loop through each column and add a table header.
86 86
 		foreach ($cur_list['headers'] as $col_header)
87 87
 			echo '
88
-					<th scope="col" id="header_', $list_id, '_', $col_header['id'], '" class="' , $col_header['id'], empty($col_header['class']) ? '' : ' '.$col_header['class'] , '"', empty($col_header['style']) ? '' : ' style="' . $col_header['style'] . '"', empty($col_header['colspan']) ? '' : ' colspan="' . $col_header['colspan'] . '"', '>
88
+					<th scope="col" id="header_', $list_id, '_', $col_header['id'], '" class="', $col_header['id'], empty($col_header['class']) ? '' : ' ' . $col_header['class'], '"', empty($col_header['style']) ? '' : ' style="' . $col_header['style'] . '"', empty($col_header['colspan']) ? '' : ' colspan="' . $col_header['colspan'] . '"', '>
89 89
 						', empty($col_header['href']) ? '' : '<a href="' . $col_header['href'] . '" rel="nofollow">', empty($col_header['label']) ? '' : $col_header['label'], empty($col_header['href']) ? '' : (empty($col_header['sort_image']) ? '</a>' : ' <span class="generic_icons sort_' . $col_header['sort_image'] . '"></span></a>'), '
90 90
 					</th>';
91 91
 
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 			if (!empty($row['data']))
118 118
 				foreach ($row['data'] as $row_id => $row_data)
119 119
 					echo '
120
-					<td class="', $row_id, empty($row_data['class']) ? '' : ' ' . $row_data['class'] .'', '"', empty($row_data['style']) ? '' : ' style="' . $row_data['style'] . '"', '>
120
+					<td class="', $row_id, empty($row_data['class']) ? '' : ' ' . $row_data['class'] . '', '"', empty($row_data['style']) ? '' : ' style="' . $row_data['style'] . '"', '>
121 121
 						', $row_data['value'], '
122 122
 					</td>';
123 123
 
Please login to merge, or discard this patch.
Themes/default/PersonalMessage.template.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
 
231 231
 				foreach ($message['custom_fields']['above_member'] as $custom)
232 232
 					echo '
233
-							<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
233
+							<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
234 234
 
235 235
 				echo '
236 236
 						</ul>
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
 			if (!empty($message['custom_fields']['below_avatar']))
280 280
 				foreach ($message['custom_fields']['below_avatar'] as $custom)
281 281
 					echo '
282
-						<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
282
+						<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
283 283
 
284 284
 			if (!$message['member']['is_guest'])
285 285
 				echo '
@@ -321,7 +321,7 @@  discard block
 block discarded – undo
321 321
 
322 322
 					foreach ($message['custom_fields']['icons'] as $custom)
323 323
 						echo '
324
-								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
324
+								<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
325 325
 
326 326
 					echo '
327 327
 							</ol>
@@ -385,7 +385,7 @@  discard block
 block discarded – undo
385 385
 				if (!empty($message['custom_fields']['standard']))
386 386
 					foreach ($message['custom_fields']['standard'] as $custom)
387 387
 						echo '
388
-						<li class="custom ', $custom['col_name'] ,'">', $custom['title'], ': ', $custom['value'], '</li>';
388
+						<li class="custom ', $custom['col_name'], '">', $custom['title'], ': ', $custom['value'], '</li>';
389 389
 
390 390
 				// Are we showing the warning status?
391 391
 				if ($message['member']['can_see_warning'])
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
396 396
 				if (!empty($message['custom_fields']['bottom_poster']))
397 397
 					foreach ($message['custom_fields']['bottom_poster'] as $custom)
398 398
 						echo '
399
-						<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
399
+						<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
400 400
 			}
401 401
 
402 402
 			// Done with the information about the poster... on to the post itself.
@@ -497,7 +497,7 @@  discard block
 block discarded – undo
497 497
 
498 498
 				foreach ($message['custom_fields']['above_signature'] as $custom)
499 499
 					echo '
500
-								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
500
+								<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
501 501
 
502 502
 				echo '
503 503
 							</ul>
@@ -520,7 +520,7 @@  discard block
 block discarded – undo
520 520
 
521 521
 				foreach ($message['custom_fields']['below_signature'] as $custom)
522 522
 					echo '
523
-								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
523
+								<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
524 524
 
525 525
 				echo '
526 526
 							</ul>
@@ -656,7 +656,7 @@  discard block
 block discarded – undo
656 656
 	while ($message = $context['get_pmessage']('subject'))
657 657
 	{
658 658
 		echo '
659
-			<tr class="windowbg', $message['is_unread'] ? ' unread_pm' : '','">
659
+			<tr class="windowbg', $message['is_unread'] ? ' unread_pm' : '', '">
660 660
 				<td class="table_icon pm_icon">
661 661
 					<script>
662 662
 						currentLabels[', $message['id'], '] = {';
@@ -680,7 +680,7 @@  discard block
 block discarded – undo
680 680
 				<td class="pm_time">', $message['time'], '</td>
681 681
 				<td class="pm_subject">
682 682
 					', ($context['display_mode'] != 0 && $context['current_pm'] == $message['id'] ? '<img src="' . $settings['images_url'] . '/selected.png" alt="*">' : ''), '<a href="', ($context['display_mode'] == 0 || $context['current_pm'] == $message['id'] ? '' : ($scripturl . '?action=pm;pmid=' . $message['id'] . ';kstart;f=' . $context['folder'] . ';start=' . $context['start'] . ';sort=' . $context['sort_by'] . ($context['sort_direction'] == 'up' ? ';' : ';desc') . ($context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : ''))), '#msg', $message['id'], '">', $message['subject'], $message['is_unread'] ? '&nbsp;<span class="new_posts">' . $txt['new'] . '</span>' : '', '</a>
683
-					<span class="pm_inline_time"><span class="generic_icons ', ($context['from_or_to']=='to' && count($message['recipients']['to'])>1) ? 'people' : 'members', '"></span> ', ($context['from_or_to'] == 'from' ? $message['member']['link'] : (empty($message['recipients']['to']) ? '' : implode(', ', $message['recipients']['to']))), '  <span class="generic_icons time_online"></span> ', $message['time'], '</span>
683
+					<span class="pm_inline_time"><span class="generic_icons ', ($context['from_or_to'] == 'to' && count($message['recipients']['to']) > 1) ? 'people' : 'members', '"></span> ', ($context['from_or_to'] == 'from' ? $message['member']['link'] : (empty($message['recipients']['to']) ? '' : implode(', ', $message['recipients']['to']))), '  <span class="generic_icons time_online"></span> ', $message['time'], '</span>
684 684
 				</td>
685 685
 				<td class="pm_from_to">
686 686
 					', ($context['from_or_to'] == 'from' ? $message['member']['link'] : (empty($message['recipients']['to']) ? '' : implode(', ', $message['recipients']['to']))), '
@@ -957,13 +957,13 @@  discard block
 block discarded – undo
957 957
 				// You can only reply if they are not a guest...
958 958
 				if (!$message['member']['is_guest'])
959 959
 					echo '
960
-					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=', $context['folder'] == 'sent' ? '' : $message['member']['id'], '">', $quote_button , '</a>', $context['menu_separator'], '
961
-					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';u=', $message['member']['id'], '">', $reply_button , '</a> ', $context['menu_separator'];
960
+					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=', $context['folder'] == 'sent' ? '' : $message['member']['id'], '">', $quote_button, '</a>', $context['menu_separator'], '
961
+					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';u=', $message['member']['id'], '">', $reply_button, '</a> ', $context['menu_separator'];
962 962
 
963 963
 				// This is for "forwarding" - even if the member is gone.
964 964
 				else
965 965
 					echo '
966
-					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote">', $quote_button , '</a>', $context['menu_separator'];
966
+					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote">', $quote_button, '</a>', $context['menu_separator'];
967 967
 			}
968 968
 
969 969
 			echo '
@@ -1063,7 +1063,7 @@  discard block
 block discarded – undo
1063 1063
 				<div class="', empty($context['error_type']) || $context['error_type'] != 'serious' ? 'noticebox' : 'errorbox', '"', empty($context['post_error']['messages']) ? ' style="display: none"' : '', ' id="errors">
1064 1064
 					<dl>
1065 1065
 						<dt>
1066
-							<strong id="error_serious">', $txt['error_while_submitting'] , '</strong>
1066
+							<strong id="error_serious">', $txt['error_while_submitting'], '</strong>
1067 1067
 						</dt>
1068 1068
 						<dd class="error" id="error_list">
1069 1069
 							', empty($context['post_error']['messages']) ? '' : implode('<br>', $context['post_error']['messages']), '
@@ -1119,7 +1119,7 @@  discard block
 block discarded – undo
1119 1119
 						<span', (isset($context['post_error']['no_subject']) ? ' class="error"' : ''), ' id="caption_subject">', $txt['subject'], ':</span>
1120 1120
 					</dt>
1121 1121
 					<dd id="pm_subject">
1122
-						<input type="text" name="subject" value="', $context['subject'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="80"',isset($context['post_error']['no_subject']) ? ' class="error"' : '', '>
1122
+						<input type="text" name="subject" value="', $context['subject'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="80"', isset($context['post_error']['no_subject']) ? ' class="error"' : '', '>
1123 1123
 					</dd>
1124 1124
 				</dl>';
1125 1125
 
@@ -1472,7 +1472,7 @@  discard block
 block discarded – undo
1472 1472
 		echo '
1473 1473
 		<div class="block righttext">
1474 1474
 			<input type="submit" name="save" value="', $txt['save'], '" class="button">
1475
-			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'] ,'" class="button you_sure">
1475
+			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'], '" class="button you_sure">
1476 1476
 		</div>';
1477 1477
 
1478 1478
 	echo '
@@ -1636,7 +1636,7 @@  discard block
 block discarded – undo
1636 1636
 	if (!empty($context['rules']))
1637 1637
 		echo '
1638 1638
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
1639
-			<input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'] ,'" class="button smalltext you_sure">';
1639
+			<input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'], '" class="button smalltext you_sure">';
1640 1640
 
1641 1641
 	echo '
1642 1642
 		</div>
@@ -1879,9 +1879,9 @@  discard block
 block discarded – undo
1879 1879
 
1880 1880
 		echo '
1881 1881
 				<select name="acttype[', $k, ']" id="acttype', $k, '" onchange="updateActionDef(', $k, '); rebuildRuleDesc();">
1882
-					<option value="">', $txt['pm_rule_sel_action'] , ':</option>
1883
-					<option value="lab"', $action['t'] == 'lab' ? ' selected' : '', '>', $txt['pm_rule_label'] , '</option>
1884
-					<option value="del"', $action['t'] == 'del' ? ' selected' : '', '>', $txt['pm_rule_delete'] , '</option>
1882
+					<option value="">', $txt['pm_rule_sel_action'], ':</option>
1883
+					<option value="lab"', $action['t'] == 'lab' ? ' selected' : '', '>', $txt['pm_rule_label'], '</option>
1884
+					<option value="del"', $action['t'] == 'del' ? ' selected' : '', '>', $txt['pm_rule_delete'], '</option>
1885 1885
 				</select>
1886 1886
 				<span id="labdiv', $k, '">
1887 1887
 					<select name="labdef[', $k, ']" id="labdef', $k, '" onchange="rebuildRuleDesc();">
@@ -1993,7 +1993,7 @@  discard block
 block discarded – undo
1993 1993
 			</div>
1994 1994
 			<ul class="quickbuttons">
1995 1995
 				<li><a href="', $scripturl, '?action=pm;sa=showpmdrafts;id_draft=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons modifybutton"></span>', $txt['draft_edit'], '</a></li>
1996
-				<li><a href="', $scripturl, '?action=pm;sa=showpmdrafts;delete=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['draft_remove'] ,'?" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['draft_delete'], '</a></li>
1996
+				<li><a href="', $scripturl, '?action=pm;sa=showpmdrafts;delete=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['draft_remove'], '?" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['draft_delete'], '</a></li>
1997 1997
 			</ul>
1998 1998
 		</div><!-- .windowbg -->';
1999 1999
 		}
Please login to merge, or discard this patch.