Fixed ext share style and use varable for popover height

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

4 files changed, 7 insertions, 11 deletions

diff --git a/apps/files/js/newfilemenu.js b/apps/files/js/newfilemenu.js
index e27ccd9771f..cbe9ced8af4 100644
--- a/apps/files/js/newfilemenu.js
+++ b/apps/files/js/newfilemenu.js
@@ -26,7 +26,6 @@
 
 	var TEMPLATE_FILENAME_FORM =
 		'<form class="filenameform">' +
-		'<label class="hidden-visually" for="{{cid}}-input-{{fileType}}">{{fileName}}</label>' +
 		'<input id="{{cid}}-input-{{fileType}}" type="text" value="{{fileName}}" autocomplete="off" autocapitalize="off">' +
 		'<input type="submit" value=" " class="icon-confirm" />'
 		'</form>';
diff --git a/apps/files_sharing/css/public.scss b/apps/files_sharing/css/public.scss
index e30c97ae7aa..cc3788884e7 100644
--- a/apps/files_sharing/css/public.scss
+++ b/apps/files_sharing/css/public.scss
@@ -105,8 +105,7 @@ thead {
 	border-color: rgba(0,0,0,0.3) !important;
 }
 
-
-#remote_address {
+#share-menu input[type='text'] {
 	width: 200px;
 }
 
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 607c50f5028..4b3ede24389 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -278,12 +278,6 @@ OCA.Sharing.PublicApp = {
 			}
 		});
 
-		$('#save #save-button').click(function () {
-			$(this).hide();
-			$('.save-form').css('display', 'inline');
-			$('#remote_address').focus();
-		});
-
 		// legacy
 		window.FileList = this.fileList;
 	},
diff --git a/apps/files_sharing/lib/Template/ExternalShareMenuAction.php b/apps/files_sharing/lib/Template/ExternalShareMenuAction.php
index 635b301e57c..0a6608ac8ca 100644
--- a/apps/files_sharing/lib/Template/ExternalShareMenuAction.php
+++ b/apps/files_sharing/lib/Template/ExternalShareMenuAction.php
@@ -58,11 +58,15 @@ class ExternalShareMenuAction extends SimpleMenuAction {
 			'<a id="save" data-protected="false" data-owner-display-name="' . Util::sanitizeHTML($this->displayname) . '" data-owner="' . Util::sanitizeHTML($this->owner) . '" data-name="' . Util::sanitizeHTML($this->shareName) . '">' .
 			'<span class="icon ' . Util::sanitizeHTML($this->getIcon()) . '"></span>' .
 			'<span id="save-button">' . Util::sanitizeHTML($this->getLabel()) . '</span>' .
-			'<form class="save-form hidden" action="#">' .
+			'</a>' .
+			'</li>' .
+			'<li>' .
+			'<span class="menuitem">' .
+			'<form class="save-form" action="#">' .
 			'<input type="text" id="remote_address" placeholder="user@yourNextcloud.org">' .
 			'<input type="submit" value=" " id="save-button-confirm" class="icon-confirm" disabled="disabled"></button>' .
 			'</form>' .
-			'</a>' .
+			'</span>' .
 			'</li>';
 	}
 }