Browse Source

A few more tweaks

pjc 5 years ago
parent
commit
12cdef2c0e
3 changed files with 37 additions and 31 deletions
  1. 24
    25
      sections/rules/upload.php
  2. 3
    1
      sections/torrents/details.php
  3. 10
    5
      static/functions/upload.js

+ 24
- 25
sections/rules/upload.php View File

112
             </li>
112
             </li>
113
 
113
 
114
             <li id="r1.1.5"><a href="#h1.1"><strong>&uarr;</strong></a> <a href="#r1.1.5">1.1.5.</a>
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 10 GiB are not allowed.</strong>
115
+              <strong>Archived files in uploads under 5 GiB are not allowed.</strong>
116
               Specific archival rules can be found in their respective sections.
116
               Specific archival rules can be found in their respective sections.
117
             </li>
117
             </li>
118
 
118
 
150
             <li id="r1.2.2"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r1.2.2">1.2.2.</a>
150
             <li id="r1.2.2"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r1.2.2">1.2.2.</a>
151
               <strong>Directories should have meaningful titles.</strong>
151
               <strong>Directories should have meaningful titles.</strong>
152
               "Title - Accession Number" or "Lab - Title."
152
               "Title - Accession Number" or "Lab - Title."
153
-              The minimum acceptable is "Title", although it is preferable to include more information.
153
+              The minimum acceptable is "Title," although it is preferable to include more information.
154
               Uploads that do not follow this rule are trumpable.
154
               Uploads that do not follow this rule are trumpable.
155
             </li>
155
             </li>
156
 
156
 
171
               A torrent with unnecessary nested folders is trumpable by a torrent with such folders removed.
171
               A torrent with unnecessary nested folders is trumpable by a torrent with such folders removed.
172
               For single-part torrents, all files must be included in the main torrent folder.
172
               For single-part torrents, all files must be included in the main torrent folder.
173
               For multi-part torrents, the main torrent folder may include sub-folders that hold the file contents for each of the parts.
173
               For multi-part torrents, the main torrent folder may include sub-folders that hold the file contents for each of the parts.
174
-              Additional folders are unnecessary because they do nothing to improve the organization of the torrent.
175
-              If you are uncertain about what to do for other cases, PM a staff member for guidance.
176
             </li>
174
             </li>
177
 
175
 
178
             <li id="r1.2.6"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r1.2.6">1.2.6.</a>
176
             <li id="r1.2.6"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r1.2.6">1.2.6.</a>
232
 
230
 
233
             <li id="r1.3.5"><a href="#h1.3"><strong>&uarr;</strong></a> <a href="#r1.3.5">1.3.5.</a>
231
             <li id="r1.3.5"><a href="#h1.3"><strong>&uarr;</strong></a> <a href="#r1.3.5">1.3.5.</a>
234
               <strong>Multi-part archives</strong>
232
               <strong>Multi-part archives</strong>
235
-              for torrents under 50 GiB.
233
+              for torrents under 10 GiB.
236
             </li>
234
             </li>
237
           </ul>
235
           </ul>
238
         </div>
236
         </div>
257
 
255
 
258
             <li id="r2.1.3"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.3">2.1.3.</a>
256
             <li id="r2.1.3"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.3">2.1.3.</a>
259
               <strong>Accession Number.</strong>
257
               <strong>Accession Number.</strong>
260
-              For nucleotide and amino acid sequences, ReqSeq database search and metadata autofill is in development.
261
-              You're encouraged to add an accession number whenever the <?= SITE_NAME ?> and NCBI data hashes match.
258
+              For nucleotide, amino acid sequences or whatever number the source repository uses.
259
+              RefSeq and UniProt integration is in development.
260
+              You're encouraged to add an accession number whenever the <?= SITE_NAME ?> and repo data hashes match.
262
             </li>
261
             </li>
263
 
262
 
264
             <li id="r2.1.4"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.4">2.1.4.</a>
263
             <li id="r2.1.4"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.4">2.1.4.</a>
275
 
274
 
276
             <li id="r2.1.6"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.6">2.1.6.</a>
275
             <li id="r2.1.6"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.6">2.1.6.</a>
277
               <strong>Strain/Variety.</strong>
276
               <strong>Strain/Variety.</strong>
278
-              The cultivar's name if known.
277
+              The strain's name if known.
279
             </li>
278
             </li>
280
 
279
 
281
             <li id="r2.1.7"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.7">2.1.7.</a>
280
             <li id="r2.1.7"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.7">2.1.7.</a>
282
               <strong>Authors(s).</strong>
281
               <strong>Authors(s).</strong>
283
               The upload form supports multiple authors per torrent.
282
               The upload form supports multiple authors per torrent.
284
-              Please limit yourself to perhaps the top three authors on the paper announcing the data release.
285
-              Do an author search before uploading so you get their names right.
286
-              ORCiD integration and author info populating is in development.
283
+              Please limit yourself to the top four authors on the paper for the release.
284
+              Do an author search before uploading to get their names right.
285
+              ORCiD integration is in development.
287
             </li>
286
             </li>
288
 
287
 
289
             <li id="r2.1.8"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.8">2.1.8.</a>
288
             <li id="r2.1.8"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.8">2.1.8.</a>
290
               <strong>Department/Lab.</strong>
289
               <strong>Department/Lab.</strong>
291
-              This should correspond to the lab that did the experiments or the last author's home lab.
290
+              The lab that did the experiments or the last author's home lab.
292
               Please use "Unaffiliated" for anonymous or unknown labs.
291
               Please use "Unaffiliated" for anonymous or unknown labs.
293
             </li>
292
             </li>
294
 
293
 
296
               <strong>Location.</strong>
295
               <strong>Location.</strong>
297
               The lab's physical location as City, (State || Country) Postal Code.
296
               The lab's physical location as City, (State || Country) Postal Code.
298
               For example, Berkeley, CA 94720 or Berlin, Germany 10117.
297
               For example, Berkeley, CA 94720 or Berlin, Germany 10117.
299
-              Please use "Unknown" for anonymous or unknown labs.
298
+              Please use "Unknown" if needed.
300
             </li>
299
             </li>
301
 
300
 
302
             <li id="r2.1.10"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.10">2.1.10.</a>
301
             <li id="r2.1.10"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.10">2.1.10.</a>
303
               <strong>Year.</strong>
302
               <strong>Year.</strong>
304
               The year the data was first published.
303
               The year the data was first published.
305
-              It should correspond to the publication announcing the data.
304
+              The publication that announced the data.
306
             </li>
305
             </li>
307
 
306
 
308
             <li id="r2.1.11"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.11">2.1.11.</a>
307
             <li id="r2.1.11"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.11">2.1.11.</a>
309
               <strong>Platform.</strong>
308
               <strong>Platform.</strong>
310
-              The class of technology this data comes from.
309
+              The class of technology the data comes from.
311
               What sequencing or imaging technique is it the output of?
310
               What sequencing or imaging technique is it the output of?
312
-              Please post in <a href="forums.php?action=viewforum&forumid=<?= SUGGESTIONS_FORUM_ID ?>">the suggestions forum</a>
311
+              <a href="forums.php?action=viewforum&forumid=<?= SUGGESTIONS_FORUM_ID ?>">Please post in the suggestions forum</a>
313
               if you'd like to request a new platform.
312
               if you'd like to request a new platform.
314
-              Note that the available platforms change for the Imaging category.
313
+              Note that the platforms change for the Imaging category.
315
             </li>
314
             </li>
316
 
315
 
317
             <li id="r2.1.12"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.12">2.1.12.</a>
316
             <li id="r2.1.12"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.12">2.1.12.</a>
318
               <strong>Format.</strong>
317
               <strong>Format.</strong>
319
               The file format of the data itself.
318
               The file format of the data itself.
320
               What programs do you need to work with the data?
319
               What programs do you need to work with the data?
321
-              Please post in <a href="forums.php?action=viewforum&forumid=<?= SUGGESTIONS_FORUM_ID ?>">the suggestions forum</a>
320
+              <a href="forums.php?action=viewforum&forumid=<?= SUGGESTIONS_FORUM_ID ?>">Please post in the suggestions forum</a>
322
               if you'd like to request a new format.
321
               if you'd like to request a new format.
323
-              Note that the available formats change for the Imaging category.
322
+              Note that the formats change for the Imaging category.
324
             </li>
323
             </li>
325
 
324
 
326
             <li id="r2.1.13"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.13">2.1.13.</a>
325
             <li id="r2.1.13"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.13">2.1.13.</a>
335
               <strong>License.</strong>
334
               <strong>License.</strong>
336
               <?= SITE_NAME ?> only allows permissive licenses.
335
               <?= SITE_NAME ?> only allows permissive licenses.
337
               If your data is original, please consider licensing it under the available options.
336
               If your data is original, please consider licensing it under the available options.
338
-              The "Unknown" option is to be compatible with web releases.
337
+              The "Unknown" option is for compatibility with existing web releases.
339
             </li>
338
             </li>
340
 
339
 
341
             <li id="r2.1.15"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.15">2.1.15.</a>
340
             <li id="r2.1.15"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.15">2.1.15.</a>
342
               <strong>Tags.</strong>
341
               <strong>Tags.</strong>
343
               Please select at least five appropriate tags.
342
               Please select at least five appropriate tags.
344
-              Don't use irrelevant tags and consider making new tags a last resort.
345
-              Please post in <a href="forums.php?action=viewforum&forumid=<?= SUGGESTIONS_FORUM_ID ?>">the suggestions forum</a>
343
+              Don't use irrelevant tags, and consider making new tags a last resort.
344
+              <a href="forums.php?action=viewforum&forumid=<?= SUGGESTIONS_FORUM_ID ?>">Please post in the suggestions forum</a>
346
               if you'd like to request a new official tag.
345
               if you'd like to request a new official tag.
347
             </li>
346
             </li>
348
 
347
 
349
             <li id="r2.1.16"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.16">2.1.16.</a>
348
             <li id="r2.1.16"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.16">2.1.16.</a>
350
               <strong>Picture.</strong>
349
               <strong>Picture.</strong>
351
               Please upload a meaningful picture, especially if you plan to add the torrent to a collection.
350
               Please upload a meaningful picture, especially if you plan to add the torrent to a collection.
352
-              This can be a photo of the specimen sequenced or a representative photo of the organism; a sample from an imaging dataset;
351
+              A photo of the specimen sequenced or a representative photo of the organism; a sample from an imaging dataset;
353
               a screenshot of a useful table from the publication; or another similarly informative picture.
352
               a screenshot of a useful table from the publication; or another similarly informative picture.
354
             </li>
353
             </li>
355
 
354
 
356
             <li id="r2.1.17"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.17">2.1.17.</a>
355
             <li id="r2.1.17"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.17">2.1.17.</a>
357
               <strong>Publications.</strong>
356
               <strong>Publications.</strong>
358
-              Up to 10 publications may be uploaded to a group.
359
-              You technically shouldn't be able to upload more than that anyway.
360
               DOI numbers should be well-formed, one per line.
357
               DOI numbers should be well-formed, one per line.
361
               The upload system currently discards malformed DOI numbers instead of extracting them from arbitrary strings.
358
               The upload system currently discards malformed DOI numbers instead of extracting them from arbitrary strings.
359
+              If your research is a URI, please use the Torrent Group Description field.
360
+              10 publication limit.
362
             </li>
361
             </li>
363
 
362
 
364
             <li id="r2.1.18"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.18">2.1.18.</a>
363
             <li id="r2.1.18"><a href="#h2.1"><strong>&uarr;</strong></a> <a href="#r2.1.18">2.1.18.</a>

+ 3
- 1
sections/torrents/details.php View File

848
 ?>
848
 ?>
849
       </div>
849
       </div>
850
       <div class="body torrent_screenshots">
850
       <div class="body torrent_screenshots">
851
-        <p>Sci-Hub links open in a new tab. Image proxy integration is coming soon.</p>
851
+        <?php if (!empty($Screenshots)) {
852
+    echo '<p>Sci-Hub links open in a new tab. Image proxy integration is coming soon.</p>';
853
+} ?>
852
         <ul>
854
         <ul>
853
 <?php
855
 <?php
854
     foreach ($Screenshots as $Screenshot) {
856
     foreach ($Screenshots as $Screenshot) {

+ 10
- 5
static/functions/upload.js View File

18
       'series': {},
18
       'series': {},
19
       'media': {},
19
       'media': {},
20
       'container': {},
20
       'container': {},
21
-      'codec': {},
22
       'resolution': {},
21
       'resolution': {},
22
+      'archive': {},
23
+      'codec': {},
23
       'screenshots': {},
24
       'screenshots': {},
24
       'group_desc': {},
25
       'group_desc': {},
25
       'release_desc': {}
26
       'release_desc': {}
30
       'series': {},
31
       'series': {},
31
       'media': {},
32
       'media': {},
32
       'container': {},
33
       'container': {},
33
-      'codec': {},
34
       'resolution': {},
34
       'resolution': {},
35
+      'archive': {},
36
+      'codec': {},
35
       'screenshots': {},
37
       'screenshots': {},
36
       'group_desc': {},
38
       'group_desc': {},
37
       'release_desc': {}
39
       'release_desc': {}
42
       'series': {},
44
       'series': {},
43
       'media': {},
45
       'media': {},
44
       'container': {},
46
       'container': {},
45
-      'codec': {},
46
       'resolution': {},
47
       'resolution': {},
48
+      'archive': {},
49
+      'codec': {},
47
       'screenshots': {},
50
       'screenshots': {},
48
       'group_desc': {},
51
       'group_desc': {},
49
       'release_desc': {}
52
       'release_desc': {}
54
       'series': {},
57
       'series': {},
55
       'media_manga': {},
58
       'media_manga': {},
56
       'container_games': {},
59
       'container_games': {},
57
-      'codec': {},
58
       'resolution': {},
60
       'resolution': {},
61
+      'archive': {},
62
+      'codec': {},
59
       'screenshots': {},
63
       'screenshots': {},
60
       'group_desc': {},
64
       'group_desc': {},
61
       'release_desc': {}
65
       'release_desc': {}
66
       'series': {},
70
       'series': {},
67
       'media': {},
71
       'media': {},
68
       'container': {},
72
       'container': {},
69
-      'codec': {},
70
       'resolution': {},
73
       'resolution': {},
74
+      'archive': {},
75
+      'codec': {},
71
       'screenshots': {},
76
       'screenshots': {},
72
       'group_desc': {},
77
       'group_desc': {},
73
       'release_desc': {}
78
       'release_desc': {}

Loading…
Cancel
Save