diff --git a/core/forms.py b/core/forms.py index 2a54428..ec639b0 100644 --- a/core/forms.py +++ b/core/forms.py @@ -7,46 +7,49 @@ import string from datetime import date from tinymce.widgets import TinyMCE -class CaveForm(ModelForm): - class Meta: - model = Cave +#class CaveForm(ModelForm): +# class Meta: +# model = Cave -class PersonForm(ModelForm): - class Meta: - model = Person +#class PersonForm(ModelForm): +# class Meta: +# model = Person -class LogbookEntryForm(ModelForm): - class Meta: - model = LogbookEntry +#class LogbookEntryForm(ModelForm): +# class Meta: +# model = LogbookEntry# - def wikiLinkHints(LogbookEntry=None): - """ - This function returns html-formatted paragraphs for each of the - wikilink types that are related to this logbookentry. Each paragraph - contains a list of all of the related wikilinks. - - Perhaps an admin javascript solution would be better. - """ - res = ["Please use the following wikilinks, which are related to this logbook entry:"] - - res.append(r'

QMs found:') - for QM in LogbookEntry.instance.QMs_found.all(): - res.append(QM.wiki_link()) +# def wikiLinkHints(LogbookEntry=None): +# """ +# This function returns html-formatted paragraphs for each of the +# wikilink types that are related to this logbookentry. Each paragraph +# contains a list of all of the related wikilinks. +# +# Perhaps an admin javascript solution would be better. +# """ +# res = ["Please use the following wikilinks, which are related to this logbook entry:"] +# +# res.append(r'

QMs found:') +# for QM in LogbookEntry.instance.QMs_found.all(): +# res.append(QM.wiki_link()) - res.append(r'

QMs ticked off:') - for QM in LogbookEntry.instance.QMs_ticked_off.all(): - res.append(QM.wiki_link()) +# res.append(r'

QMs ticked off:') +# for QM in LogbookEntry.instance.QMs_ticked_off.all(): +# res.append(QM.wiki_link()) # res.append(r'

People') # for persontrip in LogbookEntry.instance.persontrip_set.all(): # res.append(persontrip.wiki_link()) # res.append(r'

') - return string.join(res, r'
') +# return string.join(res, r'
') - def __init__(self, *args, **kwargs): - super(LogbookEntryForm, self).__init__(*args, **kwargs) - self.fields['text'].help_text=self.wikiLinkHints() +# def __init__(self, *args, **kwargs): +# super(LogbookEntryForm, self).__init__(*args, **kwargs) +# self.fields['text'].help_text=self.wikiLinkHints()# + +class CaveForm(forms.Form): + html = forms.CharField(widget=TinyMCE(attrs={'cols': 80, 'rows': 30})) def getTripForm(expedition):