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 (executable)
--- 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%;
             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%;
             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 (file)
--- 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',
     'piwik.django',
     # Disable, if not using CAS.
     'django_cas',

+    'sponsors',

 
     'django.contrib.auth',
     'django.contrib.contenttypes',
 
     '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 (file)
--- 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'
 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 (file)
--- 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',
             'catalogue/js/jquery.cycle.all.js',
             'catalogue/js/edumed.js',
             'catalogue/js/carousel.js',

+            'sponsors/js/sponsors.js',

         ),
         'output_filename': 'compressed/base.js',
     },
         ),
         'output_filename': 'compressed/base.js',
     },

diff --git a/edumed/static/css/base.css b/edumed/static/css/base.css
index 424469c..27f9ccf 100644 (file)
--- 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; }
     width: 13.75em; }
     footer.main .footer-item p {
       font-size: .75em; }

-  footer.main .footer-item-half {
+  footer.main .sponsors-column {

     float: left;
     float: left;

-    margin-right: 1.25em;
+    margin-left: 1.25em;

     width: 6.25em; }
     width: 6.25em; }

-    footer.main .footer-item-half p {
+    footer.main .sponsors-column p {

       font-size: .75em; }
 
 #search {
       font-size: .75em; }
 
 #search {

diff --git a/edumed/static/css/base.scss b/edumed/static/css/base.scss
index da9312c..4153ca2 100644 (file)
--- a/edumed/static/css/base.scss
+++ b/edumed/static/css/base.scss
@@ -141,9 +141,9 @@ footer.main {
             font-size: .75em;
         }
     }
             font-size: .75em;
         }
     }

-    .footer-item-half {
+    .sponsors-column {

         float: left;
         float: left;

-        margin-right: 20 * $px;
+        margin-left: 20 * $px;

         width: 100 * $px;
         p {
             font-size: .75em;
         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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
--- 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 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 %}
 
 {% 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<br/>
                 </p>
             </div>
                 Nr konta: 59 1030 0019 0109 8530 0040 5685<br/>
                 </p>
             </div>

-            <div class="footer-item">
+            <div class="footer-item" style="margin-right:0;">

                 <p>
                 Webdesign Ortografika<br/>
                 <br/>
                 <p>
                 Webdesign Ortografika<br/>
                 <br/>


@@ -85,20 +86,7 @@
                 – Na tych samych warunkach 3.0</a>.
                 </p>
             </div>
                 – Na tych samych warunkach 3.0</a>.
                 </p>
             </div>

-            <div class="footer-item-half">
-                <p>
-                Patron honorowy:<br/>
-                <br/>
-                <img src="{% static 'img/logosy/mkidn.png' %}" alt="Ministerstwo Kultury i Dziedzictwa Narodowego" />
-                </p>
-            </div>
-            <div class="footer-item-half" style="margin-right: 0">
-                <p>
-                Grantodawca:<br/>
-                <br/>
-                <img src="{% static 'img/logosy/nina.png' %}" alt="Narodowy Instytut Audiowizualny" />
-                </p>
-            </div>
+            {% sponsor_page "footer" %}

             <div class="clr"></div>
         </footer>
 
             <div class="clr"></div>
         </footer>
 

diff --git a/edumed/urls.py b/edumed/urls.py
index 77b9872..95748cd 100644 (file)
--- a/edumed/urls.py
+++ b/edumed/urls.py
@@ -31,3 +31,11 @@ if 'django_cas' in settings.INSTALLED_APPS:
         (r'^accounts/login/$', 'django_cas.views.login'),
         (r'^accounts/logout/$', 'django_cas.views.logout'),
     )
         (r'^accounts/login/$', 'django_cas.views.login'),
         (r'^accounts/logout/$', 'django_cas.views.logout'),
     )

+
+
+if settings.DEBUG:
+    urlpatterns += patterns('',
+        url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+            'document_root': settings.MEDIA_ROOT,
+        }),
+   )

diff --git a/requirements.txt b/requirements.txt
index 23403a6..6cbc8e1 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,6 +8,8 @@ piwik
 #git+git://github.com/Kronuz/pyScss.git@d8f4da23a3c87696a75b3830ed4ab49b75550a93#egg=pyScss
 #TODO: pyScss support, for now just install sass
 
 #git+git://github.com/Kronuz/pyScss.git@d8f4da23a3c87696a75b3830ed4ab49b75550a93#egg=pyScss
 #TODO: pyScss support, for now just install sass
 

+django-jsonfield>=0.9,<0.10
+

 django_cas>=2.1,<2.2
 fnpdjango<0.2
 
 django_cas>=2.1,<2.2
 fnpdjango<0.2
 


@@ -15,3 +17,7 @@ Feedparser
 
 # Librarian
 lxml
 
 # Librarian
 lxml

+
+# sponsors
+pillow
+django-sponsors