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/users/import-pgp.html | |
| 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/users/import-pgp.html')
| -rw-r--r-- | templates/users/import-pgp.html | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/templates/users/import-pgp.html b/templates/users/import-pgp.html deleted file mode 100644 index 57a5d64..0000000 --- a/templates/users/import-pgp.html +++ /dev/null @@ -1,22 +0,0 @@ -<h2>Import PGP Keys</h2> - -<div style="display: {{{STEP1}}}"> - <form action="#" method="POST" enctype="multipart/form-data" class="form-horizontal"> - <div class="control-group"> - <label class="control-label" for="file">Archive File (zip, tar.gz, ...) containing PGP keys</label> - <div class="controls"> - <input type="file" accept="text/csv" name="file"></input> - <input type="hidden" name="step" value="1"></input> - </div> - </div> - - <button class="btn btn-primary" type="submit">Import</button> - </form> -</div> - - -<div style="display: {{{STEP2}}}"> - <p>The following keys have been found in the archive and imported into the keyring:</p> - - {{{DATA}}} -</div> |