version => '1.0',
nocache => 1,
raw => <<'EOT',
-<style>
-dl {
- display: inline-grid;
- grid: auto-flow / min-content repeat(10, auto);
-}
-
-form > ul {
- display: table;
- border-spacing: 0 2px;
-}
-form > ul > li {
- display: table-row;
-}
-form > ul > li > * {
- display: table-cell;
- padding-right: .5em;
-}
-form > ul > li > label {
- /* th */
- text-align: right;
-}
-form > ul > li > label + * {
- /* td */
- width: 40em;
-}
-
-.multiinput,
-input,select {
- box-sizing: border-box;
- flex-grow: 1;
-}
-input:not([type=submit]) {
- padding: .4rem;
- font-family: monospace;
-}
-input[type=number] {
- max-width: 7em;
-}
-select {
- padding: .3rem .2rem; /* TODO: input */
-}
-#thumbpreview {
- width: 300px;
- align-self: start;
- flex-shrink: 0;
-}
-
-ul.popup {
- display: flex;
- flex-wrap: wrap;
- align-items: end;
- position: fixed;
- left: 0;
- top: 0;
- margin: auto;
- max-height: 90%;
- max-width: 90%;
- overflow: auto;
- background: rgba(0, 0, 0, .8);
- border: 1px solid #CCC;
-}
-
-h1 {
- margin-bottom: 1ex;
-}
-.inline {
- display: inline-flex;
- align-items: baseline;
- margin: 0 -1ex; /* inner gap */
-}
-.inline > * {
- margin: 0 1ex;
-}
-.inline .inline {
- display: flex;
- margin: 0;
-}
-.inline.multiinput {
- flex-wrap: wrap;
-}
-.multiinput > input {
- width: 10em;
-}
-
-#nav > ul,
-#nav > ul strong,
-#nav form {
- margin: 1ex 0;
- display: inline-block;
-}
-</style>
-
+<link rel="stylesheet" type="text/css" media="all" href="/editor.css" />
<script src="/writer.js"></script>
EOT
});
use List::Util qw( pairs pairkeys );
my $db = eval {
- my @dbinfo = (
- 'DBI:Pg:dbname=sheet;host=localhost', 'sheetadmin', 'fairuse',
- ) or die "database not configured\n";
- require DBIx::Simple;
- DBIx::Simple->new(@dbinfo[0..2], {
- RaiseError => 1,
- pg_enable_utf8 => 1,
- });
+ require Shiar_Sheet::DB;
+ Shiar_Sheet::DB->connect;
} or Abort('Database error', 501, $@);
-$db->abstract->{array_datatypes}++;
my $user = eval {
if (defined $post{username}) {
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}", 'русский'],
+ la => ["\N{PUSHPIN}", 'latin'],
);
my @wordcols = pairkeys
my %wordcol = (
cat => [{-label => 'Category'}, 'ref'],
ref => {-label => 'Reference'},
prio => [
- {-label => 'Level', -select => [qw(
- essential basic common distinctive rare invisible
- )]},
+ {-label => 'Level', -select => sub {
+ my ($row) = @_;
+ my @enum = qw[ essential basic common distinctive optional invisible ];
+ return {
+ ('' => 'parent') x (defined $row->{ref}),
+ map { $_ => $enum[$_] } 0 .. $#enum
+ };
+ }},
'cover', 'grade',
],
cover => {-label => 'Highlighted', type => 'checkbox'},
source => {-label => 'Image'},
thumb => {-label => 'Convert options', -multiple => 1},
);
-my ($find) = map {{id => $_}} $fields{id} || $Request || ();
+if (my $search = $fields{q}) {
+ my %filter = (form => {ilike => '%'.$search.'%'});
+ my $results = $db->select(word => '*', \%filter);
+ say '<h1>Search</h1><ul>';
+ printf("<li><small>%s</small> %s %s</li>\n",
+ $_->{id}, showlink($_->{form}, "/writer/$_->{id}"),
+ sprintf('<img src="/%s" style="height:3ex; width:auto" />', Shiar_Sheet::FormRow::imagepath($_ => 'thumb')) x defined $_->{thumb}
+ ) for $results->hashes;
+ say "</ul>\n";
+ exit;
+}
+
+my ($find) = map {{id => $_}} $fields{id} || $Request || ();
my $row;
if ($find) {
$row = $db->select(word => '*', $find)->hash
while (my ($lang, $val) = each %post) {
my $field = $lang;
$lang =~ s/^trans-// or next;
- $db->insert(word => {
+ $val = parseinput($val) or next;
+ my %subrow = (
ref => $row->{id},
lang => $lang,
- form => $_,
- }) for parseinput($val);
+ form => $val,
+ prio => undef,
+ );
+ $subrow{wptitle} = $1 if $subrow{form} =~ s/\h*\[(.*)\]$//; # [Link] shorthand
+ $subrow{alt} = [split m{/}, $1] if $subrow{form} =~ s{/(\S.*)}{}; # /alternates shorthand
+ $db->insert(word => \%subrow);
delete $fields{$field};
}
return 1;
}
@cmds = (
'convert',
+ $imgpath,
-delete => '1--1', -background => 'white',
- -gravity => @cmds ? 'northwest' : 'center',
+ -gravity => defined $row->{thumb} ? 'northwest' : 'center',
@cmds,
-resize => "$xyres^", -extent => $xyres,
'-strip', -quality => '60%', -interlace => 'plane',
- $imgpath => $thumbpath
+ $thumbpath
);
eval {
require IPC::Run;
}
}}
else {
- $row->{prio} //= 1;
$row->{lang} //= $user->{editlang}->[0];
$row->{$_} = $get{$_} for keys %get;
+ $row->{prio} = defined $row->{ref} ? undef : 1 unless exists $row->{prio};
}
my $title = $row->{id} ? "entry <small>#$row->{id}</small>" : 'new entry';
$html .= qq( $_="$attr->{$_}") for sort grep {!/^-/} keys %{$attr // {}};
if (my $options = $attr->{-select}) {
- $options = { map {$_ => $options->[$_]} 0 .. $#{$options} }
- if ref $options eq 'ARRAY';
+ $options = $options->(@_) if ref $options eq 'CODE';
$options->{$val} //= "unknown ($val)"; # preserve current
return (
sprintf('<select id="%s" name="%1$s">', $col),
sub imagepath {
my ($row, $col) = @_;
return "data/word/org/$row->{id}.jpg" if $col eq 'source';
- return "data/word/en/$row->{form}.jpg" if $col eq 'thumb';
+ return "data/word/en/$row->{id}.jpg" if $col eq 'thumb';
return;
}
}
git.shiar.nl / sheet.git / blobdiff