ExpoOnServer
9f9fbe33be
merging correct urls.py for /troggle dir in
2011-07-12 00:49:24 +01:00
ExpoOnServer
c7e58eb36d
I seem to be going wrong in circles here
2011-07-11 23:45:12 +01:00
Wookey
9e5e636d0d
really, really get all version the same!
2011-07-11 23:43:32 +01: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
Wookey
ded3d58da1
rest of martin's changes, without reverting lineend issues
2011-07-11 23:28:23 +01:00
Wookey
b6a1503c7a
Add changes from martin
2011-07-11 23:19:48 +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
Martin Green
27e224619e
Do not make an entrance redirect for entrances without there own pages
2011-07-11 22:37:49 +01:00
Martin Green
8c2cf48195
implemented mimetypes, index.htm(l) and fixed edit view
2011-07-11 22:36:48 +01:00
Martin Green
d3fb0352be
Change absolute url for caves to there expoweb url, such that links work
2011-07-11 22:35:32 +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
Wookey
a2e1882d91
undosify lineends
2011-07-11 01:49:03 +01:00
Wookey
0183f94780
merge martin's tip again
2011-07-11 00:52:58 +01:00
Martin Green
5cbfa6d8b1
Split up tags such that they use ajax
2011-07-11 00:50:07 +01:00
Wookey
cc8c47f21f
Merge from Martin's tip
2011-07-11 00:49:18 +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
db2d954b1d
Added flat pages for entrance and special flatpage redirects.
...
Enetrances should probably store their urls like cavers. Maybe the flatpages should be handled by the app Aaron installed.
2011-07-11 00:13:06 +01:00
Martin Green
4a88493afa
Removed links to removed forms
2011-07-11 00:04:30 +01:00
Martin Green
203719375e
slug views, start of cave eidt form, cavelist splitting up by kataster area etc.
2011-07-11 00:03:36 +01:00
Martin Green
06efab7d73
Added parsing of all.svx, along side parsing individual caves.
...
Added the making and parsing of all.pos to determine the location of stations.
Mare work is required so the caves are parsed and stored only once.
Survex parsing appears to include bugs, that print out errors.
2011-07-11 00:01:12 +01:00
Martin Green
425d38727d
Removed modelforms for Caves started to add normal forms
2011-07-10 23:57:31 +01:00
Martin Green
10351fc65b
Removed SurveyStation model (not SurvexStation)
2011-07-10 23:55:54 +01:00
Martin Green
b70995d314
Added THREEDTOPOS setting for survexs 3dtopos program
2011-07-10 23:53:32 +01:00
Martin Green
c4194be5f1
Added url to cave and turned entrances station names and removed the previous SurveyStation model.
...
Note caves should be rendered in the directory of their original url to make links work.
Note SurveyStations appeared to duplicate SurvexStations.
Note Given we want to be running from a mercurial repository, it is easiest to store the names of survey stations rather than foreign keys.
2011-07-10 23:52:18 +01:00
Martin Green
85318ac666
Add ability to views caves via their cave slug. Not recommended until links are fixed.
2011-07-10 23:48:13 +01:00
Martin Green
e8eb877229
Changed to regex to make 2003 expo logbooks parse
2011-07-10 23:45:45 +01:00
Martin Green
514169ec58
Added redmund style for jquery-ui
2011-07-10 23:40:52 +01:00
Wookey
1e1d63c768
merge fix from martin's tip.
2011-07-10 23:30:36 +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
expo
ca6e50b8ab
debug
2011-05-02 03:25:43 +01:00
Martin Green
12df0d417a
debug
2011-05-02 03:23:59 +01:00
Martin Green
8f7e416327
debug
2011-05-02 03:22:45 +01:00
Martin Green
326af86b84
Try to fake crsf tags so site works on djang0 1.1
2011-05-02 03:20:31 +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
925ed4635b
Get CSRF middleware to work on django 1.1- and 1.2+
2011-05-02 02:51:14 +01:00
Martin Green
9becad0d9a
Added ability to host website not at the root, eg. http://m.com/troggle/
2011-05-02 02:37:33 +01:00
Martin Green
4a3ccc728b
Debugging, and make get_name function accessable (should really be renamed)
2011-05-02 02:15:54 +01:00
Martin Green
3f4ba904e2
CRCF protection
2011-05-02 02:14:15 +01:00
Martin Green
9dd5d2ad16
decorator to check if user is logged in if settings.PUBLIC_SITE
2011-05-02 02:13:27 +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
254f028575
FIX2
2011-05-01 23:21:47 +01:00
Martin Green
5ade60e0cf
Fix
2011-05-01 23:11:18 +01:00
Martin Green
79562d8e6d
Added settings hooks for TinyMCE. On debian apt-get install tinymce python-django-tinymce
2011-05-01 19:58:38 +01:00
Martin Green
a26310767b
edit logbooks, new logbook format, increased database normalisation
2011-05-01 19:32:41 +01:00
Martin Green
d38a767d7c
Allow survey scans to be scrapped with a file in the top level directory of the year
2011-05-01 19:20:25 +01:00
Martin Green
4b2d18be69
Added variables to configure TinyMCE
2011-05-01 19:17:57 +01:00
