Changeset 39

Timestamp:

03/07/07 22:52:55 (3 years ago)

Author:

eevee

Message:

Fixed up type pages; counts were broken, moves were broken, and Pokemon styling was ugly.
Grouped breeding parents by evolution chain.

Location:

veekun/trunk

Files:

• lib/Vee/Controller/Dex.pm (modified) (1 diff)
• lib/Vee/Controller/Dex/Utils.pm (modified) (1 diff)
• root/style/dex.css (modified) (1 diff)
• root/style/dex.types.css (modified) (1 diff)
• templates/dex/page/type.tt (modified) (2 diffs)

veekun/trunk/lib/Vee/Controller/Dex.pm

@@ -696 +696 @@
     
     $s->{this}       = $row;
-    $s->{moves}      = $c->model('DBIC::Moves')->search({ type => $row->name }, { order_by => 'name ASC', columns => ['id'] });
-    $s->{pokemon_rs} = $c->model('DBIC::Pokemon')->search(
-        [ type1 => $row->name, type2 => $row->name ],
-        { order_by => 'name ASC', columns => [qw/id name type1 type2/] }
-    );
+    $s->{moves_rs}   = $c->model('DBIC::Moves')->search({ type => $row->name }, { order_by => 'name ASC', columns => ['id'] });
+    $s->{pokemon_rs} = $c->model('DBIC::Pokemon')->search( {
+        id => { '<=', $Generations[-1]{maxid} },
+        -or => [ type1 => $row->name, type2 => $row->name ],
+    }, {
+        order_by => 'name ASC',
+        columns => [qw/ id name type1 type2 /],
+    } );
 
     $s->{template} = 'dex/page/type.tt';

veekun/trunk/lib/Vee/Controller/Dex/Utils.pm

@@ -175 +175 @@
     }, {
         prefetch => 'pokemon',
+        order_by => 'pokeid ASC',
+        group_by => 'pokemon.evid',
     });
 

veekun/trunk/root/style/dex.css

@@ -54 +54 @@
 table.dex-stats tr td.dex-stats-data { width: 56px; text-align: center; }
 
+a.dex-pokelist img { margin: 0.2em 0; }
 a.dex-pokelist:hover img { background-color: #385a7c !important; background-image: none !important; -moz-border-radius: 4px; }
 

veekun/trunk/root/style/dex.types.css

@@ -37 +37 @@
 .type-steel, .type-fire,   .type-water,    .type-grass,  .type-electric, .type-psychic, .type-ice,  .type-dragon, .type-dark,
 .type-cool,  .type-beauty, .type-cute,     .type-smart,  .type-tough
-    { font-size: 10px; xtext-transform: uppercase; border-style: outset; border-width: 1px; letter-spacing: 0.5px; color: black !important; vertical-align: middle; padding: 2px; }
+    { font-size: 10px; letter-spacing: 0.5px; color: black !important; vertical-align: middle; }
 .type-none a,  .type-normal a, .type-fighting a, .type-flying a, .type-poison a,   .type-ground a,  .type-rock a, .type-bug a,    .type-ghost a,
 .type-steel a, .type-fire a,   .type-water a,    .type-grass a,  .type-electric a, .type-psychic a, .type-ice a,  .type-dragon a, .type-dark a,

veekun/trunk/templates/dex/page/type.tt

@@ -58 +58 @@
 <h1>Pok&eacute;mon</h1>
 <p><a href="[% c.uri('Dex::Search', 'pokemon_search', { view => 'icons', type_mode => 'any', type => this.name }) %]">This type in the Pok&eacute;mon search</a></p>
+[% pokemon_ct = 0 %]
 [% WHILE (poke = pokemon_rs.next) %]
-<a href="[% dex_uri('pokemon', poke.name) %]" class="[% IF poke.type2; 'type-'; IF poke.type1 == this.name; poke.type2; ELSE; poke.type1; END; ' '; END %]dex-pokelist"><img src="/dex-images/icons/[% poke.id.pad(3) %].png" alt="[% poke.name %]" title="[% poke.name %]: [% poke.type1 %][% '/' _ poke.type2 IF poke.type2 %]"/></a>
+<a href="[% dex_uri('pokemon', poke.name) %]" class="dex-pokelist"><img src="/dex-images/icons/[% poke.id.pad(3) %].png" alt="[% poke.name %]" title="[% poke.name %]: [% poke.type1 %][% '/' _ poke.type2 IF poke.type2 %]" class="[% IF poke.type2; 'type-'; IF poke.type1 == this.name; poke.type2; ELSE; poke.type1; END; END %]"/></a>
+[% pokemon_ct = pokemon_ct + 1 %]
 [% END %]
-<div class="total">[% pokemon.size %] Pok&eacute;mon total</div>
+<div class="total">[% pokemon_ct %] Pok&eacute;mon total</div>
 
 <!-- ####################################################################### -->
 
 <h1>Moves</h1>
-[% UNLESS moves %]<p>No moves of this type..  wtf?!</p>[% RETURN %][% END %]
+[% IF moves_rs.is_empty %]<p>No moves of this type..  wtf?!</p>[% END %]
 
 [% color = 1 %]
@@ -74 +76 @@
 </tr>
 
-[% FOREACH move IN moves %]
+[% moves_ct = 0 %]
+[% WHILE (move = moves_rs.next) %]
 <tr class="color[% color %]">
 [%     move_cells(move.id) %]
 </tr>
+[%     moves_ct = moves_ct + 1 %]
 [%     color = 3 - color %]
 [% END %]
 </table>
-<div class="total">[% moves.size %] moves total</div>
+<div class="total">[% moves_ct %] moves total</div>
 
 <!-- ####################################################################### -->