jenkins-bot has submitted this change and it was merged. Change subject: (bug 27911) Standardise Apple Touch icons for all projects ......................................................................
(bug 27911) Standardise Apple Touch icons for all projects This commit does the following things: * (1) It standardises the location of Apple Touch icons for our projects by putting them into one directory on bits.wm.org; * (2) It adds Apple Touch icon for all Wikinews projects, using the icon used by the English Wikinews; * (3) It removes broken links for foundationwiki, metawiki, officewiki and wikimania2005wiki — which never had any Apple Touch icons, yet had links to them inside the HTML <head /> tag — see bug 44680. * (4) It removes broken link to an icon on test wiki, which has apparently been deleted since. I'm using the same format that's already used for general favicons. This way, users will be able to define Apple Touch icons on a per- family or even per-wiki bases, should that prove neccessary. What this commit does not do, is that it does not create new icons nor change existing ones (with the exception of the Wikipedia icon per bug 47383); I'm merely moving them to a new directory. Per Krinkle's comment, since we're using a 30-day cache period, I'm keeping the current icons for commonswiki, usabilitywiki, and all Wikipedia and Wiktionary wikis so that we do not point to 404 files (mediawikiwiki is currently pointing to a non-existing icon anyway). Bug: 27911 Change-Id: Ib5554c547295d9b53b4f554e2773a4d7c14f8c6a --- A docroot/bits/apple-touch/commons.png R docroot/bits/apple-touch/mediawiki.png A docroot/bits/apple-touch/usability.png A docroot/bits/apple-touch/wikinews.png A docroot/bits/apple-touch/wikipedia.png A docroot/bits/apple-touch/wiktionary.png A docroot/bits/apple-touch/wiktionary/en.png M docroot/wikipedia.org/apple-touch-icon.png M wmf-config/InitialiseSettings.php 9 files changed, 11 insertions(+), 16 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/docroot/bits/apple-touch/commons.png b/docroot/bits/apple-touch/commons.png new file mode 100644 index 0000000..6fb4b33 --- /dev/null +++ b/docroot/bits/apple-touch/commons.png Binary files differ diff --git a/docroot/mediawiki/Apple-touch-icon.png b/docroot/bits/apple-touch/mediawiki.png similarity index 100% rename from docroot/mediawiki/Apple-touch-icon.png rename to docroot/bits/apple-touch/mediawiki.png Binary files differ diff --git a/docroot/bits/apple-touch/usability.png b/docroot/bits/apple-touch/usability.png new file mode 100644 index 0000000..b09e6b2 --- /dev/null +++ b/docroot/bits/apple-touch/usability.png Binary files differ diff --git a/docroot/bits/apple-touch/wikinews.png b/docroot/bits/apple-touch/wikinews.png new file mode 100644 index 0000000..8f7c7fd --- /dev/null +++ b/docroot/bits/apple-touch/wikinews.png Binary files differ diff --git a/docroot/bits/apple-touch/wikipedia.png b/docroot/bits/apple-touch/wikipedia.png new file mode 100644 index 0000000..0179b69 --- /dev/null +++ b/docroot/bits/apple-touch/wikipedia.png Binary files differ diff --git a/docroot/bits/apple-touch/wiktionary.png b/docroot/bits/apple-touch/wiktionary.png new file mode 100644 index 0000000..b084611 --- /dev/null +++ b/docroot/bits/apple-touch/wiktionary.png Binary files differ diff --git a/docroot/bits/apple-touch/wiktionary/en.png b/docroot/bits/apple-touch/wiktionary/en.png new file mode 100644 index 0000000..96043b2 --- /dev/null +++ b/docroot/bits/apple-touch/wiktionary/en.png Binary files differ diff --git a/docroot/wikipedia.org/apple-touch-icon.png b/docroot/wikipedia.org/apple-touch-icon.png index 08cf18d..0179b69 100644 --- a/docroot/wikipedia.org/apple-touch-icon.png +++ b/docroot/wikipedia.org/apple-touch-icon.png Binary files differ diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 084ba97..5593be9 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -9527,23 +9527,18 @@ ), 'wgAppleTouchIcon' => array( - 'default' => false, // default iPhone/iPod Touch bookmark icon + #Sites + 'default' => false, // default iPhone/iPod Touch bookmark icon + 'wiki' => '//bits.wikimedia.org/apple-touch/wikipedia.png', + 'wikinews' => '//bits.wikimedia.org/apple-touch/wikinews.png', + 'wiktionary' => '//bits.wikimedia.org/apple-touch/wiktionary.png', - // Let the secure versions shine through with their own icons as well, set it explicitly - 'wiki' => '//$lang.$site.org/apple-touch-icon.png', - 'wiktionary' => '//$lang.$site.org/apple-touch-icon.png', // http://upload.wikimedia.org/wiktionary/en/4/48/Wiktionary-iphone_logo.png - - 'testwiki' => '//upload.wikimedia.org/wikipedia/test/apple-touch-icon.png', - 'enwikinews' => '//upload.wikimedia.org/wikipedia/commons/4/43/Apple-touch-icon.png', - 'enwiktionary' => '//upload.wikimedia.org/wikipedia/commons/e/e7/Wiktionary-icon.png', // Bug 46431 - 'mediawikiwiki' => '//www.mediawiki.org/Apple-touch-icon.png', - 'usabilitywiki' => '//usability.wikimedia.org/UsabilityWiki-AppleTouch-Icon.png', - 'wikimania2005wiki' => '//$lang.$site.org/apple-touch-icon.png', - 'officewiki' => '//$lang.$site.org/apple-touch-icon.png', - 'foundationwiki' => '//$lang.$site.org/apple-touch-icon.png', - 'commonswiki' => '//$lang.$site.org/apple-touch-icon.png', - 'metawiki' => '//$lang.$site.org/apple-touch-icon.png', -), + #Other wikis + 'commonswiki' => '//bits.wikimedia.org/apple-touch/commons.png', + 'enwiktionary' => '//bits.wikimedia.org/apple-touch/wiktionary/en.png', // Bug 46431 + 'mediawikiwiki' => '//bits.wikimedia.org/apple-touch/mediawiki.png', + 'usabilitywiki' => '//bits.wikimedia.org/apple-touch/usability.png', + ), 'wgUserEmailUseReplyTo' => array( 'default' => false, // http://bugzilla.wikimedia.org/show_bug.cgi?id=12655 -- To view, visit https://gerrit.wikimedia.org/r/60670 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib5554c547295d9b53b4f554e2773a4d7c14f8c6a Gerrit-PatchSet: 6 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Odder <[email protected]> Gerrit-Reviewer: Brion VIBBER <[email protected]> Gerrit-Reviewer: Dereckson <[email protected]> Gerrit-Reviewer: Faidon <[email protected]> Gerrit-Reviewer: Krinkle <[email protected]> Gerrit-Reviewer: Nemo bis <[email protected]> Gerrit-Reviewer: Odder <[email protected]> Gerrit-Reviewer: Reedy <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
