public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #149 from witzig/master

Browse source 
Temporary fix for #148
This commit is contained in:
Andris Reinman 2017-03-07 16:31:12 +02:00 • committed by GitHub
commit 573a6d44ff
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
views/campaigns/edit-rss.hbs
View file

@ -82,9 +82,9 @@
</div> </div>
{{#if disableWysiwyg}} {{#if disableWysiwyg}}
{{> codeeditor}} {{> codeeditor}}
{{else}} {{else}}
{{> summernote}} {{> summernote}}
{{/if}} {{/if}}
<div class="form-group" style="margin-top: -15px;"> <div class="form-group" style="margin-top: -15px;">

6
views/campaigns/edit-triggered.hbs
View file

@ -131,12 +131,12 @@
{{> merge_tag_reference}} {{> merge_tag_reference}}
{{> plaintext}} {{> plaintext}}
{{#if disableWysiwyg}} {{#if disableWysiwyg}}
{{> codeeditor}} {{> codeeditor}}
{{else}} {{else}}
{{> (lookup . 'editorName') }} {{> (lookup . 'editorName') }}
{{/if}} {{/if}}
{{/if}} {{/if}}

6
views/campaigns/edit.hbs
View file

@ -147,12 +147,12 @@
{{> merge_tag_reference}} {{> merge_tag_reference}}
{{> plaintext}} {{> plaintext}}
{{#if disableWysiwyg}} {{#if disableWysiwyg}}
{{> codeeditor}} {{> codeeditor}}
{{else}} {{else}}
{{> (lookup . 'editorName') }} {{> (lookup . 'editorName') }}
{{/if}} {{/if}}
{{/if}} {{/if}}

6
views/templates/edit.hbs
View file

@ -26,12 +26,12 @@
{{> merge_tag_reference mergeTagReferenceFooterText='In addition to that any custom field can have its own merge tag.'}} {{> merge_tag_reference mergeTagReferenceFooterText='In addition to that any custom field can have its own merge tag.'}}
{{> plaintext}} {{> plaintext}}
{{#if disableWysiwyg}} {{#if disableWysiwyg}}
{{> codeeditor}} {{> codeeditor}}
{{else}} {{else}}
{{> (lookup . 'editorName') }} {{> (lookup . 'editorName') }}
{{/if}} {{/if}}
<div class="form-group"> <div class="form-group">