This is an automated email from the ASF dual-hosted git repository. brondsem pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/allura.git
commit bd373aec55795700ae62c12ee4bc1aba2ecc4274 Author: Guillermo Cruz <[email protected]> AuthorDate: Mon Jan 23 14:04:06 2023 -0600 [#8491] removed sylvester.js and updated css styles for tablesorter th element --- Allura/LICENSE | 3 --- Allura/allura/public/nf/js/sylvester.js | 22 ---------------------- Allura/allura/templates/jinja_master/master.html | 1 - .../allura/templates/site_admin_new_projects.html | 14 +++++++++----- .../templates_responsive/jinja_master/master.html | 1 - LICENSE | 3 --- rat-excludes.txt | 1 - 7 files changed, 9 insertions(+), 36 deletions(-) diff --git a/Allura/LICENSE b/Allura/LICENSE index 2dfdb4d3c..9968a636e 100644 --- a/Allura/LICENSE +++ b/Allura/LICENSE @@ -237,9 +237,6 @@ under the MIT license. For details, see the individual files: Blueprint, which is available under the MIT license. For details, see allura/public/nf/css/blueprint/ -Sylvester, which is available under the MIT license. -For details, see allura/public/nf/js/sylvester.js - React.js, which is available under the MIT license. For details, see: allura/public/nf/js/react.development.js diff --git a/Allura/allura/public/nf/js/sylvester.js b/Allura/allura/public/nf/js/sylvester.js deleted file mode 100755 index 43c34a71d..000000000 --- a/Allura/allura/public/nf/js/sylvester.js +++ /dev/null @@ -1,22 +0,0 @@ -// === Sylvester === -// Vector and Matrix mathematics modules for JavaScript -// Copyright (c) 2007 James Coglan -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included -// in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -var Sylvester={version:"0.1.3",precision:1e-6};function Vector(){}function Matrix(){}function Line(){}function Plane(){}Vector.prototype={e:function(e){return e<1||e>this.elements.length?null:this.elements[e-1]},dimensions:function(){return this.elements.length},modulus:function(){return Math.sqrt(this.dot(this))},eql:function(e){var t=this.elements.length,n=e.elements||e;if(t!=n.length)return!1;do{if(Math.abs(this.elements[t-1]-n[t-1])>Sylvester.precision)return!1}while(--t);return!0},d [...] \ No newline at end of file diff --git a/Allura/allura/templates/jinja_master/master.html b/Allura/allura/templates/jinja_master/master.html index f5e030f0d..8562130a3 100644 --- a/Allura/allura/templates/jinja_master/master.html +++ b/Allura/allura/templates/jinja_master/master.html @@ -26,7 +26,6 @@ {% do g.register_forge_js('js/jquery.cookie-1.4.1.js', location='head_js') %} {% do g.register_forge_js('js/jquery.notify.js') %} {% do g.register_forge_js('js/jquery.tooltipster.js') %} -{% do g.register_forge_js('js/sylvester.js') %} {% do g.register_forge_js('js/twemoji.min.js') %} {% do g.register_forge_js('js/allura-base.js') %} {% do g.register_forge_js('js/checklist.js') %} diff --git a/Allura/allura/templates/site_admin_new_projects.html b/Allura/allura/templates/site_admin_new_projects.html index 55da3fdf2..68de05b4c 100644 --- a/Allura/allura/templates/site_admin_new_projects.html +++ b/Allura/allura/templates/site_admin_new_projects.html @@ -90,7 +90,7 @@ td { max-width: 120px; } - th.header { + th.tablesorter-header { background-image: url("{{g.forge_static('images/bg.gif')}}"); cursor: pointer; font-weight: bold; @@ -98,12 +98,16 @@ background-position: center left; padding-left: 20px; } - th.headerSortUp { + th.tablesorter-headerAsc{ background-image: url("{{g.forge_static('images/asc.gif')}}"); + background-repeat: no-repeat; + background-position: 100% 50%; background-color: #6bb3fd; } - th.headerSortDown { + th.tablesorter-headerDesc{ background-image: url("{{g.forge_static('images/desc.gif')}}"); + background-repeat: no-repeat; + background-position: 100% 50%; background-color: #6bb3fd; } </style> @@ -116,8 +120,8 @@ $(function(){ $('#new_projects').tablesorter({ usNumberFormat : false, - sortReset : true, - sortRestart : true + sortReset : false, + sortRestart : false }); }); } );</script> diff --git a/Allura/allura/templates_responsive/jinja_master/master.html b/Allura/allura/templates_responsive/jinja_master/master.html index 11985f72f..4656f3528 100644 --- a/Allura/allura/templates_responsive/jinja_master/master.html +++ b/Allura/allura/templates_responsive/jinja_master/master.html @@ -27,7 +27,6 @@ {% do g.register_forge_js('js/foundation.min.js', location='head_js', compress=False) %} {% do g.register_forge_js('js/jquery.notify.js') %} {% do g.register_forge_js('js/jquery.tooltipster.js') %}{# TODO: use foundation #} -{% do g.register_forge_js('js/sylvester.js') %} {% do g.register_forge_js('js/twemoji.min.js') %} {% do g.register_forge_js('js/allura-base.js') %} {% do g.register_forge_js('js/checklist.js') %} diff --git a/LICENSE b/LICENSE index 14bcf2fe4..6ebddf34c 100644 --- a/LICENSE +++ b/LICENSE @@ -242,9 +242,6 @@ under the MIT license. For details, see the individual files: Blueprint, which is available under the MIT license. For details, see Allura/allura/public/nf/css/blueprint/ -Sylvester, which is available under the MIT license. -For details, see Allura/allura/public/nf/js/sylvester.js - React.js, which is available under the MIT license. For details, see: allura/public/nf/js/react.development.js diff --git a/rat-excludes.txt b/rat-excludes.txt index f40a74386..650c9ce69 100644 --- a/rat-excludes.txt +++ b/rat-excludes.txt @@ -58,7 +58,6 @@ Allura/allura/public/nf/js/react-dom.development.js Allura/allura/public/nf/js/react-dom.production.min.js Allura/allura/public/nf/js/react-drag.min.js Allura/allura/public/nf/js/react-reorderable.min.js -Allura/allura/public/nf/js/sylvester.js Allura/allura/public/nf/js/Sortable.min.js Allura/allura/public/nf/js/twemoji.min.js Allura/allura/public/nf/js/underscore-1.13.6.min.js
