Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 17BDAFBF2 for ; Fri, 22 Mar 2013 22:54:29 +0000 (UTC) Received: (qmail 8407 invoked by uid 500); 22 Mar 2013 22:54:29 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 8353 invoked by uid 500); 22 Mar 2013 22:54:29 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 8092 invoked by uid 99); 22 Mar 2013 22:54:28 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Mar 2013 22:54:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4C67F83295E; Fri, 22 Mar 2013 22:54:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: tvansteenburgh@apache.org To: allura-commits@incubator.apache.org Date: Fri, 22 Mar 2013 22:54:37 -0000 Message-Id: <612c0139cc3548ad8c3bbdd8b2a76b9b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/21] git commit: [#4299] ticket:281 Styles for combobox [#4299] ticket:281 Styles for combobox Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/967e105e Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/967e105e Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/967e105e Branch: refs/heads/master Commit: 967e105e3326bc37b9bd24b3f578548ab5e543a4 Parents: 590ce54 Author: Igor Bondarenko Authored: Mon Mar 4 15:49:14 2013 +0000 Committer: Tim Van Steenburgh Committed: Fri Mar 22 21:55:16 2013 +0000 ---------------------------------------------------------------------- Allura/allura/lib/widgets/form_fields.py | 2 + .../allura/lib/widgets/resources/css/combobox.css | 17 +++++++++++++++ Allura/allura/lib/widgets/resources/js/combobox.js | 15 +++--------- 3 files changed, 23 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/967e105e/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 25c2e32..67ea947 100644 --- a/Allura/allura/lib/widgets/form_fields.py +++ b/Allura/allura/lib/widgets/form_fields.py @@ -109,6 +109,8 @@ class ProjectUserCombo(ew.SingleSelectField): def resources(self): for r in super(ProjectUserCombo, self).resources(): yield r + yield ew.CSSLink('css/autocomplete.css') + yield ew.CSSLink('css/combobox.css') yield ew.JSLink('js/combobox.js') yield onready(''' $('select.project-user-combobox').combobox({ http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/967e105e/Allura/allura/lib/widgets/resources/css/combobox.css ---------------------------------------------------------------------- diff --git a/Allura/allura/lib/widgets/resources/css/combobox.css b/Allura/allura/lib/widgets/resources/css/combobox.css new file mode 100644 index 0000000..9e3471d --- /dev/null +++ b/Allura/allura/lib/widgets/resources/css/combobox.css @@ -0,0 +1,17 @@ +.ui-combobox { + position: relative; + display: inline-block; +} + +.ui-combobox-toggle { + color: black; + background-color: transparent; + cursor: default; + display: inline-block; + font-size: .7em; + padding: 5px; + position: absolute; + top: 0; + margin-top: 2px; + margin-left: -21px; +} http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/967e105e/Allura/allura/lib/widgets/resources/js/combobox.js ---------------------------------------------------------------------- diff --git a/Allura/allura/lib/widgets/resources/js/combobox.js b/Allura/allura/lib/widgets/resources/js/combobox.js index 1a59e35..462c2c3 100644 --- a/Allura/allura/lib/widgets/resources/js/combobox.js +++ b/Allura/allura/lib/widgets/resources/js/combobox.js @@ -61,7 +61,7 @@ .appendTo(wrapper) .val(value) .attr('title', '') - .addClass('ui-state-default ui-combobox-input') + .addClass('ui-combobox-input') .autocomplete({ delay: 0, minLength: 0, @@ -100,7 +100,7 @@ removeIfInvalid(this); } } - }).addClass('ui-widget ui-widget-content ui-corner-left'); + }); input.data('autocomplete')._renderItem = function(ul, item) { return $('
  • ') @@ -109,18 +109,11 @@ .appendTo(ul); }; - $('') + $('▼') .attr('tabIndex', -1) .attr('title', 'Show all options') .appendTo(wrapper) - .button({ - icons: { - primary: 'ui-icon-triangle-1-s' - }, - text: false - }) - .removeClass('ui-corner-all') - .addClass('ui-corner-right ui-combobox-toggle') + .addClass('ui-combobox-toggle') .mousedown(function() { wasOpen = input.autocomplete('widget').is(':visible'); })