Add Skeleton CSS support, mostly

classes/config.template.php

@@ -382,7 +382,7 @@ ENV::setPub('FEATURE_SET_ENC_KEY_PUBLIC', false);
 
 # Attempt to support the Seqhash algorithm
 # https://blog.libredna.org/post/seqhash/
-ENV::setPub('FEATURE_SEQHASH', true);
+ENV::setPub('FEATURE_BIOPHP', true);
 
 
 /**

classes/env.class.php

@@ -137,9 +137,11 @@ class ENV
      * toArray
      *
      * Takes an object and returns an array.
+     * @param object|string $obj Thing to turn into an array
+     * @return $new New recursive array with $obj contents
      * @see https://ben.lobaugh.net/blog/567/php-recursively-convert-an-object-to-an-array
      */
-    public function toArray(object $obj)
+    public function toArray($obj)
     {
         if (is_object($obj)) {
             $obj = (array) $obj;
@@ -242,10 +244,10 @@ class ENV
      * string(32) "52963afccc006d2bce3c890ad9e8f73a"
      *
      * @param string $fn Callback function
-     * @param object $obj Object to operate on
+     * @param object|string $obj Object or property to operate on
      * @return object $RAO Mapped RecursiveArrayObject
      */
-    public function map(string $fn = '', object $obj = null)
+    public function map(string $fn = '', $obj = null)
     {
         # Set a default function if desired
         if (empty($fn) && !is_object($fn)) {

classes/security.class.php

@@ -65,7 +65,7 @@ class Security
         }
 
         # blake3
-        if ($ENV->FEATURE_SEQHASH && !extension_loaded('blake3')) {
+        if ($ENV->FEATURE_BIOPHP && !extension_loaded('blake3')) {
             error('Please install and enable the php-blake3 extension.');
         }
 

classes/seqhash.class.php

@@ -1,360 +0,0 @@
-<?php
-#declare(strict_types = 1);
-# PHP Notice:  Trying to access array offset on value of type bool in /var/www/html/dev.biotorrents.de/classes/seqhash.class.php on line 233
-
-/**
- * Seqhash
- *
- * Implements Keoni's Seqhash algorithm for DNA/RNA/protein sequences,
- * e.g., v1_DCD_4b0616d1b3fc632e42d78521deb38b44fba95cca9fde159e01cd567fa996ceb9
- *
- * > The first element is the version tag (v1 for version 1).
- * > If there is ever a Seqhash version 2, this tag will differentiate seqhashes.
- *
- * > The second element is the metadata tag, which has 3 letters.
- * > The first letter codes for the sequenceType (D for DNA, R for RNA, and P for Protein).
- * > The second letter codes for whether or not the sequence is circular (C for Circular, L for Linear).
- * > The final letter codes for whether or not the sequence is double stranded (D for Double stranded, S for Single stranded).
- *
- * > The final element is the blake3 hash of the sequence (once rotated and complemented).
- *
- * Requires the php-blake3 extension from:
- * https://github.com/cypherbits/php-blake3
- *
- * @see https://blog.libredna.org/post/seqhash/
- * @see https://github.com/TimothyStiles/poly/blob/prime/hash.go
- * @see https://github.com/TimothyStiles/poly/blob/prime/hash_test.go
- */
-
-class Seqhash
-{
-    /**
-     * boothLeastRotation
-     *
-     * Gets the least rotation of a circular string.
-     * @see https://en.wikipedia.org/wiki/Lexicographically_minimal_string_rotation
-     */
-    public function boothLeastRotation(string $Sequence)
-    {
-        # First concatenate the sequence to itself to avoid modular arithmatic
-        # todo: Use buffers just for speed? May get annoying with larger sequences
-        $Sequence = $Sequence . $Sequence;
-        $LeastRotationIndex = 0;
-
-        # Initializing failure slice
-        $FailureSlice = array_fill(0, strlen($Sequence), -1);
-
-        /*
-        for ($i = 0; $i <= strlen($Sequence); $i++) {
-            $FailureSlice[$i] = -1;
-        }
-        */
-
-        # Iterate through each character in the doubled-over sequence
-        for ($CharacterIndex = 1; $CharacterIndex < strlen($Sequence); $CharacterIndex++) {
-
-            # Get character
-            $Character = $Sequence[$CharacterIndex];
-
-            # Get failure
-            $Failure = $FailureSlice[$CharacterIndex - $LeastRotationIndex - 1];
-
-            # While failure !== -1 and character !== the character found at the least rotation + failure + 1
-            while ($Failure !== -1 && $Character !== $Sequence[$LeastRotationIndex + $Failure + 1]) {
-
-                # If character is lexically less than whatever is at $LeastRotationIndex, update $LeastRotationIndex
-                if ($Character < $Sequence[$LeastRotationIndex + $Failure + 1]) {
-                    $LeastRotationIndex = $CharacterIndex - $Failure - 1;
-                }
-
-                # Update failure using previous failure as index?
-                $Failure = $FailureSlice[$Failure];
-            } # while
-
-            # If character does not equal whatever character is at leastRotationIndex plus failure
-            if ($Character !== $Sequence[$LeastRotationIndex + $Failure + 1]) {
-
-                # If character is lexically less then what is rotated, $LeastRotatationIndex gets value of $CharacterIndex
-                if ($Character < $Sequence[$LeastRotationIndex]) {
-                    $LeastRotationIndex = $CharacterIndex;
-                }
-
-                # Assign -1 to whatever is at the index of difference between character and rotation indices
-                $FailureSlice[$CharacterIndex - $LeastRotationIndex] = -1;
-    
-            # If character does equal whatever character is at $LeastRotationIndex + $Failure
-            } else {
-                # Assign $Failure + 1 at the index of difference between character and rotation indices
-                $FailureSlice[$CharacterIndex - $LeastRotationIndex] = $Failure + 1;
-            }
-        } # for
-
-        return $LeastRotationIndex;
-    }
-
-
-    /**
-     * rotateSequence
-     *
-     * Rotates circular sequences to a deterministic point.
-     */
-    public function rotateSequence(string $Sequence)
-    {
-        $RotationIndex = $this->boothLeastRotation($Sequence);
-
-        # Writing the same sequence twice
-        # PHP has no strings.Builder.WriteString
-        $ConcatenatedSequence = $Sequence . $Sequence;
-
-        # https://stackoverflow.com/a/2423867
-        $Length = $RotationIndex % strlen($Sequence);
-        return substr($Sequence, $Length) . substr($Sequence, 0, $Length);
-    }
-
-
-    /**
-     * reverseComplement
-     *
-     * Takes the reverse complement of a sequence.
-     * Doesn't validate the sequence alphabet first.
-     */
-    public function reverseComplement(string $Sequence)
-    {
-        # Normalize the sequence
-        $Sequence = strtoupper($Sequence);
-
-        /**
-         * Provides 1:1 mapping between bases and their complements.
-         * Kind of ghetto, but lowercase replaces help stop extra flips.
-         * @see https://github.com/TimothyStiles/poly/blob/prime/sequence.go
-         */
-        $RuneMap = [
-            'A' => 't',
-            'B' => 'v',
-            'C' => 'g',
-            'D' => 'h',
-            'G' => 'c',
-            'H' => 'd',
-            'K' => 'm',
-            'M' => 'k',
-            'N' => 'n',
-            'R' => 'y',
-            'S' => 's',
-            'T' => 'a',
-            'U' => 'a',
-            'V' => 'b',
-            'W' => 'w',
-            'Y' => 'r',
-        ];
-
-        return $ComplementString = strtoupper(
-            str_replace(
-                array_keys($RuneMap),
-                array_values($RuneMap),
-                $Sequence
-            )
-        );
-    }
-
-
-    /**
-     * hash
-     *
-     * Create a Seqhash from a string.
-     */
-    public function hash(
-        string $Sequence,
-        string $SequenceType,
-        bool   $Circular = false,
-        bool   $DoubleStranded = true
-    ) {
-        # Check for Blake3 support
-        if (!extension_loaded('blake3')) {
-            throw new Exception('Please install and enable the php-blake3 extension.');
-        }
-
-        # By definition, Seqhashes are of uppercase sequences
-        $Sequence = strtoupper($Sequence);
-
-        # If RNA, convert to a DNA sequence
-        # The hash itself between a DNA and RNA sequence will not be different,
-        # but their Seqhash will have a different metadata string (R vs. D)
-        if ($SequenceType === 'RNA') {
-            $Sequence = str_replace('T', 'U', $Sequence);
-        }
-
-        # Run checks on the input
-        if (!in_array($SequenceType, ['DNA', 'RNA', 'PROTEIN'])) {
-            throw new Exception("SequenceType must be one of [DNA, RNA, PROTEIN]. Got $SequenceType.");
-        }
-
-        # Check the alphabet used
-        $SequenceRegex = '/[ATUGCYRSWKMBDHVNZ]/';
-        $ProteinRegex = '/[ACDEFGHIKLMNPQRSTVWYUO*BXZ]/';
-
-        # todo: Refactor this to detect $SequenceType from alphabet
-        if ($SequenceType === 'DNA' || $SequenceType === 'RNA') {
-            foreach (str_split($Sequence) as $Letter) {
-                if (!preg_match($SequenceRegex, $Letter)) {
-                    throw new Exception("Only letters ATUGCYRSWKMBDHVNZ are allowed for DNA/RNA. Got $Letter.");
-                }
-            }
-        }
-
-        /**
-         * Selenocysteine (Sec; U) and pyrrolysine (Pyl; O) are added
-         * in accordance with https://www.uniprot.org/help/sequences
-         *
-         * The release notes https://web.expasy.org/docs/relnotes/relstat.html
-         * also state there are Asx (B), Glx (Z), and Xaa (X) amino acids,
-         * so these are added in as well.
-         */
-        else {
-            foreach (str_split($Sequence) as $Letter) {
-                if (!preg_match($ProteinRegex, $Letter)) {
-                    throw new Exception("Only letters ACDEFGHIKLMNPQRSTVWYUO*BXZ are allowed for proteins. Got $Letter.");
-                }
-            }
-        }
-    
-        # There is no check for circular proteins since proteins can be circular
-        if ($SequenceType === 'PROTEIN' && $DoubleStranded) {
-            throw new Exception("Proteins can't be double stranded.");
-        }
-
-        # Gets deterministic sequence based off of metadata + sequence
-        #switch ($Circular && $DoubleStranded) {
-        switch ([$Circular, $DoubleStranded]) {
-            #case (true && true):
-            case [true, true]:
-                $PotentialSequences = [
-                    $this->rotateSequence($Sequence),
-                    $this->rotateSequence($this->reverseComplement($Sequence)),
-                ];
-                $DeterministicSequence = sort($PotentialSequences)[0];
-                break;
-
-            #case (true && false):
-            case [true, false]:
-                $DeterministicSequence = $this->rotateSequence($Sequence);
-                break;
-
-            #case (false && true):
-            case [false, true]:
-                $PotentialSequences = [
-                    $Sequence,
-                    $this->reverseComplement($Sequence),
-                ];
-                $DeterministicSequence = sort($PotentialSequences)[0];
-                break;
-
-            #case (false && false):
-            case [false, false]:
-                $DeterministicSequence = $Sequence;
-                break;
-
-            default:
-                break;
-        }
-
-        /**
-         * Build 3 letter metadata
-         */
-
-        # Get first letter: D for DNA, R for RNA, and P for Protein
-        switch ($SequenceType) {
-            case 'DNA':
-                $SequenceTypeLetter = 'D';
-                break;
-            
-            case 'RNA':
-                $SequenceTypeLetter = 'R';
-                break;
-            
-            case 'PROTEIN':
-                $SequenceTypeLetter = 'P';
-                break;
-                
-            default:
-                break;
-            }
-
-        # Get 2nd letter: C for circular, L for Linear
-        if ($Circular) {
-            $CircularLetter = 'C';
-        } else {
-            $CircularLetter = 'L';
-        }
-
-        # Get 3rd letter: D for Double stranded, S for Single stranded
-        if ($DoubleStranded) {
-            $DoubleStrandedLetter = 'D';
-        } else {
-            $DoubleStrandedLetter = 'S';
-        }
-
-        # php-blake3 returns hex by default,
-        # binary if $rawOutput = true
-        return
-            'v1'
-          . '_'
-          . $SequenceTypeLetter
-          . $CircularLetter
-          . $DoubleStrandedLetter
-          . '_'
-          . blake3($DeterministicSequence);
-    }
-
-
-    /**
-     * validate
-     *
-     * Validates a Seqhash's metadata.
-     * Doesn't check the Blake3 hash itself,
-     * because php-blake3 has no such feature.
-     */
-    public function validate(string $Seqhash)
-    {
-        $Parts = explode('_', $Seqhash);
-
-        # Check version info
-        if ($Parts[0] !== 'v1') {
-            throw new Exception("Invalid version info. Got $Parts[0].");
-        }
-
-        # Check 3 letter metadata
-        $Meta = str_split($Parts[1]);
-        if (!in_array($Meta[0], ['D', 'R', 'P'])
-         || !in_array($Meta[1], ['C', 'L'])
-         || !in_array($Meta[2], ['D', 'S'])) {
-            throw new Exception("Invalid metadata. Got $Parts[1].");
-        }
-
-        # Check Blake3 hex and hash length
-        if (!ctype_xdigit($Parts[2]) || strlen($Parts[2] !== 64)) {
-            throw new Exception("Invalid Blake3 hash. Expected a 64-character hex string.");
-        }
-
-        return true;
-    }
-
-
-    /**
-     * gcContent
-     *
-     * Bonus feature!
-     * Calculate GC content of a DNA sequence.
-     * Shamelessly ripped from kennypavan/BioPHP.
-     *
-     * @see https://github.com/kennypavan/BioPHP/blob/master/BioPHP.php
-     */
-    public function gcContent(string $Sequence, int $Precision = 2)
-    {
-        $Sequence = strtoupper($Sequence);
-        
-        $G = substr_count($Sequence, 'G');
-        $C = substr_count($Sequence, 'C');
-
-        return number_format((($G + $C) / strlen($Sequence)) * 100, $Precision);
-    }
-}

classes/torrent_form.class.php

@@ -76,7 +76,7 @@ class TorrentForm
 
     /**
      * ====================
-     * = Twig based class =
+     * = Twig-based class =
      * ====================
     */
 
@@ -403,7 +403,7 @@ HTML;
      * upload_form
      *
      * Finally the "real" upload form.
-     * Contains all the field you'd expect.
+     * Contains all the fields you'd expect.
      *
      * This is currently one enormous function.
      * It has sub-functions, variables, and everything.
@@ -438,7 +438,7 @@ HTML;
 
 
         /**
-         * Semantic Version
+         * Version
          */
         
         $Version = display_str($Torrent['Version']);
@@ -774,6 +774,7 @@ HTML;
          */
         function formatSelect($trID = '', $Label = '', $Torrent = [], $FileTypes = [])
         {
+            #var_dump($FileTypes);
             echo <<<HTML
             <tr id="$trID">
               <td>
@@ -781,21 +782,24 @@ HTML;
                   $Label
                 <label>
               </td>
-              
+
               <td>
                 <select id="container" name="container">
                   <option value="Autofill">Autofill</option>
 HTML;
 
-            foreach ($FileTypes as $Type => $Extensions) {
-                echo "<option value='$Type'";
+            foreach ($FileTypes as $FileType) {
+                foreach ($FileType as $Type => $Extensions) {
+                    echo "<option value='$Type'";
 
-                if ($Type === ($Torrent['Container'] ?? false)) {
-                    echo ' selected';
-                }
+                    if ($Type === ($Torrent['Container'] ?? false)) {
+                        echo ' selected';
+                    }
 
-                echo ">$Type</option>\n";
+                    echo ">$Type</option>\n";
+                }
             }
+        
 
             echo <<<HTML
                 </select>
@@ -832,6 +836,7 @@ HTML;
             $Label = 'Format',
             $Torrent = $Torrent,
             #$FileTypes = array_column($ENV->META, $Formats)
+            $FileTypes = $ENV->CATS->{2}->Formats
         );
 
 
@@ -842,7 +847,8 @@ HTML;
             $trID = 'container_scalars_vectors_tr',
             $Label = 'Format',
             $Torrent = $Torrent,
-            $FileTypes = $ENV->flatten($ENV->CATS->{5}->Formats)
+            #$FileTypes = $ENV->flatten($ENV->CATS->{5}->Formats)
+            $FileTypes = $ENV->CATS->{5}->Formats
         );
 
 
@@ -853,7 +859,8 @@ HTML;
             $trID = 'container_images_tr',
             $Label = 'Format',
             $Torrent = $Torrent,
-            $FileTypes = array_merge($this->ImgFormats, $this->PlainFormats)
+            #$FileTypes = array_merge($this->ImgFormats)
+            $FileTypes = $ENV->CATS->{8}->Formats
         );
 
 
@@ -864,7 +871,8 @@ HTML;
             $trID = 'container_spatial_tr',
             $Label = 'Format',
             $Torrent = $Torrent,
-            $FileTypes = array_merge($this->MapVectorFormats, $this->MapRasterFormats, $this->ImgFormats, $this->PlainFormats)
+            #$FileTypes = array_merge($this->MapVectorFormats, $this->MapRasterFormats, $this->ImgFormats, $this->PlainFormats)
+            $FileTypes = $ENV->CATS->{9}->Formats
         );
 
 
@@ -875,7 +883,8 @@ HTML;
             $trID = 'container_documents_tr',
             $Label = 'Format',
             $Torrent = $Torrent,
-            $FileTypes = array_merge($this->BinDocFormats, $this->CpuGenFormats, $this->PlainFormats)
+            #$FileTypes = array_merge($this->BinDocFormats, $this->CpuGenFormats, $this->PlainFormats)
+            $FileTypes = $ENV->CATS->{11}->Formats
         );
 
 
@@ -886,7 +895,8 @@ HTML;
             $trID = 'archive_tr',
             $Label = 'Archive',
             $Torrent = $Torrent,
-            $FileTypes = $this->Archives
+            # $ENV->Archives nests -1 deep
+            $FileTypes = [$ENV->META->Formats->Archives]
         );
 
 
@@ -1081,6 +1091,22 @@ HTML;
         }
 
 
+        /**
+         * Seqhash
+         */
+
+        if ($ENV->FEATURE_BIOPHP && !$this->DisabledFlag && $this->NewTorrent) {
+            $TorrentSeqhash = display_str($Torrent['Seqhash']);
+            echo $Twig->render(
+                'torrent_form/seqhash.html',
+                [
+                    'db' => $ENV->DB->seqhash,
+                    'seqhash' => $TorrentSeqhash,
+                ]
+            );
+        }
+
+
         /**
          * Torrent group description
          *

classes/util.php

@@ -516,7 +516,15 @@ function json_print($Status, $Message)
  */
 function json_error($Code)
 {
-    echo json_encode(add_json_info(['status' => 'failure', 'error' => $Code, 'response' => []]));
+    echo json_encode(
+        add_json_info(
+            [
+                'status' => 'failure',
+                'error' => $Code,
+                'response' => []
+            ]
+        )
+    );
     die();
 }
 

composer.json

@@ -1,36 +1,39 @@
 {
   "name": "biotorrents/gazelle",
   "description": "Web framework for private BitTorrent trackers using Ocelot",
-
   "type": "project",
   "license": "Unlicense",
-
   "authors": [
-    { "name": "What.cd" },
-    { "name": "Oppaitime" },
-    { "name": "BioTorrents.de" }
+    {
+      "name": "What.cd"
+    },
+    {
+      "name": "Oppaitime"
+    },
+    {
+      "name": "BioTorrents.de"
+    }
   ],
-
   "autoload": {
-    "classmap": ["classes/"],
-    "files": ["classes/autoload.php"]
+    "classmap": [
+      "classes/"
+    ],
+    "files": [
+      "classes/autoload.php"
+    ]
   },
-
   "config": {
     "sort-packages": true
   },
-
   "require": {
     "php": ">=7.4",
-
     "ext-apcu": "*",
-    "ext-blake3": "*",
     "ext-curl": "*",
     "ext-json": "*",
     "ext-mbstring": "*",
     "ext-memcache": "*",
     "ext-mysqli": "*",
-
+    "biotorrents/biophp": "dev-master",
     "erusev/parsedown": "^1.8.0-beta-7",
     "erusev/parsedown-extra": "^0.8.1",
     "j7mbo/twitter-api-php": "^1.0.6",
@@ -38,13 +41,12 @@
     "robmorgan/phinx": "^0.12.7",
     "twig/twig": "^3.3.2"
   },
-
   "require-dev": {
+    "d11wtq/boris": "^1.0.10",
     "phpstan/phpstan": "^0.12.92",
     "phpunit/phpunit": "^9.5.6",
     "squizlabs/php_codesniffer": "^3.6.0"
   },
-
   "scripts": {
     "phpstan": "phpstan analyse",
     "test": "phpunit"

composer.lock

@@ -4,20 +4,66 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b306af0027bec610a1abaf7776f3253c",
+    "content-hash": "344f2e6f0358a24896af389a4bca5a1a",
     "packages": [
+        {
+            "name": "biotorrents/biophp",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/biotorrents/biophp.git",
+                "reference": "8b099fb0c78ec2a5dcab16c351e5d369853109ee"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/biotorrents/biophp/zipball/8b099fb0c78ec2a5dcab16c351e5d369853109ee",
+                "reference": "8b099fb0c78ec2a5dcab16c351e5d369853109ee",
+                "shasum": ""
+            },
+            "require": {
+                "ext-blake3": "*",
+                "ext-curl": "*",
+                "pear/math_biginteger": "^1.0.3",
+                "php": ">=7.4"
+            },
+            "require-dev": {
+                "d11wtq/boris": "^1.0.10"
+            },
+            "default-branch": true,
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "BioPHP\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "ohm",
+                    "email": "help@biotorrents.de"
+                }
+            ],
+            "description": "BioPHP implements some light tools for manipulating genomic data",
+            "support": {
+                "source": "https://github.com/biotorrents/biophp/tree/master"
+            },
+            "time": "2021-07-23T19:02:18+00:00"
+        },
         {
             "name": "cakephp/core",
-            "version": "4.2.7",
+            "version": "4.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cakephp/core.git",
-                "reference": "aa8b40e2adcfbe52c71ec273866628ffc6d87838"
+                "reference": "bed4b6f09550909beea5440627d5a6ff85fb1934"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cakephp/core/zipball/aa8b40e2adcfbe52c71ec273866628ffc6d87838",
-                "reference": "aa8b40e2adcfbe52c71ec273866628ffc6d87838",
+                "url": "https://api.github.com/repos/cakephp/core/zipball/bed4b6f09550909beea5440627d5a6ff85fb1934",
+                "reference": "bed4b6f09550909beea5440627d5a6ff85fb1934",
                 "shasum": ""
             },
             "require": {
@@ -61,11 +107,11 @@
                 "issues": "https://github.com/cakephp/cakephp/issues",
                 "source": "https://github.com/cakephp/core"
             },
-            "time": "2021-05-24T17:26:44+00:00"
+            "time": "2021-06-26T14:06:56+00:00"
         },
         {
             "name": "cakephp/database",
-            "version": "4.2.7",
+            "version": "4.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cakephp/database.git",
@@ -120,16 +166,16 @@
         },
         {
             "name": "cakephp/datasource",
-            "version": "4.2.7",
+            "version": "4.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cakephp/datasource.git",
-                "reference": "cfc914efc099d48300c1a99316fc8d0d55babc67"
+                "reference": "cc101051e8d601cf6c2895d635ccefecca97ff4e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cakephp/datasource/zipball/cfc914efc099d48300c1a99316fc8d0d55babc67",
-                "reference": "cfc914efc099d48300c1a99316fc8d0d55babc67",
+                "url": "https://api.github.com/repos/cakephp/datasource/zipball/cc101051e8d601cf6c2895d635ccefecca97ff4e",
+                "reference": "cc101051e8d601cf6c2895d635ccefecca97ff4e",
                 "shasum": ""
             },
             "require": {
@@ -174,11 +220,11 @@
                 "issues": "https://github.com/cakephp/cakephp/issues",
                 "source": "https://github.com/cakephp/datasource"
             },
-            "time": "2021-05-24T17:26:44+00:00"
+            "time": "2021-07-03T10:28:16+00:00"
         },
         {
             "name": "cakephp/utility",
-            "version": "4.2.7",
+            "version": "4.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cakephp/utility.git",
@@ -435,6 +481,59 @@
             },
             "time": "2020-10-12T00:27:44+00:00"
         },
+        {
+            "name": "pear/math_biginteger",
+            "version": "v1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pear/Math_BigInteger.git",
+                "reference": "33d4357543037a458fad3e8c837a01b93104e592"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pear/Math_BigInteger/zipball/33d4357543037a458fad3e8c837a01b93104e592",
+                "reference": "33d4357543037a458fad3e8c837a01b93104e592",
+                "shasum": ""
+            },
+            "require": {
+                "ext-pcre": "*",
+                "php": ">=4.2.0"
+            },
+            "suggest": {
+                "ext-bcmath": "Allows using the BCMath extension internally for computation. Faster than native implementation.",
+                "ext-gmp": "Allows using the GNU Multiple Precision extension internally for computation. If you are doing a lot of computation this is the recommended extension."
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Math_": "./"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jim Wigginton",
+                    "email": "terrafrost@php.net"
+                }
+            ],
+            "description": "Pure-PHP arbitrary precission integer arithmetic library. If GMP or BCMath are available they are used.",
+            "homepage": "https://github.com/pear/Math_BigInteger",
+            "keywords": [
+                "arbitrary",
+                "bcmath",
+                "gmp",
+                "integer",
+                "precision"
+            ],
+            "support": {
+                "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Math_BigInteger",
+                "source": "https://github.com/pear/Math_BigInteger"
+            },
+            "time": "2016-04-12T05:46:52+00:00"
+        },
         {
             "name": "psr/container",
             "version": "2.0.1",
@@ -1768,6 +1867,46 @@
         }
     ],
     "packages-dev": [
+        {
+            "name": "d11wtq/boris",
+            "version": "v1.0.10",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/borisrepl/boris.git",
+                "reference": "31055b15e2d3fe47f31f6aa8e277f8f3fc7eb483"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/borisrepl/boris/zipball/31055b15e2d3fe47f31f6aa8e277f8f3fc7eb483",
+                "reference": "31055b15e2d3fe47f31f6aa8e277f8f3fc7eb483",
+                "shasum": ""
+            },
+            "require": {
+                "ext-pcntl": "*",
+                "ext-posix": "*",
+                "ext-readline": "*",
+                "php": ">=5.3.0"
+            },
+            "bin": [
+                "bin/boris"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Boris": "lib"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "A tiny, but robust REPL (Read-Evaluate-Print-Loop) for PHP.",
+            "support": {
+                "issues": "https://github.com/borisrepl/boris/issues",
+                "source": "https://github.com/borisrepl/boris/tree/v1.0.10"
+            },
+            "time": "2015-03-01T08:05:19+00:00"
+        },
         {
             "name": "doctrine/instantiator",
             "version": "1.4.0",
@@ -1897,16 +2036,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.11.0",
+            "version": "v4.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "fe14cf3672a149364fb66dfe11bf6549af899f94"
+                "reference": "6608f01670c3cc5079e18c1dab1104e002579143"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/fe14cf3672a149364fb66dfe11bf6549af899f94",
-                "reference": "fe14cf3672a149364fb66dfe11bf6549af899f94",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6608f01670c3cc5079e18c1dab1104e002579143",
+                "reference": "6608f01670c3cc5079e18c1dab1104e002579143",
                 "shasum": ""
             },
             "require": {
@@ -1947,22 +2086,22 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.11.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.12.0"
             },
-            "time": "2021-07-03T13:36:55+00:00"
+            "time": "2021-07-21T10:44:31+00:00"
         },
         {
             "name": "phar-io/manifest",
-            "version": "2.0.1",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133"
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
-                "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
                 "shasum": ""
             },
             "require": {
@@ -2007,9 +2146,9 @@
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
             "support": {
                 "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/master"
+                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
             },
-            "time": "2020-06-27T14:33:11+00:00"
+            "time": "2021-07-20T11:28:43+00:00"
         },
         {
             "name": "phar-io/version",
@@ -2289,16 +2428,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "0.12.92",
+            "version": "0.12.93",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "64d4c5dc8ea96972bc18432d137a330239a5d2b2"
+                "reference": "7b7602f05d340ffa418c59299f8c053ac6c3e7ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/64d4c5dc8ea96972bc18432d137a330239a5d2b2",
-                "reference": "64d4c5dc8ea96972bc18432d137a330239a5d2b2",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/7b7602f05d340ffa418c59299f8c053ac6c3e7ea",
+                "reference": "7b7602f05d340ffa418c59299f8c053ac6c3e7ea",
                 "shasum": ""
             },
             "require": {
@@ -2329,7 +2468,7 @@
             "description": "PHPStan - PHP Static Analysis Tool",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/0.12.92"
+                "source": "https://github.com/phpstan/phpstan/tree/0.12.93"
             },
             "funding": [
                 {
@@ -2349,7 +2488,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-10T13:53:49+00:00"
+            "time": "2021-07-20T10:49:53+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -2671,16 +2810,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.6",
+            "version": "9.5.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb"
+                "reference": "d0dc8b6999c937616df4fb046792004b33fd31c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb",
-                "reference": "fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d0dc8b6999c937616df4fb046792004b33fd31c5",
+                "reference": "d0dc8b6999c937616df4fb046792004b33fd31c5",
                 "shasum": ""
             },
             "require": {
@@ -2758,7 +2897,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.6"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.7"
             },
             "funding": [
                 {
@@ -2770,7 +2909,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-06-23T05:14:38+00:00"
+            "time": "2021-07-19T06:14:47+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -3625,6 +3764,7 @@
                     "type": "github"
                 }
             ],
+            "abandoned": true,
             "time": "2020-09-28T06:45:17+00:00"
         },
         {
@@ -3904,6 +4044,7 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
+        "biotorrents/biophp": 20,
         "erusev/parsedown": 10
     },
     "prefer-stable": false,
@@ -3911,7 +4052,6 @@
     "platform": {
         "php": ">=7.4",
         "ext-apcu": "*",
-        "ext-blake3": "*",
         "ext-curl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",

design/privateheader.php

@@ -50,6 +50,7 @@ $Styles = array_filter(
         [
           'vendor/jquery-ui.min',
           'vendor/normalize',
+          'vendor/skeleton',
           #'assets/fonts/fa/css/all.min',
           'global'
         ],

sections/api/autofill/doi.php

@@ -1,14 +1,32 @@
 <?php
-#declare(strict_types=1);
+declare(strict_types=1);
+
+$ENV = ENV::go();
 
 if (!$_GET['doi']) {
-    json_die();
+    json_error('expected doi param');
+} elseif (!preg_match("/$ENV->DOI_REGEX/", strtoupper($_GET['doi']))) {
+    json_error('expected valid doi');
+} else {
+    $DOI = $_GET['doi'];
 }
 
+# https://weichie.com/blog/curl-api-calls-with-php/
+$curl = curl_init();
+curl_setopt($curl, CURLOPT_URL, "$ENV->SS/$DOI");
+curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
+$output = curl_exec($curl);
+curl_close($curl);
+
+# I don't like this nested json_*code() business
+# It's slow and unnecesary since SS already outputs JSON
+# todo: At least cache the response, then refactor
 print
     json_encode(
         [
             'status' => 'success',
-            'response' => ['loadAverage' => sys_getloadavg()]
-        ]
+            'response' => json_decode($output, true),
+        ],
+        JSON_UNESCAPED_SLASHES
     );

sections/api/index.php

@@ -266,6 +266,7 @@ switch ($_GET['action']) {
   */
 
   case 'autofill':
+    require_once "$ENV->SERVER_ROOT/sections/api/autofill/doi.php";
     /*
     if ($_GET['cat'] === 'anime') {
         require_once "$ENV->SERVER_ROOT/sections/api/autofill/anime.php";

sections/collages/browse.php

@@ -180,7 +180,7 @@ View::show_header(($BookmarkView) ? 'Your bookmarked collections' : 'Collections
         <input type="hidden" name="action" value="search" />
       </div>
 
-      <table cellpadding="6" cellspacing="1" border="0" class="layout" width="100%">
+      <table cellpadding="6" cellspacing="1" border="0" class="layout torrent_search" width="100%">
         <tr id="search_terms">
           <td class="label"></td>
           <td>
@@ -262,7 +262,7 @@ View::show_header(($BookmarkView) ? 'Your bookmarked collections' : 'Collections
         </tr>
         <tr>
           <td colspan="2" class="center">
-            <input type="submit" value="Search" />
+            <input type="submit" class="button-primary" value="Search" />
           </td>
         </tr>
       </table>

sections/collages/torrent_collage.php

@@ -231,11 +231,7 @@ foreach ($GroupIDs as $GroupID) {
   id="group_<?=$GroupID?>">
   <td></td>
 
-  <td class="center">
-    <div title="<?=$TorrentTags->title()?>"
-      class="tooltip <?=Format::css_category($GroupCategoryID)?> <?=$TorrentTags->css_name()?>">
-    </div>
-  </td>
+  <td></td>
 
   <td>
     <span class="brackets">

sections/donate/donate.php

@@ -55,7 +55,8 @@ View::show_header('Donate');
 
       <li>
         <strong>Domain.</strong>
-        The domain name is $15 per year.
+        The primary domain name (biotorrents.de) is $15 per year.
+        The secondary one (torrents.bio) is $80 per year.
         The TLS certificates are gratis.
       </li>
 
@@ -64,6 +65,19 @@ View::show_header('Donate');
         Omics Tools LLC is <?= $ENV->SITE_NAME ?>'s parent company.
         It's $50 per year for annual reports and $125 for resident agent services.
       </li>
+
+      <li>
+        <strong>Legal.</strong>
+        Registering a U.S. copyright agent is $6 per year.
+        The legal counsel is gratis.
+      </li>
+
+
+      <li>
+        <strong>Total.</strong>
+        Depending on the exchange rate, it costs about $350 per year to run <?= $ENV->SITE_NAME ?>.
+      </li>
+
     </ul>
   </div>
 

sections/requests/requests.php

@@ -359,7 +359,7 @@ View::show_header($Title, 'requests');
             value="<?=$_GET['userid']?>" />
         <?php } ?>
         <div class="box pad">
-            <table cellpadding="6" cellspacing="1" border="0" class="layout" width="100%">
+            <table cellpadding="6" cellspacing="1" border="0" class="layout torrent_requests" width="100%">
 
                 <tr id="search_terms">
                     <td class="label">
@@ -456,37 +456,37 @@ View::show_header($Title, 'requests');
     <?php } ?>
     <table id="request_table" class="request_table border" cellpadding="6" cellspacing="1" border="0" width="100%">
         <tr class="colhead_dark">
-            <td class="small cats_col"></td>
-            <td style="width: 38%;" class="nobr">
+            <th class="small cats_col"></th>
+            <th style="width: 38%;" class="nobr">
                 <strong>Request Name</strong>
-            </td>
-            <td class="nobr">
+            </th>
+            <th class="nobr">
                 <a
                     href="?order=votes&amp;sort=<?=($OrderBy === 'votes' ? $NewSort : 'desc')?>&amp;<?=$CurrentURL?>"><strong>Votes</strong></a>
-            </td>
-            <td class="nobr">
+            </th>
+            <th class="nobr">
                 <a
                     href="?order=bounty&amp;sort=<?=($OrderBy === 'bounty' ? $NewSort : 'desc')?>&amp;<?=$CurrentURL?>"><strong>Bounty</strong></a>
-            </td>
-            <td class="nobr">
+            </th>
+            <th class="nobr">
                 <a
                     href="?order=filled&amp;sort=<?=($OrderBy === 'filled' ? $NewSort : 'desc')?>&amp;<?=$CurrentURL?>"><strong>Filled</strong></a>
-            </td>
-            <td class="nobr">
+            </th>
+            <th class="nobr">
                 <strong>Filled by</strong>
-            </td>
-            <td class="nobr">
+            </th>
+            <th class="nobr">
                 <strong>Requested by</strong>
-            </td>
-            <td class="nobr">
+            </th>
+            <th class="nobr">
                 <a
                     href="?order=created&amp;sort=<?=($OrderBy === 'created' ? $NewSort : 'desc')?>&amp;<?=$CurrentURL?>"><strong>Created</strong></a>
-            </td>
-            <td class="nobr">
+            </th>
+            <th class="nobr">
                 <a
                     href="?order=lastvote&amp;sort=<?=($OrderBy === 'lastvote' ? $NewSort : 'desc')?>&amp;<?=$CurrentURL?>"><strong>Last
                         vote</strong></a>
-            </td>
+            </th>
         </tr>
         <?php
     if ($NumResults === 0) {

sections/torrents/browse.php

@@ -195,7 +195,7 @@ View::show_header('Browse Torrents', 'browse');
         <?php
         } ?>
 
-        <table class="layout">
+        <table class="layout torrent_search">
           <tr id="numbers" class="ftr_advanced<?=$HideAdvanced?>">
             <td class="label">
               <!--
@@ -607,17 +607,25 @@ View::show_header('Browse Torrents', 'browse');
           </tr>
         </table>
 
-        <!-- Result count and submit button -->
+        <!-- Result count, submit, and reset -->
         <div class="submit ft_submit">
-          <span class="float_left"><?=number_format($NumResults)?>
-            Results</span>
-          <input type="submit" value="Search" />
+          <span class="float_left">
+            <?=number_format($NumResults)?>
+            Results
+          </span>
+
+          <input type="submit" value="Search" class="button-primary"/>
+
           <input type="hidden" name="action" id="ft_type"
             value="<?=($AdvancedSearch ? 'advanced' : 'basic')?>" />
+
           <input type="hidden" name="searchsubmit" value="1" />
+
           <input type="button" value="Reset" <input type="button" value="Reset"
             onclick="window.location.href = 'torrents.php<?php if (isset($_GET['action']) && $_GET['action'] === 'advanced') { ?>?action=advanced<?php } ?>'" />
+
           &emsp;
+
           <?php if ($Search->has_filters()) { ?>
           <input type="submit" name="setdefault" value="Make Default" />
           <?php }

sections/torrents/details.php

@@ -413,16 +413,16 @@ $Index++;
         class="torrent_table details<?=$GroupFlags['IsSnatched'] ? ' snatched' : ''?>"
         id="torrent_details">
         <tr class="colhead_dark">
-          <td width="80%"><strong>Torrents</strong></td>
-          <td><strong>Size</strong></td>
-          <td class="sign snatches">
+          <th width="80%"><strong>Torrents</strong></th>
+          <th><strong>Size</strong></th>
+          <th class="sign snatches">
             ↻
-          <td class="sign seeders">
+          <th class="sign seeders">
             &uarr;
-          </td>
-          <td class="sign leechers">
+          </th>
+          <th class="sign leechers">
             &darr;
-          </td>
+          </th>
         </tr>
         <?php
 function filelist($Str)

static/functions/upload.js

@@ -1,136 +1,163 @@
 /**
  * Categories
- * 
+ *
  * Toggle category metadata.
  * Displays dynamic selects on upload.php.
  * These change with each category.
  */
 function Categories() {
   let def = [
-    'javdb', // Accession Number
-    'audio', // Version
-    'title', // Torrent Title
-    'title_rj', // Organism
-    'title_jp', // Strain/Variety
-    'artists', // Authors(s)
-    'studio', // Department/Lab
-    'series', // Location
-    'year', // Year
-    'codec', // License
+    "javdb", // Accession Number
+    "audio", // Version
+    "title", // Torrent Title
+    "title_rj", // Organism
+    "title_jp", // Strain/Variety
+    "artists", // Authors(s)
+    "studio", // Department/Lab
+    "series", // Location
+    "year", // Year
+    "codec", // License
     // Platform *changes below*
-    'resolution', // Scope *changes below*
+    "resolution", // Scope *changes below*
     // Format *changes below*
-    'archive', // Archive
-    'tags', // Tags
-    'cover', // Picture
-    'mirrors', // Mirrors
-    'screenshots', // Publications
-    'group_desc', // Torrent Group Description
-    'release_desc', // Torrent Description
-    'censored', // Aligned/Annotated
-    'anon', // Upload Anonymously
-  ]
+    "archive", // Archive
+    "tags", // Tags
+    "cover", // Picture
+    "mirrors", // Mirrors
+    "screenshots", // Publications
+    //'seqhash', // Seqhash
+    "group_desc", // Torrent Group Description
+    "release_desc", // Torrent Description
+    "censored", // Aligned/Annotated
+    "anon", // Upload Anonymously
+  ];
 
   let cats = [
-    { // Sequences
-      'media': {}, // Platform
-      'container': {}, // Format
+    {
+      // Sequences
+      media: {}, // Platform
+      container: {}, // Format
+      seqhash: {}, // Seqhash
     },
-    { // Graphs
-      'media_graphs': {}, // Platform
-      'container_graphs': {}, // Format
+    {
+      // Graphs
+      media_graphs: {}, // Platform
+      container_graphs: {}, // Format
     },
-    { // Systems
-      'media_graphs': {}, // Platform
-      'container_graphs': {}, // Format
+    {
+      // Systems
+      media_graphs: {}, // Platform
+      container_graphs: {}, // Format
     },
-    { // Geometric
-      'media_graphs': {}, // Platform
-      'container_graphs': {}, // Format
+    {
+      // Geometric
+      media_graphs: {}, // Platform
+      container_graphs: {}, // Format
     },
-    { // Scalars/Vectors
-      'media_scalars_vectors': {}, // Platform
-      'container_scalars_vectors': {}, // Format
+    {
+      // Scalars/Vectors
+      media_scalars_vectors: {}, // Platform
+      container_scalars_vectors: {}, // Format
     },
-    { // Patterns
-      'media_graphs': {}, // Platform
-      'container_graphs': {}, // Format
+    {
+      // Patterns
+      media_graphs: {}, // Platform
+      container_graphs: {}, // Format
     },
-    { // Constraints
-      'media_graphs': {}, // Platform
-      'container_graphs': {}, // Format
+    {
+      // Constraints
+      media_graphs: {}, // Platform
+      container_graphs: {}, // Format
     },
-    { // Images
-      'media_images': {}, // Platform
-      'container_images': {}, // Format
+    {
+      // Images
+      media_images: {}, // Platform
+      container_images: {}, // Format
     },
-    { // Spatial
-      'media_graphs': {}, // Platform
-      'container_spatial': {}, // Format
+    {
+      // Spatial
+      media_graphs: {}, // Platform
+      container_spatial: {}, // Format
     },
-    { // Models
-      'media_graphs': {}, // Platform
-      'container_spatial': {}, // Format
+    {
+      // Models
+      media_graphs: {}, // Platform
+      container_spatial: {}, // Format
     },
-    { // Documents
-      'media_documents': {}, // Platform
-      'container_documents': {}, // Format
+    {
+      // Documents
+      media_documents: {}, // Platform
+      container_documents: {}, // Format
     },
-    { // Machine Data
-      'media_machine_data': {}, // Platform
-      'container': {}, // Format
+    {
+      // Machine Data
+      media_machine_data: {}, // Platform
+      container: {}, // Format
     },
-  ]
-
-  let active = {}
-  for (let field of def) active[field] = {}
-
-  let category = 0
-  if ($('input[name="type"]').raw()) category = $('input[name="type"]').raw().value
-  if ($('#categories').raw()) category = $('#categories').raw().value
-  active = Object.assign(active, cats[category])
-
-  let hide = el => {
-    Array.from($(`#${el.id} input, #${el.id} select, #${el.id} textarea`)).forEach(inp => inp.disabled = true)
-    $(el).ghide()
-  }
-
-  let show = el => {
-    Array.from($(`#${el.id} input, #${el.id} select, #${el.id} textarea`)).forEach(inp => inp.disabled = false)
-    $(el).gshow()
-  }
-
-  let trs = $('#dynamic_form tr')
+  ];
+
+  let active = {};
+  for (let field of def) active[field] = {};
+
+  let category = 0;
+  if ($('input[name="type"]').raw())
+    category = $('input[name="type"]').raw().value;
+  if ($("#categories").raw()) category = $("#categories").raw().value;
+  active = Object.assign(active, cats[category]);
+
+  let hide = (el) => {
+    Array.from(
+      $(`#${el.id} input, #${el.id} select, #${el.id} textarea`)
+    ).forEach((inp) => (inp.disabled = true));
+    $(el).ghide();
+  };
+
+  let show = (el) => {
+    Array.from(
+      $(`#${el.id} input, #${el.id} select, #${el.id} textarea`)
+    ).forEach((inp) => (inp.disabled = false));
+    $(el).gshow();
+  };
+
+  let trs = $("#dynamic_form tr");
   for (let tr of trs) {
-    let field = tr.id.slice(0, -3)
+    let field = tr.id.slice(0, -3);
     if (active[field]) {
       if (active[field].name) {
-        tr.children[0].innerHTML = active[field].name
+        tr.children[0].innerHTML = active[field].name;
       }
 
-      let notes = $(`#${tr.id} p.notes`).raw()
-      if (notes) notes.innerHTML = active[field].notes || ''
-      show(tr)
+      let notes = $(`#${tr.id} p.notes`).raw();
+      if (notes) notes.innerHTML = active[field].notes || "";
+      show(tr);
     } else {
-      hide(tr)
+      hide(tr);
     }
   }
 }
 
-
 /**
  * add_tag
  */
 function add_tag() {
-  if ($('#tags').raw().value == "") {
-    $('#tags').raw().value = $('#genre_tags').raw().options[$('#genre_tags').raw().selectedIndex].value;
-  } else if ($('#genre_tags').raw().options[$('#genre_tags').raw().selectedIndex].value == '---') {
+  if ($("#tags").raw().value == "") {
+    $("#tags").raw().value =
+      $("#genre_tags").raw().options[
+        $("#genre_tags").raw().selectedIndex
+      ].value;
+  } else if (
+    $("#genre_tags").raw().options[$("#genre_tags").raw().selectedIndex]
+      .value == "---"
+  ) {
   } else {
-    $('#tags').raw().value = $('#tags').raw().value + ', ' + $('#genre_tags').raw().options[$('#genre_tags').raw().selectedIndex].value;
+    $("#tags").raw().value =
+      $("#tags").raw().value +
+      ", " +
+      $("#genre_tags").raw().options[$("#genre_tags").raw().selectedIndex]
+        .value;
   }
 }
 
-
 /**
  * AddLogField
  */
@@ -146,13 +173,12 @@ function AddLogField() {
   LogField.name = "logfiles[]";
   LogField.size = 50;
 
-  var x = $('#logfields').raw();
+  var x = $("#logfields").raw();
   x.appendChild(document.createElement("br"));
   x.appendChild(LogField);
   LogCount++;
 }
 
-
 /**
  * RemoveLogField
  */
@@ -161,14 +187,13 @@ function RemoveLogField() {
     return;
   }
 
-  var x = $('#logfields').raw();
+  var x = $("#logfields").raw();
   for (i = 0; i < 2; i++) {
     x.removeChild(x.lastChild);
   }
   LogCount--;
 }
 
-
 /**
  * AddExtraLogField
  */
@@ -184,13 +209,12 @@ function AddExtraLogField(id) {
   LogField.name = "logfiles_" + id + "[]";
   LogField.size = 50;
 
-  var x = $('#logfields_' + id).raw();
+  var x = $("#logfields_" + id).raw();
   x.appendChild(document.createElement("br"));
   x.appendChild(LogField);
   LogCount++;
 }
 
-
 /**
  * RemoveLogField
  */
@@ -199,14 +223,13 @@ function RemoveLogField() {
     return;
   }
 
-  var x = $('#logfields').raw();
+  var x = $("#logfields").raw();
   for (i = 0; i < 2; i++) {
     x.removeChild(x.lastChild);
   }
   LogCount--;
 }
 
-
 /**
  * AddFormat
  */
@@ -217,11 +240,14 @@ function AddFormat() {
   }
 
   FormatCount++;
-  $('#extras').raw().value = FormatCount;
+  $("#extras").raw().value = FormatCount;
 
   var NewRow = document.createElement("tr");
   NewRow.id = "new_torrent_row" + FormatCount;
-  NewRow.setAttribute("style", "border-top-width: 5px; border-left-width: 5px; border-right-width: 5px;");
+  NewRow.setAttribute(
+    "style",
+    "border-top-width: 5px; border-left-width: 5px; border-right-width: 5px;"
+  );
 
   var NewCell1 = document.createElement("td");
   NewCell1.setAttribute("class", "label");
@@ -240,13 +266,17 @@ function AddFormat() {
 
   NewRow = document.createElement("tr");
   NewRow.id = "new_format_row" + FormatCount;
-  NewRow.setAttribute("style", "border-left-width: 5px; border-right-width: 5px;");
+  NewRow.setAttribute(
+    "style",
+    "border-left-width: 5px; border-right-width: 5px;"
+  );
   NewCell1 = document.createElement("td");
   NewCell1.setAttribute("class", "label");
   NewCell1.innerHTML = "Extra Format / Bitrate";
 
   NewCell2 = document.createElement("td");
-  tmp = '<select id="releasetype" name="extra_formats[]"><option value="">---</option>';
+  tmp =
+    '<select id="releasetype" name="extra_formats[]"><option value="">---</option>';
   var formats = ["Saab", "Volvo", "BMW"];
 
   for (var i in formats) {
@@ -255,7 +285,8 @@ function AddFormat() {
 
   tmp += "</select>";
   var bitrates = ["1", "2", "3"];
-  tmp += '<select id="releasetype" name="extra_bitrates[]"><option value="">---</option>';
+  tmp +=
+    '<select id="releasetype" name="extra_bitrates[]"><option value="">---</option>';
 
   for (var i in bitrates) {
     tmp += '<option value="' + bitrates[i] + '">' + bitrates[i] + "</option>\n";
@@ -266,22 +297,24 @@ function AddFormat() {
   NewRow.appendChild(NewCell1);
   NewRow.appendChild(NewCell2);
 
-
   NewRow = document.createElement("tr");
   NewRow.id = "new_description_row" + FormatCount;
-  NewRow.setAttribute("style", "border-bottom-width: 5px; border-left-width: 5px; border-right-width: 5px;");
+  NewRow.setAttribute(
+    "style",
+    "border-bottom-width: 5px; border-left-width: 5px; border-right-width: 5px;"
+  );
   NewCell1 = document.createElement("td");
   NewCell1.setAttribute("class", "label");
   NewCell1.innerHTML = "Extra Release Description";
 
   NewCell2 = document.createElement("td");
-  NewCell2.innerHTML = '<textarea name="extra_release_desc[]" id="release_desc" cols="60" rows="4"></textarea>';
+  NewCell2.innerHTML =
+    '<textarea name="extra_release_desc[]" id="release_desc" cols="60" rows="4"></textarea>';
 
   NewRow.appendChild(NewCell1);
   NewRow.appendChild(NewCell2);
 }
 
-
 /**
  * RemoveFormat
  */
@@ -290,27 +323,26 @@ function RemoveFormat() {
     return;
   }
 
-  $('#extras').raw().value = FormatCount;
+  $("#extras").raw().value = FormatCount;
 
-  var x = $('#new_torrent_row' + FormatCount).raw();
+  var x = $("#new_torrent_row" + FormatCount).raw();
   x.parentNode.removeChild(x);
 
-  x = $('#new_format_row' + FormatCount).raw();
+  x = $("#new_format_row" + FormatCount).raw();
   x.parentNode.removeChild(x);
 
-  x = $('#new_description_row' + FormatCount).raw();
+  x = $("#new_description_row" + FormatCount).raw();
   x.parentNode.removeChild(x);
 
   FormatCount--;
 }
 
-
 /**
  * AddArtistField
  */
 var ArtistCount = 1;
 function AddArtistField() {
-  window.getSelection().removeAllRanges()
+  window.getSelection().removeAllRanges();
   ArtistCount = $('input[name="artists[]"]').length;
 
   if (ArtistCount >= 200) {
@@ -323,47 +355,45 @@ function AddArtistField() {
   ArtistField.name = "artists[]";
   ArtistField.size = 45;
 
-  var x = $('#artistfields').raw();
+  var x = $("#artistfields").raw();
   x.appendChild(document.createElement("br"));
   x.appendChild(ArtistField);
-  x.appendChild(document.createTextNode('\n'));
+  x.appendChild(document.createTextNode("\n"));
 
   if ($("#artist_0").data("gazelle-autocomplete")) {
-    $(ArtistField).on('focus', function () {
+    $(ArtistField).on("focus", function () {
       $(ArtistField).autocomplete({
-        serviceUrl: ARTIST_AUTOCOMPLETE_URL
+        serviceUrl: ARTIST_AUTOCOMPLETE_URL,
       });
     });
   }
   ArtistCount++;
 }
 
-
 /**
  * RemoveArtistField
  */
 function RemoveArtistField() {
-  window.getSelection().removeAllRanges()
+  window.getSelection().removeAllRanges();
   ArtistCount = $('input[name="artists[]"]').length;
 
   if (ArtistCount == 1) {
     return;
   }
 
-  var x = $('#artistfields').raw();
+  var x = $("#artistfields").raw();
   for (i = 0; i < 3; i++) {
     x.removeChild(x.lastChild);
   }
   ArtistCount--;
 }
 
-
 /**
  * AddScreenshotField
  */
 function AddScreenshotField() {
-  var sss = $('[name="screenshots[]"]')
-  if (sss.length >= 10) return
+  var sss = $('[name="screenshots[]"]');
+  if (sss.length >= 10) return;
 
   var ScreenshotField = document.createElement("input");
   ScreenshotField.type = "text";
@@ -371,177 +401,184 @@ function AddScreenshotField() {
   ScreenshotField.name = "screenshots[]";
   ScreenshotField.size = 45;
 
-  var a = document.createElement("a")
-  a.className = "brackets"
-  a.innerHTML = "−"
-  a.onclick = function () { RemoveScreenshotField(this) }
+  var a = document.createElement("a");
+  a.className = "brackets";
+  a.innerHTML = "−";
+  a.onclick = function () {
+    RemoveScreenshotField(this);
+  };
 
-  var x = $('#screenshots').raw()
-  var y = document.createElement("div")
+  var x = $("#screenshots").raw();
+  var y = document.createElement("div");
   y.appendChild(ScreenshotField);
-  y.appendChild(document.createTextNode('\n'));
+  y.appendChild(document.createTextNode("\n"));
   y.appendChild(a);
   x.appendChild(y);
 }
 function RemoveScreenshotField(el) {
-  var sss = $('[name="screenshots[]"]')
-  el.parentElement.remove()
+  var sss = $('[name="screenshots[]"]');
+  el.parentElement.remove();
 }
 
-
 /**
  * AnimeAutofill
  */
 function AnimeAutofill() {
   var map = {
-    artist: 'artist_0',
-    title: 'title',
-    title_rj: 'title_rj',
-    title_jp: 'title_jp',
-    year: 'year',
-    description: 'album_desc'
-  }
-
-  var aid = $('#anidb').raw().value
-  $.getJSON('/api.php?action=autofill&cat=anime&aid=' + aid, function (data) {
-    if (data.status != "success") return
+    artist: "artist_0",
+    title: "title",
+    title_rj: "title_rj",
+    title_jp: "title_jp",
+    year: "year",
+    description: "album_desc",
+  };
+
+  var aid = $("#anidb").raw().value;
+  $.getJSON("/api.php?action=autofill&cat=anime&aid=" + aid, function (data) {
+    if (data.status != "success") return;
     for (i in data.response) {
-      if (map[i] && !($('#' + map[i]).raw().value)) {
-        $('#' + map[i]).raw().value = data.response[i]
+      if (map[i] && !$("#" + map[i]).raw().value) {
+        $("#" + map[i]).raw().value = data.response[i];
       }
     }
-  })
+  });
 }
 
-
 /**
  * JavAutofill
  */
 function JavAutofill() {
   var map = {
-    cn: 'javdb',
-    artists: 'artists',
-    title: 'title',
-    title_jp: 'title_jp',
-    year: 'year',
-    studio: 'studio',
-    image: 'image',
-    tags: 'tags',
-    description: 'album_desc'
-  }
-
-  var cn = $('#javdb_tr #catalogue').raw().value.toUpperCase()
-  $.getJSON('/api.php?action=autofill&cat=jav&cn=' + cn, function (data) {
+    cn: "javdb",
+    artists: "artists",
+    title: "title",
+    title_jp: "title_jp",
+    year: "year",
+    studio: "studio",
+    image: "image",
+    tags: "tags",
+    description: "album_desc",
+  };
+
+  var cn = $("#javdb_tr #catalogue").raw().value.toUpperCase();
+  $.getJSON("/api.php?action=autofill&cat=jav&cn=" + cn, function (data) {
     if (data.status != "success") {
-      $('#catalogue').raw().value = 'Failed'
-      return
+      $("#catalogue").raw().value = "Failed";
+      return;
     } else {
-      $('#catalogue').raw().value = data.response.cn
+      $("#catalogue").raw().value = data.response.cn;
     }
 
     for (i in data.response) {
       if (Array.isArray(data.response[i])) {
         for (j in data.response[i]) {
-          if (i == 'artists') {
-            if (!($('#' + map[i] + '_' + j).raw())) {
-              AddArtistField()
+          if (i == "artists") {
+            if (!$("#" + map[i] + "_" + j).raw()) {
+              AddArtistField();
             }
-            $('#' + map[i] + '_' + j).raw().value = data.response[i][j]
+            $("#" + map[i] + "_" + j).raw().value = data.response[i][j];
           }
-          if (map[i] == 'tags' && !($('#' + map[i]).raw().value)) {
-            $('#' + map[i]).raw().value = data.response[i].join(', ')
+          if (map[i] == "tags" && !$("#" + map[i]).raw().value) {
+            $("#" + map[i]).raw().value = data.response[i].join(", ");
           }
         }
       }
 
-      if (map[i] && $('#' + map[i]).raw() && !($('#' + map[i]).raw().value)) {
-        $('#' + map[i]).raw().value = data.response[i]
+      if (map[i] && $("#" + map[i]).raw() && !$("#" + map[i]).raw().value) {
+        $("#" + map[i]).raw().value = data.response[i];
       }
     }
 
     if (data.response.screens.length) {
-      $('#album_desc').raw().value = ('[spoiler=Automatically located thumbs][img]' + data.response.screens.join('[/img][img]') + '[/img][/spoiler]\n\n') + $('#album_desc').raw().value
+      $("#album_desc").raw().value =
+        "[spoiler=Automatically located thumbs][img]" +
+        data.response.screens.join("[/img][img]") +
+        "[/img][/spoiler]\n\n" +
+        $("#album_desc").raw().value;
     }
-  })
+  });
 }
 
-
 /**
  * MangaAutofill
  */
 function MangaAutofill() {
   var map = {
-    artists: 'artists',
-    title: 'title',
-    title_jp: 'title_jp',
-    year: 'year',
-    tags: 'tags',
-    lang: 'lang',
-    cover: 'image',
-    circle: 'series',
-    pages: 'pages',
-    description: 'release_desc'
-  }
-
-  var nh = $('#ehentai_tr #catalogue').raw().value
-  $.getJSON('/api.php?action=autofill&cat=manga&url=' + nh, function (data) {
+    artists: "artists",
+    title: "title",
+    title_jp: "title_jp",
+    year: "year",
+    tags: "tags",
+    lang: "lang",
+    cover: "image",
+    circle: "series",
+    pages: "pages",
+    description: "release_desc",
+  };
+
+  var nh = $("#ehentai_tr #catalogue").raw().value;
+  $.getJSON("/api.php?action=autofill&cat=manga&url=" + nh, function (data) {
     if (data.status != "success") {
-      $('#catalogue').raw().value = 'Failed'
-      return
+      $("#catalogue").raw().value = "Failed";
+      return;
     }
 
     for (i in data.response) {
       if (Array.isArray(data.response[i])) {
         for (j in data.response[i]) {
-          if (i == 'artists') {
-            if (!($('#' + map[i] + '_' + j).raw())) {
-              AddArtistField()
+          if (i == "artists") {
+            if (!$("#" + map[i] + "_" + j).raw()) {
+              AddArtistField();
             }
-            $('#' + map[i] + '_' + j).raw().value = data.response[i][j]
+            $("#" + map[i] + "_" + j).raw().value = data.response[i][j];
           }
-          if (map[i] == 'tags' && !($('#' + map[i]).raw().value)) {
-            $('#' + map[i]).raw().value = data.response[i].join(', ')
+          if (map[i] == "tags" && !$("#" + map[i]).raw().value) {
+            $("#" + map[i]).raw().value = data.response[i].join(", ");
           }
         }
       }
 
-      if (map[i] && $('#' + map[i]).raw() && (!($('#' + map[i]).raw().value) || $('#' + map[i]).raw().value == '---')) {
-        $('#' + map[i]).raw().value = data.response[i]
+      if (
+        map[i] &&
+        $("#" + map[i]).raw() &&
+        (!$("#" + map[i]).raw().value || $("#" + map[i]).raw().value == "---")
+      ) {
+        $("#" + map[i]).raw().value = data.response[i];
       }
     }
-  })
+  });
 }
 
-
 /**
  * SetResolution
  */
 function SetResolution() {
-  if ($('#ressel').raw().value != 'Other') {
-    $('#resolution').raw().value = $('#ressel').raw().value
-    $('#resolution').ghide()
+  if ($("#ressel").raw().value != "Other") {
+    $("#resolution").raw().value = $("#ressel").raw().value;
+    $("#resolution").ghide();
   } else {
-    $('#resolution').raw().value = ''
-    $('#resolution').gshow()
-    $('#resolution').raw().readOnly = false
+    $("#resolution").raw().value = "";
+    $("#resolution").gshow();
+    $("#resolution").raw().readOnly = false;
   }
 }
 
-
 /**
  * initAutofill
  */
 function initAutofill() {
-  $('[autofill]').each(function (i, el) {
-    el.addEventListener('click', function (event) {
-      ({ 'douj': MangaAutofill, 'anime': AnimeAutofill, 'jav': JavAutofill })[el.attributes['autofill'].value]()
-    })
-  })
+  $("[autofill]").each(function (i, el) {
+    el.addEventListener("click", function (event) {
+      ({ douj: MangaAutofill, anime: AnimeAutofill, jav: JavAutofill }[
+        el.attributes["autofill"].value
+      ]());
+    });
+  });
 }
 
 $(function () {
   Categories();
   initAutofill();
-  $(document).on('click', '.add_artist_button', AddArtistField);
-  $(document).on('click', '.remove_artist_button', RemoveArtistField);
-})
+  $(document).on("click", ".add_artist_button", AddArtistField);
+  $(document).on("click", ".remove_artist_button", RemoveArtistField);
+});

static/styles/bookish/scss/colors.scss

@@ -24,12 +24,6 @@ $shadow: 2px 2px 10px -2px slategray;
  * Common elements
  */
 
-.head {
-    background: #b3e5fc;
-    color: black;
-    padding: 0.5em 1rem;
-}
-
 /* Alternating tables */
 #request_table .request:nth-of-type(even) {
     background: white;
@@ -51,37 +45,6 @@ $shadow: 2px 2px 10px -2px slategray;
 /**
  * Fancy torrent search input
  */
-@mixin common-elements() {
-    border: none;
-    background: white;
-    font-size: 100%;
-    margin: 0 0.25rem;
-    padding: 0.5rem;
-    outline: none;
-}
-
-input,
-input[type="search"],
-input[type="text"] {
-    @include common-elements;
-    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-    transition: ease-in-out 0.1s;
-
-    &:focus {
-        border-bottom: 1px solid $lb100;
-    }
-}
-
-select,
-input[type="select"] {
-    @include common-elements;
-    border: 1px solid rgba(0, 0, 0, 0.1);
-    border-radius: 0;
-
-    appearance: none;
-    -webkit-appearance: none;
-    -moz-appearance: none;
-}
 
 checkbox,
 input[type="checkbox"] {
@@ -93,27 +56,6 @@ input[type="file"] {
     border: none;
 }
 
-/* Buttons */
-button:not(.editor-toolbar button),
-input[type="button"],
-input[type="submit"] {
-    background: $lb200;
-    border: none;
-    border-radius: 0.25rem;
-    box-shadow: $shadow;
-    margin: 0 0.25rem;
-    padding: 0.75rem 1rem;
-    cursor: pointer;
-
-    &:hover {
-        background: $lb50;
-    }
-
-    &:focus {
-        background: $lb300;
-    }
-}
-
 /**
  * Alerts, Toolbox, etc.
  * Needs one unified error display

static/styles/bookish/scss/fonts.scss

@@ -27,6 +27,14 @@ header,
     text-align: center;
 }
 
+/* Section headers ("box" class heading) */
+.head {
+    padding: 0.5em 0;
+    font-size: 120%;
+    border-bottom: 1px solid #e1e1e1;
+    margin-bottom: 1rem;
+}
+
 /* Links */
 a {
     color: black;

static/styles/bookish/scss/layout.scss

@@ -1,20 +1,3 @@
-/*
- * Body
- */
-
-* {
-    margin: 0;
-    padding: 0;
-}
-
-body {
-    /* min-width: 800px; */
-}
-
-ol {
-    margin-left: 1rem;
-}
-
 /*
  * Basic structure
  */
@@ -26,10 +9,6 @@ ol {
     width: 100%;
 }
 
-.head {
-    margin-bottom: 0.5rem;
-}
-
 #content {
     margin: auto;
     margin-top: 2rem;
@@ -85,7 +64,7 @@ ol {
 }
 
 .main_column {
-    @include column-flex(65%);
+    @include column-flex(64%);
 
     table {
         margin-bottom: 1rem;
@@ -93,7 +72,7 @@ ol {
 }
 
 .sidebar {
-    @include column-flex(35%);
+    @include column-flex(34%);
     float: right;
 }
 
@@ -103,17 +82,6 @@ div.linkbox {
     padding: 0.5rem;
 }
 
-.pad {
-    padding: 0 !important;
-    /* padding: 1rem; */
-
-    h3,
-    h4 {
-        margin-top: 0;
-        padding-top: 0;
-    }
-}
-
 /* Misc */
 .torrents_nomatch {
     margin-top: 1rem;
@@ -171,11 +139,6 @@ div.linkbox {
     border: none;
 }
 
-.torrent_table tr {
-    /* vertical-align: top; */
-    vertical-align: middle;
-}
-
 .torrent_table .number_column {
     text-align: center;
 }
@@ -186,14 +149,6 @@ div.linkbox {
 }
 
 /* Text elements */
-h1,
-h2,
-h3,
-h4 {
-    margin: 0.5em 0;
-    font-weight: bold;
-}
-
 p {
     margin: 1em 0.5rem;
 }

static/styles/bookish/scss/tables.scss

@@ -2,25 +2,17 @@
 }
 
 table {
-    /* border: 2px solid rgba(0, 0, 0, 0.01); */
-    border-collapse: collapse;
     width: 100%;
 
-    /*
-    * {
-        vertical-align: middle;
+    th {
+        font-size: 120%;
     }
-    */
 
+    /*
     tr {
         background-color: white;
     }
-
-    td,
-    th {
-        padding: 0.5rem;
-        text-align: left;
-    }
+    */
 }
 
 /**
@@ -39,18 +31,15 @@ table {
     }
 }
 
-/* Classes */
+/**
+ * colhead
+ * The main table heading.
+ */
 .colhead {
-    background: $lb100;
+    padding: 0.5em 0;
+    border-bottom: 1px solid #e1e1e1;
+    font-size: 120%;
     font-weight: bold;
-    color: black;
-}
-
-td.colhead,
-.colhead td,
-.colhead th {
-    padding-left: 10px;
-    padding-right: 10px;
 }
 
 .colhead .sign,
@@ -66,12 +55,28 @@ td.colhead,
     font-weight: bold;
 }
 
-.colhead_dark {
-    background: $lb100;
-    color: black;
+/* Torrent and collage tables */
+.torrent_table,
+.collage_table {
+    tr:nth-child(2n) {
+        background-color: whitesmoke;
+    }
+
+    tr:nth-child(2n-1) {
+        background-color: white;
+    }
+
+    div.tags {
+        font-weight: normal;
+        max-width: 500px;
+    }
+
+    span {
+        float: right;
+    }
 }
 
-/* Torrent and collage tables */
+/*
 .torrent_table,
 .collage_table {
     tr.group {
@@ -108,13 +113,14 @@ td.colhead,
     tr .center,
     td {
         vertical-align: middle;
-        /* text-align: center; */
+        /* text-align: center; * /
     }
     div.tags {
         font-weight: normal;
         max-width: 500px;
     }
 }
+*/
 
 .torrent_table .group_torrent .torrent span {
     font-weight: normal;

static/styles/global/global.scss

@@ -8,4 +8,5 @@
 @import "scss/layout";
 @import "scss/log";
 @import "scss/settings";
+@import "scss/skeleton-fixes";
 @import "scss/tables";

static/styles/global/scss/debug.scss

@@ -29,7 +29,7 @@
     border-radius: 100px;
 }
 
-/*
+/**
  * Fix long filename tables overflowing (Chrome only).
  * Stop various release page containers from overflowing with long input.
  * !! Be sure to test all major browsers before changing this section. !!

static/styles/global/scss/fonts.scss

@@ -1,7 +1,6 @@
 html {
     font-size: 16px;
     line-height: 1.6;
-    /* line-height: 1.6; */
 }
 
 /*

static/styles/global/scss/layout.scss

@@ -1,3 +1,12 @@
+/*
+ * Body
+ */
+
+* {
+    margin: 0;
+    padding: 0;
+}
+
 /*
  * Flex elements
  */

static/styles/global/scss/legacy.scss

@@ -47,6 +47,7 @@ textarea {
     outline: none;
 }
 
+/* 2021-07-24
 select {
     padding: 5px 10px;
     background-color: white;
@@ -58,6 +59,7 @@ select {
     -moz-appearance: none;
     appearance: none;
 }
+*/
 
 h2 .group_cat {
     height: 16px;
@@ -129,6 +131,7 @@ div.collage_image {
     cursor: pointer;
 }
 
+/* 2021-07-24
 button,
 input[type="button"],
 input[type="submit"] {
@@ -139,6 +142,7 @@ input[type="submit"] {
     border: none;
     color: #000;
 }
+*/
 
 .spoilerButton {
     cursor: pointer;
@@ -582,6 +586,7 @@ tr.torrent .bookmark > a:after {
  * Fix long release descriptions overflowing containers (all browsers).
  * Fix flowing issues in the report resolving pages.
  */
+/* 2021-07-24
 .wrap_overflow,
 .filelist_table td,
 .reportinfo_table,
@@ -593,6 +598,7 @@ tr.torrent .bookmark > a:after {
     word-break: break-word;
     hyphens: auto;
 }
+*/
 
 .filelist_table td:first-child {
     word-break: break-all;
@@ -1051,21 +1057,29 @@ div.torrent_artists {
 }
 */
 
+/* 2021-07-24
 .flex {
     display: flex;
 }
+*/
 
+/* 2021-07-24
 .flex > .grow {
     flex-grow: 1;
 }
+*/
 
+/* 2021-07-24
 .flex > .shrink {
     flex-shrink: 1;
 }
+*/
 
+/* 2021-07-24
 input[type="search"] {
     -webkit-appearance: textfield;
 }
+*/
 
 #lightbox > img {
     max-width: 100%;
@@ -1089,10 +1103,12 @@ input[type="search"] {
     display: flex;
 }
 
+/* 2021-07-24
 #publickey {
     width: initial;
     font-family: monospace;
 }
+*/
 
 .hidden {
     display: none;
@@ -1103,12 +1119,15 @@ form.edit_form[name="screenshots_form"] img {
     width: 400px;
 }
 
+/* 2021-07-24
 #dbcrypt {
     position: fixed;
     top: 10px;
     right: 10px;
 }
+*/
 
+/* 2021-07-24
 #dbcrypt:after {
     content: "!";
     display: block;
@@ -1122,3 +1141,4 @@ form.edit_form[name="screenshots_form"] img {
     background: red;
     border-radius: 100px;
 }
+*/

static/styles/global/scss/skeleton-fixes.scss

@@ -0,0 +1,113 @@
+/**
+ * Fixes needed to use skeleton.css
+ * to its best advantage
+ */
+
+/* Set heading fonts 50% of default and bump down a level */
+@mixin heading-attributes {
+    letter-spacing: -1px !important;
+    margin: 1rem 0 !important;
+}
+
+h1:not(#logo) {
+    font-size: 1.8rem !important;
+    @include heading-attributes;
+}
+
+h2 {
+    font-size: 1.5rem !important;
+    @include heading-attributes;
+}
+
+h3 {
+    font-size: 1.2rem !important;
+    @include heading-attributes;
+}
+
+h4 {
+    font-size: 0.9rem !important;
+    @include heading-attributes;
+}
+
+h5 {
+    font-size: 0.75rem !important;
+    @include heading-attributes;
+}
+
+h6 {
+    font-size: 0.75rem !important;
+    @include heading-attributes;
+}
+
+/* Larger than phablet */
+@media (min-width: 550px) {
+    h1 {
+        font-size: 1.8rem !important;
+    }
+
+    h2 {
+        font-size: 1.5rem !important;
+    }
+
+    h3 {
+        font-size: 1.2rem !important;
+    }
+
+    h4 {
+        font-size: 0.9rem !important;
+    }
+
+    h5 {
+        font-size: 0.75rem !important;
+    }
+
+    h6 {
+        font-size: 0.75rem !important;
+    }
+}
+
+table.forum_index {
+    h4 {
+        margin: 0 !important;
+    }
+}
+
+label,
+legend {
+    display: inline !important;
+}
+
+table.torrent_search,
+table.torrent_requests {
+    th,
+    td {
+        border-bottom: 0 !important;
+        padding: 0.25rem !important;
+    }
+}
+
+input,
+input[type="search"],
+input[type="text"] {
+    margin: 0 !important;
+}
+
+ul {
+    list-style: circle !important;
+}
+
+pre,
+blockquote,
+dl,
+figure,
+table,
+p,
+ul,
+ol,
+form {
+    margin-bottom: 0 !important;
+}
+
+code {
+    padding: 0 !important;
+}

templates/torrent_form/seqhash.html

@@ -0,0 +1,54 @@
+<tr id="seqhash_tr">
+  <td>
+    <label for="seqhash">{{ db.name }}</label>
+    {#
+    <br />
+    <a class="add_artist_button brackets" onclick="AddArtistField()">+</a>
+    <a class="remove_artist_button brackets" onclick="RemoveArtistField()">&minus;</a>
+    #}
+  </td>
+
+  <td>
+    <textarea
+      rows="2"
+      name="seqhash"
+      id="seqhash"
+      {# Needs to be all on one line #}
+      placeholder="{{ db.desc }}">{{ seqhash }}</textarea>
+
+    <input type="radio" id="dna" name="seqhash_meta1" value="DNA" checked /> DNA
+    {# <label for="dna">DNA</label> #}
+
+    &emsp;
+
+    <input type="radio" id="rna" name="seqhash_meta1" value="RNA" /> RNA
+    {# <label for="rna">RNA</label> #}
+
+    &emsp;
+
+    <input type="radio" id="protein" name="seqhash_meta1" value="PROTEIN" /> Protein
+    {# <label for="protein">Protein</label> #}
+
+    <br />
+
+    <input type="radio" id="linear" name="seqhash_meta2" value="false" checked /> Linear
+    {# <label for="linear">Linear</label> #}
+
+    &emsp;
+
+    <input type="radio" id="circular" name="seqhash_meta2" value="true" /> Circular
+    {# <label for="circular">Circular</label> #}
+
+    <br />
+
+    <input type="radio" id="double_stranded" name="seqhash_meta3" value="true" checked /> Double-Stranded
+    {# <label for="double_stranded">Double-Stranded</label> #}
+
+    &emsp;
+
+    <input type="radio" id="single_stranded" name="seqhash_meta3" value="false" /> Single-Stranded
+    {# <label for="single_stranded">Single-Stranded</label> #}
+
+    <p>{{ db.note|raw }}</p>
+  </td>
+</tr>