README.rst @@ -1,6 +1,6 @@ import datetime -from django import newforms as forms +from django import forms from models import Entry @@ -23,7 +23,7 @@ MONTH_CHOICES = ( this_year = datetime.date.today().year try: first_year = Entry.objects.all().order_by('date')[0].date.year -except KeyError: +except IndexError: first_year = this_year YEAR_CHOICES = [] for year in range(first_year, this_year+1): beancounter/forms.py @@ -1,4 +1,5 @@ from django.db import models +from django.contrib.localflavor.us.models import PhoneNumberField TYPE_CHOICES = ( ('INC', 'Income'), @@ -57,7 +58,7 @@ class AccountTransfer(models.Model): class Person(models.Model): name = models.CharField(max_length=100) contact = models.CharField(max_length=100,null=True,blank=True) - phone = models.PhoneNumberField(null=True,blank=True) + phone = PhoneNumberField(null=True,blank=True) website = models.URLField(null=True,blank=True) email = models.EmailField(null=True,blank=True) notes = models.CharField(max_length=100,null=True,blank=True) beancounter/models.py @@ -2,20 +2,21 @@ {% load i18n %} {% block stylesheet %}{% load adminmedia %}{% admin_media_prefix %}css/dashboard.css{% endblock %} + {% block coltype %}colMS{% endblock %} + {% block bodyclass %}dashboard{% endblock %} + {% block breadcrumbs %}{% endblock %} + {% block content %} <div id="content-main"> -{% load adminapplist %} - -{% get_admin_app_list as app_list %} {% if app_list %} {% for app in app_list %} <div class="module"> <table summary="{% blocktrans with app.name as name %}Models available in the {{ name }} application.{% endblocktrans %}"> - <caption>{% blocktrans with app.name as name %}{{ name }}{% endblocktrans %}</caption> + <caption><a href="{{ app.app_url }}" class="section">{% blocktrans with app.name as name %}{{ name }}{% endblocktrans %}</a></caption> {% for model in app.models %} <tr> {% if model.perms.change %} @@ -103,7 +104,7 @@ {% else %} <ul class="actionlist"> {% for entry in admin_log %} - <li class="{% if entry.is_addition %}addlink{% endif %}{% if entry.is_change %}changelink{% endif %}{% if entry.is_deletion %}deletelink{% endif %}">{% if not entry.is_deletion %}<a href="{{ entry.get_admin_url }}">{% endif %}{{ entry.object_repr|escape }}{% if not entry.is_deletion %}</a>{% endif %}<br /><span class="mini quiet">{% filter capfirst %}{% trans entry.content_type.name %}{% endfilter %}</span></li> + <li class="{% if entry.is_addition %}addlink{% endif %}{% if entry.is_change %}changelink{% endif %}{% if entry.is_deletion %}deletelink{% endif %}">{% if not entry.is_deletion %}<a href="{{ entry.get_admin_url }}">{% endif %}{{ entry.object_repr }}{% if not entry.is_deletion %}</a>{% endif %}<br /><span class="mini quiet">{% filter capfirst %}{% trans entry.content_type.name %}{% endfilter %}</span></li> {% endfor %} </ul> {% endif %} beancounter/templates/admin/index.html 0862983b014328388b72fbf5e1d0747d2600daf5 Peter Baumgartner pete@lincolnloop.com http://github.com/lincolnloop/django-beancounter/commit/b13309e1114595408aae42b9c4cd4e9184804a63 b13309e1114595408aae42b9c4cd4e9184804a63 2008-12-09T08:14:44-08:00 2008-12-09T08:14:44-08:00 Django 1.0 updates 99219ee5b0967b621dbeb46c9ea025714ea66892 Peter Baumgartner pete@lincolnloop.com