Browse Source

Minor updates

pjc 5 years ago
parent
commit
10533348ec
3 changed files with 64 additions and 37 deletions
  1. 1
    1
      design/privateheader.php
  2. 2
    2
      sections/rules/upload.php
  3. 61
    34
      sections/torrents/browse.php

+ 1
- 1
design/privateheader.php View File

@@ -168,7 +168,7 @@ if ($NotificationsManager->is_skipped(NotificationsManager::SUBSCRIPTIONS)) {
168 168
           </li>
169 169
           <li id="nav_irc"<?=
170 170
             Format::add_class($PageID, ['chat'], 'active', true)?>>
171
-            <a href="https://biotorrents.slack.com" target="_blank">Slack</a>
171
+            <a href="https://join.slack.com/t/biotorrents/shared_invite/<?=SLACK_INVITE?>" target="_blank">Slack</a>
172 172
           </li>
173 173
           <li id="nav_top10"<?=
174 174
             Format::add_class($PageID, ['top10'], 'active', true)?>>

+ 2
- 2
sections/rules/upload.php View File

@@ -43,7 +43,7 @@ View::show_header('Uploading Rules', 'rules');
43 43
       <h4 id="Intro"><a href="#Introk"><strong>&uarr;</strong></a> Introduction</h4>
44 44
         <div class="box pad" style="padding: 10px 10px 10px 20px;">
45 45
         <p>
46
-          <?= SITE_NAME ?> is the global DIYbio community's distrubuted data repository.
46
+          <?= SITE_NAME ?> is the global DIYbio community's distributed data repository.
47 47
           The content includes richly annotated and searchable biological sequence and medical imaging data.
48 48
           It follows the example of private BitTorrent sites to
49 49
           <a href="https://www.cambridge.org/core/services/aop-cambridge-core/content/view/2F379FE0CB50DF502F0075119FD3E060/S1744137417000650a.pdf/institutional_solutions_to_freeriding_in_peertopeer_networks_a_case_study_of_online_pirate_communities.pdf" target="_blank">address the free-rider problem</a>
@@ -112,7 +112,7 @@ View::show_header('Uploading Rules', 'rules');
112 112
             </li>
113 113
 
114 114
             <li id="r1.1.5"><a href="#h1.1"><strong>&uarr;</strong></a> <a href="#r1.1.5">1.1.5.</a>
115
-              <strong>Archived files in uploads under 5 GiB are not allowed.</strong>
115
+              <strong>Archived files in uploads under 2 GiB are not allowed.</strong>
116 116
               Specific archival rules can be found in their respective sections.
117 117
             </li>
118 118
 

+ 61
- 34
sections/torrents/browse.php View File

@@ -166,36 +166,34 @@ View::show_header('Browse Torrents', 'browse');
166 166
     <svg title="Your profile settings exclude some results" class="search_warning tooltip" width="10" height="15"><rect x=3 width="4" height="10" rx="2" ry="2"/><circle cx="5" cy="13" r="2"/></svg>
167 167
 <?php } ?>
168 168
       <table class="layout">
169
-        <tr id="artist_name" class="ftr_advanced<?=$HideAdvanced?>">
170
-          <td class="label"><!--Artist name:--></td>
171
-          <td class="ft_artistname">
172
-            <input type="search" spellcheck="false" size="65" name="artistname" class="inputtext smaller fti_advanced" placeholder="Author Name" value="<?Format::form('artistname')?>" />
169
+      <tr id="catalogue_number" class="ftr_advanced<?=$HideAdvanced?>">
170
+          <td class="label"><!--Catalogue number:--></td>
171
+          <td class="ft_cataloguenumber">
172
+            <input type="search" size="19" name="cataloguenumber" class="inputtext smallest fti_advanced" placeholder="Accession Number" value="<?Format::form('cataloguenumber')?>" />
173 173
           </td>
174 174
         </tr>
175
-        <tr id="album_torrent_name" class="ftr_advanced<?=$HideAdvanced?>">
175
+
176
+      <tr id="album_torrent_name" class="ftr_advanced<?=$HideAdvanced?>">
176 177
           <td class="label"><!--Torrent name:--></td>
177 178
           <td class="ft_groupname">
178 179
             <input type="search" spellcheck="false" size="65" name="advgroupname" class="inputtext smaller fti_advanced" placeholder="Torrent Title" value="<?Format::form('advgroupname')?>" />
179 180
           </td>
180 181
         </tr>
181
-        <tr id="catalogue_number" class="ftr_advanced<?=$HideAdvanced?>">
182
-          <td class="label"><!--Catalogue number:--></td>
183
-          <td class="ft_cataloguenumber">
184
-            <input type="search" size="19" name="cataloguenumber" class="inputtext smallest fti_advanced" placeholder="Accession Number" value="<?Format::form('cataloguenumber')?>" />
182
+
183
+        <tr id="artist_name" class="ftr_advanced<?=$HideAdvanced?>">
184
+          <td class="label"><!--Artist name:--></td>
185
+          <td class="ft_artistname">
186
+            <input type="search" spellcheck="false" size="65" name="artistname" class="inputtext smaller fti_advanced" placeholder="Author Name" value="<?Format::form('artistname')?>" />
185 187
           </td>
186 188
         </tr>
189
+
187 190
         <tr id="year" class="ftr_advanced<?=$HideAdvanced?>">
188 191
           <td class="label"><!--Year:--></td>
189 192
           <td class="ft_year">
190 193
             <input type="search" name="year" class="inputtext smallest fti_advanced" placeholder="Year" value="<?Format::form('year')?>" size="12" />
191 194
           </td>
192 195
         </tr>
193
-        <tr id="file_list" class="ftr_advanced<?=$HideAdvanced?>">
194
-          <td class="label"><!--File list:--></td>
195
-          <td class="ft_filelist">
196
-            <input type="search" spellcheck="false" size="65" name="filelist" class="inputtext fti_advanced" placeholder="File List" value="<?Format::form('filelist')?>" />
197
-          </td>
198
-        </tr>
196
+
199 197
         <tr id="torrent_description" class="ftr_advanced<?=$HideAdvanced?>">
200 198
           <td class="label"><!--<span title="Search torrent descriptions (not group information)" class="tooltip">Torrent description:</span>--></td>
201 199
           <td class="ft_description">
@@ -203,39 +201,60 @@ View::show_header('Browse Torrents', 'browse');
203 201
             Search torrent descriptions (not group information)
204 202
           </td>
205 203
         </tr>
204
+
205
+        <tr id="file_list" class="ftr_advanced<?=$HideAdvanced?>">
206
+          <td class="label"><!--File list:--></td>
207
+          <td class="ft_filelist">
208
+            <input type="search" spellcheck="false" size="65" name="filelist" class="inputtext fti_advanced" placeholder="File List" value="<?Format::form('filelist')?>" />
209
+          </td>
210
+        </tr>
211
+
206 212
         <tr id="rip_specifics" class="ftr_advanced<?=$HideAdvanced?>">
207 213
           <td class="label">Specifics</td>
208 214
           <td class="nobr ft_ripspecifics">
215
+          
216
+          <select name="media" class="ft_media fti_advanced">
217
+              <option value="">Seq Platform</option>
218
+  <?php  foreach ($Media as $MediaName) { ?>
219
+              <option value="<?=display_str($MediaName); ?>"<?Format::selected('media', $MediaName)?>><?=display_str($MediaName); ?></option>
220
+  <?php  } ?>
221
+            </select>
222
+
209 223
             <select id="container" name="container" class="ft_container fti_advanced">
210
-              <option value="">Format</option>
224
+              <option value="">Seq Format</option>
211 225
   <?php  foreach ($Containers as $Container) { ?>
212 226
               <option value="<?=display_str($Container);?>" <?Format::selected('container', $Container)?>><?=display_str($Container);?></option>
213 227
   <?php  } ?>
214 228
             </select>
215
-            <select name="codec" class="ft_codec fti_advanced">
216
-              <option value="">License</option>
217
-  <?php  foreach ($Codecs as $Codec) { ?>
218
-              <option value="<?=display_str($Codec); ?>"<?Format::selected('codec', $Codec)?>><?=display_str($Codec); ?></option>
219
-  <?php  } ?>
220
-            </select>
229
+
221 230
             <select name="media" class="ft_media fti_advanced">
222
-              <option value="">Platform</option>
223
-  <?php  foreach ($Media as $MediaName) { ?>
231
+              <option value="">Img Platform</option>
232
+  <?  foreach ($MediaManga as $MediaName) { ?>
224 233
               <option value="<?=display_str($MediaName); ?>"<?Format::selected('media', $MediaName)?>><?=display_str($MediaName); ?></option>
234
+  <?  } ?>
235
+            </select>
236
+
237
+            <select id="container" name="container" class="ft_container fti_advanced">
238
+              <option value="">Img Format</option>
239
+  <?php  foreach ($ContainersGames as $Container) { ?>
240
+              <option value="<?=display_str($Container);?>" <?Format::selected('container', $Container)?>><?=display_str($Container);?></option>
225 241
   <?php  } ?>
226 242
             </select>
227
-            <select name="resolution" class="ft_resolution fti_advanced">
228
-              <option value="">Assembly Level</option>
229
-  <?php  foreach ($Resolutions as $Resolution) { ?>
230
-              <option value="<?=display_str($Resolution); ?>"<?Format::selected('resolution', $Resolution)?>><?=display_str($Resolution); ?></option>
243
+
244
+            <select name="codec" class="ft_codec fti_advanced">
245
+              <option value="">License</option>
246
+  <?php  foreach ($Codecs as $Codec) { ?>
247
+              <option value="<?=display_str($Codec); ?>"<?Format::selected('codec', $Codec)?>><?=display_str($Codec); ?></option>
231 248
   <?php  } ?>
232 249
             </select>
250
+
251
+            
233 252
           </td>
234 253
         </tr>
235 254
         <tr id="size" class="ftr_advanced<?=$HideAdvanced?>">
236 255
           <td class="label">Size</td>
237 256
           <td class="ft_size">
238
-            <input type="size_min" spellcheck="false" size="6" name="size_min" class="inputtext smaller fti_advanced" placeholder="Min" value="<?Format::form('size_min')?>" /> -
257
+            <input type="size_min" spellcheck="false" size="6" name="size_min" class="inputtext smaller fti_advanced" placeholder="Min" value="<?Format::form('size_min')?>" /> &ndash;
239 258
             <input type="size_max" spellcheck="false" size="6" name="size_max" class="inputtext smaller fti_advanced" placeholder="Max" value="<?Format::form('size_max')?>" />
240 259
             <select name="size_unit" class="ft_size fti_advanced">
241 260
               <option value="">Unit</option>
@@ -250,6 +269,19 @@ View::show_header('Browse Torrents', 'browse');
250 269
         <tr id="misc" class="ftr_advanced<?=$HideAdvanced?>">
251 270
           <td class="label">Misc</td>
252 271
           <td class="nobr ft_misc">
272
+          <select name="resolution" class="ft_resolution fti_advanced">
273
+              <option value="">Assembly Level</option>
274
+  <?php  foreach ($Resolutions as $Resolution) { ?>
275
+              <option value="<?=display_str($Resolution); ?>"<?Format::selected('resolution', $Resolution)?>><?=display_str($Resolution); ?></option>
276
+  <?php  } ?>
277
+            </select>
278
+
279
+            <select name="censored" class="ft_censored fti_advanced">
280
+              <option value="">Alignment</option>
281
+              <option value="1"<?Format::selected('censored', 1)?>>Aligned</option>
282
+              <option value="0"<?Format::selected('censored', 0)?>>Unaligned</option>
283
+            </select>
284
+
253 285
             <select name="freetorrent" class="ft_freetorrent fti_advanced">
254 286
               <option value="">Leech Status</option>
255 287
               <option value="1"<?Format::selected('freetorrent', 1)?>>Freeleech</option>
@@ -257,11 +289,6 @@ View::show_header('Browse Torrents', 'browse');
257 289
               <option value="3"<?Format::selected('freetorrent', 3)?>>Either</option>
258 290
               <option value="0"<?Format::selected('freetorrent', 0)?>>Normal</option>
259 291
             </select>
260
-            <select name="censored" class="ft_censored fti_advanced">
261
-              <option value="">Alignment</option>
262
-              <option value="1"<?Format::selected('censored', 1)?>>Aligned</option>
263
-              <option value="0"<?Format::selected('censored', 0)?>>Unaligned</option>
264
-            </select>
265 292
           </td>
266 293
         </tr>
267 294
         <tr id="search_terms" class="ftr_basic<?=$HideBasic?>">

Loading…
Cancel
Save