Permalink
Browse files

Changed .gitignore.

  • Loading branch information...
1 parent d55c256 commit c7c00e6dd9df0e03d580fb2d97da6dc6b6860ad4 @peterarnott committed Nov 5, 2012
Showing with 2 additions and 168 deletions.
  1. +2 −1 .gitignore
  2. +0 −5 CompuClub_Site/views.py~
  3. +0 −12 accounts/views.py~
  4. +0 −150 templates/main/base.html~
View
@@ -1,3 +1,4 @@
*.pyc
*.pyc~
-*.py~
+*.py~
+*~
View
@@ -1,5 +0,0 @@
-from django.shortcuts import get_object_or_404, render_to_response, redirect
-from django.template import Context, loader, RequestContext
-
-def home(request):
- return render_to_response('main/index.html', context_instance=RequestContext(request))
View
@@ -1,12 +0,0 @@
-from fixtures.models import *
-from django.shortcuts import get_object_or_404, render_to_response, redirect
-from django.template import Context, loader, RequestContext
-from django.contrib.auth.decorators import login_required
-
-def logout(request):
- logout(request)
- return render_to_response('ccounts/loggedout.html')
-
-# Register
-
-# Login is not needed!
View
@@ -1,150 +0,0 @@
-<!DOCTYPE html>
-<!-- Made by members of the SGS Computer Club. Based on Bootstrap by Twitter. Adapted (and misspelt) by peter. -->
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Computer Club</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <!-- Le styles -->
- <link href="http://twitter.github.com/bootstrap/assets/css/bootstrap.css" rel="stylesheet">
-
- <style>
- body {
- padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
- }
- </style>
- <link href="http://twitter.github.com/bootstrap/assets/css/bootstrap-responsive.css" rel="stylesheet">
- <link href="http://dl.dropbox.com/u/22128770/docs.css" rel="stylesheet">
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
- </head>
-
- <body>
-
- <div class="navbar navbar-inverse navbar-fixed-top">
- <div class="navbar-inner">
- <div class="container">
- <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </a>
- <a href="" class="brand">ComputerClub</a>
-
- {% if user %}
- <div class="btn-group pull-right">
- <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
- <i class="icon-user"></i> {{ user.get_full_name }}
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu">
- <li><a href="../accounts/logout">Sign Out</a></li>
- </ul>
- </div>
- {% else %}
- <p class="navbar-text pull-right">
- Please <a href="../accounts/login/" class="navbar-link">Log In</a>
- </p>
- {% endif %}
-
- <div class="nav-collapse collapse">
- <ul class="nav">
- <li class="active"><a href="">Home</a></li>
- <li><a href="fixtures/">Fixtures</a></li>
- </ul>
- </div><!--/.nav-collapse -->
- </div>
- </div>
- </div>
-
- <div class="jumbotron masthead">
- <div class="container">
- <h1>Computer Club</h1>
- <p>Confusing teachers since 2012</p>
- <ul class="masthead-links">
- <li><a href="http://github.com/pocon/Computer-Club">GitHub</a></li>
- <li><a href="http://sydgram.nsw.edu.au/">SGS</a></li>
- <li>Always Open Source</li>
- </ul>
- </div>
-</div>
-<div class="bs-docs-social">
- <div class="container">
- <ul class="bs-docs-social-buttons">
- <li>
- <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=pocon&repo=Computer-Club&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
- </li>
- <li>
- <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=pocon&repo=Computer-Club&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="98px" height="20px"></iframe>
- </li>
- </ul>
- </div>
-</div>
-
-<div class="container">
-
-<!-- REMBER: Pass messages (from django.contrib import messages) to the response! -->
-{% if messages %}
-<p></p>
-{% for message in messages %}
-<div class="alert{% if message.tags %} alert-{{ message.tags }}{% endif %}">
- <button type="button" class="close" data-dismiss="alert">x</button>
- <strong>{{ message.tags }}</strong> {{ message }}
-</div>
-{% endfor %}
-{% endif %}
-
- <div class="marketing">
-
- <h1>Our Projects</h1>
- <p class="marketing-byline">From The Club Members</p>
-
- <div class="row-fluid">
- <div class="span6">
- <h2>Tutorials</h2>
- <p>The python tutorials are written by senior members of the club and are availiable for anyone to use. They include lessons, challenges, exersises and solutions.</p>
- </div>
- <div class="span6">
- <h2>Fixtures</h2>
- <p>The fixtures app is the first major project of the club. It sends notifications when sporting fixtures are posted online and alerts you if they are updated.</p>
- </div>
- </div>
-
- </div>
-
-</div>
-
- <!-- Footer
- ================================================== -->
- <footer class="footer">
- <div class="container">
- <p class="pull-right"><a href="#">Back to top</a></p>
- <p>Site made with <a href="http://twitter.com/" target="_blank">Bootstrap by Twitter</a>.</p>
- <p>Design by Peter.</p>
- </div>
- </footer>
-
- <!-- Le javascript
- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
- <script src="http://twitter.github.com/bootstrap/assets/js/jquery.js"></script>
- <script src="http://twitter.github.com/bootstrap/assets/js/bootstrap-transition.js"></script>
- <script src="http://twitter.github.com/bootstrap/assets/js/bootstrap-alert.js"></script>
- <script src="http://twitter.github.com/bootstrap/assets/js/bootstrap-modal.js"></script>
- <script src="http://twitter.github.com/bootstrap/assets/js/bootstrap-dropdown.js"></script>
- <script src="http://twitter.github.com/bootstrap/assets/js/bootstrap-scrollspy.js"></script>
- <script src="http://twitter.github.com/bootstrap/assets/js/bootstrap-tab.js"></script>
- <script src="http://twitter.github.com/bootstrap/assets/js/bootstrap-tooltip.js"></script>
- <script src="http://twitter.github.com/bootstrap/assets/js/bootstrap-popover.js"></script>
- <script src="http://twitter.github.com/bootstrap/assets/js/bootstrap-button.js"></script>
- <script src="http://twitter.github.com/bootstrap/assets/js/bootstrap-collapse.js"></script>
- <script src="http://twitter.github.com/bootstrap/assets/js/bootstrap-carousel.js"></script>
- <script src="http://twitter.github.com/bootstrap/assets/js/bootstrap-typeahead.js"></script>
-
- </body>
-</html>

0 comments on commit c7c00e6

Please sign in to comment.