Commit Graph

250 Commits

Author SHA1 Message Date
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
substantialnoninfringinguser
d71ef45bf8 [svn] Added beginnings subcaves parser. This required importing more information from cavetab, namely the location where the main cave page appeared on the old expo website. 2009-06-14 04:33:19 +01:00
substantialnoninfringinguser
5db52862f6 [svn] * Fix bugs that were causing broken wikilinks. *Add edit link to mugshots. *make admin url trailing-slash tolerant 2009-06-12 05:39:30 +01:00
substantialnoninfringinguser
0ed153f2d0 [svn] Just realized it makes no sense to have qms ticked off by a logbook entry as an inline. Instead, we need some kind of drop down list where ticked off qms can be searched for and selected. Should be doable. 2009-06-11 06:37:07 +01:00
substantialnoninfringinguser
a197172224 [svn] Edited wiki page through web user interface. 2009-06-11 06:35:18 +01:00
substantialnoninfringinguser
8d374c1761 [svn] Added detection of noinfo in cave parser. It sets the non_public flag to true, and the view then shows nonpublic.html instead of the cave if the user isn't logged in. 2009-06-10 17:47:05 +01:00
substantialnoninfringinguser
6e3b99c8d2 [svn] Whoops, forgot the template during last commit. 2009-06-10 06:37:38 +01:00
substantialnoninfringinguser
11c42ed60e [svn] * Added non-public field for protecting copyright info etc. Field is on all models but needs to be checked for in views. So far, only the cave view checks.
* Added the Person wiki syntax which looks like [[person:John Doe]]
2009-06-10 06:34:50 +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
d89a4b6958 [svn] Created wiki page through web user interface. 2009-06-10 00:22:29 +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
05e7b1d456 [svn] backup settings 2009-06-09 19:52:32 +01:00
goatchurch
c2a72ab4f1 [svn] fix the revert and css 2009-06-09 19:15:31 +01:00
goatchurch
2927e27b6d [svn] the ajax page 2009-06-09 19:13:48 +01:00
goatchurch
91b9d80367 [svn] codemirror 2009-06-09 18:59:54 +01:00
substantialnoninfringinguser
2169e82455 [svn] fix logfile setting 2009-06-09 18:20:55 +01:00
substantialnoninfringinguser
8b7e4be068 [svn] Edited wiki page through web user interface. 2009-06-09 02:29:21 +01:00
substantialnoninfringinguser
82f668b242 [svn] Edited wiki page through web user interface. 2009-06-09 02:21:30 +01:00
substantialnoninfringinguser
defb382a81 [svn] Created wiki page through web user interface. Lost the goddamn thing twice now due to browser crash and stupid back button so it's not done but I'm saving it anyway! 2009-06-09 02:06:13 +01:00
substantialnoninfringinguser
f797dacb47 [svn] Removed redundant fields "date" and "place" from Persontrip model. A PersonTrip's date and place are stored in its parent LogbookEntry. PersonTrips are the people who participate in the trip in a LogbookEntry, so it would make no sense to have different dates and places from the LogbookEntry they are foreignkeyed to. 2009-06-09 00:29:00 +01:00
substantialnoninfringinguser
d645660c50 [svn] Rewrote get_absolute_url methods of models to use urlparse.urljoin instead of just +ing the urls together. This fixes problems with double slashes. 2009-06-08 20:16:18 +01:00
pjrharley
096f74a3f3 [svn] A few registration updates
-display an error for nonmatching passwords
-display an error for short passwords
-dont direct people to http://http://sitename....
2009-05-30 16:17:19 +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
pjrharley
18e080418f [svn] Use the django compatability thing - webserver might have old python on it.... 2009-05-23 21:13:53 +01:00
substantialnoninfringinguser
4ba77b9c2f [svn] Fix mistakes in export admin actions. The python serializer only works on simple objects (lists, dicts etc) and not model instances so nix that part. 2009-05-23 20:46:10 +01:00
substantialnoninfringinguser
470fe5a1d1 [svn] Re-enable JSON and XML export actions in admin pages now that troggle is using latest SVN version of Django. 2009-05-23 20:37:42 +01:00
substantialnoninfringinguser
32a7d5e79f [svn] Fix broken admin link. 2009-05-23 20:06:05 +01:00
substantialnoninfringinguser
9006016bfd [svn] fix imports 2009-05-23 16:51:21 +01:00
substantialnoninfringinguser
941ff3fdac [svn] Created wiki page through web user interface. 2009-05-22 22:38:41 +01:00