expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-22 15:21:52 +00:00
Code Issues 19 Projects 3 Activity
379 Commits 7 Branches 0 Tags 34 MiB
742848409b
Commit Graph

379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
substantialnoninfringinguser
a4edfca30e [svn] Got QM pages working. 
Started scripts for exporting to old expo format.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8269 by aaron @ 3/12/2009 2:22 PM
 2009-05-13 05:59:40 +01:00
substantialnoninfringinguser
90da85e856 [svn] revert some of the changes (href element) so that the links work 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8267 by julian @ 3/11/2009 10:44 AM
 2009-05-13 05:58:58 +01:00
substantialnoninfringinguser
e8da6b9b8b [svn] 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

Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8262 by julian @ 3/2/2009 1:30 AM
 2009-05-13 05:58:18 +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
e9cc5094b9 [svn] Not ready for these yet. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8257 by aaron @ 2/23/2009 1:11 PM
 2009-05-13 05:56:16 +01:00
substantialnoninfringinguser
24dc2e3a20 [svn] Fixing what I broke. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8256 by aaron @ 2/23/2009 1:05 PM
 2009-05-13 05:55:40 +01:00
substantialnoninfringinguser
8916b460e1 [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8255 by aaron @ 2/23/2009 4:16 AM
 2009-05-13 05:55:00 +01:00
substantialnoninfringinguser
b57452f68d [svn] 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.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8247 by aaron @ 2/18/2009 9:35 PM
 2009-05-13 05:54:17 +01:00
substantialnoninfringinguser
24dc7c5a0c [svn] Photo file handling and mugshots parsing sorted. 
Made URL settings more relative, less redundant.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8246 by aaron @ 2/18/2009 6:45 AM
 2009-05-13 05:53:37 +01:00
substantialnoninfringinguser
25b695e53d [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8245 by aaron @ 2/17/2009 1:09 AM
 2009-05-13 05:52:59 +01:00
substantialnoninfringinguser
d25fd97864 [svn] 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.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8244 by aaron @ 2/16/2009 8:31 AM
 2009-05-13 05:52:15 +01:00
substantialnoninfringinguser
3b35b6bb76 [svn] Draft of paper for ICS. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8242 by aaron @ 2/6/2009 6:20 AM
 2009-05-13 05:51:21 +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
5dfbb187a1 [svn] Had forgotten to add these. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8237 by aaron @ 1/31/2009 9:19 PM
 2009-05-13 05:50:12 +01:00
substantialnoninfringinguser
b4d82ddeea [svn] make work 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8236 by julian @ 1/30/2009 5:40 PM
 2009-05-13 05:49:50 +01:00
substantialnoninfringinguser
4a50e098a9 [svn] modify context so it does not pass unneeded and sensitive info in settings to templates 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8235 by aaron @ 1/30/2009 6:57 AM
 2009-05-13 05:49:29 +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
cdd4e685ee [svn] cave maps to all logbook entry trips done there 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8228 by julian @ 1/24/2009 11:59 PM
 2009-05-13 05:46:12 +01:00
substantialnoninfringinguser
84e9cc3396 [svn] Template update to use wiki_to_html_short 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8227 by julian @ 1/24/2009 7:40 PM
 2009-05-13 05:45:44 +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
98a3d44eed [svn] fix martins front page links 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8225 by julian @ 1/24/2009 6:36 PM
 2009-05-13 05:45:01 +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
1e1453f443 [svn] Added links to front page 
Add names for views in order to link from the main page
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8223 by julian @ 1/24/2009 3:11 PM
 2009-05-13 05:44:01 +01:00
substantialnoninfringinguser
b6f1f182f5 [svn] move qm to ;later 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8222 by julian @ 1/24/2009 2:07 PM
 2009-05-13 05:43:43 +01:00
substantialnoninfringinguser
60735a9b3a [svn] merge the trip table to have surveys by date 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8221 by julian @ 1/24/2009 2:01 PM
 2009-05-13 05:43:20 +01:00
substantialnoninfringinguser
6598dd5105 [svn] calendar.html used django 1.1 {% empty %} syntax, but older version on server so I had to change it 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8210 by aaron @ 1/20/2009 5:36 AM
 2009-05-13 05:42:57 +01:00
substantialnoninfringinguser
6947e43caf [svn] fix links 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8209 by aaron @ 1/20/2009 5:16 AM
 2009-05-13 05:42:40 +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
dcc7825547 [svn] another import statement that caused errors on framos.lawoftheland. does work find on my machine though. Wonder what the difference is. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8206 by aaron @ 1/19/2009 5:59 PM
 2009-05-13 05:41:42 +01:00
substantialnoninfringinguser
b707c31e28 [svn] fixed broken import statement 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8205 by aaron @ 1/19/2009 5:51 PM
 2009-05-13 05:41:17 +01:00
substantialnoninfringinguser
eb431eb5c9 [svn] Fixed up calendar with estimated dates from logbook. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8202 by aaron @ 1/19/2009 8:28 AM
 2009-05-13 05:40:56 +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
8de2573385 [svn] CSS for use when using lefthand navigation menu. Not sure if this will be used by all templates eventually. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8200 by aaron @ 1/19/2009 6:56 AM
 2009-05-13 05:40:13 +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
39ab4d2514 [svn] Added os.path.isDir prior to os.listdir. Otherwise Julians server 
through lots of errors.  No idea why

Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8191 by julian @ 1/18/2009 9:08 PM
 2009-05-13 05:39:05 +01:00
substantialnoninfringinguser
99ab1e22e9 [svn] MOre work on abstracting the file locations on scanned survey notes 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8190 by julian @ 1/18/2009 9:04 PM
 2009-05-13 05:38:37 +01:00
substantialnoninfringinguser
0f5109cb09 [svn] new person expedition 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8189 by julian @ 1/18/2009 7:50 PM
 2009-05-13 05:38:18 +01:00
substantialnoninfringinguser
da154a736b [svn] Got rid of data relating to specific machines 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8187 by julian @ 1/18/2009 6:15 PM
 2009-05-13 05:37:41 +01:00
substantialnoninfringinguser
0f15fd2012 [svn] Made the url file lookup work 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8186 by julian @ 1/18/2009 6:14 PM
 2009-05-13 05:37:24 +01:00
substantialnoninfringinguser
0bfdc62d70 [svn] changed import to work one level lower 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8185 by julian @ 1/18/2009 5:20 PM
 2009-05-13 05:37:08 +01:00
substantialnoninfringinguser
db523ed603 [svn] modified import to take it down a level 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8184 by julian @ 1/18/2009 5:18 PM
 2009-05-13 05:36:53 +01:00
substantialnoninfringinguser
91b68aef0d [svn] modified import settings to import troggle.settings as settings 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8183 by julian @ 1/18/2009 5:12 PM
 2009-05-13 05:36:33 +01:00
substantialnoninfringinguser
7f159a283a [svn] Changes to file abstraction, that seemed to make it work by magic 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8182 by julian @ 1/18/2009 5:07 PM
 2009-05-13 05:36:17 +01:00
substantialnoninfringinguser
f229ff35f9 [svn] Julian playing with the logbooks and expoyears 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8180 by julian @ 1/18/2009 3:59 PM
 2009-05-13 05:35:59 +01:00
substantialnoninfringinguser
b950ee70f7 [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8175 by aaron @ 1/18/2009 4:42 AM
 2009-05-13 05:35:29 +01:00
substantialnoninfringinguser
cda0a7a5e1 [svn] Beginnings of expo calendar 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8174 by aaron @ 1/18/2009 1:15 AM
 2009-05-13 05:35:11 +01:00
substantialnoninfringinguser
b66189bc9e [svn] Continued file abstracted work, to get survey files from either hard disk or the web. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8173 by julian @ 1/18/2009 12:45 AM
 2009-05-13 05:34:52 +01:00