Commit f5116985 by Scott

Fix miscellaneous invalid HTML

parent 1ef1e39e
......@@ -720,7 +720,7 @@ function qa_content_prepare($voting = false, $categoryids = null)
$qa_content['logo'] = '<a href="' . qa_path_html('') . '" class="qa-logo-link" title="' . qa_html(qa_opt('site_title')) . '">' .
'<img src="' . qa_html(is_numeric(strpos($logourl, '://')) ? $logourl : qa_path_to_root() . $logourl) . '"' .
($logowidth ? (' width="' . $logowidth . '"') : '') . ($logoheight ? (' height="' . $logoheight . '"') : '') .
' border="0" alt="' . qa_html(qa_opt('site_title')) . '"/></a>';
' alt="' . qa_html(qa_opt('site_title')) . '"/></a>';
} else {
$qa_content['logo'] = '<a href="' . qa_path_html('') . '" class="qa-logo-link">' . qa_html(qa_opt('site_title')) . '</a>';
}
......
......@@ -1009,7 +1009,7 @@ foreach ($showoptions as $optionname) {
foreach ($rawoptions as $rawoption) {
$neatoptions[$rawoption] =
'<iframe src="' . qa_path_html('url/test/' . QA_URL_TEST_STRING, array('dummy' => '', 'param' => QA_URL_TEST_STRING), null, $rawoption) . '" width="20" height="16" style="vertical-align:middle; border:0" scrolling="no" frameborder="0"></iframe>&nbsp;' .
'<iframe src="' . qa_path_html('url/test/' . QA_URL_TEST_STRING, array('dummy' => '', 'param' => QA_URL_TEST_STRING), null, $rawoption) . '" width="20" height="16" style="vertical-align:middle; border:0" scrolling="no"></iframe>&nbsp;' .
'<small>' .
qa_html(urldecode(qa_path('123/why-do-birds-sing', null, '/', $rawoption))) .
(($rawoption == QA_URL_FORMAT_NEAT) ? strtr(qa_lang_html('admin/neat_urls_note'), array(
......
......@@ -741,7 +741,7 @@ if (!QA_FINAL_EXTERNAL_USERS) {
// Information about user activity, available also with single sign-on integration
$qa_content['form_activity'] = array(
'title' => '<a name="activity">' . qa_lang_html_sub('profile/activity_by_x', $userhtml) . '</a>',
'title' => '<span id="activity">' . qa_lang_html_sub('profile/activity_by_x', $userhtml) . '</span>',
'style' => 'wide',
......@@ -906,7 +906,7 @@ $qa_content['raw']['rank'] = $userrank;
if (!QA_FINAL_EXTERNAL_USERS && qa_opt('allow_user_walls')) {
$qa_content['message_list'] = array(
'title' => '<a name="wall">' . qa_lang_html_sub('profile/wall_for_x', $userhtml) . '</a>',
'title' => '<span id="wall">' . qa_lang_html_sub('profile/wall_for_x', $userhtml) . '</span>',
'tags' => 'id="wallmessages"',
......
......@@ -48,14 +48,14 @@ class qa_ask_box
<form method="post" action="<?php echo qa_path_html('ask', $params); ?>">
<table class="qa-form-tall-table" style="width:100%">
<tr style="vertical-align:middle;">
<td class="qa-form-tall-label" style="padding:8px; white-space:nowrap; <?php echo ($region=='side') ? 'padding-bottom:0;' : 'text-align:right;'?>" width="1">
<td class="qa-form-tall-label" style="width: 1px; padding:8px; white-space:nowrap; <?php echo ($region=='side') ? 'padding-bottom:0;' : 'text-align:right;'?>">
<?php echo strtr(qa_lang_html('question/ask_title'), array(' ' => '&nbsp;'))?>:
</td>
<?php if ($region=='side') : ?>
</tr>
<tr>
<?php endif; ?>
<td class="qa-form-tall-data" style="padding:8px;" width="*">
<td class="qa-form-tall-data" style="padding:8px;">
<input name="title" type="text" class="qa-form-tall-text" style="width:95%;">
</td>
</tr>
......
......@@ -959,7 +959,7 @@ class qa_html_theme_base
public function form_columns($form)
{
if (isset($form['ok']) || !empty($form['fields']))
$columns = ($form['style'] == 'wide') ? 3 : 1;
$columns = ($form['style'] == 'wide') ? 2 : 1;
else
$columns = 0;
......@@ -1052,7 +1052,7 @@ class qa_html_theme_base
if (isset($field['style'])) { // field has different style to most of form
$style = $field['style'];
$colspan = $columns;
$columns = ($style == 'wide') ? 3 : 1;
$columns = ($style == 'wide') ? 2 : 1;
} else
$colspan = null;
......
......@@ -58,7 +58,7 @@ class qa_facebook_login
$size = 'medium';
?>
<div id="fb-root" style="display:inline;"></div>
<span id="fb-root" style="display:inline;"></span>
<script>
window.fbAsyncInit = function() {
FB.init({
......@@ -80,8 +80,8 @@ class qa_facebook_login
d.getElementsByTagName('head')[0].appendChild(js);
}(document));
</script>
<div class="fb-login-button" style="display:inline; vertical-align:middle;" size="<?php echo $size?>" <?php echo $logout ? 'autologoutlink="true"' : 'scope="email,user_about_me,user_location,user_website"'?>>
</div>
<span class="fb-login-button" style="display:inline; vertical-align:middle;" size="<?php echo $size?>" <?php echo $logout ? 'autologoutlink="true"' : 'scope="email,user_about_me,user_location,user_website"'?>>
</span>
<?php
}
......
......@@ -119,7 +119,7 @@ class qa_html_theme extends qa_html_theme_base
$feed = @$this->content['feed'];
if (!empty($feed)) {
$this->output('<a href="'.$feed['url'].'" title="'.@$feed['label'].'"><img src="'.$this->rooturl.'images/rss.jpg" alt="" width="16" height="16" border="0" class="qa-rss-icon"/></a>');
$this->output('<a href="'.$feed['url'].'" title="'.@$feed['label'].'"><img src="'.$this->rooturl.'images/rss.jpg" alt="" width="16" height="16" class="qa-rss-icon"/></a>');
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment