Commit Graph

22 Commits

Author SHA1 Message Date
substantialnoninfringinguser
8c68a8a0d7 [svn] Dynamic thumbnail generation for photos and survey scans using 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
2009-05-13 06:23:57 +01:00
substantialnoninfringinguser
1b06243dab [svn] Improve registration system.
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
2009-05-13 06:22:07 +01:00
substantialnoninfringinguser
09a1539aef [svn] Interface improvements. Code will need some cleaning up.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8331 by cucc @ 5/8/2009 8:16 PM
2009-05-13 06:19:45 +01:00
substantialnoninfringinguser
625b2156e3 [svn] Weeks of local changes.
- 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
2009-05-13 06:15:48 +01:00
substantialnoninfringinguser
157f11b659 [svn] Added QM wiki markup. The format is [[cave:204 QM:2005-04A]] with the 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
2009-05-13 06:08:04 +01:00
substantialnoninfringinguser
4b34241a16 [svn] Added new abstract base class TroggleModel. Any fields or methods that 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
2009-05-13 05:56:56 +01:00
substantialnoninfringinguser
ce5c56b430 [svn] Now that I've put the new css up, let's use it. Should have only stuff we actually use.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8238 by aaron @ 1/31/2009 9:20 PM
2009-05-13 05:50:31 +01:00
substantialnoninfringinguser
c4b8ea4d9b [svn] Fix "if logged in" tag.
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
2009-05-13 05:49:05 +01:00
substantialnoninfringinguser
cb52c47aa9 [svn] yorkshire work with tunnel integration
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8232 by julian @ 1/29/2009 11:40 PM
2009-05-13 05:48:47 +01:00
substantialnoninfringinguser
ed345f2576 [svn] Add user registration and user profiles.
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
2009-05-13 05:48:10 +01:00
substantialnoninfringinguser
efd4708526 [svn] I initial work at adding caveareas. (Descirprion of parts of caves)
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8226 by julian @ 1/24/2009 6:49 PM
2009-05-13 05:45:26 +01:00
substantialnoninfringinguser
264594ed05 [svn] made index of people
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8224 by julian @ 1/24/2009 6:26 PM
2009-05-13 05:44:35 +01:00
substantialnoninfringinguser
f7a8e95634 [svn] wrong comment syntax
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8208 by aaron @ 1/19/2009 10:08 PM
2009-05-13 05:42:18 +01:00
substantialnoninfringinguser
82e50d5199 [svn] Allow viewing of more than one survey stage at once. Also, make images 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
2009-05-13 05:42:01 +01:00
substantialnoninfringinguser
aeef470c6d [svn] Survey table improvements, added calendar to urls
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8201 by aaron @ 1/19/2009 7:19 AM
2009-05-13 05:40:35 +01:00
substantialnoninfringinguser
0ba4dd4ef4 [svn] survey block object
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8199 by julian @ 1/19/2009 12:22 AM
2009-05-13 05:39:52 +01:00
substantialnoninfringinguser
8d13864181 [svn] julian's quick makework and index page
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8169 by julian @ 1/17/2009 7:46 PM
2009-05-13 05:33:29 +01:00
substantialnoninfringinguser
b2366cfe11 [svn] Got rid of ugly old design; brought in ugly new design. This one works 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
2009-05-13 05:31:44 +01:00
substantialnoninfringinguser
c6cce8d2fe [svn] Add beginnings of virtual survey binder: new Survey and ScannedImage 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
2009-05-13 05:27:43 +01:00
substantialnoninfringinguser
7aee3fb920 [svn] QM parser now parses Hauchhoehle QMs.py
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
2009-05-13 05:25:17 +01:00
substantialnoninfringinguser
29984ff15a [svn] Added cave and logbook search, collapsible footer navbar, useless 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
2009-05-13 05:22:14 +01:00
substantialnoninfringinguser
b503d3d588 [svn] Initial troggle checkin
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
2009-05-13 05:13:38 +01:00