This is an automated email from the ASF dual-hosted git repository. kentontaylor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/allura.git
commit e61408b6c7c2efb37d1a73a9b33444dbf20cb7c0 Author: Dave Brondsema <[email protected]> AuthorDate: Fri Feb 28 18:21:48 2025 -0500 [#8576] upgrade jquery ui to 1.14.1 and remove it from filename --- Allura/LICENSE | 6 +++--- Allura/allura/ext/admin/templates/project_groups.html | 2 +- Allura/allura/ext/admin/widgets.py | 4 ++-- Allura/allura/lib/widgets/form_fields.py | 12 ++++++------ .../smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 86 -> 0 bytes .../smoothness/images/ui-bg_flat_75_ffffff_40x100.png | Bin 86 -> 0 bytes .../smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 335 -> 429 bytes .../smoothness/images/ui-bg_glass_65_ffffff_1x400.png | Bin 207 -> 301 bytes .../smoothness/images/ui-bg_glass_75_dadada_1x400.png | Bin 262 -> 359 bytes .../smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 262 -> 360 bytes .../smoothness/images/ui-bg_glass_95_fef1ec_1x400.png | Bin 332 -> 426 bytes .../images/ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 280 -> 361 bytes .../css/smoothness/images/ui-icons_222222_256x240.png | Bin 0 -> 7061 bytes ...cc0000_256x240.png => ui-icons_2e83ff_256x240.png} | Bin 4618 -> 4654 bytes .../css/smoothness/images/ui-icons_444444_256x240.png | Bin 7090 -> 0 bytes .../css/smoothness/images/ui-icons_454545_256x240.png | Bin 0 -> 7126 bytes .../css/smoothness/images/ui-icons_555555_256x240.png | Bin 7074 -> 0 bytes .../css/smoothness/images/ui-icons_777777_256x240.png | Bin 7111 -> 0 bytes .../css/smoothness/images/ui-icons_888888_256x240.png | Bin 0 -> 7147 bytes ...777620_256x240.png => ui-icons_cd0a0a_256x240.png} | Bin 4618 -> 4654 bytes .../css/smoothness/images/ui-icons_ffffff_256x240.png | Bin 6487 -> 0 bytes .../public/nf/css/smoothness/jquery-ui-1.13.2.min.css | 7 ------- .../allura/public/nf/css/smoothness/jquery-ui.min.css | 7 +++++++ Allura/allura/public/nf/js/jquery-ui-1.13.2.min.js | 6 ------ Allura/allura/public/nf/js/jquery-ui.min.js | 6 ++++++ .../allura/templates/jinja_master/theme_macros.html | 2 +- Allura/allura/templates/neighborhood_add_project.html | 2 +- .../jinja_master/theme_macros.html | 2 +- .../templates/discussionforums/stats_graph.html | 4 ++-- ForgeTracker/forgetracker/widgets/ticket_search.py | 4 ++-- LICENSE | 6 +++--- rat-excludes.txt | 4 ++-- 32 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Allura/LICENSE b/Allura/LICENSE index 9968a636e..62d28b803 100644 --- a/Allura/LICENSE +++ b/Allura/LICENSE @@ -216,8 +216,8 @@ jQuery, jQueryUI, and various related plugins, which are available under the MIT license. For details, see the individual files: allura/public/nf/js/jquery-3.6.0.min.js allura/public/nf/js/jquery.cookie-1.4.1.js - allura/public/nf/js/jquery-ui-1.13.2.min.js - allura/public/nf/css/smoothness/jquery-ui-1.13.2.min.css + allura/public/nf/js/jquery-ui.min.js + allura/public/nf/css/smoothness/jquery-ui.min.css allura/public/nf/js/jquery.daterangepicker.js allura/public/nf/css/forge/ui.daterangepicker.css allura/lib/widgets/resources/css/autocomplete.css @@ -282,4 +282,4 @@ Foundation, which is available under the MIT license Show-hint addon for CodeMirror library (https://codemirror.net/addon/hint/) is available under the MIT license. For details, see: Allura/allura/lib/widgets/resources/js/show-hint.js - Allura/allura/lib/widgets/resources/css/show-hint.css \ No newline at end of file + Allura/allura/lib/widgets/resources/css/show-hint.css diff --git a/Allura/allura/ext/admin/templates/project_groups.html b/Allura/allura/ext/admin/templates/project_groups.html index 341b91e54..b26508c9b 100644 --- a/Allura/allura/ext/admin/templates/project_groups.html +++ b/Allura/allura/ext/admin/templates/project_groups.html @@ -19,7 +19,7 @@ {% extends g.theme.master %} {% do g.register_forge_css('css/forge/deck.css') %} -{% do g.register_forge_js('js/jquery-ui-1.13.2.min.js', location='body_top_js') %} +{% do g.register_forge_js('js/jquery-ui.min.js', location='body_top_js') %} {% do g.register_forge_js('js/project_groups.js', location='body_js_tail') %} {% block title %}{{c.project.name}} / User Permissions {% endblock %} diff --git a/Allura/allura/ext/admin/widgets.py b/Allura/allura/ext/admin/widgets.py index 2e1dfba23..fe97dda04 100644 --- a/Allura/allura/ext/admin/widgets.py +++ b/Allura/allura/ext/admin/widgets.py @@ -153,8 +153,8 @@ class FeaturesField(ew.CompoundField): fields = [ew.TextField(name='feature', attrs={'style': 'width:89%'})] def resources(self): - yield ew.JSLink('allura/js/jquery-ui-1.13.2.min.js', location='body_top_js') - yield ew.CSSLink('allura/css/smoothness/jquery-ui-1.13.2.min.css', compress=False) # compress will also serve from a different location, breaking image refs + yield ew.JSLink('allura/js/jquery-ui.min.js', location='body_top_js') + yield ew.CSSLink('allura/css/smoothness/jquery-ui.min.css', compress=False) # compress will also serve from a different location, breaking image refs class MetadataAdmin(ff.AdminForm): diff --git a/Allura/allura/lib/widgets/form_fields.py b/Allura/allura/lib/widgets/form_fields.py index 646c98180..95d04311e 100644 --- a/Allura/allura/lib/widgets/form_fields.py +++ b/Allura/allura/lib/widgets/form_fields.py @@ -74,7 +74,7 @@ def from_python(self, value, state=None): return ','.join(value) def resources(self): - yield ew.JSLink('allura/js/jquery-ui-1.13.2.min.js', location='body_top_js') + yield ew.JSLink('allura/js/jquery-ui.min.js', location='body_top_js') yield ew.JSLink('js/jquery.tagsinput.js') yield ew.CSSLink('css/jquery.tagsinput.css') yield onready(''' @@ -121,7 +121,7 @@ def from_python(self, value, state=None): def resources(self): yield from super().resources() - yield ew.JSLink('allura/js/jquery-ui-1.13.2.min.js', location='body_top_js') + yield ew.JSLink('allura/js/jquery-ui.min.js', location='body_top_js') yield ew.CSSLink('css/autocomplete.css') # customized in [6b78ed] so we can't just use jquery-ui.min.css yield onready(''' $('input.project_user_select').autocomplete({ @@ -155,7 +155,7 @@ def to_python(self, value, state): def resources(self): yield from super().resources() - yield ew.JSLink('allura/js/jquery-ui-1.13.2.min.js', location='body_top_js') + yield ew.JSLink('allura/js/jquery-ui.min.js', location='body_top_js') yield ew.CSSLink('css/autocomplete.css') # customized in [6b78ed] so we can't just use jquery-ui.min.css yield ew.CSSLink('css/combobox.css') yield ew.JSLink('js/combobox.js') @@ -185,7 +185,7 @@ def from_python(self, value, state=None): def resources(self): yield from super().resources() - yield ew.JSLink('allura/js/jquery-ui-1.13.2.min.js', location='body_top_js') + yield ew.JSLink('allura/js/jquery-ui.min.js', location='body_top_js') yield ew.CSSLink('css/autocomplete.css') # customized in [6b78ed] so we can't just use jquery-ui.min.css yield onready(''' $('input.neighborhood-project-select').autocomplete({ @@ -462,8 +462,8 @@ class DateField(JQueryMixin, ew.TextField): def resources(self): yield from super().resources() - yield ew.JSLink('allura/js/jquery-ui-1.13.2.min.js', location='body_top_js') - yield ew.CSSLink('allura/css/smoothness/jquery-ui-1.13.2.min.css', compress=False) # compress will also serve from a different location, breaking image refs + yield ew.JSLink('allura/js/jquery-ui.min.js', location='body_top_js') + yield ew.CSSLink('allura/css/smoothness/jquery-ui.min.css', compress=False) # compress will also serve from a different location, breaking image refs class FieldCluster(ew.CompoundField): diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png b/Allura/allura/public/nf/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png deleted file mode 100644 index b3fe56f2a..000000000 Binary files a/Allura/allura/public/nf/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png and /dev/null differ diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png b/Allura/allura/public/nf/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png deleted file mode 100644 index 6ebfa5026..000000000 Binary files a/Allura/allura/public/nf/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png and /dev/null differ diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png b/Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png index f1d1c1e22..3f99ac385 100644 Binary files a/Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png and b/Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png differ diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png b/Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png index 66f915f5f..0232b076a 100644 Binary files a/Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png and b/Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png differ diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png b/Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png index b41ceac35..7e8ea39bd 100644 Binary files a/Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png and b/Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png differ diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png b/Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png index 0619de08d..6e47ea49e 100644 Binary files a/Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png and b/Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png differ diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png b/Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png index b9a04f050..38b070960 100644 Binary files a/Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png and b/Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png differ diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/Allura/allura/public/nf/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png index 39e29acb7..b37d25dea 100644 Binary files a/Allura/allura/public/nf/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png and b/Allura/allura/public/nf/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png differ diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-icons_222222_256x240.png b/Allura/allura/public/nf/css/smoothness/images/ui-icons_222222_256x240.png new file mode 100644 index 000000000..568ddf7ad Binary files /dev/null and b/Allura/allura/public/nf/css/smoothness/images/ui-icons_222222_256x240.png differ diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-icons_cc0000_256x240.png b/Allura/allura/public/nf/css/smoothness/images/ui-icons_2e83ff_256x240.png similarity index 82% rename from Allura/allura/public/nf/css/smoothness/images/ui-icons_cc0000_256x240.png rename to Allura/allura/public/nf/css/smoothness/images/ui-icons_2e83ff_256x240.png index a72c0cfd4..0a7e3d637 100644 Binary files a/Allura/allura/public/nf/css/smoothness/images/ui-icons_cc0000_256x240.png and b/Allura/allura/public/nf/css/smoothness/images/ui-icons_2e83ff_256x240.png differ diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-icons_444444_256x240.png b/Allura/allura/public/nf/css/smoothness/images/ui-icons_444444_256x240.png deleted file mode 100644 index 53e342a0c..000000000 Binary files a/Allura/allura/public/nf/css/smoothness/images/ui-icons_444444_256x240.png and /dev/null differ diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-icons_454545_256x240.png b/Allura/allura/public/nf/css/smoothness/images/ui-icons_454545_256x240.png new file mode 100644 index 000000000..97b38aade Binary files /dev/null and b/Allura/allura/public/nf/css/smoothness/images/ui-icons_454545_256x240.png differ diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-icons_555555_256x240.png b/Allura/allura/public/nf/css/smoothness/images/ui-icons_555555_256x240.png deleted file mode 100644 index 47470e84c..000000000 Binary files a/Allura/allura/public/nf/css/smoothness/images/ui-icons_555555_256x240.png and /dev/null differ diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-icons_777777_256x240.png b/Allura/allura/public/nf/css/smoothness/images/ui-icons_777777_256x240.png deleted file mode 100644 index 2e644ee42..000000000 Binary files a/Allura/allura/public/nf/css/smoothness/images/ui-icons_777777_256x240.png and /dev/null differ diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-icons_888888_256x240.png b/Allura/allura/public/nf/css/smoothness/images/ui-icons_888888_256x240.png new file mode 100644 index 000000000..ca7ee2481 Binary files /dev/null and b/Allura/allura/public/nf/css/smoothness/images/ui-icons_888888_256x240.png differ diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-icons_777620_256x240.png b/Allura/allura/public/nf/css/smoothness/images/ui-icons_cd0a0a_256x240.png similarity index 82% rename from Allura/allura/public/nf/css/smoothness/images/ui-icons_777620_256x240.png rename to Allura/allura/public/nf/css/smoothness/images/ui-icons_cd0a0a_256x240.png index 07d6289f3..67e8e7d6f 100644 Binary files a/Allura/allura/public/nf/css/smoothness/images/ui-icons_777620_256x240.png and b/Allura/allura/public/nf/css/smoothness/images/ui-icons_cd0a0a_256x240.png differ diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-icons_ffffff_256x240.png b/Allura/allura/public/nf/css/smoothness/images/ui-icons_ffffff_256x240.png deleted file mode 100644 index f40680d81..000000000 Binary files a/Allura/allura/public/nf/css/smoothness/images/ui-icons_ffffff_256x240.png and /dev/null differ diff --git a/Allura/allura/public/nf/css/smoothness/jquery-ui-1.13.2.min.css b/Allura/allura/public/nf/css/smoothness/jquery-ui-1.13.2.min.css deleted file mode 100644 index 57b1df88f..000000000 --- a/Allura/allura/public/nf/css/smoothness/jquery-ui-1.13.2.min.css +++ /dev/null @@ -1,7 +0,0 @@ -/*! jQuery UI - v1.12.1 - 2022-08-19 -* http://jqueryui.com -* Includes: draggable.css, sortable.css, core.css, autocomplete.css, menu.css, datepicker.css, theme.css -* To view and modify this theme, visit http://jqueryui.com/themeroller/?scope=&folderName=base&cornerRadiusShadow=8px&offsetLeftShadow=0px&offsetTopShadow=0px&thicknessShadow=5px&opacityShadow=30&bgImgOpacityShadow=0&bgTextureShadow=flat&bgColorShadow=666666&opacityOverlay=30&bgImgOpacityOverlay=0&bgTextureOverlay=flat&bgColorOverlay=aaaaaa&iconColorError=cc0000&fcError=5f3f3f&borderColorError=f1a899&bgTextureError=flat&bgColorError=fddfdf&iconColorHighlight=777620&fcHighlight=777620&bor [...] -* Copyright jQuery Foundation and other contributors; Licensed MIT */ - -.ui-draggable-handle{-ms-touch-action:none;touch-action:none}.ui-sortable-handle{-ms-touch-action:none;touch-action:none}.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;borde [...] diff --git a/Allura/allura/public/nf/css/smoothness/jquery-ui.min.css b/Allura/allura/public/nf/css/smoothness/jquery-ui.min.css new file mode 100644 index 000000000..85982afeb --- /dev/null +++ b/Allura/allura/public/nf/css/smoothness/jquery-ui.min.css @@ -0,0 +1,7 @@ +/*! jQuery UI - v1.14.1 - 2025-02-28 +* https://jqueryui.com +* Includes: draggable.css, sortable.css, core.css, autocomplete.css, menu.css, datepicker.css, theme.css +* To view and modify this theme, visit https://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityD [...] +* Copyright OpenJS Foundation and other contributors; Licensed MIT */ + +.ui-draggable-handle{touch-action:none}.ui-sortable-handle{touch-action:none}.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:afte [...] diff --git a/Allura/allura/public/nf/js/jquery-ui-1.13.2.min.js b/Allura/allura/public/nf/js/jquery-ui-1.13.2.min.js deleted file mode 100644 index 5e6d0ae50..000000000 --- a/Allura/allura/public/nf/js/jquery-ui-1.13.2.min.js +++ /dev/null @@ -1,6 +0,0 @@ -/*! jQuery UI - v1.13.3 - 2025-02-28 -* https://jqueryui.com -* Includes: widget.js, position.js, data.js, keycode.js, scroll-parent.js, unique-id.js, widgets/draggable.js, widgets/sortable.js, widgets/autocomplete.js, widgets/datepicker.js, widgets/menu.js, widgets/mouse.js, effect.js, effects/effect-fade.js, effects/effect-highlight.js -* Copyright OpenJS Foundation and other contributors; Licensed MIT */ - -(t=>{"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)})(function(q){q.ui=q.ui||{};q.ui.version="1.13.3";var n,s,w,D,o,r,a,l,h,i,O=0,W=Array.prototype.hasOwnProperty,c=Array.prototype.slice;q.cleanData=(n=q.cleanData,function(t){for(var e,i,s=0;null!=(i=t[s]);s++)(e=q._data(i,"events"))&&e.remove&&q(i).triggerHandler("remove");n(t)}),q.widget=function(t,i,e){var s,n,o,r={},a=t.split(".")[0],l=a+"-"+(t=t.split(".")[1]);return e||(e=i,i=q.Widget),Array.isArray(e)&&(e=q.e [...] diff --git a/Allura/allura/public/nf/js/jquery-ui.min.js b/Allura/allura/public/nf/js/jquery-ui.min.js new file mode 100644 index 000000000..84e41b008 --- /dev/null +++ b/Allura/allura/public/nf/js/jquery-ui.min.js @@ -0,0 +1,6 @@ +/*! jQuery UI - v1.14.1 - 2025-02-28 +* https://jqueryui.com +* Includes: widget.js, position.js, data.js, keycode.js, scroll-parent.js, unique-id.js, widgets/draggable.js, widgets/sortable.js, widgets/autocomplete.js, widgets/datepicker.js, widgets/menu.js, widgets/mouse.js, effect.js, effects/effect-fade.js, effects/effect-highlight.js +* Copyright OpenJS Foundation and other contributors; Licensed MIT */ + +(t=>{"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)})(function(q){q.ui=q.ui||{};q.ui.version="1.14.1";var n,s,w,D,o,r,a,l,h,i,O=0,W=Array.prototype.hasOwnProperty,c=Array.prototype.slice;q.cleanData=(n=q.cleanData,function(t){for(var e,i,s=0;null!=(i=t[s]);s++)(e=q._data(i,"events"))&&e.remove&&q(i).triggerHandler("remove");n(t)}),q.widget=function(t,i,e){var s,n,o,r,a={},l=t.split(".")[0];return"__proto__"===(t=t.split(".")[1])||"constructor"===t?q.error("Invalid w [...] diff --git a/Allura/allura/templates/jinja_master/theme_macros.html b/Allura/allura/templates/jinja_master/theme_macros.html index c9ee789b3..860d864d6 100644 --- a/Allura/allura/templates/jinja_master/theme_macros.html +++ b/Allura/allura/templates/jinja_master/theme_macros.html @@ -163,7 +163,7 @@ http://stackoverflow.com/questions/26582731/redefining-imported-jinja-macros {% if login_overlay is undefined %} {%- macro login_overlay() %} {% do g.register_js('js/jquery.lightbox_me.js') %} - {% do g.register_forge_js('js/jquery-ui-1.13.2.min.js') %} + {% do g.register_forge_js('js/jquery-ui.min.js') %} {% do g.register_js('js/login_overlay.js') %} <div id="login_overlay" class="ui-widget-content"> <h2 class="dark title">Login Required</h2> diff --git a/Allura/allura/templates/neighborhood_add_project.html b/Allura/allura/templates/neighborhood_add_project.html index 436c07f33..71d7ad311 100644 --- a/Allura/allura/templates/neighborhood_add_project.html +++ b/Allura/allura/templates/neighborhood_add_project.html @@ -30,7 +30,7 @@ {% block content %} {% if c.show_phone_verification_overlay %} - {% do g.register_forge_js('js/jquery-ui-1.13.2.min.js') %} + {% do g.register_forge_js('js/jquery-ui.min.js') %} {% do g.register_js('js/jquery.lightbox_me.js') %} <div id="phone_verification_overlay" class="ui-widget-content"> <h2 class="dark title">Phone Verification Required</h2> diff --git a/Allura/allura/templates_responsive/jinja_master/theme_macros.html b/Allura/allura/templates_responsive/jinja_master/theme_macros.html index dd0e70ed1..d88072248 100644 --- a/Allura/allura/templates_responsive/jinja_master/theme_macros.html +++ b/Allura/allura/templates_responsive/jinja_master/theme_macros.html @@ -180,7 +180,7 @@ http://stackoverflow.com/questions/26582731/redefining-imported-jinja-macros {% if login_overlay is undefined %} {%- macro login_overlay() %} {% do g.register_js('js/jquery.lightbox_me.js') %} - {% do g.register_forge_js('js/jquery-ui-1.13.2.min.js') %} + {% do g.register_forge_js('js/jquery-ui.min.js') %} {% do g.register_js('js/login_overlay.js') %} <div id="login_overlay" class="ui-widget-content"> <h2 class="dark title">Login Required</h2> diff --git a/ForgeDiscussion/forgediscussion/templates/discussionforums/stats_graph.html b/ForgeDiscussion/forgediscussion/templates/discussionforums/stats_graph.html index d1a1376e4..f3fe8c6f4 100644 --- a/ForgeDiscussion/forgediscussion/templates/discussionforums/stats_graph.html +++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/stats_graph.html @@ -66,10 +66,10 @@ {% endblock %} -{% do g.register_forge_js('js/jquery-ui-1.13.2.min.js', location='body_top_js') %} +{% do g.register_forge_js('js/jquery-ui.min.js', location='body_top_js') %} {% block extra_css %} -<link rel="stylesheet" type="text/css" href="{{g.forge_static('css/smoothness/jquery-ui-1.13.2.min.css')}}"/> +<link rel="stylesheet" type="text/css" href="{{g.forge_static('css/smoothness/jquery-ui.min.css')}}"/> <link rel="stylesheet" type="text/css" href="{{g.forge_static('css/forge/ui.daterangepicker.css')}}"/> {% endblock %} diff --git a/ForgeTracker/forgetracker/widgets/ticket_search.py b/ForgeTracker/forgetracker/widgets/ticket_search.py index e14ebf7da..f7ed22bb3 100644 --- a/ForgeTracker/forgetracker/widgets/ticket_search.py +++ b/ForgeTracker/forgetracker/widgets/ticket_search.py @@ -53,9 +53,9 @@ def __init__(self, filters, *args, **kw): options.append({'value': '', 'label': 'Not set', 'selected': False}) def resources(self): - yield ew.JSLink('allura/js/jquery-ui-1.13.2.min.js', location='body_top_js') + yield ew.JSLink('allura/js/jquery-ui.min.js', location='body_top_js') yield ew.JSLink('tracker_js/jquery.multiselect.min.js') - yield ew.CSSLink('allura/css/smoothness/jquery-ui-1.13.2.min.css') + yield ew.CSSLink('allura/css/smoothness/jquery-ui.min.css') yield ew.CSSLink('tracker_css/jquery.multiselect.css') yield ew.JSLink('tracker_js/ticket-list.js') yield ew.CSSLink('tracker_css/ticket-list.css') diff --git a/LICENSE b/LICENSE index f27cd3e5a..a243de8af 100644 --- a/LICENSE +++ b/LICENSE @@ -217,8 +217,8 @@ jQuery, jQueryUI, and various related plugins, which are available under the MIT license. For details, see the individual files: Allura/allura/public/nf/js/jquery-3.6.0.min.js Allura/allura/public/nf/js/jquery.cookie-1.4.1.js - Allura/allura/public/nf/js/jquery-ui-1.13.2.min.js - Allura/allura/public/nf/css/smoothness/jquery-ui-1.13.2.min.css + Allura/allura/public/nf/js/jquery-ui.min.js + Allura/allura/public/nf/css/smoothness/jquery-ui.min.css Allura/allura/public/nf/js/jquery.daterangepicker.js Allura/allura/public/nf/css/forge/ui.daterangepicker.css Allura/allura/lib/widgets/resources/css/autocomplete.css @@ -293,4 +293,4 @@ Foundation, which is available under the MIT license Show-hint addon for CodeMirror library (https://codemirror.net/addon/hint/) is available under the MIT license. For details, see: Allura/allura/lib/widgets/resources/js/show-hint.js - Allura/allura/lib/widgets/resources/css/show-hint.css \ No newline at end of file + Allura/allura/lib/widgets/resources/css/show-hint.css diff --git a/rat-excludes.txt b/rat-excludes.txt index 283a1b0c7..fe2f45655 100644 --- a/rat-excludes.txt +++ b/rat-excludes.txt @@ -36,7 +36,7 @@ Allura/allura/public/nf/css/chosen.min.css Allura/allura/public/nf/css/font-awesome.min.css Allura/allura/public/nf/css/forge/tooltipster.css Allura/allura/public/nf/css/forge/ui.daterangepicker.css -Allura/allura/public/nf/css/smoothness/jquery-ui-1.13.2.min.css +Allura/allura/public/nf/css/smoothness/jquery-ui.min.css Allura/allura/public/nf/js/browser-polyfill.min.js Allura/allura/public/nf/js/chosen.jquery.min.js Allura/allura/public/nf/js/create-react-class.min.js @@ -45,7 +45,7 @@ Allura/allura/public/nf/js/foundation.min.js.map Allura/allura/public/nf/js/hidpi-canvas.min.js Allura/allura/public/nf/js/jquery-3.6.0.min.js Allura/allura/public/nf/js/jquery.cookie-1.4.1.js -Allura/allura/public/nf/js/jquery-ui-1.13.2.min.js +Allura/allura/public/nf/js/jquery-ui.min.js Allura/allura/public/nf/js/jquery.daterangepicker.js Allura/allura/public/nf/js/jquery.flot.js Allura/allura/public/nf/js/jquery.maxlength.min.js
