Martin Green
d4c213e0b3
Merge branch 'python3-new' of ssh://expo.survex.com/home/expo/troggle into python3-new
2022-07-15 14:06:43 +01:00
Martin Green
3748840e23
Removed extranious characters where there is one unnnumbered entrance.
2022-07-15 14:05:48 +01:00
Philip Sargent
02cf9b1c22
fixing Beckas complaint
2022-07-15 16:04:07 +03:00
Martin Green
a1560c60c6
Added kataster number to cave heading
2022-07-15 13:42:58 +01:00
Philip Sargent
d3572e18c3
QM reports all working
2022-07-06 17:35:08 +03:00
Philip Sargent
ee4237b14c
cleaner template pages
2022-07-06 13:44:40 +03:00
Philip Sargent
848043f7f4
Linkt to QMs on cave page
2022-07-06 11:39:19 +03:00
Philip Sargent
0ea3ed1ef2
Not quite so broken QMs from survex files
2022-07-05 22:40:58 +03:00
Philip Sargent
2bd617b543
Fixed QM report for survex-imported QMs
2022-07-05 20:24:51 +03:00
Philip Sargent
96101252bd
Documn link
2022-07-05 17:40:31 +03:00
Philip Sargent
9d4a97fc19
Tidy HTML output
2022-07-05 17:02:43 +03:00
Philip Sargent
c9a33a4010
bug fix for forgotten href
2022-07-05 16:34:08 +03:00
Philip Sargent
779afc2f2a
QM report pages now not crashing, working..
2022-07-05 15:38:23 +03:00
Philip Sargent
a11541eb58
prefetch_related initial attempts
2022-07-05 14:14:03 +03:00
Martin Green
dbe6d10fff
Revert "Added some test pages showing different ways pages could be edited. This probably wants removing soon"
...
This reverts commit 2af88353f3
2022-06-28 00:24:57 +01:00
Martin Green
2af88353f3
Added some test pages showing different ways pages could be edited. This probably wants removing soon
2022-06-28 00:18:24 +01:00
Martin Green
82fe350493
Added HTMLarea widget to the edit entrance form
2022-06-27 00:34:08 +01:00
Martin Green
47d1662033
Added help writing HTML in the cave editing form. Made the HTML previews optional
2022-06-26 21:29:46 +01:00
Martin Green
4e5d8d1d76
Refactored code, with an aim of allowing more than one HTMLarea on a page
2022-06-26 18:29:20 +01:00
Martin Green
f1fcef2a6f
Refactorising CodeMirror HTML editor, with an ultimate aim to make it reusable. However more work if required...
2022-06-26 14:16:42 +01:00
Martin Green
20583b04c0
Allowed user to select/upload images when editing. When uploaded thumbnails and description pages are automatically created. Git commiting can now handle multiple files at once.
2022-06-25 23:17:19 +01:00
Martin Green
d607b30953
Do not allow for the main menu to be overriden, instead display old menu at bottom of page. To do this the id of the main menu was changed from links to menulinks
2022-06-25 01:07:17 +01:00
Martin Green
48f82aaaca
Merge branch 'python3-new' of ssh://expo.survex.com/home/expo/troggle into python3-new
2022-06-24 21:58:21 +01:00
Martin Green
5ac2e24cc2
Removed jQuery
2022-06-24 21:58:00 +01:00
Philip Sargent
d6db942626
Useful datamanagement link
2022-06-24 23:18:10 +03:00
Martin Green
7db7c67065
Added link to parent cave in menu
2022-06-24 19:28:31 +01:00
Martin Green
ceb6d2fef1
Added a sub menu when in the handbook directory. Imcreased width of edit preview
2022-06-24 15:48:35 +01:00
Martin Green
b38412b145
Added come mirror for the edit page, including some buttons to make html
2022-06-24 14:39:09 +01:00
Philip Sargent
6de9181390
Put inside if clause if attribute does not exist
2022-06-23 18:44:53 +03:00
Philip Sargent
b259e43de2
bad CSS from typo
2022-05-19 16:13:35 +03:00
Philip Sargent
a7baf4f3e6
restore Sit Index menu item
2022-05-19 15:58:54 +03:00
Philip Sargent
f05e885517
workaround security update on distsortreversed
...
Due to Django security update CVE-2021-45116 which removed the capability of resolving a method in a template when called dictsortreversed
2022-04-23 22:42:46 +03:00
Philip Sargent
9ead6b00f9
warning text for broken table in page, pending fix
2022-04-20 23:18:05 +03:00
Philip Sargent
c9931fd45e
survey legs calc fixed
2022-04-18 23:33:04 +03:00
Expo on server
fe53b08f35
Update the 'pagenotfound' page to reflect what users see.
2022-04-09 22:59:47 +01:00
Philip Sargent
efeb0efd1e
umlauts and edit this page
2022-03-25 02:05:10 +00:00
Philip Sargent
1589188988
enable wallet view even if not logged in
2022-03-24 20:45:15 +00:00
Philip Sargent
70efb10ece
reordered main menu
2022-03-23 11:32:36 +00:00
Philip Sargent
f1b206ad34
fixing bugs after wookey session
2022-03-22 02:22:15 +00:00
Philip Sargent
48171ae824
better fix
2022-03-18 20:45:40 +00:00
Philip Sargent
28fb4d1e94
|Another subtle bug
2022-03-18 20:43:01 +00:00
Philip Sargent
1d504e4066
bugfix
2022-03-18 20:09:49 +00:00
Philip Sargent
6a18511dd0
Fixing URLs for cave descriptions
2022-03-18 20:00:15 +00:00
Philip Sargent
8b889ade5f
Fix scanned walletindex pages
2022-03-18 12:26:32 +00:00
Philip Sargent
af7fc8f243
use new upload page for most wallets
2022-03-18 11:28:35 +00:00
Philip Sargent
e4ee4abce8
missing print msg
2022-03-18 10:21:25 +00:00
Philip Sargent
2544bc5f3d
extra cross link URL to wallet reports
2022-03-18 02:49:45 +00:00
Philip Sargent
19d017a457
Edit contents.json online
2022-03-17 00:41:29 +00:00
Philip Sargent
6bdd9be092
contnets.json now visible on form
2022-03-15 19:15:45 +00:00
Philip Sargent
3390f51049
Form creates wallet folder and contents.json
2022-03-15 17:04:43 +00:00
Philip Sargent
fac748d2e2
Better table titles
2022-03-13 23:48:22 +00:00
Philip Sargent
b65639df05
Upload form for Photos
2022-03-13 01:01:00 +00:00
Philip Sargent
f99ebf84e9
running cavern on svx files improved
2022-03-11 16:22:37 +00:00
Philip Sargent
8e78dd4a2e
update menu
2022-03-10 22:59:47 +00:00
Philip Sargent
822f8a1699
Fix URL bug
2022-03-10 18:58:58 +00:00
Philip Sargent
488ce46d73
File upload forms descriptions
2022-03-08 22:59:04 +00:00
Philip Sargent
f32df567f2
Updated troggle menu with 2022 caves
2022-03-08 09:34:52 +00:00
Philip Sargent
3ac617431f
Make .3d files in same dir as .svx
2022-03-06 01:29:45 +00:00
Philip Sargent
7a58aac08e
Drawings uploads git works
2022-03-05 22:16:03 +00:00
Philip Sargent
a3a65524b8
better errors for drawings parsing & upload
2022-03-05 20:29:01 +00:00
Philip Sargent
d7fd6b00ae
Detect unwriteable file permissions earlier
2022-03-05 17:05:15 +00:00
Philip Sargent
32377f4e6c
Cave import & reports fixes
2022-03-05 12:20:26 +00:00
Philip Sargent
601fc2cffc
WORKING Dj2.2.24 & 2.2.25 py3.7
2022-03-02 21:15:24 +00:00
Philip Sargent
8bd20f9600
Prospecting guide disabled - 100s bad URLs
2022-02-28 15:46:19 +00:00
Philip Sargent
7f542b8936
LIBDIR automatically gets right python version
2022-02-25 18:33:34 +00:00
Philip Sargent
2c13c1b5f3
remove 'testing' from menu template too
2022-02-23 23:04:00 +00:00
Philip Sargent
29c929aba4
Update title to 2022
2022-02-23 22:52:55 +00:00
Philip Sargent
ab8813e389
capture git subprocess errors
2021-12-30 23:27:42 +00:00
Philip Sargent
21ad6ecffb
New debug page for subprocess runs
2021-12-30 22:46:34 +00:00
Philip Sargent
928c451040
msg that control panel not working
2021-12-30 00:55:42 +00:00
Philip Sargent
406b4590a9
fix tests to match new error messages
2021-12-05 21:45:06 +00:00
Philip Sargent
b3aa99f008
Better error msgs for bad slugs
2021-12-05 21:23:06 +00:00
64f89be6a9
docm .3d file generation for CaveView
2021-11-06 23:57:51 +02:00
73ffb509f7
CaveView status is now documented
2021-11-06 22:59:10 +02:00
5723f57fc5
Add crossrefs to handbook UTM pages, laser points
2021-11-06 00:15:24 +02:00
bf5d0556fc
remove broken and ancient AERW map images
2021-10-26 19:00:18 +03:00
c774b14e04
remove unused JS code after checking it is redundant
2021-10-26 01:02:27 +03:00
b6bbec235c
Remove refs to absent and unused JS & CSS
2021-10-25 01:00:02 +03:00
5533029072
tried old jquery CSS
2021-10-25 00:38:24 +03:00
5807e4a873
tidying unused and unavailable JSLIB bits
2021-10-25 00:04:02 +03:00
Philip Sargent
e42cb582c7
1988, 1989 still bad
2021-05-09 00:55:37 +01:00
Philip Sargent
39cd616c90
survexstations also tabulated
2021-05-07 23:46:11 +01:00
Philip Sargent
8c5fdf5021
Entrance locations new report - url to cave
2021-05-07 23:21:57 +01:00
Philip Sargent
1ff723554c
Northings and Easting report
2021-05-07 22:42:10 +01:00
Philip Sargent
d374779c47
dwg upload and django admin extra search
2021-05-05 00:35:10 +01:00
Philip Sargent
b3fcd7765e
renamed to uploadfiles
2021-05-04 20:56:44 +01:00
Philip Sargent
b4abd7b6bc
menu update
2021-05-04 15:44:46 +01:00
Philip Sargent
56c3517328
fixed url ambiguity by rename
2021-05-04 14:16:48 +01:00
Philip Sargent
90bb0759a0
Drawing files upload form
2021-05-04 02:46:56 +01:00
Philip Sargent
e6adced39d
removed menu link to edit database object directly
2021-05-03 21:21:28 +01:00
Philip Sargent
3393db0fbc
Bigger buttons, phone compatible
2021-05-01 18:35:08 +01:00
Philip Sargent
100209ea16
add cave column to wallets report
2021-05-01 00:19:04 +01:00
Philip Sargent
425b534c30
add wallet column to expo report
2021-05-01 00:18:39 +01:00
Philip Sargent
63640db81f
remove unused templatetags load
2021-05-01 00:18:13 +01:00
Philip Sargent
b545f8ed40
cleaned & removed defunct wiki_to_html
2021-04-30 22:44:03 +01:00
Philip Sargent
be0148d146
removing cruft, renaming badly named things
2021-04-30 21:32:53 +01:00
Philip Sargent
8f1d6e2cc2
file upload integration test working
2021-04-30 18:02:05 +01:00
Philip Sargent
bdf535fcbf
Scan Upload working nicely
2021-04-30 03:44:53 +01:00
Philip Sargent
03a5f5989e
chipping away bug in personexpedition, remove role
2021-04-30 00:24:36 +01:00
Philip Sargent
e5cf1b5289
download logbook in standard HTML works
2021-04-28 02:43:09 +01:00
Philip Sargent
62799d196b
tabs to spaces
2021-04-28 00:50:36 +01:00
Philip Sargent
5e478c7eb0
Imports in control panel work again
2021-04-27 20:44:24 +01:00
Philip Sargent
942cbdd4b2
clean out broken QM bits
2021-04-27 15:38:20 +01:00
Philip Sargent
81d58f1275
delete: never implemented properly
2021-04-27 14:50:26 +01:00
Philip Sargent
49b9225b6e
rename scansfolder to wallet
2021-04-26 19:50:03 +01:00
Philip Sargent
7f64670f36
reanme manyscansfolders to manywallets
2021-04-26 19:22:29 +01:00
Philip Sargent
7dd5840353
reanem tunnelcontains to dwgcontains
2021-04-26 18:54:17 +01:00
Philip Sargent
dc840c9bc7
tunnelpath to dwgpath
2021-04-26 18:11:14 +01:00
Philip Sargent
37403a7234
renamed tunnel to drawing or dwg
2021-04-26 18:08:42 +01:00
Philip Sargent
f0d291f527
rename surveyscansfolder(s) to scanwallet(s)
2021-04-26 17:46:23 +01:00
Philip Sargent
a656ada67a
Fixing cave edit form and cave creation parser
2021-04-25 04:04:53 +01:00
Philip Sargent
4e59c8791f
copied comments from the html template file to the xml template too
2021-04-25 01:47:34 +01:00
Philip Sargent
343d6cf350
delete old forms, templates. fix logdataissues
2021-04-23 11:43:25 +01:00
Philip Sargent
dbd186e299
make ?reload private and clean old error msgs
2021-04-23 03:07:21 +01:00
Philip Sargent
8f89b022c7
drawing file upload form working
2021-04-22 02:45:28 +01:00
Philip Sargent
74403d28e9
fix field in search box so no need to delete it
2021-04-21 22:09:42 +01:00
Philip Sargent
1968db62ad
archeology on the logbook entry editing forms
2021-04-21 22:09:20 +01:00
Philip Sargent
bcdb3572fa
Add new per-module ToDo texts
2021-04-21 19:08:42 +01:00
Philip Sargent
8f0e7435d6
renaming 'tunnel' to 'dwg' in urls and views
2021-04-20 23:57:19 +01:00
Philip Sargent
b4ba3c40eb
catch unknown scotsman error
2021-04-20 22:58:41 +01:00
Philip Sargent
a2083c5310
disabling Google FLoC
2021-04-19 01:47:12 +01:00
Philip Sargent
879f6c288e
Make troggle compatible with Django 3.1
2021-04-19 01:32:18 +01:00
Philip Sargent
eea74406c9
fix template bug for newentrance
2021-04-17 23:59:11 +01:00
Philip Sargent
d4317b5fd3
better error pages
2021-04-17 21:24:37 +01:00
Philip Sargent
f8b613e0aa
prospect and moving code to better places
2021-04-17 01:41:06 +01:00
Philip Sargent
4ad7033285
working, but very faint
2021-04-16 21:47:40 +01:00
Philip Sargent
fa1df39923
stopo prospecting map crashing
2021-04-16 21:28:44 +01:00
Philip Sargent
49277216ba
Fixed cave sort-order in cave index
2021-04-16 16:01:35 +01:00
Philip Sargent
9695e49024
add link to all expedition pages back to expoweb /year/ page
2021-04-16 01:56:43 +01:00
Philip Sargent
27491c933a
enabled mugshots & blurb in people pages
2021-04-15 17:51:01 +01:00
Philip Sargent
0fee2bb165
add labels to templates to help debugging
2021-04-15 12:55:13 +01:00
Philip Sargent
3e50d0edca
renaming CSS files for clarity
2021-04-15 12:34:51 +01:00
Philip Sargent
5c4a33873f
cull old CSS
2021-04-15 01:51:42 +01:00
Philip Sargent
c2c7de4c59
more cave parsing data fixes
2021-04-14 22:50:47 +01:00
Philip Sargent
d598a6d0f5
better integration of svx file DatIssues
2021-04-14 21:08:06 +01:00
Philip Sargent
d8b1d59b12
Cave and Entrance forms tuned to user needs
2021-04-14 16:28:30 +01:00
Philip Sargent
54d98f58f3
docum and defaults in template cave-data xml
2021-04-14 01:52:42 +01:00
Philip Sargent
ba0f573618
restored cave edit capability
2021-04-14 00:11:59 +01:00
Philip Sargent
5024abc812
add url field to DataIssue
2021-04-12 01:28:54 +01:00
Philip Sargent
f6f83c6f70
data issues much easier to read
2021-04-12 01:00:47 +01:00
Philip Sargent
bc9b4f508b
Public Import Errors webpage
2021-04-11 20:00:09 +01:00
Philip Sargent
7f5ac93cc6
url dispatcher tidying
2021-04-11 03:02:06 +01:00
Philip Sargent
5d4ad93c51
Better FileNotFound in expofiles
2021-04-10 15:30:29 +01:00
Philip Sargent
a7e59b2bb0
clear cache on parsing & 2.2.19 notes
2021-04-10 02:12:13 +01:00
Philip Sargent
f16d9a5848
Therion renaming missed one
2021-04-08 01:22:09 +01:00
Philip Sargent
b7d54111ba
Import Therion files too
2021-04-07 21:53:43 +01:00
Philip Sargent
e3a341eb22
chnage maintenance menus & move tests
2021-04-07 16:04:27 +01:00
Philip Sargent
05ed8af158
remove 'register' bad link
2021-04-06 01:19:50 +01:00
Philip Sargent
d1cd72c5f8
New user login/logoff system using standard Dj
2021-04-06 00:49:09 +01:00
Philip Sargent
c08356876d
missed a wiki_markup ref
2021-04-03 21:59:18 +01:00
Philip Sargent
f6ae46e352
3d CaveView regeneates .3d file in cache
2021-04-03 20:52:35 +01:00
Philip Sargent
7ee7a05ea1
typos in templates
2021-04-03 00:35:31 +01:00
Philip Sargent
e559a1dabd
commentary in prospecting guide
2021-04-03 00:35:10 +01:00
Philip Sargent
52c1dabd0e
survex_file field inconsistency detection & edit
2021-04-02 23:21:23 +01:00
Philip Sargent
bd8d59b343
restoring wiki_markup where still used
2021-04-02 23:17:54 +01:00
Philip Sargent
ea221281a3
remove unused {% load link %}
2021-04-02 20:54:18 +01:00
Philip Sargent
cc5b4fa650
remove {% load wiki_markup %}
2021-04-02 20:41:42 +01:00
Philip Sargent
4c0ad53b3a
culling unused JS
2021-04-01 02:44:49 +01:00
Philip Sargent
2690203912
new method for /site-media/, /static/, /photos/
2021-03-31 23:19:48 +01:00
Philip Sargent
7cccf4daf1
move *_views files to /views/*
2021-03-31 21:51:17 +01:00
Philip Sargent
e1cf43c260
trailing slashes fixed
2021-03-31 20:18:46 +01:00
Philip Sargent
a6ed0a964e
making flat files delivery more robust
2021-03-31 17:57:43 +01:00
Philip Sargent
3452c2c5d4
flatpages to expopages
2021-03-31 16:14:36 +01:00
Philip Sargent
b75baffdcf
delete unused profiles app
2021-03-30 21:09:01 +01:00
Philip Sargent
a4c892b696
fixed serving expofiles from test server
2021-03-28 03:48:04 +01:00
Philip Sargent
c7475cda83
merge expeditions and statistics pages
2021-03-27 20:05:15 +00:00
Philip Sargent
ffaaea497c
re-ordering middleware and logon system
2021-03-27 18:22:07 +00:00
Philip Sargent
e7947069a2
should all be working, but isn't
2021-03-26 23:40:34 +00:00
Philip Sargent
0abd8aedff
layout tidying
2021-03-26 21:20:08 +00:00
Philip Sargent
dba0fd8b20
remove survexblock webpage - redundant
2021-03-26 21:19:31 +00:00
Philip Sargent
1c7e99e91b
attempting to enable csrf cookie robustly
2021-03-26 17:33:58 +00:00
Philip Sargent
3487c22da3
Survex 1624, 1626, 1627 now displayed robustly
2021-03-26 02:01:29 +00:00
Philip Sargent
65c3cb31d7
improved display of survex files for a cave
2021-03-25 20:23:25 +00:00
Philip Sargent
80874887cc
404 fix attempt
2021-03-25 16:15:58 +00:00
Philip Sargent
8723d62add
Survex files subdirectories displayed differently
2021-03-25 16:15:26 +00:00
Philip Sargent
213ada4ae9
unused app pending deletion
2021-03-25 16:13:58 +00:00
Philip Sargent
65be64c756
type data added to report
2021-03-24 21:16:06 +00:00
Philip Sargent
9a91487375
pathlib for path management & cavelist fixes
2021-03-24 15:46:35 +00:00
Philip Sargent
7f37327bcd
Fixing cave list webpage
2021-03-24 00:55:36 +00:00
Philip Sargent
a9fa251fee
now robust re svx in folders unofficial numbers
2021-03-23 17:35:41 +00:00
Philip Sargent
a0c3ef8ea1
comments on urls resolution re apache & bugfix
2021-03-21 01:37:52 +00:00
Philip Sargent
5836c6ff90
Importing old logbooks
2021-02-06 00:18:48 +00:00
Philip Sargent
a4d7183260
Added link to Kataster list on link to new cave form
2020-08-02 23:54:14 +01:00
Philip Sargent
42456e8e98
fix server instructions + comment in stats output
2020-07-28 01:46:00 +01:00
Philip Sargent
0094cf7054
clean troggle menu and drawingfiles layout
2020-07-28 01:22:06 +01:00
Philip Sargent
57b8242f7e
utf-8 templates .gitignore
2020-07-28 00:08:34 +01:00
Philip Sargent
f1ceb38f5f
fix for no comma after lat item in django template
2020-07-26 21:11:29 +01:00
Philip Sargent
0cf3b869af
First implementation of html API, both TSV and JSON
2020-07-26 20:48:25 +01:00
Philip Sargent
69b843a824
Removing editLogbookEntry capability
2020-07-26 03:22:37 +01:00
Philip Sargent
8530b0643d
person attribution of surveyed length working
2020-07-06 01:24:43 +01:00
Philip Sargent
3f9971d2ee
title and wallet folders working in /survexfile/258
2020-07-05 17:22:26 +01:00
Philip Sargent
5be41c8163
splays and alias splays implemented
2020-07-04 13:31:46 +01:00
Philip Sargent
6cd660982c
More informative html in templates
2020-07-02 16:24:39 +01:00
Philip Sargent
122cdd7fc8
replace GetCaveByReference
2020-06-28 01:50:34 +01:00
Philip Sargent
d6c4ffca5a
tunnelfile.scans name change for compatibility
2020-06-24 00:36:32 +01:00
Philip Sargent
c91aa4be47
Simple renaming too-similar variables
2020-06-24 00:18:01 +01:00
Philip Sargent
9cd70b31ac
simple rename survexscansfolder to scansfolder
2020-06-23 23:46:33 +01:00
Philip Sargent
b64c779a58
rename SurvexScansFolders and tidy survex parser
2020-06-23 23:34:08 +01:00
Philip Sargent
4a51de95c4
Django 1.11.19 runs clean on pre-built db.
2020-06-18 22:44:41 +01:00
Philip Sargent
b153fafa9f
django 1.8.19
2020-06-16 22:16:48 +01:00
Philip Sargent
8fc0ba136f
removed jgtfileupload
2020-06-16 16:48:19 +01:00
Philip Sargent
9f5e779b5e
remove Survey & virtual survey wallet - never used
2020-06-16 16:17:35 +01:00
Philip Sargent
d4deea2019
remove tinyMCE more
2020-06-14 10:05:25 +01:00
Philip Sargent
269b8840ad
import fixes & statistics table
2020-06-12 18:10:07 +01:00
Philip Sargent
b9a223c049
Fix to /caves/ != /caves
2020-06-12 14:54:00 +01:00
Philip Sargent
db37710b90
fixes: stopped storing survex legs
2020-06-12 14:52:00 +01:00
Philip Sargent
092c8bb913
stopped storing survex legs
2020-06-12 14:06:03 +01:00
Philip Sargent
72fd57ef76
Rearranged caveindex page
2020-06-07 16:12:52 +01:00
Philip Sargent
ac9ac5e397
Remove unused Survey object
2020-06-04 23:16:26 +01:00
Philip Sargent
43c6e2f2e1
dlete todo page, partly fix other url pages
2020-06-04 23:00:58 +01:00
Philip Sargent
b7fea2042f
merge exptl & stats, delete millenial & eyecandy
2020-06-04 21:57:04 +01:00
Philip Sargent
90dc3dac3b
Change troggle horizontal menu items
2020-06-01 17:41:41 +01:00
Philip Sargent
f949bb8dc0
python3 fixes for djsngo admin pages
2020-05-31 22:35:36 +01:00
Philip Sargent
5d89cf9474
Delete SURVEYS.CSV code
2020-05-31 21:03:40 +01:00
Philip Sargent
09aedecc3b
Unicode fix for SVX display and edit page
2020-05-31 20:46:12 +01:00
Philip Sargent
d857cc9084
format tidy & normalise paths in survex *inlcude
2020-05-30 02:35:05 +01:00
Philip Sargent
df3917a677
Expunge cavetab
2020-05-28 02:20:50 +01:00
Philip Sargent
d4ac28af18
Remove PHOTOS_ROOT and DPhoto class
2020-05-15 21:32:55 +01:00
Philip Sargent
ccc5813b3f
indent recursion and update comments
2020-05-14 17:21:34 +01:00
Expo on server
13d3f37f05
menu update
2020-05-13 19:59:41 +01:00
Expo on server
2918b4b92c
Add simple search function to default menu
2020-05-02 04:14:32 +01:00
0b85a9d330
adding sync to databaseRest and cleaning a template
2020-04-19 23:35:41 +01:00
98fd314a62
Prevent that annoying popup from Google offering to translate the page from German
2020-04-11 18:10:09 +01:00
d71e31417b
scanned image files importing
2020-04-09 02:40:32 +01:00
fbe6c0c859
rearrange main menu
2020-04-03 01:11:30 +01:00
867479e05d
Fixing my earlier mistake these are xml not html
2020-03-02 17:08:49 +00:00
cdef395f89
New troggle report on defined directory paths
2020-02-27 00:58:09 +00:00
Philip Sargent
d170a3c36e
add shortcut for logbooks & note explaining notability metric
2020-02-24 21:49:01 +00:00
Philip Sargent
de14ecea22
Fixing back mistaken chnage
2020-02-20 01:42:52 +00:00
Philip Sargent
04fb2e8701
DOCTYPE update for template for generated files
2020-02-19 21:48:37 +00:00
Philip Sargent
c1439bed8d
Adding <pre> and </pre> to the logbook entry display so that all the paragraphs are not munged into one when displayed. Untested.
2020-02-19 21:47:13 +00:00
56618dbe65
fix CUCC url in template and add years to 2020
2019-12-23 19:40:44 +00:00
Expo on server
71ef710d09
Fix the location of the cave view javascript
2019-12-08 10:53:43 +00:00
Sam Wenham
4ebf3d8a0e
Bring back TinyMCE for editing flatpages
2019-07-10 12:32:04 +01:00
Sam Wenham
97426a0ddb
Backed out changeset: 4552f42bdf54
2019-06-26 20:57:24 +01:00
Sam Wenham
8a1be45aac
Remove this stupid hard coded name match
2019-06-26 20:56:08 +01:00
Sam Wenham
b2dd905f0e
Allow html chars in names
2019-06-26 18:36:08 +01:00
Sam Wenham
23df89cf31
Fix CSRF issues in svx form
...
Set date formats
Add DataIssue model and add errors to it to allow us to give people a list of
stuff to fix
2019-04-14 22:45:31 +01:00
Sam Wenham
d1d0c24ed8
Sort people by notability
...
Better errors and tidy
Nicer date formats
2019-04-02 02:04:38 +01:00
Sam Wenham
9df91b221b
Support html and wiki logbook entrys
...
Move nearest_station to nearest_station_name and make nearest_station a foreign
key to SurvexStation
Lots of tidying
2019-03-31 15:39:53 +01:00
Sam Wenham
64a4842dcb
Remove the redundant render_with_context() as django now does this just with the
...
render() shortcut
Move from mimetype to content_type, missed in last commit
2019-03-30 17:02:07 +00:00
Sam Wenham
a4532a29da
Update new management command for DB reset
...
Switch to content_type from mimetype
Make DB reset not nuke so much
Tidy logbook parser
2019-03-30 13:58:38 +00:00
Wookey
705dd51f30
Only show unofficial number if it's not already displayed
2019-03-27 01:59:09 +00:00
expoonserver
f8be510509
Display temporary numbers on main cave index, when they exist.
2019-03-26 23:58:27 +00:00
Sam Wenham
121f0a6aac
Remove the news section as it never gets updated
...
Fix logbook entry so the edit link works
Tidy the control panel page
2019-03-10 11:05:57 +00:00
Sam Wenham
8932bdc466
Remove jquery.min.js from troggle as it busts the footer menu. Yep troggle has a footer menu!!
2019-03-09 19:32:00 +00:00
Sam Wenham
b4296f1736
Fix people list
...
Cope with Jimmy McFoo as a name!
Don't set the top expo value in the code whin it is piss easy to calculate
Fix typo from last commit
2019-03-09 18:21:10 +00:00
Sam Wenham
1bac650aee
There is no point having two functions do basicaly the same thing so make the
...
load all logbooks call load logbook(expo)
Remove the return message from load logbook as it isn't used
2019-03-09 11:18:44 +00:00
Sam Wenham
9fc80bed35
Make the logbook parser a little more sane
...
Move the parser to expo mapping to settings
Set a default parser
Iterate over the expo years rather than the mapping list!
2019-03-06 23:20:34 +00:00
4148ece133
Messing with millenialcaves.html or similar
2019-02-26 12:07:45 +00:00
53513b812b
Messing with millenialcaves.html or similar
2019-02-26 12:01:55 +00:00
622d523c98
Messing with millenialcaves.html or similar
2019-02-26 01:12:14 +00:00
a397eb9d00
Messing with millenialcaves.html or similar
2019-02-26 00:48:34 +00:00
b2adc285b6
Messing with millenialcaves.html or similar
2019-02-26 00:45:56 +00:00
8af604262d
Messing with millenialcaves.html or similar
2019-02-26 00:43:46 +00:00
b33ca2b290
Messing with millenialcaves.html or similar
2019-02-26 00:43:05 +00:00
5154c0d8e5
Messing with millenialcaves.html or similar
2019-02-26 00:29:16 +00:00
b01fcc3a6d
Messing with millenialcaves.html or similar
2019-02-26 00:23:23 +00:00
e8585bec42
Messing with millenialcaves.html or similar
2019-02-26 00:22:58 +00:00
e5fa636776
Messing with millenialcaves.html or similar
2019-02-26 00:17:56 +00:00
6beaf4afdd
Messing with millenialcaves.html or similar
2019-02-26 00:17:11 +00:00
3254ba1443
2019-02-26 00:00:34 +00:00
4c3d0ce7fa
2019-02-25 23:55:06 +00:00
a99afe07c6
2019-02-25 23:53:19 +00:00
73bb60eff9
2019-02-25 23:52:47 +00:00
0a214c5d4b
2019-02-25 23:51:26 +00:00
3746dab5de
2019-02-25 23:46:52 +00:00
ee2cd0d391
trying to add new field
2019-02-25 23:40:53 +00:00
78a5f656b9
added Rad's playground
2019-02-25 22:24:33 +00:00
becfaa1504
change to table
2019-02-25 20:58:32 +00:00
Sam Wenham
4ad5b68433
Make things more compatiable with newer python
...
Fix the expeditions list
Improvements to make it compatiable with django 1.8
Bump the years to add 2018
Update the .hgignore file to ignore junk
2019-02-24 13:03:34 +00:00
Sam Wenham
a1f02e575f
Prevent troggle adding the menu if there is one in the file
...
Add a Docker compose file to bring up a dev troggle easily
Various PEP improvments
2019-02-23 15:30:58 +00:00
Sam Wenham
f58b1db920
Don't create years that aren't here yet troggle goes boom
2018-06-20 18:14:13 +01:00
Sam Wenham
3d2ac06a72
Move the years on a bit
2018-06-20 18:11:12 +01:00
Sam Wenham
46124a770f
Fix the django for the spinny js cave viewer.
...
Make the paths settings (don't hard code things like this!!)
Add " round spinny urls from the late merge (the rest were done for the move off 1.4.2
2018-04-20 20:55:12 +01:00
Sam Wenham
6f6327d267
Merge with django-upgrade
2018-04-17 22:19:20 +01:00
expoonserver
6710a469ee
Add CaveView spinny caves view to each troggle cave page
2018-04-17 21:57:02 +01:00
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
substantialnoninfringinguser
0f64e786b5
[svn] Made the subcaves work! Now we just have to figure out how to parse them...
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8343 by cucc @ 5/11/2009 6:36 AM
2009-05-13 06:28:36 +01:00
substantialnoninfringinguser
b31d022c1a
[svn] Dynamic thumbnail generation for photos and survey scans using imagekit, further improving registration system, other misc.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8336 by cucc @ 5/10/2009 11:05 PM
2009-05-13 06:23:57 +01:00
substantialnoninfringinguser
9489fe56d9
[svn] Improve registration system.
...
Add jquery fade effects and quick search.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8334 by cucc @ 5/10/2009 5:23 AM
2009-05-13 06:22:07 +01:00
substantialnoninfringinguser
9972e28a91
[svn]
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8333 by cucc @ 5/8/2009 8:20 PM
2009-05-13 06:21:10 +01:00
substantialnoninfringinguser
09a1539aef
[svn] Interface improvements. Code will need some cleaning up.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8331 by cucc @ 5/8/2009 8:16 PM
2009-05-13 06:19:45 +01:00
substantialnoninfringinguser
625b2156e3
[svn] Weeks of local changes.
...
- Import is now non-destructive
- Parsers write output to a log file (path be specified in settings)
- databaseReset.py content been divided into separate functions which can be called for varying levels of deletion and importing
- control panel (view, template, urlpattern) added for deleting and importing
- Logins and signup fixed
- CaveArea model updated, view, hierarchical url patterns, and beginning of template added
- New site style
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8324 by cucc @ 5/3/2009 5:56 AM
2009-05-13 06:15:48 +01:00
substantialnoninfringinguser
6137f8baaa
[svn] Logbook entries are now at /YYYY-MM-DD/slug .
...
Try editing a logbook entry title in the admin now. The django built in auto slug field is fun and javascripty.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8308 by aaron @ 3/16/2009 7:27 PM
2009-05-13 06:09:55 +01:00
substantialnoninfringinguser
157f11b659
[svn] Added QM wiki markup. The format is [[cave:204 QM:2005-04A]] with the grade (A) being optional. The links color red if the QM does not exist, and in that case clicking on them goes to an admin add page with fields prepopulated.
...
Various other little things, e.g. filled in the footer with links.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8305 by aaron @ 3/16/2009 8:53 AM
2009-05-13 06:08:04 +01:00
substantialnoninfringinguser
256de6e083
[svn]
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8304 by aaron @ 3/15/2009 11:12 PM
2009-05-13 06:07:19 +01:00
substantialnoninfringinguser
5811124d9d
[svn] fix year links
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8303 by julian @ 3/15/2009 10:44 PM
2009-05-13 06:06:46 +01:00
substantialnoninfringinguser
91e4f0f8c0
[svn] Reverted the reverts from 8267. Fixed the next / previous trip in personexpedition on the LogbookEntry template -- I had misunderstood what this was supposed to do last time I messed with it. This involved adding the methods PersonTrip.get_persons_next_trip and persons_previous_trip. Couldn't find any other broken things.
...
Kept the productive changes in 8267: extending the logbook parsing back to 1993, changing index page, changes to view_surveys.py
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8274 by aaron @ 3/14/2009 8:38 AM
2009-05-13 06:02:42 +01:00
substantialnoninfringinguser
a4edfca30e
[svn] Got QM pages working.
...
Started scripts for exporting to old expo format.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8269 by aaron @ 3/12/2009 2:22 PM
2009-05-13 05:59:40 +01:00
substantialnoninfringinguser
90da85e856
[svn] revert some of the changes (href element) so that the links work
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8267 by julian @ 3/11/2009 10:44 AM
2009-05-13 05:58:58 +01:00
substantialnoninfringinguser
4b34241a16
[svn] Added new abstract base class TroggleModel. Any fields or methods that need to be added to multiple models should be added here.
...
Added edit links to caves, people, logbook entries, and people.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8260 by aaron @ 2/26/2009 5:28 AM
2009-05-13 05:56:56 +01:00
substantialnoninfringinguser
24dc2e3a20
[svn] Fixing what I broke.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8256 by aaron @ 2/23/2009 1:05 PM
2009-05-13 05:55:40 +01:00
substantialnoninfringinguser
8916b460e1
[svn]
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8255 by aaron @ 2/23/2009 4:16 AM
2009-05-13 05:55:00 +01:00
substantialnoninfringinguser
b57452f68d
[svn] Enable profile setup forms.
...
Profiles are Person model instances, and are linked to django's built in User model by a one to one foreign key.
We are using the django-registration and django-profiles pluggables.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8247 by aaron @ 2/18/2009 9:35 PM
2009-05-13 05:54:17 +01:00
substantialnoninfringinguser
24dc7c5a0c
[svn] Photo file handling and mugshots parsing sorted.
...
Made URL settings more relative, less redundant.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8246 by aaron @ 2/18/2009 6:45 AM
2009-05-13 05:53:37 +01:00
substantialnoninfringinguser
25b695e53d
[svn]
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8245 by aaron @ 2/17/2009 1:09 AM
2009-05-13 05:52:59 +01:00
substantialnoninfringinguser
d25fd97864
[svn] My crusade to make our project more Djangoic.
...
Got rid of the url tags in template, replaced them with get_absolute_url method calls where possible. Adding get_absolute_url in models enables direct link to the public model views in admin. The use of get_absolute_url, which is the correct Django way of doing things, eliminates any need for the redundant "href" fields we were using. Those fields now need to be deleted from the models and from the parsers.
Made the context processor to pass settings to all templates actually work, although this was a little uglier than expected. I had to put in a new render_response to replace render_to_response. This is because Django uses Context, not RequestContext by default. I wish they would change this, it's annoying. Anyway, I deleted all the manual settings passing in the views.
I also eliminated a couple of unnecessary methods and stuff like that.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8244 by aaron @ 2/16/2009 8:31 AM
2009-05-13 05:52:15 +01:00
substantialnoninfringinguser
ce5c56b430
[svn] Now that I've put the new css up, let's use it. Should have only stuff we actually use.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8238 by aaron @ 1/31/2009 9:20 PM
2009-05-13 05:50:31 +01:00
substantialnoninfringinguser
c4b8ea4d9b
[svn] Fix "if logged in" tag.
...
Changed logbook template; no longer uses the redundant _next and _prev fields.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8234 by aaron @ 1/30/2009 4:53 AM
2009-05-13 05:49:05 +01:00
substantialnoninfringinguser
cb52c47aa9
[svn] yorkshire work with tunnel integration
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8232 by julian @ 1/29/2009 11:40 PM
2009-05-13 05:48:47 +01:00
substantialnoninfringinguser
ed345f2576
[svn] Add user registration and user profiles.
...
Used modified versions of django-registration and django-profiles , both on bitbucket.
The Person model is now set up as the profile for auth.User s.
I set up a requestcontext so that settings is automatically passed to every template, no need to repeat ourselves in views. However, this needs to be refined: I will soon change it to only pass a subset of settings. E.G. we do not need to be passing the DB login and password!
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8231 by aaron @ 1/29/2009 11:02 PM
2009-05-13 05:48:10 +01:00
substantialnoninfringinguser
cdd4e685ee
[svn] cave maps to all logbook entry trips done there
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8228 by julian @ 1/24/2009 11:59 PM
2009-05-13 05:46:12 +01:00
substantialnoninfringinguser
84e9cc3396
[svn] Template update to use wiki_to_html_short
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8227 by julian @ 1/24/2009 7:40 PM
2009-05-13 05:45:44 +01:00
substantialnoninfringinguser
efd4708526
[svn] I initial work at adding caveareas. (Descirprion of parts of caves)
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8226 by julian @ 1/24/2009 6:49 PM
2009-05-13 05:45:26 +01:00
substantialnoninfringinguser
98a3d44eed
[svn] fix martins front page links
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8225 by julian @ 1/24/2009 6:36 PM
2009-05-13 05:45:01 +01:00
substantialnoninfringinguser
264594ed05
[svn] made index of people
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8224 by julian @ 1/24/2009 6:26 PM
2009-05-13 05:44:35 +01:00
substantialnoninfringinguser
1e1453f443
[svn] Added links to front page
...
Add names for views in order to link from the main page
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8223 by julian @ 1/24/2009 3:11 PM
2009-05-13 05:44:01 +01:00
substantialnoninfringinguser
60735a9b3a
[svn] merge the trip table to have surveys by date
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8221 by julian @ 1/24/2009 2:01 PM
2009-05-13 05:43:20 +01:00
substantialnoninfringinguser
6598dd5105
[svn] calendar.html used django 1.1 {% empty %} syntax, but older version on server so I had to change it
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8210 by aaron @ 1/20/2009 5:36 AM
2009-05-13 05:42:57 +01:00
substantialnoninfringinguser
6947e43caf
[svn] fix links
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8209 by aaron @ 1/20/2009 5:16 AM
2009-05-13 05:42:40 +01:00
substantialnoninfringinguser
f7a8e95634
[svn] wrong comment syntax
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8208 by aaron @ 1/19/2009 10:08 PM
2009-05-13 05:42:18 +01:00
substantialnoninfringinguser
82e50d5199
[svn] Allow viewing of more than one survey stage at once. Also, make images float nicely but not escape content div.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8207 by aaron @ 1/19/2009 7:30 PM
2009-05-13 05:42:01 +01:00
substantialnoninfringinguser
eb431eb5c9
[svn] Fixed up calendar with estimated dates from logbook.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8202 by aaron @ 1/19/2009 8:28 AM
2009-05-13 05:40:56 +01:00
substantialnoninfringinguser
aeef470c6d
[svn] Survey table improvements, added calendar to urls
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8201 by aaron @ 1/19/2009 7:19 AM
2009-05-13 05:40:35 +01:00
substantialnoninfringinguser
0ba4dd4ef4
[svn] survey block object
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8199 by julian @ 1/19/2009 12:22 AM
2009-05-13 05:39:52 +01:00
substantialnoninfringinguser
0f5109cb09
[svn] new person expedition
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8189 by julian @ 1/18/2009 7:50 PM
2009-05-13 05:38:18 +01:00
substantialnoninfringinguser
f229ff35f9
[svn] Julian playing with the logbooks and expoyears
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8180 by julian @ 1/18/2009 3:59 PM
2009-05-13 05:35:59 +01:00
substantialnoninfringinguser
b950ee70f7
[svn]
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8175 by aaron @ 1/18/2009 4:42 AM
2009-05-13 05:35:29 +01:00
substantialnoninfringinguser
cda0a7a5e1
[svn] Beginnings of expo calendar
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8174 by aaron @ 1/18/2009 1:15 AM
2009-05-13 05:35:11 +01:00
substantialnoninfringinguser
8d13864181
[svn] julian's quick makework and index page
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8169 by julian @ 1/17/2009 7:46 PM
2009-05-13 05:33:29 +01:00
substantialnoninfringinguser
aa0b14de5f
[svn] Fix double / error
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8167 by aaron @ 1/17/2009 8:11 AM
2009-05-13 05:32:45 +01:00
substantialnoninfringinguser
4c660b423e
[svn]
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8166 by aaron @ 1/17/2009 7:52 AM
2009-05-13 05:32:19 +01:00
substantialnoninfringinguser
b2366cfe11
[svn] Got rid of ugly old design; brought in ugly new design. This one works a little better, still needs a lot of work.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8164 by aaron @ 1/17/2009 7:11 AM
2009-05-13 05:31:44 +01:00
substantialnoninfringinguser
f02c91901c
[svn] More work on survey images parser and virtual survey binder. Renamed expedition_year field of Survey model to expedition because this makes more sense.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8163 by aaron @ 1/16/2009 7:50 PM
2009-05-13 05:31:21 +01:00
substantialnoninfringinguser
f3db37711f
[svn]
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8157 by aaron @ 1/16/2009 2:19 AM
2009-05-13 05:29:31 +01:00
substantialnoninfringinguser
7c0791973b
[svn] Added some actual funtionality to virtual survey binder.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8155 by aaron @ 1/15/2009 11:21 PM
2009-05-13 05:28:57 +01:00
substantialnoninfringinguser
14b00d2382
[svn] Forgot this in the last checkout. It's the template for the virtual survey binder.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8153 by aaron @ 1/15/2009 6:25 AM
2009-05-13 05:28:14 +01:00
substantialnoninfringinguser
c6cce8d2fe
[svn] Add beginnings of virtual survey binder: new Survey and ScannedImage models, survey parser. Still has lots of problems, but I need some help with the file upload aspect so am committing now. Biggest problem is trying to call save() on the images from the API. It needs arguments that I don't understand. Also, the # in our survey paths was causing trouble. I worked around this with a correctURL method which urlencodes the actual URL, but admin still tries to use a URL with a # in it.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8152 by aaron @ 1/15/2009 6:22 AM
2009-05-13 05:27:43 +01:00
substantialnoninfringinguser
7aee3fb920
[svn] QM parser now parses Hauchhoehle QMs.py
...
Photo model added.
Logbook parser now puts mugshots in as photo models, and descriptions from the old folk html pages in as "blurbs" on the person model.
Experimented with eye candy and a random logbook quote generator.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8094 by aaron @ 12/31/2008 2:59 AM
2009-05-13 05:25:17 +01:00
substantialnoninfringinguser
ac097cb2d0
[svn] Forgot to add cave and logbook search templates in earlier commit.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8084 by aaron @ 12/9/2008 1:31 AM
2009-05-13 05:22:51 +01:00
substantialnoninfringinguser
29984ff15a
[svn] Added cave and logbook search, collapsible footer navbar, useless statistics page. Also fixed broken css. Toying with forms but not committing those yet.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8081 by aaron @ 12/8/2008 4:28 AM
2009-05-13 05:22:14 +01:00
substantialnoninfringinguser
47604b1db2
[svn] Replace "django" with "troggle" in admin
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8080 by aaron @ 12/7/2008 10:18 PM
2009-05-13 05:21:51 +01:00
substantialnoninfringinguser
f536963d00
[svn] wiki_to_html changed to wiki_to_html_short
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8062 by julian @ 11/6/2008 11:25 PM
2009-05-13 05:18:38 +01:00
substantialnoninfringinguser
f5ddbafcb0
[svn] Wiki_markup imporved to include paragraphs
...
wiki_to_html should be used when the field will include paragraphs
wiki_to_html_short should be used when the field will not include paragraphs
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8061 by julian @ 11/6/2008 11:24 PM
2009-05-13 05:18:26 +01:00
substantialnoninfringinguser
44bb2bb723
[svn] forgotten
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8046 by julian @ 10/31/2008 1:58 PM
2009-05-13 05:15:59 +01:00
substantialnoninfringinguser
32e1e6b9ab
[svn] make the person logbooks work
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8044 by julian @ 10/30/2008 1:13 PM
2009-05-13 05:15:49 +01:00
substantialnoninfringinguser
18f6731b5b
[svn] add personindex templates
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8038 by julian @ 10/27/2008 12:36 AM
2009-05-13 05:14:28 +01:00
substantialnoninfringinguser
b503d3d588
[svn] Initial troggle checkin
...
This is a development site using Django 1.0
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8034 by julian @ 10/26/2008 9:04 PM
2009-05-13 05:13:38 +01:00
