diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/forms.py | 14 | ||||
| -rw-r--r-- | core/views/editor_helpers.py | 14 |
2 files changed, 19 insertions, 9 deletions
diff --git a/core/forms.py b/core/forms.py index 23b80ce..ede7d9e 100644 --- a/core/forms.py +++ b/core/forms.py @@ -16,7 +16,13 @@ import re There are other, simpler, upload forms in view/uploads.py class-based forms are quicker to set up (for Django experts) but -are more difficult to maintain by non-Django experts. +are more difficult to maintain (or even begin to understand) by non-Django experts. + +Notes to self, as I try to work out what the hell is going on: + +Note that HTMLarea invokes a widget which sets a CSS class which calls javascript in +templates/html_editor_scripts_css.html - which imports jquery and codemirror directly, without +declaring it anywhere or locally installing it. (!) """ todo = """ @@ -88,12 +94,6 @@ class CaveForm(ModelForm): # Converting a PENDING cave to a real cave by saving this form print("EEE", cave_slug.replace("-PENDING-", "-")) return cave_slug.replace("-PENDING-", "-") - -# def clean_url(self): -# data = self.cleaned_data["url"] -# if not re.match("\d\d\d\d/.", data): -# raise ValidationError("URL must start with a four digit Kataster area.") -# return data def clean(self): diff --git a/core/views/editor_helpers.py b/core/views/editor_helpers.py index 91ba01e..0c3f5b6 100644 --- a/core/views/editor_helpers.py +++ b/core/views/editor_helpers.py @@ -22,9 +22,15 @@ MAX_IMAGE_HEIGHT = 800 THUMBNAIL_WIDTH = 200 THUMBNAIL_HEIGHT = 200 +"""This is all written by Martin Green, and completely undocumented. + +It uses a lot of opinionated Django default magic, none of which I am familiar with. +Philip +""" def get_dir(path): "From a path sent from urls.py, determine the directory." + # todo re-write this to use modern pathlib functions if "/" in path: return path.rsplit("/", 1)[0] else: @@ -34,6 +40,7 @@ def get_dir(path): def image_selector(request, path): """Returns available images""" directory = get_dir(path) + print(f" - image selector {directory=} {path=}") thumbnailspath = Path(settings.EXPOWEB) / directory / "t" thumbnails = [] if thumbnailspath.is_dir(): @@ -116,7 +123,7 @@ def new_image_form(request, path): thumbnail = thumbnail.convert('RGB') thumbnail.save(tb, format="jpeg", quality = 70) image_rel_path, thumb_rel_path, desc_rel_path = form.get_rel_paths() - image_page_template = loader.get_template("image_page_template.html") + image_page_template = loader.get_template("image_page_template.html") # this is the .html file in the /l/ folder image_page = image_page_template.render( { "header": form.cleaned_data["header"], @@ -190,7 +197,7 @@ class NewWebImageForm(forms.Form): ] def get_full_paths(self): - return [Path(settings.EXPOWEB) / x for x in self.get_rel_paths()] + return [Path(settings.EXPOWEB) / x for x in self.get_rel_paths()] # this is where we would want to insert the /caveid/ ?! def clean_file_(self): for rel_path, full_path in zip(self.get_rel_paths(), self.get_full_paths()): @@ -200,6 +207,9 @@ class NewWebImageForm(forms.Form): class HTMLarea(forms.Textarea): + """This is called from CaveForm in core/forms.py which is called from core/views/caves.py when editing a cave description + (and similarly for Entrance Descriptions). It is alls called from core/views/expo.py when editing expo (i.e. handbook) pages. + """ template_name = "widgets/HTMLarea.html" def __init__(self, *args, **kwargs): |