From 12268ed42f103123ee317a3ef83ded8d2cb46ff7 Mon Sep 17 00:00:00 2001 From: Zak Rogoff Date: Thu, 2 Feb 2017 11:23:38 -0500 Subject: [PATCH] Adding sponsorship/exhibitor prospectus to the sidebar and improving README a little. --- 2017/README.md | 12 +++++++----- 2017/includes/nav-list-2.html | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/2017/README.md b/2017/README.md index f3701d95..64c030a8 100644 --- a/2017/README.md +++ b/2017/README.md @@ -9,19 +9,19 @@ The actual LIVE site, visible at libreplanet.org/YEAR, is served from the "stabl 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. +* Check out the master branch and make sure it is up to date with origin/master by doing: * git checkout master * git pull -* If 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. +* 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.) * 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. +* If you are working on your own branch created for your edit, merge, your branch into master by doing: * git checkout master * git merge BRANCHNAME -* Push master +* Push master by doing: * git push * Review the edited version of the site at http://wiki-dev0.libreplanet.org/YEAR. You can share this with others. -* When you are satisfied, merge master into stable and then push stable. +* When you are satisfied, merge master into stable and then push stable by doing: * git checkout stable * git merge master * git push @@ -29,6 +29,8 @@ Full workflow to make, test and deploy an edit ##### SECTION 2: EDITING INSTRUCTIONS ##### +To change content on existing pages, simply use your favorite text editor. + This site is built with [Bootstrap 3.3.5](https://github.com/twbs/bootstrap/releases/download/v3.3.5/bootstrap-3.3.5-dist.zip) and [jQuery 1.11.1](http://code.jquery.com/jquery-1.11.3.js) but you do not need to understand either of these technologies to make minor content edits to the site. Creating a New Page diff --git a/2017/includes/nav-list-2.html b/2017/includes/nav-list-2.html index d6c92b84..01de63a9 100644 --- a/2017/includes/nav-list-2.html +++ b/2017/includes/nav-list-2.html @@ -1,5 +1,6 @@ +
  • Sponsorship & Exhibit Hall
  • Build the scholarship fund
  • Safe Space Policy
    • -- 2.25.1