From: Zak Rogoff Date: Thu, 2 Feb 2017 17:14:25 +0000 (-0500) Subject: Adding sponsorship page and improving readme. X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=79263a679ee870b112f251f362777c4c6a86e9df;p=libreplanet-static.git Adding sponsorship page and improving readme. --- diff --git a/2017/README.md b/2017/README.md index 64c030a8..3c88b0fb 100644 --- a/2017/README.md +++ b/2017/README.md @@ -6,14 +6,14 @@ Heads up: to edit the Web site, you'll need a basic-to-intermediate understandin The actual LIVE site, visible at libreplanet.org/YEAR, is served from the "stable" branch of the git repository using a git hook. There is also a development branch called "master" which we use to preview edits on the Web. The master branch is served to the Web at http://wiki-dev0.libreplanet.org/YEAR and publicly visible, but not linked to. -Full workflow to make, test and deploy an edit +Full workflow to make, test and deploy an edit. ----------------- * Check out the master branch and make sure it is up to date with origin/master by doing: * git checkout master * git pull * Is this a large edit or a small edit? If it is small, edit, work in master. If this is a large edit that will take longer than a day, make a new branch based on the master branch and work there. -* Make your edits. (See instructions for editing content below.) +* Make your edits. (See site structure and instructions for editing content below.) * Optionally, test them on your computer with a local development environment. (See instructions below for setting up your development environment). * If you are working on your own branch created for your edit, merge, your branch into master by doing: * git checkout master @@ -27,7 +27,11 @@ Full workflow to make, test and deploy an edit * git push * Your edits are now live and visible at libreplanet.org/YEAR -##### SECTION 2: EDITING INSTRUCTIONS ##### +##### SECTION 2: SITE STRUCTURE ##### + +The site is made up of HTML files, each representing part of a page (sidebar, content, footer, etc.). When a browser visits the site, the server finds the core HTML file for the page (for example, the core file for https://www.libreplanet.org/YEAR/getting-around is /YEAR/getting-around/index.html in the repo), then reads special comments in that file to which instruct it to pull various other HTML files in to produce a complete page, using an Apache feature called SSI. To edit part of a page, you will need to find out which HTML file contains the element in question. Do this by navigating to core HTML file and exploring the comments that start with "#include". + +##### SECTION 3: EDITING INSTRUCTIONS ##### To change content on existing pages, simply use your favorite text editor. @@ -96,7 +100,7 @@ Include `join-list.html` -##### SECTION 3: SETTING UP A LOCAL DEVELOPMENT ENVIRONMENT ##### +##### SECTION 4: SETTING UP A LOCAL DEVELOPMENT ENVIRONMENT ##### Apache is required in order to replicate the appearance of the website on the live and staging servers on your machine. If you don't want to diff --git a/2017/includes/nav-list-2.html b/2017/includes/nav-list-2.html index 9a3c44bd..d0b894b1 100644 --- a/2017/includes/nav-list-2.html +++ b/2017/includes/nav-list-2.html @@ -1,6 +1,6 @@ -
  • Sponsorship & exhibit hall
    • +
  • Sponsorship & exhibit hall
  • Build the scholarship fund
  • Safe Space Policy
    • diff --git a/2017/sponsors/index.html b/2017/sponsors/index.html new file mode 100755 index 00000000..300c5143 --- /dev/null +++ b/2017/sponsors/index.html @@ -0,0 +1,33 @@ + + +LibrePlanet Sponsorship + + + + +

    Sponsorship and Exhibit Hall

    + +

    We are currently accepting sponsors and exhibitors for LibrePlanet 2017. Your sponsorship will help sustain, energize, and inspire the free software community. +Sponsoring provides you the unique opportunity to engage hundreds of legal and policy +experts, developers, students, activists, and free software and technology enthusiasts +with your brand, message, and organization.

    + +

    Please contact Georgia Young at campaigns@fs.org or 617-542-5942 with questions. All sponsorship materials must be delivered to the FSF by March 5th in order to be included in the program.

    + +

    Please refer to our sponsorship prospectus PDF for more information:

    + + + + + + + + + + +