nextcloud
/
contacts
mirror of https://github.com/nextcloud/contacts
0
0
Fork 0
Code Issues Releases Wiki Activity

Block sidebar on import 

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2017-08-15 12:04:05 +02:00
parent 1374491541
commit 87b24fac9c
No known key found for this signature in database
GPG Key ID: FB5ACEED51955BF8
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
css/public/style.scss
View File

@ -1,3 +1,7 @@
#app-navigation {
position: relative;
}
.contactdetails__header {
height: 100px;
padding-left: 20px;
@ -816,3 +820,11 @@ detailsitem .select2-container {
background: $color-primary;
transition: 500ms all ease-in-out;
}
#importscreen-sidebar-block {
position: absolute;
width: 100%;
height: 100%;
background: #fff;
z-index: 500;
opacity: 0.5;
}

2
js/components/contactImport/contactImport_directive.js
View File

@ -13,12 +13,14 @@ angular.module('contactsApp')
ctrl.importText = ctrl.t.importingText;
ctrl.loadingClass = 'icon-loading-small';
ctrl.importing = true;
$rootScope.importing = true;
ContactService.import.call(ContactService, reader.result, file.type, ctrl.selectedAddressBook, function (progress, user) {
if (progress === 1) {
ctrl.importText = ctrl.t.importText;
ctrl.loadingClass = 'icon-upload';
ctrl.importing = false;
$rootScope.importing = false;
ImportService.importPercent = 0;
ImportService.importing = false;
ImportService.importedUser = '';

1
templates/main.php
View File

@ -28,6 +28,7 @@ vendor_style('select2/select2');
<div id="app" ng-app="contactsApp">
<div id="app-navigation">
<div id="importscreen-sidebar-block" class="icon-loading" ng-show="$root.importing"></div>
<newContactButton></newContactButton>
<ul groupList></ul>