diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..143a105d429393d3f39281a45dd8ba5c98154057 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +# 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 diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000000000000000000000000000000000..ed6b5606274d9e625e5b85be68364cc4147c3e88 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "htdocs/js/ckeditor"] + path = htdocs/js/ckeditor + url = git://github.com/ckeditor/ckeditor-releases.git diff --git a/README b/README deleted file mode 100644 index b0a72648fde3c2d1bb10614526dc4e8edaaf358a..0000000000000000000000000000000000000000 --- a/README +++ /dev/null @@ -1,34 +0,0 @@ -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 diff --git a/README.md b/README.md new file mode 100644 index 0000000000000000000000000000000000000000..b0524b90341d2de8e8715dc7ff6cba941d4f4267 --- /dev/null +++ b/README.md @@ -0,0 +1,20 @@ +# 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 diff --git a/htdocs/images/lastsnap.jpg b/htdocs/images/lastsnap.jpg deleted file mode 100644 index a65171498d3fd4547c93808c8d61fa2e94e04638..0000000000000000000000000000000000000000 Binary files a/htdocs/images/lastsnap.jpg and /dev/null differ diff --git a/htdocs/js/ckeditor b/htdocs/js/ckeditor new file mode 160000 index 0000000000000000000000000000000000000000..a93cb51eb1fc85a13892706dd61eccfd4c999947 --- /dev/null +++ b/htdocs/js/ckeditor @@ -0,0 +1 @@ +Subproject commit a93cb51eb1fc85a13892706dd61eccfd4c999947 diff --git a/static/Community.txt b/static/Community.txt index e28febf0c18d135abe4f1902d2d644bd648494fa..7058f06cdc5f980b6f044ce45201d8fa4e30f30b 100644 --- a/static/Community.txt +++ b/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>