diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-07 15:39:02 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-07 15:39:02 +0100 |
| commit | e499b1aec315294e5d422a2fca79fdb2f1d238f2 (patch) | |
| tree | 964899824f9d7c3fdf3e925623a62a0372969097 | |
| parent | d60e25a0b3854c785731df8ffbc418aa7de2eab6 (diff) | |
| parent | 0474e394f5d90979c91b3a32da98c77dbfcc8d96 (diff) | |
Merge pull request #153 from owncloud/show-addressbook-url
Add icon to show addressbook urls
| -rw-r--r-- | css/public/style.css | 3 | ||||
| -rw-r--r-- | js/components/addressBook/addressBook_controller.js | 7 | ||||
| -rw-r--r-- | js/public/script.js | 7 | ||||
| -rw-r--r-- | templates/addressBook.html | 8 |
4 files changed, 24 insertions, 1 deletions
diff --git a/css/public/style.css b/css/public/style.css index 849863be..0dd64281 100644 --- a/css/public/style.css +++ b/css/public/style.css @@ -173,6 +173,7 @@ ul.addressBook-share-list li { margin-left: 15px; } +ul.addressBookList li .action .icon-public, ul.addressBookList li .action .icon-share, ul.addressBookList li .action .icon-delete { padding: 10px 18px; @@ -201,7 +202,7 @@ div.app-contacts span.utils { padding: 0 !important; } -input.newAddressBookInput, input.shareeInput { +input.newAddressBookInput, input.shareeInput, input.addressBookUrl { width: 100% !important; } diff --git a/js/components/addressBook/addressBook_controller.js b/js/components/addressBook/addressBook_controller.js index ded62054..5d02868d 100644 --- a/js/components/addressBook/addressBook_controller.js +++ b/js/components/addressBook/addressBook_controller.js @@ -1,6 +1,13 @@ app.controller('addressbookCtrl', ['$scope', 'AddressBookService', function($scope, AddressBookService) { var ctrl = this; + ctrl.urlBase = window.location.protocol + '//' + window.location.host; + ctrl.showUrl = false; + + ctrl.toggleShowUrl = function() { + ctrl.showUrl = !ctrl.showUrl; + } + ctrl.toggleSharesEditor = function(addressBook) { addressBook.editingShares = !addressBook.editingShares; addressBook.selectedSharee = null; diff --git a/js/public/script.js b/js/public/script.js index 392211d2..020bf746 100644 --- a/js/public/script.js +++ b/js/public/script.js @@ -47,6 +47,13 @@ app.directive('focusExpression', function ($timeout) { app.controller('addressbookCtrl', ['$scope', 'AddressBookService', function($scope, AddressBookService) { var ctrl = this; + ctrl.urlBase = window.location.protocol + '//' + window.location.host; + ctrl.showUrl = false; + + ctrl.toggleShowUrl = function() { + ctrl.showUrl = !ctrl.showUrl; + } + ctrl.toggleSharesEditor = function(addressBook) { addressBook.editingShares = !addressBook.editingShares; addressBook.selectedSharee = null; diff --git a/templates/addressBook.html b/templates/addressBook.html index 7b5699f7..baa833b3 100644 --- a/templates/addressBook.html +++ b/templates/addressBook.html @@ -2,6 +2,13 @@ <span class="utils"> <span class="action"> <span + class="addressbooklist-icon icon-public" + title="Show URL" + ng-click="ctrl.toggleShowUrl()"> + </span> + </span> + <span class="action"> + <span class="addressbooklist-icon icon-share" title="Share Addressbook" ng-click="ctrl.toggleSharesEditor(ctrl.addressBook)"> @@ -15,6 +22,7 @@ </span> </span> </span> + <input class="addressBookUrl" ng-show="ctrl.showUrl" type="url" value="{{ctrl.urlBase + ctrl.addressBook.url}}" readonly /> <div class="addressBookShares" ng-show="ctrl.addressBook.editingShares"> <i ng-show="ctrl.addressBook.loadingSharees" class="glyphicon glyphicon-refresh"></i> <input |