Commit Graph

53 Commits

Author SHA1 Message Date
aaron
e57ac77f24 [svn r8304] 2009-03-16 00:12:48 +01:00
julian
61e59bdd83 [svn r8303] fix year links 2009-03-15 23:44:40 +01:00
aaron
97c9772696 [svn r8274] Reverted the reverts from 8267. Fixed the next / previous trip in 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
2009-03-14 09:38:55 +01:00
aaron
17a7302afb [svn r8269] Got QM pages working.
Started scripts for exporting to old expo format.
2009-03-12 15:22:21 +01:00
julian
9150ee1229 [svn r8267] revert some of the changes (href element) so that the links work 2009-03-11 11:44:15 +01:00
aaron
f5fdfe3793 [svn r8260] 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.
2009-02-26 06:28:04 +01:00
aaron
292985f46f [svn r8256] Fixing what I broke. 2009-02-23 14:05:59 +01:00
aaron
40e47f368b [svn r8255] 2009-02-23 05:16:50 +01:00
aaron
9c671e8ef0 [svn r8247] Enable profile setup forms.
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.
2009-02-18 22:35:18 +01:00
aaron
4fc8c8ae3c [svn r8246] Photo file handling and mugshots parsing sorted.
Made URL settings more relative, less redundant.
2009-02-18 07:45:45 +01:00
aaron
1baf2cc0d4 [svn r8245] 2009-02-17 02:09:11 +01:00
aaron
6776111c6e [svn r8244] My crusade to make our project more Djangoic.
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.
2009-02-16 09:31:26 +01:00
aaron
30921804f3 [svn r8238] Now that I've put the new css up, let's use it. Should have only stuff we actually use. 2009-01-31 22:20:36 +01:00
aaron
119f93255c [svn r8234] Fix "if logged in" tag.
Changed logbook template; no longer uses the redundant _next and _prev fields.
2009-01-30 05:53:02 +01:00
julian
0d0005ed66 [svn r8232] yorkshire work with tunnel integration 2009-01-30 00:40:56 +01:00
aaron
7c10fc5e39 [svn r8231] 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!
2009-01-30 00:02:03 +01:00
julian
1f70991566 [svn r8228] cave maps to all logbook entry trips done there 2009-01-25 00:59:45 +01:00
julian
8068d02734 [svn r8227] Template update to use wiki_to_html_short 2009-01-24 20:40:00 +01:00
julian
af65239d6e [svn r8226] I initial work at adding caveareas. (Descirprion of parts of caves) 2009-01-24 19:49:51 +01:00
julian
ca9188bf69 [svn r8225] fix martins front page links 2009-01-24 19:36:58 +01:00
julian
c4c1520b64 [svn r8224] made index of people 2009-01-24 19:26:49 +01:00
julian
c5e59200b3 [svn r8223] Added links to front page
Add names for views in order to link from the main page
2009-01-24 16:11:44 +01:00
julian
7d9ec8009a [svn r8221] merge the trip table to have surveys by date 2009-01-24 15:01:59 +01:00
aaron
841944d564 [svn r8210] calendar.html used django 1.1 {% empty %} syntax, but older version on server so I had to change it 2009-01-20 06:36:45 +01:00
aaron
a8d5cecac9 [svn r8209] fix links 2009-01-20 06:16:27 +01:00
aaron
1df7532d79 [svn r8208] wrong comment syntax 2009-01-19 23:08:35 +01:00
aaron
b49acc3fcc [svn r8207] Allow viewing of more than one survey stage at once. Also, make images float nicely but not escape content div. 2009-01-19 20:30:23 +01:00
aaron
2b4dac2ff2 [svn r8202] Fixed up calendar with estimated dates from logbook. 2009-01-19 09:28:59 +01:00
aaron
a708accb80 [svn r8201] Survey table improvements, added calendar to urls 2009-01-19 08:19:07 +01:00
julian
9b63d62368 [svn r8199] survey block object 2009-01-19 01:22:54 +01:00
julian
2f0eb4f25f [svn r8189] new person expedition 2009-01-18 20:50:30 +01:00
julian
918dbf3250 [svn r8180] Julian playing with the logbooks and expoyears 2009-01-18 16:59:37 +01:00
aaron
0fe420d711 [svn r8175] 2009-01-18 05:42:54 +01:00
aaron
c72fa16090 [svn r8174] Beginnings of expo calendar 2009-01-18 02:15:34 +01:00
julian
309d706bd7 [svn r8169] julian's quick makework and index page 2009-01-17 20:46:05 +01:00
aaron
93197231cf [svn r8167] Fix double / error 2009-01-17 09:11:45 +01:00
aaron
47060929b5 [svn r8166] 2009-01-17 08:52:51 +01:00
aaron
1316f7657f [svn r8164] Got rid of ugly old design; brought in ugly new design. This one works a little better, still needs a lot of work. 2009-01-17 08:11:01 +01:00
aaron
014f390100 [svn r8163] More work on survey images parser and virtual survey binder. Renamed expedition_year field of Survey model to expedition because this makes more sense. 2009-01-16 20:50:23 +01:00
aaron
73d73a8a41 [svn r8157] 2009-01-16 03:19:09 +01:00
aaron
0404030f87 [svn r8155] Added some actual funtionality to virtual survey binder. 2009-01-16 00:21:55 +01:00
aaron
db1eab0c25 [svn r8153] Forgot this in the last checkout. It's the template for the virtual survey binder. 2009-01-15 07:25:09 +01:00
aaron
083b5a3f1d [svn r8152] 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. 2009-01-15 07:22:54 +01:00
aaron
134c6f8694 [svn r8094] 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.
2008-12-31 03:59:15 +01:00
aaron
5720e9f9c5 [svn r8084] Forgot to add cave and logbook search templates in earlier commit. 2008-12-09 02:31:30 +01:00
aaron
97332b8103 [svn r8081] Added cave and logbook search, collapsible footer navbar, useless statistics page. Also fixed broken css. Toying with forms but not committing those yet. 2008-12-08 05:28:03 +01:00
aaron
12118e4a59 [svn r8080] Replace "django" with "troggle" in admin 2008-12-07 23:18:58 +01:00
julian
c496000d97 [svn r8062] wiki_to_html changed to wiki_to_html_short 2008-11-07 00:25:11 +01:00
julian
d639a53f20 [svn r8061] Wiki_markup imporved to include paragraphs
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
2008-11-07 00:24:20 +01:00
julian
3a61277647 [svn r8046] forgotten 2008-10-31 14:58:13 +01:00