Commit Graph

529 Commits

Author SHA1 Message Date
goatchurch
27e65fada2 remove dependence on latest django 2009-08-29 16:23:11 +01:00
goatchurch
20eac2d04b quick hack to make work in django1.0 Photo to DPhoto 2009-08-23 23:29:05 +01:00
goatchurch
e4496e4cd8 [svn] latest hacking for various statistics 2009-08-05 11:58:36 +01:00
goatchurch
60dcb82ef6 [svn] now with ability to make new svx file 2009-08-01 07:31:27 +01:00
goatchurch
b135ab64e7 [svn] full checkin. animations disabled, sorry 2009-07-27 13:43:43 +01:00
goatchurch
694fe4b4d8 [svn] some file reading things 2009-07-27 13:42:54 +01:00
substantialnoninfringinguser
dc30f80ce4 [svn] fix indexError bug julian found 2009-07-22 16:35:49 +01:00
substantialnoninfringinguser
57ede091c4 [svn] Various bug fixes, using more raw_id fields in admin so it loads faster. I had to put onLoad="contentHeight();" back into the base template. This is a bad solution, I would rather use Martin's, but it wasn't working. 2009-07-22 16:18:00 +01:00
goatchurch
e5033c7b69 [svn] bugged 2009-07-21 07:20:34 +01:00
substantialnoninfringinguser
8bede4b5ce [svn] 2009-07-17 01:14:37 +01:00
substantialnoninfringinguser
5b3a951be3 [svn] * Make descriptions parser also replace links to descriptions from Cave models' underground_descriptions with wikilinks for valid (existing) links
* Make entrances searchable in admin by cave kataster number
2009-07-16 05:37:33 +01:00
substantialnoninfringinguser
e0613a3888 [svn] only logged in users should see the tasks page thing 2009-07-15 01:55:26 +01:00
substantialnoninfringinguser
b9a1b83273 [svn] * wikilink to html for subcaves and cave descriptions
* fix header regex
2009-07-12 06:30:24 +01:00
substantialnoninfringinguser
792751b960 [svn] Add regex to turn ==headers== into <h2>headers</2> 2009-07-12 05:54:08 +01:00
substantialnoninfringinguser
6f0be2c492 [svn] override save for CaveDescriptions to scan qm wikilinks and add into the manytomany field linked_qms 2009-07-11 01:36:00 +01:00
substantialnoninfringinguser
3a61639a08 [svn] Make QM wikilinks work in new format, and fix cave description parser to output working wikilinks. 2009-07-09 05:08:21 +01:00
substantialnoninfringinguser
f359b645e6 [svn] not ready for that yet 2009-07-06 08:35:08 +01:00
substantialnoninfringinguser
bfa202078b [svn] * Make Q< wikilinks work again
* Add new ajax bit in LogbookEntry admin which checks for QMs not in wikilink format and allows one click fixes. Soon to be expanded to check for wikilinks that aren't in foreignkey.
* Tweaks to admin including using raw_id_fields for PersonExpedition & other foreignkeyed models with lots of instances.
2009-07-06 08:31:24 +01:00
martin speleo
ff199f0d2f [svn] wiki_to_html changes.
Changes views of qm model.
2009-07-04 19:35:06 +01:00
substantialnoninfringinguser
49c12386a5 [svn] 2009-07-04 19:29:19 +01:00
substantialnoninfringinguser
ebebb2f4bc [svn] Remove old subcave model, along with mptt and feincms. Also move OtherCaveNames admin representation to an inline in Cave. 2009-07-04 19:26:51 +01:00
substantialnoninfringinguser
9d90506e1c [svn] 2009-07-04 18:41:48 +01:00
martin speleo
c5c22562e0 [svn] Initial and poor attempt at a view for cave descriptions. 2009-07-04 18:11:20 +01:00
martin speleo
84c973f291 [svn] Pareser for cave descriptions 2009-07-04 17:19:30 +01:00
martin speleo
0f8eb4d4e2 [svn] Changed addToArgsSurveyStation such that it does not pass a surveystation model to html_to_wiki. Which was unecessary as html_to_wiki returned it without modification. By removing it html_to_wiki can be cleaned up. 2009-07-04 17:08:48 +01:00
martin speleo
c377d0376f [svn] Work on turn html pages into cavedescription models.py.
Moved parser/cavetabs html_to_wiki function to utils.py
Added databaseReset.py desc to refresh the cavedescriptions.
2009-07-04 16:42:17 +01:00
martin speleo
fa9a6416d1 [svn] removed redundant import 2009-07-04 16:39:59 +01:00
substantialnoninfringinguser
b816463d1d [svn] * Adding JS fill in next QM number via ajax.
* Slight models cleanup- get rid of TroggleImageModel class, use mixin instead.
* Collect various troggle shared functions into utils.py
2009-07-04 08:27:49 +01:00
martin speleo
96533882c7 [svn] Added cavedescription and new subcave.
Changed parsers/survex to read *title into subcave
2009-07-04 00:28:28 +01:00
martin speleo
82cc8e1fe7 [svn] Change to get js in admin work for feincms 2009-07-04 00:26:12 +01:00
martin speleo
64db29fa98 [svn] Fixed the following of *includes by adding white space to the end of the regex. 2009-07-03 23:56:39 +01:00
substantialnoninfringinguser
4917d7e747 [svn] 2009-07-03 21:59:31 +01:00
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
martin speleo
50ae2a27f2 [svn] Remove broken import search 2009-07-03 21:04:28 +01:00
substantialnoninfringinguser
2c67994531 [svn] 2009-07-03 20:49:04 +01:00
substantialnoninfringinguser
83fa1ea9ac [svn] Brief code cleanup. 2009-07-03 05:31:49 +01:00
substantialnoninfringinguser
88aec344c4 [svn] whoops 2009-07-03 00:51:41 +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
substantialnoninfringinguser
9deaad4437 [svn] More fallout of renaming expo to core. Also fix 2009-07-02 23:02:42 +01:00
substantialnoninfringinguser
6daf57d8fe [svn] Fix leftover from expo -> core rename, and add databaseReset.py to README.txt 2009-07-02 22:31:28 +01:00
substantialnoninfringinguser
e565a6b73b [svn] Renaming troggle.expo to troggle.core. To do this, used:
perl -p -i -e "s/expo(?=[\s\.']+)/core/g" `find -name \*.py`

and then manually checked each change (had to remove a couple)
2009-07-02 20:43:18 +01:00
substantialnoninfringinguser
5baddea474 [svn] Add photos wiki syntaxes: e.g.
[[display:centre photo:andyc.jpg]] where centre is a class applied to image, and andyc.jpg is the filename of a Photo model instance. Image will be displayed as thumbnail with link to full size image.
[[photo:andyc.jpg]] will produce a link to the admin page for the andyc.jpg Photo model instance.
[[photo:andyc.jpg Title of the link]] will produce a link to the admin page for the andyc.jpg Photo model instance with link text "Title of the link"
2009-07-02 04:10:51 +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
goatchurch
a9c22a3cff [svn] with command option 2009-06-28 20:47:11 +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
5fc891195a [svn] Add readme with installation instructions. 2009-06-19 07:02:25 +01:00
substantialnoninfringinguser
3f290349aa [svn] Adding logbook export features. Troggle can now produce .txt or .html logbooks through the controlPanel or via an action in the LogbookEntry admin pages. 2009-06-18 06:53:52 +01:00
substantialnoninfringinguser
504a70f82b [svn] Whoops, forgot to add the file in last revision. 2009-06-14 04:36:19 +01:00