kaputtnik has proposed merging
lp:~widelands-dev/widelands-website/media_cleanup into lp:widelands-website.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/media_cleanup/+merge/333088
Some cleanup in the media directory:
- Some unused images
- Automake files for the smileys
- IE8 specific css file
I grepped through the code to be sure the removed files aren't used somewhere.
Additionally i have added the removed images into the widelands-media repo at:
http://bazaar.launchpad.net/~widelands-media-dev/widelands-media/widelands-media/files/head:/graphics/website/moved_from_trunk_2017/
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands-website/media_cleanup into lp:widelands-website.
=== modified file 'local_settings.py.sample'
--- local_settings.py.sample 2017-10-27 12:47:04 +
+++ local_settings.py.sample 2017-11-01 17:11:08 +
@@ -39,7 +39,7 @@
NORECAPTCHA_SECRET_KEY = 'dummy'
# The logo used for mainpage
-LOGO_FILE = 'Logo_alpha.png'
+LOGO_FILE = 'logo_alpha.png'
# Setting an email backend prevents 'connection refused' errors
# Don't use this on the widelands server!
=== removed file 'media/css/base_ielt8.css'
--- media/css/base_ielt8.css 2012-03-30 23:26:23 +
+++ media/css/base_ielt8.css 1970-01-01 00:00:00 +
@@ -1,3 +0,0 @@
-ul.menu li ul {
- left: -41px;
-}
=== removed file 'media/img/1.gif'
Binary files media/img/1.gif 2011-07-03 14:00:24 + and media/img/1.gif 1970-01-01 00:00:00 + differ
=== removed file 'media/img/12.gif'
Binary files media/img/12.gif 2011-07-03 14:00:24 + and media/img/12.gif 1970-01-01 00:00:00 + differ
=== removed file 'media/img/HomepageSplash.jpg'
Binary files media/img/HomepageSplash.jpg 2012-04-03 18:58:19 + and media/img/HomepageSplash.jpg 1970-01-01 00:00:00 + differ
=== removed file 'media/img/Menubackground.png'
Binary files media/img/Menubackground.png 2011-07-03 14:00:24 + and media/img/Menubackground.png 1970-01-01 00:00:00 + differ
=== removed file 'media/img/Navbar.png'
Binary files media/img/Navbar.png 2011-07-03 14:00:24 + and media/img/Navbar.png 1970-01-01 00:00:00 + differ
=== removed file 'media/img/arrow.png'
Binary files media/img/arrow.png 2009-03-21 13:00:37 + and media/img/arrow.png 1970-01-01 00:00:00 + differ
=== removed file 'media/img/background-222.png'
Binary files media/img/background-222.png 2011-07-03 14:00:24 + and media/img/background-222.png 1970-01-01 00:00:00 + differ
=== removed file 'media/img/background-3F3F3F.png'
Binary files media/img/background-3F3F3F.png 2011-07-03 14:00:24 + and media/img/background-3F3F3F.png 1970-01-01 00:00:00 + differ
=== removed file 'media/img/background-444.png'
Binary files media/img/background-444.png 2011-07-03 14:00:24 + and media/img/background-444.png 1970-01-01 00:00:00 + differ
=== removed file 'media/img/background-4A4A4A.png'
Binary files media/img/background-4A4A4A.png 2011-07-03 14:00:24 + and media/img/background-4A4A4A.png 1970-01-01 00:00:00 + differ
=== removed file 'media/img/background.png'
Binary files media/img/background.png 2011-07-03 14:00:24 + and media/img/background.png 1970-01-01 00:00:00 + differ
=== removed file 'media/img/close_icon.png'
Binary files media/img/close_icon.png 2011-07-03 14:00:24 + and media/img/close_icon.png 1970-01-01 00:00:00 + differ
=== removed file 'media/img/easter.png'
Binary files media/img/easter.png 2012-04-19 19:46:21 + and media/img/easter.png 1970-01-01 00:00:00 + differ
=== removed file 'media/img/external_link.gif'
Binary files media/img/external_link.gif 2009-03-02 17:42:51 + and media/img/external_link.gif 1970-01-01 00:00:00 + differ
=== removed file 'media/img/headback.jpg'
Binary files media/img/headback.jpg 2011-07-03 14:00:24 + and media/img/headback.jpg 1970-01-01 00:00:00 + differ
=== renamed file 'media/img/Logo.png' => 'media/img/logo.png'
=== renamed file 'media/img/Logo_alpha.png' => 'media/img/logo_alpha.png'
=== removed file 'media/img/smileys/Makefile.am'
--- media/img/smileys/Makefile.am 2009-03-26 20:25:08 +
+++ media/img/smileys/Makefile.am 1970-01-01 00:00:00 +
@@ -1,26 +0,0 @@
-
-size = 16x16
-context = emotes
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- face-angel.png \
- face-crying.png \
- face-devilish.png \
- face-glasses.png \
- face-grin.png \
- face-kiss.png \
- face-monkey.png \
- face-plain.png \
- face-sad.png \
- face-smile.png \
- face-smile-big.png \
- face-surprise.png \
- face-wink.png
-
-EXTRA_DIST = \
- $(icons_DATA)
-
-install-data-local: install-iconsDATA
- (cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
=== removed file 'media/img/smileys/Makefile.in'
--- media/img/smileys/Makefile.in 2009-03-26 20:25:08 +
+++ media/img/smileys/Makefile
