Merge branch 'master' of https://projects.sucs.org/sucssite/sucs-site

Fix a typo that makes it inherit an earlier error state and produce
erroneous error reports

.gitignore

+# Some of the files that are generated by the setup script don't want to be version controlled.
+# To that end I have added this .gitignore file to ignore the following files and folders
+
+# This is the generated .htaccess
+htdocs/.htaccess
+
+# Generated settings.php file
+settings.php
+
+# Compiled templates_c
+templates_c/
+
+# Password file for the su-api thing
+suapi.inc.php
+
+# lastsnap.jpg from cam
+htdocs/images/lastsnap.jpg
\ No newline at end of file

.gitmodules

+[submodule "htdocs/js/ckeditor"]
+	path = htdocs/js/ckeditor
+	url = git://github.com/ckeditor/ckeditor-releases.git

README

-What's in these 'ere folders:
-
-components/
-	PHP components of the site, each drives a separate element - e.g.
-	static content, the library, the help system, etc.
-htdocs/
-	Where all served content is to be found:
-	css/
-		Cascading StyleSheets
-	files/
-		Files for download (e.g. Help examples)
-	images/
-		Images used by the site skin
-	js/
-		JavaScript
-		tinymce/
-			Placeholder dir for TinyMCE, which should not itself
-			be stored in SVN
-	pictures/
-		Images used in the content (e.g. /Help)
-lib/
-	Custom libraries used by the site - e.g. session library
-plugins/
-	Custom Smarty plugins used by the site - e.g. banana drawing
-	function
-static/
-	Static content for the static content components (includes help)
-	fragments/
-		Any HTML fragments used to make up parts of pages (e.g.
-		secondary bars)
-templates/
-	Smarty templates
-templates_c/
-	Compiled Smarty templates - do not use this dir

README.md

+# SUCS Site
+---
+## Project Structure
+<br>
+
+| Directory | Description |
+| --------- | ----------- |
+| components | PHP components of the site, each drives a separate element - e.g. static content, the library, the help system, etc. |
+| htdocs/css | Cascading StyleSheets |
+| htdocs/files | Files for download (e.g. Help examples) |
+| htdocs/images | Images used by the site skin |
+| htdocs/js | JavaScript |
+| htdocs/js/tinymce | Placeholder dir for TinyMCE, which should not itself be stored in SVN |
+| htdocs/pictures | Images used in the content (e.g. /Help) |
+| lib | Custom libraries used by the site - e.g. session library |
+| plugins | Custom Smarty plugins used by the site - e.g. banana drawing function |
+| static | Static content for the static content components (includes help) |
+| static/fragments | Any HTML fragments used to make up parts of pages (e.g. secondary bars) |
+| templates | Smarty templates |
+| templates_c | Compiled Smarty templates - do not use this dir |
\ No newline at end of file

ckeditor @ a93cb51e

+Subproject commit a93cb51eb1fc85a13892706dd61eccfd4c999947

static/Community.txt

@@ -6,7 +6,7 @@ Community</h3>
 <dt><a href="Community/Talks">SUCS Lightning Talks</a></dt>
 <dd>A great way to share things you are passionate about with fellow members. We've had 3 Lightning Talks so far in the past 2 years and each of them have been very well received.  Footage of the talks can also be found in this section.</dd>
 <dt><a href="Community/Projects">SUCS Projects</a></dt>
-<dd>SUCS hosts a number of open source coding projects and offers its members Git & Subversion repositories and Gitlab Projects & Trac wiki/ticket trackers to manage their projects. The projects page lists a number of projects which SUCS members are currently working on, and which you can get involved with.</dd>
+<dd>SUCS hosts a number of open source coding projects and offers its members Git & Subversion repositories. To enhance these repositories we also provide Gitlab Projects & the Trac wiki/ticket tracking system to assist in the management of projects. The projects page lists a number of projects which SUCS members are currently working on, and which you can get involved with.</dd>
 <dt>Socials</dt>
 <dd>We regularly meet in JCs every Wednesday at 1PM and most Fridays at 7PM. It's a great chance to get to know everyone and have a chat with people. </dd>
 </dl>