Changeset 359

Timestamp:

10/30/07 23:31:18 (2 years ago)

Author:

eevee

Message:

Fixed the move table version-collapse; it was breaking on colspan'd cells, so I split the TMs into individual cells just like the level moves. (#159)
(A change in View::TT slipped in, but it's harmless.)

Location:

veekun/trunk

Files:

• lib/Vee/Controller/Dex.pm (modified) (1 diff)
• lib/Vee/View/TT.pm (modified) (2 diffs)
• root/script/dexutils.js (modified) (1 diff)
• templates/dex/common.tt (modified) (1 diff)
• templates/dex/page/pokemon.tt (modified) (4 diffs)
• templates/style/dex.tt (modified) (1 diff)
• templates/wrapper.tt (modified) (1 diff)

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

@@ -479 +479 @@
     $s->{page_title}  = $row->name . ' - Pokémon #' . $row->real_id;
     $s->{page_header} = $row->name;
+    $s->{extra_js}    = ['dexutils'];
     $s->{link_name}   = 'dex';
     $s->{crumbs}      = [

veekun/trunk/lib/Vee/View/TT.pm

@@ -10 +10 @@
 use Template::Stash;
 
+if (Vee->debug) {
+#    __PACKAGE__->config( DEBUG => Template::Constants::DEBUG_UNDEF );
+}
+
 __PACKAGE__->config({
     #        LOAD_TEMPLATES  => $Vee::TTProvider,
@@ -19 +23 @@
     INCLUDE_PATH    => Vee->path_to( 'templates' ),
     WRAPPER         => 'wrapper.tt',
-    #DEBUG           => Template::Constants::DEBUG_UNDEF,
     ERROR           => 'blank.tt',
     

veekun/trunk/root/script/dexutils.js

@@ -7 +7 @@
 
     $(' #js-movetable tr.js-versionless ').addClass('js-move-table-reduced');
+
+//    $(' #js-movetable tr.heading:not(:has( ~ tr:not(.js-move-table-reduced) ~ tr.heading )) ').addClass('js-move-table-reduced');
 
     var version_cells = $(' #js-movetable td, #js-movetable th ')

veekun/trunk/templates/dex/common.tt

@@ -1 +1 @@
 [% FILTER null %]
+
+[%# prints a compacted TM name %]
+[% MACRO tm_short_name(tm) BLOCK %]
+[% IF tm > 100 %]<em>H[% tm - 100 %]</em>[% ELSE %][% tm | format('%02d') %][% END %]
+[% END %]
 
 [%# creates a link for a type name %]

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

@@ -1 @@
-[% extra_js = 'dexutils.js' %]
 [% PROCESS 'dex/common.tt' %]
 
@@ -448 +447 @@
 
 <table class="dex-table" cellspacing="0" id="js-movetable">
-<!-- XXX: this is total crap and could stand to get one hell of a refactor.  again.  maybe for 5th gen. -->
+<!-- XXX TODO ETC: THIS IS UGLY PLEASE NORMALIZE USE OF VERSIONS -->
 <tr class="heading">
 [% version_headers %]
@@ -536 +535 @@
 
 <!--machines-->
+[%# TODO: isn't this elsewhere? %]
+[% machine_versions = { rb => 0, y => 0, gs => 1, c => 1, rusa => 2, frlg => 2, e => 2, dp => 3 } %]
+[% base_versions = { rby => 'rb', gsc => 'gs', rse => 'rusa', rsefl => 'rusa' } %]
 [% IF moves.machine.size %]
 <tr class="heading"> [% version_headers %] <th colspan="8" class="dextbl_divider"> TMs and HMs </th> </tr>
@@ -542 +544 @@
 <tr class="color[% color %]">
  <td>[% IF move.versions.dp %]<a href="[% dex_uri('pokemon', this.name) %]/backtrace/[% MoveData.$moveid.name | lower %]"><img src="/dex-images/tree.png" alt="Chains" title="Breeding chains"/></a>[% END %]</td>
-[%         IF generation == 0 %]
- <td colspan="[% move_columns_inv.y ? 2 : 1 %]">[% IF move.versions.rb; tm_name(MoveTMs.$moveid.0); END %]</td>
-[%         END %]
-[%         IF generation <= 1 %]
- <td colspan="[% move_columns_inv.c ? 2 : 1 %]">[% IF move.versions.gs; tm_name(MoveTMs.$moveid.1); END %]</td>
-[%         END %]
-[%         IF generation <= 2 %]
- <td colspan="[% move_columns_inv.frlg ? 2 : 1 %]">[% IF move.versions.rusa; tm_name(MoveTMs.$moveid.2); END %]</td>
-[%         END %]
-[%         IF generation <= 3 %]
- <td>[% IF move.versions.dp; tm_name(MoveTMs.$moveid.3); END %]</td>
-[%         END %]
-[%         FOR g IN [ 5 .. 3 ] %]
-[%-            IF (g == 0 && move.versions.rb) || (g == 1 && move.versions.gs) || (g == 2 && move.versions.rusa) %]
-[%                 tm_name(MoveTMs.$moveid.$g) %]
-[%             END %]
-  </td>
+[%         FOR ver_col IN header_icons %]
+[%             ver = base_versions.$ver_col || ver_col %]
+    <td class="level"> [% IF move.versions.$ver; tm_short_name(MoveTMs.$moveid.${machine_versions.$ver}); END %] </td>
 [%         END %]
 [%         move_cells(moveid) %]

veekun/trunk/templates/style/dex.tt

@@ -84 +84 @@
   .dex-table .number { width: 2em; text-align: center; }
   .dex-table .tm { width: 6em; text-align: center; }
-  .dex-table .level { text-align: center; }
+  .dex-table .level { text-align: center; white-space: nowrap; }
   .dex-table th.level { width: 2em; }  /* colspan does weird things to tds with widths */
   .dex-table .levels{ width: 5em; text-align: center; }

veekun/trunk/templates/wrapper.tt

@@ -31 +31 @@
 <script type="text/javascript" src="/script/dexsuggest.js"></script>
 [% FOREACH js IN extra_js %]
-<script type="text/javascript" src="/script/[% js %]"></script>
+<script type="text/javascript" src="/script/[% js %].js"></script>
 [% END %]
 </head>