Odder has uploaded a new change for review. https://gerrit.wikimedia.org/r/60670
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, officewiki, wikimania2005wiki, and metawiki — which never had any Apple Touch icons, yet had links to them inside the HTML <head /> tag — see bug 44680. I'm using the same format that's already used for general favicons, with one exception – the English Wiktionary icon is loaded from upload.wm.org (the file is protected against reuploads on Commons). This way, users will be able to define Apple Touch Icons on a per- family or even per-wiki bases, should that be neccessary. What this commit does not do, is that it does not create new icons nor change existing ones; I'm merely moving them to a new directory. Bug: 27911 Change-Id: Ib5554c547295d9b53b4f554e2773a4d7c14f8c6a --- R docroot/bits/favicon/apple-touch/commons.png R docroot/bits/favicon/apple-touch/mediawiki.png R docroot/bits/favicon/apple-touch/usability.png A docroot/bits/favicon/apple-touch/wikinews.png A docroot/bits/favicon/apple-touch/wikipedia.png R docroot/bits/favicon/apple-touch/wiktionary.png D docroot/wikipedia.org/apple-touch-icon.png M wmf-config/InitialiseSettings.php 8 files changed, 12 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/70/60670/1 diff --git a/docroot/commons/apple-touch-icon.png b/docroot/bits/favicon/apple-touch/commons.png similarity index 100% rename from docroot/commons/apple-touch-icon.png rename to docroot/bits/favicon/apple-touch/commons.png Binary files differ diff --git a/docroot/mediawiki/Apple-touch-icon.png b/docroot/bits/favicon/apple-touch/mediawiki.png similarity index 100% rename from docroot/mediawiki/Apple-touch-icon.png rename to docroot/bits/favicon/apple-touch/mediawiki.png Binary files differ diff --git a/docroot/usability/UsabilityWiki-AppleTouch-Icon.png b/docroot/bits/favicon/apple-touch/usability.png similarity index 100% rename from docroot/usability/UsabilityWiki-AppleTouch-Icon.png rename to docroot/bits/favicon/apple-touch/usability.png Binary files differ diff --git a/docroot/bits/favicon/apple-touch/wikinews.png b/docroot/bits/favicon/apple-touch/wikinews.png new file mode 100644 index 0000000..8f7c7fd --- /dev/null +++ b/docroot/bits/favicon/apple-touch/wikinews.png Binary files differ diff --git a/docroot/bits/favicon/apple-touch/wikipedia.png b/docroot/bits/favicon/apple-touch/wikipedia.png new file mode 100644 index 0000000..0179b69 --- /dev/null +++ b/docroot/bits/favicon/apple-touch/wikipedia.png Binary files differ diff --git a/docroot/wiktionary.org/apple-touch-icon.png b/docroot/bits/favicon/apple-touch/wiktionary.png similarity index 100% rename from docroot/wiktionary.org/apple-touch-icon.png rename to docroot/bits/favicon/apple-touch/wiktionary.png Binary files differ diff --git a/docroot/wikipedia.org/apple-touch-icon.png b/docroot/wikipedia.org/apple-touch-icon.png deleted file mode 100644 index 08cf18d..0000000 --- a/docroot/wikipedia.org/apple-touch-icon.png +++ /dev/null Binary files differ diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 084ba97..d86ed4d 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -9527,23 +9527,19 @@ ), 'wgAppleTouchIcon' => array( - 'default' => false, // default iPhone/iPod Touch bookmark icon + #Sites + 'default' => false, // default iPhone/iPod Touch bookmark icon + 'wiki' => '//bits.wikimedia.org/favicon/apple-touch/wikipedia.png' + 'wikinews' => '//bits.wikimedia.org/favicon/apple-touch/wikinews.png', + 'wiktionary' => '//bits.wikimedia.org/favicon/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/favicon/apple-touch/commons.png', + 'enwiktionary' => '//upload.wikimedia.org/wikipedia/commons/e/e7/Wiktionary-icon.png', // Bug 46431 + 'mediawikiwiki' => '//bits.wikimedia.org/favicon/apple-touch/mediawiki.png', + 'testwiki' => '//upload.wikimedia.org/wikipedia/test/apple-touch-icon.png', + 'usabilitywiki' => '//bits.wikimedia.org/favicon/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: newchange Gerrit-Change-Id: Ib5554c547295d9b53b4f554e2773a4d7c14f8c6a Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Odder <tom...@twkozlowski.net> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
