Commit Graph

128 Commits

Author SHA1 Message Date
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
julian
8473c4a2c3 [svn r8262] Further attempts to make troggle work on windows using surveys stored on an external server
settings.PHOTOS changed to setting.PHOTO_ROOT
Made databaseReset.py get info from external server if appropriate (hope this did not break linus disk based scripts)
Still needs more work, to get everything working
Auto create photos directory if it does not already exist
2009-03-02 02:30:45 +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
d19c51daa0 [svn r8257] Not ready for these yet. 2009-02-23 14:11:39 +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
0f2e4ebe91 [svn r8237] Had forgotten to add these. 2009-01-31 22:19:21 +01:00
julian
08ea56019d [svn r8236] make work 2009-01-30 18:40:05 +01:00
aaron
047e259551 [svn r8235] modify context so it does not pass unneeded and sensitive info in settings to templates 2009-01-30 07:57:59 +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
a38de9b7eb [svn r8222] move qm to ;later 2009-01-24 15:07:36 +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
83543ee301 [svn r8206] another import statement that caused errors on framos.lawoftheland. does work find on my machine though. Wonder what the difference is. 2009-01-19 18:59:30 +01:00
aaron
49647e5bcc [svn r8205] fixed broken import statement 2009-01-19 18:51:10 +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
aaron
76469fdd42 [svn r8200] CSS for use when using lefthand navigation menu. Not sure if this will be used by all templates eventually. 2009-01-19 07:56:28 +01:00
julian
9b63d62368 [svn r8199] survey block object 2009-01-19 01:22:54 +01:00
julian
b4cd4097a6 [svn r8191] Added os.path.isDir prior to os.listdir. Otherwise Julians server
through lots of errors.  No idea why
2009-01-18 22:08:40 +01:00
julian
7d1c2b6615 [svn r8190] MOre work on abstracting the file locations on scanned survey notes 2009-01-18 22:04:00 +01:00
julian
2f0eb4f25f [svn r8189] new person expedition 2009-01-18 20:50:30 +01:00
julian
0701ce3ee2 [svn r8187] Got rid of data relating to specific machines 2009-01-18 19:15:06 +01:00
julian
3dbd762944 [svn r8186] Made the url file lookup work 2009-01-18 19:14:15 +01:00
julian
dfbdb46a1b [svn r8185] changed import to work one level lower 2009-01-18 18:20:45 +01:00
julian
b19fb42427 [svn r8184] modified import to take it down a level 2009-01-18 18:18:34 +01:00
julian
8663062bad [svn r8183] modified import settings to import troggle.settings as settings 2009-01-18 18:12:41 +01:00
julian
ffe7d51c40 [svn r8182] Changes to file abstraction, that seemed to make it work by magic 2009-01-18 18:07:01 +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
8f817b424e [svn r8173] Continued file abstracted work, to get survey files from either hard disk or the web. 2009-01-18 01:45:56 +01:00
julian
cbb1acd1b4 [svn r8172] Modifications to allow survey files to be pulled from another server. By providing directory listing and download functions,. which could also be used by tunnel 2009-01-18 00:25:59 +01:00