Skip to content

Addressbooklist in a popover #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
irgendwie merged 19 commits into from
Mar 31, 2017
Merged

Addressbooklist in a popover #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d4a6101
Added popover menu in addressbook list
skjnldsv Jan 24, 2017
54b4c1c
Fixed build and old debug
skjnldsv Jan 24, 2017
3c7ba0f
Add enough size for the popover to be displayed
skjnldsv Jan 25, 2017
6ea9d37
Merge similar properties
skjnldsv Jan 25, 2017
3385282
Fix tests
skjnldsv Jan 25, 2017
a63392b
Css flex fix and various design flaws
skjnldsv Feb 12, 2017
e093981
Upload button margin fix
skjnldsv Feb 12, 2017
e10cf0c
Fix sharee design layout and buttons
skjnldsv Feb 12, 2017
638dbcc
icon opacity
skjnldsv Feb 12, 2017
1c2502e
Button popover width fix
skjnldsv Feb 13, 2017
1f19605
Design fix opacity
skjnldsv Feb 13, 2017
5b8d161
Share into popover and copy to clipboard
skjnldsv Feb 14, 2017
666a87a
Test fix ngclipboard
skjnldsv Feb 14, 2017
6960c76
Fix link clipboard, fix design and fix tooltips
skjnldsv Feb 18, 2017
cc00c24
Share list design fix
skjnldsv Feb 18, 2017
229e28e
Share select design fix
skjnldsv Feb 19, 2017
00efd01
Prevent settings from sliding down
skjnldsv Feb 19, 2017
b01385b
Share list absolute fix
skjnldsv Feb 19, 2017
bf9a8f1
Translation fix
skjnldsv Feb 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,9 @@ appstore:
$(project_directory)/js/vendor/angular-bootstrap/ui-bootstrap-tpls.min.js \
$(project_directory)/js/vendor/angular-sanitize/angular-sanitize.js \
$(project_directory)/js/vendor/ui-select/dist/select.js \
$(project_directory)/js/vendor/jquery-timepicker/jquery.ui.timepicker.js
$(project_directory)/js/vendor/jquery-timepicker/jquery.ui.timepicker.js \
$(project_directory)/js/vendor/angular-click-outside/clickoutside.directive.js \
$(project_directory)/js/vendor/ngclipboard/dist/ngclipboard.min.js

# Command for running JS and PHP tests. Works for package.json files in the js/
# and root directory. If phpunit is not installed systemwide, a copy is fetched
Expand Down
4 changes: 3 additions & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@
"angular-uuid4": "0.3.1",
"jquery-timepicker": "883bb2cd94",
"ui-select": "angular-ui/ui-select#0.14.9",
"vcard": "0.2.7"
"vcard": "0.2.7",
"angular-click-outside": "^2.10.1",
"ngclipboard": "^1.1.1"
},
"devDependencies": {
"angular-mocks": "1.5.8",
Expand Down
110 changes: 84 additions & 26 deletions css/public/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@
display: flex;
flex-shrink: 0;
}
.contactdetails__header #contact-failed-save {
animation: pulse 1.5s infinite;
border-radius: 50%;
}
/* fix placeholder color */
.contactdetails__header .contactdetails__name::-webkit-input-placeholder,
.contactdetails__header .contactdetails__org::-webkit-input-placeholder,
Expand Down Expand Up @@ -300,8 +304,11 @@ avatar.failed {
}

/* addressbook settings */
ul.addressBookList li {
ul.addressBookList > li {
padding: 6px 0;
display: flex;
align-items: center;
flex-wrap: wrap;
}

ul.addressBook-share-list {
Expand All @@ -310,11 +317,42 @@ ul.addressBook-share-list {
}

ul.addressBook-share-list li {
margin-left: 15px;
padding: 0 5px;
display: inline-flex;
align-items: center;
}

ul.addressBook-share-list li .icon {
margin-right: 5px;
opacity: .2;
}

ul.addressBook-share-list li .utils {
display: flex;
}

/* override core apps css */
#app-navigation ul.addressBookList > li span.utils {
position: relative;
padding: 0;
flex-shrink: 0;
height: 20px;
}

ul.addressBookList li .utils .popovermenu {
margin-top: 0;
margin-right: -5px;
}

#app-navigation ul.addressBookList li .utils .popovermenu li > button {
width: 100%;
}

ul.addressBookList li .action > span {
padding: 10px 14px;
display: inline-block;
opacity: 0.5;
width: 24px;
height: 20px;
}

ul.addressBookList li .action > a {
Expand All @@ -323,11 +361,16 @@ ul.addressBookList li .action > a {

div.addressBookShares ul.dropdown-menu {
border: 1px solid #ddd;
border-radius: 3px;
width: 229px;
height: 200px;
margin-top: -5px;
overflow: scroll;
border-radius: 0 0 3px 3px;
max-height: 200px;
margin-top: -2px;
overflow-y: auto;
display: flex;
flex-wrap: wrap;
position: absolute;
background-color: #fff;
width: 100%;
z-index: 500;
}

div.addressBookShares ul.dropdown-menu li > a {
Expand All @@ -337,7 +380,7 @@ div.addressBookShares ul.dropdown-menu li > a {
}

ul.dropdown-menu li.active {
background: #eee;
background: #f0f0f0;
}

div.app-contacts span.utils {
Expand All @@ -346,39 +389,59 @@ div.app-contacts span.utils {
position: relative !important;
}

input.newAddressBookInput, input.shareeInput, input.addressBookUrl {
.addressBookUrlContainer {
width: 100%;
position: relative;
}

input.newAddressBookInput,
input.shareeInput,
input.addressBookUrl {
width: 100% !important;
margin-right: 0;
padding-right: 30px;
text-overflow: ellipsis;
}

.addressBookList form {
position: relative;
width: 100%;
}
.newAddressBookSubmit {

addressBookList input[type='submit'].inline-button,
addressBookList input[type='button'].inline-button {
position: absolute;
right: 0;
top: 0;
padding: 6px 13px;
padding: 6px 15px;
background-color: transparent;
border: none;
opacity: .5;
margin-right: 0;
cursor: pointer;
}

ul.addressBookList li[addressbook] > span.addressBookName {
width: 105px;
width: calc(100% - 52px); /* -actions width */
overflow: hidden;
white-space:nowrap;
text-overflow: ellipsis;
padding-left: 7px;
display: inline-block;
}

li.addressBook-share-item span.shareeIdentifier {
max-width: 50px;
ul.addressBookList li[addressbook] > .addressBookShares {
width: 100%;
}

li.addressBook-share-item span.shareeIdentifier,
li.calendar-share-item span.shareeIdentifier {
width: 100%;
overflow:hidden;
white-space:nowrap;
text-overflow:ellipsis;
display: inline-block;
vertical-align: top;
opacity: 0.5;
}

#app-settings-content #upload.button {
Expand All @@ -387,9 +450,8 @@ li.addressBook-share-item span.shareeIdentifier {
padding-left: 34px;
background-position: 10px center;
text-align: left;
margin: 0;
display: block;
margin-bottom: 10px;
display: block;
}


Expand Down Expand Up @@ -506,19 +568,11 @@ contactlist .tooltip {
opacity: .5;
}

ul.addressBookList li {
margin-bottom: 5px;
}

ul.addressBook-share-list {
margin-top: 8px;
margin-bottom: 12px;
}

ul.addressBook-share-list li {
margin-left: 15px;
}

#app-navigation .utils .action span {
cursor: pointer !important;
}
Expand Down Expand Up @@ -622,3 +676,7 @@ detailsitem .select2-container {
#app-navigation-toggle-back {
display: none;
}

.icon-group {
background-image: url('../../img/group.svg');
}
4 changes: 4 additions & 0 deletions img/group.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
60 changes: 52 additions & 8 deletions js/components/addressBook/addressBook_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,42 @@ angular.module('contactsApp')

ctrl.t = {
download: t('contacts', 'Download'),
showURL:t('contacts', 'Show URL'),
shareAddressbook: t('contacts', 'Share Addressbook'),
deleteAddressbook: t('contacts', 'Delete Addressbook'),
copyURL: t('contacts', 'Copy URL'),
clickToCopy: t('contacts', 'Click to copy the URL into your clipboard'),
shareAddressbook: t('contacts', 'Toggle share'),
deleteAddressbook: t('contacts', 'Delete'),
shareInputPlaceHolder: t('contacts', 'Share with users or groups'),
delete: t('contacts', 'Delete'),
canEdit: t('contacts', 'can edit')
canEdit: t('contacts', 'can edit'),
close: t('contacts', 'Close')
};

ctrl.showUrl = false;
/* globals oc_config */
ctrl.tooltipIsOpen = false;
ctrl.tooltipTitle = ctrl.t.clickToCopy;
ctrl.showInputUrl = false;

ctrl.clipboardSuccess = function() {
ctrl.tooltipIsOpen = true;
ctrl.tooltipTitle = t('core', 'Copied!');
_.delay(function() {
ctrl.tooltipIsOpen = false;
ctrl.tooltipTitle = ctrl.t.clickToCopy;
}, 3000);
};

ctrl.clipboardError = function() {
ctrl.showInputUrl = true;
if (/iPhone|iPad/i.test(navigator.userAgent)) {
ctrl.InputUrlTooltip = t('core', 'Not supported!');
} else if (/Mac/i.test(navigator.userAgent)) {
ctrl.InputUrlTooltip = t('core', 'Press ⌘-C to copy.');
} else {
ctrl.InputUrlTooltip = t('core', 'Press Ctrl-C to copy.');
}
$('#addressBookUrl_'+ctrl.addressBook.ctag).select();
};

/* globals oc_config */
function compareVersion(version1, version2) {
for (var i = 0; i < Math.max(version1.length, version2.length); i++) {
var a = version1[i] || 0;
Expand All @@ -32,8 +57,21 @@ angular.module('contactsApp')
ctrl.canExport = compareVersion([9, 0, 2, 0], oc_config.version.split('.'));
/* eslint-enable camelcase */

ctrl.toggleShowUrl = function() {
ctrl.showUrl = !ctrl.showUrl;
ctrl.closeMenus = function() {
$scope.$parent.ctrl.openedMenu = false;
};

ctrl.openMenu = function(index) {
ctrl.closeMenus();
$scope.$parent.ctrl.openedMenu = index;
};

ctrl.toggleMenu = function(index) {
if ($scope.$parent.ctrl.openedMenu === index) {
ctrl.closeMenus();
} else {
ctrl.openMenu(index);
}
};

ctrl.toggleSharesEditor = function() {
Expand Down Expand Up @@ -103,6 +141,12 @@ angular.module('contactsApp')
};

ctrl.onSelectSharee = function (item) {
// Prevent settings to slide down
$('#app-settings-header > button').data('apps-slide-toggle', false);
Copy link
Member Author

@skjnldsv skjnldsv Feb 19, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an ugly trick. But core is broken for popups in the settings area.
Here is the issue: https://github.com/nextcloud/server/blob/25acce7e0d992b10b930472b8138240b7bd9af13/core/js/apps.js#L108

_.delay(function() {
$('#app-settings-header > button').data('apps-slide-toggle', '#app-settings-content');
}, 500);

ctrl.selectedSharee = null;
AddressBookService.share(ctrl.addressBook, item.type, item.identifier, false, false).then(function() {
$scope.$apply();
Expand Down
1 change: 1 addition & 0 deletions js/components/addressBookList/addressBookList_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ angular.module('contactsApp')
var ctrl = this;

ctrl.loading = true;
ctrl.openedMenu = false;

AddressBookService.getAll().then(function(addressBooks) {
ctrl.addressBooks = addressBooks;
Expand Down
2 changes: 1 addition & 1 deletion js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* @copyright Hendrik Leppelsack 2015
*/

angular.module('contactsApp', ['uuid4', 'angular-cache', 'ngRoute', 'ui.bootstrap', 'ui.select', 'ngSanitize'])
angular.module('contactsApp', ['uuid4', 'angular-cache', 'ngRoute', 'ui.bootstrap', 'ui.select', 'ngSanitize', 'angular-click-outside', 'ngclipboard'])
.config(function($routeProvider) {

$routeProvider.when('/:gid', {
Expand Down
2 changes: 2 additions & 0 deletions karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ module.exports = function(config) {
'js/vendor/angular-cache/dist/angular-cache.js',
'js/vendor/angular-sanitize/angular-sanitize.js',
'js/vendor/ui-select/dist/select.js',
'js/vendor/angular-click-outside/clickoutside.directive.js',
'js/vendor/ngclipboard/dist/ngclipboard.min.js',

'js/dav/dav.js',
'js/vendor/vcard/src/vcard.js',
Expand Down
Loading