}
form > ul > li > label + * {
/* td */
- width: 32em;
+ width: 40em;
}
+.multiinput,
input,select {
box-sizing: border-box;
flex-grow: 1;
#thumbpreview {
width: 300px;
align-self: start;
+ flex-shrink: 0;
}
ul.popup {
}
.inline .inline {
display: flex;
+ margin: 0;
+}
+.inline.multiinput {
+ flex-wrap: wrap;
+}
+.multiinput > input {
+ width: 10em;
}
#nav > ul,
pg_enable_utf8 => 1,
});
} or Abort('Database error', 501, $@);
+$db->abstract->{array_datatypes}++;
+
+my $user = eval {
+ if (defined $post{username}) {
+ $cookie{login} = EncodeURI(join ':', @post{qw( username pass )});
+ }
+ elsif (exists $fields{logout}) {
+ require CGI::Cookie;
+ if (AddCookie(CGI::Cookie->new(
+ -name => 'login',
+ -value => '',
+ -path => '/writer',
+ -expires => 'now',
+ )->as_string)) {
+ delete $cookie{login};
+ die "Logged out as requested\n";
+ }
+ Alert("Failed to log out", "Login cookie could not be removed.");
+ }
+
+ my $cookiedata = $cookie{login} or return;
+ my ($name, $key) = split /[:\v]/, DecodeURI($cookiedata);
+ my %rowmatch = (username => $name, pass => $key);
+ my $found = $db->select(login => '*', \%rowmatch)->hash
+ or die "Invalid user or password\n";
+ eval {
+ require CGI::Cookie;
+ my $httpcookie = CGI::Cookie->new(
+ -name => 'login',
+ -value => join(':', @{$found}{qw( username pass )}),
+ -path => '/writer',
+ ) or die "prepared object is empty\n";
+ AddCookie($httpcookie->as_string);
+ } or Abort(["Unable to create login cookie", $@], 403);
+
+ return $found;
+} or do {
+ say '<h1>Login to edit words</h1>';
+ Alert('Access denied', $@) if $@;
+ say '<form action="?" method="post" class="inline"><ul>';
+ my $loginform = bless {%post}, 'Shiar_Sheet::FormRow';
+ say '<li>', $loginform->input(@{$_}), '</li>' for pairs (
+ username => {-label => 'User name'},
+ pass => {-label => 'Password', type => 'password'},
+ );
+ say '<li><input type="submit" value="Login" /></li>';
+ say '</ul></form>';
+ exit;
+};
+
+my %lang = (
+ nl => ["\N{REGIONAL INDICATOR SYMBOL LETTER N}\N{REGIONAL INDICATOR SYMBOL LETTER L}", 'nederlands'],
+ en => ["\N{REGIONAL INDICATOR SYMBOL LETTER G}\N{REGIONAL INDICATOR SYMBOL LETTER B}", 'english'],
+ eo => ['<span style="color:green">★</span>', 'esperanto'],
+ ru => ["\N{REGIONAL INDICATOR SYMBOL LETTER R}\N{REGIONAL INDICATOR SYMBOL LETTER U}", 'русский'],
+);
my @wordcols = pairkeys
my %wordcol = (
- lang => 'Language',
+ lang => {-label => 'Language', -select => {
+ map { $_ => "@{$lang{$_}}" } keys %lang
+ }},
cat => [{-label => 'Category'}, 'ref'],
ref => {-label => 'Reference'},
prio => [
],
cover => {-label => 'Highlighted', type => 'checkbox'},
grade => {-label => 'Order', type => 'number'},
- form => 'Title',
- alt => 'Synonyms',
- wptitle => 'Wikipedia',
- source => 'Image',
- thumb => 'Convert options',
-);
-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>',
+ form => {-label => 'Title'},
+ alt => {-label => 'Synonyms', -multiple => 1},
+ wptitle => {-label => 'Wikipedia'},
+ source => {-label => 'Image'},
+ thumb => {-label => 'Convert options', -multiple => 1},
);
my ($find) = map {{id => $_}} $fields{id} || $Request || ();
if (exists $get{copy}) {
$row = {%{$row}{ qw(prio lang cat) }};
}
-elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
+elsif (defined $post{form}) {{
+ sub parseinput {
+ return if not length $_[0];
+ require Encode;
+ return Encode::decode_utf8($_[0]);
+ }
+
my $replace = $row;
- $row = {%post{keys %wordcol}};
- $_ = length ? $_ : undef for values %{$row};
+ $row = {map { $_ =>
+ ref $wordcol{$_} eq 'HASH' && $wordcol{$_}->{-multiple} ?
+ [ map { parseinput($_) } $post{'@'.$_}->@* ] :
+ scalar parseinput($post{$_})
+ } keys %wordcol};
+
+ if (!$row->{form}) {
+ if ($row->{ref} ne 'delete') {
+ Alert("Empty title",
+ "Confirm removal by setting <em>Reference</em> to <q>delete</q>."
+ );
+ }
+ else {
+ $db->delete(word => $find);
+ Alert("Entry removed");
+ }
+ next;
+ }
eval {
my %res = (returning => '*');
+ $row->{creator} = $user->{id} unless $find;
+ $row->{updated} = ['now()'];
my $query = $find ? $db->update(word => $row, $find, \%res) :
$db->insert(word => $row, \%res);
$row = $query->hash;
next;
};
+ eval {
+ while (my ($lang, $val) = each %post) {
+ my $field = $lang;
+ $lang =~ s/^trans-// or next;
+ $val = parseinput($val) or next;
+ my %subrow = (
+ ref => $row->{id},
+ lang => $lang,
+ form => $val,
+ );
+ $subrow{wptitle} = $1 if $subrow{form} =~ s/\h*\[(.*)\]$//; # [Link] shorthand
+ $db->insert(word => \%subrow);
+ delete $fields{$field};
+ }
+ return 1;
+ } or Alert('Error creating translation entries', $@);
+
my $imgpath = Shiar_Sheet::FormRow::imagepath($row, 'source');
my $reimage = eval {
($row->{source} // '') ne ($replace->{source} // '') or return;
if (-e $imgpath) {
my $xyres = $row->{cover} ? '600x400' : '300x200';
my @cmds = @{ $row->{thumb} // [] };
+ if (my ($cmdarg) = grep { $cmds[$_] eq '-area' } 0 .. $#cmds) {
+ # replace option by permillage crop
+ my @dim = map { $_ / 1000 } split /\D/, $cmds[$cmdarg + 1];
+ splice @cmds, $cmdarg, 2, (
+ -set => 'option:distort:viewport' => sprintf(
+ '%%[fx:w*%s]x%%[fx:h*%s]+%%[fx:w*%s]+%%[fx:h*%s]',
+ ($dim[2] || 1) - $dim[0], # width = x2 - x1
+ ($dim[3] || 1) - $dim[1], # height = y2 - y1
+ @dim[0, 1] # offset = x1,y1
+ ),
+ -distort => SRT => 0, # noop transform to apply viewport
+ );
+ }
@cmds = (
'convert',
-delete => '1--1', -background => 'white',
}}
else {
$row->{prio} //= 1;
+ $row->{lang} //= $user->{editlang}->[0];
$row->{$_} = $get{$_} for keys %get;
}
my $title = $row->{id} ? "entry <small>#$row->{id}</small>" : 'new entry';
package Shiar_Sheet::FormRow {
+ use PLP::Functions 'EscapeHTML';
+
sub input {
my ($row, $col, $attr) = @_;
my $val = $row->{$col} // '';
- $val = '{'.join(',', map {s/,/\\,/gr} @{$val}).'}' if ref $val eq 'ARRAY';
my $html = '';
$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>',
);
}
);
}
else {
+ my $multiple = ref $val eq 'ARRAY' || $attr->{-multiple};
return (
(map {
sprintf('<label for="%s">%s</label>', $col, $_)
} $attr->{-label} // ()),
+ $multiple ? '<span class="inline multiinput">' : (),
+ (map {
+ sprintf('<input name="%s" value="%s" />', $col, EscapeHTML($_))
+ } ref $val eq 'ARRAY' ? @{$val} : ()),
sprintf('<input id="%s" name="%1$s" value="%s"%s />',
- $col, PLP::Functions::EscapeHTML($val), $html
+ $col, $multiple ? '' : EscapeHTML($val), $html
),
+ $multiple ? '</span>' : (),
(map {
sprintf '<img id="%spreview" src="/%s" alt="%s"%s />',
$col, $_, $row->{form}, $col eq 'source' ? ' hidden' : '';
sub imagepath {
my ($row, $col) = @_;
return "data/word/org/$row->{id}.jpg" if $col eq 'source';
- return "data/word/eng/$row->{form}.jpg" if $col eq 'thumb';
+ return "data/word/en/$row->{form}.jpg" if $col eq 'thumb';
return;
}
}
say '</p></li>';
}
-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});
+if (not $row->{ref}) {
+ printf '<li><label for="%s">%s</label><div><ul class="inline" id="%1$s">',
+ 'trans', 'Translations';
+ my @children = !$row->{id} ? () :
+ $db->select(word => '*', {ref => $row->{id}}, 'lang, id')->hashes;
+ while (my ($lang, $val) = each %fields) {
+ $lang =~ s/^trans-// or next;
+ push @children, { lang => $lang, form => $val };
+ }
+ my %existing = map { $_->{lang} => 1 } $row, @children;
+ $existing{$_} or push @children, { lang => $_ } for @{$user->{editlang}};
+
+ for my $ref (@children) {
+ printf(
+ '<li><label for="%s" title="%3$s">%s </label>',
+ "trans-$ref->{lang}", @{$lang{ $ref->{lang} }}, # flag, name
+ );
+ printf(
+ $ref->{id} ? '<a id="%s" href="%s">%s</a></li>' :
+ '<input id="%s" name="%1$s" value="%3$s" />',
+ "trans-$ref->{lang}", "/writer/$ref->{id}", Entity($ref->{form} // ''),
+ );
}
say '</ul></div></li>';
}
<:
say '<ul>';
-my $parents = $db->select(word => '*', {id => $row->{cat}});
+my $parents = $db->select(word => '*', [{id => $row->{cat}}, {id => $row->{ref}}]);
while (my $ref = $parents->hash) {
printf '<li><a href="/writer/%d">%s</a></li>', $ref->{id}, Entity($ref->{form});
}
say "<li><strong>$row->{form}</strong></li>";
-my $children = $db->select(word => '*', {cat => $row->{id}}, 'grade, id');
+my $children = $db->select(word => '*', {cat => $row->{id}, ref => undef}, 'grade, id');
while (my $ref = $children->hash) {
printf '<li><a href="/writer/%d">%s</a></li>', $ref->{id}, Entity($ref->{form});
}
git.shiar.nl / sheet.git / blobdiff