Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Wed, 27 Jan 2016 20:32:01 +0000 (15:32 -0500)
committerZak Rogoff <zak@fsf.org>
Wed, 27 Jan 2016 20:32:01 +0000 (15:32 -0500)
2016/README.md
2016/assets/css/custom.css
2016/includes/program-menu.html
2016/includes/sidebar.html
2016/program/index.html [new file with mode: 0755]
2016/program/speakers.html [new file with mode: 0755]

index 2290051b9f645e372cba654523ba918d3f0b49c1..565023678a96f95249bc4519b93963ee13fb191d 100644 (file)
@@ -40,26 +40,23 @@ Create a new file called libreplanet (libreplanet.conf for Apache 2.4) in `/etc/
 
 ```
 <VirtualHost *:80>
-    ServerName lp2016.libreplanet.org
-       DocumentRoot /path/to/libreplanet-static
-
-       <Directory />
-               Options FollowSymLinks
-               AllowOverride All
-    </Directory>
-       <Directory /path/to/libreplanet-static>
-               Options Indexes FollowSymLinks MultiViews
-        Options +Includes
-        XBitHack on
-               AllowOverride All
-               Order allow,deny
-               # Directive needed in Apache 2.4
-               allow from all
-       </Directory>
-
-       ErrorLog ${APACHE_LOG_DIR}/error.log
-       LogLevel warn
-       CustomLog ${APACHE_LOG_DIR}/access.log combined
+RewriteEngine on
+        ServerName local-dev.libreplanet.org
+        ServerAdmin webmaster@localhost
+        DocumentRoot /local-path/path-to-site
+        <Directory /local-path/path-to-site/>
+            Options Indexes FollowSymLinks MultiViews
+            AllowOverride All
+            Require all granted
+            Order deny,allow
+            deny from none
+            allow from all
+            SSILegacyExprParser on
+            Options +Includes
+            XBitHack on
+        </Directory>
+        ErrorLog /home/owner/libreplanet-static/logs/error.log
+        CustomLog /home/owner/libreplanet-static/access.log combined
 </VirtualHost>
 ```
 
@@ -124,8 +121,7 @@ Add HTML markup in-between the sidebar and footer includes.
 ### Enable SSI
 
 Files that contain include directives must be marked as executable
-otherwise Apache will not parse them.  The directive `XBitHack on`
-enables this behavior.
+otherwise Apache will not parse them.  (The directive `XBitHack on` in the .conf file pasted above enables this behavior).
 
 To mark a file as executable, run:
 
index 48b39161587a322390b549b4a0b03de3eb9fe7f8..ae11947150387f476484e2dc653f3957147e2823 100644 (file)
@@ -70,6 +70,11 @@ h3  {
 
 .program-session-speaker {
     margin: 0px 7px 0px 0px;
+    font-style: italic;
+}
+
+.speaker-bio {
+  padding-bottom: 25px;
 }
 
 /* Breadcrumb */
index b45c58783ab838bd829af292aa994ff254b4b697..2dd378b288e76633132c7903a54ec6bc6cd9f71e 100644 (file)
@@ -2,7 +2,7 @@
 <div class="contain-fluid">
   <div class="row margin-top">
     <div class="col-sm-9">
-    <h3><a href="index.html">Sessions</a> / <a href="grid-schedule.html">Schedule</a> / <a href="speakers.html">Speakers</a> / <a href="exhibit-hall.html">Exhibit Hall</a> / <a href="social.html">Social Events</a></h3>
+    <h3><a href="index.html">Sessions</a> <!--/ <a href="grid-schedule.html">Schedule</a> -->/ <a href="speakers.html">Speakers</a><!-- / <a href="exhibit-hall.html">Exhibit Hall</a> / <a href="social.html">Social Events</a></h3>-->
   </div>
 </div>
 </div>
index 5c5deffdb9fc9a94d69779e40a83bd8464535694..6bddd25b2adf974b840fcff199d19362cf93827a 100755 (executable)
@@ -16,7 +16,7 @@
                        <li id="volunteer-link"><a href="/2016/volunteer">Volunteer</a></li>
                        <li><a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2016/Conference_brainstorm">Share Your Conference Ideas</a></li>
                        <li><a href="/2016/live">Livestream & Chat</a></li>
-                       <li><a href="/2016/program">Program</a></li>
+                       <li><a href="https://www.libreplanet.org/2015/program">Last year's program</a></li>
                        <li><a href="/2016/program/social.html">Social Events</a></li>
                        <li id="exhibit-link"><a href="/2016/program/exhibit-hall.html">Exhibit Hall</a></li>
                        <li><a href="/2016/sponsors">Sponsors</a></li>
@@ -25,8 +25,9 @@
 
 
                <ul class="nav nav-pills nav-stacked">
+                       <li><a href="/2016/program">Program</a></li>
                        <li><a href="https://media.libreplanet.org/">Videos of previous conferences</a></li>
-                       <li><a href="https://www.libreplanet.org/2015/program">Last year's program</a></li>
+
                        <li id="mailing-list-link"><a href="https://lists.gnu.org/mailman/listinfo/libreplanet-discuss">Join the discussion list</a></li>
                        <li><a href="https://my.fsf.org/civicrm/profile/create?gid=326&reset=1">Apply to exhibit</a></li>
                </ul>
diff --git a/2016/program/index.html b/2016/program/index.html
new file mode 100755 (executable)
index 0000000..63d9705
--- /dev/null
@@ -0,0 +1,60 @@
+
+<!--#include virtual="/2016/includes/header.html"-->
+
+<title>LibrePlanet &mdash; Sessions </title>
+
+<!--#include virtual="/2016/includes/banner.html"-->
+<!--#include virtual="/2016/includes/sidebar.html"-->
+
+<h1>Program <small>Sessions</small></h1>
+
+<!--#include virtual="../includes/program-menu.html"-->
+
+<!--<div id="lp-panel-fixed" class="panel panel-default hidden-xs">
+       <div class="panel-heading">
+               <h2 class="panel-title">
+                       <span class="glyphicon glyphicon-list"></span>
+                       Contents
+               </h2>
+       </div>
+       <div class="panel-body">
+               <p><a href="#saturday">Saturday sessions</a></p>
+               <p><a href="#sunday">Sunday sessions</a></p>
+       </div>
+</div>-->
+
+<div class="row"> <!-- session row start -->
+       <div class="col-sm-9"> <!-- session column start -->
+
+<p>The program is still being filled in, so check back for updates. <a href="https://libreplanet.org/2015/program/index.html">See last year's full program</a>.</p>
+
+               <div class="session">
+                       <h3>The last lighthouse: Free software in dark times
+</h3>
+                        <span class="program-session-speaker"><a href="speakers.html#snowden">Edward Snowden</a>, <a href="speakers.html#dkg">Daniel Kahn Gillmor</a></span>
+                       <p>Join NSA Whistleblower Edward Snowden and ACLU Technologist Daniel Kahn Gillmor for a discussion about free software, surveillance, power, and control of the future.</p>
+               </div>
+
+               <div class="session">
+                       <h3>Challenges and future growth in libre media and conference video production</h3>
+                        <span class="program-session-speaker">George Chriss and others TBA, Kat Walsh (moderator)</span>
+                       <p>An "intermediate" panel designed to provide a working overview of diversified libre media communities blended with per-project technical development updates, organizational adoption challenges, community-centric user-experience goals and other novel discussions regarding video production both generally and as it relates to conference video production (e.g., session recording and live-streaming).</p>
+               </div>
+</div> <!-- session column end -->
+</div> <!-- session row end -->
+
+<div id="lp-mini-nav" class="visible-xs">
+  <ul class="list-inline">
+       <li><a class="btn btn-default btn-xs" href="#saturday">Saturday sessions</a></li>
+       <li><a class="btn btn-default btn-xs" href="#sunday">Sunday sessions</a></li>
+  </ul>
+</div>
+
+
+<!--#include virtual="/2016/includes/footer.html"-->
+<!--#include virtual="/2016/includes/common_js.html"-->
+<script type="text/javascript">
+$("#p-sessions").addClass("active").text("Sessions");
+</script>
+<!--#include virtual="/2016/includes/program_js.html"-->
+<!--#include virtual="/2016/includes/close.html" -->
diff --git a/2016/program/speakers.html b/2016/program/speakers.html
new file mode 100755 (executable)
index 0000000..e9c45b3
--- /dev/null
@@ -0,0 +1,63 @@
+<!--#include virtual="../includes/header.html"-->
+
+<title>LibrePlanet &mdash; Speakers </title>
+
+<!--#include virtual="../includes/banner.html"-->
+<!--#include virtual="../includes/sidebar.html"-->
+
+<h1>Program <small>Keynote Speakers</small></h1>
+
+<!--#include virtual="../includes/program-menu.html"-->
+<p>The program is still being filled in, so check back for updates. <a href="https://libreplanet.org/2015/program/speakers.html">See last year's full program</a>.</p>
+<div class="row speaker-bio">
+       <div class="col-md-3 col-sm-4 col-xs-5">
+               <img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/dkg.jpg" alt="[ Daniel Kahn Gillmor - Photo ]"/>
+       </div>
+       <div class="col-md-9 col-sm-8 col-xs-7">
+               <h3 id="dkg">Daniel Kahn Gillmor</h3>
+               <p>Daniel Kahn Gillmor is a technologist with the ACLU's Speech, Privacy and Technology Project, and a free software developer. He's a Free Software Foundation member, a member of Debian, a contributor to a wide range of free software projects, and a participant in protocol development standards organizations like the IETF, with an eye toward preserving and improving civil liberties and civil rights through our shared infrastructure. <span class="text-muted">Photo license: This work by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Daniel Kahn Gillmor</span> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution ShareAlike 4.0 International License</a>.</span></p>
+       </div>
+</div>
+
+<div class="row speaker-bio">
+       <div class="col-md-3 col-sm-4 col-xs-5">
+               <img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/snowden.jpg" alt="[ Edward Snowden - Photo ]"/>
+       </div>
+       <div class="col-md-9 col-sm-8 col-xs-7">
+               <h3 id="snowden">Edward Snowden</h3>
+               <p>Edward Snowden is a former intelligence officer who served the CIA, NSA, and DIA for nearly a decade as a subject matter expert on technology and cybersecurity. In 2013, he revealed the NSA was unconstitutionally seizing the private records of billions of individuals who had not been suspected of any wrongdoing, resulting in the largest debate about reforms to US surveillance policy since 1978. Today, he works on methods of enforcing human rights through the application and development of new technologies. He joined the board of Freedom of the Press Foundation in February 2014. <span class="text-muted">Photo license: <span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/StillImage" property="dct:title" rel="dct:type">Screenshot of a Citizen Four by Praxis Films.</span> by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Laura Poitras</span> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a></span>.</p>
+       </div>
+</div>
+
+<div class="row speaker-bio">
+       <div class="col-md-3 col-sm-4 col-xs-5">
+               <img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/stallman.jpg" alt="[ Richard Stallman - Photo ]"/>
+       </div>
+       <div class="col-md-9 col-sm-8 col-xs-7">
+               <h3 id="stallman">Richard Stallman</h3>
+               <p>Richard is a software developer and software freedom activist. In 1983 he announced the project to develop the <a href="https://gnu.org">GNU operating system</a>, a Unix-like operating system meant to be entirely free software, and has been the project's leader ever since. With that announcement Richard also launched the Free Software Movement. In October 1985 he started the Free Software Foundation.</p>
+
+               <p>Since the mid-1990s, Richard has spent most of his time in political advocacy for free software, and spreading the ethical ideas of the movement, as well as campaigning against both software patents and dangerous extension of copyright laws. Before that, Richard developed a number of widely used software components of GNU, including the original Emacs, the GNU Compiler Collection, the GNU symbolic debugger (gdb), GNU Emacs, and various other programs for the GNU operating system.</p>
+       </div>
+</div>
+
+<h1>Program <small>Session Speakers</small></h1>
+
+<!--
+<h2>Session speakers</h2>
+<div class="row speaker-bio">
+       <div class="col-md-2 col-sm-3 col-xs-4">
+               <img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/rms.jpg" alt="[ Placeholder speaker - Photo ]"/>
+       </div>
+       <div class="col-md-10 col-sm-9 col-xs-8">
+               <h3 id="zacchiroli">Placeholder Fun speaker!</h3>
+               <p>Lorem impsum what a great speaker.</p>
+       </div>
+</div>
+-->
+<!--#include virtual="../includes/footer.html"-->
+<!--#include virtual="../includes/common_js.html"-->
+<script type="text/javascript">
+$("#p-speakers").addClass("active").text("Speakers");
+</script>
+<!--#include virtual="../includes/close.html" -->