Merge branch 'master' of https://github.com/londonhackspace/hackspace…

…-foundation-sites

README.md

@@ -6,19 +6,37 @@ We use Vagrant to deploy a consistent development environment. To get
 your development environment set up:
 
 * Clone this repo
-* Fetch libraries: `git submodule update --init`
-* Create config file (the defaults are fine): `cp etc/config.php.example etc/config.php`
-* Create production settings file (the defaults are fine): `cp lhs/production_settings.py.example lhs/production_settings.py`
+* Fetch libraries:
+```
+git submodule update --init
+```
+* Create config file (the defaults are fine):
+```
+cp etc/config.php.example etc/config.php
+```
+* Create production settings file (the defaults are fine):
+```
+cp lhs/production_settings.py.example lhs/production_settings.py
+```
 * Install [Vagrant](https://www.vagrantup.com/downloads.html) and [Virtualbox](https://www.virtualbox.org/)
-* Run `vagrant up` in this directory. This will create and configure a virtual machine.
+* To create and configure a virtual machine run in this directory
+```
+vagrant up
+``` 
 
 You should now be able to connect to http://localhost:8000 to view your
 development site. Changes you make on your machine will be reflected
 on the VM.
 
 If you need to log into the VM for any reason, you can just run
-`vagrant ssh`. To access the postgres database, run `psql
-hackspace` from the SSH shell.
+```
+vagrant ssh
+```
+
+To access the postgres database, run from the SSH shell 
+```
+psql hackspace
+``` 
 
 ## Making yourself an admin
 In the postgres shell:

london.hackspace.org.uk/menu.php

@@ -14,7 +14,7 @@
             <?=menulink('/donate.php', 'donate', 'Donate')?>
             <?if (isset($user) && $user->isMember()) {?>
                 <?=menulink('/members/members.php', 'memberslist', 'Members List')?>
-                <?=menulink('/members/webcams.php', 'webcams', 'Webcams')?>
+                <!-- <?=menulink('/members/webcams.php', 'webcams', 'Webcams')?> -->
                 <?=menulink('/storage/list.php', 'storagelist', 'Storage Requests')?>
                 <?=menulink('/members/minutes.php', 'minutes', 'Minutes')?>
             <? } ?>
@@ -26,7 +26,7 @@
                         <?=menulink('/members/cards.php', 'cards', 'Access Cards')?>
                         <?if (isset($user) && $user->isMember()) {?>
                         <?=menulink('/members/code.php', 'code', 'Car Park Code')?>
-                        <?=menulink('/members/tools.php', 'tools', 'Tools')?>
+                        <!-- <?=menulink('/members/tools.php', 'tools', 'Tools')?> -->
                         <?=menulink('/members/ldap.php', 'LDAP', 'Edit LDAP Account')?>
                         <? } ?>
                     </ul>