DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 21:54:14 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fixed stupid import layouts

Browse source
This commit is contained in:
snipe 2020-08-24 21:15:46 -07:00
parent 3cba174dfb
commit 53c46ac8de
No known key found for this signature in database
GPG key ID: 10BFFDA3ED34B5AC
4 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/js/build/app.js
View file

Binary file not shown.

BIN
public/js/dist/all.js vendored
View file

Binary file not shown.

4
public/mix-manifest.json
View file

@ -1,5 +1,5 @@
{ {
"/js/build/app.js": "/js/build/app.js?id=8715ab471d8cf08149b1", "/js/build/app.js": "/js/build/app.js?id=041c2c23e0a7e285999d",
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=59413334823616b81341", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=59413334823616b81341",
"/css/build/app.css": "/css/build/app.css?id=3911a887c2bdc7d0b528", "/css/build/app.css": "/css/build/app.css?id=3911a887c2bdc7d0b528",
"/css/build/overrides.css": "/css/build/overrides.css?id=688f59cd273484405f9b", "/css/build/overrides.css": "/css/build/overrides.css?id=688f59cd273484405f9b",
@ -34,5 +34,5 @@
"/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=a534edb9f7179f6dcf62", "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=a534edb9f7179f6dcf62",
"/js/build/vendor.js": "/js/build/vendor.js?id=ac70ab5fd89efc2aa7d0", "/js/build/vendor.js": "/js/build/vendor.js?id=ac70ab5fd89efc2aa7d0",
"/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=9407782198cbc29f23d1", "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=9407782198cbc29f23d1",
"/js/dist/all.js": "/js/dist/all.js?id=f638419977412eeef732" "/js/dist/all.js": "/js/dist/all.js?id=451bd5a52c473c82fd71"
} }

27
resources/assets/js/components/importer/importer-file.vue
View file

@ -5,11 +5,9 @@ tr {
</style> </style>
<template> <template>
<div v-show="processDetail"> <div v-show="processDetail" class="col-md-6 col-md-offset-3">
<div class="row"> <div class="row">
<div class="col-md-2"></div>
<div class="col-md-8" style="padding-top: 30px; margin: 0 auto;">
<div class="dynamic-form-row"> <div class="dynamic-form-row">
<div class="col-md-5 col-xs-12"> <div class="col-md-5 col-xs-12">
<label for="import-type">Import Type:</label> <label for="import-type">Import Type:</label>
@ -21,6 +19,7 @@ tr {
</div> </div>
</div> </div>
</div> </div>
<div class="row">
<div class="dynamic-form-row"> <div class="dynamic-form-row">
<div class="col-md-5 col-xs-12"> <div class="col-md-5 col-xs-12">
<label for="import-update">Update Existing Values?</label> <label for="import-update">Update Existing Values?</label>
@ -29,7 +28,8 @@ tr {
<input type="checkbox" class="minimal" name="import-update" v-model="options.update"> <input type="checkbox" class="minimal" name="import-update" v-model="options.update">
</div> </div>
</div> </div>
</div>
<div class="row">
<div class="dynamic-form-row"> <div class="dynamic-form-row">
<div class="col-md-5 col-xs-12"> <div class="col-md-5 col-xs-12">
<label for="send-welcome">Send Welcome Email for new Users?</label> <label for="send-welcome">Send Welcome Email for new Users?</label>
@ -38,6 +38,8 @@ tr {
<input type="checkbox" class="minimal" name="send-welcome" v-model="options.send_welcome"> <input type="checkbox" class="minimal" name="send-welcome" v-model="options.send_welcome">
</div> </div>
</div> </div>
</div>
<div class="row">
<div class="dynamic-form-row"> <div class="dynamic-form-row">
<div class="col-md-5 col-xs-12"> <div class="col-md-5 col-xs-12">
@ -47,7 +49,8 @@ tr {
<input type="checkbox" class="minimal" name="run-backup" v-model="options.run_backup"> <input type="checkbox" class="minimal" name="run-backup" v-model="options.run_backup">
</div> </div>
</div> </div>
</div>
<div class="row">
<div class="alert col-md-8 col-md-offset-2" style="text-align:left" <div class="alert col-md-8 col-md-offset-2" style="text-align:left"
:class="alertClass" :class="alertClass"
v-if="statusText"> v-if="statusText">
@ -55,18 +58,16 @@ tr {
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-2"></div> <div class="col-md-12" style="padding-top: 30px;">
<div class="col-md-8" style="padding-top: 30px;">
<div class="col-md-4 text-right"><h4>Header Field</h4></div> <div class="col-md-4 text-right"><h4>Header Field</h4></div>
<div class="col-md-4"><h4>Import Field</h4></div> <div class="col-md-4 text-left"><h4>Import Field</h4></div>
<div class="col-md-4"><h4>Sample Value</h4></div> <div class="col-md-4 text-left"><h4>Sample Value</h4></div>
</div> </div>
</div> </div>
<template v-for="(header, index) in file.header_row"> <template v-for="(header, index) in file.header_row">
<div class="row"> <div class="row">
<div class="col-md-2"></div> <div class="col-md-12">
<div class="col-md-8">
<div class="col-md-4 text-right"> <div class="col-md-4 text-right">
<label :for="header" class="control-label">{{ header }}</label> <label :for="header" class="control-label">{{ header }}</label>
</div> </div>
@ -77,7 +78,7 @@ tr {
</select2> </select2>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-4 text-left">
<p class="form-control-static">{{ activeFile.first_row[index] }}</p> <p class="form-control-static">{{ activeFile.first_row[index] }}</p>
</div> </div>
</div> </div>
@ -92,7 +93,7 @@ tr {
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="alert col-md-8 col-md-offset-2" style="padding-top: 20px;" <div class="alert col-md-12" style="padding-top: 20px;"
:class="alertClass" :class="alertClass"
v-if="statusText"> v-if="statusText">
{{ this.statusText }} {{ this.statusText }}