From 4599da9608edba255bd4e5806e16424c11ca3de2 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 17 Jun 2015 12:34:49 +0200 Subject: federated cloud ID: add icons, fix HTML & layout, fix wording --- apps/files_sharing/css/settings-personal.css | 29 ++++++++ apps/files_sharing/img/gs-share.png | Bin 863 -> 0 bytes apps/files_sharing/img/social-diaspora.svg | 52 ++++++++++++++ apps/files_sharing/img/social-facebook.svg | 43 +++++++++++ apps/files_sharing/img/social-gnu.svg | 79 +++++++++++++++++++++ apps/files_sharing/img/social-googleplus.svg | 45 ++++++++++++ apps/files_sharing/img/social-owncloud.svg | 44 ++++++++++++ apps/files_sharing/img/social-twitter.svg | 53 ++++++++++++++ apps/files_sharing/settings-personal.php | 4 +- apps/files_sharing/templates/settings-personal.php | 72 +++++++++---------- 10 files changed, 382 insertions(+), 39 deletions(-) delete mode 100644 apps/files_sharing/img/gs-share.png create mode 100644 apps/files_sharing/img/social-diaspora.svg create mode 100644 apps/files_sharing/img/social-facebook.svg create mode 100644 apps/files_sharing/img/social-gnu.svg create mode 100644 apps/files_sharing/img/social-googleplus.svg create mode 100644 apps/files_sharing/img/social-owncloud.svg create mode 100644 apps/files_sharing/img/social-twitter.svg (limited to 'apps/files_sharing') diff --git a/apps/files_sharing/css/settings-personal.css b/apps/files_sharing/css/settings-personal.css index de438844c7f..c9af6c08c40 100644 --- a/apps/files_sharing/css/settings-personal.css +++ b/apps/files_sharing/css/settings-personal.css @@ -1,3 +1,32 @@ #fileSharingSettings img { cursor: pointer; } + +#fileSharingSettings xmp { + margin-top: 0; +} + +[class^="social-"], [class*=" social-"] { + background-repeat: no-repeat; + background-position: 2px; + min-width: 16px; + min-height: 16px; + padding-left: 29px; + background-size: 24px; +} + +.social-gnu { + background-image: url('../img/social-gnu.svg'); +} +.social-diaspora { + background-image: url('../img/social-diaspora.svg'); +} +.social-twitter { + background-image: url('../img/social-twitter.svg'); +} +.social-facebook { + background-image: url('../img/social-facebook.svg'); +} +.social-googleplus { + background-image: url('../img/social-googleplus.svg'); +} diff --git a/apps/files_sharing/img/gs-share.png b/apps/files_sharing/img/gs-share.png deleted file mode 100644 index 25b0c4d06fe..00000000000 Binary files a/apps/files_sharing/img/gs-share.png and /dev/null differ diff --git a/apps/files_sharing/img/social-diaspora.svg b/apps/files_sharing/img/social-diaspora.svg new file mode 100644 index 00000000000..1d5131129a9 --- /dev/null +++ b/apps/files_sharing/img/social-diaspora.svg @@ -0,0 +1,52 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/apps/files_sharing/img/social-facebook.svg b/apps/files_sharing/img/social-facebook.svg new file mode 100644 index 00000000000..aad02bc3853 --- /dev/null +++ b/apps/files_sharing/img/social-facebook.svg @@ -0,0 +1,43 @@ + +image/svg+xml \ No newline at end of file diff --git a/apps/files_sharing/img/social-gnu.svg b/apps/files_sharing/img/social-gnu.svg new file mode 100644 index 00000000000..24556aaa024 --- /dev/null +++ b/apps/files_sharing/img/social-gnu.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/apps/files_sharing/img/social-googleplus.svg b/apps/files_sharing/img/social-googleplus.svg new file mode 100644 index 00000000000..123273f2d38 --- /dev/null +++ b/apps/files_sharing/img/social-googleplus.svg @@ -0,0 +1,45 @@ + +image/svg+xml \ No newline at end of file diff --git a/apps/files_sharing/img/social-owncloud.svg b/apps/files_sharing/img/social-owncloud.svg new file mode 100644 index 00000000000..e2686839c3c --- /dev/null +++ b/apps/files_sharing/img/social-owncloud.svg @@ -0,0 +1,44 @@ + +image/svg+xml \ No newline at end of file diff --git a/apps/files_sharing/img/social-twitter.svg b/apps/files_sharing/img/social-twitter.svg new file mode 100644 index 00000000000..00ce390de6b --- /dev/null +++ b/apps/files_sharing/img/social-twitter.svg @@ -0,0 +1,53 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/apps/files_sharing/settings-personal.php b/apps/files_sharing/settings-personal.php index d95c15001e3..f4d61b34f56 100644 --- a/apps/files_sharing/settings-personal.php +++ b/apps/files_sharing/settings-personal.php @@ -31,8 +31,8 @@ $url = 'https://owncloud.org/federation'; $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 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('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 84efd1dd1db..8703352e024 100644 --- a/apps/files_sharing/templates/settings-personal.php +++ b/apps/files_sharing/templates/settings-personal.php @@ -12,57 +12,55 @@ style('files_sharing', '3rdparty/gs-share/style');

t('Federated Cloud')); ?>

- t('Your Federated Cloud ID: %s', [$_['cloudId']])); ?> + t('Your Federated Cloud ID:')); ?> +

-

- -

t('Share your Federated Cloud Id:')); ?>

+

- -

- + + + + -
- - - Share on Diaspora&url='/> - | Share on Twitter'/> - | Share on Facebook'/> - | Share on Google+'/> -

-
- -

t('Add your Federated Cloud Id to your homepage:')); ?>

+

+ t('Add it to your website:')); ?> - - <?php p($_['/> + + + t('Share with me via ownCloud')); ?> +

-
+

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

- <a href="<?php p($_['reference']); ?>"> - <img src='TODO: Add Banner/Button' - alt='<?php p($_['message_with_URL']); ?>'/> - </a> - + <a target="_blank" href="<?php p($_['reference']); ?>"> + <img src="../img/social-owncloud.svg" /> + <?php p($l->t('Share with me via ownCloud')); ?> +</a>

-- cgit v1.2.3