diff options
author | Holger Cremer <HolgerCremer@gmail.com> | 2018-08-27 19:38:11 +0200 |
---|---|---|
committer | Holger Cremer <HolgerCremer@gmail.com> | 2018-08-27 19:38:11 +0200 |
commit | 8f2ba2050ee78d0e4a47f1277c6bc4422d06170c (patch) | |
tree | c008d2878905e03df7a8bf8bd3330762cc2d8f43 /data/templates/aliases | |
parent | bb55e121576a5b5d225bfc68c5062f386cc32db9 (diff) | |
parent | 3fc3ea6c6df237dbdf48d14703118b747bf5d647 (diff) | |
download | serial-barcode-scanner-8f2ba2050ee78d0e4a47f1277c6bc4422d06170c.tar.bz2 |
Merge branch 'master' into better_inventory
Conflicts:
README
data/templates/products/entry.html
docker/Dockerfile
docker/init.sh
src/database/database.vala
src/database/db-interface.vala
src/pdf-stock/Makefile
src/pdf-stock/pdf-stock-interface.vala
src/pdf-stock/pdf-stock.vala
src/web/Makefile
src/web/main.vala
templates/menu.html
templates/products/index.html
Diffstat (limited to 'data/templates/aliases')
-rw-r--r-- | data/templates/aliases/index.html | 19 | ||||
-rw-r--r-- | data/templates/aliases/new.html | 14 |
2 files changed, 33 insertions, 0 deletions
diff --git a/data/templates/aliases/index.html b/data/templates/aliases/index.html new file mode 100644 index 0000000..0bf026a --- /dev/null +++ b/data/templates/aliases/index.html @@ -0,0 +1,19 @@ +<table class="sortable table table-bordered table-striped table-condensed"> + <thead> + <tr><th>EAN</th><th>Real EAN</th></th><th>Name</th></tr> + </thead> + <tbody> + {{{DATA}}} + </tbody> +</table> + +<div id="newalias" style="display: {{{NEWALIAS}}};"> + <legend>New Alias</legend> + <form action="/aliases/new" class="form-inline"> + <div class="form-group"> + <input class="form-control" name="ean" type="number" min="0" placeholder="EAN" /> + <input class="form-control" name="real_ean" type="number" min="0" placeholder="Real EAN (existing product)" /> + <button type="submit" class="form-control btn btn-primary"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span></button> + </div> + </form> +</div> diff --git a/data/templates/aliases/new.html b/data/templates/aliases/new.html new file mode 100644 index 0000000..34b610e --- /dev/null +++ b/data/templates/aliases/new.html @@ -0,0 +1,14 @@ +<h2>Add new product alias</h2> + +<div id="new-successful" class="alert alert-success" style="display: {{{NEW.OK}}};"> + <p>Successfully created new alias: {{{EAN}}} ➜ {{{REAL_EAN}}}</p> +</div> + +<div id="new-failed" class="alert alert-error" style="display: {{{NEW.FAIL}}};"> + <h4>Error</h4> + Creating new product alias failed. Please make sure + you have sufficient permissions and gave valid values + for EAN and real EAN. +</div> + +<a href=".">Back to alias list</a> |