summaryrefslogtreecommitdiffstats
path: root/templates
Commit message (Collapse)AuthorAgeFilesLines
* [svn]substantialnoninfringinguser2009-05-193-30/+61
|
* [svn]substantialnoninfringinguser2009-05-181-1/+1
|
* [svn] Turn main menu into dropdown (well actually, drop up) menu.substantialnoninfringinguser2009-05-181-2/+28
|
* [svn] - Make control panel downloads (qm.csv for each cave, CAVETAB2.CSV) work.substantialnoninfringinguser2009-05-173-66/+54
| | | | - Fix problems in QM parsing script
* [svn] Make the workaround to avoid parsing interlaced pngs actually work ↵substantialnoninfringinguser2009-05-151-1/+1
| | | | (see issue # 14)
* [svn] Add: new generic object list template object_list.html, and ↵substantialnoninfringinguser2009-05-151-0/+15
| | | | convenience filter named "link" for making links from objects, and make expeditions list page using those two. Also, fixed survey parsing in databaseReset.py
* [svn] Forgot to upload with earlier commitsubstantialnoninfringinguser2009-05-142-7/+31
|
* [svn] Add link to google code issue trackersubstantialnoninfringinguser2009-05-131-0/+2
|
* [svn] Made the subcaves work! Now we just have to figure out how to parse ↵substantialnoninfringinguser2009-05-132-0/+104
| | | | | | them... Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8343 by cucc @ 5/11/2009 6:36 AM
* [svn] Dynamic thumbnail generation for photos and survey scans using ↵substantialnoninfringinguser2009-05-134-8/+8
| | | | | | imagekit, further improving registration system, other misc. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8336 by cucc @ 5/10/2009 11:05 PM
* [svn] Improve registration system.substantialnoninfringinguser2009-05-139-85/+36
| | | | | Add jquery fade effects and quick search. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8334 by cucc @ 5/10/2009 5:23 AM
* [svn]substantialnoninfringinguser2009-05-131-0/+40
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8333 by cucc @ 5/8/2009 8:20 PM
* [svn] Interface improvements. Code will need some cleaning up.substantialnoninfringinguser2009-05-134-25/+90
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8331 by cucc @ 5/8/2009 8:16 PM
* [svn] Weeks of local changes.substantialnoninfringinguser2009-05-137-41/+126
| | | | | | | | | | | - Import is now non-destructive - Parsers write output to a log file (path be specified in settings) - databaseReset.py content been divided into separate functions which can be called for varying levels of deletion and importing - control panel (view, template, urlpattern) added for deleting and importing - Logins and signup fixed - CaveArea model updated, view, hierarchical url patterns, and beginning of template added - New site style Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8324 by cucc @ 5/3/2009 5:56 AM
* [svn] Logbook entries are now at /YYYY-MM-DD/slug .substantialnoninfringinguser2009-05-131-0/+2
| | | | | Try editing a logbook entry title in the admin now. The django built in auto slug field is fun and javascripty. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8308 by aaron @ 3/16/2009 7:27 PM
* [svn] Added QM wiki markup. The format is [[cave:204 QM:2005-04A]] with the ↵substantialnoninfringinguser2009-05-134-40/+20
| | | | | | | grade (A) being optional. The links color red if the QM does not exist, and in that case clicking on them goes to an admin add page with fields prepopulated. Various other little things, e.g. filled in the footer with links. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8305 by aaron @ 3/16/2009 8:53 AM
* [svn]substantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8304 by aaron @ 3/15/2009 11:12 PM
* [svn] fix year linkssubstantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8303 by julian @ 3/15/2009 10:44 PM
* [svn] Reverted the reverts from 8267. Fixed the next / previous trip in ↵substantialnoninfringinguser2009-05-131-4/+4
| | | | | | | | personexpedition on the LogbookEntry template -- I had misunderstood what this was supposed to do last time I messed with it. This involved adding the methods PersonTrip.get_persons_next_trip and persons_previous_trip. Couldn't find any other broken things. Kept the productive changes in 8267: extending the logbook parsing back to 1993, changing index page, changes to view_surveys.py Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8274 by aaron @ 3/14/2009 8:38 AM
* [svn] Got QM pages working.substantialnoninfringinguser2009-05-132-1/+62
| | | | | Started scripts for exporting to old expo format. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8269 by aaron @ 3/12/2009 2:22 PM
* [svn] revert some of the changes (href element) so that the links worksubstantialnoninfringinguser2009-05-132-10/+14
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8267 by julian @ 3/11/2009 10:44 AM
* [svn] Added new abstract base class TroggleModel. Any fields or methods that ↵substantialnoninfringinguser2009-05-135-4/+6
| | | | | | | need to be added to multiple models should be added here. Added edit links to caves, people, logbook entries, and people. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8260 by aaron @ 2/26/2009 5:28 AM
* [svn] Fixing what I broke.substantialnoninfringinguser2009-05-131-2/+2
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8256 by aaron @ 2/23/2009 1:05 PM
* [svn]substantialnoninfringinguser2009-05-132-1/+5
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8255 by aaron @ 2/23/2009 4:16 AM
* [svn] Enable profile setup forms.substantialnoninfringinguser2009-05-135-2/+38
| | | | | | | Profiles are Person model instances, and are linked to django's built in User model by a one to one foreign key. We are using the django-registration and django-profiles pluggables. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8247 by aaron @ 2/18/2009 9:35 PM
* [svn] Photo file handling and mugshots parsing sorted.substantialnoninfringinguser2009-05-131-5/+17
| | | | | Made URL settings more relative, less redundant. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8246 by aaron @ 2/18/2009 6:45 AM
* [svn]substantialnoninfringinguser2009-05-131-1/+10
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8245 by aaron @ 2/17/2009 1:09 AM
* [svn] My crusade to make our project more Djangoic.substantialnoninfringinguser2009-05-139-81/+97
| | | | | | | | | Got rid of the url tags in template, replaced them with get_absolute_url method calls where possible. Adding get_absolute_url in models enables direct link to the public model views in admin. The use of get_absolute_url, which is the correct Django way of doing things, eliminates any need for the redundant "href" fields we were using. Those fields now need to be deleted from the models and from the parsers. Made the context processor to pass settings to all templates actually work, although this was a little uglier than expected. I had to put in a new render_response to replace render_to_response. This is because Django uses Context, not RequestContext by default. I wish they would change this, it's annoying. Anyway, I deleted all the manual settings passing in the views. I also eliminated a couple of unnecessary methods and stuff like that. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8244 by aaron @ 2/16/2009 8:31 AM
* [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