diff options
| author | Steve Manuel <nilslice@gmail.com> | 2018-08-19 21:15:27 -0600 |
|---|---|---|
| committer | Steve Manuel <nilslice@gmail.com> | 2018-08-19 21:15:27 -0600 |
| commit | 19de3f195bca0d9bee735e0f9914026249bf86b3 (patch) | |
| tree | 894ce306d79dbfd6d950d8bac852d1350d2b6e04 | |
| parent | 3c15499b7dd96f68262f59a368cf215b4b4c39a1 (diff) | |
| parent | 52226ad2351dd2d3bd4191c1d9cb7cc43939a8d7 (diff) | |
Merge branch 'master' of github.com:ponzu-cms/ponzu
| -rw-r--r-- | cmd/ponzu/usage.go | 2 | ||||
| -rw-r--r-- | management/editor/elements.go | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cmd/ponzu/usage.go b/cmd/ponzu/usage.go index da28b44..b5e9752 100644 --- a/cmd/ponzu/usage.go +++ b/cmd/ponzu/usage.go @@ -85,7 +85,7 @@ func RegisterCmdlineCommand(cmd *cobra.Command) { } func init() { - rootCmd.AddCommand(helpCmd) + rootCmd.SetHelpCommand(helpCmd) } // rpad adds padding to the right of a string. diff --git a/management/editor/elements.go b/management/editor/elements.go index 2dfab40..b279fa9 100644 --- a/management/editor/elements.go +++ b/management/editor/elements.go @@ -261,12 +261,13 @@ func Richtext(fieldName string, p interface{}, attrs map[string]string) []byte { height: 250, placeholder: '` + attrs["placeholder"] + `', toolbar: [ - ['style', ['bold', 'italic', 'underline', 'clear']], - ['font', ['strikethrough', 'superscript', 'subscript']], + ['style', ['style']], + ['font', ['bold', 'italic', 'underline', 'clear', 'strikethrough', 'superscript', 'subscript']], ['fontsize', ['fontsize']], ['color', ['color']], ['insert', ['link', 'picture', 'video', 'hr']], ['para', ['ul', 'ol', 'paragraph']], + ['table', ['table']], ['height', ['height']], ['misc', ['codeview']] ], |