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 /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 'templates/aliases')
| -rw-r--r-- | templates/aliases/index.html | 17 | ||||
| -rw-r--r-- | templates/aliases/new.html | 14 |
2 files changed, 0 insertions, 31 deletions
diff --git a/templates/aliases/index.html b/templates/aliases/index.html deleted file mode 100644 index c914968..0000000 --- a/templates/aliases/index.html +++ /dev/null @@ -1,17 +0,0 @@ -<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}}};"> - <form action="/aliases/new" class="form-horizontal"> - <legend>New Alias</legend> - <input class="input-medium" name="ean" type="number" min="0" placeholder="EAN" /> - <input class="input-medium" name="real_ean" type="number" min="0" placeholder="Real EAN" /> - <button type="submit" class="btn btn-primary"><i class="icon-plus"></i></button> - </form> -</div> diff --git a/templates/aliases/new.html b/templates/aliases/new.html deleted file mode 100644 index 34b610e..0000000 --- a/templates/aliases/new.html +++ /dev/null @@ -1,14 +0,0 @@ -<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> |