diff options
author | silverwind <me@silverwind.io> | 2020-03-17 20:08:15 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-17 15:08:15 -0400 |
commit | 85fb33a65ffa9d5f0c073a01fcb5a7ef1b7311a4 (patch) | |
tree | 336f0d1af2a5ab1180d84f23c1ca58351d69222c /templates | |
parent | 43c09134a972dc421aa06fb303697671c828cf67 (diff) | |
download | gitea-85fb33a65ffa9d5f0c073a01fcb5a7ef1b7311a4.tar.gz gitea-85fb33a65ffa9d5f0c073a01fcb5a7ef1b7311a4.zip |
move jquery-datetimepicker to npm/webpack (#10713)
- update to latest version and move to npm
- adapt for api changes and css class rename
- add specificity to arc-green rules as dependency css now loads later
- use imports-loader to make it load correctly
- fix some wrong paths in librejs
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'templates')
-rw-r--r-- | templates/base/footer.tmpl | 3 | ||||
-rw-r--r-- | templates/base/head.tmpl | 4 | ||||
-rw-r--r-- | templates/pwa/serviceworker_js.tmpl | 4 |
3 files changed, 2 insertions, 9 deletions
diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 9b54d9b2a8..083f44a368 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -26,9 +26,6 @@ {{if .RequireMinicolors}} <script src="{{StaticUrlPrefix}}/vendor/plugins/jquery.minicolors/jquery.minicolors.min.js"></script> {{end}} -{{if .RequireDatetimepicker}} - <script src="{{StaticUrlPrefix}}/vendor/plugins/jquery.datetimepicker/jquery.datetimepicker.js"></script> -{{end}} {{if .RequireU2F}} <script src="{{StaticUrlPrefix}}/vendor/plugins/u2f/index.js"></script> {{end}} diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index cdffbbc2f1..e0765d59d3 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -87,7 +87,6 @@ AppSubUrl: '{{AppSubUrl}}', StaticUrlPrefix: '{{StaticUrlPrefix}}', csrf: '{{.CsrfToken}}', - Datetimepicker: {{if .RequireDatetimepicker}}true{{else}}false{{end}}, HighlightJS: {{if .RequireHighlightJS}}true{{else}}false{{end}}, Minicolors: {{if .RequireMinicolors}}true{{else}}false{{end}}, SimpleMDE: {{if .RequireSimpleMDE}}true{{else}}false{{end}}, @@ -121,9 +120,6 @@ {{if .RequireMinicolors}} <link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/plugins/jquery.minicolors/jquery.minicolors.css"> {{end}} -{{if .RequireDatetimepicker}} - <link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/plugins/jquery.datetimepicker/jquery.datetimepicker.css"> -{{end}} <style class="list-search-style"></style> {{if .PageIsUserProfile}} <meta property="og:title" content="{{.Owner.Name}}" /> diff --git a/templates/pwa/serviceworker_js.tmpl b/templates/pwa/serviceworker_js.tmpl index 875a12f8bf..7117555dd2 100644 --- a/templates/pwa/serviceworker_js.tmpl +++ b/templates/pwa/serviceworker_js.tmpl @@ -10,10 +10,10 @@ var urlsToCache = [ '{{StaticUrlPrefix}}/js/swagger.js?v={{MD5 AppVer}}', '{{StaticUrlPrefix}}/js/userheatmap.js', '{{StaticUrlPrefix}}/js/dropzone.js', + '{{StaticUrlPrefix}}/js/datetimepicker.js', '{{StaticUrlPrefix}}/vendor/plugins/codemirror/addon/mode/loadmode.js', '{{StaticUrlPrefix}}/vendor/plugins/codemirror/mode/meta.js', '{{StaticUrlPrefix}}/vendor/plugins/emojify/emojify.custom.js', - '{{StaticUrlPrefix}}/vendor/plugins/jquery.datetimepicker/jquery.datetimepicker.js', '{{StaticUrlPrefix}}/vendor/plugins/jquery.minicolors/jquery.minicolors.min.js', '{{StaticUrlPrefix}}/vendor/plugins/simplemde/simplemde.min.js', @@ -22,9 +22,9 @@ var urlsToCache = [ '{{StaticUrlPrefix}}/css/swagger.css?v={{MD5 AppVer}}', '{{StaticUrlPrefix}}/css/userheatmap.css', '{{StaticUrlPrefix}}/css/dropzone.css', + '{{StaticUrlPrefix}}/css/datetimepicker.css', '{{StaticUrlPrefix}}/fomantic/semantic.min.css?v={{MD5 AppVer}}', '{{StaticUrlPrefix}}/vendor/assets/font-awesome/css/font-awesome.min.css', - '{{StaticUrlPrefix}}/vendor/plugins/jquery.datetimepicker/jquery.datetimepicker.css', '{{StaticUrlPrefix}}/vendor/plugins/jquery.minicolors/jquery.minicolors.css', '{{StaticUrlPrefix}}/vendor/plugins/simplemde/simplemde.min.css', '{{StaticUrlPrefix}}/vendor/plugins/tribute/tribute.css', |