xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity
251 Commits 8 Branches 0 Tags 18 MiB
96533882c7
Commit Graph

41 Commits

Author SHA1 Message Date
martin speleo
7dce545b4c [svn] Fixed setContentHeight to work properly for eye candy view, whilst removing it from the non-eyecandy view 2009-07-03 21:29:02 +01:00
substantialnoninfringinguser
b69ae42ef2 [svn] Use template block "related" for related objects. Various cleanup, fix personexpedition date views. 2009-07-03 00:50:56 +01:00
martin speleo
3e377eb32e [svn] Fixed accidental removal of fading in margin pictures from main page of eye candy site. 
Reduced non eye candy margins.
Moved set contents style height function into main.js from being embeded js, and ran when eye candy is turned on.  Remove style attribute when eye candy is turned back off.
 2009-06-28 23:11:45 +01:00
martin speleo
2ad3d7e332 [svn] Have different css for plain and eye candy views. 2009-06-28 22:23:56 +01:00
martin speleo
b847bde6b7 [svn] Fixed small semantics issues stopping base.js working with IE. 
Made toggle eyecandy persistent (using a cookie)
Made toggle eyecandy turn off footer menu images
Only load footer menu images if the eyecandy is being used.
 2009-06-28 19:33:24 +01:00
substantialnoninfringinguser
06f7bfa979 [svn] Make header scroll with page because Julian said so 2009-06-19 15:38:32 +01:00
substantialnoninfringinguser
eed4fea255 [svn] Fixed a bug with QMs with numbers between 1 and 10, and fixed the links in the recent changes box. 2009-06-10 05:37:53 +01:00
substantialnoninfringinguser
f9175cc6fa [svn] * Added admin inlines for QMs in LogbookEntry model 
* Added QM list edit view
* Fixed "recent changes" box on front page
 2009-06-10 00:05:02 +01:00
substantialnoninfringinguser
91b8ba1be3 [svn] 2009-06-09 23:13:11 +01:00
goatchurch
c2a72ab4f1 [svn] fix the revert and css 2009-06-09 19:15:31 +01:00
goatchurch
91b9d80367 [svn] codemirror 2009-06-09 18:59:54 +01:00
substantialnoninfringinguser
4735edb9d0 [svn] Have control panel display an error for logged in, non-superuser users. 2009-05-24 23:24:59 +01:00
substantialnoninfringinguser
3784eb9720 [svn] - Remove feature (admin JSON / XML downloads) which won't work until we have django 1.1 installed (works on my SVN version, but not on seagrass debian package version). 
- Copy feincms media to project so that we don't have to serve it separately. Also useful because we may want to customize it.
 2009-05-22 02:54:09 +01:00
substantialnoninfringinguser
49ed6495ad [svn] * Make subcave urls work. 
* Add json and xml download to admin.
 2009-05-22 01:50:16 +01:00
substantialnoninfringinguser
9c1e978da2 [svn] 2009-05-19 06:32:42 +01:00
substantialnoninfringinguser
e9eb00f65d [svn] 2009-05-18 04:30:26 +01:00
substantialnoninfringinguser
d99f44650c [svn] Turn main menu into dropdown (well actually, drop up) menu. 2009-05-18 04:25:42 +01:00
substantialnoninfringinguser
4a42396774 [svn] - Make control panel downloads (qm.csv for each cave, CAVETAB2.CSV) work. 
- Fix problems in QM parsing script
 2009-05-17 04:31:23 +01:00
substantialnoninfringinguser
8c68a8a0d7 [svn] Dynamic thumbnail generation for photos and survey scans using imagekit, further improving registration system, other misc. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8336 by cucc @ 5/10/2009 11:05 PM
 2009-05-13 06:23:57 +01:00
substantialnoninfringinguser
1b06243dab [svn] Improve registration system. 
Add jquery fade effects and quick search.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8334 by cucc @ 5/10/2009 5:23 AM
 2009-05-13 06:22:07 +01:00
substantialnoninfringinguser
6006eebb57 [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8332 by cucc @ 5/8/2009 8:17 PM
 2009-05-13 06:20:26 +01:00
substantialnoninfringinguser
09a1539aef [svn] Interface improvements. Code will need some cleaning up. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8331 by cucc @ 5/8/2009 8:16 PM
 2009-05-13 06:19:45 +01:00
substantialnoninfringinguser
84d92115f3 [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8328 by cucc @ 5/3/2009 6:33 AM
 2009-05-13 06:18:54 +01:00
substantialnoninfringinguser
625b2156e3 [svn] Weeks of local changes. 
- Import is now non-destructive
- Parsers write output to a log file (path be specified in settings)
- databaseReset.py content been divided into separate functions which can be called for varying levels of deletion and importing
- control panel (view, template, urlpattern) added for deleting and importing
- Logins and signup fixed
- CaveArea model updated, view, hierarchical url patterns, and beginning of template added
- New site style
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8324 by cucc @ 5/3/2009 5:56 AM
 2009-05-13 06:15:48 +01:00
substantialnoninfringinguser
157f11b659 [svn] Added QM wiki markup. The format is [[cave:204 QM:2005-04A]] with the grade (A) being optional. The links color red if the QM does not exist, and in that case clicking on them goes to an admin add page with fields prepopulated. 
Various other little things, e.g. filled in the footer with links.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8305 by aaron @ 3/16/2009 8:53 AM
 2009-05-13 06:08:04 +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
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
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
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
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
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
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
8d13864181 [svn] julian's quick makework and index page 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8169 by julian @ 1/17/2009 7:46 PM
 2009-05-13 05:33:29 +01:00
substantialnoninfringinguser
b2366cfe11 [svn] Got rid of ugly old design; brought in ugly new design. This one works a little better, still needs a lot of work. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8164 by aaron @ 1/17/2009 7:11 AM
 2009-05-13 05:31:44 +01:00
substantialnoninfringinguser
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
substantialnoninfringinguser
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
substantialnoninfringinguser
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
substantialnoninfringinguser
b503d3d588 [svn] Initial troggle checkin 
This is a development site using Django 1.0
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8034 by julian @ 10/26/2008 9:04 PM
 2009-05-13 05:13:38 +01:00