diff options
| author | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-05-30 08:14:11 +0200 |
|---|---|---|
| committer | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-05-30 08:14:11 +0200 |
| commit | fc1f7c700832bf3f82f2a4d4b884e7086ce6c202 (patch) | |
| tree | 13a7bb6fac7b5c888cd27f42729d371c69810434 /templates | |
| parent | 573e65665d53b1119603c7e1716f2ae47ecf345b (diff) | |
| parent | f026e4660679799673fd42b60214f656cb812a32 (diff) | |
Merge pull request #380 from owncloud/avatar-upload
Avatar upload
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/avatar.html | 5 | ||||
| -rw-r--r-- | templates/contact.html | 2 | ||||
| -rw-r--r-- | templates/contactDetails.html | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/templates/avatar.html b/templates/avatar.html new file mode 100644 index 00000000..e66936af --- /dev/null +++ b/templates/avatar.html @@ -0,0 +1,5 @@ +<img ng-show="contact.photo()!==undefined" class="contactdetails__logo avatar" data-ng-src="{{contact.photo()}}" /> +<div class="avatar-upload"> + <input type="file" id="avatar-upload" class="hidden-visually"/> + <label for="avatar-upload" class="icon-upload-white"></label> +</div> diff --git a/templates/contact.html b/templates/contact.html index 7052615a..48bb74ed 100644 --- a/templates/contact.html +++ b/templates/contact.html @@ -1,5 +1,5 @@ <a class="app-content-list-item-link" ng-click="ctrl.openContact()"> - <img class="app-content-list-item-icon contact__icon" ng-show="ctrl.contact.photo()!==undefined" data-ng-src="data:image/png;base64,{{ctrl.contact.photo()}}" /> + <img class="app-content-list-item-icon contact__icon" ng-show="ctrl.contact.photo()!==undefined" data-ng-src="{{ctrl.contact.photo()}}" /> <div class="app-content-list-item-icon contact__icon" ng-show="ctrl.contact.photo()===undefined" ng-style="{'background-color': (ctrl.contact.uid() | contactColor) }">{{ ctrl.contact.displayName() | firstCharacter }}</div> <div class="app-content-list-item-star icon-star" data-starred="false"></div> <div class="app-content-list-item-line-one" ng-class="{'no-line-two':!ctrl.contact.email()}">{{ ctrl.contact.displayName() | newContact }}</div> diff --git a/templates/contactDetails.html b/templates/contactDetails.html index eaec8ff9..b915d4c3 100644 --- a/templates/contactDetails.html +++ b/templates/contactDetails.html @@ -8,8 +8,7 @@ </div> <div ng-if="ctrl.contact!==undefined"> <header class="contactdetails__header" ng-style="{'background-color': (ctrl.contact.uid() | contactColor)}"> - <img ng-if="ctrl.photo!==undefined" class="contactdetails__logo avatar" data-ng-src="data:image/png;base64,{{ctrl.photo}}" /> - <div ng-if="ctrl.photo===undefined" class="contactdetails__logo contact__icon avatar--missing"></div> + <avatar data="ctrl.contact" ng-class="{'avatar--missing': ctrl.contact.photo()===undefined}"></avatar> <div id="details-contact-infos"> <h2> <input type="text" id="details-fullName" class="contactdetails__name" placeholder="{{ctrl.t.placeholderName}}" autocomplete="off" |