Added help writing HTML in the cave editing form. Made the HTML previews optional

3 files changed, 21 insertions, 11 deletions

diff --git a/core/forms.py b/core/forms.py
index cd40822..19a3b1b 100644
--- a/core/forms.py
+++ b/core/forms.py
@@ -11,6 +11,8 @@ from django.contrib.admin.widgets import AdminDateWidget
 from troggle.core.models.troggle import Person, PersonExpedition, Expedition
 from troggle.core.models.caves import Cave, LogbookEntry, QM, Entrance, CaveAndEntrance
 
+from troggle.core.views.editor_helpers import HTMLarea
+
 '''These are all the class-based Forms used by troggle.
 There are other, simpler, upload forms in view/uploads.py
 Some are not used and need renovating or destroying.
@@ -24,15 +26,22 @@ class CaveForm(ModelForm):
     the other fields are present on the form, but use the default presentation style
     '''
     official_name = forms.CharField(required = False, widget=forms.TextInput(attrs={'size': '45'}))
-    underground_description = forms.CharField(required = False, widget=forms.Textarea(attrs={'rows':9}))
-    explorers = forms.CharField(required = False, widget=forms.Textarea(attrs={'rows':2}))
-    equipment = forms.CharField(required = False, widget=forms.Textarea(attrs={'rows':2}))
-    survey = forms.CharField(required = False, widget=forms.Textarea(attrs={'rows':2}))
+    underground_description = forms.CharField(required = False, widget=HTMLarea(
+                                           attrs={"height":"80%", "rows":20, 'placeholder': "Enter page content (using HTML)"}))
+    explorers = forms.CharField(required = False, widget=HTMLarea(
+                                           attrs={"height":"80%", "rows":20, 'placeholder': "Enter page content (using HTML)"}))
+    equipment = forms.CharField(required = False, widget=HTMLarea(
+                                           attrs={"height":"80%", "rows":20, 'placeholder': "Enter page content (using HTML)"}))
+    survey = forms.CharField(required = False, widget=HTMLarea(
+                                           attrs={"height":"80%", "rows":20, 'placeholder': "Enter page content (using HTML)"}))
     #survey = forms.CharField(required = False, widget=TinyMCE(attrs={'cols': 80, 'rows': 10}))
     kataster_status = forms.CharField(required = False)
-    underground_centre_line = forms.CharField(required = False, widget=forms.Textarea(attrs={'rows':2}))
-    notes = forms.CharField(required = False, widget=forms.Textarea(attrs={'rows':2}))
-    references = forms.CharField(required = False, widget=forms.Textarea(attrs={'rows':1}))
+    underground_centre_line = forms.CharField(required = False, widget=HTMLarea(
+                                           attrs={"height":"80%", "rows":20, 'placeholder': "Enter page content (using HTML)"}))
+    notes = forms.CharField(required = False, widget=HTMLarea(
+                                           attrs={"height":"80%", "rows":20, 'placeholder': "Enter page content (using HTML)"}))
+    references = forms.CharField(required = False, widget=HTMLarea(
+                                           attrs={"height":"80%", "rows":20, 'placeholder': "Enter page content (using HTML)"}))
     description_file = forms.CharField(required = False, widget=forms.TextInput(attrs={'size': '45'})) 
     survex_file = forms.CharField(required = False, label="Survex file [caves-1623/000/000.svx]", widget=forms.TextInput(attrs={'size': '45'})) 
     url = forms.CharField(required = True, label="URL [1623/000/000]", widget=forms.TextInput(attrs={'size': '45'})) 
diff --git a/core/views/editor_helpers.py b/core/views/editor_helpers.py
index 0051138..8eb2591 100644
--- a/core/views/editor_helpers.py
+++ b/core/views/editor_helpers.py
@@ -134,10 +134,10 @@ class NewWebImageForm(forms.Form):
 class HTMLarea(forms.Textarea):
     template_name = "widgets/HTMLarea.html"
     def __init__(self, *args, **kwargs):
-        self.iframeattrs = kwargs.pop('iframeattrs')
+        self.preview = kwargs.pop('preview', False)
         super(forms.Textarea, self).__init__(*args, **kwargs)
     def get_context(self, name, value, attrs):
         c = super(forms.Textarea, self).get_context(name, value, attrs)
-        c["iframe"] = {"attrs": self.iframeattrs}
+        c["preview"] = self.preview
         return c
         
diff --git a/core/views/expo.py b/core/views/expo.py
index 1d07d6b..7b0d283 100644
--- a/core/views/expo.py
+++ b/core/views/expo.py
@@ -382,6 +382,7 @@ class ExpoPageForm(forms.Form):
     '''The form used by the editexpopage function
     '''
     title = forms.CharField(widget=forms.TextInput(attrs={'size':'60', 'placeholder': "Enter title (displayed in tab)"}))
-    html = forms.CharField(widget=HTMLarea(iframeattrs = {"height": "80%"}, 
-                                           attrs={"height":"80%", "rows":20, 'placeholder': "Enter page content (using HTML)"}))
+    html = forms.CharField(widget=HTMLarea(attrs={"height":"80%", "rows":20, 'placeholder': "Enter page content (using HTML)"},
+                                           preview = True
+                                           ))
     change_message = forms.CharField(widget=forms.Textarea(attrs={"cols":80, "rows":3, 'placeholder': "Descibe the change made (for git)"}))