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

160 Commits

Author SHA1 Message Date
Wookey
6481fda4d7 Update old website base URL in template from cucc.survex.com/expo to expo.survex.com 2018-02-28 15:55:00 +00:00
Sam Wenham
93d1c330c1 Bring troggle a little more up to date 2016-09-04 13:47:26 +01:00
expo
0239800ff1 Fix cave pages to have entrances and description on one page. 
Fixes broken links on description and entrance pages.
Removes need for jquery-ui.
 2016-07-02 23:42:47 +01:00
Wookey
b63ac24468 Correct typo on cave and entrance template files 
('If you edit this files...')
 2016-01-27 04:24:44 +00:00
Sam Wenham
a024475446 Add a little style 2015-06-28 13:52:33 +01:00
Sam Wenham
d9a78fe2ab Remove unnecessary escape slashes 2015-06-28 13:46:28 +01:00
expo
45fd219bc6 Added warnings that the database will need updating is cave or entrance data files are modified 2015-06-21 15:11:51 +01:00
expo
9fd6163704 Have different links for system js files and troggle js files 2015-06-21 15:06:44 +01:00
Wookey
dc385b52bf Merge in Sam's parser debugging 2015-04-08 03:27:48 +01:00
Sam Wenham
9961c31e73 Try and ignore files that don't end .html (We really need to change to .xml) eg .html.orig!! 
Change the index on troggle to move on with the year
 2015-01-19 21:28:35 +00:00
Wookey
814ecf8425 Fix templates to use system javascript for jquery, jquery-ui and 
jquery-ui themes
 2014-09-11 07:38:45 +01:00
expo
df8618d0f0 Prospecting guide and images and few minor other things. 2013-08-01 17:00:01 +02:00
Wookey
ecfa6b19a0 merged in proper CSRF changes from server 2013-07-02 20:23:55 +01:00
Wookey
ed13cca261 Add CSRF protection to registration form (and remove annoying second 
password)
 2013-07-02 18:10:45 +01:00
wookey
0dfbd1c84f Add csrf token to registration forms 2013-07-02 17:26:35 +01:00
wookey
ce249ab957 Set title to show 1976-2013 
Put quick link to 2011 back as that one works
 2013-07-02 00:33:53 +01:00
wookey
25c951b250 Change template headers to show 2012/2013 as shortcuts 2013-06-23 03:19:41 +01:00
Martin
71289d9b0f Merge 2012-08-14 23:49:26 +02:00
Martin
25a73c4ab7 Bug fixing of cave and entrance forms removal of slugs 2012-08-14 22:51:15 +02:00
Martin
29c2c5f88d added entrance locations 2012-08-14 15:08:08 +02:00
expo
28047277f1 Started removing foreignkeys to caves, to achieve greater flexability. Some log book entries stuff may be broken. Add ability to make new caves and entrances via website. 2012-08-12 19:10:23 +02:00
Martin Green
5ff163efaa Prospecting template 2012-08-10 19:34:44 +02:00
Martin Green
52736ca1b3 Made a prospecting guide and fixed survex station description. Removed parsing of underground descriptions to wikis. 2012-08-10 19:02:13 +02:00
expo
44eb3c0caf Editing no longer changes files more than nesecary. Removed TinyMCE editing. /Sumbit/Submit 2012-08-06 12:19:48 +02:00
expo
c221b75afc Fix broken markup 2012-08-05 21:37:46 +02:00
expo
0785455bac FIx base template so admin link, expoweb link work and use consistent base URL 2012-08-05 02:33:48 +02:00
Martin Green
9024520184 Start to change dataformat for caves, along with there editing. Start to change survex reader to cope better with equates/tags. 2012-06-10 14:59:21 +01:00
Martin Green
52620ea1c5 Editing for entrances along with caves 
More detailed display of entrances
 2012-05-23 09:23:40 +01:00
Martin Green
599c59454a Render a cave editing page. Nb it does not do save anything yet. 2012-01-07 19:05:25 +00:00
Martin Green
fe1989001c template changes. Fix link to css. 2011-08-08 12:40:47 +01:00
Martin Green
3205e1752c Added 'page not found do you wnat to make this page' page. Minor tweaks 2011-08-08 12:18:47 +01:00
Martin Green
57ace11427 =Make a common base for expoweb pages. Ignore any header information in expoweb except titles. 2011-08-08 10:58:50 +01:00
Martin Green
4c4b6ef11f Allow pages to be rendered when the body tag has attributes. Put an edit link on the homepage. 2011-08-08 10:04:59 +01:00
Martin Green
d75bad22de Allow for editing flatpage titles, and made a common uneditable list of links. 2011-08-08 09:51:47 +01:00
expo
b1b91d3f62 Make caveindex link to urls in the original hierachy such that their 
hyperlinks and images work.
 2011-08-07 16:11:35 +02:00
ExpoOnServer
0bfcbdc9cc add /troggle dir (Martin's changes to get main site back as entry point) 2011-07-11 23:35:11 +01:00
Martin Green
3b028661f6 Moved troggle main page to /troggle added a link in flat pages. 
Now / takes you to the expoweb index page
 2011-07-11 22:38:40 +01:00
Wookey
78cedb2070 remove all the DOS linefeeds 2011-07-11 02:10:22 +01:00
Wookey
cc27334193 Add /index.htm to EXPOWEB root URL in main template so that you get 
the static stuff
 2011-07-11 01:55:12 +01:00
Martin Green
5cbfa6d8b1 Split up tags such that they use ajax 2011-07-11 00:50:07 +01:00
Martin Green
861daee66f Removed conversion to wiki, replaced Surveystation models with text, added area 1623 to all relevant caves. 2011-07-11 00:15:59 +01:00
Martin Green
f318105a9b Added editing of flat pages. Added slugfields to models to refer to them. 2011-06-02 19:16:16 +01:00
Martin Green
af34cdb498 Attempt to get CSRF tag not breaking django 1.1 2011-05-02 03:13:54 +01:00
Martin Green
289b882a15 Attempt to get csrf tag working in django 1.1- 2011-05-02 03:11:17 +01:00
Martin Green
3f4ba904e2 CRCF protection 2011-05-02 02:14:15 +01:00
Martin Green
f178fff0b9 settings.PUBLIC_SITE, login required if public for logbook entry, CRCF middleware 2011-05-02 02:12:26 +01:00
Martin Green
d49271ddcf Bug fix to expedition links 2011-05-02 00:56:53 +01:00
Martin Green
fe221f40e7 Link to expowebsite 2011-05-02 00:53:44 +01:00
Martin Green
a26310767b edit logbooks, new logbook format, increased database normalisation 2011-05-01 19:32:41 +01:00
expo
df97991143 get survey scans into database 2009-09-14 23:09:50 +01:00