From 0a8b55cd9705b69d597bd468e9a8efd42c2b99dc Mon Sep 17 00:00:00 2001
From: Greg Wilson <gvwilson@third-bit.com>
Date: Fri, 7 Oct 2016 10:38:42 -0400
Subject: [PATCH] Starting to incorporate Library Carpentry materials
---
_includes/lesson_footer.html | 9 ++++-
_includes/navbar.html | 8 ++++
_layouts/base.html | 5 ++-
_layouts/workshop.html | 5 ++-
assets/img/lc-icon-black.svg | 76 +++++++++++++++++++++++++++++++++++
bin/lesson_initialize.py | 2 +-
favicon-lc.ico | Bin 0 -> 1267 bytes
7 files changed, 98 insertions(+), 7 deletions(-)
create mode 100644 assets/img/lc-icon-black.svg
create mode 100644 favicon-lc.ico
diff --git a/_includes/lesson_footer.html b/_includes/lesson_footer.html
index beef2cb..e143daa 100644
--- a/_includes/lesson_footer.html
+++ b/_includes/lesson_footer.html
@@ -3,8 +3,13 @@
<div class="col-md-6" align="left">
<h4>
Copyright © 2016
- {% if site.carpentry == "swc" %}<a href="{{ site.swc_site }}">Software Carpentry Foundation</a>{% endif %}
- {% if site.carpentry == "dc" %}<a href="{{ site.dc_site }}">Data Carpentry</a>{% endif %}
+ {% if site.carpentry == "swc" %}
+ <a href="{{ site.swc_site }}">Software Carpentry Foundation</a>
+ {% elsif site.carpentry == "dc" %}
+ <a href="{{ site.dc_site }}">Data Carpentry</a>
+ {% elsif site.carpentry == "lc" %}
+ <a href="{{ site.dc_site }}">Library Carpentry</a>
+ {% endif %}
</h4>
</div>
<div class="col-md-6" align="right">
diff --git a/_includes/navbar.html b/_includes/navbar.html
index b0a2c3d..8d4f1dd 100644
--- a/_includes/navbar.html
+++ b/_includes/navbar.html
@@ -17,6 +17,10 @@
<a href="{{ site.dc_site }}" class="pull-left">
<img class="navbar-logo" src="{{ page.root }}/assets/img/dc-icon-black.svg" alt="Data Carpentry logo" />
</a>
+ {% elsif page.carpentry == "lc" %}
+ <a href="{{ site.dc_site }}" class="pull-left">
+ <img class="navbar-logo" src="{{ page.root }}/assets/img/lc-icon-black.svg" alt="Library Carpentry logo" />
+ </a>
{% elsif site.carpentry == "swc" %}
<a href="{{ site.swc_site }}" class="pull-left">
<img class="navbar-logo" src="{{ page.root }}/assets/img/swc-icon-blue.svg" alt="Software Carpentry logo" />
@@ -25,6 +29,10 @@
<a href="{{ site.dc_site }}" class="pull-left">
<img class="navbar-logo" src="{{ page.root }}/assets/img/dc-icon-black.svg" alt="Data Carpentry logo" />
</a>
+ {% elsif site.carpentry == "lc" %}
+ <a href="{{ site.dc_site }}" class="pull-left">
+ <img class="navbar-logo" src="{{ page.root }}/assets/img/lc-icon-black.svg" alt="Library Carpentry logo" />
+ </a>
{% endif %}
{% comment %} Always show link to home page. {% endcomment %}
diff --git a/_layouts/base.html b/_layouts/base.html
index 06f316d..365d2e5 100644
--- a/_layouts/base.html
+++ b/_layouts/base.html
@@ -14,9 +14,10 @@
<link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/lesson.css" />
{% if site.carpentry == "swc" %}
<link rel="shortcut icon" type="image/x-icon" href="/favicon-swc.ico" />
- {% endif %}
- {% if site.carpentry == "dc" %}
+ {% elsif site.carpentry == "dc" %}
<link rel="shortcut icon" type="image/x-icon" href="/favicon-dc.ico" />
+ {% elsif site.carpentry == "lc" %}
+ <link rel="shortcut icon" type="image/x-icon" href="/favicon-lc.ico" />
{% endif %}
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
diff --git a/_layouts/workshop.html b/_layouts/workshop.html
index f29e3ce..2f4cd30 100644
--- a/_layouts/workshop.html
+++ b/_layouts/workshop.html
@@ -30,9 +30,10 @@
<link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/lesson.css" />
{% if site.carpentry == "swc" %}
<link rel="shortcut icon" type="image/x-icon" href="/favicon-swc.ico" />
- {% endif %}
- {% if site.carpentry == "dc" %}
+ {% elsif site.carpentry == "dc" %}
<link rel="shortcut icon" type="image/x-icon" href="/favicon-dc.ico" />
+ {% elsif site.carpentry == "lc" %}
+ <link rel="shortcut icon" type="image/x-icon" href="/favicon-lc.ico" />
{% endif %}
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
diff --git a/assets/img/lc-icon-black.svg b/assets/img/lc-icon-black.svg
new file mode 100644
index 0000000..df71189
--- /dev/null
+++ b/assets/img/lc-icon-black.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="600.000000pt" height="200.000000pt" viewBox="0 0 600.000000 200.000000"
+ preserveAspectRatio="xMidYMid meet">
+
+<g transform="translate(0.000000,200.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M1005 1355 l0 -325 248 0 247 0 0 83 0 82 -152 0 -153 0 0 243 0 242
+-95 0 -95 0 0 -325z"/>
+<path d="M1545 1355 l0 -325 98 0 97 0 0 325 0 325 -97 0 -98 0 0 -325z"/>
+<path d="M1835 1356 l0 -326 190 0 c105 0 208 5 229 10 81 18 128 74 133 157
+5 75 -18 120 -75 148 -23 11 -41 22 -42 25 0 3 14 11 31 19 35 15 68 77 69
+126 0 51 -40 116 -85 139 -36 19 -61 21 -245 24 l-205 3 0 -325z m326 164 c22
+-12 26 -59 7 -78 -7 -7 -40 -12 -80 -12 l-68 0 0 50 0 50 61 0 c33 0 69 -5 80
+-10z m9 -233 c17 -9 26 -22 28 -44 5 -46 -26 -63 -110 -63 l-68 0 0 60 0 60
+63 0 c34 0 73 -6 87 -13z"/>
+<path d="M2465 1355 l0 -325 96 0 95 0 -4 115 -5 115 47 0 c64 0 85 -24 122
+-137 l29 -93 103 0 c56 0 102 3 102 8 0 8 -82 202 -102 240 -7 13 -23 29 -36
+36 l-24 13 35 22 c45 27 68 78 68 146 0 91 -37 145 -120 173 -21 8 -106 12
+-220 12 l-186 0 0 -325z m309 165 c21 -8 26 -16 26 -43 0 -47 -15 -57 -87 -57
+l-63 0 0 55 0 55 49 0 c27 0 61 -4 75 -10z"/>
+<path d="M3290 1665 c0 -8 -47 -151 -105 -319 -58 -167 -105 -307 -105 -310 0
+-3 46 -6 103 -6 l103 0 14 68 15 67 100 0 100 0 15 -67 14 -68 103 0 c57 0
+103 3 103 7 0 3 -47 143 -105 310 -58 167 -105 310 -105 318 0 12 -22 15 -125
+15 -103 0 -125 -3 -125 -15z m174 -317 l6 -28 -55 0 c-30 0 -55 1 -55 3 0 2 6
+26 14 53 8 27 20 69 27 94 l12 45 22 -70 c12 -38 25 -82 29 -97z"/>
+<path d="M3805 1355 l0 -325 96 0 95 0 -4 115 -5 115 47 0 c64 0 85 -24 122
+-137 l29 -93 103 0 c56 0 102 3 102 8 0 8 -82 202 -102 240 -7 13 -23 29 -36
+36 l-24 13 35 22 c45 27 68 78 68 146 0 91 -37 145 -120 173 -21 8 -106 12
+-220 12 l-186 0 0 -325z m309 165 c21 -8 26 -16 26 -43 0 -47 -15 -57 -87 -57
+l-63 0 0 55 0 55 49 0 c27 0 61 -4 75 -10z"/>
+<path d="M4380 1674 c0 -3 13 -24 28 -47 16 -23 68 -108 115 -189 l87 -146 0
+-131 0 -131 95 0 95 0 0 130 0 130 115 192 c63 105 115 193 115 195 0 1 -49 3
+-109 3 l-108 0 -53 -107 -52 -108 -52 107 -51 107 -112 0 c-62 1 -113 -2 -113
+-5z"/>
+<path d="M357 999 c-160 -38 -254 -197 -228 -386 18 -121 73 -203 169 -250 50
+-25 68 -28 152 -28 84 0 102 3 152 28 59 29 96 68 122 131 26 62 22 73 -29 80
+-148 20 -132 22 -148 -15 -18 -45 -38 -60 -85 -66 -88 -12 -142 56 -142 177 0
+39 6 85 14 104 39 94 169 104 206 16 14 -35 12 -34 113 -15 43 8 80 15 82 15
+6 0 -12 55 -28 87 -24 46 -95 102 -151 118 -54 16 -140 18 -199 4z"/>
+<path d="M2995 1003 l-230 -3 0 -325 0 -325 253 0 252 0 0 80 0 79 -157 3
+-158 3 -3 48 -3 48 138 -2 138 -2 0 78 0 79 -138 -3 -138 -3 3 44 3 43 153 0
+152 0 0 83 c0 72 -2 82 -17 80 -10 -2 -121 -4 -248 -5z"/>
+<path d="M4000 923 l0 -83 100 0 100 0 0 -245 0 -245 98 0 97 0 -3 245 -4 245
+106 0 106 0 0 83 0 82 -300 0 -300 0 0 -82z"/>
+<path d="M990 985 c0 -8 -47 -151 -105 -319 -58 -167 -105 -307 -105 -310 0
+-3 46 -6 103 -6 l103 0 14 68 15 67 100 0 100 0 15 -67 14 -68 103 0 c57 0
+103 3 103 7 0 3 -47 143 -105 310 -58 167 -105 310 -105 318 0 12 -22 15 -125
+15 -103 0 -125 -3 -125 -15z m174 -317 l6 -28 -55 0 c-30 0 -55 1 -55 3 0 2 6
+26 14 53 8 27 20 69 27 94 l12 45 22 -70 c12 -38 25 -82 29 -97z"/>
+<path d="M1505 675 l0 -325 96 0 95 0 -4 115 -5 115 47 0 c64 0 85 -24 122
+-137 l29 -93 103 0 c56 0 102 3 102 8 0 8 -82 202 -102 240 -7 13 -23 29 -36
+36 l-24 13 35 22 c45 27 68 78 68 146 0 91 -37 145 -120 173 -21 8 -106 12
+-220 12 l-186 0 0 -325z m309 165 c21 -8 26 -16 26 -43 0 -47 -15 -57 -87 -57
+l-63 0 0 55 0 55 49 0 c27 0 61 -4 75 -10z"/>
+<path d="M2155 675 l0 -325 97 0 97 0 -6 98 -6 99 89 6 c100 7 145 19 190 53
+97 72 100 276 4 344 -57 41 -111 50 -294 50 l-171 0 0 -325z m320 159 c25 -10
+36 -49 24 -81 -14 -38 -25 -43 -96 -43 l-63 0 0 65 0 65 59 0 c33 0 67 -3 76
+-6z"/>
+<path d="M3345 675 l0 -325 95 0 95 0 -3 177 -3 178 24 -40 c13 -22 50 -80 83
+-130 34 -49 73 -111 88 -137 l28 -48 96 0 97 0 0 325 0 325 -95 0 -95 0 3
+-177 4 -178 -111 169 c-61 93 -111 173 -111 178 0 4 -44 8 -97 8 l-98 0 0
+-325z"/>
+<path d="M4655 675 l0 -325 96 0 95 0 -4 115 -5 115 47 0 c64 0 85 -24 122
+-137 l29 -93 103 0 c56 0 102 3 102 8 0 8 -82 202 -102 240 -7 13 -23 29 -36
+36 l-24 13 35 22 c45 27 68 78 68 146 0 91 -37 145 -120 173 -21 8 -106 12
+-220 12 l-186 0 0 -325z m309 165 c21 -8 26 -16 26 -43 0 -47 -15 -57 -87 -57
+l-63 0 0 55 0 55 49 0 c27 0 61 -4 75 -10z"/>
+<path d="M5230 994 c0 -3 13 -24 28 -47 16 -23 68 -108 115 -189 l87 -146 0
+-131 0 -131 95 0 95 0 0 130 0 130 115 192 c63 105 115 193 115 195 0 1 -49 3
+-109 3 l-108 0 -53 -107 -52 -108 -52 107 -51 107 -112 0 c-62 1 -113 -2 -113
+-5z"/>
+</g>
+</svg>
diff --git a/bin/lesson_initialize.py b/bin/lesson_initialize.py
index a3c478d..28b2f90 100755
--- a/bin/lesson_initialize.py
+++ b/bin/lesson_initialize.py
@@ -175,7 +175,7 @@ ROOT_CONFIG_YML = '''\
# Values for this lesson.
#------------------------------------------------------------
-# Which carpentry is this ("swc" or "dc")?
+# Which carpentry is this ("swc", "dc", or "lc")?
carpentry: "swc"
# Overall title for pages.
diff --git a/favicon-lc.ico b/favicon-lc.ico
new file mode 100644
index 0000000000000000000000000000000000000000..f4f3c9356479843b967e8cd910a69aa3f81d7dd4
GIT binary patch
literal 1267
zcmV<P1PuF$P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000B<X+uL$Nkc;*
zP;zf(X>4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW
z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa
zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G
z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_
zSYddU<1E8793KxjQ|c&UmW!m<wJPEz#Qifd`D_gH9D=nYPc7;iy3Be}cI}#B(pb7r
zQ2)<0Z#G)-dhzM<<|dEgyN}ggcgNHaf39n}NyINBzUKHDCVv(2y~bQ6jd(9W@|l`@
zq{8{hHx}zt?;zfZxN7)?sZhRX&6Fm%ZE|_eKB|VCYq~dzJ%bk!->TC>k>?{om1c9S
zUx<6_jj_<bFzzi(=30Ih>!T&^M{wWM#><F%5P#^}>IBbOSf*xP<^F{$j$aOQ5Y{cT
zROCL1M7^NKK<?M4#<(px;Nu~3TQXfUjub-vl4Az5h`EvTZbPkvoEw^(%X2^EKD8>L
z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^
zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr<Twj7JkV%^#F
z^FB1tE8`u5%(<RMUli}Gd(zOafAsejYx|L$X)B+22f)J)w3q|&`mZkiuq*PhLN2^}
zv+L>-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&<J19^6g
zw<TiDI@c3vSSRQQrH3Ur+aF1l-;_U<73B-%ymEJ2m)mwp_*D2-_)+*y_+I!KWZ{x<
zS@=n~B77rUjGfiv=VSBigL+%lGEKW)Q!u5Bv|D;f%1SRtuSmtnpVTc4Nn_F;)a>3o
zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p&
z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oN<lWx-aij
zl-K1neyXTku=K%xSu;&JP<gUTJ?bvd>L9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_|
z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p
z<z{o^OZ2}6aLN1^Spac(61Cxm0002KNkl<ZXa((<K?=Yi3<PWG|G(Up9+kx?WNBc$
zwJV9vco5tDj-&863$OiKdif1py@A$R|4V-V;q;X^zy{>`G6fhgftGDBAkmlt446R6
zHW-j-OaTT=pk*5jNHnGZ118Y24F)6{Q-A>zXxRn>5{)UqfC;p0g8_-g6qGkGJnpW5
zTX_hM)ZKY3E^mMhM2<%091LXAjnu|Kgi_`l3}n)c)W$%BQs$iDF0^wW$z0&9Hb-bi
dC_682-~s1j4POiE#p(b6002ovPDHLkV1l;(W0?Q|
literal 0
HcmV?d00001
--
GitLab