Merge pull request #18 from MaP-science/addingNews

Making the news on the homepage clickable

Author: EmmaThomson

_layouts/homelay.html

@@ -6,5 +6,18 @@
 	{{ content }}
   </div>
   <div id="newsid" class="col-sm-4" >
-	{% include news.html%}
+    <h2>News</h2>
+  <hr style="border-top: 3px solid #e1e3e3;"> <!-- Add a faint horizontal line here -->
+    <ul class="list-unstyled">
+      {% for article in site.data.news %}
+        {% assign anchor_id = article.date | replace: '/', '-' | append: '-' | append: article.headline | slugify %}
+        <li>
+          <a href="/news.html#{{ anchor_id }}" style="color: inherit; text-decoration: none;">
+            <strong>{{ article.date }}</strong><br>
+            {{ article.headline }}
+          </a>
+          <hr>
+        </li>
+      {% endfor %}
+    </ul>
   </div>

_pages/allnews.html

@@ -0,0 +1,23 @@
+---
+title: "News"
+layout: textlay
+excerpt: "Microstructure and Plasticity"
+sitemap: false
+permalink: /allnews.html
+---
+
+# News
+---
+
+<ul class="list-unstyled">
+  {% for article in site.data.news %}
+    {% assign anchor_id = article.date | replace: '/', '-' | append: '-' | append: article.headline | slugify %}
+    <li>
+      <a href="/news.html#{{ anchor_id }}" style="text-decoration: none; color: inherit;">
+        <strong>{{ article.date }}</strong><br>
+        {{ article.headline }}
+      </a>
+      <hr>
+    </li>
+  {% endfor %}
+</ul>

_pages/allnews.md

@@ -5,30 +5,31 @@
 sitemap: false
 permalink: /news.html
 ---
-<h1>{{page.title}}</h1>
 
-<hr style="border-top: 3px solid #e1e3e3;"> <!-- Add a faint horizontal line here -->
+<h1>{{ page.title }}</h1>
+<hr style="border-top: 3px solid #e1e3e3;">
 
-<ul class="list-unstyled">
-    {% for article in site.data.news %}
-        <li class="media">
-            <div class="media-body">
-                <h3 class="mt-0 mb-1">
-                    {% assign logo_lowercase = article.logo | downcase %}
-                    {% if logo_lowercase contains 'dtu' %}
-                        <img src="{{ site.url }}{{ site.baseurl }}/images/logo/{{ logo_lowercase }}_logo.png" style="width: 100px; height: 50px; margin-right: 10px;">
-                    {% else %}
-                        <img src="{{ site.url }}{{ site.baseurl }}/images/logo/{{ logo_lowercase }}_logo.png" style="width: 130px; height: 40px; margin-right: 10px;">
-                    {% endif %}
-                    {{ article.title }}
-                </h3>
-                <p><small>{{ article.date }}</small></p>
-                {{ article.content }}
-            </div>
-        </li>
-        <hr style="border-top: 1px solid #f2f2f2;"> <!-- Add a faint horizontal line here -->
-    {% endfor %}
+<div class="news-items">
+  {% for article in site.data.news %}
+    {% assign anchor_id = article.date | replace: '/', '-' | append: '-' | append: article.headline | slugify %}
+    <section id="{{ anchor_id }}">
+      <div class="media">
+        <div class="media-body">
+          <h3 class="mt-0 mb-1">
+            {% assign logo_lowercase = article.logo | downcase %}
+            {% if logo_lowercase %}
+              <img src="{{ site.url }}{{ site.baseurl }}/images/logo/{{ logo_lowercase }}_logo.png"
+                   alt="{{ article.logo }} logo"
+                   style="width: 130px; height: 40px; margin-right: 10px;">
+            {% endif %}
+            {{ article.title }}
+          </h3>
+          <p><small>{{ article.date }}</small></p>
+          {{ article.content }}
+        </div>
+      </div>
+      <hr style="border-top: 1px solid #f2f2f2;">
+    </section>
     <br>
-</ul>
-
-<br>
+  {% endfor %}
+</div>