Browse Source

Use an icon to set the email instead of a button with string

tags/v10.0RC1
Thomas Müller 8 years ago
parent
commit
4d67429cf0
No account linked to committer's email address

+ 1
- 0
apps/files_sharing/css/sharetabview.css View File

@@ -30,6 +30,7 @@
margin-left: 0;
}
.shareTabView input[type="text"].shareWithField,
.shareTabView input[type="text"].emailField,
.shareTabView input[type="text"].linkText {
width: 80%;
}

+ 4
- 0
core/css/icons.css View File

@@ -204,6 +204,10 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
background-image: url('../img/actions/mail.svg');
}

.icon-mail-grey {
background-image: url('../img/actions/mail-grey.svg');
}

.icon-menu {
background-image: url('../img/actions/menu.svg');
}

+ 4
- 4
core/js/sharedialogmailview.js View File

@@ -16,9 +16,9 @@
var TEMPLATE =
'{{#if shareAllowed}}' +
' {{#if mailPublicNotificationEnabled}}' +
'<form id="emailPrivateLink" class="emailPrivateLinkForm">' +
'<form id="emailPrivateLink" class="emailPrivateLinkForm oneline">' +
' <input id="email" class="emailField" value="{{email}}" placeholder="{{mailPrivatePlaceholder}}" type="text" />' +
' <input id="emailButton" class="emailButton" type="submit" value="{{mailButtonText}}" />' +
' <a id="emailButton" class="icon icon-mail-grey" />' +
'</form>' +
' {{/if}}' +
'{{/if}}'
@@ -48,7 +48,7 @@
showLink: true,

events: {
'submit .emailPrivateLinkForm': '_onEmailPrivateLink'
'click #emailButton': '_onEmailPrivateLink'
},

initialize: function(options) {
@@ -173,4 +173,4 @@

OC.Share.ShareDialogMailView = ShareDialogMailView;

})();
})();

+ 2
- 2
core/js/tests/specs/sharedialogviewSpec.js View File

@@ -444,7 +444,7 @@ describe('OC.Share.ShareDialogView', function() {
dialog.render();

dialog.$el.find('.emailPrivateLinkForm .emailField').val('a@b.c');
dialog.$el.find('.emailPrivateLinkForm').trigger('submit');
dialog.$el.find('#emailButton').trigger('click');

expect(sendEmailPrivateLinkStub.callCount).toEqual(1);
expect(dialog.$el.find('.emailPrivateLinkForm .emailField').val()).toEqual('Sending ...');
@@ -463,7 +463,7 @@ describe('OC.Share.ShareDialogView', function() {
dialog.render();

dialog.$el.find('.emailPrivateLinkForm .emailField').val('a@b.c');
dialog.$el.find('.emailPrivateLinkForm').trigger('submit');
dialog.$el.find('#emailButton').trigger('click');

expect(sendEmailPrivateLinkStub.callCount).toEqual(1);
expect(dialog.$el.find('.emailPrivateLinkForm .emailField').val()).toEqual('Sending ...');

Loading…
Cancel
Save