Visual update of the mil site

diff --git a/edumed/settings.d/50-static.py b/edumed/settings.d/50-static.py
index 4d75c9a..43dbb7c 100644 (file)
--- a/edumed/settings.d/50-static.py
+++ b/edumed/settings.d/50-static.py
@@ -27,6 +27,7 @@ PIPELINE_CSS = {
           'jquery/colorbox/colorbox.css',
 
           'css/forum.scss',
           'jquery/colorbox/colorbox.css',
 
           'css/forum.scss',

+          'css/mil.scss'

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

diff --git a/edumed/static/css/mil.css b/edumed/static/css/mil.css
new file mode 100644 (file)
index 0000000..3d9bbbe
--- /dev/null
+++ b/edumed/static/css/mil.css
@@ -0,0 +1,47 @@
+header.header-mil {
+  background-color: #f47b3b; }
+  header.header-mil #organizer {
+    color: white;
+    float: none;
+    position: absolute;
+    top: 10px;
+    right: 12px; }
+  header.header-mil nav ul {
+    margin-top: 0; }
+    header.header-mil nav ul li {
+      vertical-align: text-bottom; }
+  header.header-mil nav a, header.header-mil nav a:hover {
+    color: white; }
+  header.header-mil nav a:before {
+    content: " ";
+    display: block;
+    margin-bottom: .8em;
+    width: 5.5em;
+    height: 4.25em;
+    text-align: center;
+    margin: auto;
+    margin-bottom: .8em; }
+  header.header-mil nav .menu-consultations:before {
+    background: url(../img/menu/mil/consultations.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.header-mil nav .menu-takepart:before {
+    background: url(../img/menu/mil/takepart.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.header-mil nav .menu-knowledgebase:before {
+    background: url(../img/menu/mil/knowledgebase.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.header-mil nav .menu-kompetencje:before, header.header-mil nav .menu-kontakt:before {
+    width: 3.625em;
+    height: 2.8125em; }
+  header.header-mil nav .menu-kompetencje:before, header.header-mil nav .menu-kompetencje:hover:before {
+    background: url(../img/menu/mil/catalog.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.header-mil nav .menu-kontakt:before, header.header-mil nav .menu-kontakt:hover:before {
+    background: url(../img/menu/mil/contact.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.header-mil nav .lang-switcher-en:before {
+    background: url(../img/menu/mil/lang_en.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.header-mil nav .lang-switcher-pl:before {
+    background: url(../img/menu/mil/lang_pl.png) no-repeat 0 0;
+    background-size: 100%; }

diff --git a/edumed/static/css/mil.scss b/edumed/static/css/mil.scss
new file mode 100644 (file)
index 0000000..be3f0aa
--- /dev/null
+++ b/edumed/static/css/mil.scss
@@ -0,0 +1,57 @@
+@import "vars";
+
+header.header-mil {
+    
+    background-color: #f47b3b;
+
+    #organizer {
+        color: white;
+        float: none;
+        position: absolute;
+        top: 10px;
+        right:12px;
+    }
+    
+    nav {
+        ul {
+            margin-top: 0;
+            li {
+                vertical-align: text-bottom;
+            }
+        }
+
+        a,a:hover {
+            color: white;
+        }
+
+        a:before {
+            content: " ";
+            display: block;
+            margin-bottom: .8em;
+            width: 88*$px;
+            height: 68*$px;
+            text-align:center;
+            margin: auto;
+            margin-bottom: .8em;
+        }
+
+        .menu-consultations:before { background: url(../img/menu/mil/consultations.png) no-repeat 0 0; background-size: 100%;}
+        .menu-takepart:before { background: url(../img/menu/mil/takepart.png) no-repeat 0 0; background-size: 100%;}
+        .menu-knowledgebase:before { background: url(../img/menu/mil/knowledgebase.png) no-repeat 0 0; background-size: 100%;}
+
+        .menu-kompetencje:before, .menu-kontakt:before {
+            width: 58*$px;
+            height: 45*$px;
+        }
+
+        .menu-kompetencje:before, .menu-kompetencje:hover:before {
+            background: url(../img/menu/mil/catalog.png) no-repeat 0 0; background-size: 100%;
+        }
+        .menu-kontakt:before, .menu-kontakt:hover:before {
+            background: url(../img/menu/mil/contact.png) no-repeat 0 0; background-size: 100%;
+        }
+
+        .lang-switcher-en:before { background: url(../img/menu/mil/lang_en.png) no-repeat 0 0; background-size: 100%;}
+        .lang-switcher-pl:before { background: url(../img/menu/mil/lang_pl.png) no-repeat 0 0; background-size: 100%;}
+    }
+}
\ No newline at end of file

diff --git a/edumed/static/img/logo-mil.png b/edumed/static/img/logo-mil.png
new file mode 100644 (file)
index 0000000..1f1d780
Binary files /dev/null and b/edumed/static/img/logo-mil.png differ

diff --git a/edumed/static/img/logo_fnp_white.png b/edumed/static/img/logo_fnp_white.png
new file mode 100644 (file)
index 0000000..f189ca7
Binary files /dev/null and b/edumed/static/img/logo_fnp_white.png differ

diff --git a/edumed/static/img/menu/mil/catalog.png b/edumed/static/img/menu/mil/catalog.png
new file mode 100644 (file)
index 0000000..f0cc3c7
Binary files /dev/null and b/edumed/static/img/menu/mil/catalog.png differ

diff --git a/edumed/static/img/menu/mil/consultations.png b/edumed/static/img/menu/mil/consultations.png
new file mode 100644 (file)
index 0000000..e050b98
Binary files /dev/null and b/edumed/static/img/menu/mil/consultations.png differ

diff --git a/edumed/static/img/menu/mil/contact.png b/edumed/static/img/menu/mil/contact.png
new file mode 100644 (file)
index 0000000..7466951
Binary files /dev/null and b/edumed/static/img/menu/mil/contact.png differ

diff --git a/edumed/static/img/menu/mil/knowledgebase.png b/edumed/static/img/menu/mil/knowledgebase.png
new file mode 100644 (file)
index 0000000..6bd0372
Binary files /dev/null and b/edumed/static/img/menu/mil/knowledgebase.png differ

diff --git a/edumed/static/img/menu/mil/lang_en.png b/edumed/static/img/menu/mil/lang_en.png
new file mode 100644 (file)
index 0000000..ed9aa77
Binary files /dev/null and b/edumed/static/img/menu/mil/lang_en.png differ

diff --git a/edumed/static/img/menu/mil/lang_pl.png b/edumed/static/img/menu/mil/lang_pl.png
new file mode 100644 (file)
index 0000000..1c48db6
Binary files /dev/null and b/edumed/static/img/menu/mil/lang_pl.png differ

diff --git a/edumed/static/img/menu/mil/takepart.png b/edumed/static/img/menu/mil/takepart.png
new file mode 100644 (file)
index 0000000..28a6839
Binary files /dev/null and b/edumed/static/img/menu/mil/takepart.png differ

diff --git a/edumed/static/img/nina-white.png b/edumed/static/img/nina-white.png
new file mode 100644 (file)
index 0000000..3d2afe7
Binary files /dev/null and b/edumed/static/img/nina-white.png differ

diff --git a/edumed/templates/base_mil.html b/edumed/templates/base_mil.html
index d6fac36..45422e4 100644 (file)
--- a/edumed/templates/base_mil.html
+++ b/edumed/templates/base_mil.html
@@ -6,12 +6,18 @@
 
 {% load i18n %}
 
 
 {% load i18n %}
 

+{% block header_class %}header-mil{% endblock %}
+
+{% block logo %}
+<img src="{% static "img/logo-mil.png" %}" alt="Edukacja medialna"/>
+{% endblock %}
+

 {% block top_navigation %}
 {% block top_navigation %}

-    <li><a class="menu-wspolpraca" href="{% url "mil_home" %}">{% trans 'Consultations' %}</a></li>
+    <li><a class="menu-consultations" href="{% url "mil_home" %}">{% trans 'Consultations' %}</a></li>

         <li><a class="menu-kompetencje" href="{% url "curriculum" %}">{% trans 'Competencies' %}</a></li>
         <li><a class="menu-kompetencje" href="{% url "curriculum" %}">{% trans 'Competencies' %}</a></li>

-        <li><a class="menu-wspolpraca" href="{% url "comment_document_index" %}">{% trans 'Take Part' %}</a></li>
+        <li><a class="menu-takepart" href="{% url "comment_document_index" %}">{% trans 'Take Part' %}</a></li>

         {% if request.LANGUAGE_CODE == 'pl' %}
         {% if request.LANGUAGE_CODE == 'pl' %}

-            <li><a class="menu-lekcje" href="{% url 'home' subdomain=None %}">Materiały edukacyjne</a></li>
+            <li><a class="menu-knowledgebase" href="{% url 'home' subdomain=None %}">Baza wiedzy</a></li>

         {% endif %}
         <li><a class="menu-kontakt" href="{% url 'mil_contact' %}">{% trans 'Contact' %}</a></li>
         <li>{% lang_switcher %}</li>
         {% endif %}
         <li><a class="menu-kontakt" href="{% url 'mil_contact' %}">{% trans 'Contact' %}</a></li>
         <li>{% lang_switcher %}</li>


@@ -22,13 +28,11 @@
 {% endblock %}
 
 {% block organizer %}
 {% endblock %}
 
 {% block organizer %}

-    <span style="position:relative; left:70px;">

     Projekt prowadzi:<br/>
     <a href="http://nowoczesnapolska.org.pl">
     Projekt prowadzi:<br/>
     <a href="http://nowoczesnapolska.org.pl">

-        <img src="{% static "img/logo_fnp.png" %}" alt="Fundacja Nowoczesna Polska" />
-    </a>
+        <img src="{% static "img/logo_fnp_white.png" %}" alt="Fundacja Nowoczesna Polska" />
+    </a><br/>

     <a href="http://http://www.nina.gov.pl/">
     <a href="http://http://www.nina.gov.pl/">

-        <img src="{% static "img/nina.jpg" %}" alt="Narodowy Instytut Audiowizualny" />
+        <img src="{% static "img/nina-white.png" %}" alt="Narodowy Instytut Audiowizualny" />

     </a>
     </a>

-    </span>

 {% endblock %}
\ No newline at end of file
 {% endblock %}
\ No newline at end of file

diff --git a/edumed/templates/base_super.html b/edumed/templates/base_super.html
index 9ee9cec..f4a3c27 100644 (file)
--- a/edumed/templates/base_super.html
+++ b/edumed/templates/base_super.html
@@ -25,7 +25,7 @@
     </head>
     <body id="{% block body-id %}body{% endblock %}">
         <div id="header-wrapper">
     </head>
     <body id="{% block body-id %}body{% endblock %}">
         <div id="header-wrapper">

-        <header class="main" style="position:relative;">
+        <header class="main {% block header_class %}{% endblock %}" style="position:relative;">

             <!--img
                 src="{% static "tlo.png" %}"
                 style="position:absolute; opacity: 0.5; top:0; left: -83px; z-index:1000"
             <!--img
                 src="{% static "tlo.png" %}"
                 style="position:absolute; opacity: 0.5; top:0; left: -83px; z-index:1000"


@@ -34,7 +34,7 @@
                 <a href="{% url 'logout' subdomain=None %}" style="position: absolute; top:5px; right: 10px; font-size: 12px;">Wyloguj</a>
             {% endif %}
             <div id="header-top">
                 <a href="{% url 'logout' subdomain=None %}" style="position: absolute; top:5px; right: 10px; font-size: 12px;">Wyloguj</a>
             {% endif %}
             <div id="header-top">

-            <a id="logo" href="/"><img src="{% static "img/logo.png" %}" alt="Edukacja medialna"/></a>
+            <a id="logo" href="/">{% block logo %}<img src="{% static "img/logo.png" %}" alt="Edukacja medialna"/>{% endblock %}</a>

             <div id="organizer">
                 {% block organizer %}
                 Projekt prowadzi:<br/>
             <div id="organizer">
                 {% block organizer %}
                 Projekt prowadzi:<br/>

diff --git a/requirements.txt b/requirements.txt
index 1a8d1d6..ad3c6b3 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ piwik
 django-jsonfield>=0.9,<0.10
 
 django_cas>=2.1,<2.2
 django-jsonfield>=0.9,<0.10
 
 django_cas>=2.1,<2.2

-fnpdjango<0.2
+fnpdjango>=0.1.13,<0.2

 
 Feedparser
 
 
 Feedparser