Revert "Revert "Switch from quitter to status""
[libreplanet-static.git] / 2019 / README.md
CommitLineData
d4eb563b 1README version for LibrePlanet 2019
2
3Heads up: to edit the Web site, you'll need a basic-to-intermediate understanding of HTML, git, and command line.
4
5# SECTION 1: DEVELOPMENT WORKFLOW
6
bd20bf45 7The 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 **used to** be served to the Web at http://wiki-dev0.libreplanet.org/YEAR and publicly visible, but not linked to.
d4eb563b 8
9Full workflow to make, test and deploy an edit.
10-----------------
11
12* Check out the master branch and make sure it is up to date with origin/master by doing:
13 * git checkout master
14 * git pull
15* 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.
16* Make your edits. (See site structure and instructions for editing content below.)
17* Optionally, test them on your computer with a local development environment. (See instructions below for setting up your development environment).
18* If you are working on your own branch created for your edit, merge, your branch into master by doing:
19 * git checkout master
20 * git merge BRANCHNAME
21* Push master by doing:
22 * git push
23* Review the edited version of the site at http://wiki-dev0.libreplanet.org/YEAR. You can share this with others.
24* When you are satisfied, merge master into stable and then push stable by doing:
25 * git checkout stable
26 * git merge master
27 * git push
28* Your edits are now live and visible at libreplanet.org/YEAR
29
30# SECTION 2: SITE STRUCTURE
31
32The 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".
33
34The bios page and the sessions page are maintained through a special workflow to make it easy to have only one canonical copy edited by humans. That canonical copy is saved in brains (the FSF's internal wiki) in a special format. To update the sites' sessions page or bios page, you will need the lps_gen program installed on your computer (<https://ricketyspace.net/lpschedule-generator/>), as well as a local checkout of the SVN repository that contains brains.
35
36This 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.
37
38# SECTION 3: EDITING INSTRUCTIONS
39
40To change content on existing pages, use your favorite text editor.
41
42Here are specific instructions for more complex editing tasks:
43
44## Editing the schedule or bios pages
45
46The workflow for this is Edit the Brains page with the schedule, then run a script to convert it into HTML and dump it into your checkout of the repo, then push that change up to the Web like any other edit.
47
48See instructions at <https://ricketyspace.net/lpschedule-generator> for installing and running the script. The source files are stored in Brains in markdown but with special tags, so that you can edit them without needing to know this whole process. The jinja2 templates are stored in the the Web site's git repo at assets/templates.
49
50Please crop all photos of speakers too 100x100 px (200x200 px for keynotes) and then upload them to <http://static.fsf.org/nosvn/libreplanet/speaker-pics/>. Then include their URL in the bios page to embed them.
51
52## Creating a New Page
53
54*Boilerplate*
55
56Add the following to your new page (it should remain commented out, as that is the syntax for SSI):
57
58```
59<!--#include virtual="/2019/includes/header.html"-->
60<!--#include virtual="/2019/includes/banner.html"-->
61<!--#include virtual="/2019/includes/sidebar.html"-->
62<!--#include virtual="/2019/includes/footer.html"-->
63<!--#include virtual="/2019/includes/close.html"-->
64```
65
66This will include the header, banner, sidebar, footer and closing tags
67saving you from duplicating HTML.
68
69If JS is needed for a page, then create a file, containing the JS
70includes, in `/2019/includes/` & use SSI to include it in the page.
71
72Use `/2019/includes/boilerplate.html` to start a new page.
73
74*Add Your Markup*
75
76Add HTML markup in-between the sidebar and footer includes.
77
78*Enable SSI*
79
80Files that contain include directives must be marked as executable
81otherwise Apache will not parse them. (The directive `XBitHack on` in the .conf file pasted above enables this behavior).
82
83To mark a file as executable, run:
84
85```
86chmod +x foo.html
87```
88
89Replace `foo.html` with the desired file name.
90
91## Modifying top-right corner
92
93In the `/2019/includes/banner.html` find the `...#top-right-desktop
94start...` section.
95
96*For register now*
97
98Include `register-now.html`
99
100 <!-- #top-right-desktop start -->
101 <!--#include virtual="/2019/includes/register-now.html"-->
102 <!-- #top-right-desktop end -->
103
104*For join LP list form*
105
106Include `join-list.html`
107
108 <!-- #top-right-desktop start -->
109 <!--#include virtual="/2019/includes/join-list.html"-->
110 <!-- #top-right-desktop end -->
111
112
113# SECTION 4: SETTING UP A LOCAL DEVELOPMENT ENVIRONMENT
114
115Apache is required in order to replicate the appearance of the website
116on the live and staging servers on your machine. If you don't want to
117install Apache, you can still work on the site, you just won't be able
118to see what it looks like until you push to the remote.
119
120Modifying Apache's configuration files and running its executables
121typically requires root access. So, you will most likely need to run
122the commands below as the root user using `sudo`.
123
124*Enable server-side include module*
125
126```
127a2enmod include
70c8c514 128a2enmod rewrite
d4eb563b 129```
130
131If this doesn't work, you may not have Apache installed. Install the
132package apache2 from your package manager.
133
134*Create virtual host*
135
136Create a new file called libreplanet (libreplanet.conf for Apache 2.4) in `/etc/apache2/sites-available` with the following contents:
137
138```
139<VirtualHost *:80>
140RewriteEngine on
141 ServerName local-dev.libreplanet.org
142 ServerAdmin webmaster@localhost
143 DocumentRoot /local-path/path-to-site
144 <Directory /local-path/path-to-site/>
145 Options Indexes FollowSymLinks MultiViews
146 AllowOverride All
147 Require all granted
148 Order deny,allow
149 deny from none
150 allow from all
151 SSILegacyExprParser on
152 Options +Includes
153 XBitHack on
70c8c514 154G </Directory>
d4eb563b 155 ErrorLog /home/owner/libreplanet-static/logs/error.log
156 CustomLog /home/owner/libreplanet-static/access.log combined
157</VirtualHost>
158```
159
160Replace all instances of `/path/to/libreplanet-static` with the full path to the root directory of your local
161git repository.
162
163*Enable virtual host*
164
165```
166a2ensite your-virtual-host
d4eb563b 167```
168
169Replace `your-virtual-host` with the name of virtual host file you made (in this case, libreplanet).
170
171*Restart Apache*
172
173```
174service apache2 restart
d4eb563b 175```
176
177*Edit your hosts file*
178
179Edit your system's `/etc/hosts` file and add the following to the bottom:
180
181```
182127.0.0.1 lp2019.libreplanet.org
183```
184
185*Test*
186
187Visit <http://lp2019.libreplanet.org/2019> in your web browser. If
188everything is configured properly, you will see the LibrePlanet 2019
189site, complete with header, sidebar, and footer.
190
191# SECTION 5: TROUBLESHOOTING
192* I'm doing everything right, but the Web site isn't updating.
193
194Ask the tech team to look at the git hook that publishes to the live site. When you push to the git repository, this hook is supposed to update what is actually served on the Internet to match the repo.
195
196* The website isn't loading! What?
197
198It might be a permissions issue. Try cd / ls -lad to check permissions. If they are not right, chmod 711 . should fix it