Merge pull request #3 from CurtinIDS/updates

Adding CIDS-logos

_includes/favicons.html

@@ -1,33 +1,24 @@
-{% assign favicon_url = relative_root_path | append: '/assets/favicons/' | append: site.carpentry  %}
+{% assign favicon_url = relative_root_path | append: '/assets/favicons/cids' %}
 
-{% if site.carpentry == 'swc' %}
-{% assign carpentry = 'Software Carpentry' %}
-{% elsif site.carpentry == 'dc' %}
-{% assign carpentry = 'Data Carpentry' %}
-{% elsif site.carpentry == 'lc' %}
-{% assign carpentry = 'Library Carpentry' %}
-{% elsif site.carpentry == 'cp' %}
-{% assign carpentry = 'The Carpentries' %}
-{% endif %}
-
-    <!-- Favicons for everyone -->
-    <link rel="apple-touch-icon-precomposed" sizes="57x57" href="{{ favicon_url }}/apple-touch-icon-57x57.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{ favicon_url }}/apple-touch-icon-114x114.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ favicon_url }}/apple-touch-icon-72x72.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ favicon_url }}/apple-touch-icon-144x144.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="60x60" href="{{ favicon_url }}/apple-touch-icon-60x60.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="120x120" href="{{ favicon_url }}/apple-touch-icon-120x120.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="76x76" href="{{ favicon_url }}/apple-touch-icon-76x76.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{ favicon_url }}/apple-touch-icon-152x152.png" />
-    <link rel="icon" type="image/png" href="{{ favicon_url }}/favicon-196x196.png" sizes="196x196" />
-    <link rel="icon" type="image/png" href="{{ favicon_url }}/favicon-96x96.png" sizes="96x96" />
-    <link rel="icon" type="image/png" href="{{ favicon_url }}/favicon-32x32.png" sizes="32x32" />
-    <link rel="icon" type="image/png" href="{{ favicon_url }}/favicon-16x16.png" sizes="16x16" />
-    <link rel="icon" type="image/png" href="{{ favicon_url }}/favicon-128.png" sizes="128x128" />
-    <meta name="application-name" content="{{ carpentry }} - {{ site.title }}"/>
-    <meta name="msapplication-TileColor" content="#FFFFFF" />
-    <meta name="msapplication-TileImage" content="{{ favicon_url }}/mstile-144x144.png" />
-    <meta name="msapplication-square70x70logo" content="{{ favicon_url }}/mstile-70x70.png" />
-    <meta name="msapplication-square150x150logo" content="{{ favicon_url }}/mstile-150x150.png" />
-    <meta name="msapplication-wide310x150logo" content="{{ favicon_url }}/mstile-310x150.png" />
-    <meta name="msapplication-square310x310logo" content="{{ favicon_url }}/mstile-310x310.png" />
+{% assign carpentry = 'CIDS Carpentry' %}
+<!-- Favicons for everyone -->
+<link rel="apple-touch-icon-precomposed" sizes="57x57" href="{{ favicon_url }}/apple-touch-icon-57x57.png" />
+<link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{ favicon_url }}/apple-touch-icon-114x114.png" />
+<link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ favicon_url }}/apple-touch-icon-72x72.png" />
+<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ favicon_url }}/apple-touch-icon-144x144.png" />
+<link rel="apple-touch-icon-precomposed" sizes="60x60" href="{{ favicon_url }}/apple-touch-icon-60x60.png" />
+<link rel="apple-touch-icon-precomposed" sizes="120x120" href="{{ favicon_url }}/apple-touch-icon-120x120.png" />
+<link rel="apple-touch-icon-precomposed" sizes="76x76" href="{{ favicon_url }}/apple-touch-icon-76x76.png" />
+<link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{ favicon_url }}/apple-touch-icon-152x152.png" />
+<link rel="icon" type="image/png" href="{{ favicon_url }}/favicon-196x196.png" sizes="196x196" />
+<link rel="icon" type="image/png" href="{{ favicon_url }}/favicon-96x96.png" sizes="96x96" />
+<link rel="icon" type="image/png" href="{{ favicon_url }}/favicon-32x32.png" sizes="32x32" />
+<link rel="icon" type="image/png" href="{{ favicon_url }}/favicon-16x16.png" sizes="16x16" />
+<link rel="icon" type="image/png" href="{{ favicon_url }}/favicon-128.png" sizes="128x128" />
+<meta name="application-name" content="{{ carpentry }} - {{ site.title }}" />
+<meta name="msapplication-TileColor" content="#FFFFFF" />
+<meta name="msapplication-TileImage" content="{{ favicon_url }}/mstile-144x144.png" />
+<meta name="msapplication-square70x70logo" content="{{ favicon_url }}/mstile-70x70.png" />
+<meta name="msapplication-square150x150logo" content="{{ favicon_url }}/mstile-150x150.png" />
+<meta name="msapplication-wide310x150logo" content="{{ favicon_url }}/mstile-310x150.png" />
+<meta name="msapplication-square310x310logo" content="{{ favicon_url }}/mstile-310x310.png" />

_includes/navbar.html

@@ -16,40 +16,14 @@
         <span class="icon-bar"></span>
       </button>
 
-      {% comment %} Select what logo to display. {% endcomment %}
-      {% if site.carpentry == "swc" %}
-      <a href="{{ site.swc_site }}" class="pull-left">
-        <img class="navbar-logo" src="{{ relative_root_path }}{% link /assets/img/swc-icon-blue.svg %}"
-          alt="Software Carpentry logo" />
+      {% comment %} what logo to display. {% endcomment %}
+      <a href="https://datascience.curtin.edu.au/" class="pull-left">
+        <img class="navbar-logo" src="{{ relative_root_path }}{% link /assets/img/cids_logo_cantarell.svg %}"
+          alt="CIDS logo" />
       </a>
-      {% elsif site.carpentry == "dc" %}
-      <a href="{{ site.dc_site }}" class="pull-left">
-        <img class="navbar-logo" src="{{ relative_root_path }}{% link /assets/img/dc-icon-black.svg %}"
-          alt="Data Carpentry logo" />
-      </a>
-      {% elsif site.carpentry == "lc" %}
-      <a href="{{ site.lc_site }}" class="pull-left">
-        <img class="navbar-logo" src="{{ relative_root_path }}{% link /assets/img/lc-icon-black.svg %}"
-          alt="Library Carpentry logo" />
-      </a>
-      {% elsif site.carpentry == "cp" %}
-      <a href="{{ site.carpentries_site }}" class="pull-left">
-        <img class="navbar-logo" src="{{ relative_root_path }}{% link /assets/img/cp-logo-blue.svg %}"
-          alt="The Carpentries logo" />
-      </a>
-      {% elsif site.carpentry == "incubator" %}
-      <a href="{{ site.incubator_lesson_site }}" class="pull-left">
-        <img class="navbar-logo" src="{{ relative_root_path }}{% link /assets/img/incubator-logo-blue.svg %}"
-          alt="The Carpentries Incubator logo" />
-        {% elsif site.carpentry == "lab" %}
-        <a href="{{ relative_root_path }}{% link index.md %}" class="pull-left">
-          <img class="navbar-logo" src="{{ relative_root_path }}{% link /assets/img/carpentrieslab.svg %}"
-            alt="The Carpentries Lab" />
-        </a>
-        {% endif %}
 
-        {% comment %} Always show link to home page. {% endcomment %}
-        <a class="navbar-brand" href="{{ relative_root_path }}{% link index.md %}">Home</a>
+      {% comment %} Always show link to home page. {% endcomment %}
+      <a class="navbar-brand" href="{{ relative_root_path }}{% link index.md %}">Home</a>
 
     </div>
     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">

_includes/workshop_ad.html

@@ -1,8 +1,8 @@
 {% comment %}
-  Advertising box at the top of a workshop website home page.
+Advertising box at the top of a workshop website home page.
 {% endcomment %}
 
-{% assign begin_address = page.address | slice: 0, 4 | downcase  %}
+{% assign begin_address = page.address | slice: 0, 4 | downcase %}
 {% if page.address == "online" %}
 {% assign online = "true_private" %}
 {% elsif begin_address contains "http" %}
@@ -30,21 +30,25 @@ <h2>{{page.venue}}</h2>
         </div>
         <div class="col-md-6">
           <p>
-          <strong>Instructors:</strong>
-          {% if page.instructor %}
-          {{page.instructor | join: ', ' %}}
-          {% else %}
-          to be announced.
-          {% endif %}
+            <strong>Instructors:</strong>
+            {% if page.instructor %}
+            {{page.instructor | join: ', ' %}}
+            {% else %}
+            to be announced.
+            {% endif %}
           </p>
           {% if page.helper %}
           <p>
-          <strong>Helpers:</strong>
-          {{page.helper | join: ', ' %}}
+            <strong>Helpers:</strong>
+            {{page.helper | join: ', ' %}}
           </p>
           {% endif %}
+          <p>
+            <img class="img-responsive" src="{{ relative_root_path }}{% link /assets/img/cids_logo_full_big.png %}"
+              alt="Software Carpentry logo" />
+          </p>
         </div>
       </div>
     </div>
   </div>
-</div>
+</div>

_includes/workshop_footer.html

@@ -1,27 +1,29 @@
 {% comment %}
-  Footer for a standard workshop.
+Footer for a standard workshop.
 {% endcomment %}
 <footer>
-  <hr/>
+  <hr />
   <div class="row">
     <div class="col-md-6" align="left">
       <h4>
-	Copyright &copy; 2016–{{ 'now' | date: "%Y" }}
-	{% if site.carpentry == "swc" %}
-	<a href="{{ site.swc_site }}">Software Carpentry</a>
-	{% elsif site.carpentry == "dc" %}
-	<a href="{{ site.dc_site }}">Data Carpentry</a>
-	{% elsif site.carpentry == "lc" %}
-	<a href="{{ site.lc_site }}">Library Carpentry</a>
-	{% elsif site.carpentry == "cp" %}
-	<a href="{{ site.carpentries_site }}">The Carpentries</a>
-	{% endif %}
+        Copyright &copy; 2016–{{ 'now' | date: "%Y" }}
+        {% if site.carpentry == "swc" %}
+        <a href="{{ site.swc_site }}">Software Carpentry</a>
+        {% elsif site.carpentry == "dc" %}
+        <a href="{{ site.dc_site }}">Data Carpentry</a>
+        {% elsif site.carpentry == "lc" %}
+        <a href="{{ site.lc_site }}">Library Carpentry</a>
+        {% elsif site.carpentry == "cp" %}
+        <a href="{{ site.carpentries_site }}">The Carpentries</a>
+        {% endif %}
       </h4>
     </div>
     <div class="col-md-6" align="right">
       <h4>
-	<a href="mailto:{{ site.email }}">Contact The Carpentries</a>
+        <a href="mailto:{{ site.email }}">Contact The Carpentries</a>
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        <a href="mailto:[email protected]">Contact The CIDS</a>
       </h4>
     </div>
   </div>
-</footer>
+</footer>