Master

.gitmodules

@@ -0,0 +1,7 @@
+[submodule "lessons/pytest-lesson"]
+	path = lessons/pytest-lesson
+	url = https://github.com/annefou/pytest-lesson
+[submodule "lessons/deep-learning-minutes/neuralRPy"]
+	path = lessons/deep-learning-minutes/neuralRPy
+	url = https://github.com/anacost/neuralRPy
+	branch = master

_config.yml

@@ -1,48 +1,63 @@
-#Setup ~~~
-#Follow these 2 steps to set up your site.
-
-#Step 1: give your study group a name and a short description,
-#and choose a language from the options in the _data directory:
-title: Our Study Group
-description: "A study group."
-language: en
-
-#Step 2: press the green 'Commit Changes' button at the bottom of this page.
-
-# That's it, your website is all set up!
-# You can see it at https://YourUserName.github.io/studyGroup/
-# No need to change anything below this line.
-# To make your first event, check out the instructions at https://github.com/mozillascience/studyGroup#how-to-launch-a-new-event
-# Having trouble? Open a new issue at https://github.com/mozillascience/studyGroup/issues and we'll help you out ASAP!
-
-# Optional Configuration
-# None of these things need to be changed - but feel free!
-
-titleBackground: "https://s3-us-west-2.amazonaws.com/webmaker-kits/learning%402x.jpg"
-headlineSmall: "Welcome To Our Study Group!"
-headlineMain: "Let's Work Together"
-
-# Setup Google Calendar
-# Usage:
-# 1. create a new google account; set the calendar to 'public' (see https://support.google.com/calendar/answer/37083?hl=en on how to do this)
-# 2. change 'USER' in the example urls below to the username of the google account you made for your calendar
-# 3. set calendar_on: True.
-
-calendar_on: False
-calendar_embed_url: "https://www.google.com/calendar/[email protected]"
-calendar_ical_url: "https://www.google.com/calendar/ical/[email protected]/public/basic.ics"
-
-
-#========================================
-# No touching anything below this line :)
-#========================================
-# Color settings (hex-codes without the leading hash-tag)
-color:
-  primary: fed136
-  secondary: fec503
-  secondary-dark: 333
-
-# Build settings
-markdown: kramdown
-permalink: pretty
-future: true
+#Setup ~~~
+#Follow these 2 steps to set up your site.
+
+#Step 1: give your study group a name and a short description,
+#and choose a language from the options in the _data directory:
+title: Carpentry@UiO Study Group
+description: "Study group for the Carpentries community at University of Oslo."
+language: en
+
+#Step 2: press the green 'Commit Changes' button at the bottom of this page.
+
+# That's it, your website is all set up!
+# You can see it at https://YourUserName.github.io/studyGroup/
+# No need to change anything below this line.
+# To make your first event, check out the instructions at https://github.com/mozillascience/studyGroup#how-to-launch-a-new-event
+# Having trouble? Open a new issue at https://github.com/mozillascience/studyGroup/issues and we'll help you out ASAP!
+
+# Optional Configuration
+# None of these things need to be changed - but feel free!
+
+titleBackground: "https://s3-us-west-2.amazonaws.com/webmaker-kits/learning%402x.jpg"
+headlineSmall: "Welcome to UiO Carpentry Study Group!"
+headlineMain: "Let's Meet and Work Together"
+avatar: "img/logos/uio-carpentry-logo-small.png"
+
+# Setup Google Calendar
+# Usage:
+# 1. create a new google account; set the calendar to 'public' (see https://support.google.com/calendar/answer/37083?hl=en on how to do this)
+# 2. change 'USER' in the example urls below to the username of the google account you made for your calendar
+# 3. set calendar_on: True.
+
+calendar_on: False
+calendar_embed_url: "https://www.google.com/calendar/[email protected]"
+calendar_ical_url: "https://www.google.com/calendar/ical/[email protected]/public/basic.ics"
+
+# ===============================
+# Categories for sorting lessons.
+# ===============================
+
+languages:
+  - python
+  - r
+  - git
+  - misc
+
+levels:
+  - beginner
+  - intermediate
+  - advanced
+
+#========================================
+# No touching anything below this line :)
+#========================================
+# Color settings (hex-codes without the leading hash-tag)
+color:
+  primary: f42e3a
+  secondary: e30613
+  secondary-dark: 333
+
+# Build settings
+markdown: kramdown
+permalink: pretty
+future: true

_data/en.yml

@@ -1,6 +1,5 @@
 ---
 whatWeDo: What We Do
-events: Events
 contact: Contact
 tellMeMore: Tell Me More
 
@@ -24,7 +23,7 @@ leadership: How to lead a Study Group session
 pastEvents: See Our Past Events
 
 notification: Want to be notified of our upcoming events?
-watching: 'Head over to <a href="https://github.com/mozillascience/studyGroup">GitHub</a> and watch our repository, like this:'
+watching: 'Head over to <a href="%GITHUB_REPO_URL%">GitHub</a> and watch our repository, like this:'
 watchingCaption: 'Look in the top right-hand corner of <a href="%GITHUB_REPO_URL%">our repo</a>, and click "Watching." <br>You can undo this at any time in the same place.'
 
 calendar: Subscribe to our events calendar!
@@ -41,3 +40,9 @@ teamSubheading: "We're scientists, students and researchers who want to work wit
 interests: Interests
 
 codeOfConduct: Study Group Code of Conduct
+
+lessons: Lessons 
+
+initiatives: Partners
+
+bookclub: Book Club

_data/members.yml

@@ -1,6 +1,51 @@
-- name: Bill Mills
-  affiliation: TRIUMF
-  github: BillMills
+- name: Gladys Nalvarte
+  affiliation: Simula
+  github: GladysNalvarte
   interests:
-    - Programming
+    - Python
     - Open Science
+    - jupyterhub
+    - repo2docker
+
+- name: Ana Costa Conrado
+  affiliation: 
+  github: anacost
+  interests:
+    - Python
+    - R
+    - Open Science
+    - Machine & Deep Learning
+
+- name: Michel Heeremans
+  affiliation: University of Oslo
+  github: heereman
+  interests:
+    - Carpentry@UiO
+    - Research Data Management
+    - Open Science
+
+- name: Anne Bergsaker
+  affiliation: University of Oslo
+  github: 
+  interests:
+    - Carpentry@UiO
+
+- name: Annika Rockenberger 
+  affiliation: The National Library of Norway
+  github: arockenberger
+  interests:
+    - Digital Humanities
+    - Python
+    - The Carpentries
+    - Physical Programming
+
+- name: Anne Fouilloux
+  affiliation: University of Oslo
+  github: annefou
+  interests:
+    - Python
+    - R
+    - Fortran 
+    - HPC & Cloud computing
+    - The Carpentries
+

_includes/contact.html

@@ -8,7 +8,7 @@ <h3 class="section-subheading text-muted">{{site.data[site.language].contactSubh
             </div>
             <div class="row">
                   <div class="col-lg-12 text-center">
-                      <a class="btn btn-xl" href="https://gitter.im/mozillascience/studyGroup">{{site.data[site.language].contact}}</a>
+                      <a class="btn btn-xl" href="https://github.com/uio-carpentry/studyGroup/issues">{{site.data[site.language].contact}}</a>
                   </div>
             </div>
         </div>

_includes/css/custom.css

@@ -4,6 +4,73 @@
 .team-member i.fa {
  font-size: 110px;
 }
+/* * * * * * * * * * * * * * * 
+
+	UIO Events Styles 
+
+* * * * * * * * * * * * * * */
+.uio-event {
+	text-align: left; 
+}
+
+.uio-event-date {
+	margin-top: 24px; 
+}
+.uio-event-date > ul {
+	list-style: none;
+	line-height: 1;
+	text-align: center;
+}
+
+.uio-event-date > ul > li:first-child,
+.uio-event-date > ul > li:nth-child(3) {
+	font-size: 150%; 
+}
+
+.uio-event-date > ul > li:nth-child(2) {
+	font-size: 400%; 
+}
+
+.events, 
+.uio-event-date,
+.uio-event-date > ul {
+	padding: 0;
+}
+
+ul.events {
+	text-align: center; 
+	margin-top: 10px; 
+}
+
+.events > li {
+	margin: 30px 0;
+}
+
+.eventDesc > p {
+	font-size: 105%; 
+}
+
+section h3.section-subheading {
+	margin-bottom: 0px; 
+}
+
+
+.site-avatar {
+  float: left;
+  width: 60px;
+  height: auto;
+  margin-right: 15px;
+
+  @include mobile {
+    float: none;
+    display: block;
+    margin: 0 auto;
+  }
+
+  img {
+    border-radius: 5px;
+  }
+}
 
 @media(max-width: 991px) {
   ul.events {
@@ -16,3 +83,4 @@
     white-space: initial;
   }
 }
+

_includes/footer.html

@@ -3,7 +3,7 @@
       <div class="row">
         <div class="col-lg-12">
           <a href="https://www.mozillascience.org">
-            <img src="img/ScienceLabSticker.ai.png" class="img-responsive img-centered" alt="">
+            <img src="{{ site.github.url | replace:'http:','https:' }}/img/ScienceLabSticker.ai.png" class="img-responsive img-centered" alt="">
           </a>
           <a href="https://science.mozilla.org/code-of-conduct">{{site.data[site.language].codeOfConduct}}</a>
         </div>

_includes/header.html

@@ -3,6 +3,7 @@
         <div class="container">
             <!-- Brand and toggle get grouped for better mobile display -->
             <div class="navbar-header page-scroll">
+              <a href="{{ site.github.url | replace:'http:','https:' }}/"><img class="site-avatar" src="{{ site.github.url | replace:'http:','https:' }}/{{ site.avatar }}" /></a>
                 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
                     <span class="sr-only">Toggle navigation</span>
                     <span class="icon-bar"></span>
@@ -19,13 +20,22 @@
                         <a href="#page-top"></a>
                     </li>
                     <li>
-                        <a class="page-scroll" href="#services">{{site.data[site.language].whatWeDo}}</a>
+                        <a class="page-scroll" href="{{ site.github.url | replace:'http:','https:' }}/#services">{{site.data[site.language].whatWeDo}}</a>
                     </li>
                     <li>
-                        <a class="page-scroll" href="#portfolio">{{site.data[site.language].events}}</a>
+                        <a class="page-scroll" href="{{ site.github.url | replace:'http:','https:' }}/#portfolio">{{site.data[site.language].events}}</a>
                     </li>
                     <li>
-                        <a class="page-scroll" href="#contact">{{site.data[site.language].contact}}</a>
+                        <a class="page-scroll" href="{{ site.github.url | replace:'http:','https:' }}/#contact">{{site.data[site.language].contact}}</a>
+                    </li>
+                    <li>
+		     <a class="page-scroll" href="{{ site.github.url | replace:'http:','https:' }}/lessons/">{{site.data[site.language].lessons}}</a>
+                    </li>
+                    <li>
+		     <a class="page-scroll" href="{{ site.github.url | replace:'http:','https:' }}/initiatives/">{{site.data[site.language].initiatives}}</a>
+                    </li>
+                    <li>
+		     <a class="page-scroll" href="{{ site.github.url | replace:'http:','https:' }}/book_club/">{{site.data[site.language].bookclub}}</a>
                     </li>
                 </ul>
             </div>

_includes/header_lessons.html

@@ -0,0 +1,53 @@
+<!-- Navigation -->
+    <nav class="navbar navbar-default navbar-fixed-top">
+        <div class="container">
+            <!-- Brand and toggle get grouped for better mobile display -->
+            <div class="navbar-header page-scroll">
+              <a href="{{ site.github.url | replace:'http:','https:' }}/"><img class="site-avatar" src="{{ site.github.url | replace:'http:','https:' }}/{{ site.avatar }}" /></a>
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a class="navbar-brand page-scroll" href="#page-top">{{site.title}}</a>
+            </div>
+
+            <!-- Collect the nav links, forms, and other content for toggling -->
+            <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+                <ul class="nav navbar-nav navbar-right">
+                    <li class="hidden">
+                        <a href="#page-top"></a>
+                    </li>
+                    <li>
+                        <a class="page-scroll" href="{{ site.github.url | replace:'http:','https:' }}/#services">{{site.data[site.language].whatWeDo}}</a>
+                    </li>
+                    <li>
+                        <a class="page-scroll" href="{{ site.github.url | replace:'http:','https:' }}/#portfolio">{{site.data[site.language].events}}</a>
+                    </li>
+                    <li>
+                        <a class="page-scroll" href="{{ site.github.url | replace:'http:','https:' }}/#contact">{{site.data[site.language].contact}}</a>
+                    </li>
+                    <li>
+		     <a class="page-scroll" href="{{ site.github.url | replace:'http:','https:' }}/lessons/">{{site.data[site.language].lessons}}</a>
+                    </li>
+                    <li>
+		     <a class="page-scroll" href="{{ site.github.url | replace:'http:','https:' }}/initiatives/">{{site.data[site.language].initiatives}}</a>
+                    </li>
+                    <li>
+		     <a class="page-scroll" href="{{ site.github.url | replace:'http:','https:' }}/book_club/">{{site.data[site.language].bookclub}}</a>
+                    </li>
+                </ul>
+            </div>
+            <!-- /.navbar-collapse -->
+        </div>
+        <!-- /.container-fluid -->
+    </nav>
+    <!-- Header -->
+    <header>
+        <div class="container">
+            <div class="intro-text">
+                <div class="lesson-lead-in">{{ site.lessons }}</div>
+            </div>
+        </div>
+    </header>