Public share cleanup

owncloud · Dec 13, 2017 · 1f90b6b · 1f90b6b
1 parent 7d4a33a
commit 1f90b6b
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 4 deletions.
diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css
@@ -102,9 +102,9 @@
 }
 
 .shareTabView .shareWithList .mailNotificationSpinner {
-	position: relative;
-	vertical-align: middle;
-	margin-right: 10px;
+  position: relative;
+  vertical-align: middle;
+  margin-right: 10px;
 }
 
 .subTabHeaders .tabHeaders {
@@ -262,11 +262,24 @@
 
 .public-link-modal--item {
   margin-bottom: 20px;
+<<<<<<< HEAD
 }
 .public-link-modal--label,
 .public-link-modal--input {
   display: block;
   width: calc(100% - 15px) !important;
+=======
+}
+
+.public-link-modal--label,
+.public-link-modal--input {
+  display: block;
+  width: calc(100% - 15px) !important;
+}
+
+.public-link-modal--input.datepicker {
+  max-width: 120px;
+>>>>>>> 90b08dc5be... Show button text "share" if creating a new share
 }
 .minify {
   width: 1px;

diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
@@ -314,18 +314,34 @@
 			var self = this;
 			var title = t('files_sharing', 'Edit link share: {name}', {name: this.itemModel.getFileInfo().getFullPath()});
 			var buttons = [{
+<<<<<<< HEAD
 				text: t('core', 'Save'),
 				click: _.bind(this._onClickSave, this),
 				defaultButton: true
 			}, {
+=======
+>>>>>>> 90b08dc5be... Show button text "share" if creating a new share
 				text: t('core', 'Cancel'),
 				click: _.bind(this._onClickCancel, this)
 			}];
 
 			if (this.model.isNew()) {
 				title = t('files_sharing', 'Create link share: {name}', {name: this.itemModel.getFileInfo().getFullPath()});
+				buttons.unshift({
+					text: t('core', 'Share'),
+					click: _.bind(this._onClickSave, this),
+					defaultButton: true
+				})
 			}
-			else if (this.model.get('encryptedPassword')) {
+			else {
+				buttons.unshift({
+					text: t('core', 'Save'),
+					click: _.bind(this._onClickSave, this),
+					defaultButton: true
+				})
+			}
+
+			if (this.model.get('encryptedPassword')) {
 				buttons.push({
 					classes: 'removePassword -float-left',
 					text: t('core', 'Remove password'),