nextcloud/passman
1
1
Fork 0
mirror of https://github.com/nextcloud/passman.git synced 2025-09-14 00:44:52 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix outer generic csv importer css

Browse source 
Signed-off-by: binsky <timo@binsky.org>
This commit is contained in:
binsky 2023-05-07 19:08:53 +02:00
parent b830167d10
commit 2f9dc21dac
5 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
css/app.css
View file

@ -1276,10 +1276,10 @@ h3 {
.setting-group input[type="text"], .setting-group input[type="password"], .setting-group textarea {
width: 100%; }
.setting-group.margin-bottom-25 {
.setting-group.margin-bottom-25, .margin-bottom-25 {
margin-bottom: 25px; }
.setting-group.margin-bottom-10 {
.setting-group.margin-bottom-10, .margin-bottom-10 {
margin-bottom: 10px; }
.display-grid {
@ -1295,7 +1295,7 @@ h3 {
label[for=confirmVaultPWChange] {
margin-bottom: 10px; }
label[for=confirmVaultDelete] {
label[for=confirmVaultDelete], label[for=skipFirstRow] {
margin-top: 10px;
margin-bottom: 10px; }

2
css/app.css.map
View file

File diff suppressed because one or more lines are too long

2
js/templates.js
View file

@ -63,7 +63,7 @@ angular.module('views/partials/forms/settings/general_settings.html', []).run(['
angular.module('views/partials/forms/settings/generic_csv_import.html', []).run(['$templateCache', function($templateCache) {
'use strict';
$templateCache.put('views/partials/forms/settings/generic_csv_import.html',
'<div ng-controller="GenericCsvImportCtrl"><div class="row"><div class="col-xs-12 col-md-3"><div>{{ \'select.csv\' | translate}} <input type="file" file-select accept=".csv" success="csvLoaded"></div><div ng-show="parsed_csv"><span translate="parsed.csv.rows" translate-value-rows="{{ parsed_csv.length }}"></span></div><div ng-show="parsed_csv"><input type="checkbox" ng-model="skipFirstRow"> {{ \'skip.first.row\' | translate}}</div><div ng-show="import_fields.indexOf(\'label\') === -1 && parsed_csv"><b>{{ \'import.csv.label.req\' | translate}}</b></div><div ng-show="import_fields.indexOf(\'label\') !== -1 && parsed_csv"><button class="btn btn-success" ng-disabled="importing" ng-click="startCSVImport()"><i class="fa fa-spinner fa-spin" ng-show="importing"></i> {{ (importing) ? (\'import.importing\' | translate) : (\'import.start\' | translate) }}</button></div><div><div ng-if="import_progress.progress > 0">{{ \'upload.progress\' | translate}}<div progress-bar="import_progress.progress" index="import_progress.loaded" total="import_progress.total"></div></div></div><div><div ng-if="log" class="import_log"><textarea id="import_log" auto-scroll="log">{{log.join(\'\\n\')}}</textarea></div></div></div><div class="col-xs-12 col-md-9" ng-show="parsed_csv"><b>{{ \'first.five.lines\' | translate }}</b><br>{{ \'assign.column\' | translate }}<div class="import-table-outter"><table class="import-table"><tr ng-repeat="line in parsed_csv | limitTo:5"><td class="inspect"><i class="fa fa-search" ng-click="inspectCredential(line)" ng-if="($index > 0 && matched && import_fields.length > 0) || ($index >= 0 && !matched && import_fields.length > 0)"></i></td><td ng-repeat="prop in line track by $index">{{line[$index]}}</td></tr><tr ng-repeat="line in parsed_csv | limitTo:1"><td></td><td ng-repeat="prop in line track by $index"><select ng-model="import_fields[$index]" ng-change="updateExample()" ng-options="property.prop as property.label for property in credentialProperties"></select></td></tr></table></div><div ng-show="inspected_credential && import_fields.length > 0"><b>{{ \'example.credential\' | translate}}</b><div credential-template="inspected_credential" show-label></div></div></div></div></div>');
'<div ng-controller="GenericCsvImportCtrl"><div class="row margin-bottom-25"><div class="col-xs-12 col-md-3"><div>{{ \'select.csv\' | translate}} <input type="file" file-select accept=".csv" success="csvLoaded"></div><div ng-show="parsed_csv"><span translate="parsed.csv.rows" translate-value-rows="{{ parsed_csv.length }}"></span></div><div ng-show="parsed_csv"><input id="skipFirstRow" class="checkbox" type="checkbox" ng-model="skipFirstRow"> <label for="skipFirstRow">{{\'skip.first.row\' | translate}}</label></div><div ng-show="import_fields.indexOf(\'label\') === -1 && parsed_csv"><b>{{ \'import.csv.label.req\' | translate}}</b></div><div ng-show="import_fields.indexOf(\'label\') !== -1 && parsed_csv"><button class="btn btn-success" ng-disabled="importing" ng-click="startCSVImport()"><i class="fa fa-spinner fa-spin" ng-show="importing"></i> {{ (importing) ? (\'import.importing\' | translate) : (\'import.start\' | translate) }}</button></div><div><div ng-if="import_progress.progress > 0">{{ \'upload.progress\' | translate}}<div progress-bar="import_progress.progress" index="import_progress.loaded" total="import_progress.total"></div></div></div><div><div ng-if="log" class="import_log"><textarea id="import_log" auto-scroll="log">{{log.join(\'\\n\')}}</textarea></div></div></div></div><div class="row"><div class="col-xs-12 display-grid" ng-show="parsed_csv"><b>{{ \'first.five.lines\' | translate }}</b><br>{{ \'assign.column\' | translate }}<div class="import-table-outter"><table class="import-table"><tr ng-repeat="line in parsed_csv | limitTo:5"><td class="inspect"><i class="fa fa-search" ng-click="inspectCredential(line)" ng-if="($index > 0 && matched && import_fields.length > 0) || ($index >= 0 && !matched && import_fields.length > 0)"></i></td><td ng-repeat="prop in line track by $index">{{line[$index]}}</td></tr><tr ng-repeat="line in parsed_csv | limitTo:1"><td></td><td ng-repeat="prop in line track by $index"><select ng-model="import_fields[$index]" ng-change="updateExample()" ng-options="property.prop as property.label for property in credentialProperties"></select></td></tr></table></div><div ng-show="inspected_credential && import_fields.length > 0"><b>{{ \'example.credential\' | translate}}</b><div credential-template="inspected_credential" show-label></div></div></div></div></div>');
}]);
angular.module('views/partials/forms/settings/import.html', []).run(['$templateCache', function($templateCache) {

6
sass/settings.scss
View file

@ -98,10 +98,10 @@ h3 {
width: 100%;
}
}
.setting-group.margin-bottom-25 {
.setting-group.margin-bottom-25, .margin-bottom-25 {
margin-bottom: 25px;
}
.setting-group.margin-bottom-10 {
.setting-group.margin-bottom-10, .margin-bottom-10 {
margin-bottom: 10px;
}
.display-grid {
@ -117,7 +117,7 @@ h3 {
label[for=confirmVaultPWChange] {
margin-bottom: 10px;
}
label[for=confirmVaultDelete] {
label[for=confirmVaultDelete], label[for=skipFirstRow] {
margin-top: 10px;
margin-bottom: 10px;
}

9
templates/views/partials/forms/settings/generic_csv_import.html
View file

@ -1,5 +1,5 @@
<div ng-controller="GenericCsvImportCtrl">
<div class="row">
<div class="row margin-bottom-25">
<div class="col-xs-12 col-md-3">
<div>{{ 'select.csv' | translate}}
<input type="file" file-select accept=".csv"
@ -11,7 +11,8 @@
</span>
</div>
<div ng-show="parsed_csv">
<input type="checkbox" ng-model="skipFirstRow"> {{ 'skip.first.row' | translate}}
<input id="skipFirstRow" class="checkbox" type="checkbox" ng-model="skipFirstRow">
<label for="skipFirstRow">{{'skip.first.row' | translate}}</label>
</div>
<div ng-show="import_fields.indexOf('label') === -1 && parsed_csv">
<b>{{ 'import.csv.label.req' | translate}}</b>
@ -31,7 +32,9 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-9" ng-show="parsed_csv">
</div>
<div class="row">
<div class="col-xs-12 display-grid" ng-show="parsed_csv">
<b>{{ 'first.five.lines' | translate }}</b><br />
{{ 'assign.column' | translate }}
<div class="import-table-outter">