]> git.parisson.com Git - mezzo.git/commitdiff
Header, footer and basicpage update
authorJérémy Fabre <blackmagik88@gmail.com>
Wed, 20 Jul 2016 09:00:30 +0000 (11:00 +0200)
committerJérémy Fabre <blackmagik88@gmail.com>
Wed, 20 Jul 2016 09:00:30 +0000 (11:00 +0200)
17 files changed:
app/static/src/assets/img/logo-ircam-white.png [new file with mode: 0644]
app/static/src/assets/img/partners/logo-cnrs.png [new file with mode: 0644]
app/static/src/assets/img/partners/logo-inria.png [new file with mode: 0644]
app/static/src/assets/img/partners/logo-ministere-culture.png [new file with mode: 0644]
app/static/src/assets/img/partners/logo-upmc.png [new file with mode: 0644]
app/static/src/sass/global/_helpers.scss
app/static/src/sass/global/_typography.scss
app/static/src/sass/layout/_footer.scss
app/static/src/sass/layout/_global.scss
app/static/src/sass/modules/_all.scss
app/static/src/sass/modules/navs/_nav-footer.scss [new file with mode: 0644]
app/templates/base.html
app/templates/includes/slider.html
app/templates/pages/basicpage.html
app/templates/pages/menus/footer.html
app/templates/pages/menus/header.html
app/templates/pages/menus/header_tree.html [new file with mode: 0644]

diff --git a/app/static/src/assets/img/logo-ircam-white.png b/app/static/src/assets/img/logo-ircam-white.png
new file mode 100644 (file)
index 0000000..25b1727
Binary files /dev/null and b/app/static/src/assets/img/logo-ircam-white.png differ
diff --git a/app/static/src/assets/img/partners/logo-cnrs.png b/app/static/src/assets/img/partners/logo-cnrs.png
new file mode 100644 (file)
index 0000000..8386e98
Binary files /dev/null and b/app/static/src/assets/img/partners/logo-cnrs.png differ
diff --git a/app/static/src/assets/img/partners/logo-inria.png b/app/static/src/assets/img/partners/logo-inria.png
new file mode 100644 (file)
index 0000000..5e23e27
Binary files /dev/null and b/app/static/src/assets/img/partners/logo-inria.png differ
diff --git a/app/static/src/assets/img/partners/logo-ministere-culture.png b/app/static/src/assets/img/partners/logo-ministere-culture.png
new file mode 100644 (file)
index 0000000..c283cc3
Binary files /dev/null and b/app/static/src/assets/img/partners/logo-ministere-culture.png differ
diff --git a/app/static/src/assets/img/partners/logo-upmc.png b/app/static/src/assets/img/partners/logo-upmc.png
new file mode 100644 (file)
index 0000000..1a4c616
Binary files /dev/null and b/app/static/src/assets/img/partners/logo-upmc.png differ
index 8cba3fd89ca4258a41e8b78dce1eefc32bfa3e93..00a4d2762d44b1c8b986b2b59dfae66276fc3024 100755 (executable)
@@ -92,3 +92,8 @@
 .fsxs {
     @include font-size(xs);
 }
+.unstyled-list {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+}
index 4fccd852cdbc8673c38be295bb3d4047d00831cd..463ea3d71735e9fac99894430900861e0a0b37bc 100755 (executable)
@@ -23,7 +23,7 @@ h1, h2, h3 {
 h1 {
     @include typeset(heading-1);
     @include typeface(sans-serif);
-    @include margin-bottom(1);
+    @include margin-bottom(3);
        @include margin-top(1);
 }
 
@@ -104,7 +104,6 @@ figure {
        @include font-size(l);
     @include line-height(1.25);
        @include typeface(serif);
-       @include margin-top(5);
     @include margin-bottom(3);
        font-weight: weight(heavy);
 }
index cc44de1009bfa2d4c26124fcc6f7f939af64791b..fddf99ee26643b9168070817cdc33d8a20e9201e 100755 (executable)
@@ -2,6 +2,79 @@ $module: ".footer";
 
 #{$module} {
 
-    
+    &__pre {
+
+        background: $color-black;
+        border-bottom: 3px solid white;
+        color: white;
+
+        @include padding(1 0);
+
+    }
+
+    &__content {
+
+        background: #8e8e8e;
+
+        @include padding(1 0);
+
+        @include font-size(s);
+        @include typeface(sans-serif);
+        font-weight: weight(light);
+
+        color: white;
+
+    }
+
+    &__follow-link {
+
+        color: white;
+        @include font-size(xxl);
+        display: inline-block;
+
+        @include margin(0 .25);
+        @include transition(all 0.5s ease-in-out);
+
+        &:hover {
+            &.facebook {
+                color: $color-facebook;
+            }
+            &.twitter {
+                color: $color-twitter;
+            }
+            &.instagram {
+                color: $color-instagram;
+            }
+            &.youtube {
+                color: $color-youtube;
+            }
+            &.vimeo {
+                color: $color-vimeo;
+            }
+        }
+
+    }
+
+    &__link {
+
+        color: white;
+        border-bottom: 1px solid $color-main;
+        font-weight: weight(regular);
+
+    }
+
+    &__separator {
+
+        width: 100%;
+        background: white;
+        height: 3px;
+
+        @include margin(1 0);
+
+        &--small {
+            height: 1px;
+        }
+
+    }
 
 }
index 6e7d4aeda285d758ec8705076f9b0aecd698cfb4..89e3d1eeac679d1ff7f3a90c7936b09a25ab3fdc 100755 (executable)
@@ -1,7 +1,6 @@
-.section {
-    @include margin-top(4);
+.main {
+    @include margin(3 0 0 0);
+    @include padding(1 0 0 0);
 
-    &:first-child {
-        margin-top: 0;
-    }
+    background: white;
 }
index e46c42176433aa20760bb3f15be8c0bfa2aee366..d52ffebd14ae8e89310f8612f8141e500d7d4b01 100755 (executable)
@@ -1,6 +1,7 @@
 // Navs
 @import "navs/nav-actions";
 @import "navs/nav-header";
+@import "navs/nav-footer";
 
 @import 'breadcrumb';
 @import 'lang-switcher';
diff --git a/app/static/src/sass/modules/navs/_nav-footer.scss b/app/static/src/sass/modules/navs/_nav-footer.scss
new file mode 100644 (file)
index 0000000..4a7c471
--- /dev/null
@@ -0,0 +1,17 @@
+$module: ".nav-footer";
+
+#{$module} {
+
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+    text-align: left;
+
+    &__item-link {
+        @include font-size(m);
+        @include typeface(sans-serif);
+        font-weight: weight(regular);
+        color: white;
+    }
+
+}
index eac5ed0a8d69fb7a7194cd9d3ef76ba9fe8a2580..f691a067d88d39e77e3c7b31a905d94c8de125aa 100644 (file)
 
 <body id="{% block body_id %}body{% endblock %}">
 
-    {% nevercache %}
-        {% if messages %}
-            {% for message in messages %}
-                <div class="notification" id="js-notificationContainer">
-                    <button type="button" class="btn btn-small js-notificationClose">X</button>
-                    {{ message }}
-                </div>
-            {% endfor %}
-        {% endif %}
-    {% endnevercache %}
-
     <div class="banner" role="banner">
         <div class="header">
             <div class="container">
@@ -87,7 +76,7 @@
                     </div>
                 </div>
                 <div class="row header__nav">
-                    <div class="col-md-10 col-md-push-1 tac">
+                    <div class="col-md-12 tac">
                         {% page_menu "pages/menus/header.html" %}
                     </div>
                 </div>
         {% include "includes/slider.html" %}
     {% endif %}
 
-    {% featured as featured_list %}
-
-    <div class="site__content">
+    <main class="main" role="main">
         <div class="container">
+            {% block content_header %}{% endblock %}
+            {% block main %}{% endblock %}
+            {% block content_footer %}{% endblock %}
+        </div>
+    </main>
+
+    <footer class="footer" role="footer">
+
+        <div class="footer__pre">
+
+            <div class="container">
+
+                <div class="row">
+
+                    <div class="col-lg-6 col-lg-push-1">
+
+                        newsletter
 
-            <main class="main" role="main">
-                {% featured_breaking_news_content as bk_content %}
-                {% if on_home and bk_content %}
-                    <div class="bk__news">
-                        <div class="media bk__news__inner">
-                            <div class="media-img">
-                                <span class="bk__news__title">
-                                    {% trans "Breaking" %} <br> {% trans "news" %} !
-                                </span>
-                            </div>
-                            <div class="media-content bk__news__content">
-                                    {{ bk_content|safe }}
-                            </div>
-                        </div>
                     </div>
-                {% endif %}
-                {% block content_header %}
-                <div class="site__content__header">
-                    <h2 class="page__title">{% block title %}{% endblock %}</h2>
+
+                    <div class="col-lg-3 col-lg-push-1 tac">
+
+                        <a class="footer__follow-link facebook" href="https://www.facebook.com/iIRCAM/" target="_blank" title="{% trans 'Follow us on Facebook' %}"><i class="fa fa-facebook-square"></i></a>
+                        <a class="footer__follow-link twitter" href="https://twitter.com/ircam" target="_blank" title="{% trans 'Follow us on Twitter' %}"><i class="fa fa-twitter-square"></i></a>
+                        <a class="footer__follow-link instagram" href="https://www.instagram.com/ircam_paris/" target="_blank" title="{% trans 'Follow us on Instagram' %}"><i class="fa fa-instagram"></i></a>
+                        <a class="footer__follow-link youtube" href="https://www.youtube.com/user/Ircam75" target="_blank" title="{% trans 'Follow us on Youtube' %}"><i class="fa fa-youtube-square"></i></a>
+                        <a class="footer__follow-link vimeo" href="https://vimeo.com/ircam" target="_blank" title="{% trans 'Follow us on Vimeo' %}"><i class="fa fa-vimeo-square"></i></a>
+
+                    </div>
+
                 </div>
-                {% endblock %}
-                {% block main %}{% endblock %}
-            </main>
+
+            </div>
+
         </div>
-    </div>
 
-    <footer class="footer" role="footer">
-        <div class="container">
+        <div class="footer__content">
+
+            <div class="container">
+
+                <div class="row">
+
+                    <div class="col-lg-3 col-lg-push-1">
 
-            {% page_menu "pages/menus/footer.html" %}
+                        <a href="{% url "home" %}" title="{% trans 'Home' %}"><img src="{% static "img/logo-ircam-white.png" %}" width="151" /></a>
+
+                    </div>
+
+                    <div class="col-lg-2 col-lg-push-1 tar">
+
+                        <strong>IRCAM</strong><br />
+                        <br />
+                        1 Place Igor-Stravinsky<br />
+                        75004 Paris<br />
+                        t. +33 1 44 78 48 43
+
+                    </div>
+
+                    <div class="col-lg-2 col-lg-push-1 tar">
+
+                        <strong>{% trans 'Opening times' %}</strong><br />
+                        <br />
+                        du lundi au vendredi<br />
+
                        09:30–19:00<br />
+                        fermé le samedi et dimanche
+
+                    </div>
 
+                    <div class="col-lg-2 col-lg-push-1 tar">
+
+                        <strong>{% trans 'Subway access' %}</strong><br />
+                        <br />
+                        Hôtel de Ville, Rambuteau,<br />
+                        Châtelet, Les Halles
+
+                    </div>
+
+                </div>
+
+                <div class="row">
+
+                    <div class="col-lg-10 col-lg-push-1">
+
+                        <div class="footer__separator"></div>
+
+                    </div>
+
+                </div>
+
+                <div class="row">
+
+                    <div class="col-lg-3 col-lg-push-1">
+
+                        {% page_menu "pages/menus/footer.html" %}
+
+                    </div>
+
+                    <div class="col-lg-5 col-lg-push-1">
+
+                        <strong>Institut de Recherche et Coordination Acoustique/Musique</strong> {% trans 'under the tutelage of' %} :<br />
+                        <br />
+                        <a href="http://www.culturecommunication.gouv.fr/" target="_blank" title="Ministère de la Culture et de la Communication"><img width="120" height="66" src="{% static "img/partners/logo-ministere-culture.png" %}" /></a>
+                        <a href="http://www.cnrs.fr/" target="_blank" title="Centre National de la Recherche Scientifique"><img width="120" height="66" src="{% static "img/partners/logo-cnrs.png" %}" /></a>
+                        <a href="http://www.upmc.fr/" target="_blank" title="Université Pierre et Marie Curie"><img width="120" height="66" src="{% static "img/partners/logo-upmc.png" %}" /></a>
+                        <a href="http://www.inria.fr/" target="_blank" title="Inria"><img width="120" height="66" src="{% static "img/partners/logo-inria.png" %}" /></a>
+
+                    </div>
+
+                    <div class="col-lg-2 col-lg-push-1">
+
+                        {% trans 'go to' %} :
+                        <ul class="unstyled-list">
+                            <li>
+                                <a class="footer__link" href="https://www.centrepompidou.fr/" target="_blank" title="Centre Pompidou">Centre Pompidou</a>
+                            </li>
+                            <li>
+                                <a class="footer__link" href="http://www.bpi.fr/home.html" target="_blank" title="Bibliothèque Public d’Information">Bibliothèque Public d’Information</a>
+                            </li>
+                        </ul>
+
+                    </div>
+
+                </div>
+
+                <div class="row">
+
+                    <div class="col-lg-10 col-lg-push-1">
+
+                        <div class="footer__separator footer__seprator--small"></div>
+
+                    </div>
+
+                </div>
+
+            </div>
 
         </div>
+
     </footer>
+
+    {% include "includes/search_form.html" %}
+
     {% include "includes/footer_scripts.html" %}
 
 </body>
   m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
   })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
 
-  ga('create', 'UA-3416995-12', 'auto');
+  ga('create', 'UA-XXXXXX-XX', 'auto');
   ga('send', 'pageview');
 
 </script>
index fdfca906732df6c0f9140043a37b62a9d264eb78..c10cfbf904a0b1e0ad8970028b1a7e50ad29c8e5 100644 (file)
@@ -1,4 +1,5 @@
 {% load i18n event_tags featured_tags mezzanine_tags %}
+{% comment %}
 <div class="hero__slider">
     <ul id="lightSlider">
         {% featured_events as events %}
@@ -16,3 +17,4 @@
         {% endfor %}
     </ul>
 </div>
+{% endcomment %}
index f36fcf9e9f6d864d1fc67c8c663ab58324dc743a..bf987c9c176ec915f8bc95e82e5aa6867686902e 100644 (file)
 {% endmetablock %}{% endblock %}
 
 {% block title %}
-  {% editable page.title %}
-    {{ page.title }}
-  {% endeditable %}
+    {% editable page.title %}
+        {{ page.title }}
+    {% endeditable %}
 
-  {% editable page.basicpage.sub_title %}
-    {{ page.basicpage.sub_title }}
-  {% endeditable %}
+    {% editable page.basicpage.sub_title %}
+        {{ page.basicpage.sub_title }}
+    {% endeditable %}
 {% endblock %}
 
 {% block main %}
 
-  {% editable page.basicpage.content %}
-    {{ page.basicpage.content|richtext_filters|safe }}
-  {% endeditable %}
-
-  <br/>
-  <br/>
-  <br/>
-  <br/>
-
-  {{ page.basicpage.photo }}<br/>
-  {{ page.basicpage.photo_credits }}<br/>
-  {{ page.basicpage.photo_alignment }}<br/>
-  {{ page.basicpage.photo_description }}<br/>
-  {{ page.basicpage.photo_featured }}<br/>
-  {{ page.basicpage.photo_featured_credits }}<br/>
+    <div class="row">
+        <div class="col-lg-8 col-md-push-2">
+            {% editable page.basicpage.title %}
+                <h1 class="dotted">{{ page.basicpage.title }}</h1>
+            {% endeditable %}
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-lg-8 col-lg-push-2">
+            {% editable page.basicpage.content %}
+                {{ page.basicpage.content|richtext_filters|safe }}
+            {% endeditable %}
+        </div>
+    </div>
+
+    {{ page.basicpage.photo }}<br/>
+    {{ page.basicpage.photo_credits }}<br/>
+    {{ page.basicpage.photo_alignment }}<br/>
+    {{ page.basicpage.photo_description }}<br/>
+    {{ page.basicpage.photo_featured }}<br/>
+    {{ page.basicpage.photo_featured_credits }}<br/>
 {% endblock %}
index 5ad96ff7865edf4418bf7cf309d66ecb5eb5e478..44ad406058708b088d35b9ba4e8537799a72e74e 100644 (file)
@@ -1,4 +1,4 @@
-{% load i18n pages_tags %}
+{% load i18n pages_tags staticfiles %}
 {% get_language_info_list for LANGUAGES as languages %}
 
 {% spaceless %}
@@ -6,36 +6,21 @@
     {% for page in page_branch %}
         {% if page.is_primary %}
             {% if forloop.first %}
-                <div class="nav__footer">
-                <ul class="nav__footer__list  list-inline">
-            {% endif %}
-            {% if page.in_menu %}
-                {# <ul class="list-unstyled"> #}
+                <ul class="nav-footer" role="navigation">
             {% endif %}
         {% endif %}
         {% if page.in_menu %}
-            {% if forloop.first and not page.parent.in_menu and not page.is_primary %}
-            {% endif %}
-            <li class="nav__footer__item {% if page.is_current_or_ascendant %}is-active{% endif %}" id="footer-menu-{{ page.html_id }}">
-                <h2>
-                    <a class="nav__footer__item__link" href="{{ page.get_absolute_url }}">{{ page.title }}</a>
-                </h2>
-            </li>
+            <li class="nav-footer__item {% if page.is_current_or_ascendant %}active{% endif %}">
+                <a class="nav-footer__item-link" href="{{ page.get_absolute_url }}" title="{{ page.title }}">{{ page.title }}</a>
+
         {% endif %}
-        {% if page.in_menu and page.has_children_in_menu %}{% page_menu page %}{% endif %}
-        {% if page.in_menu %}
-            {% if forloop.first and not page.parent.in_menu and not page.is_primary %}
-            {# </li> #}
-            {% endif %}
-            {# </ul> #}
+        {% if page.has_children_in_menu and not forloop.first %}
+            {% page_menu page "pages/menus/header_tree.html" %}
         {% endif %}
+            </li>
         {% if page.is_primary %}
-            {% if page.in_menu %}
-            {# </ul> #}
-            {% endif %}
             {% if forloop.last %}
-            </ul>
-            </div>
+                </ul>
             {% endif %}
         {% endif %}
     {% endfor %}
index 6b8e6535bb4fb5b167763e88a6ea013bb76f8b86..648614624fafb2da380c02a4f8ee9d98b17c4a06 100644 (file)
@@ -8,15 +8,19 @@
             {% if forloop.first %}
                 <ul class="nav-header" role="navigation">
                     <li class="nav-header__item nav-header__item--image">
-                        <a href="/" title="{% trans 'Home' %}"><img src="{% static "img/logo-ircam.png" %}" width="118" height="80" /></a>
+                        <a href="{% url "home" %}" title="{% trans 'Home' %}"><img src="{% static "img/logo-ircam.png" %}" width="118" height="80" /></a>
                     </li>
             {% endif %}
         {% endif %}
         {% if page.in_menu %}
             <li class="nav-header__item {% if page.is_current_or_ascendant %}active{% endif %}">
                 <a class="nav-header__item-link" href="{{ page.get_absolute_url }}" title="{{ page.title }}">{{ page.title }}</a>
-            </li>
+
         {% endif %}
+        {% if page.has_children_in_menu and not forloop.first %}
+            {% page_menu page "pages/menus/header_tree.html" %}
+        {% endif %}
+            </li>
         {% if page.is_primary %}
             {% if forloop.last %}
                 <li class="nav-header__item nav-header__item--special">
diff --git a/app/templates/pages/menus/header_tree.html b/app/templates/pages/menus/header_tree.html
new file mode 100644 (file)
index 0000000..2155630
--- /dev/null
@@ -0,0 +1,12 @@
+{% load i18n pages_tags staticfiles %}
+{% get_language_info_list for LANGUAGES as languages %}
+
+{% spaceless %}
+{% if page_branch_in_menu %}
+    {% for page in page_branch %}
+        {% comment %}
+            TODO
+        {% endcomment %}
+    {% endfor %}
+{% endif %}
+{% endspaceless %}