diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/issue/fields/textarea.tmpl | 27 | ||||
| -rw-r--r-- | templates/repo/issue/new_form.tmpl | 7 |
2 files changed, 24 insertions, 10 deletions
diff --git a/templates/repo/issue/fields/textarea.tmpl b/templates/repo/issue/fields/textarea.tmpl index ad3c5efa04..49d51eb5a8 100644 --- a/templates/repo/issue/fields/textarea.tmpl +++ b/templates/repo/issue/fields/textarea.tmpl @@ -1,6 +1,25 @@ -<div class="field"> +{{$useMarkdownEditor := not .item.Attributes.render}} +<div class="field {{if $useMarkdownEditor}}combo-editor-dropzone{{end}}"> {{template "repo/issue/fields/header" .}} - {{/* FIXME: preview markdown result */}} - {{/* FIXME: required validation for markdown editor */}} - <textarea name="form-field-{{.item.ID}}" placeholder="{{.item.Attributes.placeholder}}" {{if and .item.Validations.required .item.Attributes.render}}required{{end}}>{{.item.Attributes.value}}</textarea> + + {{/* the real form element to provide the value */}} + <textarea class="form-field-real" name="form-field-{{.item.ID}}" placeholder="{{.item.Attributes.placeholder}}" {{if and .item.Validations.required}}required{{end}}>{{.item.Attributes.value}}</textarea> + + {{if $useMarkdownEditor}} + {{template "shared/combomarkdowneditor" (dict + "locale" .root.locale + "ContainerClasses" "gt-hidden" + "MarkdownPreviewUrl" (print .root.RepoLink "/markup") + "MarkdownPreviewContext" .root.RepoLink + "TextareaContent" .item.Attributes.value + "TextareaPlaceholder" .item.Attributes.placeholder + "DropzoneParentContainer" ".combo-editor-dropzone" + )}} + + {{if .root.IsAttachmentEnabled}} + <div class="gt-mt-4 form-field-dropzone gt-hidden"> + {{template "repo/upload" .root}} + </div> + {{end}} + {{end}} </div> diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 196e911061..c12b8149b0 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -24,18 +24,13 @@ {{else if eq .Type "markdown"}} {{template "repo/issue/fields/markdown" dict "Context" $.Context "item" .}} {{else if eq .Type "textarea"}} - {{template "repo/issue/fields/textarea" dict "Context" $.Context "item" .}} + {{template "repo/issue/fields/textarea" dict "Context" $.Context "item" . "root" $}} {{else if eq .Type "dropdown"}} {{template "repo/issue/fields/dropdown" dict "Context" $.Context "item" .}} {{else if eq .Type "checkboxes"}} {{template "repo/issue/fields/checkboxes" dict "Context" $.Context "item" .}} {{end}} {{end}} - {{if .IsAttachmentEnabled}} - <div class="field"> - {{template "repo/upload" .}} - </div> - {{end}} {{else}} {{template "repo/issue/comment_tab" .}} {{end}} |