Sam Wenham
ffb5d7bdda
Upgrade to django 1.5, some functions have been changed
...
url in templates now requires quotes roung the first arg
USE_TZ added
2018-04-11 22:02:57 +01:00
Wookey
f0e1406c5f
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
27fca090fc
Bring troggle a little more up to date
2016-09-04 13:47:26 +01:00
expo
716131f005
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
edc6591554
Correct typo on cave and entrance template files
...
('If you edit this files...')
2016-01-27 04:24:44 +00:00
Sam Wenham
480541ae54
Add a little style
2015-06-28 13:52:33 +01:00
Sam Wenham
60303d041c
Remove unnecessary escape slashes
2015-06-28 13:46:28 +01:00
expo
a4651eaa0a
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
4771f52b20
Have different links for system js files and troggle js files
2015-06-21 15:06:44 +01:00
Wookey
d29fe2ee1c
Merge in Sam's parser debugging
2015-04-08 03:27:48 +01:00
Sam Wenham
3010961383
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
5ff759db93
Fix templates to use system javascript for jquery, jquery-ui and
...
jquery-ui themes
2014-09-11 07:38:45 +01:00
expo
da71cca22f
Prospecting guide and images and few minor other things.
2013-08-01 17:00:01 +02:00
Wookey
5351108ec1
merged in proper CSRF changes from server
2013-07-02 20:23:55 +01:00
Wookey
d1ad8730d7
Add CSRF protection to registration form (and remove annoying second
...
password)
2013-07-02 18:10:45 +01:00
wookey
f3a570a21d
Add csrf token to registration forms
2013-07-02 17:26:35 +01:00
wookey
7f108f6d9a
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
ccd80e74f8
Change template headers to show 2012/2013 as shortcuts
2013-06-23 03:19:41 +01:00
Martin
cfc90deb83
Merge
2012-08-14 23:49:26 +02:00
Martin
1a0e577606
Bug fixing of cave and entrance forms removal of slugs
2012-08-14 22:51:15 +02:00
Martin
8e64062214
added entrance locations
2012-08-14 15:08:08 +02:00
expo
ecd5bbcb1d
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
6d5babd331
Prospecting template
2012-08-10 19:34:44 +02:00
Martin Green
79b7d32664
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
1ef274ec1d
Editing no longer changes files more than nesecary. Removed TinyMCE editing. /Sumbit/Submit
2012-08-06 12:19:48 +02:00
expo
0f5627505f
Fix broken markup
2012-08-05 21:37:46 +02:00
expo
9654e5da1c
FIx base template so admin link, expoweb link work and use consistent base URL
2012-08-05 02:33:48 +02:00
Martin Green
711fefb0da
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
fd12e70f78
Editing for entrances along with caves
...
More detailed display of entrances
2012-05-23 09:23:40 +01:00
Martin Green
fac89bae30
Render a cave editing page. Nb it does not do save anything yet.
2012-01-07 19:05:25 +00: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
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
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
18ccc57f87
add /troggle dir (Martin's changes to get main site back as entry point)
2011-07-11 23:35:11 +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
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
Martin Green
5d8a5494cd
Split up tags such that they use ajax
2011-07-11 00:50:07 +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
50545af223
Added editing of flat pages. Added slugfields to models to refer to them.
2011-06-02 19:16:16 +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
cb744ddeef
CRCF protection
2011-05-02 02:14:15 +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
b001df1f53
edit logbooks, new logbook format, increased database normalisation
2011-05-01 19:32:41 +01:00
expo
2be3e4ce9d
get survey scans into database
2009-09-14 23:09:50 +01:00
goatchurch
1294444026
make 2008 logbook correctly parse
2009-09-14 22:52:46 +01:00
goatchurch
7578b65573
able to save sketches up from tunnel
2009-09-13 17:27:46 +01:00
goatchurch
ced45c92f7
tunnelfiles scheme added
2009-09-11 23:56:47 +01:00
goatchurch
f21cddb2d0
modelviz added
2009-09-11 09:04:59 +01:00
goatchurch
735b729a41
survey scans features added
2009-09-10 22:07:31 +01:00
goatchurch
41eaa06e55
login required for saving survex files
2009-08-29 18:34:01 +01:00
goatchurch
7429749004
login required for saving survex files
2009-08-29 18:33:44 +01:00
expo
29adaa03c6
get rid of photo
2009-08-29 18:08:55 +01:00
goatchurch
c66b5e2dad
[svn] latest hacking for various statistics
2009-08-05 11:58:36 +01:00
goatchurch
9077462893
[svn] now with ability to make new svx file
2009-08-01 07:31:27 +01:00
goatchurch
68060d6118
[svn] some file reading things
2009-07-27 13:42:54 +01:00
substantialnoninfringinguser
263b640641
[svn] Various bug fixes, using more raw_id fields in admin so it loads faster. I had to put onLoad="contentHeight();" back into the base template. This is a bad solution, I would rather use Martin's, but it wasn't working.
2009-07-22 16:18:00 +01:00
substantialnoninfringinguser
2993ca74cc
[svn] override save for CaveDescriptions to scan qm wikilinks and add into the manytomany field linked_qms
2009-07-11 01:36:00 +01:00
substantialnoninfringinguser
4f0271ad49
[svn]
2009-07-04 18:41:48 +01:00
martin speleo
7fc1602f7a
[svn] Initial and poor attempt at a view for cave descriptions.
2009-07-04 18:11:20 +01:00
martin speleo
4da6203828
[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
substantialnoninfringinguser
8446047ab2
[svn] Brief code cleanup.
2009-07-03 05:31:49 +01:00
substantialnoninfringinguser
a89139763f
[svn] Use template block "related" for related objects. Various cleanup, fix personexpedition date views.
2009-07-03 00:50:56 +01:00
martin speleo
620040bde1
[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
22aa9990a5
[svn] Have different css for plain and eye candy views.
2009-06-28 22:23:56 +01:00
martin speleo
ca7bc171c9
[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
b4a63eca02
[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
9b44731c33
[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
e4ea57932e
[svn] Whoops, forgot the template during last commit.
2009-06-10 06:37:38 +01:00
substantialnoninfringinguser
1d421b2d7c
[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
85ada36973
[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
goatchurch
d87f221a2b
[svn] fix the revert and css
2009-06-09 19:15:31 +01:00
goatchurch
6237a19d17
[svn] the ajax page
2009-06-09 19:13:48 +01:00
goatchurch
17175637dc
[svn] codemirror
2009-06-09 18:59:54 +01:00
substantialnoninfringinguser
012d948193
[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
a048adcdac
[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
b091e8eb09
[svn] Have control panel display an error for logged in, non-superuser users.
2009-05-24 23:24:59 +01:00
substantialnoninfringinguser
93a68ff43e
[svn] Fix broken admin link.
2009-05-23 20:06:05 +01:00
pjrharley
f4405a16f1
[svn] Dont say activation failed if it didn't\!
2009-05-22 21:02:48 +01:00
pjrharley
025b743070
[svn] Accidentally commited another change... so might as well add the template to go with it. Send activation email as text and html so the link is clickable
2009-05-22 21:02:24 +01:00
substantialnoninfringinguser
75f782ab71
[svn] more survey binder updates
2009-05-22 06:49:13 +01:00
substantialnoninfringinguser
832f56a6d0
[svn] fix wrongly named template tags
2009-05-22 06:43:25 +01:00
substantialnoninfringinguser
f6d3a7c84e
[svn] switched from dodgy manually writing to logfile to using python's logging module, which seems great
2009-05-22 06:17:24 +01:00
substantialnoninfringinguser
c38dfd20a1
[svn] * Make subcave urls work.
...
* Add json and xml download to admin.
2009-05-22 01:50:16 +01:00
substantialnoninfringinguser
e336e9c770
[svn] allow the recreate tables thing on control panel to work
2009-05-21 20:46:24 +01:00
substantialnoninfringinguser
891b3abb44
[svn] Updates to allow subcave tree with nice admin.
2009-05-21 19:47:19 +01:00
substantialnoninfringinguser
2c2f11be39
[svn]
2009-05-19 06:32:42 +01:00
substantialnoninfringinguser
d71078d03d
[svn]
2009-05-18 04:30:26 +01:00
substantialnoninfringinguser
12009e36df
[svn] Turn main menu into dropdown (well actually, drop up) menu.
2009-05-18 04:25:42 +01:00
substantialnoninfringinguser
21c39f70de
[svn] - Make control panel downloads (qm.csv for each cave, CAVETAB2.CSV) work.
...
- Fix problems in QM parsing script
2009-05-17 04:31:23 +01:00
substantialnoninfringinguser
7566faf77b
[svn] Make the workaround to avoid parsing interlaced pngs actually work (see issue # 14)
2009-05-15 03:56:11 +01:00
substantialnoninfringinguser
d8a215a575
[svn] Add: new generic object list template object_list.html, and convenience filter named "link" for making links from objects, and make expeditions list page using those two. Also, fixed survey parsing in databaseReset.py
2009-05-15 03:29:19 +01:00
substantialnoninfringinguser
118d132797
[svn] Forgot to upload with earlier commit
2009-05-14 14:24:46 +01:00
substantialnoninfringinguser
191619e6d8
[svn] Add link to google code issue tracker
2009-05-13 07:01:45 +01:00
