You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2017/02/14 17:10:39 UTC
[13/13] allura git commit: [#8145] delete jquery.ui.datepicker.css,
use jquery-ui.min.css instead. Comment about why we can't do that for
autocomplete.css also
[#8145] delete jquery.ui.datepicker.css, use jquery-ui.min.css instead. Comment about why we can't do that for autocomplete.css also
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/0977870f
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/0977870f
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/0977870f
Branch: refs/heads/db/8145
Commit: 0977870fb8cab3990304b7057d64ab13cb2b2f4b
Parents: 7182460
Author: Dave Brondsema <da...@brondsema.net>
Authored: Tue Feb 14 12:09:46 2017 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Tue Feb 14 12:09:46 2017 -0500
----------------------------------------------------------------------
Allura/LICENSE | 1 -
Allura/allura/lib/widgets/form_fields.py | 8 +--
.../resources/css/jquery.ui.datepicker.css | 74 --------------------
LICENSE | 1 -
rat-excludes.txt | 1 -
5 files changed, 4 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/0977870f/Allura/LICENSE
----------------------------------------------------------------------
diff --git a/Allura/LICENSE b/Allura/LICENSE
index 65a1e99..706155c 100644
--- a/Allura/LICENSE
+++ b/Allura/LICENSE
@@ -220,7 +220,6 @@ under the MIT license. For details, see the individual files:
allura/public/nf/js/jquery-base.js
allura/public/nf/js/jquery-ui.min.js
allura/public/nf/css/smoothness/jquery-ui.min.css
- allura/lib/widgets/resources/css/jquery.ui.datepicker.css
allura/public/nf/js/jquery.daterangepicker.js
allura/public/nf/css/forge/ui.daterangepicker.css
allura/lib/widgets/resources/css/autocomplete.css
http://git-wip-us.apache.org/repos/asf/allura/blob/0977870f/Allura/allura/lib/widgets/form_fields.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/form_fields.py b/Allura/allura/lib/widgets/form_fields.py
index 900cc63..52d7e10 100644
--- a/Allura/allura/lib/widgets/form_fields.py
+++ b/Allura/allura/lib/widgets/form_fields.py
@@ -116,7 +116,7 @@ class ProjectUserSelect(ew.InputField):
for r in super(ProjectUserSelect, self).resources():
yield r
yield ew.JSLink('allura/js/jquery-ui.min.js', location='body_top_js')
- yield ew.CSSLink('css/autocomplete.css')
+ 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({
source: function (request, response) {
@@ -151,7 +151,7 @@ class ProjectUserCombo(ew.SingleSelectField):
for r in super(ProjectUserCombo, self).resources():
yield r
yield ew.JSLink('allura/js/jquery-ui.min.js', location='body_top_js')
- yield ew.CSSLink('css/autocomplete.css')
+ 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')
yield onready('''
@@ -182,7 +182,7 @@ class NeighborhoodProjectSelect(ew.InputField):
for r in super(NeighborhoodProjectSelect, self).resources():
yield r
yield ew.JSLink('allura/js/jquery-ui.min.js', location='body_top_js')
- yield ew.CSSLink('css/autocomplete.css')
+ 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({
source: function (request, response) {
@@ -454,7 +454,7 @@ class DateField(JQueryMixin, ew.TextField):
for r in super(DateField, self).resources():
yield r
yield ew.JSLink('allura/js/jquery-ui.min.js', location='body_top_js')
- yield ew.CSSLink('css/jquery.ui.datepicker.css', compress=False) # compress will also serve from a different location, breaking image refs
+ 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):
http://git-wip-us.apache.org/repos/asf/allura/blob/0977870f/Allura/allura/lib/widgets/resources/css/jquery.ui.datepicker.css
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/resources/css/jquery.ui.datepicker.css b/Allura/allura/lib/widgets/resources/css/jquery.ui.datepicker.css
deleted file mode 100644
index ab89dc9..0000000
--- a/Allura/allura/lib/widgets/resources/css/jquery.ui.datepicker.css
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * jQuery UI Datepicker @VERSION
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Datepicker#theming
- */
-.ui-datepicker { width: 17em; padding: .2em .2em 0; background-color: #fff; border: 1px solid #ccc; }
-.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
-.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
-.ui-datepicker .ui-datepicker-prev { left:2px; }
-.ui-datepicker .ui-datepicker-next { right:2px; }
-.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
-.ui-datepicker .ui-datepicker-next-hover { right:1px; }
-.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; text-indent: -7000em }
-.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
-.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
-.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
-.ui-datepicker select.ui-datepicker-month,
-.ui-datepicker select.ui-datepicker-year { width: 49%;}
-.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
-.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; }
-.ui-datepicker td { border: 0; padding: 1px; }
-.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
-.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
-.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi { width:auto; }
-.ui-datepicker-multi .ui-datepicker-group { float:left; }
-.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
-.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
-.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
-.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
-.ui-datepicker-row-break { clear:both; width:100%; }
-
-/* RTL support */
-.ui-datepicker-rtl { direction: rtl; }
-.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-
-/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
-.ui-datepicker-cover {
- display: none; /*sorry for IE5*/
- display/**/: block; /*sorry for IE5*/
- position: absolute; /*must have*/
- z-index: -1; /*must have*/
- filter: mask(); /*must have*/
- top: -4px; /*must have*/
- left: -4px; /*must have*/
- width: 200px; /*must have*/
- height: 200px; /*must have*/
-}
-/* icons */
-.ui-icon { width: 16px; height: 16px; background-image: url(ui-icons_222222_256x240.png); }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/allura/blob/0977870f/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index d018f1a..92f4fe9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -221,7 +221,6 @@ under the MIT license. For details, see the individual files:
Allura/allura/public/nf/js/jquery-base.js
Allura/allura/public/nf/js/jquery-ui.min.js
Allura/allura/public/nf/css/smoothness/jquery-ui.min.css
- Allura/allura/lib/widgets/resources/css/jquery.ui.datepicker.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
http://git-wip-us.apache.org/repos/asf/allura/blob/0977870f/rat-excludes.txt
----------------------------------------------------------------------
diff --git a/rat-excludes.txt b/rat-excludes.txt
index 43cf1e5..d36e26e 100644
--- a/rat-excludes.txt
+++ b/rat-excludes.txt
@@ -19,7 +19,6 @@ Allura/allura/lib/widgets/resources/css/autocomplete.css
Allura/allura/lib/widgets/resources/css/colorPicker.css
Allura/allura/lib/widgets/resources/css/jqfontselector.css
Allura/allura/lib/widgets/resources/css/jquery.tagsinput.css
-Allura/allura/lib/widgets/resources/css/jquery.ui.datepicker.css
Allura/allura/lib/widgets/resources/css/simplemde.min.css
Allura/allura/lib/widgets/resources/js/jqfontselector.js
Allura/allura/lib/widgets/resources/js/jquery.autosize-min.js