Merge pull request #8 from CO600GOL/develop

Pull Request for the most up-to-date code
Merge pull request #9 from CO600GOL/develop

Pull Request for the latest source code
Merge pull request #10 from CO600GOL/develop

Update
Removed obseleted variable
Added rotating loading animation

Added a rotating pattern animation to the loading modal
Project Conway Banner taken off template. Programmed by Michael.

The Project Conway Banner now only appears on the homepage. The problem
remains that the first rows of each page are covered by the fixed navbars.
(Feature #119)
Started working on adding an image to the navbar. Programmed by Michael.

I started working on adding an image to the top navbar. The img tag works within the navbar but comes up with the alt. Ongoing (Feature #119)
Added ProjectConway branding to the template. Programmed by Michael.

Instead of Menu, the branding on the navbar now says Project Conway - this is
partly so that the name of the project is always in sight, and partly because
it acts as a way of navigating the project site.
Home Page link replaced with branding link. Programmed by Michael.

Instead of having a link to the homepage on the navbar, I decided to make the
link to the homepage the navbar branding. This cleans up the UI slightly and
means the user can access the home page by clicking on the clearer Project
Conway instead of Home. (Feature #119)
Aesthetics almost completed. Programmed by Michael.

At this point, the only thing left to do is work out how to push the page
rows underneath the navbar at the top of the screen. (Feature #119).
Margin added to top of page so that first few lines are viewable. Programmed by Michael.

The first row of each page has been surrounded by a div class that adds a
percentage margin so that it is properly viewable. Also cleaned up each of
the .mako files so the rows are contained within the container div, better
olding the bootstrap grid system (Feature #119).
Clear button added. Programmed by Michael.

The Pattern input grid now has a clear button that clears the pattern from the
grid and the web session. Tests not yet written. (Feature #120).
Added test for new clear button view. Programmed by Michael.

An automated test for the clear button JSON view has been added and
passes. (Feature #120).
Fixed Github reviews. Programmed by Michael.

The calls to the Ajax Error alert have been moved to a centralised file, as
per the github reviews for this feature (Feature #120). Additionally, the test
on adding the input to the session has been removed from the test to remove the
input from the session.
Merge pull request #25 from leahcimNosliw/develop

Update to clear button code
Merge pull request #3 from CO600GOL/develop

Updating my develop
Merge branch 'develop' of github.com:richlanc/Game_of_life into develop
Erroneous container tags removed and pattern input grid made smaller. Programmed by Michael

There should now be three containers per page - one for each banner and one
for the rest of the page. Additionally, the pattern input grid has been made
smaller so that it fits on page without scrolling. However, the grid has not
yet been made responsive. (Feature #119)
Responsiveness bug fixed. Paired by Richard and Michael.

The responsiveness bug has been fixed by adding a padding to the top of the
body tag that is the same height as the fixed navbar. Code is need of review
at this point.
Fixed Conflicts. Please review.
Merge branch 'feature#119_Application_aesthetics' into develop

Conflicts:
	ProjectConway/projectconway/static/js/patternSubmission.js
	ProjectConway/projectconway/templates/pattern_input.mako