From: Radek Czajka Date: Mon, 28 Jan 2013 14:29:11 +0000 (+0100) Subject: Add sponsors page; remove some unused files. X-Git-Url: https://git.mdrn.pl/edumed.git/commitdiff_plain/e470363329ca19f0ed74f7e6d420badcd83408c6?ds=inline Add sponsors page; remove some unused files. --- diff --git a/catalogue/static/catalogue/css/carousel.scss b/catalogue/static/catalogue/css/carousel.scss index ec28f71..56e0591 100755 --- a/catalogue/static/catalogue/css/carousel.scss +++ b/catalogue/static/catalogue/css/carousel.scss @@ -24,7 +24,6 @@ $ciemny: #363a3e; top: 0; left: 0; height: 100%; - /* background-image: url(/static/test.jpg); set real background image */ background-size: 100% 100%; border-top-left-radius: 15*$px 6.38%; border-bottom-left-radius: 15*$px 6.38%; diff --git a/edumed/settings.d/30-apps.py b/edumed/settings.d/30-apps.py index c3d067f..db5d100 100644 --- a/edumed/settings.d/30-apps.py +++ b/edumed/settings.d/30-apps.py @@ -10,6 +10,7 @@ INSTALLED_APPS = ( 'piwik.django', # Disable, if not using CAS. 'django_cas', + 'sponsors', 'django.contrib.auth', 'django.contrib.contenttypes', diff --git a/edumed/settings.d/50-contrib.py b/edumed/settings.d/50-contrib.py index 2210cf1..2da1448 100644 --- a/edumed/settings.d/50-contrib.py +++ b/edumed/settings.d/50-contrib.py @@ -1,2 +1,5 @@ CAS_SERVER_URL = 'http://logowanie.nowoczesnapolska.org.pl/cas/' CAS_VERSION = '1' + +SPONSORS_THUMB_WIDTH = 100 +SPONSORS_THUMB_HEIGHT = 56 diff --git a/edumed/settings.d/50-static.py b/edumed/settings.d/50-static.py index 2108fed..2d7c9a5 100644 --- a/edumed/settings.d/50-static.py +++ b/edumed/settings.d/50-static.py @@ -32,6 +32,7 @@ PIPELINE_JS = { 'catalogue/js/jquery.cycle.all.js', 'catalogue/js/edumed.js', 'catalogue/js/carousel.js', + 'sponsors/js/sponsors.js', ), 'output_filename': 'compressed/base.js', }, diff --git a/edumed/static/css/base.css b/edumed/static/css/base.css index 424469c..27f9ccf 100644 --- a/edumed/static/css/base.css +++ b/edumed/static/css/base.css @@ -117,11 +117,11 @@ footer.main { width: 13.75em; } footer.main .footer-item p { font-size: .75em; } - footer.main .footer-item-half { + footer.main .sponsors-column { float: left; - margin-right: 1.25em; + margin-left: 1.25em; width: 6.25em; } - footer.main .footer-item-half p { + footer.main .sponsors-column p { font-size: .75em; } #search { diff --git a/edumed/static/css/base.scss b/edumed/static/css/base.scss index da9312c..4153ca2 100644 --- a/edumed/static/css/base.scss +++ b/edumed/static/css/base.scss @@ -141,9 +141,9 @@ footer.main { font-size: .75em; } } - .footer-item-half { + .sponsors-column { float: left; - margin-right: 20 * $px; + margin-left: 20 * $px; width: 100 * $px; p { font-size: .75em; diff --git a/edumed/static/img/logosy/mkidn.png b/edumed/static/img/logosy/mkidn.png deleted file mode 100644 index ae09b22..0000000 Binary files a/edumed/static/img/logosy/mkidn.png and /dev/null differ diff --git a/edumed/static/img/logosy/nina.png b/edumed/static/img/logosy/nina.png deleted file mode 100644 index ddf1e33..0000000 Binary files a/edumed/static/img/logosy/nina.png and /dev/null differ diff --git a/edumed/static/test.jpg b/edumed/static/test.jpg deleted file mode 100644 index 7fe148c..0000000 Binary files a/edumed/static/test.jpg and /dev/null differ diff --git a/edumed/static/tlo.png b/edumed/static/tlo.png deleted file mode 100644 index d9cee10..0000000 Binary files a/edumed/static/tlo.png and /dev/null differ diff --git a/edumed/templates/base.html b/edumed/templates/base.html index 316347e..bbfab33 100644 --- a/edumed/templates/base.html +++ b/edumed/templates/base.html @@ -3,6 +3,7 @@ {% load i18n static %} {% load fnp_common fnp_share fnp_lang macros %} {% load compressed static %} +{% load sponsor_tags %} {% macro title %}{% block title %}{% endblock %}{% endmacro %} {% macro site_name %}Edukacja medialna{% endmacro %} @@ -76,7 +77,7 @@ Nr konta: 59 1030 0019 0109 8530 0040 5685

-