Browse Source

Many small pre-update fixes

biotorrents 3 years ago
parent
commit
34a2337a54

+ 12
- 3
classes/config.template.php View File

55
 ENV::setPub(
55
 ENV::setPub(
56
     'SITE_NAME',
56
     'SITE_NAME',
57
     (!$ENV->DEV
57
     (!$ENV->DEV
58
-        ? 'BioTorrents.de' # Production
59
-        : '[Dev] BioTorrents.de') # Development
58
+        ? 'torrents.bio' # Production
59
+        : 'dev.torrents.bio') # Development
60
 );
60
 );
61
 
61
 
62
 # Meta description
62
 # Meta description
63
 ENV::setPub('DESCRIPTION', 'A platform to share biological sequence and medical imaging data');
63
 ENV::setPub('DESCRIPTION', 'A platform to share biological sequence and medical imaging data');
64
 
64
 
65
 # Navigation glyphs
65
 # Navigation glyphs
66
-ENV::setPub('SEP', ''); # e.g., News ⸬ BioTorrents.de
66
+ENV::setPub('SEP', '-'); # e.g., News ⸬ BioTorrents.de
67
 ENV::setPub('CRUMB', '›'); # e.g., Forums › Board › Thread
67
 ENV::setPub('CRUMB', '›'); # e.g., Forums › Board › Thread
68
 
68
 
69
 # The FQDN of your site, e.g., dev.biotorrents.de
69
 # The FQDN of your site, e.g., dev.biotorrents.de
80
         : 'dev.biotorrents.de') # Development
80
         : 'dev.biotorrents.de') # Development
81
 );
81
 );
82
 
82
 
83
+# Old domain, to handle the biotorrents.de => torrents.bio migration
84
+# If not needed, simply set to the same values as $ENV->SITE_DOMAIN
85
+ENV::setPub(
86
+    'OLD_SITE_DOMAIN',
87
+    (!$ENV->DEV
88
+        ? 'biotorrents.de' # Production
89
+        : 'dev.biotorrents.de') # Development
90
+);
91
+
83
 # The FQDN of your image host, e.g., pics.biotorrents.de
92
 # The FQDN of your image host, e.g., pics.biotorrents.de
84
 ENV::setPub('IMAGE_DOMAIN', 'pics.biotorrents.de');
93
 ENV::setPub('IMAGE_DOMAIN', 'pics.biotorrents.de');
85
 
94
 

+ 2
- 1
classes/security.class.php View File

21
     {
21
     {
22
         foreach ($IDs as $ID) {
22
         foreach ($IDs as $ID) {
23
             if (!ID || !is_int($ID) || $ID < 1) {
23
             if (!ID || !is_int($ID) || $ID < 1) {
24
-                error("Expected an integer > 1, got $ID in Security::checkInt.");
24
+                return "Expected an integer > 1, got $ID in Security::checkInt.";
25
+                #error("Expected an integer > 1, got $ID in Security::checkInt.");
25
             }
26
             }
26
         }
27
         }
27
 
28
 

+ 1
- 1
classes/text.class.php View File

137
     public function fix_links($Parsed) {
137
     public function fix_links($Parsed) {
138
             # Replace links to $ENV->SITE_DOMAIN
138
             # Replace links to $ENV->SITE_DOMAIN
139
             $Parsed = preg_replace(
139
             $Parsed = preg_replace(
140
-                "/<a href=\"$ENV->RESOURCE_REGEX$ENV->SITE_DOMAIN\//",
140
+                "/<a href=\"$ENV->RESOURCE_REGEX($ENV->SITE_DOMAIN|$ENV->OLD_SITE_DOMAIN)\//",
141
                 '<a href="/',
141
                 '<a href="/',
142
                 $Parsed
142
                 $Parsed
143
             );
143
             );

+ 6
- 1
classes/util.php View File

508
         $response = ['status' => $Status, 'response' => []];
508
         $response = ['status' => $Status, 'response' => []];
509
     }
509
     }
510
 
510
 
511
-    print(json_encode(add_json_info($response)));
511
+    print(
512
+        json_encode(
513
+            add_json_info($response),
514
+            JSON_UNESCAPED_SLASHES
515
+        )
516
+    );
512
 }
517
 }
513
 
518
 
514
 /**
519
 /**

+ 3
- 1
design/privateheader.php View File

333
             size="17">
333
             size="17">
334
         </form>
334
         </form>
335
 
335
 
336
+        <!--
336
         <form class="search_form" name="artists" action="artist.php" method="get">
337
         <form class="search_form" name="artists" action="artist.php" method="get">
337
-          <input id="artistsearch" <?=Users::has_autocomplete_enabled('search')?>
338
+          <input id="artistsearch" <?=null#Users::has_autocomplete_enabled('search')?>
338
           aria-label="Search authors" accesskey="a" spellcheck="false" autocomplete="off" placeholder="Authors"
339
           aria-label="Search authors" accesskey="a" spellcheck="false" autocomplete="off" placeholder="Authors"
339
           type="text" name="artistname" size="17">
340
           type="text" name="artistname" size="17">
340
         </form>
341
         </form>
342
+          -->
341
 
343
 
342
         <form class="search_form" name="requests" action="requests.php" method="get">
344
         <form class="search_form" name="requests" action="requests.php" method="get">
343
           <input id="requestssearch" aria-label="Search requests" spellcheck="false" autocomplete="off"
345
           <input id="requestssearch" aria-label="Search requests" spellcheck="false" autocomplete="off"

+ 1
- 1
readme.md View File

25
 with the appropriate bold/italic glyphs and monospace.
25
 with the appropriate bold/italic glyphs and monospace.
26
 These options are available to every theme.
26
 These options are available to every theme.
27
 Font Awesome 5 is also universally available.
27
 Font Awesome 5 is also universally available.
28
-[Download the fonts](https://docs.biotorrents.de/dl/fonts.tgz).
28
+[Download the fonts](https://torrents.bio/fonts.tgz).
29
 
29
 
30
 ## Markdown support
30
 ## Markdown support
31
 
31
 

+ 10
- 10
sections/api/torrents/group.php View File

81
     'id'            => (int) $TorrentDetails['id'],
81
     'id'            => (int) $TorrentDetails['id'],
82
     'identifier'    => $TorrentDetails['identifier'],
82
     'identifier'    => $TorrentDetails['identifier'],
83
 
83
 
84
-    'category_id'   => (int) $TorrentDetails['category_id'],
85
-    'category_name' => $CategoryName,
84
+    'categoryId'   => (int) $TorrentDetails['category_id'],
85
+    'categoryName' => $CategoryName,
86
 
86
 
87
     'title'         => $TorrentDetails['title'],
87
     'title'         => $TorrentDetails['title'],
88
     'subject'       => $TorrentDetails['subject'],
88
     'subject'       => $TorrentDetails['subject'],
89
     'object'        => $TorrentDetails['object'],
89
     'object'        => $TorrentDetails['object'],
90
 
90
 
91
     'authors'       => $Artists,
91
     'authors'       => $Artists,
92
-    'published'     => (int) $TorrentDetails['published'],
92
+    'year'          => (int) $TorrentDetails['year'],
93
     'workgroup'     => $TorrentDetails['workgroup'],
93
     'workgroup'     => $TorrentDetails['workgroup'],
94
     'location'      => $TorrentDetails['location'],
94
     'location'      => $TorrentDetails['location'],
95
 
95
 
99
     'description'   => $TorrentDetails['description'],
99
     'description'   => $TorrentDetails['description'],
100
    #'description'   => Text::full_format($TorrentDetails['description']),
100
    #'description'   => Text::full_format($TorrentDetails['description']),
101
     'picture'       => $TorrentDetails['picture'],
101
     'picture'       => $TorrentDetails['picture'],
102
-    'tag_list'      => $TagList,
102
+    'tagList'      => $TagList,
103
 
103
 
104
     'bookmarked'    => Bookmarks::has_bookmarked('torrent', $GroupID),
104
     'bookmarked'    => Bookmarks::has_bookmarked('torrent', $GroupID),
105
     'timestamp'     => $TorrentDetails['timestamp'],
105
     'timestamp'     => $TorrentDetails['timestamp'],
128
     # todo: Update DB schema
128
     # todo: Update DB schema
129
     $JsonTorrentList[] = [
129
     $JsonTorrentList[] = [
130
         'id'           => (int) $Torrent['ID'],
130
         'id'           => (int) $Torrent['ID'],
131
-        'info_hash'    => $Torrent['InfoHash'],
131
+        'infoHash'    => $Torrent['InfoHash'],
132
         'description'  => $Torrent['Description'],
132
         'description'  => $Torrent['Description'],
133
 
133
 
134
         'platform'     => $Torrent['Media'],
134
         'platform'     => $Torrent['Media'],
139
 
139
 
140
         'size'         => (int) $Torrent['Size'],
140
         'size'         => (int) $Torrent['Size'],
141
         'archive'      => $Torrent['Archive'],
141
         'archive'      => $Torrent['Archive'],
142
-        'file_count'   => (int) $Torrent['FileCount'],
143
-        'file_path'    => $Torrent['FilePath'],
144
-        'file_list'    => $FileList,
142
+        'fileCount'   => (int) $Torrent['FileCount'],
143
+        'filePath'    => $Torrent['FilePath'],
144
+        'fileList'    => $FileList,
145
 
145
 
146
         'seeders'      => (int) $Torrent['Seeders'],
146
         'seeders'      => (int) $Torrent['Seeders'],
147
         'leechers'     => (int) $Torrent['Leechers'],
147
         'leechers'     => (int) $Torrent['Leechers'],
148
         'snatched'     => (int) $Torrent['Snatched'],
148
         'snatched'     => (int) $Torrent['Snatched'],
149
-        'free_torrent' => ($Torrent['FreeTorrent'] === 1),
149
+        'freeTorrent' => ($Torrent['FreeTorrent'] === 1),
150
 
150
 
151
         'reported'     => (bool) $Torrent['Reported'],
151
         'reported'     => (bool) $Torrent['Reported'],
152
         'time'         => $Torrent['Time'],
152
         'time'         => $Torrent['Time'],
153
 
153
 
154
-        'user_id'      => (int) ($Torrent['Anonymous'] ? 0 : $Torrent['UserID']),
154
+        'userId'      => (int) ($Torrent['Anonymous'] ? 0 : $Torrent['UserID']),
155
         'username'     => ($Torrent['Anonymous'] ? 'Anonymous' : $Userinfo['Username']),
155
         'username'     => ($Torrent['Anonymous'] ? 'Anonymous' : $Userinfo['Username']),
156
     ];
156
     ];
157
 }
157
 }

+ 5
- 5
sections/api/torrents/torrent.php View File

1
 <?php
1
 <?php
2
-declare(strict_types=1);
2
+#declare(strict_types=1);
3
 
3
 
4
 require_once SERVER_ROOT.'/sections/torrents/functions.php';
4
 require_once SERVER_ROOT.'/sections/torrents/functions.php';
5
 
5
 
54
   'subject'     => $TorrentDetails['subject'],
54
   'subject'     => $TorrentDetails['subject'],
55
   'object'       => $TorrentDetails['object'],
55
   'object'       => $TorrentDetails['object'],
56
   'authors'      => $Artists,
56
   'authors'      => $Artists,
57
-  'published'         => (int) $TorrentDetails['published'],
57
+  'year'         => (int) $TorrentDetails['published'],
58
   'identifier'    => $TorrentDetails['identifier'],
58
   'identifier'    => $TorrentDetails['identifier'],
59
-  'category_id'   => (int) $TorrentDetails['category_id'],
60
-  'icategory_name' => $CategoryName,
59
+  'categoryId'   => (int) $TorrentDetails['category_id'],
60
+  'icategoryName' => $CategoryName,
61
   'timestamp'         => $TorrentDetails['timestamp'],
61
   'timestamp'         => $TorrentDetails['timestamp'],
62
   'bookmarked' => Bookmarks::has_bookmarked('torrent', $GroupID),
62
   'bookmarked' => Bookmarks::has_bookmarked('torrent', $GroupID),
63
-  'tag_list'         => $TagList
63
+  'tagList'         => $TagList
64
 ];
64
 ];
65
 
65
 
66
 $Torrent = $TorrentList[$TorrentID];
66
 $Torrent = $TorrentList[$TorrentID];

+ 1
- 1
sections/forums/search.php View File

229
     </tr>
229
     </tr>
230
     <tr>
230
     <tr>
231
       <td colspan="2" class="center">
231
       <td colspan="2" class="center">
232
-        <input type="submit" value="Search" />
232
+        <input type="submit" class="button-primary" value="Search" />
233
       </td>
233
       </td>
234
     </tr>
234
     </tr>
235
     </table>
235
     </table>

+ 1
- 1
sections/torrents/functions.php View File

81
           `id`,
81
           `id`,
82
           `user_id`,
82
           `user_id`,
83
           `timestamp`,
83
           `timestamp`,
84
-          `resource`
84
+          `uri`
85
         FROM
85
         FROM
86
           `torrents_mirrors`
86
           `torrents_mirrors`
87
         WHERE
87
         WHERE

+ 1
- 1
sections/upload/upload_handle.php View File

710
     foreach ($Mirrors as $Mirror) {
710
     foreach ($Mirrors as $Mirror) {
711
         $DB->query(
711
         $DB->query(
712
             "
712
             "
713
-        INSERT INTO torrents_mirrors
713
+        INSERT INTO `torrents_mirrors`
714
           (`torrent_id`, `user_id`, `timestamp`, `uri`)
714
           (`torrent_id`, `user_id`, `timestamp`, `uri`)
715
         VALUES (?, ?, NOW(), ?)",
715
         VALUES (?, ?, NOW(), ?)",
716
             $TorrentID,
716
             $TorrentID,

+ 2
- 2
sections/user/edit.php View File

156
           </li>
156
           </li>
157
 
157
 
158
           <li>
158
           <li>
159
-            <input type="submit" id="submit" value="Save profile" />
159
+            <input type="submit" id="submit" class="button-primary" value="Save profile" />
160
           </li>
160
           </li>
161
 
161
 
162
         </ul>
162
         </ul>
313
           <td>
313
           <td>
314
             <label>
314
             <label>
315
               <input type="checkbox" name="autoload_comm_stats" <?Format::selected(
315
               <input type="checkbox" name="autoload_comm_stats" <?Format::selected(
316
-              'AutoloadCommStats' ,
316
+              'AutoloadCommStats',
317
               1,
317
               1,
318
               'checked',
318
               'checked',
319
               $SiteOptions
319
               $SiteOptions

+ 69
- 108
static/styles/beluga/scss/beluga.scss View File

3
     padding: 0;
3
     padding: 0;
4
 }
4
 }
5
 
5
 
6
-.cats_sequences,
7
-.cats_graphs,
8
-.cats_systems,
9
-.cats_geometric,
10
-.cats_scalars\/vectors,
11
-.cats_patterns,
12
-.cats_constraints,
13
-.cats_images,
14
-.cats_spatial,
15
-.cats_models,
16
-.cats_documents,
17
-.cats_machinedata {
18
-    width: 38px !important;
19
-    height: 38px !important;
20
-    line-height: 38px;
21
-}
22
-
23
-.cats_sequences:after {
24
-    content: "SEQ";
25
-    color: #3eaca7;
26
-    font-size: 18px;
27
-    letter-spacing: -2px;
28
-}
29
-
30
-.cats_graphs:after {
31
-    content: "GRF";
32
-    color: #1d818e;
33
-    font-size: 18px;
34
-    letter-spacing: -2px;
35
-}
36
-
37
-.cats_systems:after {
38
-    content: "SYS";
39
-    color: #88c796;
40
-    font-size: 18px;
41
-    letter-spacing: -2px;
42
-}
43
-
44
-.cats_geometric:after {
45
-    content: "GEO";
46
-    color: #4dc593;
47
-    font-size: 18px;
48
-    letter-spacing: -2px;
49
-}
50
-
51
-.cats_scalars\/vectors:after {
52
-    content: "MC2";
53
-    color: #77c5d4;
54
-    font-size: 18px;
55
-    letter-spacing: -2px;
56
-}
57
-
58
-.cats_patterns:after {
59
-    content: "PAT";
60
-    color: #0d5968;
61
-    font-size: 18px;
62
-    letter-spacing: -2px;
63
-}
64
-
65
-.cats_constraints:after {
66
-    content: "CNST";
67
-    color: #3eaca7;
68
-    font-size: 18px;
69
-    letter-spacing: -2px;
70
-}
71
-
72
-.cats_images:after {
73
-    content: "IMG";
74
-    color: #1d818e;
75
-    font-size: 18px;
76
-    letter-spacing: -2px;
77
-}
78
-
79
-.cats_spatial:after {
80
-    content: "SPTL";
81
-    color: #88c796;
82
-    font-size: 18px;
83
-    letter-spacing: -2px;
84
-}
85
-
86
-.cats_models:after {
87
-    content: "MOD";
88
-    color: #4dc593;
89
-    font-size: 18px;
90
-    letter-spacing: -2px;
91
-}
92
-
93
-.cats_documents:after {
94
-    content: "DOC";
95
-    color: #77c5d4;
96
-    font-size: 18px;
97
-    letter-spacing: -2px;
98
-}
99
-
100
-.cats_machinedata:after {
101
-    content: "RAW";
102
-    color: #0d5968;
103
-    font-size: 18px;
104
-    letter-spacing: -2px;
105
-}
106
-
107
 body {
6
 body {
108
     width: 100%;
7
     width: 100%;
109
     font-family: "Open Sans", Helvetica, Arial, Tahoma, sans-serif;
8
     font-family: "Open Sans", Helvetica, Arial, Tahoma, sans-serif;
197
     color: #fff;
96
     color: #fff;
198
 }
97
 }
199
 
98
 
99
+/* Buttons */
100
+button:not(.editor-toolbar button),
101
+input[type="button"],
102
+input[type="submit"] {
103
+    background: change-color(whitesmoke, $alpha: 0.75);
104
+    color: black;
105
+    border: 1px solid #bbb;
106
+
107
+    &.button-primary {
108
+        background: #50aca7;
109
+        border: 1px solid #bbb;
110
+        color: black;
111
+    }
112
+
113
+    &:hover {
114
+        background: #317f8e;
115
+        /* Primary hover default blue */
116
+        border: 1px solid #bbb !important;
117
+        color: black !important;
118
+    }
119
+
120
+    &:focus {
121
+        background: #2f707c;
122
+    }
123
+}
124
+
125
+/*
200
 button,
126
 button,
201
 input[type="button"],
127
 input[type="button"],
202
 input[type="submit"] {
128
 input[type="submit"] {
216
 input[type="submit"]:focus {
142
 input[type="submit"]:focus {
217
     background-color: #2f707c;
143
     background-color: #2f707c;
218
 }
144
 }
145
+*/
219
 
146
 
220
 .spoilerButton {
147
 .spoilerButton {
221
     max-width: 604px;
148
     max-width: 604px;
351
     padding-top: 0;
278
     padding-top: 0;
352
 }
279
 }
353
 
280
 
281
+/*
354
 .sidebar {
282
 .sidebar {
355
     float: right;
283
     float: right;
356
     width: 244px;
284
     width: 244px;
357
     height: 100%;
285
     height: 100%;
358
 }
286
 }
287
+*/
359
 
288
 
360
 .sidebar .box .pad form {
289
 .sidebar .box .pad form {
361
     padding-bottom: 20px;
290
     padding-bottom: 20px;
366
     padding: 5px 10px 10px 10px;
295
     padding: 5px 10px 10px 10px;
367
 }
296
 }
368
 
297
 
298
+/*
369
 .main_column {
299
 .main_column {
370
     width: 646px;
300
     width: 646px;
371
     float: left;
301
     float: left;
372
 }
302
 }
303
+*/
373
 
304
 
374
 #logo {
305
 #logo {
375
     width: 900px;
306
     width: 900px;
386
 }
317
 }
387
 
318
 
388
 #logo a::before {
319
 #logo a::before {
389
-    content: "BioTorrents.de";
320
+    content: "torrents.bio";
390
     font-size: 40px;
321
     font-size: 40px;
391
     line-height: 56px;
322
     line-height: 56px;
392
     font-weight: 100;
323
     font-weight: 100;
1433
     padding: 10px;
1364
     padding: 10px;
1434
 }
1365
 }
1435
 
1366
 
1436
-blockquote,
1437
-pre {
1438
-    background-color: #23252a !important;
1439
-}
1440
-
1441
 .signature {
1367
 .signature {
1442
     border-top: 1px dotted #666;
1368
     border-top: 1px dotted #666;
1443
     margin: 2em 0 0;
1369
     margin: 2em 0 0;
1534
 
1460
 
1535
 pre {
1461
 pre {
1536
     color: #fff;
1462
     color: #fff;
1537
-    border: 1px dashed #55585f;
1463
+    background: black;
1464
+    border: 1px dashed #55585f !important;
1538
     margin: 10px;
1465
     margin: 10px;
1539
     padding: 10px;
1466
     padding: 10px;
1540
 }
1467
 }
1541
 
1468
 
1469
+code {
1470
+    background: black;
1471
+    border: none;
1472
+}
1473
+
1542
 #donation {
1474
 #donation {
1543
     position: absolute;
1475
     position: absolute;
1544
     display: inline;
1476
     display: inline;
1901
     z-index: 999;
1833
     z-index: 999;
1902
 }
1834
 }
1903
 
1835
 
1836
+/*
1904
 .button {
1837
 .button {
1905
     border: 0 solid #131313;
1838
     border: 0 solid #131313;
1906
     color: #eee;
1839
     color: #eee;
1911
     text-transform: uppercase;
1844
     text-transform: uppercase;
1912
     padding: 5px 12px;
1845
     padding: 5px 12px;
1913
 }
1846
 }
1847
+*/
1914
 
1848
 
1915
 #store #content {
1849
 #store #content {
1916
     position: relative;
1850
     position: relative;
2312
     background: #8b518e;
2246
     background: #8b518e;
2313
 }
2247
 }
2314
 
2248
 
2249
+/* Buttons */
2250
+body.style_pink button:not(.editor-toolbar button),
2251
+body.style_pink input[type="button"],
2252
+body.style_pink input[type="submit"] {
2253
+    color: black;
2254
+    border: 1px solid #bbb;
2255
+
2256
+    &.button-primary {
2257
+        background: #8b518e;
2258
+        border: 1px solid #bbb;
2259
+        color: black;
2260
+    }
2261
+
2262
+    &:hover {
2263
+        background: #643c72;
2264
+        /* Primary hover default blue */
2265
+        border: 1px solid #bbb !important;
2266
+        color: black !important;
2267
+    }
2268
+
2269
+    &:focus {
2270
+        background: #78467f;
2271
+    }
2272
+}
2273
+
2274
+/*
2315
 body.style_pink button,
2275
 body.style_pink button,
2316
 body.style_pink input[type="button"],
2276
 body.style_pink input[type="button"],
2317
 body.style_pink input[type="submit"] {
2277
 body.style_pink input[type="submit"] {
2329
 body.style_pink input[type="submit"]:focus {
2289
 body.style_pink input[type="submit"]:focus {
2330
     background-color: #78467f;
2290
     background-color: #78467f;
2331
 }
2291
 }
2292
+*/
2332
 
2293
 
2333
 body.style_pink #userinfo_stats {
2294
 body.style_pink #userinfo_stats {
2334
     color: #db7bc7;
2295
     color: #db7bc7;

+ 25
- 61
static/styles/bookish/matcha/matcha.scss View File

45
         width: 100%;
45
         width: 100%;
46
         z-index: 99999;
46
         z-index: 99999;
47
         margin-top: 2.4em;
47
         margin-top: 2.4em;
48
-        /* margin-top: 32px; */
49
         left: 0;
48
         left: 0;
50
     }
49
     }
51
 
50
 
172
         z-index: 100;
171
         z-index: 100;
173
     }
172
     }
174
 
173
 
175
-    /* Alerts, Toolbox, etc. */
176
-    .alertbar {
177
-        background-color: #fff9c7;
178
-        text-align: center;
179
-        color: black;
180
-        font-weight: bold;
181
-        width: 320px;
182
-        margin: 2em auto;
183
-        padding: 1em;
184
-
185
-        a {
186
-            color: black;
187
-            text-decoration: none;
188
-
189
-            &:hover {
190
-                color: black;
191
-                text-decoration: underline;
192
-            }
193
-        }
194
-
195
-        .warning {
196
-            background-color: #ffe68a;
197
-        }
198
-
199
-        .error {
200
-            background-color: #ff8a8a;
201
-        }
202
-    }
203
-
204
     /* Column heads */
174
     /* Column heads */
205
-    .head {
206
-        background: #9fedd7;
207
-        color: black;
208
-        padding: 0.5em 1em;
209
-    }
210
-
211
-    .colhead {
212
-        background: #9fedd7;
213
-        font-weight: bold;
214
-        color: black;
215
-    }
216
-
175
+    .head,
176
+    .colhead,
217
     .colhead_dark {
177
     .colhead_dark {
218
         background: #9fedd7;
178
         background: #9fedd7;
179
+        border-bottom: 2px solid change-color(black, $alpha: 0.25);
219
         color: black;
180
         color: black;
181
+        padding: 0.5em 1em;
220
     }
182
     }
221
 
183
 
222
     /* Box */
184
     /* Box */
223
     .box,
185
     .box,
224
-    section {
186
+    .pad,
187
+    section,
188
+    /* Exceptions, fixes, etc. */
189
+    table.user_options {
225
         background-color: white;
190
         background-color: white;
226
         border: none;
191
         border: none;
227
         margin-bottom: 1em;
192
         margin-bottom: 1em;
193
+        padding: 0.5rem;
228
     }
194
     }
229
 
195
 
230
     /* Shadows */
196
     /* Shadows */
236
     .forum_index,
202
     .forum_index,
237
     #userinfo_minor > li > ul,
203
     #userinfo_minor > li > ul,
238
     .permissions table {
204
     .permissions table {
239
-        box-shadow: 2px 2px 10px -2px slategray;
205
+        box-shadow: 0 5px 4px -4px slategray;
240
     }
206
     }
241
 
207
 
242
     /* Links */
208
     /* Links */
282
     button:not(.editor-toolbar button),
248
     button:not(.editor-toolbar button),
283
     input[type="button"],
249
     input[type="button"],
284
     input[type="submit"] {
250
     input[type="submit"] {
285
-        background: #fbe180;
286
-        border-radius: 0.25rem;
251
+        color: black;
252
+        border: 1px solid #bbb;
287
         box-shadow: 2px 2px 10px -5px slategray;
253
         box-shadow: 2px 2px 10px -5px slategray;
288
-    }
289
 
254
 
290
-    button:hover,
291
-    input[type="button"]:hover,
292
-    input[type="submit"]:hover {
293
-        background: #fff9c7;
294
-    }
255
+        &.button-primary {
256
+            background: #fbe180;
257
+        }
295
 
258
 
296
-    button:focus,
297
-    input[type="button"]:focus,
298
-    input[type="submit"]:focus {
299
-        background: #fff9c7;
259
+        &:hover {
260
+            background: #fff9c7;
261
+            /* Primary hover default blue */
262
+            border: 1px solid #bbb;
263
+            color: black;
264
+        }
265
+
266
+        &:focus {
267
+            background: #fff9c7;
268
+        }
300
     }
269
     }
301
 
270
 
302
     /* Text input */
271
     /* Text input */
363
     .forum_post.sticky_post {
332
     .forum_post.sticky_post {
364
         border: 2px solid #fbe180;
333
         border: 2px solid #fbe180;
365
     }
334
     }
366
-
367
-    /* Inbox */
368
-    tr.unreadpm {
369
-        background-color: #fff9c7;
370
-    }
371
 } /* end body.style_matcha */
335
 } /* end body.style_matcha */

+ 0
- 29
static/styles/bookish/scss/layout.scss View File

12
 #content {
12
 #content {
13
     margin: auto;
13
     margin: auto;
14
     margin-top: 2rem;
14
     margin-top: 2rem;
15
-    /* min-width: 720px; */
16
     overflow: hidden;
15
     overflow: hidden;
17
     width: 90%;
16
     width: 90%;
18
 }
17
 }
44
     }
43
     }
45
 }
44
 }
46
 
45
 
47
-/* Main column and sidebar */
48
-@mixin column-flex($width) {
49
-    display: flex;
50
-    flex-direction: column;
51
-    align-items: stretch;
52
-    max-width: $width;
53
-    min-height: 0;
54
-    padding: 0 0.25rem;
55
-}
56
-
57
-.main_column {
58
-    @include column-flex(64%);
59
-
60
-    table {
61
-        margin-bottom: 1rem;
62
-    }
63
-}
64
-
65
-.sidebar {
66
-    @include column-flex(34%);
67
-    float: right;
68
-}
69
-
70
-/* Box: soon to be <section> */
71
-.box {
72
-    margin-bottom: 1rem;
73
-}
74
-
75
 /* Links */
46
 /* Links */
76
 div.linkbox {
47
 div.linkbox {
77
     text-align: center;
48
     text-align: center;

+ 44
- 0
static/styles/global/scss/layout.scss View File

7
     padding: 0;
7
     padding: 0;
8
 }
8
 }
9
 
9
 
10
+/**
11
+ * Main column and sidebar
12
+ */
13
+
14
+/* Main column and sidebar */
15
+@mixin column-flex($width) {
16
+    display: flex;
17
+    flex-direction: column;
18
+    align-items: stretch;
19
+    max-width: $width;
20
+    min-height: 0;
21
+    padding: 0 0.25rem;
22
+}
23
+
24
+.main_column {
25
+    @include column-flex(64%);
26
+
27
+    table {
28
+        margin-bottom: 1rem;
29
+    }
30
+}
31
+
32
+.sidebar {
33
+    @include column-flex(34%);
34
+    width: 34%;
35
+    float: right;
36
+
37
+    &.fixed {
38
+        width: 34%;
39
+    }
40
+}
41
+
42
+.sidebar {
43
+    float: right;
44
+    width: 30%;
45
+    min-width: 20%;
46
+    margin-right: 1rem;
47
+}
48
+
49
+/* Box: soon to be <section> */
50
+.box {
51
+    margin-bottom: 1rem;
52
+}
53
+
10
 /*
54
 /*
11
  * Flex elements
55
  * Flex elements
12
  */
56
  */

+ 2
- 1
static/styles/global/scss/skeleton-fixes.scss View File

91
 /* forum lists */ table.forum_index,
91
 /* forum lists */ table.forum_index,
92
 /* notif filters */ form[name="notification"],
92
 /* notif filters */ form[name="notification"],
93
 /* service stats */ div.permission_container,
93
 /* service stats */ div.permission_container,
94
+/* user settings */ table.user_options,
94
 /* GENERIC */ table.skeleton-fix {
95
 /* GENERIC */ table.skeleton-fix {
95
     td {
96
     td {
96
         border-bottom: 0 !important;
97
         border-bottom: 0 !important;
130
 }
131
 }
131
 
132
 
132
 /* Unordered lists */
133
 /* Unordered lists */
133
-ul {
134
+ul:not(.nobullet) {
134
     list-style: circle outside !important;
135
     list-style: circle outside !important;
135
 }
136
 }
136
 
137
 

+ 30
- 7
static/styles/oppai/scss/oppai.scss View File

35
     color: #555;
35
     color: #555;
36
 }
36
 }
37
 
37
 
38
+/* Buttons */
39
+button:not(.editor-toolbar button),
40
+input[type="button"],
41
+input[type="submit"] {
42
+    color: black;
43
+    border: 1px solid #bbb;
44
+    box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
45
+
46
+    &.button-primary {
47
+        background: #eaabed;
48
+        border: 1px solid #bbb;
49
+        color: black;
50
+    }
51
+
52
+    &:hover {
53
+        background: #e197e5 !important;
54
+        /* Primary hover default blue */
55
+        border: 1px solid #bbb !important;
56
+        color: black !important;
57
+    }
58
+
59
+    &:focus {
60
+        background: #d48dd8;
61
+    }
62
+}
63
+
64
+/*
38
 button,
65
 button,
39
 input[type="button"],
66
 input[type="button"],
40
 input[type="submit"] {
67
 input[type="submit"] {
53
 input[type="submit"]:focus {
80
 input[type="submit"]:focus {
54
     background: #d48dd8;
81
     background: #d48dd8;
55
 }
82
 }
83
+*/
56
 
84
 
57
 .spoilerButton {
85
 .spoilerButton {
58
     max-width: 540px;
86
     max-width: 540px;
546
     padding-top: 0px;
574
     padding-top: 0px;
547
 }
575
 }
548
 
576
 
549
-.sidebar {
550
-    float: right;
551
-    width: 245px;
552
-}
553
-
554
 .head {
577
 .head {
555
     padding: 4px;
578
     padding: 4px;
556
     /* border-bottom: 1px solid #666; */
579
     /* border-bottom: 1px solid #666; */
563
     padding: 3px 10px 10px 10px;
586
     padding: 3px 10px 10px 10px;
564
 }
587
 }
565
 
588
 
566
-.main_column {
567
-    width: 592px;
589
+#content {
590
+    max-width: 67%;
568
 }
591
 }
569
 
592
 
570
 .main_column table {
593
 .main_column table {

+ 5
- 2
templates/legal/about.html View File

3
 <section class="tldr">
3
 <section class="tldr">
4
   <p>
4
   <p>
5
     BioTorrents.de is a functional experiment in comfy data distribution.
5
     BioTorrents.de is a functional experiment in comfy data distribution.
6
+    The tagline is "What.cd for genome sequences."
7
+    The scope is multidisciplinary and social science friendly.
6
   </p>
8
   </p>
7
 
9
 
8
   <p>
10
   <p>
12
   </p>
14
   </p>
13
 
15
 
14
   <p>
16
   <p>
15
-    BioTorrents.de provides an open platform for disadvantaged researchers to host their data.
17
+    BioTorrents.de is an open platform for disadvantaged researchers to host their data.
16
     More importantly, it provides the necessary tools for others to find and cite it later.
18
     More importantly, it provides the necessary tools for others to find and cite it later.
17
     It's a place for the Google Drives, FTP folders, and network shares that may not be accepted elsewhere.
19
     It's a place for the Google Drives, FTP folders, and network shares that may not be accepted elsewhere.
20
+    It also plays well with institutional repositories and can efficiently mirror their data.
18
   </p>
21
   </p>
19
 
22
 
20
   <p>
23
   <p>
27
       Email
30
       Email
28
     </strong>
31
     </strong>
29
     <br />
32
     <br />
30
-    help at biotorrents dot de
33
+    hello at torrents dot bio 
31
   </p>
34
   </p>
32
 
35
 
33
   <p>
36
   <p>

+ 3
- 3
templates/legal/dmca.html View File

3
 <section class="tldr">
3
 <section class="tldr">
4
   <p>
4
   <p>
5
     <em>If</em> you're a copyright owner or an agent of one,
5
     <em>If</em> you're a copyright owner or an agent of one,
6
-    <em>and</em> you believe that user-generated content on the domain
7
-    https://biotorrents.de infringes your copyrights:
6
+    <em>and</em> you reasonably believe that user-generated content on the domains
7
+    torrents.bio or biotorrents.de infringes your copyrights:
8
     <em>then</em> you may notify our Digital Millennium Copyright Act (DMCA) agent in writing.
8
     <em>then</em> you may notify our Digital Millennium Copyright Act (DMCA) agent in writing.
9
   </p>
9
   </p>
10
 
10
 
69
       Email
69
       Email
70
     </strong>
70
     </strong>
71
     <br />
71
     <br />
72
-    dmca at biotorrents dot de
72
+    dmca at torrents dot bio 
73
   </p>
73
   </p>
74
 
74
 
75
   <p>
75
   <p>

+ 2
- 2
templates/legal/privacy.html View File

188
   </h3>
188
   </h3>
189
 
189
 
190
   <p>
190
   <p>
191
-    We last updated this policy on 2021-07-14.
191
+    We last updated this policy on 2021-07-28.
192
   </p>
192
   </p>
193
 
193
 
194
 
194
 
220
       Email
220
       Email
221
     </strong>
221
     </strong>
222
     <br />
222
     <br />
223
-    privacy at biotorrents dot de
223
+    privacy at torrents dot bio 
224
   </p>
224
   </p>
225
 
225
 
226
   <p>
226
   <p>

Loading…
Cancel
Save