Browse Source

Give the bookmark page some TLC

spaghetti 1 year ago
parent
commit
aebd91b2b5

+ 19
- 90
sections/bookmarks/torrents.php View File

@@ -60,29 +60,18 @@ foreach ($GroupIDs as $GroupID) {
60 60
 
61 61
   $TorrentTags = new Tags($TagList);
62 62
 
63
-  /*if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4]) || !empty($ExtendedArtists[5]) || !empty($ExtendedArtists[6])) {
64
-      unset($ExtendedArtists[2]);
65
-      unset($ExtendedArtists[3]);
66
-      $DisplayName = Artists::display_artists($ExtendedArtists);
67
-  } elseif (count($Artists) > 0) {
68
-      $DisplayName = Artists::display_artists(array('1' => $Artists));
69
-  } else {
70
-    $DisplayName = '';
71
-  }*/
72
-
73 63
   $DisplayName = Artists::display_artists($Artists);
74 64
 
75 65
   $GroupName = empty($GroupName) ? (empty($GroupNameRJ) ? $GroupNameJP : $GroupNameRJ) : $GroupName;
76 66
 
77
-  $DisplayName .= '<a href="torrents.php?id='.$GroupID.'" class="tooltip" title="View torrent group" dir="ltr">'.$GroupName.'</a>';
67
+  $DisplayName .= '<a href="torrents.php?id='.$GroupID.'" ';
68
+  if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
69
+    $DisplayName .= 'onmouseover="getCover(event)" data-cover="'.ImageTools::process($WikiImage, 'thumb').'" onmouseleave="ungetCover(event)" ';
70
+  }
71
+  $DisplayName .= ' class="tooltip" title="View torrent group" dir="ltr">'.$GroupName.'</a>';
78 72
   if ($GroupYear > 0) {
79 73
     $DisplayName = "$DisplayName [$GroupYear]";
80 74
   }
81
-  /*
82
-  if ($GroupVanityHouse) {
83
-    $DisplayName .= ' [<abbr class="tooltip" title="This is a Vanity House release">VH</abbr>]';
84
-  }
85
-  */
86 75
   $SnatchedGroupClass = $GroupFlags['IsSnatched'] ? ' snatched_group' : '';
87 76
 
88 77
   // Start an output buffer, so we can store this output in $TorrentTable
@@ -91,17 +80,17 @@ foreach ($GroupIDs as $GroupID) {
91 80
       // Grouped torrents
92 81
       $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] === 1);
93 82
 ?>
94
-      <tr class="group discog<?=$SnatchedGroupClass?>" id="group_<?=$GroupID?>">
83
+      <tr class="group" id="group_<?=$GroupID?>">
95 84
         <td class="center">
96 85
           <div id="showimg_<?=$GroupID?>" class="<?=($ShowGroups ? 'hide' : 'show')?>_torrents">
97
-            <a href="#" class="tooltip show_torrents_link" onclick="toggle_group(<?=$GroupID?>, this, event);" title="Collapse this group. Hold &quot;Ctrl&quot; while clicking to collape all groups on this page."></a>
86
+            <a class="tooltip show_torrents_link" onclick="toggle_group(<?=$GroupID?>, this, event);" title="Collapse this group. Hold &quot;Ctrl&quot; while clicking to collape all groups on this page."></a>
98 87
           </div>
99 88
         </td>
100 89
         <td class="center">
101
-          <div title="<?=$TorrentTags->title()?>" class="tooltip <?=Format::css_category($GroupCategoryID)?> <?=$TorrentTags->css_name()?>"></div>
90
+          <div title="<?=$TorrentTags->title()?>" class="tooltip <?=Format::css_category($GroupCategoryID)?>"></div>
102 91
         </td>
103 92
         <td colspan="5">
104
-          <strong><?=$DisplayName?></strong>
93
+          <?=$DisplayName?>
105 94
           <span style="text-align: right;" class="float_right">
106 95
             <?=time_diff($AddedTime);?>
107 96
 <?    if (!$Sneaky) { ?>
@@ -113,46 +102,10 @@ foreach ($GroupIDs as $GroupID) {
113 102
         </td>
114 103
       </tr>
115 104
 <?
116
-    $LastRemasterYear = '-';
117
-    $LastRemasterTitle = '';
118
-    $LastRemasterRecordLabel = '';
119
-    $LastRemasterCatalogueNumber = '';
120
-    $LastMedia = '';
121
-
122
-    $EditionID = 0;
123
-    unset($FirstUnknown);
124
-
125 105
     foreach ($Torrents as $TorrentID => $Torrent) {
126
-/*
127
-      if ($Torrent['Remastered'] && !$Torrent['RemasterYear']) {
128
-        $FirstUnknown = !isset($FirstUnknown);
129
-      }
130
-*/
131 106
       $SnatchedTorrentClass = $Torrent['IsSnatched'] ? ' snatched_torrent' : '';
132
-/*
133
-      if (
134
-        $Torrent['RemasterTitle'] != $LastRemasterTitle
135
-        || $Torrent['RemasterYear'] != $LastRemasterYear
136
-        || $Torrent['RemasterRecordLabel'] != $LastRemasterRecordLabel
137
-        || $Torrent['RemasterCatalogueNumber'] != $LastRemasterCatalogueNumber
138
-        || $FirstUnknown
139
-        || $Torrent['Media'] != $LastMedia
140
-      ) {
141
-        $EditionID++;
142 107
 ?>
143
-  <tr class="group_torrent groupid_<?=$GroupID?> edition<?=$SnatchedGroupClass . (!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] === 1 ? ' hidden' : '')?>">
144
-    <td colspan="7" class="edition_info"><strong><a href="#" onclick="toggle_edition(<?=$GroupID?>, <?=$EditionID?>, this, event)" class="tooltip" title="Collapse this edition. Hold &quot;Ctrl&quot; while clicking to collapse all editions in this torrent group.">&minus;</a> <?=Torrents::edition_string($Torrent, $Group)?></strong></td>
145
-  </tr>
146
-<?
147
-      }
148
-      $LastRemasterTitle = $Torrent['RemasterTitle'];
149
-      $LastRemasterYear = $Torrent['RemasterYear'];
150
-      $LastRemasterRecordLabel = $Torrent['RemasterRecordLabel'];
151
-      $LastRemasterCatalogueNumber = $Torrent['RemasterCatalogueNumber'];
152
-      $LastMedia = $Torrent['Media'];
153
-*/
154
-?>
155
-  <tr class="group_torrent torrent_row groupid_<?=$GroupID?> edition_<?=$EditionID?><?=$SnatchedTorrentClass . $SnatchedGroupClass . (!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] === 1 ? ' hidden' : '')?>">
108
+  <tr class="group_torrent torrent_row groupid_<?=$GroupID?> <?=$SnatchedTorrentClass . $SnatchedGroupClass . (!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] === 1 ? ' hidden' : '')?>">
156 109
     <td colspan="3">
157 110
       <span>[ <a href="torrents.php?action=download&amp;id=<?=$TorrentID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>" class="tooltip" title="Download">DL</a>
158 111
 <?      if (Torrents::can_use_token($Torrent)) { ?>
@@ -177,7 +130,11 @@ foreach ($GroupIDs as $GroupID) {
177 130
 
178 131
     $DisplayName = Artists::display_artists(Artists::get_artist($GroupID));
179 132
 
180
-    $DisplayName .= '<a href="torrents.php?id='.$GroupID.'" class="tooltip" title="View torrent group" dir="ltr">'.$GroupName.'</a>';
133
+    $DisplayName .= '<a href="torrents.php?id='.$GroupID.'" ';
134
+    if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
135
+      $DisplayName .= 'onmouseover="getCover(event)" data-cover="'.ImageTools::process($WikiImage, 'thumb').'" onmouseleave="ungetCover(event)" ';
136
+    }
137
+    $DisplayName .=' class="tooltip" title="View torrent group" dir="ltr">'.$GroupName.'</a>';
181 138
 
182 139
     if ($Torrent['IsSnatched']) {
183 140
       $DisplayName .= ' ' . Format::torrent_label('Snatched!');
@@ -194,7 +151,7 @@ foreach ($GroupIDs as $GroupID) {
194 151
   <tr class="torrent torrent_row<?=$SnatchedTorrentClass . $SnatchedGroupClass?>" id="group_<?=$GroupID?>">
195 152
     <td></td>
196 153
     <td class="center">
197
-      <div title="<?=$TorrentTags->title()?>" class="tooltip <?=Format::css_category($GroupCategoryID)?> <?=$TorrentTags->css_name()?>">
154
+      <div title="<?=$TorrentTags->title()?>" class="tooltip <?=Format::css_category($GroupCategoryID)?>">
198 155
       </div>
199 156
     </td>
200 157
     <td>
@@ -209,7 +166,7 @@ foreach ($GroupIDs as $GroupID) {
209 166
 <?    if (!$Sneaky) { ?>
210 167
       <span class="float_right float_clear"><a href="#group_<?=$GroupID?>" class="brackets remove_bookmark" onclick="Unbookmark('torrent', <?=$GroupID?>, ''); return false;">Remove bookmark</a></span>
211 168
 <?    } ?>
212
-      <strong><?=$DisplayName?></strong>
169
+      <?=$DisplayName?>
213 170
       <div class="tags"><?=$TorrentTags->format()?></div>
214 171
 
215 172
     </td>
@@ -227,13 +184,6 @@ foreach ($GroupIDs as $GroupID) {
227 184
   ob_start();
228 185
 
229 186
   $DisplayName = '';
230
-  /*if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4]) || !empty($ExtendedArtists[5])|| !empty($ExtendedArtists[6])) {
231
-    unset($ExtendedArtists[2]);
232
-    unset($ExtendedArtists[3]);
233
-    $DisplayName .= Artists::display_artists($ExtendedArtists, false);
234
-  } elseif (count($Artists) > 0) {
235
-    $DisplayName .= Artists::display_artists(array('1' => $Artists), false);
236
-  }*/
237 187
 
238 188
   $DisplayName .= Artists::display_artists($Artists, false);
239 189
 
@@ -244,17 +194,6 @@ foreach ($GroupIDs as $GroupID) {
244 194
   $Tags = display_str($TorrentTags->format());
245 195
   $PlainTags = implode(', ', $TorrentTags->get_tags());
246 196
 ?>
247
-<? /* ?>
248
-    <li class="image_group_<?=$GroupID?>">
249
-      <a href="torrents.php?id=<?=$GroupID?>" class="bookmark_<?=$GroupID?>">
250
-<?  if ($WikiImage) { ?>
251
-        <img class="tooltip_interactive" src="<?=ImageTools::process($WikiImage, 'thumb')?>" alt="<?=$DisplayName?>" title="<?=$DisplayName?> <br /> <?=$Tags?>" data-title-plain="<?="$DisplayName ($PlainTags)"?>" width="118" />
252
-<?  } else { ?>
253
-        <div style="width: 107px; padding: 5px;"><?=$DisplayName?></div>
254
-<?  } ?>
255
-      </a>
256
-    </li>
257
-<? */ ?>
258 197
 <div class='collage_image image_group_<?=$GroupID?>'>
259 198
       <a href="torrents.php?id=<?=$GroupID?>" class="bookmark_<?=$GroupID?>">
260 199
 <?  if (!$WikiImage) {
@@ -355,7 +294,7 @@ View::show_header($Title, 'browse,collage,wall');
355 294
 if ($CollageCovers !== 0) { ?>
356 295
     <div id="coverart" class="box">
357 296
       <div class="head" id="coverhead"><strong>Cover art</strong></div>
358
-      <div class="collage_images" id="collage_page0">
297
+      <div class="collage_images" id="collage_page0" data-wall-child=".collage_image" data-wall-size="4", data-wall-min="2">
359 298
 <?
360 299
   $Page1 = array_slice($Collage, 0, $CollageCovers);
361 300
   foreach ($Page1 as $Group) {
@@ -363,16 +302,6 @@ if ($CollageCovers !== 0) { ?>
363 302
   }
364 303
 ?>
365 304
       </div>
366
-      <script>
367
-        $('.collage_image img').on('load', function() {
368
-          var test = true
369
-          $('.collage_image img').toArray().forEach(function(el) {
370
-            if (!el.complete) test = false
371
-          })
372
-          if (test) wall('.collage_images', '.collage_image', 4)
373
-        })
374
-        wall('.collage_images', '.collage_image', 4)
375
-      </script>
376 305
     </div>
377 306
 <?  if ($NumGroups > $CollageCovers) { ?>
378 307
     <div class="linkbox pager" style="clear: left;" id="pageslinksdiv">
@@ -386,7 +315,7 @@ if ($CollageCovers !== 0) { ?>
386 315
       <span id="lastpage" class="<?=(ceil($NumGroups / $CollageCovers) === 2 ? 'invisible' : '')?>"> | <a href="#" id="lastpage" class="pageslink" onclick="collageShow.page(<?=(ceil($NumGroups / $CollageCovers) - 1)?>, this); return false;">Last &gt;&gt;</a></span>
387 316
     </div>
388 317
     <script type="text/javascript">
389
-      collageShow.init(<?=json_encode($CollagePages)?>);
318
+      $(()=>collageShow.init(<?=json_encode($CollagePages)?>));
390 319
     </script>
391 320
 <?
392 321
   }

+ 5
- 5
sections/collages/torrent_collage.php View File

@@ -105,7 +105,7 @@ foreach ($GroupIDs as $GroupID) {
105 105
           <div title="<?=$TorrentTags->title()?>" class="tooltip <?=Format::css_category($GroupCategoryID)?> <?=$TorrentTags->css_name()?>"></div>
106 106
         </td>
107 107
         <td colspan="5">
108
-          <strong><?=$DisplayName?></strong>
108
+          <?=$DisplayName?>
109 109
 <?    if (Bookmarks::has_bookmarked('torrent', $GroupID)) { ?>
110 110
           <span class="remove_bookmark float_right">
111 111
             <a class="float_right" href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="remove_bookmark brackets" onclick="Unbookmark('torrent', <?=$GroupID?>, 'Bookmark'); return false;">Remove bookmark</a>
@@ -178,7 +178,7 @@ foreach ($GroupIDs as $GroupID) {
178 178
 <?    } ?>
179 179
             | <a href="reportsv2.php?action=report&amp;id=<?=$TorrentID?>" class="tooltip" title="Report">RP</a>
180 180
           </span>
181
-          <strong><?=$DisplayName?></strong>
181
+          <?=$DisplayName?>
182 182
           <div class="tags"><?=$TorrentTags->format()?></div>
183 183
         </td>
184 184
         <td class="number_column nobr"><?=Format::get_size($Torrent['Size'])?></td>
@@ -543,9 +543,9 @@ if ($CollageCovers != 0) { ?>
543 543
       <span id="nextpage"><a href="#" class="pageslink" onclick="collageShow.nextPage(); return false;"><strong>Next &gt;</strong></a></span>
544 544
       <span id="lastpage" class="<?=(ceil($NumGroups / $CollageCovers) == 2 ? 'invisible' : '')?>"> | <a href="#" class="pageslink" onclick="collageShow.page(<?=ceil($NumGroups / $CollageCovers) - 1?>, this); return false;"><strong>Last &gt;&gt;</strong></a></span>
545 545
     </div>
546
-    <script type="text/javascript">//<![CDATA[
547
-      $(document).ready(function(){collageShow.init(<?=json_encode($CollagePages)?>)});
548
-    //]]></script>
546
+    <script type="text/javascript">
547
+      $(()=>collageShow.init(<?=json_encode($CollagePages)?>));
548
+    </script>
549 549
 <?
550 550
   }
551 551
 }

+ 2
- 8
sections/upload/upload_handle.php View File

@@ -675,14 +675,8 @@ if (empty($ArtistsUnescaped)) {
675 675
 if (!empty($ArtistsUnescaped)) {
676 676
   $ArtistNameList = [];
677 677
   $GuestArtistNameList = [];
678
-  foreach ($ArtistsUnescaped as $Importance => $Artists) {
679
-    foreach ($Artists as $Artist) {
680
-      if ($Importance == 1 || $Importance == 4 || $Importance == 5 || $Importance == 6) {
681
-        $ArtistNameList[] = "Artists LIKE '%|".db_string(str_replace('\\', '\\\\', $Artist['name']), true)."|%'";
682
-      } else {
683
-        $GuestArtistNameList[] = "Artists LIKE '%|".db_string(str_replace('\\', '\\\\', $Artist['name']), true)."|%'";
684
-      }
685
-    }
678
+  foreach ($ArtistsUnescaped as $Importance => $Artist) {
679
+    $ArtistNameList[] = "Artists LIKE '%|".db_string(str_replace('\\', '\\\\', $Artist['name']), true)."|%'";
686 680
   }
687 681
   // Don't add notification if >2 main artists or if tracked artist isn't a main artist
688 682
   if (count($ArtistNameList) > 2 || $Artist['name'] == 'Various Artists') {

+ 1
- 0
static/styles/global.css View File

@@ -102,6 +102,7 @@ ul.collage_images img {
102 102
 
103 103
 div.collage_image {
104 104
   width: 20%;
105
+  display: inline-block;
105 106
 }
106 107
 
107 108
 [data-toggle-target], [data-quote-jump], .clickable {

Loading…
Cancel
Save