Changeset 236

Timestamp:

06/12/07 23:49:02 (3 years ago)

Author:

eevee

Message:

Finished <link> thing, I guess. (#64)

Location:

veekun/trunk

Files:

• lib/Vee/Controller/Dex.pm (modified) (7 diffs)
• lib/Vee/Controller/Gallery.pm (modified) (2 diffs)
• templates/dex/page/ability.tt (modified) (1 diff)
• templates/dex/page/item.tt (modified) (1 diff)
• templates/dex/page/move.tt (modified) (1 diff)
• templates/dex/page/pokemon.tt (modified) (1 diff)
• templates/dex/page/pokemon/flavor.tt (modified) (1 diff)
• templates/wrapper.tt (modified) (1 diff)

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

@@ -43 +43 @@
     
     $s->{extra_css} = ['dex'];
+    $s->{nav}{help} = $c->uri_for('/dex');
 
     # TODO: kinda hacky!  move this elsewhere, where it won't leak?
@@ -277 +278 @@
     ];
 
-    add_rel_links(
-        $c,
+    add_rel_links( $c,
         ($row->id - 2) % $#AbilityNames + 1,
         ($row->id + 0) % $#AbilityNames + 1,
@@ -417 +417 @@
     ];
 
-    add_rel_links(
-        $c,
+    add_rel_links( $c,
         ($row->id - 2) % $Generations[-1]{maxid} + 1,
         ($row->id + 0) % $Generations[-1]{maxid} + 1,
@@ -765 +764 @@
     ];
 
-    add_rel_links(
-        $c,
+    add_rel_links( $c,
         ($row->id - 2) % $Generations[-1]{maxid} + 1,
         ($row->id + 0) % $Generations[-1]{maxid} + 1,
@@ -850 +848 @@
     ];
 
-    add_rel_links(
-        $c,
+    add_rel_links( $c,
         ($row->id - 2) % $#MoveData + 1,
         ($row->id + 0) % $#MoveData + 1,
@@ -1116 +1113 @@
     ];
 
-    add_rel_links(
-        $c,
+    add_rel_links( $c,
         ($row->id - 2) % $#ItemNames + 1,
         ($row->id + 0) % $#ItemNames + 1,
@@ -1248 +1244 @@
     my $s = $c->stash;
 
-    $s->{nav_start} = $generator->(1);
-    $s->{nav_prev}  = $generator->($prev)  if defined $prev;
-    $s->{nav_next}  = $generator->($next)  if defined $next;
+    $s->{nav}{start} = $generator->(1);
+    $s->{nav}{prev}  = $generator->($prev) if defined $prev;
+    $s->{nav}{next}  = $generator->($next) if defined $next;
 }
 

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

@@ -4 +4 @@
 use warnings;
 use base 'Catalyst::Controller';
+
+use Image::Size;
 
 =head1 NAME
@@ -44 +46 @@
     my $s = $c->stash;
 
-    $s->{template} = 'gallery/upload.tt';
+    if ($c->req->method ne 'POST') {
+        $s->{template} = 'gallery/upload.tt';
+        return;
+    }
+
+    # from here on down is actual uploady logic
+    my $upload = $c->req->upload('file');
+    my ($width, $height, $type) = imgsize($upload->fh);
+
+    # TODO: check that it's one of a few basic types; sanity-check physical size and filesize; etc
+    $c->vee_abort("Uploaded file ", $upload->filename, " is not a recognized image.")
+        if not $width or not $height;
+
+    # TODO: errors
+    # TODO: filename
+    my $filename = $upload->filename;
+    $upload->copy_to( $c->path_to('root', 'uploads', $filename) );
+
+    system 'convert', qw(-resize 100x100),  # TODO: config?
+        $c->path_to('root', 'uploads',           $filename),
+        $c->path_to('root', 'uploads', 'thumbs', $filename);
+
+    my $new_obj = $c->model('DBIC::Gallery')->create({
+        creatorid  => 3,
+        filename   => $upload->filename,
+        uploaderid => $c->user->obj->id,
+        time       => time,
+        hash => '',
+        title => $upload->filename,
+        description => $upload->filename,
+        height => $height,
+        width => $width,
+        type => 'colored',
+    });
+
+    $c->flash->{success_msg} = "Successfully uploaded " . $c->vee_cleanse($upload->filename) . "!";
+
+    # $c->res->redirect('/gallery/whatever/$new_obj');
+    $c->res->redirect($c->uri_for('/gallery'));
 }
 

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

@@ -2 +2 @@
 
 <p class="dex-navigation">
-    <a href="[% nav_next.url %]" class="next blocklink"> Next: #[% nav_next.id %]<br/>[% nav_next.title %] </a>
-    <a href="[% nav_prev.url %]" class="prev blocklink"> Prev: #[% nav_prev.id %]<br/>[% nav_prev.title %] </a>
+    <a href="[% nav.next.url %]" class="next blocklink"> Next: #[% nav.next.id %]<br/>[% nav.next.title %] </a>
+    <a href="[% nav.prev.url %]" class="prev blocklink"> Prev: #[% nav.prev.id %]<br/>[% nav.prev.title %] </a>
     [% this.id %]<br/>[% this.name %]
 </p>

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

@@ -2 +2 @@
 
 <p class="dex-navigation">
-    <a href="[% nav_next.url %]" class="next blocklink"> [% item_sprite(nav_next.title) %] Next:<br/>[% nav_next.title %] </a>
-    <a href="[% nav_prev.url %]" class="prev blocklink"> [% item_sprite(nav_prev.title) %] Prev:<br/>[% nav_prev.title %] </a>
+    <a href="[% nav.next.url %]" class="next blocklink"> [% item_sprite(nav.next.title) %] Next:<br/>[% nav.next.title %] </a>
+    <a href="[% nav.prev.url %]" class="prev blocklink"> [% item_sprite(nav.prev.title) %] Prev:<br/>[% nav.prev.title %] </a>
     [% item_sprite(this.name) %]<br/>[% this.display_name %]
 </p>

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

@@ -2 +2 @@
 
 <p class="dex-navigation">
-    <a href="[% nav_next.url %]" class="next blocklink"> Next: #[% nav_next.id %]<br/>[% nav_next.title %] </a>
-    <a href="[% nav_prev.url %]" class="prev blocklink"> Prev: #[% nav_prev.id %]<br/>[% nav_prev.title %] </a>
+    <a href="[% nav.next.url %]" class="next blocklink"> Next: #[% nav.next.id %]<br/>[% nav.next.title %] </a>
+    <a href="[% nav.prev.url %]" class="prev blocklink"> Prev: #[% nav.prev.id %]<br/>[% nav.prev.title %] </a>
     [% this.id %]<br/>[% this.name %]
 </p>

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

@@ -4 +4 @@
 
 <p class="dex-navigation">
-    <a href="[% nav_next.url %]" class="next blocklink"> <img src="/dex-images/icons/[% nav_next.id.pad(3) %].png" alt=""/> Next: #[% nav_next.id %]<br/>[% nav_next.title %] </a>
-    <a href="[% nav_prev.url %]" class="prev blocklink"> <img src="/dex-images/icons/[% nav_prev.id.pad(3) %].png" alt=""/> Previous: #[% nav_prev.id %]<br/>[% nav_prev.title %] </a>
+    <a href="[% nav.next.url %]" class="next blocklink"> <img src="/dex-images/icons/[% nav.next.id.pad(3) %].png" alt=""/> Next: #[% nav.next.id %]<br/>[% nav.next.title %] </a>
+    <a href="[% nav.prev.url %]" class="prev blocklink"> <img src="/dex-images/icons/[% nav.prev.id.pad(3) %].png" alt=""/> Previous: #[% nav.prev.id %]<br/>[% nav.prev.title %] </a>
     <img src="/dex-images/icons/ani/[% image_name %].gif" alt=""/><br/>[% this.name %]
 </p>

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

@@ -1 +1 @@
 [% PROCESS 'dex/common.tt' %]
 
-[% nextid = this.id % Generations.-1.maxid + 1; previd = (this.id - 2) % Generations.-1.maxid + 1 -%]
-[% nav_next = { title => PokemonNames.$nextid, url => dex_uri('pokemon', PokemonNames.$nextid) _ '/flavor' } %]
-[% nav_prev = { title => PokemonNames.$previd, url => dex_uri('pokemon', PokemonNames.$previd) _ '/flavor' } %]
-
 <p class="dex-navigation">
-    <a href="[% nav_next.url %]" class="next blocklink"> <img src="/dex-images/icons/[% nav_next.id.pad(3) %].png" alt=""/> Next: #[% nav_next.id %]<br/>[% nav_next.title %] </a>
-    <a href="[% nav_prev.url %]" class="prev blocklink"> <img src="/dex-images/icons/[% nav_prev.id.pad(3) %].png" alt=""/> Previous: #[% nav_prev.id %]<br/>[% nav_prev.title %] </a>
+    <a href="[% nav.next.url %]" class="next blocklink"> <img src="/dex-images/icons/[% nav.next.id.pad(3) %].png" alt=""/> Next: #[% nav.next.id %]<br/>[% nav.next.title %] </a>
+    <a href="[% nav.prev.url %]" class="prev blocklink"> <img src="/dex-images/icons/[% nav.prev.id.pad(3) %].png" alt=""/> Previous: #[% nav.prev.id %]<br/>[% nav.prev.title %] </a>
     <img src="/dex-images/icons/ani/[% this.id.pad(3) %].gif" alt=""/><br/>[% this.name %]
 </p>

veekun/trunk/templates/wrapper.tt

@@ -26 +26 @@
 <link rel="up" href="[% crumbs.-2.match('href="(.+?)"').0 %]" title="[% crumbs.-2.match('>(.+)<').0 %]"/>
 [% END %]
-[% FOR dir IN ['next','prev','start'] %]
-[%     var = "nav_$dir" %]
-[%     IF $var %]
-<link rel="[% dir %]" href="[% $var.url %]" title="[% $var.title %]"/>
-[%     END %]
+[% FOR rel IN nav.keys %]
+<link rel="[% rel %]" href="[% nav.$rel.url %]" title="[% nav.$rel.title %]"/>
 [% END %]
 <script type="text/javascript" src="/script/jquery.js"></script>