aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-07-04 14:13:44 +0200
committerMorris Jobke <hey@morrisjobke.de>2014-07-04 14:13:44 +0200
commit3d13e04170a3784b6705d04b2f095334c671fae8 (patch)
tree0e6be29032bf4f6c3ebd2931811cbe9cac6ce165
parentb7b42cf1c8543c86d7296ada73644d0207643185 (diff)
parentac00e4b6e63a5e5ecdc04ba5b9babcd5f832a006 (diff)
downloadnextcloud-server-3d13e04170a3784b6705d04b2f095334c671fae8.tar.gz
nextcloud-server-3d13e04170a3784b6705d04b2f095334c671fae8.zip
Merge pull request #9426 from owncloud/design-remoteshare-confirm
use icon-confirm instead of text for accepting remote share, works better with translations
-rw-r--r--apps/files_sharing/css/public.css37
-rw-r--r--apps/files_sharing/js/public.js2
-rw-r--r--apps/files_sharing/templates/public.php4
3 files changed, 35 insertions, 8 deletions
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index 04c482d10e4..97c9696ad59 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -89,21 +89,48 @@ thead {
}
/* within #save */
+#save .save-form {
+ position: relative;
+}
+
#remote_address {
margin: 0;
+ width: 130px;
height: 14px;
padding: 6px;
+ padding-right: 24px;
+}
+
+.ie8 #remote_address {
+ padding-right: 30px;
}
-#save button {
+#save #save-button,
+#save #save-button-confirm {
margin: 0 5px;
height: 28px;
padding-bottom: 4px;
line-height: 14px;
}
-#save .save-form [type="submit"] {
- margin: 0 5px;
- height: 28px;
- padding-bottom: 4px;
+#save-button-confirm {
+ position: absolute;
+ background-color: transparent;
+ border: none;
+ margin: 2px 4px !important;
+ right: 0;
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
+ filter: alpha(opacity=50);
+ opacity: .5;
+}
+
+.ie8 #save-button-confirm {
+ margin: 2px 0 !important;
+}
+
+#save-button-confirm:hover,
+#save-button-confirm:focus {
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+ filter: alpha(opacity=100);
+ opacity: 1;
}
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index a5027da0cfb..2c68f440756 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -163,7 +163,7 @@ OCA.Sharing.PublicApp = {
OCA.Sharing.PublicApp._saveToOwnCloud(remote, token, owner, name, isProtected);
});
- $('#save > button').click(function () {
+ $('#save #save-button').click(function () {
$(this).hide();
$('.save-form').css('display', 'inline');
$('#remote_address').focus();
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 2476beac1fb..386fa7e17cd 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -19,10 +19,10 @@
<div class="header-right">
<span id="details">
<span id="save" data-protected="<?php p($_['protected'])?>" data-owner="<?php p($_['displayName'])?>" data-name="<?php p($_['filename'])?>">
- <button><?php p($l->t('Add to your ownCloud')) ?></button>
+ <button id="save-button"><?php p($l->t('Add to your ownCloud')) ?></button>
<form class="save-form hidden" action="#">
<input type="text" id="remote_address" placeholder="example.com/owncloud"/>
- <input type="submit" value="<?php p($l->t('Save')) ?>"/>
+ <button id="save-button-confirm" class="icon-confirm svg"></button>
</form>
</span>
<a href="<?php p($_['downloadURL']); ?>" id="download" class="button">