93cd18e40d
[svn] Added a line to call the parser for surveys.csv and the scanned images.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8156 by aaron @ 1/15/2009 11:25 PM
2009-05-13 05:29:13 +01:00
7c0791973b
[svn] Added some actual funtionality to virtual survey binder.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8155 by aaron @ 1/15/2009 11:21 PM
2009-05-13 05:28:57 +01:00
0ec2b1c4f2
[svn] Whoops, commented out lines with were just for my local debugging.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8154 by aaron @ 1/15/2009 7:32 PM
2009-05-13 05:28:35 +01:00
14b00d2382
[svn] Forgot this in the last checkout. It's the template for the virtual survey binder.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8153 by aaron @ 1/15/2009 6:25 AM
2009-05-13 05:28:14 +01:00
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
95a08ffbd9
[svn] Undo some changes that were only meant for my local use.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8151 by aaron @ 1/7/2009 4:50 AM
2009-05-13 05:26:51 +01:00
b7bf1b37ac
[svn] 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.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8150 by aaron @ 1/4/2009 2:06 PM
2009-05-13 05:26:14 +01:00
f525235e94
[svn] Fix plurals because they're starting to get on my nerves!
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8095 by aaron @ 12/31/2008 5:07 PM
2009-05-13 05:25:39 +01:00
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
8c818906b5
[svn] 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).
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8093 by aaron @ 12/13/2008 11:17 PM
2009-05-13 05:24:37 +01:00
1d8f647699
[svn]
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8092 by aaron @ 12/9/2008 6:58 PM
2009-05-13 05:24:21 +01:00
3d7a5b15ad
[svn] undo stupid change
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8091 by aaron @ 12/9/2008 6:51 PM
2009-05-13 05:24:10 +01:00
17ae38f109
[svn]
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8090 by aaron @ 12/9/2008 5:45 PM
2009-05-13 05:23:59 +01:00
ebbebfd81d
[svn] Fix settings reference.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8089 by aaron @ 12/9/2008 8:49 AM
2009-05-13 05:23:48 +01:00
35100c906a
[svn]
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8088 by aaron @ 12/9/2008 8:02 AM
2009-05-13 05:23:37 +01:00
89ea3a5106
[svn] Try and sort out settings mess.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8087 by aaron @ 12/9/2008 4:48 AM
2009-05-13 05:23:25 +01:00
2aeabf14c1
[svn] whoops, no slash
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8086 by aaron @ 12/9/2008 2:05 AM
2009-05-13 05:23:13 +01:00
5867432965
[svn] Trying to fix framos troggle
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8085 by aaron @ 12/9/2008 2:01 AM
2009-05-13 05:23:02 +01:00
ac097cb2d0
[svn] Forgot to add cave and logbook search templates in earlier commit.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8084 by aaron @ 12/9/2008 1:31 AM
2009-05-13 05:22:51 +01:00
315a4ce2c7
[svn]
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8083 by aaron @ 12/8/2008 5:17 AM
2009-05-13 05:22:38 +01:00
c06585b3e8
[svn] 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.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8082 by aaron @ 12/8/2008 5:10 AM
2009-05-13 05:22:26 +01:00
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
47604b1db2
[svn] Replace "django" with "troggle" in admin
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8080 by aaron @ 12/7/2008 10:18 PM
2009-05-13 05:21:51 +01:00
469a520e5c
[svn] Generalised the way dates are stored, and added a personRole and Role field
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8079 by julian @ 11/8/2008 11:27 PM
2009-05-13 05:21:39 +01:00
5757df28a1
[svn] Added survex persons to admin site
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8078 by julian @ 11/8/2008 11:24 PM
2009-05-13 05:21:27 +01:00
f02b288e4b
[svn] *teams and *date identified and scrapped
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8077 by julian @ 11/8/2008 11:23 PM
2009-05-13 05:21:16 +01:00
fa6bf04522
[svn] Djangoed Julians code
...
added underscores to field names
turned __str__ to __unicode__
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8076 by julian @ 11/8/2008 6:24 PM
2009-05-13 05:21:05 +01:00
5e6bf2436d
[svn] Removed troggle from urls
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8075 by julian @ 11/8/2008 3:37 PM
2009-05-13 05:20:53 +01:00
71b9468677
[svn] Use URL_ROOT for links
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8074 by julian @ 11/7/2008 9:12 AM
2009-05-13 05:20:43 +01:00
683534393f
[svn] Added URL_ROOT to local settings
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8073 by julian @ 11/7/2008 9:10 AM
2009-05-13 05:20:31 +01:00
730e88dc0e
[svn] add local settings files
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8072 by julian @ 11/7/2008 9:09 AM
2009-05-13 05:20:20 +01:00
a21b61e2b6
[svn] convert unfound files to lower case and try again
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8071 by julian @ 11/7/2008 8:55 AM
2009-05-13 05:20:08 +01:00
0b9afdd0e7
[svn] going back now works
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8069 by julian @ 11/7/2008 2:31 AM
2009-05-13 05:19:57 +01:00
9c75c35ed4
[svn] going back now works
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8068 by julian @ 11/7/2008 2:30 AM
2009-05-13 05:19:44 +01:00
a9161e791a
[svn] remove nonasc
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8067 by julian @ 11/7/2008 2:25 AM
2009-05-13 05:19:31 +01:00
1f8f972b13
[svn] quick
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8066 by julian @ 11/7/2008 2:09 AM
2009-05-13 05:19:18 +01:00
a8ad3a3b1e
[svn] long putting in
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8065 by julian @ 11/7/2008 2:08 AM
2009-05-13 05:19:07 +01:00
b33061a3ce
[svn] Converted <p> tags to wiki style "\n\n"
...
Tidied header
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8063 by julian @ 11/6/2008 11:29 PM
2009-05-13 05:18:49 +01:00
f536963d00
[svn] wiki_to_html changed to wiki_to_html_short
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8062 by julian @ 11/6/2008 11:25 PM
2009-05-13 05:18:38 +01:00
f5ddbafcb0
[svn] 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
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8061 by julian @ 11/6/2008 11:24 PM
2009-05-13 05:18:26 +01:00
13d44fe647
[svn] forgotten
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8059 by julian @ 11/6/2008 9:29 PM
2009-05-13 05:18:07 +01:00
a357f5adab
[svn] Moved templates and python path into the various localsettings files
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8057 by julian @ 11/2/2008 11:22 PM
2009-05-13 05:17:50 +01:00
3caae604b3
[svn] Moved up a directory
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8056 by julian @ 11/2/2008 11:19 PM
2009-05-13 05:17:37 +01:00
3a4fd77860
[svn] Moved template directories to local settings
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8055 by julian @ 11/2/2008 11:18 PM
2009-05-13 05:17:27 +01:00
936eab2844
[svn] Removed last of the sqlite save hack
...
Started to add reading of dates
Changed character encoding code so it works
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8054 by julian @ 11/2/2008 11:17 PM
2009-05-13 05:17:16 +01:00
64f0b54275
[svn] Added date field
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8053 by julian @ 11/2/2008 11:15 PM
2009-05-13 05:17:06 +01:00
f336d146f3
[svn] Moved and improved reset script from the parsers directory
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8052 by julian @ 11/2/2008 11:14 PM
2009-05-13 05:16:55 +01:00
33fad37eb0
[svn] Removed last of the sqlite save hack
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8051 by julian @ 11/2/2008 11:13 PM
2009-05-13 05:16:44 +01:00
7ddc730ad0
[svn] Increased maximum length of some of the fields to fit with the cavetab data
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8050 by julian @ 11/2/2008 11:10 PM
2009-05-13 05:16:33 +01:00
edba377305
[svn] Settings.py now references localsettings.py, which is kept outside of SVN and is specific to each machine.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8049 by aaron @ 11/2/2008 4:18 AM
2009-05-13 05:16:23 +01:00
substantialnoninfringinguser