From 123879172e3312622036ce57db98a6db3eb0aa0e Mon Sep 17 00:00:00 2001 From: Dominique Lederer Date: Mon, 18 Feb 2013 21:44:34 +0100 Subject: [PATCH] fixing broken tabindex on Tabbed Translation Fields: - updated to latest jquery UI, which fixes the totaly wrong tabindex when using Tabbed Translation Fields. This also needs a newer jquery, so django shipped jquery can no longer be used. - udated docs according to changes --- .../modeltranslation/css/tabbed_translation_fields.css | 6 +++--- modeltranslation/static/modeltranslation/js/force_jquery.js | 3 --- .../static/modeltranslation/js/tabbed_translation_fields.js | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 modeltranslation/static/modeltranslation/js/force_jquery.js diff --git a/modeltranslation/static/modeltranslation/css/tabbed_translation_fields.css b/modeltranslation/static/modeltranslation/css/tabbed_translation_fields.css index 4014fd9..c569610 100644 --- a/modeltranslation/static/modeltranslation/css/tabbed_translation_fields.css +++ b/modeltranslation/static/modeltranslation/css/tabbed_translation_fields.css @@ -24,8 +24,8 @@ .ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; } .ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; } .ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; } -.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; } -.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; } +.ui-tabs .ui-tabs-nav li.ui-tabs-active { margin-bottom: 0; padding-bottom: 1px; } +.ui-tabs .ui-tabs-nav li.ui-tabs-active a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; } .ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */ .ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; } .ui-tabs .ui-tabs-hide { @@ -54,7 +54,7 @@ font-size: 12px; } -.ui-tabs .ui-tabs-nav li.ui-tabs-selected a { +.ui-tabs .ui-tabs-nav li.ui-tabs-active a { background: #7CA0C7 repeat-x; color: #fff; padding: 6px 10px 4px 10px; diff --git a/modeltranslation/static/modeltranslation/js/force_jquery.js b/modeltranslation/static/modeltranslation/js/force_jquery.js deleted file mode 100644 index f5de8d5..0000000 --- a/modeltranslation/static/modeltranslation/js/force_jquery.js +++ /dev/null @@ -1,3 +0,0 @@ -if (!jQuery) { - jQuery = django.jQuery; -} diff --git a/modeltranslation/static/modeltranslation/js/tabbed_translation_fields.js b/modeltranslation/static/modeltranslation/js/tabbed_translation_fields.js index bd673a6..2e46d60 100644 --- a/modeltranslation/static/modeltranslation/js/tabbed_translation_fields.js +++ b/modeltranslation/static/modeltranslation/js/tabbed_translation_fields.js @@ -356,7 +356,7 @@ var google, django, gettext; var self = this; this.$select.change(function () { $.each(tabs, function (idx, tab) { - tab.tabs('select', parseInt(self.$select.val())); + tab.tabs('option', 'active', parseInt(self.$select.val())); }); }); }, @@ -364,7 +364,7 @@ var google, django, gettext; activateTab: function(tabs) { var self = this; $.each(tabs, function (idx, tab) { - tab.tabs('select', parseInt(self.$select.val())); + tab.tabs('option', 'active', parseInt(self.$select.val())); }); } };