update event, fix layout (#394)

ropensci-archive · Jan 10, 2019 · 8a5f39d · 8a5f39d
1 parent f8adc45
commit 8a5f39d
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 26 deletions.
diff --git a/content/events/2019-01-15-rstudioconf.md b/content/events/2019-01-15-rstudioconf.md
@@ -14,7 +14,21 @@ attendees:
 
 Two members of our team will attend [rstudio::conf](http://www.cvent.com/events/rstudio-conf-austin/event-summary-dd6d75526f3c4554b67c4de32aeffb47.aspx), chat with them if you have questions about rOpenSci.
 
-Karthik Ram speaking in Session 3 / Tidyverse & Teaching / A guide to modern reproducible data science 
 
-Abstract: 	
-Have you ever had a challenging time cloning someone's data analysis repo and easily re-running the analysis without fiddling with missing packages, mismatched versions, external dependencies, unavailable data or a whole host of other issues? Would you like your own work to be reproducible where someone else can access your data, code, workflow, models and provenance and easily re-create your results without consulting you? Then this is the talk for you. You'll learn about creating custom computing environments that can be shared and instantly with remote users, packaging small to medium data inside and outside packages, and creating simple to complex workflows to track the provenance of your results.
+### A guide to modern reproducible data science
+
+__Karthik Ram__ (Tidyverse & Teaching, session 3)
+
+
+_Have you ever had a challenging time cloning someone's data analysis repo and easily re-running the analysis without fiddling with missing packages, mismatched versions, external dependencies, unavailable data or a whole host of other issues? Would you like your own work to be reproducible where someone else can access your data, code, workflow, models and provenance and easily re-create your results without consulting you? Then this is the talk for you. You'll learn about creating custom computing environments that can be shared and instantly with remote users, packaging small to medium data inside and outside packages, and creating simple to complex workflows to track the provenance of your results._
+
+
+
+### A preview of Rtools 4.0
+
+__Jeroen Ooms__ (Programming, session 4)
+
+
+_Rtools is getting a major upgrade. In addition to the latest gcc, it now includes a full build system and package manager to build, install, and distribute external c/c++/fortran libraries needed by R packages. Thereby it bridges the long-standing gap between Windows and MacOS/Linux with respect to the availability of high quality, up-to-date system libraries. In this talk, we will show how to build and install system libraries with Rtools, and manage your Rtools build environment. It should be interesting both for Windows users as well as non-Windows package authors that are interested in reducing the pain of making things work on Windows._
+
+
diff --git a/themes/ropensci/layouts/events/list.html b/themes/ropensci/layouts/events/list.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
-{{ partial "head.html" . }}
+    {{ partial "head.html" . }}
 </head>
 <body>
-{{ partial "header.html" . }}
+    {{ partial "header.html" . }}
 
-<!-- begins tutorial section -->
-  <section>
+    <!-- begins tutorial section -->
+    <section>
         <div class="container">
             <div class="row center">
                 <div class="col-8 top-20">
@@ -19,26 +19,25 @@ <h2>Upcoming Events</h2>
 
             <div class="row">
                 <div class="row center">
-            <div class="col-10 top-0"> 
-  {{ $pages := where .Site.Pages ".Params.attendees" "!=" nil }}
-  {{ partial "calendar.html" (dict "pages" $pages "Site" $.Site "intervalleft" now) }}
-
-</div>
-</div>
-            </div> 
-        </div>
-        <br></br>
-  <!-- /container -->
-    </section>
-    <!-- ends tutorial section -->
-    <br><br>
+                    <div class="col-10 top-0"> 
+                      {{ $pages := where .Site.Pages ".Params.attendees" "!=" nil }}
+                      {{ partial "calendar.html" (dict "pages" $pages "Site" $.Site "intervalleft" now) }}
+                  </div>
+              </div>
+          </div> 
+      </div>
+      <br></br>
+      <!-- /container -->
+  </section>
+  <!-- ends tutorial section -->
+  <br><br>
 
-{{ partial "footer.html" . }}
+  {{ partial "footer.html" . }}
 
 
-    <script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
-    <script type="text/javascript" src="https://cdn.datatables.net/v/dt/dt-1.10.12/fh-3.1.2/r-2.1.0/sc-1.4.2/datatables.min.js"></script>
-    <script type="text/javascript" src="js/tutorialinit.js"></script>
+  <script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
+  <script type="text/javascript" src="https://cdn.datatables.net/v/dt/dt-1.10.12/fh-3.1.2/r-2.1.0/sc-1.4.2/datatables.min.js"></script>
+  <script type="text/javascript" src="js/tutorialinit.js"></script>
 
 </body>
 </html>
diff --git a/themes/ropensci/layouts/events/single.html b/themes/ropensci/layouts/events/single.html
@@ -25,8 +25,10 @@ <h1 style="text-align: center;">{{ .Title }}</h1>
                     </div>
 
                     <br>
-                    <div class="row bottom-5 top-5">
+                    <div class="row">
+                        <div class="col-12 bottom-5 top-5"> 
                         {{ .Content }}
+                        </div>
                     </div>
                 </div>
 

diff --git a/themes/ropensci/layouts/partials/calendar.html b/themes/ropensci/layouts/partials/calendar.html
@@ -15,7 +15,7 @@
   {{ $beautifulend := $end.Format "2006/01/02"}}
   {{ if and ($start.After $intervalleft) ($end.Before ($intervalleft.AddDate 1 0 0))}}
   <tr>
-    <td><a href="{{ .URL}}" target="_blank">{{.Title}}</a></td>
+    <td><a href="{{ .URL}}" >{{.Title}}</a></td>
     <td>{{ $beautifulstart }}{{if ne $beautifulstart $beautifulend}} - {{ $beautifulend }}{{end}}</td>
     <td>{{.Params.location}}{{ if .Params.country }} {{ .Params.country }} {{ end }}</td>
     <td>{{ if ne (printf "%T" .Params.attendees) "string" }}{{$authors := .Params.attendees}} {{ partial "authorssimpler.html" (dict "authors" $authors "Site" $.Site) }}{{ else }} {{ .Params.attendees }}{{ end }}</td>