Browse Source

Fix broken layout on Subscribed Collections page

spaghetti 8 years ago
parent
commit
acfc2bce52
1 changed files with 12 additions and 49 deletions
  1. 12
    49
      sections/userhistory/subscribed_collages.php

+ 12
- 49
sections/userhistory/subscribed_collages.php View File

115
       } elseif (count($Artists) > 0) {
115
       } elseif (count($Artists) > 0) {
116
         $DisplayName .= Artists::display_artists(array('1' => $Artists));
116
         $DisplayName .= Artists::display_artists(array('1' => $Artists));
117
       }
117
       }
118
-      $DisplayName .= "<a href=\"torrents.php?id=$GroupID\" class=\"tooltip\" title=\"View torrent group\" dir=\"ltr\">$GroupName</a>";
118
+      $DisplayName .= "<a href=\"torrents.php?id=$GroupID\" class=\"tooltip\" title=\"View torrent group\" ";
119
+      if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
120
+        $DisplayName .= "onmouseover=\"getCover(event)\" data-cover=\"".ImageTools::process($WikiImage)."\" onmouseleave=\"ungetCover(event)\" ";
121
+      }
122
+      $DisplayName .= "dir=\"ltr\">$GroupName</a>";
119
       if ($GroupYear > 0) {
123
       if ($GroupYear > 0) {
120
         $DisplayName = "$DisplayName [$GroupYear]";
124
         $DisplayName = "$DisplayName [$GroupYear]";
121
       }
125
       }
122
-      if ($GroupVanityHouse) {
123
-        $DisplayName .= ' [<abbr class="tooltip" title="This is a Vanity House release">VH</abbr>]';
124
-      }
125
 
126
 
126
       $SnatchedGroupClass = $GroupFlags['IsSnatched'] ? ' snatched_group' : '';
127
       $SnatchedGroupClass = $GroupFlags['IsSnatched'] ? ' snatched_group' : '';
127
 
128
 
136
           </div>
137
           </div>
137
         </td>
138
         </td>
138
         <td colspan="5" class="big_info">
139
         <td colspan="5" class="big_info">
139
-<? if ($LoggedUser['CoverArt']) { ?>
140
-          <div class="group_image float_left clear">
141
-            <? ImageTools::cover_thumb($WikiImage, $GroupCategoryID) ?>
142
-          </div>
143
-<? } ?>
144
           <div class="group_info clear">
140
           <div class="group_info clear">
145
             <strong><?=$DisplayName?></strong>
141
             <strong><?=$DisplayName?></strong>
146
             <div class="tags"><?=$TorrentTags->format()?></tags>
142
             <div class="tags"><?=$TorrentTags->format()?></tags>
148
         </td>
144
         </td>
149
       </tr>
145
       </tr>
150
 <?
146
 <?
151
-        $LastRemasterYear = '-';
152
-        $LastRemasterTitle = '';
153
-        $LastRemasterRecordLabel = '';
154
-        $LastRemasterCatalogueNumber = '';
155
-        $LastMedia = '';
156
-
157
-        $EditionID = 0;
158
-        unset($FirstUnknown);
159
-
160
         foreach ($Torrents as $TorrentID => $Torrent) {
147
         foreach ($Torrents as $TorrentID => $Torrent) {
161
-
162
-          if ($Torrent['Remastered'] && !$Torrent['RemasterYear']) {
163
-            $FirstUnknown = !isset($FirstUnknown);
164
-          }
165
           $SnatchedTorrentClass = $Torrent['IsSnatched'] ? ' snatched_torrent' : '';
148
           $SnatchedTorrentClass = $Torrent['IsSnatched'] ? ' snatched_torrent' : '';
166
-
167
-          if ($Torrent['RemasterTitle'] != $LastRemasterTitle
168
-            || $Torrent['RemasterYear'] != $LastRemasterYear
169
-            || $Torrent['RemasterRecordLabel'] != $LastRemasterRecordLabel
170
-            || $Torrent['RemasterCatalogueNumber'] != $LastRemasterCatalogueNumber
171
-            || $FirstUnknown
172
-            || $Torrent['Media'] != $LastMedia
173
-          ) {
174
-            $EditionID++;
175
-?>
176
-  <tr class="group_torrent groupid_<?=$CollageID . $GroupID?> edition<?=$SnatchedGroupClass?> hidden">
177
-    <td colspan="6" class="edition_info"><strong><a href="#" onclick="toggle_edition(<?=$CollageID?><?=$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>
178
-  </tr>
179
-<?
180
-          }
181
-          $LastRemasterTitle = $Torrent['RemasterTitle'];
182
-          $LastRemasterYear = $Torrent['RemasterYear'];
183
-          $LastRemasterRecordLabel = $Torrent['RemasterRecordLabel'];
184
-          $LastRemasterCatalogueNumber = $Torrent['RemasterCatalogueNumber'];
185
-          $LastMedia = $Torrent['Media'];
186
 ?>
149
 ?>
187
   <tr class="group_torrent groupid_<?=$CollageID . $GroupID?> edition_<?=$EditionID?> hidden<?=$SnatchedTorrentClass . $SnatchedGroupClass?>">
150
   <tr class="group_torrent groupid_<?=$CollageID . $GroupID?> edition_<?=$EditionID?> hidden<?=$SnatchedTorrentClass . $SnatchedGroupClass?>">
188
     <td colspan="2">
151
     <td colspan="2">
203
 
166
 
204
         list($TorrentID, $Torrent) = each($Torrents);
167
         list($TorrentID, $Torrent) = each($Torrents);
205
 
168
 
206
-        $DisplayName = "<a href=\"torrents.php?id=$GroupID\" class=\"tooltip\" title=\"View torrent group\" dir=\"ltr\">$GroupName</a>";
169
+        $DisplayName = "<a href=\"torrents.php?id=$GroupID\" class=\"tooltip\" title=\"View torrent group\" ";
170
+        if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
171
+          $DisplayName .= "onmouseover=\"getCover(event)\" data-cover=\"".ImageTools::process($WikiImage)."\" onmouseleave=\"ungetCover(event)\" ";
172
+        }
173
+        $DisplayName .= "dir=\"ltr\">$GroupName</a>";
207
 
174
 
208
         if ($Torrent['IsSnatched']) {
175
         if ($Torrent['IsSnatched']) {
209
           $DisplayName .= ' ' . Format::torrent_label('Snatched!');
176
           $DisplayName .= ' ' . Format::torrent_label('Snatched!');
220
       </div>
187
       </div>
221
     </td>
188
     </td>
222
     <td class="big_info">
189
     <td class="big_info">
223
-<? if ($LoggedUser['CoverArt']) { ?>
224
-      <div class="group_image float_left clear">
225
-        <? ImageTools::cover_thumb($WikiImage, $GroupCategoryID) ?>
226
-      </div>
227
-<? } ?>
228
       <div class="group_info clear">
190
       <div class="group_info clear">
229
         <span>
191
         <span>
230
           [ <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>
192
           [ <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>
260
   <!--</div>-->
222
   <!--</div>-->
261
   <table class="torrent_table<?=$ShowAll ? ' hidden' : ''?>" id="discog_table_<?=$CollageID?>">
223
   <table class="torrent_table<?=$ShowAll ? ' hidden' : ''?>" id="discog_table_<?=$CollageID?>">
262
     <tr class="colhead">
224
     <tr class="colhead">
263
-      <td width="1%"><!-- expand/collapse --></td>
225
+      <td width="1%"></td>
226
+      <td></td>
264
       <td width="70%"><strong>Torrents</strong></td>
227
       <td width="70%"><strong>Torrents</strong></td>
265
       <td>Size</td>
228
       <td>Size</td>
266
       <td class="sign snatches">
229
       <td class="sign snatches">

Loading…
Cancel
Save