From 629c3dd39f383b2ca99757a13181ed8f79079ab3 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Wed, 10 Aug 2016 05:27:13 -0400 Subject: [PATCH 1/6] adding social buttons --- core/img/facebook.svg | 1 + core/img/googleplus.svg | 1 + core/img/mail.svg | 77 +++++++++++++++++++ core/img/rss.svg | 60 +++++++++++++++ core/img/twitter.svg | 1 + settings/css/settings.css | 4 + .../templates/settings.development.notice.php | 48 +++++++++++- 7 files changed, 188 insertions(+), 4 deletions(-) create mode 100755 core/img/facebook.svg create mode 100755 core/img/googleplus.svg create mode 100755 core/img/mail.svg create mode 100755 core/img/rss.svg create mode 100755 core/img/twitter.svg diff --git a/core/img/facebook.svg b/core/img/facebook.svg new file mode 100755 index 0000000000000..df7eba290d770 --- /dev/null +++ b/core/img/facebook.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/core/img/googleplus.svg b/core/img/googleplus.svg new file mode 100755 index 0000000000000..5409983dffd5a --- /dev/null +++ b/core/img/googleplus.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/core/img/mail.svg b/core/img/mail.svg new file mode 100755 index 0000000000000..299613d7a449b --- /dev/null +++ b/core/img/mail.svg @@ -0,0 +1,77 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/core/img/rss.svg b/core/img/rss.svg new file mode 100755 index 0000000000000..3a83e0af508e2 --- /dev/null +++ b/core/img/rss.svg @@ -0,0 +1,60 @@ + +image/svg+xml \ No newline at end of file diff --git a/core/img/twitter.svg b/core/img/twitter.svg new file mode 100755 index 0000000000000..64052987815c2 --- /dev/null +++ b/core/img/twitter.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/settings/css/settings.css b/settings/css/settings.css index b006f1f565682..61b4d29231d19 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -159,6 +159,10 @@ table.nostyle td { padding: 0.2em 0; } display: table-cell; padding-right: 1em; } +.social-button img { + padding: 10px 10px 10px 10px; +} + /* USERS */ #newgroup-init a span { margin-left: 20px; } diff --git a/settings/templates/settings.development.notice.php b/settings/templates/settings.development.notice.php index a96661e5de1ef..cbdd0e29fd6ef 100644 --- a/settings/templates/settings.development.notice.php +++ b/settings/templates/settings.development.notice.php @@ -1,6 +1,4 @@ - +

', '', ], - $l->t('Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}.') + $l->t('Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}.') )); ?> + + ', + '', + '', + '', + '', + '', + ], + $l->t(' +

+{googleopen}Follow us on Google Plus!{linkclose} +{facebookopen}Like our facebook page!{linkclose} +{twitteropen}Subscribe to our twitter channel!{linkclose} +{rssopen}Subscribe to our news feed!{linkclose} +{newsletteropen}Subscribe to our newsletter!{linkclose} +

+') + )); ?> + + + +

From 707fc303046a3497b3ca5795ce8b3dabb7b9913f Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Wed, 10 Aug 2016 05:40:35 -0400 Subject: [PATCH 2/6] adding rel="noreferrer noopener" --- settings/templates/settings.development.notice.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/settings/templates/settings.development.notice.php b/settings/templates/settings.development.notice.php index cbdd0e29fd6ef..8684067783170 100644 --- a/settings/templates/settings.development.notice.php +++ b/settings/templates/settings.development.notice.php @@ -36,11 +36,11 @@ image_path('core', 'twitter.svg'), image_path('core', 'rss.svg'), image_path('core', 'mail.svg'), - '', - '', - '', - '', - '', + '', + '', + '', + '', + '', '', ], $l->t(' From 4806ea20fe573c230fdeb01e63bdc0d0a87bdd92 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 10 Aug 2016 12:04:37 +0200 Subject: [PATCH 3/6] Remove accidentially added line --- settings/templates/settings.development.notice.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/templates/settings.development.notice.php b/settings/templates/settings.development.notice.php index 8684067783170..114eaa3e08563 100644 --- a/settings/templates/settings.development.notice.php +++ b/settings/templates/settings.development.notice.php @@ -13,7 +13,7 @@ '', '', ], - $l->t('Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}.') + $l->t('Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}.') )); ?> Date: Thu, 11 Aug 2016 13:01:08 +0200 Subject: [PATCH 4/6] use shorthand for padding values --- settings/css/settings.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/css/settings.css b/settings/css/settings.css index 61b4d29231d19..dbd43b9e2c44c 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -160,7 +160,7 @@ table.nostyle td { padding: 0.2em 0; } padding-right: 1em; } .social-button img { - padding: 10px 10px 10px 10px; + padding: 10px; } From c8113a4269043a5d258c6d3ea95ac9f51c021af2 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 11 Aug 2016 13:14:00 +0200 Subject: [PATCH 5/6] compress images and fix position --- core/img/facebook.svg | 4 +- core/img/googleplus.svg | 4 +- core/img/mail.svg | 80 +++------------------------------------ core/img/rss.svg | 60 +---------------------------- core/img/twitter.svg | 4 +- settings/css/settings.css | 5 +++ 6 files changed, 21 insertions(+), 136 deletions(-) mode change 100755 => 100644 core/img/facebook.svg mode change 100755 => 100644 core/img/googleplus.svg mode change 100755 => 100644 core/img/mail.svg mode change 100755 => 100644 core/img/rss.svg mode change 100755 => 100644 core/img/twitter.svg diff --git a/core/img/facebook.svg b/core/img/facebook.svg old mode 100755 new mode 100644 index df7eba290d770..4de4ccf3002e1 --- a/core/img/facebook.svg +++ b/core/img/facebook.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/core/img/googleplus.svg b/core/img/googleplus.svg old mode 100755 new mode 100644 index 5409983dffd5a..8a443e4b6da6b --- a/core/img/googleplus.svg +++ b/core/img/googleplus.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/core/img/mail.svg b/core/img/mail.svg old mode 100755 new mode 100644 index 299613d7a449b..21991dbf3ab3e --- a/core/img/mail.svg +++ b/core/img/mail.svg @@ -1,77 +1,9 @@ - - - - - - - - - image/svg+xml - - - - - - - - - - + + + + + + diff --git a/core/img/rss.svg b/core/img/rss.svg old mode 100755 new mode 100644 index 3a83e0af508e2..8126a97acd2af --- a/core/img/rss.svg +++ b/core/img/rss.svg @@ -1,60 +1,2 @@ -image/svg+xml \ No newline at end of file + diff --git a/core/img/twitter.svg b/core/img/twitter.svg old mode 100755 new mode 100644 index 64052987815c2..8d96565ca27ea --- a/core/img/twitter.svg +++ b/core/img/twitter.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/settings/css/settings.css b/settings/css/settings.css index dbd43b9e2c44c..26b2cd20e1ff8 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -159,6 +159,11 @@ table.nostyle td { padding: 0.2em 0; } display: table-cell; padding-right: 1em; } + +.social-button { + padding-left: 0; + margin-left: -10px +} .social-button img { padding: 10px; } From 5cd5233952a24a8aa1d24d1bb069124e68efab4f Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Sat, 13 Aug 2016 14:16:17 +0200 Subject: [PATCH 6/6] Do not translate HTML --- .../templates/settings.development.notice.php | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/settings/templates/settings.development.notice.php b/settings/templates/settings.development.notice.php index 114eaa3e08563..ccbd0b7df8000 100644 --- a/settings/templates/settings.development.notice.php +++ b/settings/templates/settings.development.notice.php @@ -15,7 +15,9 @@ ], $l->t('Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}.') )); ?> +

+ -') +'{googleopen}{googletext}{linkclose} +{facebookopen}{facebooktext}{linkclose} +{twitteropen}{twittertext}{linkclose} +{rssopen}{rsstext}{linkclose} +{newsletteropen}{mailtext}{linkclose}' )); ?> - - - -

+