From c99f993e31b9ad84b05a01927992bc828fbdbeaa Mon Sep 17 00:00:00 2001 From: cg33 Date: Tue, 8 Oct 2019 22:48:28 +0800 Subject: [PATCH] fixed icon picker error --- template/adminlte/resource/assets.go | 62 +- .../pages/components/form/iconpicker.tmpl | 2254 +--------------- .../pages/components/form/singleselect.tmpl | 3 +- template/adminlte/tmpl/template.go | 2257 +---------------- 4 files changed, 63 insertions(+), 4513 deletions(-) diff --git a/template/adminlte/resource/assets.go b/template/adminlte/resource/assets.go index 72bd0e83e..ba0de36d6 100644 --- a/template/adminlte/resource/assets.go +++ b/template/adminlte/resource/assets.go @@ -111,7 +111,7 @@ func templateAdminlteResourceAssetsDistCssAllMinCss() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/css/all.min.css", size: 422369, mode: os.FileMode(420), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/css/all.min.css", size: 422369, mode: os.FileMode(420), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -131,7 +131,7 @@ func templateAdminlteResourceAssetsDistCssBluePng() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/css/blue.png", size: 1132, mode: os.FileMode(493), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/css/blue.png", size: 1132, mode: os.FileMode(493), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -151,7 +151,7 @@ func templateAdminlteResourceAssetsDistCssBlue2xPng() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/css/blue@2x.png", size: 1410, mode: os.FileMode(493), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/css/blue@2x.png", size: 1410, mode: os.FileMode(493), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -171,7 +171,7 @@ func templateAdminlteResourceAssetsDistCssFonts6xk3dsbykcsvLcoeqqfx1ryoo3qok7gTt return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/css/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7g.ttf", size: 39456, mode: os.FileMode(420), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/css/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7g.ttf", size: 39456, mode: os.FileMode(420), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -191,7 +191,7 @@ func templateAdminlteResourceAssetsDistCssFonts6xkydsbykcsvLcoeqqfx1ryoo3i54rwlx return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/css/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdr.ttf", size: 39084, mode: os.FileMode(420), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/css/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdr.ttf", size: 39084, mode: os.FileMode(420), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -211,7 +211,7 @@ func templateAdminlteResourceAssetsDistCssFonts6xkydsbykcsvLcoeqqfx1ryoo3ig4vwlx return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/css/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlxdr.ttf", size: 39128, mode: os.FileMode(420), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/css/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlxdr.ttf", size: 39128, mode: os.FileMode(420), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -231,7 +231,7 @@ func templateAdminlteResourceAssetsDistCssFonts6xkydsbykcsvLcoeqqfx1ryoo3ik4zwlx return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/css/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwlxdr.ttf", size: 39656, mode: os.FileMode(420), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/css/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwlxdr.ttf", size: 39656, mode: os.FileMode(420), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -251,7 +251,7 @@ func templateAdminlteResourceAssetsDistFonts6xk1dsbykcsvLcoeqqfx1ryoo3qpz7nsdcTt return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7nsDc.ttf", size: 36616, mode: os.FileMode(420), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7nsDc.ttf", size: 36616, mode: os.FileMode(420), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -271,7 +271,7 @@ func templateAdminlteResourceAssetsDistFonts6xkwdsbykcsvLcoeqqfx1ryoo3qpzy4lcds1 return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCds18E.ttf", size: 36536, mode: os.FileMode(420), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lCds18E.ttf", size: 36536, mode: os.FileMode(420), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -291,7 +291,7 @@ func templateAdminlteResourceAssetsDistFonts6xkwdsbykcsvLcoeqqfx1ryoo3qpzzmkids1 return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZZMkids18E.ttf", size: 36932, mode: os.FileMode(420), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZZMkids18E.ttf", size: 36932, mode: os.FileMode(420), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -311,7 +311,7 @@ func templateAdminlteResourceAssetsDistFontsFontawesomeOtf() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/FontAwesome.otf", size: 134808, mode: os.FileMode(493), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/FontAwesome.otf", size: 134808, mode: os.FileMode(493), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -331,7 +331,7 @@ func templateAdminlteResourceAssetsDistFontsFontawesomeWebfontEot() (*asset, err return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/fontawesome-webfont.eot", size: 165742, mode: os.FileMode(493), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/fontawesome-webfont.eot", size: 165742, mode: os.FileMode(493), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -351,7 +351,7 @@ func templateAdminlteResourceAssetsDistFontsFontawesomeWebfontSvg() (*asset, err return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/fontawesome-webfont.svg", size: 444379, mode: os.FileMode(493), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/fontawesome-webfont.svg", size: 444379, mode: os.FileMode(493), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -371,7 +371,7 @@ func templateAdminlteResourceAssetsDistFontsFontawesomeWebfontTtf() (*asset, err return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/fontawesome-webfont.ttf", size: 165548, mode: os.FileMode(493), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/fontawesome-webfont.ttf", size: 165548, mode: os.FileMode(493), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -391,7 +391,7 @@ func templateAdminlteResourceAssetsDistFontsFontawesomeWebfontWoff() (*asset, er return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/fontawesome-webfont.woff", size: 98024, mode: os.FileMode(493), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/fontawesome-webfont.woff", size: 98024, mode: os.FileMode(493), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -411,7 +411,7 @@ func templateAdminlteResourceAssetsDistFontsFontawesomeWebfontWoff2() (*asset, e return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/fontawesome-webfont.woff2", size: 77160, mode: os.FileMode(493), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/fontawesome-webfont.woff2", size: 77160, mode: os.FileMode(493), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -431,7 +431,7 @@ func templateAdminlteResourceAssetsDistFontsGlyphiconsHalflingsRegularEot() (*as return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/glyphicons-halflings-regular.eot", size: 20127, mode: os.FileMode(493), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/glyphicons-halflings-regular.eot", size: 20127, mode: os.FileMode(493), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -451,7 +451,7 @@ func templateAdminlteResourceAssetsDistFontsGlyphiconsHalflingsRegularSvg() (*as return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/glyphicons-halflings-regular.svg", size: 108738, mode: os.FileMode(493), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/glyphicons-halflings-regular.svg", size: 108738, mode: os.FileMode(493), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -471,7 +471,7 @@ func templateAdminlteResourceAssetsDistFontsGlyphiconsHalflingsRegularTtf() (*as return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/glyphicons-halflings-regular.ttf", size: 45404, mode: os.FileMode(493), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/glyphicons-halflings-regular.ttf", size: 45404, mode: os.FileMode(493), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -491,7 +491,7 @@ func templateAdminlteResourceAssetsDistFontsGlyphiconsHalflingsRegularWoff() (*a return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/glyphicons-halflings-regular.woff", size: 23424, mode: os.FileMode(493), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/glyphicons-halflings-regular.woff", size: 23424, mode: os.FileMode(493), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -511,7 +511,7 @@ func templateAdminlteResourceAssetsDistFontsGlyphiconsHalflingsRegularWoff2() (* return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/glyphicons-halflings-regular.woff2", size: 18028, mode: os.FileMode(493), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/glyphicons-halflings-regular.woff2", size: 18028, mode: os.FileMode(493), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -531,7 +531,7 @@ func templateAdminlteResourceAssetsDistFontsIoniconsTtf() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/ionicons.ttf", size: 188508, mode: os.FileMode(493), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/ionicons.ttf", size: 188508, mode: os.FileMode(493), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -551,7 +551,7 @@ func templateAdminlteResourceAssetsDistFontsIoniconsWoff() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/ionicons.woff", size: 67904, mode: os.FileMode(493), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/fonts/ionicons.woff", size: 67904, mode: os.FileMode(493), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -571,7 +571,7 @@ func templateAdminlteResourceAssetsDistImgAvatar04Png() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/img/avatar04.png", size: 13539, mode: os.FileMode(493), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/img/avatar04.png", size: 13539, mode: os.FileMode(493), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -591,7 +591,7 @@ func templateAdminlteResourceAssetsDistJsAllMinJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/js/all.min.js", size: 225577, mode: os.FileMode(420), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/js/all.min.js", size: 225577, mode: os.FileMode(420), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -611,7 +611,7 @@ func templateAdminlteResourceAssetsDistJsAll_2MinJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/js/all_2.min.js", size: 699906, mode: os.FileMode(420), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/js/all_2.min.js", size: 699906, mode: os.FileMode(420), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -631,7 +631,7 @@ func templateAdminlteResourceAssetsDistJsChartJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/js/chart.js", size: 142273, mode: os.FileMode(420), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/js/chart.js", size: 142273, mode: os.FileMode(420), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -651,7 +651,7 @@ func templateAdminlteResourceAssetsDistJsFontawesomeIconpickerMinJs() (*asset, e return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/js/fontawesome-iconpicker.min.js", size: 31024, mode: os.FileMode(420), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/js/fontawesome-iconpicker.min.js", size: 31024, mode: os.FileMode(420), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -671,7 +671,7 @@ func templateAdminlteResourceAssetsDistJsFormMinJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/js/form.min.js", size: 235423, mode: os.FileMode(420), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/js/form.min.js", size: 235423, mode: os.FileMode(420), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -691,7 +691,7 @@ func templateAdminlteResourceAssetsDistJsHtml5shivMinJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/js/html5shiv.min.js", size: 2730, mode: os.FileMode(420), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/js/html5shiv.min.js", size: 2730, mode: os.FileMode(420), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -711,7 +711,7 @@ func templateAdminlteResourceAssetsDistJsRespondMinJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/js/respond.min.js", size: 4377, mode: os.FileMode(420), modTime: time.Unix(1570530785, 0)} + info := bindataFileInfo{name: "template/adminlte/resource/assets/dist/js/respond.min.js", size: 4377, mode: os.FileMode(420), modTime: time.Unix(1570544915, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/template/adminlte/resource/pages/components/form/iconpicker.tmpl b/template/adminlte/resource/pages/components/form/iconpicker.tmpl index c87656949..df69c80f5 100644 --- a/template/adminlte/resource/pages/components/form/iconpicker.tmpl +++ b/template/adminlte/resource/pages/components/form/iconpicker.tmpl @@ -1,2246 +1,20 @@ {{define "form_iconpicker"}}
-
- - +
+ + {{if eq .Value ""}} + + {{else}} + + {{end}}
- -  For more icons please see http://fontawesome.io/icons/ - -
-
-
-
-
-
-
-
-
+ {{end}} \ No newline at end of file diff --git a/template/adminlte/resource/pages/components/form/singleselect.tmpl b/template/adminlte/resource/pages/components/form/singleselect.tmpl index 5ebf9d8f9..7ebee75e9 100644 --- a/template/adminlte/resource/pages/components/form/singleselect.tmpl +++ b/template/adminlte/resource/pages/components/form/singleselect.tmpl @@ -1,7 +1,8 @@ {{define "form_select_single"}}
- {{range $key, $v := .Options }} {{end}} diff --git a/template/adminlte/tmpl/template.go b/template/adminlte/tmpl/template.go index 7dbb9fa30..936d9665d 100644 --- a/template/adminlte/tmpl/template.go +++ b/template/adminlte/tmpl/template.go @@ -280,2248 +280,22 @@ var List = map[string]string{"admin_panel": `{{define "admin_panel"}} {{end}}`, "components/form/iconpicker": `{{define "form_iconpicker"}}
-
- - -
- -  For more icons please see http://fontawesome.io/icons/ - -
-
-
-
-
-
-
+
+ + {{if eq .Value ""}} + + {{else}} + + {{end}}
-
+ {{end}}`, "components/form/ip": `{{define "form_ip"}}
@@ -2635,7 +409,8 @@ var List = map[string]string{"admin_panel": `{{define "admin_panel"}} {{end}}`, "components/form/singleselect": `{{define "form_select_single"}}
- {{range $key, $v := .Options }} {{end}}