Wookey
c23fcc5b06
rest of martin's changes, without reverting lineend issues
2011-07-11 23:28:23 +01:00
Wookey
21ff3b8b5d
Add changes from martin
2011-07-11 23:19:48 +01:00
Martin Green
97c388dba0
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
10799e2ce3
Do not make an entrance redirect for entrances without there own pages
2011-07-11 22:37:49 +01:00
Martin Green
7ef6b1fcc2
implemented mimetypes, index.htm(l) and fixed edit view
2011-07-11 22:36:48 +01:00
Martin Green
7a220b4c87
Change absolute url for caves to there expoweb url, such that links work
2011-07-11 22:35:32 +01:00
Wookey
dc1327674c
remove all the DOS linefeeds
2011-07-11 02:10:22 +01:00
Wookey
c8ff8e3ef6
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
f766df597c
undosify lineends
2011-07-11 01:49:03 +01:00
Wookey
bab92cb88c
merge martin's tip again
2011-07-11 00:52:58 +01:00
Martin Green
5d8a5494cd
Split up tags such that they use ajax
2011-07-11 00:50:07 +01:00
Wookey
129d93dfa7
Merge from Martin's tip
2011-07-11 00:49:18 +01:00
Martin Green
65c55f0f21
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
8578a3097a
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
de5f68e42c
Removed links to removed forms
2011-07-11 00:04:30 +01:00
Martin Green
f44b0be459
slug views, start of cave eidt form, cavelist splitting up by kataster area etc.
2011-07-11 00:03:36 +01:00
Martin Green
a128401d49
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
5075ded032
Removed modelforms for Caves started to add normal forms
2011-07-10 23:57:31 +01:00
Martin Green
47c2e87979
Removed SurveyStation model (not SurvexStation)
2011-07-10 23:55:54 +01:00
Martin Green
53352e7987
Added THREEDTOPOS setting for survexs 3dtopos program
2011-07-10 23:53:32 +01:00
Martin Green
44f86a7d6f
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
c37124d9c4
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
69ab1e0249
Changed to regex to make 2003 expo logbooks parse
2011-07-10 23:45:45 +01:00
Martin Green
2fd8052ac2
Added redmund style for jquery-ui
2011-07-10 23:40:52 +01:00
Wookey
28924db9f8
merge fix from martin's tip.
2011-07-10 23:30:36 +01:00
Martin Green
50545af223
Added editing of flat pages. Added slugfields to models to refer to them.
2011-06-02 19:16:16 +01:00
expo
30829ff9c8
debug
2011-05-02 03:25:43 +01:00
Martin Green
ede9e4a9bd
debug
2011-05-02 03:23:59 +01:00
Martin Green
04d0e80430
debug
2011-05-02 03:22:45 +01:00
Martin Green
366d4736ca
Try to fake crsf tags so site works on djang0 1.1
2011-05-02 03:20:31 +01:00
Martin Green
f3391a912e
Attempt to get CSRF tag not breaking django 1.1
2011-05-02 03:13:54 +01:00
Martin Green
52eb4030d0
Attempt to get csrf tag working in django 1.1-
2011-05-02 03:11:17 +01:00
Martin Green
835680f0ee
Get CSRF middleware to work on django 1.1- and 1.2+
2011-05-02 02:51:14 +01:00
Martin Green
cdf54e0f9b
Added ability to host website not at the root, eg. http://m.com/troggle/
2011-05-02 02:37:33 +01:00
Martin Green
b439d40120
Debugging, and make get_name function accessable (should really be renamed)
2011-05-02 02:15:54 +01:00
Martin Green
cb744ddeef
CRCF protection
2011-05-02 02:14:15 +01:00
Martin Green
872ffe5882
decorator to check if user is logged in if settings.PUBLIC_SITE
2011-05-02 02:13:27 +01:00
Martin Green
671e946c6d
settings.PUBLIC_SITE, login required if public for logbook entry, CRCF middleware
2011-05-02 02:12:26 +01:00
Martin Green
3928609c29
Bug fix to expedition links
2011-05-02 00:56:53 +01:00
Martin Green
e942c839a1
Link to expowebsite
2011-05-02 00:53:44 +01:00
Martin Green
bff34aafb9
FIX2
2011-05-01 23:21:47 +01:00
Martin Green
7623943f3e
Fix
2011-05-01 23:11:18 +01:00
Martin Green
6d7691791a
Added settings hooks for TinyMCE. On debian apt-get install tinymce python-django-tinymce
2011-05-01 19:58:38 +01:00
Martin Green
b001df1f53
edit logbooks, new logbook format, increased database normalisation
2011-05-01 19:32:41 +01:00
Martin Green
1cc7f2d92e
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
7a0a898bc6
Added variables to configure TinyMCE
2011-05-01 19:17:57 +01:00
Martin Green
41aca4e2d7
Added files for jQuery to allow for UI and dynamic formsets.
2011-05-01 19:15:34 +01:00
Martin Green
7e89b12004
Setup files for hg to ignore (*.pyc, db*, localsettings.py)
2011-05-01 19:13:07 +01:00
Aaron Curtis
7bac9f829e
Renaming main branch from 'svn' to 'default' per mercurial convention.
...
Hopefully this will keep the main branch as the active one, so the Erebus branch is only used if requested.
2009-09-27 00:43:01 -06:00
goatchurch
2435639498
rolled back a bad update
2009-09-14 23:23:09 +01:00
