word edit: flags in language selection

[sheet.git] / writer.plp

diff --git a/writer.plp b/writer.plp
index ca27e214615983c44ce04cfacf2d0b5c000643fa..ef377a0afb0db329026956ff5548ed68c012e4ba 100644 (file)
--- a/writer.plp
+++ b/writer.plp
@@ -105,25 +105,32 @@ my $db = eval {
        });
 } or Abort('Database error', 501, $@);
 
-my @wordcols = (
-       lang    => 'Language',
-       cat     => 'Category',
-       ref     => undef, # included with cat
-       grade   => undef, # "
-       prio    => 'Level',
-       cover   => undef, # included with prio
+my %lang = (
+       nld => ["\N{REGIONAL INDICATOR SYMBOL LETTER N}\N{REGIONAL INDICATOR SYMBOL LETTER L}", 'dutch'],
+       eng => ["\N{REGIONAL INDICATOR SYMBOL LETTER G}\N{REGIONAL INDICATOR SYMBOL LETTER B}", 'english'],
+       epo => ['<span style="color:green">★</span>', 'esperanto'],
+);
+my @wordcols = pairkeys
+my %wordcol = (
+       lang    => {-label => 'Language', -select => {
+               map { $_ => "@{$lang{$_}}" } keys %lang
+       }},
+       cat     => [{-label => 'Category'}, 'ref'],
+       ref     => {-label => 'Reference'},
+       prio    => [
+               {-label => 'Level', -select => [qw(
+                       essential basic common distinctive rare invisible
+               )]},
+               'cover', 'grade',
+       ],
+       cover   => {-label => 'Highlighted', type => 'checkbox'},
+       grade   => {-label => 'Order', type => 'number'},
        form    => 'Title',
        alt     => 'Synonyms',
        wptitle => 'Wikipedia',
        source  => 'Image',
        thumb   => 'Convert options',
 );
-my @prioenum = qw( essential basic common distinctive rare invisible );
-my %langflag = (
-       nld => "\N{REGIONAL INDICATOR SYMBOL LETTER N}\N{REGIONAL INDICATOR SYMBOL LETTER L}",
-       eng => "\N{REGIONAL INDICATOR SYMBOL LETTER G}\N{REGIONAL INDICATOR SYMBOL LETTER B}",
-       epo => '<span style="color:green">★</span>',
-);
 my ($find) = map {{id => $_}} $fields{id} || $Request || ();
 
 my $row;
@@ -137,7 +144,7 @@ if (exists $get{copy}) {
 }
 elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
        my $replace = $row;
-       $row = {%post{ pairkeys @wordcols }};
+       $row = {%post{keys %wordcol}};
        $_ = length ? $_ : undef for values %{$row};
 
        eval {
@@ -215,11 +222,14 @@ package Shiar_Sheet::FormRow {
                $html .= qq( $_="$attr->{$_}") for sort grep {!/^-/} keys %{$attr // {}};
 
                if (my $options = $attr->{-select}) {
+                       $options = { map {$_ => $options->[$_]} 0 .. $#{$options} }
+                               if ref $options eq 'ARRAY';
+                       $options->{$val} //= "unknown ($val)";  # preserve current
                        return (
                                sprintf('<select id="%s" name="%1$s">', $col),
                                (map { sprintf('<option value="%s"%s>%s</option>',
-                                       $_, $val eq $_ && ' selected', $options->[$_]
-                               ) } 0 .. $#{$options}),
+                                       $_, $val eq $_ && ' selected', $options->{$_}
+                               ) } sort keys %{$options}),
                                '</select>',
                        );
                }
@@ -267,20 +277,14 @@ bless $row, 'Shiar_Sheet::FormRow';
 <input id="id" name="id" value="<:= $row->{id} // '' :>" type="hidden" />
 <ul>
 <:
-for my $colinfo (pairs @wordcols) {
-       my ($col, $title) = @{$colinfo};
-       defined $title or next;
+for my $col (@wordcols) {
+       my $info = $wordcol{$col} or next;
+       my ($attr, @span) = ref $info eq 'ARRAY' ? @{$info} : $info;
+       my $title = ref $attr ? delete $attr->{-label} : $attr;
        printf '<li><label for="%s">%s</label><p>', $col, $title;
                printf '<span class=inline>';
-       if ($col eq 'prio') {
-               print $row->input($col => {-select => \@prioenum});
-               print $row->input(cover => {type => 'checkbox', -label => 'Highlighted'});
-               print $row->input(grade => {type => 'number', -label => 'Order'});
-       }
-       else {
-               print $row->input($col);
-               print $row->input(ref => {-label => 'Reference'}) if $col eq 'cat';
-       }
+               print $row->input($col => $attr);
+               print $row->input($_ => delete $wordcol{$_}) for @span;
                print '</span>';
        say '</p></li>';
 }
@@ -289,9 +293,12 @@ if ($row->{id}) {
        my $children = $db->select(word => '*', {ref => $row->{id}}, 'lang, id');
        printf '<li><label>%s</label><div><ul class="inline">', 'Translations';
        while (my $row = $children->hash) {
-               printf '<li><label for="%s">%s</label> <a id="%1$s" href="%s">%s</a></li>',
-                       "trans-$row->{lang}", $langflag{$row->{lang}},
-                       "/writer/$row->{id}", Entity($row->{form});
+               printf(
+                       '<li><label for="%1$s" title="%5$s">%4$s</label>' .
+                               ' <a id="%s" href="%s">%s</a></li>',
+                       "trans-$row->{lang}", "/writer/$row->{id}", Entity($row->{form}),
+                       @{$lang{ $row->{lang} }}, # flag, name
+               );
        }
        say '</ul></div></li>';
 }