display: table;
border-spacing: 0 2px;
}
-form > ul li {
+form > ul > li {
display: table-row;
}
-form > ul li > * {
+form > ul > li > * {
display: table-cell;
padding-right: .5em;
}
-form > ul li > label {
+form > ul > li > label {
/* th */
text-align: right;
}
-form > ul li > label + * {
+form > ul > li > label + * {
/* td */
width: 32em;
}
-form > ul li > p input {
+input,select {
box-sizing: border-box;
- width: 100%;
+ flex-grow: 1;
+}
+input:not([type=submit]) {
padding: .4rem;
font-family: monospace;
}
-form > ul li img {
- max-width: 300px;
+input[type=number] {
+ max-width: 7em;
+}
+select {
+ padding: .3rem .2rem; /* TODO: input */
+}
+#thumbpreview {
+ width: 300px;
+ align-self: start;
}
ul.popup {
}
.inline {
display: inline-flex;
- align-items: start;
+ align-items: baseline;
margin: 0 -1ex; /* inner gap */
}
.inline > * {
display: flex;
}
-#nav {
- -margin-left: 1em; /* flex gap */
-}
#nav > ul,
#nav > ul strong,
#nav form {
}
</style>
-<script>
-document.addEventListener('DOMContentLoaded', () => {
- var wpinput = document.getElementById('wptitle');
- var wpbutton = wpinput.parentNode.appendChild(document.createElement('button'));
- wpbutton.type = 'button';
- wpbutton.append('Copy');
- wpbutton.onclick = () => {
- let wptitle = wpinput.value || document.getElementById('form').value;
- let wplang = document.getElementById('lang').value.substr(0, 2); // crude iso-639-3→2
- let wpapi = `https://${wplang}.wikipedia.org/w/api.php`;
- let wppage = wpapi+'?action=parse&format=json&origin=*&prop=text&page='+wptitle;
- fetch(wppage).then(res => res.json()).then(json => {
- if (json.error) throw `error returned: ${json.error.info}`;
- wpinput.value = json.parse.title;
- let imginput = document.getElementById('source');
- if (imginput.value) return;
- let wpimages = json.parse.text['*'].match(/<img\s[^>]+>/g);
- let wpselect = wpinput.parentNode.appendChild(document.createElement('ul'));
- wpselect.className = 'popup';
- wpimages.forEach(img => {
- let selectitem = wpselect.appendChild(document.createElement('li'));
- selectitem.insertAdjacentHTML('beforeend', img);
- selectitem.onclick = e => {
- let imgsrc = e.target.src
- .replace(/^(?=\/\/)/, 'https:')
- .replace(/\/thumb(\/.+)\/[^\/]+$/, '$1');
- imginput.value = imgsrc;
- wpselect.remove();
- return false;
- };
- });
- }).catch(error => alert(error));
- return false;
- };
-});
-</script>
+<script src="/writer.js"></script>
EOT
});
my @wordcols = (
lang => 'Language',
cat => 'Category',
- form => 'Translation',
+ ref => undef, # included with cat
+ grade => undef, # "
+ prio => 'Level',
+ cover => undef, # included with prio
+ form => 'Title',
alt => 'Synonyms',
wptitle => 'Wikipedia',
- source => 'Image URL',
+ source => 'Image',
thumb => 'Convert options',
- prio => 'Level',
- ref => 'Reference',
+);
+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 $imgpath = "data/word/org/$row->{id}.jpg";
- if (($row->{source} // '') ne ($replace->{source} // '')) {
+ my $reimage = eval {
+ ($row->{source} // '') ne ($replace->{source} // '') or return;
# copy changed remote url to local file
unlink $imgpath if -e $imgpath;
- if (my $download = $row->{source}) {
- require LWP::UserAgent;
- my $ua = LWP::UserAgent->new;
- $ua->agent('/');
- my $status = $ua->mirror($download, $imgpath);
- $status->is_success or Alert([
- "Source image not found",
- "Download from <q>$download</q> failed: ".$status->status_line,
- ]);
- }
- }
- elsif ($row->{thumb} ~~ $replace->{thumb}) {
- # image and conversion unaltered
- $imgpath = undef;
- }
+ my $download = $row->{source} or return 1;
+ require LWP::UserAgent;
+ my $ua = LWP::UserAgent->new;
+ $ua->agent('/');
+ my $status = $ua->mirror($download, $imgpath);
+ $status->is_success
+ or die "Download from <q>$download</q> failed: ".$status->status_line."\n";
+ };
+ !$@ or Alert(["Source image not found", $@]);
+
+ $reimage ||= $row->{thumb} ~~ $replace->{thumb}; # different convert
+ $reimage ||= $row->{cover} ~~ $replace->{cover}; # resize
+ $reimage++ if $fields{rethumb}; # force refresh
my $thumbpath = "data/word/eng/$row->{form}.jpg";
- if ($imgpath) {
+ if ($reimage) {
if (-e $imgpath) {
+ my $xyres = $row->{cover} ? '600x400' : '300x200';
my @cmds = @{ $row->{thumb} // [] };
@cmds = (
'convert',
-delete => '1--1', -background => 'white',
-gravity => @cmds ? 'northwest' : 'center',
@cmds,
- -resize => '300x200^', -extent => '300x200',
+ -resize => "$xyres^", -extent => $xyres,
'-strip', -quality => '60%', -interlace => 'plane',
$imgpath => $thumbpath
);
- my $status = system @cmds;
- $status == 0 or Alert([
+ eval {
+ require IPC::Run;
+ my $output;
+ IPC::Run::run(\@cmds, '<' => \undef, '>&' => \$output)
+ or die $output ||
+ ($? & 127 ? "signal $?" : "error code ".($? >> 8))."\n";
+ } or Alert([
"Thumbnail image not generated",
- "Failed to convert source image, error code ".($status >> 8),
- ], "@cmds");
+ "Failed to convert source image.",
+ ], "@cmds\n$@");
}
else {
unlink $thumbpath;
<ul>
<:
-for my $col (pairs @wordcols) {
- my $val = $row->{$col->key} // '';
+for my $colinfo (pairs @wordcols) {
+ my ($col, $title) = @{$colinfo};
+ defined $title or next;
+ my $val = $row->{$col} // '';
$val = '{'.join(',', map {s/,/\\,/gr} @{$val}).'}' if ref $val eq 'ARRAY';
- printf '<li><label for="%s">%s</label><p><span class=inline>'
- . '<input id="%1$s" name="%1$s" value="%s" />',
- $col->key, $col->value, Entity($val);
- -e and printf '<img src="/%s" alt="%s" />', $_, $row->{form} for
- $col->key eq 'source' ? "data/word/org/$row->{id}.jpg" :
- $col->key eq 'thumb' ? "data/word/eng/$row->{form}.jpg" :
- ();
- say '</span></p></li>';
+ printf '<li><label for="%s">%s</label><p>', $col, $title;
+ printf '<span class=inline>';
+ if ($col eq 'prio') {
+ printf '<select id="%s" name="%1$s">', $col;
+ printf('<option value="%s"%s>%s</option>',
+ $_, $row->{$col} eq $_ && ' selected', $prioenum[$_]
+ ) for 0 .. $#prioenum;
+ print '</select>';
+ printf(
+ join('',
+ '<label>',
+ '<input id="%1$s" name="%1$s" value="0" type="hidden" />',
+ '<input id="%s" name="%1$s" value="1" type="checkbox"%s>',
+ ' %s</label>',
+ ),
+ 'cover', !!$row->{cover} && ' checked', 'Highlighted'
+ );
+ printf('<label for="%s">%s</label><input id="%1$s" name="%1$s" value="%s" type="number" />',
+ 'grade', 'Order', Entity($row->{grade})
+ );
+ }
+ else {
+ printf '<input id="%s" name="%1$s" value="%s" />', $col, Entity($val);
+ -e and printf '<img id="%spreview" src="/%s" alt="%s" />', $col, $_, $row->{form}
+ for $col eq 'thumb' ? "data/word/eng/$row->{form}.jpg" : ();
+ printf('<label for="%s">%s</label><input id="%1$s" name="%1$s" value="%s" />',
+ 'ref', 'Reference', Entity($row->{ref})
+ ) if $col eq 'cat';
+ }
+ print '</span>';
+ -e and printf('<img id="%spreview" src="/%s" alt="%s" hidden />',
+ $col, $_, $row->{form}
+ ) for $col eq 'source' ? "data/word/org/$row->{id}.jpg" : ();
+ 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});
+ }
+ say '</ul></div></li>';
}
:>
</ul>
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}});
+my $children = $db->select(word => '*', {cat => $row->{id}}, '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