[Pkg-owncloud-commits] [owncloud] 18/205: fix look of 'Share with me via ownCloud' button, fix wording
David Prévot
taffit at moszumanska.debian.org
Thu Jul 2 17:36:49 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch stable8
in repository owncloud.
commit b43bfaf132b8457768785a5ef5165a1227273140
Author: Jan-Christoph Borchardt <hey at jancborchardt.net>
Date: Wed Jun 17 16:05:05 2015 +0200
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 +--
apps/files_sharing/templates/settings-personal.php | 12 ++++--
3 files changed, 11 insertions(+), 51 deletions(-)
diff --git a/apps/files_sharing/img/social-owncloud.svg b/apps/files_sharing/img/social-owncloud.svg
deleted file mode 100644
index e268683..0000000
--- a/apps/files_sharing/img/social-owncloud.svg
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- enable-background="new 0 0 595.275 311.111"
- xml:space="preserve"
- height="32"
- width="32"
- version="1.1"
- y="0px"
- x="0px"
- viewBox="0 0 32 31.999997"
- id="svg2"
- inkscape:version="0.91 r13725"
- sodipodi:docname="social-owncloud.svg"><metadata
- id="metadata12"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
- id="defs10" /><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="640"
- inkscape:window-height="480"
- id="namedview8"
- showgrid="false"
- inkscape:zoom="19.96875"
- inkscape:cx="2.8794992"
- inkscape:cy="16"
- inkscape:current-layer="svg2" /><path
- style="block-progression:tb;color:#000000;enable-background:accumulate;text-transform:none;text-indent:0;fill:#000000;fill-opacity:1;opacity:0.5"
- d="m14.583 7.281c-2.2329 0-4.0369 1.804-4.0369 4.0369 0 0.92043 0.30649 1.7676 0.82322 2.4459 1.121-1.2974 2.7754-2.1214 4.6227-2.1214 0.90376 0 1.7608 0.20125 2.533 0.55409 0.06252-0.28275 0.09499-0.57681 0.09499-0.87863 0-2.2329-1.804-4.0369-4.0369-4.0369zm-5.2718 1.8681c-1.1629 0-2.0976 0.94269-2.0976 2.1055 0 0.3765 0.09713 0.73224 0.26913 1.0369 0.70171-0.39584 1.513-0.62533 2.3747-0.62533 0.08316 0 0.16326 0.003 0.24538 0.008-0.0093-0.11788-0.01582-0.23595-0.01582-0.3562 0-0.6 [...]
- fill="#fff"
- id="path6" /></svg>
\ No newline at end of file
diff --git a/apps/files_sharing/settings-personal.php b/apps/files_sharing/settings-personal.php
index 9a9629c..704ee81 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 528e74f..bc10da5 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');
<p>
<?php p($l->t('Add it to your website:')); ?>
- <a target="_blank" href="<?php p($_['reference']); ?>">
- <img src="<?php p($_['owncloud_logo_path']); ?>" />
+ <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($_['owncloud_logo_path']); ?>"
+ style="width:50px;position:relative;top:8px;">
<?php p($l->t('Share with me via ownCloud')); ?>
</a>
</p>
<p>
<?php p($l->t('HTML Code:')); ?>
- <xmp><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></xmp>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list