diff --git a/config/config.go b/config/config.go index 974e33f..72827f1 100644 --- a/config/config.go +++ b/config/config.go @@ -57,7 +57,6 @@ type AmConfig struct { Rendering struct { TemplateDir string `yaml:"templatedir"` CookieKey string `yaml:"cookiekey"` - ButtonSet string `yaml:"buttonSet"` } `yaml:"rendering"` } diff --git a/config/default.yaml b/config/default.yaml index 9151b72..b0fd42d 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -15,4 +15,3 @@ database: rendering: templatedir: custom_templates cookiekey: ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz - buttonSet: classic diff --git a/ui/buttons/classic/add.jpg b/ui/buttons/classic/add.jpg deleted file mode 100644 index 2a6b7de..0000000 Binary files a/ui/buttons/classic/add.jpg and /dev/null differ diff --git a/ui/buttons/classic/add_to_hotlist.jpg b/ui/buttons/classic/add_to_hotlist.jpg deleted file mode 100644 index b725727..0000000 Binary files a/ui/buttons/classic/add_to_hotlist.jpg and /dev/null differ diff --git a/ui/buttons/classic/add_topic.jpg b/ui/buttons/classic/add_topic.jpg deleted file mode 100644 index 3cd60ab..0000000 Binary files a/ui/buttons/classic/add_topic.jpg and /dev/null differ diff --git a/ui/buttons/classic/archive_topic.jpg b/ui/buttons/classic/archive_topic.jpg deleted file mode 100644 index 7fd04e4..0000000 Binary files a/ui/buttons/classic/archive_topic.jpg and /dev/null differ diff --git a/ui/buttons/classic/arrow_next.jpg b/ui/buttons/classic/arrow_next.jpg deleted file mode 100644 index ea66781..0000000 Binary files a/ui/buttons/classic/arrow_next.jpg and /dev/null differ diff --git a/ui/buttons/classic/arrow_previous.jpg b/ui/buttons/classic/arrow_previous.jpg deleted file mode 100644 index d05c95f..0000000 Binary files a/ui/buttons/classic/arrow_previous.jpg and /dev/null differ diff --git a/ui/buttons/classic/cancel.jpg b/ui/buttons/classic/cancel.jpg deleted file mode 100644 index 2438bee..0000000 Binary files a/ui/buttons/classic/cancel.jpg and /dev/null differ diff --git a/ui/buttons/classic/conference_list.jpg b/ui/buttons/classic/conference_list.jpg deleted file mode 100644 index f3a293a..0000000 Binary files a/ui/buttons/classic/conference_list.jpg and /dev/null differ diff --git a/ui/buttons/classic/configure.jpg b/ui/buttons/classic/configure.jpg deleted file mode 100644 index 244038a..0000000 Binary files a/ui/buttons/classic/configure.jpg and /dev/null differ diff --git a/ui/buttons/classic/create.jpg b/ui/buttons/classic/create.jpg deleted file mode 100644 index e950efc..0000000 Binary files a/ui/buttons/classic/create.jpg and /dev/null differ diff --git a/ui/buttons/classic/create_new.jpg b/ui/buttons/classic/create_new.jpg deleted file mode 100644 index dbd70aa..0000000 Binary files a/ui/buttons/classic/create_new.jpg and /dev/null differ diff --git a/ui/buttons/classic/delete_topic.jpg b/ui/buttons/classic/delete_topic.jpg deleted file mode 100644 index 9ca6568..0000000 Binary files a/ui/buttons/classic/delete_topic.jpg and /dev/null differ diff --git a/ui/buttons/classic/export.jpg b/ui/buttons/classic/export.jpg deleted file mode 100644 index 611c6a8..0000000 Binary files a/ui/buttons/classic/export.jpg and /dev/null differ diff --git a/ui/buttons/classic/filter_user.jpg b/ui/buttons/classic/filter_user.jpg deleted file mode 100644 index 099181f..0000000 Binary files a/ui/buttons/classic/filter_user.jpg and /dev/null differ diff --git a/ui/buttons/classic/find.jpg b/ui/buttons/classic/find.jpg deleted file mode 100644 index 24c0291..0000000 Binary files a/ui/buttons/classic/find.jpg and /dev/null differ diff --git a/ui/buttons/classic/freeze_topic.jpg b/ui/buttons/classic/freeze_topic.jpg deleted file mode 100644 index 9ac99f8..0000000 Binary files a/ui/buttons/classic/freeze_topic.jpg and /dev/null differ diff --git a/ui/buttons/classic/go.jpg b/ui/buttons/classic/go.jpg deleted file mode 100644 index 080e92a..0000000 Binary files a/ui/buttons/classic/go.jpg and /dev/null differ diff --git a/ui/buttons/classic/hide.jpg b/ui/buttons/classic/hide.jpg deleted file mode 100644 index e83a945..0000000 Binary files a/ui/buttons/classic/hide.jpg and /dev/null differ diff --git a/ui/buttons/classic/hide_topic.jpg b/ui/buttons/classic/hide_topic.jpg deleted file mode 100644 index 6849a83..0000000 Binary files a/ui/buttons/classic/hide_topic.jpg and /dev/null differ diff --git a/ui/buttons/classic/import.jpg b/ui/buttons/classic/import.jpg deleted file mode 100644 index 6324dc0..0000000 Binary files a/ui/buttons/classic/import.jpg and /dev/null differ diff --git a/ui/buttons/classic/invite.jpg b/ui/buttons/classic/invite.jpg deleted file mode 100644 index 865737c..0000000 Binary files a/ui/buttons/classic/invite.jpg and /dev/null differ diff --git a/ui/buttons/classic/join_now.jpg b/ui/buttons/classic/join_now.jpg deleted file mode 100644 index 4fdfdf9..0000000 Binary files a/ui/buttons/classic/join_now.jpg and /dev/null differ diff --git a/ui/buttons/classic/login.jpg b/ui/buttons/classic/login.jpg deleted file mode 100644 index 8670c70..0000000 Binary files a/ui/buttons/classic/login.jpg and /dev/null differ diff --git a/ui/buttons/classic/manage.jpg b/ui/buttons/classic/manage.jpg deleted file mode 100644 index 0165ef2..0000000 Binary files a/ui/buttons/classic/manage.jpg and /dev/null differ diff --git a/ui/buttons/classic/move.jpg b/ui/buttons/classic/move.jpg deleted file mode 100644 index 54daf5d..0000000 Binary files a/ui/buttons/classic/move.jpg and /dev/null differ diff --git a/ui/buttons/classic/next_keep_new.jpg b/ui/buttons/classic/next_keep_new.jpg deleted file mode 100644 index e86d645..0000000 Binary files a/ui/buttons/classic/next_keep_new.jpg and /dev/null differ diff --git a/ui/buttons/classic/next_topic.jpg b/ui/buttons/classic/next_topic.jpg deleted file mode 100644 index 1aa5c3a..0000000 Binary files a/ui/buttons/classic/next_topic.jpg and /dev/null differ diff --git a/ui/buttons/classic/no.jpg b/ui/buttons/classic/no.jpg deleted file mode 100644 index 753cf6b..0000000 Binary files a/ui/buttons/classic/no.jpg and /dev/null differ diff --git a/ui/buttons/classic/nuke.jpg b/ui/buttons/classic/nuke.jpg deleted file mode 100644 index 73f9030..0000000 Binary files a/ui/buttons/classic/nuke.jpg and /dev/null differ diff --git a/ui/buttons/classic/ok.jpg b/ui/buttons/classic/ok.jpg deleted file mode 100644 index bdee092..0000000 Binary files a/ui/buttons/classic/ok.jpg and /dev/null differ diff --git a/ui/buttons/classic/post.jpg b/ui/buttons/classic/post.jpg deleted file mode 100644 index ea8f5ac..0000000 Binary files a/ui/buttons/classic/post.jpg and /dev/null differ diff --git a/ui/buttons/classic/post_go_next.jpg b/ui/buttons/classic/post_go_next.jpg deleted file mode 100644 index 52df20e..0000000 Binary files a/ui/buttons/classic/post_go_next.jpg and /dev/null differ diff --git a/ui/buttons/classic/post_go_topics.jpg b/ui/buttons/classic/post_go_topics.jpg deleted file mode 100644 index 7239e7c..0000000 Binary files a/ui/buttons/classic/post_go_topics.jpg and /dev/null differ diff --git a/ui/buttons/classic/post_reload.jpg b/ui/buttons/classic/post_reload.jpg deleted file mode 100644 index f0a4b83..0000000 Binary files a/ui/buttons/classic/post_reload.jpg and /dev/null differ diff --git a/ui/buttons/classic/preview.jpg b/ui/buttons/classic/preview.jpg deleted file mode 100644 index 3e63e3e..0000000 Binary files a/ui/buttons/classic/preview.jpg and /dev/null differ diff --git a/ui/buttons/classic/publish.jpg b/ui/buttons/classic/publish.jpg deleted file mode 100644 index 1254033..0000000 Binary files a/ui/buttons/classic/publish.jpg and /dev/null differ diff --git a/ui/buttons/classic/read_new.jpg b/ui/buttons/classic/read_new.jpg deleted file mode 100644 index 29777d6..0000000 Binary files a/ui/buttons/classic/read_new.jpg and /dev/null differ diff --git a/ui/buttons/classic/reminder.jpg b/ui/buttons/classic/reminder.jpg deleted file mode 100644 index e5cbb8a..0000000 Binary files a/ui/buttons/classic/reminder.jpg and /dev/null differ diff --git a/ui/buttons/classic/remove.jpg b/ui/buttons/classic/remove.jpg deleted file mode 100644 index ff62979..0000000 Binary files a/ui/buttons/classic/remove.jpg and /dev/null differ diff --git a/ui/buttons/classic/scribble.jpg b/ui/buttons/classic/scribble.jpg deleted file mode 100644 index 88b868e..0000000 Binary files a/ui/buttons/classic/scribble.jpg and /dev/null differ diff --git a/ui/buttons/classic/search.jpg b/ui/buttons/classic/search.jpg deleted file mode 100644 index 1f80e4a..0000000 Binary files a/ui/buttons/classic/search.jpg and /dev/null differ diff --git a/ui/buttons/classic/send_again.jpg b/ui/buttons/classic/send_again.jpg deleted file mode 100644 index ccc011b..0000000 Binary files a/ui/buttons/classic/send_again.jpg and /dev/null differ diff --git a/ui/buttons/classic/send_email.jpg b/ui/buttons/classic/send_email.jpg deleted file mode 100644 index 99a9128..0000000 Binary files a/ui/buttons/classic/send_email.jpg and /dev/null differ diff --git a/ui/buttons/classic/set.jpg b/ui/buttons/classic/set.jpg deleted file mode 100644 index bf114e5..0000000 Binary files a/ui/buttons/classic/set.jpg and /dev/null differ diff --git a/ui/buttons/classic/show.jpg b/ui/buttons/classic/show.jpg deleted file mode 100644 index 9c59f49..0000000 Binary files a/ui/buttons/classic/show.jpg and /dev/null differ diff --git a/ui/buttons/classic/show_topic.jpg b/ui/buttons/classic/show_topic.jpg deleted file mode 100644 index 97d2170..0000000 Binary files a/ui/buttons/classic/show_topic.jpg and /dev/null differ diff --git a/ui/buttons/classic/stick_topic.jpg b/ui/buttons/classic/stick_topic.jpg deleted file mode 100644 index 5bcdb77..0000000 Binary files a/ui/buttons/classic/stick_topic.jpg and /dev/null differ diff --git a/ui/buttons/classic/topic_list.jpg b/ui/buttons/classic/topic_list.jpg deleted file mode 100644 index d21c6be..0000000 Binary files a/ui/buttons/classic/topic_list.jpg and /dev/null differ diff --git a/ui/buttons/classic/unarchive_topic.jpg b/ui/buttons/classic/unarchive_topic.jpg deleted file mode 100644 index 137f924..0000000 Binary files a/ui/buttons/classic/unarchive_topic.jpg and /dev/null differ diff --git a/ui/buttons/classic/unfreeze_topic.jpg b/ui/buttons/classic/unfreeze_topic.jpg deleted file mode 100644 index 0b2e1c9..0000000 Binary files a/ui/buttons/classic/unfreeze_topic.jpg and /dev/null differ diff --git a/ui/buttons/classic/unstick_topic.jpg b/ui/buttons/classic/unstick_topic.jpg deleted file mode 100644 index 871cadd..0000000 Binary files a/ui/buttons/classic/unstick_topic.jpg and /dev/null differ diff --git a/ui/buttons/classic/update.jpg b/ui/buttons/classic/update.jpg deleted file mode 100644 index ab3c395..0000000 Binary files a/ui/buttons/classic/update.jpg and /dev/null differ diff --git a/ui/buttons/classic/upload.jpg b/ui/buttons/classic/upload.jpg deleted file mode 100644 index 04fca11..0000000 Binary files a/ui/buttons/classic/upload.jpg and /dev/null differ diff --git a/ui/buttons/classic/user_accept.jpg b/ui/buttons/classic/user_accept.jpg deleted file mode 100644 index b1f327d..0000000 Binary files a/ui/buttons/classic/user_accept.jpg and /dev/null differ diff --git a/ui/buttons/classic/user_decline.jpg b/ui/buttons/classic/user_decline.jpg deleted file mode 100644 index fe8cde4..0000000 Binary files a/ui/buttons/classic/user_decline.jpg and /dev/null differ diff --git a/ui/buttons/classic/yes.jpg b/ui/buttons/classic/yes.jpg deleted file mode 100644 index 5f5ce14..0000000 Binary files a/ui/buttons/classic/yes.jpg and /dev/null differ diff --git a/ui/images.go b/ui/images.go index 3d18aeb..c831d27 100644 --- a/ui/images.go +++ b/ui/images.go @@ -17,16 +17,11 @@ import ( "net/http" "path/filepath" "strings" - - "git.erbosoft.com/amy/amsterdam/config" ) //go:embed static_images/* var static_images embed.FS -//go:embed buttons/* -var buttons embed.FS - /* mimeTypeFromFilenane returns the MIME type of a file, given its filename. * Parameters: * filaname - The name of the file to be tested. @@ -57,14 +52,6 @@ func AmServeImage(ctxt AmContext) (string, any, error) { return "bytes", b, nil } } - if components[2] == "button/" { - b, err = buttons.ReadFile(filepath.Join("buttons", config.GlobalConfig.Rendering.ButtonSet, - components[3])) - if err == nil { - ctxt.SetOutputType(mimeTypeFromFilename(components[3])) - return "bytes", b, nil - } - } } ctxt.SetRC(http.StatusNotFound) // TODO: improve this error reporting