update design of events page

neicnordic · May 21, 2017 · 99195b2 · 99195b2
1 parent 2aa82f1
commit 99195b2
Show file tree

Hide file tree

Showing 6 changed files with 144 additions and 93 deletions.
diff --git a/_includes/events-past.html b/_includes/events-past.html
@@ -0,0 +1,71 @@
+<section class="single-pagebanner" style="background-image: url({{ site.baseurl }}/assets/images/upcom-banner.png);">
+</section>
+
+<section class="publications">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-8">
+        <div class="content">
+
+          <h2>HIGHLIGHTS</h2>
+          <div class="publications-list-block">
+
+            {% include noscript.html %}
+
+            <span id="calendar-events-list" data-past="true">
+
+              <div v-for="event in highlights">
+                <div class="single-publications-list">
+                  <div class="publications-details">
+                    {% include event.html %}
+                  </div>
+                </div>
+              </div>
+
+              <h2>ALL EVENTS</h2>
+              <div v-for="event in events">
+                <div class="single-publications-list">
+                  <div class="publications-details">
+                    {% include event.html %}
+                  </div>
+                </div>
+              </div>
+
+            </span>
+
+          </div>
+
+        </div>
+      </div>
+
+      <div class="col-md-offset-1 col-md-3">
+
+        <p>
+        This page contains
+        past
+        events from the NeIC
+        <a href="https://wiki.neic.no/wiki/Event_calendar">event calendar</a>,
+        which includes both NeIC events and stakeholder events which NeIC either
+        participates in or simply wants to advertize.
+
+        You may also want to look for
+        <a href="{{ site.baseurl }}/events/">upcoming
+        events</a>.
+        </p>
+
+        <p>
+          This list is generated with JavaScript in your browser, so if you cannot see
+          any events please check your settings.
+        </p>
+
+        <p>
+          This list will only show a limited number of past events (a few hundred).
+          To see older events than this please use another means of accessing the
+          calendar, as described on the
+          <a href="https://wiki.neic.no/wiki/Event_calendar">event calendar wiki page</a>.
+        </p>
+
+      </div>
+    </div>
+  </div>
+</section>
diff --git a/_includes/events.html b/_includes/events.html
@@ -0,0 +1,64 @@
+<section class="single-pagebanner" style="background-image: url({{ site.baseurl }}/assets/images/upcom-banner.png);">
+</section>
+
+<section class="publications">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-8">
+        <div class="content">
+
+          <h2>HIGHLIGHTS</h2>
+          <div class="publications-list-block">
+
+            {% include noscript.html %}
+
+	    <span id="calendar-events-list">
+
+              <div v-for="event in highlights">
+                <div class="single-publications-list">
+                  <div class="publications-details">
+                    {% include event.html %}
+                  </div>
+                </div>
+              </div>
+
+              <h2>ALL EVENTS</h2>
+              <div v-for="event in events">
+                <div class="single-publications-list">
+                  <div class="publications-details">
+                    {% include event.html %}
+                  </div>
+                </div>
+              </div>
+
+            </span>
+
+          </div>
+
+        </div>
+      </div>
+
+      <div class="col-md-offset-1 col-md-3">
+
+        <p>
+        This page contains
+        upcoming
+        events from the NeIC
+        <a href="https://wiki.neic.no/wiki/Event_calendar">event calendar</a>,
+        which includes both NeIC events and stakeholder events which NeIC either
+        participates in or simply wants to advertize.
+
+        You may also want to look for
+        <a href="{{ site.baseurl }}/events/past/">past
+        events</a>.
+        </p>
+
+        <p>
+          This list is generated with JavaScript in your browser, so if you cannot see
+          any events please check your settings.
+        </p>
+
+      </div>
+    </div>
+  </div>
+</section>
diff --git a/events.md b/events.md
@@ -0,0 +1,4 @@
+---
+layout: master
+include: events
+---
diff --git a/events/current-events.html b/events/current-events.html
diff --git a/events/past-events.html b/events/past-events.html
diff --git a/events/past.md b/events/past.md
@@ -0,0 +1,5 @@
+---
+layout: master
+include: events-past
+permalink: /events/past/
+---