Krinkle has submitted this change and it was merged.
Change subject: Move Apple Touch icons to docroots
......................................................................
Move Apple Touch icons to docroots
This patch reverts patch Ib5554c54729 for most icons; since
older versions of iOS will hit docroot/apple-touch-icon.png
by default whatever our settings are, and since newer versions
look in docroot when no icon is specified in the HTML <link />
tag anyway, let's just simplify things.
I'm putting all existing icons in their respective docroots,
and not defining any icons for wikis that don't have them yet.
The enwiktionary icon — being different from the default icon
for wiktionary.org wikis — will be loaded from bits.wm.org.
Should such a need arise, other icons could be loaded that way,
too.
The usabilitywiki and mediawikiwiki icons are moved to their
proper names (having been loaded via <link /> until now).
Bug: 27911
Change-Id: I2f0990fa087a7b2969c982d05187331e7005b64a
---
D docroot/bits/apple-touch/commons.png
D docroot/bits/apple-touch/wikipedia.png
D docroot/bits/apple-touch/wiktionary.png
R docroot/mediawiki/apple-touch-icon.png
R docroot/usability/apple-touch-icon.png
R docroot/wikinews.org/apple-touch-icon.png
M wmf-config/InitialiseSettings.php
7 files changed, 1 insertion(+), 10 deletions(-)
Approvals:
Krinkle: Verified; Looks good to me, approved
diff --git a/docroot/bits/apple-touch/commons.png
b/docroot/bits/apple-touch/commons.png
deleted file mode 100644
index 6fb4b33..0000000
--- a/docroot/bits/apple-touch/commons.png
+++ /dev/null
Binary files differ
diff --git a/docroot/bits/apple-touch/wikipedia.png
b/docroot/bits/apple-touch/wikipedia.png
deleted file mode 100644
index 0179b69..0000000
--- a/docroot/bits/apple-touch/wikipedia.png
+++ /dev/null
Binary files differ
diff --git a/docroot/bits/apple-touch/wiktionary.png
b/docroot/bits/apple-touch/wiktionary.png
deleted file mode 100644
index b084611..0000000
--- a/docroot/bits/apple-touch/wiktionary.png
+++ /dev/null
Binary files differ
diff --git a/docroot/bits/apple-touch/mediawiki.png
b/docroot/mediawiki/apple-touch-icon.png
similarity index 100%
rename from docroot/bits/apple-touch/mediawiki.png
rename to docroot/mediawiki/apple-touch-icon.png
Binary files differ
diff --git a/docroot/bits/apple-touch/usability.png
b/docroot/usability/apple-touch-icon.png
similarity index 100%
rename from docroot/bits/apple-touch/usability.png
rename to docroot/usability/apple-touch-icon.png
Binary files differ
diff --git a/docroot/bits/apple-touch/wikinews.png
b/docroot/wikinews.org/apple-touch-icon.png
similarity index 100%
rename from docroot/bits/apple-touch/wikinews.png
rename to docroot/wikinews.org/apple-touch-icon.png
Binary files differ
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 558a0de..891062e 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -9527,17 +9527,8 @@
),
'wgAppleTouchIcon' => array(
- #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',
-
- #Other wikis
- 'commonswiki' => '//bits.wikimedia.org/apple-touch/commons.png',
+ 'default' => false, // iOS searches for icons in docroot by default
'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(
--
To view, visit https://gerrit.wikimedia.org/r/60777
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2f0990fa087a7b2969c982d05187331e7005b64a
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Odder <[email protected]>
Gerrit-Reviewer: Krinkle <[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
