From b43bfaf132b8457768785a5ef5165a1227273140 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 17 Jun 2015 16:05:05 +0200 Subject: [PATCH] fix look of 'Share with me via ownCloud' button, fix wording --- apps/files_sharing/img/social-owncloud.svg | 44 ------------------- apps/files_sharing/settings-personal.php | 6 +-- .../templates/settings-personal.php | 12 +++-- 3 files changed, 11 insertions(+), 51 deletions(-) delete mode 100644 apps/files_sharing/img/social-owncloud.svg diff --git a/apps/files_sharing/img/social-owncloud.svg b/apps/files_sharing/img/social-owncloud.svg deleted file mode 100644 index e2686839c3..0000000000 --- a/apps/files_sharing/img/social-owncloud.svg +++ /dev/null @@ -1,44 +0,0 @@ - -image/svg+xml \ No newline at end of file diff --git a/apps/files_sharing/settings-personal.php b/apps/files_sharing/settings-personal.php index 9a9629c86b..704ee8103d 100644 --- a/apps/files_sharing/settings-personal.php +++ b/apps/files_sharing/settings-personal.php @@ -28,12 +28,12 @@ $uid = \OC::$server->getUserSession()->getUser()->getUID(); $server = \OC::$server->getURLGenerator()->getAbsoluteURL('/'); $cloudID = $uid . '@' . rtrim(\OCA\Files_Sharing\Helper::removeProtocolFromUrl($server), '/'); $url = 'https://owncloud.org/federation'; -$ownCloudLogoPath = \OC::$server->getURLGenerator()->imagePath('files_sharing', 'social-owncloud.svg'); +$ownCloudLogoPath = \OC::$server->getURLGenerator()->imagePath('core', 'logo-icon.svg'); $tmpl = new OCP\Template('files_sharing', 'settings-personal'); $tmpl->assign('outgoingServer2serverShareEnabled', \OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled()); -$tmpl->assign('message_with_URL', $l->t('Share with me through my #ownCloud federation ID %s see %s', [$cloudID, $url])); -$tmpl->assign('message_without_URL', $l->t('Share with me through my #ownCloud federation ID %s', [$cloudID])); +$tmpl->assign('message_with_URL', $l->t('Share with me through my #ownCloud Federated Cloud ID %s see %s', [$cloudID, $url])); +$tmpl->assign('message_without_URL', $l->t('Share with me through my #ownCloud Federated Cloud ID %s', [$cloudID])); $tmpl->assign('owncloud_logo_path', $ownCloudLogoPath); $tmpl->assign('reference', $url); $tmpl->assign('cloudId', $cloudID); diff --git a/apps/files_sharing/templates/settings-personal.php b/apps/files_sharing/templates/settings-personal.php index 528e74f4ce..bc10da5583 100644 --- a/apps/files_sharing/templates/settings-personal.php +++ b/apps/files_sharing/templates/settings-personal.php @@ -50,16 +50,20 @@ style('files_sharing', '3rdparty/gs-share/style');

t('Add it to your website:')); ?> - - + + t('Share with me via ownCloud')); ?>

t('HTML Code:')); ?> -

<a target="_blank" href="<?php p($_['reference']); ?>"> - <img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL($_['owncloud_logo_path'])); ?>" /> + <xmp><a target="_blank" href="<?php p($_['reference']); ?>" + style="padding:10px;background-color:#1d2d44;color:#fff;border-radius:3px;padding-left:4px;"> + <img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL($_['owncloud_logo_path'])); ?>" + style="width:50px;position:relative;top:8px;"> <?php p($l->t('Share with me via ownCloud')); ?> </a>