Merge branch 'core' of github.com:swcarpentry/lesson-template into up…

…dating-from-template
uzinaduzina · Mar 28, 2015 · 7dc92d0 · 7dc92d0
2 parents 17d0a19 + 77e4e46
commit 7dc92d0
Show file tree

Hide file tree

Showing 33 changed files with 20,478 additions and 9,515 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,8 @@ README.html
 LAYOUT.html
 FAQ.html
 DESIGN.html
+CONTRIBUTING.html
+CONDUCT.html
 *~
 *.pyc
 _site

diff --git a/CONDUCT.md b/CONDUCT.md
@@ -0,0 +1,13 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/).
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,49 @@
+Software Carpentry is an open source project,
+and we welcome contributions of all kinds:
+new lessons,
+fixes to existing material,
+bug reports,
+and reviews of proposed changes are all equally welcome.
+
+By contributing,
+you are agreeing that Software Carpentry may redistribute your work under
+[these licenses][license].
+You also agree to abide by our
+[contributor code of conduct][conduct].
+
+## Getting Started
+
+1.  We use GitHub flow to manage changes,
+    which is explained in the chapter [Contributing to a Project][pro-git-chapter]
+    in Scott Chacon's book *Pro Git*.
+
+2.  For our lessons,
+    you should branch from and submit pull requests against the `gh-pages` branch.
+
+3.  When editing lesson pages, you need only commit changes to the Markdown source files.
+
+4.  If you're looking for things to work on,
+    please see [the list of issues for this repository][lesson-template-issues],
+    or for [our other lessons][swc-lessons].
+    Comments on issues and reviews of pull requests are equally welcome.
+
+## Other Resources
+
+1.  This lesson is based on the template found at
+    [https://github.com/swcarpentry/lesson-template](https://github.com/swcarpentry/lesson-template).
+    That repository has instructions on formatting and previewing lessons.
+
+2.  For a list of helpful commands run `make` in this directory.
+
+3.  The [list of maintainers][swc-maintainers]
+    on the [Software Carpentry website][swc-website]
+    lists the people currently responsible for managing this repository.
+    Feel free to contact them if you have any questions or languishing pull requests.
+
+[conduct]: CONDUCT.md
+[lesson-template-issues]: https://github.com/swcarpentry/lesson-template/issues
+[license]: LICENSE.md
+[pro-git-chapter]: http://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project
+[swc-lessons]: http://software-carpentry.org/lessons.html
+[swc-maintainers]: http://software-carpentry.org/lessons.html#maintainers
+[swc-website]: http://software-carpentry.org
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ DST_RMD = $(patsubst %.Rmd,%.md,$(SRC_RMD))
 
 # All Markdown files (hand-written and generated).
 ALL_MD = $(wildcard *.md) $(DST_RMD)
-EXCLUDE_MD = README.md LAYOUT.md FAQ.md DESIGN.md
+EXCLUDE_MD = README.md LAYOUT.md FAQ.md DESIGN.md CONTRIBUTING.md CONDUCT.md
 SRC_MD = $(filter-out $(EXCLUDE_MD),$(ALL_MD))
 DST_HTML = $(patsubst %.md,%.html,$(SRC_MD))
 
@@ -42,8 +42,8 @@ clean :
 preview : $(DST_ALL)
 
 # Pattern for slides (different parameters and template).
-motivation.html : motivation.md _layouts/slides.html
-	pandoc -s -t html \
+motivation.html : motivation.md _layouts/slides.revealjs Makefile
+	pandoc -s -t revealjs --slide-level 2 \
 	--template=_layouts/slides \
 	-o $@ $<
 

diff --git a/_includes/header.html b/_includes/header.html
@@ -1,10 +1,8 @@
 <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap.css" />
-<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-responsive.css" />
+<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-theme.css" />
 <link rel="stylesheet" type="text/css" href="css/swc.css" />
-<link rel="stylesheet" type="text/css" href="css/swc-workshop-and-lesson.css" />
-<link rel="stylesheet" type="text/css" href="css/lesson.css" />
 <link rel="alternate" type="application/rss+xml" title="Software Carpentry Blog" href="http://software-carpentry.org/feed.xml"/>
 <meta charset="UTF-8" />
 <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->

diff --git a/_includes/javascript.html b/_includes/javascript.html
@@ -1,3 +1,3 @@
 <!-- Javascript placed at the end of the document so the pages load faster -->
 <script src="http://software-carpentry.org/v5/js/jquery-1.9.1.min.js"></script>
-<script src="http://software-carpentry.org/v5/js/bootstrap/bootstrap.min.js"></script>
+<script src="css/bootstrap/bootstrap-js/bootstrap.js"></script>
diff --git a/_layouts/page.html b/_layouts/page.html
@@ -7,10 +7,10 @@
     $header$
   </head>
   <body class="lesson">
-    <div class="container container-full-width card">
+    <div class="container card">
       $banner$
-      <div class="row-fluid">
-        <div class="span10 offset1">
+      <div class="row">
+        <div class="col-md-10 col-md-offset-1">
           <h1 class="title">$title$</h1>
           $if(subtitle)$<h2 class="subtitle">$subtitle$</h2>$endif$
 $body$

diff --git a/_layouts/slides.revealjs b/_layouts/slides.revealjs
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">
+
+$for(author-meta)$
+  <meta name="author" content="$author-meta$">
+$endfor$
+$if(date-meta)$
+  <meta name="date" content="$date-meta$">
+$endif$
+  <title>$if(title-prefix)$$title-prefix$ - $endif$$pagetitle$</title>
+
+$for(css)$
+  <link rel="stylesheet" href="$css$" $if(html5)$$else$type="text/css" $endif$/>
+$endfor$
+
+  <script src="js/deckjs-custom.js"></script>
+  <script>
+      // TODO: finer filter on what is needed (vs profile-5)
+      includedeck("css/swc-slides.css", {
+         BEFOREINIT: function() {
+            $$(".slide.auto li:not(li li):not(.notslide)").addClass("slide");
+         }
+      });
+  </script>
+</head>
+<body>
+  <div class="deck-container">
+
+$if(omit-title)$
+$else$
+    <div class="slide title-slide" data-container-class="no-status">
+        <h1 class="var-title"></h1>
+        <img class="logo" src="img/software-carpentry-banner.png" alt="Software Carpentry"/>
+    </div>
+$endif$
+
+    <!-- Begin slides. Just make elements with a class of slide. -->
+$body$
+    <!-- End slides. -->
+
+    <!-- Begin extension snippets. Add or remove as needed. -->
+
+    <!-- deck.navigation snippet -->
+    <div aria-role="navigation">
+      <a href="#" class="deck-prev-link" title="Previous">&#8592;</a>
+      <a href="#" class="deck-next-link" title="Next">&#8594;</a>
+    </div>
+
+    <!-- footer -->
+    <p class="deck-status deck-progress-10"> <span class="deck-status-current"></span> / <span class="deck-status-total"></span> − <span class="var-title">will be replaced by the title</span></p>
+    <!-- progress bar -->
+    <div class="progress-bar" data-progress-size=":spe.bottom(0, 1) ; left: slide.left+'px' ; height: designRatio+'px'" data-progress="width: detail.p * slide.width" style="position: absolute;"> </div>
+
+    <!-- End extension snippets. -->
+  </div>
+
+</body>
+</html>
diff --git a/css/book.css b/css/book.css
@@ -0,0 +1,10 @@
+span.subtitle {
+  color: #030303;
+  display: block;
+  font-family: inherit;
+  font-size: 31.5px;
+  font-weight: bold;
+  line-height: 40px;
+  margin: 40px 0px 10px 0px;
+  text-rendering: optimizelegibility;
+}