From 52226ad2351dd2d3bd4191c1d9cb7cc43939a8d7 Mon Sep 17 00:00:00 2001 From: Steve Manuel Date: Sun, 19 Aug 2018 21:14:52 -0600 Subject: admin richtext updates, uuid package migration (#269) * update CI code to run --dev if on ponzu-dev branch * CI: ensure we have latest from ponzu-dev branch * Replaced satori/go.uuid with gofrs/uuid. (#268) * Changed files to use new uuid pkg. * Replace satori/go.uuid with gofrs/uuid. Closes #257. * Deleted satori/go.uuid folder. Closes #257. * Added heading styles and table to richtext toolbar. (#267) Closes #207. * Override Cobra's 'help' command to remove duplicate. (#266) Closes #206. --- management/editor/elements.go | 5 +++-- management/manager/manager.go | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'management') 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']] ], diff --git a/management/manager/manager.go b/management/manager/manager.go index 1389747..5783e16 100644 --- a/management/manager/manager.go +++ b/management/manager/manager.go @@ -10,7 +10,7 @@ import ( "github.com/ponzu-cms/ponzu/management/editor" "github.com/ponzu-cms/ponzu/system/item" - uuid "github.com/satori/go.uuid" + "github.com/gofrs/uuid" ) const managerHTML = ` -- cgit v1.2.3