summaryrefslogtreecommitdiffstats
path: root/templates
Commit message (Collapse)AuthorAgeFilesLines
* [svn] Now that I've put the new css up, let's use it. Should have only stuff ↵substantialnoninfringinguser2009-05-131-1/+1
| | | | | | we actually use. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8238 by aaron @ 1/31/2009 9:20 PM
* [svn] Fix "if logged in" tag.substantialnoninfringinguser2009-05-132-9/+9
| | | | | Changed logbook template; no longer uses the redundant _next and _prev fields. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8234 by aaron @ 1/30/2009 4:53 AM
* [svn] yorkshire work with tunnel integrationsubstantialnoninfringinguser2009-05-136-16/+79
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8232 by julian @ 1/29/2009 11:40 PM
* [svn] Add user registration and user profiles.substantialnoninfringinguser2009-05-1312-8/+155
| | | | | | | | | Used modified versions of django-registration and django-profiles , both on bitbucket. The Person model is now set up as the profile for auth.User s. I set up a requestcontext so that settings is automatically passed to every template, no need to repeat ourselves in views. However, this needs to be refined: I will soon change it to only pass a subset of settings. E.G. we do not need to be passing the DB login and password! Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8231 by aaron @ 1/29/2009 11:02 PM
* [svn] cave maps to all logbook entry trips done theresubstantialnoninfringinguser2009-05-136-18/+55
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8228 by julian @ 1/24/2009 11:59 PM
* [svn] Template update to use wiki_to_html_shortsubstantialnoninfringinguser2009-05-132-5/+5
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8227 by julian @ 1/24/2009 7:40 PM
* [svn] I initial work at adding caveareas. (Descirprion of parts of caves)substantialnoninfringinguser2009-05-134-27/+42
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8226 by julian @ 1/24/2009 6:49 PM
* [svn] fix martins front page linkssubstantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8225 by julian @ 1/24/2009 6:36 PM
* [svn] made index of peoplesubstantialnoninfringinguser2009-05-135-44/+25
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8224 by julian @ 1/24/2009 6:26 PM
* [svn] Added links to front pagesubstantialnoninfringinguser2009-05-131-4/+9
| | | | | Add names for views in order to link from the main page Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8223 by julian @ 1/24/2009 3:11 PM
* [svn] merge the trip table to have surveys by datesubstantialnoninfringinguser2009-05-133-33/+62
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8221 by julian @ 1/24/2009 2:01 PM
* [svn] calendar.html used django 1.1 {% empty %} syntax, but older version on ↵substantialnoninfringinguser2009-05-132-5/+5
| | | | | | server so I had to change it Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8210 by aaron @ 1/20/2009 5:36 AM
* [svn] fix linkssubstantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8209 by aaron @ 1/20/2009 5:16 AM
* [svn] wrong comment syntaxsubstantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8208 by aaron @ 1/19/2009 10:08 PM
* [svn] Allow viewing of more than one survey stage at once. Also, make images ↵substantialnoninfringinguser2009-05-132-23/+47
| | | | | | float nicely but not escape content div. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8207 by aaron @ 1/19/2009 7:30 PM
* [svn] Fixed up calendar with estimated dates from logbook.substantialnoninfringinguser2009-05-131-9/+10
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8202 by aaron @ 1/19/2009 8:28 AM
* [svn] Survey table improvements, added calendar to urlssubstantialnoninfringinguser2009-05-132-36/+52
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8201 by aaron @ 1/19/2009 7:19 AM
* [svn] survey block objectsubstantialnoninfringinguser2009-05-136-8/+71
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8199 by julian @ 1/19/2009 12:22 AM
* [svn] new person expeditionsubstantialnoninfringinguser2009-05-133-4/+50
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8189 by julian @ 1/18/2009 7:50 PM
* [svn] Julian playing with the logbooks and expoyearssubstantialnoninfringinguser2009-05-135-53/+145
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8180 by julian @ 1/18/2009 3:59 PM
* [svn]substantialnoninfringinguser2009-05-131-24/+25
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8175 by aaron @ 1/18/2009 4:42 AM
* [svn] Beginnings of expo calendarsubstantialnoninfringinguser2009-05-131-0/+61
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8174 by aaron @ 1/18/2009 1:15 AM
* [svn] julian's quick makework and index pagesubstantialnoninfringinguser2009-05-133-15/+25
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8169 by julian @ 1/17/2009 7:46 PM
* [svn] Fix double / errorsubstantialnoninfringinguser2009-05-131-2/+2
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8167 by aaron @ 1/17/2009 8:11 AM
* [svn]substantialnoninfringinguser2009-05-131-0/+12
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8166 by aaron @ 1/17/2009 7:52 AM
* [svn] Got rid of ugly old design; brought in ugly new design. This one works ↵substantialnoninfringinguser2009-05-132-331/+132
| | | | | | a little better, still needs a lot of work. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8164 by aaron @ 1/17/2009 7:11 AM
* [svn] More work on survey images parser and virtual survey binder. Renamed ↵substantialnoninfringinguser2009-05-131-12/+108
| | | | | | expedition_year field of Survey model to expedition because this makes more sense. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8163 by aaron @ 1/16/2009 7:50 PM
* [svn]substantialnoninfringinguser2009-05-131-7/+9
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8157 by aaron @ 1/16/2009 2:19 AM
* [svn] Added some actual funtionality to virtual survey binder.substantialnoninfringinguser2009-05-131-90/+131
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8155 by aaron @ 1/15/2009 11:21 PM
* [svn] Forgot this in the last checkout. It's the template for the virtual ↵substantialnoninfringinguser2009-05-131-0/+213
| | | | | | survey binder. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8153 by aaron @ 1/15/2009 6:25 AM
* [svn] Add beginnings of virtual survey binder: new Survey and ScannedImage ↵substantialnoninfringinguser2009-05-131-0/+16
| | | | | | models, survey parser. Still has lots of problems, but I need some help with the file upload aspect so am committing now. Biggest problem is trying to call save() on the images from the API. It needs arguments that I don't understand. Also, the # in our survey paths was causing trouble. I worked around this with a correctURL method which urlencodes the actual URL, but admin still tries to use a URL with a # in it. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8152 by aaron @ 1/15/2009 6:22 AM
* [svn] QM parser now parses Hauchhoehle QMs.pysubstantialnoninfringinguser2009-05-132-55/+48
| | | | | | | | | Photo model added. Logbook parser now puts mugshots in as photo models, and descriptions from the old folk html pages in as "blurbs" on the person model. Experimented with eye candy and a random logbook quote generator. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8094 by aaron @ 12/31/2008 2:59 AM
* [svn] Forgot to add cave and logbook search templates in earlier commit.substantialnoninfringinguser2009-05-132-0/+44
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8084 by aaron @ 12/9/2008 1:31 AM
* [svn] Added cave and logbook search, collapsible footer navbar, useless ↵substantialnoninfringinguser2009-05-133-3/+67
| | | | | | statistics page. Also fixed broken css. Toying with forms but not committing those yet. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8081 by aaron @ 12/8/2008 4:28 AM
* [svn] Replace "django" with "troggle" in adminsubstantialnoninfringinguser2009-05-131-0/+10
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8080 by aaron @ 12/7/2008 10:18 PM
* [svn] wiki_to_html changed to wiki_to_html_shortsubstantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8062 by julian @ 11/6/2008 11:25 PM
* [svn] Wiki_markup imporved to include paragraphssubstantialnoninfringinguser2009-05-134-12/+13
| | | | | | wiki_to_html should be used when the field will include paragraphs wiki_to_html_short should be used when the field will not include paragraphs Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8061 by julian @ 11/6/2008 11:24 PM
* [svn] forgottensubstantialnoninfringinguser2009-05-131-0/+26
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8046 by julian @ 10/31/2008 1:58 PM
* [svn] make the person logbooks worksubstantialnoninfringinguser2009-05-132-2/+4
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8044 by julian @ 10/30/2008 1:13 PM
* [svn] add personindex templatessubstantialnoninfringinguser2009-05-132-0/+50
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8038 by julian @ 10/27/2008 12:36 AM
* [svn] Initial troggle checkinsubstantialnoninfringinguser2009-05-135-0/+197
This is a development site using Django 1.0 Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8034 by julian @ 10/26/2008 9:04 PM