Overhaul request form and support medical imaging

classes/torrent_form.class.php

@@ -10,7 +10,7 @@ class TorrentForm
     #var $Formats = [];
     #var $Bitrates = [];
     public $Media = [];
-    #var $MediaManga = [];
+    var $MediaManga = [];
     public $Containers = [];
     #var $ContainersGames = [];
     public $Codecs = [];
@@ -32,7 +32,7 @@ class TorrentForm
         $this->Torrent = $Torrent;
         $this->Error = $Error;
 
-        global $UploadForm, $Categories, $Media, $TorrentID, $Containers, $Codecs, $Resolutions, $Archives;
+        global $UploadForm, $Categories, $Media,  $MediaManga, $TorrentID, $Containers, $Codecs, $Resolutions, $Archives;
         #global $UploadForm, $Categories, $Formats, $Bitrates, $Media, $MediaManga, $TorrentID, $Containers, $ContainersGames, $Codecs, $Resolutions, $AudioFormats, $Subbing, $Languages, $Platform, $Archives, $ArchivesManga;
 
         $this->UploadForm = $UploadForm;
@@ -40,7 +40,7 @@ class TorrentForm
         #$this->Formats = $Formats;
         #$this->Bitrates = $Bitrates;
         $this->Media = $Media;
-        #$this->MediaManga = $MediaManga;
+        $this->MediaManga = $MediaManga;
         $this->Containers = $Containers;
         #$this->ContainersGames = $ContainersGames;
         $this->Codecs = $Codecs;
@@ -212,14 +212,17 @@ class TorrentForm
         </td>
       </tr>
       <?php
-            }
-        } ?>
+          }
+        }
+      ?>
 
       <!-- Rules notice and submit button -->
       <tr>
         <td colspan="2" style="text-align: center;">
-          <p>Be sure that your torrent is approved by the <a href="rules.php?p=upload" target="_blank">rules</a>.
-          Not doing this will result in a <strong class="important_text">warning</strong> or <strong class="important_text">worse</strong>.</p>
+          <p>
+            Be sure that your torrent is approved by the <a href="rules.php?p=upload" target="_blank">rules</a>.
+            Not doing this will result in a <strong class="important_text">warning</strong> or <strong class="important_text">worse</strong>.
+          </p>
           <?php if ($this->NewTorrent) { ?>
           <p>
             After uploading the torrent, you will have a one hour grace period during which no one other than you can fill requests with this torrent.
@@ -291,7 +294,7 @@ class TorrentForm
 
   <!-- Three title fields -->
   <tr id="title_tr">
-    <td class="label">Sequence Name</td>
+    <td class="label">Torrent Title</td>
     <td>
       <input type="text" id="title" name="title" size="60"
         value="<?= display_str($Torrent['Title']) ?>"
@@ -301,13 +304,12 @@ class TorrentForm
   </tr>
 
   <tr id="title_rj_tr">
-    <td class="label tooltip" title="">Organism
-    </td>
+    <td class="label" title="">Organism</td>
     <td>
       <input type="text" id="title_rj" name="title_rj" size="60"
         value="<?= display_str($Torrent['TitleRJ']) ?>"
         <?= $this->Disabled ?>/><br />
-      Organism line binomial nomenclature, e.g., <em>Saccharomyces cerevisiae</em>
+      Organism line binomial, e.g., <em>Saccharomyces cerevisiae</em>
     </td>
   </tr>
 
@@ -317,7 +319,7 @@ class TorrentForm
       <input type="text" id="title_jp" name="title_jp" size="60"
         value="<?= display_str($Torrent['TitleJP']) ?>"
         <?= $this->Disabled ?>/><br />
-      Organism line if applicable, e.g., S288C
+      Organism line if any, e.g., S288C
     </td>
   </tr>
 
@@ -325,7 +327,7 @@ class TorrentForm
   <tr id="idols_tr">
     <td class="label tooltip" title="">Authors(s)</td>
     <td id="idolfields">
-      One author per field, e.g., Robert K. Mortimer [+] David Schild<br />
+      One per field, e.g., Robert K. Mortimer [+] David Schild<br />
       <?php
         if (!empty($Torrent['Artists'])) {
           foreach ($Torrent['Artists'] as $Num => $Artist) {
@@ -367,7 +369,7 @@ class TorrentForm
       <input type="text" id="series" name="series" size="60"
         value="<?= display_str($Torrent['Series']) ?>"
         <?= $this->Disabled ?>/><br />
-      Its physical location, e.g., Berkeley, CA
+      Physical location, e.g., Berkeley, CA
     </td>
   </tr>
 
@@ -417,7 +419,7 @@ class TorrentForm
               echo ">$Cont</option>\n";
           } ?>
       </select><br />
-      The data's file format
+      Data file format
     </td>
   </tr>
 
@@ -450,7 +452,7 @@ class TorrentForm
           $('#resolution').gshow()
         }
       </script><br />
-      How complete the sequence is
+      How complete the data is
     </td>
   </tr>
 
@@ -469,7 +471,7 @@ class TorrentForm
               echo ">$Archive</option>\n";
           } ?>
       </select><br />
-      Its compression algorithm
+      Compression algorithm
     </td>
   </tr>
 
@@ -530,7 +532,7 @@ class TorrentForm
       <input type="text" id="image" name="image" size="60"
         value="<?= display_str($Torrent['Image']) ?>"
         <?= $this->Disabled ?> /><br />
-      A meaningful picture, e.g., of the specimen
+      A meaningful picture, e.g., the specimen or a thumbnail
     </td>
   </tr>
 

sections/requests/new_edit.php

@@ -1,5 +1,7 @@
 <?php
 
+# @todo Fix multiple authors and bounty preview
+
 /*
  * Yeah, that's right, edit and new are the same place again.
  * It makes the page uglier to read but ultimately better as the alternative means
@@ -18,7 +20,7 @@ if (!$NewRequest) {
 $Disabled = "";
 
 if ($NewRequest && ($LoggedUser['BytesUploaded'] < 250 * 1024 * 1024 || !check_perms('site_submit_requests'))) {
-    error('You do not have enough uploaded to make a request.');
+    error('You do not have enough uploaded to make a request');
 }
 
 if (!$NewRequest) {
@@ -52,292 +54,319 @@ if (!$NewRequest) {
         }
 
         $ArtistForm = Requests::get_artists($RequestID);
-
         $Tags = implode(', ', $Request['Tags']);
     }
 }
 
-if ($NewRequest && !empty($_GET['artistid']) && is_number($_GET['artistid'])) {
-    $DB->query("
-    SELECT Name
-    FROM artists_group
-    WHERE artistid = ".$_GET['artistid']."
-    LIMIT 1");
-    list($ArtistName) = $DB->next_record();
-    $ArtistForm = array(
-    1 => array(array('name' => trim($ArtistName))),
-  );
-} elseif ($NewRequest && !empty($_GET['groupid']) && is_number($_GET['groupid'])) {
-    $ArtistForm = Artists::get_artist($_GET['groupid']);
-    $DB->query("
-    SELECT
-      tg.Name,
-      tg.NameRJ,
-      tg.NameJP,
-      tg.Year,
-      tg.Studio,
-      tg.Series,
-      tg.CatalogueNumber,
-      tg.DLsiteID,
-      tg.WikiImage,
-      GROUP_CONCAT(t.Name SEPARATOR ', '),
-      tg.CategoryID
-    FROM torrents_group AS tg
-      JOIN torrents_tags AS tt ON tt.GroupID = tg.ID
-      JOIN tags AS t ON t.ID = tt.TagID
-    WHERE tg.ID = ".$_GET['groupid']);
-    if (list($Title, $TitleRJ, $TitleJP, $Year, $Studio, $Series, $CatalogueNumber, $DLsiteID, $Image, $Tags, $CategoryID) = $DB->next_record()) {
-        $GroupID = trim($_REQUEST['groupid']);
-        $CategoryName = $Categories[$CategoryID - 1];
-        $Disabled = 'readonly="readonly"';
-    }
-}
+  if ($NewRequest && !empty($_GET['artistid']) && is_number($_GET['artistid'])) {
+      $DB->query("
+        SELECT Name
+        FROM artists_group
+        WHERE artistid = ".$_GET['artistid']."
+        LIMIT 1");
+      list($ArtistName) = $DB->next_record();
+      $ArtistForm = array(
+      1 => array(array('name' => trim($ArtistName))),
+    );
+  } elseif ($NewRequest && !empty($_GET['groupid']) && is_number($_GET['groupid'])) {
+      $ArtistForm = Artists::get_artist($_GET['groupid']);
+      $DB->query("
+        SELECT
+        tg.Name,
+        tg.NameRJ,
+        tg.NameJP,
+        tg.Year,
+        tg.Studio,
+        tg.Series,
+        tg.CatalogueNumber,
+        tg.DLsiteID,
+        tg.WikiImage,
+        GROUP_CONCAT(t.Name SEPARATOR ', '),
+        tg.CategoryID
+        FROM torrents_group AS tg
+        JOIN torrents_tags AS tt ON tt.GroupID = tg.ID
+        JOIN tags AS t ON t.ID = tt.TagID
+        WHERE tg.ID = ".$_GET['groupid']);
+      if (list($Title, $TitleRJ, $TitleJP, $Year, $Studio, $Series, $CatalogueNumber, $DLsiteID, $Image, $Tags, $CategoryID) = $DB->next_record()) {
+          $GroupID = trim($_REQUEST['groupid']);
+          $CategoryName = $Categories[$CategoryID - 1];
+          $Disabled = 'readonly="readonly"';
+      }
+  }
 
-View::show_header(($NewRequest ? 'Create a request' : 'Edit a request'), 'bbcode,requests,form_validate');
+View::show_header(($NewRequest ? 'Create Request' : 'Edit Request'), 'bbcode,requests,form_validate');
 ?>
+
+<!-- HTML title -->
 <div class="thin">
   <div class="header">
-    <h2><?=($NewRequest ? 'Create a request' : 'Edit a request')?>
-    </h2>
+    <h2><?= ($NewRequest ? 'Create Request' : 'Edit Request') ?></h2>
   </div>
 
+  <!-- New request hidden fields -->
   <div class="box pad">
     <form action="" method="post" id="request_form" onsubmit="Calculate();">
       <div>
         <?php  if (!$NewRequest) { ?>
         <input type="hidden" name="requestid"
-          value="<?=$RequestID?>" />
+          value="<?= $RequestID ?>" />
         <?php  } ?>
         <input type="hidden" name="auth"
-          value="<?=$LoggedUser['AuthKey']?>" />
+          value="<?= $LoggedUser['AuthKey'] ?>" />
         <input type="hidden" name="action"
-          value="<?=($NewRequest ? 'takenew' : 'takeedit')?>" />
+          value="<?= ($NewRequest ? 'takenew' : 'takeedit') ?>" />
       </div>
 
+      <!-- Main table -->
       <table class="layout">
         <tr>
-          <td colspan="2" class="center">Please make sure your request follows <a href="rules.php?p=requests">the
-              request rules</a>!</td>
+          <td colspan="2" class="center">Please make sure your request follows <a href="rules.php?p=requests">the request rules</a>!</td>
         </tr>
         <?php  if ($NewRequest || $CanEdit) { ?>
+
+        <!-- Category -->
         <tr>
-          <td class="label tooltip" title="What alphabet the sequence uses, n.b., plasmids fit in the Other category">
-            Type</td>
+          <td class="label">Type</td>
           <td>
             <?php if (!empty($Disabled)) { ?>
             <input type="hidden" name="type"
-              value="<?=$CategoryName?>" />
+              value="<?= $CategoryName ?>" />
             <select id="categories" name="type" onchange="Categories();" disabled="disabled">
               <?php } else { ?>
               <select id="categories" name="type" onchange="Categories();">
                 <?php } ?>
-                <?php    foreach (Misc::display_array($Categories) as $Cat) { ?>
-                <option value="<?=$Cat?>" <?=(!empty($CategoryName) && ($CategoryName === $Cat) ? ' selected="selected"' : '')?>><?=$Cat?>
+                <?php foreach (Misc::display_array($Categories) as $Cat) { ?>
+                <option value="<?= $Cat ?>" <?= (!empty($CategoryName) && ($CategoryName === $Cat) ? ' selected="selected"' : '') ?>><?=$Cat?>
                 </option>
                 <?php    } ?>
               </select>
           </td>
         </tr>
+
+        <!-- Catalogue number -->
         <tr id="cataloguenumber_tr">
           <td class="label">Accession Number</td>
           <td>
             <input type="text" id="catalogue" name="cataloguenumber" size="15"
-              value="<?=(isset($CatalogueNumber)?$CatalogueNumber:'') ?>"
-              <?=$Disabled?>/>
+              value="<?= (isset($CatalogueNumber)?$CatalogueNumber:'') ?>"
+              <?= $Disabled ?>/>
             <?php if (empty($Disabled)) { ?>
             <input type="button" autofill="jav" value="Autofill"></input>
             <?php } ?>
           </td>
         </tr>
-        <tr id="artist_tr">
-          <td class="label">Collaborator(s)</td>
-          <td id="artistfields">
-            <p id="vawarning" class="hidden">Please use the multiple artists feature rather than adding "Various
-              Artists" as an artist; read <a href="wiki.php?action=article&amp;id=369">this</a> for more information.
-            </p>
-            <?php
-    if (!empty($ArtistForm)) {
-        $First = true;
-        foreach ($ArtistForm as $Artist) {
-            ?>
-            <input type="text" id="artist_0" name="artists[]" <?php Users::has_autocomplete_enabled('other'); ?>
-            size="45" value="<?=display_str($Artist['name']) ?>" <?=$Disabled?>/>
-            <?php if (empty($Disabled)) {
-                if ($First) { ?><a class="add_artist_button brackets">+</a> <a
-              class="remove_artist_button brackets">&minus;</a><?php }
-                $First = false;
-            } ?>
-            <br />
-            <?php
-        }
-    } else {
-        ?> <input type="text" id="artist_0" name="artists[]" <?php Users::has_autocomplete_enabled('other'); ?>
-            size="45" <?=$Disabled?>/>
-            <?php if (empty($Disabled)) { ?>
-            <a class="add_artist_button brackets">+</a> <a class="remove_artist_button brackets">&minus;</a>
-            <?php } ?>
-            <?php
-    }
-?>
-          </td>
-        </tr>
+
+        <!-- Three titles -->
         <tr>
-          <td class="label tooltip" title="FASTA definition line, e.g., Alcohol dehydrogenase ADH1">Sequence Name</td>
+          <td class="label">Torrent Title</td>
           <td>
             <input type="text" id="title" name="title" size="45"
-              value="<?=(!empty($Title) ? $Title : '')?>"
-              <?=$Disabled?>/>
+              value="<?= (!empty($Title) ? $Title : '') ?>"
+              <?= $Disabled ?>/>
           </td>
         </tr>
+
         <tr>
-          <td class="label tooltip" title="FASTA organism line binomial nomenclature, e.g., Saccharomyces cerevisiae">
-            Organism</td>
+          <td class="label">Organism</td>
           <td>
             <input type="text" id="title_rj" name="title_rj" size="45"
-              value="<?=(!empty($TitleRJ) ? $TitleRJ : '')?>"
-              <?=$Disabled?>/>
+              value="<?= (!empty($TitleRJ) ? $TitleRJ : '') ?>"
+              <?= $Disabled ?>/>
           </td>
         </tr>
+
         <tr>
-          <td class="label tooltip" title="FASTA organism line if applicable, e.g., S288C">Strain/Variety</td>
+          <td class="label">Strain/Variety</td>
           <td>
             <input type="text" id="title_jp" name="title_jp" size="45"
-              value="<?=!empty($TitleJP)?$TitleJP:''?>"
-              <?=$Disabled?>/>
+              value="<?= !empty($TitleJP)?$TitleJP:'' ?>"
+              <?= $Disabled ?>/>
           </td>
         </tr>
-        <?php  } ?>
-        <?php  if ($NewRequest || $CanEdit) { ?>
+        <?php  } # Ends if NewRequest line 123 ?>
+
+        <!-- Multiple artists -->
+        <tr id="artist_tr">
+          <td class="label">Author(s)</td>
+          <td id="artistfields">
+            <?php
+              if (!empty($ArtistForm)) {
+                $First = true;
+                foreach ($ArtistForm as $Artist) {
+                  # Cycle autocomplete
+            ?>
+            <input type="text" id="artist_0" name="artists[]" <?php Users::has_autocomplete_enabled('other'); ?>
+            size="45" value="<?= display_str($Artist['name']) ?>" <?= $Disabled ?>/>
+            <?php
+              if (empty($Disabled)) {
+                if ($First) { ?>
+            <a class="add_artist_button brackets">+</a>
+            <a class="remove_artist_button brackets">&minus;</a>
+            <?php
+                }
+                $First = false;
+              }
+            ?>
+            <br />
+            <?php
+                }
+              } else {
+            ?>
+            <input type="text" id="artist_0" name="artists[]" <?php Users::has_autocomplete_enabled('other'); ?>
+            size="45" <?= $Disabled ?>/>
+            <?php if (empty($Disabled)) { ?>
+            <a class="add_artist_button brackets">+</a> <a class="remove_artist_button brackets">&minus;</a>
+            <?php
+                } 
+              }
+            ?>
+          </td>
+        </tr>
+
+        <!-- Picture -->
+        <?php if ($NewRequest || $CanEdit) { ?>
         <tr id="image_tr">
-          <td class="label tooltip" title="A meaningful picture, e.g., of the specimen">Picture</td>
+          <td class="label">Picture</td>
           <td>
             <input type="text" id="image" name="image" size="45"
-              value="<?=(!empty($Image) ? $Image : '')?>"
-              <?=$Disabled?>/>
+              value="<?= (!empty($Image) ? $Image : '') ?>"
+              <?= $Disabled ?>/>
           </td>
         </tr>
         <?php  } ?>
+
+        <!-- Tags -->
         <tr>
-          <td class="label tooltip" title="Comma-seperated list of tags, n.b., use vanity.house for data you produced">
-            Tags</td>
+          <td class="label">Tags</td>
           <td>
             <?php
-  $GenreTags = $Cache->get_value('genre_tags');
-  if (!$GenreTags) {
-      $DB->query('
-      SELECT Name
-      FROM tags
-      WHERE TagType = \'genre\'
-      ORDER BY Name');
-      $GenreTags = $DB->collect('Name');
-      $Cache->cache_value('genre_tags', $GenreTags, 3600 * 6);
-  }
+              $GenreTags = $Cache->get_value('genre_tags');
+                if (!$GenreTags) {
+                  $DB->query('
+                    SELECT Name
+                    FROM tags
+                    WHERE TagType = \'genre\'
+                    ORDER BY Name');
+                  $GenreTags = $DB->collect('Name');
+                  $Cache->cache_value('genre_tags', $GenreTags, 3600 * 6);
+                }
 
-  if (!empty($Disabled)) {
-      ?>
+                if (!empty($Disabled)) {
+            ?>
             <select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;" disabled="disabled">
-              <?php
-  } else { ?>
-              <select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;">
-                <?php } ?>
-                <option>---</option>
-                <?php  foreach (Misc::display_array($GenreTags) as $Genre) { ?>
-                <option value="<?=$Genre?>"><?=$Genre?>
-                </option>
-                <?php  } ?>
-              </select>
-              <input type="text" id="tags" name="tags" size="45"
-                value="<?=(!empty($Tags) ? display_str($Tags) : '')?>"
-                <?php Users::has_autocomplete_enabled('other'); ?>
-              <?=$Disabled?>/>
+            <?php } else { ?>
+            <select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;">
+              <?php } ?>
+              <option>---</option>
+              <?php foreach (Misc::display_array($GenreTags) as $Genre) { ?>
+              <option value="<?= $Genre ?>"><?= $Genre ?>
+              </option>
+              <?php  } ?>
+            </select>
+            <input type="text" id="tags" name="tags" size="45"
+              value="<?= (!empty($Tags) ? display_str($Tags) : '') ?>"
+              <?php Users::has_autocomplete_enabled('other'); ?>
+              <?= $Disabled ?>/>
           </td>
         </tr>
-        <?php  if ($NewRequest || $CanEdit) { ?>
-        <?php  } ?>
+
+        <!-- Description -->
         <tr>
           <td class="label">Description</td>
           <td>
-            <?php          new TEXTAREA_PREVIEW('description', 'req_desc', $Request['Description']??''); ?>
+            <?php new TEXTAREA_PREVIEW('description', 'req_desc', $Request['Description']??''); ?>
           </td>
         </tr>
+
+        <!-- Existing torrent groups -->
         <?php  if (check_perms('site_moderate_requests')) { ?>
         <tr>
           <td class="label">Torrent Group</td>
           <td>
-            <?=site_url()?>torrents.php?id=<input type="text"
+            If this request matches a torrent group <strong>already existing</strong> on the site, please indicate that here.<br />
+            <?= site_url() ?>torrents.php?id=<input type="text"
               name="groupid"
-              value="<?=isset($GroupID)?$GroupID:''?>"
-              size="15" /><br />
-            If this request matches a torrent group <strong>already existing</strong> on the site, please indicate that
-            here.
+              value="<?= isset($GroupID)?$GroupID:'' ?>"
+              size="15" />
           </td>
         </tr>
-        <?php  } elseif (!empty($GroupID) && ($CategoryID !== 5) && ($CategoryID !== 0)) { ?>
+        <?php
+          } elseif (!empty($GroupID)
+            #&& ($CategoryID !== 5) # ?
+            #&& ($CategoryID !== 0) # ?
+            ) {
+        ?>
+
+        <!-- Torrent group admin -->
         <tr>
           <td class="label">Torrent Group</td>
           <td>
-            <a href="torrents.php?id=<?=$GroupID?>"><?=site_url()?>torrents.php?id=<?=$GroupID?></a><br />
-            This request <?=($NewRequest ? 'will be' : 'is')?>
-            associated with the above torrent group.
-            <?php    if (!$NewRequest) { ?>
-            If this is incorrect, please <a
-              href="reports.php?action=report&amp;type=request&amp;id=<?=$RequestID?>">report
-              this request</a> so that staff can fix it.
-            <?php    } ?>
+            <a href="torrents.php?id=<?= $GroupID ?>"><?= site_url() ?>torrents.php?id=<?= $GroupID ?></a><br />
+            This request <?= ($NewRequest ? 'will be' : 'is') ?> associated with the above torrent group.
+            <?php if (!$NewRequest) { ?>
+            If this is incorrect, please
+            <a href="reports.php?action=report&amp;type=request&amp;id=<?= $RequestID ?>">report this request</a>
+            so that staff can fix it.
+            <?php } ?>
             <input type="hidden" name="groupid"
-              value="<?=$GroupID?>" />
+              value="<?= $GroupID ?>" />
           </td>
         </tr>
-        <?php  }
-  if ($NewRequest) { ?>
+
+        <!-- Bounty -->
+        <?php  } if ($NewRequest) { ?>
         <tr id="voting">
-          <td class="label tooltip" title="How much upload credit the fulfiller wins">Bounty</td>
+          <td class="label">Bounty</td>
           <td>
             <input type="text" id="amount_box" size="8"
-              value="<?=(!empty($Bounty) ? $Bounty : '100')?>"
+              value="<?= (!empty($Bounty) ? $Bounty : '100') ?>"
               onchange="Calculate();" />
             <select id="unit" name="unit" onchange="Calculate();">
-              <option value="mb" <?=(!empty($_POST['unit']) && $_POST['unit'] === 'mb' ? ' selected="selected"' : '') ?>>MB
+              <option value="mb" <?= (!empty($_POST['unit']) && $_POST['unit'] === 'mb' ? ' selected="selected"' : '') ?>>MB
               </option>
-              <option value="gb" <?=(!empty($_POST['unit']) && $_POST['unit'] === 'gb' ? ' selected="selected"' : '') ?>>GB
+              <option value="gb" <?= (!empty($_POST['unit']) && $_POST['unit'] === 'gb' ? ' selected="selected"' : '') ?>>GB
               </option>
             </select>
             <input type="button" value="Preview" onclick="Calculate();" />
-            <strong><?=($RequestTax * 100)?>% of this is deducted as
-              tax by the system.</strong>
+            <strong>The system deducts <?= ($RequestTax * 100) ?>% as tax</strong>
           </td>
         </tr>
+
+        <!-- New stats -->
         <tr>
-          <td class="label">Post-Request Information</td>
+          <td class="label">New Stats</td>
           <td>
             <input type="hidden" id="amount" name="amount"
-              value="<?=(!empty($Bounty) ? $Bounty : '100')?>" />
+              value="<?= (!empty($Bounty) ? $Bounty : '100') ?>" />
             <input type="hidden" id="current_uploaded"
-              value="<?=$LoggedUser['BytesUploaded']?>" />
+              value="<?= $LoggedUser['BytesUploaded'] ?>" />
             <input type="hidden" id="current_downloaded"
-              value="<?=$LoggedUser['BytesDownloaded']?>" />
-            Bounty after tax: <strong><span id="bounty_after_tax">90.00 MB</span></strong><br />
-            If you add the entered <strong><span id="new_bounty">100.00 MB</span></strong> of bounty, your new stats
-            will be: <br />
-            Uploaded: <span id="new_uploaded"><?=Format::get_size($LoggedUser['BytesUploaded'])?></span><br />
-            Ratio: <span id="new_ratio"><?=Format::get_ratio_html($LoggedUser['BytesUploaded'], $LoggedUser['BytesDownloaded'])?></span>
+              value="<?= $LoggedUser['BytesDownloaded'] ?>" />
+            <ul>
+              <!-- <li>Bounty: <span id="bounty_after_tax">90.00 MB</span></li> -->
+              <li>Uploaded: <span id="new_uploaded"><?= Format::get_size($LoggedUser['BytesUploaded']) ?></span></li>
+              <li>Ratio: <span id="new_ratio"><?= Format::get_ratio_html($LoggedUser['BytesUploaded'], $LoggedUser['BytesDownloaded']) ?></span></li>
+            </ul>
           </td>
         </tr>
+
+        <!-- Submit -->
         <tr>
           <td colspan="2" class="center">
-            <input type="submit" id="button" value="Create request" disabled="disabled" />
+            <input type="submit" id="button" value="Create" disabled="disabled" />
           </td>
         </tr>
-        <?php  } else { ?>
+        <?php } else { ?>
         <tr>
           <td colspan="2" class="center">
-            <input type="submit" id="button" value="Edit request" />
+            <input type="submit" id="button" value="Edit" />
           </td>
         </tr>
-        <?php  } ?>
+        <?php } ?>
       </table>
     </form>
   </div>
 </div>
+
 <?php
 View::show_footer();

sections/rules/tag.php

@@ -1,11 +1,11 @@
 <?
 //Include the header
-View::show_header('Tagging rules');
+View::show_header('Tagging Rules');
 ?>
 <!-- General Rules -->
 <div class="thin">
   <div class="header">
-    <h3 id="general">Tagging rules</h3>
+    <h3 id="general">Tagging Rules</h3>
   </div>
   <div class="box pad rule_summary" style="padding: 10px 10px 10px 20px;">
 <?    Rules::display_site_tag_rules(false) ?>

sections/torrents/browse.php

@@ -166,13 +166,13 @@ View::show_header('Browse Torrents', 'browse');
         <tr id="artist_name" class="ftr_advanced<?=$HideAdvanced?>">
           <td class="label"><!--Artist name:--></td>
           <td class="ft_artistname">
-            <input type="search" spellcheck="false" size="65" name="artistname" class="inputtext smaller fti_advanced" placeholder="Collaborator Name" value="<?Format::form('artistname')?>" />
+            <input type="search" spellcheck="false" size="65" name="artistname" class="inputtext smaller fti_advanced" placeholder="Author Name" value="<?Format::form('artistname')?>" />
           </td>
         </tr>
         <tr id="album_torrent_name" class="ftr_advanced<?=$HideAdvanced?>">
           <td class="label"><!--Torrent name:--></td>
           <td class="ft_groupname">
-            <input type="search" spellcheck="false" size="65" name="advgroupname" class="inputtext smaller fti_advanced" placeholder="Sequence Name" value="<?Format::form('advgroupname')?>" />
+            <input type="search" spellcheck="false" size="65" name="advgroupname" class="inputtext smaller fti_advanced" placeholder="Torrent Title" value="<?Format::form('advgroupname')?>" />
           </td>
         </tr>
         <tr id="catalogue_number" class="ftr_advanced<?=$HideAdvanced?>">

sections/upload/upload_handle.php

@@ -752,11 +752,13 @@ if (!empty($ArtistsUnescaped)) {
         $ArtistNameList[] = "Artists LIKE '%|".db_string(str_replace('\\', '\\\\', $Artist['name']), true)."|%'";
     }
     // Don't add notification if >2 main artists or if tracked artist isn't a main artist
+    /*
     if (count($ArtistNameList) > 2 || $Artist['name'] === 'Various Artists') {
         $SQL .= " AND (ExcludeVA = '0' AND (";
         $SQL .= implode(' OR ', array_merge($ArtistNameList, $GuestArtistNameList));
         $SQL .= " OR Artists = '')) AND (";
     } else {
+    */
         $SQL .= " AND (";
         if (!empty($GuestArtistNameList)) {
             $SQL .= "(ExcludeVA = '0' AND (";
@@ -768,7 +770,7 @@ if (!empty($ArtistsUnescaped)) {
             $SQL .= " OR ";
         }
         $SQL .= "Artists = '') AND (";
-    }
+    #}
 } else {
     $SQL .= "AND (Artists = '') AND (";
 }

static/styles/beluga/style.css

@@ -18,16 +18,17 @@
   padding: 0
 }
 
-.cats_dna, .cats_mrna, .cats_rrna, .cats_trna, .cats_protein, .cats_other {
+.cats_dna, .cats_rna, .cats_protein, .cats_imaging, .cats_other {
   /* width: 36px!important; */
   height: 36px!important;
   line-height: 36px;
 }
-.group .cats_dna:after, .group .cats_mrna:after,
-.group .cats_rrna:after, .group .cats_trna:after,
-.group .cats_protein:after, .group .cats_other:after {
+.group .cats_dna:after, .group .cats_rna:after, .group .cats_protein:after,
+.group .cats_imaging:after, .group .cats_other:after {
   color: black!important;
 }
+
+/* DNA */
 .cats_dna:after {
   content: "DNA";
   color: #3EACA7;
@@ -35,41 +36,52 @@
   letter-spacing: -2px;
 }
 .group .cats_dna { background-color: #3EACA7; }
-.cats_mrna:after {
-  content: "mRNA";
+
+/* RNA */
+.cats_rna:after {
+  content: "RNA";
   color: #1D818E;
   font-size: 18px;
   letter-spacing: -2px;
 }
-.group .cats_mrna { background-color: #1D818E; }
-.cats_rrna:after {
-  content: "rRNA";
+.group .cats_rna { background-color: #1D818E; }
+
+/* Protein */
+.cats_protein:after {
+  content: "PROT";
   color: #88C796;
   font-size: 18px;
   letter-spacing: -2px;
 }
-.group .cats_rrna { background-color: #88C796; }
-.cats_trna:after {
-  content: "tRNA";
+.group .cats_protein { background-color: #88C796; }
+
+/* Imaging */
+.cats_imaging:after {
+  content: "IMG";
   color: #4DC593;
   font-size: 18px;
   letter-spacing: -2px;
 }
-.group .cats_trna { background-color: #4DC593; }
-.cats_protein:after {
-  content: "PROT";
+.group .cats_imaging { background-color: #4DC593; }
+
+/* Other */
+.cats_other:after {
+  content: "MISC";
   color: #77C5D4;
   font-size: 18px;
   letter-spacing: -2px;
 }
-.group .cats_protein { background-color: #77C5D4; }
-.cats_other:after {
-  content: "MISC";
+.group .cats_other { background-color: #77C5D4; }
+
+/* Unused
+.cats_unused:after {
+  content: "NIL";
   color: #0D5968;
   font-size: 18px;
   letter-spacing: -2px;
 }
-.group .cats_other { background-color: #0D5968; }
+.group .cats_unused { background-color: #0D5968; }
+*/
 
 body {
   width: 100%;

static/styles/oppai/style.css

@@ -6,10 +6,9 @@
 
 /* We're going to opt for the category icon method for now, tags_* is also available */
 .cats_dna { width: 36px; height: 36px; background: url('/static/common/bioicons/dna.png') no-repeat center center; }
-.cats_mrna { width: 36px; height: 36px; background: url('/static/common/bioicons/rna.png') no-repeat center center; }
-.cats_rrna { width: 36px; height: 36px; background: url('/static/common/bioicons/rna.png') no-repeat center center; }
-.cats_trna { width: 36px; height: 36px; background: url('/static/common/bioicons/rna.png') no-repeat center center; }
+.cats_rna { width: 36px; height: 36px; background: url('/static/common/bioicons/rna.png') no-repeat center center; }
 .cats_protein { width: 36px; height: 36px; background: url('/static/common/bioicons/protein.png') no-repeat center center; }
+.cats_imaging { width: 36px; height: 36px; background: url('/static/common/bioicons/imaging.png') no-repeat center center; }
 .cats_other { width: 36px; height: 36px; background: url('/static/common/bioicons/other.png') no-repeat center center; }
 
 /* Global */