From 75ed544eb0307154a0f499e4563ed8cd011c6668 Mon Sep 17 00:00:00 2001
From: spaghetti <ben@oppaiti.me>
Date: Sat, 10 Jun 2017 22:08:40 -0400
Subject: [PATCH] Modify markup to be more HTML5 compliant

---
 design/privateheader.php                  | 10 +++++-----
 design/publicheader.php                   |  8 ++++----
 design/views/generic/reply/quickreply.php | 16 +++-------------
 design/views/generic/reply/staffpm.php    |  2 +-
 static/styles/global.css                  |  8 ++++++--
 5 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/design/privateheader.php b/design/privateheader.php
index 0e104d3..a629a49 100755
--- a/design/privateheader.php
+++ b/design/privateheader.php
@@ -3,13 +3,14 @@
 define('FOOTER_FILE', SERVER_ROOT.'/design/privatefooter.php');
 
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
+<!DOCTYPE html>
+<html lang="en">
 <head>
   <title><?=display_str($PageTitle)?></title>
   <meta charset="utf-8" />
-  <meta id="auth_holder" userid="<?=G::$LoggedUser['ID']?>" authkey="<?=G::$LoggedUser['AuthKey']?>" />
-  <link rel="shortcut icon" href="favicon.ico?v=<?=md5_file('favicon.ico');?>" />
+  <meta name="userid" content="<?=G::$LoggedUser['ID']?>" />
+  <meta name="authkey" content="<?=G::$LoggedUser['AuthKey']?>" />
+  <link rel="shortcut icon" href="favicon.ico?v=<?=md5_file('favicon.ico')?>" />
   <link rel="search" type="application/opensearchdescription+xml" title="<?=SITE_NAME?>" href="<?=STATIC_SERVER?>opensearch.xml">
   <link rel="alternate" type="application/rss+xml"
       href="feeds.php?feed=feed_news&amp;user=<?=G::$LoggedUser['ID']?>&amp;auth=<?=G::$LoggedUser['RSS_Auth']?>&amp;passkey=<?=G::$LoggedUser['torrent_pass']?>&amp;authkey=<?=G::$LoggedUser['AuthKey']?>"
@@ -196,7 +197,6 @@ if ($NotificationsManager->is_skipped(NotificationsManager::SUBSCRIPTIONS)) {
             </div>
           </li>
         </ul>
-        </ul>
       </div>
 <?
 if (isset(G::$LoggedUser['SearchType']) && G::$LoggedUser['SearchType']) { // Advanced search
diff --git a/design/publicheader.php b/design/publicheader.php
index e3e6f14..73af328 100755
--- a/design/publicheader.php
+++ b/design/publicheader.php
@@ -2,11 +2,11 @@
 global $LoggedUser;
 define('FOOTER_FILE',SERVER_ROOT.'/design/publicfooter.php');
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
 <html>
 <head>
   <title><?=display_str($PageTitle)?></title>
-  <meta http-equiv="X-UA-Compatible" content="chrome=1; IE=edge" />
+  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <link rel="shortcut icon" href="favicon.ico?v=<?=md5_file('favicon.ico');?>" />
   <link href="<?=STATIC_SERVER ?>styles/public/style.css?v=<?=filemtime(SERVER_ROOT.'/static/styles/public/style.css')?>" rel="stylesheet" type="text/css" />
 <?
@@ -23,7 +23,7 @@ define('FOOTER_FILE',SERVER_ROOT.'/design/publicfooter.php');
 <?
   }
   $img = array_diff(scandir(SERVER_ROOT.'/misc/bg', 1), array('.', '..')); ?>
-  <meta id="bg_data" bg="<?=$img[rand(0,count($img)-1)]?>">
+  <meta name="bg_data" content="<?=$img[rand(0,count($img)-1)]?>">
 </head>
 <body>
 <div id="head"><span>
@@ -35,6 +35,6 @@ define('FOOTER_FILE',SERVER_ROOT.'/design/publicfooter.php');
 <div id="content">
   <table class="layout" id="maincontent">
     <tr>
-      <td align="center" valign="middle">
+      <td class="centered">
         <a href="index.php"><div id="logo"></div></a>
 <?
diff --git a/design/views/generic/reply/quickreply.php b/design/views/generic/reply/quickreply.php
index 65f9dfe..4be7a2a 100755
--- a/design/views/generic/reply/quickreply.php
+++ b/design/views/generic/reply/quickreply.php
@@ -52,16 +52,6 @@
   if (!isset($InputTitle)) {
     $InputTitle = 'Post comment';
   }
-  if (!isset($Action)) {
-    $Action = '';
-  }
-
-  // TODO: Remove inline styles
-
-  // Old to do?
-  // TODO: Preview, come up with a standard, make it look like post or just a
-  // block of formatted BBcode, but decide and write some proper XHTML
-
 
   $ReplyText = new TEXTAREA_PREVIEW('body', 'quickpost', '',
       $TextareaCols, $TextareaRows, false, false, true, array(
@@ -95,18 +85,18 @@
             </tr>
             <tr>
 <?  if (Users::has_avatars_enabled()) { ?>
-              <td class="avatar" valign="top">
+              <td class="avatar valign_top">
                 <?=Users::show_avatar(G::$LoggedUser['Avatar'], G::$LoggedUser['ID'], G::$LoggedUser['Username'], (!isset($HeavyInfo['DisableAvatars']) || $HeavyInfo['DisableAvatars']))?>
               </td>
 <?  } ?>
-              <td class="body" valign="top">
+              <td class="body valign_top">
                 <div id="contentpreview" style="text-align: left;">
                   <div id="preview_<?=$ReplyText->getID()?>"></div>
                 </div>
               </td>
             </tr>
           </table>
-          <form class="send_form center" name="reply" id="quickpostform" action="<?=$Action?>" method="post"<? if (!check_perms('users_mod')) { ?> onsubmit="quickpostform.submit_button.disabled = true;"<? } ?>>
+          <form class="send_form center" name="reply" id="quickpostform" <?=isset($Action)?'action="'.$Action.'"':''?> method="post"<? if (!check_perms('users_mod')) { ?> onsubmit="quickpostform.submit_button.disabled = true;"<? } ?>>
             <input type="hidden" name="action" value="<?=$InputAction?>" />
             <input type="hidden" name="auth" value="<?=G::$LoggedUser['AuthKey']?>" />
             <input type="hidden" name="<?=$InputName?>" value="<?=$InputID?>" />
diff --git a/design/views/generic/reply/staffpm.php b/design/views/generic/reply/staffpm.php
index cd1ceef..72ab4f8 100755
--- a/design/views/generic/reply/staffpm.php
+++ b/design/views/generic/reply/staffpm.php
@@ -22,6 +22,6 @@
 
         <input type="button" value="Preview" class="hidden button_preview_<?=$TextPrev->getID()?>" />
         <input type="submit" value="Send message" />
-        <input type="button" value="Hide" toggle-target="#compose" />
+        <input type="button" value="Hide" data-toggle-target="#compose" />
       </form>
     </div>
diff --git a/static/styles/global.css b/static/styles/global.css
index b0fb73d..c96ad1e 100755
--- a/static/styles/global.css
+++ b/static/styles/global.css
@@ -111,7 +111,7 @@ div.collage_image {
   width: 20%;
 }
 
-[toggle-target], [quote-jump] {
+[data-toggle-target], [quote-jump] {
   cursor: pointer;
 }
 
@@ -267,7 +267,7 @@ div#AddArtists a {
   width: 95%
 }
 
-td.label {
+td.label, .valign_top {
   vertical-align: top;
 }
 
@@ -723,6 +723,10 @@ tr.torrent .bookmark>a:after {
   max-width: 500px;
 }
 
+.display_block {
+  display: block;
+}
+
 .sidebar img {
   max-width: 100%;
   width: initial;
