xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

Comments adjusted

Browse Source
This commit is contained in:
Philip Sargent
2024-12-28 17:04:36 +00:00
parent 8dbad16ece
commit 4652d83b49
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/utils.py
View File

@@ -263,7 +263,7 @@ def git_string(author_string):
def write_and_commit(files, message, editor=None): def write_and_commit(files, message, editor=None):
"""Writes the content to the filepath and adds and commits the file to git. If this fails, a WriteAndCommitError is raised. """Writes the content to the filepath and adds and commits the file to git. If this fails, a WriteAndCommitError is raised.
These need refactoring This needs refactoring to just write and then call only_commit()
""" """
git = settings.GIT git = settings.GIT
commands = [] commands = []
@@ -380,7 +380,7 @@ class WriteAndCommitError(Exception):
return f"WriteAndCommitError: {self.message}" return f"WriteAndCommitError: {self.message}"
def writetrogglefile(filepath, filecontent, commit_msg=None): def writetrogglefile(filepath, filecontent, commit_msg=None):
""" """
REPLACE with call to write_and_commit + any necessary setup REPLACE with call to write_and_commit + any necessary setup
used only by cave editor in used only by cave editor in

6
core/views/survex.py
View File

@@ -145,6 +145,10 @@ class SvxForm(forms.Form):
"""Two-pane form, upper half is the raw survex file, lower half (with green background) """Two-pane form, upper half is the raw survex file, lower half (with green background)
is the output : of running 'cavern' on the survex file, of running a 'difference', of is the output : of running 'cavern' on the survex file, of running a 'difference', of
checking that there are no square brackets left. checking that there are no square brackets left.
This is not a ModelForm.
see https://docs.djangoproject.com/en/5.1/topics/forms/modelforms/
""" """
dirname = forms.CharField(widget=forms.TextInput(attrs={"readonly": True})) dirname = forms.CharField(widget=forms.TextInput(attrs={"readonly": True}))
@@ -154,7 +158,7 @@ class SvxForm(forms.Form):
code = forms.CharField(widget=forms.Textarea(attrs={"cols": 140, "rows": 36})) code = forms.CharField(widget=forms.Textarea(attrs={"cols": 140, "rows": 36}))
who_are_you = forms.CharField( who_are_you = forms.CharField(
widget=forms.TextInput( widget=forms.TextInput(
attrs={"size": 100, "placeholder": "You are editing this page, who are you ? e.g. 'Animal <mta@gasthof.expo>'", attrs={"size": 100, "placeholder": "You are editing this page, who are you ? e.g. 'Becka' or 'Animal <mta@gasthof.expo>'",
"style": "vertical-align: text-top;"} "style": "vertical-align: text-top;"}
) )
) )

2
templates/editcave.html
View File

@@ -70,7 +70,7 @@ div > label {
} }
</style> </style>
<form action="" method="post">{% csrf_token %} <form action="" method="post">{% csrf_token %}
{% if tabletype == 'table' %}<table>{% endif %} {% if tabletype == 'table' %}<table>{% endif %} <!-- to work with Dj 5.1 and Dj 3.2 -->
{{ form }} {{ form }}
{% if tabletype == 'table' %}</table>{% endif %} {% if tabletype == 'table' %}</table>{% endif %}
<p><input style="font-weight: bold; font-size: 200%; font-variant-caps: small-caps; margin-left: 40%;" type="submit" value="Submit" /></p> <p><input style="font-weight: bold; font-size: 200%; font-variant-caps: small-caps; margin-left: 40%;" type="submit" value="Submit" /></p>