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
julian
22b7620253
[svn r8171] Converted screen output display to ASCII, so that I could run the script
...
via SSH on a server
2009-01-17 21:36:14 +01:00
julian
820564de79
[svn r8170] Changed admin media prefix and enabled smart slash adding
2009-01-17 21:35:13 +01:00
julian
309d706bd7
[svn r8169] julian's quick makework and index page
2009-01-17 20:46:05 +01:00
julian
c538cc7e95
[svn r8168] aaron changes
2009-01-17 18:49:29 +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
82598eacd6
[svn r8165]
2009-01-17 08:44:39 +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
246bb42545
[svn r8162]
2009-01-16 03:47:39 +01:00
aaron
03f4046e61
[svn r8161] randSent is unnecessary and causing problems
2009-01-16 03:44:39 +01:00
aaron
f3bd6169ab
[svn r8160]
2009-01-16 03:41:47 +01:00
aaron
8edaff3045
[svn r8159] randomLogbookSentance.py renamed to randSent.py, and expanded
2009-01-16 03:40:58 +01:00
aaron
e543df8b83
[svn r8158] same mistake
2009-01-16 03:21:46 +01:00
aaron
73d73a8a41
[svn r8157]
2009-01-16 03:19:09 +01:00
aaron
7ef80e36a3
[svn r8156] Added a line to call the parser for surveys.csv and the scanned images.
2009-01-16 00:25:36 +01:00
aaron
0404030f87
[svn r8155] Added some actual funtionality to virtual survey binder.
2009-01-16 00:21:55 +01:00
aaron
95d6ae7011
[svn r8154] Whoops, commented out lines with were just for my local debugging.
2009-01-15 20:32:41 +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
96288429f3
[svn r8151] Undo some changes that were only meant for my local use.
2009-01-07 05:50:55 +01:00
aaron
785a130d0c
[svn r8150] Added new photo model.
...
Logbook parser now looks for mugshots when adding people. If it finds an image, it adds a new photo model instance linked to that person. If it finds an html page, it adds the body text of that page as the person's "blurb" and then adds the mugshot.
My interface web design isn't working, sorry. Need a blank slate on that one.
2009-01-04 15:06:01 +01:00
aaron
7aaff3f64c
[svn r8095] Fix plurals because they're starting to get on my nerves!
2008-12-31 18:07:50 +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
7a4f8987f8
[svn r8093] Added QM model and parser. Had to merge models_cave.py and models_logbooks.py into models.py. This is because logbook entries now have an optional foreign key to caves, and QMs have a required foreign key to a logbook entry of the trip that created them. So, the two files became circularly dependent.
...
Also, the urls for the person model now allow lookups using their actual first and last name in the url instead of the primary key. We should do similar things for all models, maybe even using the url as a search which results in a page with multiple model instance results if the input is ambiguous (e.g. they only enter a first name).
2008-12-14 00:17:33 +01:00
aaron
fe81408800
[svn r8092]
2008-12-09 19:58:32 +01:00
aaron
88146c9a25
[svn r8091] undo stupid change
2008-12-09 19:51:11 +01:00
aaron
e783b3b576
[svn r8090]
2008-12-09 18:45:34 +01:00
aaron
f4f4efbe0e
[svn r8089] Fix settings reference.
2008-12-09 09:49:59 +01:00
aaron
7f43f0ccc8
[svn r8088]
2008-12-09 09:02:21 +01:00
aaron
4e1b4684cd
[svn r8087] Try and sort out settings mess.
2008-12-09 05:48:56 +01:00
aaron
b04d822383
[svn r8086] whoops, no slash
2008-12-09 03:05:23 +01:00
aaron
262b32bad5
[svn r8085] Trying to fix framos troggle
2008-12-09 03:01:31 +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
feb0f3a5c5
[svn r8083]
2008-12-08 06:17:35 +01:00
aaron
6b1555f867
[svn r8082] Remove MEDIA_ROOT from settings.py because it belongs in local settings, and comment out urlconf line for unfinished edit form which I haven't checked in.
2008-12-08 06:10:45 +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
aff675d7f4
[svn r8079] Generalised the way dates are stored, and added a personRole and Role field
2008-11-09 00:27:00 +01:00
julian
a76fd17c4e
[svn r8078] Added survex persons to admin site
2008-11-09 00:24:24 +01:00
julian
503d00db90
[svn r8077] *teams and *date identified and scrapped
2008-11-09 00:23:27 +01:00
julian
b85c962575
[svn r8076] Djangoed Julians code
...
added underscores to field names
turned __str__ to __unicode__
2008-11-08 19:24:03 +01:00
julian
f08d6b6ecf
[svn r8075] Removed troggle from urls
2008-11-08 16:37:12 +01:00
julian
c126d85b87
[svn r8074] Use URL_ROOT for links
2008-11-07 10:12:11 +01:00
julian
400276daae
[svn r8073] Added URL_ROOT to local settings
2008-11-07 10:10:03 +01:00
julian
379183b9db
[svn r8072] add local settings files
2008-11-07 10:09:45 +01:00
julian
657046ca8c
[svn r8071] convert unfound files to lower case and try again
2008-11-07 09:55:37 +01:00
julian
abcd18531d
[svn r8069] going back now works
2008-11-07 03:31:52 +01:00
julian
5f18df3822
[svn r8068] going back now works
2008-11-07 03:30:53 +01:00
julian
e8b493d070
[svn r8067] remove nonasc
2008-11-07 03:25:00 +01:00
julian
c057ec34f3
[svn r8066] quick
2008-11-07 03:09:23 +01:00
julian
9e26b652b2
[svn r8065] long putting in
2008-11-07 03:08:47 +01:00
julian
d5f15a98e2
[svn r8063] Converted <p> tags to wiki style "\n\n"
...
Tidied header
2008-11-07 00:29:38 +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
91f24887ab
[svn r8059] forgotten
2008-11-06 22:29:46 +01:00
julian
901c2ad3f5
[svn r8057] Moved templates and python path into the various localsettings files
2008-11-03 00:22:19 +01:00
julian
00dbc91314
[svn r8056] Moved up a directory
2008-11-03 00:19:53 +01:00
julian
223a32a5db
[svn r8055] Moved template directories to local settings
2008-11-03 00:18:55 +01:00
julian
c2876c0b64
[svn r8054] Removed last of the sqlite save hack
...
Started to add reading of dates
Changed character encoding code so it works
2008-11-03 00:17:28 +01:00
julian
e56ad841b2
[svn r8053] Added date field
2008-11-03 00:15:37 +01:00
julian
316807afff
[svn r8052] Moved and improved reset script from the parsers directory
2008-11-03 00:14:37 +01:00
julian
65caea6e05
[svn r8051] Removed last of the sqlite save hack
2008-11-03 00:13:04 +01:00
julian
3301c10513
[svn r8050] Increased maximum length of some of the fields to fit with the cavetab data
2008-11-03 00:10:19 +01:00
aaron
6b91da5b60
[svn r8049] Settings.py now references localsettings.py, which is kept outside of SVN and is specific to each machine.
2008-11-02 05:18:41 +01:00
julian
233f376608
[svn r8047] more parsing back to 2002
2008-10-31 15:43:57 +01:00
julian
3a61277647
[svn r8046] forgotten
2008-10-31 14:58:13 +01:00
