Stupid comments - like I can keep track of everything I change...

git-svn-id: svn://vndb.org/vndb@5 1fe2e327-d9db-4752-bcf7-ef0cb4a1748b

4 files changed, 10 insertions, 9 deletions

diff --git a/data/tpl/defs.pl b/data/tpl/defs.pl
index b68faab0..44ce3121 100644
--- a/data/tpl/defs.pl
+++ b/data/tpl/defs.pl
@@ -300,9 +300,8 @@ my %formerr_exeptions = (
   usrexists  => 'Username already exists, please choose an other one',
   mailexists => 'There already is a user with that email address, please request a new password if you forgot it',
   nomail     => 'No user found with that email address',
-  nojpeg     => 'Image is not in JPEG format!',
+  nojpeg     => 'Image is not in JPEG or PNG format!',
   toolarge   => 'Image is too large (in filesize), try to compress it a little',
-  imgsize    => 'Image is too large (in height/width), try to resize it a little',
 );
 sub formerr {
   my @err = ref $_[0] eq 'ARRAY' ? @{$_[0]} : ();
diff --git a/data/tpl/vnbrowse b/data/tpl/vnbrowse
index 79dd122e..27aa78b7 100644
--- a/data/tpl/vnbrowse
+++ b/data/tpl/vnbrowse
@@ -15,7 +15,7 @@
 <div id="lfilter">
  <b>Languages</b> (none selected means all)<br />
 [[ for (sort keys %{$d{lang}}) { next if !$d{lang}{$_}; ]]-
- <input type="checkbox" name="lang_[[= $_ ]]" id="lang_[[= $_ ]]" value="1" -[[= $d{slang}=~/$_/?'checked="checked"':'' ]]>
+ <input type="checkbox" name="lang_[[= $_ ]]" id="lang_[[= $_ ]]" value="1" -[[= $d{slang}=~/$_/?'checked="checked"':'' ]] />
   <label for="lang_[[= $_ ]]">[[: $VNDB::LANG->{$_} ]]- ([[= $d{lang}{$_} ]])</label>
 [[ } ]]-
 </div>
@@ -70,7 +70,7 @@
   <td class="tc2">Released [[= sortbut($url, 'released') ]]</td>
   <td class="tc3">Languages</td>
   <td class="tc4">Rating [[= sortbut($url, 'votes') ]]</td>
- </thead></tr>
+ </tr></thead>
  [[ for (@{$d{vn}}) {
   $_->{c_votes} =~ s#^([0-9]{2}.[0-9]{2})\|([0-9]{4})$#$1 == 0 ? sprintf '- (%d)', $2 : sprintf '%.2f (%d)', $1, $2#e;
   $_->{c_released} =~ s#^([0-9]{4})([0-9]{2}).+#$1==0?'N/A':$1==9999?'TBA':(($2&&$2>0?($Time::CTime::MoY[$2-1].' '):'').$1)#e;
diff --git a/data/tpl/vnedit b/data/tpl/vnedit
index f3ae245c..3f5c6700 100644
--- a/data/tpl/vnedit
+++ b/data/tpl/vnedit
@@ -64,13 +64,13 @@
 
  { type => 'sub', title => 'Image', short => 'img' },
  $d{id} ? (
-   { type => 'static', text => $d{vn}{image} ?
+   { type => 'static', text => $d{vn}{image} > 0 ?
     sprintf '<img src="%s/cv/%02d/%d.jpg" style="float: right" />', $p{st}, $d{vn}{image}%50, $d{vn}{image} :
-    'No image uploaded yet...' },
+    $d{vn}{image} < 0 ? '[processing]' : 'No image uploaded yet...' },
  ) : (),
  { type => 'upload', name => $d{vn}{image} ? 'Change' : 'Upload', short => 'img' },
  { type => 'static', text => q|
-   Preferably the cover of the CD/DVD/package. Image must be in JPEG format and at most 256x400px and 50KB.<br /><br />| },
+   Preferably the cover of the CD/DVD/package. Image must be in JPEG or PNG format and at most 500kB. Images larger than 256x400 will automatically be resized.<br /><br />| },
  { type => 'check', short => 'img_nsfw', name => '<b>NSFW.</b> Please check this option if the image contains nudity, gore, or is otherwise not safe in a work-friendly environment.' },
 
  { type => 'sub', title => 'Visual novel relations', short => 'rel' },
diff --git a/data/tpl/vnpage b/data/tpl/vnpage
index 15cb3235..1cfdd89a 100644
--- a/data/tpl/vnpage
+++ b/data/tpl/vnpage
@@ -22,7 +22,7 @@
   [ l_cisv     => 'CISVisual link', sub { $_[0] ? '<a href="http://cisvisual.net/title/'.$_[0].'">'.$_[0].'</a>' : 'No link' } ], 
   [ categories => 'Categories',     sub { join(' ', map { $VNDB::CAT->{substr($_->[0],0,1)}[1]{substr($_->[0],1,2)}.'('.$_->[1].')' } sort { $a->[0] cmp $b->[0] } @{$_[0]}) || 'No categories selected' }, 1 ],
   [ relations  => 'Relations',      sub { join("<br />\n", map { $VNDB::VREL->[$_->{relation}].': '._hchar($_->{title}) } sort { $a->{id} <=> $b->{id} } @{$_[0]}) } ],
-  [ image      => 'Image',          sub { $_[0] ? sprintf '<img src="%s/cv/%02d/%d.jpg" />', $p{st}, $_[0]%50, $_[0] : 'No image'; } ],
+  [ image      => 'Image',          sub { $_[0] > 0 ? sprintf '<img src="%s/cv/%02d/%d.jpg" />', $p{st}, $_[0]%50, $_[0] : $_[0] < 0 ? '[processing]' : 'No image'; } ],
   [ img_nsfw   => 'NSFW',           sub { $_[0] ? 'Not safe' : 'Safe' } ]
  ) ]]
 [[ } ]]-
@@ -40,12 +40,14 @@
 
 <div id="vnheader">
 <div>
-[[ if($d{vn}{image}) { ]]
+[[ if($d{vn}{image} > 0) { ]]
  [[ if($d{vn}{img_nsfw} && !$p{AuthNsfw}) { ]]
   <img src="[[: $p{st} ]]/cv/nsfw.png" id="nsfw" class="[[: $p{st} ]]/cv/[[= sprintf '%02d/%d', $d{vn}{image}%50, $d{vn}{image} ]].jpg" />
  [[ } else { ]]
   <img src="[[: $p{st} ]]/cv/[[= sprintf '%02d/%d', $d{vn}{image}%50, $d{vn}{image} ]].jpg" alt="[[: $p{PageTitle} ]]" />
  [[ } ]]
+[[ } elsif($d{vn}{image} < 0) { ]]-
+ [processing image, please return in a few minutes]
 [[ } else { ]]-
  No image uploaded yet...
 [[ } ]]-