Release Candidate 0.1

2015-11-11 13:27:05 +01:00
parent 2abb12981c
commit 333ee13a91
110 changed files with 563 additions and 102 deletions
@@ -0,0 +1,19 @@
+{% extends 'partials/base.html.twig' %}
+
+{% set bodyclass = "categories" %}
+
+{% block content %}
+
+  <nav class="categories">
+    {% include 'partials/tagslist.html.twig' with {'base_url':"/categories/", 'taxonomy':'tag', 'display':'inline'} %}
+  </nav>
+
+  <div id="categories-content" class="grid">
+    {% for child in page.collection %}
+      <section class="projet-block projet-block-text grid-block columns large-3 medium-6 small-12">
+        {% include 'partials/projet-block.html.twig' with {'page':child, 'display':'text'} %}
+      </section>
+    {% endfor %}
+  </div>
+
+{% endblock %}
@@ -1,9 +1,15 @@
 {% extends 'partials/base.html.twig' %}

+{% set bodyclass = "home" %}
+
 {% block content %}
-  {% for child in page.collection %}
-    <section class="projet columns large-4">
-      {% include 'partials/projet.html.twig' with {'page':child} %}
-    </section>
-  {% endfor %}
+  <div class="grid">
+    {% for child in page.collection %}
+      {% if child.header.home == true %}
+        <section class="projet-block projet-block-img grid-block columns large-3 medium-6 small-12">
+          {% include 'partials/projet-block.html.twig' with {'page':child,'display':'img'} %}
+        </section>
+      {% endif %}
+    {% endfor %}
+  </div>
 {% endblock %}
@@ -20,29 +20,33 @@
    <title>{% if header.title %}{{ header.title|e('html') }} | {% endif %}{{ site.title|e('html') }}</title>

    {% block stylesheets %}
-        {# Bootstrap core CSS #}
-        {% do assets.add('theme://app/bower_components/foundation/css/foundation.min.css',101) %}
+      {# Bootstrap core CSS #}
+      {# % do assets.add('theme://app/bower_components/foundation/css/foundation.min.css',101) % #}

-    {# Custom styles for this theme #}
-        {% do assets.add('theme://css/styles.css',100) %}
+      {# Custom font for this theme #}
+      {% do assets.add('theme://font/fontwebkit.css',100) %}

-        {{ assets.css() }}
+      {# Custom styles for this theme #}
+      {% do assets.add('theme://css/styles.css',100) %}
+
+      {{ assets.css() }}
    {% endblock %}

  {% endblock head %}
  </head>
-  <body>
+  
+  <body class="{{bodyclass}}">

    {# include the header + navigation #}
    {% include 'partials/header.html.twig' %}

-    <div id="center" class="row">
-      <div class="large-12 columns grid">
+    <div id="center" class="row fullwidth">
+      <div class="large-12 columns">
        {% block content %}{% endblock %}
      </div>
    </div>

-    <!-- {% block bottom %}{% endblock %} -->
+    {% block bottom %}{% endblock %}


    {# include the footer#}
@@ -53,7 +57,7 @@
        {% do assets.add('theme://bower_components/jquery/dist/jquery.min.js', 101) %}
        {% do assets.add('theme://bower_components/foundation/js/foundation.min.js') %}
        {% do assets.add('theme://bower_components/masonry/dist/masonry.pkgd.min.js') %}
-        {% do assets.add('theme://js/script.min.js') %}
+        {% do assets.add('theme://js/dist/script.min.js') %}
        {{ assets.js() }}
    {% endblock %}

@@ -1,7 +1,11 @@
 <footer id="bottom-bar">
-  <div class="row">
+  <div class="row fullwidth">
    <section class="large-12 columns">
-      <h1><a href="#">{{ site.title|e('html') }}</a></h1>
+      <h1><a href="/">- {{ site.title|e('html') }} -</a></h1>
+      <address>
+        {{ site.adresse|e('html') }}<br />
+        <a href="mailto:{{site.email}}">{{ site.email|e('html') }}</a>
+      </address>
    </section>
  </div>
 </header>
@@ -1,24 +1,29 @@
 <header id="top-bar">
-  <div class="row">
-    <section id="title-area" class="large-6 large-push-3 columns">
-      <h1><a href="#">{{ site.title|e('html') }}</a></h1>
+  <div class="row fullwidth">
+
+    <section id="title-area" class="small-8 small-push-2 columns">
+        <h1><a href="/"><span>{{ site.title|e('html') }}</span></a></h1>
+        <h2>{{ site.subtitle|e('html') }}</h2>
    </section>

-    <nav id="right-nav" class="large-3 large-pull-6 columns">
-      <!-- Right Nav Section -->
-      <ul class="left">
-        {% for page in pages.children %}
-          <li><a href="{{ page.url }}">{{ page.menu }}</a></li>
-        {% endfor %}
-      </ul>
+    <nav id="left-nav" class="nav small-2 small-pull-8 columns">
+      <div class="wrapper">
+        <ul class="left">
+          {% for page in pages.children %}
+            {% if page.menu != "home" and page.menu != "Catégories" %}
+              <li><a href="{{ page.url }}">{{ page.menu }}</a></li>
+            {% endif %}
+          {% endfor %}
+        </ul>
+      </div>
    </nav>

-    <nav id="left-nav" class="large-3 columns">
+    <nav id="right-nav" class="nav small-2 columns">
      {% if config.plugins.taxonomylist.enabled %}
-      <div class="right">
-          <h4>Catégoris</h4>
-          {% include 'partials/tagslist.html.twig' with {'base_url':"/", 'taxonomy':'tag'} %}
-      </div>
+        <div class="wrapper">
+            <h4><a href="/categories">Catégories</a></h4>
+            {% include 'partials/tagslist.html.twig' with {'base_url':"/categories/", 'taxonomy':'tag'} %}
+        </div>
      {% endif %}
    </nav>
  </div>
@@ -0,0 +1,20 @@
+{% if display == 'img' %}
+  {% set image = page.media.images|first %}
+  <a href="{{ page.url }}">{{ image.html }}</a>
+  <header>
+    <h1><a href="{{ page.url }}">{{page.title}}</a></h1>
+    <h2><a href="{{ page.url }}">{{page.header.subtitle}}</a></h2>
+  </header>
+{% endif %}
+
+{% if display == 'text' %}
+  <h1><a href="{{ page.url }}">{{page.title}}</a></h1>
+  <h2>{{page.header.subtitle}}</h2>
+
+  {{ page.summary() }}
+
+
+  {% set image = page.media.images|first %}
+  <a class="projet-img" href="{{ page.url }}">{{ image.html }}</a>
+
+{% endif %}
@@ -1,2 +0,0 @@
-<h1>{{page.title}}</h1>
-{{ page.content }}
@@ -4,8 +4,15 @@
 <ul class="tags">
    {% for tax,value in taxlist[taxonomy] %}
        {% set active = uri.param(taxonomy) == tax ? 'active' : '' %}
-        <li>
-        <a class="{{ active }}" href="{{ base_url }}/{{ taxonomy }}{{ config.system.param_sep }}{{ tax|e('url') }}">{{ tax }}</a>
+        {% if not loop.first and display == "inline" %}
+        <span>-</span>
+        {% endif %}
+        <li class="{{ active }}">
+          <a
+            class="{{ active }}"
+            href="{{ base_url }}{{ taxonomy }}{{ config.system.param_sep }}{{ tax|e('url') }}">
+              <span>{{ tax }}</sapn>
+          </a>
        </li>
    {% endfor %}
 </ul>
@@ -0,0 +1,67 @@
+{% extends 'partials/base.html.twig' %}
+
+{% set bodyclass = "projet" %}
+
+{% set images = page.media.images %}
+
+{% block content %}
+  <section class="projet">
+    <h1>{{page.title}}</h1>
+    <h2>{{ page.header.subtitle}}</h2>
+
+    {{ page.content }}
+
+    <div id="images" class="">
+      {{ dump(images) }}
+
+      {# set temporary array to be able to look trough images with index #}
+      {% set numberedKeys = {} %}
+      {% for key,value in images %}
+        {% set numberedKeys = numberedKeys|merge({(loop.index):(key)}) %}
+      {% endfor %}
+      {{dump(numberedKeys)}}
+
+      {# display images #}
+      {% set continue = false %}
+
+      {% for image in images %}
+        {% if not continue %}
+          <div class="row">
+
+            {% if image.meta.size == 1 %}
+              <div class="block block-{{loop.index}} column large-12">
+                {{ image.html }}
+              </div>
+            {% else %}
+              {% set nextimage = images[numberedKeys[loop.index]] %}
+              {{ dump(nextimage) }}
+              {% if nextimage.meta.size != 1 %}
+                {% set continue = true %}
+                <div class="block block-{{loop.index}} column large-6">
+                  {{ image.html }}
+                </div>
+                <div class="block block-{{loop.index+1}} column large-6">
+                  {{ nextimage.html }}
+                </div>
+              {% else %}
+                <div class="block block-{{loop.index}} column large-6">
+                  {{ image.html }}
+                </div>
+                <div class="block empty column large-6"></div>
+              {% endif %}
+
+            {% endif %}
+
+          </div>
+        {% else %}
+          {% set continue = false %}
+        {% endif %}
+      {% endfor %}
+    </div>
+  </section>
+
+  <nav class="categories">
+    {% include 'partials/tagslist.html.twig' with {'base_url':"/categories/", 'taxonomy':'tag', 'display':'inline'} %}
+  </nav>
+
+{% endblock %}