visual changes

diff --git a/catalogue/static/catalogue/css/carousel.css b/catalogue/static/catalogue/css/carousel.css
index abf7ce0..49fe461 100644 (file)
--- a/catalogue/static/catalogue/css/carousel.css
+++ b/catalogue/static/catalogue/css/carousel.css
@@ -25,10 +25,27 @@
         overflow: hidden;
         width: 28.75em;
         height: 100%;
         overflow: hidden;
         width: 28.75em;
         height: 100%;

-        background-image: url(/static/catalogue/img/carousel-left.png);
-        background-position: 100% 0;
-        background-repeat: no-repeat;
+        background: url(/static/catalogue/img/carousel-left.png) 100% 0 no-repeat;

         background-size: 4.375em 100%; }
         background-size: 4.375em 100%; }

+        #catalogue-carousel #catalogue-carousel-links li a .catalogue-carousel-note {
+          height: 100%;
+          margin-left: 50%;
+          background-color: black;
+          color: white;
+          opacity: 0.6;
+          background-image: url(/static/catalogue/img/carousel-left.png);
+          background-position: 100% 0;
+          background-repeat: no-repeat;
+          background-size: 4.375em 100%; }
+          #catalogue-carousel #catalogue-carousel-links li a .catalogue-carousel-note p {
+            padding: 6em 2em 0 1.6em;
+            margin: 0; }
+            #catalogue-carousel #catalogue-carousel-links li a .catalogue-carousel-note p em {
+              display: block;
+              font-style: normal;
+              font-size: 1.5em; }
+            #catalogue-carousel #catalogue-carousel-links li a .catalogue-carousel-note p strong {
+              font-size: 2em; }

   #catalogue-carousel #catalogue-carousel-switcher {
     margin: 0;
     padding: 3.125em 0 0 3.625em;
   #catalogue-carousel #catalogue-carousel-switcher {
     margin: 0;
     padding: 3.125em 0 0 3.625em;

diff --git a/catalogue/static/catalogue/css/carousel.scss b/catalogue/static/catalogue/css/carousel.scss
index 56e0591..aa69028 100755 (executable)
--- a/catalogue/static/catalogue/css/carousel.scss
+++ b/catalogue/static/catalogue/css/carousel.scss
@@ -33,10 +33,34 @@ $ciemny: #363a3e;
                 overflow: hidden;
                 width: 460*$px;
                 height: 100%;
                 overflow: hidden;
                 width: 460*$px;
                 height: 100%;

-                background-image: url(/static/catalogue/img/carousel-left.png);
-                background-position: 100% 0;
-                background-repeat: no-repeat;
+                background: url(/static/catalogue/img/carousel-left.png) 100% 0 no-repeat;

                 background-size: 70*$px 100%;
                 background-size: 70*$px 100%;

+                
+                .catalogue-carousel-note {
+                    height: 100%;
+                    margin-left: 50%;
+                    background-color: black;
+                    color: white;
+                    opacity: 0.6;
+                    background-image: url(/static/catalogue/img/carousel-left.png);
+                    background-position: 100% 0;
+                    background-repeat: no-repeat;
+                    background-size: 70*$px 100%;
+
+                    p {
+                        padding: 6em 2em 0 1.6em;
+                        margin: 0;
+                        em {
+                            display: block;
+                            font-style: normal;
+                            font-size: 1.5em;
+                        }
+                        strong {
+                            font-size: 2em;
+                        }
+                        
+                    }
+                }

             }
         }
     }
             }
         }
     }

diff --git a/catalogue/templates/catalogue/lesson_detail.html b/catalogue/templates/catalogue/lesson_detail.html
index 629af17..c22a74c 100755 (executable)
--- a/catalogue/templates/catalogue/lesson_detail.html
+++ b/catalogue/templates/catalogue/lesson_detail.html
@@ -13,17 +13,17 @@
     <section class="box">
         <h1 class="realisation">Realizacja i czas lekcji</h1>
         {% if object.type == 'synthetic' %}
     <section class="box">
         <h1 class="realisation">Realizacja i czas lekcji</h1>
         {% if object.type == 'synthetic' %}

-        <p>To lekcja jest syntezą działu
+        <p>To lekcja jest syntezą tematu

         <strong>{{ object.section }}</strong></a>{% if object.level.slug = "liceum" %}
             (na poziomie zaawansowanym)
         {% endif %}.
         Dostępny jest również
         <strong>{{ object.section }}</strong></a>{% if object.level.slug = "liceum" %}
             (na poziomie zaawansowanym)
         {% endif %}.
         Dostępny jest również

-        <strong><a href="{% url 'catalogue_lessons' %}#{{ object.section.slug }}">szczegółowy kurs</a></strong>
-        dla tego działu.
+        <strong><a href="{% url 'catalogue_lessons' %}#{{ object.section.slug }}">pełny kurs</a></strong>
+        tego tematu.

         </p>
         <p>Czas trwania: 45 minut.</p>
         {% elif object.type == 'course' %}
         </p>
         <p>Czas trwania: 45 minut.</p>
         {% elif object.type == 'course' %}

-        <p>Ta lekcja jest częścią działu
+        <p>Ta lekcja jest częścią tematu

         <a href="{{ object.section.get_absolute_url }}"><strong>{{ object.section }}</strong></a>{% if object.level.slug = "liceum" %}
             (na poziomie zaawansowanym)
         {% endif %}.
         <a href="{{ object.section.get_absolute_url }}"><strong>{{ object.section }}</strong></a>{% if object.level.slug = "liceum" %}
             (na poziomie zaawansowanym)
         {% endif %}.


@@ -31,7 +31,7 @@
         {% if synth %}
         Dostępna jest również
         <strong><a href="{{ object.get_syntetic.get_absolute_url }}">lekcja syntetyczna</a></strong>
         {% if synth %}
         Dostępna jest również
         <strong><a href="{{ object.get_syntetic.get_absolute_url }}">lekcja syntetyczna</a></strong>

-        dla tego działu.
+        dla tego tematu.

         {% endif %}
         {% endwith %}
         </p>
         {% endif %}
         {% endwith %}
         </p>


@@ -74,13 +74,13 @@
         <h1>Informacje:</h1>
         <p>
         {% if object.dc.authors_textbook %}
         <h1>Informacje:</h1>
         <p>
         {% if object.dc.authors_textbook %}

-        Autor podręcznika: {{ object.dc.authors_textbook|person_list }}<br/>
+        Tekst: {{ object.dc.authors_textbook|person_list }}<br/>

         {% endif %}
         {% if object.dc.authors_scenario %}
         {% endif %}
         {% if object.dc.authors_scenario %}

-        Autor scenariusza: {{ object.dc.authors_scenario|person_list }}<br/>
+        Scenariusz: {{ object.dc.authors_scenario|person_list }}<br/>

         {% endif %}
         {% if object.dc.authors_expert %}
         {% endif %}
         {% if object.dc.authors_expert %}

-        Ekspert: {{ object.dc.authors_expert|person_list }}<br/>
+        Konsultacja merytoryczna: {{ object.dc.authors_expert|person_list }}<br/>

         {% endif %}
         Licencja: <a href="{{ object.dc.license }}">{{ object.dc.license_description }}</a>.</p>
     </section>
         {% endif %}
         Licencja: <a href="{{ object.dc.license }}">{{ object.dc.license_description }}</a>.</p>
     </section>

diff --git a/catalogue/templates/catalogue/snippets/carousel.html b/catalogue/templates/catalogue/snippets/carousel.html
index 0850c13..2095186 100755 (executable)
--- a/catalogue/templates/catalogue/snippets/carousel.html
+++ b/catalogue/templates/catalogue/snippets/carousel.html
@@ -1,18 +1,20 @@
 {% load url from future %}
 
 {% load url from future %}
 

+{% url "info" "jak-korzystac/" as jak %}

 <section id="catalogue-carousel">
     <ul id="catalogue-carousel-links">
         <li style="background-image: url(/static/carousel/img1.jpg); z-index: 100;">
 <section id="catalogue-carousel">
     <ul id="catalogue-carousel-links">
         <li style="background-image: url(/static/carousel/img1.jpg); z-index: 100;">

-            <a href="{% url 'catalogue_lesson' 'jak-planowac-prace-z-informacja' %}" class="catalogue-carousel-link">
+            <a href="{{ jak }}" class="catalogue-carousel-link">

                 <div class="catalogue-carousel-note">
                 <div class="catalogue-carousel-note">

+                    <p><strong>75</strong> <em>kompletnych lekcji</em> - zobacz jak wykorzystać</p>

                 </div>
             </a>
         </li>
     </ul>
     <ul id="catalogue-carousel-switcher">
                 </div>
             </a>
         </li>
     </ul>
     <ul id="catalogue-carousel-switcher">

-        <li><a href="{% url 'catalogue_lesson' 'jak-planowac-prace-z-informacja' %}" class="knowledge">wiedza w pigułce</a></li>
-        <li><a href="{% url 'catalogue_lesson' 'jak-planowac-prace-z-informacja' %}" class="activity">ćwiczenia</a></li>
-        <li><a href="{% url 'catalogue_lesson' 'jak-planowac-prace-z-informacja' %}" class="lesson-plan">scenariusze</a></li>
-        <li><a href="{% url 'catalogue_lesson' 'jak-planowac-prace-z-informacja' %}" class="reference">słowniczek</a></li>
+        <li><a href="{{ jak }}#wiedza-w-pigulce" class="knowledge">wiedza w pigułce</a></li>
+        <li><a href="{{ jak }}#cwiczenia" class="activity">zadania</a></li>
+        <li><a href="{{ jak }}#scenariusze" class="lesson-plan">scenariusze</a></li>
+        <li><a href="{{ jak }}#slowniczek" class="reference">słowniczek</a></li>

     </ul>
 </section>
     </ul>
 </section>

diff --git a/catalogue/templates/catalogue/snippets/section_box.html b/catalogue/templates/catalogue/snippets/section_box.html
index 8e8a581..f7ad6e5 100755 (executable)
--- a/catalogue/templates/catalogue/snippets/section_box.html
+++ b/catalogue/templates/catalogue/snippets/section_box.html
@@ -18,7 +18,7 @@
                 {% for lesson in lesson_list %}
                     <li class="section-lesson">
                         <a href="{{ lesson.get_absolute_url }}">{{ lesson }}{% if lesson_type == 'synthetic' %}
                 {% for lesson in lesson_list %}
                     <li class="section-lesson">
                         <a href="{{ lesson.get_absolute_url }}">{{ lesson }}{% if lesson_type == 'synthetic' %}

-                            <br/>(przegląd całego działu w 45 minut)
+                            <br/>(przegląd całego tematu w 45 minut)

                         {% endif %}</a>
                     </li>
                 {% endfor %}
                         {% endif %}</a>
                     </li>
                 {% endfor %}

diff --git a/edumed/static/css/base.css b/edumed/static/css/base.css
index 27f9ccf..c971f39 100644 (file)
--- a/edumed/static/css/base.css
+++ b/edumed/static/css/base.css
@@ -32,7 +32,10 @@ header.main {
       vertical-align: middle; }
   header.main #organizer {
     float: right;
       vertical-align: middle; }
   header.main #organizer {
     float: right;

-    margin-top: 1.3em; }
+    font-size: .75em;
+    color: #777; }
+    header.main #organizer img {
+      margin-top: .5em; }

   header.main nav ul {
     padding: 0;
     position: absolute;
   header.main nav ul {
     padding: 0;
     position: absolute;


@@ -157,6 +160,8 @@ footer.main {
 .link-list {
   list-style: none;
   padding: 0; }
 .link-list {
   list-style: none;
   padding: 0; }

+  .link-list li {
+    margin-bottom: .5em; }

   .link-list a:before {
     content: "→";
     margin-right: .5em; }
   .link-list a:before {
     content: "→";
     margin-right: .5em; }

diff --git a/edumed/static/css/base.scss b/edumed/static/css/base.scss
index 4153ca2..e2be168 100644 (file)
--- a/edumed/static/css/base.scss
+++ b/edumed/static/css/base.scss
@@ -46,7 +46,12 @@ header.main {
     }
     #organizer {
         float: right;
     }
     #organizer {
         float: right;

-        margin-top: 1.3em;
+        font-size: .75em;
+        color: #777;
+        
+        img {
+            margin-top: .5em;
+        }

     }
 
 
     }
 
 


@@ -199,6 +204,10 @@ footer.main {
     list-style: none;
     padding: 0;
 
     list-style: none;
     padding: 0;
 

+    li {
+        margin-bottom: .5em;
+    }
+

     a:before {
         content: "→";
         margin-right: .5em;
     a:before {
         content: "→";
         margin-right: .5em;

diff --git a/edumed/static/css/main.css b/edumed/static/css/main.css
index 98fb208..974aa37 100644 (file)
--- a/edumed/static/css/main.css
+++ b/edumed/static/css/main.css
@@ -50,10 +50,10 @@
         color: white;
         text-transform: uppercase;
         display: block;
         color: white;
         text-transform: uppercase;
         display: block;

-        height: 4.375em;
-        width: 8.75em;
+        height: 5em;
+        width: 9.375em;

         display: table;
         display: table;

-        padding: 0.625em; }
+        padding: 0.313em; }

         #main-sections ul li a span {
           font-size: .9em;
           height: 100%;
         #main-sections ul li a span {
           font-size: .9em;
           height: 100%;

diff --git a/edumed/static/css/main.scss b/edumed/static/css/main.scss
index 59422de..a37de9e 100755 (executable)
--- a/edumed/static/css/main.scss
+++ b/edumed/static/css/main.scss
@@ -66,10 +66,10 @@ $px: .0625em;
                 color: white;
                 text-transform: uppercase;
                 display: block;
                 color: white;
                 text-transform: uppercase;
                 display: block;

-                height: 70*$px;
-                width: 140*$px;
+                height: 80*$px;
+                width: 150*$px;

                 display: table;
                 display: table;

-                padding: 10*$px;
+                padding: 5*$px;

 
                 span {
                     font-size: .9em;
 
                 span {
                     font-size: .9em;

diff --git a/edumed/templates/base.html b/edumed/templates/base.html
index dd92cb4..e744135 100644 (file)
--- a/edumed/templates/base.html
+++ b/edumed/templates/base.html
@@ -33,8 +33,12 @@
                 -->
             <div id="header-top">
             <a id="logo" href="/"><img src="{% static "img/logo.png" %}" alt="Edukacja medialna"/></a>
                 -->
             <div id="header-top">
             <a id="logo" href="/"><img src="{% static "img/logo.png" %}" alt="Edukacja medialna"/></a>

-            <a id="organizer" href="http://nowoczesnapolska.org.pl">
-                <img src="{% static "img/logo_fnp.png" %}" alt="Fundacja Nowoczesna Polska" /></a>
+            <div id="organizer">
+                Projekt prowadzi:<br/>
+                <a href="http://nowoczesnapolska.org.pl">
+                    <img src="{% static "img/logo_fnp.png" %}" alt="Fundacja Nowoczesna Polska" />
+                </a>
+            </div>

             <nav><ul>
                 <li><a class="menu-lekcje" href="{% url "catalogue_lessons" %}">Lekcje</a></li>
                 <li><a class="menu-kompetencje" href="{% url "curriculum" %}">Kompetencje</a></li>
             <nav><ul>
                 <li><a class="menu-lekcje" href="{% url "catalogue_lessons" %}">Lekcje</a></li>
                 <li><a class="menu-kompetencje" href="{% url "curriculum" %}">Kompetencje</a></li>

diff --git a/edumed/templates/home.html b/edumed/templates/home.html
index 669a365..8ec229f 100755 (executable)
--- a/edumed/templates/home.html
+++ b/edumed/templates/home.html
@@ -23,7 +23,7 @@ w trzech wierszach?</p>
 </section>
 
 <section id="main-sections">
 </section>
 
 <section id="main-sections">

-<h1>Działy:</h1>
+<h1>Lekcje:</h1>

 {% catalogue_section_buttons %}
 </section>
 
 {% catalogue_section_buttons %}
 </section>
 


@@ -48,4 +48,4 @@ w trzech wierszach?</p>
 
 
 
 
 
 

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