From 566a9bd40a6732a12dd4555c72977f9a2de60bc9 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 24 Apr 2012 10:49:15 -0400 Subject: [PATCH] Bug 8143 [REVISED] Upgrade jQuery tabs to current jQueryUI version Content-Type: text/plain; charset="utf-8" Current jQuery-driven tabs are done using a very old version of the tabs plugin. This patch upgrades jQueryUI to the latest version and adds the tabs widget dependency to the jqueryui js file and updates the syntax for existing tabs: - $("#foo > ul").tabs(); changes to $("#foo").tabs(); - Remove full URL from tab links (use #anchor only). Pages with "static" tabs (tabs which are built in the markup rather than generated by the plugin) have been modified to use their own style. Examples: pay.tt in the staff client and opac-readingrecord.tt in the OPAC. Edit: Minor revision to some uncorrected markup Signed-off-by: Martin Renvoize --- .../intranet-tmpl/prog/en/css/staff-global.css | 278 +++++++---- .../prog/en/includes/acquisitions-search.inc | 6 +- .../prog/en/includes/authorities-search.inc | 10 +- .../prog/en/includes/budgets-admin-search.inc | 8 +- .../intranet-tmpl/prog/en/includes/cat-search.inc | 8 +- .../prog/en/includes/cataloging-search.inc | 4 +- .../prog/en/includes/checkin-search.inc | 6 +- .../intranet-tmpl/prog/en/includes/circ-search.inc | 10 +- .../prog/en/includes/cities-admin-search.inc | 8 +- .../prog/en/includes/contracts-admin-search.inc | 8 +- .../prog/en/includes/currencies-admin-search.inc | 8 +- .../prog/en/includes/doc-head-close.inc | 2 - .../intranet-tmpl/prog/en/includes/home-search.inc | 14 +- .../prog/en/includes/letters-search.inc | 8 +- .../prog/en/includes/patron-search.inc | 12 +- .../prog/en/includes/patrons-admin-search.inc | 8 +- .../prog/en/includes/prefs-admin-search.inc | 8 +- .../prog/en/includes/printers-admin-search.inc | 8 +- .../prog/en/includes/roadtype-admin-search.inc | 8 +- .../prog/en/includes/serials-search.inc | 8 +- .../prog/en/includes/stopwords-admin-search.inc | 8 +- .../prog/en/includes/suggestions-add-search.inc | 10 +- .../prog/en/includes/sysprefs-admin-search.inc | 8 +- .../prog/en/includes/z3950-admin-search.inc | 10 +- koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js | 10 +- .../intranet-tmpl/prog/en/lib/jquery/jquery-ui.css | 76 ++-- .../intranet-tmpl/prog/en/lib/jquery/jquery-ui.js | 74 +-- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 16 +- .../prog/en/modules/acqui/basketgroup.tt | 2 +- .../en/modules/admin/auth_subfields_structure.tt | 6 +- .../prog/en/modules/admin/authorised_values.tt | 14 +- .../en/modules/admin/branch_transfer_limits.tt | 2 +- .../en/modules/admin/item_circulation_alerts.tt | 2 +- .../prog/en/modules/admin/itemtypes.tt | 17 +- .../en/modules/admin/marc_subfields_structure.tt | 2 +- .../prog/en/modules/authorities/authorities.tt | 6 +- .../prog/en/modules/authorities/detail.tt | 4 +- .../prog/en/modules/catalogue/MARCdetail.tt | 24 +- .../prog/en/modules/catalogue/advsearch.tt | 4 +- .../prog/en/modules/catalogue/detail.tt | 14 +- .../prog/en/modules/cataloguing/addbiblio.tt | 8 +- .../prog/en/modules/cataloguing/merge.tt | 2 +- .../prog/en/modules/circ/circulation.tt | 12 +- .../prog/en/modules/circ/waitingreserves.tt | 6 +- .../prog/en/modules/members/boraccount.tt | 6 +- .../prog/en/modules/members/mancredit.tt | 6 +- .../prog/en/modules/members/maninvoice.tt | 6 +- .../prog/en/modules/members/moremember.tt | 17 +- .../intranet-tmpl/prog/en/modules/members/pay.tt | 6 +- .../prog/en/modules/members/paycollect.tt | 6 +- .../prog/en/modules/reviews/reviewswaiting.tt | 8 +- .../prog/en/modules/serials/serials-collection.tt | 4 +- .../prog/en/modules/serials/subscription-detail.tt | 10 +- .../prog/en/modules/suggestion/suggestion.tt | 8 +- .../prog/en/modules/tools/csv-profiles.tt | 6 +- .../prog/en/modules/tools/overduerules.tt | 2 +- .../prog/en/modules/virtualshelves/shelves.tt | 18 +- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 185 ++++++- .../opac-tmpl/prog/en/includes/doc-head-close.inc | 4 +- .../opac-tmpl/prog/en/lib/jquery/jquery-ui.css | 357 ++++++++++++++ .../opac-tmpl/prog/en/lib/jquery/jquery-ui.js | 25 + .../prog/en/lib/jquery/plugins/ui.tabs.css | 80 --- .../prog/en/lib/jquery/plugins/ui.tabs.js | 517 -------------------- .../opac-tmpl/prog/en/modules/opac-ISBDdetail.tt | 3 - .../opac-tmpl/prog/en/modules/opac-advsearch.tt | 4 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 36 +- .../prog/en/modules/opac-readingrecord.tt | 12 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 16 +- 68 files changed, 1048 insertions(+), 1061 deletions(-) create mode 100644 koha-tmpl/opac-tmpl/prog/en/lib/jquery/jquery-ui.css create mode 100644 koha-tmpl/opac-tmpl/prog/en/lib/jquery/jquery-ui.js delete mode 100644 koha-tmpl/opac-tmpl/prog/en/lib/jquery/plugins/ui.tabs.css delete mode 100644 koha-tmpl/opac-tmpl/prog/en/lib/jquery/plugins/ui.tabs.js diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index 96c8b7e..9be1e1f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -7,12 +7,6 @@ input:focus, textarea:focus { border-radius: 4px; } -radio:focus, checkbox:focus { - border-color:#538200; - border-style:solid; - border-radius: 4px; -} - ::selection { background:#538200; color:#ffffff; /* Safari and Opera */ } ::-moz-selection { background:#538200; color:#ffffff; /* Firefox */ } @@ -794,99 +788,6 @@ fieldset.rows .inputnote { margin : .5em 0 0 11em; } -.ui-tabs-nav li { - margin-right : .5em; - position : relative; - top : -1px; -} - -.ui-tabs-nav li.ui-tabs-selected { - -} - -.ui-tabs-nav a, .ui-tabs-nav a span, .ui-tabs-nav span.a { - background : none; - display : block; - padding: .2em .5em .25em .5em; -} - -.ui-tabs-nav a, .ui-tabs-nav span.a { - -} - -.ui-tabs-nav .ui-tabs-selected a, .ui-tabs-nav .ui-tabs-selected span.a { - border-top: 1px solid #e6f0f2; - border-right: 1px solid #85ca11; - border-bottom: 1px solid #85ca11; - border-left: 1px solid #85ca11; - font-weight : bold; - text-align : center; - text-decoration : none; - border-radius: 0px 0px 4px 4px; - color : #000000; - -} - -.ui-tabs-nav .tabs-selected a, .ui-tabs-nav a:hover, .ui-tabs-nav a:focus, .ui-tabs-nav a:active, .ui-tabs-nav span.a { - outline: 0; /* prevent dotted border in Firefox */ -} - -.ui-tabs-nav .ui-tabs-selected a:hover { - color : #000000; -} - -.ui-tabs-nav li.ui-tabs-selected { - /* background-color : #FFFFCC; */ -} - -.ui-tabs-nav .ui-tabs-selected a, .ui-tabs-nav a:hover, .ui-tabs-nav a:focus, .ui-tabs-nav a:active, .ui-tabs-nav span.a { - background : none; - outline: 0; /* prevent dotted border in Firefox */ -} - -.tabs-container { - border-top: 0; - padding : inherit; - background: #fff; /* declare background color for container to avoid distorted fonts in IE while fading */ -} -.tabs-loading em { - padding: inherit; - background: none; -} - -.toptabs { - margin-top : 1em; -} - -.toptabs .ui-tabs-nav li { - margin-right : .5em; - position : relative; - top : 1px; -} - -.toptabs .ui-tabs-nav li a, .toptabs .ui-tabs-nav li span.a { - background-color : #E6F0F2; - border : 1px solid #B9D8D9; - text-align : center; - text-decoration : none; - border-radius : 3px 3px 0 0; -} - -.toptabs .ui-tabs-nav li.ui-tabs-selected a, .toptabs .ui-tabs-nav li.ui-tabs-selected span.a { - background-color : #FFF; - border-top : 1px solid #85CA11; - border-right : 1px solid #85CA11; - border-left : 1px solid #85CA11; - border-bottom : 1px solid #FFF; - margin-top : 0; - border-radius : 3px; -} - -.toptabs .tabs-container { - border : 1px solid #B9D8D9; - padding : 1em; -} - .checkedout { color : #999999; font-style : italic; @@ -2275,3 +2176,182 @@ ul.ui-autocomplete { .ui-autocomplete-loading { background: #FFF url("../../img/loading-small.gif") right center no-repeat; } + +/* jQuery UI standard tabs */ +.ui-tabs-nav .ui-tabs-selected a, +.ui-tabs-nav a:hover, +.ui-tabs-nav a:focus, +.ui-tabs-nav a:active, +.ui-tabs-nav span.a { + background: none repeat scroll 0 0 transparent; + outline: 0 none; +} + +.ui-tabs .ui-tabs-nav li.ui-tabs-selected { + background-color : #FFF; + border : 1px solid #B9D8D9; +} + +.ui-widget, +.ui-widget input, +.ui-widget select, +.ui-widget textarea, +.ui-widget button { + font-family : inherit; + font-size : inherit; +} +ul.ui-tabs-nav li { + list-style : none; +} +.ui-tabs.ui-widget-content { + background : transparent none; + border : 0; +} + +.ui-tabs .ui-tabs-panel { + border : 1px solid #B9D8D9; +} +.ui-tabs-nav.ui-widget-header { + border : 0; + background : none; +} +.ui-tabs .ui-tabs-nav li { + background: #E6F0F2 none; + border: 1px solid #B9D8D9; + margin-right : .4em; +} +.ui-tabs .ui-tabs-nav li.ui-tabs-selected a { + color : #000; + font-weight : bold; +} + +.ui-tabs .ui-tabs-nav li.ui-state-default.ui-state-hover { + background : #EDF4F5 none; +} + +.ui-tabs .ui-tabs-nav li.ui-tabs-selected.ui-state-hover { + background : #FFF none; +} + +.ui-tabs .ui-state-default a, +.ui-tabs .ui-state-default a:link, +.ui-tabs .ui-state-default a:visited { + color: #004D99; +} + +.ui-tabs .ui-state-hover a, +.ui-tabs .ui-state-hover a:link, +.ui-tabs .ui-state-hover a:visited { + color: #538200; +} + +.statictabs ul { + background: none repeat scroll 0 0 transparent; + border: 0 none; + margin: 0; + padding: 0.2em 0.2em 0; + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; + border-top-right-radius: 4px; + border-top-left-radius: 4px; + color: #222222; + font-weight: bold; + font-size: 100%; + line-height: 1.3; + list-style: none outside none; + outline: 0 none; + text-decoration: none; +} + +.statictabs ul:after { + clear: both; +} + +.statictabs ul:before, +.statictabs ul:after { + content: ""; + display: table; +} + +.statictabs ul li { + background: none repeat scroll 0 0 #E6F0F2; + border: 1px solid #B9D8D9; + border-bottom: 0 none !important; + border-top-right-radius: 4px; + border-top-left-radius: 4px; + float: left; + list-style: none outside none; + margin-bottom: 0; + margin-right: 0.4em; + padding: 0; + position: relative; + white-space: nowrap; + top: 1px; + color: #555555; + font-weight: normal; + +} + +.statictabs ul li.active { + background-color: #FFFFFF; + color: #212121; + font-weight: normal; + padding-bottom: 1px; +} + +.statictabs ul li a { + color: #004D99; + cursor: pointer; + float: left; + padding: 0.5em 1em; + text-decoration: none; +} + +.statictabs ul li a:hover { + background-color : #EDF4F5; + border-top-right-radius: 4px; + border-top-left-radius: 4px; + color : #538200; +} + +.statictabs ul li.active a { + color: #000000; + font-weight: bold; + cursor: text; + background: none repeat scroll 0 0 transparent; + outline: 0 none; +} + +.statictabs .tabs-container { + border: 1px solid #B9D8D9; + background: none repeat scroll 0 0 transparent; + display: block; + padding: 1em 1.4em; + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; + color: #222222; +} + +/* jQuery UI header search box tabs */ +#header_search ul.ui-tabs-nav { + padding-top : 0; + margin-left: 1em; +} +#header_search ul.ui-tabs-nav li.ui-state-default { + border: 0 !important; + background : transparent none; top: 0; +} +#header_search ul.ui-tabs-nav li.ui-state-default a { + padding : .3em .6em; +} +#header_search ul.ui-tabs-nav li.ui-tabs-selected { + background-color : #FFFFF1; + border: 1px solid #85CA11 !important; + border-top: 0 !important; top: -1px; +} +#header_search ul.ui-tabs-nav li.ui-tabs-selected a { + text-decoration: none; +} +#header_search .ui-corner-top { + border-radius: 0 0 4px 4px; +} diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc index cc796fa..5855c78 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc @@ -7,7 +7,7 @@ - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc index 9a2f9c5..151986d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc @@ -31,7 +31,7 @@ - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc index 5cb753a..0b70028 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc @@ -25,7 +25,7 @@ [% INCLUDE 'patron-search-box.inc' %] [% IF ( CAN_user_catalogue ) %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc index d813d17..186f1d1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc @@ -5,7 +5,7 @@ [% INCLUDE 'patron-search-box.inc' %] [% IF ( CAN_user_circulate ) %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc index aa2fccd..ba878ce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc @@ -14,8 +14,8 @@ [% INCLUDE 'patron-search-box.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc index 0ee0558..8fc03af 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc @@ -3,7 +3,7 @@ [% INCLUDE 'patron-search-box.inc' %] [% IF ( CAN_user_catalogue ) %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc index c03e81e..7559f03 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc @@ -10,7 +10,7 @@ [% INCLUDE 'patron-search-box.inc' %] [% IF ( CAN_user_catalogue ) %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc index 46cd4d8..21a83ab 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc @@ -13,7 +13,7 @@ [% INCLUDE 'patron-search-box.inc' %] [% IF ( CAN_user_catalogue ) %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc index de3afdf..dfb908f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc @@ -17,7 +17,7 @@ [% INCLUDE 'patron-search-box.inc' %] [% IF ( CAN_user_catalogue ) %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc index 4c300a8..270bab4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc @@ -10,7 +10,7 @@ [% INCLUDE 'patron-search-box.inc' %] [% IF ( CAN_user_catalogue ) %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc index 24f0f4f..dd4d9f5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc @@ -15,7 +15,7 @@ [% INCLUDE 'patron-search-box.inc' %] [% IF ( CAN_user_catalogue ) %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-admin-search.inc index 5a2f6ad..fa9fc4b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-admin-search.inc @@ -11,7 +11,7 @@ [% INCLUDE 'patron-search-box.inc' %] [% IF ( CAN_user_catalogue ) %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc index b64b500..2b3ce19 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc @@ -1,7 +1,7 @@