Wookey
ab97e367cb
merge from upstream
2011-09-15 12:13:07 +01:00
Wookey
ae693ca4c5
Add 2010 and 2011 logbooks to parsing list (can we make this auto
...
somehow - by agreeing a logbook format, or letting it guess)?
2011-09-15 12:12:18 +01:00
expo
77dea07b40
branch merge
2011-09-02 03:39:20 +02:00
expo
77dcf7f759
Remove old ref to goatchurch in localconfig
2011-09-01 01:50:51 +02:00
Martin Green
59e7c4d5df
Bug fix
2011-08-08 13:11:57 +01:00
Martin Green
0b5e57b85e
ignorecase when finding html tags
2011-08-08 12:58:02 +01:00
Martin Green
c623acf832
template changes. Fix link to css.
2011-08-08 12:40:47 +01:00
Martin Green
36b1888f46
Added 'page not found do you wnat to make this page' page. Minor tweaks
2011-08-08 12:18:47 +01:00
Martin Green
c09a668620
Fix logbook editing
2011-08-08 12:17:38 +01:00
Martin Green
e85c386375
=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
c66ecc4d7f
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
13fe89af9f
Allow for editing flatpage titles, and made a common uneditable list of links.
2011-08-08 09:51:47 +01:00
Martin Green
d8fe39ae86
Allow the viewing of noinfo caves on non public website without login
2011-08-08 08:51:12 +01:00
Martin Green
5f5359f933
Changed regex for finding head and body of flat pages.
2011-08-07 19:17:27 +01:00
Martin Green
e820a516de
bug fix for edit link for index files
2011-08-07 17:30:18 +01:00
expo
e9fdea80c0
Changed ubuntu local settings to be applicable to the expo machine
2011-08-07 16:12:52 +02:00
expo
9534bd8881
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
5be508620e
update localsettings for server and expo machine
2011-07-14 03:50:49 +01:00
Wookey
82e968d5c7
Attempt 17b to end with the right files as tip
2011-07-12 02:44:07 +01:00
Wookey
b4b060a962
Add odt and ods mime types to our list.
...
Maybe this should just be read in from the real list...
2011-07-12 00:57:48 +01:00
ExpoOnServer
64e5e9d45c
merging correct urls.py for /troggle dir in
2011-07-12 00:49:24 +01:00
ExpoOnServer
881215e815
Add empty troggle_log.txt file to save doing it by hand
2011-07-12 00:02:01 +01:00
ExpoOnServer
35cd983cc9
I seem to be going wrong in circles here
2011-07-11 23:45:12 +01:00
Wookey
0a70039dee
really, really get all version the same!
2011-07-11 23:43:32 +01:00
ExpoOnServer
18ccc57f87
add /troggle dir (Martin's changes to get main site back as entry point)
2011-07-11 23:35:11 +01:00
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
