From: Bartosz Dziewoński Date: Fri, 5 Sep 2014 17:13:52 +0000 (+0200) Subject: Move file type icons to new assets/ directory X-Git-Tag: 1.31.0-rc.0~14127^2 X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=2b4b9a3fdb8072984d330c093c95aa9a8dfe2012;p=lhc%2Fweb%2Fwiklou.git Move file type icons to new assets/ directory This patch introduces the assets/ directory, which will be used for static files included with MediaWiki that can't meaningfully be loaded via ResourceLoader. Bug: 69277 Change-Id: Ifd87387f20a6355a6e273628b37735c207e4c53a --- diff --git a/assets/file-type-icons/COPYING b/assets/file-type-icons/COPYING new file mode 100644 index 0000000000..136530a91e --- /dev/null +++ b/assets/file-type-icons/COPYING @@ -0,0 +1,43 @@ +The icons used here are derived from the crystalsvg icons in the the +pics/crystalsvg/ directory of kdelibs-3.4.0 they were modified on 2005-05-15 +by Ævar Arnfjörð Bjarmason for use in MediaWiki. + +What follows is the contents of the LICENSE.crystalsvg file found in the pics/ +subdirectory of kdelibs-3.4.0: + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +This copyright and license notice covers all CrystalSVG images. +Note the license notice contains an add-on. +******************************************************************************** +KDE Crystal theme icons. +Copyright (C) 2002 and following years KDE Artists +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation, +version 2.1 of the License. +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + **** NOTE THIS ADD-ON **** +The GNU Lesser General Public License or LGPL is written for software libraries +in the first place. We expressly want the LGPL to be valid for this artwork +library too. +KDE Crystal theme icons is a special kind of software library, it is an +artwork library, it's elements can be used in a Graphical User Interface, or +GUI. +Source code, for this library means: + - for vectors svg; + - for pixels, if applicable, the multi-layered formats xcf or psd, or +otherwise png. +The LGPL in some sections obliges you to make the files carry +notices. With images this is in some cases impossible or hardly useful. +With this library a notice is placed at a prominent place in the directory +containing the elements. You may follow this practice. +The exception in section 6 of the GNU Lesser General Public License covers +the use of elements of this art library in a GUI. +kde-artists [at] kde.org +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/assets/file-type-icons/fileicon-c.png b/assets/file-type-icons/fileicon-c.png new file mode 100644 index 0000000000..0d603b7090 Binary files /dev/null and b/assets/file-type-icons/fileicon-c.png differ diff --git a/assets/file-type-icons/fileicon-cpp.png b/assets/file-type-icons/fileicon-cpp.png new file mode 100644 index 0000000000..123688f002 Binary files /dev/null and b/assets/file-type-icons/fileicon-cpp.png differ diff --git a/assets/file-type-icons/fileicon-deb.png b/assets/file-type-icons/fileicon-deb.png new file mode 100644 index 0000000000..87ca3fabe1 Binary files /dev/null and b/assets/file-type-icons/fileicon-deb.png differ diff --git a/assets/file-type-icons/fileicon-djvu.png b/assets/file-type-icons/fileicon-djvu.png new file mode 100644 index 0000000000..1da2276118 Binary files /dev/null and b/assets/file-type-icons/fileicon-djvu.png differ diff --git a/assets/file-type-icons/fileicon-djvu.xcf b/assets/file-type-icons/fileicon-djvu.xcf new file mode 100644 index 0000000000..8043dcdb51 Binary files /dev/null and b/assets/file-type-icons/fileicon-djvu.xcf differ diff --git a/assets/file-type-icons/fileicon-dvi.png b/assets/file-type-icons/fileicon-dvi.png new file mode 100644 index 0000000000..f37878d80a Binary files /dev/null and b/assets/file-type-icons/fileicon-dvi.png differ diff --git a/assets/file-type-icons/fileicon-exe.png b/assets/file-type-icons/fileicon-exe.png new file mode 100644 index 0000000000..dc020eb813 Binary files /dev/null and b/assets/file-type-icons/fileicon-exe.png differ diff --git a/assets/file-type-icons/fileicon-h.png b/assets/file-type-icons/fileicon-h.png new file mode 100644 index 0000000000..339bf02506 Binary files /dev/null and b/assets/file-type-icons/fileicon-h.png differ diff --git a/assets/file-type-icons/fileicon-html.png b/assets/file-type-icons/fileicon-html.png new file mode 100644 index 0000000000..f28f8a26d1 Binary files /dev/null and b/assets/file-type-icons/fileicon-html.png differ diff --git a/assets/file-type-icons/fileicon-iso.png b/assets/file-type-icons/fileicon-iso.png new file mode 100644 index 0000000000..c73d2294d2 Binary files /dev/null and b/assets/file-type-icons/fileicon-iso.png differ diff --git a/assets/file-type-icons/fileicon-java.png b/assets/file-type-icons/fileicon-java.png new file mode 100644 index 0000000000..a1b4f225e2 Binary files /dev/null and b/assets/file-type-icons/fileicon-java.png differ diff --git a/assets/file-type-icons/fileicon-mid.png b/assets/file-type-icons/fileicon-mid.png new file mode 100644 index 0000000000..ce2bebb283 Binary files /dev/null and b/assets/file-type-icons/fileicon-mid.png differ diff --git a/assets/file-type-icons/fileicon-mov.png b/assets/file-type-icons/fileicon-mov.png new file mode 100644 index 0000000000..952de1f2f3 Binary files /dev/null and b/assets/file-type-icons/fileicon-mov.png differ diff --git a/assets/file-type-icons/fileicon-o.png b/assets/file-type-icons/fileicon-o.png new file mode 100644 index 0000000000..f3523d96ae Binary files /dev/null and b/assets/file-type-icons/fileicon-o.png differ diff --git a/assets/file-type-icons/fileicon-ogg.png b/assets/file-type-icons/fileicon-ogg.png new file mode 100644 index 0000000000..ef4d801608 Binary files /dev/null and b/assets/file-type-icons/fileicon-ogg.png differ diff --git a/assets/file-type-icons/fileicon-ogg.xcf b/assets/file-type-icons/fileicon-ogg.xcf new file mode 100644 index 0000000000..a91024bf21 Binary files /dev/null and b/assets/file-type-icons/fileicon-ogg.xcf differ diff --git a/assets/file-type-icons/fileicon-pdf.png b/assets/file-type-icons/fileicon-pdf.png new file mode 100644 index 0000000000..8c8da92ba4 Binary files /dev/null and b/assets/file-type-icons/fileicon-pdf.png differ diff --git a/assets/file-type-icons/fileicon-ps.png b/assets/file-type-icons/fileicon-ps.png new file mode 100644 index 0000000000..e872833158 Binary files /dev/null and b/assets/file-type-icons/fileicon-ps.png differ diff --git a/assets/file-type-icons/fileicon-psd.png b/assets/file-type-icons/fileicon-psd.png new file mode 100644 index 0000000000..598f190e18 Binary files /dev/null and b/assets/file-type-icons/fileicon-psd.png differ diff --git a/assets/file-type-icons/fileicon-rm.png b/assets/file-type-icons/fileicon-rm.png new file mode 100644 index 0000000000..81dbe0b7dd Binary files /dev/null and b/assets/file-type-icons/fileicon-rm.png differ diff --git a/assets/file-type-icons/fileicon-rpm.png b/assets/file-type-icons/fileicon-rpm.png new file mode 100644 index 0000000000..1903aacc26 Binary files /dev/null and b/assets/file-type-icons/fileicon-rpm.png differ diff --git a/assets/file-type-icons/fileicon-svg.png b/assets/file-type-icons/fileicon-svg.png new file mode 100644 index 0000000000..b782113a74 Binary files /dev/null and b/assets/file-type-icons/fileicon-svg.png differ diff --git a/assets/file-type-icons/fileicon-tar.png b/assets/file-type-icons/fileicon-tar.png new file mode 100644 index 0000000000..e5fd1b74d4 Binary files /dev/null and b/assets/file-type-icons/fileicon-tar.png differ diff --git a/assets/file-type-icons/fileicon-tex.png b/assets/file-type-icons/fileicon-tex.png new file mode 100644 index 0000000000..a4372841d1 Binary files /dev/null and b/assets/file-type-icons/fileicon-tex.png differ diff --git a/assets/file-type-icons/fileicon-ttf.png b/assets/file-type-icons/fileicon-ttf.png new file mode 100644 index 0000000000..1ed4e740cb Binary files /dev/null and b/assets/file-type-icons/fileicon-ttf.png differ diff --git a/assets/file-type-icons/fileicon-txt.png b/assets/file-type-icons/fileicon-txt.png new file mode 100644 index 0000000000..9e988e711e Binary files /dev/null and b/assets/file-type-icons/fileicon-txt.png differ diff --git a/assets/file-type-icons/fileicon-xcf.png b/assets/file-type-icons/fileicon-xcf.png new file mode 100644 index 0000000000..1037b506d5 Binary files /dev/null and b/assets/file-type-icons/fileicon-xcf.png differ diff --git a/assets/file-type-icons/fileicon.png b/assets/file-type-icons/fileicon.png new file mode 100644 index 0000000000..59696a382b Binary files /dev/null and b/assets/file-type-icons/fileicon.png differ diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php index ba2d4ac895..f9e0a2dc93 100644 --- a/includes/filerepo/file/File.php +++ b/includes/filerepo/file/File.php @@ -1312,16 +1312,16 @@ abstract class File { * @return ThumbnailImage */ function iconThumb() { - global $wgStylePath, $wgStyleDirectory; + global $wgScriptPath, $IP; + $assetsPath = "$wgScriptPath/assets/file-type-icons/"; + $assetsDirectory = "$IP/assets/file-type-icons/"; $try = array( 'fileicon-' . $this->getExtension() . '.png', 'fileicon.png' ); foreach ( $try as $icon ) { - $path = '/common/images/icons/' . $icon; - $filepath = $wgStyleDirectory . $path; - if ( file_exists( $filepath ) ) { // always FS + if ( file_exists( $assetsDirectory . $icon ) ) { // always FS $params = array( 'width' => 120, 'height' => 120 ); - return new ThumbnailImage( $this, $wgStylePath . $path, false, $params ); + return new ThumbnailImage( $this, $assetsPath . $icon, false, $params ); } } diff --git a/skins/common/images/icons/COPYING b/skins/common/images/icons/COPYING deleted file mode 100644 index 136530a91e..0000000000 --- a/skins/common/images/icons/COPYING +++ /dev/null @@ -1,43 +0,0 @@ -The icons used here are derived from the crystalsvg icons in the the -pics/crystalsvg/ directory of kdelibs-3.4.0 they were modified on 2005-05-15 -by Ævar Arnfjörð Bjarmason for use in MediaWiki. - -What follows is the contents of the LICENSE.crystalsvg file found in the pics/ -subdirectory of kdelibs-3.4.0: - -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -This copyright and license notice covers all CrystalSVG images. -Note the license notice contains an add-on. -******************************************************************************** -KDE Crystal theme icons. -Copyright (C) 2002 and following years KDE Artists -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation, -version 2.1 of the License. -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - **** NOTE THIS ADD-ON **** -The GNU Lesser General Public License or LGPL is written for software libraries -in the first place. We expressly want the LGPL to be valid for this artwork -library too. -KDE Crystal theme icons is a special kind of software library, it is an -artwork library, it's elements can be used in a Graphical User Interface, or -GUI. -Source code, for this library means: - - for vectors svg; - - for pixels, if applicable, the multi-layered formats xcf or psd, or -otherwise png. -The LGPL in some sections obliges you to make the files carry -notices. With images this is in some cases impossible or hardly useful. -With this library a notice is placed at a prominent place in the directory -containing the elements. You may follow this practice. -The exception in section 6 of the GNU Lesser General Public License covers -the use of elements of this art library in a GUI. -kde-artists [at] kde.org -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/skins/common/images/icons/fileicon-c.png b/skins/common/images/icons/fileicon-c.png deleted file mode 100644 index 0d603b7090..0000000000 Binary files a/skins/common/images/icons/fileicon-c.png and /dev/null differ diff --git a/skins/common/images/icons/fileicon-cpp.png b/skins/common/images/icons/fileicon-cpp.png deleted file mode 100644 index 123688f002..0000000000 Binary files a/skins/common/images/icons/fileicon-cpp.png and /dev/null differ diff --git a/skins/common/images/icons/fileicon-deb.png b/skins/common/images/icons/fileicon-deb.png deleted file mode 100644 index 87ca3fabe1..0000000000 Binary files a/skins/common/images/icons/fileicon-deb.png and /dev/null differ diff --git a/skins/common/images/icons/fileicon-djvu.png b/skins/common/images/icons/fileicon-djvu.png deleted file mode 100644 index 1da2276118..0000000000 Binary files a/skins/common/images/icons/fileicon-djvu.png and /dev/null differ diff --git a/skins/common/images/icons/fileicon-djvu.xcf b/skins/common/images/icons/fileicon-djvu.xcf deleted file mode 100644 index 8043dcdb51..0000000000 Binary files a/skins/common/images/icons/fileicon-djvu.xcf and /dev/null differ diff --git a/skins/common/images/icons/fileicon-dvi.png b/skins/common/images/icons/fileicon-dvi.png deleted file mode 100644 index f37878d80a..0000000000 Binary files a/skins/common/images/icons/fileicon-dvi.png and /dev/null differ diff --git a/skins/common/images/icons/fileicon-exe.png b/skins/common/images/icons/fileicon-exe.png deleted file mode 100644 index dc020eb813..0000000000 Binary files a/skins/common/images/icons/fileicon-exe.png and /dev/null differ diff --git a/skins/common/images/icons/fileicon-h.png b/skins/common/images/icons/fileicon-h.png deleted file mode 100644 index 339bf02506..0000000000 Binary files a/skins/common/images/icons/fileicon-h.png and /dev/null differ diff --git a/skins/common/images/icons/fileicon-html.png b/skins/common/images/icons/fileicon-html.png deleted file mode 100644 index f28f8a26d1..0000000000 Binary files a/skins/common/images/icons/fileicon-html.png and /dev/null differ diff --git a/skins/common/images/icons/fileicon-iso.png b/skins/common/images/icons/fileicon-iso.png deleted file mode 100644 index c73d2294d2..0000000000 Binary files a/skins/common/images/icons/fileicon-iso.png and /dev/null differ diff --git a/skins/common/images/icons/fileicon-java.png b/skins/common/images/icons/fileicon-java.png deleted file mode 100644 index a1b4f225e2..0000000000 Binary files a/skins/common/images/icons/fileicon-java.png and /dev/null differ diff --git a/skins/common/images/icons/fileicon-mid.png b/skins/common/images/icons/fileicon-mid.png deleted file mode 100644 index ce2bebb283..0000000000 Binary files a/skins/common/images/icons/fileicon-mid.png and /dev/null differ diff --git a/skins/common/images/icons/fileicon-mov.png b/skins/common/images/icons/fileicon-mov.png deleted file mode 100644 index 952de1f2f3..0000000000 Binary files a/skins/common/images/icons/fileicon-mov.png and /dev/null differ diff --git a/skins/common/images/icons/fileicon-o.png b/skins/common/images/icons/fileicon-o.png deleted file mode 100644 index f3523d96ae..0000000000 Binary files a/skins/common/images/icons/fileicon-o.png and /dev/null differ diff --git a/skins/common/images/icons/fileicon-ogg.png b/skins/common/images/icons/fileicon-ogg.png deleted file mode 100644 index ef4d801608..0000000000 Binary files a/skins/common/images/icons/fileicon-ogg.png and /dev/null differ diff --git a/skins/common/images/icons/fileicon-ogg.xcf b/skins/common/images/icons/fileicon-ogg.xcf deleted file mode 100644 index a91024bf21..0000000000 Binary files a/skins/common/images/icons/fileicon-ogg.xcf and /dev/null differ diff --git a/skins/common/images/icons/fileicon-pdf.png b/skins/common/images/icons/fileicon-pdf.png deleted file mode 100644 index 8c8da92ba4..0000000000 Binary files a/skins/common/images/icons/fileicon-pdf.png and /dev/null differ diff --git a/skins/common/images/icons/fileicon-ps.png b/skins/common/images/icons/fileicon-ps.png deleted file mode 100644 index e872833158..0000000000 Binary files a/skins/common/images/icons/fileicon-ps.png and /dev/null differ diff --git a/skins/common/images/icons/fileicon-psd.png b/skins/common/images/icons/fileicon-psd.png deleted file mode 100644 index 598f190e18..0000000000 Binary files a/skins/common/images/icons/fileicon-psd.png and /dev/null differ diff --git a/skins/common/images/icons/fileicon-rm.png b/skins/common/images/icons/fileicon-rm.png deleted file mode 100644 index 81dbe0b7dd..0000000000 Binary files a/skins/common/images/icons/fileicon-rm.png and /dev/null differ diff --git a/skins/common/images/icons/fileicon-rpm.png b/skins/common/images/icons/fileicon-rpm.png deleted file mode 100644 index 1903aacc26..0000000000 Binary files a/skins/common/images/icons/fileicon-rpm.png and /dev/null differ diff --git a/skins/common/images/icons/fileicon-svg.png b/skins/common/images/icons/fileicon-svg.png deleted file mode 100644 index b782113a74..0000000000 Binary files a/skins/common/images/icons/fileicon-svg.png and /dev/null differ diff --git a/skins/common/images/icons/fileicon-tar.png b/skins/common/images/icons/fileicon-tar.png deleted file mode 100644 index e5fd1b74d4..0000000000 Binary files a/skins/common/images/icons/fileicon-tar.png and /dev/null differ diff --git a/skins/common/images/icons/fileicon-tex.png b/skins/common/images/icons/fileicon-tex.png deleted file mode 100644 index a4372841d1..0000000000 Binary files a/skins/common/images/icons/fileicon-tex.png and /dev/null differ diff --git a/skins/common/images/icons/fileicon-ttf.png b/skins/common/images/icons/fileicon-ttf.png deleted file mode 100644 index 1ed4e740cb..0000000000 Binary files a/skins/common/images/icons/fileicon-ttf.png and /dev/null differ diff --git a/skins/common/images/icons/fileicon-txt.png b/skins/common/images/icons/fileicon-txt.png deleted file mode 100644 index 9e988e711e..0000000000 Binary files a/skins/common/images/icons/fileicon-txt.png and /dev/null differ diff --git a/skins/common/images/icons/fileicon-xcf.png b/skins/common/images/icons/fileicon-xcf.png deleted file mode 100644 index 1037b506d5..0000000000 Binary files a/skins/common/images/icons/fileicon-xcf.png and /dev/null differ diff --git a/skins/common/images/icons/fileicon.png b/skins/common/images/icons/fileicon.png deleted file mode 100644 index 59696a382b..0000000000 Binary files a/skins/common/images/icons/fileicon.png and /dev/null differ