Commits

Anonymous committed 07c0abc

Added events and links into the project removed template from base

Comments (0)

Files changed (4)

caktus_django_template/base/templates/base.html

-{% load treenav_tags %}{% load analytics %}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-	<meta name='verify-v1' content='lDuJSxFGjLeE9nsfGwVwVIJitVZxe6mOzMZ05j/mV4s=' />
-	<meta name="description" content="{% spaceless %}{% block description %}Caktus Consulting Group builds custom, Django-based web applications for clients in the Raleigh, Durham and Chapel Hill (Triangle) area and beyond.{% endblock %}{% endspaceless %}" />
-	<meta name="author" content='Caktus Consulting Group, LLC' />
-	<title>{% block title %}{% endblock %} | Django Web Development | Raleigh Durham Chapel Hill | Caktus Consulting Group</title>
-
-	<link rel='stylesheet' charset='UTF-8' type='text/css' media='screen' href='{{ MEDIA_URL }}style/main.css?1' />
-	
-    <link rel="stylesheet" charset='UTF-8' type='text/css' href="{{ MEDIA_URL }}css/pagelets.css" />
-    <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-1.2.6.min.js"></script>
-    <script type="text/javascript" src="{{ MEDIA_URL }}wymeditor/jquery.wymeditor.min.js"></script>
-
-	<script type="text/javascript" src="{{ MEDIA_URL }}js/pagelets.js"></script>
-	{% block js %}{% endblock %}
-	{% block css %}{% endblock %}
-	
-	<link rel='icon' href='{{ MEDIA_URL }}images/favicon.png' />
-</head>
-<body class='caktus {% block body-class %}{% endblock %}'>
-<div id="page-wrapper">{# /everything/ but footer goes inside page-wrapper #}
-
-<div id="title">
-
-	<div id='logo'>
-		<a href='{% url home %}'><img src="{{ MEDIA_URL }}images/caktus-web-logo.png" alt="Caktus Logo" /></a>
-	</div>
-	
-	<div id="utils">
-		<!--form action="#" method="GET">
-			<input type="text" size="20" name="q" value="Search" /> <input type="submit" value="Search" /> <br/>
-		</form-->
-		<a href="{% url contact_form %}"><span id="contact">Contact Us</span></a>
-	</div>
-
-	<div id="navigation">
-		{% block navigation %}
-            {% single_level_menu 'primary-nav' 0 %}
-		{% endblock %}
-	</div>
-
-	<div id="sub-navigation">
-		{% block subnavigation %}
-		    {% single_level_menu 'primary-nav' 1 %}
-		{% endblock %}
-	</div>
-</div>
-
-<div id="content">
-	<div id="left-column"></div>
-	<div id="right-column"></div>
-	<div id="center-column">
-		{% block center_column %}{% endblock %}
-		{% block content %}{% endblock %}
-	</div>
-	<div id="cleaner" > </div>
-</div>
-</div>
-<div id="footer">
-	<div id='caktus-info'>
-		<ul >
-			<li id='who-we-are'>
-				<h2>Who We Are</h2>
-				<p><strong>Caktus Consulting Group</strong> is a team of highly talented and creative web designers and developers based in the Raleigh-Durham-Chapel Hill area of North Carolina.</p>
-				<p>&rarr; <a href="{% url view_page 'about' %}">About Us</a></p>
-			</li>
-			<li id='our-clients'>
-				<h2>Our Clients</h2>
-				<p>Caktus' clients range from individuals to non-profits and corporations in the broader Raleigh-Durham-Chapel Hill region and beyond.</p>
-				<p>&rarr; <a href="{% url portfolio %}">Our Portfolio</a></p>
-			</li>
-			<li id='what-we-do'>
-				<h2>What We Do</h2>
-				<p><strong>Caktus Consulting Group</strong> builds custom web applications with <a href="http://www.djangoproject.com/">Django</a>.  Our web apps feature <strong>elegant, dynamic user interfaces</strong> and a <strong>rock solid database backend</strong>.</p>
-				<p>&rarr; <a href="{% url view_page 'services' %}">Read More...</a></p>
-			</li>
-			<li id='how-to-reach-us'>
-				<h2>How to Reach Us</h2>
-				<p><strong>Mailing address:</strong><br/>
-				P.O. Box 1454<br/>
-				Carrboro, NC 27510</p>
-				<p><strong>Telephone:</strong><br/>
-				919/951-0052</p>
-				<p>&rarr; <a href="{% url contact_form %}">Contact Us</a></p>
-
-			</li>
-		</ul>
-	</div>
-	<div id="copyright">&copy; 2007-{{ now|date:"Y" }} <a href="http://www.caktusgroup.com/">Caktus Consulting Group, LLC</a>. All rights reserved.</div>
-	<div id='badges'>
-		{# <a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10-blue" alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a> #}
-		{# <a href="http://jigsaw.w3.org/css-validator/"><img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" /></a> #}
-		<a href="http://www.djangoproject.com/"><img src="http://media.djangoproject.com/img/badges/djangomade124x25.gif" alt="Made with Django." title="Made with Django." /></a>
-	</div>
-</div>
-{% analytics %}
-</body>
-</html>

caktus_django_template/features/requirements/apps.txt

 -e svn+http://django-crumbs.googlecode.com/svn/trunk@5#egg=django-crumbs
 -e git://github.com/clintecker/django-google-analytics.git#egg=django-google-analytics
 -e hg+http://bitbucket.org/glassresistor/django-sponsors#egg=django-sponsors
+-e hg+http://bitbucket.org/copelco/django-basic-events#egg=django-basic-events
+-e hg+http://bitbucket.org/glassresistor/django-basic-links#egg=django-basic-links
+-e svn+http://django-tagging.googlecode.com/svn/trunk#egg=django-tagging

caktus_django_template/features/settings.py

     'google_analytics',
     'sponsors',
     'sorl.thumbnail',
+    'tagging',
+    'links',
+    'events',
 ]

caktus_django_template/features/urls.py

     (r'^%streenav/' % settings.URL_PREFIX, include('treenav.urls.admin')),
     (r'^%srobots.txt$' % settings.URL_PREFIX, include('robots.urls')),
     (r'^%ssponsors/' % settings.URL_PREFIX, include('sponsors.urls')),
+    (r'^%sevents/' % settings.URL_PREFIX, include('events.urls')),
+    (r'^%slinks/' % settings.URL_PREFIX, include('links.urls')),
 )