diff options
-rw-r--r-- | data/global.pl | 2 | ||||
-rw-r--r-- | data/lang.txt | 2 | ||||
-rw-r--r-- | data/style.css | 2 | ||||
-rw-r--r-- | lib/VNDB/Handler/Staff.pm | 19 | ||||
-rw-r--r-- | lib/VNDB/Util/LayoutHTML.pm | 4 |
5 files changed, 18 insertions, 11 deletions
diff --git a/data/global.pl b/data/global.pl index b07281b2..b3fd8264 100644 --- a/data/global.pl +++ b/data/global.pl @@ -35,7 +35,7 @@ our %S = (%S, ch_size => [ 256, 300 ], # max. w*h of char images cv_size => [ 256, 400 ], # max. w*h of cover images # bit flags (Flag 8 was used for charedit, currently free for re-use) - permissions => {qw| board 1 boardmod 2 edit 4 tag 16 dbmod 32 tagmod 64 usermod 128 affiliate 256 |}, + permissions => {qw| board 1 boardmod 2 edit 4 staffedit 8 tag 16 dbmod 32 tagmod 64 usermod 128 affiliate 256 |}, languages => [qw|ar cs da de en es fi fr he hu id it ja ko nl no pl pt-br pt-pt ro ru sk sv tr uk vi zh|], producer_types => [qw|co in ng|], discussion_boards => [qw|an db ge v p u|], # <- note that some properties of these boards are hard-coded diff --git a/data/lang.txt b/data/lang.txt index 7e32b2af..c219a707 100644 --- a/data/lang.txt +++ b/data/lang.txt @@ -5427,7 +5427,7 @@ en : Gender en : Language :_staff_aliases -en : Aliases +en : [quant,_1,Alias,Aliases] :_staff_links en : Links diff --git a/data/style.css b/data/style.css index 5dd6dcaf..10fd8051 100644 --- a/data/style.css +++ b/data/style.css @@ -578,6 +578,8 @@ div.staffbrowse { padding-bottom: 10px } .staffdesc p { padding: 0 5px; } .staffroles td { padding-left: 20px; padding-right: 20px; } .staffroles td.tc2 { min-width: 100px; } +table.aliases td { padding: 0 5px; } +table.aliases td.key { padding: 0 5px 0 0; } /***** Staff display *****/ diff --git a/lib/VNDB/Handler/Staff.pm b/lib/VNDB/Handler/Staff.pm index 4daf5d89..008dbf96 100644 --- a/lib/VNDB/Handler/Staff.pm +++ b/lib/VNDB/Handler/Staff.pm @@ -67,13 +67,16 @@ sub page { end; if (@{$s->{aliases}}) { Tr; - td class => 'key', mt '_staff_aliases'; + td class => 'key', mt('_staff_aliases', scalar @{$s->{aliases}}); td; - p; + table class => 'aliases'; foreach my $alias (@{$s->{aliases}}) { - txt $alias->{name}; - txt ' ('.$alias->{original}.')' if $alias->{original}; - br; + Tr class => 'nostripe'; + td $alias->{original} ? () : (colspan => 2), class => 'key'; + txt $alias->{name}; + end; + td $alias->{original} if $alias->{original}; + end; } end; end; @@ -101,13 +104,13 @@ sub page { # description div class => 'staffdesc'; - if($s->{desc}) { + if($s->{desc}) { h2 mt '_staff_bio'; p; lit bb2html $s->{desc}, 0, 1; end; br; - } + } if (@{$s->{roles}}) { h2 mt '_staff_credits'; @@ -201,7 +204,7 @@ sub edit { return $self->resNotFound if $sid && !$s->{id}; $rev = undef if !$s || $s->{cid} == $s->{latest}; - return $self->htmlDenied if !$self->authCan('edit') + return $self->htmlDenied if !$self->authCan('staffedit') || $sid && (($s->{locked} || $s->{hidden}) && !$self->authCan('dbmod')); my %b4 = !$sid ? () : ( diff --git a/lib/VNDB/Util/LayoutHTML.pm b/lib/VNDB/Util/LayoutHTML.pm index 128a18c7..e51ec998 100644 --- a/lib/VNDB/Util/LayoutHTML.pm +++ b/lib/VNDB/Util/LayoutHTML.pm @@ -103,7 +103,9 @@ sub _menu { if($self->authCan('edit')) { a href => '/v/add', mt '_menu_addvn'; br; a href => '/p/new', mt '_menu_addproducer'; br; - a href => '/s/new', mt '_menu_addstaff'; br; + if($self->authCan('staffedit')) { + a href => '/s/new', mt '_menu_addstaff'; br; + } a href => '/c/new', mt '_menu_addcharacter'; br; } br; |