From: Greg Wilson Date: Tue, 8 Nov 2016 22:24:45 +0000 (-0500) Subject: Merge pull request #108 from gvwilson/library-carpentry X-Git-Url: https://git.arvados.org/rnaseq-cwl-training.git/commitdiff_plain/4030b747276c61ac5a3c19dd46525ea4d9b03799?hp=60900b8f9755dce7ca0aaddaec8c236bdd2636a2 Merge pull request #108 from gvwilson/library-carpentry Starting to incorporate Library Carpentry materials --- diff --git a/LICENSE.md b/LICENSE.md index 566ce55..179758a 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -73,7 +73,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ## Trademark -"Software Carpentry" an "Data Carpentry" and their respective logos +"Software Carpentry" and "Data Carpentry" and their respective logos are registered trademarks of [NumFOCUS][numfocus]. [cc-by-human]: https://creativecommons.org/licenses/by/4.0/ diff --git a/_includes/lesson_footer.html b/_includes/lesson_footer.html index beef2cb..a37ba3e 100644 --- a/_includes/lesson_footer.html +++ b/_includes/lesson_footer.html @@ -3,8 +3,13 @@

Copyright © 2016 - {% if site.carpentry == "swc" %}Software Carpentry Foundation{% endif %} - {% if site.carpentry == "dc" %}Data Carpentry{% endif %} + {% if site.carpentry == "swc" %} + Software Carpentry Foundation + {% elsif site.carpentry == "dc" %} + Data Carpentry + {% elsif site.carpentry == "lc" %} + Library Carpentry + {% endif %}

@@ -13,7 +18,9 @@ / Contributing / - Contact + Cite + / + Contact
diff --git a/_includes/navbar.html b/_includes/navbar.html index b0a2c3d..6a4df8a 100644 --- a/_includes/navbar.html +++ b/_includes/navbar.html @@ -17,6 +17,10 @@ + {% elsif page.carpentry == "lc" %} + + + {% elsif site.carpentry == "swc" %} @@ -25,6 +29,10 @@ + {% elsif site.carpentry == "lc" %} + + + {% 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 @@ {% if site.carpentry == "swc" %} - {% endif %} - {% if site.carpentry == "dc" %} + {% elsif site.carpentry == "dc" %} + {% elsif site.carpentry == "lc" %} + {% endif %} 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 @@ {% if site.carpentry == "swc" %} - {% endif %} - {% if site.carpentry == "dc" %} + {% elsif site.carpentry == "dc" %} + {% elsif site.carpentry == "lc" %} + {% endif %} 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 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/lesson_check.py b/bin/lesson_check.py index 311687e..a594f2f 100755 --- a/bin/lesson_check.py +++ b/bin/lesson_check.py @@ -151,9 +151,9 @@ def check_config(reporter, source_dir): config_file = os.path.join(source_dir, '_config.yml') config = load_yaml(config_file) reporter.check_field(config_file, 'configuration', config, 'kind', 'lesson') - reporter.check_field(config_file, 'configuration', config, 'carpentry', ('swc', 'dc')) + reporter.check_field(config_file, 'configuration', config, 'carpentry', ('swc', 'dc', 'lc')) reporter.check_field(config_file, 'configuration', config, 'title') - reporter.check_field(config_file, 'configuration', config, 'email') + reporter.check_field(config_file, 'configuration', config, 'contact') reporter.check({'values': {'root': '..'}} in config.get('defaults', []), 'configuration', diff --git a/bin/lesson_initialize.py b/bin/lesson_initialize.py index e0c2881..b26bf28 100755 --- a/bin/lesson_initialize.py +++ b/bin/lesson_initialize.py @@ -175,14 +175,16 @@ 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. title: "Lesson Title" -# Contact email address. -email: lessons@software-carpentry.org +# Contact. This *must* include the protocol: if it's an email +# address, it must look like "mailto:lessons@software-carpentry.org", +# or if it's a URL, "https://gitter.im/username/ProjectName". +contact: "mailto:lessons@software-carpentry.org" #------------------------------------------------------------ # Generic settings (should not need to change). @@ -201,6 +203,7 @@ dc_site: "http://datacarpentry.org" swc_github: "https://github.com/swcarpentry" swc_site: "https://software-carpentry.org" swc_pages: "https://swcarpentry.github.io" +lc_site: "http://librarycarpentry.github.io/" template_repo: "https://github.com/swcarpentry/styles" example_repo: "https://github.com/swcarpentry/lesson-example" example_site: "https://swcarpentry.github.com/lesson-example" diff --git a/favicon-lc.ico b/favicon-lc.ico new file mode 100644 index 0000000..f4f3c93 Binary files /dev/null and b/favicon-lc.ico differ