From srdjan at catalyst.net.nz  Mon Sep  3 07:06:14 2012
From: srdjan at catalyst.net.nz (Srdjan)
Date: Mon,  3 Sep 2012 17:06:14 +1200
Subject: [Koha-patches] [PATCH] bug_7243: Be selective when summing up
	charges for blocking issues
In-Reply-To: <bug 7243>
References: <bug 7243>
Message-ID: <1346648774-10206-1-git-send-email-srdjan@catalyst.net.nz>

Added RentalsInNoissueCharges and ManInvlsInNoissueCharges sys prefs

Created C4::Members::cwGetMemberAccountBallance()
* A wrapper for GetMemberAccountRecords that gives info on non-issue and
  other charges
* Other charges are:
  'Res'
  'Rent' if RentalsInNoissueCharges is Mo
  authorised_values MANUAL_INV if ManInvlsInNoissueCharges is No

C4::Members::GetMemberAccountRecords() changes:
* Dropped input param $date, it is not used

Use split charges in C4::Circulation::CanBookBeIssued() and
C4::Members::patronflags(). That way only fines decide whether an item
can be issued, and not other non-fine charges
---
 C4/Circulation.pm                                  |   31 +++++-----
 C4/Members.pm                                      |   63 +++++++++++++++-----
 circ/circulation.pl                                |   17 ++----
 installer/data/mysql/sysprefs.sql                  |    2 +
 installer/data/mysql/updatedatabase.pl             |   10 ++++
 .../en/modules/admin/preferences/circulation.pref  |   12 ++++
 .../prog/en/modules/circ/circulation.tt            |    4 ++
 opac/opac-user.pl                                  |    1 -
 t/db_dependent/lib/KohaTest/Members.pm             |    1 +
 9 files changed, 99 insertions(+), 42 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index cf7e927..f0f86ef 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -763,29 +763,32 @@ sub CanBookBeIssued {
     #
 
     # DEBTS
-    my ($amount) =
-      C4::Members::GetMemberAccountRecords( $borrower->{'borrowernumber'}, '' && $duedate->ymd() );
+    my ($ballance, $non_issue_ballance, $other_charges) =
+      C4::Members::GetMemberAccountBallance( $borrower->{'borrowernumber'} );
     my $amountlimit = C4::Context->preference("noissuescharge");
     my $allowfineoverride = C4::Context->preference("AllowFineOverride");
     my $allfinesneedoverride = C4::Context->preference("AllFinesNeedOverride");
     if ( C4::Context->preference("IssuingInProcess") ) {
-        if ( $amount > $amountlimit && !$inprocess && !$allowfineoverride) {
-            $issuingimpossible{DEBT} = sprintf( "%.2f", $amount );
-        } elsif ( $amount > $amountlimit && !$inprocess && $allowfineoverride) {
-            $needsconfirmation{DEBT} = sprintf( "%.2f", $amount );
-        } elsif ( $allfinesneedoverride && $amount > 0 && $amount <= $amountlimit && !$inprocess ) {
-            $needsconfirmation{DEBT} = sprintf( "%.2f", $amount );
+        if ( $non_issue_ballance > $amountlimit && !$inprocess && !$allowfineoverride) {
+            $issuingimpossible{DEBT} = sprintf( "%.2f", $non_issue_ballance );
+        } elsif ( $non_issue_ballance > $amountlimit && !$inprocess && $allowfineoverride) {
+            $needsconfirmation{DEBT} = sprintf( "%.2f", $non_issue_ballance );
+        } elsif ( $allfinesneedoverride && $non_issue_ballance > 0 && $non_issue_ballance <= $amountlimit && !$inprocess ) {
+            $needsconfirmation{DEBT} = sprintf( "%.2f", $non_issue_ballance );
         }
     }
     else {
-        if ( $amount > $amountlimit && $allowfineoverride ) {
-            $needsconfirmation{DEBT} = sprintf( "%.2f", $amount );
-        } elsif ( $amount > $amountlimit && !$allowfineoverride) {
-            $issuingimpossible{DEBT} = sprintf( "%.2f", $amount );
-        } elsif ( $amount > 0 && $allfinesneedoverride ) {
-            $needsconfirmation{DEBT} = sprintf( "%.2f", $amount );
+        if ( $non_issue_ballance > $amountlimit && $allowfineoverride ) {
+            $needsconfirmation{DEBT} = sprintf( "%.2f", $non_issue_ballance );
+        } elsif ( $non_issue_ballance > $amountlimit && !$allowfineoverride) {
+            $issuingimpossible{DEBT} = sprintf( "%.2f", $non_issue_ballance );
+        } elsif ( $non_issue_ballance > 0 && $allfinesneedoverride ) {
+            $needsconfirmation{DEBT} = sprintf( "%.2f", $non_issue_ballance );
         }
     }
+    if ($ballance > 0 && $other_charges > 0) {
+        $alerts{OTHER_CHARGES} = sprintf( "%.2f", $other_charges );
+    }
 
     my ($blocktype, $count) = C4::Members::IsMemberBlocked($borrower->{'borrowernumber'});
     if ($blocktype == -1) {
diff --git a/C4/Members.pm b/C4/Members.pm
index 2e315aa..adf0987 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -430,21 +430,21 @@ sub patronflags {
     my %flags;
     my ( $patroninformation) = @_;
     my $dbh=C4::Context->dbh;
-    my ($amount) = GetMemberAccountRecords( $patroninformation->{'borrowernumber'});
-    if ( $amount > 0 ) {
+    my ($ballance, $owing) = GetMemberAccountBallance( $patroninformation->{'borrowernumber'});
+    if ( $owing > 0 ) {
         my %flaginfo;
         my $noissuescharge = C4::Context->preference("noissuescharge") || 5;
-        $flaginfo{'message'} = sprintf "Patron owes \$%.02f", $amount;
-        $flaginfo{'amount'}  = sprintf "%.02f", $amount;
-        if ( $amount > $noissuescharge && !C4::Context->preference("AllowFineOverride") ) {
+        $flaginfo{'message'} = sprintf "Patron owes \$%.02f", $owing;
+        $flaginfo{'amount'}  = sprintf "%.02f", $owing;
+        if ( $owing > $noissuescharge && !C4::Context->preference("AllowFineOverride") ) {
             $flaginfo{'noissues'} = 1;
         }
         $flags{'CHARGES'} = \%flaginfo;
     }
-    elsif ( $amount < 0 ) {
+    elsif ( $ballance < 0 ) {
         my %flaginfo;
-        $flaginfo{'message'} = sprintf "Patron has credit of \$%.02f", -$amount;
-        $flaginfo{'amount'}  = sprintf "%.02f", $amount;
+        $flaginfo{'message'} = sprintf "Patron has credit of \$%.02f", -$ballance;
+        $flaginfo{'amount'}  = sprintf "%.02f", $ballance;
         $flags{'CREDITS'} = \%flaginfo;
     }
     if (   $patroninformation->{'gonenoaddress'}
@@ -1119,9 +1119,8 @@ total amount outstanding for all of the account lines.
 
 =cut
 
-#'
 sub GetMemberAccountRecords {
-    my ($borrowernumber,$date) = @_;
+    my ($borrowernumber) = @_;
     my $dbh = C4::Context->dbh;
     my @acctlines;
     my $numlines = 0;
@@ -1129,14 +1128,10 @@ sub GetMemberAccountRecords {
                         SELECT * 
                         FROM accountlines 
                         WHERE borrowernumber=?);
-    my @bind = ($borrowernumber);
-    if ($date && $date ne ''){
-            $strsth.=" AND date < ? ";
-            push(@bind,$date);
-    }
     $strsth.=" ORDER BY date desc,timestamp DESC";
     my $sth= $dbh->prepare( $strsth );
-    $sth->execute( @bind );
+    $sth->execute( $borrowernumber );
+     
     my $total = 0;
     while ( my $data = $sth->fetchrow_hashref ) {
         if ( $data->{itemnumber} ) {
@@ -1152,6 +1147,42 @@ sub GetMemberAccountRecords {
     return ( $total, \@acctlines,$numlines);
 }
 
+=head2 GetMemberAccountBallance
+
+  ($total_ballance, $non_issue_ballance, $other_charges) = &GetMemberAccountBallance($borrowernumber);
+
+Calculates amount immediately owing by the patron - non-issue charges.
+Based on GetMemberAccountRecords.
+Charges exempt from non-issue are:
+* Res (reserves)
+* Rent (rental) if RentalsInNoissueCharges syspref is set to false
+* Manual invoices if ManInvInNoissueCharges syspref is set to false
+
+=cut
+
+my $ACCOUNT_TYPE_LENGTH = 5; # this is plain ridiculous...
+
+my @not_fines = ('Res');
+push @not_fines, 'Rent' unless C4::Context->preference('RentalsInNoissueCharges');
+unless ( C4::Context->preference('ManInvInNoissueCharges') ) {
+    my $dbh = C4::Context->dbh;
+    my $man_inv_types = $dbh->selectcol_arrayref(qq{SELECT authorised_value FROM authorised_values WHERE category = 'MANUAL_INV'});
+    push @not_fines, map substr($_, 0, $ACCOUNT_TYPE_LENGTH), @$man_inv_types;
+}
+my %not_fine = map {$_ => 1} @not_fines;
+
+sub GetMemberAccountBallance {
+    my ($borrowernumber) = @_;
+
+    my ($total, $acctlines) = GetMemberAccountRecords($borrowernumber);
+    my $other_charges = 0;
+    foreach (@$acctlines) {
+        $other_charges += $_->{amountoutstanding} if $not_fine{ substr($_->{accounttype}, 0, $ACCOUNT_TYPE_LENGTH) };
+    }
+     
+    return ( $total, $total - $other_charges, $other_charges);
+}
+
 =head2 GetBorNotifyAcctRecord
 
   ($total, $acctlines, $count) = &GetBorNotifyAcctRecord($params,$notifyid);
diff --git a/circ/circulation.pl b/circ/circulation.pl
index 78ac1a4..61346d9 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -186,8 +186,7 @@ if ( $print eq 'yes' && $borrowernumber ne '' ) {
 my $borrowerslist;
 my $message;
 if ($findborrower) {
-    my $borrowers = Search($findborrower, 'cardnumber');
-    my @borrowers = @$borrowers;
+    my $borrowers = Search($findborrower, 'cardnumber') || [];
     if (C4::Context->preference("AddPatronLists")) {
         $template->param(
             "AddPatronLists_".C4::Context->preference("AddPatronLists")=> "1",
@@ -198,17 +197,17 @@ if ($findborrower) {
             $template->param(categories=>$categories);
         }
     }
-    if ( $#borrowers == -1 ) {
+    if ( @$borrowers == 0 ) {
         $query->param( 'findborrower', '' );
         $message = "'$findborrower'";
     }
-    elsif ( $#borrowers == 0 ) {
-        $query->param( 'borrowernumber', $borrowers[0]->{'borrowernumber'} );
+    elsif ( @$borrowers == 1 ) {
+        $borrowernumber = $borrowers->[0]->{'borrowernumber'};
+        $query->param( 'borrowernumber', $borrowernumber );
         $query->param( 'barcode',           '' );
-        $borrowernumber = $borrowers[0]->{'borrowernumber'};
     }
     else {
-        $borrowerslist = \@borrowers;
+        $borrowerslist = $borrowers;
     }
 }
 
@@ -536,7 +535,6 @@ foreach my $flag ( sort keys %$flags ) {
     $flags->{$flag}->{'message'} =~ s#\n#<br />#g;
     if ( $flags->{$flag}->{'noissues'} ) {
         $template->param(
-            flagged  => 1,
             noissues => 'true',
         );
         if ( $flag eq 'GNA' ) {
@@ -568,7 +566,6 @@ foreach my $flag ( sort keys %$flags ) {
         if ( $flag eq 'CHARGES' ) {
             $template->param(
                 charges    => 'true',
-                flagged    => 1,
                 chargesmsg => $flags->{'CHARGES'}->{'message'},
                 chargesamount => $flags->{'CHARGES'}->{'amount'},
             );
@@ -583,7 +580,6 @@ foreach my $flag ( sort keys %$flags ) {
         elsif ( $flag eq 'ODUES' ) {
             $template->param(
                 odues    => 'true',
-                flagged  => 1,
                 oduesmsg => $flags->{'ODUES'}->{'message'}
             );
 
@@ -595,7 +591,6 @@ foreach my $flag ( sort keys %$flags ) {
         elsif ( $flag eq 'NOTES' ) {
             $template->param(
                 notes    => 'true',
-                flagged  => 1,
                 notesmsg => $flags->{'NOTES'}->{'message'}
             );
         }
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 7219e37..f25874a 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -325,6 +325,8 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('EasyAnalyticalRecords','0','If on, display in the catalogue screens tools to easily setup analytical record relationships','','YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowRecentComments',0,'If ON a link to recent comments will appear in the OPAC masthead',NULL,'YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('CircAutoPrintQuickSlip', '1', 'Choose what should happen when an empty barcode field is submitted in circulation: Display a print quick slip window or Clear the screen.',NULL,'YesNo');
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('RentalsInNoissueCharges', '1', 'Include rental charges when summing up charges for NoissueCharge.',NULL,'YesNo');
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ManInvInNoissueCharges', '1', 'Include MAN_INV charges when summing up charges for NoissueCharge.',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('NoticeCSS','','Notices CSS url.',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SlipCSS','','Slips CSS url.',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('TransferWhenCancelAllWaitingHolds','0','Transfer items when cancelling all waiting holds',NULL,'YesNo');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index e58c4c9..3f7e3c0 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -5657,6 +5657,16 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion ($DBversion);
 }
 
+
+
+$DBversion = "3.09.00.XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('RentalsInNoissueCharges', '1', 'Include rental charges when summing up charges for NoissueCharge.',NULL,'YesNo');");
+    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ManInvInNoissueCharges', '1', 'Include MAN_INV charges when summing up charges for NoissueCharge.',NULL,'YesNo');");
+    print "Upgrade to $DBversion done (Add sysprefs RentalsInNoissueCharges and ManInvInNoissueCharges.)\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index a758b19..9d9e5af 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -220,6 +220,18 @@ Circulation:
               class: integer
             - '[% local_currency %] in fines.'
         -
+            - pref: RentalsInNoissueCharges
+              choices:
+                  yes: Include
+                  no: "Don't include"
+            - rental charges when summing up charges for NoissueCharge.
+        -
+            - pref: ManInvInNoissueCharges
+              choices:
+                  yes: Include
+                  no: "Don't include"
+            - MAN_INV charges when summing up charges for NoissueCharge.
+        -
             - pref: ReturnBeforeExpiry
               choices:
                   yes: Require
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 729defc..8edb8c3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -243,6 +243,10 @@ function validate1(date) {
     <div class="dialog message">This item has been lost with a status of "[% alert.ITEM_LOST %]".</div>
 [% END %]
 
+[% IF ( alert.OTHER_CHARGES ) %]
+    <div class="dialog message">The patron has unpaid charges for reserves, rentals etc of [% alert.OTHER_CHARGES %]</div>
+[% END %]
+
 [% IF ( NEEDSCONFIRMATION ) %]
 <div class="yui-g">
 
diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 50a167e..d353185 100755
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -141,7 +141,6 @@ $template->param(   BORROWER_INFO     => \@bordat,
                     OPACMySummaryHTML => (C4::Context->preference("OPACMySummaryHTML")) ? 1 : 0,
                     surname           => $borr->{surname},
                     showname          => $borr->{showname},
-
                 );
 
 #get issued items ....
diff --git a/t/db_dependent/lib/KohaTest/Members.pm b/t/db_dependent/lib/KohaTest/Members.pm
index dfde7da..3a2d4e8 100644
--- a/t/db_dependent/lib/KohaTest/Members.pm
+++ b/t/db_dependent/lib/KohaTest/Members.pm
@@ -27,6 +27,7 @@ sub methods : Test( 1 ) {
                       GetPendingIssues 
                       GetAllIssues 
                       GetMemberAccountRecords 
+                      GetMemberAccountBallance
                       GetBorNotifyAcctRecord 
                       checkuniquemember 
                       checkcardnumber 
-- 
1.7.9.5


From fridolyn.somers at biblibre.com  Mon Sep  3 13:43:24 2012
From: fridolyn.somers at biblibre.com (Fridolyn SOMERS)
Date: Mon,  3 Sep 2012 13:43:24 +0200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 8293 : Fixing POD to match
	actuality.
Message-ID: <1346672604-5816-1-git-send-email-fridolyn.somers@biblibre.com>

From: Chris Cormack <chrisc at catalyst.net.nz>


Signed-off-by: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
---
 C4/Search.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index b0085c4..3edf118 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1415,7 +1415,7 @@ sub buildQuery {
 
   my @search_results = searchResults($search_context, $searchdesc, $hits, 
                                      $results_per_page, $offset, $scan, 
-                                     @marcresults, $hidelostitems);
+                                     @marcresults);
 
 Format results in a form suitable for passing to the template
 
-- 
1.7.9.5


From nengard at bywatersolutions.com  Tue Sep  4 17:25:33 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue,  4 Sep 2012 11:25:33 -0400
Subject: [Koha-patches] [PATCH] Bug 8721: Fixes minor typo in
	AllowItemsOnHoldCheckout
Message-ID: <1346772333-2404-1-git-send-email-nengard@bywatersolutions.com>

Small string fix to remove repeated word.
---
 .../en/modules/admin/preferences/circulation.pref  |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index a758b19..308a30f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -128,7 +128,7 @@ Circulation:
               choices:
                   yes: Allow
                   no: "Don't allow"
-            - checkouts of items items reserved to someone else. If allowed do not generate RESERVE_WAITING and RESERVED warning. This allows self checkouts for those items.
+            - checkouts of items reserved to someone else. If allowed do not generate RESERVE_WAITING and RESERVED warning. This allows self checkouts for those items.
         -
             - pref: AllFinesNeedOverride
               choices:
-- 
1.7.2.3


From srdjan at catalyst.net.nz  Wed Sep  5 02:52:30 2012
From: srdjan at catalyst.net.nz (Srdjan)
Date: Wed,  5 Sep 2012 12:52:30 +1200
Subject: [Koha-patches] [PATCH] bug_5911: Transport Cost Matrix
In-Reply-To: <bug 5911>
References: <bug 5911>
Message-ID: <1346806350-18899-1-git-send-email-srdjan@catalyst.net.nz>

Create transport_cost table,  added UseTransportCostMatrix syspref.
transport_cost table contains branch to branch transfer
costs. These are used for filling inter-branch hold transfers.

Moved GetHoldsQueueItems() from .pl to HoldsQueue.pm

Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
---
 C4/Circulation.pm                                  |    3 +-
 C4/HoldsQueue.pm                                   |  622 ++++++++++++++++++++
 admin/systempreferences.pl                         |    1 +
 admin/transport-cost-matrix.pl                     |  125 ++++
 circ/view_holdsqueue.pl                            |   34 +-
 installer/data/mysql/kohastructure.sql             |   16 +
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |   22 +
 .../prog/en/modules/admin/admin-home.tt            |    2 +
 .../en/modules/admin/preferences/circulation.pref  |    6 +
 .../prog/en/modules/admin/transport-cost-matrix.tt |  131 +++++
 misc/cronjobs/holds/build_holds_queue.pl           |  385 +-----------
 t/db_dependent/HoldsQueue.t                        |  175 ++++++
 13 files changed, 1107 insertions(+), 416 deletions(-)
 create mode 100755 C4/HoldsQueue.pm
 create mode 100755 admin/transport-cost-matrix.pl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
 create mode 100755 t/db_dependent/HoldsQueue.t

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 8647943..f4b9cd1 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -1413,7 +1413,8 @@ sub GetBranchItemRule {
 
     foreach my $attempt (@attempts) {
         my ($query, @bind_params) = @{$attempt};
-        my $search_result = $dbh->selectrow_hashref ( $query , {}, @bind_params );
+        my $search_result = $dbh->selectrow_hashref ( $query , {}, @bind_params )
+          or next;
 
         # Since branch/category and branch/itemtype use the same per-branch
         # defaults tables, we have to check that the key we want is set, not
diff --git a/C4/HoldsQueue.pm b/C4/HoldsQueue.pm
new file mode 100755
index 0000000..ffc6f89
--- /dev/null
+++ b/C4/HoldsQueue.pm
@@ -0,0 +1,622 @@
+package C4::HoldsQueue;
+
+# Copyright 2011 Catalyst IT
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+# FIXME: expand perldoc, explain intended logic
+
+use strict;
+use warnings;
+
+use C4::Context;
+use C4::Search;
+use C4::Items;
+use C4::Branch;
+use C4::Circulation;
+use C4::Members;
+use C4::Biblio;
+use C4::Dates qw/format_date/;
+
+use List::Util qw(shuffle);
+use Data::Dumper;
+
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
+BEGIN {
+    $VERSION = 3.03;
+    require Exporter;
+    @ISA = qw(Exporter);
+    @EXPORT_OK = qw(
+        &CreateQueue
+        &GetHoldsQueueItems
+
+        &TransportCostMatrix
+        &UpdateTransportCostMatrix
+     );
+}
+
+# XXX This is not safe in a persistant environment
+my $dbh   = C4::Context->dbh;
+
+=head1 FUNCTIONS
+
+=head2 TransportCostMatrix
+
+  TransportCostMatrix();
+
+Returns Transport Cost Matrix as a hashref <to branch code> => <from branch code> => cost
+
+=cut
+
+sub TransportCostMatrix {
+    my $transport_costs = $dbh->selectall_arrayref("SELECT * FROM transport_cost",{ Slice => {} });
+
+    my %transport_cost_matrix;
+    foreach (@$transport_costs) {
+        my $from = $_->{frombranch};
+        my $to = $_->{tobranch};
+        my $cost = $_->{cost};
+        my $disabled = $_->{disable_transfer};
+        $transport_cost_matrix{$to}{$from} = { cost => $cost, disable_transfer => $disabled };
+    }
+    return \%transport_cost_matrix;
+}
+
+=head2 UpdateTransportCostMatrix
+
+  UpdateTransportCostMatrix($records);
+
+Updates full Transport Cost Matrix table. $records is an arrayref of records.
+Records: { frombranch => <code>, tobranch => <code>, cost => <figure>, disable_transfer => <0,1> }
+
+=cut
+
+sub UpdateTransportCostMatrix {
+    my ($records) = @_;
+
+    my $sth = $dbh->prepare("INSERT INTO transport_cost (frombranch, tobranch, cost, disable_transfer) VALUES (?, ?, ?, ?)");
+                 
+    $dbh->do("TRUNCATE TABLE transport_cost");
+    foreach (@$records) {
+        my $cost = $_->{cost};
+        my $from = $_->{frombranch};
+        my $to = $_->{tobranch};
+        if ($_->{disable_transfer}) {
+            $cost ||= 0;
+        }
+        elsif ( !defined ($cost) || ($cost !~ m/(0|[1-9][0-9]*)(\.[0-9]*)?/o) ) {
+            warn  "Invalid $from -> $to cost $cost - must be a number >= 0, disablig";
+            $cost = 0;
+            $_->{disable_transfer} = 1;
+        }
+        $sth->execute( $from, $to, $cost, $_->{disable_transfer} ? 1 : 0 );
+    }
+}
+
+=head2 GetHoldsQueueItems
+
+  GetHoldsQueueItems($branch);
+
+Returns hold queue for a holding branch. If branch is omitted, then whole queue is returned
+
+=cut
+
+sub GetHoldsQueueItems {
+    my ($branchlimit) = @_;
+
+    my @bind_params = ();
+    my $query = q/SELECT tmp_holdsqueue.*, biblio.author, items.ccode, items.location, items.enumchron, items.cn_sort, biblioitems.publishercode,biblio.copyrightdate,biblioitems.publicationyear,biblioitems.pages,biblioitems.size,biblioitems.publicationyear,biblioitems.isbn,items.copynumber
+                  FROM tmp_holdsqueue
+                       JOIN biblio      USING (biblionumber)
+                  LEFT JOIN biblioitems USING (biblionumber)
+                  LEFT JOIN items       USING (  itemnumber)
+                /;
+    if ($branchlimit) {
+        $query .=" WHERE tmp_holdsqueue.holdingbranch = ?";
+        push @bind_params, $branchlimit;
+    }
+    $query .= " ORDER BY ccode, location, cn_sort, author, title, pickbranch, reservedate";
+    my $sth = $dbh->prepare($query);
+    $sth->execute(@bind_params);
+    my $items = [];
+    while ( my $row = $sth->fetchrow_hashref ){
+        $row->{reservedate} = format_date($row->{reservedate});
+        my $record = GetMarcBiblio($row->{biblionumber});
+        if ($record){
+            $row->{subtitle} = GetRecordValue('subtitle',$record,'')->[0]->{subfield};
+            $row->{parts} = GetRecordValue('parts',$record,'')->[0]->{subfield};
+            $row->{numbers} = GetRecordValue('numbers',$record,'')->[0]->{subfield};
+        }
+        push @$items, $row;
+    }
+    return $items;
+}
+
+=head2 CreateQueue
+
+  CreateQueue();
+
+Top level function that turns reserves into tmp_holdsqueue and hold_fill_targets.
+
+=cut
+
+sub CreateQueue {
+
+    $dbh->do("DELETE FROM tmp_holdsqueue");  # clear the old table for new info
+    $dbh->do("DELETE FROM hold_fill_targets");
+
+    my $total_bibs            = 0;
+    my $total_requests        = 0;
+    my $total_available_items = 0;
+    my $num_items_mapped      = 0;
+
+    my $branches_to_use;
+    my $transport_cost_matrix;
+    my $use_transport_cost_matrix = C4::Context->preference("UseTransportCostMatrix");
+    if ($use_transport_cost_matrix) {
+        $transport_cost_matrix = TransportCostMatrix();
+        unless (keys %$transport_cost_matrix) {
+            warn "UseTransportCostMatrix set to yes, but matrix not populated";
+            undef $transport_cost_matrix;
+        }
+    }
+    unless ($transport_cost_matrix) {
+        $branches_to_use = load_branches_to_pull_from();
+    }
+
+    my $bibs_with_pending_requests = GetBibsWithPendingHoldRequests();
+
+    foreach my $biblionumber (@$bibs_with_pending_requests) {
+        $total_bibs++;
+        my $hold_requests   = GetPendingHoldRequestsForBib($biblionumber);
+        my $available_items = GetItemsAvailableToFillHoldRequestsForBib($biblionumber, $branches_to_use);
+        $total_requests        += scalar(@$hold_requests);
+        $total_available_items += scalar(@$available_items);
+
+        my $item_map = MapItemsToHoldRequests($hold_requests, $available_items, $branches_to_use, $transport_cost_matrix);
+        $item_map  or next;
+        my $item_map_size = scalar(keys %$item_map)
+          or next;
+
+        $num_items_mapped += $item_map_size;
+        CreatePicklistFromItemMap($item_map);
+        AddToHoldTargetMap($item_map);
+        if (($item_map_size < scalar(@$hold_requests  )) and
+            ($item_map_size < scalar(@$available_items))) {
+            # DOUBLE CHECK, but this is probably OK - unfilled item-level requests
+            # FIXME
+            #warn "unfilled requests for $biblionumber";
+            #warn Dumper($hold_requests), Dumper($available_items), Dumper($item_map);
+        }
+    }
+}
+
+=head2 GetBibsWithPendingHoldRequests
+
+  my $biblionumber_aref = GetBibsWithPendingHoldRequests();
+
+Return an arrayref of the biblionumbers of all bibs
+that have one or more unfilled hold requests.
+
+=cut
+
+sub GetBibsWithPendingHoldRequests {
+    my $dbh = C4::Context->dbh;
+
+    my $bib_query = "SELECT DISTINCT biblionumber
+                     FROM reserves
+                     WHERE found IS NULL
+                     AND priority > 0
+                     AND reservedate <= CURRENT_DATE()";
+    my $sth = $dbh->prepare($bib_query);
+
+    $sth->execute();
+    my $biblionumbers = $sth->fetchall_arrayref();
+
+    return [ map { $_->[0] } @$biblionumbers ];
+}
+
+=head2 GetPendingHoldRequestsForBib
+
+  my $requests = GetPendingHoldRequestsForBib($biblionumber);
+
+Returns an arrayref of hashrefs to pending, unfilled hold requests
+on the bib identified by $biblionumber.  The following keys
+are present in each hashref:
+
+    biblionumber
+    borrowernumber
+    itemnumber
+    priority
+    branchcode
+    reservedate
+    reservenotes
+    borrowerbranch
+
+The arrayref is sorted in order of increasing priority.
+
+=cut
+
+sub GetPendingHoldRequestsForBib {
+    my $biblionumber = shift;
+
+    my $dbh = C4::Context->dbh;
+
+    my $request_query = "SELECT biblionumber, borrowernumber, itemnumber, priority, reserves.branchcode, 
+                                reservedate, reservenotes, borrowers.branchcode AS borrowerbranch
+                         FROM reserves
+                         JOIN borrowers USING (borrowernumber)
+                         WHERE biblionumber = ?
+                         AND found IS NULL
+                         AND priority > 0
+                         AND reservedate <= CURRENT_DATE()
+                         ORDER BY priority";
+    my $sth = $dbh->prepare($request_query);
+    $sth->execute($biblionumber);
+
+    my $requests = $sth->fetchall_arrayref({});
+    return $requests;
+
+}
+
+=head2 GetItemsAvailableToFillHoldRequestsForBib
+
+  my $available_items = GetItemsAvailableToFillHoldRequestsForBib($biblionumber, $branches_ar);
+
+Returns an arrayref of items available to fill hold requests
+for the bib identified by C<$biblionumber>.  An item is available
+to fill a hold request if and only if:
+
+    * it is not on loan
+    * it is not withdrawn
+    * it is not marked notforloan
+    * it is not currently in transit
+    * it is not lost
+    * it is not sitting on the hold shelf
+
+=cut
+
+sub GetItemsAvailableToFillHoldRequestsForBib {
+    my ($biblionumber, $branches_to_use) = @_;
+
+    my $dbh = C4::Context->dbh;
+    my $items_query = "SELECT itemnumber, homebranch, holdingbranch, itemtypes.itemtype AS itype
+                       FROM items ";
+
+    if (C4::Context->preference('item-level_itypes')) {
+        $items_query .=   "LEFT JOIN itemtypes ON (itemtypes.itemtype = items.itype) ";
+    } else {
+        $items_query .=   "JOIN biblioitems USING (biblioitemnumber)
+                           LEFT JOIN itemtypes USING (itemtype) ";
+    }
+    $items_query .=   "WHERE items.notforloan = 0
+                       AND holdingbranch IS NOT NULL
+                       AND itemlost = 0
+                       AND wthdrawn = 0";
+    $items_query .= "  AND damaged = 0" unless C4::Context->preference('AllowHoldsOnDamagedItems');
+    $items_query .= "  AND items.onloan IS NULL
+                       AND (itemtypes.notforloan IS NULL OR itemtypes.notforloan = 0)
+                       AND itemnumber NOT IN (
+                           SELECT itemnumber
+                           FROM reserves
+                           WHERE biblionumber = ?
+                           AND itemnumber IS NOT NULL
+                           AND (found IS NOT NULL OR priority = 0)
+                        )
+                       AND items.biblionumber = ?";
+    $items_query .=  " AND damaged = 0 "
+      unless C4::Context->preference('AllowHoldsOnDamagedItems');
+
+    my @params = ($biblionumber, $biblionumber);
+    if ($branches_to_use && @$branches_to_use) {
+        $items_query .= " AND holdingbranch IN (" . join (",", map { "?" } @$branches_to_use) . ")";
+        push @params, @$branches_to_use;
+    }
+    my $sth = $dbh->prepare($items_query);
+    $sth->execute(@params);
+
+    my $itm = $sth->fetchall_arrayref({});
+    my @items = grep { ! scalar GetTransfers($_->{itemnumber}) } @$itm;
+    return [ grep { 
+        my $rule = GetBranchItemRule($_->{homebranch}, $_->{itype});
+        $_->{holdallowed} = $rule->{holdallowed} != 0
+    } @items ];
+}
+
+=head2 MapItemsToHoldRequests
+
+  MapItemsToHoldRequests($hold_requests, $available_items, $branches, $transport_cost_matrix)
+
+=cut
+
+sub MapItemsToHoldRequests {
+    my ($hold_requests, $available_items, $branches_to_use, $transport_cost_matrix) = @_;
+
+    # handle trival cases
+    return unless scalar(@$hold_requests) > 0;
+    return unless scalar(@$available_items) > 0;
+
+    my $automatic_return = C4::Context->preference("AutomaticItemReturn");
+
+    # identify item-level requests
+    my %specific_items_requested = map { $_->{itemnumber} => 1 } 
+                                   grep { defined($_->{itemnumber}) }
+                                   @$hold_requests;
+
+    # group available items by itemnumber
+    my %items_by_itemnumber = map { $_->{itemnumber} => $_ } @$available_items;
+
+    # items already allocated
+    my %allocated_items = ();
+
+    # map of items to hold requests
+    my %item_map = ();
+ 
+    # figure out which item-level requests can be filled    
+    my $num_items_remaining = scalar(@$available_items);
+    foreach my $request (@$hold_requests) {
+        last if $num_items_remaining == 0;
+
+        # is this an item-level request?
+        if (defined($request->{itemnumber})) {
+            # fill it if possible; if not skip it
+            if (exists $items_by_itemnumber{$request->{itemnumber}} and
+                not exists $allocated_items{$request->{itemnumber}}) {
+                $item_map{$request->{itemnumber}} = { 
+                    borrowernumber => $request->{borrowernumber},
+                    biblionumber => $request->{biblionumber},
+                    holdingbranch =>  $items_by_itemnumber{$request->{itemnumber}}->{holdingbranch},
+                    pickup_branch => $request->{branchcode} || $request->{borrowerbranch},
+                    item_level => 1,
+                    reservedate => $request->{reservedate},
+                    reservenotes => $request->{reservenotes},
+                };
+                $allocated_items{$request->{itemnumber}}++;
+                $num_items_remaining--;
+            }
+        } else {
+            # it's title-level request that will take up one item
+            $num_items_remaining--;
+        }
+    }
+
+    # group available items by branch
+    my %items_by_branch = ();
+    foreach my $item (@$available_items) {
+        next unless $item->{holdallowed};
+
+        push @{ $items_by_branch{  $automatic_return ? $item->{homebranch}
+                                                     : $item->{holdingbranch} } }, $item
+          unless exists $allocated_items{ $item->{itemnumber} };
+    }
+    return unless keys %items_by_branch;
+
+    # now handle the title-level requests
+    $num_items_remaining = scalar(@$available_items) - scalar(keys %allocated_items); 
+    my $pull_branches;
+    foreach my $request (@$hold_requests) {
+        last if $num_items_remaining == 0;
+        next if defined($request->{itemnumber}); # already handled these
+
+        # look for local match first
+        my $pickup_branch = $request->{branchcode} || $request->{borrowerbranch};
+        my ($itemnumber, $holdingbranch);
+
+        my $holding_branch_items = $automatic_return ? undef : $items_by_branch{$pickup_branch};
+        if ( $holding_branch_items ) {
+            foreach my $item (@$holding_branch_items) {
+                if ( $request->{borrowerbranch} eq $item->{homebranch} ) {
+                    $itemnumber = $item->{itemnumber};
+                    last;
+                }
+            }
+            $holdingbranch = $pickup_branch;
+            $itemnumber ||= $holding_branch_items->[0]->{itemnumber};
+        }
+        elsif ($transport_cost_matrix) {
+            $pull_branches = [keys %items_by_branch];
+            $holdingbranch = least_cost_branch( $pickup_branch, $pull_branches, $transport_cost_matrix );
+            if ( $holdingbranch ) {
+
+                my $holding_branch_items = $items_by_branch{$holdingbranch};
+                foreach my $item (@$holding_branch_items) {
+                    next if $request->{borrowerbranch} ne $item->{homebranch};
+
+                    $itemnumber = $item->{itemnumber};
+                    last;
+                }
+                $itemnumber ||= $holding_branch_items->[0]->{itemnumber};
+            }
+            else {
+                warn "No transport costs for $pickup_branch";
+            }
+        }
+
+        unless ($itemnumber) {
+            # not found yet, fall back to basics
+            if ($branches_to_use) {
+                $pull_branches = $branches_to_use;
+            } else {
+                $pull_branches = [keys %items_by_branch];
+            }
+            PULL_BRANCHES:
+            foreach my $branch (@$pull_branches) {
+                my $holding_branch_items = $items_by_branch{$branch}
+                  or next;
+
+                $holdingbranch ||= $branch;
+                foreach my $item (@$holding_branch_items) {
+                    next if $pickup_branch ne $item->{homebranch};
+
+                    $itemnumber = $item->{itemnumber};
+                    $holdingbranch = $branch;
+                    last PULL_BRANCHES;
+                }
+            }
+            $itemnumber ||= $items_by_branch{$holdingbranch}->[0]->{itemnumber}
+              if $holdingbranch;
+        }
+
+        if ($itemnumber) {
+            my $holding_branch_items = $items_by_branch{$holdingbranch}
+              or die "Have $itemnumber, $holdingbranch, but no items!";
+            @$holding_branch_items = grep { $_->{itemnumber} != $itemnumber } @$holding_branch_items;
+            delete $items_by_branch{$holdingbranch} unless @$holding_branch_items;
+
+            $item_map{$itemnumber} = {
+                borrowernumber => $request->{borrowernumber},
+                biblionumber => $request->{biblionumber},
+                holdingbranch => $holdingbranch,
+                pickup_branch => $pickup_branch,
+                item_level => 0,
+                reservedate => $request->{reservedate},
+                reservenotes => $request->{reservenotes},
+            };
+            $num_items_remaining--; 
+        }
+    }
+    return \%item_map;
+}
+
+=head2 CreatePickListFromItemMap 
+
+=cut
+
+sub CreatePicklistFromItemMap {
+    my $item_map = shift;
+
+    my $dbh = C4::Context->dbh;
+
+    my $sth_load=$dbh->prepare("
+        INSERT INTO tmp_holdsqueue (biblionumber,itemnumber,barcode,surname,firstname,phone,borrowernumber,
+                                    cardnumber,reservedate,title, itemcallnumber,
+                                    holdingbranch,pickbranch,notes, item_level_request)
+        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+    ");
+
+    foreach my $itemnumber  (sort keys %$item_map) {
+        my $mapped_item = $item_map->{$itemnumber};
+        my $biblionumber = $mapped_item->{biblionumber}; 
+        my $borrowernumber = $mapped_item->{borrowernumber}; 
+        my $pickbranch = $mapped_item->{pickup_branch};
+        my $holdingbranch = $mapped_item->{holdingbranch};
+        my $reservedate = $mapped_item->{reservedate};
+        my $reservenotes = $mapped_item->{reservenotes};
+        my $item_level = $mapped_item->{item_level};
+
+        my $item = GetItem($itemnumber);
+        my $barcode = $item->{barcode};
+        my $itemcallnumber = $item->{itemcallnumber};
+
+        my $borrower = GetMember('borrowernumber'=>$borrowernumber);
+        my $cardnumber = $borrower->{'cardnumber'};
+        my $surname = $borrower->{'surname'};
+        my $firstname = $borrower->{'firstname'};
+        my $phone = $borrower->{'phone'};
+   
+        my $bib = GetBiblioData($biblionumber);
+        my $title = $bib->{title}; 
+
+        $sth_load->execute($biblionumber, $itemnumber, $barcode, $surname, $firstname, $phone, $borrowernumber,
+                           $cardnumber, $reservedate, $title, $itemcallnumber,
+                           $holdingbranch, $pickbranch, $reservenotes, $item_level);
+    }
+}
+
+=head2 AddToHoldTargetMap
+
+=cut
+
+sub AddToHoldTargetMap {
+    my $item_map = shift;
+
+    my $dbh = C4::Context->dbh;
+
+    my $insert_sql = q(
+        INSERT INTO hold_fill_targets (borrowernumber, biblionumber, itemnumber, source_branchcode, item_level_request)
+                               VALUES (?, ?, ?, ?, ?)
+    );
+    my $sth_insert = $dbh->prepare($insert_sql);
+
+    foreach my $itemnumber (keys %$item_map) {
+        my $mapped_item = $item_map->{$itemnumber};
+        $sth_insert->execute($mapped_item->{borrowernumber}, $mapped_item->{biblionumber}, $itemnumber,
+                             $mapped_item->{holdingbranch}, $mapped_item->{item_level});
+    }
+}
+
+# Helper functions, not part of any interface
+
+sub _trim {
+    return $_[0] unless $_[0];
+    $_[0] =~ s/^\s+//;
+    $_[0] =~ s/\s+$//;
+    $_[0];
+}
+
+sub load_branches_to_pull_from {
+    my $static_branch_list = C4::Context->preference("StaticHoldsQueueWeight")
+      or return;
+
+    my @branches_to_use = map _trim($_), split /,/, $static_branch_list;
+
+    @branches_to_use = shuffle(@branches_to_use) if  C4::Context->preference("RandomizeHoldsQueueWeight");
+
+    return \@branches_to_use;
+}
+
+sub least_cost_branch {
+
+    #$from - arrayref
+    my ($to, $from, $transport_cost_matrix) = @_;
+
+# Nothing really spectacular: supply to branch, a list of potential from branches
+# and find the minimum from - to value from the transport_cost_matrix
+    return $from->[0] if @$from == 1;
+
+    my ($least_cost, @branch);
+    foreach (@$from) {
+        my $cell = $transport_cost_matrix->{$to}{$_};
+        next if $cell->{disable_transfer};
+
+        my $cost = $cell->{cost};
+        next unless defined $cost; # XXX should this be reported?
+
+        unless (defined $least_cost) {
+            $least_cost = $cost;
+            push @branch, $_;
+            next;
+        }
+
+        next if $cost > $least_cost;
+
+        if ($cost == $least_cost) {
+            push @branch, $_;
+            next;
+        }
+
+        @branch = ($_);
+        $least_cost = $cost;
+    }
+
+    return $branch[0];
+
+    # XXX return a random @branch with minimum cost instead of the first one;
+    # return $branch[0] if @branch == 1;
+}
+
+
+1;
diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index f7a7d05..8b37919 100755
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -203,6 +203,7 @@ $tabsysprefs{DisplayClearScreenButton}       = "Circulation";
 $tabsysprefs{AllowAllMessageDeletion}        = "Circulation";
 $tabsysprefs{OverdueNoticeBcc}               = "Circulation";
 $tabsysprefs{OverduesBlockCirc}              = "Circulation";
+$tabsysprefs{UseTransportCostMatrix}         = "Circulation";
 
 
 # Staff Client
diff --git a/admin/transport-cost-matrix.pl b/admin/transport-cost-matrix.pl
new file mode 100755
index 0000000..725257c
--- /dev/null
+++ b/admin/transport-cost-matrix.pl
@@ -0,0 +1,125 @@
+#!/usr/bin/perl
+# Copyright 2000-2002 Katipo Communications
+# copyright 2010 BibLibre
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use strict;
+use warnings;
+use CGI;
+use C4::Context;
+use C4::Output;
+use C4::Auth;
+use C4::Koha;
+use C4::Debug;
+use C4::Branch; # GetBranches
+use C4::HoldsQueue qw(TransportCostMatrix UpdateTransportCostMatrix);
+
+use Data::Dumper;
+
+my $input = new CGI;
+
+my ($template, $loggedinuser, $cookie)
+    = get_template_and_user({template_name => "admin/transport-cost-matrix.tmpl",
+                            query => $input,
+                            type => "intranet",
+                            authnotrequired => 0,
+                            flagsrequired => {parameters => 1},
+                            debug => 1,
+                            });
+my $use_transport_cost_matrix = C4::Context->preference("UseTransportCostMatrix");
+
+my $update = $input->param('op') eq 'set-cost-matrix';
+
+my ($cost_matrix, $have_matrix);
+unless ($update) {
+    $cost_matrix = TransportCostMatrix();
+    $have_matrix = keys %$cost_matrix if $cost_matrix;
+}
+
+my $branches = GetBranches();
+my @branchloop = map { code => $_,
+                       name => $branches->{$_}->{'branchname'} },
+                 sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} }
+                 keys %$branches;
+my (@branchfromloop, @cost, @errors);
+foreach my $branchfrom ( @branchloop ) {
+    my $fromcode = $branchfrom->{code};
+
+    my %from_row = ( code => $fromcode, name => $branchfrom->{name} );
+    foreach my $branchto ( @branchloop ) {
+        my $tocode = $branchto->{code};
+
+        my %from_to_input_def = ( code => $tocode, name => $branchto->{name} );
+        push @{ $from_row{branchtoloop} }, \%from_to_input_def;
+
+        if ($fromcode eq $tocode) {
+            $from_to_input_def{skip} = 1;
+            next;
+        }
+
+        (my $from_to = "${fromcode}_${tocode}") =~ s/\W//go;
+         $from_to_input_def{id} = $from_to;
+        my $input_name   = "cost_$from_to";
+        my $disable_name = "disable_$from_to";
+
+        if ($update) {
+            my $value = $from_to_input_def{value} = $input->param($input_name);
+            if ( $input->param($disable_name) ) {
+                $from_to_input_def{disabled} = 1;
+            }
+            else {
+                push @errors, "Invalid value for $from_row{name} -> $from_to_input_def{name}"
+                  unless $value =~ /\d/o && $value >= 0.0;
+            }
+        }
+        else {
+            if ($have_matrix) {
+                if ( my $cell = $cost_matrix->{$tocode}{$fromcode} ) {
+                    $from_to_input_def{value} = $cell->{cost};
+                    $from_to_input_def{disabled} = 1 if $cell->{disable_transfer};
+                }
+            } else {
+                $from_to_input_def{disabled} = 1;
+            }
+        }
+    }
+    
+#              die Dumper(\%from_row);
+    push @branchfromloop, \%from_row;
+}
+
+if ($update && !@errors) {
+    my @update_recs = map {
+        my $from = $_->{code};
+        map { frombranch => $from, tobranch => $_->{code}, cost => $_->{value}, disable_transfer => $_->{disabled} || 0 },
+            grep { $_->{code} ne $from }
+            @{ $_->{branchtoloop} };
+    } @branchfromloop;
+
+    UpdateTransportCostMatrix(\@update_recs);
+}
+   
+$template->param(
+    branchloop => \@branchloop,
+    branchfromloop => \@branchfromloop,
+    WARNING_transport_cost_matrix_off => !$use_transport_cost_matrix,
+    errors => \@errors,
+);
+output_html_with_http_headers $input, $cookie, $template->output;
+
+exit 0;
+
diff --git a/circ/view_holdsqueue.pl b/circ/view_holdsqueue.pl
index 4b51423..cf529f0 100755
--- a/circ/view_holdsqueue.pl
+++ b/circ/view_holdsqueue.pl
@@ -31,7 +31,7 @@ use C4::Biblio;
 use C4::Items;
 use C4::Koha;   # GetItemTypes
 use C4::Branch; # GetBranches
-use C4::Dates qw/format_date/;
+use C4::HoldsQueue qw(GetHoldsQueueItems);
 
 my $query = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -51,6 +51,7 @@ my $branchlimit    = $params->{'branchlimit'};
 my $itemtypeslimit = $params->{'itemtypeslimit'};
 
 if ( $run_report ) {
+    # XXX GetHoldsQueueItems() does not support $itemtypeslimit!
     my $items = GetHoldsQueueItems($branchlimit, $itemtypeslimit);
     $template->param(
         branch     => $branchlimit,
@@ -76,36 +77,5 @@ $template->param(
    itemtypeloop => \@itemtypesloop,
 );
 
-sub GetHoldsQueueItems {
-	my ($branchlimit,$itemtypelimit) = @_;
-	my $dbh = C4::Context->dbh;
-
-    my @bind_params = ();
-	my $query = q/SELECT tmp_holdsqueue.*, biblio.author, items.ccode, items.location, items.enumchron, items.cn_sort, biblioitems.publishercode,biblio.copyrightdate,biblioitems.publicationyear,biblioitems.pages,biblioitems.size,biblioitems.publicationyear,biblioitems.isbn,items.copynumber
-                  FROM tmp_holdsqueue
-                       JOIN biblio      USING (biblionumber)
-				  LEFT JOIN biblioitems USING (biblionumber)
-                  LEFT JOIN items       USING (  itemnumber)
-                /;
-    if ($branchlimit) {
-	    $query .=" WHERE tmp_holdsqueue.holdingbranch = ?";
-        push @bind_params, $branchlimit;
-    }
-    $query .= " ORDER BY ccode, location, cn_sort, author, title, pickbranch, reservedate";
-	my $sth = $dbh->prepare($query);
-	$sth->execute(@bind_params);
-	my $items = [];
-    while ( my $row = $sth->fetchrow_hashref ){
-	$row->{reservedate} = format_date($row->{reservedate});
-	my $record = GetMarcBiblio($row->{biblionumber});
-    if ($record){
-        $row->{subtitle} = GetRecordValue('subtitle',$record,'')->[0]->{subfield};
-	    $row->{parts} = GetRecordValue('parts',$record,'')->[0]->{subfield};
-	    $row->{numbers} = GetRecordValue('numbers',$record,'')->[0]->{subfield};
-	}
-        push @$items, $row;
-    }
-    return $items;
-}
 # writing the template
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 69304e1..b620800 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -2808,6 +2808,22 @@ CREATE TABLE `fieldmapping` ( -- koha to keyword mapping
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
+-- Table structure for table `transport_cost`
+--
+
+DROP TABLE IF EXISTS transport_cost;
+CREATE TABLE transport_cost (
+      frombranch varchar(10) NOT NULL,
+      tobranch varchar(10) NOT NULL,
+      cost decimal(6,2) NOT NULL,
+      disable_transfer tinyint(1) NOT NULL DEFAULT 0,
+      CHECK ( frombranch <> tobranch ), -- a dud check, mysql does not support that
+      PRIMARY KEY (frombranch, tobranch),
+      CONSTRAINT transport_cost_ibfk_1 FOREIGN KEY (frombranch) REFERENCES branches (branchcode) ON DELETE CASCADE ON UPDATE CASCADE,
+      CONSTRAINT transport_cost_ibfk_2 FOREIGN KEY (tobranch) REFERENCES branches (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+--
 -- Table structure for table `biblioimages`
 --
 
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 430585a..d0bf8f0 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -317,6 +317,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch|patronhomebranch|checkoutbranch|null','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('UseTransportCostMatrix',0,"Use Transport Cost Matrix when filling holds",'','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.|do not ask for confirmation.', 'Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index c6b6063..88596fa 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -5684,6 +5684,28 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+
+
+
+$DBversion = "3.09.00.XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('UseTransportCostMatrix',0,'Use Transport Cost Matrix when filling holds','','YesNo')");
+
+ $dbh->do("CREATE TABLE `transport_cost` (
+              `frombranch` varchar(10) NOT NULL,
+              `tobranch` varchar(10) NOT NULL,
+              `cost` decimal(6,2) NOT NULL,
+              `disable_transfer` tinyint(1) NOT NULL DEFAULT 0,
+              CHECK ( `frombranch` <> `tobranch` ), -- a dud check, mysql does not support that
+              PRIMARY KEY (`frombranch`, `tobranch`),
+              CONSTRAINT `transport_cost_ibfk_1` FOREIGN KEY (`frombranch`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
+              CONSTRAINT `transport_cost_ibfk_2` FOREIGN KEY (`tobranch`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE
+          ) ENGINE=InnoDB DEFAULT CHARSET=utf8");
+
+    print "Upgrade to $DBversion done (creating `transport_cost` table; adding UseTransportCostMatrix systempref, in circulation)\n";
+    SetVersion ($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
index 3906c46..6ceb6d7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
@@ -50,6 +50,8 @@
     <dd>Define extended attributes (identifiers and statistical categories) for patron records</dd>
     <dt><a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">Library transfer limits</a></dt>
 	<dd>Limit the ability to transfer items between libraries based on the library sending, the library receiving, and the item type involved. These rules only go into effect if the preference UseBranchTransferLimits is set to ON.</dd>
+    <dt><a href="/cgi-bin/koha/admin/transport-cost-matrix.pl">Transport Cost Matrix</a></dt>
+	<dd>Define transport costs between branches</dd>
     <dt><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">Item circulation alerts</a></dt>
 	<dd>Define rules for check-in and checkout notifications for combinations of libraries, patron categories, and item types</dd>
     <dt><a href="/cgi-bin/koha/admin/cities.pl">Cities and towns</a></dt>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index a758b19..81b40b1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -171,6 +171,12 @@ Circulation:
                   itemtype: item type
             - .
         -
+            - pref: UseTransportCostMatrix
+              choices:
+                  yes: Use
+                  no: "Don't use"
+            - Transport Cost Matrix for calculating optimal holds filling between branches.
+        -
             - Use the checkout and fines rules of
             - pref: CircControl
               type: choice
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
new file mode 100644
index 0000000..8d12419
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
@@ -0,0 +1,131 @@
+[% INCLUDE 'doc-head-open.inc' %]
+<title>Koha &rsaquo; Administration &rsaquo; Transport Cost Matrix</title>
+[% INCLUDE 'doc-head-close.inc' %]
+
+<script type="text/javascript">
+//<![CDATA[
+function check_transport_cost(e) {
+    var val = e.value;
+    if (val && val != '' && !isNaN(parseFloat(val)) && val >= 0.0) {
+        return;
+    }
+    alert("Cost must be expressed as a decimal number >= 0");
+}
+function disable_transport_cost_chg(e, cost_id) {
+    disable_transport_cost(cost_id, e.checked);
+}
+function disable_transport_cost(cost_id, disable) {
+    if (disable) {
+        $('#celldiv_'+cost_id).find('input[type=text]').attr("disabled","disabled").addClass('disabled-transfer');
+    } else {
+        $('#celldiv_'+cost_id).find('input:disabled').removeAttr("disabled").removeClass('disabled-transfer');
+    }
+}
+function enable_cost_input(cost_id) {
+    var cell = $('#celldiv_'+cost_id);
+    var cost = $(cell).text();
+    var disabled = $(cell).hasClass('disabled-transfer');
+    $(cell).removeClass('disabled-transfer');
+
+    $('#celldiv_'+cost_id).html(
+        '<input type="text" name="cost_'+cost_id+'" onblur="check_transport_cost(this);" size="4" value="'+$.trim(cost)+'" />'+
+        '<br/>Disable <input name="disable_'+cost_id+'" value="1" onchange="disable_transport_cost_chg(this, \''+cost_id+'\');" type="checkbox" '+(disabled ? 'checked' : '')+' />'
+    );
+    disable_transport_cost(cost_id, disabled);
+}
+
+function form_submit (f) {
+    $(f).find('input:disabled').removeAttr("disabled");
+    return true;
+}
+
+$(document).ready(function() {
+    show_transport_cost_matrix([% IF UseTransportCostMatrix %]true[% ELSE %]false[% END %]);
+});
+//]]>
+</script>
+<style type="text/css">
+.disabled-transfer {
+    background-color: red;
+}
+.errors {
+    color: red;
+}
+</style>
+
+</head>
+<body>
+[% INCLUDE 'header.inc' %]
+[% INCLUDE 'cat-search.inc' %]
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Transport Cost Matrix</div>
+
+<div id="doc3" class="yui-t1">
+
+<div id="bd">
+    <div id="yui-main">
+    <div class="yui-b">
+    <h1 class="parameters">
+            Defining transport costs between libraries
+    </h1>
+[% IF ( WARNING_transport_cost_matrix_off ) %]
+<div class="dialog message">Because the "UseTransportCostMatrix" system preference is currently not enabled, Transport Cost Matrix is not being used.  Go <a href="/cgi-bin/koha/admin/preferences.pl?op=search&amp;searchfield=UseTransportCostMatrix">here</a> if you wish to enable this feature.</div>
+[% END %]
+
+    <div class="container">
+        <form method="post" action="?" onSubmit="return form_submit(this);">
+            <input type="hidden" name="op" value="set-cost-matrix" />
+            <div id="transport-cost-matrix">
+                <div class="help">
+                    <p>Costs are decimal values 0 to some arbitrarymax value (1 or 100), 0 being minimum (no) cost.</p>
+                    <p>Red cells signify no transfer allowed</p>
+                    <p>Click on the cell to edit</p>
+                </div>
+                <ul class="errors" %]>
+                [% FOR e IN errors %]
+                    <li>[% e %]</li>
+                [% END %]
+                </ul>
+                <table>
+                    <tr>
+                        <th>From \ To</th>
+                [% FOR b IN branchloop %]
+                        <th>[% b.name %]</th>
+                [% END %]
+                    <tr>
+                [% FOR bf IN branchfromloop %]
+                    <tr>
+                        <th>[% bf.name %]</th>
+                    [% FOR bt IN bf.branchtoloop %]
+                        <td>
+                        [% IF bt.skip %]
+                            &nbsp;
+                        [% ELSE %]
+                            [% IF bt.disabled %]
+                            <div id="celldiv_[% bt.id %]" class="disabled-transfer">
+                            [% ELSE %]
+                            <div id="celldiv_[% bt.id %]">
+                            [% END %]
+                            <div onclick="enable_cost_input('[% bt.id %]');">[% bt.disabled ? '&nbsp;' : bt.value %]</div>
+                            <input type="hidden" name="cost_[% bt.id %]" value="[% bt.value %]" />
+                            [% IF bt.disabled %]
+                            <input type="hidden" name="disable_[% bt.id %]" value="1" />
+                            [% END %]
+                            </div>
+                        [% END %]
+                        </td>
+                    [% END %]
+                    </tr>
+                [% END %]
+                </table>
+            </div>
+            <input type="submit" value="Save" class="submit" />
+        </form>
+    </div>
+    </div>
+    </div>
+<div class="yui-b">
+[% INCLUDE 'admin-menu.inc' %]
+</div>
+</div>
+[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/misc/cronjobs/holds/build_holds_queue.pl b/misc/cronjobs/holds/build_holds_queue.pl
index d920c04..9ec9825 100755
--- a/misc/cronjobs/holds/build_holds_queue.pl
+++ b/misc/cronjobs/holds/build_holds_queue.pl
@@ -5,7 +5,6 @@
 #-----------------------------------
 # FIXME: add command-line options for verbosity and summary
 # FIXME: expand perldoc, explain intended logic
-# FIXME: refactor all subroutines into C4 for testability
 
 use strict;
 use warnings;
@@ -16,387 +15,7 @@ BEGIN {
     eval { require "$FindBin::Bin/../kohalib.pl" };
 }
 
-use C4::Context;
-use C4::Search;
-use C4::Items;
-use C4::Branch;
-use C4::Circulation;
-use C4::Members;
-use C4::Biblio;
+use C4::HoldsQueue qw(CreateQueue);
 
-use List::Util qw(shuffle);
+CreateQueue();
 
-my $bibs_with_pending_requests = GetBibsWithPendingHoldRequests();
-
-my $dbh   = C4::Context->dbh;
-$dbh->do("DELETE FROM tmp_holdsqueue");  # clear the old table for new info
-$dbh->do("DELETE FROM hold_fill_targets");
-
-my $total_bibs            = 0;
-my $total_requests        = 0;
-my $total_available_items = 0;
-my $num_items_mapped      = 0;
-
-my @branches_to_use = _get_branches_to_pull_from();
-
-foreach my $biblionumber (@$bibs_with_pending_requests) {
-    $total_bibs++;
-    my $hold_requests   = GetPendingHoldRequestsForBib($biblionumber);
-    my $available_items = GetItemsAvailableToFillHoldRequestsForBib($biblionumber, @branches_to_use);
-    $total_requests        += scalar(@$hold_requests);
-    $total_available_items += scalar(@$available_items);
-    my $item_map = MapItemsToHoldRequests($hold_requests, $available_items, @branches_to_use);
-
-    (defined($item_map)) or next;
-
-    my $item_map_size = scalar(keys %$item_map);
-    $num_items_mapped += $item_map_size;
-    CreatePicklistFromItemMap($item_map);
-    AddToHoldTargetMap($item_map);
-    if (($item_map_size < scalar(@$hold_requests  )) and
-        ($item_map_size < scalar(@$available_items))) {
-        # DOUBLE CHECK, but this is probably OK - unfilled item-level requests
-        # FIXME
-        #warn "unfilled requests for $biblionumber";
-        #warn Dumper($hold_requests), Dumper($available_items), Dumper($item_map);
-    }
-}
-
-exit 0;
-
-=head1 FUNCTIONS
-
-=head2 GetBibsWithPendingHoldRequests
-
-  my $biblionumber_aref = GetBibsWithPendingHoldRequests();
-
-Return an arrayref of the biblionumbers of all bibs
-that have one or more unfilled hold requests.
-
-=cut
-
-sub GetBibsWithPendingHoldRequests {
-    my $dbh = C4::Context->dbh;
-
-    my $bib_query = "SELECT DISTINCT biblionumber
-                     FROM reserves
-                     WHERE found IS NULL
-                     AND priority > 0
-                     AND reservedate <= CURRENT_DATE()
-                     AND suspend = 0
-                     ";
-    my $sth = $dbh->prepare($bib_query);
-
-    $sth->execute();
-    my $biblionumbers = $sth->fetchall_arrayref();
-
-    return [ map { $_->[0] } @$biblionumbers ];
-}
-
-=head2 GetPendingHoldRequestsForBib
-
-  my $requests = GetPendingHoldRequestsForBib($biblionumber);
-
-Returns an arrayref of hashrefs to pending, unfilled hold requests
-on the bib identified by $biblionumber.  The following keys
-are present in each hashref:
-
-    biblionumber
-    borrowernumber
-    itemnumber
-    priority
-    branchcode
-    reservedate
-    reservenotes
-    borrowerbranch
-
-The arrayref is sorted in order of increasing priority.
-
-=cut
-
-sub GetPendingHoldRequestsForBib {
-    my $biblionumber = shift;
-
-    my $dbh = C4::Context->dbh;
-
-    my $request_query = "SELECT biblionumber, borrowernumber, itemnumber, priority, reserves.branchcode, 
-                                reservedate, reservenotes, borrowers.branchcode AS borrowerbranch
-                         FROM reserves
-                         JOIN borrowers USING (borrowernumber)
-                         WHERE biblionumber = ?
-                         AND found IS NULL
-                         AND priority > 0
-                         AND reservedate <= CURRENT_DATE()
-                         AND suspend = 0
-                         ORDER BY priority";
-    my $sth = $dbh->prepare($request_query);
-    $sth->execute($biblionumber);
-
-    my $requests = $sth->fetchall_arrayref({});
-    return $requests;
-
-}
-
-=head2 GetItemsAvailableToFillHoldRequestsForBib
-
-  my $available_items = GetItemsAvailableToFillHoldRequestsForBib($biblionumber);
-
-Returns an arrayref of items available to fill hold requests
-for the bib identified by C<$biblionumber>.  An item is available
-to fill a hold request if and only if:
-
-    * it is not on loan
-    * it is not withdrawn
-    * it is not marked notforloan
-    * it is not currently in transit
-    * it is not lost
-    * it is not sitting on the hold shelf
-
-=cut
-
-sub GetItemsAvailableToFillHoldRequestsForBib {
-    my $biblionumber = shift;
-    my @branches_to_use = @_;
-
-    my $dbh = C4::Context->dbh;
-    my $items_query = "SELECT itemnumber, homebranch, holdingbranch, itemtypes.itemtype AS itype
-                       FROM items ";
-
-    if (C4::Context->preference('item-level_itypes')) {
-        $items_query .=   "LEFT JOIN itemtypes ON (itemtypes.itemtype = items.itype) ";
-    } else {
-        $items_query .=   "JOIN biblioitems USING (biblioitemnumber)
-                           LEFT JOIN itemtypes USING (itemtype) ";
-    }
-    $items_query .=   "WHERE items.notforloan = 0
-                       AND holdingbranch IS NOT NULL
-                       AND itemlost = 0
-                       AND wthdrawn = 0";
-    $items_query .=   " AND damaged = 0 " unless C4::Context->preference('AllowHoldsOnDamagedItems');
-    $items_query .=   " AND items.onloan IS NULL
-                       AND (itemtypes.notforloan IS NULL OR itemtypes.notforloan = 0)
-                       AND itemnumber NOT IN (
-                           SELECT itemnumber
-                           FROM reserves
-                           WHERE biblionumber = ?
-                           AND itemnumber IS NOT NULL
-                           AND (found IS NOT NULL OR priority = 0)
-                        )
-                       AND items.biblionumber = ?";
-    my @params = ($biblionumber, $biblionumber);
-    if ($#branches_to_use > -1) {
-        $items_query .= " AND holdingbranch IN (" . join (",", map { "?" } @branches_to_use) . ")";
-        push @params, @branches_to_use;
-    }
-    my $sth = $dbh->prepare($items_query);
-    $sth->execute(@params);
-
-    my $items = $sth->fetchall_arrayref({});
-    $items = [ grep { my @transfers = GetTransfers($_->{itemnumber}); $#transfers == -1; } @$items ]; 
-    map { my $rule = GetBranchItemRule($_->{homebranch}, $_->{itype}); $_->{holdallowed} = $rule->{holdallowed}; $rule->{holdallowed} != 0 } @$items;
-    return [ grep { $_->{holdallowed} != 0 } @$items ];
-}
-
-=head2 MapItemsToHoldRequests
-
-  MapItemsToHoldRequests($hold_requests, $available_items);
-
-=cut
-
-sub MapItemsToHoldRequests {
-    my $hold_requests = shift;
-    my $available_items = shift;
-    my @branches_to_use = @_;
-
-    # handle trival cases
-    return unless scalar(@$hold_requests) > 0;
-    return unless scalar(@$available_items) > 0;
-
-    # identify item-level requests
-    my %specific_items_requested = map { $_->{itemnumber} => 1 } 
-                                   grep { defined($_->{itemnumber}) }
-                                   @$hold_requests;
-
-    # group available items by itemnumber
-    my %items_by_itemnumber = map { $_->{itemnumber} => $_ } @$available_items;
-
-    # items already allocated
-    my %allocated_items = ();
-
-    # map of items to hold requests
-    my %item_map = ();
- 
-    # figure out which item-level requests can be filled    
-    my $num_items_remaining = scalar(@$available_items);
-    foreach my $request (@$hold_requests) {
-        last if $num_items_remaining == 0;
-
-        # is this an item-level request?
-        if (defined($request->{itemnumber})) {
-            # fill it if possible; if not skip it
-            if (exists $items_by_itemnumber{$request->{itemnumber}} and
-                not exists $allocated_items{$request->{itemnumber}}) {
-                $item_map{$request->{itemnumber}} = { 
-                    borrowernumber => $request->{borrowernumber},
-                    biblionumber => $request->{biblionumber},
-                    holdingbranch =>  $items_by_itemnumber{$request->{itemnumber}}->{holdingbranch},
-                    pickup_branch => $request->{branchcode},
-                    item_level => 1,
-                    reservedate => $request->{reservedate},
-                    reservenotes => $request->{reservenotes},
-                };
-                $allocated_items{$request->{itemnumber}}++;
-                $num_items_remaining--;
-            }
-        } else {
-            # it's title-level request that will take up one item
-            $num_items_remaining--;
-        }
-    }
-
-    # group available items by branch
-    my %items_by_branch = ();
-    foreach my $item (@$available_items) {
-        push @{ $items_by_branch{ $item->{holdingbranch} } }, $item unless exists $allocated_items{ $item->{itemnumber} };
-    }
-
-    # now handle the title-level requests
-    $num_items_remaining = scalar(@$available_items) - scalar(keys %allocated_items); 
-    foreach my $request (@$hold_requests) {
-        last if $num_items_remaining <= 0;
-        next if defined($request->{itemnumber}); # already handled these
-
-        # look for local match first
-        my $pickup_branch = $request->{branchcode};
-        if (exists $items_by_branch{$pickup_branch} and 
-            not ($items_by_branch{$pickup_branch}->[0]->{holdallowed} == 1 and 
-                 $request->{borrowerbranch} ne $items_by_branch{$pickup_branch}->[0]->{homebranch}) 
-           ) {
-            my $item = pop @{ $items_by_branch{$pickup_branch} };
-            delete $items_by_branch{$pickup_branch} if scalar(@{ $items_by_branch{$pickup_branch} }) == 0;
-            $item_map{$item->{itemnumber}} = { 
-                                                borrowernumber => $request->{borrowernumber},
-                                                biblionumber => $request->{biblionumber},
-                                                holdingbranch => $pickup_branch,
-                                                pickup_branch => $pickup_branch,
-                                                item_level => 0,
-                                                reservedate => $request->{reservedate},
-                                                reservenotes => $request->{reservenotes},
-                                             };
-            $num_items_remaining--;
-        } else {
-            my @pull_branches = ();
-            if ($#branches_to_use > -1) {
-                @pull_branches = @branches_to_use;
-            } else {
-                @pull_branches = sort keys %items_by_branch;
-            }
-            foreach my $branch (@pull_branches) {
-                next unless exists $items_by_branch{$branch} and
-                            not ($items_by_branch{$branch}->[0]->{holdallowed} == 1 and 
-                                $request->{borrowerbranch} ne $items_by_branch{$branch}->[0]->{homebranch});
-                my $item = pop @{ $items_by_branch{$branch} };
-                delete $items_by_branch{$branch} if scalar(@{ $items_by_branch{$branch} }) == 0;
-                $item_map{$item->{itemnumber}} = { 
-                                                    borrowernumber => $request->{borrowernumber},
-                                                    biblionumber => $request->{biblionumber},
-                                                    holdingbranch => $branch,
-                                                    pickup_branch => $pickup_branch,
-                                                    item_level => 0,
-                                                    reservedate => $request->{reservedate},
-                                                    reservenotes => $request->{reservenotes},
-                                                 };
-                $num_items_remaining--; 
-                last;
-            }
-        }
-    }
-    return \%item_map;
-}
-
-=head2 CreatePickListFromItemMap 
-
-=cut
-
-sub CreatePicklistFromItemMap {
-    my $item_map = shift;
-
-    my $dbh = C4::Context->dbh;
-
-    my $sth_load=$dbh->prepare("
-        INSERT INTO tmp_holdsqueue (biblionumber,itemnumber,barcode,surname,firstname,phone,borrowernumber,
-                                    cardnumber,reservedate,title, itemcallnumber,
-                                    holdingbranch,pickbranch,notes, item_level_request)
-        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-    ");
-
-    foreach my $itemnumber  (sort keys %$item_map) {
-        my $mapped_item = $item_map->{$itemnumber};
-        my $biblionumber = $mapped_item->{biblionumber}; 
-        my $borrowernumber = $mapped_item->{borrowernumber}; 
-        my $pickbranch = $mapped_item->{pickup_branch};
-        my $holdingbranch = $mapped_item->{holdingbranch};
-        my $reservedate = $mapped_item->{reservedate};
-        my $reservenotes = $mapped_item->{reservenotes};
-        my $item_level = $mapped_item->{item_level};
-
-        my $item = GetItem($itemnumber);
-        my $barcode = $item->{barcode};
-        my $itemcallnumber = $item->{itemcallnumber};
-
-        my $borrower = GetMember('borrowernumber'=>$borrowernumber);
-        my $cardnumber = $borrower->{'cardnumber'};
-        my $surname = $borrower->{'surname'};
-        my $firstname = $borrower->{'firstname'};
-        my $phone = $borrower->{'phone'};
-   
-        my $bib = GetBiblioData($biblionumber);
-        my $title = $bib->{title}; 
-
-        $sth_load->execute($biblionumber, $itemnumber, $barcode, $surname, $firstname, $phone, $borrowernumber,
-                           $cardnumber, $reservedate, $title, $itemcallnumber,
-                           $holdingbranch, $pickbranch, $reservenotes, $item_level);
-    }
-}
-
-=head2 AddToHoldTargetMap
-
-=cut
-
-sub AddToHoldTargetMap {
-    my $item_map = shift;
-
-    my $dbh = C4::Context->dbh;
-
-    my $insert_sql = q(
-        INSERT INTO hold_fill_targets (borrowernumber, biblionumber, itemnumber, source_branchcode, item_level_request)
-                               VALUES (?, ?, ?, ?, ?)
-    );
-    my $sth_insert = $dbh->prepare($insert_sql);
-
-    foreach my $itemnumber (keys %$item_map) {
-        my $mapped_item = $item_map->{$itemnumber};
-        $sth_insert->execute($mapped_item->{borrowernumber}, $mapped_item->{biblionumber}, $itemnumber,
-                             $mapped_item->{holdingbranch}, $mapped_item->{item_level});
-    }
-}
-
-=head2 _get_branches_to_pull_from
-
-Query system preferences to get ordered list of
-branches to use to fill hold requests.
-
-=cut
-
-sub _get_branches_to_pull_from {
-    my @branches_to_use = ();
-  
-    my $static_branch_list = C4::Context->preference("StaticHoldsQueueWeight");
-    if ($static_branch_list) {
-        @branches_to_use = map { s/^\s+//; s/\s+$//; $_; } split /,/, $static_branch_list;
-    }
-
-    @branches_to_use = shuffle(@branches_to_use) if  C4::Context->preference("RandomizeHoldsQueueWeight");
-
-    return @branches_to_use;
-}
diff --git a/t/db_dependent/HoldsQueue.t b/t/db_dependent/HoldsQueue.t
new file mode 100755
index 0000000..0198269
--- /dev/null
+++ b/t/db_dependent/HoldsQueue.t
@@ -0,0 +1,175 @@
+#!/usr/bin/perl
+
+# Test C4::HoldsQueue::CreateQueue() for both transport cost matrix
+# and StaticHoldsQueueWeight array (no RandomizeHoldsQueueWeight, no point)
+# Wraps tests in transaction that's rolled back, so no data is destroyed
+# MySQL WARNING: This makes sense only if your tables are InnoDB, otherwise
+# transactions are not supported and mess is left behind
+
+use strict;
+use warnings;
+use C4::Context;
+
+use Data::Dumper;
+
+use Test::More tests => 18;
+
+BEGIN {
+	use FindBin;
+	use lib $FindBin::Bin;
+	use_ok('C4::Reserves');
+	use_ok('C4::HoldsQueue');
+}
+
+my $TITLE = "Test Holds Queue XXX";
+# Pick a plausible borrower. Easier than creating one.
+my $BORROWER_QRY = <<EOQ;
+select *
+from borrowers
+where borrowernumber = (select max(borrowernumber) from issues)
+EOQ
+my $dbh = C4::Context->dbh;
+my $borrower = $dbh->selectrow_hashref($BORROWER_QRY);
+my $borrowernumber = $borrower->{borrowernumber};
+# Set special (for this test) branches
+my $borrower_branchcode = $borrower->{branchcode};
+my @other_branches = grep { $_ ne $borrower_branchcode } @{ $dbh->selectcol_arrayref("SELECT branchcode FROM branches") };
+my $least_cost_branch_code = pop @other_branches
+  or BAIL_OUT("No point testing only one branch...");
+my $itemtype = $dbh->selectrow_array("SELECT min(itemtype) FROM itemtypes WHERE notforloan = 0")
+  or BAIL_OUT("No adequate itemtype");
+
+# Start transaction
+$dbh->{AutoCommit} = 0;
+$dbh->{RaiseError} = 1;
+
+#Set up the stage
+# Sysprefs and cost matrix
+$dbh->do("UPDATE systempreferences SET value = ? WHERE variable = 'StaticHoldsQueueWeight'", undef,
+         join( ',', @other_branches, $borrower_branchcode, $least_cost_branch_code));
+$dbh->do("UPDATE systempreferences SET value = '0' WHERE variable = 'RandomizeHoldsQueueWeight'");
+
+$dbh->do("DELETE FROM transport_cost");
+my $transport_cost_insert_sth = $dbh->prepare("insert into transport_cost (frombranch, tobranch, cost) values (?, ?, ?)");
+# Favour $least_cost_branch_code
+$transport_cost_insert_sth->execute($borrower_branchcode, $least_cost_branch_code, 0.2);
+$transport_cost_insert_sth->execute($least_cost_branch_code, $borrower_branchcode, 0.2);
+my @b = @other_branches;
+while ( my $b1 = shift @b ) {
+    foreach my $b2 ($borrower_branchcode, $least_cost_branch_code, @b) {
+        $transport_cost_insert_sth->execute($b1, $b2, 0.5);
+        $transport_cost_insert_sth->execute($b2, $b1, 0.5);
+    }
+}
+
+
+# Loanable items - all possible combinations of homebranch and holdingbranch
+$dbh->do("INSERT INTO biblio (frameworkcode, author, title, datecreated)
+          VALUES             ('SER', 'Koha test', '$TITLE', '2011-02-01')");
+my $biblionumber = $dbh->selectrow_array("SELECT biblionumber FROM biblio WHERE title = '$TITLE'")
+  or BAIL_OUT("Cannot find newly created biblio record");
+$dbh->do("INSERT INTO biblioitems (biblionumber, marcxml, itemtype)
+          VALUES                  ($biblionumber, '', '$itemtype')");
+my $biblioitemnumber = $dbh->selectrow_array("SELECT biblioitemnumber FROM biblioitems WHERE biblionumber = $biblionumber")
+  or BAIL_OUT("Cannot find newly created biblioitems record");
+
+my $items_insert_sth = $dbh->prepare("INSERT INTO items (biblionumber, biblioitemnumber, barcode, homebranch, holdingbranch, notforloan, damaged, itemlost, wthdrawn, onloan, itype)
+                                      VALUES            ($biblionumber, $biblioitemnumber, ?, ?, ?, 0, 0, 0, 0, NULL, '$itemtype')"); # CURRENT_DATE - 3)");
+my $first_barcode = int(rand(1000000000000)); # XXX
+my $barcode = $first_barcode;
+foreach ( $borrower_branchcode, $least_cost_branch_code, @other_branches ) {
+    $items_insert_sth->execute($barcode++, $borrower_branchcode, $_);
+    $items_insert_sth->execute($barcode++, $_, $_);
+    $items_insert_sth->execute($barcode++, $_, $borrower_branchcode);
+}
+
+# Remove existing reserves, makes debugging easier
+$dbh->do("DELETE FROM reserves");
+my $constraint = undef;
+my $bibitems = undef;
+my $priority = 1;
+# Make a reserve
+AddReserve ( $borrower_branchcode, $borrowernumber, $biblionumber, $constraint, $bibitems,  $priority );
+#                           $resdate, $expdate, $notes, $title, $checkitem, $found
+$dbh->do("UPDATE reserves SET reservedate = reservedate - 1");
+
+# Tests
+my $use_cost_matrix_sth = $dbh->prepare("UPDATE systempreferences SET value = ? WHERE variable = 'UseTransportCostMatrix'");
+my $test_sth = $dbh->prepare("SELECT * FROM hold_fill_targets
+                              JOIN tmp_holdsqueue USING (borrowernumber, biblionumber, itemnumber)
+                              JOIN items USING (itemnumber)
+                              WHERE borrowernumber = $borrowernumber");
+
+# We have a book available homed in borrower branch, no point fiddling with AutomaticItemReturn
+test_queue ('take from homebranch',  0, $borrower_branchcode, $borrower_branchcode);
+test_queue ('take from homebranch',  1, $borrower_branchcode, $borrower_branchcode);
+
+$dbh->do("DELETE FROM tmp_holdsqueue");
+$dbh->do("DELETE FROM hold_fill_targets");
+$dbh->do("DELETE FROM issues WHERE itemnumber IN (SELECT itemnumber FROM items WHERE homebranch = '$borrower_branchcode' AND holdingbranch = '$borrower_branchcode')");
+$dbh->do("DELETE FROM items WHERE homebranch = '$borrower_branchcode' AND holdingbranch = '$borrower_branchcode'");
+# test_queue will flush
+$dbh->do("UPDATE systempreferences SET value = 1 WHERE variable = 'AutomaticItemReturn'");
+# Not sure how to make this test more difficult - holding branch does not matter
+test_queue ('take from holdingbranch AutomaticItemReturn on', 0, $borrower_branchcode, undef);
+test_queue ('take from holdingbranch AutomaticItemReturn on', 1, $borrower_branchcode, $least_cost_branch_code);
+
+$dbh->do("DELETE FROM tmp_holdsqueue");
+$dbh->do("DELETE FROM hold_fill_targets");
+$dbh->do("DELETE FROM issues WHERE itemnumber IN (SELECT itemnumber FROM items WHERE homebranch = '$borrower_branchcode')");
+$dbh->do("DELETE FROM items WHERE homebranch = '$borrower_branchcode'");
+$dbh->do("UPDATE systempreferences SET value = 0 WHERE variable = 'AutomaticItemReturn'");
+# We have a book available held in borrower branch
+test_queue ('take from holdingbranch', 0, $borrower_branchcode, $borrower_branchcode);
+test_queue ('take from holdingbranch', 1, $borrower_branchcode, $borrower_branchcode);
+
+$dbh->do("DELETE FROM tmp_holdsqueue");
+$dbh->do("DELETE FROM hold_fill_targets");
+$dbh->do("DELETE FROM issues WHERE itemnumber IN (SELECT itemnumber FROM items WHERE holdingbranch = '$borrower_branchcode')");
+$dbh->do("DELETE FROM items WHERE holdingbranch = '$borrower_branchcode'");
+# No book available in borrower branch, pick according to the rules
+# Frst branch from StaticHoldsQueueWeight
+test_queue ('take from lowest cost branch', 0, $borrower_branchcode, $other_branches[0]);
+test_queue ('take from lowest cost branch', 1, $borrower_branchcode, $least_cost_branch_code);
+my $queue = C4::HoldsQueue::GetHoldsQueueItems($least_cost_branch_code) || [];
+my $queue_item = $queue->[0];
+ok( $queue_item
+ && $queue_item->{pickbranch} eq $borrower_branchcode
+ && $queue_item->{holdingbranch} eq $least_cost_branch_code, "GetHoldsQueueItems" )
+  or diag( "Expected item for pick $borrower_branchcode, hold $least_cost_branch_code, got ".Dumper($queue_item) );
+
+# XXX All this tests are for borrower branch pick-up.
+# Maybe needs expanding to homebranch or holdingbranch pick-up.
+
+# Cleanup
+$dbh->rollback;
+
+exit;
+
+sub test_queue {
+    my ($test_name, $use_cost_matrix, $pick_branch, $hold_branch) = @_;
+
+    $test_name = "$test_name (".($use_cost_matrix ? "" : "don't ")."use cost matrix)";
+
+    $use_cost_matrix_sth->execute($use_cost_matrix);
+    C4::Context->clear_syspref_cache();
+    C4::HoldsQueue::CreateQueue();
+
+    my $results = $dbh->selectall_arrayref($test_sth, { Slice => {} }); # should be only one
+    my $r = $results->[0];
+
+    my $ok = is( $r->{pickbranch}, $pick_branch, "$test_name pick up branch");
+    $ok &&=  is( $r->{holdingbranch}, $hold_branch, "$test_name holding branch")
+      if $hold_branch;
+
+    diag( "Wrong pick-up/hold for first target (pick_branch, hold_branch, reserves, hold_fill_targets, tmp_holdsqueue): "
+        . Dumper ($pick_branch, $hold_branch, map dump_records($_), qw(reserves hold_fill_targets tmp_holdsqueue)) )
+      unless $ok;
+}
+
+sub dump_records {
+    my ($tablename) = @_;
+    return $dbh->selectall_arrayref("SELECT * from $tablename where borrowernumber = ?", { Slice => {} }, $borrowernumber);
+}
+
+
-- 
1.7.9.5


From colin.campbell at ptfs-europe.com  Wed Sep  5 14:12:23 2012
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Wed,  5 Sep 2012 13:12:23 +0100
Subject: [Koha-patches] [PATCH] Bug 8251 Do not try to debar patrons if
	returns are not overdue
Message-ID: <1346847143-28385-1-git-send-email-colin.campbell@ptfs-europe.com>

If a period of suspension is configured in the issuing rules
a calculation to debar the patron was called on all returns
It should be limited to overdue returns

Renamed _FixFineDaysOnReturn subroutine to _debar_user_on_return
which is more descriptive of its purpose
Removed some unnecessary or duplicated processing
Changed visibility of $today so it didnt need
calculating twice
Removed declaration of a datedue variable that is
never used
---
 C4/Circulation.pm | 89 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 49 insertions(+), 40 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 8647943..a46dd1d 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -1579,8 +1579,8 @@ sub AddReturn {
     }
 
     # case of a return of document (deal with issues and holdingbranch)
-    if ($doreturn) {
     my $today = DateTime->now( time_zone => C4::Context->tz() );
+    if ($doreturn) {
     my $datedue = $issue->{date_due};
         $borrower or warn "AddReturn without current borrower";
 		my $circControlBranch;
@@ -1590,7 +1590,6 @@ sub AddReturn {
             # FIXME: check issuedate > returndate, factoring in holidays
             #$circControlBranch = _GetCircControlBranch($item,$borrower) unless ( $item->{'issuedate'} eq C4::Dates->today('iso') );;
             $circControlBranch = _GetCircControlBranch($item,$borrower);
-        my $datedue = $issue->{date_due};
         $issue->{'overdue'} = DateTime->compare($issue->{'date_due'}, $today ) == -1 ? 1 : 0;
         }
 
@@ -1654,9 +1653,12 @@ sub AddReturn {
         my $fix = _FixOverduesOnReturn($borrowernumber, $item->{itemnumber}, $exemptfine, $dropbox);
         defined($fix) or warn "_FixOverduesOnReturn($borrowernumber, $item->{itemnumber}...) failed!";  # zero is OK, check defined
         
-        # fix fine days
-        my $debardate = _FixFineDaysOnReturn( $borrower, $item, $issue->{date_due} );
-        $messages->{'Debarred'} = $debardate if ($debardate);
+        if ( $issue->{overdue} && $issue->{date_due} ) {
+# fix fine days
+            my $debardate =
+              _debar_user_on_return( $borrower, $item, $issue->{date_due}, $today );
+            $messages->{Debarred} = $debardate if ($debardate);
+        }
     }
 
     # find reserves.....
@@ -1781,26 +1783,27 @@ sub MarkIssueReturned {
     $sth_del->execute($borrowernumber, $itemnumber);
 }
 
-=head2 _FixFineDaysOnReturn
+=head2 _debar_user_on_return
 
-    &_FixFineDaysOnReturn($borrower, $item, $datedue);
+    _debar_user_on_return($borrower, $item, $datedue, today);
 
 C<$borrower> borrower hashref
 
 C<$item> item hashref
 
-C<$datedue> date due
+C<$datedue> date due DateTime object
 
-Internal function, called only by AddReturn that calculate and update the user fine days, and debars him
+C<$today> DateTime object representing the return time
+
+Internal function, called only by AddReturn that calculates and updates
+ the user fine days, and debars him if necessary.
+
+Should only be called for overdue returns
 
 =cut
 
-sub _FixFineDaysOnReturn {
-    my ( $borrower, $item, $datedue ) = @_;
-    return unless ($datedue);
-    
-    my $dt_due =  dt_from_string( $datedue );
-    my $dt_today = DateTime->now( time_zone => C4::Context->tz() );
+sub _debar_user_on_return {
+    my ( $borrower, $item, $dt_due, $dt_today ) = @_;
 
     my $branchcode = _GetCircControlBranch( $item, $borrower );
     my $calendar = Koha::Calendar->new( branchcode => $branchcode );
@@ -1809,35 +1812,41 @@ sub _FixFineDaysOnReturn {
     my $deltadays = $calendar->days_between( $dt_due, $dt_today );
 
     my $circcontrol = C4::Context::preference('CircControl');
-    my $issuingrule = GetIssuingRule( $borrower->{categorycode}, $item->{itype}, $branchcode );
-    my $finedays    = $issuingrule->{finedays};
-    my $unit        = $issuingrule->{lengthunit};
-
-    # exit if no finedays defined
-    return unless $finedays;
-    # finedays is in days, so hourly loans must multiply by 24
-    # thus 1 hour late equals 1 day suspension * finedays rate
-    $finedays       = $finedays * 24 if ($unit eq 'hours');
-
-    # grace period is measured in the same units as the loan
-    my $grace = DateTime::Duration->new( $unit => $issuingrule->{firstremind} );
-
-    if ( ( $deltadays - $grace )->is_positive ) { # you can't compare DateTime::Durations with logical operators
-        my $new_debar_dt = $dt_today->clone()->add_duration( $deltadays * $finedays );
-        my $borrower_debar_dt = dt_from_string( $borrower->{debarred} );
-        # check to see if the current debar date is a valid date
-        if ( $borrower->{debarred} && $borrower_debar_dt ) {
-        # if so, is it before the new date?  update only if true
-            if ( DateTime->compare( $borrower_debar_dt, $new_debar_dt ) == -1 ) {
-                C4::Members::DebarMember( $borrower->{borrowernumber}, $new_debar_dt->ymd() );
-                return $new_debar_dt->ymd();
+    my $issuingrule =
+      GetIssuingRule( $borrower->{categorycode}, $item->{itype}, $branchcode );
+    my $finedays = $issuingrule->{finedays};
+    my $unit     = $issuingrule->{lengthunit};
+
+    if ($finedays) {
+
+        # finedays is in days, so hourly loans must multiply by 24
+        # thus 1 hour late equals 1 day suspension * finedays rate
+        $finedays = $finedays * 24 if ( $unit eq 'hours' );
+
+        # grace period is measured in the same units as the loan
+        my $grace =
+          DateTime::Duration->new( $unit => $issuingrule->{firstremind} );
+        if ( $deltadays->subtract($grace)->is_positive() ) {
+
+            my $new_debar_dt =
+              $dt_today->clone()->add_duration( $deltadays * $finedays );
+            if ( $borrower->{debarred} ) {
+                my $borrower_debar_dt = dt_from_string( $borrower->{debarred} );
+
+                # Update patron only if new date > old
+                if ( DateTime->compare( $borrower_debar_dt, $new_debar_dt ) !=
+                    -1 )
+                {
+                    return;
+                }
+
             }
-        # if the borrower's debar date is not set or valid, debar them
-        } else {
-            C4::Members::DebarMember( $borrower->{borrowernumber}, $new_debar_dt->ymd() );
+            C4::Members::DebarMember( $borrower->{borrowernumber},
+                $new_debar_dt->ymd() );
             return $new_debar_dt->ymd();
         }
     }
+    return;
 }
 
 =head2 _FixOverduesOnReturn
-- 
1.7.12.146.g16d26b1


From colin.campbell at ptfs-europe.com  Wed Sep  5 15:11:39 2012
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Wed,  5 Sep 2012 14:11:39 +0100
Subject: [Koha-patches] [PATCH] Bug 8727 Minor stylistic change to help text
Message-ID: <1346850699-28859-1-git-send-email-colin.campbell@ptfs-europe.com>

indexing not indexation
some minor grammatical changes
---
 misc/migration_tools/rebuild_zebra_sliced.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/misc/migration_tools/rebuild_zebra_sliced.sh b/misc/migration_tools/rebuild_zebra_sliced.sh
index f1b73f9..3874d08 100755
--- a/misc/migration_tools/rebuild_zebra_sliced.sh
+++ b/misc/migration_tools/rebuild_zebra_sliced.sh
@@ -5,9 +5,9 @@ usage() {
     cat <<EOF
 $scriptname
 
-Index Koha records by chunks. It is useful when some record causes errors and
-stop the indexation process. With this script, if indexation of one chunk fails,
-chunk is splitted in two or more chunks, and indexation continue on these chunks.
+Index Koha records by chunks. It is useful when a record causes errors and
+stops the indexing process. With this script, if indexing of one chunk fails,
+ithat chunk is split into two or more chunks, and indexing continues on these chunks.
 rebuild_zebra.pl is called only once to export records. Splitting and indexing
 is handled by this script (using yaz-marcdump and zebraidx).
 
-- 
1.7.12.146.g16d26b1


From oleonard at myacpl.org  Wed Sep  5 18:34:17 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed,  5 Sep 2012 12:34:17 -0400
Subject: [Koha-patches] [PATCH] Bug 8382 [Follow-up] It is not possible to
	cancel an order when receiving on a filtered page in parcel.pl
Message-ID: <1346862857-17383-1-git-send-email-oleonard@myacpl.org>

In order to be valid XHTML ampersands must be encoded ("&amp;").
---
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
index 1b6543a..23a7866 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -392,7 +392,7 @@
         <input type="hidden" value="[% invoice %]" name="invoice" />
         <input type="hidden" value="[% invoicedatereceived %]" name="datereceived" />
         <input type="submit" value="Filter" />
-        <a href="/cgi-bin/koha/acqui/parcel.pl?booksellerid=[% booksellerid %]&invoice=[% invoice %]&op=new&datereceived=[% formatteddatereceived %]">Clear</a>
+        <a href="/cgi-bin/koha/acqui/parcel.pl?booksellerid=[% booksellerid %]&amp;invoice=[% invoice %]&amp;op=new&amp;datereceived=[% formatteddatereceived %]">Clear</a>
 		</fieldset>
 
 
-- 
1.7.9.5


From matted-34813 at mypacks.net  Wed Sep  5 18:48:37 2012
From: matted-34813 at mypacks.net (matted-34813 at mypacks.net)
Date: Wed, 5 Sep 2012 11:48:37 -0500 (GMT-05:00)
Subject: [Koha-patches]
	adjust-Reserves.t-test-for-resdate-and-expdate-and-t.patch
Message-ID: <1618134.1346863717545.JavaMail.root@wamui-hunyo.atl.sa.earthlink.net>

This patch adds the resdate and expdate argument to the AddReserve test.

I also adjusted it to create a bilio, and item for that biblio and delete them at the end of the test, so its not dependent on external test data.

It gets rid of Illegal metric data warning from misaligned arguments.


TestPlan:
koha at biblio:~/kohaclone$ prove t/db_dependent/Reserves.t 
t/db_dependent/Reserves.t .. 1/4 # 
# Creating biblio instance for testing.
# Creating item instance for testing.
# Deleting item testing instance.
# Deleting biblio testing instance.
t/db_dependent/Reserves.t .. ok   
All tests successful.
Files=1, Tests=4,  2 wallclock secs ( 0.03 usr  0.01 sys +  0.59 cusr  0.04 csys =  0.67 CPU)
Result: PASS

From matted-34813 at mypacks.net  Wed Sep  5 18:35:42 2012
From: matted-34813 at mypacks.net (wajasu)
Date: Wed, 5 Sep 2012 11:35:42 -0500
Subject: [PATCH] adjust Reserves.t test for resdate and expdate and test
 setup/teardown
Message-ID: <mailman.62.1346862945.15477.koha-patches@lists.koha-community.org>

---
 t/db_dependent/Reserves.t | 59 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 43 insertions(+), 16 deletions(-)

diff --git a/t/db_dependent/Reserves.t b/t/db_dependent/Reserves.t
index ca4d42e..d3428b3 100755
--- a/t/db_dependent/Reserves.t
+++ b/t/db_dependent/Reserves.t
@@ -5,6 +5,9 @@ use warnings;
 use C4::Branch;
 
 use Test::More tests => 4;
+use MARC::Record;
+use C4::Biblio;
+use C4::Items;
 
 BEGIN {
 	use FindBin;
@@ -12,6 +15,20 @@ BEGIN {
 	use_ok('C4::Reserves');
 }
 
+# Setup Test------------------------
+# Helper biblio.
+diag("\nCreating biblio instance for testing.");
+my ($bibnum, $title, $bibitemnum) = create_helper_biblio();
+
+# Helper item for that biblio.
+diag("Creating item instance for testing.");
+my ($item_bibnum, $item_bibitemnum, $itemnumber) = AddItem({ homebranch => 'CPL', holdingbranch => 'CPL' } , $bibnum);
+
+# Modify item; setting barcode.
+my $testbarcode = '97531';
+ModItem({ barcode => $testbarcode }, $bibnum, $itemnumber);
+
+# Get a borrower
 my $dbh = C4::Context->dbh;
 my $query = qq/SELECT borrowernumber
     FROM   borrowers
@@ -20,27 +37,16 @@ my $sth = $dbh->prepare($query);
 $sth->execute;
 my $borrower = $sth->fetchrow_hashref;
 
-$query = qq/SELECT biblionumber, title, itemnumber, barcode
-    FROM biblio
-    LEFT JOIN items USING (biblionumber)
-    WHERE barcode <> ""
-    AND barcode IS NOT NULL
-    LIMIT  1/;
-$sth = $dbh->prepare($query);
-$sth->execute;
-my $biblio = $sth->fetchrow_hashref;
-
-
 my $borrowernumber = $borrower->{'borrowernumber'};
-my $biblionumber   = $biblio->{'biblionumber'};
-my $itemnumber     = $biblio->{'itemnumber'};
-my $barcode        = $biblio->{'barcode'};
+my $biblionumber   = $bibnum;
+my $barcode        = $testbarcode;
 
 my $constraint     = 'a';
 my $bibitems       = '';
 my $priority       = '1';
+my $resdate        = undef;
+my $expdate        = undef;
 my $notes          = '';
-my $title          = $biblio->{'title'};
 my $checkitem      = undef;
 my $found          = undef;
 
@@ -48,7 +54,7 @@ my @branches = GetBranchesLoop();
 my $branch = $branches[0][0]{value};
 
 AddReserve($branch,    $borrowernumber, $biblionumber,
-        $constraint, $bibitems,  $priority,       $notes,
+        $constraint, $bibitems,  $priority, $resdate, $expdate, $notes,
         $title,      $checkitem, $found);
         
 my ($status, $reserve, $all_reserves) = CheckReserves($itemnumber, $barcode);
@@ -60,3 +66,24 @@ ok($status eq "Reserved", "CheckReserves Test 2");
 ($status, $reserve, $all_reserves) = CheckReserves(undef, $barcode);
 ok($status eq "Reserved", "CheckReserves Test 3");
 
+
+# Teardown Test---------------------
+# Delete item.
+diag("Deleting item testing instance.");
+DelItem($dbh, $bibnum, $itemnumber);
+
+# Delete helper Biblio.
+diag("Deleting biblio testing instance.");
+DelBiblio($bibnum);
+
+# Helper method to set up a Biblio.
+sub create_helper_biblio {
+    my $bib = MARC::Record->new();
+    my $title = 'Silence in the library';
+    $bib->append_fields(
+        MARC::Field->new('100', ' ', ' ', a => 'Moffat, Steven'),
+        MARC::Field->new('245', ' ', ' ', a => $title),
+    );
+    return ($bibnum, $title, $bibitemnum) = AddBiblio($bib, '');
+}
+
-- 
1.7.11.4


------=_Part_2868_5036580.1346863717269--


From nengard at bywatersolutions.com  Wed Sep  5 21:14:49 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Wed,  5 Sep 2012 15:14:49 -0400
Subject: [Koha-patches] [PATCH] Bug 6716: Update borrowers tables altaddress
	definiton
Message-ID: <1346872489-2192-1-git-send-email-nengard@bywatersolutions.com>

The comment on the altcontactaddress3 said it was the 3rd address line
but in reality it was the city. This fixes the documentation of
that field
---
 installer/data/mysql/kohastructure.sql |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 91d42a2..e1ef469 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -256,7 +256,7 @@ CREATE TABLE `borrowers` ( -- this table includes information about your patrons
   `altcontactsurname` varchar(255) default NULL, -- surname or last name of the alternate contact for the patron/borrower
   `altcontactaddress1` varchar(255) default NULL, -- the first address line for the alternate contact for the patron/borrower
   `altcontactaddress2` varchar(255) default NULL, -- the second address line for the alternate contact for the patron/borrower
-  `altcontactaddress3` varchar(255) default NULL, -- the third address line for the alternate contact for the patron/borrower
+  `altcontactaddress3` varchar(255) default NULL, -- the city for the alternate contact for the patron/borrower
   `altcontactstate` text default NULL, -- the city and state for the alternate contact for the patron/borrower
   `altcontactzipcode` varchar(50) default NULL, -- the zipcode for the alternate contact for the patron/borrower
   `altcontactcountry` text default NULL, -- the country for the alternate contact for the patron/borrower
@@ -727,7 +727,7 @@ CREATE TABLE `deletedborrowers` ( -- stores data related to the patrons/borrower
   `altcontactsurname` varchar(255) default NULL, -- surname or last name of the alternate contact for the patron/borrower
   `altcontactaddress1` varchar(255) default NULL, -- the first address line for the alternate contact for the patron/borrower
   `altcontactaddress2` varchar(255) default NULL, -- the second address line for the alternate contact for the patron/borrower
-  `altcontactaddress3` varchar(255) default NULL, -- the third address line for the alternate contact for the patron/borrower
+  `altcontactaddress3` varchar(255) default NULL, -- the city for the alternate contact for the patron/borrower
   `altcontactstate` text default NULL, -- the city and state for the alternate contact for the patron/borrower
   `altcontactzipcode` varchar(50) default NULL, -- the zipcode for the alternate contact for the patron/borrower
   `altcontactcountry` text default NULL, -- the country for the alternate contact for the patron/borrower
-- 
1.7.2.3


From srdjan at catalyst.net.nz  Thu Sep  6 01:53:21 2012
From: srdjan at catalyst.net.nz (Srdjan)
Date: Thu,  6 Sep 2012 11:53:21 +1200
Subject: [Koha-patches] [PATCH] bug_8034: Restored network printer
	maintenance and selection
In-Reply-To: <bug 8034>
References: <bug 8034>
Message-ID: <1346889201-6733-1-git-send-email-srdjan@catalyst.net.nz>

This patch is just for restoring printer maintenance and selection, not
for priting itself. It is just a preparation step.

* Added UsePrintQueues syspref. If set to No, no printer info will be
  displayed/used
* Database changes:
- printers table PRIMARY KEY is now printqueue. It is more natural. We
  should really have a synthetic id, but printqueue is good enough
- branches.branchprinter is a FOREIGN KEY to printers.printqueue
* Created C4::Auth::get_user_printer() function that will return
  appropriate printer. In order of preference:
- session selected
- logged in branch branchprinter
* Moved printer functions to C4::Printer
* Restored printer maint/selection in admin zone UsePrintQueues
  permitting
* Restored printer selection in circ/selectbranchprinter.pl
  UsePrintQueues permitting

Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
---
 C4/Auth.pm                                         |   49 +++++--
 C4/Context.pm                                      |    2 +-
 C4/Koha.pm                                         |   40 ------
 C4/Printer.pm                                      |  152 ++++++++++++++++++++
 admin/branches.pl                                  |   30 ++--
 admin/printers.pl                                  |   39 ++---
 circ/circulation.pl                                |   12 +-
 circ/returns.pl                                    |    8 --
 circ/selectbranchprinter.pl                        |   49 ++++---
 installer/data/mysql/kohastructure.sql             |   16 ++-
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |   12 ++
 .../intranet-tmpl/prog/en/includes/header.inc      |    3 +
 .../prog/en/modules/admin/admin-home.tt            |    4 +-
 .../prog/en/modules/admin/branches.tt              |   20 +--
 .../en/modules/admin/preferences/circulation.pref  |    6 +
 .../prog/en/modules/admin/printers.tt              |   13 +-
 .../prog/en/modules/circ/circulation.tt            |    2 -
 .../prog/en/modules/circ/selectbranchprinter.tt    |    5 +-
 t/db_dependent/lib/KohaTest/Koha.pm                |    2 -
 t/db_dependent/lib/KohaTest/Printer.pm             |   26 ++++
 21 files changed, 330 insertions(+), 161 deletions(-)
 create mode 100644 C4/Printer.pm
 create mode 100644 t/db_dependent/lib/KohaTest/Printer.pm

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 59c9955..71abfb3 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -28,6 +28,7 @@ require Exporter;
 use C4::Context;
 use C4::Templates;    # to get the template
 use C4::Branch; # GetBranches
+use C4::Printer qw(GetPrinterDetails);
 use C4::VirtualShelves;
 use POSIX qw/strftime/;
 use List::MoreUtils qw/ any /;
@@ -46,7 +47,8 @@ BEGIN {
     $debug       = $ENV{DEBUG};
     @ISA         = qw(Exporter);
     @EXPORT      = qw(&checkauth &get_template_and_user &haspermission &get_user_subpermissions);
-    @EXPORT_OK   = qw(&check_api_auth &get_session &check_cookie_auth &checkpw &get_all_subpermissions &get_user_subpermissions);
+    @EXPORT_OK   = qw(&check_api_auth &get_session &check_cookie_auth &checkpw
+                      &get_all_subpermissions &get_user_subpermissions &get_user_printer);
     %EXPORT_TAGS = ( EditPermissions => [qw(get_all_subpermissions get_user_subpermissions)] );
     $ldap        = C4::Context->config('useldapserver') || 0;
     $cas         = C4::Context->preference('casAuthentication');
@@ -310,6 +312,9 @@ sub get_template_and_user {
         $template->param(dateformat_iso => 1);
     }
 
+    my $userenv = C4::Context->userenv;
+    my $userenv_branch = $userenv ? $userenv->{"branch"} : undef;
+
     # these template parameters are set the same regardless of $in->{'type'}
     $template->param(
             "BiblioDefaultView".C4::Context->preference("BiblioDefaultView")         => 1,
@@ -317,9 +322,9 @@ sub get_template_and_user {
             GoogleJackets                => C4::Context->preference("GoogleJackets"),
             OpenLibraryCovers            => C4::Context->preference("OpenLibraryCovers"),
             KohaAdminEmailAddress        => "" . C4::Context->preference("KohaAdminEmailAddress"),
-            LoginBranchcode              => (C4::Context->userenv?C4::Context->userenv->{"branch"}:"insecure"),
-            LoginFirstname               => (C4::Context->userenv?C4::Context->userenv->{"firstname"}:"Bel"),
-            LoginSurname                 => C4::Context->userenv?C4::Context->userenv->{"surname"}:"Inconnu",
+            LoginBranchcode              => ($userenv?$userenv_branch:"insecure"),
+            LoginFirstname               => ($userenv?$userenv->{"firstname"}:"Bel"),
+            LoginSurname                 => $userenv?$userenv->{"surname"}:"Inconnu",
             TagsEnabled                  => C4::Context->preference("TagsEnabled"),
             hide_marc                    => C4::Context->preference("hide_marc"),
             item_level_itypes            => C4::Context->preference('item-level_itypes'),
@@ -344,7 +349,7 @@ sub get_template_and_user {
             IntranetNav                 => C4::Context->preference("IntranetNav"),
             IntranetmainUserblock       => C4::Context->preference("IntranetmainUserblock"),
             LibraryName                 => C4::Context->preference("LibraryName"),
-            LoginBranchname             => (C4::Context->userenv?C4::Context->userenv->{"branchname"}:"insecure"),
+            LoginBranchname             => ($userenv?$userenv->{"branchname"}:"insecure"),
             advancedMARCEditor          => C4::Context->preference("advancedMARCEditor"),
             canreservefromotherbranches => C4::Context->preference('canreservefromotherbranches'),
             intranetcolorstylesheet     => C4::Context->preference("intranetcolorstylesheet"),
@@ -364,6 +369,14 @@ sub get_template_and_user {
             AllowMultipleCovers         => C4::Context->preference('AllowMultipleCovers'),
             EnableBorrowerFiles         => C4::Context->preference('EnableBorrowerFiles'),
         );
+        if ( C4::Context->preference('UsePrintQueues') ) {
+            my $printer = get_user_printer();
+            my $printer_rec = $printer ? GetPrinterDetails($printer) : {};
+            $template->param(
+                UsePrintQueues          => 1,
+                PrinterName             => $printer_rec->{printername},
+            );
+        }
     }
     else {
         warn "template type should be OPAC, here it is=[" . $in->{'type'} . "]" unless ( $in->{'type'} eq 'opac' );
@@ -382,8 +395,8 @@ sub get_template_and_user {
         my $opac_name = '';
         if (($opac_search_limit =~ /branch:(\w+)/ && $opac_limit_override) || $in->{'query'}->param('limit') =~ /branch:(\w+)/){
             $opac_name = $1;   # opac_search_limit is a branch, so we use it.
-        } elsif (C4::Context->preference("SearchMyLibraryFirst") && C4::Context->userenv && C4::Context->userenv->{'branch'}) {
-            $opac_name = C4::Context->userenv->{'branch'};
+        } elsif (C4::Context->preference("SearchMyLibraryFirst") && $userenv_branch) {
+            $opac_name = $userenv_branch
         }
         $template->param(
             opaccolorstylesheet       => C4::Context->preference("opaccolorstylesheet"),
@@ -393,7 +406,7 @@ sub get_template_and_user {
             CalendarFirstDayOfWeek      => (C4::Context->preference("CalendarFirstDayOfWeek") eq "Sunday")?0:1,
             LibraryName               => "" . C4::Context->preference("LibraryName"),
             LibraryNameTitle          => "" . $LibraryNameTitle,
-            LoginBranchname           => C4::Context->userenv?C4::Context->userenv->{"branchname"}:"",
+            LoginBranchname           => $userenv?$userenv->{"branchname"}:"",
             OPACAmazonCoverImages     => C4::Context->preference("OPACAmazonCoverImages"),
             OPACFRBRizeEditions       => C4::Context->preference("OPACFRBRizeEditions"),
             OpacHighlightedWords       => C4::Context->preference("OpacHighlightedWords"),
@@ -424,7 +437,7 @@ sub get_template_and_user {
             RequestOnOpac             => C4::Context->preference("RequestOnOpac"),
             'Version'                 => C4::Context->preference('Version'),
             hidelostitems             => C4::Context->preference("hidelostitems"),
-            mylibraryfirst            => (C4::Context->preference("SearchMyLibraryFirst") && C4::Context->userenv) ? C4::Context->userenv->{'branch'} : '',
+            mylibraryfirst            => (C4::Context->preference("SearchMyLibraryFirst") && $userenv) ? $userenv_branch : '',
             opaclayoutstylesheet      => "" . C4::Context->preference("opaclayoutstylesheet"),
             opacbookbag               => "" . C4::Context->preference("opacbookbag"),
             opaccredits               => "" . C4::Context->preference("opaccredits"),
@@ -1644,8 +1657,24 @@ sub getborrowernumber {
     return 0;
 }
 
+=head2 get_user_printer
+
+  $printer = get_user_printer();
+
+  Returns printer queue that is to be used for the logged in user
+
+=cut
+
+sub get_user_printer {
+    my $userenv = C4::Context->userenv or return;
+    if (my $printer = $userenv->{branchprinter}) {
+        return $printer;
+    }
+    my $branchname = $userenv->{branch} or return;
+    my $branch = GetBranchDetail($branchname) or return;
+    return $branch->{branchprinter};
+}
 
-END { }    # module clean-up code here (global destructor)
 1;
 __END__
 
diff --git a/C4/Context.pm b/C4/Context.pm
index 9ce6c74..717863f 100644
--- a/C4/Context.pm
+++ b/C4/Context.pm
@@ -998,7 +998,7 @@ sub userenv {
 =head2 set_userenv
 
   C4::Context->set_userenv($usernum, $userid, $usercnum, $userfirstname, 
-                  $usersurname, $userbranch, $userflags, $emailaddress);
+                  $usersurname, $userbranch, $userflags, $emailaddress, $branchprinter);
 
 Establish a hash of user environment variables.
 
diff --git a/C4/Koha.pm b/C4/Koha.pm
index 26106cf..1e1a412 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -39,7 +39,6 @@ BEGIN {
 	@EXPORT = qw(
 		&slashifyDate
 		&subfield_is_koha_internal_p
-		&GetPrinters &GetPrinter
 		&GetItemTypes &getitemtypeinfo
 		&GetCcodes
 		&GetSupportName &GetSupportList
@@ -600,45 +599,6 @@ sub getImageSets {
     return \@imagesets;
 }
 
-=head2 GetPrinters
-
-  $printers = &GetPrinters();
-  @queues = keys %$printers;
-
-Returns information about existing printer queues.
-
-C<$printers> is a reference-to-hash whose keys are the print queues
-defined in the printers table of the Koha database. The values are
-references-to-hash, whose keys are the fields in the printers table.
-
-=cut
-
-sub GetPrinters {
-    my %printers;
-    my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare("select * from printers");
-    $sth->execute;
-    while ( my $printer = $sth->fetchrow_hashref ) {
-        $printers{ $printer->{'printqueue'} } = $printer;
-    }
-    return ( \%printers );
-}
-
-=head2 GetPrinter
-
-  $printer = GetPrinter( $query, $printers );
-
-=cut
-
-sub GetPrinter ($$) {
-    my ( $query, $printers ) = @_;    # get printer for this query from printers
-    my $printer = $query->param('printer');
-    my %cookie = $query->cookie('userenv');
-    ($printer) || ( $printer = $cookie{'printer'} ) || ( $printer = '' );
-    ( $printers->{$printer} ) || ( $printer = ( keys %$printers )[0] );
-    return $printer;
-}
-
 =head2 getnbpages
 
 Returns the number of pages to display in a pagination bar, given the number
diff --git a/C4/Printer.pm b/C4/Printer.pm
new file mode 100644
index 0000000..fc4d326
--- /dev/null
+++ b/C4/Printer.pm
@@ -0,0 +1,152 @@
+#!/usr/bin/perl
+
+package C4::Printer;
+
+# Copyright 2012 Catalyst IT
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use strict;
+use warnings;
+
+use C4::Context;
+
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
+
+BEGIN {
+    $VERSION = 3.07.00.049;
+    require Exporter;
+    @ISA    = qw(Exporter);
+    @EXPORT = qw(
+    );
+    @EXPORT_OK = qw(
+        &GetPrinters &SearchPrinters &GetPrinterDetails
+        &AddPrinter &UpdatePrinter &DeletePrinter
+    );
+}
+
+=head1 NAME
+
+C4::Printer - functions that deal with printer selection
+
+=head1 SYNOPSIS
+
+  use C4::Printer;
+
+=head1 DESCRIPTION
+
+This module provides functions to select printer for slips etc.
+
+TODO: Move SQL from admin/printers.pl to this module
+
+=head1 FUNCTIONS
+
+=head2 GetPrinters
+
+  $printers = &GetPrinters();
+  @queues = keys %$printers;
+
+Returns information about existing printer queues.
+
+C<$printers> is a reference-to-hash whose keys are the print queues
+defined in the printers table of the Koha database. The values are
+references-to-hash, whose keys are the fields in the printers table.
+
+=cut
+
+sub GetPrinters {
+    my %printers;
+    my $dbh = C4::Context->dbh;
+    my $sth = $dbh->prepare("select * from printers");
+    $sth->execute;
+    while ( my $printer = $sth->fetchrow_hashref ) {
+        $printers{ $printer->{'printqueue'} } = $printer;
+    }
+    return ( \%printers );
+}
+
+=head2 SearchPrinters
+
+  $printers = SearchPrinters( $searchstring );
+
+=cut
+
+sub SearchPrinters {
+    my ($searchstring)=@_;
+    $searchstring=~ s/\'/\\\'/g;
+    my @data=split(' ',$searchstring);
+    my $sth = C4::Context->dbh->prepare("
+        SELECT * FROM printers 
+        WHERE (printername like ?) ORDER BY printername
+        ");
+    $sth->execute("$data[0]%");
+    return $sth->fetchall_arrayref({});
+}
+
+
+=head2 GetPrinterDetails
+
+  $printer_rec = GetPrinterDetails( $printqueue );
+
+=cut
+
+sub GetPrinterDetails {
+    my ( $printer ) = @_;
+    my $dbh = C4::Context->dbh;
+    my $printername = $dbh->selectrow_hashref('SELECT * FROM printers WHERE printqueue = ?', undef, $printer);
+    return $printername;
+}
+
+=head2 AddPrinter
+
+  AddPrinter( $data );
+
+=cut
+
+sub AddPrinter {
+    my ( $data ) = @_;
+    my $dbh = C4::Context->dbh;
+    $dbh->do("INSERT INTO printers (printername,printqueue,printtype) VALUES (?,?,?)", undef,
+        $data->{printername}, $data->{printqueue}, $data->{printtype});
+}
+
+=head2 UpdatePrinter
+
+  UpdatePrinter( $printqueue, $data );
+
+=cut
+
+sub UpdatePrinter {
+    my ( $printqueue, $data ) = @_;
+    my $dbh = C4::Context->dbh;
+    $dbh->do("UPDATE printers SET printername = ?, printtype = ? WHERE printqueue = ?", undef,
+        $data->{printername}, $data->{printtype}, $printqueue);
+}
+
+=head2 DeletePrinter
+
+  DeletePrinter( $printqueue );
+
+=cut
+
+sub DeletePrinter {
+    my ( $printqueue ) = @_;
+    my $dbh = C4::Context->dbh;
+    $dbh->do("DELETE FROM printers WHERE printqueue = ?", undef,
+        $printqueue);
+}
+
+1;
diff --git a/admin/branches.pl b/admin/branches.pl
index d172ea6..711fa0a 100755
--- a/admin/branches.pl
+++ b/admin/branches.pl
@@ -45,6 +45,7 @@ use C4::Context;
 use C4::Output;
 use C4::Koha;
 use C4::Branch;
+use C4::Printer qw(GetPrinters);
 
 # Fixed variables
 my $script_name = "/cgi-bin/koha/admin/branches.pl";
@@ -226,12 +227,9 @@ sub default {
 
 sub editbranchform {
     my ($branchcode,$innertemplate) = @_;
-    # initiate the scrolling-list to select the printers
-    my $printers = GetPrinters();
-    my @printerloop;
+
     my $data;
     my $oldprinter = "";
-
     if ($branchcode) {
         $data = GetBranchInfo($branchcode);
         $data = $data->[0];
@@ -241,15 +239,21 @@ sub editbranchform {
         _branch_to_template($data, $innertemplate);
     }
 
-    foreach my $thisprinter ( keys %$printers ) {
-        push @printerloop, {
-            value         => $thisprinter,
-            selected      => ( $oldprinter eq $printers->{$thisprinter} ),
-            branchprinter => $printers->{$thisprinter}->{'printqueue'},
-        };
+    if ( C4::Context->preference('UsePrintQueues') ) {
+        # initiate the scrolling-list to select the printers
+        my $printers = GetPrinters();
+        my @printerloop;
+        foreach my $thisprinter ( keys %$printers ) {
+            push @printerloop, {
+                value         => $thisprinter,
+                selected      => ( $oldprinter eq $printers->{$thisprinter} ),
+                branchprinter => $printers->{$thisprinter}->{'printername'},
+            };
+        }
+
+        $innertemplate->param( printerloop => \@printerloop );
     }
 
-    $innertemplate->param( printerloop => \@printerloop );
     # make the checkboxes.....
     #
     # We export a "categoryloop" array to the template, each element of which
@@ -308,6 +312,7 @@ sub branchinfotable {
 
     my ($branchcode,$innertemplate) = @_;
     my $branchinfo = $branchcode ? GetBranchInfo($branchcode) : GetBranchInfo();
+    my $printers = GetPrinters();
     my @loop_data = ();
     foreach my $branch (@$branchinfo) {
         #
@@ -367,6 +372,9 @@ sub branchinfotable {
         $row{'branch_name'} = $branch->{'branchname'};
         $row{'branch_code'} = $branch->{'branchcode'};
         $row{'value'}       = $branch->{'branchcode'};
+        if (my $printer = $branch->{'branchprinter'}) {
+            $row{'branchprintername'} = $printers->{$printer}->{'printername'};
+        }
 
         push @loop_data, \%row;
     }
diff --git a/admin/printers.pl b/admin/printers.pl
index c7e7492..1cce350 100755
--- a/admin/printers.pl
+++ b/admin/printers.pl
@@ -43,19 +43,7 @@ use CGI;
 use C4::Context;
 use C4::Output;
 use C4::Auth;
-
-sub StringSearch  {
-	my ($searchstring,$type)=@_;		# why bother with $type if we don't use it?!
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $sth = C4::Context->dbh->prepare("
-		SELECT printername,printqueue,printtype from printers 
-		WHERE (printername like ?) order by printername
-	");
-	$sth->execute("$data[0]%");
-	my $data=$sth->fetchall_arrayref({});
-	return (scalar(@$data),$data);
-}
+use C4::Printer qw(GetPrinterDetails SearchPrinters AddPrinter UpdatePrinter DeletePrinter);
 
 my $input = new CGI;
 my $searchfield=$input->param('searchfield');
@@ -89,33 +77,31 @@ if ($op eq 'add_form') {
 	#---- if primkey exists, it's a modify action, so read values to modify...
 	my $data;
 	if ($searchfield) {
-		my $sth=$dbh->prepare("SELECT printername,printqueue,printtype from printers where printername=?");
-		$sth->execute($searchfield);
-		$data=$sth->fetchrow_hashref;
+		$data=GetPrinterDetails($searchfield);
 	}
 
 	$template->param(printqueue => $data->{'printqueue'},
+                    printername => $data->{'printername'},
 			 printtype => $data->{'printtype'});
 													# END $OP eq ADD_FORM
 ################## ADD_VALIDATE ##################################
 # called by add_form, used to insert/modify data in DB
 } elsif ($op eq 'add_validate') {
 	$template->param(add_validate => 1);
+        my $params = $input->Vars;
 	if ($input->param('add')){
-		my $sth=$dbh->prepare("INSERT INTO printers (printername,printqueue,printtype) VALUES (?,?,?)");
-		$sth->execute($input->param('printername'),$input->param('printqueue'),$input->param('printtype'));
+            AddPrinter($params);
 	} else {
-		my $sth=$dbh->prepare("UPDATE printers SET printqueue=?,printtype=? WHERE printername=?");
-		$sth->execute($input->param('printqueue'),$input->param('printtype'),$input->param('printername'));
+            UpdatePrinter($params->{printqueue}, $params);
 	}
 													# END $OP eq ADD_VALIDATE
 ################## DELETE_CONFIRM ##################################
 # called by default form, used to confirm deletion of data in DB
 } elsif ($op eq 'delete_confirm') {
 	$template->param(delete_confirm => 1);
-	my $sth=$dbh->prepare("select printername,printqueue,printtype from printers where printername=?");
+   my $sth=$dbh->prepare("select printername,printqueue,printtype from printers where printqueue=?");
 	$sth->execute($searchfield);
-	my $data=$sth->fetchrow_hashref;
+	my $data=GetPrinterDetails($searchfield);
 	$template->param(printqueue => $data->{'printqueue'},
 			 printtype  => $data->{'printtype'});
 													# END $OP eq DELETE_CONFIRM
@@ -123,15 +109,16 @@ if ($op eq 'add_form') {
 # called by delete_confirm, used to effectively confirm deletion of data in DB
 } elsif ($op eq 'delete_confirmed') {
 	$template->param(delete_confirmed => 1);
-	my $sth=$dbh->prepare("delete from printers where printername=?");
-	$sth->execute($searchfield);
+        DeletePrinter($searchfield);
 													# END $OP eq DELETE_CONFIRMED
 ################## DEFAULT ###########################################
 } else { # DEFAULT
 	$template->param(else => 1);
-	my ($count,$results)=StringSearch($searchfield,'web');
+        $searchfield ||= $input->param('description') || "";
+	my $results=SearchPrinters($searchfield);
+	my $count = $results ? scalar(@$results) : 0;
 	my $max = ($offset+$pagesize < $count) ? $offset+$pagesize : $count;
-	my @loop = (@$results)[$offset..$max];
+    my @loop = (@$results)[$offset..$max-1];
 	
 	$template->param(loop => \@loop);
 	
diff --git a/circ/circulation.pl b/circ/circulation.pl
index 78ac1a4..54138ef 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -29,7 +29,7 @@ use C4::Print;
 use C4::Auth qw/:DEFAULT get_session/;
 use C4::Dates qw/format_date/;
 use C4::Branch; # GetBranches
-use C4::Koha;   # GetPrinter
+use C4::Koha;
 use C4::Circulation;
 use C4::Overdues qw/CheckBorrowerDebarred/;
 use C4::Members;
@@ -67,12 +67,6 @@ if ($branch){
     $session->param('branchname', GetBranchName($branch));
 }
 
-my $printer = $query->param('printer');
-if ($printer){
-    # update our session so the userenv is updated
-    $session->param('branchprinter', $printer);
-}
-
 if (!C4::Context->userenv && !$branch){
     if ($session->param('branch') eq 'NO_LIBRARY_SET'){
         # no branch set we can't issue
@@ -102,8 +96,6 @@ $findborrower =~ s|,| |g;
 my $borrowernumber = $query->param('borrowernumber');
 
 $branch  = C4::Context->userenv->{'branch'};  
-$printer = C4::Context->userenv->{'branchprinter'};
-
 
 # If AutoLocation is not activated, we show the Circulation Parameters to chage settings of librarian
 if (C4::Context->preference("AutoLocation") != 1) {
@@ -665,8 +657,6 @@ $template->param(
     borrowernumber    => $borrowernumber,
     branch            => $branch,
     branchname        => GetBranchName($borrower->{'branchcode'}),
-    printer           => $printer,
-    printername       => $printer,
     firstname         => $borrower->{'firstname'},
     surname           => $borrower->{'surname'},
     showname          => $borrower->{'showname'},
diff --git a/circ/returns.pl b/circ/returns.pl
index 743bf18..0efa712 100755
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -36,7 +36,6 @@ use C4::Context;
 use C4::Auth qw/:DEFAULT get_session/;
 use C4::Output;
 use C4::Circulation;
-use C4::Print;
 use C4::Reserves;
 use C4::Biblio;
 use C4::Items;
@@ -73,15 +72,10 @@ my ( $template, $librarian, $cookie ) = get_template_and_user(
 #####################
 #Global vars
 my $branches = GetBranches();
-my $printers = GetPrinters();
 
-my $printer = C4::Context->userenv ? C4::Context->userenv->{'branchprinter'} : "";
 my $overduecharges = (C4::Context->preference('finesMode') && C4::Context->preference('finesMode') ne 'off');
 
 my $userenv_branch = C4::Context->userenv->{'branch'} || '';
-#
-# Some code to handle the error if there is no branch or printer setting.....
-#
 
 # Set up the item stack ....
 my %returneditems;
@@ -601,9 +595,7 @@ foreach ( sort { $a <=> $b } keys %returneditems ) {
 $template->param(
     riloop         => \@riloop,
     genbrname      => $branches->{$userenv_branch}->{'branchname'},
-    genprname      => $printers->{$printer}->{'printername'},
     branchname     => $branches->{$userenv_branch}->{'branchname'},
-    printer        => $printer,
     errmsgloop     => \@errmsgloop,
     exemptfine     => $exemptfine,
     dropboxmode    => $dropboxmode,
diff --git a/circ/selectbranchprinter.pl b/circ/selectbranchprinter.pl
index b5adcfc..67034b7 100755
--- a/circ/selectbranchprinter.pl
+++ b/circ/selectbranchprinter.pl
@@ -23,10 +23,10 @@ use CGI;
 
 use C4::Context;
 use C4::Output;
-use C4::Auth qw/:DEFAULT get_session/;
-use C4::Print;  # GetPrinters
+use C4::Auth qw/:DEFAULT get_session get_user_printer/;
 use C4::Koha;
 use C4::Branch; # GetBranches GetBranchesLoop
+use C4::Printer qw(GetPrinters);
 
 # this will be the script that chooses branch and printer settings....
 
@@ -56,9 +56,10 @@ my $userenv_printer = C4::Context->userenv->{'branchprinter'} || '';
 my @updated;
 
 # $session lddines here are doing the updating
-if ($branch and $branches->{$branch}) {
+my $branch_rec = $branch ? $branches->{$branch} : undef;
+if ($branch_rec) {
     if (! $userenv_branch or $userenv_branch ne $branch ) {
-        my $branchname = GetBranchName($branch);
+        my $branchname = $branch_rec->{branchname};
         $template->param(LoginBranchname => $branchname);   # update template for new branch
         $template->param(LoginBranchcode => $branch);       # update template for new branch
         $session->param('branchname', $branchname);         # update sesssion in DB
@@ -67,6 +68,8 @@ if ($branch and $branches->{$branch}) {
             updated_branch => 1,
                 old_branch => $userenv_branch,
         };
+        $printer ||= $branch_rec->{branchprinter};
+        undef $userenv_printer;
     } # else branch the same, no update
 } else {
     $branch = $userenv_branch;  # fallback value
@@ -87,7 +90,7 @@ if ($printer) {
         };
     } # else printer is the same, no update
 } else {
-    $printer = $userenv_printer;  # fallback value
+    $printer = get_user_printer();  # fallback value
 }
 
 $template->param(updated => \@updated) if (scalar @updated);
@@ -96,21 +99,6 @@ unless ($branches->{$branch}) {
     $branch = (keys %$branches)[0];  # if branch didn't really exist, then replace it w/ one that does
 }
 
-my @printkeys = sort keys %$printers;
-if (scalar(@printkeys) == 1 or not $printers->{$printer}) {
-    $printer = $printkeys[0];   # if printer didn't really exist, or there is only 1 anyway, then replace it w/ one that does
-}
-
-my @printerloop;
-foreach ( @printkeys ) {
-    next unless ($_); # skip printer if blank.
-    push @printerloop, {
-        selected => ( $_ eq $printer ),
-        name     => $printers->{$_}->{'printername'},
-        value    => $_,
-    };
-}
-
 my @recycle_loop;
 foreach ($query->param()) {
     $_ or next;                   # disclude blanks
@@ -133,9 +121,28 @@ if (scalar @updated and not scalar @recycle_loop) {
 
 $template->param(
     referer     => $referer,
-    printerloop => \@printerloop,
     branchloop  => GetBranchesLoop($branch),
     recycle_loop=> \@recycle_loop,
 );
 
+if ( C4::Context->preference('UsePrintQueues') ) {
+    my @printkeys = keys %$printers;
+    if (scalar(@printkeys) == 1 or not $printers->{$printer}) {
+        $printer = $printkeys[0];   # if printer didn't really exist, or there is only 1 anyway, then replace it w/ one that does
+    }
+
+    my @printerloop;
+    foreach ( @printkeys ) {
+        push @printerloop, {
+            selected => ( $_ eq $printer ),
+            name     => $printers->{$_}->{'printername'},
+            value    => $_,
+        };
+    }
+
+    $template->param(
+        printerloop => \@printerloop,
+    );
+}
+
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 91d42a2..048a7ea 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -364,10 +364,11 @@ CREATE TABLE `branches` ( -- information about your libraries or branches are st
   `branchurl` mediumtext, -- the URL for your library or branch's website
   `issuing` tinyint(4) default NULL, -- unused in Koha
   `branchip` varchar(15) default NULL, -- the IP address for your library or branch
-  `branchprinter` varchar(100) default NULL, -- unused in Koha
+  `branchprinter` varchar(20) default NULL,
   `branchnotes` mediumtext, -- notes related to your library or branch
   opac_info text, -- HTML that displays in OPAC
   PRIMARY KEY (`branchcode`)
+  FOREIGN KEY (branchprinter) REFERENCES printers (printqueue) ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
@@ -1570,12 +1571,13 @@ CREATE TABLE `pending_offline_operations` (
 -- Table structure for table `printers`
 --
 
-DROP TABLE IF EXISTS `printers`;
-CREATE TABLE `printers` (
-  `printername` varchar(40) NOT NULL default '',
-  `printqueue` varchar(20) default NULL,
-  `printtype` varchar(20) default NULL,
-  PRIMARY KEY  (`printername`)
+DROP TABLE IF EXISTS printers;
+CREATE TABLE printers (
+  printername varchar(40) NOT NULL default '',
+  printqueue varchar(20) NOT NULL,
+  printtype varchar(20) default NULL,
+  PRIMARY KEY  (printqueue),
+  UNIQUE (printername)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 35f92cc..f21b071 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -366,6 +366,7 @@ INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES (
 INSERT INTO systempreferences (variable,value,explanation,type) VALUES('EnableBorrowerFiles','0','If enabled, allows librarians to upload and attach arbitrary files to a borrower record.','YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('UpdateTotalIssuesOnCirc','0','Whether to update the totalissues field in the biblio on each circ.',NULL,'YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('IntranetSlipPrinterJS','','Use this JavaScript for printing slips. Define at least function printThenClose(). For use e.g. with Firefox PlugIn jsPrintSetup, see http://jsprintsetup.mozdev.org/','','Free');
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('UsePrintQueues','0',NULL,NULL,'YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacSuppressionByIPRange','','Restrict the suppression to IP adresses outside of the IP range','','free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('PrefillItem','0','When a new item is added, should it be prefilled with last created item values?','','YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('SubfieldsToUseWhenPrefill','','Define a list of subfields to use when prefilling items (separated by space)','','Free');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 25cd367..3649a78 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -5696,6 +5696,18 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion($DBversion);
 }
 
+
+
+$DBversion = "3.09.00.XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    $dbh->do("ALTER TABLE printers DROP PRIMARY KEY, MODIFY printqueue varchar(20) NOT NULL PRIMARY KEY, ADD UNIQUE (printername)");
+    $dbh->do("ALTER TABLE branches MODIFY branchprinter varchar(20) NULL, ADD FOREIGN KEY (branchprinter) REFERENCES printers (printqueue) ON UPDATE CASCADE");
+    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('UsePrintQueues','0',NULL,NULL,'YesNo')");
+
+    print "Upgrade to $DBversion done (Add borrowers.default_printqueue and 'UsePrintQueues' syspref)\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 3d71d45..86fe8cc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -57,6 +57,9 @@
                 [% LoginBranchname %]
             [% END %]
             </strong>
+            [% IF UsePrintQueues %]
+            - [% PrinterName %]
+            [% END %]
             [% IF ( IndependantBranches ) %]
                 [% IF ( CAN_user_management || CAN_user_editcatalogue_edit_catalogue ) %]
                     ( <a class="toplinks" href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a> )
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
index 3906c46..d2e0fc5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
@@ -101,8 +101,8 @@
 <dl>
 	[% IF ( NoZebra ) %]<dt><a href="/cgi-bin/koha/admin/stopwords.pl">Stop words</a></dt>
 	<dd>Words ignored during search.</dd>[% END %]
-	<!-- <dt><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></dt>
-	<dd>Printers (UNIX paths).</dd> -->
+   [% IF UsePrintQueues %]<dt><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></dt>
+ <dd>Printers (UNIX paths).</dd>[% END %]
     <dt><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 client targets</a></dt>
 	<dd>Define which servers to query for MARC data in the integrated Z39.50 client.</dd>
 </dl>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
index 15e8064..bcb918f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
@@ -143,10 +143,10 @@ tinyMCE.init({
         <li><label for="branchurl">URL</label><input type="text" name="branchurl" id="branchurl" value="[% branchurl |html %]" /></li>
         <li><label for="opac_info">OPAC info</label><textarea name="opac_info" id="opac_info">[% opac_info |html %]</textarea></li>
         <li><label for="branchip">IP</label><input type="text" name="branchip" id="branchip" value="[% branchip |html %]" /> <span class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</span></li>
-		<!--
-        <li><label for="branchprinter">Library Printer</label>
+[% IF UsePrintQueues %]
+        <li><label for="branchprinter">Library printer</label>
             <select id="branchprinter" name="branchprinter">
-                <option value="">None</option>
+                <option value="">(None)</option>
             [% FOREACH printerloo IN printerloop %]
                 [% IF ( printerloo.selected ) %]
 				<option value="[% printerloo.value %]" selected="selected">[% printerloo.branchprinter %]</option>
@@ -155,7 +155,7 @@ tinyMCE.init({
 				[% END %]
                 [% END %]
             </select></li>
-			-->
+[% END %]
         <li><label for="branchnotes">Notes</label><input type="text" name="branchnotes" id="branchnotes" value="[% branchnotes |html %]" /></li>
         </ol>
         </fieldset>
@@ -198,7 +198,9 @@ tinyMCE.init({
             <th>Address</th>
             <th>Properties</th>
             <th>IP</th>
-            <!-- <th>Printer</th> -->
+[% IF UsePrintQueues %]
+            <th>Printer</th>
+[% END %]
             <th colspan="2">&nbsp;</th>
         </tr></thead><tbody>
         [% FOREACH branche IN branches %]
@@ -250,9 +252,11 @@ tinyMCE.init({
                 <td>
                     [% branche.branchip %]
                 </td>
-                <!-- <td>
-                    [% branche.branchprinter %]
-                </td> -->
+[% IF UsePrintQueues %]
+                <td>
+                    [% branche.branchprintername %]
+                </td>
+[% END %]
                 <td>
                     <a href="[% branche.action %]?op=edit&amp;branchcode=[% branche.value |url %]">Edit</a>
                 </td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index a9ed6f7..23cd7ee 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -110,6 +110,12 @@ Circulation:
                   yes: Do
                   no: "Do not"
             - update a bibliographic record's total issues count whenever an item is issued (WARNING! This increases server load significantly; if performance is a concern, use the update_totalissues.pl cron job to update the total issues count).
+        -
+            - pref: UsePrintQueues
+              choices:
+                  yes: "Use"
+                  no: "Don't use"
+            - server print queues.
     Checkout Policy:
         -
             - pref: AllowNotForLoanOverride
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
index 7dfb80b..d1007a3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
@@ -89,22 +89,17 @@
         <form action="[% script_name %]" name="Aform" method="post">
         <input type="hidden" name="op" value="add_validate" />
 	[% IF ( searchfield ) %]
+          <input type="hidden" name="searchfield" value="[% searchfield %]" />
 		<input type="hidden" name="add" value="0" />
 	[% ELSE %]
 		<input type="hidden" name="add" value="1" />
 	[% END %]
 	<fieldset class="rows">
-<ol>	[% IF ( searchfield ) %]
-		<li>
-            <span class="label">Printer name: </span>
-				<input type="hidden" name="printername" id="" value="[% searchfield %]" />[% searchfield %]
-		</li>
-	[% ELSE %]
+<ol>
 		<li>
             <label for="printername">Printer name: </label>
-				<input type="text" name="printername" id="printername" size="50" maxlength="50" />
+                             <input type="text" name="printername" id="printername" size="50" maxlength="50" value="[% printername %]" />
 		</li>
-	[% END %]
         	<li>
 			<label for="printqueue">Queue: </label>
 			<input type="text" name="printqueue" id="printqueue" size="50" maxlength="50" value="[% printqueue %]" /> 
@@ -190,7 +185,7 @@
 			<td>[% loo.printername %]</td>
 			<td>[% loo.printqueue %]</td>
 			<td>[% loo.printtype %]</td>
-			<td><a href="[% loo.script_name %]?op=add_form&amp;searchfield=[% loo.printername %]">Edit</a> <a href="[% loo.script_name %]?op=delete_confirm&amp;searchfield=[% loo.printername %]">Delete</a></td>
+                     <td><a href="[% loo.script_name %]?op=add_form&amp;searchfield=[% loo.printqueue %]">Edit</a> <a href="[% loo.script_name %]?op=delete_confirm&amp;searchfield=[% loo.printqueue %]">Delete</a></td>
 		</tr>
 		[% END %]
 	</table>[% ELSE %]<div class="notice">No printers defined.</div>[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 8724e9d..0dc95a8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -457,7 +457,6 @@ No patron matched <span class="ex">[% message %]</span>
     <legend>Patron selection</legend>
 
     <input type="hidden" name="branch" value="[% branch %]" />
-    <input type="hidden" name="printer" value="[% printer %]" />
     <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
     <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
 
@@ -515,7 +514,6 @@ No patron matched <span class="ex">[% message %]</span>
 </div>[% END %]
           <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
           <input type="hidden" name="branch" value="[% branch %]" />
-          <input type="hidden" name="printer" value="[% printer %]" />
           <input type="hidden" name="print" value="maybe" />
           <input type="hidden" name="debt_confirmed" value="[% debt_confirmed %]" />
                 [% IF ( CHARGES ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt
index acad21c..e742f81 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt
@@ -28,7 +28,7 @@ Updated:<ul>
     [% IF ( update.updated_branch ) %]
         <li>Library: [% update.old_branch or "?" %] &rArr; [% update.LoginBranchcode or "?" %]</li>
     [% ELSIF ( update.updated_printer ) %]
-      <!-- FIXME:  <li>Printer: [% update.old_printer or "?" %] &rArr; [% update.new_printer or "?" %]</li> -->
+        <li>Printer: [% update.old_printer or "?" %] &rArr; [% update.new_printer or "?" %]</li>
     [% ELSE %]
         <li>ERROR - unknown</li>
     [% END %]
@@ -63,7 +63,6 @@ Updated:<ul>
         [% END %]
         </select></li>
     [% END %]
-<!--
     [% IF ( printerloop ) %]
         <li><label for="printer">Choose a network printer:</label>
         <select name="printer" id="printer">
@@ -75,7 +74,7 @@ Updated:<ul>
                 [% END %]
             [% END %]
         </select></li>
-    [% END %] -->
+    [% END %]
     </ol>
 </fieldset>
 <fieldset class="action"><input type="submit" value="Submit" /></fieldset>
diff --git a/t/db_dependent/lib/KohaTest/Koha.pm b/t/db_dependent/lib/KohaTest/Koha.pm
index 13a145a..0dda47a 100644
--- a/t/db_dependent/lib/KohaTest/Koha.pm
+++ b/t/db_dependent/lib/KohaTest/Koha.pm
@@ -28,8 +28,6 @@ sub methods : Test( 1 ) {
       _getImagesFromDirectory
       _getSubdirectoryNames
       getImageSets
-      GetPrinters
-      GetPrinter
       getnbpages
       getallthemes
       getFacets
diff --git a/t/db_dependent/lib/KohaTest/Printer.pm b/t/db_dependent/lib/KohaTest/Printer.pm
new file mode 100644
index 0000000..4caef06
--- /dev/null
+++ b/t/db_dependent/lib/KohaTest/Printer.pm
@@ -0,0 +1,26 @@
+package KohaTest::Printer;
+use base qw( KohaTest );
+
+use strict;
+use warnings;
+
+use Test::More;
+
+use C4::Printer;
+sub testing_class { 'C4::Printer' }
+
+sub methods : Test( 1 ) {
+    my $self    = shift;
+    my @methods = qw(
+      GetPrinters
+      SearchPrinters
+      GetPrinterDetails
+      AddPrinter
+      UpdatePrinter
+      DeletePrinter
+    );
+
+    can_ok( $self->testing_class, @methods );
+}
+
+1;
-- 
1.7.9.5


From fridolyn.somers at biblibre.com  Thu Sep  6 14:11:00 2012
From: fridolyn.somers at biblibre.com (Fridolyn SOMERS)
Date: Thu,  6 Sep 2012 14:11:00 +0200
Subject: [Koha-patches] [PATCH] Bug 8462: OpacHiddenItems and hidelostitems
	hide items, but query result count is off
Message-ID: <1346933460-17787-1-git-send-email-fridolyn.somers@biblibre.com>

---
 C4/Search.pm |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index 3edf118..f2f33b6 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1766,10 +1766,7 @@ sub searchResults {
                 }
             }
         }    # notforloan, item level and biblioitem level
-	if ($items_count > 0) {
-        next if $is_opac       && $hideatopac_count >= $items_count;
-        next if $hidelostitems && $itemlost_count   >= $items_count;
-	}
+
         my ( $availableitemscount, $onloanitemscount, $otheritemscount );
         for my $key ( sort keys %$onloan_items ) {
             (++$onloanitemscount > $maxitems) and last;
-- 
1.7.9.5


From oleonard at myacpl.org  Thu Sep  6 21:07:02 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu,  6 Sep 2012 15:07:02 -0400
Subject: [Koha-patches] [PATCH] Bug 8730 - browse overlaying powered by
Message-ID: <1346958423-23352-1-git-send-email-oleonard@myacpl.org>

This patch adds a "z-index" property to the CSS for
the browse results menu so that it will appear
on top of the "Powered by Koha" link.
---
 koha-tmpl/opac-tmpl/prog/en/css/opac.css |    1 +
 1 file changed, 1 insertion(+)

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 414b776..f6f6096 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -2230,6 +2230,7 @@ a.koha_url {
     display: none;
 	background-color:#F3F3F3;
 	padding-bottom:10px;
+    z-index: 100;
 }
 
 
-- 
1.7.9.5


From nengard at bywatersolutions.com  Thu Sep  6 06:23:03 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Thu,  6 Sep 2012 00:23:03 -0400
Subject: [Koha-patches] [PATCH] Bug 6716 - Fix alt contact field
	documentation
Message-ID: <1346905383-4029-1-git-send-email-nengard@bywatersolutions.com>

The borrowers table has the wrong documentation for the alternate
address3 and city fields. This fixes that.
---
 installer/data/mysql/kohastructure.sql |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 91d42a2..305d3ea 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -256,8 +256,8 @@ CREATE TABLE `borrowers` ( -- this table includes information about your patrons
   `altcontactsurname` varchar(255) default NULL, -- surname or last name of the alternate contact for the patron/borrower
   `altcontactaddress1` varchar(255) default NULL, -- the first address line for the alternate contact for the patron/borrower
   `altcontactaddress2` varchar(255) default NULL, -- the second address line for the alternate contact for the patron/borrower
-  `altcontactaddress3` varchar(255) default NULL, -- the third address line for the alternate contact for the patron/borrower
-  `altcontactstate` text default NULL, -- the city and state for the alternate contact for the patron/borrower
+  `altcontactaddress3` varchar(255) default NULL, -- the city for the alternate contact for the patron/borrower
+  `altcontactstate` text default NULL, -- the state for the alternate contact for the patron/borrower
   `altcontactzipcode` varchar(50) default NULL, -- the zipcode for the alternate contact for the patron/borrower
   `altcontactcountry` text default NULL, -- the country for the alternate contact for the patron/borrower
   `altcontactphone` varchar(50) default NULL, -- the phone number for the alternate contact for the patron/borrower
@@ -727,8 +727,8 @@ CREATE TABLE `deletedborrowers` ( -- stores data related to the patrons/borrower
   `altcontactsurname` varchar(255) default NULL, -- surname or last name of the alternate contact for the patron/borrower
   `altcontactaddress1` varchar(255) default NULL, -- the first address line for the alternate contact for the patron/borrower
   `altcontactaddress2` varchar(255) default NULL, -- the second address line for the alternate contact for the patron/borrower
-  `altcontactaddress3` varchar(255) default NULL, -- the third address line for the alternate contact for the patron/borrower
-  `altcontactstate` text default NULL, -- the city and state for the alternate contact for the patron/borrower
+  `altcontactaddress3` varchar(255) default NULL, -- the city for the alternate contact for the patron/borrower
+  `altcontactstate` text default NULL, -- the state for the alternate contact for the patron/borrower
   `altcontactzipcode` varchar(50) default NULL, -- the zipcode for the alternate contact for the patron/borrower
   `altcontactcountry` text default NULL, -- the country for the alternate contact for the patron/borrower
   `altcontactphone` varchar(50) default NULL, -- the phone number for the alternate contact for the patron/borrower
-- 
1.7.2.3


From oleonard at myacpl.org  Thu Sep  6 21:22:25 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu,  6 Sep 2012 15:22:25 -0400
Subject: [Koha-patches] [PATCH] Bug 8711 - alternating colors messed up on
	reports
Message-ID: <1346959345-23613-1-git-send-email-oleonard@myacpl.org>

Patch adds the "zebra-striping" option to the
table sorter initialization and changes the row
color CSS to match the tablesorter's to prevent
conflicts.
---
 .../en/modules/reports/guided_reports_start.tt     |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
index 21d8235..f081894 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -43,6 +43,7 @@ $(document).ready(function(){
 [% END %]
   // call the tablesorter plugin
   $("#table_reports").tablesorter({
+    widgets : ['zebra'],
     sortList: [[1,0]],
     headers: {
        6: { sorter: false},
@@ -151,7 +152,7 @@ canned reports and writing custom SQL reports.</p>
 </thead>
 <tbody>
 [% FOREACH savedreport IN savedreports %]
-[% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
+[% UNLESS ( loop.odd ) %]<tr class="odd">[% ELSE %]<tr>[% END %]
 <td>[% savedreport.id %]</td>
 <td>[% savedreport.report_name %]</td>
 <td>[% savedreport.type %]</td>
-- 
1.7.9.5


From oleonard at myacpl.org  Fri Sep  7 17:24:35 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  7 Sep 2012 11:24:35 -0400
Subject: [Koha-patches] [PATCH] Bug 8677 - table overlapping to the right on
	holds waiting
Message-ID: <1347031475-26454-1-git-send-email-oleonard@myacpl.org>

Converting layout to 100% flexible width to allow
table to expand as needed.
---
 .../prog/en/modules/circ/waitingreserves.tt        |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
index ea0faef..f9d2258 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
@@ -32,7 +32,7 @@ $.tablesorter.addParser({
 &rsaquo; <a href="/cgi-bin/koha/circ/waitingreserves.pl">Holds awaiting pickup</a>
 </div>
 
-<div id="doc" class="yui-t7">
+<div id="doc3" class="yui-t7">
 
    <div id="bd">
     <div id="yui-main">
-- 
1.7.9.5


From oleonard at myacpl.org  Fri Sep  7 18:14:49 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  7 Sep 2012 12:14:49 -0400
Subject: [Koha-patches] [PATCH] Bug 8598 - No patron image or home library
	on Files & Statistics tabs
Message-ID: <1347034490-27053-1-git-send-email-oleonard@myacpl.org>

Adding the necessary code for patron image, patron
home library, patron category description, and patron
extended attributes to show in the left-hand sidebar.
---
 members/files.pl      |   18 ++++++++++++++++++
 members/statistics.pl |   17 ++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/members/files.pl b/members/files.pl
index f011c77..84bc41e 100755
--- a/members/files.pl
+++ b/members/files.pl
@@ -23,8 +23,10 @@ use warnings;
 use CGI;
 
 use C4::Auth;
+use C4::Branch;
 use C4::Output;
 use C4::Members;
+use C4::Members::Attributes qw(GetBorrowerAttributes);
 use C4::Debug;
 
 use Koha::DateUtils;
@@ -100,6 +102,22 @@ else {
     }
 
     $template->param(
+        categoryname    => $data->{'description'},
+        branchname      => GetBranchName($data->{'branchcode'}),
+    );
+
+    if (C4::Context->preference('ExtendedPatronAttributes')) {
+        my $attributes = GetBorrowerAttributes($borrowernumber);
+        $template->param(
+            ExtendedPatronAttributes => 1,
+            extendedattributes => $attributes
+        );
+    }
+
+    my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+    $template->param( picture => 1 ) if $picture;
+
+    $template->param(
         files => Koha::Borrower::Files->new( borrowernumber => $borrowernumber )
           ->GetFilesInfo(),
 
diff --git a/members/statistics.pl b/members/statistics.pl
index 7125560..d48cdde 100755
--- a/members/statistics.pl
+++ b/members/statistics.pl
@@ -29,6 +29,7 @@ use C4::Branch;
 use C4::Context;
 use C4::Members;
 use C4::Members::Statistics;
+use C4::Members::Attributes qw(GetBorrowerAttributes);
 use C4::Output;
 
 my $input = new CGI;
@@ -56,7 +57,10 @@ if ( not defined $borrower ) {
 foreach my $key ( keys %$borrower ) {
     $template->param( $key => $borrower->{$key} );
 }
-
+$template->param(
+    categoryname    => $borrower->{'description'},
+    branchname      => GetBranchName($borrower->{'branchcode'}),
+);
 # Construct column names
 my $fields = C4::Members::Statistics::get_fields();
 our @statistic_column_names = split '\|', $fields;
@@ -80,6 +84,17 @@ my $count_total_issues = $total->{count_total_issues_today} || 0;
 my $count_total_issues_returned = $total->{count_total_issues_returned_today} || 0;
 my $count_total_actual_state = ($count_total_precedent_state - $count_total_issues_returned + $count_total_issues);
 
+if (C4::Context->preference('ExtendedPatronAttributes')) {
+    my $attributes = GetBorrowerAttributes($borrowernumber);
+    $template->param(
+        ExtendedPatronAttributes => 1,
+        extendedattributes => $attributes
+    );
+}
+
+my ($picture, $dberror) = GetPatronImage($borrower->{'cardnumber'});
+$template->param( picture => 1 ) if $picture;
+
 $template->param(
     statisticsview => 1,
     datas          => $datas,
-- 
1.7.9.5


From oleonard at myacpl.org  Fri Sep  7 19:51:16 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  7 Sep 2012 13:51:16 -0400
Subject: [Koha-patches] [PATCH] Bug 8661 - break out additional authors in
	opac like in staff
Message-ID: <1347040276-28311-1-git-send-email-oleonard@myacpl.org>

This patch takes the simple route of copying over the markup
for displaying authors from the staff client XSL to the OPAC.

Signed-off-by: Owen Leonard <oleonard at myacpl.org>
---
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |   91 +++++++++-----------
 1 file changed, 43 insertions(+), 48 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
index 8d54517..cc0d4d9 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
@@ -137,16 +137,10 @@
                 </xsl:call-template>
             </h5>
         </xsl:if>
-        <xsl:choose>
-            <xsl:when test="marc:datafield[@tag=100] or marc:datafield[@tag=110] or marc:datafield[@tag=111] or marc:datafield[@tag=700] or marc:datafield[@tag=710] or marc:datafield[@tag=711]">
-                <h5 class="author">by
-                    <xsl:call-template name="showAuthor">
-                        <xsl:with-param name="authorfield" select="marc:datafield[@tag=100 or @tag=110 or @tag=111 or @tag=700 or @tag=710 or @tag=711]"/>
-                        <xsl:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/>
-                    </xsl:call-template>
-                </h5>
-            </xsl:when>
-        </xsl:choose>
+
+    <!-- Author Statement -->
+    <xsl:call-template name="showAuthor"><xsl:with-param name="authorfield" select="marc:datafield[@tag=100 or @tag=110 or @tag=111]"/><xsl:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/></xsl:call-template>
+    <xsl:call-template name="showAuthor"><xsl:with-param name="authorfield" select="marc:datafield[@tag=700 or @tag=710 or @tag=711]"/><xsl:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/></xsl:call-template>
 
    <xsl:if test="$DisplayOPACiconsXSLT!='0'">
         <xsl:if test="$materialTypeCode!=''">
@@ -873,47 +867,48 @@
 
     </xsl:template>
 
+
     <xsl:template name="showAuthor">
-        <xsl:param name="authorfield" />
-        <xsl:param name="UseAuthoritiesForTracings" />
+    <xsl:param name="authorfield"/>
+    <xsl:param name="UseAuthoritiesForTracings"/>
+    <xsl:if test="count($authorfield)&gt;0">
+        <h5 class="author">
         <xsl:for-each select="$authorfield">
-            <xsl:choose><xsl:when test="position()!=1"><xsl:text>; </xsl:text></xsl:when></xsl:choose>
-            <xsl:choose>
-                <xsl:when test="not(@tag=111 or @tag=711)" />
-                <xsl:when test="marc:subfield[@code='n']">
-                    <xsl:text> </xsl:text>
-                    <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">n</xsl:with-param>
-                    </xsl:call-template>
-                    <xsl:text> </xsl:text>
-                </xsl:when>
-            </xsl:choose>
-            <a>
-                <xsl:choose>
-                    <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
-                        <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=au:<xsl:value-of select="marc:subfield[@code='a']"/></xsl:attribute>
-                    </xsl:otherwise>
-                </xsl:choose>
-                <xsl:choose>
-                    <xsl:when test="@tag=100 or @tag=700"><xsl:call-template name="nameABCDQ"/></xsl:when>
-                    <xsl:when test="@tag=110 or @tag=710"><xsl:call-template name="nameABCDN"/></xsl:when>
-                    <xsl:when test="@tag=111 or @tag=711"><xsl:call-template name="nameACDEQ"/></xsl:when>
-                </xsl:choose>
-                <!-- add relator code too between brackets-->
-                <xsl:if test="marc:subfield[@code='4' or @code='e']">
-                    <xsl:text>[</xsl:text>
-                    <xsl:choose>
-                        <xsl:when test="marc:subfield[@code=4]"><xsl:value-of select="marc:subfield[@code=4]"/></xsl:when>
-                        <xsl:otherwise><xsl:value-of select="marc:subfield[@code='e']"/></xsl:otherwise>
-                    </xsl:choose>
-                    <xsl:text>]</xsl:text>
-                </xsl:if>
-            </a>
+        <xsl:choose>
+          <xsl:when test="position()&gt;1"/>
+          <xsl:when test="@tag&lt;700">Author(s): </xsl:when>
+          <xsl:otherwise>Additional author(s): </xsl:otherwise>
+        </xsl:choose>
+        <a>
+        <xsl:choose>
+            <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
+                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
+            </xsl:when>
+            <xsl:otherwise>
+            <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=au:<xsl:value-of select="marc:subfield[@code='a']"/></xsl:attribute>
+            </xsl:otherwise>
+        </xsl:choose>
+        <xsl:choose>
+              <xsl:when test="@tag=100 or @tag=700"><xsl:call-template name="nameABCDQ"/></xsl:when>
+              <xsl:when test="@tag=110 or @tag=710"><xsl:call-template name="nameABCDN"/></xsl:when>
+              <xsl:when test="@tag=111 or @tag=711"><xsl:call-template name="nameACDEQ"/></xsl:when>
+        </xsl:choose>
+        <!-- add relator code too between brackets-->
+        <xsl:if test="marc:subfield[@code='4' or @code='e']">
+          <xsl:text>[</xsl:text>
+          <xsl:choose>
+            <xsl:when test="marc:subfield[@code=4]"><xsl:value-of select="marc:subfield[@code=4]"/></xsl:when>
+            <xsl:otherwise><xsl:value-of select="marc:subfield[@code='e']"/></xsl:otherwise>
+          </xsl:choose>
+          <xsl:text>]</xsl:text>
+        </xsl:if>
+        </a>
+        <xsl:choose>
+          <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise>
+        </xsl:choose>
         </xsl:for-each>
-        <xsl:text>.</xsl:text>
+        </h5>
+        </xsl:if>
     </xsl:template>
 
     <xsl:template name="nameABCDQ">
-- 
1.7.9.5


From matted-34813 at mypacks.net  Sat Sep  8 06:49:49 2012
From: matted-34813 at mypacks.net (matted-34813 at mypacks.net)
Date: Fri, 7 Sep 2012 23:49:49 -0500 (GMT-05:00)
Subject: [Koha-patches] Bug-8447- Can't save new recors/ indicator
 error/Make-sure-we-have-enough-subfield
Message-ID: <22103295.1347079789593.JavaMail.root@wamui-june.atl.sa.earthlink.net>


Here is a use case that caused the problem (for historical reference and testing for QA)

In admin set sysprefs
 AutoCreateAuthorities - generate
 BiblioAddsAuthorities  - allow
   dontmerge  don't
LinkerModule   Default
LinkerOptions broader_headings

Catalogueing -> Z3950 search 
Subject [Bible.]
Library of Congress[x]

Import the one with:
	1 Corinthians : 		2005 		080282577X (cloth:alkpaper) 	2005052170

Edit koha itemtype books 942c, and 003

Save (  and get software error mentioning indicators)


With the patch, we fixend how the biblio is merged with existing data.

wajasu



From jcamins at cpbibliography.com  Fri Sep  7 16:58:53 2012
From: jcamins at cpbibliography.com (Jared Camins-Esakov)
Date: Fri, 7 Sep 2012 10:58:53 -0400
Subject: [PATCH] [SIGNED-OFF] Bug 8447: Make sure we have enough subfields
 for broader_headings
Message-ID: <mailman.63.1347079009.15477.koha-patches@lists.koha-community.org>

Thanks to wajasu for providing the debugging information, as I cannot
seem to duplicate the problem, even seeing where it could come from.

Fix corrects cases where upon save, a software error complaing about
indicators being wrong as a side effect of a poorly autogenerated
biblio/authority record.

Behvior with this fix causes existing bilio data to to be preserved
while linking to the authority via subtag 9.

Signed-off-by: wajasu <matted-34813 at mypacks.net>
---
 C4/Linker/Default.pm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/C4/Linker/Default.pm b/C4/Linker/Default.pm
index 653dabd..445b408 100644
--- a/C4/Linker/Default.pm
+++ b/C4/Linker/Default.pm
@@ -56,17 +56,16 @@ sub get_link {
 
         if ( !defined $authid && $self->{'broader_headings'} ) {
             my $field     = $heading->field();
-            my @subfields = $field->subfields();
+            my @subfields = grep { $_->[0] ne '9' } $field->subfields();
             if ( scalar @subfields > 1 ) {
                 pop @subfields;
-                $field->replace_with(
+                $field =
                     MARC::Field->new(
                         $field->tag,
                         $field->indicator(1),
                         $field->indicator(2),
-                        map { $_[0] => $_[1] } @subfields
-                    )
-                );
+                        map { $_->[0] => $_->[1] } @subfields
+                    );
                 ( $authid, $fuzzy ) =
                   $self->get_link( C4::Heading->new_from_bib_field($field),
                     $behavior );
-- 
1.7.11.4


------=_Part_8041_12838168.1347079789321--


From matted-34813 at mypacks.net  Sun Sep  9 21:55:23 2012
From: matted-34813 at mypacks.net (matted-34813 at mypacks.net)
Date: Sun, 9 Sep 2012 14:55:23 -0500 (GMT-05:00)
Subject: [Koha-patches]
 SIGNED-OFF-Bug-8744-Thesaurus-in-authorities-should-not-lock-fields
Message-ID: <30320385.1347220523521.JavaMail.root@wamui-june.atl.sa.earthlink.net>

Now one can create heirarchies of geographical names inthe authority 551 $a field for example.  This was needed to support bug 8211 for expanded search functionaility.

wajasu

From jcamins at cpbibliography.com  Sun Sep  9 14:55:12 2012
From: jcamins at cpbibliography.com (Jared Camins-Esakov)
Date: Sun, 9 Sep 2012 08:55:12 -0400
Subject: [PATCH] [SIGNED-OFF] Bug 8744: Thesaurus in authorities should not
 lock fields
Message-ID: <mailman.64.1347219750.15477.koha-patches@lists.koha-community.org>

Although fields in the authority editor should support thesaurus
control, they should never be locked, as authority records commonly
refer to other records that may not be in use locally (and therefore
might not be in the authority file).

Test plan:
1) Make sure a 5xx field in one of your authority frameworks is
   thesaurus-controlled.
2) Note that you cannot edit the field directly.
3) Apply patch.
4) Note that you can now edit the field irectly.

Signed-off-by: wajasu <matted-34813 at mypacks.net>
---
 authorities/authorities.pl | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/authorities/authorities.pl b/authorities/authorities.pl
index 5b6afbd..661e465 100755
--- a/authorities/authorities.pl
+++ b/authorities/authorities.pl
@@ -194,9 +194,8 @@ sub create_input {
             id=\"".$subfield_data{id}."\"
             name=\"".$subfield_data{id}."\"
             value=\"$value\"
-            class=\"input_marceditor readonly\"
-            tabindex=\"1\"
-            readonly=\"readonly\" \/>
+            class=\"input_marceditor\"
+            tabindex=\"1\" \/>
         <a href=\"#\" class=\"buttonDot\"
         onclick=\"openAuth(this.parentNode.getElementsByTagName('input')[1].id,'".$tagslib->{$tag}->{$subfield}->{authtypecode}."'); return false;\" tabindex=\"1\" title=\"Tag Editor\">...</a>
     ";
-- 
1.7.11.4


------=_Part_2512_10030794.1347220523217--


From matted-34813 at mypacks.net  Mon Sep 10 02:20:22 2012
From: matted-34813 at mypacks.net (matted-34813 at mypacks.net)
Date: Sun, 9 Sep 2012 19:20:22 -0500 (GMT-05:00)
Subject: [Koha-patches] SIGNED-OFF-Bug-8211-Add-exploded-search-options.patch
Message-ID: <18785378.1347236422979.JavaMail.root@wamui-june.atl.sa.earthlink.net>

After pulling master i applied these:
0001-Bug-8744-Thesaurus-in-authorities-should-not-lock-fi.patch
0002-Bug-8649-Add-unit-test-for-C4-Search.patch
0003-bug-8649-make-sure-C4-Context-is-fully-mocked-up-bef.patch
0004-bug-8649-make-sure-we-can-exit-if-a-test-fails.patch
0005-bug-8649-create-a-temp-directory-for-Zebra-for-C4-Se.patch
0006-bug-8649-quiet-a-variable-use-warning.patch
0007-Bug-8211-Add-exploded-search-options.patch

You need 8744 to be able to edit Geographical names in 551 (unlock them)
8649 has Search.t tests

1) I had created the authority heirarchy as comment#2 described.
2) I used z3950 to search LOC specifiying "United States" in subject heading, and chose "1000 things to love about America" and added an item.  I navigated to its 651 Geographic name heading and clicked the editor icon for the 'a' subtag, and used the authority search plugin ( $a = United States ) and found the record that was created in step #1).  choose it.  I finished out the biblio and added an item.
3) I did the same thing as step 2) but for "Arizona" and "Phoenix" subject headingg, linking with the authority plugin as well.  Pick a book for Arizona accordingly.
4) I ran rebuild-zebra and did my searches as described in comment #3) in the OPAC search.   su-br:Arizona  su-na:Arizona  and su-rl:Arizona
Each returned results.
For me: I also had Phoenix in the su-br-Arizona search, and jcamins said there must be a subject heading in my chosen biblio for Phoenix.  There was, so I edited my biblio, to remove the Restaurant -- Arizona  TOPICAL TERM SUBJECT HEADING.  After that I requeried su-br: Arizona, and the Phoenix item did not show up as we wanted.  So there is an added restriction to be sure other subject heading don't interfere with results.


wajasu

From srdjan at catalyst.net.nz  Mon Sep 10 03:16:43 2012
From: srdjan at catalyst.net.nz (Srdjan)
Date: Mon, 10 Sep 2012 13:16:43 +1200
Subject: [Koha-patches] [PATCH] Bug 7993: Save reports with Group/Subgroup
	hierarchy
In-Reply-To: <bug 7993>
References: <bug 7993>
Message-ID: <1347239803-21035-1-git-send-email-srdjan@catalyst.net.nz>

This should make saved reports more manageable.
Group/Subgroup hierarchy is stored in authorised_values,
categories REPORT_GROUP and REPORT_SUBGROUP, connected by
REPORT_SUBGROUP.lib_opac -> REPORT_GROUP.authorised_value

Database changes:
* authorised_values: expanded category to 16 chars
* created default set of REPORT_GROUP authorised values to match
  hardcoded report areas
* reports_dictionary: replaced area int with report_area text, converted
  values
* saved_sql: added report_area, report_group and report_subgroup;
  report_area is not currently used, saved for the record

C4/Reports/Guided.pm:
* Replaced Area numeric values with the mnemonic codes
* get_report_areas(): returns hardcoded areas list
* created get_report_areas(): returns full hierarchy (groups with belonging
  subgroups)
* save_report(): changed iterface, accepts fields hashref as input
* update_sql(): changed iterface, accepts id and fields hashref as input
* get_saved_reports():]
- join to authorised_values to pick group and subgroup name
- accept group and subgroup filter params
* get_saved_report():
- changed iterface, return record hashref
- join to authorised_values to pick group and subgroup name
* build_authorised_value_list(): new sub, moved code from
  reports/guided_reports.pl
* Updated interfaces in:
cronjobs/runreport.pl, svc/report, opac/svc/report: get_saved_report()
reports/dictionary.pl: get_report_areas()
reports/guided_reports.pl

reports/guided_reports_start.tt:
* Reports list:
- added group/subgroup filter
- display area/group/subgroup for the reports
* Create report wizard:
- carry area to the end
- select group and subgroup when saving the report; group defaults to area,
  useful when report groups match areas
* Update report and Create from SQL: added group/subgroup
* Amended reports/guided_reports.pl accordingly

Conflicts:

    C4/Reports/Guided.pm
    admin/authorised_values.pl
    installer/data/mysql/kohastructure.sql
    installer/data/mysql/updatedatabase.pl
    koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl
    koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
    misc/cronjobs/runreport.pl
    reports/dictionary.pl
    reports/guided_reports.pl
---
 C4/Reports/Guided.pm                               |  432 +++++++++++-------
 admin/authorised_values.pl                         |   23 +-
 installer/data/mysql/kohastructure.sql             |   11 +-
 installer/data/mysql/updatedatabase.pl             |   32 ++
 .../prog/en/modules/reports/dictionary.tt          |    4 +-
 .../en/modules/reports/guided_reports_start.tt     |  144 +++++-
 misc/cronjobs/runreport.pl                         |   22 +-
 opac/svc/report                                    |   48 +-
 reports/dictionary.pl                              |  292 ++++++------
 reports/guided_reports.pl                          |  482 +++++++++++---------
 svc/report                                         |   55 +--
 11 files changed, 949 insertions(+), 596 deletions(-)

diff --git a/C4/Reports/Guided.pm b/C4/Reports/Guided.pm
index e5c28f3..377a55a 100644
--- a/C4/Reports/Guided.pm
+++ b/C4/Reports/Guided.pm
@@ -26,7 +26,8 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 use C4::Context;
 use C4::Dates qw/format_date format_date_in_iso/;
 use C4::Templates qw/themelanguage/;
-use C4::Dates;
+use C4::Koha;
+use C4::Output;
 use XML::Simple;
 use XML::Dumper;
 use C4::Debug;
@@ -34,75 +35,82 @@ use C4::Debug;
 # use Data::Dumper;
 
 BEGIN {
-	# set the version for version checking
+    # set the version for version checking
     $VERSION = 3.07.00.049;
-	require Exporter;
-	@ISA = qw(Exporter);
-	@EXPORT = qw(
-		get_report_types get_report_areas get_columns build_query get_criteria
-	    save_report get_saved_reports execute_query get_saved_report create_compound run_compound
-		get_column_type get_distinct_values save_dictionary get_from_dictionary
-		delete_definition delete_report format_results get_sql
-        nb_rows update_sql
-	);
+    require Exporter;
+    @ISA    = qw(Exporter);
+    @EXPORT = qw(
+      get_report_types get_report_areas get_report_groups get_columns build_query get_criteria
+      save_report get_saved_reports execute_query get_saved_report create_compound run_compound
+      get_column_type get_distinct_values save_dictionary get_from_dictionary
+      delete_definition delete_report format_results get_sql
+      nb_rows update_sql build_authorised_value_list
+    );
 }
 
-our %table_areas;
-$table_areas{'1'} =
-  [ 'borrowers', 'statistics','items', 'biblioitems' ];    # circulation
-$table_areas{'2'} = [ 'items', 'biblioitems', 'biblio' ];   # catalogue
-$table_areas{'3'} = [ 'borrowers' ];        # patrons
-$table_areas{'4'} = ['aqorders', 'biblio', 'items'];        # acquisitions
-$table_areas{'5'} = [ 'borrowers', 'accountlines' ];        # accounts
-our %keys;
-$keys{'1'} = [
-    'statistics.borrowernumber=borrowers.borrowernumber',
-    'items.itemnumber = statistics.itemnumber',
-    'biblioitems.biblioitemnumber = items.biblioitemnumber'
-];
-$keys{'2'} = [
-    'items.biblioitemnumber=biblioitems.biblioitemnumber',
-    'biblioitems.biblionumber=biblio.biblionumber'
-];
-$keys{'3'} = [ ];
-$keys{'4'} = [
-	'aqorders.biblionumber=biblio.biblionumber',
-	'biblio.biblionumber=items.biblionumber'
-];
-$keys{'5'} = ['borrowers.borrowernumber=accountlines.borrowernumber'];
+=item get_report_areas()
 
-# have to do someting here to know if its dropdown, free text, date etc
+This will return a list of all the available report areas
 
-our %criteria;
-# reports on circulation
-$criteria{'1'} = [
-    'statistics.type',   'borrowers.categorycode',
-    'statistics.branch',
-    'biblioitems.publicationyear|date',
-    'items.dateaccessioned|date'
-];
-# reports on catalogue
-$criteria{'2'} =
-  [ 'items.itemnumber|textrange',   'items.biblionumber|textrange',   'items.barcode|textrange', 
-    'biblio.frameworkcode',         'items.holdingbranch',            'items.homebranch', 
-  'biblio.datecreated|daterange',   'biblio.timestamp|daterange',     'items.onloan|daterange', 
-  'items.ccode',                    'items.itemcallnumber|textrange', 'items.itype', 
-  'items.itemlost',                 'items.location' ];
-# reports on borrowers
-$criteria{'3'} = ['borrowers.branchcode', 'borrowers.categorycode'];
-# reports on acquisition
-$criteria{'4'} = ['aqorders.datereceived|date'];
-
-# reports on accounting
-$criteria{'5'} = ['borrowers.branchcode', 'borrowers.categorycode'];
+=cut
+
+my @REPORT_AREA = (
+    [CIRC => "Circulation"],
+    [CAT  => "Catalogue"],
+    [PAT  => "Patrons"],
+    [ACQ  => "Acquisition"],
+    [ACC  => "Accounts"],
+);
+my $AREA_NAME_SQL_SNIPPET
+  = "CASE report_area " .
+    join (" ", map "WHEN '$_->[0]' THEN '$_->[1]'", @REPORT_AREA) .
+    " END AS areaname";
+sub get_report_areas {
+    return \@REPORT_AREA
+}
+
+my %table_areas = (
+    CIRC => [ 'borrowers', 'statistics', 'items', 'biblioitems' ],
+    CAT  => [ 'items', 'biblioitems', 'biblio' ],
+    PAT  => ['borrowers'],
+    ACQ  => [ 'aqorders', 'biblio', 'items' ],
+    ACC  => [ 'borrowers', 'accountlines' ],
+);
+my %keys = (
+    CIRC => [ 'statistics.borrowernumber=borrowers.borrowernumber',
+              'items.itemnumber = statistics.itemnumber',
+              'biblioitems.biblioitemnumber = items.biblioitemnumber' ],
+    CAT  => [ 'items.biblioitemnumber=biblioitems.biblioitemnumber',
+              'biblioitems.biblionumber=biblio.biblionumber' ],
+    PAT  => [],
+    ACQ  => [ 'aqorders.biblionumber=biblio.biblionumber',
+              'biblio.biblionumber=items.biblionumber' ],
+    ACC  => ['borrowers.borrowernumber=accountlines.borrowernumber'],
+);
+
+# have to do someting here to know if its dropdown, free text, date etc
+my %criteria = (
+    CIRC => [ 'statistics.type', 'borrowers.categorycode', 'statistics.branch',
+              'biblioitems.publicationyear|date', 'items.dateaccessioned|date' ],
+    CAT  => [ 'items.itemnumber|textrange', 'items.biblionumber|textrange',
+              'items.barcode|textrange', 'biblio.frameworkcode',
+              'items.holdingbranch', 'items.homebranch',
+              'biblio.datecreated|daterange', 'biblio.timestamp|daterange',
+              'items.onloan|daterange', 'items.ccode',
+              'items.itemcallnumber|textrange', 'items.itype', 'items.itemlost',
+              'items.location' ],
+    PAT  => [ 'borrowers.branchcode', 'borrowers.categorycode' ],
+    ACQ  => ['aqorders.datereceived|date'],
+    ACC  => [ 'borrowers.branchcode', 'borrowers.categorycode' ],
+);
 
 # Adds itemtypes to criteria, according to the syspref
-if (C4::Context->preference('item-level_itypes')) {
-    unshift @{ $criteria{'1'} }, 'items.itype';
-    unshift @{ $criteria{'2'} }, 'items.itype';
+if ( C4::Context->preference('item-level_itypes') ) {
+    unshift @{ $criteria{'CIRC'} }, 'items.itype';
+    unshift @{ $criteria{'CAT'} }, 'items.itype';
 } else {
-    unshift @{ $criteria{'1'} }, 'biblioitems.itemtype';
-    unshift @{ $criteria{'2'} }, 'biblioitems.itemtype';
+    unshift @{ $criteria{'CIRC'} }, 'biblioitems.itemtype';
+    unshift @{ $criteria{'CAT'} }, 'biblioitems.itemtype';
 }
 
 =head1 NAME
@@ -145,26 +153,33 @@ sub get_report_types {
 
 }
 
-=item get_report_areas()
+=item get_report_groups()
 
-This will return a list of all the available report areas
+This will return a list of all the available report areas with groups
 
 =cut
 
-sub get_report_areas {
+sub get_report_groups {
     my $dbh = C4::Context->dbh();
 
-    # FIXME these should be in the database
-    my @reports = ( 'Circulation', 'Catalog', 'Patrons', 'Acquisitions', 'Accounts');
-    my @reports2;
-    for ( my $i = 0 ; $i < 5 ; $i++ ) {
-        my %hashrep;
-        $hashrep{id}   = $i + 1;
-        $hashrep{name} = $reports[$i];
-        push @reports2, \%hashrep;
+    my $groups = GetAuthorisedValues('REPORT_GROUP');
+    my $subgroups = GetAuthorisedValues('REPORT_SUBGROUP');
+
+    my %groups_with_subgroups = map { $_->{authorised_value} => {
+                        name => $_->{lib},
+                        groups => {}
+                    } } @$groups;
+    foreach (@$subgroups) {
+        my $sg = $_->{authorised_value};
+        my $g = $_->{lib_opac}
+          or warn( qq{REPORT_SUBGROUP "$sg" without REPORT_GROUP (lib_opac)} ),
+             next;
+        my $g_sg = $groups_with_subgroups{$g}
+          or warn( qq{REPORT_SUBGROUP "$sg" with invalid REPORT_GROUP "$g"} ),
+             next;
+        $g_sg->{subgroups}{$sg} = $_->{lib};
     }
-    return ( \@reports2 );
-
+    return \%groups_with_subgroups
 }
 
 =item get_all_tables()
@@ -196,8 +211,10 @@ This will return a list of all columns for a report area
 sub get_columns {
 
     # this calls the internal fucntion _get_columns
-    my ($area,$cgi) = @_;
-    my $tables = $table_areas{$area};
+    my ( $area, $cgi ) = @_;
+    my $tables = $table_areas{$area}
+      or die qq{Unsuported report area "$area"};
+
     my @allcolumns;
     my $first = 1;
     foreach my $table (@$tables) {
@@ -383,7 +400,7 @@ sub nb_rows($) {
 
 =item execute_query
 
-  ($results, $total, $error) = execute_query($sql, $offset, $limit)
+  ($results, $error) = execute_query($sql, $offset, $limit)
 
 
 When passed C<$sql>, this function returns an array ref containing a result set
@@ -505,37 +522,47 @@ Returns id of the newly created report
 =cut
 
 sub save_report {
-    my ( $borrowernumber, $sql, $name, $type, $notes, $cache_expiry, $public ) = @_;
-    $cache_expiry ||= 300;
+    my ($fields) = @_;
+    my $borrowernumber = $fields->{borrowernumber};
+    my $sql = $fields->{sql};
+    my $name = $fields->{name};
+    my $type = $fields->{type};
+    my $notes = $fields->{notes};
+    my $area = $fields->{area};
+    my $group = $fields->{group};
+    my $subgroup = $fields->{subgroup};
+    my $cache_expiry = $fields->{cache_expiry} || 300;
+    my $public = $fields->{public};
+
     my $dbh = C4::Context->dbh();
-    $sql =~ s/(\s*\;\s*)$//; # removes trailing whitespace and /;/
-    my $query =
-"INSERT INTO saved_sql (borrowernumber,date_created,last_modified,savedsql,report_name,type,notes,cache_expiry, public)  VALUES (?,now(),now(),?,?,?,?,?,?)";
-    $dbh->do( $query, undef, $borrowernumber, $sql, $name, $type, $notes, $cache_expiry, $public );
+    $sql =~ s/(\s*\;\s*)$//;    # removes trailing whitespace and /;/
+    my $query = "INSERT INTO saved_sql (borrowernumber,date_created,last_modified,savedsql,report_name,report_area,report_group,report_subgroup,type,notes,cache_expiry,public)  VALUES (?,now(),now(),?,?,?,?,?,?,?,?,?)";
+    $dbh->do($query, undef, $borrowernumber, $sql, $name, $area, $group, $subgroup, $type, $notes, $cache_expiry, $public);
+
     my $id = $dbh->selectrow_array("SELECT max(id) FROM saved_sql WHERE borrowernumber=? AND report_name=?", undef,
                                    $borrowernumber, $name);
     return $id;
 }
 
 sub update_sql {
-    my $id = shift || croak "No Id given";
-    my $sql = shift;
-    my $reportname = shift;
-    my $notes = shift;
-    my $cache_expiry = shift;
-    my $public = shift;
-
-    # not entirely a magic number, Cache::Memcached::Set assumed any expiry >= (60*60*24*30) is an absolute unix timestamp (rather than relative seconds)
+    my $id         = shift || croak "No Id given";
+    my $fields     = shift;
+    my $sql = $fields->{sql};
+    my $name = $fields->{name};
+    my $notes = $fields->{notes};
+    my $group = $fields->{group};
+    my $subgroup = $fields->{subgroup};
+    my $cache_expiry = $fields->{cache_expiry};
+    my $public = $fields->{public};
+
     if( $cache_expiry >= 2592000 ){
       die "Please specify a cache expiry less than 30 days\n";
     }
 
-    my $dbh = C4::Context->dbh();
-    $sql =~ s/(\s*\;\s*)$//; # removes trailing whitespace and /;/
-    my $query = "UPDATE saved_sql SET savedsql = ?, last_modified = now(), report_name = ?, notes = ?, cache_expiry = ?, public = ? WHERE id = ? ";
-    my $sth = $dbh->prepare($query);
-    $sth->execute( $sql, $reportname, $notes, $cache_expiry, $public, $id );
-    $sth->finish();
+    my $dbh        = C4::Context->dbh();
+    $sql =~ s/(\s*\;\s*)$//;    # removes trailing whitespace and /;/
+    my $query = "UPDATE saved_sql SET savedsql = ?, last_modified = now(), report_name = ?, report_group = ?, report_subgroup = ?, notes = ?, cache_expiry = ?, public = ? WHERE id = ? ";
+    $dbh->do($query, undef, $sql, $name, $group, $subgroup, $notes, $cache_expiry, $public, $id );
 }
 
 sub store_results {
@@ -582,30 +609,34 @@ sub format_results {
 }	
 
 sub delete_report {
-	my ( $id ) = @_;
-	my $dbh = C4::Context->dbh();
-	my $query = "DELETE FROM saved_sql WHERE id = ?";
-	my $sth = $dbh->prepare($query);
-	$sth->execute($id);
+    my ($id)  = @_;
+    my $dbh   = C4::Context->dbh();
+    my $query = "DELETE FROM saved_sql WHERE id = ?";
+    my $sth   = $dbh->prepare($query);
+    $sth->execute($id);
 }	
 
-# $filter is either { date => $d, author => $a, keyword => $kw }
-# or $keyword. Optional.
+
+my $SAVED_REPORTS_BASE_QRY = <<EOQ;
+SELECT s.*, r.report, r.date_run, $AREA_NAME_SQL_SNIPPET, av_g.lib AS groupname, av_sg.lib AS subgroupname,
+b.firstname AS borrowerfirstname, b.surname AS borrowersurname
+FROM saved_sql s
+LEFT JOIN saved_reports r ON r.report_id = s.id
+LEFT OUTER JOIN authorised_values av_g ON (av_g.category = 'REPORT_GROUP' AND av_g.authorised_value = s.report_group)
+LEFT OUTER JOIN authorised_values av_sg ON (av_sg.category = 'REPORT_SUBGROUP' AND av_sg.lib_opac = s.report_group AND av_sg.authorised_value = s.report_subgroup)
+LEFT OUTER JOIN borrowers b USING (borrowernumber)
+EOQ
 my $DATE_FORMAT = "%d/%m/%Y";
 sub get_saved_reports {
+# $filter is either { date => $d, author => $a, keyword => $kw, }
+# or $keyword. Optional.
     my ($filter) = @_;
     $filter = { keyword => $filter } if $filter && !ref( $filter );
+    my ($group, $subgroup) = @_;
 
     my $dbh   = C4::Context->dbh();
+    my $query = $SAVED_REPORTS_BASE_QRY;
     my (@cond, at args);
-    my $query = "SELECT saved_sql.id, report_id, report,
-                        date_run, date_created, last_modified, savedsql, last_run,
-                        report_name, type, notes,
-                        borrowernumber, surname as borrowersurname, firstname as borrowerfirstname,
-                        cache_expiry, public
-                 FROM saved_sql 
-                 LEFT JOIN saved_reports ON saved_reports.report_id = saved_sql.id
-                 LEFT OUTER JOIN borrowers USING (borrowernumber)";
     if ($filter) {
         if (my $date = $filter->{date}) {
             $date = format_date_in_iso($date);
@@ -629,6 +660,14 @@ sub get_saved_reports {
                          savedsql LIKE ?";
             push @args, $keyword, $keyword, $keyword, $keyword;
         }
+        if ($filter->{group}) {
+            push @cond, "report_group = ?";
+            push @args, $filter->{group};
+        }
+        if ($filter->{subgroup}) {
+            push @cond, "report_subgroup = ?";
+            push @args, $filter->{subgroup};
+        }
     }
     $query .= " WHERE ".join( " AND ", map "($_)", @cond ) if @cond;
     $query .= " ORDER by date_created";
@@ -642,7 +681,6 @@ sub get_saved_reports {
 sub get_saved_report {
     my $dbh   = C4::Context->dbh();
     my $query;
-    my $sth;
     my $report_arg;
     if ($#_ == 0 && ref $_[0] ne 'HASH') {
         ($report_arg) = @_;
@@ -661,10 +699,7 @@ sub get_saved_report {
     } else {
         return;
     }
-    $sth   = $dbh->prepare($query);
-    $sth->execute($report_arg);
-    my $data = $sth->fetchrow_hashref();
-    return ( $data->{'savedsql'}, $data->{'type'}, $data->{'report_name'}, $data->{'notes'}, $data->{'cache_expiry'}, $data->{'public'}, $data->{'id'} );
+    return $dbh->selectrow_hashref($query, undef, $report_arg);
 }
 
 =item create_compound($masterID,$subreportID)
@@ -674,22 +709,27 @@ This will take 2 reports and create a compound report using both of them
 =cut
 
 sub create_compound {
-	my ($masterID,$subreportID) = @_;
-	my $dbh = C4::Context->dbh();
-	# get the reports
-	my ($mastersql,$mastertype) = get_saved_report($masterID);
-	my ($subsql,$subtype) = get_saved_report($subreportID);
-	
-	# now we have to do some checking to see how these two will fit together
-	# or if they will
-	my ($mastertables,$subtables);
-	if ($mastersql =~ / from (.*) where /i){ 
-		$mastertables = $1;
-	}
-	if ($subsql =~ / from (.*) where /i){
-		$subtables = $1;
-	}
-	return ($mastertables,$subtables);
+    my ( $masterID, $subreportID ) = @_;
+    my $dbh = C4::Context->dbh();
+
+    # get the reports
+    my $master = get_saved_report($masterID);
+    my $mastersql = $master->{savedsql};
+    my $mastertype = $master->{type};
+    my $sub = get_saved_report($subreportID);
+    my $subsql = $master->{savedsql};
+    my $subtype = $master->{type};
+
+    # now we have to do some checking to see how these two will fit together
+    # or if they will
+    my ( $mastertables, $subtables );
+    if ( $mastersql =~ / from (.*) where /i ) {
+        $mastertables = $1;
+    }
+    if ( $subsql =~ / from (.*) where /i ) {
+        $subtables = $1;
+    }
+    return ( $mastertables, $subtables );
 }
 
 =item get_column_type($column)
@@ -739,43 +779,41 @@ sub get_distinct_values {
 }	
 
 sub save_dictionary {
-	my ($name,$description,$sql,$area) = @_;
-	my $dbh = C4::Context->dbh();
-	my $query = "INSERT INTO reports_dictionary (name,description,saved_sql,area,date_created,date_modified)
+    my ( $name, $description, $sql, $area ) = @_;
+    my $dbh   = C4::Context->dbh();
+    my $query = "INSERT INTO reports_dictionary (name,description,saved_sql,report_area,date_created,date_modified)
   VALUES (?,?,?,?,now(),now())";
     my $sth = $dbh->prepare($query);
     $sth->execute($name,$description,$sql,$area) || return 0;
     return 1;
 }
 
+my $DICTIONARY_BASE_QRY = <<EOQ;
+SELECT d.*, $AREA_NAME_SQL_SNIPPET
+FROM reports_dictionary d
+EOQ
 sub get_from_dictionary {
-	my ($area,$id) = @_;
-	my $dbh = C4::Context->dbh();
-	my $query = "SELECT * FROM reports_dictionary";
-	if ($area){
-		$query.= " WHERE area = ?";
-	}
-	elsif ($id){
-		$query.= " WHERE id = ?"
-	}
-	my $sth = $dbh->prepare($query);
-	if ($id){
-		$sth->execute($id);
-	}
-	elsif ($area) {
-		$sth->execute($area);
-	}
-	else {
-		$sth->execute();
-	}
-	my @loop;
-	my @reports = ( 'Circulation', 'Catalog', 'Patrons', 'Acquisitions', 'Accounts');
-	while (my $data = $sth->fetchrow_hashref()){
-		$data->{'areaname'}=$reports[$data->{'area'}-1];
-		push @loop,$data;
-		
-	}
-	return (\@loop);
+    my ( $area, $id ) = @_;
+    my $dbh   = C4::Context->dbh();
+    my $query = $DICTIONARY_BASE_QRY;
+    if ($area) {
+        $query .= " WHERE report_area = ?";
+    } elsif ($id) {
+        $query .= " WHERE id = ?";
+    }
+    my $sth = $dbh->prepare($query);
+    if ($id) {
+        $sth->execute($id);
+    } elsif ($area) {
+        $sth->execute($area);
+    } else {
+        $sth->execute();
+    }
+    my @loop;
+    while ( my $data = $sth->fetchrow_hashref() ) {
+        push @loop, $data;
+    }
+    return ( \@loop );
 }
 
 sub delete_definition {
@@ -815,6 +853,72 @@ sub _get_column_defs {
 	close COLUMNS;
 	return \%columns;
 }
+
+=item build_authorised_value_list($authorised_value)
+
+Returns an arrayref - hashref pair. The hashref consists of
+various code => name lists depending on the $authorised_value.
+The arrayref is the hashref keys, in appropriate order
+
+=cut
+
+sub build_authorised_value_list {
+    my ( $authorised_value ) = @_;
+
+    my $dbh = C4::Context->dbh;
+    my @authorised_values;
+    my %authorised_lib;
+
+    # builds list, depending on authorised value...
+    if ( $authorised_value eq "branches" ) {
+        my $branches = GetBranchesLoop();
+        foreach my $thisbranch (@$branches) {
+            push @authorised_values, $thisbranch->{value};
+            $authorised_lib{ $thisbranch->{value} } = $thisbranch->{branchname};
+        }
+    } elsif ( $authorised_value eq "itemtypes" ) {
+        my $sth = $dbh->prepare("SELECT itemtype,description FROM itemtypes ORDER BY description");
+        $sth->execute;
+        while ( my ( $itemtype, $description ) = $sth->fetchrow_array ) {
+            push @authorised_values, $itemtype;
+            $authorised_lib{$itemtype} = $description;
+        }
+    } elsif ( $authorised_value eq "cn_source" ) {
+        my $class_sources  = GetClassSources();
+        my $default_source = C4::Context->preference("DefaultClassificationSource");
+        foreach my $class_source ( sort keys %$class_sources ) {
+            next
+              unless $class_sources->{$class_source}->{'used'}
+                  or ( $class_source eq $default_source );
+            push @authorised_values, $class_source;
+            $authorised_lib{$class_source} = $class_sources->{$class_source}->{'description'};
+        }
+    } elsif ( $authorised_value eq "categorycode" ) {
+        my $sth = $dbh->prepare("SELECT categorycode, description FROM categories ORDER BY description");
+        $sth->execute;
+        while ( my ( $categorycode, $description ) = $sth->fetchrow_array ) {
+            push @authorised_values, $categorycode;
+            $authorised_lib{$categorycode} = $description;
+        }
+
+        #---- "true" authorised value
+    } else {
+        my $authorised_values_sth = $dbh->prepare("SELECT authorised_value,lib FROM authorised_values WHERE category=? ORDER BY lib");
+
+        $authorised_values_sth->execute($authorised_value);
+
+        while ( my ( $value, $lib ) = $authorised_values_sth->fetchrow_array ) {
+            push @authorised_values, $value;
+            $authorised_lib{$value} = $lib;
+
+            # For item location, we show the code and the libelle
+            $authorised_lib{$value} = $lib;
+        }
+    }
+
+    return (\@authorised_values, \%authorised_lib);
+}
+
 1;
 __END__
 
diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl
index 949e488..17917ce 100755
--- a/admin/authorised_values.pl
+++ b/admin/authorised_values.pl
@@ -188,17 +188,18 @@ output_html_with_http_headers $input, $cookie, $template->output;
 exit 0;
 
 sub default_form {
-	# build categories list
-	my $sth = $dbh->prepare("select distinct category from authorised_values");
-	$sth->execute;
-	my @category_list;
-	my %categories;     # a hash, to check that some hardcoded categories exist.
-	while ( my ($category) = $sth->fetchrow_array) {
-		push(@category_list,$category);
-		$categories{$category} = 1;
-	}
-	# push koha system categories
-    foreach (qw(Asort1 Asort2 Bsort1 Bsort2 SUGGEST DAMAGED LOST)) {
+    # build categories list
+    my $sth = $dbh->prepare("select distinct category from authorised_values");
+    $sth->execute;
+    my @category_list;
+    my %categories;    # a hash, to check that some hardcoded categories exist.
+    while ( my ($category) = $sth->fetchrow_array ) {
+        push( @category_list, $category );
+        $categories{$category} = 1;
+    }
+
+    # push koha system categories
+    foreach (qw(Asort1 Asort2 Bsort1 Bsort2 SUGGEST DAMAGED LOST REPORT_GROUP REPORT_SUBGROUP)) {
         push @category_list, $_ unless $categories{$_};
     }
 
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 91d42a2..ff1c0f1 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -97,7 +97,7 @@ CREATE TABLE `auth_types` (
 DROP TABLE IF EXISTS `authorised_values`;
 CREATE TABLE `authorised_values` ( -- stores values for authorized values categories and values
   `id` int(11) NOT NULL auto_increment, -- unique key, used to identify the authorized value
-  `category` varchar(10) NOT NULL default '', -- key used to identify the authorized value category
+  `category` varchar(16) NOT NULL default '', -- key used to identify the authorized value category
   `authorised_value` varchar(80) NOT NULL default '', -- code use to identify the authorized value
   `lib` varchar(80) default NULL, -- authorized value description as printed in the staff client
   `lib_opac` VARCHAR(80) default NULL, -- authorized value description as printed in the OPAC
@@ -1626,8 +1626,9 @@ CREATE TABLE reports_dictionary ( -- definitions (or snippets of SQL) stored for
    `date_created` datetime default NULL, -- date and time this definition was created
    `date_modified` datetime default NULL, -- date and time this definition was last modified
    `saved_sql` text, -- SQL snippet for us in reports
-   `area` int(11) default NULL, -- Koha module this definition is for (1 = Circulation, 2 = Catalog, 3 = Patrons, 4 = Acquistions, 5 = Accounts)
-   PRIMARY KEY  (`id`)
+   report_area varchar(6) DEFAULT NULL, -- Koha module this definition is for Circulation, Catalog, Patrons, Acquistions, Accounts)
+   PRIMARY KEY  (id),
+   KEY dictionary_area_idx (report_area)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
@@ -1725,7 +1726,11 @@ CREATE TABLE saved_sql ( -- saved sql reports
    `notes` text, -- the notes or description given to this report
    `cache_expiry` int NOT NULL default 300,
    `public` boolean NOT NULL default FALSE,
+    report_area varchar(6) default NULL,
+    report_group varchar(80) default NULL,
+    report_subgroup varchar(80) default NULL,
    PRIMARY KEY  (`id`),
+   KEY sql_area_group_idx (report_group, report_subgroup),
    KEY boridx (`borrowernumber`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 25cd367..3f713eb 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -5696,6 +5696,38 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion($DBversion);
 }
 
+
+
+$DBversion = "3.09.00.XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("ALTER TABLE authorised_values MODIFY category varchar(16) NOT NULL DEFAULT '';");
+    $dbh->do("INSERT INTO authorised_values (category, authorised_value, lib) VALUES
+              ('REPORT_GROUP', 'CIRC', 'Circulation'),
+              ('REPORT_GROUP', 'CAT', 'Catalog'),
+              ('REPORT_GROUP', 'PAT', 'Patrons'),
+              ('REPORT_GROUP', 'ACQ', 'Acquisitions'),
+              ('REPORT_GROUP', 'ACC', 'Accounts');");
+
+    $dbh->do("ALTER TABLE reports_dictionary ADD report_area varchar(6) DEFAULT NULL;");
+    $dbh->do("UPDATE reports_dictionary SET report_area = CASE area
+                  WHEN 1 THEN 'CIRC'
+                  WHEN 2 THEN 'CAT'
+                  WHEN 3 THEN 'PAT'
+                  WHEN 4 THEN 'ACQ'
+                  WHEN 5 THEN 'ACC'
+                  END;");
+    $dbh->do("ALTER TABLE reports_dictionary DROP area;");
+    $dbh->do("ALTER TABLE reports_dictionary ADD KEY dictionary_area_idx (report_area);");
+
+    $dbh->do("ALTER TABLE saved_sql ADD report_area varchar(6) DEFAULT NULL;");
+    $dbh->do("ALTER TABLE saved_sql ADD report_group varchar(80) DEFAULT NULL;");
+    $dbh->do("ALTER TABLE saved_sql ADD report_subgroup varchar(80) DEFAULT NULL;");
+    $dbh->do("ALTER TABLE saved_sql ADD KEY sql_area_group_idx (report_group, report_subgroup);");
+
+    print "Upgrade to $DBversion done saved_sql new fields report_group and report_area; authorised_values.category 16 char \n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
index 102a6ee..2e15834 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
@@ -33,7 +33,7 @@
 		<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
         <input type="hidden" name="phase" value="View Dictionary" />
 		[% IF ( areas ) %]
-			Filter by area <select name="areas">
+			Filter by area <select name="area">
 			<option value="">All</option>
 			[% FOREACH area IN areas %]
 			    [% IF ( area.selected ) %]
@@ -103,7 +103,7 @@
 <ol><li><input type="hidden" name="phase" value="New Term step 3" />
 <input type="hidden" name="definition_name" value="[% definition_name %]" />
 <input type="hidden" name="definition_description" value="[% definition_description %]" />
-<label for="areas">Select table </label><select name="areas" id="areas">
+<label for="area">Select table </label><select name="area" id="area">
 [% FOREACH area IN areas %]     
 <option value="[% area.id %]">[% area.name %]</option>                  
 [% END %]                
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
index 21d8235..aa6a627 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -24,6 +24,25 @@
 
 <script type="text/javascript">
 //<![CDATA[
+var group_subgroups = {};
+var no_subgroup_label = _( "(None)" );
+function load_group_subgroups () {
+    var group = $("#group").val();
+    var sg = $("#subgroup");
+    var has_subgroups = false;
+    $(sg).empty().append('<option value="">' + no_subgroup_label + '</option>');
+    if (group) {
+        $.each( group_subgroups[group], function(index, value) {
+                has_subgroups = true;
+            $('<option value="' + value[0] + '">' + value[1] + '</option>').appendTo(sg);
+        } );
+    }
+    if (has_subgroups) {
+        $(sg).show();
+    } else {
+        $(sg).hide();
+    }
+}
 $(document).ready(function(){
 [% IF ( showsql ) %]
     $("#sql").focus(function() {
@@ -138,6 +157,9 @@ canned reports and writing custom SQL reports.</p>
   <th>ID</th>
   <th>Report name</th>
   <th>Type</th>
+  <th>Area</th>
+  <th>Group</th>
+  <th>Subgroup</th>
   <th>Notes</th>
   <th>Author</th>
   <th>Creation date</th>
@@ -155,6 +177,9 @@ canned reports and writing custom SQL reports.</p>
 <td>[% savedreport.id %]</td>
 <td>[% savedreport.report_name %]</td>
 <td>[% savedreport.type %]</td>
+<td>[% savedreport.areaname %]</td>
+<td>[% savedreport.groupname %]</td>
+<td>[% savedreport.subgroupname %]</td>
 <td>[% savedreport.notes %]</td>
 <td>[% savedreport.borrowersurname %][% IF ( savedreport.borrowerfirstname ) %], [% savedreport.borrowerfirstname %][% END %] ([% savedreport.borrowernumber %])</td>
 <td>[% savedreport.date_created %]</td>
@@ -219,7 +244,7 @@ canned reports and writing custom SQL reports.</p>
 <form action="/cgi-bin/koha/reports/guided_reports.pl">
 <fieldset class="rows">
 <legend>Step 1 of 6: Choose a module to report on,[% IF (usecache) %] Set cache expiry, [% END %] and Choose report visibility </legend>
-<ol><li><label for="areas">Choose: </label><select name="areas" id="areas">
+<ol><li><label for="area">Choose: </label><select name="area" id="area">
 [% FOREACH area IN areas %]
 <option value="[% area.id %]">[% area.name %]</option>
 [% END %]
@@ -485,12 +510,38 @@ canned reports and writing custom SQL reports.</p>
 <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
 <input type="hidden" name="sql" value="[% sql |html %]" />
 <input type="hidden" name="type" value="[% type %]" />
+<input type="hidden" name="area" value="[% area %]" />
 <input type="hidden" name="public" value="[% public %]" />
 <input type="hidden" name="cache_expiry" value="[% cache_expiry %]" />
 <fieldset class="rows">
 <legend>Save your custom report</legend>
 <ol>
     <li><label for="reportname">Report name: </label><input type="text" id="reportname" name="reportname" /></li>
+    [% IF groups_with_subgroups %]
+    <li><label for="group">Report group: </label><select name="group" id="group" onChange="load_group_subgroups();">
+        [% FOR g IN groups_with_subgroups %]
+            [% IF g.selected %]
+    <option value="[% g.id %]" selected>[% g.name %]</option>
+            [% ELSE %]
+    <option value="[% g.id %]">[% g.name %]</option>
+            [% END %]
+    <script type="text/javascript">
+        var g_sg = new Array();
+            [% FOR sg IN g.subgroups %]
+        g_sg.push(["[% sg.id %]", "[% sg.name %]"]);
+                [% IF sg.selected %]
+        $(document).ready(function() {
+            $("#subgroup").val("[% sg.id %]");
+        });
+                [% END %]
+            [% END %]
+        group_subgroups["[% g.id %]"] = g_sg;
+    </script>
+        [% END %]
+    </select></li>
+    <li><label for="subgroup">Report subgroup: </label><select name="subgroup" id="subgroup">
+    </select></li>
+    [% END %]
     <li><label for="notes">Notes:</label> <textarea name="notes" id="notes"></textarea></li>
 </ol></fieldset>
 <fieldset class="action"><input type="hidden" name="phase" value="Save Report" />
@@ -553,6 +604,11 @@ canned reports and writing custom SQL reports.</p>
 [% END %]
 
 [% IF ( create ) %]
+<script type="text/javascript">
+$(document).ready(function() {
+    load_group_subgroups();
+});
+</script>
 <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
 <fieldset class="rows">
 <legend>Create report from SQL</legend>
@@ -561,6 +617,31 @@ canned reports and writing custom SQL reports.</p>
         [% IF ( reportname ) %]<input type="text" id="reportname" name="reportname" value="[% reportname %]" />
         [% ELSE %]<input type="text" id="reportname" name="reportname" />[% END %] 
     </li>
+    [% IF groups_with_subgroups %]
+    <li><label for="group">Report group: </label><select name="group" id="group" onChange="load_group_subgroups();">
+        [% FOR g IN groups_with_subgroups %]
+            [% IF g.selected %]
+    <option value="[% g.id %]" selected>[% g.name %]</option>
+            [% ELSE %]
+    <option value="[% g.id %]">[% g.name %]</option>
+            [% END %]
+    <script type="text/javascript">
+        var g_sg = new Array();
+            [% FOR sg IN g.subgroups %]
+        g_sg.push(["[% sg.id %]", "[% sg.name %]"]);
+                [% IF sg.selected %]
+        $(document).ready(function() {
+            $("#subgroup").val("[% sg.id %]");
+        });
+                [% END %]
+            [% END %]
+        group_subgroups["[% g.id %]"] = g_sg;
+    </script>
+        [% END %]
+    </select></li>
+    <li><label for="subgroup">Report subgroup: </label><select name="subgroup" id="subgroup">
+    </select></li>
+    [% END %]
 [% IF (public) %]
   <li><label for="public">Report is public:</label><select id="public" name="public"> <option value="0">No (default)</option> <option value="1" selected="selected">Yes</public> </select></li>
 [% ELSE %]
@@ -645,6 +726,11 @@ Sub report:<select name="subreport">
 [% END %]
 
 [% IF ( editsql ) %]
+<script type="text/javascript">
+$(document).ready(function() {
+    load_group_subgroups();
+});
+</script>
 <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
 <input type="hidden" name="phase" value="Update SQL" />
 <input type="hidden" name="id" value="[% id %]"/>
@@ -652,6 +738,31 @@ Sub report:<select name="subreport">
 <legend>Edit SQL report</legend>
 <ol>
 <li><label for="reportname">Report name:</label><input type="text" id="reportname" name="reportname" value="[% reportname %]" size="50" /></li>
+    [% IF groups_with_subgroups %]
+    <li><label for="group">Report group: </label><select name="group" id="group" onChange="load_group_subgroups();">
+        [% FOR g IN groups_with_subgroups %]
+            [% IF g.selected %]
+    <option value="[% g.id %]" selected>[% g.name %]</option>
+            [% ELSE %]
+    <option value="[% g.id %]">[% g.name %]</option>
+            [% END %]
+    <script type="text/javascript">
+        var g_sg = new Array();
+            [% FOR sg IN g.subgroups %]
+        g_sg.push(["[% sg.id %]", "[% sg.name %]"]);
+                [% IF sg.selected %]
+        $(document).ready(function() {
+            $("#subgroup").val("[% sg.id %]");
+        });
+                [% END %]
+            [% END %]
+        group_subgroups["[% g.id %]"] = g_sg;
+    </script>
+        [% END %]
+    </select></li>
+    <li><label for="subgroup">Report subgroup: </label><select name="subgroup" id="subgroup">
+    </select></li>
+    [% END %]
 [% IF (public) %]
   <li><label for="public">Report is public:</label><select id="public" name="public"> <option value="0">No (default)</option> <option value="1" selected="selected">Yes</public> </select></li>
 [% ELSE %]
@@ -719,12 +830,43 @@ Sub report:<select name="subreport">
 
 [% IF ( saved1 ) %]
 <div id="saved-reports-filter">
+<script type="text/javascript">
+$(document).ready(function() {
+    no_subgroup_label = _( "-- All --" );
+    load_group_subgroups();
+});
+</script>
 <form action="/cgi-bin/koha/reports/guided_reports.pl" method="get">
   <input type="hidden" name="phase" value="Use saved" />
   <input type="hidden" name="filter_set" value="1" />
   <fieldset class="brief">
   <h3>Filter</h3>
   <ol>
+    <li><label for="group">Choose Group and Subgroup: </label>
+    <select name="group" id="group" onChange="load_group_subgroups();">
+        <option value="">-- All --</option>
+    [% FOR g IN groups_with_subgroups %]
+        [% IF g.selected %]
+        <option value="[% g.id %]" selected>[% g.name %]</option>
+        [% ELSE %]
+        <option value="[% g.id %]">[% g.name %]</option>
+        [% END %]
+        <script type="text/javascript">
+            var g_sg = new Array();
+        [% FOR sg IN g.subgroups %]
+            g_sg.push(["[% sg.id %]", "[% sg.name %]"]);
+            [% IF sg.selected %]
+            $(document).ready(function() {
+                $("#subgroup").val("[% sg.id %]");
+            });
+            [% END %]
+        [% END %]
+            group_subgroups["[% g.id %]"] = g_sg;
+        </script>
+    [% END %]
+    </select>
+    <select name="subgroup" id="subgroup"></select>
+    </li>
     <li><label for="filter_date">Date:</label> <input type="text" id="filter_date" name="filter_date" size="10" value="[% filter_date %]" class="datepicker" />
     <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
 
diff --git a/misc/cronjobs/runreport.pl b/misc/cronjobs/runreport.pl
index 6a8cce7..690f216 100755
--- a/misc/cronjobs/runreport.pl
+++ b/misc/cronjobs/runreport.pl
@@ -186,14 +186,26 @@ unless (scalar(@ARGV)) {
 ($verbose) and print scalar(@ARGV), " argument(s) after options: " . join(" ", @ARGV) . "\n";
 
 
-foreach my $report (@ARGV) {
-    my ($sql, $type) = get_saved_report($report);
-    unless ($sql) {
-        carp "ERROR: No saved report $report found";
+foreach my $report_id (@ARGV) {
+    my $report = get_saved_report($report_id);
+    unless ($report) {
+        warn "ERROR: No saved report $report_id found";
         next;
     }
+    my $sql         => $report->{savedsql};
+    my $report_name => $report->{report_name};
+    my $type        => $report->{type};
+
     $verbose and print "SQL: $sql\n\n";
-    # my $results = execute_query($sql, undef, 0, 99999, $format, $report); 
+    if (defined($report_name) and $report_name ne "")
+    {
+        $subject = $report_name ;
+    }
+    else
+    {
+        $subject = 'Koha Saved Report';
+    }
+    # my $results = execute_query($sql, undef, 0, 99999, $format, $report_id);
     my ($sth) = execute_query($sql);
     # execute_query(sql, , 0, 20, , )
     my $count = scalar($sth->rows);
diff --git a/opac/svc/report b/opac/svc/report
index 86b7a00..38cbd42 100755
--- a/opac/svc/report
+++ b/opac/svc/report
@@ -31,38 +31,34 @@ my $query  = CGI->new();
 my $report_id = $query->param('id');
 my $report_name = $query->param('name');
 
-my $cache;
-my $sql;
-my $type;
-my $notes;
-my $cache_expiry;
-my $public;
+my $report_rec = get_saved_report( $report_name ? { 'name' => $report_name } : { 'id' => $report_id } );
+die "Sorry this report is not public\n" unless $report_rec->{public};
 
-( $sql, $type, $report_name, $notes, $cache_expiry, $public, $report_id ) =
-  get_saved_report($report_name ? { 'name' => $report_name } : { 'id' => $report_id } );
-die "Sorry this report is not public\n" unless $public;
 
-if (Koha::Cache->is_cache_active) {
-    $cache = Koha::Cache->new(
-    );
-    my $page = $cache->get_from_cache("opac:report:$report_id");
-    if ($page) {
-        print $query->header;
-        print $page;
-        exit;
-    }
+my $cache_active = Koha::Cache->is_cache_active;
+my ($cache_key, $cache, $json_text);
+if ($cache_active) {
+    $cache_key = "opac:report:".($report_name ? "name:$report_name" : "id:$report_id");
+    $cache = Koha::Cache->new();
+    $json_text = $cache->get_from_cache($cache_key);
 }
 
-print $query->header;
-if ($sql) {
+unless ($json_text) {
     my $offset = 0;
     my $limit  = C4::Context->preference("SvcMaxReportRows") || 10;
-    my ( $sth, $errors ) = execute_query( $sql, $offset, $limit );
-    my $lines     = $sth->fetchall_arrayref;
-    my $json_text = to_json($lines);
-    print $json_text;
+    my ( $sth, $errors ) = execute_query( $report_rec->{savedsql}, $offset, $limit );
+    if ($sth) {
+        my $lines     = $sth->fetchall_arrayref;
+        $json_text = to_json($lines);
 
-    if (Koha::Cache->is_cache_active) {
-        $cache->set_in_cache( "opac:report:$report_id", $json_text, $cache_expiry );
+        if ($cache_active) {
+            $cache->set_in_cache( $cache_key, $json_text, $report_rec->{cache_expiry} );
+        }
+    }
+    else {
+        $json_text = to_json($errors);
     }
 }
+
+print $query->header;
+print $json_text;
diff --git a/reports/dictionary.pl b/reports/dictionary.pl
index 4f94d69..aae96c9 100755
--- a/reports/dictionary.pl
+++ b/reports/dictionary.pl
@@ -37,11 +37,12 @@ my $input = new CGI;
 my $referer = $input->referer();
 
 my $phase = $input->param('phase') || 'View Dictionary';
-my $area = $input->param('areas') || '';
-my $no_html = 0; # this will be set if we dont want to print out an html::template
-my 	( $template, $borrowernumber, $cookie ) = get_template_and_user(
-    {
-        template_name   => "reports/dictionary.tmpl",
+my $definition_name        = $input->param('definition_name');
+my $definition_description = $input->param('definition_description');
+my $area  = $input->param('area') || '';
+my $no_html = 0;    # this will be set if we dont want to print out an html::template
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {   template_name   => "reports/dictionary.tmpl",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
@@ -51,78 +52,71 @@ my 	( $template, $borrowernumber, $cookie ) = get_template_and_user(
 	);
 
 if ($phase eq 'View Dictionary'){
-	# view the dictionary we use to set up abstract variables such as all borrowers over fifty who live in a certain town
-	my $areas = get_report_areas();
-    foreach (@{ $areas }) {
-        $_->{selected} = 1 if $_->{id} eq $area; # mark active area
-    }
-	my $definitions = get_from_dictionary($area);
-	$template->param( 'areas' => $areas ,
-		'start_dictionary' => 1,
-		'definitions' => $definitions,
-	);
-}
-elsif ($phase eq 'Add New Definition'){
-	# display form allowing them to add a new definition
-	$template->param( 'new_dictionary' => 1,
-		);
+    # view the dictionary we use to set up abstract variables such as all borrowers over fifty who live in a certain town
+    my $definitions = get_from_dictionary($area);
+    $template->param(
+        'areas'=> areas(),
+        'start_dictionary' => 1,
+        'definitions'      => $definitions,
+    );
+} elsif ( $phase eq 'Add New Definition' ) {
+
+    # display form allowing them to add a new definition
+    $template->param( 'new_dictionary' => 1, );
 }
 
-elsif ($phase eq 'New Term step 2'){
-	# Choosing the area
-	my $areas = C4::Reports::Guided::get_report_areas();
-	my $definition_name=$input->param('definition_name');
-	my $definition_description=$input->param('definition_description');		
-	$template->param( 'step_2' => 1,
-		'areas' => $areas,
-		'definition_name' => $definition_name,
-		'definition_description' => $definition_description,
-	);
+elsif ( $phase eq 'New Term step 2' ) {
+
+    # Choosing the area
+    $template->param(
+        'step_2'                 => 1,
+        'areas'                  => areas(),
+        'definition_name'        => $definition_name,
+        'definition_description' => $definition_description,
+    );
 }
 
-elsif ($phase eq 'New Term step 3'){
-	# Choosing the columns
-	my $area = $input->param('areas');
-	my $columns = get_columns($area,$input);
-	my $definition_name=$input->param('definition_name');
-	my $definition_description=$input->param('definition_description');		
-	$template->param( 'step_3' => 1,
-		'area' => $area,
-		'columns' => $columns,
-		'definition_name' => $definition_name,
-		'definition_description' => $definition_description,
-	);
+elsif ( $phase eq 'New Term step 3' ) {
+
+    # Choosing the columns
+    my $columns                = get_columns( $area, $input );
+    $template->param(
+        'step_3'                 => 1,
+        'area'                   => $area,
+        'columns'                => $columns,
+        'definition_name'        => $definition_name,
+        'definition_description' => $definition_description,
+    );
 }
 
-elsif ($phase eq 'New Term step 4'){
-	# Choosing the values
-	my $area=$input->param('area');
-	my $definition_name=$input->param('definition_name');
-	my $definition_description=$input->param('definition_description');		
-    my @columns = $input->param('columns');
-	my $columnstring = join (',', at columns);
-	my @column_loop;
-	foreach my $column (@columns){
-		my %tmp_hash;
-		$tmp_hash{'name'}=$column;
-		my $type =get_column_type($column);
-		if ($type eq 'distinct'){
-			my $values = get_distinct_values($column);
-			$tmp_hash{'values'} = $values;
-			$tmp_hash{'distinct'} = 1;
-			  
-		}
-		if ($type eq 'DATE' || $type eq 'DATETIME'){
-			$tmp_hash{'date'}=1;
-		}
-		if ($type eq 'TEXT' || $type eq 'MEDIUMTEXT'){
-			$tmp_hash{'text'}=1;
-		}
-#		else {
-#			warn $type;#
-#			}
-		push @column_loop,\%tmp_hash;
-		}
+elsif ( $phase eq 'New Term step 4' ) {
+
+    # Choosing the values
+    my @columns                = $input->param('columns');
+    my $columnstring           = join( ',', @columns );
+    my @column_loop;
+    foreach my $column (@columns) {
+        my %tmp_hash;
+        $tmp_hash{'name'} = $column;
+        my $type = get_column_type($column);
+        if ( $type eq 'distinct' ) {
+            my $values = get_distinct_values($column);
+            $tmp_hash{'values'}   = $values;
+            $tmp_hash{'distinct'} = 1;
+
+        }
+        if ( $type eq 'DATE' || $type eq 'DATETIME' ) {
+            $tmp_hash{'date'} = 1;
+        }
+        if ( $type eq 'TEXT' ) {
+            $tmp_hash{'text'} = 1;
+        }
+
+        #		else {
+        #			warn $type;#
+        #			}
+        push @column_loop, \%tmp_hash;
+    }
 
 	$template->param( 'step_4' => 1,
 		'area' => $area,
@@ -134,83 +128,78 @@ elsif ($phase eq 'New Term step 4'){
 	);
 }
 
-elsif ($phase eq 'New Term step 5'){
-	# Confirmation screen
-	my $areas = C4::Reports::Guided::get_report_areas();
-	my $area = $input->param('area');
-    my $areaname = $areas->[$area - 1]->{'name'};
-	my $columnstring = $input->param('columnstring');
-	my $definition_name=$input->param('definition_name');
-	my $definition_description=$input->param('definition_description');	
-	my @criteria = $input->param('criteria_column'); 
-	my $query_criteria;
-	my @criteria_loop;
-	foreach my $crit (@criteria) {
-		my $value = $input->param( $crit . "_value" );
-		if ($value) {
-                    my %tmp_hash;
-                    $tmp_hash{'name'}=$crit;
-                    $tmp_hash{'value'} = $value;
-                    push @criteria_loop,\%tmp_hash;
-                    if ($value =~ C4::Dates->regexp(C4::Context->preference('dateformat'))) {    
-                        my $date = C4::Dates->new($value);
-                        $value = $date->output("iso");
-                    }
-                    $query_criteria .= " AND $crit='$value'";
-		}
-		$value = $input->param( $crit . "_start_value" );
-		if ($value) {
-                    my %tmp_hash;
-                    $tmp_hash{'name'}="$crit Start";
-                    $tmp_hash{'value'} = $value;
-                    push @criteria_loop,\%tmp_hash;
-                    if ($value =~ C4::Dates->regexp(C4::Context->preference('dateformat'))) {    
-                        my $date = C4::Dates->new($value);
-                        $value = $date->output("iso");
-                    }
-                    $query_criteria .= " AND $crit >= '$value'";
-		}
-		$value = $input->param( $crit . "_end_value" );
-		if ($value) {
-                    my %tmp_hash;
-                    $tmp_hash{'name'}="$crit End";
-                    $tmp_hash{'value'} = $value;
-                    push @criteria_loop,\%tmp_hash;
-                    if ($value =~ C4::Dates->regexp(C4::Context->preference('dateformat'))) {    
-                        my $date = C4::Dates->new($value);
-                        $value = $date->output("iso");
-                    }
-                    $query_criteria .= " AND $crit <= '$value'";
-		}		  
-	}
-	$template->param( 'step_5' => 1,
-		'area' => $area,
-		'areaname' => $areaname,
-		'definition_name' => $definition_name,
-		'definition_description' => $definition_description,
-		'query' => $query_criteria,
-		'columnstring' => $columnstring,
-		'criteria_loop' => \@criteria_loop,
-	);
+elsif ( $phase eq 'New Term step 5' ) {
+    # Confirmation screen
+    my $columnstring           = $input->param('columnstring');
+    my @criteria               = $input->param('criteria_column');
+    my $query_criteria;
+    my @criteria_loop;
+
+    foreach my $crit (@criteria) {
+        my $value = $input->param( $crit . "_value" );
+        if ($value) {
+            my %tmp_hash;
+            $tmp_hash{'name'}  = $crit;
+            $tmp_hash{'value'} = $value;
+            push @criteria_loop, \%tmp_hash;
+            if ( $value =~ C4::Dates->regexp( C4::Context->preference('dateformat') ) ) {
+                my $date = C4::Dates->new($value);
+                $value = $date->output("iso");
+            }
+            $query_criteria .= " AND $crit='$value'";
+        }
+        $value = $input->param( $crit . "_start_value" );
+        if ($value) {
+            my %tmp_hash;
+            $tmp_hash{'name'}  = "$crit Start";
+            $tmp_hash{'value'} = $value;
+            push @criteria_loop, \%tmp_hash;
+            if ( $value =~ C4::Dates->regexp( C4::Context->preference('dateformat') ) ) {
+                my $date = C4::Dates->new($value);
+                $value = $date->output("iso");
+            }
+            $query_criteria .= " AND $crit >= '$value'";
+        }
+        $value = $input->param( $crit . "_end_value" );
+        if ($value) {
+            my %tmp_hash;
+            $tmp_hash{'name'}  = "$crit End";
+            $tmp_hash{'value'} = $value;
+            push @criteria_loop, \%tmp_hash;
+            if ( $value =~ C4::Dates->regexp( C4::Context->preference('dateformat') ) ) {
+                my $date = C4::Dates->new($value);
+                $value = $date->output("iso");
+            }
+            $query_criteria .= " AND $crit <= '$value'";
+        }
+    }
+    my %report_areas = map @$_, get_report_areas();
+    $template->param(
+        'step_5'                 => 1,
+        'area'                   => $area,
+        'areaname'               => $report_areas{$area},
+        'definition_name'        => $definition_name,
+        'definition_description' => $definition_description,
+        'query'                  => $query_criteria,
+        'columnstring'           => $columnstring,
+        'criteria_loop'          => \@criteria_loop,
+    );
 }
 
-elsif ($phase eq 'New Term step 6'){
-	# Saving
-	my $area = $input->param('area');
-	my $definition_name=$input->param('definition_name');
-	my $definition_description=$input->param('definition_description');		
-	my $sql=$input->param('sql');
-	save_dictionary($definition_name,$definition_description,$sql,$area);
-	$no_html=1;
-	print $input->redirect("/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary");	
-
+elsif ( $phase eq 'New Term step 6' ) {
+    # Saving
+    my $area                   = $input->param('area');
+    my $sql                    = $input->param('sql');
+    save_dictionary( $definition_name, $definition_description, $sql, $area );
+    $no_html = 1;
+    print $input->redirect("/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary");
+
+} elsif ( $phase eq 'Delete Definition' ) {
+    $no_html = 1;
+    my $id = $input->param('id');
+    delete_definition($id);
+    print $input->redirect("/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary");
 }
-elsif ($phase eq 'Delete Definition'){
-	$no_html=1;
-	my $id = $input->param('id');
-	delete_definition($id);
-	print $input->redirect("/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary");
-	}
 
 $template->param( 'referer' => $referer );
 
@@ -218,3 +207,16 @@ $template->param( 'referer' => $referer );
 if (!$no_html){
 	output_html_with_http_headers $input, $cookie, $template->output;
 }
+
+sub areas {
+    my $areas = get_report_areas();
+    my @a;
+    foreach (@$areas) {
+        push @a, {
+            id => $_->[0],
+            name => $_->[1],
+            selected => ($_->[0] eq $area),
+        };
+    }
+    return \@a;
+}
diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl
index 25a2ffb..85247d3 100755
--- a/reports/guided_reports.pl
+++ b/reports/guided_reports.pl
@@ -18,14 +18,15 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
-#use warnings; FIXME - Bug 2505
+use warnings;
+
 use CGI;
 use Text::CSV;
 use URI::Escape;
 use C4::Reports::Guided;
 use C4::Auth qw/:DEFAULT get_session/;
 use C4::Output;
-use C4::Dates;
+use C4::Dates qw/format_date/;
 use C4::Debug;
 use C4::Branch; # XXX subfield_is_koha_internal_p
 use Koha::Cache;
@@ -69,7 +70,7 @@ my $session = $cookie ? get_session($cookie->value) : undef;
 my $filter;
 if ( $input->param("filter_set") ) {
     $filter = {};
-    $filter->{$_} = $input->param("filter_$_") foreach qw/date author keyword/;
+    $filter->{$_} = $input->param("filter_$_") foreach qw/date author keyword group subgroup/;
     $session->param('report_filter', $filter) if $session;
     $template->param( 'filter_set' => 1 );
 }
@@ -86,21 +87,27 @@ if ( !$phase ) {
 elsif ( $phase eq 'Build new' ) {
     # build a new report
     $template->param( 'build1' => 1 );
-    $template->param( 'areas' => get_report_areas(), 'usecache' => $usecache, 'cache_expiry' => 300, 'public' => '0' );
-}
-elsif ( $phase eq 'Use saved' ) {
+    my $areas = get_report_areas();
+    $template->param(
+        'areas' => [map { id => $_->[0], name => $_->[1] }, @$areas],
+        'usecache' => $usecache,
+        'cache_expiry' => 300,
+        'public' => '0',
+    );
+} elsif ( $phase eq 'Use saved' ) {
+
     # use a saved report
     # get list of reports and display them
+    my $group = $input->param('group');
+    my $subgroup = $input->param('subgroup');
+    $filter->{group} = $group;
+    $filter->{subgroup} = $subgroup;
     $template->param(
         'saved1' => 1,
         'savedreports' => get_saved_reports($filter),
         'usecache' => $usecache,
+        'groups_with_subgroups'=> groups_with_subgroups($group, $subgroup),
     );
-    if ($filter) {
-        while ( my ($k, $v) = each %$filter ) {
-            $template->param( "filter_$k" => $v ) if $v;
-        }
-    }
 }
 
 elsif ( $phase eq 'Delete Saved') {
@@ -114,30 +121,33 @@ elsif ( $phase eq 'Delete Saved') {
 
 elsif ( $phase eq 'Show SQL'){
 	
-	my $id = $input->param('reports');
-    my ($sql,$type,$reportname,$notes) = get_saved_report($id);
-	$template->param(
+    my $id = $input->param('reports');
+    my $report = get_saved_report($id);
+    $template->param(
         'id'      => $id,
-        'reportname' => $reportname,
-        'notes'      => $notes,
-		'sql'     => $sql,
-		'showsql' => 1,
+        'reportname' => $report->{report_name},
+        'notes'      => $report->{notes},
+	'sql'     => $report->{savedsql},
+	'showsql' => 1,
     );
 }
 
 elsif ( $phase eq 'Edit SQL'){
 	
     my $id = $input->param('reports');
-    my ($sql,$type,$reportname,$notes, $cache_expiry, $public) = get_saved_report($id);
+    my $report = get_saved_report($id);
+    my $group = $report->{report_group};
+    my $subgroup  = $report->{report_subgroup};
     $template->param(
-	    'sql'        => $sql,
-	    'reportname' => $reportname,
-        'notes'      => $notes,
+        'sql'        => $report->{savedsql},
+        'reportname' => $report->{report_name},
+        'groups_with_subgroups' => groups_with_subgroups($group, $subgroup),
+        'notes'      => $report->{notes},
         'id'         => $id,
-        'cache_expiry' => $cache_expiry,
-        'public' => $public,
+        'cache_expiry' => $report->{cache_expiry},
+        'public' => $report->{public},
         'usecache' => $usecache,
-	    'editsql'    => 1,
+        'editsql'    => 1,
     );
 }
 
@@ -145,6 +155,8 @@ elsif ( $phase eq 'Update SQL'){
     my $id         = $input->param('id');
     my $sql        = $input->param('sql');
     my $reportname = $input->param('reportname');
+    my $group      = $input->param('group');
+    my $subgroup   = $input->param('subgroup');
     my $notes      = $input->param('notes');
     my $cache_expiry = $input->param('cache_expiry');
     my $cache_expiry_units = $input->param('cache_expiry_units');
@@ -178,16 +190,22 @@ elsif ( $phase eq 'Update SQL'){
             'errors'    => \@errors,
             'sql'       => $sql,
         );
-    }
-    else {
-        update_sql( $id, $sql, $reportname, $notes, $cache_expiry, $public );
+    } else {
+        update_sql( $id, {
+                sql => $sql,
+                name => $reportname,
+                group => $group,
+                subgroup => $subgroup,
+                notes => $notes,
+                cache_expiry => $cache_expiry,
+                public => $public,
+        } );
         $template->param(
             'save_successful'       => 1,
             'reportname'            => $reportname,
             'id'                    => $id,
         );
     }
-    
 }
 
 elsif ($phase eq 'retrieve results') {
@@ -229,7 +247,7 @@ elsif ( $phase eq 'Report on this Area' ) {
       # they have choosen a new report and the area to report on
       $template->param(
           'build2' => 1,
-          'area'   => $input->param('areas'),
+          'area'   => $input->param('area'),
           'types'  => get_report_types(),
           'cache_expiry' => $cache_expiry,
           'public' => $input->param('public'),
@@ -276,42 +294,42 @@ elsif ( $phase eq 'Choose these criteria' ) {
     my $area     = $input->param('area');
     my $type     = $input->param('type');
     my $column   = $input->param('column');
-	my @definitions = $input->param('definition');
-	my $definition = join (',', at definitions);
+    my @definitions = $input->param('definition');
+    my $definition = join (',', at definitions);
     my @criteria = $input->param('criteria_column');
-	my $query_criteria;
+    my $query_criteria;
     foreach my $crit (@criteria) {
         my $value = $input->param( $crit . "_value" );
-	
-	# If value is not defined, then it may be range values
-	if (!defined $value) {
-
-	    my $fromvalue = $input->param( "from_" . $crit . "_value" );
-	    my $tovalue   = $input->param( "to_"   . $crit . "_value" );
-	    
-	    # If the range values are dates
-	    if ($fromvalue =~ C4::Dates->regexp('syspref') && $tovalue =~ C4::Dates->regexp('syspref')) { 
-		$fromvalue = C4::Dates->new($fromvalue)->output("iso");
-		$tovalue = C4::Dates->new($tovalue)->output("iso");
-	    }
-
-	    if ($fromvalue && $tovalue) {
-		$query_criteria .= " AND $crit >= '$fromvalue' AND $crit <= '$tovalue'";
-	    }
-
-	} else {
-
-	    # If value is a date
-	    if ($value =~ C4::Dates->regexp('syspref')) { 
-		$value = C4::Dates->new($value)->output("iso");
-	    }
-        # don't escape runtime parameters, they'll be at runtime
-        if ($value =~ /<<.*>>/) {
-            $query_criteria .= " AND $crit=$value";
+
+        # If value is not defined, then it may be range values
+        if (!defined $value) {
+
+            my $fromvalue = $input->param( "from_" . $crit . "_value" );
+            my $tovalue   = $input->param( "to_"   . $crit . "_value" );
+
+            # If the range values are dates
+            if ($fromvalue =~ C4::Dates->regexp('syspref') && $tovalue =~ C4::Dates->regexp('syspref')) { 
+                $fromvalue = C4::Dates->new($fromvalue)->output("iso");
+                $tovalue = C4::Dates->new($tovalue)->output("iso");
+            }
+
+            if ($fromvalue && $tovalue) {
+                $query_criteria .= " AND $crit >= '$fromvalue' AND $crit <= '$tovalue'";
+            }
+
         } else {
-            $query_criteria .= " AND $crit='$value'";
+
+            # If value is a date
+            if ($value =~ C4::Dates->regexp('syspref')) { 
+                $value = C4::Dates->new($value)->output("iso");
+            }
+            # don't escape runtime parameters, they'll be at runtime
+            if ($value =~ /<<.*>>/) {
+                $query_criteria .= " AND $crit=$value";
+            } else {
+                $query_criteria .= " AND $crit='$value'";
+            }
         }
-	}
     }
     $template->param(
         'build5'         => 1,
@@ -413,6 +431,7 @@ elsif ( $phase eq 'Build report' ) {
       build_query( \@columns, $query_criteria, $query_orderby, $area, $totals, $definition );
     $template->param(
         'showreport' => 1,
+        'area'       => $area,
         'sql'        => $sql,
         'type'       => $type,
         'cache_expiry' => $input->param('cache_expiry'),
@@ -421,23 +440,29 @@ elsif ( $phase eq 'Build report' ) {
 }
 
 elsif ( $phase eq 'Save' ) {
-	# Save the report that has just been built
+    # Save the report that has just been built
+    my $area           = $input->param('area');
     my $sql  = $input->param('sql');
     my $type = $input->param('type');
     $template->param(
         'save' => 1,
+        'area'  => $area,
         'sql'  => $sql,
         'type' => $type,
         'cache_expiry' => $input->param('cache_expiry'),
         'public' => $input->param('public'),
+        'groups_with_subgroups' => groups_with_subgroups($area), # in case we have a report group that matches area
     );
 }
 
 elsif ( $phase eq 'Save Report' ) {
-    # save the sql pasted in by a user 
-    my $sql  = $input->param('sql');
-    my $name = $input->param('reportname');
-    my $type = $input->param('types');
+    # save the sql pasted in by a user
+    my $area  = $input->param('area');
+    my $group = $input->param('group');
+    my $subgroup = $input->param('subgroup');
+    my $sql   = $input->param('sql');
+    my $name  = $input->param('reportname');
+    my $type  = $input->param('types');
     my $notes = $input->param('notes');
     my $cache_expiry = $input->param('cache_expiry');
     my $cache_expiry_units = $input->param('cache_expiry_units');
@@ -455,7 +480,7 @@ elsif ( $phase eq 'Save Report' ) {
       }
     }
     # check $cache_expiry isnt too large, Memcached::set requires it to be less than 30 days or it will be treated as if it were an absolute time stamp
-    if( $cache_expiry >= 2592000 ){
+    if( $cache_expiry && $cache_expiry >= 2592000 ){
       push @errors, {cache_expiry => $cache_expiry};
     }
     ## FIXME this is AFTER entering a name to save the report under
@@ -463,7 +488,7 @@ elsif ( $phase eq 'Save Report' ) {
         push @errors, {sqlerr => $1};
     }
     elsif ($sql !~ /^(SELECT)/i) {
-        push @errors, {queryerr => 1};
+        push @errors, {queryerr => "No SELECT"};
     }
     if (@errors) {
         $template->param(
@@ -477,161 +502,174 @@ elsif ( $phase eq 'Save Report' ) {
         );
     }
     else {
-        my $id = save_report( $borrowernumber, $sql, $name, $type, $notes, $cache_expiry, $public );
-        $template->param(
-            'save_successful'       => 1,
-            'reportname'            => $name,
-            'id'                    => $id,
-        );
+        save_report( {
+                borrowernumber => $borrowernumber,
+                sql            => $sql,
+                name           => $name,
+                area           => $area,
+                group          => $group,
+                subgroup       => $subgroup,
+                type           => $type,
+                notes          => $notes,
+                cache_expiry   => $cache_expiry,
+                public         => $public,
+            } );
+        $template->param( 'save_successful' => 1, );
     }
 }
 
 elsif ($phase eq 'Run this report'){
     # execute a saved report
-    my $limit  = 20;    # page size. # TODO: move to DB or syspref?
-    my $offset = 0;
-    my $report = $input->param('reports');
+    my $limit      = 20; # page size. # TODO: move to DB or syspref?
+    my $offset     = 0;
+    my $report_id  = $input->param('reports');
     my @sql_params = $input->param('sql_params');
     # offset algorithm
     if ($input->param('page')) {
         $offset = ($input->param('page') - 1) * $limit;
     }
-    my ($sql,$type,$name,$notes) = get_saved_report($report);
-    unless ($sql) {
-        push @errors, {no_sql_for_id=>$report};   
-    } 
-    my @rows = ();
-    # if we have at least 1 parameter, and it's not filled, then don't execute but ask for parameters
-    if ($sql =~ /<</ && !@sql_params) {
-        # split on ??. Each odd (2,4,6,...) entry should be a parameter to fill
-        my @split = split /<<|>>/,$sql;
-        my @tmpl_parameters;
-        for(my $i=0;$i<($#split/2);$i++) {
-            my ($text,$authorised_value) = split /\|/,$split[$i*2+1];
-            my $input;
-            my $labelid;
-            if ($authorised_value eq "date") {
-               $input = 'date';
-            }
-            elsif ($authorised_value) {
-                my $dbh=C4::Context->dbh;
-                my @authorised_values;
-                my %authorised_lib;
-                # builds list, depending on authorised value...
-                if ( $authorised_value eq "branches" ) {
-                    my $branches = GetBranchesLoop();
-                    foreach my $thisbranch (@$branches) {
-                        push @authorised_values, $thisbranch->{value};
-                        $authorised_lib{$thisbranch->{value}} = $thisbranch->{branchname};
-                    }
+
+    my ( $sql, $type, $name, $notes );
+    if (my $report = get_saved_report($report_id)) {
+        $sql   = $report->{savedsql};
+        $name  = $report->{report_name};
+        $notes = $report->{notes};
+
+        my @rows = ();
+        # if we have at least 1 parameter, and it's not filled, then don't execute but ask for parameters
+        if ($sql =~ /<</ && !@sql_params) {
+            # split on ??. Each odd (2,4,6,...) entry should be a parameter to fill
+            my @split = split /<<|>>/,$sql;
+            my @tmpl_parameters;
+            for(my $i=0;$i<($#split/2);$i++) {
+                my ($text,$authorised_value) = split /\|/,$split[$i*2+1];
+                my $input;
+                my $labelid;
+                if ($authorised_value eq "date") {
+                   $input = 'date';
                 }
-                elsif ( $authorised_value eq "itemtypes" ) {
-                    my $sth = $dbh->prepare("SELECT itemtype,description FROM itemtypes ORDER BY description");
-                    $sth->execute;
-                    while ( my ( $itemtype, $description ) = $sth->fetchrow_array ) {
-                        push @authorised_values, $itemtype;
-                        $authorised_lib{$itemtype} = $description;
+                elsif ($authorised_value) {
+                    my $dbh=C4::Context->dbh;
+                    my @authorised_values;
+                    my %authorised_lib;
+                    # builds list, depending on authorised value...
+                    if ( $authorised_value eq "branches" ) {
+                        my $branches = GetBranchesLoop();
+                        foreach my $thisbranch (@$branches) {
+                            push @authorised_values, $thisbranch->{value};
+                            $authorised_lib{$thisbranch->{value}} = $thisbranch->{branchname};
+                        }
                     }
-                }
-                elsif ( $authorised_value eq "cn_source" ) {
-                    my $class_sources = GetClassSources();
-                    my $default_source = C4::Context->preference("DefaultClassificationSource");
-                    foreach my $class_source (sort keys %$class_sources) {
-                        next unless $class_sources->{$class_source}->{'used'} or
-                                    ($class_source eq $default_source);
-                        push @authorised_values, $class_source;
-                        $authorised_lib{$class_source} = $class_sources->{$class_source}->{'description'};
+                    elsif ( $authorised_value eq "itemtypes" ) {
+                        my $sth = $dbh->prepare("SELECT itemtype,description FROM itemtypes ORDER BY description");
+                        $sth->execute;
+                        while ( my ( $itemtype, $description ) = $sth->fetchrow_array ) {
+                            push @authorised_values, $itemtype;
+                            $authorised_lib{$itemtype} = $description;
+                        }
                     }
-                }
-                elsif ( $authorised_value eq "categorycode" ) {
-                    my $sth = $dbh->prepare("SELECT categorycode, description FROM categories ORDER BY description");
-                    $sth->execute;
-                    while ( my ( $categorycode, $description ) = $sth->fetchrow_array ) {
-                        push @authorised_values, $categorycode;
-                        $authorised_lib{$categorycode} = $description;
+                    elsif ( $authorised_value eq "cn_source" ) {
+                        my $class_sources = GetClassSources();
+                        my $default_source = C4::Context->preference("DefaultClassificationSource");
+                        foreach my $class_source (sort keys %$class_sources) {
+                            next unless $class_sources->{$class_source}->{'used'} or
+                                        ($class_source eq $default_source);
+                            push @authorised_values, $class_source;
+                            $authorised_lib{$class_source} = $class_sources->{$class_source}->{'description'};
+                        }
                     }
+                    elsif ( $authorised_value eq "categorycode" ) {
+                        my $sth = $dbh->prepare("SELECT categorycode, description FROM categories ORDER BY description");
+                        $sth->execute;
+                        while ( my ( $categorycode, $description ) = $sth->fetchrow_array ) {
+                            push @authorised_values, $categorycode;
+                            $authorised_lib{$categorycode} = $description;
+                        }
+
+                        #---- "true" authorised value
+                    }
+                    else {
+                        my $authorised_values_sth = $dbh->prepare("SELECT authorised_value,lib FROM authorised_values WHERE category=? ORDER BY lib");
 
-                    #---- "true" authorised value
-                }
-                else {
-                    my $authorised_values_sth = $dbh->prepare("SELECT authorised_value,lib FROM authorised_values WHERE category=? ORDER BY lib");
-
-                    $authorised_values_sth->execute( $authorised_value);
+                        $authorised_values_sth->execute( $authorised_value);
 
-                    while ( my ( $value, $lib ) = $authorised_values_sth->fetchrow_array ) {
-                        push @authorised_values, $value;
-                        $authorised_lib{$value} = $lib;
-                        # For item location, we show the code and the libelle
-                        $authorised_lib{$value} = $lib;
+                        while ( my ( $value, $lib ) = $authorised_values_sth->fetchrow_array ) {
+                            push @authorised_values, $value;
+                            $authorised_lib{$value} = $lib;
+                            # For item location, we show the code and the libelle
+                            $authorised_lib{$value} = $lib;
+                        }
                     }
-                }
-                $labelid = $text;
-                $labelid =~ s/\W//g;
-                $input =CGI::scrolling_list(      # FIXME: factor out scrolling_list
-                    -name     => "sql_params",
-                    -id       => "sql_params_".$labelid,
-                    -values   => \@authorised_values,
+                    $labelid = $text;
+                    $labelid =~ s/\W//g;
+                    $input =CGI::scrolling_list(      # FIXME: factor out scrolling_list
+                        -name     => "sql_params",
+                        -id       => "sql_params_".$labelid,
+                        -values   => \@authorised_values,
 #                     -default  => $value,
-                    -labels   => \%authorised_lib,
-                    -override => 1,
-                    -size     => 1,
-                    -multiple => 0,
-                    -tabindex => 1,
-                );
-
-            } else {
-                $input = "text";
+                        -labels   => \%authorised_lib,
+                        -override => 1,
+                        -size     => 1,
+                        -multiple => 0,
+                        -tabindex => 1,
+                    );
+                } else {
+                    $input = "text";
+                }
+                push @tmpl_parameters, {'entry' => $text, 'input' => $input, 'labelid' => $labelid };
             }
-            push @tmpl_parameters, {'entry' => $text, 'input' => $input, 'labelid' => $labelid };
-        }
-        $template->param('sql'         => $sql,
-                        'name'         => $name,
-                        'sql_params'   => \@tmpl_parameters,
-                        'enter_params' => 1,
-                        'reports'      => $report,
-                        );
-    } else {
-        # OK, we have parameters, or there are none, we run the report
-        # if there were parameters, replace before running
-        # split on ??. Each odd (2,4,6,...) entry should be a parameter to fill
-        my @split = split /<<|>>/,$sql;
-        my @tmpl_parameters;
-        for(my $i=0;$i<$#split/2;$i++) {
-            my $quoted = C4::Context->dbh->quote($sql_params[$i]);
-            # if there are special regexp chars, we must \ them
-            $split[$i*2+1] =~ s/(\||\?|\.|\*|\(|\)|\%)/\\$1/g;
-            $sql =~ s/<<$split[$i*2+1]>>/$quoted/;
-        }
-        my ($sth, $errors) = execute_query($sql, $offset, $limit);
-        my $total = nb_rows($sql) || 0;
-        unless ($sth) {
-            die "execute_query failed to return sth for report $report: $sql";
+            $template->param('sql'         => $sql,
+                            'name'         => $name,
+                            'sql_params'   => \@tmpl_parameters,
+                            'enter_params' => 1,
+                            'reports'      => $report_id,
+                            );
         } else {
-            my $headref = $sth->{NAME} || [];
-            my @headers = map { +{ cell => $_ } } @$headref;
-            $template->param(header_row => \@headers);
-            while (my $row = $sth->fetchrow_arrayref()) {
-                my @cells = map { +{ cell => $_ } } @$row;
-                push @rows, { cells => \@cells };
+            # OK, we have parameters, or there are none, we run the report
+            # if there were parameters, replace before running
+            # split on ??. Each odd (2,4,6,...) entry should be a parameter to fill
+            my @split = split /<<|>>/,$sql;
+            my @tmpl_parameters;
+            for(my $i=0;$i<$#split/2;$i++) {
+                my $quoted = C4::Context->dbh->quote($sql_params[$i]);
+                # if there are special regexp chars, we must \ them
+                $split[$i*2+1] =~ s/(\||\?|\.|\*|\(|\)|\%)/\\$1/g;
+                $sql =~ s/<<$split[$i*2+1]>>/$quoted/;
+            }
+            my ($sth, $errors) = execute_query($sql, $offset, $limit);
+            my $total = nb_rows($sql) || 0;
+            unless ($sth) {
+                die "execute_query failed to return sth for report $report_id: $sql";
+            } else {
+                my $headref = $sth->{NAME} || [];
+                my @headers = map { +{ cell => $_ } } @$headref;
+                $template->param(header_row => \@headers);
+                while (my $row = $sth->fetchrow_arrayref()) {
+                    my @cells = map { +{ cell => $_ } } @$row;
+                    push @rows, { cells => \@cells };
+                }
             }
-        }
 
-        my $totpages = int($total/$limit) + (($total % $limit) > 0 ? 1 : 0);
-        my $url = "/cgi-bin/koha/reports/guided_reports.pl?reports=$report&amp;phase=Run%20this%20report";
-        if (@sql_params) {
-            $url = join('&amp;sql_params=', $url, map { URI::Escape::uri_escape($_) } @sql_params);
+            my $totpages = int($total/$limit) + (($total % $limit) > 0 ? 1 : 0);
+            my $url = "/cgi-bin/koha/reports/guided_reports.pl?reports=$report_id&amp;phase=Run%20this%20report";
+            if (@sql_params) {
+                $url = join('&amp;sql_params=', $url, map { URI::Escape::uri_escape($_) } @sql_params);
+            }
+            $template->param(
+                'results' => \@rows,
+                'sql'     => $sql,
+                'id'      => $report_id,
+                'execute' => 1,
+                'name'    => $name,
+                'notes'   => $notes,
+                'errors'  => $errors,
+                'pagination_bar'  => pagination_bar($url, $totpages, $input->param('page')),
+                'unlimited_total' => $total,
+            );
         }
-        $template->param(
-            'results' => \@rows,
-            'sql'     => $sql,
-            'id'      => $report,
-            'execute' => 1,
-            'name'    => $name,
-            'notes'   => $notes,
-            'errors'  => $errors,
-            'pagination_bar'  => pagination_bar($url, $totpages, $input->param('page')),
-            'unlimited_total' => $total,
-        );
+    }
+    else {
+        push @errors, { no_sql_for_id => $report_id };
     }
 }
 
@@ -681,16 +719,26 @@ elsif ($phase eq 'Export'){
     );
 }
 
-elsif ($phase eq 'Create report from SQL') {
-	# allow the user to paste in sql
-    if ($input->param('sql')) {
+elsif ( $phase eq 'Create report from SQL' ) {
+
+    my ($group, $subgroup);
+    # allow the user to paste in sql
+    if ( $input->param('sql') ) {
+        $group = $input->param('report_group');
+        $subgroup  = $input->param('report_subgroup');
         $template->param(
             'sql'           => $input->param('sql'),
             'reportname'    => $input->param('reportname'),
             'notes'         => $input->param('notes'),
         );
     }
-        $template->param('create' => 1, 'public' => '0', 'cache_expiry' => 300, 'usecache' => $usecache);
+    $template->param(
+        'create' => 1,
+        'groups_with_subgroups' => groups_with_subgroups($group, $subgroup),
+        'public' => '0',
+        'cache_expiry' => 300,
+        'usecache' => $usecache,
+    );
 }
 
 elsif ($phase eq 'Create Compound Report'){
@@ -729,3 +777,29 @@ $template->param(   'referer' => $input->referer(),
                 );
 
 output_html_with_http_headers $input, $cookie, $template->output;
+
+sub groups_with_subgroups {
+    my ($group, $subgroup) = @_;
+
+    my $groups_with_subgroups = get_report_groups();
+    my @g_sg;
+    while (my ($g_id, $v) = each %$groups_with_subgroups) {
+        my @subgroups;
+        if (my $sg = $v->{subgroups}) {
+            while (my ($sg_id, $n) = each %$sg) {
+                push @subgroups, {
+                    id => $sg_id,
+                    name => $n,
+                    selected => ($group && $g_id eq $group && $subgroup && $sg_id eq $subgroup ),
+                };
+            }
+        }
+        push @g_sg, {
+            id => $g_id,
+            name => $v->{name},
+            selected => ($group && $g_id eq $group),
+            subgroups => \@subgroups,
+        };
+    }
+    return \@g_sg;
+}
diff --git a/svc/report b/svc/report
index b0507bd..654ef15 100755
--- a/svc/report
+++ b/svc/report
@@ -33,13 +33,6 @@ my $query  = CGI->new();
 my $report_id = $query->param('id');
 my $report_name = $query->param('name');
 
-my $cache;
-my $sql;
-my $type;
-my $notes;
-my $cache_expiry;
-my $public;
-
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
         template_name   => "intranet-main.tmpl",
@@ -50,39 +43,31 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-if (Koha::Cache->is_cache_active) {
-    if ($report_name) { # When retrieving by name, we have to hit the
-                        # database to get the ID before we can check
-                        # the cache. Yuck.
-        ( $sql, $type, $report_name, $notes, $cache_expiry, $public, $report_id ) =
-            get_saved_report( { 'name' => $report_name } );
-    }
-
+my $cache_active = Koha::Cache->is_cache_active;
+my ($cache_key, $cache, $json_text);
+if ($cache_active) {
+    $cache_key = "intranet:report:".($report_name ? "name:$report_name" : "id:$report_id");
     $cache = Koha::Cache->new();
-    my $page = $cache->get_from_cache("intranet:report:$report_id");
-    if ($page) {
-        print $query->header;
-        print $page;
-        exit;
-    }
+    $json_text = $cache->get_from_cache($cache_key);
 }
 
-print $query->header;
-
-# $public isnt used for intranet
-unless ($sql) {
-    ( $sql, $type, $report_name, $notes, $cache_expiry, $public, $report_id ) =
-        get_saved_report($report_name ? { 'name' => $report_name } : { 'id' => $report_id } );
-}
-if ($sql) {
+unless ($json_text) {
+    my $report_rec = get_saved_report($report_name ? { 'name' => $report_name } : { 'id' => $report_id });
     my $offset = 0;
     my $limit  = C4::Context->preference("SvcMaxReportRows") || 10;
-    my ( $sth, $errors ) = execute_query( $sql, $offset, $limit );
-    my $lines     = $sth->fetchall_arrayref;
-    my $json_text = to_json($lines);
-    print $json_text;
+    my ( $sth, $errors ) = execute_query( $report_rec->{savedsql}, $offset, $limit );
+    if ($sth) {
+        my $lines     = $sth->fetchall_arrayref;
+        $json_text = to_json($lines);
 
-    if (Koha::Cache->is_cache_active) {
-        $cache->set_in_cache( "intranet:report:$report_id", $json_text, $cache_expiry );
+        if ($cache_active) {
+            $cache->set_in_cache( $cache_key, $json_text, $report_rec->{cache_expiry} );
+        }
+    }
+    else {
+        $json_text = to_json($errors);
     }
 }
+
+print $query->header;
+print $json_text;
-- 
1.7.9.5


From srdjan at catalyst.net.nz  Mon Sep 10 03:55:11 2012
From: srdjan at catalyst.net.nz (Srdjan)
Date: Mon, 10 Sep 2012 13:55:11 +1200
Subject: [Koha-patches] [PATCH] bug_8034: Restored network printer
	maintenance and selection
In-Reply-To: <bug 8034>
References: <bug 8034>
Message-ID: <1347242111-22540-1-git-send-email-srdjan@catalyst.net.nz>

This patch is just for restoring printer maintenance and selection, not
for priting itself. It is just a preparation step.

* Added UsePrintQueues syspref. If set to No, no printer info will be
  displayed/used
* Database changes:
- printers table PRIMARY KEY is now printqueue. It is more natural. We
  should really have a synthetic id, but printqueue is good enough
- branches.branchprinter is a FOREIGN KEY to printers.printqueue
* Created C4::Auth::get_user_printer() function that will return
  appropriate printer. In order of preference:
- session selected
- logged in branch branchprinter
* Moved printer functions to C4::Printer
* Restored printer maint/selection in admin zone UsePrintQueues
  permitting
* Restored printer selection in circ/selectbranchprinter.pl
  UsePrintQueues permitting

Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
---
 C4/Auth.pm                                         |   49 +++++--
 C4/Context.pm                                      |    2 +-
 C4/Koha.pm                                         |   40 ------
 C4/Printer.pm                                      |  148 +++++++++++++++++++
 admin/branches.pl                                  |   30 ++--
 admin/printers.pl                                  |  152 ++++++++++----------
 circ/circulation.pl                                |   12 +-
 circ/returns.pl                                    |    8 --
 circ/selectbranchprinter.pl                        |   49 ++++---
 installer/data/mysql/kohastructure.sql             |   16 ++-
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |   12 ++
 .../intranet-tmpl/prog/en/includes/admin-menu.inc  |    1 +
 .../intranet-tmpl/prog/en/includes/header.inc      |    3 +
 .../prog/en/modules/admin/admin-home.tt            |    4 +-
 .../prog/en/modules/admin/branches.tt              |   20 +--
 .../en/modules/admin/preferences/circulation.pref  |    6 +
 .../prog/en/modules/admin/printers.tt              |   33 +----
 .../prog/en/modules/circ/circulation.tt            |    2 -
 .../prog/en/modules/circ/selectbranchprinter.tt    |    5 +-
 t/db_dependent/lib/KohaTest/Koha.pm                |    2 -
 t/db_dependent/lib/KohaTest/Printer.pm             |   26 ++++
 22 files changed, 393 insertions(+), 228 deletions(-)
 create mode 100644 C4/Printer.pm
 create mode 100644 t/db_dependent/lib/KohaTest/Printer.pm

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 59c9955..71abfb3 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -28,6 +28,7 @@ require Exporter;
 use C4::Context;
 use C4::Templates;    # to get the template
 use C4::Branch; # GetBranches
+use C4::Printer qw(GetPrinterDetails);
 use C4::VirtualShelves;
 use POSIX qw/strftime/;
 use List::MoreUtils qw/ any /;
@@ -46,7 +47,8 @@ BEGIN {
     $debug       = $ENV{DEBUG};
     @ISA         = qw(Exporter);
     @EXPORT      = qw(&checkauth &get_template_and_user &haspermission &get_user_subpermissions);
-    @EXPORT_OK   = qw(&check_api_auth &get_session &check_cookie_auth &checkpw &get_all_subpermissions &get_user_subpermissions);
+    @EXPORT_OK   = qw(&check_api_auth &get_session &check_cookie_auth &checkpw
+                      &get_all_subpermissions &get_user_subpermissions &get_user_printer);
     %EXPORT_TAGS = ( EditPermissions => [qw(get_all_subpermissions get_user_subpermissions)] );
     $ldap        = C4::Context->config('useldapserver') || 0;
     $cas         = C4::Context->preference('casAuthentication');
@@ -310,6 +312,9 @@ sub get_template_and_user {
         $template->param(dateformat_iso => 1);
     }
 
+    my $userenv = C4::Context->userenv;
+    my $userenv_branch = $userenv ? $userenv->{"branch"} : undef;
+
     # these template parameters are set the same regardless of $in->{'type'}
     $template->param(
             "BiblioDefaultView".C4::Context->preference("BiblioDefaultView")         => 1,
@@ -317,9 +322,9 @@ sub get_template_and_user {
             GoogleJackets                => C4::Context->preference("GoogleJackets"),
             OpenLibraryCovers            => C4::Context->preference("OpenLibraryCovers"),
             KohaAdminEmailAddress        => "" . C4::Context->preference("KohaAdminEmailAddress"),
-            LoginBranchcode              => (C4::Context->userenv?C4::Context->userenv->{"branch"}:"insecure"),
-            LoginFirstname               => (C4::Context->userenv?C4::Context->userenv->{"firstname"}:"Bel"),
-            LoginSurname                 => C4::Context->userenv?C4::Context->userenv->{"surname"}:"Inconnu",
+            LoginBranchcode              => ($userenv?$userenv_branch:"insecure"),
+            LoginFirstname               => ($userenv?$userenv->{"firstname"}:"Bel"),
+            LoginSurname                 => $userenv?$userenv->{"surname"}:"Inconnu",
             TagsEnabled                  => C4::Context->preference("TagsEnabled"),
             hide_marc                    => C4::Context->preference("hide_marc"),
             item_level_itypes            => C4::Context->preference('item-level_itypes'),
@@ -344,7 +349,7 @@ sub get_template_and_user {
             IntranetNav                 => C4::Context->preference("IntranetNav"),
             IntranetmainUserblock       => C4::Context->preference("IntranetmainUserblock"),
             LibraryName                 => C4::Context->preference("LibraryName"),
-            LoginBranchname             => (C4::Context->userenv?C4::Context->userenv->{"branchname"}:"insecure"),
+            LoginBranchname             => ($userenv?$userenv->{"branchname"}:"insecure"),
             advancedMARCEditor          => C4::Context->preference("advancedMARCEditor"),
             canreservefromotherbranches => C4::Context->preference('canreservefromotherbranches'),
             intranetcolorstylesheet     => C4::Context->preference("intranetcolorstylesheet"),
@@ -364,6 +369,14 @@ sub get_template_and_user {
             AllowMultipleCovers         => C4::Context->preference('AllowMultipleCovers'),
             EnableBorrowerFiles         => C4::Context->preference('EnableBorrowerFiles'),
         );
+        if ( C4::Context->preference('UsePrintQueues') ) {
+            my $printer = get_user_printer();
+            my $printer_rec = $printer ? GetPrinterDetails($printer) : {};
+            $template->param(
+                UsePrintQueues          => 1,
+                PrinterName             => $printer_rec->{printername},
+            );
+        }
     }
     else {
         warn "template type should be OPAC, here it is=[" . $in->{'type'} . "]" unless ( $in->{'type'} eq 'opac' );
@@ -382,8 +395,8 @@ sub get_template_and_user {
         my $opac_name = '';
         if (($opac_search_limit =~ /branch:(\w+)/ && $opac_limit_override) || $in->{'query'}->param('limit') =~ /branch:(\w+)/){
             $opac_name = $1;   # opac_search_limit is a branch, so we use it.
-        } elsif (C4::Context->preference("SearchMyLibraryFirst") && C4::Context->userenv && C4::Context->userenv->{'branch'}) {
-            $opac_name = C4::Context->userenv->{'branch'};
+        } elsif (C4::Context->preference("SearchMyLibraryFirst") && $userenv_branch) {
+            $opac_name = $userenv_branch
         }
         $template->param(
             opaccolorstylesheet       => C4::Context->preference("opaccolorstylesheet"),
@@ -393,7 +406,7 @@ sub get_template_and_user {
             CalendarFirstDayOfWeek      => (C4::Context->preference("CalendarFirstDayOfWeek") eq "Sunday")?0:1,
             LibraryName               => "" . C4::Context->preference("LibraryName"),
             LibraryNameTitle          => "" . $LibraryNameTitle,
-            LoginBranchname           => C4::Context->userenv?C4::Context->userenv->{"branchname"}:"",
+            LoginBranchname           => $userenv?$userenv->{"branchname"}:"",
             OPACAmazonCoverImages     => C4::Context->preference("OPACAmazonCoverImages"),
             OPACFRBRizeEditions       => C4::Context->preference("OPACFRBRizeEditions"),
             OpacHighlightedWords       => C4::Context->preference("OpacHighlightedWords"),
@@ -424,7 +437,7 @@ sub get_template_and_user {
             RequestOnOpac             => C4::Context->preference("RequestOnOpac"),
             'Version'                 => C4::Context->preference('Version'),
             hidelostitems             => C4::Context->preference("hidelostitems"),
-            mylibraryfirst            => (C4::Context->preference("SearchMyLibraryFirst") && C4::Context->userenv) ? C4::Context->userenv->{'branch'} : '',
+            mylibraryfirst            => (C4::Context->preference("SearchMyLibraryFirst") && $userenv) ? $userenv_branch : '',
             opaclayoutstylesheet      => "" . C4::Context->preference("opaclayoutstylesheet"),
             opacbookbag               => "" . C4::Context->preference("opacbookbag"),
             opaccredits               => "" . C4::Context->preference("opaccredits"),
@@ -1644,8 +1657,24 @@ sub getborrowernumber {
     return 0;
 }
 
+=head2 get_user_printer
+
+  $printer = get_user_printer();
+
+  Returns printer queue that is to be used for the logged in user
+
+=cut
+
+sub get_user_printer {
+    my $userenv = C4::Context->userenv or return;
+    if (my $printer = $userenv->{branchprinter}) {
+        return $printer;
+    }
+    my $branchname = $userenv->{branch} or return;
+    my $branch = GetBranchDetail($branchname) or return;
+    return $branch->{branchprinter};
+}
 
-END { }    # module clean-up code here (global destructor)
 1;
 __END__
 
diff --git a/C4/Context.pm b/C4/Context.pm
index 0a56aa8..7835497 100644
--- a/C4/Context.pm
+++ b/C4/Context.pm
@@ -978,7 +978,7 @@ sub userenv {
 =head2 set_userenv
 
   C4::Context->set_userenv($usernum, $userid, $usercnum, $userfirstname, 
-                  $usersurname, $userbranch, $userflags, $emailaddress);
+                  $usersurname, $userbranch, $userflags, $emailaddress, $branchprinter);
 
 Establish a hash of user environment variables.
 
diff --git a/C4/Koha.pm b/C4/Koha.pm
index 26106cf..1e1a412 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -39,7 +39,6 @@ BEGIN {
 	@EXPORT = qw(
 		&slashifyDate
 		&subfield_is_koha_internal_p
-		&GetPrinters &GetPrinter
 		&GetItemTypes &getitemtypeinfo
 		&GetCcodes
 		&GetSupportName &GetSupportList
@@ -600,45 +599,6 @@ sub getImageSets {
     return \@imagesets;
 }
 
-=head2 GetPrinters
-
-  $printers = &GetPrinters();
-  @queues = keys %$printers;
-
-Returns information about existing printer queues.
-
-C<$printers> is a reference-to-hash whose keys are the print queues
-defined in the printers table of the Koha database. The values are
-references-to-hash, whose keys are the fields in the printers table.
-
-=cut
-
-sub GetPrinters {
-    my %printers;
-    my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare("select * from printers");
-    $sth->execute;
-    while ( my $printer = $sth->fetchrow_hashref ) {
-        $printers{ $printer->{'printqueue'} } = $printer;
-    }
-    return ( \%printers );
-}
-
-=head2 GetPrinter
-
-  $printer = GetPrinter( $query, $printers );
-
-=cut
-
-sub GetPrinter ($$) {
-    my ( $query, $printers ) = @_;    # get printer for this query from printers
-    my $printer = $query->param('printer');
-    my %cookie = $query->cookie('userenv');
-    ($printer) || ( $printer = $cookie{'printer'} ) || ( $printer = '' );
-    ( $printers->{$printer} ) || ( $printer = ( keys %$printers )[0] );
-    return $printer;
-}
-
 =head2 getnbpages
 
 Returns the number of pages to display in a pagination bar, given the number
diff --git a/C4/Printer.pm b/C4/Printer.pm
new file mode 100644
index 0000000..22d8659
--- /dev/null
+++ b/C4/Printer.pm
@@ -0,0 +1,148 @@
+#!/usr/bin/perl
+
+package C4::Printer;
+
+# Copyright 2012 Catalyst IT
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use strict;
+use warnings;
+
+use C4::Context;
+
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
+
+BEGIN {
+    $VERSION = 3.07.00.049;
+    require Exporter;
+    @ISA    = qw(Exporter);
+    @EXPORT = qw(
+    );
+    @EXPORT_OK = qw(
+        &GetPrinters &SearchPrinters &GetPrinterDetails
+        &AddPrinter &UpdatePrinter &DeletePrinter
+    );
+}
+
+=head1 NAME
+
+C4::Printer - functions that deal with printer selection
+
+=head1 SYNOPSIS
+
+  use C4::Printer;
+
+=head1 DESCRIPTION
+
+This module provides functions to select printer for slips etc.
+
+TODO: Move SQL from admin/printers.pl to this module
+
+=head1 FUNCTIONS
+
+=head2 GetPrinters
+
+  $printers = &GetPrinters();
+  @queues = keys %$printers;
+
+Returns information about existing printer queues.
+
+C<$printers> is a reference-to-hash whose keys are the print queues
+defined in the printers table of the Koha database. The values are
+references-to-hash, whose keys are the fields in the printers table.
+
+=cut
+
+sub GetPrinters {
+    my %printers;
+    my $dbh = C4::Context->dbh;
+    my $sth = $dbh->prepare("select * from printers");
+    $sth->execute;
+    while ( my $printer = $sth->fetchrow_hashref ) {
+        $printers{ $printer->{'printqueue'} } = $printer;
+    }
+    return ( \%printers );
+}
+
+=head2 SearchPrinters
+
+  $printers = SearchPrinters( $searchstring );
+
+=cut
+
+sub SearchPrinters {
+    my ($searchstring)=@_;
+    $searchstring .= '%';
+    return C4::Context->dbh->selectall_arrayref("
+        SELECT * FROM printers 
+        WHERE printername like ? OR printqueue like ? ORDER BY printername
+        ", {Slice => {}}, $searchstring, $searchstring);
+}
+
+=head2 GetPrinterDetails
+
+  $printer_rec = GetPrinterDetails( $printqueue );
+
+=cut
+
+sub GetPrinterDetails {
+    my ( $printer ) = @_;
+    my $dbh = C4::Context->dbh;
+    my $printername = $dbh->selectrow_hashref('SELECT * FROM printers WHERE printqueue = ?', undef, $printer);
+    return $printername;
+}
+
+=head2 AddPrinter
+
+  AddPrinter( $data );
+
+=cut
+
+sub AddPrinter {
+    my ( $data ) = @_;
+    my $dbh = C4::Context->dbh;
+    $dbh->do("INSERT INTO printers (printername,printqueue,printtype) VALUES (?,?,?)", undef,
+        $data->{printername}, $data->{printqueue}, $data->{printtype});
+}
+
+=head2 UpdatePrinter
+
+  UpdatePrinter( $printqueue, $data );
+
+=cut
+
+sub UpdatePrinter {
+    my ( $printqueue, $data ) = @_;
+    my $dbh = C4::Context->dbh;
+    $dbh->do("UPDATE printers SET printername = ?, printtype = ? WHERE printqueue = ?", undef,
+        $data->{printername}, $data->{printtype}, $printqueue);
+}
+
+=head2 DeletePrinter
+
+  DeletePrinter( $printqueue );
+
+=cut
+
+sub DeletePrinter {
+    my ( $printqueue ) = @_;
+    my $dbh = C4::Context->dbh;
+    $dbh->do("DELETE FROM printers WHERE printqueue = ?", undef,
+        $printqueue);
+}
+
+1;
diff --git a/admin/branches.pl b/admin/branches.pl
index d172ea6..3671f43 100755
--- a/admin/branches.pl
+++ b/admin/branches.pl
@@ -45,6 +45,7 @@ use C4::Context;
 use C4::Output;
 use C4::Koha;
 use C4::Branch;
+use C4::Printer qw(GetPrinters);
 
 # Fixed variables
 my $script_name = "/cgi-bin/koha/admin/branches.pl";
@@ -226,12 +227,9 @@ sub default {
 
 sub editbranchform {
     my ($branchcode,$innertemplate) = @_;
-    # initiate the scrolling-list to select the printers
-    my $printers = GetPrinters();
-    my @printerloop;
+
     my $data;
     my $oldprinter = "";
-
     if ($branchcode) {
         $data = GetBranchInfo($branchcode);
         $data = $data->[0];
@@ -241,15 +239,21 @@ sub editbranchform {
         _branch_to_template($data, $innertemplate);
     }
 
-    foreach my $thisprinter ( keys %$printers ) {
-        push @printerloop, {
-            value         => $thisprinter,
-            selected      => ( $oldprinter eq $printers->{$thisprinter} ),
-            branchprinter => $printers->{$thisprinter}->{'printqueue'},
-        };
+    if ( C4::Context->preference('UsePrintQueues') ) {
+        # initiate the scrolling-list to select the printers
+        my $printers = GetPrinters();
+        my @printerloop;
+        foreach my $thisprinter ( keys %$printers ) {
+            push @printerloop, {
+                value         => $thisprinter,
+                selected      => ( $oldprinter eq $thisprinter ),
+                branchprinter => $printers->{$thisprinter}->{'printername'},
+            };
+        }
+
+        $innertemplate->param( printerloop => \@printerloop );
     }
 
-    $innertemplate->param( printerloop => \@printerloop );
     # make the checkboxes.....
     #
     # We export a "categoryloop" array to the template, each element of which
@@ -308,6 +312,7 @@ sub branchinfotable {
 
     my ($branchcode,$innertemplate) = @_;
     my $branchinfo = $branchcode ? GetBranchInfo($branchcode) : GetBranchInfo();
+    my $printers = GetPrinters();
     my @loop_data = ();
     foreach my $branch (@$branchinfo) {
         #
@@ -367,6 +372,9 @@ sub branchinfotable {
         $row{'branch_name'} = $branch->{'branchname'};
         $row{'branch_code'} = $branch->{'branchcode'};
         $row{'value'}       = $branch->{'branchcode'};
+        if (my $printer = $branch->{'branchprinter'}) {
+            $row{'branchprintername'} = $printers->{$printer}->{'printername'};
+        }
 
         push @loop_data, \%row;
     }
diff --git a/admin/printers.pl b/admin/printers.pl
index c7e7492..701f9fe 100755
--- a/admin/printers.pl
+++ b/admin/printers.pl
@@ -7,17 +7,17 @@
 # ALGO :
 # this script use an $op to know what to do.
 # if $op is empty or none of the above values,
-#	- the default screen is build (with all records, or filtered datas).
-#	- the   user can clic on add, modify or delete record.
+#    - the default screen is build (with all records, or filtered datas).
+#    - the   user can clic on add, modify or delete record.
 # if $op=add_form
-#	- if primkey exists, this is a modification,so we read the $primkey record
-#	- builds the add/modify form
+#    - if primkey exists, this is a modification,so we read the $primkey record
+#    - builds the add/modify form
 # if $op=add_validate
-#	- the user has just send datas, so we create/modify the record
+#    - the user has just send datas, so we create/modify the record
 # if $op=delete_form
-#	- we show the record having primkey=$primkey and ask for deletion validation form
+#    - we show the record having primkey=$primkey and ask for deletion validation form
 # if $op=delete_confirm
-#	- we delete the record having primkey=$primkey
+#    - we delete the record having primkey=$primkey
 
 
 # Copyright 2000-2002 Katipo Communications
@@ -43,19 +43,7 @@ use CGI;
 use C4::Context;
 use C4::Output;
 use C4::Auth;
-
-sub StringSearch  {
-	my ($searchstring,$type)=@_;		# why bother with $type if we don't use it?!
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $sth = C4::Context->dbh->prepare("
-		SELECT printername,printqueue,printtype from printers 
-		WHERE (printername like ?) order by printername
-	");
-	$sth->execute("$data[0]%");
-	my $data=$sth->fetchall_arrayref({});
-	return (scalar(@$data),$data);
-}
+use C4::Printer qw(GetPrinterDetails SearchPrinters AddPrinter UpdatePrinter DeletePrinter);
 
 my $input = new CGI;
 my $searchfield=$input->param('searchfield');
@@ -68,83 +56,95 @@ my $op = $input->param('op');
 $searchfield=~ s/\,//g;
 
 my ($template, $loggedinuser, $cookie) = get_template_and_user({
-	   template_name => "admin/printers.tmpl",
-			   query => $input,
-			 	type => "intranet",
-	 authnotrequired => 0,
+       template_name => "admin/printers.tmpl",
+               query => $input,
+                type => "intranet",
+     authnotrequired => 0,
        flagsrequired => {parameters => 'parameters_remaining_permissions'},
-		       debug => 1,
+               debug => 1,
 });
 
-$template->param(searchfield => $searchfield,
-		 script_name => $script_name);
-
 #start the page and read in includes
 
 my $dbh = C4::Context->dbh;
+my $list_printers = 1;
 ################## ADD_FORM ##################################
 # called by default. Used to create form to add or  modify a record
 if ($op eq 'add_form') {
-	$template->param(add_form => 1);
-	#---- if primkey exists, it's a modify action, so read values to modify...
-	my $data;
-	if ($searchfield) {
-		my $sth=$dbh->prepare("SELECT printername,printqueue,printtype from printers where printername=?");
-		$sth->execute($searchfield);
-		$data=$sth->fetchrow_hashref;
-	}
-
-	$template->param(printqueue => $data->{'printqueue'},
-			 printtype => $data->{'printtype'});
-													# END $OP eq ADD_FORM
+    $list_printers = 0;
+    $template->param(add_form => 1);
+    #---- if primkey exists, it's a modify action, so read values to modify...
+    my $data;
+    if ($searchfield) {
+        $data=GetPrinterDetails($searchfield);
+    }
+
+    $template->param(
+        printqueue => $data->{'printqueue'},
+        printername => $data->{'printername'},
+        printtype => $data->{'printtype'}
+    );
+# END $OP eq ADD_FORM
 ################## ADD_VALIDATE ##################################
 # called by add_form, used to insert/modify data in DB
 } elsif ($op eq 'add_validate') {
-	$template->param(add_validate => 1);
-	if ($input->param('add')){
-		my $sth=$dbh->prepare("INSERT INTO printers (printername,printqueue,printtype) VALUES (?,?,?)");
-		$sth->execute($input->param('printername'),$input->param('printqueue'),$input->param('printtype'));
-	} else {
-		my $sth=$dbh->prepare("UPDATE printers SET printqueue=?,printtype=? WHERE printername=?");
-		$sth->execute($input->param('printqueue'),$input->param('printtype'),$input->param('printername'));
-	}
-													# END $OP eq ADD_VALIDATE
+    my $params = $input->Vars;
+    if ($input->param('add')){
+        AddPrinter($params);
+    } else {
+        UpdatePrinter($params->{printqueue}, $params);
+    }
+    $template->param(add_validate => 1);
+    $searchfield = '';
+# END $OP eq ADD_VALIDATE
 ################## DELETE_CONFIRM ##################################
 # called by default form, used to confirm deletion of data in DB
 } elsif ($op eq 'delete_confirm') {
-	$template->param(delete_confirm => 1);
-	my $sth=$dbh->prepare("select printername,printqueue,printtype from printers where printername=?");
-	$sth->execute($searchfield);
-	my $data=$sth->fetchrow_hashref;
-	$template->param(printqueue => $data->{'printqueue'},
-			 printtype  => $data->{'printtype'});
-													# END $OP eq DELETE_CONFIRM
+    $list_printers = 0;
+    $template->param(delete_confirm => 1);
+    my $data=GetPrinterDetails($searchfield);
+    $template->param(
+        printqueue => $data->{'printqueue'},
+        printtype  => $data->{'printtype'},
+    );
+# END $OP eq DELETE_CONFIRM
 ################## DELETE_CONFIRMED ##################################
 # called by delete_confirm, used to effectively confirm deletion of data in DB
 } elsif ($op eq 'delete_confirmed') {
-	$template->param(delete_confirmed => 1);
-	my $sth=$dbh->prepare("delete from printers where printername=?");
-	$sth->execute($searchfield);
-													# END $OP eq DELETE_CONFIRMED
+    # XXX Delete can fail
+    DeletePrinter($searchfield);
+    $template->param(delete_confirmed => 1);
+    $template->param(list_printers => 1);
+    $searchfield = '';
+# END $OP eq DELETE_CONFIRMED
 ################## DEFAULT ###########################################
 } else { # DEFAULT
-	$template->param(else => 1);
-	my ($count,$results)=StringSearch($searchfield,'web');
-	my $max = ($offset+$pagesize < $count) ? $offset+$pagesize : $count;
-	my @loop = (@$results)[$offset..$max];
-	
-	$template->param(loop => \@loop);
-	
-	if ($offset>0) {
-		$template->param(offsetgtzero => 1,
-				 prevpage => $offset-$pagesize);
-	}
-	if ($offset+$pagesize<$count) {
-		$template->param(ltcount => 1,
-				 nextpage => $offset+$pagesize);
-	}
-
+    $searchfield ||= $input->param('description') || "";
 } #---- END $OP eq DEFAULT
 
+if ($list_printers) {
+    $template->param(list_printers => 1);
+    my $results=SearchPrinters($searchfield);
+    my $count = $results ? scalar(@$results) : 0;
+    my $max = ($offset+$pagesize < $count) ? $offset+$pagesize : $count;
+    my @loop = (@$results)[$offset..$max-1];
+    
+    $template->param(loop => \@loop);
+    
+    if ($offset>0) {
+        $template->param(offsetgtzero => 1,
+                 prevpage => $offset-$pagesize);
+    }
+    if ($offset+$pagesize<$count) {
+        $template->param(ltcount => 1,
+                 nextpage => $offset+$pagesize);
+    }
+}
+
+$template->param(
+    searchfield => $searchfield,
+    script_name => $script_name
+);
+
 output_html_with_http_headers $input, $cookie, $template->output;
 
diff --git a/circ/circulation.pl b/circ/circulation.pl
index 78ac1a4..54138ef 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -29,7 +29,7 @@ use C4::Print;
 use C4::Auth qw/:DEFAULT get_session/;
 use C4::Dates qw/format_date/;
 use C4::Branch; # GetBranches
-use C4::Koha;   # GetPrinter
+use C4::Koha;
 use C4::Circulation;
 use C4::Overdues qw/CheckBorrowerDebarred/;
 use C4::Members;
@@ -67,12 +67,6 @@ if ($branch){
     $session->param('branchname', GetBranchName($branch));
 }
 
-my $printer = $query->param('printer');
-if ($printer){
-    # update our session so the userenv is updated
-    $session->param('branchprinter', $printer);
-}
-
 if (!C4::Context->userenv && !$branch){
     if ($session->param('branch') eq 'NO_LIBRARY_SET'){
         # no branch set we can't issue
@@ -102,8 +96,6 @@ $findborrower =~ s|,| |g;
 my $borrowernumber = $query->param('borrowernumber');
 
 $branch  = C4::Context->userenv->{'branch'};  
-$printer = C4::Context->userenv->{'branchprinter'};
-
 
 # If AutoLocation is not activated, we show the Circulation Parameters to chage settings of librarian
 if (C4::Context->preference("AutoLocation") != 1) {
@@ -665,8 +657,6 @@ $template->param(
     borrowernumber    => $borrowernumber,
     branch            => $branch,
     branchname        => GetBranchName($borrower->{'branchcode'}),
-    printer           => $printer,
-    printername       => $printer,
     firstname         => $borrower->{'firstname'},
     surname           => $borrower->{'surname'},
     showname          => $borrower->{'showname'},
diff --git a/circ/returns.pl b/circ/returns.pl
index 743bf18..0efa712 100755
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -36,7 +36,6 @@ use C4::Context;
 use C4::Auth qw/:DEFAULT get_session/;
 use C4::Output;
 use C4::Circulation;
-use C4::Print;
 use C4::Reserves;
 use C4::Biblio;
 use C4::Items;
@@ -73,15 +72,10 @@ my ( $template, $librarian, $cookie ) = get_template_and_user(
 #####################
 #Global vars
 my $branches = GetBranches();
-my $printers = GetPrinters();
 
-my $printer = C4::Context->userenv ? C4::Context->userenv->{'branchprinter'} : "";
 my $overduecharges = (C4::Context->preference('finesMode') && C4::Context->preference('finesMode') ne 'off');
 
 my $userenv_branch = C4::Context->userenv->{'branch'} || '';
-#
-# Some code to handle the error if there is no branch or printer setting.....
-#
 
 # Set up the item stack ....
 my %returneditems;
@@ -601,9 +595,7 @@ foreach ( sort { $a <=> $b } keys %returneditems ) {
 $template->param(
     riloop         => \@riloop,
     genbrname      => $branches->{$userenv_branch}->{'branchname'},
-    genprname      => $printers->{$printer}->{'printername'},
     branchname     => $branches->{$userenv_branch}->{'branchname'},
-    printer        => $printer,
     errmsgloop     => \@errmsgloop,
     exemptfine     => $exemptfine,
     dropboxmode    => $dropboxmode,
diff --git a/circ/selectbranchprinter.pl b/circ/selectbranchprinter.pl
index b5adcfc..67034b7 100755
--- a/circ/selectbranchprinter.pl
+++ b/circ/selectbranchprinter.pl
@@ -23,10 +23,10 @@ use CGI;
 
 use C4::Context;
 use C4::Output;
-use C4::Auth qw/:DEFAULT get_session/;
-use C4::Print;  # GetPrinters
+use C4::Auth qw/:DEFAULT get_session get_user_printer/;
 use C4::Koha;
 use C4::Branch; # GetBranches GetBranchesLoop
+use C4::Printer qw(GetPrinters);
 
 # this will be the script that chooses branch and printer settings....
 
@@ -56,9 +56,10 @@ my $userenv_printer = C4::Context->userenv->{'branchprinter'} || '';
 my @updated;
 
 # $session lddines here are doing the updating
-if ($branch and $branches->{$branch}) {
+my $branch_rec = $branch ? $branches->{$branch} : undef;
+if ($branch_rec) {
     if (! $userenv_branch or $userenv_branch ne $branch ) {
-        my $branchname = GetBranchName($branch);
+        my $branchname = $branch_rec->{branchname};
         $template->param(LoginBranchname => $branchname);   # update template for new branch
         $template->param(LoginBranchcode => $branch);       # update template for new branch
         $session->param('branchname', $branchname);         # update sesssion in DB
@@ -67,6 +68,8 @@ if ($branch and $branches->{$branch}) {
             updated_branch => 1,
                 old_branch => $userenv_branch,
         };
+        $printer ||= $branch_rec->{branchprinter};
+        undef $userenv_printer;
     } # else branch the same, no update
 } else {
     $branch = $userenv_branch;  # fallback value
@@ -87,7 +90,7 @@ if ($printer) {
         };
     } # else printer is the same, no update
 } else {
-    $printer = $userenv_printer;  # fallback value
+    $printer = get_user_printer();  # fallback value
 }
 
 $template->param(updated => \@updated) if (scalar @updated);
@@ -96,21 +99,6 @@ unless ($branches->{$branch}) {
     $branch = (keys %$branches)[0];  # if branch didn't really exist, then replace it w/ one that does
 }
 
-my @printkeys = sort keys %$printers;
-if (scalar(@printkeys) == 1 or not $printers->{$printer}) {
-    $printer = $printkeys[0];   # if printer didn't really exist, or there is only 1 anyway, then replace it w/ one that does
-}
-
-my @printerloop;
-foreach ( @printkeys ) {
-    next unless ($_); # skip printer if blank.
-    push @printerloop, {
-        selected => ( $_ eq $printer ),
-        name     => $printers->{$_}->{'printername'},
-        value    => $_,
-    };
-}
-
 my @recycle_loop;
 foreach ($query->param()) {
     $_ or next;                   # disclude blanks
@@ -133,9 +121,28 @@ if (scalar @updated and not scalar @recycle_loop) {
 
 $template->param(
     referer     => $referer,
-    printerloop => \@printerloop,
     branchloop  => GetBranchesLoop($branch),
     recycle_loop=> \@recycle_loop,
 );
 
+if ( C4::Context->preference('UsePrintQueues') ) {
+    my @printkeys = keys %$printers;
+    if (scalar(@printkeys) == 1 or not $printers->{$printer}) {
+        $printer = $printkeys[0];   # if printer didn't really exist, or there is only 1 anyway, then replace it w/ one that does
+    }
+
+    my @printerloop;
+    foreach ( @printkeys ) {
+        push @printerloop, {
+            selected => ( $_ eq $printer ),
+            name     => $printers->{$_}->{'printername'},
+            value    => $_,
+        };
+    }
+
+    $template->param(
+        printerloop => \@printerloop,
+    );
+}
+
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 91d42a2..048a7ea 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -364,10 +364,11 @@ CREATE TABLE `branches` ( -- information about your libraries or branches are st
   `branchurl` mediumtext, -- the URL for your library or branch's website
   `issuing` tinyint(4) default NULL, -- unused in Koha
   `branchip` varchar(15) default NULL, -- the IP address for your library or branch
-  `branchprinter` varchar(100) default NULL, -- unused in Koha
+  `branchprinter` varchar(20) default NULL,
   `branchnotes` mediumtext, -- notes related to your library or branch
   opac_info text, -- HTML that displays in OPAC
   PRIMARY KEY (`branchcode`)
+  FOREIGN KEY (branchprinter) REFERENCES printers (printqueue) ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
@@ -1570,12 +1571,13 @@ CREATE TABLE `pending_offline_operations` (
 -- Table structure for table `printers`
 --
 
-DROP TABLE IF EXISTS `printers`;
-CREATE TABLE `printers` (
-  `printername` varchar(40) NOT NULL default '',
-  `printqueue` varchar(20) default NULL,
-  `printtype` varchar(20) default NULL,
-  PRIMARY KEY  (`printername`)
+DROP TABLE IF EXISTS printers;
+CREATE TABLE printers (
+  printername varchar(40) NOT NULL default '',
+  printqueue varchar(20) NOT NULL,
+  printtype varchar(20) default NULL,
+  PRIMARY KEY  (printqueue),
+  UNIQUE (printername)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 35f92cc..f21b071 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -366,6 +366,7 @@ INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES (
 INSERT INTO systempreferences (variable,value,explanation,type) VALUES('EnableBorrowerFiles','0','If enabled, allows librarians to upload and attach arbitrary files to a borrower record.','YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('UpdateTotalIssuesOnCirc','0','Whether to update the totalissues field in the biblio on each circ.',NULL,'YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('IntranetSlipPrinterJS','','Use this JavaScript for printing slips. Define at least function printThenClose(). For use e.g. with Firefox PlugIn jsPrintSetup, see http://jsprintsetup.mozdev.org/','','Free');
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('UsePrintQueues','0',NULL,NULL,'YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacSuppressionByIPRange','','Restrict the suppression to IP adresses outside of the IP range','','free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('PrefillItem','0','When a new item is added, should it be prefilled with last created item values?','','YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('SubfieldsToUseWhenPrefill','','Define a list of subfields to use when prefilling items (separated by space)','','Free');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 25cd367..3649a78 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -5696,6 +5696,18 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion($DBversion);
 }
 
+
+
+$DBversion = "3.09.00.XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    $dbh->do("ALTER TABLE printers DROP PRIMARY KEY, MODIFY printqueue varchar(20) NOT NULL PRIMARY KEY, ADD UNIQUE (printername)");
+    $dbh->do("ALTER TABLE branches MODIFY branchprinter varchar(20) NULL, ADD FOREIGN KEY (branchprinter) REFERENCES printers (printqueue) ON UPDATE CASCADE");
+    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('UsePrintQueues','0',NULL,NULL,'YesNo')");
+
+    print "Upgrade to $DBversion done (Add borrowers.default_printqueue and 'UsePrintQueues' syspref)\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
index 72162d3..7da6f1f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
@@ -59,6 +59,7 @@
 <h5>Additional parameters</h5>
 
 <ul>
+    [% IF UsePrintQueues %]<li><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></li>[% END %]
     [% IF ( NoZebra ) %]<li><a href="/cgi-bin/koha/admin/stopwords.pl">Stop words</a></li>[% END %]
 	<!-- <li><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></li> -->
     <li><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 client targets</a></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 3d71d45..7d3aa24 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -57,6 +57,9 @@
                 [% LoginBranchname %]
             [% END %]
             </strong>
+            [% IF UsePrintQueues && PrinterName %]
+            - [% PrinterName %]
+            [% END %]
             [% IF ( IndependantBranches ) %]
                 [% IF ( CAN_user_management || CAN_user_editcatalogue_edit_catalogue ) %]
                     ( <a class="toplinks" href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a> )
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
index 3906c46..d2e0fc5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
@@ -101,8 +101,8 @@
 <dl>
 	[% IF ( NoZebra ) %]<dt><a href="/cgi-bin/koha/admin/stopwords.pl">Stop words</a></dt>
 	<dd>Words ignored during search.</dd>[% END %]
-	<!-- <dt><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></dt>
-	<dd>Printers (UNIX paths).</dd> -->
+   [% IF UsePrintQueues %]<dt><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></dt>
+ <dd>Printers (UNIX paths).</dd>[% END %]
     <dt><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 client targets</a></dt>
 	<dd>Define which servers to query for MARC data in the integrated Z39.50 client.</dd>
 </dl>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
index 15e8064..bcb918f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
@@ -143,10 +143,10 @@ tinyMCE.init({
         <li><label for="branchurl">URL</label><input type="text" name="branchurl" id="branchurl" value="[% branchurl |html %]" /></li>
         <li><label for="opac_info">OPAC info</label><textarea name="opac_info" id="opac_info">[% opac_info |html %]</textarea></li>
         <li><label for="branchip">IP</label><input type="text" name="branchip" id="branchip" value="[% branchip |html %]" /> <span class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</span></li>
-		<!--
-        <li><label for="branchprinter">Library Printer</label>
+[% IF UsePrintQueues %]
+        <li><label for="branchprinter">Library printer</label>
             <select id="branchprinter" name="branchprinter">
-                <option value="">None</option>
+                <option value="">(None)</option>
             [% FOREACH printerloo IN printerloop %]
                 [% IF ( printerloo.selected ) %]
 				<option value="[% printerloo.value %]" selected="selected">[% printerloo.branchprinter %]</option>
@@ -155,7 +155,7 @@ tinyMCE.init({
 				[% END %]
                 [% END %]
             </select></li>
-			-->
+[% END %]
         <li><label for="branchnotes">Notes</label><input type="text" name="branchnotes" id="branchnotes" value="[% branchnotes |html %]" /></li>
         </ol>
         </fieldset>
@@ -198,7 +198,9 @@ tinyMCE.init({
             <th>Address</th>
             <th>Properties</th>
             <th>IP</th>
-            <!-- <th>Printer</th> -->
+[% IF UsePrintQueues %]
+            <th>Printer</th>
+[% END %]
             <th colspan="2">&nbsp;</th>
         </tr></thead><tbody>
         [% FOREACH branche IN branches %]
@@ -250,9 +252,11 @@ tinyMCE.init({
                 <td>
                     [% branche.branchip %]
                 </td>
-                <!-- <td>
-                    [% branche.branchprinter %]
-                </td> -->
+[% IF UsePrintQueues %]
+                <td>
+                    [% branche.branchprintername %]
+                </td>
+[% END %]
                 <td>
                     <a href="[% branche.action %]?op=edit&amp;branchcode=[% branche.value |url %]">Edit</a>
                 </td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index a9ed6f7..23cd7ee 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -110,6 +110,12 @@ Circulation:
                   yes: Do
                   no: "Do not"
             - update a bibliographic record's total issues count whenever an item is issued (WARNING! This increases server load significantly; if performance is a concern, use the update_totalissues.pl cron job to update the total issues count).
+        -
+            - pref: UsePrintQueues
+              choices:
+                  yes: "Use"
+                  no: "Don't use"
+            - server print queues.
     Checkout Policy:
         -
             - pref: AllowNotForLoanOverride
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
index 7dfb80b..06fd229 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
@@ -4,7 +4,7 @@
 [% IF ( add_validate ) %] Printers &rsaquo; Printer added[% END %]
 [% IF ( delete_confirm ) %] Printers &rsaquo; Confirm deletion of printer '[% searchfield %]'[% END %]
 [% IF ( delete_confirmed ) %] Printers &rsaquo; Printer deleted[% END %]
-[% IF ( else ) %]Printers[% END %]</title>
+[% IF ( list_printers ) %]Printers[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% IF ( add_form ) %]<script type="text/javascript">
 //<![CDATA[
@@ -71,7 +71,7 @@
 [% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Printer added[% END %]
 [% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Confirm deletion of printer '[% searchfield %]'[% END %]
 [% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Printer deleted[% END %]
-[% IF ( else ) %]Printers[% END %]</div>
+[% IF ( list_printers ) %]Printers[% END %]</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -89,22 +89,17 @@
         <form action="[% script_name %]" name="Aform" method="post">
         <input type="hidden" name="op" value="add_validate" />
 	[% IF ( searchfield ) %]
+          <input type="hidden" name="searchfield" value="[% searchfield %]" />
 		<input type="hidden" name="add" value="0" />
 	[% ELSE %]
 		<input type="hidden" name="add" value="1" />
 	[% END %]
 	<fieldset class="rows">
-<ol>	[% IF ( searchfield ) %]
-		<li>
-            <span class="label">Printer name: </span>
-				<input type="hidden" name="printername" id="" value="[% searchfield %]" />[% searchfield %]
-		</li>
-	[% ELSE %]
+<ol>
 		<li>
             <label for="printername">Printer name: </label>
-				<input type="text" name="printername" id="printername" size="50" maxlength="50" />
+                             <input type="text" name="printername" id="printername" size="50" maxlength="50" value="[% printername %]" />
 		</li>
-	[% END %]
         	<li>
 			<label for="printqueue">Queue: </label>
 			<input type="text" name="printqueue" id="printqueue" size="50" maxlength="50" value="[% printqueue %]" /> 
@@ -119,13 +114,6 @@
 
 [% END %]
 
-[% IF ( add_validate ) %]
-<h3>Printer added</h3>
-<form action="[% script_name %]" method="post">
-       <fieldset class="action"> <input type="submit" value="OK" /></fieldset>
-</form>
-[% END %]
-
 [% IF ( delete_confirm ) %]
 <h3>Confirm deletion of printer <em>[% searchfield %]</em></h3>
 <ul>
@@ -151,14 +139,7 @@
 			</form>
 [% END %]
 
-[% IF ( delete_confirmed ) %]
-<h3>Printer deleted</h3>
-<form action="[% script_name %]" method="post">
-		<fieldset class="action"><input type="submit" value="OK" /></fieldset>
-</form>
-[% END %]
-
-[% IF ( else ) %]
+[% IF ( list_printers ) %]
 
 <div id="toolbar">
 	<script type="text/javascript">
@@ -190,7 +171,7 @@
 			<td>[% loo.printername %]</td>
 			<td>[% loo.printqueue %]</td>
 			<td>[% loo.printtype %]</td>
-			<td><a href="[% loo.script_name %]?op=add_form&amp;searchfield=[% loo.printername %]">Edit</a> <a href="[% loo.script_name %]?op=delete_confirm&amp;searchfield=[% loo.printername %]">Delete</a></td>
+                     <td><a href="[% loo.script_name %]?op=add_form&amp;searchfield=[% loo.printqueue %]">Edit</a> <a href="[% loo.script_name %]?op=delete_confirm&amp;searchfield=[% loo.printqueue %]">Delete</a></td>
 		</tr>
 		[% END %]
 	</table>[% ELSE %]<div class="notice">No printers defined.</div>[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 8724e9d..0dc95a8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -457,7 +457,6 @@ No patron matched <span class="ex">[% message %]</span>
     <legend>Patron selection</legend>
 
     <input type="hidden" name="branch" value="[% branch %]" />
-    <input type="hidden" name="printer" value="[% printer %]" />
     <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
     <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
 
@@ -515,7 +514,6 @@ No patron matched <span class="ex">[% message %]</span>
 </div>[% END %]
           <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
           <input type="hidden" name="branch" value="[% branch %]" />
-          <input type="hidden" name="printer" value="[% printer %]" />
           <input type="hidden" name="print" value="maybe" />
           <input type="hidden" name="debt_confirmed" value="[% debt_confirmed %]" />
                 [% IF ( CHARGES ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt
index acad21c..e742f81 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt
@@ -28,7 +28,7 @@ Updated:<ul>
     [% IF ( update.updated_branch ) %]
         <li>Library: [% update.old_branch or "?" %] &rArr; [% update.LoginBranchcode or "?" %]</li>
     [% ELSIF ( update.updated_printer ) %]
-      <!-- FIXME:  <li>Printer: [% update.old_printer or "?" %] &rArr; [% update.new_printer or "?" %]</li> -->
+        <li>Printer: [% update.old_printer or "?" %] &rArr; [% update.new_printer or "?" %]</li>
     [% ELSE %]
         <li>ERROR - unknown</li>
     [% END %]
@@ -63,7 +63,6 @@ Updated:<ul>
         [% END %]
         </select></li>
     [% END %]
-<!--
     [% IF ( printerloop ) %]
         <li><label for="printer">Choose a network printer:</label>
         <select name="printer" id="printer">
@@ -75,7 +74,7 @@ Updated:<ul>
                 [% END %]
             [% END %]
         </select></li>
-    [% END %] -->
+    [% END %]
     </ol>
 </fieldset>
 <fieldset class="action"><input type="submit" value="Submit" /></fieldset>
diff --git a/t/db_dependent/lib/KohaTest/Koha.pm b/t/db_dependent/lib/KohaTest/Koha.pm
index 13a145a..0dda47a 100644
--- a/t/db_dependent/lib/KohaTest/Koha.pm
+++ b/t/db_dependent/lib/KohaTest/Koha.pm
@@ -28,8 +28,6 @@ sub methods : Test( 1 ) {
       _getImagesFromDirectory
       _getSubdirectoryNames
       getImageSets
-      GetPrinters
-      GetPrinter
       getnbpages
       getallthemes
       getFacets
diff --git a/t/db_dependent/lib/KohaTest/Printer.pm b/t/db_dependent/lib/KohaTest/Printer.pm
new file mode 100644
index 0000000..4caef06
--- /dev/null
+++ b/t/db_dependent/lib/KohaTest/Printer.pm
@@ -0,0 +1,26 @@
+package KohaTest::Printer;
+use base qw( KohaTest );
+
+use strict;
+use warnings;
+
+use Test::More;
+
+use C4::Printer;
+sub testing_class { 'C4::Printer' }
+
+sub methods : Test( 1 ) {
+    my $self    = shift;
+    my @methods = qw(
+      GetPrinters
+      SearchPrinters
+      GetPrinterDetails
+      AddPrinter
+      UpdatePrinter
+      DeletePrinter
+    );
+
+    can_ok( $self->testing_class, @methods );
+}
+
+1;
-- 
1.7.9.5


From barry at oslo.ie  Mon Sep 10 16:32:25 2012
From: barry at oslo.ie (Barry Cannon)
Date: Mon, 10 Sep 2012 15:32:25 +0100
Subject: [Koha-patches] [PATCH] Bug 8745 - Disallow rebuild_zebra.pl from
	executing, when run by root user.
In-Reply-To: <Bug 8745 - Disallow rebuild zebra as root user>
References: <Bug 8745 - Disallow rebuild zebra as root user>
Message-ID: <1347287545-22639-1-git-send-email-barry@oslo.ie>

Added a check to warn users of execution as root user.
Added a 'runas-root' switch to allow users to force execution as root user.
---
 misc/migration_tools/rebuild_zebra.pl |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/rebuild_zebra.pl
index 1621e84..10d7338 100755
--- a/misc/migration_tools/rebuild_zebra.pl
+++ b/misc/migration_tools/rebuild_zebra.pl
@@ -38,6 +38,8 @@ my $do_not_clear_zebraqueue;
 my $length;
 my $where;
 my $offset;
+my $runas_root;
+my $run_user = (getpwuid($<))[0];
 my $verbose_logging = 0;
 my $zebraidx_log_opt = " -v none,fatal,warn ";
 my $result = GetOptions(
@@ -45,7 +47,7 @@ my $result = GetOptions(
     'r|reset'       => \$reset,
     's'             => \$skip_export,
     'k'             => \$keep_export,
-    'I|skip-index'    => \$skip_index,
+    'I|skip-index'  => \$skip_index,
     'nosanitize'    => \$nosanitize,
     'b'             => \$biblios,
     'noxml'         => \$noxml,
@@ -60,14 +62,21 @@ my $result = GetOptions(
     'length:i'        => \$length,
     'offset:i'      => \$offset,
     'v+'             => \$verbose_logging,
+    'runas-root'    => \$runas_root,
 );
 
-
 if (not $result or $want_help) {
     print_usage();
     exit 0;
 }
 
+if(not $runas_root && $run_user eq 'root') {
+    my $msg = "Warning: You are running this script as the user 'root'.\n";
+    $msg   .= "If this is intentional you must explicitly specify this using the -runas-root switch\n";
+    $msg   .= "Please do '$0 --help' to see usage.\n";
+    die $msg;
+}
+
 if (not $biblios and not $authorities) {
     my $msg = "Must specify -b or -a to reindex bibs or authorities\n";
     $msg   .= "Please do '$0 --help' to see usage.\n";
-- 
1.7.2.5


From matted-34813 at mypacks.net  Mon Sep 10 19:48:00 2012
From: matted-34813 at mypacks.net (matted-34813 at mypacks.net)
Date: Mon, 10 Sep 2012 12:48:00 -0500 (GMT-05:00)
Subject: [Koha-patches] SIGNED-OFF-Bug-8209-Did-you-mean-from-authorities
Message-ID: <17366594.1347299281156.JavaMail.root@wamui-june.atl.sa.earthlink.net>

After jcamins rebase for me to apply patch against master. I needed to retest for 8276.

From matted-34813 at mypacks.net  Mon Sep 10 20:09:38 2012
From: matted-34813 at mypacks.net (matted-34813 at mypacks.net)
Date: Mon, 10 Sep 2012 13:09:38 -0500 (GMT-05:00)
Subject: [Koha-patches] SIGNED-OFF-Bug-8726-ExplodedTerms-suggestion-plugin
Message-ID: <309254.1347300579087.JavaMail.root@wamui-june.atl.sa.earthlink.net>

I applied:
0001-Bug-8744-Thesaurus-in-authorities-should-not-lock-fi.patch
0002-Bug-8649-Add-unit-test-for-C4-Search.patch
0003-bug-8649-make-sure-C4-Context-is-fully-mocked-up-bef.patch
0004-bug-8649-make-sure-we-can-exit-if-a-test-fails.patch
0005-bug-8649-create-a-temp-directory-for-Zebra-for-C4-Se.patch
0006-bug-8649-quiet-a-variable-use-warning.patch
0007-Bug-8211-Add-exploded-search-options.patch
0008-SIGNED-OFF-Bug-8209-Did-you-mean-from-authorities.patch
0009-Bug-8726-ExplodedTerms-suggestion-plugin.patch

As mentioned, the work done in 8211 testing is duplicated here,
so I leveraged the authority linked geographical names i had in my db.

I applied the updatedatabase.pl
I configured the syspref  DidYouMean... to Suggest.  AND
on the main Administration web page, in the bottom right corner, there
is a new link "Did you mean?" to configure the suggestion plugins,
of which I checked (Exploded Terms, Auhtority file, Both) and did my searches.

Suggestion links showed up in the results page, to offer alternate searches,
(su-br, su-na, su-rl  accordingly) and I got the same results as 8211 provided.
The authority file link would show up using my search term as a link, and I had to pull down some biblios for "Smith, John" and use the authority search plugin to link the authority to the biblio item.

wajasu

From jcamins at cpbibliography.com  Tue Sep  4 17:50:26 2012
From: jcamins at cpbibliography.com (Jared Camins-Esakov)
Date: Tue, 4 Sep 2012 11:50:26 -0400
Subject: [PATCH 9/9] [SIGNED-OFF] Bug 8726: ExplodedTerms suggestion plugin
Message-ID: <mailman.67.1347299791.15477.koha-patches@lists.koha-community.org>

When working with hierarchical subject headings, it is sometimes helpful
to do a search for all records with a specific subject, plus
broader/narrower/related subjects. This patch adds a suggestion plugin for
these "exploded" subject searches to Koha. Note that this patch depends on
both bug 8211 AND bug 8209.

To test (NOTE: this test plan covers both 8211 and 8726):
1) Make sure you have a bunch of hierarchical subjects. I created
   geographical subjects for "Arizona," "United States," and "Phoenix,"
   and linked them together using 551s, and made sure I had a half
   dozen records linking to each (but not all to all three).
2) Do a search for su-br:Arizona (or choose "Subject and broader terms"
   on the advanced search screen with "more options" displayed), and
   check that you get the records with the subject "Arizona" and the
   records with the subject "United States"
3) Do a search for su-na:Arizona (or choose "Subject and narrower terms"
   on the advanced search screen with "more options" displayed), and
   check that you get the records with the subject "Arizona" and the
   records with the subject "Phoenix"
4) Do a search for su-rl:Arizona (or choose "Subject and related terms"
   on the advanced search screen with "more options" displayed), and
   check that you get the records with the subject "Arizona," the
   records with the subject "United States," and the records with the
   subject "Phoenix"
5) Ensure that other searches still work (keyword, subject, ccl,
   whatever)
6) Use "Did you mean?" page in admin section to enable ExplodedTerms
   plugin
7) Do a keyword search on the OPAC, confirm that searching for exploded
   terms is suggested.
8) Do a subject search on the OPAC, confirm that searching for exploded
   terms is suggested.
9) Do a non-keyword, non-subject search on the OPAC, confirm that
   searching for exploded terms is NOT suggested.
10) Disable ExplodedTerms plugin and enable AuthorityFile plugin.
11) Do search on OPAC, confirm suggestions are made from authority file.
12) Sign off

Signed-off-by: wajasu <matted-34813 at mypacks.net>
---
 Koha/SuggestionEngine.pm                           |   7 +-
 Koha/SuggestionEngine/Base.pm                      |  44 ++++++++-
 Koha/SuggestionEngine/Plugin/ExplodedTerms.pm      |  87 +++++++++++++++++
 admin/didyoumean.pl                                |  37 +++++++
 installer/data/mysql/sysprefs.sql                  |   3 +-
 installer/data/mysql/updatedatabase.pl             |   9 ++
 .../intranet-tmpl/prog/en/css/staff-global.css     |  36 +++++++
 .../intranet-tmpl/prog/en/includes/admin-menu.inc  |   1 +
 .../jquery/images/ui-bg_flat_0_aaaaaa_40x100.png   | Bin 0 -> 180 bytes
 .../jquery/images/ui-bg_flat_75_ffffff_40x100.png  | Bin 0 -> 178 bytes
 .../jquery/images/ui-bg_glass_55_fbf9ee_1x400.png  | Bin 0 -> 120 bytes
 .../jquery/images/ui-bg_glass_65_ffffff_1x400.png  | Bin 0 -> 105 bytes
 .../jquery/images/ui-bg_glass_75_dadada_1x400.png  | Bin 0 -> 111 bytes
 .../jquery/images/ui-bg_glass_75_e6e6e6_1x400.png  | Bin 0 -> 110 bytes
 .../jquery/images/ui-bg_glass_95_fef1ec_1x400.png  | Bin 0 -> 119 bytes
 .../ui-bg_highlight-soft_75_cccccc_1x100.png       | Bin 0 -> 101 bytes
 .../lib/jquery/images/ui-icons_2e83ff_256x240.png  | Bin 0 -> 4369 bytes
 .../lib/jquery/images/ui-icons_888888_256x240.png  | Bin 0 -> 4369 bytes
 .../lib/jquery/images/ui-icons_cd0a0a_256x240.png  | Bin 0 -> 4369 bytes
 .../intranet-tmpl/prog/en/lib/jquery/jquery-ui.css |  50 +++++-----
 .../intranet-tmpl/prog/en/lib/jquery/jquery-ui.js  | 108 ++---------------=
----
 .../prog/en/modules/admin/admin-home.tt            |   2 +
 .../prog/en/modules/admin/didyoumean.tt            | 104 +++++++++++++++++=
+++
 .../opac-tmpl/prog/en/lib/jquery/jquery-ui.css     | 103 +++++++++++------=
---
 .../opac-tmpl/prog/en/lib/jquery/jquery-ui.js      |  24 +++--
 .../opac-tmpl/prog/en/modules/opac-results.tt      |   2 +-
 .../prog/en/modules/text/explodedterms.tt          |   8 ++
 opac/opac-search.pl                                |   2 +-
 opac/svc/suggestion                                |  12 ++-
 t/SuggestionEngine_ExplodedTerms.t                 |  31 ++++++
 30 files changed, 484 insertions(+), 186 deletions(-)
 create mode 100644 Koha/SuggestionEngine/Plugin/ExplodedTerms.pm
 create mode 100755 admin/didyoumean.pl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg=
_flat_0_aaaaaa_40x100.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg=
_flat_75_ffffff_40x100.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg=
_glass_55_fbf9ee_1x400.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg=
_glass_65_ffffff_1x400.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg=
_glass_75_dadada_1x400.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg=
_glass_75_e6e6e6_1x400.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg=
_glass_95_fef1ec_1x400.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg=
_highlight-soft_75_cccccc_1x100.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-ic=
ons_2e83ff_256x240.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-ic=
ons_888888_256x240.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-ic=
ons_cd0a0a_256x240.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumea=
n.tt
 create mode 100644 koha-tmpl/opac-tmpl/prog/en/modules/text/explodedterms.=
tt
 create mode 100755 t/SuggestionEngine_ExplodedTerms.t

diff --git a/Koha/SuggestionEngine.pm b/Koha/SuggestionEngine.pm
index 0d977c1..e3ee1c9 100644
--- a/Koha/SuggestionEngine.pm
+++ b/Koha/SuggestionEngine.pm
@@ -87,7 +87,7 @@ sub new {
     my $options =3D $param->{options} || '';
     my @plugins =3D ();
=20
-    foreach my $plugin ( $param->{plugins} ) {
+    foreach my $plugin ( @{$param->{plugins}} ) {
         next unless $plugin;
         my $plugin_module =3D
             $plugin =3D~ m/:/
@@ -141,15 +141,18 @@ sub get_suggestions {
=20
     my %suggestions;
=20
+    my $index =3D scalar @{ $self->plugins };
+
     foreach my $pluginobj ( @{ $self->plugins } ) {
         next unless $pluginobj;
         my $pluginres =3D $pluginobj->get_suggestions($param);
         foreach my $suggestion (@$pluginres) {
             $suggestions{ $suggestion->{'search'} }->{'relevance'} +=3D
-              $suggestion->{'relevance'};
+              $suggestion->{'relevance'} * $index;
             $suggestions{ $suggestion->{'search'} }->{'label'} |=3D
               $suggestion->{'label'};
         }
+        $index--;
     }
=20
     my @results =3D ();
diff --git a/Koha/SuggestionEngine/Base.pm b/Koha/SuggestionEngine/Base.pm
index 95c6622..5c52e2b 100644
--- a/Koha/SuggestionEngine/Base.pm
+++ b/Koha/SuggestionEngine/Base.pm
@@ -60,8 +60,6 @@ use base qw(Class::Accessor);
=20
 __PACKAGE__->mk_ro_accessors(qw( name version ));
 __PACKAGE__->mk_accessors(qw( params ));
-our $NAME    =3D 'Base';
-our $VERSION =3D '1.0';
=20
 =3Dhead2 new
=20
@@ -125,4 +123,46 @@ sub get_suggestions {
     return;
 }
=20
+=3Dhead2 NAME
+
+    my $name =3D $plugin->NAME;
+
+Getter function for plugin names.
+
+=3Dcut
+
+sub NAME {
+    my $self =3D shift;
+    my $package =3D ref $self || $self;
+    return eval '$' . $package . '::NAME';
+}
+
+=3Dhead2 VERSION
+
+    my $version =3D $plugin->VERSION;
+
+Getter function for plugin versions.
+
+=3Dcut
+
+sub VERSION {
+    my $self =3D shift;
+    my $package =3D ref $self || $self;
+    return eval '$' . $package . '::VERSION';
+}
+
+=3Dhead2 DESCRIPTION
+
+    my $description =3D $plugin->DESCRIPTION;
+
+Getter function for plugin descriptions.
+
+=3Dcut
+
+sub DESCRIPTION {
+    my $self =3D shift;
+    my $package =3D ref $self || $self;
+    return eval '$' . $package . '::DESCRIPTION';
+}
+
 1;
diff --git a/Koha/SuggestionEngine/Plugin/ExplodedTerms.pm b/Koha/Suggestio=
nEngine/Plugin/ExplodedTerms.pm
new file mode 100644
index 0000000..a380261
--- /dev/null
+++ b/Koha/SuggestionEngine/Plugin/ExplodedTerms.pm
@@ -0,0 +1,87 @@
+package Koha::SuggestionEngine::Plugin::ExplodedTerms;
+
+# Copyright 2012 C & P Bibliography Services
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under th=
e
+# terms of the GNU General Public License as published by the Free Softwar=
e
+# Foundation; either version 2 of the License, or (at your option) any lat=
er
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNES=
S FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more detai=
ls.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+=3Dhead1 NAME
+
+Koha::SuggestionEngine::Plugin::ExplodedTerms - suggest searches for broad=
er/narrower/related subjects
+
+=3Dhead1 SYNOPSIS
+
+
+=3Dhead1 DESCRIPTION
+
+Plugin to suggest expanding the search by adding broader/narrower/related
+subjects to subject searches.
+
+=3Dcut
+
+use strict;
+use warnings;
+use Carp;
+use C4::Templates qw(gettemplate); # This is necessary for translatability
+
+use base qw(Koha::SuggestionEngine::Base);
+our $NAME    =3D 'ExplodedTerms';
+our $VERSION =3D '1.0';
+
+=3Dhead2 get_suggestions
+
+    my $suggestions =3D $plugin->get_suggestions(\%param);
+
+Return suggestions for the specified search that add broader/narrower/rela=
ted
+terms to the search.
+
+=3Dcut
+
+sub get_suggestions {
+    my $self  =3D shift;
+    my $param =3D shift;
+
+    my $search =3D $param->{'search'};
+
+    return if ( $search =3D~ m/^(ccl=3D|cql=3D|pqf=3D)/ );
+    $search =3D~ s/(su|su-br|su-na|su-rl)[:=3D](\w*)/OP!$2/g;
+    return if ( $search =3D~ m/\w+[:=3D]\w+/ );
+
+    my @indexes =3D (
+        'su-na',
+        'su-br',
+        'su-rl'
+    );
+    my $cgi =3D new CGI;
+    my $template =3D C4::Templates::gettemplate('text/explodedterms.tt', '=
opac', $cgi);
+    my @results;
+    foreach my $index (@indexes) {
+        my $thissearch =3D $search;
+        $thissearch =3D "$index=3D$thissearch"
+          unless ( $thissearch =3D~ s/OP!/$index=3D/g );
+        $template->{VARS}->{index} =3D $index;
+        my $label =3D pack("U0a*", $template->output); #FIXME: C4::Templat=
es is
+        # returning incorrectly-marked UTF-8. This fixes the problem, but =
is
+        # an annoying workaround.
+        push @results,
+        {
+            'search'  =3D> $thissearch,
+            relevance =3D> 100,
+                # FIXME: it'd be nice to have some empirical measure of
+                #        "relevance" in this case, but we don't.
+            label =3D> $label
+        };
+    } return \@results;
+}
diff --git a/admin/didyoumean.pl b/admin/didyoumean.pl
new file mode 100755
index 0000000..434d0e9
--- /dev/null
+++ b/admin/didyoumean.pl
@@ -0,0 +1,37 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use CGI;
+use C4::Context;
+use C4::Auth;
+use C4::Output;
+use Koha::SuggestionEngine;
+use Module::Load::Conditional qw(can_load);
+use JSON;
+
+my $input =3D new CGI;
+
+my ($template, $loggedinuser, $cookie)
+    =3D get_template_and_user({template_name =3D> "admin/didyoumean.tt",
+            query =3D> $input,
+            type =3D> "intranet",
+            authnotrequired =3D> 0,
+            flagsrequired =3D> {parameters =3D> 'parameters_remaining_perm=
issions'},
+            debug =3D> 1,
+            });
+
+my $opacplugins =3D from_json(C4::Context->preference('OPACdidyoumean') ||=
 '[]');
+
+my $intraplugins =3D from_json(C4::Context->preference('INTRAdidyoumean') =
|| '[]');
+
+my @pluginlist =3D Koha::SuggestionEngine::AvailablePlugins();
+foreach my $plugin (@pluginlist) {
+    next if $plugin eq 'Koha::SuggestionEngine::Plugin::Null';
+    next unless (can_load( modules =3D> { "$plugin" =3D> undef } ));
+    push @$opacplugins, { name =3D> $plugin->NAME } unless grep { $_->{nam=
e} eq $plugin->NAME } @$opacplugins;
+    push @$intraplugins, { name =3D> $plugin->NAME } unless grep { $_->{na=
me} eq $plugin->NAME } @$intraplugins;
+}
+$template->{VARS}->{OPACpluginlist} =3D $opacplugins;
+$template->{VARS}->{INTRApluginlist} =3D $intraplugins;
+output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/syspr=
efs.sql
index 59454db..56df2e1 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -371,4 +371,5 @@ INSERT INTO systempreferences (variable,value,explanati=
on,options,type) VALUES('
 INSERT INTO systempreferences (variable,value,explanation,options,type) VA=
LUES ('SubfieldsToUseWhenPrefill','','Define a list of subfields to use whe=
n prefilling items (separated by space)','','Free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VA=
LUES('AgeRestrictionMarker','','Markers for age restriction indication, e.g=
. FSK|PEGI|Age|',NULL,'free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VA=
LUES('AgeRestrictionOverride',0,'Allow staff to check out an item with age =
restriction.',NULL,'YesNo');
-INSERT INTO systempreferences (variable,value,explanation,type) VALUES('Di=
dYouMeanFromAuthorities','0','Suggest searches based on authority file.','Y=
esNo');
+INSERT INTO systempreferences (variable,value,explanation,type) VALUES('OP=
ACdidyoumean',NULL,'Did you mean? configuration for the OPAC. Do not change=
, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free');
+INSERT INTO systempreferences (variable,value,explanation,type) VALUES('IN=
TRAdidyoumean',NULL,'Did you mean? configuration for the Intranet. Do not c=
hange, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free')=
;
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/=
updatedatabase.pl
index 41777c0..faa0011 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -5703,6 +5703,15 @@ if ( C4::Context->preference("Version") < TransformT=
oNum($DBversion) ) {
     SetVersion($DBversion);
 }
=20
+$DBversion =3D"3.09.00.XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,ty=
pe) VALUES('OPACdidyoumean',NULL,'Did you mean? configuration for the OPAC.=
 Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.=
','Free');");
+    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,ty=
pe) VALUES('INTRAdidyoumean',NULL,'Did you mean? configuration for the Intr=
anet. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumea=
n.pl.','Free');");
+    print "Upgrade to $DBversion done (Add Did You Mean? configuration)\n"=
;
+    SetVersion($DBversion);
+}
+
+
 =3Dhead1 FUNCTIONS
=20
 =3Dhead2 TableExists($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tm=
pl/intranet-tmpl/prog/en/css/staff-global.css
index afe98f7..7ef1771 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -2397,6 +2397,42 @@ ul.ui-tabs-nav li {
     display: inline;
 }
=20
+#didyoumeanopac, #didyoumeanintranet {
+    float: left;
+    width: 260px;
+}
+
+#didyoumeanlegend {
+    float: right;
+}
+
+.pluginlist {
+    padding-bottom: 10px;
+}
+.plugin {
+    margin: 0 1em 1em 0;
+}
+.pluginname {
+    margin: 0.3em;
+    padding-bottom: 4px;
+    padding-left: 0.2em;
+    background-color: #E6F0F2;
+}
+.pluginname .ui-icon {
+    float: right;
+}
+.plugindesc {
+    padding: 0.4em;
+}
+.ui-sortable-placeholder {
+    border: 1px dotted black;
+    visibility: visible !important;
+    height: 80px !important;
+}
+.ui-sortable-placeholder * {
+    visibility: hidden;
+}
+
 /* jQuery UI Datepicker */
 .ui-datepicker-trigger {
     vertical-align: middle;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc b/koha=
-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
index 72162d3..fbda324 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
@@ -62,6 +62,7 @@
     [% IF ( NoZebra ) %]<li><a href=3D"/cgi-bin/koha/admin/stopwords.pl">S=
top words</a></li>[% END %]
 =09<!-- <li><a href=3D"/cgi-bin/koha/admin/printers.pl">Network Printers</=
a></li> -->
     <li><a href=3D"/cgi-bin/koha/admin/z3950servers.pl">Z39.50 client targ=
ets</a></li>
+    <li><a href=3D"/cgi-bin/koha/admin/didyoumean.pl">Did you mean?</a></l=
i>
 </ul>
 </div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg_flat_0=
_aaaaaa_40x100.png b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-b=
g_flat_0_aaaaaa_40x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b5dab2ab7b1c50dea9cfe73dc5=
a269a92d2d4b4
GIT binary patch
literal 180
zcmeAS at N?(olHy`uVBq!ia0vp^8bF-F!3HG1q!d*FscKIb$B>N1x91EQ4=3D4yQ7#`R^
z$vje}<irI&an_s0pV!D+$FtuP31JO&3=3DI&aE+u|=3D5A)Hv$*VMh&S3C#^>bP0l+XkK
DSH>_4

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg_flat_7=
5_ffffff_40x100.png b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-=
bg_flat_75_ffffff_40x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac8b229af950c29356abf64a6c4=
aa894575445f0
GIT binary patch
literal 178
zcmeAS at N?(olHy`uVBq!ia0vp^8bF-F!3HG1q!d*FsY*{5$B>N1x91EQ4=3D4yQYz+E8
zPo9&<{J;c_6SHRil>2s{Zw^OT)6 at jj2u|u!(plXsM>LJD`vD!n;OXk;vd$@?2>^GI
BH at yG=3D

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg_glass_=
55_fbf9ee_1x400.png b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-=
bg_glass_55_fbf9ee_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad3d6346e00f246102f72f2e026=
ed0491988b394
GIT binary patch
literal 120
zcmeAS at N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnour0hLi978O6-<~(*I$*%ybaDOn
z{W;e!B}_MSUQoPXhYd^Y6RUoS1yepnPx`2Kz)7OXQG!!=3D-jY=3DF+d2OOy?#DnJ32>z
UEim$g7SJdLPgg&ebxsLQ09~*s;{X5v

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg_glass_=
65_ffffff_1x400.png b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-=
bg_glass_65_ffffff_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..42ccba269b6e91bef12ad0fa18b=
e651b5ef0ee68
GIT binary patch
literal 105
zcmeAS at N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouqzpV=3D978O6-=3D0?FV^9z|eBtf=3D
z|7WztIJ;WT>{+tN>ySr~=3DF{k$>;_x^_y?afmf9pRKH0)6?eSP?3s5hEr>mdKI;Vst
E0O<Z9>;M1&

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg_glass_=
75_dadada_1x400.png b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-=
bg_glass_75_dadada_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a46b47cb16631068aee9e0bd61=
269fc4e95e5cd
GIT binary patch
literal 111
zcmeAS at N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouq|7{B978O6lPf+wIa#m9#>Unb
zm^4K~wN3Zq+uP<E-4iDYHYX${Ii)G?xY5!0{fvg8SC7yQ4u<2&oOc%dd<Zm-fx*+&
K&t;ucLK6Ud-y?JY

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg_glass_=
75_e6e6e6_1x400.png b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-=
bg_glass_75_e6e6e6_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..86c2baa655eac8539db34f8d9ad=
b69ec1226201c
GIT binary patch
literal 110
zcmeAS at N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouq)a_s978O6-<~$)Vo(rZKDhVK
z|J9WTLT^QIG;Q^ml{ow8HvtEZhta#LLqp$|vO7%bGjI7IBizcw`SFI!bT^;@44$rj
JF6*2UngEbSBdP!Z

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg_glass_=
95_fef1ec_1x400.png b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-=
bg_glass_95_fef1ec_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..4443fdc1a156babad4336f004ea=
f5ca5dfa0f9ab
GIT binary patch
literal 119
zcmeAS at N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnour0hIh978O6-<~(*YA|4MzBvER
z|7}eQtdCVXoUc2b{PaWeaIKu7gJx>{vDV26o)#~38&#8k_!`W=3D^oo1w6ixmPC4R1b
Tyd6G3lNdZ*{an^LB{Ts5`idse

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-bg_highli=
ght-soft_75_cccccc_1x100.png b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/i=
mages/ui-bg_highlight-soft_75_cccccc_1x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c9fa6c6edcfcdd3e5b77e6f547=
b719e6fc66e30
GIT binary patch
literal 101
zcmeAS at N?(olHy`uVBq!ia0vp^j6j^i!3HGVb)pi0l#Zv1V~E7m<ccpZF4n8Dv9Yx&
zy8QY7U*2m$;l+;n|NjK_PainIAnKgVYt6(keT9{lbLSy{pgsmqS3j3^P6<r_2PGZu

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-icons_2e8=
3ff_256x240.png b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-icon=
s_2e83ff_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..09d1cdc856c292c4ab6dd818c75=
43ac0828bd616
GIT binary patch
literal 4369
zcmd^?`8O2)_s3 at pGmLE*`#M>&Z`mr_kcu#tBo!IbqU=3Dl7VaSrbQrTh%5m}S08Obh0
zGL{*mi8RK}U~J#s at 6Y%1S9~7lb?$xLU+y{go_o*h`AW1wUF3v{Kmh;%r at 5J_9RL9Q
zdj+hqg8o{9`K7(TZrR4t{=3D9O`!T-(~c=3DyEWZ{eswJJe->5bP8)t4;f(Y*i_HU*sLM
z2=3D7-8guZ}@*(HhVC)Mqg<Fpc at JMZ@m_nbBrYio+A_)wDiw(`CFAx>r$3T8?#a(hu&
z?Kzuw!O%PM>AicSW`_U(cbvJYv3<y^W#?44=3D>{HfpIP~Q>@$^c588E$vv)V2c|Mr%
zuFO$+I~Hg at u}wPm17n%}j1Y+Pbu!bt?iPkjGAo7>9eRN0FZz3X2_QZj+V!}+*8oBQ
z_=3DiI^_TCA;Ea2tPmRNOeX3+VM>KL;o1(h`c@`6Ah`vdH<&+$yTg)jGWW<DoLyP at F%
z1a?(b6!zkLvMy_3J2VHTkjbIwpclDibDQ*&(<G#ZS8)TbY#<XBUji}ZBYc9y!j?g=3D
zCB)t#7=3DW%zwQbX at pwY(37C?J!LzE!l%t|=3Do`O|-??P**$^X>72T}6J`kUAv?2CgyV
zrs0y at Fpvpj@kWVE0TzL at Cy#qHn~kgensb{hIm6J&I8hkoNHOz6o1QQ3QM4NZyu?;=3D
zLd>`wPT*uGr+6vAxYv3k8{gMDR>tO}UavDKzzyi6hvbuP=3DXQ4Y|A)r4#B$U(q7{1Z
z0iLeSjo3;T*<wqybAvRAA?2T+&Y9txKIfi5?<yZ57FH|IAnl`(9<7HXJZ{X1{(kDN
z(Vkq6C${(+AkP^!;sw>diS*me%4|!s23l@>R}rn@#Zc{<%CFt;?gd5S<)b=3D8Yz32U
zBBLprntW3RE3f|uNX5Aw|I(IlJjW-Byd?QFFRk%hLU}O*YyYQel}WcXilLMJp9cB4
z)E?D+*Y4zai&XY!>niMfTW-2pp-^KFT93%Leig at uoQGPYRCva-`w#orm`is`p8b4s
zxD462;f<sb?0~I>*^XO$=3D3by=3DVzN9i at xxr<1w=3Dpcxl!$!fjWt|fYmq1@@badT?v`d
zIi$|e$Ji}FXsiVYf)?pN1R0LBw;+)B5aUJj2fP+=3Dm;=3D_Eho84g%Jq#@MLPSQEX*@T
z6sZb)m?)zby>{j1)(;rRML|gKSs+9jorf-XhQJ2Jyt5Cqc*`S3iX at A5C3jvgAns|4
z*|)YQ%Kmsj+YZ53;nMqh|AFvehUV-9R;1ZZ;w5r9l}8hjSw@#k;>)$P*r%)=3DExtyu
zB!$Kd-F?*50aJ2;TNTR-fc8B{KAq3!vW{g$LlGPfGW+%#CXU<Nz-K_W*D6U7Mo7f>
zJDcMsvyT2`x~v>>w8 at yssoA`KuIZ98CLU{Ia%*nW3G4t}@ApsbC at o^WCqL>OXx>Y^
zSuVWEQ;3=3DA=3D at RxCnt0>G@#(VWBQ`0$qTwA#e>SX{_N~JWGsBxFHCw|5<IbE^2zQft
z+V(~OSkf)|lX5W_7EJt<@((Sk8!u;jnOqZIk=3D&$6YYOz$F?*zMPTU2T+x|MROAklN
z%9!TpTpdzgi=3D at hTRw^Ahcil~@&hwEFY;|?)K#dO5Scx8UFD*{3dV-!oOM#&cE&Q2n
zoW9TnYFwBbCzoyprD(`zOk49a>|?CzDi>92F-^=3Db*8sMXnhUJdb!>yGD2nhN@{582
zRPcxuDzs&;8De)>_J19z{0xppXQop#T_5ejGCKv at l>$O#DA- at X{y_1B-AsiU)H}DR
z3xDZ8G`amV_WmA&8!W=3D at jgm|%bnw<n8Q)drY3eYBD{f~yuK!dV>H%qkg(@J$hLaSV
z<b?8z3vpCe_J&8AY!c(!FqUw-kI7 at s<dgb*ThA?Tu$O)zp>C-rXIFMM%y<|Gb)o?j
zpe-`dJ*N5tC-iH)d0CgLdBsw*C!ST9hY1EkI|Y(&=3Dp&dH&q;a&7HXa5#_wtMsenQL
zcpyhwx)Ppw at XmVz?P)DI#^ee1oC!i`>>Jq1ESk-OuQ(Pbv=3Ds{A0AjM at rw#FaU;RUh
z*At0{U*NtGVY_-JcuG$?zuuf%ZBTWxKU2yf?iN#-MRWs>A*2;p0G1Tp3d29u5RbnY
zDOON-G|PidOOGeybnbzu7UVv71l!<qLl#EcbYWe!wG5tcyhhuMWP&yr`zRz8F_ozM
zhJ``fFaR+RaQ$HxV1JAUt!HeCZ<^dcnDIL8eYWG)9j+;3USxo7a|iDliv%vqQj)sU
zoDLu%#I6^B)l^mSEoEz1>b=3Dw7eU5l*{EdKuoKu`#LZ}|fnUr-+lSST9(MTT`0tqOG
z#<K!`0^vSUvDg(~Yn7}4&a+I75c`V)D|~FimXdl~J-Q;PJw#_TZAuc(RAcfC`&|}0
zkZV}8q8Q9<U*ERkYb6H2y_HbsHY0*XF((5#-fVna8M>+Q_=3DlXe-=3D;rE4u8s~;%i~~
z8v&&+VPeXG=3D2zw9B5sR$e?R(n%nf?p-(BCZ8}x!_-9T+LT;2=3DZu?Wv)j3#>35$6dR
z4*7xmI)#06qjh#sXvX(%`#D1mD8fn1G~I;l%Dk{pw)}>_{+3^Fv_q)>2#de5qGCId
zPz?ix-3954nM&u at vaw{o%-#HU%_bLJMO#@enR^&B{3ihWdoU6%pBJ`o<w?5T9ud^Y
zI>>im+b-c6r-;c{vd0Z_)`75$jApy2?!9G4_FGa)iZ~9`6VELiYM+n!-mUfvfm{jt
zC?!1=3D%pxJhF>vyQ47Q}R;O48pxgMs)rz$SbM&jkp<6X$r4DHWg>ZnGB-$r2o1*nL#
zW0^*itcRY_^Uv^XgQP>W#>KQgM~l{;S(GkVW@&vld^AhWzG^m|9#0#USbM>^en{k2
za8~DTL`(Q~=3DofsL&Fc`!L6r~qTnnGo8r98<(aG*<0%aNEr!!BIyY>VV82k<Gsoyn#
zvIJW>xhR%d>V(lN&#BId#urK_i~Pe6?>C~J!pU_lRon#&S_cXoQv;poG8FK4atc<p
zjeUBy@^Jw(V((z7r>N)npz1~X%p6x{M(Gw!!H=3D!}lmO0Xr*8ewyH(Q+>oy`fxQkxJ
zzzB$)%*xM4s_2(O>)T-QXhwP|&DZam#{O+47q|WKfz_ZL-MypRN~o{fE*I#6 at eM?I
zs%f-6{Lz6j7rB#U$%O$~TIT!j?|Ip1CpSmb=3DJA9qCY3-mQf|fVCxswPjok|VofUEP
zW5^pTd5B;wRkyW%1a;nYHB$ef6Pv8^);`m0jv6p72iNJl+sVBqZugsq6cq_pyNREi
z>GN!h6ZQ6`aOMr_2KI at j=3DXR@$aJj(2jcpY?>f=3D2kMV at di5W7Swj?ug10zRe}F1nR*
ztMm6+T^)LJe^SzGgSxahQajq0h7<FIM)=3D=3DmqOi0sP&ku%D`037mHLEQ;?YBXRgcBJ
zg;YBqQV1p<N>#|8oMV0>D~*N}jl?9_X`ka42R4 at rryDc3o(c$R?1*!1O9zleSOczw
zYPS3~xbJ$~C(3+D7Z<s)U8yQk=3D*tiGGzJrAhaSC#qIs?Jh81YQ47QuqhWW!*VSm_0
z=3Dt^45-NL{7OdQ=3D+(>krfjs_lneY^zv^kHmxt)aqZ!aeGABHZ`gvA&K`72z}ihI$Ht
z9V&)wQy0g at R9irwbf!{uE&_J2l9jXz^Vj#=3DqA77*3Pd9OjrE_tKDHADd!AjFQv(ji
zct-BMUt9()1Ox!dsI_h1(^F_U)_QJrx|%+y`zWWlD4=3DNd?JQ=3DURh0*{fb1!o4tS(H
z^r_T(8t1SAHf1oduG+X^*EC_kL(!QnXL6Hp);449yO&1xE>MXGqT)t10lzvALl<?{
zrVF-Nlk*Lcvq9SGK;9)Dyv<a=3D at k|#mT05o~q+!s##A{Fr at jZNvP>lX;;Q)RiJX$dm
zlR8ep5-GdHmRm9?N#QCjNUA);vC03Gw6yds6^?c4;(MH>;O5xmQ2nGK3Dmk8i*v5t
z-{jJsQq30%z}0`g7SN-yN`l-`@6<bxgAJDPgWtfjt{vU|la%{8JOg<~aF@)sJ2H-T
zJtv=3D5W+3ZEjrJj*8XPnbuZ$;ozuG9)*k!x_DnY^o_splP?Xrx3x5yraES;Cf|J5r4
zKm=3Dv+F$_FjQPn%(xB916O9fMjy+<RXM2|CFbj)`jN%Oc#F19k_UX>rkJ|V|>18`MV
zwUeH}DxWw&h+A+Dn|4|YNr&EfKS`Hz_NkeW3*sI5Rq-J&FzG=3D!{-K`n65#7O%^&f>
z`PkqxyC_K)>781~7H${^Nj{`>XEa&OPqqQhySR5%w2{5+sEakXXHazJp6~LP2QKDx
zpkvZrkDOa+A4BbqqX6ls&O)5-Q7`qkZ_?6~c-wQ9tseNtET;nhEOL^`*naKwcMX;R
zbto&a;oTR0s;vjfj3wigUg)Sj)!OHQfZoJwAsWYI1A4ntz>X=3DW4s|y?tUk1r=3D>#Ct
zf+?hq^>rQ3$KNboG$UhCdEmp{qAR13DK$f0ES7kAG~7q+g!jfVq`1b5+c62N^0%~o
zKw91o at Wv;0EW*7fINAX3O~L-V{`;xB0q()#^HKZ<VQD|Ssq*t15*X{M&@{ft%5R$-
z6owZW2o=3Dm-TQzdLLef(vN96$G9ORVX`|MzBlmqVMs_3OgJL<%B=3Deg2K!P2uuCBqY8
z=3DfHBH!!ecFczAO at u@^ZX9m+}9YOS0K+RQxSNG(M>OlLrXVL*Dtw<PJE!!R49Z5AiW
z at RZu|VfY&-AB8mfbHEZ%<mzrpZlr6pW{4#|nDeZli!Dhng=3DXNJ^rLmrJ&?7uQ-W#5
zN$xbbvAOj#F;Y`(?y{ZDw0Pl^PWS5eUTBmOE@${373(N^u!ns<C}>-$SUp8*_J{r(
zW`6r`cz0yZQ#f0#*y+m64{bs7GP|2V$phf42rswJB?s at 9qf;Bfc^pm-ZS#^5dkG{u
zzv;l&B$NYcegSqAnjnPN1?17VUQbPummcWry((85IFB(pFQNGN{hhN$Fv?~l_fr?|
z9=3D%dK(+;kZ(8=3DmwptjwC-ikBD$Z{l2++~*8wq5ynF<+PNlZI7ba5V#fg~L}kE;UH5
zJ;{P(`G{tNl&z5rUiH~e{I>GT8~9&*(J;Myx9z5P!db!F8RTII^I7c)HU=3Dss*bYB`
zgwiIMZ_q>KEC$4lFm+Afvu6^$X1jm1rB*4H)-EIO5Rvz<oJsXcs9TC3t>_p24?OkJ
zovD4{-1KA6*oL?a;3qR7GZRB!cE5oAdA#M@{w+fGgsJ-lSmQ^-?8E&Q%tbmjd=3D at gZ
z(}Mg*jsDf6Z)|7s%@9pc-tuw5W&zqUXjv2bVkC%-X?O3F72W4EsIl#1e<T(7Fti0z
z=3D*7Pu9Hvju-R6I>>Mdz=3DX4k*_>VxCu_2?jjg16N*5fwC-36OW&;Sz}@jMn}hgJdEd
pO;bST+>R{W-aENZYk%(=3D^(_R5N$LmL{Qc?!%+I4tt4z=3D_{|902Wu5>4

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-icons_888=
888_256x240.png b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-icon=
s_888888_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d02426c114be4b57aabc0a80b8=
a63d9e56b9eb6
GIT binary patch
literal 4369
zcmd^?`8O2)_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~Gm<qS
zlCjL7i8RK}U~J#s at 6Y%1S9~7lb?$xLU+y{go_o*h`AV=3DspXY*!!T<mOmxZ~R9RL9Q
zdj+hrf&W^P#f9C!Zpp^V{%mq$^8e21?ZR9CEgT(ahrR?5hM!<zvuS&nr6z6fi at J>w
z<@?HsG!Qg3zaV+-xQ3ldtad!U<6iGz_enGH*2akP_r)o1D&8p^5M)<i5Kvm7+w+1d
z&*|KAM&6N6?%o|XKL7xDVlB)}>_c8IIj6Wy*7HJo&CBLuo~nj>(63pZzO(Vv^ZuB3
zMYigjkwA;FEy|G}1jpiMj6|NTm7Uyiw=3D at FDE*nX<>jR!W at 9XIyf%$Fd*J5*D0Z0Lm
z9}ZQxyT|x5ftNy?V>EbJz-K>bV9gs9RaXUP<^=3D;e?&Fqxj;6{ieR-a- at H<J_4GiWZ
zaVu(K at aJcf^w<j8VA*iR3{E8n{m4z5Ta=3D$%rXkgQO6v#}L)oynVyGEE=3D_51-z65?H
zDgGA81aw}gX`NgF4>ycA1KMKhql8GOmcx<Hp8QKqcf*>wZ?_-(3hMK^^a*(gaFvBH
ziIC!fgH4$W*NbKIaY&T?%&13``KbD at S-0`xQ%v3TV+B!;RC7O!+1a9QCA$H at 3tR;k
z)SSoR7(s4)f{zM}eWgFN{(ZH5d1O}l)f$ruT!)Q&NImXyZsTzOf9TwctcSfr+M)aJ
z5otO+$jvm-P4)ykH)x|cO5xeb>?!`qGw$(>&axqLL6yoB${vsMXgL_-bz at 2J_tS92
zdvZG-+vKl at K4Vr(<X8D7Fm5%eurE#<YP<1YLAHb!!E~xCzIMI68x%=3DYh-w$L6-vB;
z!c#Z2_$LgPU;Po3j&(cwr6cKhhF=3DVILF!3vYQvfMvLYtV{!ir!NUtS|shjnm2Kl+v
z9M*o<>EL{WQt at Z+Ea-hxX0}nTSZxnpi^#Kn8Ox8FgIS|hc}KJQ4tm*HO16ui{(O9}
z1YN)GjiQt6fGq`Cj+^`zUf?8hk^(T{{cOQGWFP98am}is28A!5%{R#ENv8fCN!j69
zl<vTXm`x#Aj3pR~5$!tw8x6HJBT;veqlI((e3l5f1J0XQfUi^9^|f?)8pp02+%sAX
zr3QSEAghjFy?kTy2b}Y~5VYqs5GsSo#pFLl;)0^z+6P*`;T5Mu&WLv=3DbzI9Q at 9K!#
zx3ne5{kTux3L#b!(t3OTfpmY0?(76nqT7xWC3Cn`hU1f1hZjxb%CxmPCafJTzecbo
zhDHzEdDz$vS9U>MEK(2z?|BY=3DJe$XD9mB-Kkem*(d-j^9j$2#6r$Dz?s)-TCDCGCs
z8>6Pvj{Y+YIeFA at qY22V$)awy at q!9A4rgk5b9TcC;s9Ig^G|6nDP+5=3DFzg&?(L=3Dvc
zCbGd>fSu~@6!94td+o#d at sid<c4_^>!EI<?7QBi6t=3D$bf#g{8RUCj>X$rx7*cawe6
z`dScJ+$HssdOjE)O#Ybs56vm-FQ$7yuJJD^Zqk%hMaIgAJ<2yb_MFQte_i;62ScT$
zpjifYyR_E=3DrQ+>H)pmlr-Udzg*-!|ssw(D7wJvC+Sf8bb9;;q8#z?0p!!bsd{wy|5
zpBaMHE-Ve>i#LLjHRaMLtp%9&(HCng7Sw96jVv!#0k%?F^K7&=3DT)mnYn)D9(i;4x5
z^NJTJwq~pv;kH@#ejTd*48~(J(r6j34|m`h9fEDj0im)~+%I5XphWymhT;_Zty|Q&
zzjPg#-ufAHZ<omf5#{klOC=3DUKcxxw*?x^rKwwoZ7wz3 at 8eku)ggLNRn<<KIdajH#H
zeA)T=3DSeh$G{X;Ew$<Zx1YdFKl^buFmaRdI%XI9raN<LH2H`S7|Dmv<?JPd_9FaRph
z7M0*0UG<&|_BGC;v{TKZe6h)s$R@%If`c(mfiu?)kSq&lq&xx(v`_L7ceQ&}Az*(Z
zkTW$+naI+A`yGk?qy`dg`WSb{6e&FN4RX;O&+frr6hjc+3<Yokv6*p`M#SE){vkzc
z3FL#%2;YdX9eq<GwL48ff7Y!gs4B at Hlzc$A2`aV3*Atk++JX5HDY4Bk;uB4Yxbu<X
z`L&1ByqMIqI8t`UE|_LH(~F2;?|){*%50r1sI9V=3DC6bO-=3D^K$CSiOmlVqzhvSi?6g
z4AzPTh<iZl4l)6IBfJ=3DW6EkAt_}>1M*Gccw?Kf|8Pnhtb0`!{N`Bqsa37J+>wC$!e
z00k+2Egzz;rbcWoUB%Jvp8W1}$XD%e3>4y;;OZ1ccT-O#uW6Ys at C}Pa`nZrNKzR(2
z4e%3)@QI4SE&E!lW`5y14QhbepBG%_XBV-O(%<aX6HVzRJ7ee*QV3AB=3D~LWyIoy{V
zqv~a)U>5tj)@9#|;sC-MNev!zGDHk}JdpGC`iJF#8=3D8-P$Xoku_=3DDw%Cv3{U7L>gf
zRQ?<$t`cZ*MP5GQmbmx#!+*!zu>0MewRO9GFGS{b^m_fJ-N0?j at EqoFf>$khj+E|@
z7r3We&^tR^YZrxKe*d<YJy4G(9mh^GOxZ8bi3n#Ytos{m`t{%)Lj8wW{Y{jV+Q_6T
zI5_MMSa-xsCZ~p-HRDCj#<#0BIhacN@>22agXqCO0l44&kqCv{u)T|(lv`~PK at DvE
z{QI_TlCH5z*gR!>LO)k67{^R+vWx24U2^2ODXpwT;6y+6+$5m)_*w4WY&#do9dCeE
z)>p+Ykdhq($DhmMiaYXey!@N%L26uz($aJ!QT{B^Wu}U$^9e#5)=3Dc+XF9 at Ill?ZmM
zlNgHiz*9!vDc&uxOo;ZVxb`Q!Sk0*gnfxWzmbZh4(=3D%CD%qP?0=3D);n$&zaW_$UKV9
z8axdcN#AyZ{P)wj?V{P}vM)YY!>6@}^>U+iv$`9>nMTCPjN>z%yF&3yf%>+T at 0vh4
zlC8Xa6zeo?%=3Do3}M8{aebLHcO{^1Ar8qiM=3DGquf?Jo)q5`-+?sUpg?QXyEUpWSm+n
z$K-UyqkI<R?*3wTVfWE~<@2<uS?-MVl1;jzAA8*iL4xsi?b?BNi<UXgZAh$t2eX2O
zlaSjP6`u~(FfWAHwjdICW?Bi|*YB$4-Yt-e+urDxm7s0C-NReT=3D&xHY=3DNLk9^<)K_
z8Qvc8a9 at Rcrh{U|jRjj-<@xXJdfDhCHAU3q@`fxV7DF|YZ^rH=3Dh9J#M-17gO6$#8E
z=3D<ACLP at x){UQ68&`mEVXq`?Cxb~%;JJ<xQvIxsey(BZq&!Lur1_nVgz6$w$lK^&jz
z^=3Dyq5^Y*23<@W0Z_KKzDbZLlkyC5J9t>wHLquru~o(OF)hhz$Y*|X>ZIbswnxRvr~
z2=3DrdOGVuD|xRlpAZE<0!X1F(%Anpl^@V^D3vbM}qxe|NI;TTiZy7(IM;R69RkA>a&
z6gwYE2sREzQ_LHmWqB+ogMk(fMaSFeoDq-!HkFB_nXt5+2ncFuk9BQL1I&oB1zZi)
zYW{6_&-Ip1l*OVRA##1ILQS;5R{-K^0wGTiJbVSi at LA^$D$;@J>^G{6@&+%4{b3(s
zC~LEHiTv(0b#zxt?YJ0r_~pUZM~mQ(??(n#>&tD%+ at nq=3DAbj5*8R!~Ul1`G~=3DqFJ4
zfl|m8ZDCYgtr`4LcOpgiJYX9qRY5;DcWti~PmS$VB$E-Zt^f4)vLDOe_3XTq5^ylW
zJ9PKm!V-8sAOJXnUfuFNIf0R9tK-pNs2hO04zr620}5B(Ok>yB)Of-3sP59qfQNbm
zA4{w!2 at cB;GbR(~szVrbO%(w=3D5S!X`o at o@x++wbN_tMPT0V<QhG{UeJ;8({%=3Dz{L*
zWd0UgQl1fNI!H$Y$hXK#w3!Gvn(74Nb)t*FnucAAe1;`Z--B03CHyB#2gq}g;qs~I
zlu;^<Ox+<j-;_m5iBxJsQxuqvjs7QOWMpota<0)9-Vv;XHb%w=3D>c)*I;Fgsbf^*g0
z2Di?HTApwKq3+YwfNsqd3iP%{hyK1iyuVZc@*0tO_3+N0#GFsz>8MjeJ2UJ%L!%hi
zGYYAthH`E+ywA*u{(eJ=3Dia3h*%k?779rk-K<0VZAPkl;TFUbmei|$fqWO8!_zIvqt
z$ly$VrlH46nnpX~X5Yk0iBJl;=3DWuA4>~X4-f&K0yWf42h&0b30t at NYX$7egQ1Fp!a
zbui-D6cWCWV&|R1CY at G8(qOmWjWeX3eX7UggZPGimA}soOuQdXe4uZ#2>5zN>qlI0
z9xk}lE=3DtNpX1m6*nFr2EQ3xs79!^sCldDJYE$m(qYv3q7>}1R7?iZW7>$~*%zKaC|
z=3D$N?ME$>#+%T&MZC`dW1wUl6Z)JgyCn~V%K&i0H|iwE%$>xsZW3tTfZxIUe<xAj&4
z4Hz4+{_ST0nym-LoHhM~e(110&D!U_p#In^VLIn{J!Y#z&<>Pci at p;cRu|d=3DItIwF
z1clVHy{hH?@SD|(Zfqi^0DQ1hczHN7xq85h)rzQqLHMX2^IkuK7FB!kI40s$|CY7~
zNX^{_UjN8}L%Med;|+=3D4RNTMozn8KT;2tb77bUPCmioh+rZBfIiM6f_P34cQ__o1G
zWqQp3VL~~pE5?qODf%iiQQ3f42YF at 09tQ*$<v=3D*TB6gv{jy879dA6iNsN{5E@!(k4
z8HhaiU_^B~4$+iH?m^ArL%A5*Efo_%8ySb3DJ2+($#iHi9LOmDmMF7*5N3n2&E!HG
zolrkI2!HM5qnOHg23Q1&UfD^`iFCzlg;)`TxlRkY*i!V9>4v_EKUx;t1KCPCBtgqg
z at +Tn;O)a0uky_%jm+WjNB?=3D~VyH>V#L!*=3Dl*@OS6SVyt_UEH&NA=3D?V2stHPyKkVNy
z<J*73J43UcB3bH1PM2 at IZw;E0-Pr(2?E_y%c)4{fI(WYro>&jg<#cjros){#ji)dK
z%)We0L_478=3DHZ8- at xnwsKrWs8)x`MB;(Y`Cmu2c-&SH(vN-F(*e`l?c%+l$|y_AJJ
zhcDGnwLvN+bu;_sX|1<mH)GAPa-4}{cUWY%Y?nWr&(mZ0q~a8r+)V&r!Qf at i3-wZ~
zk29f}K4Mv56>AiePh<L{fUUyPI`J1j9<HC~w$=3DDnBr|v`eP$5Ka$0AMorz8kwj<6R
zqIF0X>x at u&%P$hf*xE+O=3D~D?_(_KGWQ!158YL-y9$*6mmPo;Rp*Dl5lm-mVM2i`h-
zM at nxv590_tvMwPD_{l=3Db$iOm|+|S{D9&P%zeT$GgX6Akl-tfUF>tL at Ld!B&{pN39t
zH>3Vhqkr}2Yul+jb7UiouWVGPNsxX7Ueba+9|~dz?d*QM$ng0DZfO0`7fAy?2yMm|
zcnRzUhZ&IcwgjH9cuU!w+VStYa{p*)4IgBf|E8)sqMYtB2KH_}SfsFq(c9i(Q6S3U
oBo%DI<H*|Oy`A%<=3DJ$?q?|gu`ltGZq->*Kv;w;*%(i9W at f3_WCF#rGn

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-icons_cd0=
a0a_256x240.png b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/images/ui-icon=
s_cd0a0a_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ab019b73ec11a485fa09378f3a=
0e155194f6a5d
GIT binary patch
literal 4369
zcmd^?`8O2)_s3 at pGmLE*`#M>&Z`mr_kcwz5Nh&gy7G+<u4l}Z3uT-`eLPXXiYeupr
zL^75cG?B*G8I0}g{r-GEf5qo<UgzG|{pFr>@45H9p05OJ)J0CH2owMSaGIN$+5!N;
z<11j56?ANg=3D9hMl-IBGX-T8hf$N$b*<htN?TsSJw7Ig(61UtpdYTfoIOI6Cw7kLLQ
z!uyQ_p)X)!c1hyKNp)N0Sgm+m$Nk>H?$f4Xt&I`oABt1nR=3Dk%#z{{*a!Axm|t}hCz
zJg0Ln7<xxOy?1Ze>;M4Zjx{$mwhMW+<dot%S<eIRH7lEod8QKXLAzmb_U^_r&j(}P
z71=3D6pM*_{qw#Y|*U at Wtr5dv|(R%UX?-NKMbX4z1pT at Ud5MPE-35yWRryAhlF8bAyH
z|Fo~d-aEmU3A_^89HY+73_AZ&9b?w0pt343GcORx{s6n=3Db2L?E;miG;na@$uc3?0c
zfn8A*g}peRq{~{+2F->kWN;|j>qTx_-zNX!GzqEZRa}QF8_0yk6+=3Dw<h at T)auqDuI
z39)ww2B7m&P3z<eXt-g#8PFC}A0<dUvmB0i{`6mJx*OKae7pT%*N|V<rB2C#fve2;
zNw_383}nJsxLGWdk3}HuW=3D1`l%tqCI&$^BmpJC{vpD2iOpqTlgP0tr~E7}eKUScaa
zA!gk6C-Ac46TB2)>}$QD^&hM4%OkT=3Duh$q9;5u~NL-I+NQyaVc|3l+iWI5~|(hA-G
z08i8AMr@{uY_cWTx<VSokn+z at XHW4>o^y|<ca{y23aXT+kajqvN6Wzwk1KP6zn{7b
z&XddG#3o-o<T;~SJip2}fquJ5nQd{}K+Bcy8lok<2&!FO at vZCKy`V^fd{n!LjbP#}
zB#yG7$v0uJ{Q9qeRIKaKZ*2*Ob9|!6OOj7>Qyb33mlZLvc7H2Zm~>mB7&=3D-1X^@|D
z&0*~i?GBE&NM(Pv&Vt^zWu_bD3e|R?wTL{cSFwD^Ij9v%g=3DaLY at 1U2Bxn#Te*{>%D
zOOW-O-bfnJ7T8jd<*><T?gdIBCCLL5KFk(eK=3DdJ>8`Z2DsFQi~S$%^npJwXam5>>p
zMd}QEjM)@~##n$LXpz1Hkl|2UGXi-JF<Lmc&uamP*<-zV_<1{}T;52Pr?KzK!aSoz
zk*dIl2{LN9)vLEQf5JE}3PO6$0wL1qTy*|31U4x8on4^CTOKiT<cwHnQpb&a(yq3c
zT}xYn?9T_Ztq?*bKCQRsABYd8Xikn`MViexK_Z7!c{o0aWq8pfu1rgdeZtDY;#&ku
zVrcZh-A9e>FePXB<sx|j(4Ober}KGSRxu156v1IHvuCGa;;^*^d<JxVt&$jFghc$f
zvoUHi?chH{mz6^fHySfJHksGWHeOQ3#9>WL+-5f%!S>L#KL3>Vl0w#d^21Jn<~_7q
zWx^Xg1(>PsPGO&cu{S;(pRQ;=3DVw2J<9NdQVWx<+g-`ia=3DQ at puS)75M+?u>DTa95e9
zt#1T?#a)uWC>Mia!K6>g|InPW{&Kp9$tC_3*;R_Xsz6^Eu|xW1$6j#0?XLs7^l+%O
zlxddE)h^|=3DK(2UqS*0ECuDe0ic|H_^t*VOoTCKx0Qmn_^LyJ|b8l$Jvl3{2=3D3x8&7
z$1ik&YG>w#@x at y~$r`fhlUDo;yXecc6$`30m`3K8s{k8G&3RVp8n#|l6h(Xw`Axw9
z%6Y^J6k0P at 4YAuSd%q7=3Deg)&u8EMoEmq$CWj1GY|rGQWw3ida!FHk&wCqrQh_0Bcw
z!ZBS3CbxgZ+}~wzgGIQ#QId%T_TE~_qdUqxjqS#8#jPxdwO@(@-5_nSP&uT?aGYYD
z6km36K9=3DgjUjImwO=3D5Hl#u85VF?r0HbW)#h^SR|s_L47Tl$&Z&Rz*ksl!t*(2O2;D
z+8`6$qpLn}LchhCmv*X}moGMX5?F<Km|!5ZW8ln9eFXEuIZ2Pe0<F{Bgk7y(6)?!3
z0OUwbQz9_;-+51 at J*@#pn>@juGeHQAd<S1P!?Ahr6~*9%HbVg%Kul)bq#>dAn}0~r
zS_0|d3*0v%Y)8+8K<Q57*PC^%393r+XG%W6yD^no;Og-VA+5lCu%zf_7~!dgc-+NE
zvHaS at X&!WHS{yOEV;4lVnCXQ_u=3DPJTWMQ;U7SvW*$q<M~tF(<sCTP8}k3wQ0Q?a^l
zSQxYw0}%57*BxX6_C|Qndd8-N#__%VDX-JsXWQNGa7`HVA_H`r+Id%5B=3DDJ*lGN>{
zGyoYPb|W9Grm9M4E?vb^@16ePbI4omZv+(NoZ##fLUmKlB(G_jEbtDCM*27t$v`<Y
zffeuz2=3D|GK!7lq+sbqfTJj>JovAZa+%*Q5dDXF*Ftt*n!O>#ohCM4lZ)h5rdKV-3A
za}2AO6@!`W>ROk5FN*>2Zza^Z%}8KT%*jBGH|rml2X1LR{wZhWx8V<xBb>4>|5i};
zMnLIHn3!^)`87GYh}&Y`KMwyLbA#^pch}Z!`@P_qH&N^LS9SxpEy8mc!wFusq&Z@`
zeO}<6PC at VNaII|=3Dn(^cNUiLseig*$;NjG7;IwvfYCBN>kzv<V5vk&zjV(~XtRBR&=3D
zt6-q8yC9trQ|X)<HkOQ+IUC=3DvTj!uFY0FE+vk#*O{{~?H^hd(wbHny7dy;RrMFcgl
z_VexAv`M(cDq`}K?C|}ZwID1by~#GJYj??k-AzhK5zm2o;<<@O?eQ_+b8EX0$Q7 at T
zQqohwED)0&0>@v-V2eBQZ at oIs^)NLqMR935k|1}U;5<{s(Ebdj4r`?QtrrAPfQooq
zmPs_(YTy|??+nitNIFDoR7~qLPPFFCf^_~8OUt{#!|9o<Yi5&aakOEH)fbE#2PAF<
zCw1-yw1jWFe*TB)+;)*{RM}Ub>*3Q{!@9ZAI$7O~piD!;WX8#v&RxNH27i59$`1{o
zEYU_zE{bKEI%f3BbE0Fc;f2!4LjUlC`wgh4 at R{1?O78r5t$hWKiLV{#QWWq{QZiPx
zm3?x$;&DDRVt0SByRiFczw$-e)GSv<ddVhD!H=3D!(lmOmnyLRosyG7Fs>pCRbzk^=3DE
zz=3D(+LjEc{Ps_2(OYg=3DG(93!oS=3DIeJ|WA8STv+LgI*Oj1c-QC06N~mvJ&KKx{arGp5
zswvJ6{%BvBYo>#2$%O$~TITuh?Rr^jCpAUX<nn|pBo;$7lHFqW5<?KC#;*DQ&Wbqt
zG33o<d5B;QRkx*X2zB0cB~t&PBb%)9<{r~@wi+-t8{gr()4{zeZu^Ia92E&xyG0nE
z>h)}m74`O|aOU>w2KI`k<#efwa5=3D-l4Xx!o>Z9Evg`RLN5W7SQp3$@D3_hY4EV!0(
ztMm6>zBcgY{<x&qI(2bjsAjk~6))xqjqtzCL}6)}r*J0rl*7;_Ds}NSq{D~&svZlw
z^C`AI<Pc08l&X+7KFj<>RvHZ{9Ey&&)jr2B4s0qDPBUh1ITaAp&>rj3ng*B=3DVGXz*
zs at eR<;J(XkpD6Q1U3}#FR)wlafiFMU(-=3D&e9(eQ`isrS-9aNwJ)7frS8RiXM4*SbC
zL|4*c?h^jfYvSOpn%Z$W?C|TuZ;uy2pFWHXuGW`ZkGV&kPJsKqJJQ!NswAE!!cb2k
zumi=3DAE$YIkm})cVlg>nn&PBjBR<eS2VeZCWD~=3DM|sX!vZ-&p<a?PWWWzw6m~B_-fs
zglFj9`-LUYd_Vwj2DQ57dwK#b$6Cj&PFK?hbsc6G6$TWpyq(6Zv8wWb=3D8 at f{lL3!(
z2R at ZpP2%mB!KMrb)<qjX=3D#nZ7cqlrx=3D`_<QoVmqV{o$pNwF6WlfvEUlO~CJtgU|(?
z)ye!V)}%Z`<aCg>I*@mfhhRMsa5U8k#A!ztfiw)d7I_UyAif8$5sJ9a7WUv5!o%fL
z(J7-8EQzv1YIc)BNeWkLK~m%y4vqe&q@|_ZR5;eC3-9rkf*T{_19jtuWKhdW4Bn|~
zZ-YyFLN!k)0AKg{dO)|v3K?=3Doy+dzb4%T1F4}JsByncB1Z(`2p at O0!E!JQelouN^*
z%Q^YfQUh66D$Zx-RDZvLctsr9`_+1p#tz&4SMd at i_-8()tyg3OyhU~?Gt#-a{NKFN
z0VGf+AH%@o6;-_*?$$T4QX-f_>Ny-5CV8Ccq+@>gNSeovbFr0 at b}RiTcJbLx>ws&r
zsvY!rR{4al#MpVKut~?&kTmF>_v3UaC!gvuxgg%5-{l{20}~&F6CUarF9N=3Du)BG71
zoQDlAwT+T=3Dmfo&$Xy%4-kmW;4wuh6{{ABClybHV6L>t&k4?9_Ny8A_^?)ff#dEjhL
z2RbC~cFVbz^fJ`$I0%prYc0g-9(7X3eUp}^#Mzv)Z1EsGW;qr3cY$+e2HU5d_O9L%
zpbljP*1!A0PqpzNo3W&y(hD87qgweq5YQWYEkxrOuSain2-q at Z*P`x*ht-9)Fr5Ho
zSTKduvc9h6`S^#$i)LgjDi3_PQ+RbaGP!!di^Y;4kB0lGo$y{if)rJIaXTbpRgO#B
z1El6|18;s}$0FRjgK-7~ZwmI`_1{a`32+Y<pNrz(4@>>&O_iTpm%vz6hNkjGR(#*!
zpfJ2<fKb7l)fFR$t7JXpnW$_)ti7BPe2*QBjk3p|ToJw0U`rjl;WS%PAy{&@uy}AR
z>>OAQbTFba9S3j9BlRHXaG{)Zt(J<3ppA?}j+7F#{bV{M7zU)5e@~R&J_xf$+GKK~
z3{R;Y9fZGe^ifEqKL;!VMXv26=3DR~^TG(#*2!JKCWoo&c^$utAs#Gfq-?t!c&9TH5-
zj&i5L4NWbdNs*djvsY}bC&ddUbh=3Diyc0;3- at Y#d^s8|Ql{ax(yenFcG#i|K%lRxy|
zFys4w!@EPXp2AsbMUGc*eP|7uliAq-O6~(+MR>V(EZTd&9G+MY&gF2lZ=3DI8j*o`OC
z`AxrmOGMeD=3DH_9Cq47clT|h34>-EI=3D%;E!my;o&wU(aKV&PymBzrV9q2uA62<X+0c
z-NRREXWGD(5;~cE^VHTmP`6l9j4Vgu*j;9sEt}<!7xQ%KKB-s*23HdRSTJ~%<5Iok
z>XS at JrjKYANZAU>;8mag#BU?Nv`+ZVhlA<mxo$PS6V43YN}m~oFrU>PV`HF_gKY_O
zhbV2L`8qvR&f=3D at M5vH~geD+L&*L2s<)|5)clA0yt9TM{X)iWtx at wJO_!{vR#|AD6t
z*OAg2&P_i8jjW5y0DdtOGcqvrCHD*1Uq_q1ZQmngPnf!2fHizH%sSX>#$2Rh!>1ur
z+s(*-)abDuePc6~XNG8m@|KMXHVM#<Kuem?7ehg8Ogp=3DuF4KKJgBn^t_C->G4?~+V
z1z!An!D0GD-7WqXE8ddUXLkI%u01$fTEhhy<iD+|jwq)&kAb{f4;INRVYIgQ7$g(<
paFPNt=3DXPM}^4`vQTJvYesCPa<Oj19{`uM94Fh7qntu#SL{~w9ECo}*6

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/jquery-ui.css b/koh=
a-tmpl/intranet-tmpl/prog/en/lib/jquery/jquery-ui.css
index 89d99b0..fe76cd3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/jquery-ui.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/jquery-ui.css
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI CSS Framework 1.8.22
+ * jQuery UI CSS Framework 1.8.23
  *
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -39,7 +39,7 @@
=20
=20
 /*!
- * jQuery UI CSS Framework 1.8.22
+ * jQuery UI CSS Framework 1.8.23
  *
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -285,7 +285,7 @@
 /* Overlays */
 .ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40=
x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=3D30); }
 .ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaa=
aa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .3=
0;filter:Alpha(Opacity=3D30); -moz-border-radius: 8px; -khtml-border-radius=
: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*!
- * jQuery UI Autocomplete 1.8.22
+ * jQuery UI Autocomplete 1.8.23
  *
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -299,7 +299,7 @@
 * html .ui-autocomplete { width:1px; } /* without this, the menu expands t=
o 100% in IE6 */
=20
 /*
- * jQuery UI Menu 1.8.22
+ * jQuery UI Menu 1.8.23
  *
  * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -308,37 +308,37 @@
  * http://docs.jquery.com/UI/Menu#theming
  */
 .ui-menu {
-    list-style:none;
-    padding: 2px;
-    margin: 0;
-    display:block;
-    float: left;
+       list-style:none;
+       padding: 2px;
+  margin: 0;
+     display:block;
+ float: left;
 }
 .ui-menu .ui-menu {
-    margin-top: -3px;
+     margin-top: -3px;
 }
 .ui-menu .ui-menu-item {
-    margin:0;
-    padding: 0;
+   margin:0;
+      padding: 0;
     zoom: 1;
-    float: left;
-    clear: left;
-    width: 100%;
+       float: left;
+   clear: left;
+   width: 100%;
 }
 .ui-menu .ui-menu-item a {
-    text-decoration:none;
-    display:block;
-    padding:.2em .4em;
-    line-height:1.5;
-    zoom:1;
+      text-decoration:none;
+  display:block;
+ padding:.2em .4em;
+     line-height:1.5;
+       zoom:1;
 }
 .ui-menu .ui-menu-item a.ui-state-hover,
 .ui-menu .ui-menu-item a.ui-state-active {
-    font-weight: normal;
-    margin: -1px;
+  font-weight: normal;
+   margin: -1px;
 }
 /*!
- * jQuery UI Slider 1.8.22
+ * jQuery UI Slider 1.8.23
  *
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -361,7 +361,7 @@
 .ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
 .ui-slider-vertical .ui-slider-range-min { bottom: 0; }
 .ui-slider-vertical .ui-slider-range-max { top: 0; }/*!
- * jQuery UI Tabs 1.8.22
+ * jQuery UI Tabs 1.8.23
  *
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -379,7 +379,7 @@
 .ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.=
4em; background: none; }
 .ui-tabs .ui-tabs-hide { display: none !important; }
 /*!
- * jQuery UI Datepicker 1.8.22
+ * jQuery UI Datepicker 1.8.23
  *
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/jquery-ui.js b/koha=
-tmpl/intranet-tmpl/prog/en/lib/jquery/jquery-ui.js
index e36a7f0..635f4c6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/jquery-ui.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/jquery-ui.js
@@ -1,125 +1,37 @@
-/*! jQuery UI - v1.8.22 - 2012-07-24
+/*! jQuery UI - v1.8.23 - 2012-08-15
 * https://github.com/jquery/jquery-ui
 * Includes: jquery.ui.core.js
 * Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){function c(b,c){var e=3Db.nodeName.toLowerCase();if("area"=
=3D=3D=3De){var f=3Db.parentNode,g=3Df.name,h;return!b.href||!g||f.nodeName=
.toLowerCase()!=3D=3D"map"?!1:(h=3Da("img[usemap=3D#"+g+"]")[0],!!h&&d(h))}=
return(/input|select|textarea|button|object/.test(e)?!b.disabled:"a"=3D=3De=
?b.href||c:c)&&d(b)}function d(b){return!a(b).parents().andSelf().filter(fu=
nction(){return a.curCSS(this,"visibility")=3D=3D=3D"hidden"||a.expr.filter=
s.hidden(this)}).length}a.ui=3Da.ui||{};if(a.ui.version)return;a.extend(a.u=
i,{version:"1.8.22",keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMM=
AND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35=
,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD=
_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_=
SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,=
TAB:9,UP:38,WINDOWS:91}}),a.fn.extend({propAttr:a.fn.prop||a.fn.attr,_focus=
:a.fn.focus,focus:function(b,c){return typeof b=3D=3D"number"?this.each(fun=
ction(){var d=3Dthis;setTimeout(function(){a(d).focus(),c&&c.call(d)},b)}):=
this._focus.apply(this,arguments)},scrollParent:function(){var b;return a.b=
rowser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.tes=
t(this.css("position"))?b=3Dthis.parents().filter(function(){return/(relati=
ve|absolute|fixed)/.test(a.curCSS(this,"position",1))&&/(auto|scroll)/.test=
(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"o=
verflow-x",1))}).eq(0):b=3Dthis.parents().filter(function(){return/(auto|sc=
roll)/.test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.cur=
CSS(this,"overflow-x",1))}).eq(0),/fixed/.test(this.css("position"))||!b.le=
ngth?a(document):b},zIndex:function(c){if(c!=3D=3Db)return this.css("zIndex=
",c);if(this.length){var d=3Da(this[0]),e,f;while(d.length&&d[0]!=3D=3Ddocu=
ment){e=3Dd.css("position");if(e=3D=3D=3D"absolute"||e=3D=3D=3D"relative"||=
e=3D=3D=3D"fixed"){f=3DparseInt(d.css("zIndex"),10);if(!isNaN(f)&&f!=3D=3D0=
)return f}d=3Dd.parent()}}return 0},disableSelection:function(){return this=
.bind((a.support.selectstart?"selectstart":"mousedown")+".ui-disableSelecti=
on",function(a){a.preventDefault()})},enableSelection:function(){return thi=
s.unbind(".ui-disableSelection")}}),a("<a>").outerWidth(1).jquery||a.each([=
"Width","Height"],function(c,d){function h(b,c,d,f){return a.each(e,functio=
n(){c-=3DparseFloat(a.curCSS(b,"padding"+this,!0))||0,d&&(c-=3DparseFloat(a=
.curCSS(b,"border"+this+"Width",!0))||0),f&&(c-=3DparseFloat(a.curCSS(b,"ma=
rgin"+this,!0))||0)}),c}var e=3Dd=3D=3D=3D"Width"?["Left","Right"]:["Top","=
Bottom"],f=3Dd.toLowerCase(),g=3D{innerWidth:a.fn.innerWidth,innerHeight:a.=
fn.innerHeight,outerWidth:a.fn.outerWidth,outerHeight:a.fn.outerHeight};a.f=
n["inner"+d]=3Dfunction(c){return c=3D=3D=3Db?g["inner"+d].call(this):this.=
each(function(){a(this).css(f,h(this,c)+"px")})},a.fn["outer"+d]=3Dfunction=
(b,c){return typeof b!=3D"number"?g["outer"+d].call(this,b):this.each(funct=
ion(){a(this).css(f,h(this,b,!0,c)+"px")})}}),a.extend(a.expr[":"],{data:a.=
expr.createPseudo?a.expr.createPseudo(function(b){return function(c){return=
!!a.data(c,b)}}):function(b,c,d){return!!a.data(b,d[3])},focusable:function=
(b){return c(b,!isNaN(a.attr(b,"tabindex")))},tabbable:function(b){var d=3D=
a.attr(b,"tabindex"),e=3DisNaN(d);return(e||d>=3D0)&&c(b,!e)}}),a(function(=
){var b=3Ddocument.body,c=3Db.appendChild(c=3Ddocument.createElement("div")=
);c.offsetHeight,a.extend(c.style,{minHeight:"100px",height:"auto",padding:=
0,borderWidth:0}),a.support.minHeight=3Dc.offsetHeight=3D=3D=3D100,a.suppor=
t.selectstart=3D"onselectstart"in c,b.removeChild(c).style.display=3D"none"=
}),a.curCSS||(a.curCSS=3Da.css),a.extend(a.ui,{plugin:{add:function(b,c,d){=
var e=3Da.ui[b].prototype;for(var f in d)e.plugins[f]=3De.plugins[f]||[],e.=
plugins[f].push([c,d[f]])},call:function(a,b,c){var d=3Da.plugins[b];if(!d|=
|!a.element[0].parentNode)return;for(var e=3D0;e<d.length;e++)a.options[d[e=
][0]]&&d[e][1].apply(a.element,c)}},contains:function(a,b){return document.=
compareDocumentPosition?a.compareDocumentPosition(b)&16:a!=3D=3Db&&a.contai=
ns(b)},hasScroll:function(b,c){if(a(b).css("overflow")=3D=3D=3D"hidden")ret=
urn!1;var d=3Dc&&c=3D=3D=3D"left"?"scrollLeft":"scrollTop",e=3D!1;return b[=
d]>0?!0:(b[d]=3D1,e=3Db[d]>0,b[d]=3D0,e)},isOverAxis:function(a,b,c){return=
 a>b&&a<b+c},isOver:function(b,c,d,e,f,g){return a.ui.isOverAxis(b,d,f)&&a.=
ui.isOverAxis(c,e,g)}})})(jQuery);;/*! jQuery UI - v1.8.22 - 2012-07-24
+(function(a,b){function c(b,c){var e=3Db.nodeName.toLowerCase();if("area"=
=3D=3D=3De){var f=3Db.parentNode,g=3Df.name,h;return!b.href||!g||f.nodeName=
.toLowerCase()!=3D=3D"map"?!1:(h=3Da("img[usemap=3D#"+g+"]")[0],!!h&&d(h))}=
return(/input|select|textarea|button|object/.test(e)?!b.disabled:"a"=3D=3De=
?b.href||c:c)&&d(b)}function d(b){return!a(b).parents().andSelf().filter(fu=
nction(){return a.curCSS(this,"visibility")=3D=3D=3D"hidden"||a.expr.filter=
s.hidden(this)}).length}a.ui=3Da.ui||{};if(a.ui.version)return;a.extend(a.u=
i,{version:"1.8.23",keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMM=
AND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35=
,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD=
_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_=
SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,=
TAB:9,UP:38,WINDOWS:91}}),a.fn.extend({propAttr:a.fn.prop||a.fn.attr,_focus=
:a.fn.focus,focus:function(b,c){return typeof b=3D=3D"number"?this.each(fun=
ction(){var d=3Dthis;setTimeout(function(){a(d).focus(),c&&c.call(d)},b)}):=
this._focus.apply(this,arguments)},scrollParent:function(){var b;return a.b=
rowser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.tes=
t(this.css("position"))?b=3Dthis.parents().filter(function(){return/(relati=
ve|absolute|fixed)/.test(a.curCSS(this,"position",1))&&/(auto|scroll)/.test=
(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"o=
verflow-x",1))}).eq(0):b=3Dthis.parents().filter(function(){return/(auto|sc=
roll)/.test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.cur=
CSS(this,"overflow-x",1))}).eq(0),/fixed/.test(this.css("position"))||!b.le=
ngth?a(document):b},zIndex:function(c){if(c!=3D=3Db)return this.css("zIndex=
",c);if(this.length){var d=3Da(this[0]),e,f;while(d.length&&d[0]!=3D=3Ddocu=
ment){e=3Dd.css("position");if(e=3D=3D=3D"absolute"||e=3D=3D=3D"relative"||=
e=3D=3D=3D"fixed"){f=3DparseInt(d.css("zIndex"),10);if(!isNaN(f)&&f!=3D=3D0=
)return f}d=3Dd.parent()}}return 0},disableSelection:function(){return this=
.bind((a.support.selectstart?"selectstart":"mousedown")+".ui-disableSelecti=
on",function(a){a.preventDefault()})},enableSelection:function(){return thi=
s.unbind(".ui-disableSelection")}}),a("<a>").outerWidth(1).jquery||a.each([=
"Width","Height"],function(c,d){function h(b,c,d,f){return a.each(e,functio=
n(){c-=3DparseFloat(a.curCSS(b,"padding"+this,!0))||0,d&&(c-=3DparseFloat(a=
.curCSS(b,"border"+this+"Width",!0))||0),f&&(c-=3DparseFloat(a.curCSS(b,"ma=
rgin"+this,!0))||0)}),c}var e=3Dd=3D=3D=3D"Width"?["Left","Right"]:["Top","=
Bottom"],f=3Dd.toLowerCase(),g=3D{innerWidth:a.fn.innerWidth,innerHeight:a.=
fn.innerHeight,outerWidth:a.fn.outerWidth,outerHeight:a.fn.outerHeight};a.f=
n["inner"+d]=3Dfunction(c){return c=3D=3D=3Db?g["inner"+d].call(this):this.=
each(function(){a(this).css(f,h(this,c)+"px")})},a.fn["outer"+d]=3Dfunction=
(b,c){return typeof b!=3D"number"?g["outer"+d].call(this,b):this.each(funct=
ion(){a(this).css(f,h(this,b,!0,c)+"px")})}}),a.extend(a.expr[":"],{data:a.=
expr.createPseudo?a.expr.createPseudo(function(b){return function(c){return=
!!a.data(c,b)}}):function(b,c,d){return!!a.data(b,d[3])},focusable:function=
(b){return c(b,!isNaN(a.attr(b,"tabindex")))},tabbable:function(b){var d=3D=
a.attr(b,"tabindex"),e=3DisNaN(d);return(e||d>=3D0)&&c(b,!e)}}),a(function(=
){var b=3Ddocument.body,c=3Db.appendChild(c=3Ddocument.createElement("div")=
);c.offsetHeight,a.extend(c.style,{minHeight:"100px",height:"auto",padding:=
0,borderWidth:0}),a.support.minHeight=3Dc.offsetHeight=3D=3D=3D100,a.suppor=
t.selectstart=3D"onselectstart"in c,b.removeChild(c).style.display=3D"none"=
}),a.curCSS||(a.curCSS=3Da.css),a.extend(a.ui,{plugin:{add:function(b,c,d){=
var e=3Da.ui[b].prototype;for(var f in d)e.plugins[f]=3De.plugins[f]||[],e.=
plugins[f].push([c,d[f]])},call:function(a,b,c){var d=3Da.plugins[b];if(!d|=
|!a.element[0].parentNode)return;for(var e=3D0;e<d.length;e++)a.options[d[e=
][0]]&&d[e][1].apply(a.element,c)}},contains:function(a,b){return document.=
compareDocumentPosition?a.compareDocumentPosition(b)&16:a!=3D=3Db&&a.contai=
ns(b)},hasScroll:function(b,c){if(a(b).css("overflow")=3D=3D=3D"hidden")ret=
urn!1;var d=3Dc&&c=3D=3D=3D"left"?"scrollLeft":"scrollTop",e=3D!1;return b[=
d]>0?!0:(b[d]=3D1,e=3Db[d]>0,b[d]=3D0,e)},isOverAxis:function(a,b,c){return=
 a>b&&a<b+c},isOver:function(b,c,d,e,f,g){return a.ui.isOverAxis(b,d,f)&&a.=
ui.isOverAxis(c,e,g)}})})(jQuery);;/*! jQuery UI - v1.8.23 - 2012-08-15
 * https://github.com/jquery/jquery-ui
 * Includes: jquery.ui.widget.js
 * Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){if(a.cleanData){var c=3Da.cleanData;a.cleanData=3Dfunction(=
b){for(var d=3D0,e;(e=3Db[d])!=3Dnull;d++)try{a(e).triggerHandler("remove")=
}catch(f){}c(b)}}else{var d=3Da.fn.remove;a.fn.remove=3Dfunction(b,c){retur=
n this.each(function(){return c||(!b||a.filter(b,[this]).length)&&a("*",thi=
s).add([this]).each(function(){try{a(this).triggerHandler("remove")}catch(b=
){}}),d.call(a(this),b,c)})}}a.widget=3Dfunction(b,c,d){var e=3Db.split("."=
)[0],f;b=3Db.split(".")[1],f=3De+"-"+b,d||(d=3Dc,c=3Da.Widget),a.expr[":"][=
f]=3Dfunction(c){return!!a.data(c,b)},a[e]=3Da[e]||{},a[e][b]=3Dfunction(a,=
b){arguments.length&&this._createWidget(a,b)};var g=3Dnew c;g.options=3Da.e=
xtend(!0,{},g.options),a[e][b].prototype=3Da.extend(!0,g,{namespace:e,widge=
tName:b,widgetEventPrefix:a[e][b].prototype.widgetEventPrefix||b,widgetBase=
Class:f},d),a.widget.bridge(b,a[e][b])},a.widget.bridge=3Dfunction(c,d){a.f=
n[c]=3Dfunction(e){var f=3Dtypeof e=3D=3D"string",g=3DArray.prototype.slice=
.call(arguments,1),h=3Dthis;return e=3D!f&&g.length?a.extend.apply(null,[!0=
,e].concat(g)):e,f&&e.charAt(0)=3D=3D=3D"_"?h:(f?this.each(function(){var d=
=3Da.data(this,c),f=3Dd&&a.isFunction(d[e])?d[e].apply(d,g):d;if(f!=3D=3Dd&=
&f!=3D=3Db)return h=3Df,!1}):this.each(function(){var b=3Da.data(this,c);b?=
b.option(e||{})._init():a.data(this,c,new d(e,this))}),h)}},a.Widget=3Dfunc=
tion(a,b){arguments.length&&this._createWidget(a,b)},a.Widget.prototype=3D{=
widgetName:"widget",widgetEventPrefix:"",options:{disabled:!1},_createWidge=
t:function(b,c){a.data(c,this.widgetName,this),this.element=3Da(c),this.opt=
ions=3Da.extend(!0,{},this.options,this._getCreateOptions(),b);var d=3Dthis=
;this.element.bind("remove."+this.widgetName,function(){d.destroy()}),this.=
_create(),this._trigger("create"),this._init()},_getCreateOptions:function(=
){return a.metadata&&a.metadata.get(this.element[0])[this.widgetName]},_cre=
ate:function(){},_init:function(){},destroy:function(){this.element.unbind(=
"."+this.widgetName).removeData(this.widgetName),this.widget().unbind("."+t=
his.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClas=
s+"-disabled "+"ui-state-disabled")},widget:function(){return this.element}=
,option:function(c,d){var e=3Dc;if(arguments.length=3D=3D=3D0)return a.exte=
nd({},this.options);if(typeof c=3D=3D"string"){if(d=3D=3D=3Db)return this.o=
ptions[c];e=3D{},e[c]=3Dd}return this._setOptions(e),this},_setOptions:func=
tion(b){var c=3Dthis;return a.each(b,function(a,b){c._setOption(a,b)}),this=
},_setOption:function(a,b){return this.options[a]=3Db,a=3D=3D=3D"disabled"&=
&this.widget()[b?"addClass":"removeClass"](this.widgetBaseClass+"-disabled"=
+" "+"ui-state-disabled").attr("aria-disabled",b),this},enable:function(){r=
eturn this._setOption("disabled",!1)},disable:function(){return this._setOp=
tion("disabled",!0)},_trigger:function(b,c,d){var e,f,g=3Dthis.options[b];d=
=3Dd||{},c=3Da.Event(c),c.type=3D(b=3D=3D=3Dthis.widgetEventPrefix?b:this.w=
idgetEventPrefix+b).toLowerCase(),c.target=3Dthis.element[0],f=3Dc.original=
Event;if(f)for(e in f)e in c||(c[e]=3Df[e]);return this.element.trigger(c,d=
),!(a.isFunction(g)&&g.call(this.element[0],c,d)=3D=3D=3D!1||c.isDefaultPre=
vented())}}})(jQuery);;/*! jQuery UI - v1.8.22 - 2012-07-24
+(function(a,b){if(a.cleanData){var c=3Da.cleanData;a.cleanData=3Dfunction(=
b){for(var d=3D0,e;(e=3Db[d])!=3Dnull;d++)try{a(e).triggerHandler("remove")=
}catch(f){}c(b)}}else{var d=3Da.fn.remove;a.fn.remove=3Dfunction(b,c){retur=
n this.each(function(){return c||(!b||a.filter(b,[this]).length)&&a("*",thi=
s).add([this]).each(function(){try{a(this).triggerHandler("remove")}catch(b=
){}}),d.call(a(this),b,c)})}}a.widget=3Dfunction(b,c,d){var e=3Db.split("."=
)[0],f;b=3Db.split(".")[1],f=3De+"-"+b,d||(d=3Dc,c=3Da.Widget),a.expr[":"][=
f]=3Dfunction(c){return!!a.data(c,b)},a[e]=3Da[e]||{},a[e][b]=3Dfunction(a,=
b){arguments.length&&this._createWidget(a,b)};var g=3Dnew c;g.options=3Da.e=
xtend(!0,{},g.options),a[e][b].prototype=3Da.extend(!0,g,{namespace:e,widge=
tName:b,widgetEventPrefix:a[e][b].prototype.widgetEventPrefix||b,widgetBase=
Class:f},d),a.widget.bridge(b,a[e][b])},a.widget.bridge=3Dfunction(c,d){a.f=
n[c]=3Dfunction(e){var f=3Dtypeof e=3D=3D"string",g=3DArray.prototype.slice=
.call(arguments,1),h=3Dthis;return e=3D!f&&g.length?a.extend.apply(null,[!0=
,e].concat(g)):e,f&&e.charAt(0)=3D=3D=3D"_"?h:(f?this.each(function(){var d=
=3Da.data(this,c),f=3Dd&&a.isFunction(d[e])?d[e].apply(d,g):d;if(f!=3D=3Dd&=
&f!=3D=3Db)return h=3Df,!1}):this.each(function(){var b=3Da.data(this,c);b?=
b.option(e||{})._init():a.data(this,c,new d(e,this))}),h)}},a.Widget=3Dfunc=
tion(a,b){arguments.length&&this._createWidget(a,b)},a.Widget.prototype=3D{=
widgetName:"widget",widgetEventPrefix:"",options:{disabled:!1},_createWidge=
t:function(b,c){a.data(c,this.widgetName,this),this.element=3Da(c),this.opt=
ions=3Da.extend(!0,{},this.options,this._getCreateOptions(),b);var d=3Dthis=
;this.element.bind("remove."+this.widgetName,function(){d.destroy()}),this.=
_create(),this._trigger("create"),this._init()},_getCreateOptions:function(=
){return a.metadata&&a.metadata.get(this.element[0])[this.widgetName]},_cre=
ate:function(){},_init:function(){},destroy:function(){this.element.unbind(=
"."+this.widgetName).removeData(this.widgetName),this.widget().unbind("."+t=
his.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClas=
s+"-disabled "+"ui-state-disabled")},widget:function(){return this.element}=
,option:function(c,d){var e=3Dc;if(arguments.length=3D=3D=3D0)return a.exte=
nd({},this.options);if(typeof c=3D=3D"string"){if(d=3D=3D=3Db)return this.o=
ptions[c];e=3D{},e[c]=3Dd}return this._setOptions(e),this},_setOptions:func=
tion(b){var c=3Dthis;return a.each(b,function(a,b){c._setOption(a,b)}),this=
},_setOption:function(a,b){return this.options[a]=3Db,a=3D=3D=3D"disabled"&=
&this.widget()[b?"addClass":"removeClass"](this.widgetBaseClass+"-disabled"=
+" "+"ui-state-disabled").attr("aria-disabled",b),this},enable:function(){r=
eturn this._setOption("disabled",!1)},disable:function(){return this._setOp=
tion("disabled",!0)},_trigger:function(b,c,d){var e,f,g=3Dthis.options[b];d=
=3Dd||{},c=3Da.Event(c),c.type=3D(b=3D=3D=3Dthis.widgetEventPrefix?b:this.w=
idgetEventPrefix+b).toLowerCase(),c.target=3Dthis.element[0],f=3Dc.original=
Event;if(f)for(e in f)e in c||(c[e]=3Df[e]);return this.element.trigger(c,d=
),!(a.isFunction(g)&&g.call(this.element[0],c,d)=3D=3D=3D!1||c.isDefaultPre=
vented())}}})(jQuery);;/*! jQuery UI - v1.8.23 - 2012-08-15
 * https://github.com/jquery/jquery-ui
 * Includes: jquery.ui.mouse.js
 * Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){var c=3D!1;a(document).mouseup(function(a){c=3D!1}),a.widge=
t("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseIni=
t:function(){var b=3Dthis;this.element.bind("mousedown."+this.widgetName,fu=
nction(a){return b._mouseDown(a)}).bind("click."+this.widgetName,function(c=
){if(!0=3D=3D=3Da.data(c.target,b.widgetName+".preventClickEvent"))return a=
.removeData(c.target,b.widgetName+".preventClickEvent"),c.stopImmediateProp=
agation(),!1}),this.started=3D!1},_mouseDestroy:function(){this.element.unb=
ind("."+this.widgetName),a(document).unbind("mousemove."+this.widgetName,th=
is._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDeleg=
ate)},_mouseDown:function(b){if(c)return;this._mouseStarted&&this._mouseUp(=
b),this._mouseDownEvent=3Db;var d=3Dthis,e=3Db.which=3D=3D1,f=3Dtypeof this=
.options.cancel=3D=3D"string"&&b.target.nodeName?a(b.target).closest(this.o=
ptions.cancel).length:!1;if(!e||f||!this._mouseCapture(b))return!0;this.mou=
seDelayMet=3D!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=
=3DsetTimeout(function(){d.mouseDelayMet=3D!0},this.options.delay));if(this=
._mouseDistanceMet(b)&&this._mouseDelayMet(b)){this._mouseStarted=3Dthis._m=
ouseStart(b)!=3D=3D!1;if(!this._mouseStarted)return b.preventDefault(),!0}r=
eturn!0=3D=3D=3Da.data(b.target,this.widgetName+".preventClickEvent")&&a.re=
moveData(b.target,this.widgetName+".preventClickEvent"),this._mouseMoveDele=
gate=3Dfunction(a){return d._mouseMove(a)},this._mouseUpDelegate=3Dfunction=
(a){return d._mouseUp(a)},a(document).bind("mousemove."+this.widgetName,thi=
s._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate=
),b.preventDefault(),c=3D!0,!0},_mouseMove:function(b){return!a.browser.msi=
e||document.documentMode>=3D9||!!b.button?this._mouseStarted?(this._mouseDr=
ag(b),b.preventDefault()):(this._mouseDistanceMet(b)&&this._mouseDelayMet(b=
)&&(this._mouseStarted=3Dthis._mouseStart(this._mouseDownEvent,b)!=3D=3D!1,=
this._mouseStarted?this._mouseDrag(b):this._mouseUp(b)),!this._mouseStarted=
):this._mouseUp(b)},_mouseUp:function(b){return a(document).unbind("mousemo=
ve."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widget=
Name,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=3D!1,b.=
target=3D=3Dthis._mouseDownEvent.target&&a.data(b.target,this.widgetName+".=
preventClickEvent",!0),this._mouseStop(b)),!1},_mouseDistanceMet:function(a=
){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(thi=
s._mouseDownEvent.pageY-a.pageY))>=3Dthis.options.distance},_mouseDelayMet:=
function(a){return this.mouseDelayMet},_mouseStart:function(a){},_mouseDrag=
:function(a){},_mouseStop:function(a){},_mouseCapture:function(a){return!0}=
})})(jQuery);;/*! jQuery UI - v1.8.22 - 2012-07-24
+(function(a,b){var c=3D!1;a(document).mouseup(function(a){c=3D!1}),a.widge=
t("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseIni=
t:function(){var b=3Dthis;this.element.bind("mousedown."+this.widgetName,fu=
nction(a){return b._mouseDown(a)}).bind("click."+this.widgetName,function(c=
){if(!0=3D=3D=3Da.data(c.target,b.widgetName+".preventClickEvent"))return a=
.removeData(c.target,b.widgetName+".preventClickEvent"),c.stopImmediateProp=
agation(),!1}),this.started=3D!1},_mouseDestroy:function(){this.element.unb=
ind("."+this.widgetName),this._mouseMoveDelegate&&a(document).unbind("mouse=
move."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widg=
etName,this._mouseUpDelegate)},_mouseDown:function(b){if(c)return;this._mou=
seStarted&&this._mouseUp(b),this._mouseDownEvent=3Db;var d=3Dthis,e=3Db.whi=
ch=3D=3D1,f=3Dtypeof this.options.cancel=3D=3D"string"&&b.target.nodeName?a=
(b.target).closest(this.options.cancel).length:!1;if(!e||f||!this._mouseCap=
ture(b))return!0;this.mouseDelayMet=3D!this.options.delay,this.mouseDelayMe=
t||(this._mouseDelayTimer=3DsetTimeout(function(){d.mouseDelayMet=3D!0},thi=
s.options.delay));if(this._mouseDistanceMet(b)&&this._mouseDelayMet(b)){thi=
s._mouseStarted=3Dthis._mouseStart(b)!=3D=3D!1;if(!this._mouseStarted)retur=
n b.preventDefault(),!0}return!0=3D=3D=3Da.data(b.target,this.widgetName+".=
preventClickEvent")&&a.removeData(b.target,this.widgetName+".preventClickEv=
ent"),this._mouseMoveDelegate=3Dfunction(a){return d._mouseMove(a)},this._m=
ouseUpDelegate=3Dfunction(a){return d._mouseUp(a)},a(document).bind("mousem=
ove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetN=
ame,this._mouseUpDelegate),b.preventDefault(),c=3D!0,!0},_mouseMove:functio=
n(b){return!a.browser.msie||document.documentMode>=3D9||!!b.button?this._mo=
useStarted?(this._mouseDrag(b),b.preventDefault()):(this._mouseDistanceMet(=
b)&&this._mouseDelayMet(b)&&(this._mouseStarted=3Dthis._mouseStart(this._mo=
useDownEvent,b)!=3D=3D!1,this._mouseStarted?this._mouseDrag(b):this._mouseU=
p(b)),!this._mouseStarted):this._mouseUp(b)},_mouseUp:function(b){return a(=
document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbi=
nd("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(t=
his._mouseStarted=3D!1,b.target=3D=3Dthis._mouseDownEvent.target&&a.data(b.=
target,this.widgetName+".preventClickEvent",!0),this._mouseStop(b)),!1},_mo=
useDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pa=
geX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=3Dthis.options.=
distance},_mouseDelayMet:function(a){return this.mouseDelayMet},_mouseStart=
:function(a){},_mouseDrag:function(a){},_mouseStop:function(a){},_mouseCapt=
ure:function(a){return!0}})})(jQuery);;/*! jQuery UI - v1.8.23 - 2012-08-15
 * https://github.com/jquery/jquery-ui
 * Includes: jquery.ui.position.js
 * Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){a.ui=3Da.ui||{};var c=3D/left|center|right/,d=3D/top|center=
|bottom/,e=3D"center",f=3D{},g=3Da.fn.position,h=3Da.fn.offset;a.fn.positio=
n=3Dfunction(b){if(!b||!b.of)return g.apply(this,arguments);b=3Da.extend({}=
,b);var h=3Da(b.of),i=3Dh[0],j=3D(b.collision||"flip").split(" "),k=3Db.off=
set?b.offset.split(" "):[0,0],l,m,n;return i.nodeType=3D=3D=3D9?(l=3Dh.widt=
h(),m=3Dh.height(),n=3D{top:0,left:0}):i.setTimeout?(l=3Dh.width(),m=3Dh.he=
ight(),n=3D{top:h.scrollTop(),left:h.scrollLeft()}):i.preventDefault?(b.at=
=3D"left top",l=3Dm=3D0,n=3D{top:b.of.pageY,left:b.of.pageX}):(l=3Dh.outerW=
idth(),m=3Dh.outerHeight(),n=3Dh.offset()),a.each(["my","at"],function(){va=
r a=3D(b[this]||"").split(" ");a.length=3D=3D=3D1&&(a=3Dc.test(a[0])?a.conc=
at([e]):d.test(a[0])?[e].concat(a):[e,e]),a[0]=3Dc.test(a[0])?a[0]:e,a[1]=
=3Dd.test(a[1])?a[1]:e,b[this]=3Da}),j.length=3D=3D=3D1&&(j[1]=3Dj[0]),k[0]=
=3DparseInt(k[0],10)||0,k.length=3D=3D=3D1&&(k[1]=3Dk[0]),k[1]=3DparseInt(k=
[1],10)||0,b.at[0]=3D=3D=3D"right"?n.left+=3Dl:b.at[0]=3D=3D=3De&&(n.left+=
=3Dl/2),b.at[1]=3D=3D=3D"bottom"?n.top+=3Dm:b.at[1]=3D=3D=3De&&(n.top+=3Dm/=
2),n.left+=3Dk[0],n.top+=3Dk[1],this.each(function(){var c=3Da(this),d=3Dc.=
outerWidth(),g=3Dc.outerHeight(),h=3DparseInt(a.curCSS(this,"marginLeft",!0=
))||0,i=3DparseInt(a.curCSS(this,"marginTop",!0))||0,o=3Dd+h+(parseInt(a.cu=
rCSS(this,"marginRight",!0))||0),p=3Dg+i+(parseInt(a.curCSS(this,"marginBot=
tom",!0))||0),q=3Da.extend({},n),r;b.my[0]=3D=3D=3D"right"?q.left-=3Dd:b.my=
[0]=3D=3D=3De&&(q.left-=3Dd/2),b.my[1]=3D=3D=3D"bottom"?q.top-=3Dg:b.my[1]=
=3D=3D=3De&&(q.top-=3Dg/2),f.fractions||(q.left=3DMath.round(q.left),q.top=
=3DMath.round(q.top)),r=3D{left:q.left-h,top:q.top-i},a.each(["left","top"]=
,function(c,e){a.ui.position[j[c]]&&a.ui.position[j[c]][e](q,{targetWidth:l=
,targetHeight:m,elemWidth:d,elemHeight:g,collisionPosition:r,collisionWidth=
:o,collisionHeight:p,offset:k,my:b.my,at:b.at})}),a.fn.bgiframe&&c.bgiframe=
(),c.offset(a.extend(q,{using:b.using}))})},a.ui.position=3D{fit:{left:func=
tion(b,c){var d=3Da(window),e=3Dc.collisionPosition.left+c.collisionWidth-d=
.width()-d.scrollLeft();b.left=3De>0?b.left-e:Math.max(b.left-c.collisionPo=
sition.left,b.left)},top:function(b,c){var d=3Da(window),e=3Dc.collisionPos=
ition.top+c.collisionHeight-d.height()-d.scrollTop();b.top=3De>0?b.top-e:Ma=
th.max(b.top-c.collisionPosition.top,b.top)}},flip:{left:function(b,c){if(c=
.at[0]=3D=3D=3De)return;var d=3Da(window),f=3Dc.collisionPosition.left+c.co=
llisionWidth-d.width()-d.scrollLeft(),g=3Dc.my[0]=3D=3D=3D"left"?-c.elemWid=
th:c.my[0]=3D=3D=3D"right"?c.elemWidth:0,h=3Dc.at[0]=3D=3D=3D"left"?c.targe=
tWidth:-c.targetWidth,i=3D-2*c.offset[0];b.left+=3Dc.collisionPosition.left=
<0?g+h+i:f>0?g+h+i:0},top:function(b,c){if(c.at[1]=3D=3D=3De)return;var d=
=3Da(window),f=3Dc.collisionPosition.top+c.collisionHeight-d.height()-d.scr=
ollTop(),g=3Dc.my[1]=3D=3D=3D"top"?-c.elemHeight:c.my[1]=3D=3D=3D"bottom"?c=
.elemHeight:0,h=3Dc.at[1]=3D=3D=3D"top"?c.targetHeight:-c.targetHeight,i=3D=
-2*c.offset[1];b.top+=3Dc.collisionPosition.top<0?g+h+i:f>0?g+h+i:0}}},a.of=
fset.setOffset||(a.offset.setOffset=3Dfunction(b,c){/static/.test(a.curCSS(=
b,"position"))&&(b.style.position=3D"relative");var d=3Da(b),e=3Dd.offset()=
,f=3DparseInt(a.curCSS(b,"top",!0),10)||0,g=3DparseInt(a.curCSS(b,"left",!0=
),10)||0,h=3D{top:c.top-e.top+f,left:c.left-e.left+g};"using"in c?c.using.c=
all(b,h):d.css(h)},a.fn.offset=3Dfunction(b){var c=3Dthis[0];return!c||!c.o=
wnerDocument?null:b?a.isFunction(b)?this.each(function(c){a(this).offset(b.=
call(this,c,a(this).offset()))}):this.each(function(){a.offset.setOffset(th=
is,b)}):h.call(this)}),function(){var b=3Ddocument.getElementsByTagName("bo=
dy")[0],c=3Ddocument.createElement("div"),d,e,g,h,i;d=3Ddocument.createElem=
ent(b?"div":"body"),g=3D{visibility:"hidden",width:0,height:0,border:0,marg=
in:0,background:"none"},b&&a.extend(g,{position:"absolute",left:"-1000px",t=
op:"-1000px"});for(var j in g)d.style[j]=3Dg[j];d.appendChild(c),e=3Db||doc=
ument.documentElement,e.insertBefore(d,e.firstChild),c.style.cssText=3D"pos=
ition: absolute; left: 10.7432222px; top: 10.432325px; height: 30px; width:=
 201px;",h=3Da(c).offset(function(a,b){return b}).offset(),d.innerHTML=3D""=
,e.removeChild(d),i=3Dh.top+h.left+(b?2e3:0),f.fractions=3Di>21&&i<22}()})(=
jQuery);;/*! jQuery UI - v1.8.22 - 2012-07-24
-* https://github.com/jquery/jquery-ui
-* Includes: jquery.ui.draggable.js
-* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){a.widget("ui.draggable",a.ui.mouse,{widgetEventPrefix:"drag=
",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,con=
tainment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",i=
frameFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,sco=
pe:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode=
:"both",snapTolerance:20,stack:!1,zIndex:!1},_create:function(){this.option=
s.helper=3D=3D"original"&&!/^(?:r|a|f)/.test(this.element.css("position"))&=
&(this.element[0].style.position=3D"relative"),this.options.addClasses&&thi=
s.element.addClass("ui-draggable"),this.options.disabled&&this.element.addC=
lass("ui-draggable-disabled"),this._mouseInit()},destroy:function(){if(!thi=
s.element.data("draggable"))return;return this.element.removeData("draggabl=
e").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui=
-draggable-disabled"),this._mouseDestroy(),this},_mouseCapture:function(b){=
var c=3Dthis.options;return this.helper||c.disabled||a(b.target).is(".ui-re=
sizable-handle")?!1:(this.handle=3Dthis._getHandle(b),this.handle?(c.iframe=
Fix&&a(c.iframeFix=3D=3D=3D!0?"iframe":c.iframeFix).each(function(){a('<div=
 class=3D"ui-draggable-iframeFix" style=3D"background: #fff;"></div>').css(=
{width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolu=
te",opacity:"0.001",zIndex:1e3}).css(a(this).offset()).appendTo("body")}),!=
0):!1)},_mouseStart:function(b){var c=3Dthis.options;return this.helper=3Dt=
his._createHelper(b),this.helper.addClass("ui-draggable-dragging"),this._ca=
cheHelperProportions(),a.ui.ddmanager&&(a.ui.ddmanager.current=3Dthis),this=
._cacheMargins(),this.cssPosition=3Dthis.helper.css("position"),this.scroll=
Parent=3Dthis.helper.scrollParent(),this.offset=3Dthis.positionAbs=3Dthis.e=
lement.offset(),this.offset=3D{top:this.offset.top-this.margins.top,left:th=
is.offset.left-this.margins.left},a.extend(this.offset,{click:{left:b.pageX=
-this.offset.left,top:b.pageY-this.offset.top},parent:this._getParentOffset=
(),relative:this._getRelativeOffset()}),this.originalPosition=3Dthis.positi=
on=3Dthis._generatePosition(b),this.originalPageX=3Db.pageX,this.originalPa=
geY=3Db.pageY,c.cursorAt&&this._adjustOffsetFromHelper(c.cursorAt),c.contai=
nment&&this._setContainment(),this._trigger("start",b)=3D=3D=3D!1?(this._cl=
ear(),!1):(this._cacheHelperProportions(),a.ui.ddmanager&&!c.dropBehaviour&=
&a.ui.ddmanager.prepareOffsets(this,b),this._mouseDrag(b,!0),a.ui.ddmanager=
&&a.ui.ddmanager.dragStart(this,b),!0)},_mouseDrag:function(b,c){this.posit=
ion=3Dthis._generatePosition(b),this.positionAbs=3Dthis._convertPositionTo(=
"absolute");if(!c){var d=3Dthis._uiHash();if(this._trigger("drag",b,d)=3D=
=3D=3D!1)return this._mouseUp({}),!1;this.position=3Dd.position}if(!this.op=
tions.axis||this.options.axis!=3D"y")this.helper[0].style.left=3Dthis.posit=
ion.left+"px";if(!this.options.axis||this.options.axis!=3D"x")this.helper[0=
].style.top=3Dthis.position.top+"px";return a.ui.ddmanager&&a.ui.ddmanager.=
drag(this,b),!1},_mouseStop:function(b){var c=3D!1;a.ui.ddmanager&&!this.op=
tions.dropBehaviour&&(c=3Da.ui.ddmanager.drop(this,b)),this.dropped&&(c=3Dt=
his.dropped,this.dropped=3D!1);var d=3Dthis.element[0],e=3D!1;while(d&&(d=
=3Dd.parentNode))d=3D=3Ddocument&&(e=3D!0);if(!e&&this.options.helper=3D=3D=
=3D"original")return!1;if(this.options.revert=3D=3D"invalid"&&!c||this.opti=
ons.revert=3D=3D"valid"&&c||this.options.revert=3D=3D=3D!0||a.isFunction(th=
is.options.revert)&&this.options.revert.call(this.element,c)){var f=3Dthis;=
a(this.helper).animate(this.originalPosition,parseInt(this.options.revertDu=
ration,10),function(){f._trigger("stop",b)!=3D=3D!1&&f._clear()})}else this=
._trigger("stop",b)!=3D=3D!1&&this._clear();return!1},_mouseUp:function(b){=
return this.options.iframeFix=3D=3D=3D!0&&a("div.ui-draggable-iframeFix").e=
ach(function(){this.parentNode.removeChild(this)}),a.ui.ddmanager&&a.ui.ddm=
anager.dragStop(this,b),a.ui.mouse.prototype._mouseUp.call(this,b)},cancel:=
function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp({}=
):this._clear(),this},_getHandle:function(b){var c=3D!this.options.handle||=
!a(this.options.handle,this.element).length?!0:!1;return a(this.options.han=
dle,this.element).find("*").andSelf().each(function(){this=3D=3Db.target&&(=
c=3D!0)}),c},_createHelper:function(b){var c=3Dthis.options,d=3Da.isFunctio=
n(c.helper)?a(c.helper.apply(this.element[0],[b])):c.helper=3D=3D"clone"?th=
is.element.clone().removeAttr("id"):this.element;return d.parents("body").l=
ength||d.appendTo(c.appendTo=3D=3D"parent"?this.element[0].parentNode:c.app=
endTo),d[0]!=3Dthis.element[0]&&!/(fixed|absolute)/.test(d.css("position"))=
&&d.css("position","absolute"),d},_adjustOffsetFromHelper:function(b){typeo=
f b=3D=3D"string"&&(b=3Db.split(" ")),a.isArray(b)&&(b=3D{left:+b[0],top:+b=
[1]||0}),"left"in b&&(this.offset.click.left=3Db.left+this.margins.left),"r=
ight"in b&&(this.offset.click.left=3Dthis.helperProportions.width-b.right+t=
his.margins.left),"top"in b&&(this.offset.click.top=3Db.top+this.margins.to=
p),"bottom"in b&&(this.offset.click.top=3Dthis.helperProportions.height-b.b=
ottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=3Dth=
is.helper.offsetParent();var b=3Dthis.offsetParent.offset();this.cssPositio=
n=3D=3D"absolute"&&this.scrollParent[0]!=3Ddocument&&a.ui.contains(this.scr=
ollParent[0],this.offsetParent[0])&&(b.left+=3Dthis.scrollParent.scrollLeft=
(),b.top+=3Dthis.scrollParent.scrollTop());if(this.offsetParent[0]=3D=3Ddoc=
ument.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLo=
werCase()=3D=3D"html"&&a.browser.msie)b=3D{top:0,left:0};return{top:b.top+(=
parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:b.left+(parse=
Int(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:f=
unction(){if(this.cssPosition=3D=3D"relative"){var a=3Dthis.element.positio=
n();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollPa=
rent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this=
.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){=
this.margins=3D{left:parseInt(this.element.css("marginLeft"),10)||0,top:par=
seInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css(=
"marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)|=
|0}},_cacheHelperProportions:function(){this.helperProportions=3D{width:thi=
s.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:fu=
nction(){var b=3Dthis.options;b.containment=3D=3D"parent"&&(b.containment=
=3Dthis.helper[0].parentNode);if(b.containment=3D=3D"document"||b.containme=
nt=3D=3D"window")this.containment=3D[b.containment=3D=3D"document"?0:a(wind=
ow).scrollLeft()-this.offset.relative.left-this.offset.parent.left,b.contai=
nment=3D=3D"document"?0:a(window).scrollTop()-this.offset.relative.top-this=
.offset.parent.top,(b.containment=3D=3D"document"?0:a(window).scrollLeft())=
+a(b.containment=3D=3D"document"?document:window).width()-this.helperPropor=
tions.width-this.margins.left,(b.containment=3D=3D"document"?0:a(window).sc=
rollTop())+(a(b.containment=3D=3D"document"?document:window).height()||docu=
ment.body.parentNode.scrollHeight)-this.helperProportions.height-this.margi=
ns.top];if(!/^(document|window|parent)$/.test(b.containment)&&b.containment=
.constructor!=3DArray){var c=3Da(b.containment),d=3Dc[0];if(!d)return;var e=
=3Dc.offset(),f=3Da(d).css("overflow")!=3D"hidden";this.containment=3D[(par=
seInt(a(d).css("borderLeftWidth"),10)||0)+(parseInt(a(d).css("paddingLeft")=
,10)||0),(parseInt(a(d).css("borderTopWidth"),10)||0)+(parseInt(a(d).css("p=
addingTop"),10)||0),(f?Math.max(d.scrollWidth,d.offsetWidth):d.offsetWidth)=
-(parseInt(a(d).css("borderLeftWidth"),10)||0)-(parseInt(a(d).css("paddingR=
ight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.=
right,(f?Math.max(d.scrollHeight,d.offsetHeight):d.offsetHeight)-(parseInt(=
a(d).css("borderTopWidth"),10)||0)-(parseInt(a(d).css("paddingBottom"),10)|=
|0)-this.helperProportions.height-this.margins.top-this.margins.bottom],thi=
s.relative_container=3Dc}else b.containment.constructor=3D=3DArray&&(this.c=
ontainment=3Db.containment)},_convertPositionTo:function(b,c){c||(c=3Dthis.=
position);var d=3Db=3D=3D"absolute"?1:-1,e=3Dthis.options,f=3Dthis.cssPosit=
ion=3D=3D"absolute"&&(this.scrollParent[0]=3D=3Ddocument||!a.ui.contains(th=
is.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollPare=
nt,g=3D/(html|body)/i.test(f[0].tagName);return{top:c.top+this.offset.relat=
ive.top*d+this.offset.parent.top*d-(a.browser.safari&&a.browser.version<526=
&&this.cssPosition=3D=3D"fixed"?0:(this.cssPosition=3D=3D"fixed"?-this.scro=
llParent.scrollTop():g?0:f.scrollTop())*d),left:c.left+this.offset.relative=
.left*d+this.offset.parent.left*d-(a.browser.safari&&a.browser.version<526&=
&this.cssPosition=3D=3D"fixed"?0:(this.cssPosition=3D=3D"fixed"?-this.scrol=
lParent.scrollLeft():g?0:f.scrollLeft())*d)}},_generatePosition:function(b)=
{var c=3Dthis.options,d=3Dthis.cssPosition=3D=3D"absolute"&&(this.scrollPar=
ent[0]=3D=3Ddocument||!a.ui.contains(this.scrollParent[0],this.offsetParent=
[0]))?this.offsetParent:this.scrollParent,e=3D/(html|body)/i.test(d[0].tagN=
ame),f=3Db.pageX,g=3Db.pageY;if(this.originalPosition){var h;if(this.contai=
nment){if(this.relative_container){var i=3Dthis.relative_container.offset()=
;h=3D[this.containment[0]+i.left,this.containment[1]+i.top,this.containment=
[2]+i.left,this.containment[3]+i.top]}else h=3Dthis.containment;b.pageX-thi=
s.offset.click.left<h[0]&&(f=3Dh[0]+this.offset.click.left),b.pageY-this.of=
fset.click.top<h[1]&&(g=3Dh[1]+this.offset.click.top),b.pageX-this.offset.c=
lick.left>h[2]&&(f=3Dh[2]+this.offset.click.left),b.pageY-this.offset.click=
.top>h[3]&&(g=3Dh[3]+this.offset.click.top)}if(c.grid){var j=3Dc.grid[1]?th=
is.originalPageY+Math.round((g-this.originalPageY)/c.grid[1])*c.grid[1]:thi=
s.originalPageY;g=3Dh?j-this.offset.click.top<h[1]||j-this.offset.click.top=
>h[3]?j-this.offset.click.top<h[1]?j+c.grid[1]:j-c.grid[1]:j:j;var k=3Dc.gr=
id[0]?this.originalPageX+Math.round((f-this.originalPageX)/c.grid[0])*c.gri=
d[0]:this.originalPageX;f=3Dh?k-this.offset.click.left<h[0]||k-this.offset.=
click.left>h[2]?k-this.offset.click.left<h[0]?k+c.grid[0]:k-c.grid[0]:k:k}}=
return{top:g-this.offset.click.top-this.offset.relative.top-this.offset.par=
ent.top+(a.browser.safari&&a.browser.version<526&&this.cssPosition=3D=3D"fi=
xed"?0:this.cssPosition=3D=3D"fixed"?-this.scrollParent.scrollTop():e?0:d.s=
crollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.of=
fset.parent.left+(a.browser.safari&&a.browser.version<526&&this.cssPosition=
=3D=3D"fixed"?0:this.cssPosition=3D=3D"fixed"?-this.scrollParent.scrollLeft=
():e?0:d.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-drag=
gable-dragging"),this.helper[0]!=3Dthis.element[0]&&!this.cancelHelperRemov=
al&&this.helper.remove(),this.helper=3Dnull,this.cancelHelperRemoval=3D!1},=
_trigger:function(b,c,d){return d=3Dd||this._uiHash(),a.ui.plugin.call(this=
,b,[c,d]),b=3D=3D"drag"&&(this.positionAbs=3Dthis._convertPositionTo("absol=
ute")),a.Widget.prototype._trigger.call(this,b,c,d)},plugins:{},_uiHash:fun=
ction(a){return{helper:this.helper,position:this.position,originalPosition:=
this.originalPosition,offset:this.positionAbs}}}),a.extend(a.ui.draggable,{=
version:"1.8.22"}),a.ui.plugin.add("draggable","connectToSortable",{start:f=
unction(b,c){var d=3Da(this).data("draggable"),e=3Dd.options,f=3Da.extend({=
},c,{item:d.element});d.sortables=3D[],a(e.connectToSortable).each(function=
(){var c=3Da.data(this,"sortable");c&&!c.options.disabled&&(d.sortables.pus=
h({instance:c,shouldRevert:c.options.revert}),c.refreshPositions(),c._trigg=
er("activate",b,f))})},stop:function(b,c){var d=3Da(this).data("draggable")=
,e=3Da.extend({},c,{item:d.element});a.each(d.sortables,function(){this.ins=
tance.isOver?(this.instance.isOver=3D0,d.cancelHelperRemoval=3D!0,this.inst=
ance.cancelHelperRemoval=3D!1,this.shouldRevert&&(this.instance.options.rev=
ert=3D!0),this.instance._mouseStop(b),this.instance.options.helper=3Dthis.i=
nstance.options._helper,d.options.helper=3D=3D"original"&&this.instance.cur=
rentItem.css({top:"auto",left:"auto"})):(this.instance.cancelHelperRemoval=
=3D!1,this.instance._trigger("deactivate",b,e))})},drag:function(b,c){var d=
=3Da(this).data("draggable"),e=3Dthis,f=3Dfunction(b){var c=3Dthis.offset.c=
lick.top,d=3Dthis.offset.click.left,e=3Dthis.positionAbs.top,f=3Dthis.posit=
ionAbs.left,g=3Db.height,h=3Db.width,i=3Db.top,j=3Db.left;return a.ui.isOve=
r(e+c,f+d,i,j,g,h)};a.each(d.sortables,function(f){this.instance.positionAb=
s=3Dd.positionAbs,this.instance.helperProportions=3Dd.helperProportions,thi=
s.instance.offset.click=3Dd.offset.click,this.instance._intersectsWith(this=
.instance.containerCache)?(this.instance.isOver||(this.instance.isOver=3D1,=
this.instance.currentItem=3Da(e).clone().removeAttr("id").appendTo(this.ins=
tance.element).data("sortable-item",!0),this.instance.options._helper=3Dthi=
s.instance.options.helper,this.instance.options.helper=3Dfunction(){return =
c.helper[0]},b.target=3Dthis.instance.currentItem[0],this.instance._mouseCa=
pture(b,!0),this.instance._mouseStart(b,!0,!0),this.instance.offset.click.t=
op=3Dd.offset.click.top,this.instance.offset.click.left=3Dd.offset.click.le=
ft,this.instance.offset.parent.left-=3Dd.offset.parent.left-this.instance.o=
ffset.parent.left,this.instance.offset.parent.top-=3Dd.offset.parent.top-th=
is.instance.offset.parent.top,d._trigger("toSortable",b),d.dropped=3Dthis.i=
nstance.element,d.currentItem=3Dd.element,this.instance.fromOutside=3Dd),th=
is.instance.currentItem&&this.instance._mouseDrag(b)):this.instance.isOver&=
&(this.instance.isOver=3D0,this.instance.cancelHelperRemoval=3D!0,this.inst=
ance.options.revert=3D!1,this.instance._trigger("out",b,this.instance._uiHa=
sh(this.instance)),this.instance._mouseStop(b,!0),this.instance.options.hel=
per=3Dthis.instance.options._helper,this.instance.currentItem.remove(),this=
.instance.placeholder&&this.instance.placeholder.remove(),d._trigger("fromS=
ortable",b),d.dropped=3D!1)})}}),a.ui.plugin.add("draggable","cursor",{star=
t:function(b,c){var d=3Da("body"),e=3Da(this).data("draggable").options;d.c=
ss("cursor")&&(e._cursor=3Dd.css("cursor")),d.css("cursor",e.cursor)},stop:=
function(b,c){var d=3Da(this).data("draggable").options;d._cursor&&a("body"=
).css("cursor",d._cursor)}}),a.ui.plugin.add("draggable","opacity",{start:f=
unction(b,c){var d=3Da(c.helper),e=3Da(this).data("draggable").options;d.cs=
s("opacity")&&(e._opacity=3Dd.css("opacity")),d.css("opacity",e.opacity)},s=
top:function(b,c){var d=3Da(this).data("draggable").options;d._opacity&&a(c=
.helper).css("opacity",d._opacity)}}),a.ui.plugin.add("draggable","scroll",=
{start:function(b,c){var d=3Da(this).data("draggable");d.scrollParent[0]!=
=3Ddocument&&d.scrollParent[0].tagName!=3D"HTML"&&(d.overflowOffset=3Dd.scr=
ollParent.offset())},drag:function(b,c){var d=3Da(this).data("draggable"),e=
=3Dd.options,f=3D!1;if(d.scrollParent[0]!=3Ddocument&&d.scrollParent[0].tag=
Name!=3D"HTML"){if(!e.axis||e.axis!=3D"x")d.overflowOffset.top+d.scrollPare=
nt[0].offsetHeight-b.pageY<e.scrollSensitivity?d.scrollParent[0].scrollTop=
=3Df=3Dd.scrollParent[0].scrollTop+e.scrollSpeed:b.pageY-d.overflowOffset.t=
op<e.scrollSensitivity&&(d.scrollParent[0].scrollTop=3Df=3Dd.scrollParent[0=
].scrollTop-e.scrollSpeed);if(!e.axis||e.axis!=3D"y")d.overflowOffset.left+=
d.scrollParent[0].offsetWidth-b.pageX<e.scrollSensitivity?d.scrollParent[0]=
.scrollLeft=3Df=3Dd.scrollParent[0].scrollLeft+e.scrollSpeed:b.pageX-d.over=
flowOffset.left<e.scrollSensitivity&&(d.scrollParent[0].scrollLeft=3Df=3Dd.=
scrollParent[0].scrollLeft-e.scrollSpeed)}else{if(!e.axis||e.axis!=3D"x")b.=
pageY-a(document).scrollTop()<e.scrollSensitivity?f=3Da(document).scrollTop=
(a(document).scrollTop()-e.scrollSpeed):a(window).height()-(b.pageY-a(docum=
ent).scrollTop())<e.scrollSensitivity&&(f=3Da(document).scrollTop(a(documen=
t).scrollTop()+e.scrollSpeed));if(!e.axis||e.axis!=3D"y")b.pageX-a(document=
).scrollLeft()<e.scrollSensitivity?f=3Da(document).scrollLeft(a(document).s=
crollLeft()-e.scrollSpeed):a(window).width()-(b.pageX-a(document).scrollLef=
t())<e.scrollSensitivity&&(f=3Da(document).scrollLeft(a(document).scrollLef=
t()+e.scrollSpeed))}f!=3D=3D!1&&a.ui.ddmanager&&!e.dropBehaviour&&a.ui.ddma=
nager.prepareOffsets(d,b)}}),a.ui.plugin.add("draggable","snap",{start:func=
tion(b,c){var d=3Da(this).data("draggable"),e=3Dd.options;d.snapElements=3D=
[],a(e.snap.constructor!=3DString?e.snap.items||":data(draggable)":e.snap).=
each(function(){var b=3Da(this),c=3Db.offset();this!=3Dd.element[0]&&d.snap=
Elements.push({item:this,width:b.outerWidth(),height:b.outerHeight(),top:c.=
top,left:c.left})})},drag:function(b,c){var d=3Da(this).data("draggable"),e=
=3Dd.options,f=3De.snapTolerance,g=3Dc.offset.left,h=3Dg+d.helperProportion=
s.width,i=3Dc.offset.top,j=3Di+d.helperProportions.height;for(var k=3Dd.sna=
pElements.length-1;k>=3D0;k--){var l=3Dd.snapElements[k].left,m=3Dl+d.snapE=
lements[k].width,n=3Dd.snapElements[k].top,o=3Dn+d.snapElements[k].height;i=
f(!(l-f<g&&g<m+f&&n-f<i&&i<o+f||l-f<g&&g<m+f&&n-f<j&&j<o+f||l-f<h&&h<m+f&&n=
-f<i&&i<o+f||l-f<h&&h<m+f&&n-f<j&&j<o+f)){d.snapElements[k].snapping&&d.opt=
ions.snap.release&&d.options.snap.release.call(d.element,b,a.extend(d._uiHa=
sh(),{snapItem:d.snapElements[k].item})),d.snapElements[k].snapping=3D!1;co=
ntinue}if(e.snapMode!=3D"inner"){var p=3DMath.abs(n-j)<=3Df,q=3DMath.abs(o-=
i)<=3Df,r=3DMath.abs(l-h)<=3Df,s=3DMath.abs(m-g)<=3Df;p&&(c.position.top=3D=
d._convertPositionTo("relative",{top:n-d.helperProportions.height,left:0}).=
top-d.margins.top),q&&(c.position.top=3Dd._convertPositionTo("relative",{to=
p:o,left:0}).top-d.margins.top),r&&(c.position.left=3Dd._convertPositionTo(=
"relative",{top:0,left:l-d.helperProportions.width}).left-d.margins.left),s=
&&(c.position.left=3Dd._convertPositionTo("relative",{top:0,left:m}).left-d=
.margins.left)}var t=3Dp||q||r||s;if(e.snapMode!=3D"outer"){var p=3DMath.ab=
s(n-i)<=3Df,q=3DMath.abs(o-j)<=3Df,r=3DMath.abs(l-g)<=3Df,s=3DMath.abs(m-h)=
<=3Df;p&&(c.position.top=3Dd._convertPositionTo("relative",{top:n,left:0}).=
top-d.margins.top),q&&(c.position.top=3Dd._convertPositionTo("relative",{to=
p:o-d.helperProportions.height,left:0}).top-d.margins.top),r&&(c.position.l=
eft=3Dd._convertPositionTo("relative",{top:0,left:l}).left-d.margins.left),=
s&&(c.position.left=3Dd._convertPositionTo("relative",{top:0,left:m-d.helpe=
rProportions.width}).left-d.margins.left)}!d.snapElements[k].snapping&&(p||=
q||r||s||t)&&d.options.snap.snap&&d.options.snap.snap.call(d.element,b,a.ex=
tend(d._uiHash(),{snapItem:d.snapElements[k].item})),d.snapElements[k].snap=
ping=3Dp||q||r||s||t}}}),a.ui.plugin.add("draggable","stack",{start:functio=
n(b,c){var d=3Da(this).data("draggable").options,e=3Da.makeArray(a(d.stack)=
).sort(function(b,c){return(parseInt(a(b).css("zIndex"),10)||0)-(parseInt(a=
(c).css("zIndex"),10)||0)});if(!e.length)return;var f=3DparseInt(e[0].style=
.zIndex)||0;a(e).each(function(a){this.style.zIndex=3Df+a}),this[0].style.z=
Index=3Df+e.length}}),a.ui.plugin.add("draggable","zIndex",{start:function(=
b,c){var d=3Da(c.helper),e=3Da(this).data("draggable").options;d.css("zInde=
x")&&(e._zIndex=3Dd.css("zIndex")),d.css("zIndex",e.zIndex)},stop:function(=
b,c){var d=3Da(this).data("draggable").options;d._zIndex&&a(c.helper).css("=
zIndex",d._zIndex)}})})(jQuery);;/*! jQuery UI - v1.8.22 - 2012-07-24
-* https://github.com/jquery/jquery-ui
-* Includes: jquery.ui.droppable.js
-* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){a.widget("ui.droppable",{widgetEventPrefix:"drop",options:{=
accept:"*",activeClass:!1,addClasses:!0,greedy:!1,hoverClass:!1,scope:"defa=
ult",tolerance:"intersect"},_create:function(){var b=3Dthis.options,c=3Db.a=
ccept;this.isover=3D0,this.isout=3D1,this.accept=3Da.isFunction(c)?c:functi=
on(a){return a.is(c)},this.proportions=3D{width:this.element[0].offsetWidth=
,height:this.element[0].offsetHeight},a.ui.ddmanager.droppables[b.scope]=3D=
a.ui.ddmanager.droppables[b.scope]||[],a.ui.ddmanager.droppables[b.scope].p=
ush(this),b.addClasses&&this.element.addClass("ui-droppable")},destroy:func=
tion(){var b=3Da.ui.ddmanager.droppables[this.options.scope];for(var c=3D0;=
c<b.length;c++)b[c]=3D=3Dthis&&b.splice(c,1);return this.element.removeClas=
s("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".dr=
oppable"),this},_setOption:function(b,c){b=3D=3D"accept"&&(this.accept=3Da.=
isFunction(c)?c:function(a){return a.is(c)}),a.Widget.prototype._setOption.=
apply(this,arguments)},_activate:function(b){var c=3Da.ui.ddmanager.current=
;this.options.activeClass&&this.element.addClass(this.options.activeClass),=
c&&this._trigger("activate",b,this.ui(c))},_deactivate:function(b){var c=3D=
a.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(t=
his.options.activeClass),c&&this._trigger("deactivate",b,this.ui(c))},_over=
:function(b){var c=3Da.ui.ddmanager.current;if(!c||(c.currentItem||c.elemen=
t)[0]=3D=3Dthis.element[0])return;this.accept.call(this.element[0],c.curren=
tItem||c.element)&&(this.options.hoverClass&&this.element.addClass(this.opt=
ions.hoverClass),this._trigger("over",b,this.ui(c)))},_out:function(b){var =
c=3Da.ui.ddmanager.current;if(!c||(c.currentItem||c.element)[0]=3D=3Dthis.e=
lement[0])return;this.accept.call(this.element[0],c.currentItem||c.element)=
&&(this.options.hoverClass&&this.element.removeClass(this.options.hoverClas=
s),this._trigger("out",b,this.ui(c)))},_drop:function(b,c){var d=3Dc||a.ui.=
ddmanager.current;if(!d||(d.currentItem||d.element)[0]=3D=3Dthis.element[0]=
)return!1;var e=3D!1;return this.element.find(":data(droppable)").not(".ui-=
draggable-dragging").each(function(){var b=3Da.data(this,"droppable");if(b.=
options.greedy&&!b.options.disabled&&b.options.scope=3D=3Dd.options.scope&&=
b.accept.call(b.element[0],d.currentItem||d.element)&&a.ui.intersect(d,a.ex=
tend(b,{offset:b.element.offset()}),b.options.tolerance))return e=3D!0,!1})=
,e?!1:this.accept.call(this.element[0],d.currentItem||d.element)?(this.opti=
ons.activeClass&&this.element.removeClass(this.options.activeClass),this.op=
tions.hoverClass&&this.element.removeClass(this.options.hoverClass),this._t=
rigger("drop",b,this.ui(d)),this.element):!1},ui:function(a){return{draggab=
le:a.currentItem||a.element,helper:a.helper,position:a.position,offset:a.po=
sitionAbs}}}),a.extend(a.ui.droppable,{version:"1.8.22"}),a.ui.intersect=3D=
function(b,c,d){if(!c.offset)return!1;var e=3D(b.positionAbs||b.position.ab=
solute).left,f=3De+b.helperProportions.width,g=3D(b.positionAbs||b.position=
.absolute).top,h=3Dg+b.helperProportions.height,i=3Dc.offset.left,j=3Di+c.p=
roportions.width,k=3Dc.offset.top,l=3Dk+c.proportions.height;switch(d){case=
"fit":return i<=3De&&f<=3Dj&&k<=3Dg&&h<=3Dl;case"intersect":return i<e+b.he=
lperProportions.width/2&&f-b.helperProportions.width/2<j&&k<g+b.helperPropo=
rtions.height/2&&h-b.helperProportions.height/2<l;case"pointer":var m=3D(b.=
positionAbs||b.position.absolute).left+(b.clickOffset||b.offset.click).left=
,n=3D(b.positionAbs||b.position.absolute).top+(b.clickOffset||b.offset.clic=
k).top,o=3Da.ui.isOver(n,m,k,i,c.proportions.height,c.proportions.width);re=
turn o;case"touch":return(g>=3Dk&&g<=3Dl||h>=3Dk&&h<=3Dl||g<k&&h>l)&&(e>=3D=
i&&e<=3Dj||f>=3Di&&f<=3Dj||e<i&&f>j);default:return!1}},a.ui.ddmanager=3D{c=
urrent:null,droppables:{"default":[]},prepareOffsets:function(b,c){var d=3D=
a.ui.ddmanager.droppables[b.options.scope]||[],e=3Dc?c.type:null,f=3D(b.cur=
rentItem||b.element).find(":data(droppable)").andSelf();g:for(var h=3D0;h<d=
.length;h++){if(d[h].options.disabled||b&&!d[h].accept.call(d[h].element[0]=
,b.currentItem||b.element))continue;for(var i=3D0;i<f.length;i++)if(f[i]=3D=
=3Dd[h].element[0]){d[h].proportions.height=3D0;continue g}d[h].visible=3Dd=
[h].element.css("display")!=3D"none";if(!d[h].visible)continue;e=3D=3D"mous=
edown"&&d[h]._activate.call(d[h],c),d[h].offset=3Dd[h].element.offset(),d[h=
].proportions=3D{width:d[h].element[0].offsetWidth,height:d[h].element[0].o=
ffsetHeight}}},drop:function(b,c){var d=3D!1;return a.each(a.ui.ddmanager.d=
roppables[b.options.scope]||[],function(){if(!this.options)return;!this.opt=
ions.disabled&&this.visible&&a.ui.intersect(b,this,this.options.tolerance)&=
&(d=3Dthis._drop.call(this,c)||d),!this.options.disabled&&this.visible&&thi=
s.accept.call(this.element[0],b.currentItem||b.element)&&(this.isout=3D1,th=
is.isover=3D0,this._deactivate.call(this,c))}),d},dragStart:function(b,c){b=
.element.parents(":not(body,html)").bind("scroll.droppable",function(){b.op=
tions.refreshPositions||a.ui.ddmanager.prepareOffsets(b,c)})},drag:function=
(b,c){b.options.refreshPositions&&a.ui.ddmanager.prepareOffsets(b,c),a.each=
(a.ui.ddmanager.droppables[b.options.scope]||[],function(){if(this.options.=
disabled||this.greedyChild||!this.visible)return;var d=3Da.ui.intersect(b,t=
his,this.options.tolerance),e=3D!d&&this.isover=3D=3D1?"isout":d&&this.isov=
er=3D=3D0?"isover":null;if(!e)return;var f;if(this.options.greedy){var g=3D=
this.element.parents(":data(droppable):eq(0)");g.length&&(f=3Da.data(g[0],"=
droppable"),f.greedyChild=3De=3D=3D"isover"?1:0)}f&&e=3D=3D"isover"&&(f.iso=
ver=3D0,f.isout=3D1,f._out.call(f,c)),this[e]=3D1,this[e=3D=3D"isout"?"isov=
er":"isout"]=3D0,this[e=3D=3D"isover"?"_over":"_out"].call(this,c),f&&e=3D=
=3D"isout"&&(f.isout=3D0,f.isover=3D1,f._over.call(f,c))})},dragStop:functi=
on(b,c){b.element.parents(":not(body,html)").unbind("scroll.droppable"),b.o=
ptions.refreshPositions||a.ui.ddmanager.prepareOffsets(b,c)}}})(jQuery);;/*=
! jQuery UI - v1.8.22 - 2012-07-24
-* https://github.com/jquery/jquery-ui
-* Includes: jquery.ui.resizable.js
-* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){a.widget("ui.resizable",a.ui.mouse,{widgetEventPrefix:"resi=
ze",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:=
"swing",aspectRatio:!1,autoHide:!1,containment:!1,ghost:!1,grid:!1,handles:=
"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zI=
ndex:1e3},_create:function(){var b=3Dthis,c=3Dthis.options;this.element.add=
Class("ui-resizable"),a.extend(this,{_aspectRatio:!!c.aspectRatio,aspectRat=
io:c.aspectRatio,originalElement:this.element,_proportionallyResizeElements=
:[],_helper:c.helper||c.ghost||c.animate?c.helper||"ui-resizable-helper":nu=
ll}),this.element[0].nodeName.match(/canvas|textarea|input|select|button|im=
g/i)&&(this.element.wrap(a('<div class=3D"ui-wrapper" style=3D"overflow: hi=
dden;"></div>').css({position:this.element.css("position"),width:this.eleme=
nt.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top=
"),left:this.element.css("left")})),this.element=3Dthis.element.parent().da=
ta("resizable",this.element.data("resizable")),this.elementIsWrapper=3D!0,t=
his.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTo=
p:this.originalElement.css("marginTop"),marginRight:this.originalElement.cs=
s("marginRight"),marginBottom:this.originalElement.css("marginBottom")}),th=
is.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom=
:0}),this.originalResizeStyle=3Dthis.originalElement.css("resize"),this.ori=
ginalElement.css("resize","none"),this._proportionallyResizeElements.push(t=
his.originalElement.css({position:"static",zoom:1,display:"block"})),this.o=
riginalElement.css({margin:this.originalElement.css("margin")}),this._propo=
rtionallyResize()),this.handles=3Dc.handles||(a(".ui-resizable-handle",this=
.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-=
s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-=
resizable-ne",nw:".ui-resizable-nw"}:"e,s,se");if(this.handles.constructor=
=3D=3DString){this.handles=3D=3D"all"&&(this.handles=3D"n,e,s,w,se,sw,ne,nw=
");var d=3Dthis.handles.split(",");this.handles=3D{};for(var e=3D0;e<d.leng=
th;e++){var f=3Da.trim(d[e]),g=3D"ui-resizable-"+f,h=3Da('<div class=3D"ui-=
resizable-handle '+g+'"></div>');h.css({zIndex:c.zIndex}),"se"=3D=3Df&&h.ad=
dClass("ui-icon ui-icon-gripsmall-diagonal-se"),this.handles[f]=3D".ui-resi=
zable-"+f,this.element.append(h)}}this._renderAxis=3Dfunction(b){b=3Db||thi=
s.element;for(var c in this.handles){this.handles[c].constructor=3D=3DStrin=
g&&(this.handles[c]=3Da(this.handles[c],this.element).show());if(this.eleme=
ntIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|=
button/i)){var d=3Da(this.handles[c],this.element),e=3D0;e=3D/sw|ne|nw|se|n=
|s/.test(c)?d.outerHeight():d.outerWidth();var f=3D["padding",/ne|nw|n/.tes=
t(c)?"Top":/se|sw|s/.test(c)?"Bottom":/^e$/.test(c)?"Right":"Left"].join(""=
);b.css(f,e),this._proportionallyResize()}if(!a(this.handles[c]).length)con=
tinue}},this._renderAxis(this.element),this._handles=3Da(".ui-resizable-han=
dle",this.element).disableSelection(),this._handles.mouseover(function(){if=
(!b.resizing){if(this.className)var a=3Dthis.className.match(/ui-resizable-=
(se|sw|ne|nw|n|e|s|w)/i);b.axis=3Da&&a[1]?a[1]:"se"}}),c.autoHide&&(this._h=
andles.hide(),a(this.element).addClass("ui-resizable-autohide").hover(funct=
ion(){if(c.disabled)return;a(this).removeClass("ui-resizable-autohide"),b._=
handles.show()},function(){if(c.disabled)return;b.resizing||(a(this).addCla=
ss("ui-resizable-autohide"),b._handles.hide())})),this._mouseInit()},destro=
y:function(){this._mouseDestroy();var b=3Dfunction(b){a(b).removeClass("ui-=
resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizab=
le").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.el=
ementIsWrapper){b(this.element);var c=3Dthis.element;c.after(this.originalE=
lement.css({position:c.css("position"),width:c.outerWidth(),height:c.outerH=
eight(),top:c.css("top"),left:c.css("left")})).remove()}return this.origina=
lElement.css("resize",this.originalResizeStyle),b(this.originalElement),thi=
s},_mouseCapture:function(b){var c=3D!1;for(var d in this.handles)a(this.ha=
ndles[d])[0]=3D=3Db.target&&(c=3D!0);return!this.options.disabled&&c},_mous=
eStart:function(b){var d=3Dthis.options,e=3Dthis.element.position(),f=3Dthi=
s.element;this.resizing=3D!0,this.documentScroll=3D{top:a(document).scrollT=
op(),left:a(document).scrollLeft()},(f.is(".ui-draggable")||/absolute/.test=
(f.css("position")))&&f.css({position:"absolute",top:e.top,left:e.left}),th=
is._renderProxy();var g=3Dc(this.helper.css("left")),h=3Dc(this.helper.css(=
"top"));d.containment&&(g+=3Da(d.containment).scrollLeft()||0,h+=3Da(d.cont=
ainment).scrollTop()||0),this.offset=3Dthis.helper.offset(),this.position=
=3D{left:g,top:h},this.size=3Dthis._helper?{width:f.outerWidth(),height:f.o=
uterHeight()}:{width:f.width(),height:f.height()},this.originalSize=3Dthis.=
_helper?{width:f.outerWidth(),height:f.outerHeight()}:{width:f.width(),heig=
ht:f.height()},this.originalPosition=3D{left:g,top:h},this.sizeDiff=3D{widt=
h:f.outerWidth()-f.width(),height:f.outerHeight()-f.height()},this.original=
MousePosition=3D{left:b.pageX,top:b.pageY},this.aspectRatio=3Dtypeof d.aspe=
ctRatio=3D=3D"number"?d.aspectRatio:this.originalSize.width/this.originalSi=
ze.height||1;var i=3Da(".ui-resizable-"+this.axis).css("cursor");return a("=
body").css("cursor",i=3D=3D"auto"?this.axis+"-resize":i),f.addClass("ui-res=
izable-resizing"),this._propagate("start",b),!0},_mouseDrag:function(b){var=
 c=3Dthis.helper,d=3Dthis.options,e=3D{},f=3Dthis,g=3Dthis.originalMousePos=
ition,h=3Dthis.axis,i=3Db.pageX-g.left||0,j=3Db.pageY-g.top||0,k=3Dthis._ch=
ange[h];if(!k)return!1;var l=3Dk.apply(this,[b,i,j]),m=3Da.browser.msie&&a.=
browser.version<7,n=3Dthis.sizeDiff;this._updateVirtualBoundaries(b.shiftKe=
y);if(this._aspectRatio||b.shiftKey)l=3Dthis._updateRatio(l,b);return l=3Dt=
his._respectSize(l,b),this._propagate("resize",b),c.css({top:this.position.=
top+"px",left:this.position.left+"px",width:this.size.width+"px",height:thi=
s.size.height+"px"}),!this._helper&&this._proportionallyResizeElements.leng=
th&&this._proportionallyResize(),this._updateCache(l),this._trigger("resize=
",b,this.ui()),!1},_mouseStop:function(b){this.resizing=3D!1;var c=3Dthis.o=
ptions,d=3Dthis;if(this._helper){var e=3Dthis._proportionallyResizeElements=
,f=3De.length&&/textarea/i.test(e[0].nodeName),g=3Df&&a.ui.hasScroll(e[0],"=
left")?0:d.sizeDiff.height,h=3Df?0:d.sizeDiff.width,i=3D{width:d.helper.wid=
th()-h,height:d.helper.height()-g},j=3DparseInt(d.element.css("left"),10)+(=
d.position.left-d.originalPosition.left)||null,k=3DparseInt(d.element.css("=
top"),10)+(d.position.top-d.originalPosition.top)||null;c.animate||this.ele=
ment.css(a.extend(i,{top:k,left:j})),d.helper.height(d.size.height),d.helpe=
r.width(d.size.width),this._helper&&!c.animate&&this._proportionallyResize(=
)}return a("body").css("cursor","auto"),this.element.removeClass("ui-resiza=
ble-resizing"),this._propagate("stop",b),this._helper&&this.helper.remove()=
,!1},_updateVirtualBoundaries:function(a){var b=3Dthis.options,c,e,f,g,h;h=
=3D{minWidth:d(b.minWidth)?b.minWidth:0,maxWidth:d(b.maxWidth)?b.maxWidth:I=
nfinity,minHeight:d(b.minHeight)?b.minHeight:0,maxHeight:d(b.maxHeight)?b.m=
axHeight:Infinity};if(this._aspectRatio||a)c=3Dh.minHeight*this.aspectRatio=
,f=3Dh.minWidth/this.aspectRatio,e=3Dh.maxHeight*this.aspectRatio,g=3Dh.max=
Width/this.aspectRatio,c>h.minWidth&&(h.minWidth=3Dc),f>h.minHeight&&(h.min=
Height=3Df),e<h.maxWidth&&(h.maxWidth=3De),g<h.maxHeight&&(h.maxHeight=3Dg)=
;this._vBoundaries=3Dh},_updateCache:function(a){var b=3Dthis.options;this.=
offset=3Dthis.helper.offset(),d(a.left)&&(this.position.left=3Da.left),d(a.=
top)&&(this.position.top=3Da.top),d(a.height)&&(this.size.height=3Da.height=
),d(a.width)&&(this.size.width=3Da.width)},_updateRatio:function(a,b){var c=
=3Dthis.options,e=3Dthis.position,f=3Dthis.size,g=3Dthis.axis;return d(a.he=
ight)?a.width=3Da.height*this.aspectRatio:d(a.width)&&(a.height=3Da.width/t=
his.aspectRatio),g=3D=3D"sw"&&(a.left=3De.left+(f.width-a.width),a.top=3Dnu=
ll),g=3D=3D"nw"&&(a.top=3De.top+(f.height-a.height),a.left=3De.left+(f.widt=
h-a.width)),a},_respectSize:function(a,b){var c=3Dthis.helper,e=3Dthis._vBo=
undaries,f=3Dthis._aspectRatio||b.shiftKey,g=3Dthis.axis,h=3Dd(a.width)&&e.=
maxWidth&&e.maxWidth<a.width,i=3Dd(a.height)&&e.maxHeight&&e.maxHeight<a.he=
ight,j=3Dd(a.width)&&e.minWidth&&e.minWidth>a.width,k=3Dd(a.height)&&e.minH=
eight&&e.minHeight>a.height;j&&(a.width=3De.minWidth),k&&(a.height=3De.minH=
eight),h&&(a.width=3De.maxWidth),i&&(a.height=3De.maxHeight);var l=3Dthis.o=
riginalPosition.left+this.originalSize.width,m=3Dthis.position.top+this.siz=
e.height,n=3D/sw|nw|w/.test(g),o=3D/nw|ne|n/.test(g);j&&n&&(a.left=3Dl-e.mi=
nWidth),h&&n&&(a.left=3Dl-e.maxWidth),k&&o&&(a.top=3Dm-e.minHeight),i&&o&&(=
a.top=3Dm-e.maxHeight);var p=3D!a.width&&!a.height;return p&&!a.left&&a.top=
?a.top=3Dnull:p&&!a.top&&a.left&&(a.left=3Dnull),a},_proportionallyResize:f=
unction(){var b=3Dthis.options;if(!this._proportionallyResizeElements.lengt=
h)return;var c=3Dthis.helper||this.element;for(var d=3D0;d<this._proportion=
allyResizeElements.length;d++){var e=3Dthis._proportionallyResizeElements[d=
];if(!this.borderDif){var f=3D[e.css("borderTopWidth"),e.css("borderRightWi=
dth"),e.css("borderBottomWidth"),e.css("borderLeftWidth")],g=3D[e.css("padd=
ingTop"),e.css("paddingRight"),e.css("paddingBottom"),e.css("paddingLeft")]=
;this.borderDif=3Da.map(f,function(a,b){var c=3DparseInt(a,10)||0,d=3Dparse=
Int(g[b],10)||0;return c+d})}if(!a.browser.msie||!a(c).is(":hidden")&&!a(c)=
.parents(":hidden").length)e.css({height:c.height()-this.borderDif[0]-this.=
borderDif[2]||0,width:c.width()-this.borderDif[1]-this.borderDif[3]||0});el=
se continue}},_renderProxy:function(){var b=3Dthis.element,c=3Dthis.options=
;this.elementOffset=3Db.offset();if(this._helper){this.helper=3Dthis.helper=
||a('<div style=3D"overflow:hidden;"></div>');var d=3Da.browser.msie&&a.bro=
wser.version<7,e=3Dd?1:0,f=3Dd?2:-1;this.helper.addClass(this._helper).css(=
{width:this.element.outerWidth()+f,height:this.element.outerHeight()+f,posi=
tion:"absolute",left:this.elementOffset.left-e+"px",top:this.elementOffset.=
top-e+"px",zIndex:++c.zIndex}),this.helper.appendTo("body").disableSelectio=
n()}else this.helper=3Dthis.element},_change:{e:function(a,b,c){return{widt=
h:this.originalSize.width+b}},w:function(a,b,c){var d=3Dthis.options,e=3Dth=
is.originalSize,f=3Dthis.originalPosition;return{left:f.left+b,width:e.widt=
h-b}},n:function(a,b,c){var d=3Dthis.options,e=3Dthis.originalSize,f=3Dthis=
.originalPosition;return{top:f.top+c,height:e.height-c}},s:function(a,b,c){=
return{height:this.originalSize.height+c}},se:function(b,c,d){return a.exte=
nd(this._change.s.apply(this,arguments),this._change.e.apply(this,[b,c,d]))=
},sw:function(b,c,d){return a.extend(this._change.s.apply(this,arguments),t=
his._change.w.apply(this,[b,c,d]))},ne:function(b,c,d){return a.extend(this=
._change.n.apply(this,arguments),this._change.e.apply(this,[b,c,d]))},nw:fu=
nction(b,c,d){return a.extend(this._change.n.apply(this,arguments),this._ch=
ange.w.apply(this,[b,c,d]))}},_propagate:function(b,c){a.ui.plugin.call(thi=
s,b,[c,this.ui()]),b!=3D"resize"&&this._trigger(b,c,this.ui())},plugins:{},=
ui:function(){return{originalElement:this.originalElement,element:this.elem=
ent,helper:this.helper,position:this.position,size:this.size,originalSize:t=
his.originalSize,originalPosition:this.originalPosition}}}),a.extend(a.ui.r=
esizable,{version:"1.8.22"}),a.ui.plugin.add("resizable","alsoResize",{star=
t:function(b,c){var d=3Da(this).data("resizable"),e=3Dd.options,f=3Dfunctio=
n(b){a(b).each(function(){var b=3Da(this);b.data("resizable-alsoresize",{wi=
dth:parseInt(b.width(),10),height:parseInt(b.height(),10),left:parseInt(b.c=
ss("left"),10),top:parseInt(b.css("top"),10)})})};typeof e.alsoResize=3D=3D=
"object"&&!e.alsoResize.parentNode?e.alsoResize.length?(e.alsoResize=3De.al=
soResize[0],f(e.alsoResize)):a.each(e.alsoResize,function(a){f(a)}):f(e.als=
oResize)},resize:function(b,c){var d=3Da(this).data("resizable"),e=3Dd.opti=
ons,f=3Dd.originalSize,g=3Dd.originalPosition,h=3D{height:d.size.height-f.h=
eight||0,width:d.size.width-f.width||0,top:d.position.top-g.top||0,left:d.p=
osition.left-g.left||0},i=3Dfunction(b,d){a(b).each(function(){var b=3Da(th=
is),e=3Da(this).data("resizable-alsoresize"),f=3D{},g=3Dd&&d.length?d:b.par=
ents(c.originalElement[0]).length?["width","height"]:["width","height","top=
","left"];a.each(g,function(a,b){var c=3D(e[b]||0)+(h[b]||0);c&&c>=3D0&&(f[=
b]=3Dc||null)}),b.css(f)})};typeof e.alsoResize=3D=3D"object"&&!e.alsoResiz=
e.nodeType?a.each(e.alsoResize,function(a,b){i(a,b)}):i(e.alsoResize)},stop=
:function(b,c){a(this).removeData("resizable-alsoresize")}}),a.ui.plugin.ad=
d("resizable","animate",{stop:function(b,c){var d=3Da(this).data("resizable=
"),e=3Dd.options,f=3Dd._proportionallyResizeElements,g=3Df.length&&/textare=
a/i.test(f[0].nodeName),h=3Dg&&a.ui.hasScroll(f[0],"left")?0:d.sizeDiff.hei=
ght,i=3Dg?0:d.sizeDiff.width,j=3D{width:d.size.width-i,height:d.size.height=
-h},k=3DparseInt(d.element.css("left"),10)+(d.position.left-d.originalPosit=
ion.left)||null,l=3DparseInt(d.element.css("top"),10)+(d.position.top-d.ori=
ginalPosition.top)||null;d.element.animate(a.extend(j,l&&k?{top:l,left:k}:{=
}),{duration:e.animateDuration,easing:e.animateEasing,step:function(){var c=
=3D{width:parseInt(d.element.css("width"),10),height:parseInt(d.element.css=
("height"),10),top:parseInt(d.element.css("top"),10),left:parseInt(d.elemen=
t.css("left"),10)};f&&f.length&&a(f[0]).css({width:c.width,height:c.height}=
),d._updateCache(c),d._propagate("resize",b)}})}}),a.ui.plugin.add("resizab=
le","containment",{start:function(b,d){var e=3Da(this).data("resizable"),f=
=3De.options,g=3De.element,h=3Df.containment,i=3Dh instanceof a?h.get(0):/p=
arent/.test(h)?g.parent().get(0):h;if(!i)return;e.containerElement=3Da(i);i=
f(/document/.test(h)||h=3D=3Ddocument)e.containerOffset=3D{left:0,top:0},e.=
containerPosition=3D{left:0,top:0},e.parentData=3D{element:a(document),left=
:0,top:0,width:a(document).width(),height:a(document).height()||document.bo=
dy.parentNode.scrollHeight};else{var j=3Da(i),k=3D[];a(["Top","Right","Left=
","Bottom"]).each(function(a,b){k[a]=3Dc(j.css("padding"+b))}),e.containerO=
ffset=3Dj.offset(),e.containerPosition=3Dj.position(),e.containerSize=3D{he=
ight:j.innerHeight()-k[3],width:j.innerWidth()-k[1]};var l=3De.containerOff=
set,m=3De.containerSize.height,n=3De.containerSize.width,o=3Da.ui.hasScroll=
(i,"left")?i.scrollWidth:n,p=3Da.ui.hasScroll(i)?i.scrollHeight:m;e.parentD=
ata=3D{element:i,left:l.left,top:l.top,width:o,height:p}}},resize:function(=
b,c){var d=3Da(this).data("resizable"),e=3Dd.options,f=3Dd.containerSize,g=
=3Dd.containerOffset,h=3Dd.size,i=3Dd.position,j=3Dd._aspectRatio||b.shiftK=
ey,k=3D{top:0,left:0},l=3Dd.containerElement;l[0]!=3Ddocument&&/static/.tes=
t(l.css("position"))&&(k=3Dg),i.left<(d._helper?g.left:0)&&(d.size.width=3D=
d.size.width+(d._helper?d.position.left-g.left:d.position.left-k.left),j&&(=
d.size.height=3Dd.size.width/d.aspectRatio),d.position.left=3De.helper?g.le=
ft:0),i.top<(d._helper?g.top:0)&&(d.size.height=3Dd.size.height+(d._helper?=
d.position.top-g.top:d.position.top),j&&(d.size.width=3Dd.size.height*d.asp=
ectRatio),d.position.top=3Dd._helper?g.top:0),d.offset.left=3Dd.parentData.=
left+d.position.left,d.offset.top=3Dd.parentData.top+d.position.top;var m=
=3DMath.abs((d._helper?d.offset.left-k.left:d.offset.left-k.left)+d.sizeDif=
f.width),n=3DMath.abs((d._helper?d.offset.top-k.top:d.offset.top-g.top)+d.s=
izeDiff.height),o=3Dd.containerElement.get(0)=3D=3Dd.element.parent().get(0=
),p=3D/relative|absolute/.test(d.containerElement.css("position"));o&&p&&(m=
-=3Dd.parentData.left),m+d.size.width>=3Dd.parentData.width&&(d.size.width=
=3Dd.parentData.width-m,j&&(d.size.height=3Dd.size.width/d.aspectRatio)),n+=
d.size.height>=3Dd.parentData.height&&(d.size.height=3Dd.parentData.height-=
n,j&&(d.size.width=3Dd.size.height*d.aspectRatio))},stop:function(b,c){var =
d=3Da(this).data("resizable"),e=3Dd.options,f=3Dd.position,g=3Dd.containerO=
ffset,h=3Dd.containerPosition,i=3Dd.containerElement,j=3Da(d.helper),k=3Dj.=
offset(),l=3Dj.outerWidth()-d.sizeDiff.width,m=3Dj.outerHeight()-d.sizeDiff=
.height;d._helper&&!e.animate&&/relative/.test(i.css("position"))&&a(this).=
css({left:k.left-h.left-g.left,width:l,height:m}),d._helper&&!e.animate&&/s=
tatic/.test(i.css("position"))&&a(this).css({left:k.left-h.left-g.left,widt=
h:l,height:m})}}),a.ui.plugin.add("resizable","ghost",{start:function(b,c){=
var d=3Da(this).data("resizable"),e=3Dd.options,f=3Dd.size;d.ghost=3Dd.orig=
inalElement.clone(),d.ghost.css({opacity:.25,display:"block",position:"rela=
tive",height:f.height,width:f.width,margin:0,left:0,top:0}).addClass("ui-re=
sizable-ghost").addClass(typeof e.ghost=3D=3D"string"?e.ghost:""),d.ghost.a=
ppendTo(d.helper)},resize:function(b,c){var d=3Da(this).data("resizable"),e=
=3Dd.options;d.ghost&&d.ghost.css({position:"relative",height:d.size.height=
,width:d.size.width})},stop:function(b,c){var d=3Da(this).data("resizable")=
,e=3Dd.options;d.ghost&&d.helper&&d.helper.get(0).removeChild(d.ghost.get(0=
))}}),a.ui.plugin.add("resizable","grid",{resize:function(b,c){var d=3Da(th=
is).data("resizable"),e=3Dd.options,f=3Dd.size,g=3Dd.originalSize,h=3Dd.ori=
ginalPosition,i=3Dd.axis,j=3De._aspectRatio||b.shiftKey;e.grid=3Dtypeof e.g=
rid=3D=3D"number"?[e.grid,e.grid]:e.grid;var k=3DMath.round((f.width-g.widt=
h)/(e.grid[0]||1))*(e.grid[0]||1),l=3DMath.round((f.height-g.height)/(e.gri=
d[1]||1))*(e.grid[1]||1);/^(se|s|e)$/.test(i)?(d.size.width=3Dg.width+k,d.s=
ize.height=3Dg.height+l):/^(ne)$/.test(i)?(d.size.width=3Dg.width+k,d.size.=
height=3Dg.height+l,d.position.top=3Dh.top-l):/^(sw)$/.test(i)?(d.size.widt=
h=3Dg.width+k,d.size.height=3Dg.height+l,d.position.left=3Dh.left-k):(d.siz=
e.width=3Dg.width+k,d.size.height=3Dg.height+l,d.position.top=3Dh.top-l,d.p=
osition.left=3Dh.left-k)}});var c=3Dfunction(a){return parseInt(a,10)||0},d=
=3Dfunction(a){return!isNaN(parseInt(a,10))}})(jQuery);;/*! jQuery UI - v1.=
8.22 - 2012-07-24
-* https://github.com/jquery/jquery-ui
-* Includes: jquery.ui.selectable.js
-* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){a.widget("ui.selectable",a.ui.mouse,{options:{appendTo:"bod=
y",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch"},_create:function=
(){var b=3Dthis;this.element.addClass("ui-selectable"),this.dragged=3D!1;va=
r c;this.refresh=3Dfunction(){c=3Da(b.options.filter,b.element[0]),c.addCla=
ss("ui-selectee"),c.each(function(){var b=3Da(this),c=3Db.offset();a.data(t=
his,"selectable-item",{element:this,$element:b,left:c.left,top:c.top,right:=
c.left+b.outerWidth(),bottom:c.top+b.outerHeight(),startselected:!1,selecte=
d:b.hasClass("ui-selected"),selecting:b.hasClass("ui-selecting"),unselectin=
g:b.hasClass("ui-unselecting")})})},this.refresh(),this.selectees=3Dc.addCl=
ass("ui-selectee"),this._mouseInit(),this.helper=3Da("<div class=3D'ui-sele=
ctable-helper'></div>")},destroy:function(){return this.selectees.removeCla=
ss("ui-selectee").removeData("selectable-item"),this.element.removeClass("u=
i-selectable ui-selectable-disabled").removeData("selectable").unbind(".sel=
ectable"),this._mouseDestroy(),this},_mouseStart:function(b){var c=3Dthis;t=
his.opos=3D[b.pageX,b.pageY];if(this.options.disabled)return;var d=3Dthis.o=
ptions;this.selectees=3Da(d.filter,this.element[0]),this._trigger("start",b=
),a(d.appendTo).append(this.helper),this.helper.css({left:b.clientX,top:b.c=
lientY,width:0,height:0}),d.autoRefresh&&this.refresh(),this.selectees.filt=
er(".ui-selected").each(function(){var d=3Da.data(this,"selectable-item");d=
.startselected=3D!0,!b.metaKey&&!b.ctrlKey&&(d.$element.removeClass("ui-sel=
ected"),d.selected=3D!1,d.$element.addClass("ui-unselecting"),d.unselecting=
=3D!0,c._trigger("unselecting",b,{unselecting:d.element}))}),a(b.target).pa=
rents().andSelf().each(function(){var d=3Da.data(this,"selectable-item");if=
(d){var e=3D!b.metaKey&&!b.ctrlKey||!d.$element.hasClass("ui-selected");ret=
urn d.$element.removeClass(e?"ui-unselecting":"ui-selected").addClass(e?"ui=
-selecting":"ui-unselecting"),d.unselecting=3D!e,d.selecting=3De,d.selected=
=3De,e?c._trigger("selecting",b,{selecting:d.element}):c._trigger("unselect=
ing",b,{unselecting:d.element}),!1}})},_mouseDrag:function(b){var c=3Dthis;=
this.dragged=3D!0;if(this.options.disabled)return;var d=3Dthis.options,e=3D=
this.opos[0],f=3Dthis.opos[1],g=3Db.pageX,h=3Db.pageY;if(e>g){var i=3Dg;g=
=3De,e=3Di}if(f>h){var i=3Dh;h=3Df,f=3Di}return this.helper.css({left:e,top=
:f,width:g-e,height:h-f}),this.selectees.each(function(){var i=3Da.data(thi=
s,"selectable-item");if(!i||i.element=3D=3Dc.element[0])return;var j=3D!1;d=
.tolerance=3D=3D"touch"?j=3D!(i.left>g||i.right<e||i.top>h||i.bottom<f):d.t=
olerance=3D=3D"fit"&&(j=3Di.left>e&&i.right<g&&i.top>f&&i.bottom<h),j?(i.se=
lected&&(i.$element.removeClass("ui-selected"),i.selected=3D!1),i.unselecti=
ng&&(i.$element.removeClass("ui-unselecting"),i.unselecting=3D!1),i.selecti=
ng||(i.$element.addClass("ui-selecting"),i.selecting=3D!0,c._trigger("selec=
ting",b,{selecting:i.element}))):(i.selecting&&((b.metaKey||b.ctrlKey)&&i.s=
tartselected?(i.$element.removeClass("ui-selecting"),i.selecting=3D!1,i.$el=
ement.addClass("ui-selected"),i.selected=3D!0):(i.$element.removeClass("ui-=
selecting"),i.selecting=3D!1,i.startselected&&(i.$element.addClass("ui-unse=
lecting"),i.unselecting=3D!0),c._trigger("unselecting",b,{unselecting:i.ele=
ment}))),i.selected&&!b.metaKey&&!b.ctrlKey&&!i.startselected&&(i.$element.=
removeClass("ui-selected"),i.selected=3D!1,i.$element.addClass("ui-unselect=
ing"),i.unselecting=3D!0,c._trigger("unselecting",b,{unselecting:i.element}=
)))}),!1},_mouseStop:function(b){var c=3Dthis;this.dragged=3D!1;var d=3Dthi=
s.options;return a(".ui-unselecting",this.element[0]).each(function(){var d=
=3Da.data(this,"selectable-item");d.$element.removeClass("ui-unselecting"),=
d.unselecting=3D!1,d.startselected=3D!1,c._trigger("unselected",b,{unselect=
ed:d.element})}),a(".ui-selecting",this.element[0]).each(function(){var d=
=3Da.data(this,"selectable-item");d.$element.removeClass("ui-selecting").ad=
dClass("ui-selected"),d.selecting=3D!1,d.selected=3D!0,d.startselected=3D!0=
,c._trigger("selected",b,{selected:d.element})}),this._trigger("stop",b),th=
is.helper.remove(),!1}}),a.extend(a.ui.selectable,{version:"1.8.22"})})(jQu=
ery);;/*! jQuery UI - v1.8.22 - 2012-07-24
+(function(a,b){a.ui=3Da.ui||{};var c=3D/left|center|right/,d=3D/top|center=
|bottom/,e=3D"center",f=3D{},g=3Da.fn.position,h=3Da.fn.offset;a.fn.positio=
n=3Dfunction(b){if(!b||!b.of)return g.apply(this,arguments);b=3Da.extend({}=
,b);var h=3Da(b.of),i=3Dh[0],j=3D(b.collision||"flip").split(" "),k=3Db.off=
set?b.offset.split(" "):[0,0],l,m,n;return i.nodeType=3D=3D=3D9?(l=3Dh.widt=
h(),m=3Dh.height(),n=3D{top:0,left:0}):i.setTimeout?(l=3Dh.width(),m=3Dh.he=
ight(),n=3D{top:h.scrollTop(),left:h.scrollLeft()}):i.preventDefault?(b.at=
=3D"left top",l=3Dm=3D0,n=3D{top:b.of.pageY,left:b.of.pageX}):(l=3Dh.outerW=
idth(),m=3Dh.outerHeight(),n=3Dh.offset()),a.each(["my","at"],function(){va=
r a=3D(b[this]||"").split(" ");a.length=3D=3D=3D1&&(a=3Dc.test(a[0])?a.conc=
at([e]):d.test(a[0])?[e].concat(a):[e,e]),a[0]=3Dc.test(a[0])?a[0]:e,a[1]=
=3Dd.test(a[1])?a[1]:e,b[this]=3Da}),j.length=3D=3D=3D1&&(j[1]=3Dj[0]),k[0]=
=3DparseInt(k[0],10)||0,k.length=3D=3D=3D1&&(k[1]=3Dk[0]),k[1]=3DparseInt(k=
[1],10)||0,b.at[0]=3D=3D=3D"right"?n.left+=3Dl:b.at[0]=3D=3D=3De&&(n.left+=
=3Dl/2),b.at[1]=3D=3D=3D"bottom"?n.top+=3Dm:b.at[1]=3D=3D=3De&&(n.top+=3Dm/=
2),n.left+=3Dk[0],n.top+=3Dk[1],this.each(function(){var c=3Da(this),d=3Dc.=
outerWidth(),g=3Dc.outerHeight(),h=3DparseInt(a.curCSS(this,"marginLeft",!0=
))||0,i=3DparseInt(a.curCSS(this,"marginTop",!0))||0,o=3Dd+h+(parseInt(a.cu=
rCSS(this,"marginRight",!0))||0),p=3Dg+i+(parseInt(a.curCSS(this,"marginBot=
tom",!0))||0),q=3Da.extend({},n),r;b.my[0]=3D=3D=3D"right"?q.left-=3Dd:b.my=
[0]=3D=3D=3De&&(q.left-=3Dd/2),b.my[1]=3D=3D=3D"bottom"?q.top-=3Dg:b.my[1]=
=3D=3D=3De&&(q.top-=3Dg/2),f.fractions||(q.left=3DMath.round(q.left),q.top=
=3DMath.round(q.top)),r=3D{left:q.left-h,top:q.top-i},a.each(["left","top"]=
,function(c,e){a.ui.position[j[c]]&&a.ui.position[j[c]][e](q,{targetWidth:l=
,targetHeight:m,elemWidth:d,elemHeight:g,collisionPosition:r,collisionWidth=
:o,collisionHeight:p,offset:k,my:b.my,at:b.at})}),a.fn.bgiframe&&c.bgiframe=
(),c.offset(a.extend(q,{using:b.using}))})},a.ui.position=3D{fit:{left:func=
tion(b,c){var d=3Da(window),e=3Dc.collisionPosition.left+c.collisionWidth-d=
.width()-d.scrollLeft();b.left=3De>0?b.left-e:Math.max(b.left-c.collisionPo=
sition.left,b.left)},top:function(b,c){var d=3Da(window),e=3Dc.collisionPos=
ition.top+c.collisionHeight-d.height()-d.scrollTop();b.top=3De>0?b.top-e:Ma=
th.max(b.top-c.collisionPosition.top,b.top)}},flip:{left:function(b,c){if(c=
.at[0]=3D=3D=3De)return;var d=3Da(window),f=3Dc.collisionPosition.left+c.co=
llisionWidth-d.width()-d.scrollLeft(),g=3Dc.my[0]=3D=3D=3D"left"?-c.elemWid=
th:c.my[0]=3D=3D=3D"right"?c.elemWidth:0,h=3Dc.at[0]=3D=3D=3D"left"?c.targe=
tWidth:-c.targetWidth,i=3D-2*c.offset[0];b.left+=3Dc.collisionPosition.left=
<0?g+h+i:f>0?g+h+i:0},top:function(b,c){if(c.at[1]=3D=3D=3De)return;var d=
=3Da(window),f=3Dc.collisionPosition.top+c.collisionHeight-d.height()-d.scr=
ollTop(),g=3Dc.my[1]=3D=3D=3D"top"?-c.elemHeight:c.my[1]=3D=3D=3D"bottom"?c=
.elemHeight:0,h=3Dc.at[1]=3D=3D=3D"top"?c.targetHeight:-c.targetHeight,i=3D=
-2*c.offset[1];b.top+=3Dc.collisionPosition.top<0?g+h+i:f>0?g+h+i:0}}},a.of=
fset.setOffset||(a.offset.setOffset=3Dfunction(b,c){/static/.test(a.curCSS(=
b,"position"))&&(b.style.position=3D"relative");var d=3Da(b),e=3Dd.offset()=
,f=3DparseInt(a.curCSS(b,"top",!0),10)||0,g=3DparseInt(a.curCSS(b,"left",!0=
),10)||0,h=3D{top:c.top-e.top+f,left:c.left-e.left+g};"using"in c?c.using.c=
all(b,h):d.css(h)},a.fn.offset=3Dfunction(b){var c=3Dthis[0];return!c||!c.o=
wnerDocument?null:b?a.isFunction(b)?this.each(function(c){a(this).offset(b.=
call(this,c,a(this).offset()))}):this.each(function(){a.offset.setOffset(th=
is,b)}):h.call(this)}),a.curCSS||(a.curCSS=3Da.css),function(){var b=3Ddocu=
ment.getElementsByTagName("body")[0],c=3Ddocument.createElement("div"),d,e,=
g,h,i;d=3Ddocument.createElement(b?"div":"body"),g=3D{visibility:"hidden",w=
idth:0,height:0,border:0,margin:0,background:"none"},b&&a.extend(g,{positio=
n:"absolute",left:"-1000px",top:"-1000px"});for(var j in g)d.style[j]=3Dg[j=
];d.appendChild(c),e=3Db||document.documentElement,e.insertBefore(d,e.first=
Child),c.style.cssText=3D"position: absolute; left: 10.7432222px; top: 10.4=
32325px; height: 30px; width: 201px;",h=3Da(c).offset(function(a,b){return =
b}).offset(),d.innerHTML=3D"",e.removeChild(d),i=3Dh.top+h.left+(b?2e3:0),f=
.fractions=3Di>21&&i<22}()})(jQuery);;/*! jQuery UI - v1.8.23 - 2012-08-15
 * https://github.com/jquery/jquery-ui
 * Includes: jquery.ui.sortable.js
 * Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){a.widget("ui.sortable",a.ui.mouse,{widgetEventPrefix:"sort"=
,ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,=
cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelpe=
rSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeho=
lder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"defa=
ult",tolerance:"intersect",zIndex:1e3},_create:function(){var a=3Dthis.opti=
ons;this.containerCache=3D{},this.element.addClass("ui-sortable"),this.refr=
esh(),this.floating=3Dthis.items.length?a.axis=3D=3D=3D"x"||/left|right/.te=
st(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0]=
.item.css("display")):!1,this.offset=3Dthis.element.offset(),this._mouseIni=
t(),this.ready=3D!0},destroy:function(){a.Widget.prototype.destroy.call(thi=
s),this.element.removeClass("ui-sortable ui-sortable-disabled"),this._mouse=
Destroy();for(var b=3Dthis.items.length-1;b>=3D0;b--)this.items[b].item.rem=
oveData(this.widgetName+"-item");return this},_setOption:function(b,c){b=3D=
=3D=3D"disabled"?(this.options[b]=3Dc,this.widget()[c?"addClass":"removeCla=
ss"]("ui-sortable-disabled")):a.Widget.prototype._setOption.apply(this,argu=
ments)},_mouseCapture:function(b,c){var d=3Dthis;if(this.reverting)return!1=
;if(this.options.disabled||this.options.type=3D=3D"static")return!1;this._r=
efreshItems(b);var e=3Dnull,f=3Dthis,g=3Da(b.target).parents().each(functio=
n(){if(a.data(this,d.widgetName+"-item")=3D=3Df)return e=3Da(this),!1});a.d=
ata(b.target,d.widgetName+"-item")=3D=3Df&&(e=3Da(b.target));if(!e)return!1=
;if(this.options.handle&&!c){var h=3D!1;a(this.options.handle,e).find("*").=
andSelf().each(function(){this=3D=3Db.target&&(h=3D!0)});if(!h)return!1}ret=
urn this.currentItem=3De,this._removeCurrentsFromItems(),!0},_mouseStart:fu=
nction(b,c,d){var e=3Dthis.options,f=3Dthis;this.currentContainer=3Dthis,th=
is.refreshPositions(),this.helper=3Dthis._createHelper(b),this._cacheHelper=
Proportions(),this._cacheMargins(),this.scrollParent=3Dthis.helper.scrollPa=
rent(),this.offset=3Dthis.currentItem.offset(),this.offset=3D{top:this.offs=
et.top-this.margins.top,left:this.offset.left-this.margins.left},a.extend(t=
his.offset,{click:{left:b.pageX-this.offset.left,top:b.pageY-this.offset.to=
p},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this=
.helper.css("position","absolute"),this.cssPosition=3Dthis.helper.css("posi=
tion"),this.originalPosition=3Dthis._generatePosition(b),this.originalPageX=
=3Db.pageX,this.originalPageY=3Db.pageY,e.cursorAt&&this._adjustOffsetFromH=
elper(e.cursorAt),this.domPosition=3D{prev:this.currentItem.prev()[0],paren=
t:this.currentItem.parent()[0]},this.helper[0]!=3Dthis.currentItem[0]&&this=
.currentItem.hide(),this._createPlaceholder(),e.containment&&this._setConta=
inment(),e.cursor&&(a("body").css("cursor")&&(this._storedCursor=3Da("body"=
).css("cursor")),a("body").css("cursor",e.cursor)),e.opacity&&(this.helper.=
css("opacity")&&(this._storedOpacity=3Dthis.helper.css("opacity")),this.hel=
per.css("opacity",e.opacity)),e.zIndex&&(this.helper.css("zIndex")&&(this._=
storedZIndex=3Dthis.helper.css("zIndex")),this.helper.css("zIndex",e.zIndex=
)),this.scrollParent[0]!=3Ddocument&&this.scrollParent[0].tagName!=3D"HTML"=
&&(this.overflowOffset=3Dthis.scrollParent.offset()),this._trigger("start",=
b,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProport=
ions();if(!d)for(var g=3Dthis.containers.length-1;g>=3D0;g--)this.container=
s[g]._trigger("activate",b,f._uiHash(this));return a.ui.ddmanager&&(a.ui.dd=
manager.current=3Dthis),a.ui.ddmanager&&!e.dropBehaviour&&a.ui.ddmanager.pr=
epareOffsets(this,b),this.dragging=3D!0,this.helper.addClass("ui-sortable-h=
elper"),this._mouseDrag(b),!0},_mouseDrag:function(b){this.position=3Dthis.=
_generatePosition(b),this.positionAbs=3Dthis._convertPositionTo("absolute")=
,this.lastPositionAbs||(this.lastPositionAbs=3Dthis.positionAbs);if(this.op=
tions.scroll){var c=3Dthis.options,d=3D!1;this.scrollParent[0]!=3Ddocument&=
&this.scrollParent[0].tagName!=3D"HTML"?(this.overflowOffset.top+this.scrol=
lParent[0].offsetHeight-b.pageY<c.scrollSensitivity?this.scrollParent[0].sc=
rollTop=3Dd=3Dthis.scrollParent[0].scrollTop+c.scrollSpeed:b.pageY-this.ove=
rflowOffset.top<c.scrollSensitivity&&(this.scrollParent[0].scrollTop=3Dd=3D=
this.scrollParent[0].scrollTop-c.scrollSpeed),this.overflowOffset.left+this=
.scrollParent[0].offsetWidth-b.pageX<c.scrollSensitivity?this.scrollParent[=
0].scrollLeft=3Dd=3Dthis.scrollParent[0].scrollLeft+c.scrollSpeed:b.pageX-t=
his.overflowOffset.left<c.scrollSensitivity&&(this.scrollParent[0].scrollLe=
ft=3Dd=3Dthis.scrollParent[0].scrollLeft-c.scrollSpeed)):(b.pageY-a(documen=
t).scrollTop()<c.scrollSensitivity?d=3Da(document).scrollTop(a(document).sc=
rollTop()-c.scrollSpeed):a(window).height()-(b.pageY-a(document).scrollTop(=
))<c.scrollSensitivity&&(d=3Da(document).scrollTop(a(document).scrollTop()+=
c.scrollSpeed)),b.pageX-a(document).scrollLeft()<c.scrollSensitivity?d=3Da(=
document).scrollLeft(a(document).scrollLeft()-c.scrollSpeed):a(window).widt=
h()-(b.pageX-a(document).scrollLeft())<c.scrollSensitivity&&(d=3Da(document=
).scrollLeft(a(document).scrollLeft()+c.scrollSpeed))),d!=3D=3D!1&&a.ui.ddm=
anager&&!c.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,b)}this.positi=
onAbs=3Dthis._convertPositionTo("absolute");if(!this.options.axis||this.opt=
ions.axis!=3D"y")this.helper[0].style.left=3Dthis.position.left+"px";if(!th=
is.options.axis||this.options.axis!=3D"x")this.helper[0].style.top=3Dthis.p=
osition.top+"px";for(var e=3Dthis.items.length-1;e>=3D0;e--){var f=3Dthis.i=
tems[e],g=3Df.item[0],h=3Dthis._intersectsWithPointer(f);if(!h)continue;if(=
g!=3Dthis.currentItem[0]&&this.placeholder[h=3D=3D1?"next":"prev"]()[0]!=3D=
g&&!a.ui.contains(this.placeholder[0],g)&&(this.options.type=3D=3D"semi-dyn=
amic"?!a.ui.contains(this.element[0],g):!0)){this.direction=3Dh=3D=3D1?"dow=
n":"up";if(this.options.tolerance=3D=3D"pointer"||this._intersectsWithSides=
(f))this._rearrange(b,f);else break;this._trigger("change",b,this._uiHash()=
);break}}return this._contactContainers(b),a.ui.ddmanager&&a.ui.ddmanager.d=
rag(this,b),this._trigger("sort",b,this._uiHash()),this.lastPositionAbs=3Dt=
his.positionAbs,!1},_mouseStop:function(b,c){if(!b)return;a.ui.ddmanager&&!=
this.options.dropBehaviour&&a.ui.ddmanager.drop(this,b);if(this.options.rev=
ert){var d=3Dthis,e=3Dd.placeholder.offset();d.reverting=3D!0,a(this.helper=
).animate({left:e.left-this.offset.parent.left-d.margins.left+(this.offsetP=
arent[0]=3D=3Ddocument.body?0:this.offsetParent[0].scrollLeft),top:e.top-th=
is.offset.parent.top-d.margins.top+(this.offsetParent[0]=3D=3Ddocument.body=
?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,f=
unction(){d._clear(b)})}else this._clear(b,c);return!1},cancel:function(){v=
ar b=3Dthis;if(this.dragging){this._mouseUp({target:null}),this.options.hel=
per=3D=3D"original"?this.currentItem.css(this._storedCSS).removeClass("ui-s=
ortable-helper"):this.currentItem.show();for(var c=3Dthis.containers.length=
-1;c>=3D0;c--)this.containers[c]._trigger("deactivate",null,b._uiHash(this)=
),this.containers[c].containerCache.over&&(this.containers[c]._trigger("out=
",null,b._uiHash(this)),this.containers[c].containerCache.over=3D0)}return =
this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].pare=
ntNode.removeChild(this.placeholder[0]),this.options.helper!=3D"original"&&=
this.helper&&this.helper[0].parentNode&&this.helper.remove(),a.extend(this,=
{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.=
prev?a(this.domPosition.prev).after(this.currentItem):a(this.domPosition.pa=
rent).prepend(this.currentItem)),this},serialize:function(b){var c=3Dthis._=
getItemsAsjQuery(b&&b.connected),d=3D[];return b=3Db||{},a(c).each(function=
(){var c=3D(a(b.item||this).attr(b.attribute||"id")||"").match(b.expression=
||/(.+)[-=3D_](.+)/);c&&d.push((b.key||c[1]+"[]")+"=3D"+(b.key&&b.expressio=
n?c[1]:c[2]))}),!d.length&&b.key&&d.push(b.key+"=3D"),d.join("&")},toArray:=
function(b){var c=3Dthis._getItemsAsjQuery(b&&b.connected),d=3D[];return b=
=3Db||{},c.each(function(){d.push(a(b.item||this).attr(b.attribute||"id")||=
"")}),d},_intersectsWith:function(a){var b=3Dthis.positionAbs.left,c=3Db+th=
is.helperProportions.width,d=3Dthis.positionAbs.top,e=3Dd+this.helperPropor=
tions.height,f=3Da.left,g=3Df+a.width,h=3Da.top,i=3Dh+a.height,j=3Dthis.off=
set.click.top,k=3Dthis.offset.click.left,l=3Dd+j>h&&d+j<i&&b+k>f&&b+k<g;ret=
urn this.options.tolerance=3D=3D"pointer"||this.options.forcePointerForCont=
ainers||this.options.tolerance!=3D"pointer"&&this.helperProportions[this.fl=
oating?"width":"height"]>a[this.floating?"width":"height"]?l:f<b+this.helpe=
rProportions.width/2&&c-this.helperProportions.width/2<g&&h<d+this.helperPr=
oportions.height/2&&e-this.helperProportions.height/2<i},_intersectsWithPoi=
nter:function(b){var c=3Dthis.options.axis=3D=3D=3D"x"||a.ui.isOverAxis(thi=
s.positionAbs.top+this.offset.click.top,b.top,b.height),d=3Dthis.options.ax=
is=3D=3D=3D"y"||a.ui.isOverAxis(this.positionAbs.left+this.offset.click.lef=
t,b.left,b.width),e=3Dc&&d,f=3Dthis._getDragVerticalDirection(),g=3Dthis._g=
etDragHorizontalDirection();return e?this.floating?g&&g=3D=3D"right"||f=3D=
=3D"down"?2:1:f&&(f=3D=3D"down"?2:1):!1},_intersectsWithSides:function(b){v=
ar c=3Da.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,b.top+b.h=
eight/2,b.height),d=3Da.ui.isOverAxis(this.positionAbs.left+this.offset.cli=
ck.left,b.left+b.width/2,b.width),e=3Dthis._getDragVerticalDirection(),f=3D=
this._getDragHorizontalDirection();return this.floating&&f?f=3D=3D"right"&&=
d||f=3D=3D"left"&&!d:e&&(e=3D=3D"down"&&c||e=3D=3D"up"&&!c)},_getDragVertic=
alDirection:function(){var a=3Dthis.positionAbs.top-this.lastPositionAbs.to=
p;return a!=3D0&&(a>0?"down":"up")},_getDragHorizontalDirection:function(){=
var a=3Dthis.positionAbs.left-this.lastPositionAbs.left;return a!=3D0&&(a>0=
?"right":"left")},refresh:function(a){return this._refreshItems(a),this.ref=
reshPositions(),this},_connectWith:function(){var a=3Dthis.options;return a=
.connectWith.constructor=3D=3DString?[a.connectWith]:a.connectWith},_getIte=
msAsjQuery:function(b){var c=3Dthis,d=3D[],e=3D[],f=3Dthis._connectWith();i=
f(f&&b)for(var g=3Df.length-1;g>=3D0;g--){var h=3Da(f[g]);for(var i=3Dh.len=
gth-1;i>=3D0;i--){var j=3Da.data(h[i],this.widgetName);j&&j!=3Dthis&&!j.opt=
ions.disabled&&e.push([a.isFunction(j.options.items)?j.options.items.call(j=
.element):a(j.options.items,j.element).not(".ui-sortable-helper").not(".ui-=
sortable-placeholder"),j])}}e.push([a.isFunction(this.options.items)?this.o=
ptions.items.call(this.element,null,{options:this.options,item:this.current=
Item}):a(this.options.items,this.element).not(".ui-sortable-helper").not(".=
ui-sortable-placeholder"),this]);for(var g=3De.length-1;g>=3D0;g--)e[g][0].=
each(function(){d.push(this)});return a(d)},_removeCurrentsFromItems:functi=
on(){var a=3Dthis.currentItem.find(":data("+this.widgetName+"-item)");for(v=
ar b=3D0;b<this.items.length;b++)for(var c=3D0;c<a.length;c++)a[c]=3D=3Dthi=
s.items[b].item[0]&&this.items.splice(b,1)},_refreshItems:function(b){this.=
items=3D[],this.containers=3D[this];var c=3Dthis.items,d=3Dthis,e=3D[[a.isF=
unction(this.options.items)?this.options.items.call(this.element[0],b,{item=
:this.currentItem}):a(this.options.items,this.element),this]],f=3Dthis._con=
nectWith();if(f&&this.ready)for(var g=3Df.length-1;g>=3D0;g--){var h=3Da(f[=
g]);for(var i=3Dh.length-1;i>=3D0;i--){var j=3Da.data(h[i],this.widgetName)=
;j&&j!=3Dthis&&!j.options.disabled&&(e.push([a.isFunction(j.options.items)?=
j.options.items.call(j.element[0],b,{item:this.currentItem}):a(j.options.it=
ems,j.element),j]),this.containers.push(j))}}for(var g=3De.length-1;g>=3D0;=
g--){var k=3De[g][1],l=3De[g][0];for(var i=3D0,m=3Dl.length;i<m;i++){var n=
=3Da(l[i]);n.data(this.widgetName+"-item",k),c.push({item:n,instance:k,widt=
h:0,height:0,left:0,top:0})}}},refreshPositions:function(b){this.offsetPare=
nt&&this.helper&&(this.offset.parent=3Dthis._getParentOffset());for(var c=
=3Dthis.items.length-1;c>=3D0;c--){var d=3Dthis.items[c];if(d.instance!=3Dt=
his.currentContainer&&this.currentContainer&&d.item[0]!=3Dthis.currentItem[=
0])continue;var e=3Dthis.options.toleranceElement?a(this.options.toleranceE=
lement,d.item):d.item;b||(d.width=3De.outerWidth(),d.height=3De.outerHeight=
());var f=3De.offset();d.left=3Df.left,d.top=3Df.top}if(this.options.custom=
&&this.options.custom.refreshContainers)this.options.custom.refreshContaine=
rs.call(this);else for(var c=3Dthis.containers.length-1;c>=3D0;c--){var f=
=3Dthis.containers[c].element.offset();this.containers[c].containerCache.le=
ft=3Df.left,this.containers[c].containerCache.top=3Df.top,this.containers[c=
].containerCache.width=3Dthis.containers[c].element.outerWidth(),this.conta=
iners[c].containerCache.height=3Dthis.containers[c].element.outerHeight()}r=
eturn this},_createPlaceholder:function(b){var c=3Db||this,d=3Dc.options;if=
(!d.placeholder||d.placeholder.constructor=3D=3DString){var e=3Dd.placehold=
er;d.placeholder=3D{element:function(){var b=3Da(document.createElement(c.c=
urrentItem[0].nodeName)).addClass(e||c.currentItem[0].className+" ui-sortab=
le-placeholder").removeClass("ui-sortable-helper")[0];return e||(b.style.vi=
sibility=3D"hidden"),b},update:function(a,b){if(e&&!d.forcePlaceholderSize)=
return;b.height()||b.height(c.currentItem.innerHeight()-parseInt(c.currentI=
tem.css("paddingTop")||0,10)-parseInt(c.currentItem.css("paddingBottom")||0=
,10)),b.width()||b.width(c.currentItem.innerWidth()-parseInt(c.currentItem.=
css("paddingLeft")||0,10)-parseInt(c.currentItem.css("paddingRight")||0,10)=
)}}}c.placeholder=3Da(d.placeholder.element.call(c.element,c.currentItem)),=
c.currentItem.after(c.placeholder),d.placeholder.update(c,c.placeholder)},_=
contactContainers:function(b){var c=3Dnull,d=3Dnull;for(var e=3Dthis.contai=
ners.length-1;e>=3D0;e--){if(a.ui.contains(this.currentItem[0],this.contain=
ers[e].element[0]))continue;if(this._intersectsWith(this.containers[e].cont=
ainerCache)){if(c&&a.ui.contains(this.containers[e].element[0],c.element[0]=
))continue;c=3Dthis.containers[e],d=3De}else this.containers[e].containerCa=
che.over&&(this.containers[e]._trigger("out",b,this._uiHash(this)),this.con=
tainers[e].containerCache.over=3D0)}if(!c)return;if(this.containers.length=
=3D=3D=3D1)this.containers[d]._trigger("over",b,this._uiHash(this)),this.co=
ntainers[d].containerCache.over=3D1;else if(this.currentContainer!=3Dthis.c=
ontainers[d]){var f=3D1e4,g=3Dnull,h=3Dthis.positionAbs[this.containers[d].=
floating?"left":"top"];for(var i=3Dthis.items.length-1;i>=3D0;i--){if(!a.ui=
.contains(this.containers[d].element[0],this.items[i].item[0]))continue;var=
 j=3Dthis.containers[d].floating?this.items[i].item.offset().left:this.item=
s[i].item.offset().top;Math.abs(j-h)<f&&(f=3DMath.abs(j-h),g=3Dthis.items[i=
],this.direction=3Dj-h>0?"down":"up")}if(!g&&!this.options.dropOnEmpty)retu=
rn;this.currentContainer=3Dthis.containers[d],g?this._rearrange(b,g,null,!0=
):this._rearrange(b,null,this.containers[d].element,!0),this._trigger("chan=
ge",b,this._uiHash()),this.containers[d]._trigger("change",b,this._uiHash(t=
his)),this.options.placeholder.update(this.currentContainer,this.placeholde=
r),this.containers[d]._trigger("over",b,this._uiHash(this)),this.containers=
[d].containerCache.over=3D1}},_createHelper:function(b){var c=3Dthis.option=
s,d=3Da.isFunction(c.helper)?a(c.helper.apply(this.element[0],[b,this.curre=
ntItem])):c.helper=3D=3D"clone"?this.currentItem.clone():this.currentItem;r=
eturn d.parents("body").length||a(c.appendTo!=3D"parent"?c.appendTo:this.cu=
rrentItem[0].parentNode)[0].appendChild(d[0]),d[0]=3D=3Dthis.currentItem[0]=
&&(this._storedCSS=3D{width:this.currentItem[0].style.width,height:this.cur=
rentItem[0].style.height,position:this.currentItem.css("position"),top:this=
.currentItem.css("top"),left:this.currentItem.css("left")}),(d[0].style.wid=
th=3D=3D""||c.forceHelperSize)&&d.width(this.currentItem.width()),(d[0].sty=
le.height=3D=3D""||c.forceHelperSize)&&d.height(this.currentItem.height()),=
d},_adjustOffsetFromHelper:function(b){typeof b=3D=3D"string"&&(b=3Db.split=
(" ")),a.isArray(b)&&(b=3D{left:+b[0],top:+b[1]||0}),"left"in b&&(this.offs=
et.click.left=3Db.left+this.margins.left),"right"in b&&(this.offset.click.l=
eft=3Dthis.helperProportions.width-b.right+this.margins.left),"top"in b&&(t=
his.offset.click.top=3Db.top+this.margins.top),"bottom"in b&&(this.offset.c=
lick.top=3Dthis.helperProportions.height-b.bottom+this.margins.top)},_getPa=
rentOffset:function(){this.offsetParent=3Dthis.helper.offsetParent();var b=
=3Dthis.offsetParent.offset();this.cssPosition=3D=3D"absolute"&&this.scroll=
Parent[0]!=3Ddocument&&a.ui.contains(this.scrollParent[0],this.offsetParent=
[0])&&(b.left+=3Dthis.scrollParent.scrollLeft(),b.top+=3Dthis.scrollParent.=
scrollTop());if(this.offsetParent[0]=3D=3Ddocument.body||this.offsetParent[=
0].tagName&&this.offsetParent[0].tagName.toLowerCase()=3D=3D"html"&&a.brows=
er.msie)b=3D{top:0,left:0};return{top:b.top+(parseInt(this.offsetParent.css=
("borderTopWidth"),10)||0),left:b.left+(parseInt(this.offsetParent.css("bor=
derLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=
=3D=3D"relative"){var a=3Dthis.currentItem.position();return{top:a.top-(par=
seInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.l=
eft-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft(=
)}}return{top:0,left:0}},_cacheMargins:function(){this.margins=3D{left:pars=
eInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentIte=
m.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperP=
roportions=3D{width:this.helper.outerWidth(),height:this.helper.outerHeight=
()}},_setContainment:function(){var b=3Dthis.options;b.containment=3D=3D"pa=
rent"&&(b.containment=3Dthis.helper[0].parentNode);if(b.containment=3D=3D"d=
ocument"||b.containment=3D=3D"window")this.containment=3D[0-this.offset.rel=
ative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.p=
arent.top,a(b.containment=3D=3D"document"?document:window).width()-this.hel=
perProportions.width-this.margins.left,(a(b.containment=3D=3D"document"?doc=
ument:window).height()||document.body.parentNode.scrollHeight)-this.helperP=
roportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(b=
.containment)){var c=3Da(b.containment)[0],d=3Da(b.containment).offset(),e=
=3Da(c).css("overflow")!=3D"hidden";this.containment=3D[d.left+(parseInt(a(=
c).css("borderLeftWidth"),10)||0)+(parseInt(a(c).css("paddingLeft"),10)||0)=
-this.margins.left,d.top+(parseInt(a(c).css("borderTopWidth"),10)||0)+(pars=
eInt(a(c).css("paddingTop"),10)||0)-this.margins.top,d.left+(e?Math.max(c.s=
crollWidth,c.offsetWidth):c.offsetWidth)-(parseInt(a(c).css("borderLeftWidt=
h"),10)||0)-(parseInt(a(c).css("paddingRight"),10)||0)-this.helperProportio=
ns.width-this.margins.left,d.top+(e?Math.max(c.scrollHeight,c.offsetHeight)=
:c.offsetHeight)-(parseInt(a(c).css("borderTopWidth"),10)||0)-(parseInt(a(c=
).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.t=
op]}},_convertPositionTo:function(b,c){c||(c=3Dthis.position);var d=3Db=3D=
=3D"absolute"?1:-1,e=3Dthis.options,f=3Dthis.cssPosition=3D=3D"absolute"&&(=
this.scrollParent[0]=3D=3Ddocument||!a.ui.contains(this.scrollParent[0],thi=
s.offsetParent[0]))?this.offsetParent:this.scrollParent,g=3D/(html|body)/i.=
test(f[0].tagName);return{top:c.top+this.offset.relative.top*d+this.offset.=
parent.top*d-(a.browser.safari&&this.cssPosition=3D=3D"fixed"?0:(this.cssPo=
sition=3D=3D"fixed"?-this.scrollParent.scrollTop():g?0:f.scrollTop())*d),le=
ft:c.left+this.offset.relative.left*d+this.offset.parent.left*d-(a.browser.=
safari&&this.cssPosition=3D=3D"fixed"?0:(this.cssPosition=3D=3D"fixed"?-thi=
s.scrollParent.scrollLeft():g?0:f.scrollLeft())*d)}},_generatePosition:func=
tion(b){var c=3Dthis.options,d=3Dthis.cssPosition=3D=3D"absolute"&&(this.sc=
rollParent[0]=3D=3Ddocument||!a.ui.contains(this.scrollParent[0],this.offse=
tParent[0]))?this.offsetParent:this.scrollParent,e=3D/(html|body)/i.test(d[=
0].tagName);this.cssPosition=3D=3D"relative"&&(this.scrollParent[0]=3D=3Ddo=
cument||this.scrollParent[0]=3D=3Dthis.offsetParent[0])&&(this.offset.relat=
ive=3Dthis._getRelativeOffset());var f=3Db.pageX,g=3Db.pageY;if(this.origin=
alPosition){this.containment&&(b.pageX-this.offset.click.left<this.containm=
ent[0]&&(f=3Dthis.containment[0]+this.offset.click.left),b.pageY-this.offse=
t.click.top<this.containment[1]&&(g=3Dthis.containment[1]+this.offset.click=
.top),b.pageX-this.offset.click.left>this.containment[2]&&(f=3Dthis.contain=
ment[2]+this.offset.click.left),b.pageY-this.offset.click.top>this.containm=
ent[3]&&(g=3Dthis.containment[3]+this.offset.click.top));if(c.grid){var h=
=3Dthis.originalPageY+Math.round((g-this.originalPageY)/c.grid[1])*c.grid[1=
];g=3Dthis.containment?h-this.offset.click.top<this.containment[1]||h-this.=
offset.click.top>this.containment[3]?h-this.offset.click.top<this.containme=
nt[1]?h+c.grid[1]:h-c.grid[1]:h:h;var i=3Dthis.originalPageX+Math.round((f-=
this.originalPageX)/c.grid[0])*c.grid[0];f=3Dthis.containment?i-this.offset=
.click.left<this.containment[0]||i-this.offset.click.left>this.containment[=
2]?i-this.offset.click.left<this.containment[0]?i+c.grid[0]:i-c.grid[0]:i:i=
}}return{top:g-this.offset.click.top-this.offset.relative.top-this.offset.p=
arent.top+(a.browser.safari&&this.cssPosition=3D=3D"fixed"?0:this.cssPositi=
on=3D=3D"fixed"?-this.scrollParent.scrollTop():e?0:d.scrollTop()),left:f-th=
is.offset.click.left-this.offset.relative.left-this.offset.parent.left+(a.b=
rowser.safari&&this.cssPosition=3D=3D"fixed"?0:this.cssPosition=3D=3D"fixed=
"?-this.scrollParent.scrollLeft():e?0:d.scrollLeft())}},_rearrange:function=
(a,b,c,d){c?c[0].appendChild(this.placeholder[0]):b.item[0].parentNode.inse=
rtBefore(this.placeholder[0],this.direction=3D=3D"down"?b.item[0]:b.item[0]=
.nextSibling),this.counter=3Dthis.counter?++this.counter:1;var e=3Dthis,f=
=3Dthis.counter;window.setTimeout(function(){f=3D=3De.counter&&e.refreshPos=
itions(!d)},0)},_clear:function(b,c){this.reverting=3D!1;var d=3D[],e=3Dthi=
s;!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.be=
fore(this.currentItem),this._noFinalSort=3Dnull;if(this.helper[0]=3D=3Dthis=
.currentItem[0]){for(var f in this._storedCSS)if(this._storedCSS[f]=3D=3D"a=
uto"||this._storedCSS[f]=3D=3D"static")this._storedCSS[f]=3D"";this.current=
Item.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.curre=
ntItem.show();this.fromOutside&&!c&&d.push(function(a){this._trigger("recei=
ve",a,this._uiHash(this.fromOutside))}),(this.fromOutside||this.domPosition=
.prev!=3Dthis.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPos=
ition.parent!=3Dthis.currentItem.parent()[0])&&!c&&d.push(function(a){this.=
_trigger("update",a,this._uiHash())});if(!a.ui.contains(this.element[0],thi=
s.currentItem[0])){c||d.push(function(a){this._trigger("remove",a,this._uiH=
ash())});for(var f=3Dthis.containers.length-1;f>=3D0;f--)a.ui.contains(this=
.containers[f].element[0],this.currentItem[0])&&!c&&(d.push(function(a){ret=
urn function(b){a._trigger("receive",b,this._uiHash(this))}}.call(this,this=
.containers[f])),d.push(function(a){return function(b){a._trigger("update",=
b,this._uiHash(this))}}.call(this,this.containers[f])))}for(var f=3Dthis.co=
ntainers.length-1;f>=3D0;f--)c||d.push(function(a){return function(b){a._tr=
igger("deactivate",b,this._uiHash(this))}}.call(this,this.containers[f])),t=
his.containers[f].containerCache.over&&(d.push(function(a){return function(=
b){a._trigger("out",b,this._uiHash(this))}}.call(this,this.containers[f])),=
this.containers[f].containerCache.over=3D0);this._storedCursor&&a("body").c=
ss("cursor",this._storedCursor),this._storedOpacity&&this.helper.css("opaci=
ty",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex",this.=
_storedZIndex=3D=3D"auto"?"":this._storedZIndex),this.dragging=3D!1;if(this=
.cancelHelperRemoval){if(!c){this._trigger("beforeStop",b,this._uiHash());f=
or(var f=3D0;f<d.length;f++)d[f].call(this,b);this._trigger("stop",b,this._=
uiHash())}return this.fromOutside=3D!1,!1}c||this._trigger("beforeStop",b,t=
his._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[=
0]),this.helper[0]!=3Dthis.currentItem[0]&&this.helper.remove(),this.helper=
=3Dnull;if(!c){for(var f=3D0;f<d.length;f++)d[f].call(this,b);this._trigger=
("stop",b,this._uiHash())}return this.fromOutside=3D!1,!0},_trigger:functio=
n(){a.Widget.prototype._trigger.apply(this,arguments)=3D=3D=3D!1&&this.canc=
el()},_uiHash:function(b){var c=3Db||this;return{helper:c.helper,placeholde=
r:c.placeholder||a([]),position:c.position,originalPosition:c.originalPosit=
ion,offset:c.positionAbs,item:c.currentItem,sender:b?b.element:null}}}),a.e=
xtend(a.ui.sortable,{version:"1.8.22"})})(jQuery);;/*! jQuery UI - v1.8.22 =
- 2012-07-24
-* https://github.com/jquery/jquery-ui
-* Includes: jquery.ui.accordion.js
-* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){a.widget("ui.accordion",{options:{active:0,animated:"slide"=
,autoHeight:!0,clearStyle:!1,collapsible:!1,event:"click",fillSpace:!1,head=
er:"> li > :first-child,> :not(li):even",icons:{header:"ui-icon-triangle-1-=
e",headerSelected:"ui-icon-triangle-1-s"},navigation:!1,navigationFilter:fu=
nction(){return this.href.toLowerCase()=3D=3D=3Dlocation.href.toLowerCase()=
}},_create:function(){var b=3Dthis,c=3Db.options;b.running=3D0,b.element.ad=
dClass("ui-accordion ui-widget ui-helper-reset").children("li").addClass("u=
i-accordion-li-fix"),b.headers=3Db.element.find(c.header).addClass("ui-acco=
rdion-header ui-helper-reset ui-state-default ui-corner-all").bind("mouseen=
ter.accordion",function(){if(c.disabled)return;a(this).addClass("ui-state-h=
over")}).bind("mouseleave.accordion",function(){if(c.disabled)return;a(this=
).removeClass("ui-state-hover")}).bind("focus.accordion",function(){if(c.di=
sabled)return;a(this).addClass("ui-state-focus")}).bind("blur.accordion",fu=
nction(){if(c.disabled)return;a(this).removeClass("ui-state-focus")}),b.hea=
ders.next().addClass("ui-accordion-content ui-helper-reset ui-widget-conten=
t ui-corner-bottom");if(c.navigation){var d=3Db.element.find("a").filter(c.=
navigationFilter).eq(0);if(d.length){var e=3Dd.closest(".ui-accordion-heade=
r");e.length?b.active=3De:b.active=3Dd.closest(".ui-accordion-content").pre=
v()}}b.active=3Db._findActive(b.active||c.active).addClass("ui-state-defaul=
t ui-state-active").toggleClass("ui-corner-all").toggleClass("ui-corner-top=
"),b.active.next().addClass("ui-accordion-content-active"),b._createIcons()=
,b.resize(),b.element.attr("role","tablist"),b.headers.attr("role","tab").b=
ind("keydown.accordion",function(a){return b._keydown(a)}).next().attr("rol=
e","tabpanel"),b.headers.not(b.active||"").attr({"aria-expanded":"false","a=
ria-selected":"false",tabIndex:-1}).next().hide(),b.active.length?b.active.=
attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}):b.headers.=
eq(0).attr("tabIndex",0),a.browser.safari||b.headers.find("a").attr("tabInd=
ex",-1),c.event&&b.headers.bind(c.event.split(" ").join(".accordion ")+".ac=
cordion",function(a){b._clickHandler.call(b,a,this),a.preventDefault()})},_=
createIcons:function(){var b=3Dthis.options;b.icons&&(a("<span></span>").ad=
dClass("ui-icon "+b.icons.header).prependTo(this.headers),this.active.child=
ren(".ui-icon").toggleClass(b.icons.header).toggleClass(b.icons.headerSelec=
ted),this.element.addClass("ui-accordion-icons"))},_destroyIcons:function()=
{this.headers.children(".ui-icon").remove(),this.element.removeClass("ui-ac=
cordion-icons")},destroy:function(){var b=3Dthis.options;this.element.remov=
eClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role"),this.he=
aders.unbind(".accordion").removeClass("ui-accordion-header ui-accordion-di=
sabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-st=
ate-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded")=
.removeAttr("aria-selected").removeAttr("tabIndex"),this.headers.find("a").=
removeAttr("tabIndex"),this._destroyIcons();var c=3Dthis.headers.next().css=
("display","").removeAttr("role").removeClass("ui-helper-reset ui-widget-co=
ntent ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-=
accordion-disabled ui-state-disabled");return(b.autoHeight||b.fillHeight)&&=
c.css("height",""),a.Widget.prototype.destroy.call(this)},_setOption:functi=
on(b,c){a.Widget.prototype._setOption.apply(this,arguments),b=3D=3D"active"=
&&this.activate(c),b=3D=3D"icons"&&(this._destroyIcons(),c&&this._createIco=
ns()),b=3D=3D"disabled"&&this.headers.add(this.headers.next())[c?"addClass"=
:"removeClass"]("ui-accordion-disabled ui-state-disabled")},_keydown:functi=
on(b){if(this.options.disabled||b.altKey||b.ctrlKey)return;var c=3Da.ui.key=
Code,d=3Dthis.headers.length,e=3Dthis.headers.index(b.target),f=3D!1;switch=
(b.keyCode){case c.RIGHT:case c.DOWN:f=3Dthis.headers[(e+1)%d];break;case c=
.LEFT:case c.UP:f=3Dthis.headers[(e-1+d)%d];break;case c.SPACE:case c.ENTER=
:this._clickHandler({target:b.target},b.target),b.preventDefault()}return f=
?(a(b.target).attr("tabIndex",-1),a(f).attr("tabIndex",0),f.focus(),!1):!0}=
,resize:function(){var b=3Dthis.options,c;if(b.fillSpace){if(a.browser.msie=
){var d=3Dthis.element.parent().css("overflow");this.element.parent().css("=
overflow","hidden")}c=3Dthis.element.parent().height(),a.browser.msie&&this=
.element.parent().css("overflow",d),this.headers.each(function(){c-=3Da(thi=
s).outerHeight(!0)}),this.headers.next().each(function(){a(this).height(Mat=
h.max(0,c-a(this).innerHeight()+a(this).height()))}).css("overflow","auto")=
}else b.autoHeight&&(c=3D0,this.headers.next().each(function(){c=3DMath.max=
(c,a(this).height("").height())}).height(c));return this},activate:function=
(a){this.options.active=3Da;var b=3Dthis._findActive(a)[0];return this._cli=
ckHandler({target:b},b),this},_findActive:function(b){return b?typeof b=3D=
=3D"number"?this.headers.filter(":eq("+b+")"):this.headers.not(this.headers=
.not(b)):b=3D=3D=3D!1?a([]):this.headers.filter(":eq(0)")},_clickHandler:fu=
nction(b,c){var d=3Dthis.options;if(d.disabled)return;if(!b.target){if(!d.c=
ollapsible)return;this.active.removeClass("ui-state-active ui-corner-top").=
addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass=
(d.icons.headerSelected).addClass(d.icons.header),this.active.next().addCla=
ss("ui-accordion-content-active");var e=3Dthis.active.next(),f=3D{options:d=
,newHeader:a([]),oldHeader:d.active,newContent:a([]),oldContent:e},g=3Dthis=
.active=3Da([]);this._toggle(g,e,f);return}var h=3Da(b.currentTarget||c),i=
=3Dh[0]=3D=3D=3Dthis.active[0];d.active=3Dd.collapsible&&i?!1:this.headers.=
index(h);if(this.running||!d.collapsible&&i)return;var j=3Dthis.active,g=3D=
h.next(),e=3Dthis.active.next(),f=3D{options:d,newHeader:i&&d.collapsible?a=
([]):h,oldHeader:this.active,newContent:i&&d.collapsible?a([]):g,oldContent=
:e},k=3Dthis.headers.index(this.active[0])>this.headers.index(h[0]);this.ac=
tive=3Di?a([]):h,this._toggle(g,e,f,i,k),j.removeClass("ui-state-active ui-=
corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon"=
).removeClass(d.icons.headerSelected).addClass(d.icons.header),i||(h.remove=
Class("ui-state-default ui-corner-all").addClass("ui-state-active ui-corner=
-top").children(".ui-icon").removeClass(d.icons.header).addClass(d.icons.he=
aderSelected),h.next().addClass("ui-accordion-content-active"));return},_to=
ggle:function(b,c,d,e,f){var g=3Dthis,h=3Dg.options;g.toShow=3Db,g.toHide=
=3Dc,g.data=3Dd;var i=3Dfunction(){if(!g)return;return g._completed.apply(g=
,arguments)};g._trigger("changestart",null,g.data),g.running=3Dc.size()=3D=
=3D=3D0?b.size():c.size();if(h.animated){var j=3D{};h.collapsible&&e?j=3D{t=
oShow:a([]),toHide:c,complete:i,down:f,autoHeight:h.autoHeight||h.fillSpace=
}:j=3D{toShow:b,toHide:c,complete:i,down:f,autoHeight:h.autoHeight||h.fillS=
pace},h.proxied||(h.proxied=3Dh.animated),h.proxiedDuration||(h.proxiedDura=
tion=3Dh.duration),h.animated=3Da.isFunction(h.proxied)?h.proxied(j):h.prox=
ied,h.duration=3Da.isFunction(h.proxiedDuration)?h.proxiedDuration(j):h.pro=
xiedDuration;var k=3Da.ui.accordion.animations,l=3Dh.duration,m=3Dh.animate=
d;m&&!k[m]&&!a.easing[m]&&(m=3D"slide"),k[m]||(k[m]=3Dfunction(a){this.slid=
e(a,{easing:m,duration:l||700})}),k[m](j)}else h.collapsible&&e?b.toggle():=
(c.hide(),b.show()),i(!0);c.prev().attr({"aria-expanded":"false","aria-sele=
cted":"false",tabIndex:-1}).blur(),b.prev().attr({"aria-expanded":"true","a=
ria-selected":"true",tabIndex:0}).focus()},_completed:function(a){this.runn=
ing=3Da?0:--this.running;if(this.running)return;this.options.clearStyle&&th=
is.toShow.add(this.toHide).css({height:"",overflow:""}),this.toHide.removeC=
lass("ui-accordion-content-active"),this.toHide.length&&(this.toHide.parent=
()[0].className=3Dthis.toHide.parent()[0].className),this._trigger("change"=
,null,this.data)}}),a.extend(a.ui.accordion,{version:"1.8.22",animations:{s=
lide:function(b,c){b=3Da.extend({easing:"swing",duration:300},b,c);if(!b.to=
Hide.size()){b.toShow.animate({height:"show",paddingTop:"show",paddingBotto=
m:"show"},b);return}if(!b.toShow.size()){b.toHide.animate({height:"hide",pa=
ddingTop:"hide",paddingBottom:"hide"},b);return}var d=3Db.toShow.css("overf=
low"),e=3D0,f=3D{},g=3D{},h=3D["height","paddingTop","paddingBottom"],i,j=
=3Db.toShow;i=3Dj[0].style.width,j.width(j.parent().width()-parseFloat(j.cs=
s("paddingLeft"))-parseFloat(j.css("paddingRight"))-(parseFloat(j.css("bord=
erLeftWidth"))||0)-(parseFloat(j.css("borderRightWidth"))||0)),a.each(h,fun=
ction(c,d){g[d]=3D"hide";var e=3D(""+a.css(b.toShow[0],d)).match(/^([\d+-.]=
+)(.*)$/);f[d]=3D{value:e[1],unit:e[2]||"px"}}),b.toShow.css({height:0,over=
flow:"hidden"}).show(),b.toHide.filter(":hidden").each(b.complete).end().fi=
lter(":visible").animate(g,{step:function(a,c){c.prop=3D=3D"height"&&(e=3Dc=
.end-c.start=3D=3D=3D0?0:(c.now-c.start)/(c.end-c.start)),b.toShow[0].style=
[c.prop]=3De*f[c.prop].value+f[c.prop].unit},duration:b.duration,easing:b.e=
asing,complete:function(){b.autoHeight||b.toShow.css("height",""),b.toShow.=
css({width:i,overflow:d}),b.complete()}})},bounceslide:function(a){this.sli=
de(a,{easing:a.down?"easeOutBounce":"swing",duration:a.down?1e3:200})}}})})=
(jQuery);;/*! jQuery UI - v1.8.22 - 2012-07-24
+(function(a,b){a.widget("ui.sortable",a.ui.mouse,{widgetEventPrefix:"sort"=
,ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,=
cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelpe=
rSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeho=
lder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"defa=
ult",tolerance:"intersect",zIndex:1e3},_create:function(){var a=3Dthis.opti=
ons;this.containerCache=3D{},this.element.addClass("ui-sortable"),this.refr=
esh(),this.floating=3Dthis.items.length?a.axis=3D=3D=3D"x"||/left|right/.te=
st(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0]=
.item.css("display")):!1,this.offset=3Dthis.element.offset(),this._mouseIni=
t(),this.ready=3D!0},destroy:function(){a.Widget.prototype.destroy.call(thi=
s),this.element.removeClass("ui-sortable ui-sortable-disabled"),this._mouse=
Destroy();for(var b=3Dthis.items.length-1;b>=3D0;b--)this.items[b].item.rem=
oveData(this.widgetName+"-item");return this},_setOption:function(b,c){b=3D=
=3D=3D"disabled"?(this.options[b]=3Dc,this.widget()[c?"addClass":"removeCla=
ss"]("ui-sortable-disabled")):a.Widget.prototype._setOption.apply(this,argu=
ments)},_mouseCapture:function(b,c){var d=3Dthis;if(this.reverting)return!1=
;if(this.options.disabled||this.options.type=3D=3D"static")return!1;this._r=
efreshItems(b);var e=3Dnull,f=3Dthis,g=3Da(b.target).parents().each(functio=
n(){if(a.data(this,d.widgetName+"-item")=3D=3Df)return e=3Da(this),!1});a.d=
ata(b.target,d.widgetName+"-item")=3D=3Df&&(e=3Da(b.target));if(!e)return!1=
;if(this.options.handle&&!c){var h=3D!1;a(this.options.handle,e).find("*").=
andSelf().each(function(){this=3D=3Db.target&&(h=3D!0)});if(!h)return!1}ret=
urn this.currentItem=3De,this._removeCurrentsFromItems(),!0},_mouseStart:fu=
nction(b,c,d){var e=3Dthis.options,f=3Dthis;this.currentContainer=3Dthis,th=
is.refreshPositions(),this.helper=3Dthis._createHelper(b),this._cacheHelper=
Proportions(),this._cacheMargins(),this.scrollParent=3Dthis.helper.scrollPa=
rent(),this.offset=3Dthis.currentItem.offset(),this.offset=3D{top:this.offs=
et.top-this.margins.top,left:this.offset.left-this.margins.left},a.extend(t=
his.offset,{click:{left:b.pageX-this.offset.left,top:b.pageY-this.offset.to=
p},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this=
.helper.css("position","absolute"),this.cssPosition=3Dthis.helper.css("posi=
tion"),this.originalPosition=3Dthis._generatePosition(b),this.originalPageX=
=3Db.pageX,this.originalPageY=3Db.pageY,e.cursorAt&&this._adjustOffsetFromH=
elper(e.cursorAt),this.domPosition=3D{prev:this.currentItem.prev()[0],paren=
t:this.currentItem.parent()[0]},this.helper[0]!=3Dthis.currentItem[0]&&this=
.currentItem.hide(),this._createPlaceholder(),e.containment&&this._setConta=
inment(),e.cursor&&(a("body").css("cursor")&&(this._storedCursor=3Da("body"=
).css("cursor")),a("body").css("cursor",e.cursor)),e.opacity&&(this.helper.=
css("opacity")&&(this._storedOpacity=3Dthis.helper.css("opacity")),this.hel=
per.css("opacity",e.opacity)),e.zIndex&&(this.helper.css("zIndex")&&(this._=
storedZIndex=3Dthis.helper.css("zIndex")),this.helper.css("zIndex",e.zIndex=
)),this.scrollParent[0]!=3Ddocument&&this.scrollParent[0].tagName!=3D"HTML"=
&&(this.overflowOffset=3Dthis.scrollParent.offset()),this._trigger("start",=
b,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProport=
ions();if(!d)for(var g=3Dthis.containers.length-1;g>=3D0;g--)this.container=
s[g]._trigger("activate",b,f._uiHash(this));return a.ui.ddmanager&&(a.ui.dd=
manager.current=3Dthis),a.ui.ddmanager&&!e.dropBehaviour&&a.ui.ddmanager.pr=
epareOffsets(this,b),this.dragging=3D!0,this.helper.addClass("ui-sortable-h=
elper"),this._mouseDrag(b),!0},_mouseDrag:function(b){this.position=3Dthis.=
_generatePosition(b),this.positionAbs=3Dthis._convertPositionTo("absolute")=
,this.lastPositionAbs||(this.lastPositionAbs=3Dthis.positionAbs);if(this.op=
tions.scroll){var c=3Dthis.options,d=3D!1;this.scrollParent[0]!=3Ddocument&=
&this.scrollParent[0].tagName!=3D"HTML"?(this.overflowOffset.top+this.scrol=
lParent[0].offsetHeight-b.pageY<c.scrollSensitivity?this.scrollParent[0].sc=
rollTop=3Dd=3Dthis.scrollParent[0].scrollTop+c.scrollSpeed:b.pageY-this.ove=
rflowOffset.top<c.scrollSensitivity&&(this.scrollParent[0].scrollTop=3Dd=3D=
this.scrollParent[0].scrollTop-c.scrollSpeed),this.overflowOffset.left+this=
.scrollParent[0].offsetWidth-b.pageX<c.scrollSensitivity?this.scrollParent[=
0].scrollLeft=3Dd=3Dthis.scrollParent[0].scrollLeft+c.scrollSpeed:b.pageX-t=
his.overflowOffset.left<c.scrollSensitivity&&(this.scrollParent[0].scrollLe=
ft=3Dd=3Dthis.scrollParent[0].scrollLeft-c.scrollSpeed)):(b.pageY-a(documen=
t).scrollTop()<c.scrollSensitivity?d=3Da(document).scrollTop(a(document).sc=
rollTop()-c.scrollSpeed):a(window).height()-(b.pageY-a(document).scrollTop(=
))<c.scrollSensitivity&&(d=3Da(document).scrollTop(a(document).scrollTop()+=
c.scrollSpeed)),b.pageX-a(document).scrollLeft()<c.scrollSensitivity?d=3Da(=
document).scrollLeft(a(document).scrollLeft()-c.scrollSpeed):a(window).widt=
h()-(b.pageX-a(document).scrollLeft())<c.scrollSensitivity&&(d=3Da(document=
).scrollLeft(a(document).scrollLeft()+c.scrollSpeed))),d!=3D=3D!1&&a.ui.ddm=
anager&&!c.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,b)}this.positi=
onAbs=3Dthis._convertPositionTo("absolute");if(!this.options.axis||this.opt=
ions.axis!=3D"y")this.helper[0].style.left=3Dthis.position.left+"px";if(!th=
is.options.axis||this.options.axis!=3D"x")this.helper[0].style.top=3Dthis.p=
osition.top+"px";for(var e=3Dthis.items.length-1;e>=3D0;e--){var f=3Dthis.i=
tems[e],g=3Df.item[0],h=3Dthis._intersectsWithPointer(f);if(!h)continue;if(=
g!=3Dthis.currentItem[0]&&this.placeholder[h=3D=3D1?"next":"prev"]()[0]!=3D=
g&&!a.ui.contains(this.placeholder[0],g)&&(this.options.type=3D=3D"semi-dyn=
amic"?!a.ui.contains(this.element[0],g):!0)){this.direction=3Dh=3D=3D1?"dow=
n":"up";if(this.options.tolerance=3D=3D"pointer"||this._intersectsWithSides=
(f))this._rearrange(b,f);else break;this._trigger("change",b,this._uiHash()=
);break}}return this._contactContainers(b),a.ui.ddmanager&&a.ui.ddmanager.d=
rag(this,b),this._trigger("sort",b,this._uiHash()),this.lastPositionAbs=3Dt=
his.positionAbs,!1},_mouseStop:function(b,c){if(!b)return;a.ui.ddmanager&&!=
this.options.dropBehaviour&&a.ui.ddmanager.drop(this,b);if(this.options.rev=
ert){var d=3Dthis,e=3Dd.placeholder.offset();d.reverting=3D!0,a(this.helper=
).animate({left:e.left-this.offset.parent.left-d.margins.left+(this.offsetP=
arent[0]=3D=3Ddocument.body?0:this.offsetParent[0].scrollLeft),top:e.top-th=
is.offset.parent.top-d.margins.top+(this.offsetParent[0]=3D=3Ddocument.body=
?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,f=
unction(){d._clear(b)})}else this._clear(b,c);return!1},cancel:function(){v=
ar b=3Dthis;if(this.dragging){this._mouseUp({target:null}),this.options.hel=
per=3D=3D"original"?this.currentItem.css(this._storedCSS).removeClass("ui-s=
ortable-helper"):this.currentItem.show();for(var c=3Dthis.containers.length=
-1;c>=3D0;c--)this.containers[c]._trigger("deactivate",null,b._uiHash(this)=
),this.containers[c].containerCache.over&&(this.containers[c]._trigger("out=
",null,b._uiHash(this)),this.containers[c].containerCache.over=3D0)}return =
this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].pare=
ntNode.removeChild(this.placeholder[0]),this.options.helper!=3D"original"&&=
this.helper&&this.helper[0].parentNode&&this.helper.remove(),a.extend(this,=
{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.=
prev?a(this.domPosition.prev).after(this.currentItem):a(this.domPosition.pa=
rent).prepend(this.currentItem)),this},serialize:function(b){var c=3Dthis._=
getItemsAsjQuery(b&&b.connected),d=3D[];return b=3Db||{},a(c).each(function=
(){var c=3D(a(b.item||this).attr(b.attribute||"id")||"").match(b.expression=
||/(.+)[-=3D_](.+)/);c&&d.push((b.key||c[1]+"[]")+"=3D"+(b.key&&b.expressio=
n?c[1]:c[2]))}),!d.length&&b.key&&d.push(b.key+"=3D"),d.join("&")},toArray:=
function(b){var c=3Dthis._getItemsAsjQuery(b&&b.connected),d=3D[];return b=
=3Db||{},c.each(function(){d.push(a(b.item||this).attr(b.attribute||"id")||=
"")}),d},_intersectsWith:function(a){var b=3Dthis.positionAbs.left,c=3Db+th=
is.helperProportions.width,d=3Dthis.positionAbs.top,e=3Dd+this.helperPropor=
tions.height,f=3Da.left,g=3Df+a.width,h=3Da.top,i=3Dh+a.height,j=3Dthis.off=
set.click.top,k=3Dthis.offset.click.left,l=3Dd+j>h&&d+j<i&&b+k>f&&b+k<g;ret=
urn this.options.tolerance=3D=3D"pointer"||this.options.forcePointerForCont=
ainers||this.options.tolerance!=3D"pointer"&&this.helperProportions[this.fl=
oating?"width":"height"]>a[this.floating?"width":"height"]?l:f<b+this.helpe=
rProportions.width/2&&c-this.helperProportions.width/2<g&&h<d+this.helperPr=
oportions.height/2&&e-this.helperProportions.height/2<i},_intersectsWithPoi=
nter:function(b){var c=3Dthis.options.axis=3D=3D=3D"x"||a.ui.isOverAxis(thi=
s.positionAbs.top+this.offset.click.top,b.top,b.height),d=3Dthis.options.ax=
is=3D=3D=3D"y"||a.ui.isOverAxis(this.positionAbs.left+this.offset.click.lef=
t,b.left,b.width),e=3Dc&&d,f=3Dthis._getDragVerticalDirection(),g=3Dthis._g=
etDragHorizontalDirection();return e?this.floating?g&&g=3D=3D"right"||f=3D=
=3D"down"?2:1:f&&(f=3D=3D"down"?2:1):!1},_intersectsWithSides:function(b){v=
ar c=3Da.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,b.top+b.h=
eight/2,b.height),d=3Da.ui.isOverAxis(this.positionAbs.left+this.offset.cli=
ck.left,b.left+b.width/2,b.width),e=3Dthis._getDragVerticalDirection(),f=3D=
this._getDragHorizontalDirection();return this.floating&&f?f=3D=3D"right"&&=
d||f=3D=3D"left"&&!d:e&&(e=3D=3D"down"&&c||e=3D=3D"up"&&!c)},_getDragVertic=
alDirection:function(){var a=3Dthis.positionAbs.top-this.lastPositionAbs.to=
p;return a!=3D0&&(a>0?"down":"up")},_getDragHorizontalDirection:function(){=
var a=3Dthis.positionAbs.left-this.lastPositionAbs.left;return a!=3D0&&(a>0=
?"right":"left")},refresh:function(a){return this._refreshItems(a),this.ref=
reshPositions(),this},_connectWith:function(){var a=3Dthis.options;return a=
.connectWith.constructor=3D=3DString?[a.connectWith]:a.connectWith},_getIte=
msAsjQuery:function(b){var c=3Dthis,d=3D[],e=3D[],f=3Dthis._connectWith();i=
f(f&&b)for(var g=3Df.length-1;g>=3D0;g--){var h=3Da(f[g]);for(var i=3Dh.len=
gth-1;i>=3D0;i--){var j=3Da.data(h[i],this.widgetName);j&&j!=3Dthis&&!j.opt=
ions.disabled&&e.push([a.isFunction(j.options.items)?j.options.items.call(j=
.element):a(j.options.items,j.element).not(".ui-sortable-helper").not(".ui-=
sortable-placeholder"),j])}}e.push([a.isFunction(this.options.items)?this.o=
ptions.items.call(this.element,null,{options:this.options,item:this.current=
Item}):a(this.options.items,this.element).not(".ui-sortable-helper").not(".=
ui-sortable-placeholder"),this]);for(var g=3De.length-1;g>=3D0;g--)e[g][0].=
each(function(){d.push(this)});return a(d)},_removeCurrentsFromItems:functi=
on(){var a=3Dthis.currentItem.find(":data("+this.widgetName+"-item)");for(v=
ar b=3D0;b<this.items.length;b++)for(var c=3D0;c<a.length;c++)a[c]=3D=3Dthi=
s.items[b].item[0]&&this.items.splice(b,1)},_refreshItems:function(b){this.=
items=3D[],this.containers=3D[this];var c=3Dthis.items,d=3Dthis,e=3D[[a.isF=
unction(this.options.items)?this.options.items.call(this.element[0],b,{item=
:this.currentItem}):a(this.options.items,this.element),this]],f=3Dthis._con=
nectWith();if(f&&this.ready)for(var g=3Df.length-1;g>=3D0;g--){var h=3Da(f[=
g]);for(var i=3Dh.length-1;i>=3D0;i--){var j=3Da.data(h[i],this.widgetName)=
;j&&j!=3Dthis&&!j.options.disabled&&(e.push([a.isFunction(j.options.items)?=
j.options.items.call(j.element[0],b,{item:this.currentItem}):a(j.options.it=
ems,j.element),j]),this.containers.push(j))}}for(var g=3De.length-1;g>=3D0;=
g--){var k=3De[g][1],l=3De[g][0];for(var i=3D0,m=3Dl.length;i<m;i++){var n=
=3Da(l[i]);n.data(this.widgetName+"-item",k),c.push({item:n,instance:k,widt=
h:0,height:0,left:0,top:0})}}},refreshPositions:function(b){this.offsetPare=
nt&&this.helper&&(this.offset.parent=3Dthis._getParentOffset());for(var c=
=3Dthis.items.length-1;c>=3D0;c--){var d=3Dthis.items[c];if(d.instance!=3Dt=
his.currentContainer&&this.currentContainer&&d.item[0]!=3Dthis.currentItem[=
0])continue;var e=3Dthis.options.toleranceElement?a(this.options.toleranceE=
lement,d.item):d.item;b||(d.width=3De.outerWidth(),d.height=3De.outerHeight=
());var f=3De.offset();d.left=3Df.left,d.top=3Df.top}if(this.options.custom=
&&this.options.custom.refreshContainers)this.options.custom.refreshContaine=
rs.call(this);else for(var c=3Dthis.containers.length-1;c>=3D0;c--){var f=
=3Dthis.containers[c].element.offset();this.containers[c].containerCache.le=
ft=3Df.left,this.containers[c].containerCache.top=3Df.top,this.containers[c=
].containerCache.width=3Dthis.containers[c].element.outerWidth(),this.conta=
iners[c].containerCache.height=3Dthis.containers[c].element.outerHeight()}r=
eturn this},_createPlaceholder:function(b){var c=3Db||this,d=3Dc.options;if=
(!d.placeholder||d.placeholder.constructor=3D=3DString){var e=3Dd.placehold=
er;d.placeholder=3D{element:function(){var b=3Da(document.createElement(c.c=
urrentItem[0].nodeName)).addClass(e||c.currentItem[0].className+" ui-sortab=
le-placeholder").removeClass("ui-sortable-helper")[0];return e||(b.style.vi=
sibility=3D"hidden"),b},update:function(a,b){if(e&&!d.forcePlaceholderSize)=
return;b.height()||b.height(c.currentItem.innerHeight()-parseInt(c.currentI=
tem.css("paddingTop")||0,10)-parseInt(c.currentItem.css("paddingBottom")||0=
,10)),b.width()||b.width(c.currentItem.innerWidth()-parseInt(c.currentItem.=
css("paddingLeft")||0,10)-parseInt(c.currentItem.css("paddingRight")||0,10)=
)}}}c.placeholder=3Da(d.placeholder.element.call(c.element,c.currentItem)),=
c.currentItem.after(c.placeholder),d.placeholder.update(c,c.placeholder)},_=
contactContainers:function(b){var c=3Dnull,d=3Dnull;for(var e=3Dthis.contai=
ners.length-1;e>=3D0;e--){if(a.ui.contains(this.currentItem[0],this.contain=
ers[e].element[0]))continue;if(this._intersectsWith(this.containers[e].cont=
ainerCache)){if(c&&a.ui.contains(this.containers[e].element[0],c.element[0]=
))continue;c=3Dthis.containers[e],d=3De}else this.containers[e].containerCa=
che.over&&(this.containers[e]._trigger("out",b,this._uiHash(this)),this.con=
tainers[e].containerCache.over=3D0)}if(!c)return;if(this.containers.length=
=3D=3D=3D1)this.containers[d]._trigger("over",b,this._uiHash(this)),this.co=
ntainers[d].containerCache.over=3D1;else if(this.currentContainer!=3Dthis.c=
ontainers[d]){var f=3D1e4,g=3Dnull,h=3Dthis.positionAbs[this.containers[d].=
floating?"left":"top"];for(var i=3Dthis.items.length-1;i>=3D0;i--){if(!a.ui=
.contains(this.containers[d].element[0],this.items[i].item[0]))continue;var=
 j=3Dthis.containers[d].floating?this.items[i].item.offset().left:this.item=
s[i].item.offset().top;Math.abs(j-h)<f&&(f=3DMath.abs(j-h),g=3Dthis.items[i=
],this.direction=3Dj-h>0?"down":"up")}if(!g&&!this.options.dropOnEmpty)retu=
rn;this.currentContainer=3Dthis.containers[d],g?this._rearrange(b,g,null,!0=
):this._rearrange(b,null,this.containers[d].element,!0),this._trigger("chan=
ge",b,this._uiHash()),this.containers[d]._trigger("change",b,this._uiHash(t=
his)),this.options.placeholder.update(this.currentContainer,this.placeholde=
r),this.containers[d]._trigger("over",b,this._uiHash(this)),this.containers=
[d].containerCache.over=3D1}},_createHelper:function(b){var c=3Dthis.option=
s,d=3Da.isFunction(c.helper)?a(c.helper.apply(this.element[0],[b,this.curre=
ntItem])):c.helper=3D=3D"clone"?this.currentItem.clone():this.currentItem;r=
eturn d.parents("body").length||a(c.appendTo!=3D"parent"?c.appendTo:this.cu=
rrentItem[0].parentNode)[0].appendChild(d[0]),d[0]=3D=3Dthis.currentItem[0]=
&&(this._storedCSS=3D{width:this.currentItem[0].style.width,height:this.cur=
rentItem[0].style.height,position:this.currentItem.css("position"),top:this=
.currentItem.css("top"),left:this.currentItem.css("left")}),(d[0].style.wid=
th=3D=3D""||c.forceHelperSize)&&d.width(this.currentItem.width()),(d[0].sty=
le.height=3D=3D""||c.forceHelperSize)&&d.height(this.currentItem.height()),=
d},_adjustOffsetFromHelper:function(b){typeof b=3D=3D"string"&&(b=3Db.split=
(" ")),a.isArray(b)&&(b=3D{left:+b[0],top:+b[1]||0}),"left"in b&&(this.offs=
et.click.left=3Db.left+this.margins.left),"right"in b&&(this.offset.click.l=
eft=3Dthis.helperProportions.width-b.right+this.margins.left),"top"in b&&(t=
his.offset.click.top=3Db.top+this.margins.top),"bottom"in b&&(this.offset.c=
lick.top=3Dthis.helperProportions.height-b.bottom+this.margins.top)},_getPa=
rentOffset:function(){this.offsetParent=3Dthis.helper.offsetParent();var b=
=3Dthis.offsetParent.offset();this.cssPosition=3D=3D"absolute"&&this.scroll=
Parent[0]!=3Ddocument&&a.ui.contains(this.scrollParent[0],this.offsetParent=
[0])&&(b.left+=3Dthis.scrollParent.scrollLeft(),b.top+=3Dthis.scrollParent.=
scrollTop());if(this.offsetParent[0]=3D=3Ddocument.body||this.offsetParent[=
0].tagName&&this.offsetParent[0].tagName.toLowerCase()=3D=3D"html"&&a.brows=
er.msie)b=3D{top:0,left:0};return{top:b.top+(parseInt(this.offsetParent.css=
("borderTopWidth"),10)||0),left:b.left+(parseInt(this.offsetParent.css("bor=
derLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=
=3D=3D"relative"){var a=3Dthis.currentItem.position();return{top:a.top-(par=
seInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.l=
eft-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft(=
)}}return{top:0,left:0}},_cacheMargins:function(){this.margins=3D{left:pars=
eInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentIte=
m.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperP=
roportions=3D{width:this.helper.outerWidth(),height:this.helper.outerHeight=
()}},_setContainment:function(){var b=3Dthis.options;b.containment=3D=3D"pa=
rent"&&(b.containment=3Dthis.helper[0].parentNode);if(b.containment=3D=3D"d=
ocument"||b.containment=3D=3D"window")this.containment=3D[0-this.offset.rel=
ative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.p=
arent.top,a(b.containment=3D=3D"document"?document:window).width()-this.hel=
perProportions.width-this.margins.left,(a(b.containment=3D=3D"document"?doc=
ument:window).height()||document.body.parentNode.scrollHeight)-this.helperP=
roportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(b=
.containment)){var c=3Da(b.containment)[0],d=3Da(b.containment).offset(),e=
=3Da(c).css("overflow")!=3D"hidden";this.containment=3D[d.left+(parseInt(a(=
c).css("borderLeftWidth"),10)||0)+(parseInt(a(c).css("paddingLeft"),10)||0)=
-this.margins.left,d.top+(parseInt(a(c).css("borderTopWidth"),10)||0)+(pars=
eInt(a(c).css("paddingTop"),10)||0)-this.margins.top,d.left+(e?Math.max(c.s=
crollWidth,c.offsetWidth):c.offsetWidth)-(parseInt(a(c).css("borderLeftWidt=
h"),10)||0)-(parseInt(a(c).css("paddingRight"),10)||0)-this.helperProportio=
ns.width-this.margins.left,d.top+(e?Math.max(c.scrollHeight,c.offsetHeight)=
:c.offsetHeight)-(parseInt(a(c).css("borderTopWidth"),10)||0)-(parseInt(a(c=
).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.t=
op]}},_convertPositionTo:function(b,c){c||(c=3Dthis.position);var d=3Db=3D=
=3D"absolute"?1:-1,e=3Dthis.options,f=3Dthis.cssPosition=3D=3D"absolute"&&(=
this.scrollParent[0]=3D=3Ddocument||!a.ui.contains(this.scrollParent[0],thi=
s.offsetParent[0]))?this.offsetParent:this.scrollParent,g=3D/(html|body)/i.=
test(f[0].tagName);return{top:c.top+this.offset.relative.top*d+this.offset.=
parent.top*d-(a.browser.safari&&this.cssPosition=3D=3D"fixed"?0:(this.cssPo=
sition=3D=3D"fixed"?-this.scrollParent.scrollTop():g?0:f.scrollTop())*d),le=
ft:c.left+this.offset.relative.left*d+this.offset.parent.left*d-(a.browser.=
safari&&this.cssPosition=3D=3D"fixed"?0:(this.cssPosition=3D=3D"fixed"?-thi=
s.scrollParent.scrollLeft():g?0:f.scrollLeft())*d)}},_generatePosition:func=
tion(b){var c=3Dthis.options,d=3Dthis.cssPosition=3D=3D"absolute"&&(this.sc=
rollParent[0]=3D=3Ddocument||!a.ui.contains(this.scrollParent[0],this.offse=
tParent[0]))?this.offsetParent:this.scrollParent,e=3D/(html|body)/i.test(d[=
0].tagName);this.cssPosition=3D=3D"relative"&&(this.scrollParent[0]=3D=3Ddo=
cument||this.scrollParent[0]=3D=3Dthis.offsetParent[0])&&(this.offset.relat=
ive=3Dthis._getRelativeOffset());var f=3Db.pageX,g=3Db.pageY;if(this.origin=
alPosition){this.containment&&(b.pageX-this.offset.click.left<this.containm=
ent[0]&&(f=3Dthis.containment[0]+this.offset.click.left),b.pageY-this.offse=
t.click.top<this.containment[1]&&(g=3Dthis.containment[1]+this.offset.click=
.top),b.pageX-this.offset.click.left>this.containment[2]&&(f=3Dthis.contain=
ment[2]+this.offset.click.left),b.pageY-this.offset.click.top>this.containm=
ent[3]&&(g=3Dthis.containment[3]+this.offset.click.top));if(c.grid){var h=
=3Dthis.originalPageY+Math.round((g-this.originalPageY)/c.grid[1])*c.grid[1=
];g=3Dthis.containment?h-this.offset.click.top<this.containment[1]||h-this.=
offset.click.top>this.containment[3]?h-this.offset.click.top<this.containme=
nt[1]?h+c.grid[1]:h-c.grid[1]:h:h;var i=3Dthis.originalPageX+Math.round((f-=
this.originalPageX)/c.grid[0])*c.grid[0];f=3Dthis.containment?i-this.offset=
.click.left<this.containment[0]||i-this.offset.click.left>this.containment[=
2]?i-this.offset.click.left<this.containment[0]?i+c.grid[0]:i-c.grid[0]:i:i=
}}return{top:g-this.offset.click.top-this.offset.relative.top-this.offset.p=
arent.top+(a.browser.safari&&this.cssPosition=3D=3D"fixed"?0:this.cssPositi=
on=3D=3D"fixed"?-this.scrollParent.scrollTop():e?0:d.scrollTop()),left:f-th=
is.offset.click.left-this.offset.relative.left-this.offset.parent.left+(a.b=
rowser.safari&&this.cssPosition=3D=3D"fixed"?0:this.cssPosition=3D=3D"fixed=
"?-this.scrollParent.scrollLeft():e?0:d.scrollLeft())}},_rearrange:function=
(a,b,c,d){c?c[0].appendChild(this.placeholder[0]):b.item[0].parentNode.inse=
rtBefore(this.placeholder[0],this.direction=3D=3D"down"?b.item[0]:b.item[0]=
.nextSibling),this.counter=3Dthis.counter?++this.counter:1;var e=3Dthis,f=
=3Dthis.counter;window.setTimeout(function(){f=3D=3De.counter&&e.refreshPos=
itions(!d)},0)},_clear:function(b,c){this.reverting=3D!1;var d=3D[],e=3Dthi=
s;!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.be=
fore(this.currentItem),this._noFinalSort=3Dnull;if(this.helper[0]=3D=3Dthis=
.currentItem[0]){for(var f in this._storedCSS)if(this._storedCSS[f]=3D=3D"a=
uto"||this._storedCSS[f]=3D=3D"static")this._storedCSS[f]=3D"";this.current=
Item.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.curre=
ntItem.show();this.fromOutside&&!c&&d.push(function(a){this._trigger("recei=
ve",a,this._uiHash(this.fromOutside))}),(this.fromOutside||this.domPosition=
.prev!=3Dthis.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPos=
ition.parent!=3Dthis.currentItem.parent()[0])&&!c&&d.push(function(a){this.=
_trigger("update",a,this._uiHash())});if(!a.ui.contains(this.element[0],thi=
s.currentItem[0])){c||d.push(function(a){this._trigger("remove",a,this._uiH=
ash())});for(var f=3Dthis.containers.length-1;f>=3D0;f--)a.ui.contains(this=
.containers[f].element[0],this.currentItem[0])&&!c&&(d.push(function(a){ret=
urn function(b){a._trigger("receive",b,this._uiHash(this))}}.call(this,this=
.containers[f])),d.push(function(a){return function(b){a._trigger("update",=
b,this._uiHash(this))}}.call(this,this.containers[f])))}for(var f=3Dthis.co=
ntainers.length-1;f>=3D0;f--)c||d.push(function(a){return function(b){a._tr=
igger("deactivate",b,this._uiHash(this))}}.call(this,this.containers[f])),t=
his.containers[f].containerCache.over&&(d.push(function(a){return function(=
b){a._trigger("out",b,this._uiHash(this))}}.call(this,this.containers[f])),=
this.containers[f].containerCache.over=3D0);this._storedCursor&&a("body").c=
ss("cursor",this._storedCursor),this._storedOpacity&&this.helper.css("opaci=
ty",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex",this.=
_storedZIndex=3D=3D"auto"?"":this._storedZIndex),this.dragging=3D!1;if(this=
.cancelHelperRemoval){if(!c){this._trigger("beforeStop",b,this._uiHash());f=
or(var f=3D0;f<d.length;f++)d[f].call(this,b);this._trigger("stop",b,this._=
uiHash())}return this.fromOutside=3D!1,!1}c||this._trigger("beforeStop",b,t=
his._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[=
0]),this.helper[0]!=3Dthis.currentItem[0]&&this.helper.remove(),this.helper=
=3Dnull;if(!c){for(var f=3D0;f<d.length;f++)d[f].call(this,b);this._trigger=
("stop",b,this._uiHash())}return this.fromOutside=3D!1,!0},_trigger:functio=
n(){a.Widget.prototype._trigger.apply(this,arguments)=3D=3D=3D!1&&this.canc=
el()},_uiHash:function(b){var c=3Db||this;return{helper:c.helper,placeholde=
r:c.placeholder||a([]),position:c.position,originalPosition:c.originalPosit=
ion,offset:c.positionAbs,item:c.currentItem,sender:b?b.element:null}}}),a.e=
xtend(a.ui.sortable,{version:"1.8.23"})})(jQuery);;/*! jQuery UI - v1.8.23 =
- 2012-08-15
 * https://github.com/jquery/jquery-ui
 * Includes: jquery.ui.autocomplete.js
 * Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){var c=3D0;a.widget("ui.autocomplete",{options:{appendTo:"bo=
dy",autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bot=
tom",collision:"none"},source:null},pending:0,_create:function(){var b=3Dth=
is,c=3Dthis.element[0].ownerDocument,d;this.isMultiLine=3Dthis.element.is("=
textarea"),this.element.addClass("ui-autocomplete-input").attr("autocomplet=
e","off").attr({role:"textbox","aria-autocomplete":"list","aria-haspopup":"=
true"}).bind("keydown.autocomplete",function(c){if(b.options.disabled||b.el=
ement.propAttr("readOnly"))return;d=3D!1;var e=3Da.ui.keyCode;switch(c.keyC=
ode){case e.PAGE_UP:b._move("previousPage",c);break;case e.PAGE_DOWN:b._mov=
e("nextPage",c);break;case e.UP:b._keyEvent("previous",c);break;case e.DOWN=
:b._keyEvent("next",c);break;case e.ENTER:case e.NUMPAD_ENTER:b.menu.active=
&&(d=3D!0,c.preventDefault());case e.TAB:if(!b.menu.active)return;b.menu.se=
lect(c);break;case e.ESCAPE:b.element.val(b.term),b.close(c);break;default:=
clearTimeout(b.searching),b.searching=3DsetTimeout(function(){b.term!=3Db.e=
lement.val()&&(b.selectedItem=3Dnull,b.search(null,c))},b.options.delay)}})=
.bind("keypress.autocomplete",function(a){d&&(d=3D!1,a.preventDefault())}).=
bind("focus.autocomplete",function(){if(b.options.disabled)return;b.selecte=
dItem=3Dnull,b.previous=3Db.element.val()}).bind("blur.autocomplete",functi=
on(a){if(b.options.disabled)return;clearTimeout(b.searching),b.closing=3Dse=
tTimeout(function(){b.close(a),b._change(a)},150)}),this._initSource(),this=
.menu=3Da("<ul></ul>").addClass("ui-autocomplete").appendTo(a(this.options.=
appendTo||"body",c)[0]).mousedown(function(c){var d=3Db.menu.element[0];a(c=
.target).closest(".ui-menu-item").length||setTimeout(function(){a(document)=
.one("mousedown",function(c){c.target!=3D=3Db.element[0]&&c.target!=3D=3Dd&=
&!a.ui.contains(d,c.target)&&b.close()})},1),setTimeout(function(){clearTim=
eout(b.closing)},13)}).menu({focus:function(a,c){var d=3Dc.item.data("item.=
autocomplete");!1!=3D=3Db._trigger("focus",a,{item:d})&&/^key/.test(a.origi=
nalEvent.type)&&b.element.val(d.value)},selected:function(a,d){var e=3Dd.it=
em.data("item.autocomplete"),f=3Db.previous;b.element[0]!=3D=3Dc.activeElem=
ent&&(b.element.focus(),b.previous=3Df,setTimeout(function(){b.previous=3Df=
,b.selectedItem=3De},1)),!1!=3D=3Db._trigger("select",a,{item:e})&&b.elemen=
t.val(e.value),b.term=3Db.element.val(),b.close(a),b.selectedItem=3De},blur=
:function(a,c){b.menu.element.is(":visible")&&b.element.val()!=3D=3Db.term&=
&b.element.val(b.term)}}).zIndex(this.element.zIndex()+1).css({top:0,left:0=
}).hide().data("menu"),a.fn.bgiframe&&this.menu.element.bgiframe(),b.before=
unloadHandler=3Dfunction(){b.element.removeAttr("autocomplete")},a(window).=
bind("beforeunload",b.beforeunloadHandler)},destroy:function(){this.element=
.removeClass("ui-autocomplete-input").removeAttr("autocomplete").removeAttr=
("role").removeAttr("aria-autocomplete").removeAttr("aria-haspopup"),this.m=
enu.element.remove(),a(window).unbind("beforeunload",this.beforeunloadHandl=
er),a.Widget.prototype.destroy.call(this)},_setOption:function(b,c){a.Widge=
t.prototype._setOption.apply(this,arguments),b=3D=3D=3D"source"&&this._init=
Source(),b=3D=3D=3D"appendTo"&&this.menu.element.appendTo(a(c||"body",this.=
element[0].ownerDocument)[0]),b=3D=3D=3D"disabled"&&c&&this.xhr&&this.xhr.a=
bort()},_initSource:function(){var b=3Dthis,c,d;a.isArray(this.options.sour=
ce)?(c=3Dthis.options.source,this.source=3Dfunction(b,d){d(a.ui.autocomplet=
e.filter(c,b.term))}):typeof this.options.source=3D=3D"string"?(d=3Dthis.op=
tions.source,this.source=3Dfunction(c,e){b.xhr&&b.xhr.abort(),b.xhr=3Da.aja=
x({url:d,data:c,dataType:"json",success:function(a,b){e(a)},error:function(=
){e([])}})}):this.source=3Dthis.options.source},search:function(a,b){a=3Da!=
=3Dnull?a:this.element.val(),this.term=3Dthis.element.val();if(a.length<thi=
s.options.minLength)return this.close(b);clearTimeout(this.closing);if(this=
._trigger("search",b)=3D=3D=3D!1)return;return this._search(a)},_search:fun=
ction(a){this.pending++,this.element.addClass("ui-autocomplete-loading"),th=
is.source({term:a},this._response())},_response:function(){var a=3Dthis,b=
=3D++c;return function(d){b=3D=3D=3Dc&&a.__response(d),a.pending--,a.pendin=
g||a.element.removeClass("ui-autocomplete-loading")}},__response:function(a=
){!this.options.disabled&&a&&a.length?(a=3Dthis._normalize(a),this._suggest=
(a),this._trigger("open")):this.close()},close:function(a){clearTimeout(thi=
s.closing),this.menu.element.is(":visible")&&(this.menu.element.hide(),this=
.menu.deactivate(),this._trigger("close",a))},_change:function(a){this.prev=
ious!=3D=3Dthis.element.val()&&this._trigger("change",a,{item:this.selected=
Item})},_normalize:function(b){return b.length&&b[0].label&&b[0].value?b:a.=
map(b,function(b){return typeof b=3D=3D"string"?{label:b,value:b}:a.extend(=
{label:b.label||b.value,value:b.value||b.label},b)})},_suggest:function(b){=
var c=3Dthis.menu.element.empty().zIndex(this.element.zIndex()+1);this._ren=
derMenu(c,b),this.menu.deactivate(),this.menu.refresh(),c.show(),this._resi=
zeMenu(),c.position(a.extend({of:this.element},this.options.position)),this=
.options.autoFocus&&this.menu.next(new a.Event("mouseover"))},_resizeMenu:f=
unction(){var a=3Dthis.menu.element;a.outerWidth(Math.max(a.width("").outer=
Width()+1,this.element.outerWidth()))},_renderMenu:function(b,c){var d=3Dth=
is;a.each(c,function(a,c){d._renderItem(b,c)})},_renderItem:function(b,c){r=
eturn a("<li></li>").data("item.autocomplete",c).append(a("<a></a>").text(c=
.label)).appendTo(b)},_move:function(a,b){if(!this.menu.element.is(":visibl=
e")){this.search(null,b);return}if(this.menu.first()&&/^previous/.test(a)||=
this.menu.last()&&/^next/.test(a)){this.element.val(this.term),this.menu.de=
activate();return}this.menu[a](b)},widget:function(){return this.menu.eleme=
nt},_keyEvent:function(a,b){if(!this.isMultiLine||this.menu.element.is(":vi=
sible"))this._move(a,b),b.preventDefault()}}),a.extend(a.ui.autocomplete,{e=
scapeRegex:function(a){return a.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&")}=
,filter:function(b,c){var d=3Dnew RegExp(a.ui.autocomplete.escapeRegex(c),"=
i");return a.grep(b,function(a){return d.test(a.label||a.value||a)})}})})(j=
Query),function(a){a.widget("ui.menu",{_create:function(){var b=3Dthis;this=
.element.addClass("ui-menu ui-widget ui-widget-content ui-corner-all").attr=
({role:"listbox","aria-activedescendant":"ui-active-menuitem"}).click(funct=
ion(c){if(!a(c.target).closest(".ui-menu-item a").length)return;c.preventDe=
fault(),b.select(c)}),this.refresh()},refresh:function(){var b=3Dthis,c=3Dt=
his.element.children("li:not(.ui-menu-item):has(a)").addClass("ui-menu-item=
").attr("role","menuitem");c.children("a").addClass("ui-corner-all").attr("=
tabindex",-1).mouseenter(function(c){b.activate(c,a(this).parent())}).mouse=
leave(function(){b.deactivate()})},activate:function(a,b){this.deactivate()=
;if(this.hasScroll()){var c=3Db.offset().top-this.element.offset().top,d=3D=
this.element.scrollTop(),e=3Dthis.element.height();c<0?this.element.scrollT=
op(d+c):c>=3De&&this.element.scrollTop(d+c-e+b.height())}this.active=3Db.eq=
(0).children("a").addClass("ui-state-hover").attr("id","ui-active-menuitem"=
).end(),this._trigger("focus",a,{item:b})},deactivate:function(){if(!this.a=
ctive)return;this.active.children("a").removeClass("ui-state-hover").remove=
Attr("id"),this._trigger("blur"),this.active=3Dnull},next:function(a){this.=
move("next",".ui-menu-item:first",a)},previous:function(a){this.move("prev"=
,".ui-menu-item:last",a)},first:function(){return this.active&&!this.active=
.prevAll(".ui-menu-item").length},last:function(){return this.active&&!this=
.active.nextAll(".ui-menu-item").length},move:function(a,b,c){if(!this.acti=
ve){this.activate(c,this.element.children(b));return}var d=3Dthis.active[a+=
"All"](".ui-menu-item").eq(0);d.length?this.activate(c,d):this.activate(c,t=
his.element.children(b))},nextPage:function(b){if(this.hasScroll()){if(!thi=
s.active||this.last()){this.activate(b,this.element.children(".ui-menu-item=
:first"));return}var c=3Dthis.active.offset().top,d=3Dthis.element.height()=
,e=3Dthis.element.children(".ui-menu-item").filter(function(){var b=3Da(thi=
s).offset().top-c-d+a(this).height();return b<10&&b>-10});e.length||(e=3Dth=
is.element.children(".ui-menu-item:last")),this.activate(b,e)}else this.act=
ivate(b,this.element.children(".ui-menu-item").filter(!this.active||this.la=
st()?":first":":last"))},previousPage:function(b){if(this.hasScroll()){if(!=
this.active||this.first()){this.activate(b,this.element.children(".ui-menu-=
item:last"));return}var c=3Dthis.active.offset().top,d=3Dthis.element.heigh=
t(),e=3Dthis.element.children(".ui-menu-item").filter(function(){var b=3Da(=
this).offset().top-c+d-a(this).height();return b<10&&b>-10});e.length||(e=
=3Dthis.element.children(".ui-menu-item:first")),this.activate(b,e)}else th=
is.activate(b,this.element.children(".ui-menu-item").filter(!this.active||t=
his.first()?":last":":first"))},hasScroll:function(){return this.element.he=
ight()<this.element[a.fn.prop?"prop":"attr"]("scrollHeight")},select:functi=
on(a){this._trigger("selected",a,{item:this.active})}})}(jQuery);;/*! jQuer=
y UI - v1.8.22 - 2012-07-24
-* https://github.com/jquery/jquery-ui
-* Includes: jquery.ui.button.js
-* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){var c,d,e,f,g=3D"ui-button ui-widget ui-state-default ui-co=
rner-all",h=3D"ui-state-hover ui-state-active ",i=3D"ui-button-icons-only u=
i-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-butt=
on-text-icon-secondary ui-button-text-only",j=3Dfunction(){var b=3Da(this).=
find(":ui-button");setTimeout(function(){b.button("refresh")},1)},k=3Dfunct=
ion(b){var c=3Db.name,d=3Db.form,e=3Da([]);return c&&(d?e=3Da(d).find("[nam=
e=3D'"+c+"']"):e=3Da("[name=3D'"+c+"']",b.ownerDocument).filter(function(){=
return!this.form})),e};a.widget("ui.button",{options:{disabled:null,text:!0=
,label:null,icons:{primary:null,secondary:null}},_create:function(){this.el=
ement.closest("form").unbind("reset.button").bind("reset.button",j),typeof =
this.options.disabled!=3D"boolean"?this.options.disabled=3D!!this.element.p=
ropAttr("disabled"):this.element.propAttr("disabled",this.options.disabled)=
,this._determineButtonType(),this.hasTitle=3D!!this.buttonElement.attr("tit=
le");var b=3Dthis,h=3Dthis.options,i=3Dthis.type=3D=3D=3D"checkbox"||this.t=
ype=3D=3D=3D"radio",l=3D"ui-state-hover"+(i?"":" ui-state-active"),m=3D"ui-=
state-focus";h.label=3D=3D=3Dnull&&(h.label=3Dthis.buttonElement.html()),th=
is.buttonElement.addClass(g).attr("role","button").bind("mouseenter.button"=
,function(){if(h.disabled)return;a(this).addClass("ui-state-hover"),this=3D=
=3D=3Dc&&a(this).addClass("ui-state-active")}).bind("mouseleave.button",fun=
ction(){if(h.disabled)return;a(this).removeClass(l)}).bind("click.button",f=
unction(a){h.disabled&&(a.preventDefault(),a.stopImmediatePropagation())}),=
this.element.bind("focus.button",function(){b.buttonElement.addClass(m)}).b=
ind("blur.button",function(){b.buttonElement.removeClass(m)}),i&&(this.elem=
ent.bind("change.button",function(){if(f)return;b.refresh()}),this.buttonEl=
ement.bind("mousedown.button",function(a){if(h.disabled)return;f=3D!1,d=3Da=
.pageX,e=3Da.pageY}).bind("mouseup.button",function(a){if(h.disabled)return=
;if(d!=3D=3Da.pageX||e!=3D=3Da.pageY)f=3D!0})),this.type=3D=3D=3D"checkbox"=
?this.buttonElement.bind("click.button",function(){if(h.disabled||f)return!=
1;a(this).toggleClass("ui-state-active"),b.buttonElement.attr("aria-pressed=
",b.element[0].checked)}):this.type=3D=3D=3D"radio"?this.buttonElement.bind=
("click.button",function(){if(h.disabled||f)return!1;a(this).addClass("ui-s=
tate-active"),b.buttonElement.attr("aria-pressed","true");var c=3Db.element=
[0];k(c).not(c).map(function(){return a(this).button("widget")[0]}).removeC=
lass("ui-state-active").attr("aria-pressed","false")}):(this.buttonElement.=
bind("mousedown.button",function(){if(h.disabled)return!1;a(this).addClass(=
"ui-state-active"),c=3Dthis,a(document).one("mouseup",function(){c=3Dnull})=
}).bind("mouseup.button",function(){if(h.disabled)return!1;a(this).removeCl=
ass("ui-state-active")}).bind("keydown.button",function(b){if(h.disabled)re=
turn!1;(b.keyCode=3D=3Da.ui.keyCode.SPACE||b.keyCode=3D=3Da.ui.keyCode.ENTE=
R)&&a(this).addClass("ui-state-active")}).bind("keyup.button",function(){a(=
this).removeClass("ui-state-active")}),this.buttonElement.is("a")&&this.but=
tonElement.keyup(function(b){b.keyCode=3D=3D=3Da.ui.keyCode.SPACE&&a(this).=
click()})),this._setOption("disabled",h.disabled),this._resetButton()},_det=
ermineButtonType:function(){this.element.is(":checkbox")?this.type=3D"check=
box":this.element.is(":radio")?this.type=3D"radio":this.element.is("input")=
?this.type=3D"input":this.type=3D"button";if(this.type=3D=3D=3D"checkbox"||=
this.type=3D=3D=3D"radio"){var a=3Dthis.element.parents().filter(":last"),b=
=3D"label[for=3D'"+this.element.attr("id")+"']";this.buttonElement=3Da.find=
(b),this.buttonElement.length||(a=3Da.length?a.siblings():this.element.sibl=
ings(),this.buttonElement=3Da.filter(b),this.buttonElement.length||(this.bu=
ttonElement=3Da.find(b))),this.element.addClass("ui-helper-hidden-accessibl=
e");var c=3Dthis.element.is(":checked");c&&this.buttonElement.addClass("ui-=
state-active"),this.buttonElement.attr("aria-pressed",c)}else this.buttonEl=
ement=3Dthis.element},widget:function(){return this.buttonElement},destroy:=
function(){this.element.removeClass("ui-helper-hidden-accessible"),this.but=
tonElement.removeClass(g+" "+h+" "+i).removeAttr("role").removeAttr("aria-p=
ressed").html(this.buttonElement.find(".ui-button-text").html()),this.hasTi=
tle||this.buttonElement.removeAttr("title"),a.Widget.prototype.destroy.call=
(this)},_setOption:function(b,c){a.Widget.prototype._setOption.apply(this,a=
rguments);if(b=3D=3D=3D"disabled"){c?this.element.propAttr("disabled",!0):t=
his.element.propAttr("disabled",!1);return}this._resetButton()},refresh:fun=
ction(){var b=3Dthis.element.is(":disabled");b!=3D=3Dthis.options.disabled&=
&this._setOption("disabled",b),this.type=3D=3D=3D"radio"?k(this.element[0])=
.each(function(){a(this).is(":checked")?a(this).button("widget").addClass("=
ui-state-active").attr("aria-pressed","true"):a(this).button("widget").remo=
veClass("ui-state-active").attr("aria-pressed","false")}):this.type=3D=3D=
=3D"checkbox"&&(this.element.is(":checked")?this.buttonElement.addClass("ui=
-state-active").attr("aria-pressed","true"):this.buttonElement.removeClass(=
"ui-state-active").attr("aria-pressed","false"))},_resetButton:function(){i=
f(this.type=3D=3D=3D"input"){this.options.label&&this.element.val(this.opti=
ons.label);return}var b=3Dthis.buttonElement.removeClass(i),c=3Da("<span></=
span>",this.element[0].ownerDocument).addClass("ui-button-text").html(this.=
options.label).appendTo(b.empty()).text(),d=3Dthis.options.icons,e=3Dd.prim=
ary&&d.secondary,f=3D[];d.primary||d.secondary?(this.options.text&&f.push("=
ui-button-text-icon"+(e?"s":d.primary?"-primary":"-secondary")),d.primary&&=
b.prepend("<span class=3D'ui-button-icon-primary ui-icon "+d.primary+"'></s=
pan>"),d.secondary&&b.append("<span class=3D'ui-button-icon-secondary ui-ic=
on "+d.secondary+"'></span>"),this.options.text||(f.push(e?"ui-button-icons=
-only":"ui-button-icon-only"),this.hasTitle||b.attr("title",c))):f.push("ui=
-button-text-only"),b.addClass(f.join(" "))}}),a.widget("ui.buttonset",{opt=
ions:{items:":button, :submit, :reset, :checkbox, :radio, a, :data(button)"=
},_create:function(){this.element.addClass("ui-buttonset")},_init:function(=
){this.refresh()},_setOption:function(b,c){b=3D=3D=3D"disabled"&&this.butto=
ns.button("option",b,c),a.Widget.prototype._setOption.apply(this,arguments)=
},refresh:function(){var b=3Dthis.element.css("direction")=3D=3D=3D"rtl";th=
is.buttons=3Dthis.element.find(this.options.items).filter(":ui-button").but=
ton("refresh").end().not(":ui-button").button().end().map(function(){return=
 a(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui=
-corner-right").filter(":first").addClass(b?"ui-corner-right":"ui-corner-le=
ft").end().filter(":last").addClass(b?"ui-corner-left":"ui-corner-right").e=
nd().end()},destroy:function(){this.element.removeClass("ui-buttonset"),thi=
s.buttons.map(function(){return a(this).button("widget")[0]}).removeClass("=
ui-corner-left ui-corner-right").end().button("destroy"),a.Widget.prototype=
.destroy.call(this)}})})(jQuery);;/*! jQuery UI - v1.8.22 - 2012-07-24
-* https://github.com/jquery/jquery-ui
-* Includes: jquery.ui.dialog.js
-* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){var c=3D"ui-dialog ui-widget ui-widget-content ui-corner-al=
l ",d=3D{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidt=
h:!0,width:!0},e=3D{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},f=3D=
a.attrFn||{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:=
!0,click:!0};a.widget("ui.dialog",{options:{autoOpen:!0,buttons:{},closeOnE=
scape:!0,closeText:"close",dialogClass:"",draggable:!0,hide:null,height:"au=
to",maxHeight:!1,maxWidth:!1,minHeight:150,minWidth:150,modal:!1,position:{=
my:"center",at:"center",collision:"fit",using:function(b){var c=3Da(this).c=
ss(b).offset().top;c<0&&a(this).css("top",b.top-c)}},resizable:!0,show:null=
,stack:!0,title:"",width:300,zIndex:1e3},_create:function(){this.originalTi=
tle=3Dthis.element.attr("title"),typeof this.originalTitle!=3D"string"&&(th=
is.originalTitle=3D""),this.options.title=3Dthis.options.title||this.origin=
alTitle;var b=3Dthis,d=3Db.options,e=3Dd.title||"&#160;",f=3Da.ui.dialog.ge=
tTitleId(b.element),g=3D(b.uiDialog=3Da("<div></div>")).appendTo(document.b=
ody).hide().addClass(c+d.dialogClass).css({zIndex:d.zIndex}).attr("tabIndex=
",-1).css("outline",0).keydown(function(c){d.closeOnEscape&&!c.isDefaultPre=
vented()&&c.keyCode&&c.keyCode=3D=3D=3Da.ui.keyCode.ESCAPE&&(b.close(c),c.p=
reventDefault())}).attr({role:"dialog","aria-labelledby":f}).mousedown(func=
tion(a){b.moveToTop(!1,a)}),h=3Db.element.show().removeAttr("title").addCla=
ss("ui-dialog-content ui-widget-content").appendTo(g),i=3D(b.uiDialogTitleb=
ar=3Da("<div></div>")).addClass("ui-dialog-titlebar ui-widget-header ui-cor=
ner-all ui-helper-clearfix").prependTo(g),j=3Da('<a href=3D"#"></a>').addCl=
ass("ui-dialog-titlebar-close ui-corner-all").attr("role","button").hover(f=
unction(){j.addClass("ui-state-hover")},function(){j.removeClass("ui-state-=
hover")}).focus(function(){j.addClass("ui-state-focus")}).blur(function(){j=
.removeClass("ui-state-focus")}).click(function(a){return b.close(a),!1}).a=
ppendTo(i),k=3D(b.uiDialogTitlebarCloseText=3Da("<span></span>")).addClass(=
"ui-icon ui-icon-closethick").text(d.closeText).appendTo(j),l=3Da("<span></=
span>").addClass("ui-dialog-title").attr("id",f).html(e).prependTo(i);a.isF=
unction(d.beforeclose)&&!a.isFunction(d.beforeClose)&&(d.beforeClose=3Dd.be=
foreclose),i.find("*").add(i).disableSelection(),d.draggable&&a.fn.draggabl=
e&&b._makeDraggable(),d.resizable&&a.fn.resizable&&b._makeResizable(),b._cr=
eateButtons(d.buttons),b._isOpen=3D!1,a.fn.bgiframe&&g.bgiframe()},_init:fu=
nction(){this.options.autoOpen&&this.open()},destroy:function(){var a=3Dthi=
s;return a.overlay&&a.overlay.destroy(),a.uiDialog.hide(),a.element.unbind(=
".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-co=
ntent").hide().appendTo("body"),a.uiDialog.remove(),a.originalTitle&&a.elem=
ent.attr("title",a.originalTitle),a},widget:function(){return this.uiDialog=
},close:function(b){var c=3Dthis,d,e;if(!1=3D=3D=3Dc._trigger("beforeClose"=
,b))return;return c.overlay&&c.overlay.destroy(),c.uiDialog.unbind("keypres=
s.ui-dialog"),c._isOpen=3D!1,c.options.hide?c.uiDialog.hide(c.options.hide,=
function(){c._trigger("close",b)}):(c.uiDialog.hide(),c._trigger("close",b)=
),a.ui.dialog.overlay.resize(),c.options.modal&&(d=3D0,a(".ui-dialog").each=
(function(){this!=3D=3Dc.uiDialog[0]&&(e=3Da(this).css("z-index"),isNaN(e)|=
|(d=3DMath.max(d,e)))}),a.ui.dialog.maxZ=3Dd),c},isOpen:function(){return t=
his._isOpen},moveToTop:function(b,c){var d=3Dthis,e=3Dd.options,f;return e.=
modal&&!b||!e.stack&&!e.modal?d._trigger("focus",c):(e.zIndex>a.ui.dialog.m=
axZ&&(a.ui.dialog.maxZ=3De.zIndex),d.overlay&&(a.ui.dialog.maxZ+=3D1,d.over=
lay.$el.css("z-index",a.ui.dialog.overlay.maxZ=3Da.ui.dialog.maxZ)),f=3D{sc=
rollTop:d.element.scrollTop(),scrollLeft:d.element.scrollLeft()},a.ui.dialo=
g.maxZ+=3D1,d.uiDialog.css("z-index",a.ui.dialog.maxZ),d.element.attr(f),d.=
_trigger("focus",c),d)},open:function(){if(this._isOpen)return;var b=3Dthis=
,c=3Db.options,d=3Db.uiDialog;return b.overlay=3Dc.modal?new a.ui.dialog.ov=
erlay(b):null,b._size(),b._position(c.position),d.show(c.show),b.moveToTop(=
!0),c.modal&&d.bind("keydown.ui-dialog",function(b){if(b.keyCode!=3D=3Da.ui=
.keyCode.TAB)return;var c=3Da(":tabbable",this),d=3Dc.filter(":first"),e=3D=
c.filter(":last");if(b.target=3D=3D=3De[0]&&!b.shiftKey)return d.focus(1),!=
1;if(b.target=3D=3D=3Dd[0]&&b.shiftKey)return e.focus(1),!1}),a(b.element.f=
ind(":tabbable").get().concat(d.find(".ui-dialog-buttonpane :tabbable").get=
().concat(d.get()))).eq(0).focus(),b._isOpen=3D!0,b._trigger("open"),b},_cr=
eateButtons:function(b){var c=3Dthis,d=3D!1,e=3Da("<div></div>").addClass("=
ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),g=3Da("<div></d=
iv>").addClass("ui-dialog-buttonset").appendTo(e);c.uiDialog.find(".ui-dial=
og-buttonpane").remove(),typeof b=3D=3D"object"&&b!=3D=3Dnull&&a.each(b,fun=
ction(){return!(d=3D!0)}),d&&(a.each(b,function(b,d){d=3Da.isFunction(d)?{c=
lick:d,text:b}:d;var e=3Da('<button type=3D"button"></button>').click(funct=
ion(){d.click.apply(c.element[0],arguments)}).appendTo(g);a.each(d,function=
(a,b){if(a=3D=3D=3D"click")return;a in f?e[a](b):e.attr(a,b)}),a.fn.button&=
&e.button()}),e.appendTo(c.uiDialog))},_makeDraggable:function(){function f=
(a){return{position:a.position,offset:a.offset}}var b=3Dthis,c=3Db.options,=
d=3Da(document),e;b.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dia=
log-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",sta=
rt:function(d,g){e=3Dc.height=3D=3D=3D"auto"?"auto":a(this).height(),a(this=
).height(a(this).height()).addClass("ui-dialog-dragging"),b._trigger("dragS=
tart",d,f(g))},drag:function(a,c){b._trigger("drag",a,f(c))},stop:function(=
g,h){c.position=3D[h.position.left-d.scrollLeft(),h.position.top-d.scrollTo=
p()],a(this).removeClass("ui-dialog-dragging").height(e),b._trigger("dragSt=
op",g,f(h)),a.ui.dialog.overlay.resize()}})},_makeResizable:function(c){fun=
ction h(a){return{originalPosition:a.originalPosition,originalSize:a.origin=
alSize,position:a.position,size:a.size}}c=3Dc=3D=3D=3Db?this.options.resiza=
ble:c;var d=3Dthis,e=3Dd.options,f=3Dd.uiDialog.css("position"),g=3Dtypeof =
c=3D=3D"string"?c:"n,e,s,w,se,sw,ne,nw";d.uiDialog.resizable({cancel:".ui-d=
ialog-content",containment:"document",alsoResize:d.element,maxWidth:e.maxWi=
dth,maxHeight:e.maxHeight,minWidth:e.minWidth,minHeight:d._minHeight(),hand=
les:g,start:function(b,c){a(this).addClass("ui-dialog-resizing"),d._trigger=
("resizeStart",b,h(c))},resize:function(a,b){d._trigger("resize",a,h(b))},s=
top:function(b,c){a(this).removeClass("ui-dialog-resizing"),e.height=3Da(th=
is).height(),e.width=3Da(this).width(),d._trigger("resizeStop",b,h(c)),a.ui=
.dialog.overlay.resize()}}).css("position",f).find(".ui-resizable-se").addC=
lass("ui-icon ui-icon-grip-diagonal-se")},_minHeight:function(){var a=3Dthi=
s.options;return a.height=3D=3D=3D"auto"?a.minHeight:Math.min(a.minHeight,a=
.height)},_position:function(b){var c=3D[],d=3D[0,0],e;if(b){if(typeof b=3D=
=3D"string"||typeof b=3D=3D"object"&&"0"in b)c=3Db.split?b.split(" "):[b[0]=
,b[1]],c.length=3D=3D=3D1&&(c[1]=3Dc[0]),a.each(["left","top"],function(a,b=
){+c[a]=3D=3D=3Dc[a]&&(d[a]=3Dc[a],c[a]=3Db)}),b=3D{my:c.join(" "),at:c.joi=
n(" "),offset:d.join(" ")};b=3Da.extend({},a.ui.dialog.prototype.options.po=
sition,b)}else b=3Da.ui.dialog.prototype.options.position;e=3Dthis.uiDialog=
.is(":visible"),e||this.uiDialog.show(),this.uiDialog.css({top:0,left:0}).p=
osition(a.extend({of:window},b)),e||this.uiDialog.hide()},_setOptions:funct=
ion(b){var c=3Dthis,f=3D{},g=3D!1;a.each(b,function(a,b){c._setOption(a,b),=
a in d&&(g=3D!0),a in e&&(f[a]=3Db)}),g&&this._size(),this.uiDialog.is(":da=
ta(resizable)")&&this.uiDialog.resizable("option",f)},_setOption:function(b=
,d){var e=3Dthis,f=3De.uiDialog;switch(b){case"beforeclose":b=3D"beforeClos=
e";break;case"buttons":e._createButtons(d);break;case"closeText":e.uiDialog=
TitlebarCloseText.text(""+d);break;case"dialogClass":f.removeClass(e.option=
s.dialogClass).addClass(c+d);break;case"disabled":d?f.addClass("ui-dialog-d=
isabled"):f.removeClass("ui-dialog-disabled");break;case"draggable":var g=
=3Df.is(":data(draggable)");g&&!d&&f.draggable("destroy"),!g&&d&&e._makeDra=
ggable();break;case"position":e._position(d);break;case"resizable":var h=3D=
f.is(":data(resizable)");h&&!d&&f.resizable("destroy"),h&&typeof d=3D=3D"st=
ring"&&f.resizable("option","handles",d),!h&&d!=3D=3D!1&&e._makeResizable(d=
);break;case"title":a(".ui-dialog-title",e.uiDialogTitlebar).html(""+(d||"&=
#160;"))}a.Widget.prototype._setOption.apply(e,arguments)},_size:function()=
{var b=3Dthis.options,c,d,e=3Dthis.uiDialog.is(":visible");this.element.sho=
w().css({width:"auto",minHeight:0,height:0}),b.minWidth>b.width&&(b.width=
=3Db.minWidth),c=3Dthis.uiDialog.css({height:"auto",width:b.width}).height(=
),d=3DMath.max(0,b.minHeight-c);if(b.height=3D=3D=3D"auto")if(a.support.min=
Height)this.element.css({minHeight:d,height:"auto"});else{this.uiDialog.sho=
w();var f=3Dthis.element.css("height","auto").height();e||this.uiDialog.hid=
e(),this.element.height(Math.max(f,d))}else this.element.height(Math.max(b.=
height-c,0));this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable(=
"option","minHeight",this._minHeight())}}),a.extend(a.ui.dialog,{version:"1=
.8.22",uuid:0,maxZ:0,getTitleId:function(a){var b=3Da.attr("id");return b||=
(this.uuid+=3D1,b=3Dthis.uuid),"ui-dialog-title-"+b},overlay:function(b){th=
is.$el=3Da.ui.dialog.overlay.create(b)}}),a.extend(a.ui.dialog.overlay,{ins=
tances:[],oldInstances:[],maxZ:0,events:a.map("focus,mousedown,mouseup,keyd=
own,keypress,click".split(","),function(a){return a+".dialog-overlay"}).joi=
n(" "),create:function(b){this.instances.length=3D=3D=3D0&&(setTimeout(func=
tion(){a.ui.dialog.overlay.instances.length&&a(document).bind(a.ui.dialog.o=
verlay.events,function(b){if(a(b.target).zIndex()<a.ui.dialog.overlay.maxZ)=
return!1})},1),a(document).bind("keydown.dialog-overlay",function(c){b.opti=
ons.closeOnEscape&&!c.isDefaultPrevented()&&c.keyCode&&c.keyCode=3D=3D=3Da.=
ui.keyCode.ESCAPE&&(b.close(c),c.preventDefault())}),a(window).bind("resize=
.dialog-overlay",a.ui.dialog.overlay.resize));var c=3D(this.oldInstances.po=
p()||a("<div></div>").addClass("ui-widget-overlay")).appendTo(document.body=
).css({width:this.width(),height:this.height()});return a.fn.bgiframe&&c.bg=
iframe(),this.instances.push(c),c},destroy:function(b){var c=3Da.inArray(b,=
this.instances);c!=3D-1&&this.oldInstances.push(this.instances.splice(c,1)[=
0]),this.instances.length=3D=3D=3D0&&a([document,window]).unbind(".dialog-o=
verlay"),b.remove();var d=3D0;a.each(this.instances,function(){d=3DMath.max=
(d,this.css("z-index"))}),this.maxZ=3Dd},height:function(){var b,c;return a=
.browser.msie&&a.browser.version<7?(b=3DMath.max(document.documentElement.s=
crollHeight,document.body.scrollHeight),c=3DMath.max(document.documentEleme=
nt.offsetHeight,document.body.offsetHeight),b<c?a(window).height()+"px":b+"=
px"):a(document).height()+"px"},width:function(){var b,c;return a.browser.m=
sie?(b=3DMath.max(document.documentElement.scrollWidth,document.body.scroll=
Width),c=3DMath.max(document.documentElement.offsetWidth,document.body.offs=
etWidth),b<c?a(window).width()+"px":b+"px"):a(document).width()+"px"},resiz=
e:function(){var b=3Da([]);a.each(a.ui.dialog.overlay.instances,function(){=
b=3Db.add(this)}),b.css({width:0,height:0}).css({width:a.ui.dialog.overlay.=
width(),height:a.ui.dialog.overlay.height()})}}),a.extend(a.ui.dialog.overl=
ay.prototype,{destroy:function(){a.ui.dialog.overlay.destroy(this.$el)}})})=
(jQuery);;/*! jQuery UI - v1.8.22 - 2012-07-24
+(function(a,b){var c=3D0;a.widget("ui.autocomplete",{options:{appendTo:"bo=
dy",autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bot=
tom",collision:"none"},source:null},pending:0,_create:function(){var b=3Dth=
is,c=3Dthis.element[0].ownerDocument,d;this.isMultiLine=3Dthis.element.is("=
textarea"),this.element.addClass("ui-autocomplete-input").attr("autocomplet=
e","off").attr({role:"textbox","aria-autocomplete":"list","aria-haspopup":"=
true"}).bind("keydown.autocomplete",function(c){if(b.options.disabled||b.el=
ement.propAttr("readOnly"))return;d=3D!1;var e=3Da.ui.keyCode;switch(c.keyC=
ode){case e.PAGE_UP:b._move("previousPage",c);break;case e.PAGE_DOWN:b._mov=
e("nextPage",c);break;case e.UP:b._keyEvent("previous",c);break;case e.DOWN=
:b._keyEvent("next",c);break;case e.ENTER:case e.NUMPAD_ENTER:b.menu.active=
&&(d=3D!0,c.preventDefault());case e.TAB:if(!b.menu.active)return;b.menu.se=
lect(c);break;case e.ESCAPE:b.element.val(b.term),b.close(c);break;default:=
clearTimeout(b.searching),b.searching=3DsetTimeout(function(){b.term!=3Db.e=
lement.val()&&(b.selectedItem=3Dnull,b.search(null,c))},b.options.delay)}})=
.bind("keypress.autocomplete",function(a){d&&(d=3D!1,a.preventDefault())}).=
bind("focus.autocomplete",function(){if(b.options.disabled)return;b.selecte=
dItem=3Dnull,b.previous=3Db.element.val()}).bind("blur.autocomplete",functi=
on(a){if(b.options.disabled)return;clearTimeout(b.searching),b.closing=3Dse=
tTimeout(function(){b.close(a),b._change(a)},150)}),this._initSource(),this=
.menu=3Da("<ul></ul>").addClass("ui-autocomplete").appendTo(a(this.options.=
appendTo||"body",c)[0]).mousedown(function(c){var d=3Db.menu.element[0];a(c=
.target).closest(".ui-menu-item").length||setTimeout(function(){a(document)=
.one("mousedown",function(c){c.target!=3D=3Db.element[0]&&c.target!=3D=3Dd&=
&!a.ui.contains(d,c.target)&&b.close()})},1),setTimeout(function(){clearTim=
eout(b.closing)},13)}).menu({focus:function(a,c){var d=3Dc.item.data("item.=
autocomplete");!1!=3D=3Db._trigger("focus",a,{item:d})&&/^key/.test(a.origi=
nalEvent.type)&&b.element.val(d.value)},selected:function(a,d){var e=3Dd.it=
em.data("item.autocomplete"),f=3Db.previous;b.element[0]!=3D=3Dc.activeElem=
ent&&(b.element.focus(),b.previous=3Df,setTimeout(function(){b.previous=3Df=
,b.selectedItem=3De},1)),!1!=3D=3Db._trigger("select",a,{item:e})&&b.elemen=
t.val(e.value),b.term=3Db.element.val(),b.close(a),b.selectedItem=3De},blur=
:function(a,c){b.menu.element.is(":visible")&&b.element.val()!=3D=3Db.term&=
&b.element.val(b.term)}}).zIndex(this.element.zIndex()+1).css({top:0,left:0=
}).hide().data("menu"),a.fn.bgiframe&&this.menu.element.bgiframe(),b.before=
unloadHandler=3Dfunction(){b.element.removeAttr("autocomplete")},a(window).=
bind("beforeunload",b.beforeunloadHandler)},destroy:function(){this.element=
.removeClass("ui-autocomplete-input").removeAttr("autocomplete").removeAttr=
("role").removeAttr("aria-autocomplete").removeAttr("aria-haspopup"),this.m=
enu.element.remove(),a(window).unbind("beforeunload",this.beforeunloadHandl=
er),a.Widget.prototype.destroy.call(this)},_setOption:function(b,c){a.Widge=
t.prototype._setOption.apply(this,arguments),b=3D=3D=3D"source"&&this._init=
Source(),b=3D=3D=3D"appendTo"&&this.menu.element.appendTo(a(c||"body",this.=
element[0].ownerDocument)[0]),b=3D=3D=3D"disabled"&&c&&this.xhr&&this.xhr.a=
bort()},_initSource:function(){var b=3Dthis,c,d;a.isArray(this.options.sour=
ce)?(c=3Dthis.options.source,this.source=3Dfunction(b,d){d(a.ui.autocomplet=
e.filter(c,b.term))}):typeof this.options.source=3D=3D"string"?(d=3Dthis.op=
tions.source,this.source=3Dfunction(c,e){b.xhr&&b.xhr.abort(),b.xhr=3Da.aja=
x({url:d,data:c,dataType:"json",success:function(a,b){e(a)},error:function(=
){e([])}})}):this.source=3Dthis.options.source},search:function(a,b){a=3Da!=
=3Dnull?a:this.element.val(),this.term=3Dthis.element.val();if(a.length<thi=
s.options.minLength)return this.close(b);clearTimeout(this.closing);if(this=
._trigger("search",b)=3D=3D=3D!1)return;return this._search(a)},_search:fun=
ction(a){this.pending++,this.element.addClass("ui-autocomplete-loading"),th=
is.source({term:a},this._response())},_response:function(){var a=3Dthis,b=
=3D++c;return function(d){b=3D=3D=3Dc&&a.__response(d),a.pending--,a.pendin=
g||a.element.removeClass("ui-autocomplete-loading")}},__response:function(a=
){!this.options.disabled&&a&&a.length?(a=3Dthis._normalize(a),this._suggest=
(a),this._trigger("open")):this.close()},close:function(a){clearTimeout(thi=
s.closing),this.menu.element.is(":visible")&&(this.menu.element.hide(),this=
.menu.deactivate(),this._trigger("close",a))},_change:function(a){this.prev=
ious!=3D=3Dthis.element.val()&&this._trigger("change",a,{item:this.selected=
Item})},_normalize:function(b){return b.length&&b[0].label&&b[0].value?b:a.=
map(b,function(b){return typeof b=3D=3D"string"?{label:b,value:b}:a.extend(=
{label:b.label||b.value,value:b.value||b.label},b)})},_suggest:function(b){=
var c=3Dthis.menu.element.empty().zIndex(this.element.zIndex()+1);this._ren=
derMenu(c,b),this.menu.deactivate(),this.menu.refresh(),c.show(),this._resi=
zeMenu(),c.position(a.extend({of:this.element},this.options.position)),this=
.options.autoFocus&&this.menu.next(new a.Event("mouseover"))},_resizeMenu:f=
unction(){var a=3Dthis.menu.element;a.outerWidth(Math.max(a.width("").outer=
Width()+1,this.element.outerWidth()))},_renderMenu:function(b,c){var d=3Dth=
is;a.each(c,function(a,c){d._renderItem(b,c)})},_renderItem:function(b,c){r=
eturn a("<li></li>").data("item.autocomplete",c).append(a("<a></a>").text(c=
.label)).appendTo(b)},_move:function(a,b){if(!this.menu.element.is(":visibl=
e")){this.search(null,b);return}if(this.menu.first()&&/^previous/.test(a)||=
this.menu.last()&&/^next/.test(a)){this.element.val(this.term),this.menu.de=
activate();return}this.menu[a](b)},widget:function(){return this.menu.eleme=
nt},_keyEvent:function(a,b){if(!this.isMultiLine||this.menu.element.is(":vi=
sible"))this._move(a,b),b.preventDefault()}}),a.extend(a.ui.autocomplete,{e=
scapeRegex:function(a){return a.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&")}=
,filter:function(b,c){var d=3Dnew RegExp(a.ui.autocomplete.escapeRegex(c),"=
i");return a.grep(b,function(a){return d.test(a.label||a.value||a)})}})})(j=
Query),function(a){a.widget("ui.menu",{_create:function(){var b=3Dthis;this=
.element.addClass("ui-menu ui-widget ui-widget-content ui-corner-all").attr=
({role:"listbox","aria-activedescendant":"ui-active-menuitem"}).click(funct=
ion(c){if(!a(c.target).closest(".ui-menu-item a").length)return;c.preventDe=
fault(),b.select(c)}),this.refresh()},refresh:function(){var b=3Dthis,c=3Dt=
his.element.children("li:not(.ui-menu-item):has(a)").addClass("ui-menu-item=
").attr("role","menuitem");c.children("a").addClass("ui-corner-all").attr("=
tabindex",-1).mouseenter(function(c){b.activate(c,a(this).parent())}).mouse=
leave(function(){b.deactivate()})},activate:function(a,b){this.deactivate()=
;if(this.hasScroll()){var c=3Db.offset().top-this.element.offset().top,d=3D=
this.element.scrollTop(),e=3Dthis.element.height();c<0?this.element.scrollT=
op(d+c):c>=3De&&this.element.scrollTop(d+c-e+b.height())}this.active=3Db.eq=
(0).children("a").addClass("ui-state-hover").attr("id","ui-active-menuitem"=
).end(),this._trigger("focus",a,{item:b})},deactivate:function(){if(!this.a=
ctive)return;this.active.children("a").removeClass("ui-state-hover").remove=
Attr("id"),this._trigger("blur"),this.active=3Dnull},next:function(a){this.=
move("next",".ui-menu-item:first",a)},previous:function(a){this.move("prev"=
,".ui-menu-item:last",a)},first:function(){return this.active&&!this.active=
.prevAll(".ui-menu-item").length},last:function(){return this.active&&!this=
.active.nextAll(".ui-menu-item").length},move:function(a,b,c){if(!this.acti=
ve){this.activate(c,this.element.children(b));return}var d=3Dthis.active[a+=
"All"](".ui-menu-item").eq(0);d.length?this.activate(c,d):this.activate(c,t=
his.element.children(b))},nextPage:function(b){if(this.hasScroll()){if(!thi=
s.active||this.last()){this.activate(b,this.element.children(".ui-menu-item=
:first"));return}var c=3Dthis.active.offset().top,d=3Dthis.element.height()=
,e=3Dthis.element.children(".ui-menu-item").filter(function(){var b=3Da(thi=
s).offset().top-c-d+a(this).height();return b<10&&b>-10});e.length||(e=3Dth=
is.element.children(".ui-menu-item:last")),this.activate(b,e)}else this.act=
ivate(b,this.element.children(".ui-menu-item").filter(!this.active||this.la=
st()?":first":":last"))},previousPage:function(b){if(this.hasScroll()){if(!=
this.active||this.first()){this.activate(b,this.element.children(".ui-menu-=
item:last"));return}var c=3Dthis.active.offset().top,d=3Dthis.element.heigh=
t(),e=3Dthis.element.children(".ui-menu-item").filter(function(){var b=3Da(=
this).offset().top-c+d-a(this).height();return b<10&&b>-10});e.length||(e=
=3Dthis.element.children(".ui-menu-item:first")),this.activate(b,e)}else th=
is.activate(b,this.element.children(".ui-menu-item").filter(!this.active||t=
his.first()?":last":":first"))},hasScroll:function(){return this.element.he=
ight()<this.element[a.fn.prop?"prop":"attr"]("scrollHeight")},select:functi=
on(a){this._trigger("selected",a,{item:this.active})}})}(jQuery);;/*! jQuer=
y UI - v1.8.23 - 2012-08-15
 * https://github.com/jquery/jquery-ui
 * Includes: jquery.ui.slider.js
 * Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){var c=3D5;a.widget("ui.slider",a.ui.mouse,{widgetEventPrefi=
x:"slide",options:{animate:!1,distance:0,max:100,min:0,orientation:"horizon=
tal",range:!1,step:1,value:0,values:null},_create:function(){var b=3Dthis,d=
=3Dthis.options,e=3Dthis.element.find(".ui-slider-handle").addClass("ui-sta=
te-default ui-corner-all"),f=3D"<a class=3D'ui-slider-handle ui-state-defau=
lt ui-corner-all' href=3D'#'></a>",g=3Dd.values&&d.values.length||1,h=3D[];=
this._keySliding=3D!1,this._mouseSliding=3D!1,this._animateOff=3D!0,this._h=
andleIndex=3Dnull,this._detectOrientation(),this._mouseInit(),this.element.=
addClass("ui-slider ui-slider-"+this.orientation+" ui-widget"+" ui-widget-c=
ontent"+" ui-corner-all"+(d.disabled?" ui-slider-disabled ui-disabled":""))=
,this.range=3Da([]),d.range&&(d.range=3D=3D=3D!0&&(d.values||(d.values=3D[t=
his._valueMin(),this._valueMin()]),d.values.length&&d.values.length!=3D=3D2=
&&(d.values=3D[d.values[0],d.values[0]])),this.range=3Da("<div></div>").app=
endTo(this.element).addClass("ui-slider-range ui-widget-header"+(d.range=3D=
=3D=3D"min"||d.range=3D=3D=3D"max"?" ui-slider-range-"+d.range:"")));for(va=
r i=3De.length;i<g;i+=3D1)h.push(f);this.handles=3De.add(a(h.join("")).appe=
ndTo(b.element)),this.handle=3Dthis.handles.eq(0),this.handles.add(this.ran=
ge).filter("a").click(function(a){a.preventDefault()}).hover(function(){d.d=
isabled||a(this).addClass("ui-state-hover")},function(){a(this).removeClass=
("ui-state-hover")}).focus(function(){d.disabled?a(this).blur():(a(".ui-sli=
der .ui-state-focus").removeClass("ui-state-focus"),a(this).addClass("ui-st=
ate-focus"))}).blur(function(){a(this).removeClass("ui-state-focus")}),this=
.handles.each(function(b){a(this).data("index.ui-slider-handle",b)}),this.h=
andles.keydown(function(d){var e=3Da(this).data("index.ui-slider-handle"),f=
,g,h,i;if(b.options.disabled)return;switch(d.keyCode){case a.ui.keyCode.HOM=
E:case a.ui.keyCode.END:case a.ui.keyCode.PAGE_UP:case a.ui.keyCode.PAGE_DO=
WN:case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:case a.ui.keyCode.DOWN:case=
 a.ui.keyCode.LEFT:d.preventDefault();if(!b._keySliding){b._keySliding=3D!0=
,a(this).addClass("ui-state-active"),f=3Db._start(d,e);if(f=3D=3D=3D!1)retu=
rn}}i=3Db.options.step,b.options.values&&b.options.values.length?g=3Dh=3Db.=
values(e):g=3Dh=3Db.value();switch(d.keyCode){case a.ui.keyCode.HOME:h=3Db.=
_valueMin();break;case a.ui.keyCode.END:h=3Db._valueMax();break;case a.ui.k=
eyCode.PAGE_UP:h=3Db._trimAlignValue(g+(b._valueMax()-b._valueMin())/c);bre=
ak;case a.ui.keyCode.PAGE_DOWN:h=3Db._trimAlignValue(g-(b._valueMax()-b._va=
lueMin())/c);break;case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:if(g=3D=3D=
=3Db._valueMax())return;h=3Db._trimAlignValue(g+i);break;case a.ui.keyCode.=
DOWN:case a.ui.keyCode.LEFT:if(g=3D=3D=3Db._valueMin())return;h=3Db._trimAl=
ignValue(g-i)}b._slide(d,e,h)}).keyup(function(c){var d=3Da(this).data("ind=
ex.ui-slider-handle");b._keySliding&&(b._keySliding=3D!1,b._stop(c,d),b._ch=
ange(c,d),a(this).removeClass("ui-state-active"))}),this._refreshValue(),th=
is._animateOff=3D!1},destroy:function(){return this.handles.remove(),this.r=
ange.remove(),this.element.removeClass("ui-slider ui-slider-horizontal ui-s=
lider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all=
").removeData("slider").unbind(".slider"),this._mouseDestroy(),this},_mouse=
Capture:function(b){var c=3Dthis.options,d,e,f,g,h,i,j,k,l;return c.disable=
d?!1:(this.elementSize=3D{width:this.element.outerWidth(),height:this.eleme=
nt.outerHeight()},this.elementOffset=3Dthis.element.offset(),d=3D{x:b.pageX=
,y:b.pageY},e=3Dthis._normValueFromMouse(d),f=3Dthis._valueMax()-this._valu=
eMin()+1,h=3Dthis,this.handles.each(function(b){var c=3DMath.abs(e-h.values=
(b));f>c&&(f=3Dc,g=3Da(this),i=3Db)}),c.range=3D=3D=3D!0&&this.values(1)=3D=
=3D=3Dc.min&&(i+=3D1,g=3Da(this.handles[i])),j=3Dthis._start(b,i),j=3D=3D=
=3D!1?!1:(this._mouseSliding=3D!0,h._handleIndex=3Di,g.addClass("ui-state-a=
ctive").focus(),k=3Dg.offset(),l=3D!a(b.target).parents().andSelf().is(".ui=
-slider-handle"),this._clickOffset=3Dl?{left:0,top:0}:{left:b.pageX-k.left-=
g.width()/2,top:b.pageY-k.top-g.height()/2-(parseInt(g.css("borderTopWidth"=
),10)||0)-(parseInt(g.css("borderBottomWidth"),10)||0)+(parseInt(g.css("mar=
ginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(b,i,=
e),this._animateOff=3D!0,!0))},_mouseStart:function(a){return!0},_mouseDrag=
:function(a){var b=3D{x:a.pageX,y:a.pageY},c=3Dthis._normValueFromMouse(b);=
return this._slide(a,this._handleIndex,c),!1},_mouseStop:function(a){return=
 this.handles.removeClass("ui-state-active"),this._mouseSliding=3D!1,this._=
stop(a,this._handleIndex),this._change(a,this._handleIndex),this._handleInd=
ex=3Dnull,this._clickOffset=3Dnull,this._animateOff=3D!1,!1},_detectOrienta=
tion:function(){this.orientation=3Dthis.options.orientation=3D=3D=3D"vertic=
al"?"vertical":"horizontal"},_normValueFromMouse:function(a){var b,c,d,e,f;=
return this.orientation=3D=3D=3D"horizontal"?(b=3Dthis.elementSize.width,c=
=3Da.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)=
):(b=3Dthis.elementSize.height,c=3Da.y-this.elementOffset.top-(this._clickO=
ffset?this._clickOffset.top:0)),d=3Dc/b,d>1&&(d=3D1),d<0&&(d=3D0),this.orie=
ntation=3D=3D=3D"vertical"&&(d=3D1-d),e=3Dthis._valueMax()-this._valueMin()=
,f=3Dthis._valueMin()+d*e,this._trimAlignValue(f)},_start:function(a,b){var=
 c=3D{handle:this.handles[b],value:this.value()};return this.options.values=
&&this.options.values.length&&(c.value=3Dthis.values(b),c.values=3Dthis.val=
ues()),this._trigger("start",a,c)},_slide:function(a,b,c){var d,e,f;this.op=
tions.values&&this.options.values.length?(d=3Dthis.values(b?0:1),this.optio=
ns.values.length=3D=3D=3D2&&this.options.range=3D=3D=3D!0&&(b=3D=3D=3D0&&c>=
d||b=3D=3D=3D1&&c<d)&&(c=3Dd),c!=3D=3Dthis.values(b)&&(e=3Dthis.values(),e[=
b]=3Dc,f=3Dthis._trigger("slide",a,{handle:this.handles[b],value:c,values:e=
}),d=3Dthis.values(b?0:1),f!=3D=3D!1&&this.values(b,c,!0))):c!=3D=3Dthis.va=
lue()&&(f=3Dthis._trigger("slide",a,{handle:this.handles[b],value:c}),f!=3D=
=3D!1&&this.value(c))},_stop:function(a,b){var c=3D{handle:this.handles[b],=
value:this.value()};this.options.values&&this.options.values.length&&(c.val=
ue=3Dthis.values(b),c.values=3Dthis.values()),this._trigger("stop",a,c)},_c=
hange:function(a,b){if(!this._keySliding&&!this._mouseSliding){var c=3D{han=
dle:this.handles[b],value:this.value()};this.options.values&&this.options.v=
alues.length&&(c.value=3Dthis.values(b),c.values=3Dthis.values()),this._tri=
gger("change",a,c)}},value:function(a){if(arguments.length){this.options.va=
lue=3Dthis._trimAlignValue(a),this._refreshValue(),this._change(null,0);ret=
urn}return this._value()},values:function(b,c){var d,e,f;if(arguments.lengt=
h>1){this.options.values[b]=3Dthis._trimAlignValue(c),this._refreshValue(),=
this._change(null,b);return}if(!arguments.length)return this._values();if(!=
a.isArray(arguments[0]))return this.options.values&&this.options.values.len=
gth?this._values(b):this.value();d=3Dthis.options.values,e=3Darguments[0];f=
or(f=3D0;f<d.length;f+=3D1)d[f]=3Dthis._trimAlignValue(e[f]),this._change(n=
ull,f);this._refreshValue()},_setOption:function(b,c){var d,e=3D0;a.isArray=
(this.options.values)&&(e=3Dthis.options.values.length),a.Widget.prototype.=
_setOption.apply(this,arguments);switch(b){case"disabled":c?(this.handles.f=
ilter(".ui-state-focus").blur(),this.handles.removeClass("ui-state-hover"),=
this.handles.propAttr("disabled",!0),this.element.addClass("ui-disabled")):=
(this.handles.propAttr("disabled",!1),this.element.removeClass("ui-disabled=
"));break;case"orientation":this._detectOrientation(),this.element.removeCl=
ass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.o=
rientation),this._refreshValue();break;case"value":this._animateOff=3D!0,th=
is._refreshValue(),this._change(null,0),this._animateOff=3D!1;break;case"va=
lues":this._animateOff=3D!0,this._refreshValue();for(d=3D0;d<e;d+=3D1)this.=
_change(null,d);this._animateOff=3D!1}},_value:function(){var a=3Dthis.opti=
ons.value;return a=3Dthis._trimAlignValue(a),a},_values:function(a){var b,c=
,d;if(arguments.length)return b=3Dthis.options.values[a],b=3Dthis._trimAlig=
nValue(b),b;c=3Dthis.options.values.slice();for(d=3D0;d<c.length;d+=3D1)c[d=
]=3Dthis._trimAlignValue(c[d]);return c},_trimAlignValue:function(a){if(a<=
=3Dthis._valueMin())return this._valueMin();if(a>=3Dthis._valueMax())return=
 this._valueMax();var b=3Dthis.options.step>0?this.options.step:1,c=3D(a-th=
is._valueMin())%b,d=3Da-c;return Math.abs(c)*2>=3Db&&(d+=3Dc>0?b:-b),parseF=
loat(d.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax=
:function(){return this.options.max},_refreshValue:function(){var b=3Dthis.=
options.range,c=3Dthis.options,d=3Dthis,e=3Dthis._animateOff?!1:c.animate,f=
,g=3D{},h,i,j,k;this.options.values&&this.options.values.length?this.handle=
s.each(function(b,i){f=3D(d.values(b)-d._valueMin())/(d._valueMax()-d._valu=
eMin())*100,g[d.orientation=3D=3D=3D"horizontal"?"left":"bottom"]=3Df+"%",a=
(this).stop(1,1)[e?"animate":"css"](g,c.animate),d.options.range=3D=3D=3D!0=
&&(d.orientation=3D=3D=3D"horizontal"?(b=3D=3D=3D0&&d.range.stop(1,1)[e?"an=
imate":"css"]({left:f+"%"},c.animate),b=3D=3D=3D1&&d.range[e?"animate":"css=
"]({width:f-h+"%"},{queue:!1,duration:c.animate})):(b=3D=3D=3D0&&d.range.st=
op(1,1)[e?"animate":"css"]({bottom:f+"%"},c.animate),b=3D=3D=3D1&&d.range[e=
?"animate":"css"]({height:f-h+"%"},{queue:!1,duration:c.animate}))),h=3Df})=
:(i=3Dthis.value(),j=3Dthis._valueMin(),k=3Dthis._valueMax(),f=3Dk!=3D=3Dj?=
(i-j)/(k-j)*100:0,g[d.orientation=3D=3D=3D"horizontal"?"left":"bottom"]=3Df=
+"%",this.handle.stop(1,1)[e?"animate":"css"](g,c.animate),b=3D=3D=3D"min"&=
&this.orientation=3D=3D=3D"horizontal"&&this.range.stop(1,1)[e?"animate":"c=
ss"]({width:f+"%"},c.animate),b=3D=3D=3D"max"&&this.orientation=3D=3D=3D"ho=
rizontal"&&this.range[e?"animate":"css"]({width:100-f+"%"},{queue:!1,durati=
on:c.animate}),b=3D=3D=3D"min"&&this.orientation=3D=3D=3D"vertical"&&this.r=
ange.stop(1,1)[e?"animate":"css"]({height:f+"%"},c.animate),b=3D=3D=3D"max"=
&&this.orientation=3D=3D=3D"vertical"&&this.range[e?"animate":"css"]({heigh=
t:100-f+"%"},{queue:!1,duration:c.animate}))}}),a.extend(a.ui.slider,{versi=
on:"1.8.22"})})(jQuery);;/*! jQuery UI - v1.8.22 - 2012-07-24
+(function(a,b){var c=3D5;a.widget("ui.slider",a.ui.mouse,{widgetEventPrefi=
x:"slide",options:{animate:!1,distance:0,max:100,min:0,orientation:"horizon=
tal",range:!1,step:1,value:0,values:null},_create:function(){var b=3Dthis,d=
=3Dthis.options,e=3Dthis.element.find(".ui-slider-handle").addClass("ui-sta=
te-default ui-corner-all"),f=3D"<a class=3D'ui-slider-handle ui-state-defau=
lt ui-corner-all' href=3D'#'></a>",g=3Dd.values&&d.values.length||1,h=3D[];=
this._keySliding=3D!1,this._mouseSliding=3D!1,this._animateOff=3D!0,this._h=
andleIndex=3Dnull,this._detectOrientation(),this._mouseInit(),this.element.=
addClass("ui-slider ui-slider-"+this.orientation+" ui-widget"+" ui-widget-c=
ontent"+" ui-corner-all"+(d.disabled?" ui-slider-disabled ui-disabled":""))=
,this.range=3Da([]),d.range&&(d.range=3D=3D=3D!0&&(d.values||(d.values=3D[t=
his._valueMin(),this._valueMin()]),d.values.length&&d.values.length!=3D=3D2=
&&(d.values=3D[d.values[0],d.values[0]])),this.range=3Da("<div></div>").app=
endTo(this.element).addClass("ui-slider-range ui-widget-header"+(d.range=3D=
=3D=3D"min"||d.range=3D=3D=3D"max"?" ui-slider-range-"+d.range:"")));for(va=
r i=3De.length;i<g;i+=3D1)h.push(f);this.handles=3De.add(a(h.join("")).appe=
ndTo(b.element)),this.handle=3Dthis.handles.eq(0),this.handles.add(this.ran=
ge).filter("a").click(function(a){a.preventDefault()}).hover(function(){d.d=
isabled||a(this).addClass("ui-state-hover")},function(){a(this).removeClass=
("ui-state-hover")}).focus(function(){d.disabled?a(this).blur():(a(".ui-sli=
der .ui-state-focus").removeClass("ui-state-focus"),a(this).addClass("ui-st=
ate-focus"))}).blur(function(){a(this).removeClass("ui-state-focus")}),this=
.handles.each(function(b){a(this).data("index.ui-slider-handle",b)}),this.h=
andles.keydown(function(d){var e=3Da(this).data("index.ui-slider-handle"),f=
,g,h,i;if(b.options.disabled)return;switch(d.keyCode){case a.ui.keyCode.HOM=
E:case a.ui.keyCode.END:case a.ui.keyCode.PAGE_UP:case a.ui.keyCode.PAGE_DO=
WN:case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:case a.ui.keyCode.DOWN:case=
 a.ui.keyCode.LEFT:d.preventDefault();if(!b._keySliding){b._keySliding=3D!0=
,a(this).addClass("ui-state-active"),f=3Db._start(d,e);if(f=3D=3D=3D!1)retu=
rn}}i=3Db.options.step,b.options.values&&b.options.values.length?g=3Dh=3Db.=
values(e):g=3Dh=3Db.value();switch(d.keyCode){case a.ui.keyCode.HOME:h=3Db.=
_valueMin();break;case a.ui.keyCode.END:h=3Db._valueMax();break;case a.ui.k=
eyCode.PAGE_UP:h=3Db._trimAlignValue(g+(b._valueMax()-b._valueMin())/c);bre=
ak;case a.ui.keyCode.PAGE_DOWN:h=3Db._trimAlignValue(g-(b._valueMax()-b._va=
lueMin())/c);break;case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:if(g=3D=3D=
=3Db._valueMax())return;h=3Db._trimAlignValue(g+i);break;case a.ui.keyCode.=
DOWN:case a.ui.keyCode.LEFT:if(g=3D=3D=3Db._valueMin())return;h=3Db._trimAl=
ignValue(g-i)}b._slide(d,e,h)}).keyup(function(c){var d=3Da(this).data("ind=
ex.ui-slider-handle");b._keySliding&&(b._keySliding=3D!1,b._stop(c,d),b._ch=
ange(c,d),a(this).removeClass("ui-state-active"))}),this._refreshValue(),th=
is._animateOff=3D!1},destroy:function(){return this.handles.remove(),this.r=
ange.remove(),this.element.removeClass("ui-slider ui-slider-horizontal ui-s=
lider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all=
").removeData("slider").unbind(".slider"),this._mouseDestroy(),this},_mouse=
Capture:function(b){var c=3Dthis.options,d,e,f,g,h,i,j,k,l;return c.disable=
d?!1:(this.elementSize=3D{width:this.element.outerWidth(),height:this.eleme=
nt.outerHeight()},this.elementOffset=3Dthis.element.offset(),d=3D{x:b.pageX=
,y:b.pageY},e=3Dthis._normValueFromMouse(d),f=3Dthis._valueMax()-this._valu=
eMin()+1,h=3Dthis,this.handles.each(function(b){var c=3DMath.abs(e-h.values=
(b));f>c&&(f=3Dc,g=3Da(this),i=3Db)}),c.range=3D=3D=3D!0&&this.values(1)=3D=
=3D=3Dc.min&&(i+=3D1,g=3Da(this.handles[i])),j=3Dthis._start(b,i),j=3D=3D=
=3D!1?!1:(this._mouseSliding=3D!0,h._handleIndex=3Di,g.addClass("ui-state-a=
ctive").focus(),k=3Dg.offset(),l=3D!a(b.target).parents().andSelf().is(".ui=
-slider-handle"),this._clickOffset=3Dl?{left:0,top:0}:{left:b.pageX-k.left-=
g.width()/2,top:b.pageY-k.top-g.height()/2-(parseInt(g.css("borderTopWidth"=
),10)||0)-(parseInt(g.css("borderBottomWidth"),10)||0)+(parseInt(g.css("mar=
ginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(b,i,=
e),this._animateOff=3D!0,!0))},_mouseStart:function(a){return!0},_mouseDrag=
:function(a){var b=3D{x:a.pageX,y:a.pageY},c=3Dthis._normValueFromMouse(b);=
return this._slide(a,this._handleIndex,c),!1},_mouseStop:function(a){return=
 this.handles.removeClass("ui-state-active"),this._mouseSliding=3D!1,this._=
stop(a,this._handleIndex),this._change(a,this._handleIndex),this._handleInd=
ex=3Dnull,this._clickOffset=3Dnull,this._animateOff=3D!1,!1},_detectOrienta=
tion:function(){this.orientation=3Dthis.options.orientation=3D=3D=3D"vertic=
al"?"vertical":"horizontal"},_normValueFromMouse:function(a){var b,c,d,e,f;=
return this.orientation=3D=3D=3D"horizontal"?(b=3Dthis.elementSize.width,c=
=3Da.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)=
):(b=3Dthis.elementSize.height,c=3Da.y-this.elementOffset.top-(this._clickO=
ffset?this._clickOffset.top:0)),d=3Dc/b,d>1&&(d=3D1),d<0&&(d=3D0),this.orie=
ntation=3D=3D=3D"vertical"&&(d=3D1-d),e=3Dthis._valueMax()-this._valueMin()=
,f=3Dthis._valueMin()+d*e,this._trimAlignValue(f)},_start:function(a,b){var=
 c=3D{handle:this.handles[b],value:this.value()};return this.options.values=
&&this.options.values.length&&(c.value=3Dthis.values(b),c.values=3Dthis.val=
ues()),this._trigger("start",a,c)},_slide:function(a,b,c){var d,e,f;this.op=
tions.values&&this.options.values.length?(d=3Dthis.values(b?0:1),this.optio=
ns.values.length=3D=3D=3D2&&this.options.range=3D=3D=3D!0&&(b=3D=3D=3D0&&c>=
d||b=3D=3D=3D1&&c<d)&&(c=3Dd),c!=3D=3Dthis.values(b)&&(e=3Dthis.values(),e[=
b]=3Dc,f=3Dthis._trigger("slide",a,{handle:this.handles[b],value:c,values:e=
}),d=3Dthis.values(b?0:1),f!=3D=3D!1&&this.values(b,c,!0))):c!=3D=3Dthis.va=
lue()&&(f=3Dthis._trigger("slide",a,{handle:this.handles[b],value:c}),f!=3D=
=3D!1&&this.value(c))},_stop:function(a,b){var c=3D{handle:this.handles[b],=
value:this.value()};this.options.values&&this.options.values.length&&(c.val=
ue=3Dthis.values(b),c.values=3Dthis.values()),this._trigger("stop",a,c)},_c=
hange:function(a,b){if(!this._keySliding&&!this._mouseSliding){var c=3D{han=
dle:this.handles[b],value:this.value()};this.options.values&&this.options.v=
alues.length&&(c.value=3Dthis.values(b),c.values=3Dthis.values()),this._tri=
gger("change",a,c)}},value:function(a){if(arguments.length){this.options.va=
lue=3Dthis._trimAlignValue(a),this._refreshValue(),this._change(null,0);ret=
urn}return this._value()},values:function(b,c){var d,e,f;if(arguments.lengt=
h>1){this.options.values[b]=3Dthis._trimAlignValue(c),this._refreshValue(),=
this._change(null,b);return}if(!arguments.length)return this._values();if(!=
a.isArray(arguments[0]))return this.options.values&&this.options.values.len=
gth?this._values(b):this.value();d=3Dthis.options.values,e=3Darguments[0];f=
or(f=3D0;f<d.length;f+=3D1)d[f]=3Dthis._trimAlignValue(e[f]),this._change(n=
ull,f);this._refreshValue()},_setOption:function(b,c){var d,e=3D0;a.isArray=
(this.options.values)&&(e=3Dthis.options.values.length),a.Widget.prototype.=
_setOption.apply(this,arguments);switch(b){case"disabled":c?(this.handles.f=
ilter(".ui-state-focus").blur(),this.handles.removeClass("ui-state-hover"),=
this.handles.propAttr("disabled",!0),this.element.addClass("ui-disabled")):=
(this.handles.propAttr("disabled",!1),this.element.removeClass("ui-disabled=
"));break;case"orientation":this._detectOrientation(),this.element.removeCl=
ass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.o=
rientation),this._refreshValue();break;case"value":this._animateOff=3D!0,th=
is._refreshValue(),this._change(null,0),this._animateOff=3D!1;break;case"va=
lues":this._animateOff=3D!0,this._refreshValue();for(d=3D0;d<e;d+=3D1)this.=
_change(null,d);this._animateOff=3D!1}},_value:function(){var a=3Dthis.opti=
ons.value;return a=3Dthis._trimAlignValue(a),a},_values:function(a){var b,c=
,d;if(arguments.length)return b=3Dthis.options.values[a],b=3Dthis._trimAlig=
nValue(b),b;c=3Dthis.options.values.slice();for(d=3D0;d<c.length;d+=3D1)c[d=
]=3Dthis._trimAlignValue(c[d]);return c},_trimAlignValue:function(a){if(a<=
=3Dthis._valueMin())return this._valueMin();if(a>=3Dthis._valueMax())return=
 this._valueMax();var b=3Dthis.options.step>0?this.options.step:1,c=3D(a-th=
is._valueMin())%b,d=3Da-c;return Math.abs(c)*2>=3Db&&(d+=3Dc>0?b:-b),parseF=
loat(d.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax=
:function(){return this.options.max},_refreshValue:function(){var b=3Dthis.=
options.range,c=3Dthis.options,d=3Dthis,e=3Dthis._animateOff?!1:c.animate,f=
,g=3D{},h,i,j,k;this.options.values&&this.options.values.length?this.handle=
s.each(function(b,i){f=3D(d.values(b)-d._valueMin())/(d._valueMax()-d._valu=
eMin())*100,g[d.orientation=3D=3D=3D"horizontal"?"left":"bottom"]=3Df+"%",a=
(this).stop(1,1)[e?"animate":"css"](g,c.animate),d.options.range=3D=3D=3D!0=
&&(d.orientation=3D=3D=3D"horizontal"?(b=3D=3D=3D0&&d.range.stop(1,1)[e?"an=
imate":"css"]({left:f+"%"},c.animate),b=3D=3D=3D1&&d.range[e?"animate":"css=
"]({width:f-h+"%"},{queue:!1,duration:c.animate})):(b=3D=3D=3D0&&d.range.st=
op(1,1)[e?"animate":"css"]({bottom:f+"%"},c.animate),b=3D=3D=3D1&&d.range[e=
?"animate":"css"]({height:f-h+"%"},{queue:!1,duration:c.animate}))),h=3Df})=
:(i=3Dthis.value(),j=3Dthis._valueMin(),k=3Dthis._valueMax(),f=3Dk!=3D=3Dj?=
(i-j)/(k-j)*100:0,g[d.orientation=3D=3D=3D"horizontal"?"left":"bottom"]=3Df=
+"%",this.handle.stop(1,1)[e?"animate":"css"](g,c.animate),b=3D=3D=3D"min"&=
&this.orientation=3D=3D=3D"horizontal"&&this.range.stop(1,1)[e?"animate":"c=
ss"]({width:f+"%"},c.animate),b=3D=3D=3D"max"&&this.orientation=3D=3D=3D"ho=
rizontal"&&this.range[e?"animate":"css"]({width:100-f+"%"},{queue:!1,durati=
on:c.animate}),b=3D=3D=3D"min"&&this.orientation=3D=3D=3D"vertical"&&this.r=
ange.stop(1,1)[e?"animate":"css"]({height:f+"%"},c.animate),b=3D=3D=3D"max"=
&&this.orientation=3D=3D=3D"vertical"&&this.range[e?"animate":"css"]({heigh=
t:100-f+"%"},{queue:!1,duration:c.animate}))}}),a.extend(a.ui.slider,{versi=
on:"1.8.23"})})(jQuery);;/*! jQuery UI - v1.8.23 - 2012-08-15
 * https://github.com/jquery/jquery-ui
 * Includes: jquery.ui.tabs.js
 * Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){function e(){return++c}function f(){return++d}var c=3D0,d=
=3D0;a.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:!1,cookie=
:null,collapsible:!1,disable:null,disabled:[],enable:null,event:"click",fx:=
null,idPrefix:"ui-tabs-",load:null,panelTemplate:"<div></div>",remove:null,=
select:null,show:null,spinner:"<em>Loading&#8230;</em>",tabTemplate:"<li><a=
 href=3D'#{href}'><span>#{label}</span></a></li>"},_create:function(){this.=
_tabify(!0)},_setOption:function(a,b){if(a=3D=3D"selected"){if(this.options=
.collapsible&&b=3D=3Dthis.options.selected)return;this.select(b)}else this.=
options[a]=3Db,this._tabify()},_tabId:function(a){return a.title&&a.title.r=
eplace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix=
+e()},_sanitizeSelector:function(a){return a.replace(/:/g,"\\:")},_cookie:f=
unction(){var b=3Dthis.cookie||(this.cookie=3Dthis.options.cookie.name||"ui=
-tabs-"+f());return a.cookie.apply(null,[b].concat(a.makeArray(arguments)))=
},_ui:function(a,b){return{tab:a,panel:b,index:this.anchors.index(a)}},_cle=
anup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-sta=
te-processing").find("span:data(label.tabs)").each(function(){var b=3Da(thi=
s);b.html(b.data("label.tabs")).removeData("label.tabs")})},_tabify:functio=
n(c){function m(b,c){b.css("display",""),!a.support.opacity&&c.opacity&&b[0=
].style.removeAttribute("filter")}var d=3Dthis,e=3Dthis.options,f=3D/^#.+/;=
this.list=3Dthis.element.find("ol,ul").eq(0),this.lis=3Da(" > li:has(a[href=
])",this.list),this.anchors=3Dthis.lis.map(function(){return a("a",this)[0]=
}),this.panels=3Da([]),this.anchors.each(function(b,c){var g=3Da(c).attr("h=
ref"),h=3Dg.split("#")[0],i;h&&(h=3D=3D=3Dlocation.toString().split("#")[0]=
||(i=3Da("base")[0])&&h=3D=3D=3Di.href)&&(g=3Dc.hash,c.href=3Dg);if(f.test(=
g))d.panels=3Dd.panels.add(d.element.find(d._sanitizeSelector(g)));else if(=
g&&g!=3D=3D"#"){a.data(c,"href.tabs",g),a.data(c,"load.tabs",g.replace(/#.*=
$/,""));var j=3Dd._tabId(c);c.href=3D"#"+j;var k=3Dd.element.find("#"+j);k.=
length||(k=3Da(e.panelTemplate).attr("id",j).addClass("ui-tabs-panel ui-wid=
get-content ui-corner-bottom").insertAfter(d.panels[b-1]||d.list),k.data("d=
estroy.tabs",!0)),d.panels=3Dd.panels.add(k)}else e.disabled.push(b)}),c?(t=
his.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all"),t=
his.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget=
-header ui-corner-all"),this.lis.addClass("ui-state-default ui-corner-top")=
,this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom"),e=
.selected=3D=3D=3Db?(location.hash&&this.anchors.each(function(a,b){if(b.ha=
sh=3D=3Dlocation.hash)return e.selected=3Da,!1}),typeof e.selected!=3D"numb=
er"&&e.cookie&&(e.selected=3DparseInt(d._cookie(),10)),typeof e.selected!=
=3D"number"&&this.lis.filter(".ui-tabs-selected").length&&(e.selected=3Dthi=
s.lis.index(this.lis.filter(".ui-tabs-selected"))),e.selected=3De.selected|=
|(this.lis.length?0:-1)):e.selected=3D=3D=3Dnull&&(e.selected=3D-1),e.selec=
ted=3De.selected>=3D0&&this.anchors[e.selected]||e.selected<0?e.selected:0,=
e.disabled=3Da.unique(e.disabled.concat(a.map(this.lis.filter(".ui-state-di=
sabled"),function(a,b){return d.lis.index(a)}))).sort(),a.inArray(e.selecte=
d,e.disabled)!=3D-1&&e.disabled.splice(a.inArray(e.selected,e.disabled),1),=
this.panels.addClass("ui-tabs-hide"),this.lis.removeClass("ui-tabs-selected=
 ui-state-active"),e.selected>=3D0&&this.anchors.length&&(d.element.find(d.=
_sanitizeSelector(d.anchors[e.selected].hash)).removeClass("ui-tabs-hide"),=
this.lis.eq(e.selected).addClass("ui-tabs-selected ui-state-active"),d.elem=
ent.queue("tabs",function(){d._trigger("show",null,d._ui(d.anchors[e.select=
ed],d.element.find(d._sanitizeSelector(d.anchors[e.selected].hash))[0]))}),=
this.load(e.selected)),a(window).bind("unload",function(){d.lis.add(d.ancho=
rs).unbind(".tabs"),d.lis=3Dd.anchors=3Dd.panels=3Dnull})):e.selected=3Dthi=
s.lis.index(this.lis.filter(".ui-tabs-selected")),this.element[e.collapsibl=
e?"addClass":"removeClass"]("ui-tabs-collapsible"),e.cookie&&this._cookie(e=
.selected,e.cookie);for(var g=3D0,h;h=3Dthis.lis[g];g++)a(h)[a.inArray(g,e.=
disabled)!=3D-1&&!a(h).hasClass("ui-tabs-selected")?"addClass":"removeClass=
"]("ui-state-disabled");e.cache=3D=3D=3D!1&&this.anchors.removeData("cache.=
tabs"),this.lis.add(this.anchors).unbind(".tabs");if(e.event!=3D=3D"mouseov=
er"){var i=3Dfunction(a,b){b.is(":not(.ui-state-disabled)")&&b.addClass("ui=
-state-"+a)},j=3Dfunction(a,b){b.removeClass("ui-state-"+a)};this.lis.bind(=
"mouseover.tabs",function(){i("hover",a(this))}),this.lis.bind("mouseout.ta=
bs",function(){j("hover",a(this))}),this.anchors.bind("focus.tabs",function=
(){i("focus",a(this).closest("li"))}),this.anchors.bind("blur.tabs",functio=
n(){j("focus",a(this).closest("li"))})}var k,l;e.fx&&(a.isArray(e.fx)?(k=3D=
e.fx[0],l=3De.fx[1]):k=3Dl=3De.fx);var n=3Dl?function(b,c){a(b).closest("li=
").addClass("ui-tabs-selected ui-state-active"),c.hide().removeClass("ui-ta=
bs-hide").animate(l,l.duration||"normal",function(){m(c,l),d._trigger("show=
",null,d._ui(b,c[0]))})}:function(b,c){a(b).closest("li").addClass("ui-tabs=
-selected ui-state-active"),c.removeClass("ui-tabs-hide"),d._trigger("show"=
,null,d._ui(b,c[0]))},o=3Dk?function(a,b){b.animate(k,k.duration||"normal",=
function(){d.lis.removeClass("ui-tabs-selected ui-state-active"),b.addClass=
("ui-tabs-hide"),m(b,k),d.element.dequeue("tabs")})}:function(a,b,c){d.lis.=
removeClass("ui-tabs-selected ui-state-active"),b.addClass("ui-tabs-hide"),=
d.element.dequeue("tabs")};this.anchors.bind(e.event+".tabs",function(){var=
 b=3Dthis,c=3Da(b).closest("li"),f=3Dd.panels.filter(":not(.ui-tabs-hide)")=
,g=3Dd.element.find(d._sanitizeSelector(b.hash));if(c.hasClass("ui-tabs-sel=
ected")&&!e.collapsible||c.hasClass("ui-state-disabled")||c.hasClass("ui-st=
ate-processing")||d.panels.filter(":animated").length||d._trigger("select",=
null,d._ui(this,g[0]))=3D=3D=3D!1)return this.blur(),!1;e.selected=3Dd.anch=
ors.index(this),d.abort();if(e.collapsible){if(c.hasClass("ui-tabs-selected=
"))return e.selected=3D-1,e.cookie&&d._cookie(e.selected,e.cookie),d.elemen=
t.queue("tabs",function(){o(b,f)}).dequeue("tabs"),this.blur(),!1;if(!f.len=
gth)return e.cookie&&d._cookie(e.selected,e.cookie),d.element.queue("tabs",=
function(){n(b,g)}),d.load(d.anchors.index(this)),this.blur(),!1}e.cookie&&=
d._cookie(e.selected,e.cookie);if(g.length)f.length&&d.element.queue("tabs"=
,function(){o(b,f)}),d.element.queue("tabs",function(){n(b,g)}),d.load(d.an=
chors.index(this));else throw"jQuery UI Tabs: Mismatching fragment identifi=
er.";a.browser.msie&&this.blur()}),this.anchors.bind("click.tabs",function(=
){return!1})},_getIndex:function(a){return typeof a=3D=3D"string"&&(a=3Dthi=
s.anchors.index(this.anchors.filter("[href$=3D'"+a+"']"))),a},destroy:funct=
ion(){var b=3Dthis.options;return this.abort(),this.element.unbind(".tabs")=
.removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-col=
lapsible").removeData("tabs"),this.list.removeClass("ui-tabs-nav ui-helper-=
reset ui-helper-clearfix ui-widget-header ui-corner-all"),this.anchors.each=
(function(){var b=3Da.data(this,"href.tabs");b&&(this.href=3Db);var c=3Da(t=
his).unbind(".tabs");a.each(["href","load","cache"],function(a,b){c.removeD=
ata(b+".tabs")})}),this.lis.unbind(".tabs").add(this.panels).each(function(=
){a.data(this,"destroy.tabs")?a(this).remove():a(this).removeClass(["ui-sta=
te-default","ui-corner-top","ui-tabs-selected","ui-state-active","ui-state-=
hover","ui-state-focus","ui-state-disabled","ui-tabs-panel","ui-widget-cont=
ent","ui-corner-bottom","ui-tabs-hide"].join(" "))}),b.cookie&&this._cookie=
(null,b.cookie),this},add:function(c,d,e){e=3D=3D=3Db&&(e=3Dthis.anchors.le=
ngth);var f=3Dthis,g=3Dthis.options,h=3Da(g.tabTemplate.replace(/#\{href\}/=
g,c).replace(/#\{label\}/g,d)),i=3Dc.indexOf("#")?this._tabId(a("a",h)[0]):=
c.replace("#","");h.addClass("ui-state-default ui-corner-top").data("destro=
y.tabs",!0);var j=3Df.element.find("#"+i);return j.length||(j=3Da(g.panelTe=
mplate).attr("id",i).data("destroy.tabs",!0)),j.addClass("ui-tabs-panel ui-=
widget-content ui-corner-bottom ui-tabs-hide"),e>=3Dthis.lis.length?(h.appe=
ndTo(this.list),j.appendTo(this.list[0].parentNode)):(h.insertBefore(this.l=
is[e]),j.insertBefore(this.panels[e])),g.disabled=3Da.map(g.disabled,functi=
on(a,b){return a>=3De?++a:a}),this._tabify(),this.anchors.length=3D=3D1&&(g=
.selected=3D0,h.addClass("ui-tabs-selected ui-state-active"),j.removeClass(=
"ui-tabs-hide"),this.element.queue("tabs",function(){f._trigger("show",null=
,f._ui(f.anchors[0],f.panels[0]))}),this.load(0)),this._trigger("add",null,=
this._ui(this.anchors[e],this.panels[e])),this},remove:function(b){b=3Dthis=
._getIndex(b);var c=3Dthis.options,d=3Dthis.lis.eq(b).remove(),e=3Dthis.pan=
els.eq(b).remove();return d.hasClass("ui-tabs-selected")&&this.anchors.leng=
th>1&&this.select(b+(b+1<this.anchors.length?1:-1)),c.disabled=3Da.map(a.gr=
ep(c.disabled,function(a,c){return a!=3Db}),function(a,c){return a>=3Db?--a=
:a}),this._tabify(),this._trigger("remove",null,this._ui(d.find("a")[0],e[0=
])),this},enable:function(b){b=3Dthis._getIndex(b);var c=3Dthis.options;if(=
a.inArray(b,c.disabled)=3D=3D-1)return;return this.lis.eq(b).removeClass("u=
i-state-disabled"),c.disabled=3Da.grep(c.disabled,function(a,c){return a!=
=3Db}),this._trigger("enable",null,this._ui(this.anchors[b],this.panels[b])=
),this},disable:function(a){a=3Dthis._getIndex(a);var b=3Dthis,c=3Dthis.opt=
ions;return a!=3Dc.selected&&(this.lis.eq(a).addClass("ui-state-disabled"),=
c.disabled.push(a),c.disabled.sort(),this._trigger("disable",null,this._ui(=
this.anchors[a],this.panels[a]))),this},select:function(a){a=3Dthis._getInd=
ex(a);if(a=3D=3D-1)if(this.options.collapsible&&this.options.selected!=3D-1=
)a=3Dthis.options.selected;else return this;return this.anchors.eq(a).trigg=
er(this.options.event+".tabs"),this},load:function(b){b=3Dthis._getIndex(b)=
;var c=3Dthis,d=3Dthis.options,e=3Dthis.anchors.eq(b)[0],f=3Da.data(e,"load=
.tabs");this.abort();if(!f||this.element.queue("tabs").length!=3D=3D0&&a.da=
ta(e,"cache.tabs")){this.element.dequeue("tabs");return}this.lis.eq(b).addC=
lass("ui-state-processing");if(d.spinner){var g=3Da("span",e);g.data("label=
.tabs",g.html()).html(d.spinner)}return this.xhr=3Da.ajax(a.extend({},d.aja=
xOptions,{url:f,success:function(f,g){c.element.find(c._sanitizeSelector(e.=
hash)).html(f),c._cleanup(),d.cache&&a.data(e,"cache.tabs",!0),c._trigger("=
load",null,c._ui(c.anchors[b],c.panels[b]));try{d.ajaxOptions.success(f,g)}=
catch(h){}},error:function(a,f,g){c._cleanup(),c._trigger("load",null,c._ui=
(c.anchors[b],c.panels[b]));try{d.ajaxOptions.error(a,f,b,e)}catch(g){}}}))=
,c.element.dequeue("tabs"),this},abort:function(){return this.element.queue=
([]),this.panels.stop(!1,!0),this.element.queue("tabs",this.element.queue("=
tabs").splice(-2,2)),this.xhr&&(this.xhr.abort(),delete this.xhr),this._cle=
anup(),this},url:function(a,b){return this.anchors.eq(a).removeData("cache.=
tabs").data("load.tabs",b),this},length:function(){return this.anchors.leng=
th}}),a.extend(a.ui.tabs,{version:"1.8.22"}),a.extend(a.ui.tabs.prototype,{=
rotation:null,rotate:function(a,b){var c=3Dthis,d=3Dthis.options,e=3Dc._rot=
ate||(c._rotate=3Dfunction(b){clearTimeout(c.rotation),c.rotation=3DsetTime=
out(function(){var a=3Dd.selected;c.select(++a<c.anchors.length?a:0)},a),b&=
&b.stopPropagation()}),f=3Dc._unrotate||(c._unrotate=3Db?function(a){e()}:f=
unction(a){a.clientX&&c.rotate(null)});return a?(this.element.bind("tabssho=
w",e),this.anchors.bind(d.event+".tabs",f),e()):(clearTimeout(c.rotation),t=
his.element.unbind("tabsshow",e),this.anchors.unbind(d.event+".tabs",f),del=
ete this._rotate,delete this._unrotate),this}})})(jQuery);;/*! jQuery UI - =
v1.8.22 - 2012-07-24
+(function(a,b){function e(){return++c}function f(){return++d}var c=3D0,d=
=3D0;a.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:!1,cookie=
:null,collapsible:!1,disable:null,disabled:[],enable:null,event:"click",fx:=
null,idPrefix:"ui-tabs-",load:null,panelTemplate:"<div></div>",remove:null,=
select:null,show:null,spinner:"<em>Loading&#8230;</em>",tabTemplate:"<li><a=
 href=3D'#{href}'><span>#{label}</span></a></li>"},_create:function(){this.=
_tabify(!0)},_setOption:function(a,b){if(a=3D=3D"selected"){if(this.options=
.collapsible&&b=3D=3Dthis.options.selected)return;this.select(b)}else this.=
options[a]=3Db,this._tabify()},_tabId:function(a){return a.title&&a.title.r=
eplace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix=
+e()},_sanitizeSelector:function(a){return a.replace(/:/g,"\\:")},_cookie:f=
unction(){var b=3Dthis.cookie||(this.cookie=3Dthis.options.cookie.name||"ui=
-tabs-"+f());return a.cookie.apply(null,[b].concat(a.makeArray(arguments)))=
},_ui:function(a,b){return{tab:a,panel:b,index:this.anchors.index(a)}},_cle=
anup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-sta=
te-processing").find("span:data(label.tabs)").each(function(){var b=3Da(thi=
s);b.html(b.data("label.tabs")).removeData("label.tabs")})},_tabify:functio=
n(c){function m(b,c){b.css("display",""),!a.support.opacity&&c.opacity&&b[0=
].style.removeAttribute("filter")}var d=3Dthis,e=3Dthis.options,f=3D/^#.+/;=
this.list=3Dthis.element.find("ol,ul").eq(0),this.lis=3Da(" > li:has(a[href=
])",this.list),this.anchors=3Dthis.lis.map(function(){return a("a",this)[0]=
}),this.panels=3Da([]),this.anchors.each(function(b,c){var g=3Da(c).attr("h=
ref"),h=3Dg.split("#")[0],i;h&&(h=3D=3D=3Dlocation.toString().split("#")[0]=
||(i=3Da("base")[0])&&h=3D=3D=3Di.href)&&(g=3Dc.hash,c.href=3Dg);if(f.test(=
g))d.panels=3Dd.panels.add(d.element.find(d._sanitizeSelector(g)));else if(=
g&&g!=3D=3D"#"){a.data(c,"href.tabs",g),a.data(c,"load.tabs",g.replace(/#.*=
$/,""));var j=3Dd._tabId(c);c.href=3D"#"+j;var k=3Dd.element.find("#"+j);k.=
length||(k=3Da(e.panelTemplate).attr("id",j).addClass("ui-tabs-panel ui-wid=
get-content ui-corner-bottom").insertAfter(d.panels[b-1]||d.list),k.data("d=
estroy.tabs",!0)),d.panels=3Dd.panels.add(k)}else e.disabled.push(b)}),c?(t=
his.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all"),t=
his.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget=
-header ui-corner-all"),this.lis.addClass("ui-state-default ui-corner-top")=
,this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom"),e=
.selected=3D=3D=3Db?(location.hash&&this.anchors.each(function(a,b){if(b.ha=
sh=3D=3Dlocation.hash)return e.selected=3Da,!1}),typeof e.selected!=3D"numb=
er"&&e.cookie&&(e.selected=3DparseInt(d._cookie(),10)),typeof e.selected!=
=3D"number"&&this.lis.filter(".ui-tabs-selected").length&&(e.selected=3Dthi=
s.lis.index(this.lis.filter(".ui-tabs-selected"))),e.selected=3De.selected|=
|(this.lis.length?0:-1)):e.selected=3D=3D=3Dnull&&(e.selected=3D-1),e.selec=
ted=3De.selected>=3D0&&this.anchors[e.selected]||e.selected<0?e.selected:0,=
e.disabled=3Da.unique(e.disabled.concat(a.map(this.lis.filter(".ui-state-di=
sabled"),function(a,b){return d.lis.index(a)}))).sort(),a.inArray(e.selecte=
d,e.disabled)!=3D-1&&e.disabled.splice(a.inArray(e.selected,e.disabled),1),=
this.panels.addClass("ui-tabs-hide"),this.lis.removeClass("ui-tabs-selected=
 ui-state-active"),e.selected>=3D0&&this.anchors.length&&(d.element.find(d.=
_sanitizeSelector(d.anchors[e.selected].hash)).removeClass("ui-tabs-hide"),=
this.lis.eq(e.selected).addClass("ui-tabs-selected ui-state-active"),d.elem=
ent.queue("tabs",function(){d._trigger("show",null,d._ui(d.anchors[e.select=
ed],d.element.find(d._sanitizeSelector(d.anchors[e.selected].hash))[0]))}),=
this.load(e.selected)),a(window).bind("unload",function(){d.lis.add(d.ancho=
rs).unbind(".tabs"),d.lis=3Dd.anchors=3Dd.panels=3Dnull})):e.selected=3Dthi=
s.lis.index(this.lis.filter(".ui-tabs-selected")),this.element[e.collapsibl=
e?"addClass":"removeClass"]("ui-tabs-collapsible"),e.cookie&&this._cookie(e=
.selected,e.cookie);for(var g=3D0,h;h=3Dthis.lis[g];g++)a(h)[a.inArray(g,e.=
disabled)!=3D-1&&!a(h).hasClass("ui-tabs-selected")?"addClass":"removeClass=
"]("ui-state-disabled");e.cache=3D=3D=3D!1&&this.anchors.removeData("cache.=
tabs"),this.lis.add(this.anchors).unbind(".tabs");if(e.event!=3D=3D"mouseov=
er"){var i=3Dfunction(a,b){b.is(":not(.ui-state-disabled)")&&b.addClass("ui=
-state-"+a)},j=3Dfunction(a,b){b.removeClass("ui-state-"+a)};this.lis.bind(=
"mouseover.tabs",function(){i("hover",a(this))}),this.lis.bind("mouseout.ta=
bs",function(){j("hover",a(this))}),this.anchors.bind("focus.tabs",function=
(){i("focus",a(this).closest("li"))}),this.anchors.bind("blur.tabs",functio=
n(){j("focus",a(this).closest("li"))})}var k,l;e.fx&&(a.isArray(e.fx)?(k=3D=
e.fx[0],l=3De.fx[1]):k=3Dl=3De.fx);var n=3Dl?function(b,c){a(b).closest("li=
").addClass("ui-tabs-selected ui-state-active"),c.hide().removeClass("ui-ta=
bs-hide").animate(l,l.duration||"normal",function(){m(c,l),d._trigger("show=
",null,d._ui(b,c[0]))})}:function(b,c){a(b).closest("li").addClass("ui-tabs=
-selected ui-state-active"),c.removeClass("ui-tabs-hide"),d._trigger("show"=
,null,d._ui(b,c[0]))},o=3Dk?function(a,b){b.animate(k,k.duration||"normal",=
function(){d.lis.removeClass("ui-tabs-selected ui-state-active"),b.addClass=
("ui-tabs-hide"),m(b,k),d.element.dequeue("tabs")})}:function(a,b,c){d.lis.=
removeClass("ui-tabs-selected ui-state-active"),b.addClass("ui-tabs-hide"),=
d.element.dequeue("tabs")};this.anchors.bind(e.event+".tabs",function(){var=
 b=3Dthis,c=3Da(b).closest("li"),f=3Dd.panels.filter(":not(.ui-tabs-hide)")=
,g=3Dd.element.find(d._sanitizeSelector(b.hash));if(c.hasClass("ui-tabs-sel=
ected")&&!e.collapsible||c.hasClass("ui-state-disabled")||c.hasClass("ui-st=
ate-processing")||d.panels.filter(":animated").length||d._trigger("select",=
null,d._ui(this,g[0]))=3D=3D=3D!1)return this.blur(),!1;e.selected=3Dd.anch=
ors.index(this),d.abort();if(e.collapsible){if(c.hasClass("ui-tabs-selected=
"))return e.selected=3D-1,e.cookie&&d._cookie(e.selected,e.cookie),d.elemen=
t.queue("tabs",function(){o(b,f)}).dequeue("tabs"),this.blur(),!1;if(!f.len=
gth)return e.cookie&&d._cookie(e.selected,e.cookie),d.element.queue("tabs",=
function(){n(b,g)}),d.load(d.anchors.index(this)),this.blur(),!1}e.cookie&&=
d._cookie(e.selected,e.cookie);if(g.length)f.length&&d.element.queue("tabs"=
,function(){o(b,f)}),d.element.queue("tabs",function(){n(b,g)}),d.load(d.an=
chors.index(this));else throw"jQuery UI Tabs: Mismatching fragment identifi=
er.";a.browser.msie&&this.blur()}),this.anchors.bind("click.tabs",function(=
){return!1})},_getIndex:function(a){return typeof a=3D=3D"string"&&(a=3Dthi=
s.anchors.index(this.anchors.filter("[href$=3D'"+a+"']"))),a},destroy:funct=
ion(){var b=3Dthis.options;return this.abort(),this.element.unbind(".tabs")=
.removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-col=
lapsible").removeData("tabs"),this.list.removeClass("ui-tabs-nav ui-helper-=
reset ui-helper-clearfix ui-widget-header ui-corner-all"),this.anchors.each=
(function(){var b=3Da.data(this,"href.tabs");b&&(this.href=3Db);var c=3Da(t=
his).unbind(".tabs");a.each(["href","load","cache"],function(a,b){c.removeD=
ata(b+".tabs")})}),this.lis.unbind(".tabs").add(this.panels).each(function(=
){a.data(this,"destroy.tabs")?a(this).remove():a(this).removeClass(["ui-sta=
te-default","ui-corner-top","ui-tabs-selected","ui-state-active","ui-state-=
hover","ui-state-focus","ui-state-disabled","ui-tabs-panel","ui-widget-cont=
ent","ui-corner-bottom","ui-tabs-hide"].join(" "))}),b.cookie&&this._cookie=
(null,b.cookie),this},add:function(c,d,e){e=3D=3D=3Db&&(e=3Dthis.anchors.le=
ngth);var f=3Dthis,g=3Dthis.options,h=3Da(g.tabTemplate.replace(/#\{href\}/=
g,c).replace(/#\{label\}/g,d)),i=3Dc.indexOf("#")?this._tabId(a("a",h)[0]):=
c.replace("#","");h.addClass("ui-state-default ui-corner-top").data("destro=
y.tabs",!0);var j=3Df.element.find("#"+i);return j.length||(j=3Da(g.panelTe=
mplate).attr("id",i).data("destroy.tabs",!0)),j.addClass("ui-tabs-panel ui-=
widget-content ui-corner-bottom ui-tabs-hide"),e>=3Dthis.lis.length?(h.appe=
ndTo(this.list),j.appendTo(this.list[0].parentNode)):(h.insertBefore(this.l=
is[e]),j.insertBefore(this.panels[e])),g.disabled=3Da.map(g.disabled,functi=
on(a,b){return a>=3De?++a:a}),this._tabify(),this.anchors.length=3D=3D1&&(g=
.selected=3D0,h.addClass("ui-tabs-selected ui-state-active"),j.removeClass(=
"ui-tabs-hide"),this.element.queue("tabs",function(){f._trigger("show",null=
,f._ui(f.anchors[0],f.panels[0]))}),this.load(0)),this._trigger("add",null,=
this._ui(this.anchors[e],this.panels[e])),this},remove:function(b){b=3Dthis=
._getIndex(b);var c=3Dthis.options,d=3Dthis.lis.eq(b).remove(),e=3Dthis.pan=
els.eq(b).remove();return d.hasClass("ui-tabs-selected")&&this.anchors.leng=
th>1&&this.select(b+(b+1<this.anchors.length?1:-1)),c.disabled=3Da.map(a.gr=
ep(c.disabled,function(a,c){return a!=3Db}),function(a,c){return a>=3Db?--a=
:a}),this._tabify(),this._trigger("remove",null,this._ui(d.find("a")[0],e[0=
])),this},enable:function(b){b=3Dthis._getIndex(b);var c=3Dthis.options;if(=
a.inArray(b,c.disabled)=3D=3D-1)return;return this.lis.eq(b).removeClass("u=
i-state-disabled"),c.disabled=3Da.grep(c.disabled,function(a,c){return a!=
=3Db}),this._trigger("enable",null,this._ui(this.anchors[b],this.panels[b])=
),this},disable:function(a){a=3Dthis._getIndex(a);var b=3Dthis,c=3Dthis.opt=
ions;return a!=3Dc.selected&&(this.lis.eq(a).addClass("ui-state-disabled"),=
c.disabled.push(a),c.disabled.sort(),this._trigger("disable",null,this._ui(=
this.anchors[a],this.panels[a]))),this},select:function(a){a=3Dthis._getInd=
ex(a);if(a=3D=3D-1)if(this.options.collapsible&&this.options.selected!=3D-1=
)a=3Dthis.options.selected;else return this;return this.anchors.eq(a).trigg=
er(this.options.event+".tabs"),this},load:function(b){b=3Dthis._getIndex(b)=
;var c=3Dthis,d=3Dthis.options,e=3Dthis.anchors.eq(b)[0],f=3Da.data(e,"load=
.tabs");this.abort();if(!f||this.element.queue("tabs").length!=3D=3D0&&a.da=
ta(e,"cache.tabs")){this.element.dequeue("tabs");return}this.lis.eq(b).addC=
lass("ui-state-processing");if(d.spinner){var g=3Da("span",e);g.data("label=
.tabs",g.html()).html(d.spinner)}return this.xhr=3Da.ajax(a.extend({},d.aja=
xOptions,{url:f,success:function(f,g){c.element.find(c._sanitizeSelector(e.=
hash)).html(f),c._cleanup(),d.cache&&a.data(e,"cache.tabs",!0),c._trigger("=
load",null,c._ui(c.anchors[b],c.panels[b]));try{d.ajaxOptions.success(f,g)}=
catch(h){}},error:function(a,f,g){c._cleanup(),c._trigger("load",null,c._ui=
(c.anchors[b],c.panels[b]));try{d.ajaxOptions.error(a,f,b,e)}catch(g){}}}))=
,c.element.dequeue("tabs"),this},abort:function(){return this.element.queue=
([]),this.panels.stop(!1,!0),this.element.queue("tabs",this.element.queue("=
tabs").splice(-2,2)),this.xhr&&(this.xhr.abort(),delete this.xhr),this._cle=
anup(),this},url:function(a,b){return this.anchors.eq(a).removeData("cache.=
tabs").data("load.tabs",b),this},length:function(){return this.anchors.leng=
th}}),a.extend(a.ui.tabs,{version:"1.8.23"}),a.extend(a.ui.tabs.prototype,{=
rotation:null,rotate:function(a,b){var c=3Dthis,d=3Dthis.options,e=3Dc._rot=
ate||(c._rotate=3Dfunction(b){clearTimeout(c.rotation),c.rotation=3DsetTime=
out(function(){var a=3Dd.selected;c.select(++a<c.anchors.length?a:0)},a),b&=
&b.stopPropagation()}),f=3Dc._unrotate||(c._unrotate=3Db?function(a){e()}:f=
unction(a){a.clientX&&c.rotate(null)});return a?(this.element.bind("tabssho=
w",e),this.anchors.bind(d.event+".tabs",f),e()):(clearTimeout(c.rotation),t=
his.element.unbind("tabsshow",e),this.anchors.unbind(d.event+".tabs",f),del=
ete this._rotate,delete this._unrotate),this}})})(jQuery);;/*! jQuery UI - =
v1.8.23 - 2012-08-15
 * https://github.com/jquery/jquery-ui
 * Includes: jquery.ui.datepicker.js
 * Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function($,undefined){function Datepicker(){this.debug=3D!1,this._curInst=
=3Dnull,this._keyEvent=3D!1,this._disabledInputs=3D[],this._datepickerShowi=
ng=3D!1,this._inDialog=3D!1,this._mainDivId=3D"ui-datepicker-div",this._inl=
ineClass=3D"ui-datepicker-inline",this._appendClass=3D"ui-datepicker-append=
",this._triggerClass=3D"ui-datepicker-trigger",this._dialogClass=3D"ui-date=
picker-dialog",this._disableClass=3D"ui-datepicker-disabled",this._unselect=
ableClass=3D"ui-datepicker-unselectable",this._currentClass=3D"ui-datepicke=
r-current-day",this._dayOverClass=3D"ui-datepicker-days-cell-over",this.reg=
ional=3D[],this.regional[""]=3D{closeText:"Done",prevText:"Prev",nextText:"=
Next",currentText:"Today",monthNames:["January","February","March","April",=
"May","June","July","August","September","October","November","December"],m=
onthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct"=
,"Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday",=
"Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sa=
t"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFo=
rmat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},th=
is._defaults=3D{showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate=
:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hide=
IfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,cha=
ngeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,sh=
owWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null=
,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:n=
ull,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0=
,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,s=
howButtonPanel:!1,autoSize:!1,disabled:!1},$.extend(this._defaults,this.reg=
ional[""]),this.dpDiv=3DbindHover($('<div id=3D"'+this._mainDivId+'" class=
=3D"ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-=
all"></div>'))}function bindHover(a){var b=3D"button, .ui-datepicker-prev, =
.ui-datepicker-next, .ui-datepicker-calendar td a";return a.bind("mouseout"=
,function(a){var c=3D$(a.target).closest(b);if(!c.length)return;c.removeCla=
ss("ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover")}).bi=
nd("mouseover",function(c){var d=3D$(c.target).closest(b);if($.datepicker._=
isDisabledDatepicker(instActive.inline?a.parent()[0]:instActive.input[0])||=
!d.length)return;d.parents(".ui-datepicker-calendar").find("a").removeClass=
("ui-state-hover"),d.addClass("ui-state-hover"),d.hasClass("ui-datepicker-p=
rev")&&d.addClass("ui-datepicker-prev-hover"),d.hasClass("ui-datepicker-nex=
t")&&d.addClass("ui-datepicker-next-hover")})}function extendRemove(a,b){$.=
extend(a,b);for(var c in b)if(b[c]=3D=3Dnull||b[c]=3D=3Dundefined)a[c]=3Db[=
c];return a}function isArray(a){return a&&($.browser.safari&&typeof a=3D=3D=
"object"&&a.length||a.constructor&&a.constructor.toString().match(/\Array\(=
\)/))}$.extend($.ui,{datepicker:{version:"1.8.22"}});var PROP_NAME=3D"datep=
icker",dpuuid=3D(new Date).getTime(),instActive;$.extend(Datepicker.prototy=
pe,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&co=
nsole.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpD=
iv},setDefaults:function(a){return extendRemove(this._defaults,a||{}),this}=
,_attachDatepicker:function(target,settings){var inlineSettings=3Dnull;for(=
var attrName in this._defaults){var attrValue=3Dtarget.getAttribute("date:"=
+attrName);if(attrValue){inlineSettings=3DinlineSettings||{};try{inlineSett=
ings[attrName]=3Deval(attrValue)}catch(err){inlineSettings[attrName]=3Dattr=
Value}}}var nodeName=3Dtarget.nodeName.toLowerCase(),inline=3DnodeName=3D=
=3D"div"||nodeName=3D=3D"span";target.id||(this.uuid+=3D1,target.id=3D"dp"+=
this.uuid);var inst=3Dthis._newInst($(target),inline);inst.settings=3D$.ext=
end({},settings||{},inlineSettings||{}),nodeName=3D=3D"input"?this._connect=
Datepicker(target,inst):inline&&this._inlineDatepicker(target,inst)},_newIn=
st:function(a,b){var c=3Da[0].id.replace(/([^A-Za-z0-9_-])/g,"\\\\$1");retu=
rn{id:c,input:a,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,dr=
awYear:0,inline:b,dpDiv:b?bindHover($('<div class=3D"'+this._inlineClass+' =
ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"=
></div>')):this.dpDiv}},_connectDatepicker:function(a,b){var c=3D$(a);b.app=
end=3D$([]),b.trigger=3D$([]);if(c.hasClass(this.markerClassName))return;th=
is._attachments(c,b),c.addClass(this.markerClassName).keydown(this._doKeyDo=
wn).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicke=
r",function(a,c,d){b.settings[c]=3Dd}).bind("getData.datepicker",function(a=
,c){return this._get(b,c)}),this._autoSize(b),$.data(a,PROP_NAME,b),b.setti=
ngs.disabled&&this._disableDatepicker(a)},_attachments:function(a,b){var c=
=3Dthis._get(b,"appendText"),d=3Dthis._get(b,"isRTL");b.append&&b.append.re=
move(),c&&(b.append=3D$('<span class=3D"'+this._appendClass+'">'+c+"</span>=
"),a[d?"before":"after"](b.append)),a.unbind("focus",this._showDatepicker),=
b.trigger&&b.trigger.remove();var e=3Dthis._get(b,"showOn");(e=3D=3D"focus"=
||e=3D=3D"both")&&a.focus(this._showDatepicker);if(e=3D=3D"button"||e=3D=3D=
"both"){var f=3Dthis._get(b,"buttonText"),g=3Dthis._get(b,"buttonImage");b.=
trigger=3D$(this._get(b,"buttonImageOnly")?$("<img/>").addClass(this._trigg=
erClass).attr({src:g,alt:f,title:f}):$('<button type=3D"button"></button>')=
.addClass(this._triggerClass).html(g=3D=3D""?f:$("<img/>").attr({src:g,alt:=
f,title:f}))),a[d?"before":"after"](b.trigger),b.trigger.click(function(){r=
eturn $.datepicker._datepickerShowing&&$.datepicker._lastInput=3D=3Da[0]?$.=
datepicker._hideDatepicker():$.datepicker._datepickerShowing&&$.datepicker.=
_lastInput!=3Da[0]?($.datepicker._hideDatepicker(),$.datepicker._showDatepi=
cker(a[0])):$.datepicker._showDatepicker(a[0]),!1})}},_autoSize:function(a)=
{if(this._get(a,"autoSize")&&!a.inline){var b=3Dnew Date(2009,11,20),c=3Dth=
is._get(a,"dateFormat");if(c.match(/[DM]/)){var d=3Dfunction(a){var b=3D0,c=
=3D0;for(var d=3D0;d<a.length;d++)a[d].length>b&&(b=3Da[d].length,c=3Dd);re=
turn c};b.setMonth(d(this._get(a,c.match(/MM/)?"monthNames":"monthNamesShor=
t"))),b.setDate(d(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20=
-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDat=
epicker:function(a,b){var c=3D$(a);if(c.hasClass(this.markerClassName))retu=
rn;c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicke=
r",function(a,c,d){b.settings[c]=3Dd}).bind("getData.datepicker",function(a=
,c){return this._get(b,c)}),$.data(a,PROP_NAME,b),this._setDate(b,this._get=
DefaultDate(b),!0),this._updateDatepicker(b),this._updateAlternate(b),b.set=
tings.disabled&&this._disableDatepicker(a),b.dpDiv.css("display","block")},=
_dialogDatepicker:function(a,b,c,d,e){var f=3Dthis._dialogInst;if(!f){this.=
uuid+=3D1;var g=3D"dp"+this.uuid;this._dialogInput=3D$('<input type=3D"text=
" id=3D"'+g+'" style=3D"position: absolute; top: -100px; width: 0px;"/>'),t=
his._dialogInput.keydown(this._doKeyDown),$("body").append(this._dialogInpu=
t),f=3Dthis._dialogInst=3Dthis._newInst(this._dialogInput,!1),f.settings=3D=
{},$.data(this._dialogInput[0],PROP_NAME,f)}extendRemove(f.settings,d||{}),=
b=3Db&&b.constructor=3D=3DDate?this._formatDate(f,b):b,this._dialogInput.va=
l(b),this._pos=3De?e.length?e:[e.pageX,e.pageY]:null;if(!this._pos){var h=
=3Ddocument.documentElement.clientWidth,i=3Ddocument.documentElement.client=
Height,j=3Ddocument.documentElement.scrollLeft||document.body.scrollLeft,k=
=3Ddocument.documentElement.scrollTop||document.body.scrollTop;this._pos=3D=
[h/2-100+j,i/2-150+k]}return this._dialogInput.css("left",this._pos[0]+20+"=
px").css("top",this._pos[1]+"px"),f.settings.onSelect=3Dc,this._inDialog=3D=
!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialog=
Input[0]),$.blockUI&&$.blockUI(this.dpDiv),$.data(this._dialogInput[0],PROP=
_NAME,f),this},_destroyDatepicker:function(a){var b=3D$(a),c=3D$.data(a,PRO=
P_NAME);if(!b.hasClass(this.markerClassName))return;var d=3Da.nodeName.toLo=
werCase();$.removeData(a,PROP_NAME),d=3D=3D"input"?(c.append.remove(),c.tri=
gger.remove(),b.removeClass(this.markerClassName).unbind("focus",this._show=
Datepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKey=
Press).unbind("keyup",this._doKeyUp)):(d=3D=3D"div"||d=3D=3D"span")&&b.remo=
veClass(this.markerClassName).empty()},_enableDatepicker:function(a){var b=
=3D$(a),c=3D$.data(a,PROP_NAME);if(!b.hasClass(this.markerClassName))return=
;var d=3Da.nodeName.toLowerCase();if(d=3D=3D"input")a.disabled=3D!1,c.trigg=
er.filter("button").each(function(){this.disabled=3D!1}).end().filter("img"=
).css({opacity:"1.0",cursor:""});else if(d=3D=3D"div"||d=3D=3D"span"){var e=
=3Db.children("."+this._inlineClass);e.children().removeClass("ui-state-dis=
abled"),e.find("select.ui-datepicker-month, select.ui-datepicker-year").rem=
oveAttr("disabled")}this._disabledInputs=3D$.map(this._disabledInputs,funct=
ion(b){return b=3D=3Da?null:b})},_disableDatepicker:function(a){var b=3D$(a=
),c=3D$.data(a,PROP_NAME);if(!b.hasClass(this.markerClassName))return;var d=
=3Da.nodeName.toLowerCase();if(d=3D=3D"input")a.disabled=3D!0,c.trigger.fil=
ter("button").each(function(){this.disabled=3D!0}).end().filter("img").css(=
{opacity:"0.5",cursor:"default"});else if(d=3D=3D"div"||d=3D=3D"span"){var =
e=3Db.children("."+this._inlineClass);e.children().addClass("ui-state-disab=
led"),e.find("select.ui-datepicker-month, select.ui-datepicker-year").attr(=
"disabled","disabled")}this._disabledInputs=3D$.map(this._disabledInputs,fu=
nction(b){return b=3D=3Da?null:b}),this._disabledInputs[this._disabledInput=
s.length]=3Da},_isDisabledDatepicker:function(a){if(!a)return!1;for(var b=
=3D0;b<this._disabledInputs.length;b++)if(this._disabledInputs[b]=3D=3Da)re=
turn!0;return!1},_getInst:function(a){try{return $.data(a,PROP_NAME)}catch(=
b){throw"Missing instance data for this datepicker"}},_optionDatepicker:fun=
ction(a,b,c){var d=3Dthis._getInst(a);if(arguments.length=3D=3D2&&typeof b=
=3D=3D"string")return b=3D=3D"defaults"?$.extend({},$.datepicker._defaults)=
:d?b=3D=3D"all"?$.extend({},d.settings):this._get(d,b):null;var e=3Db||{};t=
ypeof b=3D=3D"string"&&(e=3D{},e[b]=3Dc);if(d){this._curInst=3D=3Dd&&this._=
hideDatepicker();var f=3Dthis._getDateDatepicker(a,!0),g=3Dthis._getMinMaxD=
ate(d,"min"),h=3Dthis._getMinMaxDate(d,"max");extendRemove(d.settings,e),g!=
=3D=3Dnull&&e.dateFormat!=3D=3Dundefined&&e.minDate=3D=3D=3Dundefined&&(d.s=
ettings.minDate=3Dthis._formatDate(d,g)),h!=3D=3Dnull&&e.dateFormat!=3D=3Du=
ndefined&&e.maxDate=3D=3D=3Dundefined&&(d.settings.maxDate=3Dthis._formatDa=
te(d,h)),this._attachments($(a),d),this._autoSize(d),this._setDate(d,f),thi=
s._updateAlternate(d),this._updateDatepicker(d)}},_changeDatepicker:functio=
n(a,b,c){this._optionDatepicker(a,b,c)},_refreshDatepicker:function(a){var =
b=3Dthis._getInst(a);b&&this._updateDatepicker(b)},_setDateDatepicker:funct=
ion(a,b){var c=3Dthis._getInst(a);c&&(this._setDate(c,b),this._updateDatepi=
cker(c),this._updateAlternate(c))},_getDateDatepicker:function(a,b){var c=
=3Dthis._getInst(a);return c&&!c.inline&&this._setDateFromField(c,b),c?this=
._getDate(c):null},_doKeyDown:function(a){var b=3D$.datepicker._getInst(a.t=
arget),c=3D!0,d=3Db.dpDiv.is(".ui-datepicker-rtl");b._keyEvent=3D!0;if($.da=
tepicker._datepickerShowing)switch(a.keyCode){case 9:$.datepicker._hideDate=
picker(),c=3D!1;break;case 13:var e=3D$("td."+$.datepicker._dayOverClass+":=
not(."+$.datepicker._currentClass+")",b.dpDiv);e[0]&&$.datepicker._selectDa=
y(a.target,b.selectedMonth,b.selectedYear,e[0]);var f=3D$.datepicker._get(b=
,"onSelect");if(f){var g=3D$.datepicker._formatDate(b);f.apply(b.input?b.in=
put[0]:null,[g,b])}else $.datepicker._hideDatepicker();return!1;case 27:$.d=
atepicker._hideDatepicker();break;case 33:$.datepicker._adjustDate(a.target=
,a.ctrlKey?-$.datepicker._get(b,"stepBigMonths"):-$.datepicker._get(b,"step=
Months"),"M");break;case 34:$.datepicker._adjustDate(a.target,a.ctrlKey?+$.=
datepicker._get(b,"stepBigMonths"):+$.datepicker._get(b,"stepMonths"),"M");=
break;case 35:(a.ctrlKey||a.metaKey)&&$.datepicker._clearDate(a.target),c=
=3Da.ctrlKey||a.metaKey;break;case 36:(a.ctrlKey||a.metaKey)&&$.datepicker.=
_gotoToday(a.target),c=3Da.ctrlKey||a.metaKey;break;case 37:(a.ctrlKey||a.m=
etaKey)&&$.datepicker._adjustDate(a.target,d?1:-1,"D"),c=3Da.ctrlKey||a.met=
aKey,a.originalEvent.altKey&&$.datepicker._adjustDate(a.target,a.ctrlKey?-$=
.datepicker._get(b,"stepBigMonths"):-$.datepicker._get(b,"stepMonths"),"M")=
;break;case 38:(a.ctrlKey||a.metaKey)&&$.datepicker._adjustDate(a.target,-7=
,"D"),c=3Da.ctrlKey||a.metaKey;break;case 39:(a.ctrlKey||a.metaKey)&&$.date=
picker._adjustDate(a.target,d?-1:1,"D"),c=3Da.ctrlKey||a.metaKey,a.original=
Event.altKey&&$.datepicker._adjustDate(a.target,a.ctrlKey?+$.datepicker._ge=
t(b,"stepBigMonths"):+$.datepicker._get(b,"stepMonths"),"M");break;case 40:=
(a.ctrlKey||a.metaKey)&&$.datepicker._adjustDate(a.target,7,"D"),c=3Da.ctrl=
Key||a.metaKey;break;default:c=3D!1}else a.keyCode=3D=3D36&&a.ctrlKey?$.dat=
epicker._showDatepicker(this):c=3D!1;c&&(a.preventDefault(),a.stopPropagati=
on())},_doKeyPress:function(a){var b=3D$.datepicker._getInst(a.target);if($=
.datepicker._get(b,"constrainInput")){var c=3D$.datepicker._possibleChars($=
.datepicker._get(b,"dateFormat")),d=3DString.fromCharCode(a.charCode=3D=3Du=
ndefined?a.keyCode:a.charCode);return a.ctrlKey||a.metaKey||d<" "||!c||c.in=
dexOf(d)>-1}},_doKeyUp:function(a){var b=3D$.datepicker._getInst(a.target);=
if(b.input.val()!=3Db.lastVal)try{var c=3D$.datepicker.parseDate($.datepick=
er._get(b,"dateFormat"),b.input?b.input.val():null,$.datepicker._getFormatC=
onfig(b));c&&($.datepicker._setDateFromField(b),$.datepicker._updateAlterna=
te(b),$.datepicker._updateDatepicker(b))}catch(d){$.datepicker.log(d)}retur=
n!0},_showDatepicker:function(a){a=3Da.target||a,a.nodeName.toLowerCase()!=
=3D"input"&&(a=3D$("input",a.parentNode)[0]);if($.datepicker._isDisabledDat=
epicker(a)||$.datepicker._lastInput=3D=3Da)return;var b=3D$.datepicker._get=
Inst(a);$.datepicker._curInst&&$.datepicker._curInst!=3Db&&($.datepicker._c=
urInst.dpDiv.stop(!0,!0),b&&$.datepicker._datepickerShowing&&$.datepicker._=
hideDatepicker($.datepicker._curInst.input[0]));var c=3D$.datepicker._get(b=
,"beforeShow"),d=3Dc?c.apply(a,[a,b]):{};if(d=3D=3D=3D!1)return;extendRemov=
e(b.settings,d),b.lastVal=3Dnull,$.datepicker._lastInput=3Da,$.datepicker._=
setDateFromField(b),$.datepicker._inDialog&&(a.value=3D""),$.datepicker._po=
s||($.datepicker._pos=3D$.datepicker._findPos(a),$.datepicker._pos[1]+=3Da.=
offsetHeight);var e=3D!1;$(a).parents().each(function(){return e|=3D$(this)=
.css("position")=3D=3D"fixed",!e}),e&&$.browser.opera&&($.datepicker._pos[0=
]-=3Ddocument.documentElement.scrollLeft,$.datepicker._pos[1]-=3Ddocument.d=
ocumentElement.scrollTop);var f=3D{left:$.datepicker._pos[0],top:$.datepick=
er._pos[1]};$.datepicker._pos=3Dnull,b.dpDiv.empty(),b.dpDiv.css({position:=
"absolute",display:"block",top:"-1000px"}),$.datepicker._updateDatepicker(b=
),f=3D$.datepicker._checkOffset(b,f,e),b.dpDiv.css({position:$.datepicker._=
inDialog&&$.blockUI?"static":e?"fixed":"absolute",display:"none",left:f.lef=
t+"px",top:f.top+"px"});if(!b.inline){var g=3D$.datepicker._get(b,"showAnim=
"),h=3D$.datepicker._get(b,"duration"),i=3Dfunction(){var a=3Db.dpDiv.find(=
"iframe.ui-datepicker-cover");if(!!a.length){var c=3D$.datepicker._getBorde=
rs(b.dpDiv);a.css({left:-c[0],top:-c[1],width:b.dpDiv.outerWidth(),height:b=
.dpDiv.outerHeight()})}};b.dpDiv.zIndex($(a).zIndex()+1),$.datepicker._date=
pickerShowing=3D!0,$.effects&&$.effects[g]?b.dpDiv.show(g,$.datepicker._get=
(b,"showOptions"),h,i):b.dpDiv[g||"show"](g?h:null,i),(!g||!h)&&i(),b.input=
.is(":visible")&&!b.input.is(":disabled")&&b.input.focus(),$.datepicker._cu=
rInst=3Db}},_updateDatepicker:function(a){var b=3Dthis;b.maxRows=3D4;var c=
=3D$.datepicker._getBorders(a.dpDiv);instActive=3Da,a.dpDiv.empty().append(=
this._generateHTML(a)),this._attachHandlers(a);var d=3Da.dpDiv.find("iframe=
.ui-datepicker-cover");!d.length||d.css({left:-c[0],top:-c[1],width:a.dpDiv=
.outerWidth(),height:a.dpDiv.outerHeight()}),a.dpDiv.find("."+this._dayOver=
Class+" a").mouseover();var e=3Dthis._getNumberOfMonths(a),f=3De[1],g=3D17;=
a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepic=
ker-multi-4").width(""),f>1&&a.dpDiv.addClass("ui-datepicker-multi-"+f).css=
("width",g*f+"em"),a.dpDiv[(e[0]!=3D1||e[1]!=3D1?"add":"remove")+"Class"]("=
ui-datepicker-multi"),a.dpDiv[(this._get(a,"isRTL")?"add":"remove")+"Class"=
]("ui-datepicker-rtl"),a=3D=3D$.datepicker._curInst&&$.datepicker._datepick=
erShowing&&a.input&&a.input.is(":visible")&&!a.input.is(":disabled")&&a.inp=
ut[0]!=3Ddocument.activeElement&&a.input.focus();if(a.yearshtml){var h=3Da.=
yearshtml;setTimeout(function(){h=3D=3D=3Da.yearshtml&&a.yearshtml&&a.dpDiv=
.find("select.ui-datepicker-year:first").replaceWith(a.yearshtml),h=3Da.yea=
rshtml=3Dnull},0)}},_getBorders:function(a){var b=3Dfunction(a){return{thin=
:1,medium:2,thick:3}[a]||a};return[parseFloat(b(a.css("border-left-width"))=
),parseFloat(b(a.css("border-top-width")))]},_checkOffset:function(a,b,c){v=
ar d=3Da.dpDiv.outerWidth(),e=3Da.dpDiv.outerHeight(),f=3Da.input?a.input.o=
uterWidth():0,g=3Da.input?a.input.outerHeight():0,h=3Ddocument.documentElem=
ent.clientWidth+(c?0:$(document).scrollLeft()),i=3Ddocument.documentElement=
.clientHeight+(c?0:$(document).scrollTop());return b.left-=3Dthis._get(a,"i=
sRTL")?d-f:0,b.left-=3Dc&&b.left=3D=3Da.input.offset().left?$(document).scr=
ollLeft():0,b.top-=3Dc&&b.top=3D=3Da.input.offset().top+g?$(document).scrol=
lTop():0,b.left-=3DMath.min(b.left,b.left+d>h&&h>d?Math.abs(b.left+d-h):0),=
b.top-=3DMath.min(b.top,b.top+e>i&&i>e?Math.abs(e+g):0),b},_findPos:functio=
n(a){var b=3Dthis._getInst(a),c=3Dthis._get(b,"isRTL");while(a&&(a.type=3D=
=3D"hidden"||a.nodeType!=3D1||$.expr.filters.hidden(a)))a=3Da[c?"previousSi=
bling":"nextSibling"];var d=3D$(a).offset();return[d.left,d.top]},_hideDate=
picker:function(a){var b=3Dthis._curInst;if(!b||a&&b!=3D$.data(a,PROP_NAME)=
)return;if(this._datepickerShowing){var c=3Dthis._get(b,"showAnim"),d=3Dthi=
s._get(b,"duration"),e=3Dfunction(){$.datepicker._tidyDialog(b)};$.effects&=
&$.effects[c]?b.dpDiv.hide(c,$.datepicker._get(b,"showOptions"),d,e):b.dpDi=
v[c=3D=3D"slideDown"?"slideUp":c=3D=3D"fadeIn"?"fadeOut":"hide"](c?d:null,e=
),c||e(),this._datepickerShowing=3D!1;var f=3Dthis._get(b,"onClose");f&&f.a=
pply(b.input?b.input[0]:null,[b.input?b.input.val():"",b]),this._lastInput=
=3Dnull,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0=
",top:"-100px"}),$.blockUI&&($.unblockUI(),$("body").append(this.dpDiv))),t=
his._inDialog=3D!1}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dial=
ogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(a)=
{if(!$.datepicker._curInst)return;var b=3D$(a.target),c=3D$.datepicker._get=
Inst(b[0]);(b[0].id!=3D$.datepicker._mainDivId&&b.parents("#"+$.datepicker.=
_mainDivId).length=3D=3D0&&!b.hasClass($.datepicker.markerClassName)&&!b.cl=
osest("."+$.datepicker._triggerClass).length&&$.datepicker._datepickerShowi=
ng&&(!$.datepicker._inDialog||!$.blockUI)||b.hasClass($.datepicker.markerCl=
assName)&&$.datepicker._curInst!=3Dc)&&$.datepicker._hideDatepicker()},_adj=
ustDate:function(a,b,c){var d=3D$(a),e=3Dthis._getInst(d[0]);if(this._isDis=
abledDatepicker(d[0]))return;this._adjustInstDate(e,b+(c=3D=3D"M"?this._get=
(e,"showCurrentAtPos"):0),c),this._updateDatepicker(e)},_gotoToday:function=
(a){var b=3D$(a),c=3Dthis._getInst(b[0]);if(this._get(c,"gotoCurrent")&&c.c=
urrentDay)c.selectedDay=3Dc.currentDay,c.drawMonth=3Dc.selectedMonth=3Dc.cu=
rrentMonth,c.drawYear=3Dc.selectedYear=3Dc.currentYear;else{var d=3Dnew Dat=
e;c.selectedDay=3Dd.getDate(),c.drawMonth=3Dc.selectedMonth=3Dd.getMonth(),=
c.drawYear=3Dc.selectedYear=3Dd.getFullYear()}this._notifyChange(c),this._a=
djustDate(b)},_selectMonthYear:function(a,b,c){var d=3D$(a),e=3Dthis._getIn=
st(d[0]);e["selected"+(c=3D=3D"M"?"Month":"Year")]=3De["draw"+(c=3D=3D"M"?"=
Month":"Year")]=3DparseInt(b.options[b.selectedIndex].value,10),this._notif=
yChange(e),this._adjustDate(d)},_selectDay:function(a,b,c,d){var e=3D$(a);i=
f($(d).hasClass(this._unselectableClass)||this._isDisabledDatepicker(e[0]))=
return;var f=3Dthis._getInst(e[0]);f.selectedDay=3Df.currentDay=3D$("a",d).=
html(),f.selectedMonth=3Df.currentMonth=3Db,f.selectedYear=3Df.currentYear=
=3Dc,this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.cu=
rrentYear))},_clearDate:function(a){var b=3D$(a),c=3Dthis._getInst(b[0]);th=
is._selectDate(b,"")},_selectDate:function(a,b){var c=3D$(a),d=3Dthis._getI=
nst(c[0]);b=3Db!=3Dnull?b:this._formatDate(d),d.input&&d.input.val(b),this.=
_updateAlternate(d);var e=3Dthis._get(d,"onSelect");e?e.apply(d.input?d.inp=
ut[0]:null,[b,d]):d.input&&d.input.trigger("change"),d.inline?this._updateD=
atepicker(d):(this._hideDatepicker(),this._lastInput=3Dd.input[0],typeof d.=
input[0]!=3D"object"&&d.input.focus(),this._lastInput=3Dnull)},_updateAlter=
nate:function(a){var b=3Dthis._get(a,"altField");if(b){var c=3Dthis._get(a,=
"altFormat")||this._get(a,"dateFormat"),d=3Dthis._getDate(a),e=3Dthis.forma=
tDate(c,d,this._getFormatConfig(a));$(b).each(function(){$(this).val(e)})}}=
,noWeekends:function(a){var b=3Da.getDay();return[b>0&&b<6,""]},iso8601Week=
:function(a){var b=3Dnew Date(a.getTime());b.setDate(b.getDate()+4-(b.getDa=
y()||7));var c=3Db.getTime();return b.setMonth(0),b.setDate(1),Math.floor(M=
ath.round((c-b)/864e5)/7)+1},parseDate:function(a,b,c){if(a=3D=3Dnull||b=3D=
=3Dnull)throw"Invalid arguments";b=3Dtypeof b=3D=3D"object"?b.toString():b+=
"";if(b=3D=3D"")return null;var d=3D(c?c.shortYearCutoff:null)||this._defau=
lts.shortYearCutoff;d=3Dtypeof d!=3D"string"?d:(new Date).getFullYear()%100=
+parseInt(d,10);var e=3D(c?c.dayNamesShort:null)||this._defaults.dayNamesSh=
ort,f=3D(c?c.dayNames:null)||this._defaults.dayNames,g=3D(c?c.monthNamesSho=
rt:null)||this._defaults.monthNamesShort,h=3D(c?c.monthNames:null)||this._d=
efaults.monthNames,i=3D-1,j=3D-1,k=3D-1,l=3D-1,m=3D!1,n=3Dfunction(b){var c=
=3Ds+1<a.length&&a.charAt(s+1)=3D=3Db;return c&&s++,c},o=3Dfunction(a){var =
c=3Dn(a),d=3Da=3D=3D"@"?14:a=3D=3D"!"?20:a=3D=3D"y"&&c?4:a=3D=3D"o"?3:2,e=
=3Dnew RegExp("^\\d{1,"+d+"}"),f=3Db.substring(r).match(e);if(!f)throw"Miss=
ing number at position "+r;return r+=3Df[0].length,parseInt(f[0],10)},p=3Df=
unction(a,c,d){var e=3D$.map(n(a)?d:c,function(a,b){return[[b,a]]}).sort(fu=
nction(a,b){return-(a[1].length-b[1].length)}),f=3D-1;$.each(e,function(a,c=
){var d=3Dc[1];if(b.substr(r,d.length).toLowerCase()=3D=3Dd.toLowerCase())r=
eturn f=3Dc[0],r+=3Dd.length,!1});if(f!=3D-1)return f+1;throw"Unknown name =
at position "+r},q=3Dfunction(){if(b.charAt(r)!=3Da.charAt(s))throw"Unexpec=
ted literal at position "+r;r++},r=3D0;for(var s=3D0;s<a.length;s++)if(m)a.=
charAt(s)=3D=3D"'"&&!n("'")?m=3D!1:q();else switch(a.charAt(s)){case"d":k=
=3Do("d");break;case"D":p("D",e,f);break;case"o":l=3Do("o");break;case"m":j=
=3Do("m");break;case"M":j=3Dp("M",g,h);break;case"y":i=3Do("y");break;case"=
@":var t=3Dnew Date(o("@"));i=3Dt.getFullYear(),j=3Dt.getMonth()+1,k=3Dt.ge=
tDate();break;case"!":var t=3Dnew Date((o("!")-this._ticksTo1970)/1e4);i=3D=
t.getFullYear(),j=3Dt.getMonth()+1,k=3Dt.getDate();break;case"'":n("'")?q()=
:m=3D!0;break;default:q()}if(r<b.length)throw"Extra/unparsed characters fou=
nd in date: "+b.substring(r);i=3D=3D-1?i=3D(new Date).getFullYear():i<100&&=
(i+=3D(new Date).getFullYear()-(new Date).getFullYear()%100+(i<=3Dd?0:-100)=
);if(l>-1){j=3D1,k=3Dl;do{var u=3Dthis._getDaysInMonth(i,j-1);if(k<=3Du)bre=
ak;j++,k-=3Du}while(!0)}var t=3Dthis._daylightSavingAdjust(new Date(i,j-1,k=
));if(t.getFullYear()!=3Di||t.getMonth()+1!=3Dj||t.getDate()!=3Dk)throw"Inv=
alid date";return t},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd=
",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, =
d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy=
-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(=
4.925))*24*60*60*1e7,formatDate:function(a,b,c){if(!b)return"";var d=3D(c?c=
.dayNamesShort:null)||this._defaults.dayNamesShort,e=3D(c?c.dayNames:null)|=
|this._defaults.dayNames,f=3D(c?c.monthNamesShort:null)||this._defaults.mon=
thNamesShort,g=3D(c?c.monthNames:null)||this._defaults.monthNames,h=3Dfunct=
ion(b){var c=3Dm+1<a.length&&a.charAt(m+1)=3D=3Db;return c&&m++,c},i=3Dfunc=
tion(a,b,c){var d=3D""+b;if(h(a))while(d.length<c)d=3D"0"+d;return d},j=3Df=
unction(a,b,c,d){return h(a)?d[b]:c[b]},k=3D"",l=3D!1;if(b)for(var m=3D0;m<=
a.length;m++)if(l)a.charAt(m)=3D=3D"'"&&!h("'")?l=3D!1:k+=3Da.charAt(m);els=
e switch(a.charAt(m)){case"d":k+=3Di("d",b.getDate(),2);break;case"D":k+=3D=
j("D",b.getDay(),d,e);break;case"o":k+=3Di("o",Math.round(((new Date(b.getF=
ullYear(),b.getMonth(),b.getDate())).getTime()-(new Date(b.getFullYear(),0,=
0)).getTime())/864e5),3);break;case"m":k+=3Di("m",b.getMonth()+1,2);break;c=
ase"M":k+=3Dj("M",b.getMonth(),f,g);break;case"y":k+=3Dh("y")?b.getFullYear=
():(b.getYear()%100<10?"0":"")+b.getYear()%100;break;case"@":k+=3Db.getTime=
();break;case"!":k+=3Db.getTime()*1e4+this._ticksTo1970;break;case"'":h("'"=
)?k+=3D"'":l=3D!0;break;default:k+=3Da.charAt(m)}return k},_possibleChars:f=
unction(a){var b=3D"",c=3D!1,d=3Dfunction(b){var c=3De+1<a.length&&a.charAt=
(e+1)=3D=3Db;return c&&e++,c};for(var e=3D0;e<a.length;e++)if(c)a.charAt(e)=
=3D=3D"'"&&!d("'")?c=3D!1:b+=3Da.charAt(e);else switch(a.charAt(e)){case"d"=
:case"m":case"y":case"@":b+=3D"0123456789";break;case"D":case"M":return nul=
l;case"'":d("'")?b+=3D"'":c=3D!0;break;default:b+=3Da.charAt(e)}return b},_=
get:function(a,b){return a.settings[b]!=3D=3Dundefined?a.settings[b]:this._=
defaults[b]},_setDateFromField:function(a,b){if(a.input.val()=3D=3Da.lastVa=
l)return;var c=3Dthis._get(a,"dateFormat"),d=3Da.lastVal=3Da.input?a.input.=
val():null,e,f;e=3Df=3Dthis._getDefaultDate(a);var g=3Dthis._getFormatConfi=
g(a);try{e=3Dthis.parseDate(c,d,g)||f}catch(h){this.log(h),d=3Db?"":d}a.sel=
ectedDay=3De.getDate(),a.drawMonth=3Da.selectedMonth=3De.getMonth(),a.drawY=
ear=3Da.selectedYear=3De.getFullYear(),a.currentDay=3Dd?e.getDate():0,a.cur=
rentMonth=3Dd?e.getMonth():0,a.currentYear=3Dd?e.getFullYear():0,this._adju=
stInstDate(a)},_getDefaultDate:function(a){return this._restrictMinMax(a,th=
is._determineDate(a,this._get(a,"defaultDate"),new Date))},_determineDate:f=
unction(a,b,c){var d=3Dfunction(a){var b=3Dnew Date;return b.setDate(b.getD=
ate()+a),b},e=3Dfunction(b){try{return $.datepicker.parseDate($.datepicker.=
_get(a,"dateFormat"),b,$.datepicker._getFormatConfig(a))}catch(c){}var d=3D=
(b.toLowerCase().match(/^c/)?$.datepicker._getDate(a):null)||new Date,e=3Dd=
.getFullYear(),f=3Dd.getMonth(),g=3Dd.getDate(),h=3D/([+-]?[0-9]+)\s*(d|D|w=
|W|m|M|y|Y)?/g,i=3Dh.exec(b);while(i){switch(i[2]||"d"){case"d":case"D":g+=
=3DparseInt(i[1],10);break;case"w":case"W":g+=3DparseInt(i[1],10)*7;break;c=
ase"m":case"M":f+=3DparseInt(i[1],10),g=3DMath.min(g,$.datepicker._getDaysI=
nMonth(e,f));break;case"y":case"Y":e+=3DparseInt(i[1],10),g=3DMath.min(g,$.=
datepicker._getDaysInMonth(e,f))}i=3Dh.exec(b)}return new Date(e,f,g)},f=3D=
b=3D=3Dnull||b=3D=3D=3D""?c:typeof b=3D=3D"string"?e(b):typeof b=3D=3D"numb=
er"?isNaN(b)?c:d(b):new Date(b.getTime());return f=3Df&&f.toString()=3D=3D"=
Invalid Date"?c:f,f&&(f.setHours(0),f.setMinutes(0),f.setSeconds(0),f.setMi=
lliseconds(0)),this._daylightSavingAdjust(f)},_daylightSavingAdjust:functio=
n(a){return a?(a.setHours(a.getHours()>12?a.getHours()+2:0),a):null},_setDa=
te:function(a,b,c){var d=3D!b,e=3Da.selectedMonth,f=3Da.selectedYear,g=3Dth=
is._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay=3Da.c=
urrentDay=3Dg.getDate(),a.drawMonth=3Da.selectedMonth=3Da.currentMonth=3Dg.=
getMonth(),a.drawYear=3Da.selectedYear=3Da.currentYear=3Dg.getFullYear(),(e=
!=3Da.selectedMonth||f!=3Da.selectedYear)&&!c&&this._notifyChange(a),this._=
adjustInstDate(a),a.input&&a.input.val(d?"":this._formatDate(a))},_getDate:=
function(a){var b=3D!a.currentYear||a.input&&a.input.val()=3D=3D""?null:thi=
s._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay)=
);return b},_attachHandlers:function(a){var b=3Dthis._get(a,"stepMonths"),c=
=3D"#"+a.id;a.dpDiv.find("[data-handler]").map(function(){var a=3D{prev:fun=
ction(){window["DP_jQuery_"+dpuuid].datepicker._adjustDate(c,-b,"M")},next:=
function(){window["DP_jQuery_"+dpuuid].datepicker._adjustDate(c,+b,"M")},hi=
de:function(){window["DP_jQuery_"+dpuuid].datepicker._hideDatepicker()},tod=
ay:function(){window["DP_jQuery_"+dpuuid].datepicker._gotoToday(c)},selectD=
ay:function(){return window["DP_jQuery_"+dpuuid].datepicker._selectDay(c,+t=
his.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},se=
lectMonth:function(){return window["DP_jQuery_"+dpuuid].datepicker._selectM=
onthYear(c,this,"M"),!1},selectYear:function(){return window["DP_jQuery_"+d=
puuid].datepicker._selectMonthYear(c,this,"Y"),!1}};$(this).bind(this.getAt=
tribute("data-event"),a[this.getAttribute("data-handler")])})},_generateHTM=
L:function(a){var b=3Dnew Date;b=3Dthis._daylightSavingAdjust(new Date(b.ge=
tFullYear(),b.getMonth(),b.getDate()));var c=3Dthis._get(a,"isRTL"),d=3Dthi=
s._get(a,"showButtonPanel"),e=3Dthis._get(a,"hideIfNoPrevNext"),f=3Dthis._g=
et(a,"navigationAsDateFormat"),g=3Dthis._getNumberOfMonths(a),h=3Dthis._get=
(a,"showCurrentAtPos"),i=3Dthis._get(a,"stepMonths"),j=3Dg[0]!=3D1||g[1]!=
=3D1,k=3Dthis._daylightSavingAdjust(a.currentDay?new Date(a.currentYear,a.c=
urrentMonth,a.currentDay):new Date(9999,9,9)),l=3Dthis._getMinMaxDate(a,"mi=
n"),m=3Dthis._getMinMaxDate(a,"max"),n=3Da.drawMonth-h,o=3Da.drawYear;n<0&&=
(n+=3D12,o--);if(m){var p=3Dthis._daylightSavingAdjust(new Date(m.getFullYe=
ar(),m.getMonth()-g[0]*g[1]+1,m.getDate()));p=3Dl&&p<l?l:p;while(this._dayl=
ightSavingAdjust(new Date(o,n,1))>p)n--,n<0&&(n=3D11,o--)}a.drawMonth=3Dn,a=
.drawYear=3Do;var q=3Dthis._get(a,"prevText");q=3Df?this.formatDate(q,this.=
_daylightSavingAdjust(new Date(o,n-i,1)),this._getFormatConfig(a)):q;var r=
=3Dthis._canAdjustMonth(a,-1,o,n)?'<a class=3D"ui-datepicker-prev ui-corner=
-all" data-handler=3D"prev" data-event=3D"click" title=3D"'+q+'"><span clas=
s=3D"ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+q+"</span></a>":e?"=
":'<a class=3D"ui-datepicker-prev ui-corner-all ui-state-disabled" title=3D=
"'+q+'"><span class=3D"ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+q=
+"</span></a>",s=3Dthis._get(a,"nextText");s=3Df?this.formatDate(s,this._da=
ylightSavingAdjust(new Date(o,n+i,1)),this._getFormatConfig(a)):s;var t=3Dt=
his._canAdjustMonth(a,1,o,n)?'<a class=3D"ui-datepicker-next ui-corner-all"=
 data-handler=3D"next" data-event=3D"click" title=3D"'+s+'"><span class=3D"=
ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</span></a>":e?"":'<a=
 class=3D"ui-datepicker-next ui-corner-all ui-state-disabled" title=3D"'+s+=
'"><span class=3D"ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</s=
pan></a>",u=3Dthis._get(a,"currentText"),v=3Dthis._get(a,"gotoCurrent")&&a.=
currentDay?k:b;u=3Df?this.formatDate(u,v,this._getFormatConfig(a)):u;var w=
=3Da.inline?"":'<button type=3D"button" class=3D"ui-datepicker-close ui-sta=
te-default ui-priority-primary ui-corner-all" data-handler=3D"hide" data-ev=
ent=3D"click">'+this._get(a,"closeText")+"</button>",x=3Dd?'<div class=3D"u=
i-datepicker-buttonpane ui-widget-content">'+(c?w:"")+(this._isInRange(a,v)=
?'<button type=3D"button" class=3D"ui-datepicker-current ui-state-default u=
i-priority-secondary ui-corner-all" data-handler=3D"today" data-event=3D"cl=
ick">'+u+"</button>":"")+(c?"":w)+"</div>":"",y=3DparseInt(this._get(a,"fir=
stDay"),10);y=3DisNaN(y)?0:y;var z=3Dthis._get(a,"showWeek"),A=3Dthis._get(=
a,"dayNames"),B=3Dthis._get(a,"dayNamesShort"),C=3Dthis._get(a,"dayNamesMin=
"),D=3Dthis._get(a,"monthNames"),E=3Dthis._get(a,"monthNamesShort"),F=3Dthi=
s._get(a,"beforeShowDay"),G=3Dthis._get(a,"showOtherMonths"),H=3Dthis._get(=
a,"selectOtherMonths"),I=3Dthis._get(a,"calculateWeek")||this.iso8601Week,J=
=3Dthis._getDefaultDate(a),K=3D"";for(var L=3D0;L<g[0];L++){var M=3D"";this=
.maxRows=3D4;for(var N=3D0;N<g[1];N++){var O=3Dthis._daylightSavingAdjust(n=
ew Date(o,n,a.selectedDay)),P=3D" ui-corner-all",Q=3D"";if(j){Q+=3D'<div cl=
ass=3D"ui-datepicker-group';if(g[1]>1)switch(N){case 0:Q+=3D" ui-datepicker=
-group-first",P=3D" ui-corner-"+(c?"right":"left");break;case g[1]-1:Q+=3D"=
 ui-datepicker-group-last",P=3D" ui-corner-"+(c?"left":"right");break;defau=
lt:Q+=3D" ui-datepicker-group-middle",P=3D""}Q+=3D'">'}Q+=3D'<div class=3D"=
ui-datepicker-header ui-widget-header ui-helper-clearfix'+P+'">'+(/all|left=
/.test(P)&&L=3D=3D0?c?t:r:"")+(/all|right/.test(P)&&L=3D=3D0?c?r:t:"")+this=
._generateMonthYearHeader(a,n,o,l,m,L>0||N>0,D,E)+'</div><table class=3D"ui=
-datepicker-calendar"><thead>'+"<tr>";var R=3Dz?'<th class=3D"ui-datepicker=
-week-col">'+this._get(a,"weekHeader")+"</th>":"";for(var S=3D0;S<7;S++){va=
r T=3D(S+y)%7;R+=3D"<th"+((S+y+6)%7>=3D5?' class=3D"ui-datepicker-week-end"=
':"")+">"+'<span title=3D"'+A[T]+'">'+C[T]+"</span></th>"}Q+=3DR+"</tr></th=
ead><tbody>";var U=3Dthis._getDaysInMonth(o,n);o=3D=3Da.selectedYear&&n=3D=
=3Da.selectedMonth&&(a.selectedDay=3DMath.min(a.selectedDay,U));var V=3D(th=
is._getFirstDayOfMonth(o,n)-y+7)%7,W=3DMath.ceil((V+U)/7),X=3Dj?this.maxRow=
s>W?this.maxRows:W:W;this.maxRows=3DX;var Y=3Dthis._daylightSavingAdjust(ne=
w Date(o,n,1-V));for(var Z=3D0;Z<X;Z++){Q+=3D"<tr>";var _=3Dz?'<td class=3D=
"ui-datepicker-week-col">'+this._get(a,"calculateWeek")(Y)+"</td>":"";for(v=
ar S=3D0;S<7;S++){var ba=3DF?F.apply(a.input?a.input[0]:null,[Y]):[!0,""],b=
b=3DY.getMonth()!=3Dn,bc=3Dbb&&!H||!ba[0]||l&&Y<l||m&&Y>m;_+=3D'<td class=
=3D"'+((S+y+6)%7>=3D5?" ui-datepicker-week-end":"")+(bb?" ui-datepicker-oth=
er-month":"")+(Y.getTime()=3D=3DO.getTime()&&n=3D=3Da.selectedMonth&&a._key=
Event||J.getTime()=3D=3DY.getTime()&&J.getTime()=3D=3DO.getTime()?" "+this.=
_dayOverClass:"")+(bc?" "+this._unselectableClass+" ui-state-disabled":"")+=
(bb&&!G?"":" "+ba[1]+(Y.getTime()=3D=3Dk.getTime()?" "+this._currentClass:"=
")+(Y.getTime()=3D=3Db.getTime()?" ui-datepicker-today":""))+'"'+((!bb||G)&=
&ba[2]?' title=3D"'+ba[2]+'"':"")+(bc?"":' data-handler=3D"selectDay" data-=
event=3D"click" data-month=3D"'+Y.getMonth()+'" data-year=3D"'+Y.getFullYea=
r()+'"')+">"+(bb&&!G?"&#xa0;":bc?'<span class=3D"ui-state-default">'+Y.getD=
ate()+"</span>":'<a class=3D"ui-state-default'+(Y.getTime()=3D=3Db.getTime(=
)?" ui-state-highlight":"")+(Y.getTime()=3D=3Dk.getTime()?" ui-state-active=
":"")+(bb?" ui-priority-secondary":"")+'" href=3D"#">'+Y.getDate()+"</a>")+=
"</td>",Y.setDate(Y.getDate()+1),Y=3Dthis._daylightSavingAdjust(Y)}Q+=3D_+"=
</tr>"}n++,n>11&&(n=3D0,o++),Q+=3D"</tbody></table>"+(j?"</div>"+(g[0]>0&&N=
=3D=3Dg[1]-1?'<div class=3D"ui-datepicker-row-break"></div>':""):""),M+=3DQ=
}K+=3DM}return K+=3Dx+($.browser.msie&&parseInt($.browser.version,10)<7&&!a=
.inline?'<iframe src=3D"javascript:false;" class=3D"ui-datepicker-cover" fr=
ameborder=3D"0"></iframe>':""),a._keyEvent=3D!1,K},_generateMonthYearHeader=
:function(a,b,c,d,e,f,g,h){var i=3Dthis._get(a,"changeMonth"),j=3Dthis._get=
(a,"changeYear"),k=3Dthis._get(a,"showMonthAfterYear"),l=3D'<div class=3D"u=
i-datepicker-title">',m=3D"";if(f||!i)m+=3D'<span class=3D"ui-datepicker-mo=
nth">'+g[b]+"</span>";else{var n=3Dd&&d.getFullYear()=3D=3Dc,o=3De&&e.getFu=
llYear()=3D=3Dc;m+=3D'<select class=3D"ui-datepicker-month" data-handler=3D=
"selectMonth" data-event=3D"change">';for(var p=3D0;p<12;p++)(!n||p>=3Dd.ge=
tMonth())&&(!o||p<=3De.getMonth())&&(m+=3D'<option value=3D"'+p+'"'+(p=3D=
=3Db?' selected=3D"selected"':"")+">"+h[p]+"</option>");m+=3D"</select>"}k|=
|(l+=3Dm+(f||!i||!j?"&#xa0;":""));if(!a.yearshtml){a.yearshtml=3D"";if(f||!=
j)l+=3D'<span class=3D"ui-datepicker-year">'+c+"</span>";else{var q=3Dthis.=
_get(a,"yearRange").split(":"),r=3D(new Date).getFullYear(),s=3Dfunction(a)=
{var b=3Da.match(/c[+-].*/)?c+parseInt(a.substring(1),10):a.match(/[+-].*/)=
?r+parseInt(a,10):parseInt(a,10);return isNaN(b)?r:b},t=3Ds(q[0]),u=3DMath.=
max(t,s(q[1]||""));t=3Dd?Math.max(t,d.getFullYear()):t,u=3De?Math.min(u,e.g=
etFullYear()):u,a.yearshtml+=3D'<select class=3D"ui-datepicker-year" data-h=
andler=3D"selectYear" data-event=3D"change">';for(;t<=3Du;t++)a.yearshtml+=
=3D'<option value=3D"'+t+'"'+(t=3D=3Dc?' selected=3D"selected"':"")+">"+t+"=
</option>";a.yearshtml+=3D"</select>",l+=3Da.yearshtml,a.yearshtml=3Dnull}}=
return l+=3Dthis._get(a,"yearSuffix"),k&&(l+=3D(f||!i||!j?"&#xa0;":"")+m),l=
+=3D"</div>",l},_adjustInstDate:function(a,b,c){var d=3Da.drawYear+(c=3D=3D=
"Y"?b:0),e=3Da.drawMonth+(c=3D=3D"M"?b:0),f=3DMath.min(a.selectedDay,this._=
getDaysInMonth(d,e))+(c=3D=3D"D"?b:0),g=3Dthis._restrictMinMax(a,this._dayl=
ightSavingAdjust(new Date(d,e,f)));a.selectedDay=3Dg.getDate(),a.drawMonth=
=3Da.selectedMonth=3Dg.getMonth(),a.drawYear=3Da.selectedYear=3Dg.getFullYe=
ar(),(c=3D=3D"M"||c=3D=3D"Y")&&this._notifyChange(a)},_restrictMinMax:funct=
ion(a,b){var c=3Dthis._getMinMaxDate(a,"min"),d=3Dthis._getMinMaxDate(a,"ma=
x"),e=3Dc&&b<c?c:b;return e=3Dd&&e>d?d:e,e},_notifyChange:function(a){var b=
=3Dthis._get(a,"onChangeMonthYear");b&&b.apply(a.input?a.input[0]:null,[a.s=
electedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){var b=3Dt=
his._get(a,"numberOfMonths");return b=3D=3Dnull?[1,1]:typeof b=3D=3D"number=
"?[1,b]:b},_getMinMaxDate:function(a,b){return this._determineDate(a,this._=
get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-this._daylig=
htSavingAdjust(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,=
b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,d){var =
e=3Dthis._getNumberOfMonths(a),f=3Dthis._daylightSavingAdjust(new Date(c,d+=
(b<0?b:e[0]*e[1]),1));return b<0&&f.setDate(this._getDaysInMonth(f.getFullY=
ear(),f.getMonth())),this._isInRange(a,f)},_isInRange:function(a,b){var c=
=3Dthis._getMinMaxDate(a,"min"),d=3Dthis._getMinMaxDate(a,"max");return(!c|=
|b.getTime()>=3Dc.getTime())&&(!d||b.getTime()<=3Dd.getTime())},_getFormatC=
onfig:function(a){var b=3Dthis._get(a,"shortYearCutoff");return b=3Dtypeof =
b!=3D"string"?b:(new Date).getFullYear()%100+parseInt(b,10),{shortYearCutof=
f:b,dayNamesShort:this._get(a,"dayNamesShort"),dayNames:this._get(a,"dayNam=
es"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,=
"monthNames")}},_formatDate:function(a,b,c,d){b||(a.currentDay=3Da.selected=
Day,a.currentMonth=3Da.selectedMonth,a.currentYear=3Da.selectedYear);var e=
=3Db?typeof b=3D=3D"object"?b:this._daylightSavingAdjust(new Date(d,c,b)):t=
his._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDa=
y));return this.formatDate(this._get(a,"dateFormat"),e,this._getFormatConfi=
g(a))}}),$.fn.datepicker=3Dfunction(a){if(!this.length)return this;$.datepi=
cker.initialized||($(document).mousedown($.datepicker._checkExternalClick).=
find("body").append($.datepicker.dpDiv),$.datepicker.initialized=3D!0);var =
b=3DArray.prototype.slice.call(arguments,1);return typeof a!=3D"string"||a!=
=3D"isDisabled"&&a!=3D"getDate"&&a!=3D"widget"?a=3D=3D"option"&&arguments.l=
ength=3D=3D2&&typeof arguments[1]=3D=3D"string"?$.datepicker["_"+a+"Datepic=
ker"].apply($.datepicker,[this[0]].concat(b)):this.each(function(){typeof a=
=3D=3D"string"?$.datepicker["_"+a+"Datepicker"].apply($.datepicker,[this].c=
oncat(b)):$.datepicker._attachDatepicker(this,a)}):$.datepicker["_"+a+"Date=
picker"].apply($.datepicker,[this[0]].concat(b))},$.datepicker=3Dnew Datepi=
cker,$.datepicker.initialized=3D!1,$.datepicker.uuid=3D(new Date).getTime()=
,$.datepicker.version=3D"1.8.22",window["DP_jQuery_"+dpuuid]=3D$})(jQuery);=
;/*! jQuery UI - v1.8.22 - 2012-07-24
-* https://github.com/jquery/jquery-ui
-* Includes: jquery.ui.progressbar.js
-* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){a.widget("ui.progressbar",{options:{value:0,max:100},min:0,=
_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widge=
t-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min=
,"aria-valuemax":this.options.max,"aria-valuenow":this._value()}),this.valu=
eDiv=3Da("<div class=3D'ui-progressbar-value ui-widget-header ui-corner-lef=
t'></div>").appendTo(this.element),this.oldValue=3Dthis._value(),this._refr=
eshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-=
widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("ari=
a-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.v=
alueDiv.remove(),a.Widget.prototype.destroy.apply(this,arguments)},value:fu=
nction(a){return a=3D=3D=3Db?this._value():(this._setOption("value",a),this=
)},_setOption:function(b,c){b=3D=3D=3D"value"&&(this.options.value=3Dc,this=
._refreshValue(),this._value()=3D=3D=3Dthis.options.max&&this._trigger("com=
plete")),a.Widget.prototype._setOption.apply(this,arguments)},_value:functi=
on(){var a=3Dthis.options.value;return typeof a!=3D"number"&&(a=3D0),Math.m=
in(this.options.max,Math.max(this.min,a))},_percentage:function(){return 10=
0*this._value()/this.options.max},_refreshValue:function(){var a=3Dthis.val=
ue(),b=3Dthis._percentage();this.oldValue!=3D=3Da&&(this.oldValue=3Da,this.=
_trigger("change")),this.valueDiv.toggle(a>this.min).toggleClass("ui-corner=
-right",a=3D=3D=3Dthis.options.max).width(b.toFixed(0)+"%"),this.element.at=
tr("aria-valuenow",a)}}),a.extend(a.ui.progressbar,{version:"1.8.22"})})(jQ=
uery);;/*! jQuery UI - v1.8.22 - 2012-07-24
-* https://github.com/jquery/jquery-ui
-* Includes: jquery.effects.core.js
-* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-jQuery.effects||function(a,b){function c(b){var c;return b&&b.constructor=
=3D=3DArray&&b.length=3D=3D3?b:(c=3D/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3}=
)\s*,\s*([0-9]{1,3})\s*\)/.exec(b))?[parseInt(c[1],10),parseInt(c[2],10),pa=
rseInt(c[3],10)]:(c=3D/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0=
-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(b))?[parseFloat(c[1])*2.=
55,parseFloat(c[2])*2.55,parseFloat(c[3])*2.55]:(c=3D/#([a-fA-F0-9]{2})([a-=
fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(b))?[parseInt(c[1],16),parseInt(c[2],16)=
,parseInt(c[3],16)]:(c=3D/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(b)=
)?[parseInt(c[1]+c[1],16),parseInt(c[2]+c[2],16),parseInt(c[3]+c[3],16)]:(c=
=3D/rgba\(0, 0, 0, 0\)/.exec(b))?e.transparent:e[a.trim(b).toLowerCase()]}f=
unction d(b,d){var e;do{e=3D(a.curCSS||a.css)(b,d);if(e!=3D""&&e!=3D"transp=
arent"||a.nodeName(b,"body"))break;d=3D"backgroundColor"}while(b=3Db.parent=
Node);return c(e)}function h(){var a=3Ddocument.defaultView?document.defaul=
tView.getComputedStyle(this,null):this.currentStyle,b=3D{},c,d;if(a&&a.leng=
th&&a[0]&&a[a[0]]){var e=3Da.length;while(e--)c=3Da[e],typeof a[c]=3D=3D"st=
ring"&&(d=3Dc.replace(/\-(\w)/g,function(a,b){return b.toUpperCase()}),b[d]=
=3Da[c])}else for(c in a)typeof a[c]=3D=3D"string"&&(b[c]=3Da[c]);return b}=
function i(b){var c,d;for(c in b)d=3Db[c],(d=3D=3Dnull||a.isFunction(d)||c =
in g||/scrollbar/.test(c)||!/color/i.test(c)&&isNaN(parseFloat(d)))&&delete=
 b[c];return b}function j(a,b){var c=3D{_:0},d;for(d in b)a[d]!=3Db[d]&&(c[=
d]=3Db[d]);return c}function k(b,c,d,e){typeof b=3D=3D"object"&&(e=3Dc,d=3D=
null,c=3Db,b=3Dc.effect),a.isFunction(c)&&(e=3Dc,d=3Dnull,c=3D{});if(typeof=
 c=3D=3D"number"||a.fx.speeds[c])e=3Dd,d=3Dc,c=3D{};return a.isFunction(d)&=
&(e=3Dd,d=3Dnull),c=3Dc||{},d=3Dd||c.duration,d=3Da.fx.off?0:typeof d=3D=3D=
"number"?d:d in a.fx.speeds?a.fx.speeds[d]:a.fx.speeds._default,e=3De||c.co=
mplete,[b,c,d,e]}function l(b){return!b||typeof b=3D=3D"number"||a.fx.speed=
s[b]?!0:typeof b=3D=3D"string"&&!a.effects[b]?!0:!1}a.effects=3D{},a.each([=
"backgroundColor","borderBottomColor","borderLeftColor","borderRightColor",=
"borderTopColor","borderColor","color","outlineColor"],function(b,e){a.fx.s=
tep[e]=3Dfunction(a){a.colorInit||(a.start=3Dd(a.elem,e),a.end=3Dc(a.end),a=
.colorInit=3D!0),a.elem.style[e]=3D"rgb("+Math.max(Math.min(parseInt(a.pos*=
(a.end[0]-a.start[0])+a.start[0],10),255),0)+","+Math.max(Math.min(parseInt=
(a.pos*(a.end[1]-a.start[1])+a.start[1],10),255),0)+","+Math.max(Math.min(p=
arseInt(a.pos*(a.end[2]-a.start[2])+a.start[2],10),255),0)+")"}});var e=3D{=
aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue=
:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[=
0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,10=
7],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0=
],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkvi=
olet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indig=
o:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255=
,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,1=
93],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[12=
8,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,20=
3],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192]=
,white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},f=3D["ad=
d","remove","toggle"],g=3D{border:1,borderBottom:1,borderColor:1,borderLeft=
:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};a.effects.an=
imateClass=3Dfunction(b,c,d,e){return a.isFunction(d)&&(e=3Dd,d=3Dnull),thi=
s.queue(function(){var g=3Da(this),k=3Dg.attr("style")||" ",l=3Di(h.call(th=
is)),m,n=3Dg.attr("class")||"";a.each(f,function(a,c){b[c]&&g[c+"Class"](b[=
c])}),m=3Di(h.call(this)),g.attr("class",n),g.animate(j(l,m),{queue:!1,dura=
tion:c,easing:d,complete:function(){a.each(f,function(a,c){b[c]&&g[c+"Class=
"](b[c])}),typeof g.attr("style")=3D=3D"object"?(g.attr("style").cssText=3D=
"",g.attr("style").cssText=3Dk):g.attr("style",k),e&&e.apply(this,arguments=
),a.dequeue(this)}})})},a.fn.extend({_addClass:a.fn.addClass,addClass:funct=
ion(b,c,d,e){return c?a.effects.animateClass.apply(this,[{add:b},c,d,e]):th=
is._addClass(b)},_removeClass:a.fn.removeClass,removeClass:function(b,c,d,e=
){return c?a.effects.animateClass.apply(this,[{remove:b},c,d,e]):this._remo=
veClass(b)},_toggleClass:a.fn.toggleClass,toggleClass:function(c,d,e,f,g){r=
eturn typeof d=3D=3D"boolean"||d=3D=3D=3Db?e?a.effects.animateClass.apply(t=
his,[d?{add:c}:{remove:c},e,f,g]):this._toggleClass(c,d):a.effects.animateC=
lass.apply(this,[{toggle:c},d,e,f])},switchClass:function(b,c,d,e,f){return=
 a.effects.animateClass.apply(this,[{add:c,remove:b},d,e,f])}}),a.extend(a.=
effects,{version:"1.8.22",save:function(a,b){for(var c=3D0;c<b.length;c++)b=
[c]!=3D=3Dnull&&a.data("ec.storage."+b[c],a[0].style[b[c]])},restore:functi=
on(a,b){for(var c=3D0;c<b.length;c++)b[c]!=3D=3Dnull&&a.css(b[c],a.data("ec=
.storage."+b[c]))},setMode:function(a,b){return b=3D=3D"toggle"&&(b=3Da.is(=
":hidden")?"show":"hide"),b},getBaseline:function(a,b){var c,d;switch(a[0])=
{case"top":c=3D0;break;case"middle":c=3D.5;break;case"bottom":c=3D1;break;d=
efault:c=3Da[0]/b.height}switch(a[1]){case"left":d=3D0;break;case"center":d=
=3D.5;break;case"right":d=3D1;break;default:d=3Da[1]/b.width}return{x:d,y:c=
}},createWrapper:function(b){if(b.parent().is(".ui-effects-wrapper"))return=
 b.parent();var c=3D{width:b.outerWidth(!0),height:b.outerHeight(!0),"float=
":b.css("float")},d=3Da("<div></div>").addClass("ui-effects-wrapper").css({=
fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0})=
,e=3Ddocument.activeElement;try{e.id}catch(f){e=3Ddocument.body}return b.wr=
ap(d),(b[0]=3D=3D=3De||a.contains(b[0],e))&&a(e).focus(),d=3Db.parent(),b.c=
ss("position")=3D=3D"static"?(d.css({position:"relative"}),b.css({position:=
"relative"})):(a.extend(c,{position:b.css("position"),zIndex:b.css("z-index=
")}),a.each(["top","left","bottom","right"],function(a,d){c[d]=3Db.css(d),i=
sNaN(parseInt(c[d],10))&&(c[d]=3D"auto")}),b.css({position:"relative",top:0=
,left:0,right:"auto",bottom:"auto"})),d.css(c).show()},removeWrapper:functi=
on(b){var c,d=3Ddocument.activeElement;return b.parent().is(".ui-effects-wr=
apper")?(c=3Db.parent().replaceWith(b),(b[0]=3D=3D=3Dd||a.contains(b[0],d))=
&&a(d).focus(),c):b},setTransition:function(b,c,d,e){return e=3De||{},a.eac=
h(c,function(a,c){var f=3Db.cssUnit(c);f[0]>0&&(e[c]=3Df[0]*d+f[1])}),e}}),=
a.fn.extend({effect:function(b,c,d,e){var f=3Dk.apply(this,arguments),g=3D{=
options:f[1],duration:f[2],callback:f[3]},h=3Dg.options.mode,i=3Da.effects[=
b];return a.fx.off||!i?h?this[h](g.duration,g.callback):this.each(function(=
){g.callback&&g.callback.call(this)}):i.call(this,g)},_show:a.fn.show,show:=
function(a){if(l(a))return this._show.apply(this,arguments);var b=3Dk.apply=
(this,arguments);return b[1].mode=3D"show",this.effect.apply(this,b)},_hide=
:a.fn.hide,hide:function(a){if(l(a))return this._hide.apply(this,arguments)=
;var b=3Dk.apply(this,arguments);return b[1].mode=3D"hide",this.effect.appl=
y(this,b)},__toggle:a.fn.toggle,toggle:function(b){if(l(b)||typeof b=3D=3D"=
boolean"||a.isFunction(b))return this.__toggle.apply(this,arguments);var c=
=3Dk.apply(this,arguments);return c[1].mode=3D"toggle",this.effect.apply(th=
is,c)},cssUnit:function(b){var c=3Dthis.css(b),d=3D[];return a.each(["em","=
px","%","pt"],function(a,b){c.indexOf(b)>0&&(d=3D[parseFloat(c),b])}),d}}),=
a.easing.jswing=3Da.easing.swing,a.extend(a.easing,{def:"easeOutQuad",swing=
:function(b,c,d,e,f){return a.easing[a.easing.def](b,c,d,e,f)},easeInQuad:f=
unction(a,b,c,d,e){return d*(b/=3De)*b+c},easeOutQuad:function(a,b,c,d,e){r=
eturn-d*(b/=3De)*(b-2)+c},easeInOutQuad:function(a,b,c,d,e){return(b/=3De/2=
)<1?d/2*b*b+c:-d/2*(--b*(b-2)-1)+c},easeInCubic:function(a,b,c,d,e){return =
d*(b/=3De)*b*b+c},easeOutCubic:function(a,b,c,d,e){return d*((b=3Db/e-1)*b*=
b+1)+c},easeInOutCubic:function(a,b,c,d,e){return(b/=3De/2)<1?d/2*b*b*b+c:d=
/2*((b-=3D2)*b*b+2)+c},easeInQuart:function(a,b,c,d,e){return d*(b/=3De)*b*=
b*b+c},easeOutQuart:function(a,b,c,d,e){return-d*((b=3Db/e-1)*b*b*b-1)+c},e=
aseInOutQuart:function(a,b,c,d,e){return(b/=3De/2)<1?d/2*b*b*b*b+c:-d/2*((b=
-=3D2)*b*b*b-2)+c},easeInQuint:function(a,b,c,d,e){return d*(b/=3De)*b*b*b*=
b+c},easeOutQuint:function(a,b,c,d,e){return d*((b=3Db/e-1)*b*b*b*b+1)+c},e=
aseInOutQuint:function(a,b,c,d,e){return(b/=3De/2)<1?d/2*b*b*b*b*b+c:d/2*((=
b-=3D2)*b*b*b*b+2)+c},easeInSine:function(a,b,c,d,e){return-d*Math.cos(b/e*=
(Math.PI/2))+d+c},easeOutSine:function(a,b,c,d,e){return d*Math.sin(b/e*(Ma=
th.PI/2))+c},easeInOutSine:function(a,b,c,d,e){return-d/2*(Math.cos(Math.PI=
*b/e)-1)+c},easeInExpo:function(a,b,c,d,e){return b=3D=3D0?c:d*Math.pow(2,1=
0*(b/e-1))+c},easeOutExpo:function(a,b,c,d,e){return b=3D=3De?c+d:d*(-Math.=
pow(2,-10*b/e)+1)+c},easeInOutExpo:function(a,b,c,d,e){return b=3D=3D0?c:b=
=3D=3De?c+d:(b/=3De/2)<1?d/2*Math.pow(2,10*(b-1))+c:d/2*(-Math.pow(2,-10*--=
b)+2)+c},easeInCirc:function(a,b,c,d,e){return-d*(Math.sqrt(1-(b/=3De)*b)-1=
)+c},easeOutCirc:function(a,b,c,d,e){return d*Math.sqrt(1-(b=3Db/e-1)*b)+c}=
,easeInOutCirc:function(a,b,c,d,e){return(b/=3De/2)<1?-d/2*(Math.sqrt(1-b*b=
)-1)+c:d/2*(Math.sqrt(1-(b-=3D2)*b)+1)+c},easeInElastic:function(a,b,c,d,e)=
{var f=3D1.70158,g=3D0,h=3Dd;if(b=3D=3D0)return c;if((b/=3De)=3D=3D1)return=
 c+d;g||(g=3De*.3);if(h<Math.abs(d)){h=3Dd;var f=3Dg/4}else var f=3Dg/(2*Ma=
th.PI)*Math.asin(d/h);return-(h*Math.pow(2,10*(b-=3D1))*Math.sin((b*e-f)*2*=
Math.PI/g))+c},easeOutElastic:function(a,b,c,d,e){var f=3D1.70158,g=3D0,h=
=3Dd;if(b=3D=3D0)return c;if((b/=3De)=3D=3D1)return c+d;g||(g=3De*.3);if(h<=
Math.abs(d)){h=3Dd;var f=3Dg/4}else var f=3Dg/(2*Math.PI)*Math.asin(d/h);re=
turn h*Math.pow(2,-10*b)*Math.sin((b*e-f)*2*Math.PI/g)+d+c},easeInOutElasti=
c:function(a,b,c,d,e){var f=3D1.70158,g=3D0,h=3Dd;if(b=3D=3D0)return c;if((=
b/=3De/2)=3D=3D2)return c+d;g||(g=3De*.3*1.5);if(h<Math.abs(d)){h=3Dd;var f=
=3Dg/4}else var f=3Dg/(2*Math.PI)*Math.asin(d/h);return b<1?-0.5*h*Math.pow=
(2,10*(b-=3D1))*Math.sin((b*e-f)*2*Math.PI/g)+c:h*Math.pow(2,-10*(b-=3D1))*=
Math.sin((b*e-f)*2*Math.PI/g)*.5+d+c},easeInBack:function(a,c,d,e,f,g){retu=
rn g=3D=3Db&&(g=3D1.70158),e*(c/=3Df)*c*((g+1)*c-g)+d},easeOutBack:function=
(a,c,d,e,f,g){return g=3D=3Db&&(g=3D1.70158),e*((c=3Dc/f-1)*c*((g+1)*c+g)+1=
)+d},easeInOutBack:function(a,c,d,e,f,g){return g=3D=3Db&&(g=3D1.70158),(c/=
=3Df/2)<1?e/2*c*c*(((g*=3D1.525)+1)*c-g)+d:e/2*((c-=3D2)*c*(((g*=3D1.525)+1=
)*c+g)+2)+d},easeInBounce:function(b,c,d,e,f){return e-a.easing.easeOutBoun=
ce(b,f-c,0,e,f)+d},easeOutBounce:function(a,b,c,d,e){return(b/=3De)<1/2.75?=
d*7.5625*b*b+c:b<2/2.75?d*(7.5625*(b-=3D1.5/2.75)*b+.75)+c:b<2.5/2.75?d*(7.=
5625*(b-=3D2.25/2.75)*b+.9375)+c:d*(7.5625*(b-=3D2.625/2.75)*b+.984375)+c},=
easeInOutBounce:function(b,c,d,e,f){return c<f/2?a.easing.easeInBounce(b,c*=
2,0,e,f)*.5+d:a.easing.easeOutBounce(b,c*2-f,0,e,f)*.5+e*.5+d}})}(jQuery);;=
/*! jQuery UI - v1.8.22 - 2012-07-24
-* https://github.com/jquery/jquery-ui
-* Includes: jquery.effects.blind.js
-* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){a.effects.blind=3Dfunction(b){return this.queue(function(){=
var c=3Da(this),d=3D["position","top","bottom","left","right"],e=3Da.effect=
s.setMode(c,b.options.mode||"hide"),f=3Db.options.direction||"vertical";a.e=
ffects.save(c,d),c.show();var g=3Da.effects.createWrapper(c).css({overflow:=
"hidden"}),h=3Df=3D=3D"vertical"?"height":"width",i=3Df=3D=3D"vertical"?g.h=
eight():g.width();e=3D=3D"show"&&g.css(h,0);var j=3D{};j[h]=3De=3D=3D"show"=
?i:0,g.animate(j,b.duration,b.options.easing,function(){e=3D=3D"hide"&&c.hi=
de(),a.effects.restore(c,d),a.effects.removeWrapper(c),b.callback&&b.callba=
ck.apply(c[0],arguments),c.dequeue()})})}})(jQuery);;/*! jQuery UI - v1.8.2=
2 - 2012-07-24
-* https://github.com/jquery/jquery-ui
-* Includes: jquery.effects.bounce.js
-* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){a.effects.bounce=3Dfunction(b){return this.queue(function()=
{var c=3Da(this),d=3D["position","top","bottom","left","right"],e=3Da.effec=
ts.setMode(c,b.options.mode||"effect"),f=3Db.options.direction||"up",g=3Db.=
options.distance||20,h=3Db.options.times||5,i=3Db.duration||250;/show|hide/=
.test(e)&&d.push("opacity"),a.effects.save(c,d),c.show(),a.effects.createWr=
apper(c);var j=3Df=3D=3D"up"||f=3D=3D"down"?"top":"left",k=3Df=3D=3D"up"||f=
=3D=3D"left"?"pos":"neg",g=3Db.options.distance||(j=3D=3D"top"?c.outerHeigh=
t(!0)/3:c.outerWidth(!0)/3);e=3D=3D"show"&&c.css("opacity",0).css(j,k=3D=3D=
"pos"?-g:g),e=3D=3D"hide"&&(g=3Dg/(h*2)),e!=3D"hide"&&h--;if(e=3D=3D"show")=
{var l=3D{opacity:1};l[j]=3D(k=3D=3D"pos"?"+=3D":"-=3D")+g,c.animate(l,i/2,=
b.options.easing),g=3Dg/2,h--}for(var m=3D0;m<h;m++){var n=3D{},p=3D{};n[j]=
=3D(k=3D=3D"pos"?"-=3D":"+=3D")+g,p[j]=3D(k=3D=3D"pos"?"+=3D":"-=3D")+g,c.a=
nimate(n,i/2,b.options.easing).animate(p,i/2,b.options.easing),g=3De=3D=3D"=
hide"?g*2:g/2}if(e=3D=3D"hide"){var l=3D{opacity:0};l[j]=3D(k=3D=3D"pos"?"-=
=3D":"+=3D")+g,c.animate(l,i/2,b.options.easing,function(){c.hide(),a.effec=
ts.restore(c,d),a.effects.removeWrapper(c),b.callback&&b.callback.apply(thi=
s,arguments)})}else{var n=3D{},p=3D{};n[j]=3D(k=3D=3D"pos"?"-=3D":"+=3D")+g=
,p[j]=3D(k=3D=3D"pos"?"+=3D":"-=3D")+g,c.animate(n,i/2,b.options.easing).an=
imate(p,i/2,b.options.easing,function(){a.effects.restore(c,d),a.effects.re=
moveWrapper(c),b.callback&&b.callback.apply(this,arguments)})}c.queue("fx",=
function(){c.dequeue()}),c.dequeue()})}})(jQuery);;/*! jQuery UI - v1.8.22 =
- 2012-07-24
-* https://github.com/jquery/jquery-ui
-* Includes: jquery.effects.clip.js
-* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){a.effects.clip=3Dfunction(b){return this.queue(function(){v=
ar c=3Da(this),d=3D["position","top","bottom","left","right","height","widt=
h"],e=3Da.effects.setMode(c,b.options.mode||"hide"),f=3Db.options.direction=
||"vertical";a.effects.save(c,d),c.show();var g=3Da.effects.createWrapper(c=
).css({overflow:"hidden"}),h=3Dc[0].tagName=3D=3D"IMG"?g:c,i=3D{size:f=3D=
=3D"vertical"?"height":"width",position:f=3D=3D"vertical"?"top":"left"},j=
=3Df=3D=3D"vertical"?h.height():h.width();e=3D=3D"show"&&(h.css(i.size,0),h=
.css(i.position,j/2));var k=3D{};k[i.size]=3De=3D=3D"show"?j:0,k[i.position=
]=3De=3D=3D"show"?0:j/2,h.animate(k,{queue:!1,duration:b.duration,easing:b.=
options.easing,complete:function(){e=3D=3D"hide"&&c.hide(),a.effects.restor=
e(c,d),a.effects.removeWrapper(c),b.callback&&b.callback.apply(c[0],argumen=
ts),c.dequeue()}})})}})(jQuery);;/*! jQuery UI - v1.8.22 - 2012-07-24
-* https://github.com/jquery/jquery-ui
-* Includes: jquery.effects.drop.js
-* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){a.effects.drop=3Dfunction(b){return this.queue(function(){v=
ar c=3Da(this),d=3D["position","top","bottom","left","right","opacity"],e=
=3Da.effects.setMode(c,b.options.mode||"hide"),f=3Db.options.direction||"le=
ft";a.effects.save(c,d),c.show(),a.effects.createWrapper(c);var g=3Df=3D=3D=
"up"||f=3D=3D"down"?"top":"left",h=3Df=3D=3D"up"||f=3D=3D"left"?"pos":"neg"=
,i=3Db.options.distance||(g=3D=3D"top"?c.outerHeight(!0)/2:c.outerWidth(!0)=
/2);e=3D=3D"show"&&c.css("opacity",0).css(g,h=3D=3D"pos"?-i:i);var j=3D{opa=
city:e=3D=3D"show"?1:0};j[g]=3D(e=3D=3D"show"?h=3D=3D"pos"?"+=3D":"-=3D":h=
=3D=3D"pos"?"-=3D":"+=3D")+i,c.animate(j,{queue:!1,duration:b.duration,easi=
ng:b.options.easing,complete:function(){e=3D=3D"hide"&&c.hide(),a.effects.r=
estore(c,d),a.effects.removeWrapper(c),b.callback&&b.callback.apply(this,ar=
guments),c.dequeue()}})})}})(jQuery);;/*! jQuery UI - v1.8.22 - 2012-07-24
-* https://github.com/jquery/jquery-ui
-* Includes: jquery.effects.explode.js
-* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){a.effects.explode=3Dfunction(b){return this.queue(function(=
){var c=3Db.options.pieces?Math.round(Math.sqrt(b.options.pieces)):3,d=3Db.=
options.pieces?Math.round(Math.sqrt(b.options.pieces)):3;b.options.mode=3Db=
.options.mode=3D=3D"toggle"?a(this).is(":visible")?"hide":"show":b.options.=
mode;var e=3Da(this).show().css("visibility","hidden"),f=3De.offset();f.top=
-=3DparseInt(e.css("marginTop"),10)||0,f.left-=3DparseInt(e.css("marginLeft=
"),10)||0;var g=3De.outerWidth(!0),h=3De.outerHeight(!0);for(var i=3D0;i<c;=
i++)for(var j=3D0;j<d;j++)e.clone().appendTo("body").wrap("<div></div>").cs=
s({position:"absolute",visibility:"visible",left:-j*(g/d),top:-i*(h/c)}).pa=
rent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hi=
dden",width:g/d,height:h/c,left:f.left+j*(g/d)+(b.options.mode=3D=3D"show"?=
(j-Math.floor(d/2))*(g/d):0),top:f.top+i*(h/c)+(b.options.mode=3D=3D"show"?=
(i-Math.floor(c/2))*(h/c):0),opacity:b.options.mode=3D=3D"show"?0:1}).anima=
te({left:f.left+j*(g/d)+(b.options.mode=3D=3D"show"?0:(j-Math.floor(d/2))*(=
g/d)),top:f.top+i*(h/c)+(b.options.mode=3D=3D"show"?0:(i-Math.floor(c/2))*(=
h/c)),opacity:b.options.mode=3D=3D"show"?1:0},b.duration||500);setTimeout(f=
unction(){b.options.mode=3D=3D"show"?e.css({visibility:"visible"}):e.css({v=
isibility:"visible"}).hide(),b.callback&&b.callback.apply(e[0]),e.dequeue()=
,a("div.ui-effects-explode").remove()},b.duration||500)})}})(jQuery);;/*! j=
Query UI - v1.8.22 - 2012-07-24
-* https://github.com/jquery/jquery-ui
-* Includes: jquery.effects.fade.js
-* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){a.effects.fade=3Dfunction(b){return this.queue(function(){v=
ar c=3Da(this),d=3Da.effects.setMode(c,b.options.mode||"hide");c.animate({o=
pacity:d},{queue:!1,duration:b.duration,easing:b.options.easing,complete:fu=
nction(){b.callback&&b.callback.apply(this,arguments),c.dequeue()}})})}})(j=
Query);;/*! jQuery UI - v1.8.22 - 2012-07-24
-* https://github.com/jquery/jquery-ui
-* Includes: jquery.effects.fold.js
-* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){a.effects.fold=3Dfunction(b){return this.queue(function(){v=
ar c=3Da(this),d=3D["position","top","bottom","left","right"],e=3Da.effects=
.setMode(c,b.options.mode||"hide"),f=3Db.options.size||15,g=3D!!b.options.h=
orizFirst,h=3Db.duration?b.duration/2:a.fx.speeds._default/2;a.effects.save=
(c,d),c.show();var i=3Da.effects.createWrapper(c).css({overflow:"hidden"}),=
j=3De=3D=3D"show"!=3Dg,k=3Dj?["width","height"]:["height","width"],l=3Dj?[i=
.width(),i.height()]:[i.height(),i.width()],m=3D/([0-9]+)%/.exec(f);m&&(f=
=3DparseInt(m[1],10)/100*l[e=3D=3D"hide"?0:1]),e=3D=3D"show"&&i.css(g?{heig=
ht:0,width:f}:{height:f,width:0});var n=3D{},p=3D{};n[k[0]]=3De=3D=3D"show"=
?l[0]:f,p[k[1]]=3De=3D=3D"show"?l[1]:0,i.animate(n,h,b.options.easing).anim=
ate(p,h,b.options.easing,function(){e=3D=3D"hide"&&c.hide(),a.effects.resto=
re(c,d),a.effects.removeWrapper(c),b.callback&&b.callback.apply(c[0],argume=
nts),c.dequeue()})})}})(jQuery);;/*! jQuery UI - v1.8.22 - 2012-07-24
-* https://github.com/jquery/jquery-ui
-* Includes: jquery.effects.highlight.js
-* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){a.effects.highlight=3Dfunction(b){return this.queue(functio=
n(){var c=3Da(this),d=3D["backgroundImage","backgroundColor","opacity"],e=
=3Da.effects.setMode(c,b.options.mode||"show"),f=3D{backgroundColor:c.css("=
backgroundColor")};e=3D=3D"hide"&&(f.opacity=3D0),a.effects.save(c,d),c.sho=
w().css({backgroundImage:"none",backgroundColor:b.options.color||"#ffff99"}=
).animate(f,{queue:!1,duration:b.duration,easing:b.options.easing,complete:=
function(){e=3D=3D"hide"&&c.hide(),a.effects.restore(c,d),e=3D=3D"show"&&!a=
.support.opacity&&this.style.removeAttribute("filter"),b.callback&&b.callba=
ck.apply(this,arguments),c.dequeue()}})})}})(jQuery);;/*! jQuery UI - v1.8.=
22 - 2012-07-24
-* https://github.com/jquery/jquery-ui
-* Includes: jquery.effects.pulsate.js
-* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){a.effects.pulsate=3Dfunction(b){return this.queue(function(=
){var c=3Da(this),d=3Da.effects.setMode(c,b.options.mode||"show"),e=3D(b.op=
tions.times||5)*2-1,f=3Db.duration?b.duration/2:a.fx.speeds._default/2,g=3D=
c.is(":visible"),h=3D0;g||(c.css("opacity",0).show(),h=3D1),(d=3D=3D"hide"&=
&g||d=3D=3D"show"&&!g)&&e--;for(var i=3D0;i<e;i++)c.animate({opacity:h},f,b=
.options.easing),h=3D(h+1)%2;c.animate({opacity:h},f,b.options.easing,funct=
ion(){h=3D=3D0&&c.hide(),b.callback&&b.callback.apply(this,arguments)}),c.q=
ueue("fx",function(){c.dequeue()}).dequeue()})}})(jQuery);;/*! jQuery UI - =
v1.8.22 - 2012-07-24
-* https://github.com/jquery/jquery-ui
-* Includes: jquery.effects.scale.js
-* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){a.effects.puff=3Dfunction(b){return this.queue(function(){v=
ar c=3Da(this),d=3Da.effects.setMode(c,b.options.mode||"hide"),e=3DparseInt=
(b.options.percent,10)||150,f=3De/100,g=3D{height:c.height(),width:c.width(=
)};a.extend(b.options,{fade:!0,mode:d,percent:d=3D=3D"hide"?e:100,from:d=3D=
=3D"hide"?g:{height:g.height*f,width:g.width*f}}),c.effect("scale",b.option=
s,b.duration,b.callback),c.dequeue()})},a.effects.scale=3Dfunction(b){retur=
n this.queue(function(){var c=3Da(this),d=3Da.extend(!0,{},b.options),e=3Da=
.effects.setMode(c,b.options.mode||"effect"),f=3DparseInt(b.options.percent=
,10)||(parseInt(b.options.percent,10)=3D=3D0?0:e=3D=3D"hide"?0:100),g=3Db.o=
ptions.direction||"both",h=3Db.options.origin;e!=3D"effect"&&(d.origin=3Dh|=
|["middle","center"],d.restore=3D!0);var i=3D{height:c.height(),width:c.wid=
th()};c.from=3Db.options.from||(e=3D=3D"show"?{height:0,width:0}:i);var j=
=3D{y:g!=3D"horizontal"?f/100:1,x:g!=3D"vertical"?f/100:1};c.to=3D{height:i=
.height*j.y,width:i.width*j.x},b.options.fade&&(e=3D=3D"show"&&(c.from.opac=
ity=3D0,c.to.opacity=3D1),e=3D=3D"hide"&&(c.from.opacity=3D1,c.to.opacity=
=3D0)),d.from=3Dc.from,d.to=3Dc.to,d.mode=3De,c.effect("size",d,b.duration,=
b.callback),c.dequeue()})},a.effects.size=3Dfunction(b){return this.queue(f=
unction(){var c=3Da(this),d=3D["position","top","bottom","left","right","wi=
dth","height","overflow","opacity"],e=3D["position","top","bottom","left","=
right","overflow","opacity"],f=3D["width","height","overflow"],g=3D["fontSi=
ze"],h=3D["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"=
],i=3D["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],j=
=3Da.effects.setMode(c,b.options.mode||"effect"),k=3Db.options.restore||!1,=
l=3Db.options.scale||"both",m=3Db.options.origin,n=3D{height:c.height(),wid=
th:c.width()};c.from=3Db.options.from||n,c.to=3Db.options.to||n;if(m){var p=
=3Da.effects.getBaseline(m,n);c.from.top=3D(n.height-c.from.height)*p.y,c.f=
rom.left=3D(n.width-c.from.width)*p.x,c.to.top=3D(n.height-c.to.height)*p.y=
,c.to.left=3D(n.width-c.to.width)*p.x}var q=3D{from:{y:c.from.height/n.heig=
ht,x:c.from.width/n.width},to:{y:c.to.height/n.height,x:c.to.width/n.width}=
};if(l=3D=3D"box"||l=3D=3D"both")q.from.y!=3Dq.to.y&&(d=3Dd.concat(h),c.fro=
m=3Da.effects.setTransition(c,h,q.from.y,c.from),c.to=3Da.effects.setTransi=
tion(c,h,q.to.y,c.to)),q.from.x!=3Dq.to.x&&(d=3Dd.concat(i),c.from=3Da.effe=
cts.setTransition(c,i,q.from.x,c.from),c.to=3Da.effects.setTransition(c,i,q=
.to.x,c.to));(l=3D=3D"content"||l=3D=3D"both")&&q.from.y!=3Dq.to.y&&(d=3Dd.=
concat(g),c.from=3Da.effects.setTransition(c,g,q.from.y,c.from),c.to=3Da.ef=
fects.setTransition(c,g,q.to.y,c.to)),a.effects.save(c,k?d:e),c.show(),a.ef=
fects.createWrapper(c),c.css("overflow","hidden").css(c.from);if(l=3D=3D"co=
ntent"||l=3D=3D"both")h=3Dh.concat(["marginTop","marginBottom"]).concat(g),=
i=3Di.concat(["marginLeft","marginRight"]),f=3Dd.concat(h).concat(i),c.find=
("*[width]").each(function(){var c=3Da(this);k&&a.effects.save(c,f);var d=
=3D{height:c.height(),width:c.width()};c.from=3D{height:d.height*q.from.y,w=
idth:d.width*q.from.x},c.to=3D{height:d.height*q.to.y,width:d.width*q.to.x}=
,q.from.y!=3Dq.to.y&&(c.from=3Da.effects.setTransition(c,h,q.from.y,c.from)=
,c.to=3Da.effects.setTransition(c,h,q.to.y,c.to)),q.from.x!=3Dq.to.x&&(c.fr=
om=3Da.effects.setTransition(c,i,q.from.x,c.from),c.to=3Da.effects.setTrans=
ition(c,i,q.to.x,c.to)),c.css(c.from),c.animate(c.to,b.duration,b.options.e=
asing,function(){k&&a.effects.restore(c,f)})});c.animate(c.to,{queue:!1,dur=
ation:b.duration,easing:b.options.easing,complete:function(){c.to.opacity=
=3D=3D=3D0&&c.css("opacity",c.from.opacity),j=3D=3D"hide"&&c.hide(),a.effec=
ts.restore(c,k?d:e),a.effects.removeWrapper(c),b.callback&&b.callback.apply=
(this,arguments),c.dequeue()}})})}})(jQuery);;/*! jQuery UI - v1.8.22 - 201=
2-07-24
-* https://github.com/jquery/jquery-ui
-* Includes: jquery.effects.shake.js
-* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){a.effects.shake=3Dfunction(b){return this.queue(function(){=
var c=3Da(this),d=3D["position","top","bottom","left","right"],e=3Da.effect=
s.setMode(c,b.options.mode||"effect"),f=3Db.options.direction||"left",g=3Db=
.options.distance||20,h=3Db.options.times||3,i=3Db.duration||b.options.dura=
tion||140;a.effects.save(c,d),c.show(),a.effects.createWrapper(c);var j=3Df=
=3D=3D"up"||f=3D=3D"down"?"top":"left",k=3Df=3D=3D"up"||f=3D=3D"left"?"pos"=
:"neg",l=3D{},m=3D{},n=3D{};l[j]=3D(k=3D=3D"pos"?"-=3D":"+=3D")+g,m[j]=3D(k=
=3D=3D"pos"?"+=3D":"-=3D")+g*2,n[j]=3D(k=3D=3D"pos"?"-=3D":"+=3D")+g*2,c.an=
imate(l,i,b.options.easing);for(var p=3D1;p<h;p++)c.animate(m,i,b.options.e=
asing).animate(n,i,b.options.easing);c.animate(m,i,b.options.easing).animat=
e(l,i/2,b.options.easing,function(){a.effects.restore(c,d),a.effects.remove=
Wrapper(c),b.callback&&b.callback.apply(this,arguments)}),c.queue("fx",func=
tion(){c.dequeue()}),c.dequeue()})}})(jQuery);;/*! jQuery UI - v1.8.22 - 20=
12-07-24
-* https://github.com/jquery/jquery-ui
-* Includes: jquery.effects.slide.js
-* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){a.effects.slide=3Dfunction(b){return this.queue(function(){=
var c=3Da(this),d=3D["position","top","bottom","left","right"],e=3Da.effect=
s.setMode(c,b.options.mode||"show"),f=3Db.options.direction||"left";a.effec=
ts.save(c,d),c.show(),a.effects.createWrapper(c).css({overflow:"hidden"});v=
ar g=3Df=3D=3D"up"||f=3D=3D"down"?"top":"left",h=3Df=3D=3D"up"||f=3D=3D"lef=
t"?"pos":"neg",i=3Db.options.distance||(g=3D=3D"top"?c.outerHeight(!0):c.ou=
terWidth(!0));e=3D=3D"show"&&c.css(g,h=3D=3D"pos"?isNaN(i)?"-"+i:-i:i);var =
j=3D{};j[g]=3D(e=3D=3D"show"?h=3D=3D"pos"?"+=3D":"-=3D":h=3D=3D"pos"?"-=3D"=
:"+=3D")+i,c.animate(j,{queue:!1,duration:b.duration,easing:b.options.easin=
g,complete:function(){e=3D=3D"hide"&&c.hide(),a.effects.restore(c,d),a.effe=
cts.removeWrapper(c),b.callback&&b.callback.apply(this,arguments),c.dequeue=
()}})})}})(jQuery);;/*! jQuery UI - v1.8.22 - 2012-07-24
-* https://github.com/jquery/jquery-ui
-* Includes: jquery.effects.transfer.js
-* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){a.effects.transfer=3Dfunction(b){return this.queue(function=
(){var c=3Da(this),d=3Da(b.options.to),e=3Dd.offset(),f=3D{top:e.top,left:e=
.left,height:d.innerHeight(),width:d.innerWidth()},g=3Dc.offset(),h=3Da('<d=
iv class=3D"ui-effects-transfer"></div>').appendTo(document.body).addClass(=
b.options.className).css({top:g.top,left:g.left,height:c.innerHeight(),widt=
h:c.innerWidth(),position:"absolute"}).animate(f,b.duration,b.options.easin=
g,function(){h.remove(),b.callback&&b.callback.apply(c[0],arguments),c.dequ=
eue()})})}})(jQuery);;
\ No newline at end of file
+(function($,undefined){function Datepicker(){this.debug=3D!1,this._curInst=
=3Dnull,this._keyEvent=3D!1,this._disabledInputs=3D[],this._datepickerShowi=
ng=3D!1,this._inDialog=3D!1,this._mainDivId=3D"ui-datepicker-div",this._inl=
ineClass=3D"ui-datepicker-inline",this._appendClass=3D"ui-datepicker-append=
",this._triggerClass=3D"ui-datepicker-trigger",this._dialogClass=3D"ui-date=
picker-dialog",this._disableClass=3D"ui-datepicker-disabled",this._unselect=
ableClass=3D"ui-datepicker-unselectable",this._currentClass=3D"ui-datepicke=
r-current-day",this._dayOverClass=3D"ui-datepicker-days-cell-over",this.reg=
ional=3D[],this.regional[""]=3D{closeText:"Done",prevText:"Prev",nextText:"=
Next",currentText:"Today",monthNames:["January","February","March","April",=
"May","June","July","August","September","October","November","December"],m=
onthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct"=
,"Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday",=
"Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sa=
t"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFo=
rmat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},th=
is._defaults=3D{showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate=
:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hide=
IfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,cha=
ngeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,sh=
owWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null=
,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:n=
ull,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0=
,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,s=
howButtonPanel:!1,autoSize:!1,disabled:!1},$.extend(this._defaults,this.reg=
ional[""]),this.dpDiv=3DbindHover($('<div id=3D"'+this._mainDivId+'" class=
=3D"ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-=
all"></div>'))}function bindHover(a){var b=3D"button, .ui-datepicker-prev, =
.ui-datepicker-next, .ui-datepicker-calendar td a";return a.bind("mouseout"=
,function(a){var c=3D$(a.target).closest(b);if(!c.length)return;c.removeCla=
ss("ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover")}).bi=
nd("mouseover",function(c){var d=3D$(c.target).closest(b);if($.datepicker._=
isDisabledDatepicker(instActive.inline?a.parent()[0]:instActive.input[0])||=
!d.length)return;d.parents(".ui-datepicker-calendar").find("a").removeClass=
("ui-state-hover"),d.addClass("ui-state-hover"),d.hasClass("ui-datepicker-p=
rev")&&d.addClass("ui-datepicker-prev-hover"),d.hasClass("ui-datepicker-nex=
t")&&d.addClass("ui-datepicker-next-hover")})}function extendRemove(a,b){$.=
extend(a,b);for(var c in b)if(b[c]=3D=3Dnull||b[c]=3D=3Dundefined)a[c]=3Db[=
c];return a}function isArray(a){return a&&($.browser.safari&&typeof a=3D=3D=
"object"&&a.length||a.constructor&&a.constructor.toString().match(/\Array\(=
\)/))}$.extend($.ui,{datepicker:{version:"1.8.23"}});var PROP_NAME=3D"datep=
icker",dpuuid=3D(new Date).getTime(),instActive;$.extend(Datepicker.prototy=
pe,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&co=
nsole.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpD=
iv},setDefaults:function(a){return extendRemove(this._defaults,a||{}),this}=
,_attachDatepicker:function(target,settings){var inlineSettings=3Dnull;for(=
var attrName in this._defaults){var attrValue=3Dtarget.getAttribute("date:"=
+attrName);if(attrValue){inlineSettings=3DinlineSettings||{};try{inlineSett=
ings[attrName]=3Deval(attrValue)}catch(err){inlineSettings[attrName]=3Dattr=
Value}}}var nodeName=3Dtarget.nodeName.toLowerCase(),inline=3DnodeName=3D=
=3D"div"||nodeName=3D=3D"span";target.id||(this.uuid+=3D1,target.id=3D"dp"+=
this.uuid);var inst=3Dthis._newInst($(target),inline);inst.settings=3D$.ext=
end({},settings||{},inlineSettings||{}),nodeName=3D=3D"input"?this._connect=
Datepicker(target,inst):inline&&this._inlineDatepicker(target,inst)},_newIn=
st:function(a,b){var c=3Da[0].id.replace(/([^A-Za-z0-9_-])/g,"\\\\$1");retu=
rn{id:c,input:a,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,dr=
awYear:0,inline:b,dpDiv:b?bindHover($('<div class=3D"'+this._inlineClass+' =
ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"=
></div>')):this.dpDiv}},_connectDatepicker:function(a,b){var c=3D$(a);b.app=
end=3D$([]),b.trigger=3D$([]);if(c.hasClass(this.markerClassName))return;th=
is._attachments(c,b),c.addClass(this.markerClassName).keydown(this._doKeyDo=
wn).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicke=
r",function(a,c,d){b.settings[c]=3Dd}).bind("getData.datepicker",function(a=
,c){return this._get(b,c)}),this._autoSize(b),$.data(a,PROP_NAME,b),b.setti=
ngs.disabled&&this._disableDatepicker(a)},_attachments:function(a,b){var c=
=3Dthis._get(b,"appendText"),d=3Dthis._get(b,"isRTL");b.append&&b.append.re=
move(),c&&(b.append=3D$('<span class=3D"'+this._appendClass+'">'+c+"</span>=
"),a[d?"before":"after"](b.append)),a.unbind("focus",this._showDatepicker),=
b.trigger&&b.trigger.remove();var e=3Dthis._get(b,"showOn");(e=3D=3D"focus"=
||e=3D=3D"both")&&a.focus(this._showDatepicker);if(e=3D=3D"button"||e=3D=3D=
"both"){var f=3Dthis._get(b,"buttonText"),g=3Dthis._get(b,"buttonImage");b.=
trigger=3D$(this._get(b,"buttonImageOnly")?$("<img/>").addClass(this._trigg=
erClass).attr({src:g,alt:f,title:f}):$('<button type=3D"button"></button>')=
.addClass(this._triggerClass).html(g=3D=3D""?f:$("<img/>").attr({src:g,alt:=
f,title:f}))),a[d?"before":"after"](b.trigger),b.trigger.click(function(){r=
eturn $.datepicker._datepickerShowing&&$.datepicker._lastInput=3D=3Da[0]?$.=
datepicker._hideDatepicker():$.datepicker._datepickerShowing&&$.datepicker.=
_lastInput!=3Da[0]?($.datepicker._hideDatepicker(),$.datepicker._showDatepi=
cker(a[0])):$.datepicker._showDatepicker(a[0]),!1})}},_autoSize:function(a)=
{if(this._get(a,"autoSize")&&!a.inline){var b=3Dnew Date(2009,11,20),c=3Dth=
is._get(a,"dateFormat");if(c.match(/[DM]/)){var d=3Dfunction(a){var b=3D0,c=
=3D0;for(var d=3D0;d<a.length;d++)a[d].length>b&&(b=3Da[d].length,c=3Dd);re=
turn c};b.setMonth(d(this._get(a,c.match(/MM/)?"monthNames":"monthNamesShor=
t"))),b.setDate(d(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20=
-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDat=
epicker:function(a,b){var c=3D$(a);if(c.hasClass(this.markerClassName))retu=
rn;c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicke=
r",function(a,c,d){b.settings[c]=3Dd}).bind("getData.datepicker",function(a=
,c){return this._get(b,c)}),$.data(a,PROP_NAME,b),this._setDate(b,this._get=
DefaultDate(b),!0),this._updateDatepicker(b),this._updateAlternate(b),b.set=
tings.disabled&&this._disableDatepicker(a),b.dpDiv.css("display","block")},=
_dialogDatepicker:function(a,b,c,d,e){var f=3Dthis._dialogInst;if(!f){this.=
uuid+=3D1;var g=3D"dp"+this.uuid;this._dialogInput=3D$('<input type=3D"text=
" id=3D"'+g+'" style=3D"position: absolute; top: -100px; width: 0px;"/>'),t=
his._dialogInput.keydown(this._doKeyDown),$("body").append(this._dialogInpu=
t),f=3Dthis._dialogInst=3Dthis._newInst(this._dialogInput,!1),f.settings=3D=
{},$.data(this._dialogInput[0],PROP_NAME,f)}extendRemove(f.settings,d||{}),=
b=3Db&&b.constructor=3D=3DDate?this._formatDate(f,b):b,this._dialogInput.va=
l(b),this._pos=3De?e.length?e:[e.pageX,e.pageY]:null;if(!this._pos){var h=
=3Ddocument.documentElement.clientWidth,i=3Ddocument.documentElement.client=
Height,j=3Ddocument.documentElement.scrollLeft||document.body.scrollLeft,k=
=3Ddocument.documentElement.scrollTop||document.body.scrollTop;this._pos=3D=
[h/2-100+j,i/2-150+k]}return this._dialogInput.css("left",this._pos[0]+20+"=
px").css("top",this._pos[1]+"px"),f.settings.onSelect=3Dc,this._inDialog=3D=
!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialog=
Input[0]),$.blockUI&&$.blockUI(this.dpDiv),$.data(this._dialogInput[0],PROP=
_NAME,f),this},_destroyDatepicker:function(a){var b=3D$(a),c=3D$.data(a,PRO=
P_NAME);if(!b.hasClass(this.markerClassName))return;var d=3Da.nodeName.toLo=
werCase();$.removeData(a,PROP_NAME),d=3D=3D"input"?(c.append.remove(),c.tri=
gger.remove(),b.removeClass(this.markerClassName).unbind("focus",this._show=
Datepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKey=
Press).unbind("keyup",this._doKeyUp)):(d=3D=3D"div"||d=3D=3D"span")&&b.remo=
veClass(this.markerClassName).empty()},_enableDatepicker:function(a){var b=
=3D$(a),c=3D$.data(a,PROP_NAME);if(!b.hasClass(this.markerClassName))return=
;var d=3Da.nodeName.toLowerCase();if(d=3D=3D"input")a.disabled=3D!1,c.trigg=
er.filter("button").each(function(){this.disabled=3D!1}).end().filter("img"=
).css({opacity:"1.0",cursor:""});else if(d=3D=3D"div"||d=3D=3D"span"){var e=
=3Db.children("."+this._inlineClass);e.children().removeClass("ui-state-dis=
abled"),e.find("select.ui-datepicker-month, select.ui-datepicker-year").rem=
oveAttr("disabled")}this._disabledInputs=3D$.map(this._disabledInputs,funct=
ion(b){return b=3D=3Da?null:b})},_disableDatepicker:function(a){var b=3D$(a=
),c=3D$.data(a,PROP_NAME);if(!b.hasClass(this.markerClassName))return;var d=
=3Da.nodeName.toLowerCase();if(d=3D=3D"input")a.disabled=3D!0,c.trigger.fil=
ter("button").each(function(){this.disabled=3D!0}).end().filter("img").css(=
{opacity:"0.5",cursor:"default"});else if(d=3D=3D"div"||d=3D=3D"span"){var =
e=3Db.children("."+this._inlineClass);e.children().addClass("ui-state-disab=
led"),e.find("select.ui-datepicker-month, select.ui-datepicker-year").attr(=
"disabled","disabled")}this._disabledInputs=3D$.map(this._disabledInputs,fu=
nction(b){return b=3D=3Da?null:b}),this._disabledInputs[this._disabledInput=
s.length]=3Da},_isDisabledDatepicker:function(a){if(!a)return!1;for(var b=
=3D0;b<this._disabledInputs.length;b++)if(this._disabledInputs[b]=3D=3Da)re=
turn!0;return!1},_getInst:function(a){try{return $.data(a,PROP_NAME)}catch(=
b){throw"Missing instance data for this datepicker"}},_optionDatepicker:fun=
ction(a,b,c){var d=3Dthis._getInst(a);if(arguments.length=3D=3D2&&typeof b=
=3D=3D"string")return b=3D=3D"defaults"?$.extend({},$.datepicker._defaults)=
:d?b=3D=3D"all"?$.extend({},d.settings):this._get(d,b):null;var e=3Db||{};t=
ypeof b=3D=3D"string"&&(e=3D{},e[b]=3Dc);if(d){this._curInst=3D=3Dd&&this._=
hideDatepicker();var f=3Dthis._getDateDatepicker(a,!0),g=3Dthis._getMinMaxD=
ate(d,"min"),h=3Dthis._getMinMaxDate(d,"max");extendRemove(d.settings,e),g!=
=3D=3Dnull&&e.dateFormat!=3D=3Dundefined&&e.minDate=3D=3D=3Dundefined&&(d.s=
ettings.minDate=3Dthis._formatDate(d,g)),h!=3D=3Dnull&&e.dateFormat!=3D=3Du=
ndefined&&e.maxDate=3D=3D=3Dundefined&&(d.settings.maxDate=3Dthis._formatDa=
te(d,h)),this._attachments($(a),d),this._autoSize(d),this._setDate(d,f),thi=
s._updateAlternate(d),this._updateDatepicker(d)}},_changeDatepicker:functio=
n(a,b,c){this._optionDatepicker(a,b,c)},_refreshDatepicker:function(a){var =
b=3Dthis._getInst(a);b&&this._updateDatepicker(b)},_setDateDatepicker:funct=
ion(a,b){var c=3Dthis._getInst(a);c&&(this._setDate(c,b),this._updateDatepi=
cker(c),this._updateAlternate(c))},_getDateDatepicker:function(a,b){var c=
=3Dthis._getInst(a);return c&&!c.inline&&this._setDateFromField(c,b),c?this=
._getDate(c):null},_doKeyDown:function(a){var b=3D$.datepicker._getInst(a.t=
arget),c=3D!0,d=3Db.dpDiv.is(".ui-datepicker-rtl");b._keyEvent=3D!0;if($.da=
tepicker._datepickerShowing)switch(a.keyCode){case 9:$.datepicker._hideDate=
picker(),c=3D!1;break;case 13:var e=3D$("td."+$.datepicker._dayOverClass+":=
not(."+$.datepicker._currentClass+")",b.dpDiv);e[0]&&$.datepicker._selectDa=
y(a.target,b.selectedMonth,b.selectedYear,e[0]);var f=3D$.datepicker._get(b=
,"onSelect");if(f){var g=3D$.datepicker._formatDate(b);f.apply(b.input?b.in=
put[0]:null,[g,b])}else $.datepicker._hideDatepicker();return!1;case 27:$.d=
atepicker._hideDatepicker();break;case 33:$.datepicker._adjustDate(a.target=
,a.ctrlKey?-$.datepicker._get(b,"stepBigMonths"):-$.datepicker._get(b,"step=
Months"),"M");break;case 34:$.datepicker._adjustDate(a.target,a.ctrlKey?+$.=
datepicker._get(b,"stepBigMonths"):+$.datepicker._get(b,"stepMonths"),"M");=
break;case 35:(a.ctrlKey||a.metaKey)&&$.datepicker._clearDate(a.target),c=
=3Da.ctrlKey||a.metaKey;break;case 36:(a.ctrlKey||a.metaKey)&&$.datepicker.=
_gotoToday(a.target),c=3Da.ctrlKey||a.metaKey;break;case 37:(a.ctrlKey||a.m=
etaKey)&&$.datepicker._adjustDate(a.target,d?1:-1,"D"),c=3Da.ctrlKey||a.met=
aKey,a.originalEvent.altKey&&$.datepicker._adjustDate(a.target,a.ctrlKey?-$=
.datepicker._get(b,"stepBigMonths"):-$.datepicker._get(b,"stepMonths"),"M")=
;break;case 38:(a.ctrlKey||a.metaKey)&&$.datepicker._adjustDate(a.target,-7=
,"D"),c=3Da.ctrlKey||a.metaKey;break;case 39:(a.ctrlKey||a.metaKey)&&$.date=
picker._adjustDate(a.target,d?-1:1,"D"),c=3Da.ctrlKey||a.metaKey,a.original=
Event.altKey&&$.datepicker._adjustDate(a.target,a.ctrlKey?+$.datepicker._ge=
t(b,"stepBigMonths"):+$.datepicker._get(b,"stepMonths"),"M");break;case 40:=
(a.ctrlKey||a.metaKey)&&$.datepicker._adjustDate(a.target,7,"D"),c=3Da.ctrl=
Key||a.metaKey;break;default:c=3D!1}else a.keyCode=3D=3D36&&a.ctrlKey?$.dat=
epicker._showDatepicker(this):c=3D!1;c&&(a.preventDefault(),a.stopPropagati=
on())},_doKeyPress:function(a){var b=3D$.datepicker._getInst(a.target);if($=
.datepicker._get(b,"constrainInput")){var c=3D$.datepicker._possibleChars($=
.datepicker._get(b,"dateFormat")),d=3DString.fromCharCode(a.charCode=3D=3Du=
ndefined?a.keyCode:a.charCode);return a.ctrlKey||a.metaKey||d<" "||!c||c.in=
dexOf(d)>-1}},_doKeyUp:function(a){var b=3D$.datepicker._getInst(a.target);=
if(b.input.val()!=3Db.lastVal)try{var c=3D$.datepicker.parseDate($.datepick=
er._get(b,"dateFormat"),b.input?b.input.val():null,$.datepicker._getFormatC=
onfig(b));c&&($.datepicker._setDateFromField(b),$.datepicker._updateAlterna=
te(b),$.datepicker._updateDatepicker(b))}catch(d){$.datepicker.log(d)}retur=
n!0},_showDatepicker:function(a){a=3Da.target||a,a.nodeName.toLowerCase()!=
=3D"input"&&(a=3D$("input",a.parentNode)[0]);if($.datepicker._isDisabledDat=
epicker(a)||$.datepicker._lastInput=3D=3Da)return;var b=3D$.datepicker._get=
Inst(a);$.datepicker._curInst&&$.datepicker._curInst!=3Db&&($.datepicker._c=
urInst.dpDiv.stop(!0,!0),b&&$.datepicker._datepickerShowing&&$.datepicker._=
hideDatepicker($.datepicker._curInst.input[0]));var c=3D$.datepicker._get(b=
,"beforeShow"),d=3Dc?c.apply(a,[a,b]):{};if(d=3D=3D=3D!1)return;extendRemov=
e(b.settings,d),b.lastVal=3Dnull,$.datepicker._lastInput=3Da,$.datepicker._=
setDateFromField(b),$.datepicker._inDialog&&(a.value=3D""),$.datepicker._po=
s||($.datepicker._pos=3D$.datepicker._findPos(a),$.datepicker._pos[1]+=3Da.=
offsetHeight);var e=3D!1;$(a).parents().each(function(){return e|=3D$(this)=
.css("position")=3D=3D"fixed",!e}),e&&$.browser.opera&&($.datepicker._pos[0=
]-=3Ddocument.documentElement.scrollLeft,$.datepicker._pos[1]-=3Ddocument.d=
ocumentElement.scrollTop);var f=3D{left:$.datepicker._pos[0],top:$.datepick=
er._pos[1]};$.datepicker._pos=3Dnull,b.dpDiv.empty(),b.dpDiv.css({position:=
"absolute",display:"block",top:"-1000px"}),$.datepicker._updateDatepicker(b=
),f=3D$.datepicker._checkOffset(b,f,e),b.dpDiv.css({position:$.datepicker._=
inDialog&&$.blockUI?"static":e?"fixed":"absolute",display:"none",left:f.lef=
t+"px",top:f.top+"px"});if(!b.inline){var g=3D$.datepicker._get(b,"showAnim=
"),h=3D$.datepicker._get(b,"duration"),i=3Dfunction(){var a=3Db.dpDiv.find(=
"iframe.ui-datepicker-cover");if(!!a.length){var c=3D$.datepicker._getBorde=
rs(b.dpDiv);a.css({left:-c[0],top:-c[1],width:b.dpDiv.outerWidth(),height:b=
.dpDiv.outerHeight()})}};b.dpDiv.zIndex($(a).zIndex()+1),$.datepicker._date=
pickerShowing=3D!0,$.effects&&$.effects[g]?b.dpDiv.show(g,$.datepicker._get=
(b,"showOptions"),h,i):b.dpDiv[g||"show"](g?h:null,i),(!g||!h)&&i(),b.input=
.is(":visible")&&!b.input.is(":disabled")&&b.input.focus(),$.datepicker._cu=
rInst=3Db}},_updateDatepicker:function(a){var b=3Dthis;b.maxRows=3D4;var c=
=3D$.datepicker._getBorders(a.dpDiv);instActive=3Da,a.dpDiv.empty().append(=
this._generateHTML(a)),this._attachHandlers(a);var d=3Da.dpDiv.find("iframe=
.ui-datepicker-cover");!d.length||d.css({left:-c[0],top:-c[1],width:a.dpDiv=
.outerWidth(),height:a.dpDiv.outerHeight()}),a.dpDiv.find("."+this._dayOver=
Class+" a").mouseover();var e=3Dthis._getNumberOfMonths(a),f=3De[1],g=3D17;=
a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepic=
ker-multi-4").width(""),f>1&&a.dpDiv.addClass("ui-datepicker-multi-"+f).css=
("width",g*f+"em"),a.dpDiv[(e[0]!=3D1||e[1]!=3D1?"add":"remove")+"Class"]("=
ui-datepicker-multi"),a.dpDiv[(this._get(a,"isRTL")?"add":"remove")+"Class"=
]("ui-datepicker-rtl"),a=3D=3D$.datepicker._curInst&&$.datepicker._datepick=
erShowing&&a.input&&a.input.is(":visible")&&!a.input.is(":disabled")&&a.inp=
ut[0]!=3Ddocument.activeElement&&a.input.focus();if(a.yearshtml){var h=3Da.=
yearshtml;setTimeout(function(){h=3D=3D=3Da.yearshtml&&a.yearshtml&&a.dpDiv=
.find("select.ui-datepicker-year:first").replaceWith(a.yearshtml),h=3Da.yea=
rshtml=3Dnull},0)}},_getBorders:function(a){var b=3Dfunction(a){return{thin=
:1,medium:2,thick:3}[a]||a};return[parseFloat(b(a.css("border-left-width"))=
),parseFloat(b(a.css("border-top-width")))]},_checkOffset:function(a,b,c){v=
ar d=3Da.dpDiv.outerWidth(),e=3Da.dpDiv.outerHeight(),f=3Da.input?a.input.o=
uterWidth():0,g=3Da.input?a.input.outerHeight():0,h=3Ddocument.documentElem=
ent.clientWidth+(c?0:$(document).scrollLeft()),i=3Ddocument.documentElement=
.clientHeight+(c?0:$(document).scrollTop());return b.left-=3Dthis._get(a,"i=
sRTL")?d-f:0,b.left-=3Dc&&b.left=3D=3Da.input.offset().left?$(document).scr=
ollLeft():0,b.top-=3Dc&&b.top=3D=3Da.input.offset().top+g?$(document).scrol=
lTop():0,b.left-=3DMath.min(b.left,b.left+d>h&&h>d?Math.abs(b.left+d-h):0),=
b.top-=3DMath.min(b.top,b.top+e>i&&i>e?Math.abs(e+g):0),b},_findPos:functio=
n(a){var b=3Dthis._getInst(a),c=3Dthis._get(b,"isRTL");while(a&&(a.type=3D=
=3D"hidden"||a.nodeType!=3D1||$.expr.filters.hidden(a)))a=3Da[c?"previousSi=
bling":"nextSibling"];var d=3D$(a).offset();return[d.left,d.top]},_hideDate=
picker:function(a){var b=3Dthis._curInst;if(!b||a&&b!=3D$.data(a,PROP_NAME)=
)return;if(this._datepickerShowing){var c=3Dthis._get(b,"showAnim"),d=3Dthi=
s._get(b,"duration"),e=3Dfunction(){$.datepicker._tidyDialog(b)};$.effects&=
&$.effects[c]?b.dpDiv.hide(c,$.datepicker._get(b,"showOptions"),d,e):b.dpDi=
v[c=3D=3D"slideDown"?"slideUp":c=3D=3D"fadeIn"?"fadeOut":"hide"](c?d:null,e=
),c||e(),this._datepickerShowing=3D!1;var f=3Dthis._get(b,"onClose");f&&f.a=
pply(b.input?b.input[0]:null,[b.input?b.input.val():"",b]),this._lastInput=
=3Dnull,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0=
",top:"-100px"}),$.blockUI&&($.unblockUI(),$("body").append(this.dpDiv))),t=
his._inDialog=3D!1}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dial=
ogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(a)=
{if(!$.datepicker._curInst)return;var b=3D$(a.target),c=3D$.datepicker._get=
Inst(b[0]);(b[0].id!=3D$.datepicker._mainDivId&&b.parents("#"+$.datepicker.=
_mainDivId).length=3D=3D0&&!b.hasClass($.datepicker.markerClassName)&&!b.cl=
osest("."+$.datepicker._triggerClass).length&&$.datepicker._datepickerShowi=
ng&&(!$.datepicker._inDialog||!$.blockUI)||b.hasClass($.datepicker.markerCl=
assName)&&$.datepicker._curInst!=3Dc)&&$.datepicker._hideDatepicker()},_adj=
ustDate:function(a,b,c){var d=3D$(a),e=3Dthis._getInst(d[0]);if(this._isDis=
abledDatepicker(d[0]))return;this._adjustInstDate(e,b+(c=3D=3D"M"?this._get=
(e,"showCurrentAtPos"):0),c),this._updateDatepicker(e)},_gotoToday:function=
(a){var b=3D$(a),c=3Dthis._getInst(b[0]);if(this._get(c,"gotoCurrent")&&c.c=
urrentDay)c.selectedDay=3Dc.currentDay,c.drawMonth=3Dc.selectedMonth=3Dc.cu=
rrentMonth,c.drawYear=3Dc.selectedYear=3Dc.currentYear;else{var d=3Dnew Dat=
e;c.selectedDay=3Dd.getDate(),c.drawMonth=3Dc.selectedMonth=3Dd.getMonth(),=
c.drawYear=3Dc.selectedYear=3Dd.getFullYear()}this._notifyChange(c),this._a=
djustDate(b)},_selectMonthYear:function(a,b,c){var d=3D$(a),e=3Dthis._getIn=
st(d[0]);e["selected"+(c=3D=3D"M"?"Month":"Year")]=3De["draw"+(c=3D=3D"M"?"=
Month":"Year")]=3DparseInt(b.options[b.selectedIndex].value,10),this._notif=
yChange(e),this._adjustDate(d)},_selectDay:function(a,b,c,d){var e=3D$(a);i=
f($(d).hasClass(this._unselectableClass)||this._isDisabledDatepicker(e[0]))=
return;var f=3Dthis._getInst(e[0]);f.selectedDay=3Df.currentDay=3D$("a",d).=
html(),f.selectedMonth=3Df.currentMonth=3Db,f.selectedYear=3Df.currentYear=
=3Dc,this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.cu=
rrentYear))},_clearDate:function(a){var b=3D$(a),c=3Dthis._getInst(b[0]);th=
is._selectDate(b,"")},_selectDate:function(a,b){var c=3D$(a),d=3Dthis._getI=
nst(c[0]);b=3Db!=3Dnull?b:this._formatDate(d),d.input&&d.input.val(b),this.=
_updateAlternate(d);var e=3Dthis._get(d,"onSelect");e?e.apply(d.input?d.inp=
ut[0]:null,[b,d]):d.input&&d.input.trigger("change"),d.inline?this._updateD=
atepicker(d):(this._hideDatepicker(),this._lastInput=3Dd.input[0],typeof d.=
input[0]!=3D"object"&&d.input.focus(),this._lastInput=3Dnull)},_updateAlter=
nate:function(a){var b=3Dthis._get(a,"altField");if(b){var c=3Dthis._get(a,=
"altFormat")||this._get(a,"dateFormat"),d=3Dthis._getDate(a),e=3Dthis.forma=
tDate(c,d,this._getFormatConfig(a));$(b).each(function(){$(this).val(e)})}}=
,noWeekends:function(a){var b=3Da.getDay();return[b>0&&b<6,""]},iso8601Week=
:function(a){var b=3Dnew Date(a.getTime());b.setDate(b.getDate()+4-(b.getDa=
y()||7));var c=3Db.getTime();return b.setMonth(0),b.setDate(1),Math.floor(M=
ath.round((c-b)/864e5)/7)+1},parseDate:function(a,b,c){if(a=3D=3Dnull||b=3D=
=3Dnull)throw"Invalid arguments";b=3Dtypeof b=3D=3D"object"?b.toString():b+=
"";if(b=3D=3D"")return null;var d=3D(c?c.shortYearCutoff:null)||this._defau=
lts.shortYearCutoff;d=3Dtypeof d!=3D"string"?d:(new Date).getFullYear()%100=
+parseInt(d,10);var e=3D(c?c.dayNamesShort:null)||this._defaults.dayNamesSh=
ort,f=3D(c?c.dayNames:null)||this._defaults.dayNames,g=3D(c?c.monthNamesSho=
rt:null)||this._defaults.monthNamesShort,h=3D(c?c.monthNames:null)||this._d=
efaults.monthNames,i=3D-1,j=3D-1,k=3D-1,l=3D-1,m=3D!1,n=3Dfunction(b){var c=
=3Ds+1<a.length&&a.charAt(s+1)=3D=3Db;return c&&s++,c},o=3Dfunction(a){var =
c=3Dn(a),d=3Da=3D=3D"@"?14:a=3D=3D"!"?20:a=3D=3D"y"&&c?4:a=3D=3D"o"?3:2,e=
=3Dnew RegExp("^\\d{1,"+d+"}"),f=3Db.substring(r).match(e);if(!f)throw"Miss=
ing number at position "+r;return r+=3Df[0].length,parseInt(f[0],10)},p=3Df=
unction(a,c,d){var e=3D$.map(n(a)?d:c,function(a,b){return[[b,a]]}).sort(fu=
nction(a,b){return-(a[1].length-b[1].length)}),f=3D-1;$.each(e,function(a,c=
){var d=3Dc[1];if(b.substr(r,d.length).toLowerCase()=3D=3Dd.toLowerCase())r=
eturn f=3Dc[0],r+=3Dd.length,!1});if(f!=3D-1)return f+1;throw"Unknown name =
at position "+r},q=3Dfunction(){if(b.charAt(r)!=3Da.charAt(s))throw"Unexpec=
ted literal at position "+r;r++},r=3D0;for(var s=3D0;s<a.length;s++)if(m)a.=
charAt(s)=3D=3D"'"&&!n("'")?m=3D!1:q();else switch(a.charAt(s)){case"d":k=
=3Do("d");break;case"D":p("D",e,f);break;case"o":l=3Do("o");break;case"m":j=
=3Do("m");break;case"M":j=3Dp("M",g,h);break;case"y":i=3Do("y");break;case"=
@":var t=3Dnew Date(o("@"));i=3Dt.getFullYear(),j=3Dt.getMonth()+1,k=3Dt.ge=
tDate();break;case"!":var t=3Dnew Date((o("!")-this._ticksTo1970)/1e4);i=3D=
t.getFullYear(),j=3Dt.getMonth()+1,k=3Dt.getDate();break;case"'":n("'")?q()=
:m=3D!0;break;default:q()}if(r<b.length)throw"Extra/unparsed characters fou=
nd in date: "+b.substring(r);i=3D=3D-1?i=3D(new Date).getFullYear():i<100&&=
(i+=3D(new Date).getFullYear()-(new Date).getFullYear()%100+(i<=3Dd?0:-100)=
);if(l>-1){j=3D1,k=3Dl;do{var u=3Dthis._getDaysInMonth(i,j-1);if(k<=3Du)bre=
ak;j++,k-=3Du}while(!0)}var t=3Dthis._daylightSavingAdjust(new Date(i,j-1,k=
));if(t.getFullYear()!=3Di||t.getMonth()+1!=3Dj||t.getDate()!=3Dk)throw"Inv=
alid date";return t},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd=
",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, =
d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy=
-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(=
4.925))*24*60*60*1e7,formatDate:function(a,b,c){if(!b)return"";var d=3D(c?c=
.dayNamesShort:null)||this._defaults.dayNamesShort,e=3D(c?c.dayNames:null)|=
|this._defaults.dayNames,f=3D(c?c.monthNamesShort:null)||this._defaults.mon=
thNamesShort,g=3D(c?c.monthNames:null)||this._defaults.monthNames,h=3Dfunct=
ion(b){var c=3Dm+1<a.length&&a.charAt(m+1)=3D=3Db;return c&&m++,c},i=3Dfunc=
tion(a,b,c){var d=3D""+b;if(h(a))while(d.length<c)d=3D"0"+d;return d},j=3Df=
unction(a,b,c,d){return h(a)?d[b]:c[b]},k=3D"",l=3D!1;if(b)for(var m=3D0;m<=
a.length;m++)if(l)a.charAt(m)=3D=3D"'"&&!h("'")?l=3D!1:k+=3Da.charAt(m);els=
e switch(a.charAt(m)){case"d":k+=3Di("d",b.getDate(),2);break;case"D":k+=3D=
j("D",b.getDay(),d,e);break;case"o":k+=3Di("o",Math.round(((new Date(b.getF=
ullYear(),b.getMonth(),b.getDate())).getTime()-(new Date(b.getFullYear(),0,=
0)).getTime())/864e5),3);break;case"m":k+=3Di("m",b.getMonth()+1,2);break;c=
ase"M":k+=3Dj("M",b.getMonth(),f,g);break;case"y":k+=3Dh("y")?b.getFullYear=
():(b.getYear()%100<10?"0":"")+b.getYear()%100;break;case"@":k+=3Db.getTime=
();break;case"!":k+=3Db.getTime()*1e4+this._ticksTo1970;break;case"'":h("'"=
)?k+=3D"'":l=3D!0;break;default:k+=3Da.charAt(m)}return k},_possibleChars:f=
unction(a){var b=3D"",c=3D!1,d=3Dfunction(b){var c=3De+1<a.length&&a.charAt=
(e+1)=3D=3Db;return c&&e++,c};for(var e=3D0;e<a.length;e++)if(c)a.charAt(e)=
=3D=3D"'"&&!d("'")?c=3D!1:b+=3Da.charAt(e);else switch(a.charAt(e)){case"d"=
:case"m":case"y":case"@":b+=3D"0123456789";break;case"D":case"M":return nul=
l;case"'":d("'")?b+=3D"'":c=3D!0;break;default:b+=3Da.charAt(e)}return b},_=
get:function(a,b){return a.settings[b]!=3D=3Dundefined?a.settings[b]:this._=
defaults[b]},_setDateFromField:function(a,b){if(a.input.val()=3D=3Da.lastVa=
l)return;var c=3Dthis._get(a,"dateFormat"),d=3Da.lastVal=3Da.input?a.input.=
val():null,e,f;e=3Df=3Dthis._getDefaultDate(a);var g=3Dthis._getFormatConfi=
g(a);try{e=3Dthis.parseDate(c,d,g)||f}catch(h){this.log(h),d=3Db?"":d}a.sel=
ectedDay=3De.getDate(),a.drawMonth=3Da.selectedMonth=3De.getMonth(),a.drawY=
ear=3Da.selectedYear=3De.getFullYear(),a.currentDay=3Dd?e.getDate():0,a.cur=
rentMonth=3Dd?e.getMonth():0,a.currentYear=3Dd?e.getFullYear():0,this._adju=
stInstDate(a)},_getDefaultDate:function(a){return this._restrictMinMax(a,th=
is._determineDate(a,this._get(a,"defaultDate"),new Date))},_determineDate:f=
unction(a,b,c){var d=3Dfunction(a){var b=3Dnew Date;return b.setDate(b.getD=
ate()+a),b},e=3Dfunction(b){try{return $.datepicker.parseDate($.datepicker.=
_get(a,"dateFormat"),b,$.datepicker._getFormatConfig(a))}catch(c){}var d=3D=
(b.toLowerCase().match(/^c/)?$.datepicker._getDate(a):null)||new Date,e=3Dd=
.getFullYear(),f=3Dd.getMonth(),g=3Dd.getDate(),h=3D/([+-]?[0-9]+)\s*(d|D|w=
|W|m|M|y|Y)?/g,i=3Dh.exec(b);while(i){switch(i[2]||"d"){case"d":case"D":g+=
=3DparseInt(i[1],10);break;case"w":case"W":g+=3DparseInt(i[1],10)*7;break;c=
ase"m":case"M":f+=3DparseInt(i[1],10),g=3DMath.min(g,$.datepicker._getDaysI=
nMonth(e,f));break;case"y":case"Y":e+=3DparseInt(i[1],10),g=3DMath.min(g,$.=
datepicker._getDaysInMonth(e,f))}i=3Dh.exec(b)}return new Date(e,f,g)},f=3D=
b=3D=3Dnull||b=3D=3D=3D""?c:typeof b=3D=3D"string"?e(b):typeof b=3D=3D"numb=
er"?isNaN(b)?c:d(b):new Date(b.getTime());return f=3Df&&f.toString()=3D=3D"=
Invalid Date"?c:f,f&&(f.setHours(0),f.setMinutes(0),f.setSeconds(0),f.setMi=
lliseconds(0)),this._daylightSavingAdjust(f)},_daylightSavingAdjust:functio=
n(a){return a?(a.setHours(a.getHours()>12?a.getHours()+2:0),a):null},_setDa=
te:function(a,b,c){var d=3D!b,e=3Da.selectedMonth,f=3Da.selectedYear,g=3Dth=
is._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay=3Da.c=
urrentDay=3Dg.getDate(),a.drawMonth=3Da.selectedMonth=3Da.currentMonth=3Dg.=
getMonth(),a.drawYear=3Da.selectedYear=3Da.currentYear=3Dg.getFullYear(),(e=
!=3Da.selectedMonth||f!=3Da.selectedYear)&&!c&&this._notifyChange(a),this._=
adjustInstDate(a),a.input&&a.input.val(d?"":this._formatDate(a))},_getDate:=
function(a){var b=3D!a.currentYear||a.input&&a.input.val()=3D=3D""?null:thi=
s._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay)=
);return b},_attachHandlers:function(a){var b=3Dthis._get(a,"stepMonths"),c=
=3D"#"+a.id.replace(/\\\\/g,"\\");a.dpDiv.find("[data-handler]").map(functi=
on(){var a=3D{prev:function(){window["DP_jQuery_"+dpuuid].datepicker._adjus=
tDate(c,-b,"M")},next:function(){window["DP_jQuery_"+dpuuid].datepicker._ad=
justDate(c,+b,"M")},hide:function(){window["DP_jQuery_"+dpuuid].datepicker.=
_hideDatepicker()},today:function(){window["DP_jQuery_"+dpuuid].datepicker.=
_gotoToday(c)},selectDay:function(){return window["DP_jQuery_"+dpuuid].date=
picker._selectDay(c,+this.getAttribute("data-month"),+this.getAttribute("da=
ta-year"),this),!1},selectMonth:function(){return window["DP_jQuery_"+dpuui=
d].datepicker._selectMonthYear(c,this,"M"),!1},selectYear:function(){return=
 window["DP_jQuery_"+dpuuid].datepicker._selectMonthYear(c,this,"Y"),!1}};$=
(this).bind(this.getAttribute("data-event"),a[this.getAttribute("data-handl=
er")])})},_generateHTML:function(a){var b=3Dnew Date;b=3Dthis._daylightSavi=
ngAdjust(new Date(b.getFullYear(),b.getMonth(),b.getDate()));var c=3Dthis._=
get(a,"isRTL"),d=3Dthis._get(a,"showButtonPanel"),e=3Dthis._get(a,"hideIfNo=
PrevNext"),f=3Dthis._get(a,"navigationAsDateFormat"),g=3Dthis._getNumberOfM=
onths(a),h=3Dthis._get(a,"showCurrentAtPos"),i=3Dthis._get(a,"stepMonths"),=
j=3Dg[0]!=3D1||g[1]!=3D1,k=3Dthis._daylightSavingAdjust(a.currentDay?new Da=
te(a.currentYear,a.currentMonth,a.currentDay):new Date(9999,9,9)),l=3Dthis.=
_getMinMaxDate(a,"min"),m=3Dthis._getMinMaxDate(a,"max"),n=3Da.drawMonth-h,=
o=3Da.drawYear;n<0&&(n+=3D12,o--);if(m){var p=3Dthis._daylightSavingAdjust(=
new Date(m.getFullYear(),m.getMonth()-g[0]*g[1]+1,m.getDate()));p=3Dl&&p<l?=
l:p;while(this._daylightSavingAdjust(new Date(o,n,1))>p)n--,n<0&&(n=3D11,o-=
-)}a.drawMonth=3Dn,a.drawYear=3Do;var q=3Dthis._get(a,"prevText");q=3Df?thi=
s.formatDate(q,this._daylightSavingAdjust(new Date(o,n-i,1)),this._getForma=
tConfig(a)):q;var r=3Dthis._canAdjustMonth(a,-1,o,n)?'<a class=3D"ui-datepi=
cker-prev ui-corner-all" data-handler=3D"prev" data-event=3D"click" title=
=3D"'+q+'"><span class=3D"ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">=
'+q+"</span></a>":e?"":'<a class=3D"ui-datepicker-prev ui-corner-all ui-sta=
te-disabled" title=3D"'+q+'"><span class=3D"ui-icon ui-icon-circle-triangle=
-'+(c?"e":"w")+'">'+q+"</span></a>",s=3Dthis._get(a,"nextText");s=3Df?this.=
formatDate(s,this._daylightSavingAdjust(new Date(o,n+i,1)),this._getFormatC=
onfig(a)):s;var t=3Dthis._canAdjustMonth(a,1,o,n)?'<a class=3D"ui-datepicke=
r-next ui-corner-all" data-handler=3D"next" data-event=3D"click" title=3D"'=
+s+'"><span class=3D"ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"=
</span></a>":e?"":'<a class=3D"ui-datepicker-next ui-corner-all ui-state-di=
sabled" title=3D"'+s+'"><span class=3D"ui-icon ui-icon-circle-triangle-'+(c=
?"w":"e")+'">'+s+"</span></a>",u=3Dthis._get(a,"currentText"),v=3Dthis._get=
(a,"gotoCurrent")&&a.currentDay?k:b;u=3Df?this.formatDate(u,v,this._getForm=
atConfig(a)):u;var w=3Da.inline?"":'<button type=3D"button" class=3D"ui-dat=
epicker-close ui-state-default ui-priority-primary ui-corner-all" data-hand=
ler=3D"hide" data-event=3D"click">'+this._get(a,"closeText")+"</button>",x=
=3Dd?'<div class=3D"ui-datepicker-buttonpane ui-widget-content">'+(c?w:"")+=
(this._isInRange(a,v)?'<button type=3D"button" class=3D"ui-datepicker-curre=
nt ui-state-default ui-priority-secondary ui-corner-all" data-handler=3D"to=
day" data-event=3D"click">'+u+"</button>":"")+(c?"":w)+"</div>":"",y=3Dpars=
eInt(this._get(a,"firstDay"),10);y=3DisNaN(y)?0:y;var z=3Dthis._get(a,"show=
Week"),A=3Dthis._get(a,"dayNames"),B=3Dthis._get(a,"dayNamesShort"),C=3Dthi=
s._get(a,"dayNamesMin"),D=3Dthis._get(a,"monthNames"),E=3Dthis._get(a,"mont=
hNamesShort"),F=3Dthis._get(a,"beforeShowDay"),G=3Dthis._get(a,"showOtherMo=
nths"),H=3Dthis._get(a,"selectOtherMonths"),I=3Dthis._get(a,"calculateWeek"=
)||this.iso8601Week,J=3Dthis._getDefaultDate(a),K=3D"";for(var L=3D0;L<g[0]=
;L++){var M=3D"";this.maxRows=3D4;for(var N=3D0;N<g[1];N++){var O=3Dthis._d=
aylightSavingAdjust(new Date(o,n,a.selectedDay)),P=3D" ui-corner-all",Q=3D"=
";if(j){Q+=3D'<div class=3D"ui-datepicker-group';if(g[1]>1)switch(N){case 0=
:Q+=3D" ui-datepicker-group-first",P=3D" ui-corner-"+(c?"right":"left");bre=
ak;case g[1]-1:Q+=3D" ui-datepicker-group-last",P=3D" ui-corner-"+(c?"left"=
:"right");break;default:Q+=3D" ui-datepicker-group-middle",P=3D""}Q+=3D'">'=
}Q+=3D'<div class=3D"ui-datepicker-header ui-widget-header ui-helper-clearf=
ix'+P+'">'+(/all|left/.test(P)&&L=3D=3D0?c?t:r:"")+(/all|right/.test(P)&&L=
=3D=3D0?c?r:t:"")+this._generateMonthYearHeader(a,n,o,l,m,L>0||N>0,D,E)+'</=
div><table class=3D"ui-datepicker-calendar"><thead>'+"<tr>";var R=3Dz?'<th =
class=3D"ui-datepicker-week-col">'+this._get(a,"weekHeader")+"</th>":"";for=
(var S=3D0;S<7;S++){var T=3D(S+y)%7;R+=3D"<th"+((S+y+6)%7>=3D5?' class=3D"u=
i-datepicker-week-end"':"")+">"+'<span title=3D"'+A[T]+'">'+C[T]+"</span></=
th>"}Q+=3DR+"</tr></thead><tbody>";var U=3Dthis._getDaysInMonth(o,n);o=3D=
=3Da.selectedYear&&n=3D=3Da.selectedMonth&&(a.selectedDay=3DMath.min(a.sele=
ctedDay,U));var V=3D(this._getFirstDayOfMonth(o,n)-y+7)%7,W=3DMath.ceil((V+=
U)/7),X=3Dj?this.maxRows>W?this.maxRows:W:W;this.maxRows=3DX;var Y=3Dthis._=
daylightSavingAdjust(new Date(o,n,1-V));for(var Z=3D0;Z<X;Z++){Q+=3D"<tr>";=
var _=3Dz?'<td class=3D"ui-datepicker-week-col">'+this._get(a,"calculateWee=
k")(Y)+"</td>":"";for(var S=3D0;S<7;S++){var ba=3DF?F.apply(a.input?a.input=
[0]:null,[Y]):[!0,""],bb=3DY.getMonth()!=3Dn,bc=3Dbb&&!H||!ba[0]||l&&Y<l||m=
&&Y>m;_+=3D'<td class=3D"'+((S+y+6)%7>=3D5?" ui-datepicker-week-end":"")+(b=
b?" ui-datepicker-other-month":"")+(Y.getTime()=3D=3DO.getTime()&&n=3D=3Da.=
selectedMonth&&a._keyEvent||J.getTime()=3D=3DY.getTime()&&J.getTime()=3D=3D=
O.getTime()?" "+this._dayOverClass:"")+(bc?" "+this._unselectableClass+" ui=
-state-disabled":"")+(bb&&!G?"":" "+ba[1]+(Y.getTime()=3D=3Dk.getTime()?" "=
+this._currentClass:"")+(Y.getTime()=3D=3Db.getTime()?" ui-datepicker-today=
":""))+'"'+((!bb||G)&&ba[2]?' title=3D"'+ba[2]+'"':"")+(bc?"":' data-handle=
r=3D"selectDay" data-event=3D"click" data-month=3D"'+Y.getMonth()+'" data-y=
ear=3D"'+Y.getFullYear()+'"')+">"+(bb&&!G?"&#xa0;":bc?'<span class=3D"ui-st=
ate-default">'+Y.getDate()+"</span>":'<a class=3D"ui-state-default'+(Y.getT=
ime()=3D=3Db.getTime()?" ui-state-highlight":"")+(Y.getTime()=3D=3Dk.getTim=
e()?" ui-state-active":"")+(bb?" ui-priority-secondary":"")+'" href=3D"#">'=
+Y.getDate()+"</a>")+"</td>",Y.setDate(Y.getDate()+1),Y=3Dthis._daylightSav=
ingAdjust(Y)}Q+=3D_+"</tr>"}n++,n>11&&(n=3D0,o++),Q+=3D"</tbody></table>"+(=
j?"</div>"+(g[0]>0&&N=3D=3Dg[1]-1?'<div class=3D"ui-datepicker-row-break"><=
/div>':""):""),M+=3DQ}K+=3DM}return K+=3Dx+($.browser.msie&&parseInt($.brow=
ser.version,10)<7&&!a.inline?'<iframe src=3D"javascript:false;" class=3D"ui=
-datepicker-cover" frameborder=3D"0"></iframe>':""),a._keyEvent=3D!1,K},_ge=
nerateMonthYearHeader:function(a,b,c,d,e,f,g,h){var i=3Dthis._get(a,"change=
Month"),j=3Dthis._get(a,"changeYear"),k=3Dthis._get(a,"showMonthAfterYear")=
,l=3D'<div class=3D"ui-datepicker-title">',m=3D"";if(f||!i)m+=3D'<span clas=
s=3D"ui-datepicker-month">'+g[b]+"</span>";else{var n=3Dd&&d.getFullYear()=
=3D=3Dc,o=3De&&e.getFullYear()=3D=3Dc;m+=3D'<select class=3D"ui-datepicker-=
month" data-handler=3D"selectMonth" data-event=3D"change">';for(var p=3D0;p=
<12;p++)(!n||p>=3Dd.getMonth())&&(!o||p<=3De.getMonth())&&(m+=3D'<option va=
lue=3D"'+p+'"'+(p=3D=3Db?' selected=3D"selected"':"")+">"+h[p]+"</option>")=
;m+=3D"</select>"}k||(l+=3Dm+(f||!i||!j?"&#xa0;":""));if(!a.yearshtml){a.ye=
arshtml=3D"";if(f||!j)l+=3D'<span class=3D"ui-datepicker-year">'+c+"</span>=
";else{var q=3Dthis._get(a,"yearRange").split(":"),r=3D(new Date).getFullYe=
ar(),s=3Dfunction(a){var b=3Da.match(/c[+-].*/)?c+parseInt(a.substring(1),1=
0):a.match(/[+-].*/)?r+parseInt(a,10):parseInt(a,10);return isNaN(b)?r:b},t=
=3Ds(q[0]),u=3DMath.max(t,s(q[1]||""));t=3Dd?Math.max(t,d.getFullYear()):t,=
u=3De?Math.min(u,e.getFullYear()):u,a.yearshtml+=3D'<select class=3D"ui-dat=
epicker-year" data-handler=3D"selectYear" data-event=3D"change">';for(;t<=
=3Du;t++)a.yearshtml+=3D'<option value=3D"'+t+'"'+(t=3D=3Dc?' selected=3D"s=
elected"':"")+">"+t+"</option>";a.yearshtml+=3D"</select>",l+=3Da.yearshtml=
,a.yearshtml=3Dnull}}return l+=3Dthis._get(a,"yearSuffix"),k&&(l+=3D(f||!i|=
|!j?"&#xa0;":"")+m),l+=3D"</div>",l},_adjustInstDate:function(a,b,c){var d=
=3Da.drawYear+(c=3D=3D"Y"?b:0),e=3Da.drawMonth+(c=3D=3D"M"?b:0),f=3DMath.mi=
n(a.selectedDay,this._getDaysInMonth(d,e))+(c=3D=3D"D"?b:0),g=3Dthis._restr=
ictMinMax(a,this._daylightSavingAdjust(new Date(d,e,f)));a.selectedDay=3Dg.=
getDate(),a.drawMonth=3Da.selectedMonth=3Dg.getMonth(),a.drawYear=3Da.selec=
tedYear=3Dg.getFullYear(),(c=3D=3D"M"||c=3D=3D"Y")&&this._notifyChange(a)},=
_restrictMinMax:function(a,b){var c=3Dthis._getMinMaxDate(a,"min"),d=3Dthis=
._getMinMaxDate(a,"max"),e=3Dc&&b<c?c:b;return e=3Dd&&e>d?d:e,e},_notifyCha=
nge:function(a){var b=3Dthis._get(a,"onChangeMonthYear");b&&b.apply(a.input=
?a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:=
function(a){var b=3Dthis._get(a,"numberOfMonths");return b=3D=3Dnull?[1,1]:=
typeof b=3D=3D"number"?[1,b]:b},_getMinMaxDate:function(a,b){return this._d=
etermineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){r=
eturn 32-this._daylightSavingAdjust(new Date(a,b,32)).getDate()},_getFirstD=
ayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:f=
unction(a,b,c,d){var e=3Dthis._getNumberOfMonths(a),f=3Dthis._daylightSavin=
gAdjust(new Date(c,d+(b<0?b:e[0]*e[1]),1));return b<0&&f.setDate(this._getD=
aysInMonth(f.getFullYear(),f.getMonth())),this._isInRange(a,f)},_isInRange:=
function(a,b){var c=3Dthis._getMinMaxDate(a,"min"),d=3Dthis._getMinMaxDate(=
a,"max");return(!c||b.getTime()>=3Dc.getTime())&&(!d||b.getTime()<=3Dd.getT=
ime())},_getFormatConfig:function(a){var b=3Dthis._get(a,"shortYearCutoff")=
;return b=3Dtypeof b!=3D"string"?b:(new Date).getFullYear()%100+parseInt(b,=
10),{shortYearCutoff:b,dayNamesShort:this._get(a,"dayNamesShort"),dayNames:=
this._get(a,"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),mont=
hNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,d){b||(a.curr=
entDay=3Da.selectedDay,a.currentMonth=3Da.selectedMonth,a.currentYear=3Da.s=
electedYear);var e=3Db?typeof b=3D=3D"object"?b:this._daylightSavingAdjust(=
new Date(d,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.curren=
tMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),e,th=
is._getFormatConfig(a))}}),$.fn.datepicker=3Dfunction(a){if(!this.length)re=
turn this;$.datepicker.initialized||($(document).mousedown($.datepicker._ch=
eckExternalClick).find("body").append($.datepicker.dpDiv),$.datepicker.init=
ialized=3D!0);var b=3DArray.prototype.slice.call(arguments,1);return typeof=
 a!=3D"string"||a!=3D"isDisabled"&&a!=3D"getDate"&&a!=3D"widget"?a=3D=3D"op=
tion"&&arguments.length=3D=3D2&&typeof arguments[1]=3D=3D"string"?$.datepic=
ker["_"+a+"Datepicker"].apply($.datepicker,[this[0]].concat(b)):this.each(f=
unction(){typeof a=3D=3D"string"?$.datepicker["_"+a+"Datepicker"].apply($.d=
atepicker,[this].concat(b)):$.datepicker._attachDatepicker(this,a)}):$.date=
picker["_"+a+"Datepicker"].apply($.datepicker,[this[0]].concat(b))},$.datep=
icker=3Dnew Datepicker,$.datepicker.initialized=3D!1,$.datepicker.uuid=3D(n=
ew Date).getTime(),$.datepicker.version=3D"1.8.23",window["DP_jQuery_"+dpuu=
id]=3D$})(jQuery);;
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/=
koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
index 3906c46..5aef1f6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
@@ -105,6 +105,8 @@
 =09<dd>Printers (UNIX paths).</dd> -->
     <dt><a href=3D"/cgi-bin/koha/admin/z3950servers.pl">Z39.50 client targ=
ets</a></dt>
 =09<dd>Define which servers to query for MARC data in the integrated Z39.5=
0 client.</dd>
+    <dt><a href=3D"/cgi-bin/koha/admin/didyoumean.pl">Did you mean?</a></d=
t>
+    <dd>Choose which plugins to use to suggest searches to patrons and sta=
ff.</dd>
 </dl>
 </div>
=20
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt b/=
koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt
new file mode 100644
index 0000000..b534fed
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt
@@ -0,0 +1,104 @@
+[% BLOCK pluginlist %]
+<div class=3D"pluginlist">
+[% FOREACH plugin IN plugins %]
+    <div class=3D"plugin">
+        <div class=3D"pluginname">
+            [% IF plugin.enabled %]<input type=3D"checkbox" checked=3D"che=
cked" id=3D"checkbox_[% plugin.name %]">[% ELSE %]<input type=3D"checkbox" =
id=3D"checkbox_[% plugin.name %]">[% END %]
+            <label class=3D'pluginlabel' for=3D"checkbox_[% plugin.name %]=
">[% plugin.name %]</label></div>
+        <div class=3D"plugindesc">
+        [% SWITCH plugin.name %]
+        [% CASE 'AuthorityFile' %]
+            Suggest authorities which are relevant to the term the user se=
arched for.
+        [% CASE 'ExplodedTerms' %]
+            Suggest that patrons expand their searches to include
+            broader/narrower/related terms.
+        [% END %]
+        </div>
+    </div>
+[% END %]
+</div>
+[% END %]
+[% INCLUDE 'doc-head-open.inc' %]
+<title>Koha &rsaquo; Administration &rsaquo; Did you mean?</title>
+[% INCLUDE 'doc-head-close.inc' %]
+<script>
+    $(document).ready(function() {
+        $( ".pluginlist" ).sortable();
+        $( ".plugin" ).addClass( "ui-widget ui-widget-content ui-helper-cl=
earfix ui-corner-all" )
+            .find( ".pluginname" )
+                    .addClass( "ui-widget-header ui-corner-all" )
+                    .end()
+            .find( ".plugindesc" );
+    });
+
+    function yesimeant() {
+        var OPACdidyoumean =3D serialize_plugins('opac');
+        var INTRAdidyoumean =3D serialize_plugins('intranet');
+
+        var data =3D "pref_OPACdidyoumean=3D" + encodeURIComponent(OPACdid=
youmean) + "&pref_INTRAdidyoumean=3D" + encodeURIComponent(INTRAdidyoumean)=
;
+
+        $.ajax({
+            data: data,
+            type: 'POST',
+            url: '/cgi-bin/koha/svc/config/systempreferences/',
+            success: function () { alert("Successfully saved configuration=
"); },
+        });
+        return false;
+    }
+
+    function serialize_plugins(interface) {
+        var serializedconfig =3D '[';
+        $('#didyoumean' + interface + ' .pluginlist .plugin').each(functio=
n(index) {
+            var name =3D $(this).find('.pluginlabel').text();
+            var enabled =3D $(this).find('#checkbox_' + name).attr('checke=
d') =3D=3D 'checked' ?
+                          ', "enabled": 1' : '';
+            serializedconfig +=3D '{ "name": "' + name + '"' + enabled + '=
}, ';
+            });
+            serializedconfig =3D serializedconfig.substring(0, serializedc=
onfig.length - 2);
+            serializedconfig +=3D ']';
+            return serializedconfig;
+    }
+</script>
+</head>
+<body id=3D"admin_didyoumean" class=3D"admin">
+[% INCLUDE 'header.inc' %]
+[% INCLUDE 'cat-search.inc' %]
+<div id=3D"breadcrumbs"><a href=3D"/cgi-bin/koha/mainpage.pl">Home</a> &rs=
aquo; <a href=3D"/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsa=
quo; Did you mean?</div>
+
+<div id=3D"doc3" class=3D"yui-t2">
+
+    <div id=3D"bd">
+    <div id=3D"yui-main">
+    <div class=3D"yui-b">
+        <h3>Did you mean?</h3>
+        <noscript><div class=3D"dialog alert"><strong>Please enable Javasc=
ript:</strong>
+            Configuring <em>Did you mean?</em> plugins requires Javascript=
. If
+            you are unable to use Javascript, you may be able to enter the
+            configuration (which is stored in JSON in the OPACdidyoumean a=
nd
+            INTRAdidyoumean system preferences) in the Local Preferences t=
ab in
+            the system preference editor, but this is unsupported, not
+            recommended, and likely will not work.</div></noscript>
+        <div id=3D"didyoumeanlegend">
+            Please put the <em>Did you mean?</em> plugins in order by sign=
ificance, from
+            most significant to least significant, and check the box to en=
able those
+            plugins that you want to use.
+        </div>
+        <form action=3D"/cgi-bin/koha/admin/didyoumean.pl" method=3D"post"=
>
+            <fieldset id=3D"didyoumeanopac">
+                <legend>OPAC</legend>
+                [% PROCESS pluginlist plugins=3DOPACpluginlist %]
+            </fieldset>
+            <fieldset id=3D"didyoumeanintranet">
+                <legend>Intranet</legend>
+                [% PROCESS pluginlist plugins=3DINTRApluginlist %]
+            </fieldset>
+            <fieldset class=3D"action"><button class=3D"save-all submit" o=
nclick=3D"yesimeant();return false;" type=3D"submit">Save configuration</bu=
tton> <a href=3D"#" onclick=3D"window.location.reload(true);" class=3D"canc=
el">Cancel</a></fieldset>
+        </form>
+
+        </div>
+        </div>
+<div class=3D"yui-b">
+[% INCLUDE 'admin-menu.inc' %]
+</div>
+</div>
+[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/lib/jquery/jquery-ui.css b/koha-tm=
pl/opac-tmpl/prog/en/lib/jquery/jquery-ui.css
index 234b987..fe76cd3 100644
--- a/koha-tmpl/opac-tmpl/prog/en/lib/jquery/jquery-ui.css
+++ b/koha-tmpl/opac-tmpl/prog/en/lib/jquery/jquery-ui.css
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI CSS Framework 1.8.20
+ * jQuery UI CSS Framework 1.8.23
  *
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -39,7 +39,7 @@
=20
=20
 /*!
- * jQuery UI CSS Framework 1.8.20
+ * jQuery UI CSS Framework 1.8.23
  *
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -56,26 +56,26 @@
 .ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
 .ui-widget .ui-widget { font-size: 1em; }
 .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget butto=
n { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #B9D8D9; background: #ffffff; color=
: #222222; }
+.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(im=
ages/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
 .ui-widget-content a { color: #222222; }
-.ui-widget-header { border: 1px solid #B9D8D9; background: #E6F0F2 none; c=
olor: #222222; font-weight: bold; }
+.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(ima=
ges/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222=
222; font-weight: bold; }
 .ui-widget-header a { color: #222222; }
=20
 /* Interaction states
 ----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header=
 .ui-state-default { border: 1px solid #B9D8D9; background: #F4F8F9 none; f=
ont-weight: normal; color: #555555; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header=
 .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(ima=
ges/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal;=
 color: #555555; }
 .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited=
 { color: #555555; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui=
-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widg=
et-header .ui-state-focus { border: 1px solid #B9D8D9; background: #E6F0F2 =
none; font-weight: normal; color: #212121; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui=
-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widg=
et-header .ui-state-focus { border: 1px solid #999999; background: #dadada =
url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: =
normal; color: #212121; }
 .ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decorati=
on: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .=
ui-state-active { border: 1px solid #aaaaaa; background: #ffffff none; font=
-weight: normal; color: #212121; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .=
ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images=
/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; co=
lor: #212121; }
 .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { =
color: #212121; text-decoration: none; }
 .ui-widget :active { outline: none; }
=20
 /* Interaction Cues
 ----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-he=
ader .ui-state-highlight  {border: 1px solid #fcefa1; background: #fbf9ee; =
color: #363636; }
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-he=
ader .ui-state-highlight  {border: 1px solid #fcefa1; background: #fbf9ee u=
rl(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636=
; }
 .ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget=
-header .ui-state-highlight a { color: #363636; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui=
-state-error {border: 1px solid #cd0a0a; background: #fef1ec; color: #cd0a0=
a; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui=
-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-=
bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
 .ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header=
 .ui-state-error a { color: #cd0a0a; }
 .ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-=
header .ui-state-error-text { color: #cd0a0a; }
 .ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-=
header .ui-priority-primary { font-weight: bold; }
@@ -285,7 +285,7 @@
 /* Overlays */
 .ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40=
x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=3D30); }
 .ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaa=
aa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .3=
0;filter:Alpha(Opacity=3D30); -moz-border-radius: 8px; -khtml-border-radius=
: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*!
- * jQuery UI Autocomplete 1.8.20
+ * jQuery UI Autocomplete 1.8.23
  *
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -293,20 +293,13 @@
  *
  * http://docs.jquery.com/UI/Autocomplete#theming
  */
-.ui-autocomplete { position: absolute; cursor: default; -webkit-box-shadow=
: 2px 2px 2px rgba(0,0,0,.3); -moz-box-shadow: 2px 2px 2px rgba(0,0,0,.3); =
box-shadow: 2px 2px 2px rgba(0,0,0,.3); }
-
-.ui-autocomplete.ui-widget-content .ui-state-hover { border: 1px solid #B9=
D8D9; background: #E6F0F2 none; font-weight: normal; color: #212121;
-}
-
-.ui-autocomplete-loading {
-    background: #FFF url("../../img/loading-small.gif") right center no-re=
peat;
-}
+.ui-autocomplete { position: absolute; cursor: default; }
=20
 /* workarounds */
 * html .ui-autocomplete { width:1px; } /* without this, the menu expands t=
o 100% in IE6 */
=20
 /*
- * jQuery UI Menu 1.8.20
+ * jQuery UI Menu 1.8.23
  *
  * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -315,40 +308,60 @@
  * http://docs.jquery.com/UI/Menu#theming
  */
 .ui-menu {
-    list-style:none;
-    padding: 2px;
-    margin: 0;
-    display:block;
-    float: left;
-}
-.ui-menu li {
-    list-style:none;
+       list-style:none;
+       padding: 2px;
+  margin: 0;
+     display:block;
+ float: left;
 }
 .ui-menu .ui-menu {
-    margin-top: -3px;
+     margin-top: -3px;
 }
 .ui-menu .ui-menu-item {
-    margin:0;
-    padding: 0;
+   margin:0;
+      padding: 0;
     zoom: 1;
-    float: left;
-    clear: left;
-    width: 100%;
+       float: left;
+   clear: left;
+   width: 100%;
 }
 .ui-menu .ui-menu-item a {
-    text-decoration:none;
-    display:block;
-    padding:.2em .4em;
-    line-height:1.5;
-    zoom:1;
+      text-decoration:none;
+  display:block;
+ padding:.2em .4em;
+     line-height:1.5;
+       zoom:1;
 }
 .ui-menu .ui-menu-item a.ui-state-hover,
 .ui-menu .ui-menu-item a.ui-state-active {
-    font-weight: normal;
-    margin: -1px;
+  font-weight: normal;
+   margin: -1px;
 }
 /*!
- * jQuery UI Tabs 1.8.20
+ * jQuery UI Slider 1.8.23
+ *
+ * Copyright 2012, 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/Slider#theming
+ */
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2e=
m; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .=
7em; display: block; border: 0; background-position: 0 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; =
}
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margi=
n-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }/*!
+ * jQuery UI Tabs 1.8.23
  *
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -366,7 +379,7 @@
 .ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.=
4em; background: none; }
 .ui-tabs .ui-tabs-hide { display: none !important; }
 /*!
- * jQuery UI Datepicker 1.8.20
+ * jQuery UI Datepicker 1.8.23
  *
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -388,8 +401,8 @@
 .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 : 0; border-col=
lapse: collapse; margin:0 0 .4em; }
-.ui-datepicker th { background : transparent none; padding: .7em .3em; tex=
t-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: colla=
pse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: b=
old; border: 0;  }
 .ui-datepicker td { border: 0; padding: 1px; }
 .ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2e=
m; 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; }
@@ -423,8 +436,6 @@
=20
 /* 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*/
diff --git a/koha-tmpl/opac-tmpl/prog/en/lib/jquery/jquery-ui.js b/koha-tmp=
l/opac-tmpl/prog/en/lib/jquery/jquery-ui.js
index 6996eae..635f4c6 100644
--- a/koha-tmpl/opac-tmpl/prog/en/lib/jquery/jquery-ui.js
+++ b/koha-tmpl/opac-tmpl/prog/en/lib/jquery/jquery-ui.js
@@ -1,29 +1,37 @@
-/*! jQuery UI - v1.8.21 - 2012-06-05
+/*! jQuery UI - v1.8.23 - 2012-08-15
 * https://github.com/jquery/jquery-ui
 * Includes: jquery.ui.core.js
 * Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){function c(b,c){var e=3Db.nodeName.toLowerCase();if("area"=
=3D=3D=3De){var f=3Db.parentNode,g=3Df.name,h;return!b.href||!g||f.nodeName=
.toLowerCase()!=3D=3D"map"?!1:(h=3Da("img[usemap=3D#"+g+"]")[0],!!h&&d(h))}=
return(/input|select|textarea|button|object/.test(e)?!b.disabled:"a"=3D=3De=
?b.href||c:c)&&d(b)}function d(b){return!a(b).parents().andSelf().filter(fu=
nction(){return a.curCSS(this,"visibility")=3D=3D=3D"hidden"||a.expr.filter=
s.hidden(this)}).length}a.ui=3Da.ui||{};if(a.ui.version)return;a.extend(a.u=
i,{version:"1.8.21",keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMM=
AND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35=
,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD=
_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_=
SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,=
TAB:9,UP:38,WINDOWS:91}}),a.fn.extend({propAttr:a.fn.prop||a.fn.attr,_focus=
:a.fn.focus,focus:function(b,c){return typeof b=3D=3D"number"?this.each(fun=
ction(){var d=3Dthis;setTimeout(function(){a(d).focus(),c&&c.call(d)},b)}):=
this._focus.apply(this,arguments)},scrollParent:function(){var b;return a.b=
rowser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.tes=
t(this.css("position"))?b=3Dthis.parents().filter(function(){return/(relati=
ve|absolute|fixed)/.test(a.curCSS(this,"position",1))&&/(auto|scroll)/.test=
(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"o=
verflow-x",1))}).eq(0):b=3Dthis.parents().filter(function(){return/(auto|sc=
roll)/.test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.cur=
CSS(this,"overflow-x",1))}).eq(0),/fixed/.test(this.css("position"))||!b.le=
ngth?a(document):b},zIndex:function(c){if(c!=3D=3Db)return this.css("zIndex=
",c);if(this.length){var d=3Da(this[0]),e,f;while(d.length&&d[0]!=3D=3Ddocu=
ment){e=3Dd.css("position");if(e=3D=3D=3D"absolute"||e=3D=3D=3D"relative"||=
e=3D=3D=3D"fixed"){f=3DparseInt(d.css("zIndex"),10);if(!isNaN(f)&&f!=3D=3D0=
)return f}d=3Dd.parent()}}return 0},disableSelection:function(){return this=
.bind((a.support.selectstart?"selectstart":"mousedown")+".ui-disableSelecti=
on",function(a){a.preventDefault()})},enableSelection:function(){return thi=
s.unbind(".ui-disableSelection")}}),a.each(["Width","Height"],function(c,d)=
{function h(b,c,d,f){return a.each(e,function(){c-=3DparseFloat(a.curCSS(b,=
"padding"+this,!0))||0,d&&(c-=3DparseFloat(a.curCSS(b,"border"+this+"Width"=
,!0))||0),f&&(c-=3DparseFloat(a.curCSS(b,"margin"+this,!0))||0)}),c}var e=
=3Dd=3D=3D=3D"Width"?["Left","Right"]:["Top","Bottom"],f=3Dd.toLowerCase(),=
g=3D{innerWidth:a.fn.innerWidth,innerHeight:a.fn.innerHeight,outerWidth:a.f=
n.outerWidth,outerHeight:a.fn.outerHeight};a.fn["inner"+d]=3Dfunction(c){re=
turn c=3D=3D=3Db?g["inner"+d].call(this):this.each(function(){a(this).css(f=
,h(this,c)+"px")})},a.fn["outer"+d]=3Dfunction(b,c){return typeof b!=3D"num=
ber"?g["outer"+d].call(this,b):this.each(function(){a(this).css(f,h(this,b,=
!0,c)+"px")})}}),a.extend(a.expr[":"],{data:function(b,c,d){return!!a.data(=
b,d[3])},focusable:function(b){return c(b,!isNaN(a.attr(b,"tabindex")))},ta=
bbable:function(b){var d=3Da.attr(b,"tabindex"),e=3DisNaN(d);return(e||d>=
=3D0)&&c(b,!e)}}),a(function(){var b=3Ddocument.body,c=3Db.appendChild(c=3D=
document.createElement("div"));c.offsetHeight,a.extend(c.style,{minHeight:"=
100px",height:"auto",padding:0,borderWidth:0}),a.support.minHeight=3Dc.offs=
etHeight=3D=3D=3D100,a.support.selectstart=3D"onselectstart"in c,b.removeCh=
ild(c).style.display=3D"none"}),a.extend(a.ui,{plugin:{add:function(b,c,d){=
var e=3Da.ui[b].prototype;for(var f in d)e.plugins[f]=3De.plugins[f]||[],e.=
plugins[f].push([c,d[f]])},call:function(a,b,c){var d=3Da.plugins[b];if(!d|=
|!a.element[0].parentNode)return;for(var e=3D0;e<d.length;e++)a.options[d[e=
][0]]&&d[e][1].apply(a.element,c)}},contains:function(a,b){return document.=
compareDocumentPosition?a.compareDocumentPosition(b)&16:a!=3D=3Db&&a.contai=
ns(b)},hasScroll:function(b,c){if(a(b).css("overflow")=3D=3D=3D"hidden")ret=
urn!1;var d=3Dc&&c=3D=3D=3D"left"?"scrollLeft":"scrollTop",e=3D!1;return b[=
d]>0?!0:(b[d]=3D1,e=3Db[d]>0,b[d]=3D0,e)},isOverAxis:function(a,b,c){return=
 a>b&&a<b+c},isOver:function(b,c,d,e,f,g){return a.ui.isOverAxis(b,d,f)&&a.=
ui.isOverAxis(c,e,g)}})})(jQuery);;/*! jQuery UI - v1.8.21 - 2012-06-05
+(function(a,b){function c(b,c){var e=3Db.nodeName.toLowerCase();if("area"=
=3D=3D=3De){var f=3Db.parentNode,g=3Df.name,h;return!b.href||!g||f.nodeName=
.toLowerCase()!=3D=3D"map"?!1:(h=3Da("img[usemap=3D#"+g+"]")[0],!!h&&d(h))}=
return(/input|select|textarea|button|object/.test(e)?!b.disabled:"a"=3D=3De=
?b.href||c:c)&&d(b)}function d(b){return!a(b).parents().andSelf().filter(fu=
nction(){return a.curCSS(this,"visibility")=3D=3D=3D"hidden"||a.expr.filter=
s.hidden(this)}).length}a.ui=3Da.ui||{};if(a.ui.version)return;a.extend(a.u=
i,{version:"1.8.23",keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMM=
AND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35=
,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD=
_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_=
SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,=
TAB:9,UP:38,WINDOWS:91}}),a.fn.extend({propAttr:a.fn.prop||a.fn.attr,_focus=
:a.fn.focus,focus:function(b,c){return typeof b=3D=3D"number"?this.each(fun=
ction(){var d=3Dthis;setTimeout(function(){a(d).focus(),c&&c.call(d)},b)}):=
this._focus.apply(this,arguments)},scrollParent:function(){var b;return a.b=
rowser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.tes=
t(this.css("position"))?b=3Dthis.parents().filter(function(){return/(relati=
ve|absolute|fixed)/.test(a.curCSS(this,"position",1))&&/(auto|scroll)/.test=
(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"o=
verflow-x",1))}).eq(0):b=3Dthis.parents().filter(function(){return/(auto|sc=
roll)/.test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.cur=
CSS(this,"overflow-x",1))}).eq(0),/fixed/.test(this.css("position"))||!b.le=
ngth?a(document):b},zIndex:function(c){if(c!=3D=3Db)return this.css("zIndex=
",c);if(this.length){var d=3Da(this[0]),e,f;while(d.length&&d[0]!=3D=3Ddocu=
ment){e=3Dd.css("position");if(e=3D=3D=3D"absolute"||e=3D=3D=3D"relative"||=
e=3D=3D=3D"fixed"){f=3DparseInt(d.css("zIndex"),10);if(!isNaN(f)&&f!=3D=3D0=
)return f}d=3Dd.parent()}}return 0},disableSelection:function(){return this=
.bind((a.support.selectstart?"selectstart":"mousedown")+".ui-disableSelecti=
on",function(a){a.preventDefault()})},enableSelection:function(){return thi=
s.unbind(".ui-disableSelection")}}),a("<a>").outerWidth(1).jquery||a.each([=
"Width","Height"],function(c,d){function h(b,c,d,f){return a.each(e,functio=
n(){c-=3DparseFloat(a.curCSS(b,"padding"+this,!0))||0,d&&(c-=3DparseFloat(a=
.curCSS(b,"border"+this+"Width",!0))||0),f&&(c-=3DparseFloat(a.curCSS(b,"ma=
rgin"+this,!0))||0)}),c}var e=3Dd=3D=3D=3D"Width"?["Left","Right"]:["Top","=
Bottom"],f=3Dd.toLowerCase(),g=3D{innerWidth:a.fn.innerWidth,innerHeight:a.=
fn.innerHeight,outerWidth:a.fn.outerWidth,outerHeight:a.fn.outerHeight};a.f=
n["inner"+d]=3Dfunction(c){return c=3D=3D=3Db?g["inner"+d].call(this):this.=
each(function(){a(this).css(f,h(this,c)+"px")})},a.fn["outer"+d]=3Dfunction=
(b,c){return typeof b!=3D"number"?g["outer"+d].call(this,b):this.each(funct=
ion(){a(this).css(f,h(this,b,!0,c)+"px")})}}),a.extend(a.expr[":"],{data:a.=
expr.createPseudo?a.expr.createPseudo(function(b){return function(c){return=
!!a.data(c,b)}}):function(b,c,d){return!!a.data(b,d[3])},focusable:function=
(b){return c(b,!isNaN(a.attr(b,"tabindex")))},tabbable:function(b){var d=3D=
a.attr(b,"tabindex"),e=3DisNaN(d);return(e||d>=3D0)&&c(b,!e)}}),a(function(=
){var b=3Ddocument.body,c=3Db.appendChild(c=3Ddocument.createElement("div")=
);c.offsetHeight,a.extend(c.style,{minHeight:"100px",height:"auto",padding:=
0,borderWidth:0}),a.support.minHeight=3Dc.offsetHeight=3D=3D=3D100,a.suppor=
t.selectstart=3D"onselectstart"in c,b.removeChild(c).style.display=3D"none"=
}),a.curCSS||(a.curCSS=3Da.css),a.extend(a.ui,{plugin:{add:function(b,c,d){=
var e=3Da.ui[b].prototype;for(var f in d)e.plugins[f]=3De.plugins[f]||[],e.=
plugins[f].push([c,d[f]])},call:function(a,b,c){var d=3Da.plugins[b];if(!d|=
|!a.element[0].parentNode)return;for(var e=3D0;e<d.length;e++)a.options[d[e=
][0]]&&d[e][1].apply(a.element,c)}},contains:function(a,b){return document.=
compareDocumentPosition?a.compareDocumentPosition(b)&16:a!=3D=3Db&&a.contai=
ns(b)},hasScroll:function(b,c){if(a(b).css("overflow")=3D=3D=3D"hidden")ret=
urn!1;var d=3Dc&&c=3D=3D=3D"left"?"scrollLeft":"scrollTop",e=3D!1;return b[=
d]>0?!0:(b[d]=3D1,e=3Db[d]>0,b[d]=3D0,e)},isOverAxis:function(a,b,c){return=
 a>b&&a<b+c},isOver:function(b,c,d,e,f,g){return a.ui.isOverAxis(b,d,f)&&a.=
ui.isOverAxis(c,e,g)}})})(jQuery);;/*! jQuery UI - v1.8.23 - 2012-08-15
 * https://github.com/jquery/jquery-ui
 * Includes: jquery.ui.widget.js
 * Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){if(a.cleanData){var c=3Da.cleanData;a.cleanData=3Dfunction(=
b){for(var d=3D0,e;(e=3Db[d])!=3Dnull;d++)try{a(e).triggerHandler("remove")=
}catch(f){}c(b)}}else{var d=3Da.fn.remove;a.fn.remove=3Dfunction(b,c){retur=
n this.each(function(){return c||(!b||a.filter(b,[this]).length)&&a("*",thi=
s).add([this]).each(function(){try{a(this).triggerHandler("remove")}catch(b=
){}}),d.call(a(this),b,c)})}}a.widget=3Dfunction(b,c,d){var e=3Db.split("."=
)[0],f;b=3Db.split(".")[1],f=3De+"-"+b,d||(d=3Dc,c=3Da.Widget),a.expr[":"][=
f]=3Dfunction(c){return!!a.data(c,b)},a[e]=3Da[e]||{},a[e][b]=3Dfunction(a,=
b){arguments.length&&this._createWidget(a,b)};var g=3Dnew c;g.options=3Da.e=
xtend(!0,{},g.options),a[e][b].prototype=3Da.extend(!0,g,{namespace:e,widge=
tName:b,widgetEventPrefix:a[e][b].prototype.widgetEventPrefix||b,widgetBase=
Class:f},d),a.widget.bridge(b,a[e][b])},a.widget.bridge=3Dfunction(c,d){a.f=
n[c]=3Dfunction(e){var f=3Dtypeof e=3D=3D"string",g=3DArray.prototype.slice=
.call(arguments,1),h=3Dthis;return e=3D!f&&g.length?a.extend.apply(null,[!0=
,e].concat(g)):e,f&&e.charAt(0)=3D=3D=3D"_"?h:(f?this.each(function(){var d=
=3Da.data(this,c),f=3Dd&&a.isFunction(d[e])?d[e].apply(d,g):d;if(f!=3D=3Dd&=
&f!=3D=3Db)return h=3Df,!1}):this.each(function(){var b=3Da.data(this,c);b?=
b.option(e||{})._init():a.data(this,c,new d(e,this))}),h)}},a.Widget=3Dfunc=
tion(a,b){arguments.length&&this._createWidget(a,b)},a.Widget.prototype=3D{=
widgetName:"widget",widgetEventPrefix:"",options:{disabled:!1},_createWidge=
t:function(b,c){a.data(c,this.widgetName,this),this.element=3Da(c),this.opt=
ions=3Da.extend(!0,{},this.options,this._getCreateOptions(),b);var d=3Dthis=
;this.element.bind("remove."+this.widgetName,function(){d.destroy()}),this.=
_create(),this._trigger("create"),this._init()},_getCreateOptions:function(=
){return a.metadata&&a.metadata.get(this.element[0])[this.widgetName]},_cre=
ate:function(){},_init:function(){},destroy:function(){this.element.unbind(=
"."+this.widgetName).removeData(this.widgetName),this.widget().unbind("."+t=
his.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClas=
s+"-disabled "+"ui-state-disabled")},widget:function(){return this.element}=
,option:function(c,d){var e=3Dc;if(arguments.length=3D=3D=3D0)return a.exte=
nd({},this.options);if(typeof c=3D=3D"string"){if(d=3D=3D=3Db)return this.o=
ptions[c];e=3D{},e[c]=3Dd}return this._setOptions(e),this},_setOptions:func=
tion(b){var c=3Dthis;return a.each(b,function(a,b){c._setOption(a,b)}),this=
},_setOption:function(a,b){return this.options[a]=3Db,a=3D=3D=3D"disabled"&=
&this.widget()[b?"addClass":"removeClass"](this.widgetBaseClass+"-disabled"=
+" "+"ui-state-disabled").attr("aria-disabled",b),this},enable:function(){r=
eturn this._setOption("disabled",!1)},disable:function(){return this._setOp=
tion("disabled",!0)},_trigger:function(b,c,d){var e,f,g=3Dthis.options[b];d=
=3Dd||{},c=3Da.Event(c),c.type=3D(b=3D=3D=3Dthis.widgetEventPrefix?b:this.w=
idgetEventPrefix+b).toLowerCase(),c.target=3Dthis.element[0],f=3Dc.original=
Event;if(f)for(e in f)e in c||(c[e]=3Df[e]);return this.element.trigger(c,d=
),!(a.isFunction(g)&&g.call(this.element[0],c,d)=3D=3D=3D!1||c.isDefaultPre=
vented())}}})(jQuery);;/*! jQuery UI - v1.8.21 - 2012-06-05
+(function(a,b){if(a.cleanData){var c=3Da.cleanData;a.cleanData=3Dfunction(=
b){for(var d=3D0,e;(e=3Db[d])!=3Dnull;d++)try{a(e).triggerHandler("remove")=
}catch(f){}c(b)}}else{var d=3Da.fn.remove;a.fn.remove=3Dfunction(b,c){retur=
n this.each(function(){return c||(!b||a.filter(b,[this]).length)&&a("*",thi=
s).add([this]).each(function(){try{a(this).triggerHandler("remove")}catch(b=
){}}),d.call(a(this),b,c)})}}a.widget=3Dfunction(b,c,d){var e=3Db.split("."=
)[0],f;b=3Db.split(".")[1],f=3De+"-"+b,d||(d=3Dc,c=3Da.Widget),a.expr[":"][=
f]=3Dfunction(c){return!!a.data(c,b)},a[e]=3Da[e]||{},a[e][b]=3Dfunction(a,=
b){arguments.length&&this._createWidget(a,b)};var g=3Dnew c;g.options=3Da.e=
xtend(!0,{},g.options),a[e][b].prototype=3Da.extend(!0,g,{namespace:e,widge=
tName:b,widgetEventPrefix:a[e][b].prototype.widgetEventPrefix||b,widgetBase=
Class:f},d),a.widget.bridge(b,a[e][b])},a.widget.bridge=3Dfunction(c,d){a.f=
n[c]=3Dfunction(e){var f=3Dtypeof e=3D=3D"string",g=3DArray.prototype.slice=
.call(arguments,1),h=3Dthis;return e=3D!f&&g.length?a.extend.apply(null,[!0=
,e].concat(g)):e,f&&e.charAt(0)=3D=3D=3D"_"?h:(f?this.each(function(){var d=
=3Da.data(this,c),f=3Dd&&a.isFunction(d[e])?d[e].apply(d,g):d;if(f!=3D=3Dd&=
&f!=3D=3Db)return h=3Df,!1}):this.each(function(){var b=3Da.data(this,c);b?=
b.option(e||{})._init():a.data(this,c,new d(e,this))}),h)}},a.Widget=3Dfunc=
tion(a,b){arguments.length&&this._createWidget(a,b)},a.Widget.prototype=3D{=
widgetName:"widget",widgetEventPrefix:"",options:{disabled:!1},_createWidge=
t:function(b,c){a.data(c,this.widgetName,this),this.element=3Da(c),this.opt=
ions=3Da.extend(!0,{},this.options,this._getCreateOptions(),b);var d=3Dthis=
;this.element.bind("remove."+this.widgetName,function(){d.destroy()}),this.=
_create(),this._trigger("create"),this._init()},_getCreateOptions:function(=
){return a.metadata&&a.metadata.get(this.element[0])[this.widgetName]},_cre=
ate:function(){},_init:function(){},destroy:function(){this.element.unbind(=
"."+this.widgetName).removeData(this.widgetName),this.widget().unbind("."+t=
his.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClas=
s+"-disabled "+"ui-state-disabled")},widget:function(){return this.element}=
,option:function(c,d){var e=3Dc;if(arguments.length=3D=3D=3D0)return a.exte=
nd({},this.options);if(typeof c=3D=3D"string"){if(d=3D=3D=3Db)return this.o=
ptions[c];e=3D{},e[c]=3Dd}return this._setOptions(e),this},_setOptions:func=
tion(b){var c=3Dthis;return a.each(b,function(a,b){c._setOption(a,b)}),this=
},_setOption:function(a,b){return this.options[a]=3Db,a=3D=3D=3D"disabled"&=
&this.widget()[b?"addClass":"removeClass"](this.widgetBaseClass+"-disabled"=
+" "+"ui-state-disabled").attr("aria-disabled",b),this},enable:function(){r=
eturn this._setOption("disabled",!1)},disable:function(){return this._setOp=
tion("disabled",!0)},_trigger:function(b,c,d){var e,f,g=3Dthis.options[b];d=
=3Dd||{},c=3Da.Event(c),c.type=3D(b=3D=3D=3Dthis.widgetEventPrefix?b:this.w=
idgetEventPrefix+b).toLowerCase(),c.target=3Dthis.element[0],f=3Dc.original=
Event;if(f)for(e in f)e in c||(c[e]=3Df[e]);return this.element.trigger(c,d=
),!(a.isFunction(g)&&g.call(this.element[0],c,d)=3D=3D=3D!1||c.isDefaultPre=
vented())}}})(jQuery);;/*! jQuery UI - v1.8.23 - 2012-08-15
 * https://github.com/jquery/jquery-ui
 * Includes: jquery.ui.mouse.js
 * Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){var c=3D!1;a(document).mouseup(function(a){c=3D!1}),a.widge=
t("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseIni=
t:function(){var b=3Dthis;this.element.bind("mousedown."+this.widgetName,fu=
nction(a){return b._mouseDown(a)}).bind("click."+this.widgetName,function(c=
){if(!0=3D=3D=3Da.data(c.target,b.widgetName+".preventClickEvent"))return a=
.removeData(c.target,b.widgetName+".preventClickEvent"),c.stopImmediateProp=
agation(),!1}),this.started=3D!1},_mouseDestroy:function(){this.element.unb=
ind("."+this.widgetName),a(document).unbind("mousemove."+this.widgetName,th=
is._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDeleg=
ate)},_mouseDown:function(b){if(c)return;this._mouseStarted&&this._mouseUp(=
b),this._mouseDownEvent=3Db;var d=3Dthis,e=3Db.which=3D=3D1,f=3Dtypeof this=
.options.cancel=3D=3D"string"&&b.target.nodeName?a(b.target).closest(this.o=
ptions.cancel).length:!1;if(!e||f||!this._mouseCapture(b))return!0;this.mou=
seDelayMet=3D!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=
=3DsetTimeout(function(){d.mouseDelayMet=3D!0},this.options.delay));if(this=
._mouseDistanceMet(b)&&this._mouseDelayMet(b)){this._mouseStarted=3Dthis._m=
ouseStart(b)!=3D=3D!1;if(!this._mouseStarted)return b.preventDefault(),!0}r=
eturn!0=3D=3D=3Da.data(b.target,this.widgetName+".preventClickEvent")&&a.re=
moveData(b.target,this.widgetName+".preventClickEvent"),this._mouseMoveDele=
gate=3Dfunction(a){return d._mouseMove(a)},this._mouseUpDelegate=3Dfunction=
(a){return d._mouseUp(a)},a(document).bind("mousemove."+this.widgetName,thi=
s._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate=
),b.preventDefault(),c=3D!0,!0},_mouseMove:function(b){return!a.browser.msi=
e||document.documentMode>=3D9||!!b.button?this._mouseStarted?(this._mouseDr=
ag(b),b.preventDefault()):(this._mouseDistanceMet(b)&&this._mouseDelayMet(b=
)&&(this._mouseStarted=3Dthis._mouseStart(this._mouseDownEvent,b)!=3D=3D!1,=
this._mouseStarted?this._mouseDrag(b):this._mouseUp(b)),!this._mouseStarted=
):this._mouseUp(b)},_mouseUp:function(b){return a(document).unbind("mousemo=
ve."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widget=
Name,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=3D!1,b.=
target=3D=3Dthis._mouseDownEvent.target&&a.data(b.target,this.widgetName+".=
preventClickEvent",!0),this._mouseStop(b)),!1},_mouseDistanceMet:function(a=
){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(thi=
s._mouseDownEvent.pageY-a.pageY))>=3Dthis.options.distance},_mouseDelayMet:=
function(a){return this.mouseDelayMet},_mouseStart:function(a){},_mouseDrag=
:function(a){},_mouseStop:function(a){},_mouseCapture:function(a){return!0}=
})})(jQuery);;/*! jQuery UI - v1.8.21 - 2012-06-05
+(function(a,b){var c=3D!1;a(document).mouseup(function(a){c=3D!1}),a.widge=
t("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseIni=
t:function(){var b=3Dthis;this.element.bind("mousedown."+this.widgetName,fu=
nction(a){return b._mouseDown(a)}).bind("click."+this.widgetName,function(c=
){if(!0=3D=3D=3Da.data(c.target,b.widgetName+".preventClickEvent"))return a=
.removeData(c.target,b.widgetName+".preventClickEvent"),c.stopImmediateProp=
agation(),!1}),this.started=3D!1},_mouseDestroy:function(){this.element.unb=
ind("."+this.widgetName),this._mouseMoveDelegate&&a(document).unbind("mouse=
move."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widg=
etName,this._mouseUpDelegate)},_mouseDown:function(b){if(c)return;this._mou=
seStarted&&this._mouseUp(b),this._mouseDownEvent=3Db;var d=3Dthis,e=3Db.whi=
ch=3D=3D1,f=3Dtypeof this.options.cancel=3D=3D"string"&&b.target.nodeName?a=
(b.target).closest(this.options.cancel).length:!1;if(!e||f||!this._mouseCap=
ture(b))return!0;this.mouseDelayMet=3D!this.options.delay,this.mouseDelayMe=
t||(this._mouseDelayTimer=3DsetTimeout(function(){d.mouseDelayMet=3D!0},thi=
s.options.delay));if(this._mouseDistanceMet(b)&&this._mouseDelayMet(b)){thi=
s._mouseStarted=3Dthis._mouseStart(b)!=3D=3D!1;if(!this._mouseStarted)retur=
n b.preventDefault(),!0}return!0=3D=3D=3Da.data(b.target,this.widgetName+".=
preventClickEvent")&&a.removeData(b.target,this.widgetName+".preventClickEv=
ent"),this._mouseMoveDelegate=3Dfunction(a){return d._mouseMove(a)},this._m=
ouseUpDelegate=3Dfunction(a){return d._mouseUp(a)},a(document).bind("mousem=
ove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetN=
ame,this._mouseUpDelegate),b.preventDefault(),c=3D!0,!0},_mouseMove:functio=
n(b){return!a.browser.msie||document.documentMode>=3D9||!!b.button?this._mo=
useStarted?(this._mouseDrag(b),b.preventDefault()):(this._mouseDistanceMet(=
b)&&this._mouseDelayMet(b)&&(this._mouseStarted=3Dthis._mouseStart(this._mo=
useDownEvent,b)!=3D=3D!1,this._mouseStarted?this._mouseDrag(b):this._mouseU=
p(b)),!this._mouseStarted):this._mouseUp(b)},_mouseUp:function(b){return a(=
document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbi=
nd("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(t=
his._mouseStarted=3D!1,b.target=3D=3Dthis._mouseDownEvent.target&&a.data(b.=
target,this.widgetName+".preventClickEvent",!0),this._mouseStop(b)),!1},_mo=
useDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pa=
geX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=3Dthis.options.=
distance},_mouseDelayMet:function(a){return this.mouseDelayMet},_mouseStart=
:function(a){},_mouseDrag:function(a){},_mouseStop:function(a){},_mouseCapt=
ure:function(a){return!0}})})(jQuery);;/*! jQuery UI - v1.8.23 - 2012-08-15
 * https://github.com/jquery/jquery-ui
 * Includes: jquery.ui.position.js
 * Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){a.ui=3Da.ui||{};var c=3D/left|center|right/,d=3D/top|center=
|bottom/,e=3D"center",f=3D{},g=3Da.fn.position,h=3Da.fn.offset;a.fn.positio=
n=3Dfunction(b){if(!b||!b.of)return g.apply(this,arguments);b=3Da.extend({}=
,b);var h=3Da(b.of),i=3Dh[0],j=3D(b.collision||"flip").split(" "),k=3Db.off=
set?b.offset.split(" "):[0,0],l,m,n;return i.nodeType=3D=3D=3D9?(l=3Dh.widt=
h(),m=3Dh.height(),n=3D{top:0,left:0}):i.setTimeout?(l=3Dh.width(),m=3Dh.he=
ight(),n=3D{top:h.scrollTop(),left:h.scrollLeft()}):i.preventDefault?(b.at=
=3D"left top",l=3Dm=3D0,n=3D{top:b.of.pageY,left:b.of.pageX}):(l=3Dh.outerW=
idth(),m=3Dh.outerHeight(),n=3Dh.offset()),a.each(["my","at"],function(){va=
r a=3D(b[this]||"").split(" ");a.length=3D=3D=3D1&&(a=3Dc.test(a[0])?a.conc=
at([e]):d.test(a[0])?[e].concat(a):[e,e]),a[0]=3Dc.test(a[0])?a[0]:e,a[1]=
=3Dd.test(a[1])?a[1]:e,b[this]=3Da}),j.length=3D=3D=3D1&&(j[1]=3Dj[0]),k[0]=
=3DparseInt(k[0],10)||0,k.length=3D=3D=3D1&&(k[1]=3Dk[0]),k[1]=3DparseInt(k=
[1],10)||0,b.at[0]=3D=3D=3D"right"?n.left+=3Dl:b.at[0]=3D=3D=3De&&(n.left+=
=3Dl/2),b.at[1]=3D=3D=3D"bottom"?n.top+=3Dm:b.at[1]=3D=3D=3De&&(n.top+=3Dm/=
2),n.left+=3Dk[0],n.top+=3Dk[1],this.each(function(){var c=3Da(this),d=3Dc.=
outerWidth(),g=3Dc.outerHeight(),h=3DparseInt(a.curCSS(this,"marginLeft",!0=
))||0,i=3DparseInt(a.curCSS(this,"marginTop",!0))||0,o=3Dd+h+(parseInt(a.cu=
rCSS(this,"marginRight",!0))||0),p=3Dg+i+(parseInt(a.curCSS(this,"marginBot=
tom",!0))||0),q=3Da.extend({},n),r;b.my[0]=3D=3D=3D"right"?q.left-=3Dd:b.my=
[0]=3D=3D=3De&&(q.left-=3Dd/2),b.my[1]=3D=3D=3D"bottom"?q.top-=3Dg:b.my[1]=
=3D=3D=3De&&(q.top-=3Dg/2),f.fractions||(q.left=3DMath.round(q.left),q.top=
=3DMath.round(q.top)),r=3D{left:q.left-h,top:q.top-i},a.each(["left","top"]=
,function(c,e){a.ui.position[j[c]]&&a.ui.position[j[c]][e](q,{targetWidth:l=
,targetHeight:m,elemWidth:d,elemHeight:g,collisionPosition:r,collisionWidth=
:o,collisionHeight:p,offset:k,my:b.my,at:b.at})}),a.fn.bgiframe&&c.bgiframe=
(),c.offset(a.extend(q,{using:b.using}))})},a.ui.position=3D{fit:{left:func=
tion(b,c){var d=3Da(window),e=3Dc.collisionPosition.left+c.collisionWidth-d=
.width()-d.scrollLeft();b.left=3De>0?b.left-e:Math.max(b.left-c.collisionPo=
sition.left,b.left)},top:function(b,c){var d=3Da(window),e=3Dc.collisionPos=
ition.top+c.collisionHeight-d.height()-d.scrollTop();b.top=3De>0?b.top-e:Ma=
th.max(b.top-c.collisionPosition.top,b.top)}},flip:{left:function(b,c){if(c=
.at[0]=3D=3D=3De)return;var d=3Da(window),f=3Dc.collisionPosition.left+c.co=
llisionWidth-d.width()-d.scrollLeft(),g=3Dc.my[0]=3D=3D=3D"left"?-c.elemWid=
th:c.my[0]=3D=3D=3D"right"?c.elemWidth:0,h=3Dc.at[0]=3D=3D=3D"left"?c.targe=
tWidth:-c.targetWidth,i=3D-2*c.offset[0];b.left+=3Dc.collisionPosition.left=
<0?g+h+i:f>0?g+h+i:0},top:function(b,c){if(c.at[1]=3D=3D=3De)return;var d=
=3Da(window),f=3Dc.collisionPosition.top+c.collisionHeight-d.height()-d.scr=
ollTop(),g=3Dc.my[1]=3D=3D=3D"top"?-c.elemHeight:c.my[1]=3D=3D=3D"bottom"?c=
.elemHeight:0,h=3Dc.at[1]=3D=3D=3D"top"?c.targetHeight:-c.targetHeight,i=3D=
-2*c.offset[1];b.top+=3Dc.collisionPosition.top<0?g+h+i:f>0?g+h+i:0}}},a.of=
fset.setOffset||(a.offset.setOffset=3Dfunction(b,c){/static/.test(a.curCSS(=
b,"position"))&&(b.style.position=3D"relative");var d=3Da(b),e=3Dd.offset()=
,f=3DparseInt(a.curCSS(b,"top",!0),10)||0,g=3DparseInt(a.curCSS(b,"left",!0=
),10)||0,h=3D{top:c.top-e.top+f,left:c.left-e.left+g};"using"in c?c.using.c=
all(b,h):d.css(h)},a.fn.offset=3Dfunction(b){var c=3Dthis[0];return!c||!c.o=
wnerDocument?null:b?a.isFunction(b)?this.each(function(c){a(this).offset(b.=
call(this,c,a(this).offset()))}):this.each(function(){a.offset.setOffset(th=
is,b)}):h.call(this)}),function(){var b=3Ddocument.getElementsByTagName("bo=
dy")[0],c=3Ddocument.createElement("div"),d,e,g,h,i;d=3Ddocument.createElem=
ent(b?"div":"body"),g=3D{visibility:"hidden",width:0,height:0,border:0,marg=
in:0,background:"none"},b&&a.extend(g,{position:"absolute",left:"-1000px",t=
op:"-1000px"});for(var j in g)d.style[j]=3Dg[j];d.appendChild(c),e=3Db||doc=
ument.documentElement,e.insertBefore(d,e.firstChild),c.style.cssText=3D"pos=
ition: absolute; left: 10.7432222px; top: 10.432325px; height: 30px; width:=
 201px;",h=3Da(c).offset(function(a,b){return b}).offset(),d.innerHTML=3D""=
,e.removeChild(d),i=3Dh.top+h.left+(b?2e3:0),f.fractions=3Di>21&&i<22}()})(=
jQuery);;/*! jQuery UI - v1.8.21 - 2012-06-05
+(function(a,b){a.ui=3Da.ui||{};var c=3D/left|center|right/,d=3D/top|center=
|bottom/,e=3D"center",f=3D{},g=3Da.fn.position,h=3Da.fn.offset;a.fn.positio=
n=3Dfunction(b){if(!b||!b.of)return g.apply(this,arguments);b=3Da.extend({}=
,b);var h=3Da(b.of),i=3Dh[0],j=3D(b.collision||"flip").split(" "),k=3Db.off=
set?b.offset.split(" "):[0,0],l,m,n;return i.nodeType=3D=3D=3D9?(l=3Dh.widt=
h(),m=3Dh.height(),n=3D{top:0,left:0}):i.setTimeout?(l=3Dh.width(),m=3Dh.he=
ight(),n=3D{top:h.scrollTop(),left:h.scrollLeft()}):i.preventDefault?(b.at=
=3D"left top",l=3Dm=3D0,n=3D{top:b.of.pageY,left:b.of.pageX}):(l=3Dh.outerW=
idth(),m=3Dh.outerHeight(),n=3Dh.offset()),a.each(["my","at"],function(){va=
r a=3D(b[this]||"").split(" ");a.length=3D=3D=3D1&&(a=3Dc.test(a[0])?a.conc=
at([e]):d.test(a[0])?[e].concat(a):[e,e]),a[0]=3Dc.test(a[0])?a[0]:e,a[1]=
=3Dd.test(a[1])?a[1]:e,b[this]=3Da}),j.length=3D=3D=3D1&&(j[1]=3Dj[0]),k[0]=
=3DparseInt(k[0],10)||0,k.length=3D=3D=3D1&&(k[1]=3Dk[0]),k[1]=3DparseInt(k=
[1],10)||0,b.at[0]=3D=3D=3D"right"?n.left+=3Dl:b.at[0]=3D=3D=3De&&(n.left+=
=3Dl/2),b.at[1]=3D=3D=3D"bottom"?n.top+=3Dm:b.at[1]=3D=3D=3De&&(n.top+=3Dm/=
2),n.left+=3Dk[0],n.top+=3Dk[1],this.each(function(){var c=3Da(this),d=3Dc.=
outerWidth(),g=3Dc.outerHeight(),h=3DparseInt(a.curCSS(this,"marginLeft",!0=
))||0,i=3DparseInt(a.curCSS(this,"marginTop",!0))||0,o=3Dd+h+(parseInt(a.cu=
rCSS(this,"marginRight",!0))||0),p=3Dg+i+(parseInt(a.curCSS(this,"marginBot=
tom",!0))||0),q=3Da.extend({},n),r;b.my[0]=3D=3D=3D"right"?q.left-=3Dd:b.my=
[0]=3D=3D=3De&&(q.left-=3Dd/2),b.my[1]=3D=3D=3D"bottom"?q.top-=3Dg:b.my[1]=
=3D=3D=3De&&(q.top-=3Dg/2),f.fractions||(q.left=3DMath.round(q.left),q.top=
=3DMath.round(q.top)),r=3D{left:q.left-h,top:q.top-i},a.each(["left","top"]=
,function(c,e){a.ui.position[j[c]]&&a.ui.position[j[c]][e](q,{targetWidth:l=
,targetHeight:m,elemWidth:d,elemHeight:g,collisionPosition:r,collisionWidth=
:o,collisionHeight:p,offset:k,my:b.my,at:b.at})}),a.fn.bgiframe&&c.bgiframe=
(),c.offset(a.extend(q,{using:b.using}))})},a.ui.position=3D{fit:{left:func=
tion(b,c){var d=3Da(window),e=3Dc.collisionPosition.left+c.collisionWidth-d=
.width()-d.scrollLeft();b.left=3De>0?b.left-e:Math.max(b.left-c.collisionPo=
sition.left,b.left)},top:function(b,c){var d=3Da(window),e=3Dc.collisionPos=
ition.top+c.collisionHeight-d.height()-d.scrollTop();b.top=3De>0?b.top-e:Ma=
th.max(b.top-c.collisionPosition.top,b.top)}},flip:{left:function(b,c){if(c=
.at[0]=3D=3D=3De)return;var d=3Da(window),f=3Dc.collisionPosition.left+c.co=
llisionWidth-d.width()-d.scrollLeft(),g=3Dc.my[0]=3D=3D=3D"left"?-c.elemWid=
th:c.my[0]=3D=3D=3D"right"?c.elemWidth:0,h=3Dc.at[0]=3D=3D=3D"left"?c.targe=
tWidth:-c.targetWidth,i=3D-2*c.offset[0];b.left+=3Dc.collisionPosition.left=
<0?g+h+i:f>0?g+h+i:0},top:function(b,c){if(c.at[1]=3D=3D=3De)return;var d=
=3Da(window),f=3Dc.collisionPosition.top+c.collisionHeight-d.height()-d.scr=
ollTop(),g=3Dc.my[1]=3D=3D=3D"top"?-c.elemHeight:c.my[1]=3D=3D=3D"bottom"?c=
.elemHeight:0,h=3Dc.at[1]=3D=3D=3D"top"?c.targetHeight:-c.targetHeight,i=3D=
-2*c.offset[1];b.top+=3Dc.collisionPosition.top<0?g+h+i:f>0?g+h+i:0}}},a.of=
fset.setOffset||(a.offset.setOffset=3Dfunction(b,c){/static/.test(a.curCSS(=
b,"position"))&&(b.style.position=3D"relative");var d=3Da(b),e=3Dd.offset()=
,f=3DparseInt(a.curCSS(b,"top",!0),10)||0,g=3DparseInt(a.curCSS(b,"left",!0=
),10)||0,h=3D{top:c.top-e.top+f,left:c.left-e.left+g};"using"in c?c.using.c=
all(b,h):d.css(h)},a.fn.offset=3Dfunction(b){var c=3Dthis[0];return!c||!c.o=
wnerDocument?null:b?a.isFunction(b)?this.each(function(c){a(this).offset(b.=
call(this,c,a(this).offset()))}):this.each(function(){a.offset.setOffset(th=
is,b)}):h.call(this)}),a.curCSS||(a.curCSS=3Da.css),function(){var b=3Ddocu=
ment.getElementsByTagName("body")[0],c=3Ddocument.createElement("div"),d,e,=
g,h,i;d=3Ddocument.createElement(b?"div":"body"),g=3D{visibility:"hidden",w=
idth:0,height:0,border:0,margin:0,background:"none"},b&&a.extend(g,{positio=
n:"absolute",left:"-1000px",top:"-1000px"});for(var j in g)d.style[j]=3Dg[j=
];d.appendChild(c),e=3Db||document.documentElement,e.insertBefore(d,e.first=
Child),c.style.cssText=3D"position: absolute; left: 10.7432222px; top: 10.4=
32325px; height: 30px; width: 201px;",h=3Da(c).offset(function(a,b){return =
b}).offset(),d.innerHTML=3D"",e.removeChild(d),i=3Dh.top+h.left+(b?2e3:0),f=
.fractions=3Di>21&&i<22}()})(jQuery);;/*! jQuery UI - v1.8.23 - 2012-08-15
+* https://github.com/jquery/jquery-ui
+* Includes: jquery.ui.sortable.js
+* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
+(function(a,b){a.widget("ui.sortable",a.ui.mouse,{widgetEventPrefix:"sort"=
,ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,=
cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelpe=
rSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeho=
lder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"defa=
ult",tolerance:"intersect",zIndex:1e3},_create:function(){var a=3Dthis.opti=
ons;this.containerCache=3D{},this.element.addClass("ui-sortable"),this.refr=
esh(),this.floating=3Dthis.items.length?a.axis=3D=3D=3D"x"||/left|right/.te=
st(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0]=
.item.css("display")):!1,this.offset=3Dthis.element.offset(),this._mouseIni=
t(),this.ready=3D!0},destroy:function(){a.Widget.prototype.destroy.call(thi=
s),this.element.removeClass("ui-sortable ui-sortable-disabled"),this._mouse=
Destroy();for(var b=3Dthis.items.length-1;b>=3D0;b--)this.items[b].item.rem=
oveData(this.widgetName+"-item");return this},_setOption:function(b,c){b=3D=
=3D=3D"disabled"?(this.options[b]=3Dc,this.widget()[c?"addClass":"removeCla=
ss"]("ui-sortable-disabled")):a.Widget.prototype._setOption.apply(this,argu=
ments)},_mouseCapture:function(b,c){var d=3Dthis;if(this.reverting)return!1=
;if(this.options.disabled||this.options.type=3D=3D"static")return!1;this._r=
efreshItems(b);var e=3Dnull,f=3Dthis,g=3Da(b.target).parents().each(functio=
n(){if(a.data(this,d.widgetName+"-item")=3D=3Df)return e=3Da(this),!1});a.d=
ata(b.target,d.widgetName+"-item")=3D=3Df&&(e=3Da(b.target));if(!e)return!1=
;if(this.options.handle&&!c){var h=3D!1;a(this.options.handle,e).find("*").=
andSelf().each(function(){this=3D=3Db.target&&(h=3D!0)});if(!h)return!1}ret=
urn this.currentItem=3De,this._removeCurrentsFromItems(),!0},_mouseStart:fu=
nction(b,c,d){var e=3Dthis.options,f=3Dthis;this.currentContainer=3Dthis,th=
is.refreshPositions(),this.helper=3Dthis._createHelper(b),this._cacheHelper=
Proportions(),this._cacheMargins(),this.scrollParent=3Dthis.helper.scrollPa=
rent(),this.offset=3Dthis.currentItem.offset(),this.offset=3D{top:this.offs=
et.top-this.margins.top,left:this.offset.left-this.margins.left},a.extend(t=
his.offset,{click:{left:b.pageX-this.offset.left,top:b.pageY-this.offset.to=
p},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this=
.helper.css("position","absolute"),this.cssPosition=3Dthis.helper.css("posi=
tion"),this.originalPosition=3Dthis._generatePosition(b),this.originalPageX=
=3Db.pageX,this.originalPageY=3Db.pageY,e.cursorAt&&this._adjustOffsetFromH=
elper(e.cursorAt),this.domPosition=3D{prev:this.currentItem.prev()[0],paren=
t:this.currentItem.parent()[0]},this.helper[0]!=3Dthis.currentItem[0]&&this=
.currentItem.hide(),this._createPlaceholder(),e.containment&&this._setConta=
inment(),e.cursor&&(a("body").css("cursor")&&(this._storedCursor=3Da("body"=
).css("cursor")),a("body").css("cursor",e.cursor)),e.opacity&&(this.helper.=
css("opacity")&&(this._storedOpacity=3Dthis.helper.css("opacity")),this.hel=
per.css("opacity",e.opacity)),e.zIndex&&(this.helper.css("zIndex")&&(this._=
storedZIndex=3Dthis.helper.css("zIndex")),this.helper.css("zIndex",e.zIndex=
)),this.scrollParent[0]!=3Ddocument&&this.scrollParent[0].tagName!=3D"HTML"=
&&(this.overflowOffset=3Dthis.scrollParent.offset()),this._trigger("start",=
b,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProport=
ions();if(!d)for(var g=3Dthis.containers.length-1;g>=3D0;g--)this.container=
s[g]._trigger("activate",b,f._uiHash(this));return a.ui.ddmanager&&(a.ui.dd=
manager.current=3Dthis),a.ui.ddmanager&&!e.dropBehaviour&&a.ui.ddmanager.pr=
epareOffsets(this,b),this.dragging=3D!0,this.helper.addClass("ui-sortable-h=
elper"),this._mouseDrag(b),!0},_mouseDrag:function(b){this.position=3Dthis.=
_generatePosition(b),this.positionAbs=3Dthis._convertPositionTo("absolute")=
,this.lastPositionAbs||(this.lastPositionAbs=3Dthis.positionAbs);if(this.op=
tions.scroll){var c=3Dthis.options,d=3D!1;this.scrollParent[0]!=3Ddocument&=
&this.scrollParent[0].tagName!=3D"HTML"?(this.overflowOffset.top+this.scrol=
lParent[0].offsetHeight-b.pageY<c.scrollSensitivity?this.scrollParent[0].sc=
rollTop=3Dd=3Dthis.scrollParent[0].scrollTop+c.scrollSpeed:b.pageY-this.ove=
rflowOffset.top<c.scrollSensitivity&&(this.scrollParent[0].scrollTop=3Dd=3D=
this.scrollParent[0].scrollTop-c.scrollSpeed),this.overflowOffset.left+this=
.scrollParent[0].offsetWidth-b.pageX<c.scrollSensitivity?this.scrollParent[=
0].scrollLeft=3Dd=3Dthis.scrollParent[0].scrollLeft+c.scrollSpeed:b.pageX-t=
his.overflowOffset.left<c.scrollSensitivity&&(this.scrollParent[0].scrollLe=
ft=3Dd=3Dthis.scrollParent[0].scrollLeft-c.scrollSpeed)):(b.pageY-a(documen=
t).scrollTop()<c.scrollSensitivity?d=3Da(document).scrollTop(a(document).sc=
rollTop()-c.scrollSpeed):a(window).height()-(b.pageY-a(document).scrollTop(=
))<c.scrollSensitivity&&(d=3Da(document).scrollTop(a(document).scrollTop()+=
c.scrollSpeed)),b.pageX-a(document).scrollLeft()<c.scrollSensitivity?d=3Da(=
document).scrollLeft(a(document).scrollLeft()-c.scrollSpeed):a(window).widt=
h()-(b.pageX-a(document).scrollLeft())<c.scrollSensitivity&&(d=3Da(document=
).scrollLeft(a(document).scrollLeft()+c.scrollSpeed))),d!=3D=3D!1&&a.ui.ddm=
anager&&!c.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,b)}this.positi=
onAbs=3Dthis._convertPositionTo("absolute");if(!this.options.axis||this.opt=
ions.axis!=3D"y")this.helper[0].style.left=3Dthis.position.left+"px";if(!th=
is.options.axis||this.options.axis!=3D"x")this.helper[0].style.top=3Dthis.p=
osition.top+"px";for(var e=3Dthis.items.length-1;e>=3D0;e--){var f=3Dthis.i=
tems[e],g=3Df.item[0],h=3Dthis._intersectsWithPointer(f);if(!h)continue;if(=
g!=3Dthis.currentItem[0]&&this.placeholder[h=3D=3D1?"next":"prev"]()[0]!=3D=
g&&!a.ui.contains(this.placeholder[0],g)&&(this.options.type=3D=3D"semi-dyn=
amic"?!a.ui.contains(this.element[0],g):!0)){this.direction=3Dh=3D=3D1?"dow=
n":"up";if(this.options.tolerance=3D=3D"pointer"||this._intersectsWithSides=
(f))this._rearrange(b,f);else break;this._trigger("change",b,this._uiHash()=
);break}}return this._contactContainers(b),a.ui.ddmanager&&a.ui.ddmanager.d=
rag(this,b),this._trigger("sort",b,this._uiHash()),this.lastPositionAbs=3Dt=
his.positionAbs,!1},_mouseStop:function(b,c){if(!b)return;a.ui.ddmanager&&!=
this.options.dropBehaviour&&a.ui.ddmanager.drop(this,b);if(this.options.rev=
ert){var d=3Dthis,e=3Dd.placeholder.offset();d.reverting=3D!0,a(this.helper=
).animate({left:e.left-this.offset.parent.left-d.margins.left+(this.offsetP=
arent[0]=3D=3Ddocument.body?0:this.offsetParent[0].scrollLeft),top:e.top-th=
is.offset.parent.top-d.margins.top+(this.offsetParent[0]=3D=3Ddocument.body=
?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,f=
unction(){d._clear(b)})}else this._clear(b,c);return!1},cancel:function(){v=
ar b=3Dthis;if(this.dragging){this._mouseUp({target:null}),this.options.hel=
per=3D=3D"original"?this.currentItem.css(this._storedCSS).removeClass("ui-s=
ortable-helper"):this.currentItem.show();for(var c=3Dthis.containers.length=
-1;c>=3D0;c--)this.containers[c]._trigger("deactivate",null,b._uiHash(this)=
),this.containers[c].containerCache.over&&(this.containers[c]._trigger("out=
",null,b._uiHash(this)),this.containers[c].containerCache.over=3D0)}return =
this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].pare=
ntNode.removeChild(this.placeholder[0]),this.options.helper!=3D"original"&&=
this.helper&&this.helper[0].parentNode&&this.helper.remove(),a.extend(this,=
{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.=
prev?a(this.domPosition.prev).after(this.currentItem):a(this.domPosition.pa=
rent).prepend(this.currentItem)),this},serialize:function(b){var c=3Dthis._=
getItemsAsjQuery(b&&b.connected),d=3D[];return b=3Db||{},a(c).each(function=
(){var c=3D(a(b.item||this).attr(b.attribute||"id")||"").match(b.expression=
||/(.+)[-=3D_](.+)/);c&&d.push((b.key||c[1]+"[]")+"=3D"+(b.key&&b.expressio=
n?c[1]:c[2]))}),!d.length&&b.key&&d.push(b.key+"=3D"),d.join("&")},toArray:=
function(b){var c=3Dthis._getItemsAsjQuery(b&&b.connected),d=3D[];return b=
=3Db||{},c.each(function(){d.push(a(b.item||this).attr(b.attribute||"id")||=
"")}),d},_intersectsWith:function(a){var b=3Dthis.positionAbs.left,c=3Db+th=
is.helperProportions.width,d=3Dthis.positionAbs.top,e=3Dd+this.helperPropor=
tions.height,f=3Da.left,g=3Df+a.width,h=3Da.top,i=3Dh+a.height,j=3Dthis.off=
set.click.top,k=3Dthis.offset.click.left,l=3Dd+j>h&&d+j<i&&b+k>f&&b+k<g;ret=
urn this.options.tolerance=3D=3D"pointer"||this.options.forcePointerForCont=
ainers||this.options.tolerance!=3D"pointer"&&this.helperProportions[this.fl=
oating?"width":"height"]>a[this.floating?"width":"height"]?l:f<b+this.helpe=
rProportions.width/2&&c-this.helperProportions.width/2<g&&h<d+this.helperPr=
oportions.height/2&&e-this.helperProportions.height/2<i},_intersectsWithPoi=
nter:function(b){var c=3Dthis.options.axis=3D=3D=3D"x"||a.ui.isOverAxis(thi=
s.positionAbs.top+this.offset.click.top,b.top,b.height),d=3Dthis.options.ax=
is=3D=3D=3D"y"||a.ui.isOverAxis(this.positionAbs.left+this.offset.click.lef=
t,b.left,b.width),e=3Dc&&d,f=3Dthis._getDragVerticalDirection(),g=3Dthis._g=
etDragHorizontalDirection();return e?this.floating?g&&g=3D=3D"right"||f=3D=
=3D"down"?2:1:f&&(f=3D=3D"down"?2:1):!1},_intersectsWithSides:function(b){v=
ar c=3Da.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,b.top+b.h=
eight/2,b.height),d=3Da.ui.isOverAxis(this.positionAbs.left+this.offset.cli=
ck.left,b.left+b.width/2,b.width),e=3Dthis._getDragVerticalDirection(),f=3D=
this._getDragHorizontalDirection();return this.floating&&f?f=3D=3D"right"&&=
d||f=3D=3D"left"&&!d:e&&(e=3D=3D"down"&&c||e=3D=3D"up"&&!c)},_getDragVertic=
alDirection:function(){var a=3Dthis.positionAbs.top-this.lastPositionAbs.to=
p;return a!=3D0&&(a>0?"down":"up")},_getDragHorizontalDirection:function(){=
var a=3Dthis.positionAbs.left-this.lastPositionAbs.left;return a!=3D0&&(a>0=
?"right":"left")},refresh:function(a){return this._refreshItems(a),this.ref=
reshPositions(),this},_connectWith:function(){var a=3Dthis.options;return a=
.connectWith.constructor=3D=3DString?[a.connectWith]:a.connectWith},_getIte=
msAsjQuery:function(b){var c=3Dthis,d=3D[],e=3D[],f=3Dthis._connectWith();i=
f(f&&b)for(var g=3Df.length-1;g>=3D0;g--){var h=3Da(f[g]);for(var i=3Dh.len=
gth-1;i>=3D0;i--){var j=3Da.data(h[i],this.widgetName);j&&j!=3Dthis&&!j.opt=
ions.disabled&&e.push([a.isFunction(j.options.items)?j.options.items.call(j=
.element):a(j.options.items,j.element).not(".ui-sortable-helper").not(".ui-=
sortable-placeholder"),j])}}e.push([a.isFunction(this.options.items)?this.o=
ptions.items.call(this.element,null,{options:this.options,item:this.current=
Item}):a(this.options.items,this.element).not(".ui-sortable-helper").not(".=
ui-sortable-placeholder"),this]);for(var g=3De.length-1;g>=3D0;g--)e[g][0].=
each(function(){d.push(this)});return a(d)},_removeCurrentsFromItems:functi=
on(){var a=3Dthis.currentItem.find(":data("+this.widgetName+"-item)");for(v=
ar b=3D0;b<this.items.length;b++)for(var c=3D0;c<a.length;c++)a[c]=3D=3Dthi=
s.items[b].item[0]&&this.items.splice(b,1)},_refreshItems:function(b){this.=
items=3D[],this.containers=3D[this];var c=3Dthis.items,d=3Dthis,e=3D[[a.isF=
unction(this.options.items)?this.options.items.call(this.element[0],b,{item=
:this.currentItem}):a(this.options.items,this.element),this]],f=3Dthis._con=
nectWith();if(f&&this.ready)for(var g=3Df.length-1;g>=3D0;g--){var h=3Da(f[=
g]);for(var i=3Dh.length-1;i>=3D0;i--){var j=3Da.data(h[i],this.widgetName)=
;j&&j!=3Dthis&&!j.options.disabled&&(e.push([a.isFunction(j.options.items)?=
j.options.items.call(j.element[0],b,{item:this.currentItem}):a(j.options.it=
ems,j.element),j]),this.containers.push(j))}}for(var g=3De.length-1;g>=3D0;=
g--){var k=3De[g][1],l=3De[g][0];for(var i=3D0,m=3Dl.length;i<m;i++){var n=
=3Da(l[i]);n.data(this.widgetName+"-item",k),c.push({item:n,instance:k,widt=
h:0,height:0,left:0,top:0})}}},refreshPositions:function(b){this.offsetPare=
nt&&this.helper&&(this.offset.parent=3Dthis._getParentOffset());for(var c=
=3Dthis.items.length-1;c>=3D0;c--){var d=3Dthis.items[c];if(d.instance!=3Dt=
his.currentContainer&&this.currentContainer&&d.item[0]!=3Dthis.currentItem[=
0])continue;var e=3Dthis.options.toleranceElement?a(this.options.toleranceE=
lement,d.item):d.item;b||(d.width=3De.outerWidth(),d.height=3De.outerHeight=
());var f=3De.offset();d.left=3Df.left,d.top=3Df.top}if(this.options.custom=
&&this.options.custom.refreshContainers)this.options.custom.refreshContaine=
rs.call(this);else for(var c=3Dthis.containers.length-1;c>=3D0;c--){var f=
=3Dthis.containers[c].element.offset();this.containers[c].containerCache.le=
ft=3Df.left,this.containers[c].containerCache.top=3Df.top,this.containers[c=
].containerCache.width=3Dthis.containers[c].element.outerWidth(),this.conta=
iners[c].containerCache.height=3Dthis.containers[c].element.outerHeight()}r=
eturn this},_createPlaceholder:function(b){var c=3Db||this,d=3Dc.options;if=
(!d.placeholder||d.placeholder.constructor=3D=3DString){var e=3Dd.placehold=
er;d.placeholder=3D{element:function(){var b=3Da(document.createElement(c.c=
urrentItem[0].nodeName)).addClass(e||c.currentItem[0].className+" ui-sortab=
le-placeholder").removeClass("ui-sortable-helper")[0];return e||(b.style.vi=
sibility=3D"hidden"),b},update:function(a,b){if(e&&!d.forcePlaceholderSize)=
return;b.height()||b.height(c.currentItem.innerHeight()-parseInt(c.currentI=
tem.css("paddingTop")||0,10)-parseInt(c.currentItem.css("paddingBottom")||0=
,10)),b.width()||b.width(c.currentItem.innerWidth()-parseInt(c.currentItem.=
css("paddingLeft")||0,10)-parseInt(c.currentItem.css("paddingRight")||0,10)=
)}}}c.placeholder=3Da(d.placeholder.element.call(c.element,c.currentItem)),=
c.currentItem.after(c.placeholder),d.placeholder.update(c,c.placeholder)},_=
contactContainers:function(b){var c=3Dnull,d=3Dnull;for(var e=3Dthis.contai=
ners.length-1;e>=3D0;e--){if(a.ui.contains(this.currentItem[0],this.contain=
ers[e].element[0]))continue;if(this._intersectsWith(this.containers[e].cont=
ainerCache)){if(c&&a.ui.contains(this.containers[e].element[0],c.element[0]=
))continue;c=3Dthis.containers[e],d=3De}else this.containers[e].containerCa=
che.over&&(this.containers[e]._trigger("out",b,this._uiHash(this)),this.con=
tainers[e].containerCache.over=3D0)}if(!c)return;if(this.containers.length=
=3D=3D=3D1)this.containers[d]._trigger("over",b,this._uiHash(this)),this.co=
ntainers[d].containerCache.over=3D1;else if(this.currentContainer!=3Dthis.c=
ontainers[d]){var f=3D1e4,g=3Dnull,h=3Dthis.positionAbs[this.containers[d].=
floating?"left":"top"];for(var i=3Dthis.items.length-1;i>=3D0;i--){if(!a.ui=
.contains(this.containers[d].element[0],this.items[i].item[0]))continue;var=
 j=3Dthis.containers[d].floating?this.items[i].item.offset().left:this.item=
s[i].item.offset().top;Math.abs(j-h)<f&&(f=3DMath.abs(j-h),g=3Dthis.items[i=
],this.direction=3Dj-h>0?"down":"up")}if(!g&&!this.options.dropOnEmpty)retu=
rn;this.currentContainer=3Dthis.containers[d],g?this._rearrange(b,g,null,!0=
):this._rearrange(b,null,this.containers[d].element,!0),this._trigger("chan=
ge",b,this._uiHash()),this.containers[d]._trigger("change",b,this._uiHash(t=
his)),this.options.placeholder.update(this.currentContainer,this.placeholde=
r),this.containers[d]._trigger("over",b,this._uiHash(this)),this.containers=
[d].containerCache.over=3D1}},_createHelper:function(b){var c=3Dthis.option=
s,d=3Da.isFunction(c.helper)?a(c.helper.apply(this.element[0],[b,this.curre=
ntItem])):c.helper=3D=3D"clone"?this.currentItem.clone():this.currentItem;r=
eturn d.parents("body").length||a(c.appendTo!=3D"parent"?c.appendTo:this.cu=
rrentItem[0].parentNode)[0].appendChild(d[0]),d[0]=3D=3Dthis.currentItem[0]=
&&(this._storedCSS=3D{width:this.currentItem[0].style.width,height:this.cur=
rentItem[0].style.height,position:this.currentItem.css("position"),top:this=
.currentItem.css("top"),left:this.currentItem.css("left")}),(d[0].style.wid=
th=3D=3D""||c.forceHelperSize)&&d.width(this.currentItem.width()),(d[0].sty=
le.height=3D=3D""||c.forceHelperSize)&&d.height(this.currentItem.height()),=
d},_adjustOffsetFromHelper:function(b){typeof b=3D=3D"string"&&(b=3Db.split=
(" ")),a.isArray(b)&&(b=3D{left:+b[0],top:+b[1]||0}),"left"in b&&(this.offs=
et.click.left=3Db.left+this.margins.left),"right"in b&&(this.offset.click.l=
eft=3Dthis.helperProportions.width-b.right+this.margins.left),"top"in b&&(t=
his.offset.click.top=3Db.top+this.margins.top),"bottom"in b&&(this.offset.c=
lick.top=3Dthis.helperProportions.height-b.bottom+this.margins.top)},_getPa=
rentOffset:function(){this.offsetParent=3Dthis.helper.offsetParent();var b=
=3Dthis.offsetParent.offset();this.cssPosition=3D=3D"absolute"&&this.scroll=
Parent[0]!=3Ddocument&&a.ui.contains(this.scrollParent[0],this.offsetParent=
[0])&&(b.left+=3Dthis.scrollParent.scrollLeft(),b.top+=3Dthis.scrollParent.=
scrollTop());if(this.offsetParent[0]=3D=3Ddocument.body||this.offsetParent[=
0].tagName&&this.offsetParent[0].tagName.toLowerCase()=3D=3D"html"&&a.brows=
er.msie)b=3D{top:0,left:0};return{top:b.top+(parseInt(this.offsetParent.css=
("borderTopWidth"),10)||0),left:b.left+(parseInt(this.offsetParent.css("bor=
derLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=
=3D=3D"relative"){var a=3Dthis.currentItem.position();return{top:a.top-(par=
seInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.l=
eft-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft(=
)}}return{top:0,left:0}},_cacheMargins:function(){this.margins=3D{left:pars=
eInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentIte=
m.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperP=
roportions=3D{width:this.helper.outerWidth(),height:this.helper.outerHeight=
()}},_setContainment:function(){var b=3Dthis.options;b.containment=3D=3D"pa=
rent"&&(b.containment=3Dthis.helper[0].parentNode);if(b.containment=3D=3D"d=
ocument"||b.containment=3D=3D"window")this.containment=3D[0-this.offset.rel=
ative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.p=
arent.top,a(b.containment=3D=3D"document"?document:window).width()-this.hel=
perProportions.width-this.margins.left,(a(b.containment=3D=3D"document"?doc=
ument:window).height()||document.body.parentNode.scrollHeight)-this.helperP=
roportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(b=
.containment)){var c=3Da(b.containment)[0],d=3Da(b.containment).offset(),e=
=3Da(c).css("overflow")!=3D"hidden";this.containment=3D[d.left+(parseInt(a(=
c).css("borderLeftWidth"),10)||0)+(parseInt(a(c).css("paddingLeft"),10)||0)=
-this.margins.left,d.top+(parseInt(a(c).css("borderTopWidth"),10)||0)+(pars=
eInt(a(c).css("paddingTop"),10)||0)-this.margins.top,d.left+(e?Math.max(c.s=
crollWidth,c.offsetWidth):c.offsetWidth)-(parseInt(a(c).css("borderLeftWidt=
h"),10)||0)-(parseInt(a(c).css("paddingRight"),10)||0)-this.helperProportio=
ns.width-this.margins.left,d.top+(e?Math.max(c.scrollHeight,c.offsetHeight)=
:c.offsetHeight)-(parseInt(a(c).css("borderTopWidth"),10)||0)-(parseInt(a(c=
).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.t=
op]}},_convertPositionTo:function(b,c){c||(c=3Dthis.position);var d=3Db=3D=
=3D"absolute"?1:-1,e=3Dthis.options,f=3Dthis.cssPosition=3D=3D"absolute"&&(=
this.scrollParent[0]=3D=3Ddocument||!a.ui.contains(this.scrollParent[0],thi=
s.offsetParent[0]))?this.offsetParent:this.scrollParent,g=3D/(html|body)/i.=
test(f[0].tagName);return{top:c.top+this.offset.relative.top*d+this.offset.=
parent.top*d-(a.browser.safari&&this.cssPosition=3D=3D"fixed"?0:(this.cssPo=
sition=3D=3D"fixed"?-this.scrollParent.scrollTop():g?0:f.scrollTop())*d),le=
ft:c.left+this.offset.relative.left*d+this.offset.parent.left*d-(a.browser.=
safari&&this.cssPosition=3D=3D"fixed"?0:(this.cssPosition=3D=3D"fixed"?-thi=
s.scrollParent.scrollLeft():g?0:f.scrollLeft())*d)}},_generatePosition:func=
tion(b){var c=3Dthis.options,d=3Dthis.cssPosition=3D=3D"absolute"&&(this.sc=
rollParent[0]=3D=3Ddocument||!a.ui.contains(this.scrollParent[0],this.offse=
tParent[0]))?this.offsetParent:this.scrollParent,e=3D/(html|body)/i.test(d[=
0].tagName);this.cssPosition=3D=3D"relative"&&(this.scrollParent[0]=3D=3Ddo=
cument||this.scrollParent[0]=3D=3Dthis.offsetParent[0])&&(this.offset.relat=
ive=3Dthis._getRelativeOffset());var f=3Db.pageX,g=3Db.pageY;if(this.origin=
alPosition){this.containment&&(b.pageX-this.offset.click.left<this.containm=
ent[0]&&(f=3Dthis.containment[0]+this.offset.click.left),b.pageY-this.offse=
t.click.top<this.containment[1]&&(g=3Dthis.containment[1]+this.offset.click=
.top),b.pageX-this.offset.click.left>this.containment[2]&&(f=3Dthis.contain=
ment[2]+this.offset.click.left),b.pageY-this.offset.click.top>this.containm=
ent[3]&&(g=3Dthis.containment[3]+this.offset.click.top));if(c.grid){var h=
=3Dthis.originalPageY+Math.round((g-this.originalPageY)/c.grid[1])*c.grid[1=
];g=3Dthis.containment?h-this.offset.click.top<this.containment[1]||h-this.=
offset.click.top>this.containment[3]?h-this.offset.click.top<this.containme=
nt[1]?h+c.grid[1]:h-c.grid[1]:h:h;var i=3Dthis.originalPageX+Math.round((f-=
this.originalPageX)/c.grid[0])*c.grid[0];f=3Dthis.containment?i-this.offset=
.click.left<this.containment[0]||i-this.offset.click.left>this.containment[=
2]?i-this.offset.click.left<this.containment[0]?i+c.grid[0]:i-c.grid[0]:i:i=
}}return{top:g-this.offset.click.top-this.offset.relative.top-this.offset.p=
arent.top+(a.browser.safari&&this.cssPosition=3D=3D"fixed"?0:this.cssPositi=
on=3D=3D"fixed"?-this.scrollParent.scrollTop():e?0:d.scrollTop()),left:f-th=
is.offset.click.left-this.offset.relative.left-this.offset.parent.left+(a.b=
rowser.safari&&this.cssPosition=3D=3D"fixed"?0:this.cssPosition=3D=3D"fixed=
"?-this.scrollParent.scrollLeft():e?0:d.scrollLeft())}},_rearrange:function=
(a,b,c,d){c?c[0].appendChild(this.placeholder[0]):b.item[0].parentNode.inse=
rtBefore(this.placeholder[0],this.direction=3D=3D"down"?b.item[0]:b.item[0]=
.nextSibling),this.counter=3Dthis.counter?++this.counter:1;var e=3Dthis,f=
=3Dthis.counter;window.setTimeout(function(){f=3D=3De.counter&&e.refreshPos=
itions(!d)},0)},_clear:function(b,c){this.reverting=3D!1;var d=3D[],e=3Dthi=
s;!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.be=
fore(this.currentItem),this._noFinalSort=3Dnull;if(this.helper[0]=3D=3Dthis=
.currentItem[0]){for(var f in this._storedCSS)if(this._storedCSS[f]=3D=3D"a=
uto"||this._storedCSS[f]=3D=3D"static")this._storedCSS[f]=3D"";this.current=
Item.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.curre=
ntItem.show();this.fromOutside&&!c&&d.push(function(a){this._trigger("recei=
ve",a,this._uiHash(this.fromOutside))}),(this.fromOutside||this.domPosition=
.prev!=3Dthis.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPos=
ition.parent!=3Dthis.currentItem.parent()[0])&&!c&&d.push(function(a){this.=
_trigger("update",a,this._uiHash())});if(!a.ui.contains(this.element[0],thi=
s.currentItem[0])){c||d.push(function(a){this._trigger("remove",a,this._uiH=
ash())});for(var f=3Dthis.containers.length-1;f>=3D0;f--)a.ui.contains(this=
.containers[f].element[0],this.currentItem[0])&&!c&&(d.push(function(a){ret=
urn function(b){a._trigger("receive",b,this._uiHash(this))}}.call(this,this=
.containers[f])),d.push(function(a){return function(b){a._trigger("update",=
b,this._uiHash(this))}}.call(this,this.containers[f])))}for(var f=3Dthis.co=
ntainers.length-1;f>=3D0;f--)c||d.push(function(a){return function(b){a._tr=
igger("deactivate",b,this._uiHash(this))}}.call(this,this.containers[f])),t=
his.containers[f].containerCache.over&&(d.push(function(a){return function(=
b){a._trigger("out",b,this._uiHash(this))}}.call(this,this.containers[f])),=
this.containers[f].containerCache.over=3D0);this._storedCursor&&a("body").c=
ss("cursor",this._storedCursor),this._storedOpacity&&this.helper.css("opaci=
ty",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex",this.=
_storedZIndex=3D=3D"auto"?"":this._storedZIndex),this.dragging=3D!1;if(this=
.cancelHelperRemoval){if(!c){this._trigger("beforeStop",b,this._uiHash());f=
or(var f=3D0;f<d.length;f++)d[f].call(this,b);this._trigger("stop",b,this._=
uiHash())}return this.fromOutside=3D!1,!1}c||this._trigger("beforeStop",b,t=
his._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[=
0]),this.helper[0]!=3Dthis.currentItem[0]&&this.helper.remove(),this.helper=
=3Dnull;if(!c){for(var f=3D0;f<d.length;f++)d[f].call(this,b);this._trigger=
("stop",b,this._uiHash())}return this.fromOutside=3D!1,!0},_trigger:functio=
n(){a.Widget.prototype._trigger.apply(this,arguments)=3D=3D=3D!1&&this.canc=
el()},_uiHash:function(b){var c=3Db||this;return{helper:c.helper,placeholde=
r:c.placeholder||a([]),position:c.position,originalPosition:c.originalPosit=
ion,offset:c.positionAbs,item:c.currentItem,sender:b?b.element:null}}}),a.e=
xtend(a.ui.sortable,{version:"1.8.23"})})(jQuery);;/*! jQuery UI - v1.8.23 =
- 2012-08-15
 * https://github.com/jquery/jquery-ui
 * Includes: jquery.ui.autocomplete.js
 * Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){var c=3D0;a.widget("ui.autocomplete",{options:{appendTo:"bo=
dy",autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bot=
tom",collision:"none"},source:null},pending:0,_create:function(){var b=3Dth=
is,c=3Dthis.element[0].ownerDocument,d;this.isMultiLine=3Dthis.element.is("=
textarea"),this.element.addClass("ui-autocomplete-input").attr("autocomplet=
e","off").attr({role:"textbox","aria-autocomplete":"list","aria-haspopup":"=
true"}).bind("keydown.autocomplete",function(c){if(b.options.disabled||b.el=
ement.propAttr("readOnly"))return;d=3D!1;var e=3Da.ui.keyCode;switch(c.keyC=
ode){case e.PAGE_UP:b._move("previousPage",c);break;case e.PAGE_DOWN:b._mov=
e("nextPage",c);break;case e.UP:b._keyEvent("previous",c);break;case e.DOWN=
:b._keyEvent("next",c);break;case e.ENTER:case e.NUMPAD_ENTER:b.menu.active=
&&(d=3D!0,c.preventDefault());case e.TAB:if(!b.menu.active)return;b.menu.se=
lect(c);break;case e.ESCAPE:b.element.val(b.term),b.close(c);break;default:=
clearTimeout(b.searching),b.searching=3DsetTimeout(function(){b.term!=3Db.e=
lement.val()&&(b.selectedItem=3Dnull,b.search(null,c))},b.options.delay)}})=
.bind("keypress.autocomplete",function(a){d&&(d=3D!1,a.preventDefault())}).=
bind("focus.autocomplete",function(){if(b.options.disabled)return;b.selecte=
dItem=3Dnull,b.previous=3Db.element.val()}).bind("blur.autocomplete",functi=
on(a){if(b.options.disabled)return;clearTimeout(b.searching),b.closing=3Dse=
tTimeout(function(){b.close(a),b._change(a)},150)}),this._initSource(),this=
.menu=3Da("<ul></ul>").addClass("ui-autocomplete").appendTo(a(this.options.=
appendTo||"body",c)[0]).mousedown(function(c){var d=3Db.menu.element[0];a(c=
.target).closest(".ui-menu-item").length||setTimeout(function(){a(document)=
.one("mousedown",function(c){c.target!=3D=3Db.element[0]&&c.target!=3D=3Dd&=
&!a.ui.contains(d,c.target)&&b.close()})},1),setTimeout(function(){clearTim=
eout(b.closing)},13)}).menu({focus:function(a,c){var d=3Dc.item.data("item.=
autocomplete");!1!=3D=3Db._trigger("focus",a,{item:d})&&/^key/.test(a.origi=
nalEvent.type)&&b.element.val(d.value)},selected:function(a,d){var e=3Dd.it=
em.data("item.autocomplete"),f=3Db.previous;b.element[0]!=3D=3Dc.activeElem=
ent&&(b.element.focus(),b.previous=3Df,setTimeout(function(){b.previous=3Df=
,b.selectedItem=3De},1)),!1!=3D=3Db._trigger("select",a,{item:e})&&b.elemen=
t.val(e.value),b.term=3Db.element.val(),b.close(a),b.selectedItem=3De},blur=
:function(a,c){b.menu.element.is(":visible")&&b.element.val()!=3D=3Db.term&=
&b.element.val(b.term)}}).zIndex(this.element.zIndex()+1).css({top:0,left:0=
}).hide().data("menu"),a.fn.bgiframe&&this.menu.element.bgiframe(),b.before=
unloadHandler=3Dfunction(){b.element.removeAttr("autocomplete")},a(window).=
bind("beforeunload",b.beforeunloadHandler)},destroy:function(){this.element=
.removeClass("ui-autocomplete-input").removeAttr("autocomplete").removeAttr=
("role").removeAttr("aria-autocomplete").removeAttr("aria-haspopup"),this.m=
enu.element.remove(),a(window).unbind("beforeunload",this.beforeunloadHandl=
er),a.Widget.prototype.destroy.call(this)},_setOption:function(b,c){a.Widge=
t.prototype._setOption.apply(this,arguments),b=3D=3D=3D"source"&&this._init=
Source(),b=3D=3D=3D"appendTo"&&this.menu.element.appendTo(a(c||"body",this.=
element[0].ownerDocument)[0]),b=3D=3D=3D"disabled"&&c&&this.xhr&&this.xhr.a=
bort()},_initSource:function(){var b=3Dthis,c,d;a.isArray(this.options.sour=
ce)?(c=3Dthis.options.source,this.source=3Dfunction(b,d){d(a.ui.autocomplet=
e.filter(c,b.term))}):typeof this.options.source=3D=3D"string"?(d=3Dthis.op=
tions.source,this.source=3Dfunction(c,e){b.xhr&&b.xhr.abort(),b.xhr=3Da.aja=
x({url:d,data:c,dataType:"json",success:function(a,b){e(a)},error:function(=
){e([])}})}):this.source=3Dthis.options.source},search:function(a,b){a=3Da!=
=3Dnull?a:this.element.val(),this.term=3Dthis.element.val();if(a.length<thi=
s.options.minLength)return this.close(b);clearTimeout(this.closing);if(this=
._trigger("search",b)=3D=3D=3D!1)return;return this._search(a)},_search:fun=
ction(a){this.pending++,this.element.addClass("ui-autocomplete-loading"),th=
is.source({term:a},this._response())},_response:function(){var a=3Dthis,b=
=3D++c;return function(d){b=3D=3D=3Dc&&a.__response(d),a.pending--,a.pendin=
g||a.element.removeClass("ui-autocomplete-loading")}},__response:function(a=
){!this.options.disabled&&a&&a.length?(a=3Dthis._normalize(a),this._suggest=
(a),this._trigger("open")):this.close()},close:function(a){clearTimeout(thi=
s.closing),this.menu.element.is(":visible")&&(this.menu.element.hide(),this=
.menu.deactivate(),this._trigger("close",a))},_change:function(a){this.prev=
ious!=3D=3Dthis.element.val()&&this._trigger("change",a,{item:this.selected=
Item})},_normalize:function(b){return b.length&&b[0].label&&b[0].value?b:a.=
map(b,function(b){return typeof b=3D=3D"string"?{label:b,value:b}:a.extend(=
{label:b.label||b.value,value:b.value||b.label},b)})},_suggest:function(b){=
var c=3Dthis.menu.element.empty().zIndex(this.element.zIndex()+1);this._ren=
derMenu(c,b),this.menu.deactivate(),this.menu.refresh(),c.show(),this._resi=
zeMenu(),c.position(a.extend({of:this.element},this.options.position)),this=
.options.autoFocus&&this.menu.next(new a.Event("mouseover"))},_resizeMenu:f=
unction(){var a=3Dthis.menu.element;a.outerWidth(Math.max(a.width("").outer=
Width()+1,this.element.outerWidth()))},_renderMenu:function(b,c){var d=3Dth=
is;a.each(c,function(a,c){d._renderItem(b,c)})},_renderItem:function(b,c){r=
eturn a("<li></li>").data("item.autocomplete",c).append(a("<a></a>").text(c=
.label)).appendTo(b)},_move:function(a,b){if(!this.menu.element.is(":visibl=
e")){this.search(null,b);return}if(this.menu.first()&&/^previous/.test(a)||=
this.menu.last()&&/^next/.test(a)){this.element.val(this.term),this.menu.de=
activate();return}this.menu[a](b)},widget:function(){return this.menu.eleme=
nt},_keyEvent:function(a,b){if(!this.isMultiLine||this.menu.element.is(":vi=
sible"))this._move(a,b),b.preventDefault()}}),a.extend(a.ui.autocomplete,{e=
scapeRegex:function(a){return a.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&")}=
,filter:function(b,c){var d=3Dnew RegExp(a.ui.autocomplete.escapeRegex(c),"=
i");return a.grep(b,function(a){return d.test(a.label||a.value||a)})}})})(j=
Query),function(a){a.widget("ui.menu",{_create:function(){var b=3Dthis;this=
.element.addClass("ui-menu ui-widget ui-widget-content ui-corner-all").attr=
({role:"listbox","aria-activedescendant":"ui-active-menuitem"}).click(funct=
ion(c){if(!a(c.target).closest(".ui-menu-item a").length)return;c.preventDe=
fault(),b.select(c)}),this.refresh()},refresh:function(){var b=3Dthis,c=3Dt=
his.element.children("li:not(.ui-menu-item):has(a)").addClass("ui-menu-item=
").attr("role","menuitem");c.children("a").addClass("ui-corner-all").attr("=
tabindex",-1).mouseenter(function(c){b.activate(c,a(this).parent())}).mouse=
leave(function(){b.deactivate()})},activate:function(a,b){this.deactivate()=
;if(this.hasScroll()){var c=3Db.offset().top-this.element.offset().top,d=3D=
this.element.scrollTop(),e=3Dthis.element.height();c<0?this.element.scrollT=
op(d+c):c>=3De&&this.element.scrollTop(d+c-e+b.height())}this.active=3Db.eq=
(0).children("a").addClass("ui-state-hover").attr("id","ui-active-menuitem"=
).end(),this._trigger("focus",a,{item:b})},deactivate:function(){if(!this.a=
ctive)return;this.active.children("a").removeClass("ui-state-hover").remove=
Attr("id"),this._trigger("blur"),this.active=3Dnull},next:function(a){this.=
move("next",".ui-menu-item:first",a)},previous:function(a){this.move("prev"=
,".ui-menu-item:last",a)},first:function(){return this.active&&!this.active=
.prevAll(".ui-menu-item").length},last:function(){return this.active&&!this=
.active.nextAll(".ui-menu-item").length},move:function(a,b,c){if(!this.acti=
ve){this.activate(c,this.element.children(b));return}var d=3Dthis.active[a+=
"All"](".ui-menu-item").eq(0);d.length?this.activate(c,d):this.activate(c,t=
his.element.children(b))},nextPage:function(b){if(this.hasScroll()){if(!thi=
s.active||this.last()){this.activate(b,this.element.children(".ui-menu-item=
:first"));return}var c=3Dthis.active.offset().top,d=3Dthis.element.height()=
,e=3Dthis.element.children(".ui-menu-item").filter(function(){var b=3Da(thi=
s).offset().top-c-d+a(this).height();return b<10&&b>-10});e.length||(e=3Dth=
is.element.children(".ui-menu-item:last")),this.activate(b,e)}else this.act=
ivate(b,this.element.children(".ui-menu-item").filter(!this.active||this.la=
st()?":first":":last"))},previousPage:function(b){if(this.hasScroll()){if(!=
this.active||this.first()){this.activate(b,this.element.children(".ui-menu-=
item:last"));return}var c=3Dthis.active.offset().top,d=3Dthis.element.heigh=
t(),e=3Dthis.element.children(".ui-menu-item").filter(function(){var b=3Da(=
this).offset().top-c+d-a(this).height();return b<10&&b>-10});e.length||(e=
=3Dthis.element.children(".ui-menu-item:first")),this.activate(b,e)}else th=
is.activate(b,this.element.children(".ui-menu-item").filter(!this.active||t=
his.first()?":last":":first"))},hasScroll:function(){return this.element.he=
ight()<this.element[a.fn.prop?"prop":"attr"]("scrollHeight")},select:functi=
on(a){this._trigger("selected",a,{item:this.active})}})}(jQuery);;/*! jQuer=
y UI - v1.8.21 - 2012-06-05
+(function(a,b){var c=3D0;a.widget("ui.autocomplete",{options:{appendTo:"bo=
dy",autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bot=
tom",collision:"none"},source:null},pending:0,_create:function(){var b=3Dth=
is,c=3Dthis.element[0].ownerDocument,d;this.isMultiLine=3Dthis.element.is("=
textarea"),this.element.addClass("ui-autocomplete-input").attr("autocomplet=
e","off").attr({role:"textbox","aria-autocomplete":"list","aria-haspopup":"=
true"}).bind("keydown.autocomplete",function(c){if(b.options.disabled||b.el=
ement.propAttr("readOnly"))return;d=3D!1;var e=3Da.ui.keyCode;switch(c.keyC=
ode){case e.PAGE_UP:b._move("previousPage",c);break;case e.PAGE_DOWN:b._mov=
e("nextPage",c);break;case e.UP:b._keyEvent("previous",c);break;case e.DOWN=
:b._keyEvent("next",c);break;case e.ENTER:case e.NUMPAD_ENTER:b.menu.active=
&&(d=3D!0,c.preventDefault());case e.TAB:if(!b.menu.active)return;b.menu.se=
lect(c);break;case e.ESCAPE:b.element.val(b.term),b.close(c);break;default:=
clearTimeout(b.searching),b.searching=3DsetTimeout(function(){b.term!=3Db.e=
lement.val()&&(b.selectedItem=3Dnull,b.search(null,c))},b.options.delay)}})=
.bind("keypress.autocomplete",function(a){d&&(d=3D!1,a.preventDefault())}).=
bind("focus.autocomplete",function(){if(b.options.disabled)return;b.selecte=
dItem=3Dnull,b.previous=3Db.element.val()}).bind("blur.autocomplete",functi=
on(a){if(b.options.disabled)return;clearTimeout(b.searching),b.closing=3Dse=
tTimeout(function(){b.close(a),b._change(a)},150)}),this._initSource(),this=
.menu=3Da("<ul></ul>").addClass("ui-autocomplete").appendTo(a(this.options.=
appendTo||"body",c)[0]).mousedown(function(c){var d=3Db.menu.element[0];a(c=
.target).closest(".ui-menu-item").length||setTimeout(function(){a(document)=
.one("mousedown",function(c){c.target!=3D=3Db.element[0]&&c.target!=3D=3Dd&=
&!a.ui.contains(d,c.target)&&b.close()})},1),setTimeout(function(){clearTim=
eout(b.closing)},13)}).menu({focus:function(a,c){var d=3Dc.item.data("item.=
autocomplete");!1!=3D=3Db._trigger("focus",a,{item:d})&&/^key/.test(a.origi=
nalEvent.type)&&b.element.val(d.value)},selected:function(a,d){var e=3Dd.it=
em.data("item.autocomplete"),f=3Db.previous;b.element[0]!=3D=3Dc.activeElem=
ent&&(b.element.focus(),b.previous=3Df,setTimeout(function(){b.previous=3Df=
,b.selectedItem=3De},1)),!1!=3D=3Db._trigger("select",a,{item:e})&&b.elemen=
t.val(e.value),b.term=3Db.element.val(),b.close(a),b.selectedItem=3De},blur=
:function(a,c){b.menu.element.is(":visible")&&b.element.val()!=3D=3Db.term&=
&b.element.val(b.term)}}).zIndex(this.element.zIndex()+1).css({top:0,left:0=
}).hide().data("menu"),a.fn.bgiframe&&this.menu.element.bgiframe(),b.before=
unloadHandler=3Dfunction(){b.element.removeAttr("autocomplete")},a(window).=
bind("beforeunload",b.beforeunloadHandler)},destroy:function(){this.element=
.removeClass("ui-autocomplete-input").removeAttr("autocomplete").removeAttr=
("role").removeAttr("aria-autocomplete").removeAttr("aria-haspopup"),this.m=
enu.element.remove(),a(window).unbind("beforeunload",this.beforeunloadHandl=
er),a.Widget.prototype.destroy.call(this)},_setOption:function(b,c){a.Widge=
t.prototype._setOption.apply(this,arguments),b=3D=3D=3D"source"&&this._init=
Source(),b=3D=3D=3D"appendTo"&&this.menu.element.appendTo(a(c||"body",this.=
element[0].ownerDocument)[0]),b=3D=3D=3D"disabled"&&c&&this.xhr&&this.xhr.a=
bort()},_initSource:function(){var b=3Dthis,c,d;a.isArray(this.options.sour=
ce)?(c=3Dthis.options.source,this.source=3Dfunction(b,d){d(a.ui.autocomplet=
e.filter(c,b.term))}):typeof this.options.source=3D=3D"string"?(d=3Dthis.op=
tions.source,this.source=3Dfunction(c,e){b.xhr&&b.xhr.abort(),b.xhr=3Da.aja=
x({url:d,data:c,dataType:"json",success:function(a,b){e(a)},error:function(=
){e([])}})}):this.source=3Dthis.options.source},search:function(a,b){a=3Da!=
=3Dnull?a:this.element.val(),this.term=3Dthis.element.val();if(a.length<thi=
s.options.minLength)return this.close(b);clearTimeout(this.closing);if(this=
._trigger("search",b)=3D=3D=3D!1)return;return this._search(a)},_search:fun=
ction(a){this.pending++,this.element.addClass("ui-autocomplete-loading"),th=
is.source({term:a},this._response())},_response:function(){var a=3Dthis,b=
=3D++c;return function(d){b=3D=3D=3Dc&&a.__response(d),a.pending--,a.pendin=
g||a.element.removeClass("ui-autocomplete-loading")}},__response:function(a=
){!this.options.disabled&&a&&a.length?(a=3Dthis._normalize(a),this._suggest=
(a),this._trigger("open")):this.close()},close:function(a){clearTimeout(thi=
s.closing),this.menu.element.is(":visible")&&(this.menu.element.hide(),this=
.menu.deactivate(),this._trigger("close",a))},_change:function(a){this.prev=
ious!=3D=3Dthis.element.val()&&this._trigger("change",a,{item:this.selected=
Item})},_normalize:function(b){return b.length&&b[0].label&&b[0].value?b:a.=
map(b,function(b){return typeof b=3D=3D"string"?{label:b,value:b}:a.extend(=
{label:b.label||b.value,value:b.value||b.label},b)})},_suggest:function(b){=
var c=3Dthis.menu.element.empty().zIndex(this.element.zIndex()+1);this._ren=
derMenu(c,b),this.menu.deactivate(),this.menu.refresh(),c.show(),this._resi=
zeMenu(),c.position(a.extend({of:this.element},this.options.position)),this=
.options.autoFocus&&this.menu.next(new a.Event("mouseover"))},_resizeMenu:f=
unction(){var a=3Dthis.menu.element;a.outerWidth(Math.max(a.width("").outer=
Width()+1,this.element.outerWidth()))},_renderMenu:function(b,c){var d=3Dth=
is;a.each(c,function(a,c){d._renderItem(b,c)})},_renderItem:function(b,c){r=
eturn a("<li></li>").data("item.autocomplete",c).append(a("<a></a>").text(c=
.label)).appendTo(b)},_move:function(a,b){if(!this.menu.element.is(":visibl=
e")){this.search(null,b);return}if(this.menu.first()&&/^previous/.test(a)||=
this.menu.last()&&/^next/.test(a)){this.element.val(this.term),this.menu.de=
activate();return}this.menu[a](b)},widget:function(){return this.menu.eleme=
nt},_keyEvent:function(a,b){if(!this.isMultiLine||this.menu.element.is(":vi=
sible"))this._move(a,b),b.preventDefault()}}),a.extend(a.ui.autocomplete,{e=
scapeRegex:function(a){return a.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&")}=
,filter:function(b,c){var d=3Dnew RegExp(a.ui.autocomplete.escapeRegex(c),"=
i");return a.grep(b,function(a){return d.test(a.label||a.value||a)})}})})(j=
Query),function(a){a.widget("ui.menu",{_create:function(){var b=3Dthis;this=
.element.addClass("ui-menu ui-widget ui-widget-content ui-corner-all").attr=
({role:"listbox","aria-activedescendant":"ui-active-menuitem"}).click(funct=
ion(c){if(!a(c.target).closest(".ui-menu-item a").length)return;c.preventDe=
fault(),b.select(c)}),this.refresh()},refresh:function(){var b=3Dthis,c=3Dt=
his.element.children("li:not(.ui-menu-item):has(a)").addClass("ui-menu-item=
").attr("role","menuitem");c.children("a").addClass("ui-corner-all").attr("=
tabindex",-1).mouseenter(function(c){b.activate(c,a(this).parent())}).mouse=
leave(function(){b.deactivate()})},activate:function(a,b){this.deactivate()=
;if(this.hasScroll()){var c=3Db.offset().top-this.element.offset().top,d=3D=
this.element.scrollTop(),e=3Dthis.element.height();c<0?this.element.scrollT=
op(d+c):c>=3De&&this.element.scrollTop(d+c-e+b.height())}this.active=3Db.eq=
(0).children("a").addClass("ui-state-hover").attr("id","ui-active-menuitem"=
).end(),this._trigger("focus",a,{item:b})},deactivate:function(){if(!this.a=
ctive)return;this.active.children("a").removeClass("ui-state-hover").remove=
Attr("id"),this._trigger("blur"),this.active=3Dnull},next:function(a){this.=
move("next",".ui-menu-item:first",a)},previous:function(a){this.move("prev"=
,".ui-menu-item:last",a)},first:function(){return this.active&&!this.active=
.prevAll(".ui-menu-item").length},last:function(){return this.active&&!this=
.active.nextAll(".ui-menu-item").length},move:function(a,b,c){if(!this.acti=
ve){this.activate(c,this.element.children(b));return}var d=3Dthis.active[a+=
"All"](".ui-menu-item").eq(0);d.length?this.activate(c,d):this.activate(c,t=
his.element.children(b))},nextPage:function(b){if(this.hasScroll()){if(!thi=
s.active||this.last()){this.activate(b,this.element.children(".ui-menu-item=
:first"));return}var c=3Dthis.active.offset().top,d=3Dthis.element.height()=
,e=3Dthis.element.children(".ui-menu-item").filter(function(){var b=3Da(thi=
s).offset().top-c-d+a(this).height();return b<10&&b>-10});e.length||(e=3Dth=
is.element.children(".ui-menu-item:last")),this.activate(b,e)}else this.act=
ivate(b,this.element.children(".ui-menu-item").filter(!this.active||this.la=
st()?":first":":last"))},previousPage:function(b){if(this.hasScroll()){if(!=
this.active||this.first()){this.activate(b,this.element.children(".ui-menu-=
item:last"));return}var c=3Dthis.active.offset().top,d=3Dthis.element.heigh=
t(),e=3Dthis.element.children(".ui-menu-item").filter(function(){var b=3Da(=
this).offset().top-c+d-a(this).height();return b<10&&b>-10});e.length||(e=
=3Dthis.element.children(".ui-menu-item:first")),this.activate(b,e)}else th=
is.activate(b,this.element.children(".ui-menu-item").filter(!this.active||t=
his.first()?":last":":first"))},hasScroll:function(){return this.element.he=
ight()<this.element[a.fn.prop?"prop":"attr"]("scrollHeight")},select:functi=
on(a){this._trigger("selected",a,{item:this.active})}})}(jQuery);;/*! jQuer=
y UI - v1.8.23 - 2012-08-15
+* https://github.com/jquery/jquery-ui
+* Includes: jquery.ui.slider.js
+* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
+(function(a,b){var c=3D5;a.widget("ui.slider",a.ui.mouse,{widgetEventPrefi=
x:"slide",options:{animate:!1,distance:0,max:100,min:0,orientation:"horizon=
tal",range:!1,step:1,value:0,values:null},_create:function(){var b=3Dthis,d=
=3Dthis.options,e=3Dthis.element.find(".ui-slider-handle").addClass("ui-sta=
te-default ui-corner-all"),f=3D"<a class=3D'ui-slider-handle ui-state-defau=
lt ui-corner-all' href=3D'#'></a>",g=3Dd.values&&d.values.length||1,h=3D[];=
this._keySliding=3D!1,this._mouseSliding=3D!1,this._animateOff=3D!0,this._h=
andleIndex=3Dnull,this._detectOrientation(),this._mouseInit(),this.element.=
addClass("ui-slider ui-slider-"+this.orientation+" ui-widget"+" ui-widget-c=
ontent"+" ui-corner-all"+(d.disabled?" ui-slider-disabled ui-disabled":""))=
,this.range=3Da([]),d.range&&(d.range=3D=3D=3D!0&&(d.values||(d.values=3D[t=
his._valueMin(),this._valueMin()]),d.values.length&&d.values.length!=3D=3D2=
&&(d.values=3D[d.values[0],d.values[0]])),this.range=3Da("<div></div>").app=
endTo(this.element).addClass("ui-slider-range ui-widget-header"+(d.range=3D=
=3D=3D"min"||d.range=3D=3D=3D"max"?" ui-slider-range-"+d.range:"")));for(va=
r i=3De.length;i<g;i+=3D1)h.push(f);this.handles=3De.add(a(h.join("")).appe=
ndTo(b.element)),this.handle=3Dthis.handles.eq(0),this.handles.add(this.ran=
ge).filter("a").click(function(a){a.preventDefault()}).hover(function(){d.d=
isabled||a(this).addClass("ui-state-hover")},function(){a(this).removeClass=
("ui-state-hover")}).focus(function(){d.disabled?a(this).blur():(a(".ui-sli=
der .ui-state-focus").removeClass("ui-state-focus"),a(this).addClass("ui-st=
ate-focus"))}).blur(function(){a(this).removeClass("ui-state-focus")}),this=
.handles.each(function(b){a(this).data("index.ui-slider-handle",b)}),this.h=
andles.keydown(function(d){var e=3Da(this).data("index.ui-slider-handle"),f=
,g,h,i;if(b.options.disabled)return;switch(d.keyCode){case a.ui.keyCode.HOM=
E:case a.ui.keyCode.END:case a.ui.keyCode.PAGE_UP:case a.ui.keyCode.PAGE_DO=
WN:case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:case a.ui.keyCode.DOWN:case=
 a.ui.keyCode.LEFT:d.preventDefault();if(!b._keySliding){b._keySliding=3D!0=
,a(this).addClass("ui-state-active"),f=3Db._start(d,e);if(f=3D=3D=3D!1)retu=
rn}}i=3Db.options.step,b.options.values&&b.options.values.length?g=3Dh=3Db.=
values(e):g=3Dh=3Db.value();switch(d.keyCode){case a.ui.keyCode.HOME:h=3Db.=
_valueMin();break;case a.ui.keyCode.END:h=3Db._valueMax();break;case a.ui.k=
eyCode.PAGE_UP:h=3Db._trimAlignValue(g+(b._valueMax()-b._valueMin())/c);bre=
ak;case a.ui.keyCode.PAGE_DOWN:h=3Db._trimAlignValue(g-(b._valueMax()-b._va=
lueMin())/c);break;case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:if(g=3D=3D=
=3Db._valueMax())return;h=3Db._trimAlignValue(g+i);break;case a.ui.keyCode.=
DOWN:case a.ui.keyCode.LEFT:if(g=3D=3D=3Db._valueMin())return;h=3Db._trimAl=
ignValue(g-i)}b._slide(d,e,h)}).keyup(function(c){var d=3Da(this).data("ind=
ex.ui-slider-handle");b._keySliding&&(b._keySliding=3D!1,b._stop(c,d),b._ch=
ange(c,d),a(this).removeClass("ui-state-active"))}),this._refreshValue(),th=
is._animateOff=3D!1},destroy:function(){return this.handles.remove(),this.r=
ange.remove(),this.element.removeClass("ui-slider ui-slider-horizontal ui-s=
lider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all=
").removeData("slider").unbind(".slider"),this._mouseDestroy(),this},_mouse=
Capture:function(b){var c=3Dthis.options,d,e,f,g,h,i,j,k,l;return c.disable=
d?!1:(this.elementSize=3D{width:this.element.outerWidth(),height:this.eleme=
nt.outerHeight()},this.elementOffset=3Dthis.element.offset(),d=3D{x:b.pageX=
,y:b.pageY},e=3Dthis._normValueFromMouse(d),f=3Dthis._valueMax()-this._valu=
eMin()+1,h=3Dthis,this.handles.each(function(b){var c=3DMath.abs(e-h.values=
(b));f>c&&(f=3Dc,g=3Da(this),i=3Db)}),c.range=3D=3D=3D!0&&this.values(1)=3D=
=3D=3Dc.min&&(i+=3D1,g=3Da(this.handles[i])),j=3Dthis._start(b,i),j=3D=3D=
=3D!1?!1:(this._mouseSliding=3D!0,h._handleIndex=3Di,g.addClass("ui-state-a=
ctive").focus(),k=3Dg.offset(),l=3D!a(b.target).parents().andSelf().is(".ui=
-slider-handle"),this._clickOffset=3Dl?{left:0,top:0}:{left:b.pageX-k.left-=
g.width()/2,top:b.pageY-k.top-g.height()/2-(parseInt(g.css("borderTopWidth"=
),10)||0)-(parseInt(g.css("borderBottomWidth"),10)||0)+(parseInt(g.css("mar=
ginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(b,i,=
e),this._animateOff=3D!0,!0))},_mouseStart:function(a){return!0},_mouseDrag=
:function(a){var b=3D{x:a.pageX,y:a.pageY},c=3Dthis._normValueFromMouse(b);=
return this._slide(a,this._handleIndex,c),!1},_mouseStop:function(a){return=
 this.handles.removeClass("ui-state-active"),this._mouseSliding=3D!1,this._=
stop(a,this._handleIndex),this._change(a,this._handleIndex),this._handleInd=
ex=3Dnull,this._clickOffset=3Dnull,this._animateOff=3D!1,!1},_detectOrienta=
tion:function(){this.orientation=3Dthis.options.orientation=3D=3D=3D"vertic=
al"?"vertical":"horizontal"},_normValueFromMouse:function(a){var b,c,d,e,f;=
return this.orientation=3D=3D=3D"horizontal"?(b=3Dthis.elementSize.width,c=
=3Da.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)=
):(b=3Dthis.elementSize.height,c=3Da.y-this.elementOffset.top-(this._clickO=
ffset?this._clickOffset.top:0)),d=3Dc/b,d>1&&(d=3D1),d<0&&(d=3D0),this.orie=
ntation=3D=3D=3D"vertical"&&(d=3D1-d),e=3Dthis._valueMax()-this._valueMin()=
,f=3Dthis._valueMin()+d*e,this._trimAlignValue(f)},_start:function(a,b){var=
 c=3D{handle:this.handles[b],value:this.value()};return this.options.values=
&&this.options.values.length&&(c.value=3Dthis.values(b),c.values=3Dthis.val=
ues()),this._trigger("start",a,c)},_slide:function(a,b,c){var d,e,f;this.op=
tions.values&&this.options.values.length?(d=3Dthis.values(b?0:1),this.optio=
ns.values.length=3D=3D=3D2&&this.options.range=3D=3D=3D!0&&(b=3D=3D=3D0&&c>=
d||b=3D=3D=3D1&&c<d)&&(c=3Dd),c!=3D=3Dthis.values(b)&&(e=3Dthis.values(),e[=
b]=3Dc,f=3Dthis._trigger("slide",a,{handle:this.handles[b],value:c,values:e=
}),d=3Dthis.values(b?0:1),f!=3D=3D!1&&this.values(b,c,!0))):c!=3D=3Dthis.va=
lue()&&(f=3Dthis._trigger("slide",a,{handle:this.handles[b],value:c}),f!=3D=
=3D!1&&this.value(c))},_stop:function(a,b){var c=3D{handle:this.handles[b],=
value:this.value()};this.options.values&&this.options.values.length&&(c.val=
ue=3Dthis.values(b),c.values=3Dthis.values()),this._trigger("stop",a,c)},_c=
hange:function(a,b){if(!this._keySliding&&!this._mouseSliding){var c=3D{han=
dle:this.handles[b],value:this.value()};this.options.values&&this.options.v=
alues.length&&(c.value=3Dthis.values(b),c.values=3Dthis.values()),this._tri=
gger("change",a,c)}},value:function(a){if(arguments.length){this.options.va=
lue=3Dthis._trimAlignValue(a),this._refreshValue(),this._change(null,0);ret=
urn}return this._value()},values:function(b,c){var d,e,f;if(arguments.lengt=
h>1){this.options.values[b]=3Dthis._trimAlignValue(c),this._refreshValue(),=
this._change(null,b);return}if(!arguments.length)return this._values();if(!=
a.isArray(arguments[0]))return this.options.values&&this.options.values.len=
gth?this._values(b):this.value();d=3Dthis.options.values,e=3Darguments[0];f=
or(f=3D0;f<d.length;f+=3D1)d[f]=3Dthis._trimAlignValue(e[f]),this._change(n=
ull,f);this._refreshValue()},_setOption:function(b,c){var d,e=3D0;a.isArray=
(this.options.values)&&(e=3Dthis.options.values.length),a.Widget.prototype.=
_setOption.apply(this,arguments);switch(b){case"disabled":c?(this.handles.f=
ilter(".ui-state-focus").blur(),this.handles.removeClass("ui-state-hover"),=
this.handles.propAttr("disabled",!0),this.element.addClass("ui-disabled")):=
(this.handles.propAttr("disabled",!1),this.element.removeClass("ui-disabled=
"));break;case"orientation":this._detectOrientation(),this.element.removeCl=
ass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.o=
rientation),this._refreshValue();break;case"value":this._animateOff=3D!0,th=
is._refreshValue(),this._change(null,0),this._animateOff=3D!1;break;case"va=
lues":this._animateOff=3D!0,this._refreshValue();for(d=3D0;d<e;d+=3D1)this.=
_change(null,d);this._animateOff=3D!1}},_value:function(){var a=3Dthis.opti=
ons.value;return a=3Dthis._trimAlignValue(a),a},_values:function(a){var b,c=
,d;if(arguments.length)return b=3Dthis.options.values[a],b=3Dthis._trimAlig=
nValue(b),b;c=3Dthis.options.values.slice();for(d=3D0;d<c.length;d+=3D1)c[d=
]=3Dthis._trimAlignValue(c[d]);return c},_trimAlignValue:function(a){if(a<=
=3Dthis._valueMin())return this._valueMin();if(a>=3Dthis._valueMax())return=
 this._valueMax();var b=3Dthis.options.step>0?this.options.step:1,c=3D(a-th=
is._valueMin())%b,d=3Da-c;return Math.abs(c)*2>=3Db&&(d+=3Dc>0?b:-b),parseF=
loat(d.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax=
:function(){return this.options.max},_refreshValue:function(){var b=3Dthis.=
options.range,c=3Dthis.options,d=3Dthis,e=3Dthis._animateOff?!1:c.animate,f=
,g=3D{},h,i,j,k;this.options.values&&this.options.values.length?this.handle=
s.each(function(b,i){f=3D(d.values(b)-d._valueMin())/(d._valueMax()-d._valu=
eMin())*100,g[d.orientation=3D=3D=3D"horizontal"?"left":"bottom"]=3Df+"%",a=
(this).stop(1,1)[e?"animate":"css"](g,c.animate),d.options.range=3D=3D=3D!0=
&&(d.orientation=3D=3D=3D"horizontal"?(b=3D=3D=3D0&&d.range.stop(1,1)[e?"an=
imate":"css"]({left:f+"%"},c.animate),b=3D=3D=3D1&&d.range[e?"animate":"css=
"]({width:f-h+"%"},{queue:!1,duration:c.animate})):(b=3D=3D=3D0&&d.range.st=
op(1,1)[e?"animate":"css"]({bottom:f+"%"},c.animate),b=3D=3D=3D1&&d.range[e=
?"animate":"css"]({height:f-h+"%"},{queue:!1,duration:c.animate}))),h=3Df})=
:(i=3Dthis.value(),j=3Dthis._valueMin(),k=3Dthis._valueMax(),f=3Dk!=3D=3Dj?=
(i-j)/(k-j)*100:0,g[d.orientation=3D=3D=3D"horizontal"?"left":"bottom"]=3Df=
+"%",this.handle.stop(1,1)[e?"animate":"css"](g,c.animate),b=3D=3D=3D"min"&=
&this.orientation=3D=3D=3D"horizontal"&&this.range.stop(1,1)[e?"animate":"c=
ss"]({width:f+"%"},c.animate),b=3D=3D=3D"max"&&this.orientation=3D=3D=3D"ho=
rizontal"&&this.range[e?"animate":"css"]({width:100-f+"%"},{queue:!1,durati=
on:c.animate}),b=3D=3D=3D"min"&&this.orientation=3D=3D=3D"vertical"&&this.r=
ange.stop(1,1)[e?"animate":"css"]({height:f+"%"},c.animate),b=3D=3D=3D"max"=
&&this.orientation=3D=3D=3D"vertical"&&this.range[e?"animate":"css"]({heigh=
t:100-f+"%"},{queue:!1,duration:c.animate}))}}),a.extend(a.ui.slider,{versi=
on:"1.8.23"})})(jQuery);;/*! jQuery UI - v1.8.23 - 2012-08-15
 * https://github.com/jquery/jquery-ui
 * Includes: jquery.ui.tabs.js
 * Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){function e(){return++c}function f(){return++d}var c=3D0,d=
=3D0;a.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:!1,cookie=
:null,collapsible:!1,disable:null,disabled:[],enable:null,event:"click",fx:=
null,idPrefix:"ui-tabs-",load:null,panelTemplate:"<div></div>",remove:null,=
select:null,show:null,spinner:"<em>Loading&#8230;</em>",tabTemplate:"<li><a=
 href=3D'#{href}'><span>#{label}</span></a></li>"},_create:function(){this.=
_tabify(!0)},_setOption:function(a,b){if(a=3D=3D"selected"){if(this.options=
.collapsible&&b=3D=3Dthis.options.selected)return;this.select(b)}else this.=
options[a]=3Db,this._tabify()},_tabId:function(a){return a.title&&a.title.r=
eplace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix=
+e()},_sanitizeSelector:function(a){return a.replace(/:/g,"\\:")},_cookie:f=
unction(){var b=3Dthis.cookie||(this.cookie=3Dthis.options.cookie.name||"ui=
-tabs-"+f());return a.cookie.apply(null,[b].concat(a.makeArray(arguments)))=
},_ui:function(a,b){return{tab:a,panel:b,index:this.anchors.index(a)}},_cle=
anup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-sta=
te-processing").find("span:data(label.tabs)").each(function(){var b=3Da(thi=
s);b.html(b.data("label.tabs")).removeData("label.tabs")})},_tabify:functio=
n(c){function m(b,c){b.css("display",""),!a.support.opacity&&c.opacity&&b[0=
].style.removeAttribute("filter")}var d=3Dthis,e=3Dthis.options,f=3D/^#.+/;=
this.list=3Dthis.element.find("ol,ul").eq(0),this.lis=3Da(" > li:has(a[href=
])",this.list),this.anchors=3Dthis.lis.map(function(){return a("a",this)[0]=
}),this.panels=3Da([]),this.anchors.each(function(b,c){var g=3Da(c).attr("h=
ref"),h=3Dg.split("#")[0],i;h&&(h=3D=3D=3Dlocation.toString().split("#")[0]=
||(i=3Da("base")[0])&&h=3D=3D=3Di.href)&&(g=3Dc.hash,c.href=3Dg);if(f.test(=
g))d.panels=3Dd.panels.add(d.element.find(d._sanitizeSelector(g)));else if(=
g&&g!=3D=3D"#"){a.data(c,"href.tabs",g),a.data(c,"load.tabs",g.replace(/#.*=
$/,""));var j=3Dd._tabId(c);c.href=3D"#"+j;var k=3Dd.element.find("#"+j);k.=
length||(k=3Da(e.panelTemplate).attr("id",j).addClass("ui-tabs-panel ui-wid=
get-content ui-corner-bottom").insertAfter(d.panels[b-1]||d.list),k.data("d=
estroy.tabs",!0)),d.panels=3Dd.panels.add(k)}else e.disabled.push(b)}),c?(t=
his.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all"),t=
his.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget=
-header ui-corner-all"),this.lis.addClass("ui-state-default ui-corner-top")=
,this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom"),e=
.selected=3D=3D=3Db?(location.hash&&this.anchors.each(function(a,b){if(b.ha=
sh=3D=3Dlocation.hash)return e.selected=3Da,!1}),typeof e.selected!=3D"numb=
er"&&e.cookie&&(e.selected=3DparseInt(d._cookie(),10)),typeof e.selected!=
=3D"number"&&this.lis.filter(".ui-tabs-selected").length&&(e.selected=3Dthi=
s.lis.index(this.lis.filter(".ui-tabs-selected"))),e.selected=3De.selected|=
|(this.lis.length?0:-1)):e.selected=3D=3D=3Dnull&&(e.selected=3D-1),e.selec=
ted=3De.selected>=3D0&&this.anchors[e.selected]||e.selected<0?e.selected:0,=
e.disabled=3Da.unique(e.disabled.concat(a.map(this.lis.filter(".ui-state-di=
sabled"),function(a,b){return d.lis.index(a)}))).sort(),a.inArray(e.selecte=
d,e.disabled)!=3D-1&&e.disabled.splice(a.inArray(e.selected,e.disabled),1),=
this.panels.addClass("ui-tabs-hide"),this.lis.removeClass("ui-tabs-selected=
 ui-state-active"),e.selected>=3D0&&this.anchors.length&&(d.element.find(d.=
_sanitizeSelector(d.anchors[e.selected].hash)).removeClass("ui-tabs-hide"),=
this.lis.eq(e.selected).addClass("ui-tabs-selected ui-state-active"),d.elem=
ent.queue("tabs",function(){d._trigger("show",null,d._ui(d.anchors[e.select=
ed],d.element.find(d._sanitizeSelector(d.anchors[e.selected].hash))[0]))}),=
this.load(e.selected)),a(window).bind("unload",function(){d.lis.add(d.ancho=
rs).unbind(".tabs"),d.lis=3Dd.anchors=3Dd.panels=3Dnull})):e.selected=3Dthi=
s.lis.index(this.lis.filter(".ui-tabs-selected")),this.element[e.collapsibl=
e?"addClass":"removeClass"]("ui-tabs-collapsible"),e.cookie&&this._cookie(e=
.selected,e.cookie);for(var g=3D0,h;h=3Dthis.lis[g];g++)a(h)[a.inArray(g,e.=
disabled)!=3D-1&&!a(h).hasClass("ui-tabs-selected")?"addClass":"removeClass=
"]("ui-state-disabled");e.cache=3D=3D=3D!1&&this.anchors.removeData("cache.=
tabs"),this.lis.add(this.anchors).unbind(".tabs");if(e.event!=3D=3D"mouseov=
er"){var i=3Dfunction(a,b){b.is(":not(.ui-state-disabled)")&&b.addClass("ui=
-state-"+a)},j=3Dfunction(a,b){b.removeClass("ui-state-"+a)};this.lis.bind(=
"mouseover.tabs",function(){i("hover",a(this))}),this.lis.bind("mouseout.ta=
bs",function(){j("hover",a(this))}),this.anchors.bind("focus.tabs",function=
(){i("focus",a(this).closest("li"))}),this.anchors.bind("blur.tabs",functio=
n(){j("focus",a(this).closest("li"))})}var k,l;e.fx&&(a.isArray(e.fx)?(k=3D=
e.fx[0],l=3De.fx[1]):k=3Dl=3De.fx);var n=3Dl?function(b,c){a(b).closest("li=
").addClass("ui-tabs-selected ui-state-active"),c.hide().removeClass("ui-ta=
bs-hide").animate(l,l.duration||"normal",function(){m(c,l),d._trigger("show=
",null,d._ui(b,c[0]))})}:function(b,c){a(b).closest("li").addClass("ui-tabs=
-selected ui-state-active"),c.removeClass("ui-tabs-hide"),d._trigger("show"=
,null,d._ui(b,c[0]))},o=3Dk?function(a,b){b.animate(k,k.duration||"normal",=
function(){d.lis.removeClass("ui-tabs-selected ui-state-active"),b.addClass=
("ui-tabs-hide"),m(b,k),d.element.dequeue("tabs")})}:function(a,b,c){d.lis.=
removeClass("ui-tabs-selected ui-state-active"),b.addClass("ui-tabs-hide"),=
d.element.dequeue("tabs")};this.anchors.bind(e.event+".tabs",function(){var=
 b=3Dthis,c=3Da(b).closest("li"),f=3Dd.panels.filter(":not(.ui-tabs-hide)")=
,g=3Dd.element.find(d._sanitizeSelector(b.hash));if(c.hasClass("ui-tabs-sel=
ected")&&!e.collapsible||c.hasClass("ui-state-disabled")||c.hasClass("ui-st=
ate-processing")||d.panels.filter(":animated").length||d._trigger("select",=
null,d._ui(this,g[0]))=3D=3D=3D!1)return this.blur(),!1;e.selected=3Dd.anch=
ors.index(this),d.abort();if(e.collapsible){if(c.hasClass("ui-tabs-selected=
"))return e.selected=3D-1,e.cookie&&d._cookie(e.selected,e.cookie),d.elemen=
t.queue("tabs",function(){o(b,f)}).dequeue("tabs"),this.blur(),!1;if(!f.len=
gth)return e.cookie&&d._cookie(e.selected,e.cookie),d.element.queue("tabs",=
function(){n(b,g)}),d.load(d.anchors.index(this)),this.blur(),!1}e.cookie&&=
d._cookie(e.selected,e.cookie);if(g.length)f.length&&d.element.queue("tabs"=
,function(){o(b,f)}),d.element.queue("tabs",function(){n(b,g)}),d.load(d.an=
chors.index(this));else throw"jQuery UI Tabs: Mismatching fragment identifi=
er.";a.browser.msie&&this.blur()}),this.anchors.bind("click.tabs",function(=
){return!1})},_getIndex:function(a){return typeof a=3D=3D"string"&&(a=3Dthi=
s.anchors.index(this.anchors.filter("[href$=3D'"+a+"']"))),a},destroy:funct=
ion(){var b=3Dthis.options;return this.abort(),this.element.unbind(".tabs")=
.removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-col=
lapsible").removeData("tabs"),this.list.removeClass("ui-tabs-nav ui-helper-=
reset ui-helper-clearfix ui-widget-header ui-corner-all"),this.anchors.each=
(function(){var b=3Da.data(this,"href.tabs");b&&(this.href=3Db);var c=3Da(t=
his).unbind(".tabs");a.each(["href","load","cache"],function(a,b){c.removeD=
ata(b+".tabs")})}),this.lis.unbind(".tabs").add(this.panels).each(function(=
){a.data(this,"destroy.tabs")?a(this).remove():a(this).removeClass(["ui-sta=
te-default","ui-corner-top","ui-tabs-selected","ui-state-active","ui-state-=
hover","ui-state-focus","ui-state-disabled","ui-tabs-panel","ui-widget-cont=
ent","ui-corner-bottom","ui-tabs-hide"].join(" "))}),b.cookie&&this._cookie=
(null,b.cookie),this},add:function(c,d,e){e=3D=3D=3Db&&(e=3Dthis.anchors.le=
ngth);var f=3Dthis,g=3Dthis.options,h=3Da(g.tabTemplate.replace(/#\{href\}/=
g,c).replace(/#\{label\}/g,d)),i=3Dc.indexOf("#")?this._tabId(a("a",h)[0]):=
c.replace("#","");h.addClass("ui-state-default ui-corner-top").data("destro=
y.tabs",!0);var j=3Df.element.find("#"+i);return j.length||(j=3Da(g.panelTe=
mplate).attr("id",i).data("destroy.tabs",!0)),j.addClass("ui-tabs-panel ui-=
widget-content ui-corner-bottom ui-tabs-hide"),e>=3Dthis.lis.length?(h.appe=
ndTo(this.list),j.appendTo(this.list[0].parentNode)):(h.insertBefore(this.l=
is[e]),j.insertBefore(this.panels[e])),g.disabled=3Da.map(g.disabled,functi=
on(a,b){return a>=3De?++a:a}),this._tabify(),this.anchors.length=3D=3D1&&(g=
.selected=3D0,h.addClass("ui-tabs-selected ui-state-active"),j.removeClass(=
"ui-tabs-hide"),this.element.queue("tabs",function(){f._trigger("show",null=
,f._ui(f.anchors[0],f.panels[0]))}),this.load(0)),this._trigger("add",null,=
this._ui(this.anchors[e],this.panels[e])),this},remove:function(b){b=3Dthis=
._getIndex(b);var c=3Dthis.options,d=3Dthis.lis.eq(b).remove(),e=3Dthis.pan=
els.eq(b).remove();return d.hasClass("ui-tabs-selected")&&this.anchors.leng=
th>1&&this.select(b+(b+1<this.anchors.length?1:-1)),c.disabled=3Da.map(a.gr=
ep(c.disabled,function(a,c){return a!=3Db}),function(a,c){return a>=3Db?--a=
:a}),this._tabify(),this._trigger("remove",null,this._ui(d.find("a")[0],e[0=
])),this},enable:function(b){b=3Dthis._getIndex(b);var c=3Dthis.options;if(=
a.inArray(b,c.disabled)=3D=3D-1)return;return this.lis.eq(b).removeClass("u=
i-state-disabled"),c.disabled=3Da.grep(c.disabled,function(a,c){return a!=
=3Db}),this._trigger("enable",null,this._ui(this.anchors[b],this.panels[b])=
),this},disable:function(a){a=3Dthis._getIndex(a);var b=3Dthis,c=3Dthis.opt=
ions;return a!=3Dc.selected&&(this.lis.eq(a).addClass("ui-state-disabled"),=
c.disabled.push(a),c.disabled.sort(),this._trigger("disable",null,this._ui(=
this.anchors[a],this.panels[a]))),this},select:function(a){a=3Dthis._getInd=
ex(a);if(a=3D=3D-1)if(this.options.collapsible&&this.options.selected!=3D-1=
)a=3Dthis.options.selected;else return this;return this.anchors.eq(a).trigg=
er(this.options.event+".tabs"),this},load:function(b){b=3Dthis._getIndex(b)=
;var c=3Dthis,d=3Dthis.options,e=3Dthis.anchors.eq(b)[0],f=3Da.data(e,"load=
.tabs");this.abort();if(!f||this.element.queue("tabs").length!=3D=3D0&&a.da=
ta(e,"cache.tabs")){this.element.dequeue("tabs");return}this.lis.eq(b).addC=
lass("ui-state-processing");if(d.spinner){var g=3Da("span",e);g.data("label=
.tabs",g.html()).html(d.spinner)}return this.xhr=3Da.ajax(a.extend({},d.aja=
xOptions,{url:f,success:function(f,g){c.element.find(c._sanitizeSelector(e.=
hash)).html(f),c._cleanup(),d.cache&&a.data(e,"cache.tabs",!0),c._trigger("=
load",null,c._ui(c.anchors[b],c.panels[b]));try{d.ajaxOptions.success(f,g)}=
catch(h){}},error:function(a,f,g){c._cleanup(),c._trigger("load",null,c._ui=
(c.anchors[b],c.panels[b]));try{d.ajaxOptions.error(a,f,b,e)}catch(g){}}}))=
,c.element.dequeue("tabs"),this},abort:function(){return this.element.queue=
([]),this.panels.stop(!1,!0),this.element.queue("tabs",this.element.queue("=
tabs").splice(-2,2)),this.xhr&&(this.xhr.abort(),delete this.xhr),this._cle=
anup(),this},url:function(a,b){return this.anchors.eq(a).removeData("cache.=
tabs").data("load.tabs",b),this},length:function(){return this.anchors.leng=
th}}),a.extend(a.ui.tabs,{version:"1.8.21"}),a.extend(a.ui.tabs.prototype,{=
rotation:null,rotate:function(a,b){var c=3Dthis,d=3Dthis.options,e=3Dc._rot=
ate||(c._rotate=3Dfunction(b){clearTimeout(c.rotation),c.rotation=3DsetTime=
out(function(){var a=3Dd.selected;c.select(++a<c.anchors.length?a:0)},a),b&=
&b.stopPropagation()}),f=3Dc._unrotate||(c._unrotate=3Db?function(a){e()}:f=
unction(a){a.clientX&&c.rotate(null)});return a?(this.element.bind("tabssho=
w",e),this.anchors.bind(d.event+".tabs",f),e()):(clearTimeout(c.rotation),t=
his.element.unbind("tabsshow",e),this.anchors.unbind(d.event+".tabs",f),del=
ete this._rotate,delete this._unrotate),this}})})(jQuery);;/*! jQuery UI - =
v1.8.21 - 2012-06-05
+(function(a,b){function e(){return++c}function f(){return++d}var c=3D0,d=
=3D0;a.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:!1,cookie=
:null,collapsible:!1,disable:null,disabled:[],enable:null,event:"click",fx:=
null,idPrefix:"ui-tabs-",load:null,panelTemplate:"<div></div>",remove:null,=
select:null,show:null,spinner:"<em>Loading&#8230;</em>",tabTemplate:"<li><a=
 href=3D'#{href}'><span>#{label}</span></a></li>"},_create:function(){this.=
_tabify(!0)},_setOption:function(a,b){if(a=3D=3D"selected"){if(this.options=
.collapsible&&b=3D=3Dthis.options.selected)return;this.select(b)}else this.=
options[a]=3Db,this._tabify()},_tabId:function(a){return a.title&&a.title.r=
eplace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix=
+e()},_sanitizeSelector:function(a){return a.replace(/:/g,"\\:")},_cookie:f=
unction(){var b=3Dthis.cookie||(this.cookie=3Dthis.options.cookie.name||"ui=
-tabs-"+f());return a.cookie.apply(null,[b].concat(a.makeArray(arguments)))=
},_ui:function(a,b){return{tab:a,panel:b,index:this.anchors.index(a)}},_cle=
anup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-sta=
te-processing").find("span:data(label.tabs)").each(function(){var b=3Da(thi=
s);b.html(b.data("label.tabs")).removeData("label.tabs")})},_tabify:functio=
n(c){function m(b,c){b.css("display",""),!a.support.opacity&&c.opacity&&b[0=
].style.removeAttribute("filter")}var d=3Dthis,e=3Dthis.options,f=3D/^#.+/;=
this.list=3Dthis.element.find("ol,ul").eq(0),this.lis=3Da(" > li:has(a[href=
])",this.list),this.anchors=3Dthis.lis.map(function(){return a("a",this)[0]=
}),this.panels=3Da([]),this.anchors.each(function(b,c){var g=3Da(c).attr("h=
ref"),h=3Dg.split("#")[0],i;h&&(h=3D=3D=3Dlocation.toString().split("#")[0]=
||(i=3Da("base")[0])&&h=3D=3D=3Di.href)&&(g=3Dc.hash,c.href=3Dg);if(f.test(=
g))d.panels=3Dd.panels.add(d.element.find(d._sanitizeSelector(g)));else if(=
g&&g!=3D=3D"#"){a.data(c,"href.tabs",g),a.data(c,"load.tabs",g.replace(/#.*=
$/,""));var j=3Dd._tabId(c);c.href=3D"#"+j;var k=3Dd.element.find("#"+j);k.=
length||(k=3Da(e.panelTemplate).attr("id",j).addClass("ui-tabs-panel ui-wid=
get-content ui-corner-bottom").insertAfter(d.panels[b-1]||d.list),k.data("d=
estroy.tabs",!0)),d.panels=3Dd.panels.add(k)}else e.disabled.push(b)}),c?(t=
his.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all"),t=
his.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget=
-header ui-corner-all"),this.lis.addClass("ui-state-default ui-corner-top")=
,this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom"),e=
.selected=3D=3D=3Db?(location.hash&&this.anchors.each(function(a,b){if(b.ha=
sh=3D=3Dlocation.hash)return e.selected=3Da,!1}),typeof e.selected!=3D"numb=
er"&&e.cookie&&(e.selected=3DparseInt(d._cookie(),10)),typeof e.selected!=
=3D"number"&&this.lis.filter(".ui-tabs-selected").length&&(e.selected=3Dthi=
s.lis.index(this.lis.filter(".ui-tabs-selected"))),e.selected=3De.selected|=
|(this.lis.length?0:-1)):e.selected=3D=3D=3Dnull&&(e.selected=3D-1),e.selec=
ted=3De.selected>=3D0&&this.anchors[e.selected]||e.selected<0?e.selected:0,=
e.disabled=3Da.unique(e.disabled.concat(a.map(this.lis.filter(".ui-state-di=
sabled"),function(a,b){return d.lis.index(a)}))).sort(),a.inArray(e.selecte=
d,e.disabled)!=3D-1&&e.disabled.splice(a.inArray(e.selected,e.disabled),1),=
this.panels.addClass("ui-tabs-hide"),this.lis.removeClass("ui-tabs-selected=
 ui-state-active"),e.selected>=3D0&&this.anchors.length&&(d.element.find(d.=
_sanitizeSelector(d.anchors[e.selected].hash)).removeClass("ui-tabs-hide"),=
this.lis.eq(e.selected).addClass("ui-tabs-selected ui-state-active"),d.elem=
ent.queue("tabs",function(){d._trigger("show",null,d._ui(d.anchors[e.select=
ed],d.element.find(d._sanitizeSelector(d.anchors[e.selected].hash))[0]))}),=
this.load(e.selected)),a(window).bind("unload",function(){d.lis.add(d.ancho=
rs).unbind(".tabs"),d.lis=3Dd.anchors=3Dd.panels=3Dnull})):e.selected=3Dthi=
s.lis.index(this.lis.filter(".ui-tabs-selected")),this.element[e.collapsibl=
e?"addClass":"removeClass"]("ui-tabs-collapsible"),e.cookie&&this._cookie(e=
.selected,e.cookie);for(var g=3D0,h;h=3Dthis.lis[g];g++)a(h)[a.inArray(g,e.=
disabled)!=3D-1&&!a(h).hasClass("ui-tabs-selected")?"addClass":"removeClass=
"]("ui-state-disabled");e.cache=3D=3D=3D!1&&this.anchors.removeData("cache.=
tabs"),this.lis.add(this.anchors).unbind(".tabs");if(e.event!=3D=3D"mouseov=
er"){var i=3Dfunction(a,b){b.is(":not(.ui-state-disabled)")&&b.addClass("ui=
-state-"+a)},j=3Dfunction(a,b){b.removeClass("ui-state-"+a)};this.lis.bind(=
"mouseover.tabs",function(){i("hover",a(this))}),this.lis.bind("mouseout.ta=
bs",function(){j("hover",a(this))}),this.anchors.bind("focus.tabs",function=
(){i("focus",a(this).closest("li"))}),this.anchors.bind("blur.tabs",functio=
n(){j("focus",a(this).closest("li"))})}var k,l;e.fx&&(a.isArray(e.fx)?(k=3D=
e.fx[0],l=3De.fx[1]):k=3Dl=3De.fx);var n=3Dl?function(b,c){a(b).closest("li=
").addClass("ui-tabs-selected ui-state-active"),c.hide().removeClass("ui-ta=
bs-hide").animate(l,l.duration||"normal",function(){m(c,l),d._trigger("show=
",null,d._ui(b,c[0]))})}:function(b,c){a(b).closest("li").addClass("ui-tabs=
-selected ui-state-active"),c.removeClass("ui-tabs-hide"),d._trigger("show"=
,null,d._ui(b,c[0]))},o=3Dk?function(a,b){b.animate(k,k.duration||"normal",=
function(){d.lis.removeClass("ui-tabs-selected ui-state-active"),b.addClass=
("ui-tabs-hide"),m(b,k),d.element.dequeue("tabs")})}:function(a,b,c){d.lis.=
removeClass("ui-tabs-selected ui-state-active"),b.addClass("ui-tabs-hide"),=
d.element.dequeue("tabs")};this.anchors.bind(e.event+".tabs",function(){var=
 b=3Dthis,c=3Da(b).closest("li"),f=3Dd.panels.filter(":not(.ui-tabs-hide)")=
,g=3Dd.element.find(d._sanitizeSelector(b.hash));if(c.hasClass("ui-tabs-sel=
ected")&&!e.collapsible||c.hasClass("ui-state-disabled")||c.hasClass("ui-st=
ate-processing")||d.panels.filter(":animated").length||d._trigger("select",=
null,d._ui(this,g[0]))=3D=3D=3D!1)return this.blur(),!1;e.selected=3Dd.anch=
ors.index(this),d.abort();if(e.collapsible){if(c.hasClass("ui-tabs-selected=
"))return e.selected=3D-1,e.cookie&&d._cookie(e.selected,e.cookie),d.elemen=
t.queue("tabs",function(){o(b,f)}).dequeue("tabs"),this.blur(),!1;if(!f.len=
gth)return e.cookie&&d._cookie(e.selected,e.cookie),d.element.queue("tabs",=
function(){n(b,g)}),d.load(d.anchors.index(this)),this.blur(),!1}e.cookie&&=
d._cookie(e.selected,e.cookie);if(g.length)f.length&&d.element.queue("tabs"=
,function(){o(b,f)}),d.element.queue("tabs",function(){n(b,g)}),d.load(d.an=
chors.index(this));else throw"jQuery UI Tabs: Mismatching fragment identifi=
er.";a.browser.msie&&this.blur()}),this.anchors.bind("click.tabs",function(=
){return!1})},_getIndex:function(a){return typeof a=3D=3D"string"&&(a=3Dthi=
s.anchors.index(this.anchors.filter("[href$=3D'"+a+"']"))),a},destroy:funct=
ion(){var b=3Dthis.options;return this.abort(),this.element.unbind(".tabs")=
.removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-col=
lapsible").removeData("tabs"),this.list.removeClass("ui-tabs-nav ui-helper-=
reset ui-helper-clearfix ui-widget-header ui-corner-all"),this.anchors.each=
(function(){var b=3Da.data(this,"href.tabs");b&&(this.href=3Db);var c=3Da(t=
his).unbind(".tabs");a.each(["href","load","cache"],function(a,b){c.removeD=
ata(b+".tabs")})}),this.lis.unbind(".tabs").add(this.panels).each(function(=
){a.data(this,"destroy.tabs")?a(this).remove():a(this).removeClass(["ui-sta=
te-default","ui-corner-top","ui-tabs-selected","ui-state-active","ui-state-=
hover","ui-state-focus","ui-state-disabled","ui-tabs-panel","ui-widget-cont=
ent","ui-corner-bottom","ui-tabs-hide"].join(" "))}),b.cookie&&this._cookie=
(null,b.cookie),this},add:function(c,d,e){e=3D=3D=3Db&&(e=3Dthis.anchors.le=
ngth);var f=3Dthis,g=3Dthis.options,h=3Da(g.tabTemplate.replace(/#\{href\}/=
g,c).replace(/#\{label\}/g,d)),i=3Dc.indexOf("#")?this._tabId(a("a",h)[0]):=
c.replace("#","");h.addClass("ui-state-default ui-corner-top").data("destro=
y.tabs",!0);var j=3Df.element.find("#"+i);return j.length||(j=3Da(g.panelTe=
mplate).attr("id",i).data("destroy.tabs",!0)),j.addClass("ui-tabs-panel ui-=
widget-content ui-corner-bottom ui-tabs-hide"),e>=3Dthis.lis.length?(h.appe=
ndTo(this.list),j.appendTo(this.list[0].parentNode)):(h.insertBefore(this.l=
is[e]),j.insertBefore(this.panels[e])),g.disabled=3Da.map(g.disabled,functi=
on(a,b){return a>=3De?++a:a}),this._tabify(),this.anchors.length=3D=3D1&&(g=
.selected=3D0,h.addClass("ui-tabs-selected ui-state-active"),j.removeClass(=
"ui-tabs-hide"),this.element.queue("tabs",function(){f._trigger("show",null=
,f._ui(f.anchors[0],f.panels[0]))}),this.load(0)),this._trigger("add",null,=
this._ui(this.anchors[e],this.panels[e])),this},remove:function(b){b=3Dthis=
._getIndex(b);var c=3Dthis.options,d=3Dthis.lis.eq(b).remove(),e=3Dthis.pan=
els.eq(b).remove();return d.hasClass("ui-tabs-selected")&&this.anchors.leng=
th>1&&this.select(b+(b+1<this.anchors.length?1:-1)),c.disabled=3Da.map(a.gr=
ep(c.disabled,function(a,c){return a!=3Db}),function(a,c){return a>=3Db?--a=
:a}),this._tabify(),this._trigger("remove",null,this._ui(d.find("a")[0],e[0=
])),this},enable:function(b){b=3Dthis._getIndex(b);var c=3Dthis.options;if(=
a.inArray(b,c.disabled)=3D=3D-1)return;return this.lis.eq(b).removeClass("u=
i-state-disabled"),c.disabled=3Da.grep(c.disabled,function(a,c){return a!=
=3Db}),this._trigger("enable",null,this._ui(this.anchors[b],this.panels[b])=
),this},disable:function(a){a=3Dthis._getIndex(a);var b=3Dthis,c=3Dthis.opt=
ions;return a!=3Dc.selected&&(this.lis.eq(a).addClass("ui-state-disabled"),=
c.disabled.push(a),c.disabled.sort(),this._trigger("disable",null,this._ui(=
this.anchors[a],this.panels[a]))),this},select:function(a){a=3Dthis._getInd=
ex(a);if(a=3D=3D-1)if(this.options.collapsible&&this.options.selected!=3D-1=
)a=3Dthis.options.selected;else return this;return this.anchors.eq(a).trigg=
er(this.options.event+".tabs"),this},load:function(b){b=3Dthis._getIndex(b)=
;var c=3Dthis,d=3Dthis.options,e=3Dthis.anchors.eq(b)[0],f=3Da.data(e,"load=
.tabs");this.abort();if(!f||this.element.queue("tabs").length!=3D=3D0&&a.da=
ta(e,"cache.tabs")){this.element.dequeue("tabs");return}this.lis.eq(b).addC=
lass("ui-state-processing");if(d.spinner){var g=3Da("span",e);g.data("label=
.tabs",g.html()).html(d.spinner)}return this.xhr=3Da.ajax(a.extend({},d.aja=
xOptions,{url:f,success:function(f,g){c.element.find(c._sanitizeSelector(e.=
hash)).html(f),c._cleanup(),d.cache&&a.data(e,"cache.tabs",!0),c._trigger("=
load",null,c._ui(c.anchors[b],c.panels[b]));try{d.ajaxOptions.success(f,g)}=
catch(h){}},error:function(a,f,g){c._cleanup(),c._trigger("load",null,c._ui=
(c.anchors[b],c.panels[b]));try{d.ajaxOptions.error(a,f,b,e)}catch(g){}}}))=
,c.element.dequeue("tabs"),this},abort:function(){return this.element.queue=
([]),this.panels.stop(!1,!0),this.element.queue("tabs",this.element.queue("=
tabs").splice(-2,2)),this.xhr&&(this.xhr.abort(),delete this.xhr),this._cle=
anup(),this},url:function(a,b){return this.anchors.eq(a).removeData("cache.=
tabs").data("load.tabs",b),this},length:function(){return this.anchors.leng=
th}}),a.extend(a.ui.tabs,{version:"1.8.23"}),a.extend(a.ui.tabs.prototype,{=
rotation:null,rotate:function(a,b){var c=3Dthis,d=3Dthis.options,e=3Dc._rot=
ate||(c._rotate=3Dfunction(b){clearTimeout(c.rotation),c.rotation=3DsetTime=
out(function(){var a=3Dd.selected;c.select(++a<c.anchors.length?a:0)},a),b&=
&b.stopPropagation()}),f=3Dc._unrotate||(c._unrotate=3Db?function(a){e()}:f=
unction(a){a.clientX&&c.rotate(null)});return a?(this.element.bind("tabssho=
w",e),this.anchors.bind(d.event+".tabs",f),e()):(clearTimeout(c.rotation),t=
his.element.unbind("tabsshow",e),this.anchors.unbind(d.event+".tabs",f),del=
ete this._rotate,delete this._unrotate),this}})})(jQuery);;/*! jQuery UI - =
v1.8.23 - 2012-08-15
 * https://github.com/jquery/jquery-ui
 * Includes: jquery.ui.datepicker.js
 * Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function($,undefined){function Datepicker(){this.debug=3D!1,this._curInst=
=3Dnull,this._keyEvent=3D!1,this._disabledInputs=3D[],this._datepickerShowi=
ng=3D!1,this._inDialog=3D!1,this._mainDivId=3D"ui-datepicker-div",this._inl=
ineClass=3D"ui-datepicker-inline",this._appendClass=3D"ui-datepicker-append=
",this._triggerClass=3D"ui-datepicker-trigger",this._dialogClass=3D"ui-date=
picker-dialog",this._disableClass=3D"ui-datepicker-disabled",this._unselect=
ableClass=3D"ui-datepicker-unselectable",this._currentClass=3D"ui-datepicke=
r-current-day",this._dayOverClass=3D"ui-datepicker-days-cell-over",this.reg=
ional=3D[],this.regional[""]=3D{closeText:"Done",prevText:"Prev",nextText:"=
Next",currentText:"Today",monthNames:["January","February","March","April",=
"May","June","July","August","September","October","November","December"],m=
onthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct"=
,"Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday",=
"Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sa=
t"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFo=
rmat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},th=
is._defaults=3D{showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate=
:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hide=
IfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,cha=
ngeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,sh=
owWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null=
,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:n=
ull,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0=
,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,s=
howButtonPanel:!1,autoSize:!1,disabled:!1},$.extend(this._defaults,this.reg=
ional[""]),this.dpDiv=3DbindHover($('<div id=3D"'+this._mainDivId+'" class=
=3D"ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-=
all"></div>'))}function bindHover(a){var b=3D"button, .ui-datepicker-prev, =
.ui-datepicker-next, .ui-datepicker-calendar td a";return a.bind("mouseout"=
,function(a){var c=3D$(a.target).closest(b);if(!c.length)return;c.removeCla=
ss("ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover")}).bi=
nd("mouseover",function(c){var d=3D$(c.target).closest(b);if($.datepicker._=
isDisabledDatepicker(instActive.inline?a.parent()[0]:instActive.input[0])||=
!d.length)return;d.parents(".ui-datepicker-calendar").find("a").removeClass=
("ui-state-hover"),d.addClass("ui-state-hover"),d.hasClass("ui-datepicker-p=
rev")&&d.addClass("ui-datepicker-prev-hover"),d.hasClass("ui-datepicker-nex=
t")&&d.addClass("ui-datepicker-next-hover")})}function extendRemove(a,b){$.=
extend(a,b);for(var c in b)if(b[c]=3D=3Dnull||b[c]=3D=3Dundefined)a[c]=3Db[=
c];return a}function isArray(a){return a&&($.browser.safari&&typeof a=3D=3D=
"object"&&a.length||a.constructor&&a.constructor.toString().match(/\Array\(=
\)/))}$.extend($.ui,{datepicker:{version:"1.8.21"}});var PROP_NAME=3D"datep=
icker",dpuuid=3D(new Date).getTime(),instActive;$.extend(Datepicker.prototy=
pe,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&co=
nsole.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpD=
iv},setDefaults:function(a){return extendRemove(this._defaults,a||{}),this}=
,_attachDatepicker:function(target,settings){var inlineSettings=3Dnull;for(=
var attrName in this._defaults){var attrValue=3Dtarget.getAttribute("date:"=
+attrName);if(attrValue){inlineSettings=3DinlineSettings||{};try{inlineSett=
ings[attrName]=3Deval(attrValue)}catch(err){inlineSettings[attrName]=3Dattr=
Value}}}var nodeName=3Dtarget.nodeName.toLowerCase(),inline=3DnodeName=3D=
=3D"div"||nodeName=3D=3D"span";target.id||(this.uuid+=3D1,target.id=3D"dp"+=
this.uuid);var inst=3Dthis._newInst($(target),inline);inst.settings=3D$.ext=
end({},settings||{},inlineSettings||{}),nodeName=3D=3D"input"?this._connect=
Datepicker(target,inst):inline&&this._inlineDatepicker(target,inst)},_newIn=
st:function(a,b){var c=3Da[0].id.replace(/([^A-Za-z0-9_-])/g,"\\\\$1");retu=
rn{id:c,input:a,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,dr=
awYear:0,inline:b,dpDiv:b?bindHover($('<div class=3D"'+this._inlineClass+' =
ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"=
></div>')):this.dpDiv}},_connectDatepicker:function(a,b){var c=3D$(a);b.app=
end=3D$([]),b.trigger=3D$([]);if(c.hasClass(this.markerClassName))return;th=
is._attachments(c,b),c.addClass(this.markerClassName).keydown(this._doKeyDo=
wn).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicke=
r",function(a,c,d){b.settings[c]=3Dd}).bind("getData.datepicker",function(a=
,c){return this._get(b,c)}),this._autoSize(b),$.data(a,PROP_NAME,b),b.setti=
ngs.disabled&&this._disableDatepicker(a)},_attachments:function(a,b){var c=
=3Dthis._get(b,"appendText"),d=3Dthis._get(b,"isRTL");b.append&&b.append.re=
move(),c&&(b.append=3D$('<span class=3D"'+this._appendClass+'">'+c+"</span>=
"),a[d?"before":"after"](b.append)),a.unbind("focus",this._showDatepicker),=
b.trigger&&b.trigger.remove();var e=3Dthis._get(b,"showOn");(e=3D=3D"focus"=
||e=3D=3D"both")&&a.focus(this._showDatepicker);if(e=3D=3D"button"||e=3D=3D=
"both"){var f=3Dthis._get(b,"buttonText"),g=3Dthis._get(b,"buttonImage");b.=
trigger=3D$(this._get(b,"buttonImageOnly")?$("<img/>").addClass(this._trigg=
erClass).attr({src:g,alt:f,title:f}):$('<button type=3D"button"></button>')=
.addClass(this._triggerClass).html(g=3D=3D""?f:$("<img/>").attr({src:g,alt:=
f,title:f}))),a[d?"before":"after"](b.trigger),b.trigger.click(function(){r=
eturn $.datepicker._datepickerShowing&&$.datepicker._lastInput=3D=3Da[0]?$.=
datepicker._hideDatepicker():$.datepicker._datepickerShowing&&$.datepicker.=
_lastInput!=3Da[0]?($.datepicker._hideDatepicker(),$.datepicker._showDatepi=
cker(a[0])):$.datepicker._showDatepicker(a[0]),!1})}},_autoSize:function(a)=
{if(this._get(a,"autoSize")&&!a.inline){var b=3Dnew Date(2009,11,20),c=3Dth=
is._get(a,"dateFormat");if(c.match(/[DM]/)){var d=3Dfunction(a){var b=3D0,c=
=3D0;for(var d=3D0;d<a.length;d++)a[d].length>b&&(b=3Da[d].length,c=3Dd);re=
turn c};b.setMonth(d(this._get(a,c.match(/MM/)?"monthNames":"monthNamesShor=
t"))),b.setDate(d(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20=
-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDat=
epicker:function(a,b){var c=3D$(a);if(c.hasClass(this.markerClassName))retu=
rn;c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicke=
r",function(a,c,d){b.settings[c]=3Dd}).bind("getData.datepicker",function(a=
,c){return this._get(b,c)}),$.data(a,PROP_NAME,b),this._setDate(b,this._get=
DefaultDate(b),!0),this._updateDatepicker(b),this._updateAlternate(b),b.set=
tings.disabled&&this._disableDatepicker(a),b.dpDiv.css("display","block")},=
_dialogDatepicker:function(a,b,c,d,e){var f=3Dthis._dialogInst;if(!f){this.=
uuid+=3D1;var g=3D"dp"+this.uuid;this._dialogInput=3D$('<input type=3D"text=
" id=3D"'+g+'" style=3D"position: absolute; top: -100px; width: 0px; z-inde=
x: -10;"/>'),this._dialogInput.keydown(this._doKeyDown),$("body").append(th=
is._dialogInput),f=3Dthis._dialogInst=3Dthis._newInst(this._dialogInput,!1)=
,f.settings=3D{},$.data(this._dialogInput[0],PROP_NAME,f)}extendRemove(f.se=
ttings,d||{}),b=3Db&&b.constructor=3D=3DDate?this._formatDate(f,b):b,this._=
dialogInput.val(b),this._pos=3De?e.length?e:[e.pageX,e.pageY]:null;if(!this=
._pos){var h=3Ddocument.documentElement.clientWidth,i=3Ddocument.documentEl=
ement.clientHeight,j=3Ddocument.documentElement.scrollLeft||document.body.s=
crollLeft,k=3Ddocument.documentElement.scrollTop||document.body.scrollTop;t=
his._pos=3D[h/2-100+j,i/2-150+k]}return this._dialogInput.css("left",this._=
pos[0]+20+"px").css("top",this._pos[1]+"px"),f.settings.onSelect=3Dc,this._=
inDialog=3D!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(t=
his._dialogInput[0]),$.blockUI&&$.blockUI(this.dpDiv),$.data(this._dialogIn=
put[0],PROP_NAME,f),this},_destroyDatepicker:function(a){var b=3D$(a),c=3D$=
.data(a,PROP_NAME);if(!b.hasClass(this.markerClassName))return;var d=3Da.no=
deName.toLowerCase();$.removeData(a,PROP_NAME),d=3D=3D"input"?(c.append.rem=
ove(),c.trigger.remove(),b.removeClass(this.markerClassName).unbind("focus"=
,this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",=
this._doKeyPress).unbind("keyup",this._doKeyUp)):(d=3D=3D"div"||d=3D=3D"spa=
n")&&b.removeClass(this.markerClassName).empty()},_enableDatepicker:functio=
n(a){var b=3D$(a),c=3D$.data(a,PROP_NAME);if(!b.hasClass(this.markerClassNa=
me))return;var d=3Da.nodeName.toLowerCase();if(d=3D=3D"input")a.disabled=3D=
!1,c.trigger.filter("button").each(function(){this.disabled=3D!1}).end().fi=
lter("img").css({opacity:"1.0",cursor:""});else if(d=3D=3D"div"||d=3D=3D"sp=
an"){var e=3Db.children("."+this._inlineClass);e.children().removeClass("ui=
-state-disabled"),e.find("select.ui-datepicker-month, select.ui-datepicker-=
year").removeAttr("disabled")}this._disabledInputs=3D$.map(this._disabledIn=
puts,function(b){return b=3D=3Da?null:b})},_disableDatepicker:function(a){v=
ar b=3D$(a),c=3D$.data(a,PROP_NAME);if(!b.hasClass(this.markerClassName))re=
turn;var d=3Da.nodeName.toLowerCase();if(d=3D=3D"input")a.disabled=3D!0,c.t=
rigger.filter("button").each(function(){this.disabled=3D!0}).end().filter("=
img").css({opacity:"0.5",cursor:"default"});else if(d=3D=3D"div"||d=3D=3D"s=
pan"){var e=3Db.children("."+this._inlineClass);e.children().addClass("ui-s=
tate-disabled"),e.find("select.ui-datepicker-month, select.ui-datepicker-ye=
ar").attr("disabled","disabled")}this._disabledInputs=3D$.map(this._disable=
dInputs,function(b){return b=3D=3Da?null:b}),this._disabledInputs[this._dis=
abledInputs.length]=3Da},_isDisabledDatepicker:function(a){if(!a)return!1;f=
or(var b=3D0;b<this._disabledInputs.length;b++)if(this._disabledInputs[b]=
=3D=3Da)return!0;return!1},_getInst:function(a){try{return $.data(a,PROP_NA=
ME)}catch(b){throw"Missing instance data for this datepicker"}},_optionDate=
picker:function(a,b,c){var d=3Dthis._getInst(a);if(arguments.length=3D=3D2&=
&typeof b=3D=3D"string")return b=3D=3D"defaults"?$.extend({},$.datepicker._=
defaults):d?b=3D=3D"all"?$.extend({},d.settings):this._get(d,b):null;var e=
=3Db||{};typeof b=3D=3D"string"&&(e=3D{},e[b]=3Dc);if(d){this._curInst=3D=
=3Dd&&this._hideDatepicker();var f=3Dthis._getDateDatepicker(a,!0),g=3Dthis=
._getMinMaxDate(d,"min"),h=3Dthis._getMinMaxDate(d,"max");extendRemove(d.se=
ttings,e),g!=3D=3Dnull&&e.dateFormat!=3D=3Dundefined&&e.minDate=3D=3D=3Dund=
efined&&(d.settings.minDate=3Dthis._formatDate(d,g)),h!=3D=3Dnull&&e.dateFo=
rmat!=3D=3Dundefined&&e.maxDate=3D=3D=3Dundefined&&(d.settings.maxDate=3Dth=
is._formatDate(d,h)),this._attachments($(a),d),this._autoSize(d),this._setD=
ate(d,f),this._updateAlternate(d),this._updateDatepicker(d)}},_changeDatepi=
cker:function(a,b,c){this._optionDatepicker(a,b,c)},_refreshDatepicker:func=
tion(a){var b=3Dthis._getInst(a);b&&this._updateDatepicker(b)},_setDateDate=
picker:function(a,b){var c=3Dthis._getInst(a);c&&(this._setDate(c,b),this._=
updateDatepicker(c),this._updateAlternate(c))},_getDateDatepicker:function(=
a,b){var c=3Dthis._getInst(a);return c&&!c.inline&&this._setDateFromField(c=
,b),c?this._getDate(c):null},_doKeyDown:function(a){var b=3D$.datepicker._g=
etInst(a.target),c=3D!0,d=3Db.dpDiv.is(".ui-datepicker-rtl");b._keyEvent=3D=
!0;if($.datepicker._datepickerShowing)switch(a.keyCode){case 9:$.datepicker=
._hideDatepicker(),c=3D!1;break;case 13:var e=3D$("td."+$.datepicker._dayOv=
erClass+":not(."+$.datepicker._currentClass+")",b.dpDiv);e[0]&&$.datepicker=
._selectDay(a.target,b.selectedMonth,b.selectedYear,e[0]);var f=3D$.datepic=
ker._get(b,"onSelect");if(f){var g=3D$.datepicker._formatDate(b);f.apply(b.=
input?b.input[0]:null,[g,b])}else $.datepicker._hideDatepicker();return!1;c=
ase 27:$.datepicker._hideDatepicker();break;case 33:$.datepicker._adjustDat=
e(a.target,a.ctrlKey?-$.datepicker._get(b,"stepBigMonths"):-$.datepicker._g=
et(b,"stepMonths"),"M");break;case 34:$.datepicker._adjustDate(a.target,a.c=
trlKey?+$.datepicker._get(b,"stepBigMonths"):+$.datepicker._get(b,"stepMont=
hs"),"M");break;case 35:(a.ctrlKey||a.metaKey)&&$.datepicker._clearDate(a.t=
arget),c=3Da.ctrlKey||a.metaKey;break;case 36:(a.ctrlKey||a.metaKey)&&$.dat=
epicker._gotoToday(a.target),c=3Da.ctrlKey||a.metaKey;break;case 37:(a.ctrl=
Key||a.metaKey)&&$.datepicker._adjustDate(a.target,d?1:-1,"D"),c=3Da.ctrlKe=
y||a.metaKey,a.originalEvent.altKey&&$.datepicker._adjustDate(a.target,a.ct=
rlKey?-$.datepicker._get(b,"stepBigMonths"):-$.datepicker._get(b,"stepMonth=
s"),"M");break;case 38:(a.ctrlKey||a.metaKey)&&$.datepicker._adjustDate(a.t=
arget,-7,"D"),c=3Da.ctrlKey||a.metaKey;break;case 39:(a.ctrlKey||a.metaKey)=
&&$.datepicker._adjustDate(a.target,d?-1:1,"D"),c=3Da.ctrlKey||a.metaKey,a.=
originalEvent.altKey&&$.datepicker._adjustDate(a.target,a.ctrlKey?+$.datepi=
cker._get(b,"stepBigMonths"):+$.datepicker._get(b,"stepMonths"),"M");break;=
case 40:(a.ctrlKey||a.metaKey)&&$.datepicker._adjustDate(a.target,7,"D"),c=
=3Da.ctrlKey||a.metaKey;break;default:c=3D!1}else a.keyCode=3D=3D36&&a.ctrl=
Key?$.datepicker._showDatepicker(this):c=3D!1;c&&(a.preventDefault(),a.stop=
Propagation())},_doKeyPress:function(a){var b=3D$.datepicker._getInst(a.tar=
get);if($.datepicker._get(b,"constrainInput")){var c=3D$.datepicker._possib=
leChars($.datepicker._get(b,"dateFormat")),d=3DString.fromCharCode(a.charCo=
de=3D=3Dundefined?a.keyCode:a.charCode);return a.ctrlKey||a.metaKey||d<" "|=
|!c||c.indexOf(d)>-1}},_doKeyUp:function(a){var b=3D$.datepicker._getInst(a=
.target);if(b.input.val()!=3Db.lastVal)try{var c=3D$.datepicker.parseDate($=
.datepicker._get(b,"dateFormat"),b.input?b.input.val():null,$.datepicker._g=
etFormatConfig(b));c&&($.datepicker._setDateFromField(b),$.datepicker._upda=
teAlternate(b),$.datepicker._updateDatepicker(b))}catch(d){$.datepicker.log=
(d)}return!0},_showDatepicker:function(a){a=3Da.target||a,a.nodeName.toLowe=
rCase()!=3D"input"&&(a=3D$("input",a.parentNode)[0]);if($.datepicker._isDis=
abledDatepicker(a)||$.datepicker._lastInput=3D=3Da)return;var b=3D$.datepic=
ker._getInst(a);$.datepicker._curInst&&$.datepicker._curInst!=3Db&&($.datep=
icker._curInst.dpDiv.stop(!0,!0),b&&$.datepicker._datepickerShowing&&$.date=
picker._hideDatepicker($.datepicker._curInst.input[0]));var c=3D$.datepicke=
r._get(b,"beforeShow"),d=3Dc?c.apply(a,[a,b]):{};if(d=3D=3D=3D!1)return;ext=
endRemove(b.settings,d),b.lastVal=3Dnull,$.datepicker._lastInput=3Da,$.date=
picker._setDateFromField(b),$.datepicker._inDialog&&(a.value=3D""),$.datepi=
cker._pos||($.datepicker._pos=3D$.datepicker._findPos(a),$.datepicker._pos[=
1]+=3Da.offsetHeight);var e=3D!1;$(a).parents().each(function(){return e|=
=3D$(this).css("position")=3D=3D"fixed",!e}),e&&$.browser.opera&&($.datepic=
ker._pos[0]-=3Ddocument.documentElement.scrollLeft,$.datepicker._pos[1]-=3D=
document.documentElement.scrollTop);var f=3D{left:$.datepicker._pos[0],top:=
$.datepicker._pos[1]};$.datepicker._pos=3Dnull,b.dpDiv.empty(),b.dpDiv.css(=
{position:"absolute",display:"block",top:"-1000px"}),$.datepicker._updateDa=
tepicker(b),f=3D$.datepicker._checkOffset(b,f,e),b.dpDiv.css({position:$.da=
tepicker._inDialog&&$.blockUI?"static":e?"fixed":"absolute",display:"none",=
left:f.left+"px",top:f.top+"px"});if(!b.inline){var g=3D$.datepicker._get(b=
,"showAnim"),h=3D$.datepicker._get(b,"duration"),i=3Dfunction(){var a=3Db.d=
pDiv.find("iframe.ui-datepicker-cover");if(!!a.length){var c=3D$.datepicker=
._getBorders(b.dpDiv);a.css({left:-c[0],top:-c[1],width:b.dpDiv.outerWidth(=
),height:b.dpDiv.outerHeight()})}};b.dpDiv.zIndex($(a).zIndex()+1),$.datepi=
cker._datepickerShowing=3D!0,$.effects&&$.effects[g]?b.dpDiv.show(g,$.datep=
icker._get(b,"showOptions"),h,i):b.dpDiv[g||"show"](g?h:null,i),(!g||!h)&&i=
(),b.input.is(":visible")&&!b.input.is(":disabled")&&b.input.focus(),$.date=
picker._curInst=3Db}},_updateDatepicker:function(a){var b=3Dthis;b.maxRows=
=3D4;var c=3D$.datepicker._getBorders(a.dpDiv);instActive=3Da,a.dpDiv.empty=
().append(this._generateHTML(a));var d=3Da.dpDiv.find("iframe.ui-datepicker=
-cover");!d.length||d.css({left:-c[0],top:-c[1],width:a.dpDiv.outerWidth(),=
height:a.dpDiv.outerHeight()}),a.dpDiv.find("."+this._dayOverClass+" a").mo=
useover();var e=3Dthis._getNumberOfMonths(a),f=3De[1],g=3D17;a.dpDiv.remove=
Class("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").=
width(""),f>1&&a.dpDiv.addClass("ui-datepicker-multi-"+f).css("width",g*f+"=
em"),a.dpDiv[(e[0]!=3D1||e[1]!=3D1?"add":"remove")+"Class"]("ui-datepicker-=
multi"),a.dpDiv[(this._get(a,"isRTL")?"add":"remove")+"Class"]("ui-datepick=
er-rtl"),a=3D=3D$.datepicker._curInst&&$.datepicker._datepickerShowing&&a.i=
nput&&a.input.is(":visible")&&!a.input.is(":disabled")&&a.input[0]!=3Ddocum=
ent.activeElement&&a.input.focus();if(a.yearshtml){var h=3Da.yearshtml;setT=
imeout(function(){h=3D=3D=3Da.yearshtml&&a.yearshtml&&a.dpDiv.find("select.=
ui-datepicker-year:first").replaceWith(a.yearshtml),h=3Da.yearshtml=3Dnull}=
,0)}},_getBorders:function(a){var b=3Dfunction(a){return{thin:1,medium:2,th=
ick:3}[a]||a};return[parseFloat(b(a.css("border-left-width"))),parseFloat(b=
(a.css("border-top-width")))]},_checkOffset:function(a,b,c){var d=3Da.dpDiv=
.outerWidth(),e=3Da.dpDiv.outerHeight(),f=3Da.input?a.input.outerWidth():0,=
g=3Da.input?a.input.outerHeight():0,h=3Ddocument.documentElement.clientWidt=
h+$(document).scrollLeft(),i=3Ddocument.documentElement.clientHeight+$(docu=
ment).scrollTop();return b.left-=3Dthis._get(a,"isRTL")?d-f:0,b.left-=3Dc&&=
b.left=3D=3Da.input.offset().left?$(document).scrollLeft():0,b.top-=3Dc&&b.=
top=3D=3Da.input.offset().top+g?$(document).scrollTop():0,b.left-=3DMath.mi=
n(b.left,b.left+d>h&&h>d?Math.abs(b.left+d-h):0),b.top-=3DMath.min(b.top,b.=
top+e>i&&i>e?Math.abs(e+g):0),b},_findPos:function(a){var b=3Dthis._getInst=
(a),c=3Dthis._get(b,"isRTL");while(a&&(a.type=3D=3D"hidden"||a.nodeType!=3D=
1||$.expr.filters.hidden(a)))a=3Da[c?"previousSibling":"nextSibling"];var d=
=3D$(a).offset();return[d.left,d.top]},_hideDatepicker:function(a){var b=3D=
this._curInst;if(!b||a&&b!=3D$.data(a,PROP_NAME))return;if(this._datepicker=
Showing){var c=3Dthis._get(b,"showAnim"),d=3Dthis._get(b,"duration"),e=3Dfu=
nction(){$.datepicker._tidyDialog(b)};$.effects&&$.effects[c]?b.dpDiv.hide(=
c,$.datepicker._get(b,"showOptions"),d,e):b.dpDiv[c=3D=3D"slideDown"?"slide=
Up":c=3D=3D"fadeIn"?"fadeOut":"hide"](c?d:null,e),c||e(),this._datepickerSh=
owing=3D!1;var f=3Dthis._get(b,"onClose");f&&f.apply(b.input?b.input[0]:nul=
l,[b.input?b.input.val():"",b]),this._lastInput=3Dnull,this._inDialog&&(thi=
s._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),$.blockUI&&=
($.unblockUI(),$("body").append(this.dpDiv))),this._inDialog=3D!1}},_tidyDi=
alog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepic=
ker-calendar")},_checkExternalClick:function(a){if(!$.datepicker._curInst)r=
eturn;var b=3D$(a.target),c=3D$.datepicker._getInst(b[0]);(b[0].id!=3D$.dat=
epicker._mainDivId&&b.parents("#"+$.datepicker._mainDivId).length=3D=3D0&&!=
b.hasClass($.datepicker.markerClassName)&&!b.closest("."+$.datepicker._trig=
gerClass).length&&$.datepicker._datepickerShowing&&(!$.datepicker._inDialog=
||!$.blockUI)||b.hasClass($.datepicker.markerClassName)&&$.datepicker._curI=
nst!=3Dc)&&$.datepicker._hideDatepicker()},_adjustDate:function(a,b,c){var =
d=3D$(a),e=3Dthis._getInst(d[0]);if(this._isDisabledDatepicker(d[0]))return=
;this._adjustInstDate(e,b+(c=3D=3D"M"?this._get(e,"showCurrentAtPos"):0),c)=
,this._updateDatepicker(e)},_gotoToday:function(a){var b=3D$(a),c=3Dthis._g=
etInst(b[0]);if(this._get(c,"gotoCurrent")&&c.currentDay)c.selectedDay=3Dc.=
currentDay,c.drawMonth=3Dc.selectedMonth=3Dc.currentMonth,c.drawYear=3Dc.se=
lectedYear=3Dc.currentYear;else{var d=3Dnew Date;c.selectedDay=3Dd.getDate(=
),c.drawMonth=3Dc.selectedMonth=3Dd.getMonth(),c.drawYear=3Dc.selectedYear=
=3Dd.getFullYear()}this._notifyChange(c),this._adjustDate(b)},_selectMonthY=
ear:function(a,b,c){var d=3D$(a),e=3Dthis._getInst(d[0]);e["selected"+(c=3D=
=3D"M"?"Month":"Year")]=3De["draw"+(c=3D=3D"M"?"Month":"Year")]=3DparseInt(=
b.options[b.selectedIndex].value,10),this._notifyChange(e),this._adjustDate=
(d)},_selectDay:function(a,b,c,d){var e=3D$(a);if($(d).hasClass(this._unsel=
ectableClass)||this._isDisabledDatepicker(e[0]))return;var f=3Dthis._getIns=
t(e[0]);f.selectedDay=3Df.currentDay=3D$("a",d).html(),f.selectedMonth=3Df.=
currentMonth=3Db,f.selectedYear=3Df.currentYear=3Dc,this._selectDate(a,this=
._formatDate(f,f.currentDay,f.currentMonth,f.currentYear))},_clearDate:func=
tion(a){var b=3D$(a),c=3Dthis._getInst(b[0]);this._selectDate(b,"")},_selec=
tDate:function(a,b){var c=3D$(a),d=3Dthis._getInst(c[0]);b=3Db!=3Dnull?b:th=
is._formatDate(d),d.input&&d.input.val(b),this._updateAlternate(d);var e=3D=
this._get(d,"onSelect");e?e.apply(d.input?d.input[0]:null,[b,d]):d.input&&d=
.input.trigger("change"),d.inline?this._updateDatepicker(d):(this._hideDate=
picker(),this._lastInput=3Dd.input[0],typeof d.input[0]!=3D"object"&&d.inpu=
t.focus(),this._lastInput=3Dnull)},_updateAlternate:function(a){var b=3Dthi=
s._get(a,"altField");if(b){var c=3Dthis._get(a,"altFormat")||this._get(a,"d=
ateFormat"),d=3Dthis._getDate(a),e=3Dthis.formatDate(c,d,this._getFormatCon=
fig(a));$(b).each(function(){$(this).val(e)})}},noWeekends:function(a){var =
b=3Da.getDay();return[b>0&&b<6,""]},iso8601Week:function(a){var b=3Dnew Dat=
e(a.getTime());b.setDate(b.getDate()+4-(b.getDay()||7));var c=3Db.getTime()=
;return b.setMonth(0),b.setDate(1),Math.floor(Math.round((c-b)/864e5)/7)+1}=
,parseDate:function(a,b,c){if(a=3D=3Dnull||b=3D=3Dnull)throw"Invalid argume=
nts";b=3Dtypeof b=3D=3D"object"?b.toString():b+"";if(b=3D=3D"")return null;=
var d=3D(c?c.shortYearCutoff:null)||this._defaults.shortYearCutoff;d=3Dtype=
of d!=3D"string"?d:(new Date).getFullYear()%100+parseInt(d,10);var e=3D(c?c=
.dayNamesShort:null)||this._defaults.dayNamesShort,f=3D(c?c.dayNames:null)|=
|this._defaults.dayNames,g=3D(c?c.monthNamesShort:null)||this._defaults.mon=
thNamesShort,h=3D(c?c.monthNames:null)||this._defaults.monthNames,i=3D-1,j=
=3D-1,k=3D-1,l=3D-1,m=3D!1,n=3Dfunction(b){var c=3Ds+1<a.length&&a.charAt(s=
+1)=3D=3Db;return c&&s++,c},o=3Dfunction(a){var c=3Dn(a),d=3Da=3D=3D"@"?14:=
a=3D=3D"!"?20:a=3D=3D"y"&&c?4:a=3D=3D"o"?3:2,e=3Dnew RegExp("^\\d{1,"+d+"}"=
),f=3Db.substring(r).match(e);if(!f)throw"Missing number at position "+r;re=
turn r+=3Df[0].length,parseInt(f[0],10)},p=3Dfunction(a,c,d){var e=3D$.map(=
n(a)?d:c,function(a,b){return[[b,a]]}).sort(function(a,b){return-(a[1].leng=
th-b[1].length)}),f=3D-1;$.each(e,function(a,c){var d=3Dc[1];if(b.substr(r,=
d.length).toLowerCase()=3D=3Dd.toLowerCase())return f=3Dc[0],r+=3Dd.length,=
!1});if(f!=3D-1)return f+1;throw"Unknown name at position "+r},q=3Dfunction=
(){if(b.charAt(r)!=3Da.charAt(s))throw"Unexpected literal at position "+r;r=
++},r=3D0;for(var s=3D0;s<a.length;s++)if(m)a.charAt(s)=3D=3D"'"&&!n("'")?m=
=3D!1:q();else switch(a.charAt(s)){case"d":k=3Do("d");break;case"D":p("D",e=
,f);break;case"o":l=3Do("o");break;case"m":j=3Do("m");break;case"M":j=3Dp("=
M",g,h);break;case"y":i=3Do("y");break;case"@":var t=3Dnew Date(o("@"));i=
=3Dt.getFullYear(),j=3Dt.getMonth()+1,k=3Dt.getDate();break;case"!":var t=
=3Dnew Date((o("!")-this._ticksTo1970)/1e4);i=3Dt.getFullYear(),j=3Dt.getMo=
nth()+1,k=3Dt.getDate();break;case"'":n("'")?q():m=3D!0;break;default:q()}i=
f(r<b.length)throw"Extra/unparsed characters found in date: "+b.substring(r=
);i=3D=3D-1?i=3D(new Date).getFullYear():i<100&&(i+=3D(new Date).getFullYea=
r()-(new Date).getFullYear()%100+(i<=3Dd?0:-100));if(l>-1){j=3D1,k=3Dl;do{v=
ar u=3Dthis._getDaysInMonth(i,j-1);if(k<=3Du)break;j++,k-=3Du}while(!0)}var=
 t=3Dthis._daylightSavingAdjust(new Date(i,j-1,k));if(t.getFullYear()!=3Di|=
|t.getMonth()+1!=3Dj||t.getDate()!=3Dk)throw"Invalid date";return t},ATOM:"=
yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_85=
0:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy=
",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(71868=
5+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1e7,format=
Date:function(a,b,c){if(!b)return"";var d=3D(c?c.dayNamesShort:null)||this.=
_defaults.dayNamesShort,e=3D(c?c.dayNames:null)||this._defaults.dayNames,f=
=3D(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,g=3D(c?c.mont=
hNames:null)||this._defaults.monthNames,h=3Dfunction(b){var c=3Dm+1<a.lengt=
h&&a.charAt(m+1)=3D=3Db;return c&&m++,c},i=3Dfunction(a,b,c){var d=3D""+b;i=
f(h(a))while(d.length<c)d=3D"0"+d;return d},j=3Dfunction(a,b,c,d){return h(=
a)?d[b]:c[b]},k=3D"",l=3D!1;if(b)for(var m=3D0;m<a.length;m++)if(l)a.charAt=
(m)=3D=3D"'"&&!h("'")?l=3D!1:k+=3Da.charAt(m);else switch(a.charAt(m)){case=
"d":k+=3Di("d",b.getDate(),2);break;case"D":k+=3Dj("D",b.getDay(),d,e);brea=
k;case"o":k+=3Di("o",Math.round(((new Date(b.getFullYear(),b.getMonth(),b.g=
etDate())).getTime()-(new Date(b.getFullYear(),0,0)).getTime())/864e5),3);b=
reak;case"m":k+=3Di("m",b.getMonth()+1,2);break;case"M":k+=3Dj("M",b.getMon=
th(),f,g);break;case"y":k+=3Dh("y")?b.getFullYear():(b.getYear()%100<10?"0"=
:"")+b.getYear()%100;break;case"@":k+=3Db.getTime();break;case"!":k+=3Db.ge=
tTime()*1e4+this._ticksTo1970;break;case"'":h("'")?k+=3D"'":l=3D!0;break;de=
fault:k+=3Da.charAt(m)}return k},_possibleChars:function(a){var b=3D"",c=3D=
!1,d=3Dfunction(b){var c=3De+1<a.length&&a.charAt(e+1)=3D=3Db;return c&&e++=
,c};for(var e=3D0;e<a.length;e++)if(c)a.charAt(e)=3D=3D"'"&&!d("'")?c=3D!1:=
b+=3Da.charAt(e);else switch(a.charAt(e)){case"d":case"m":case"y":case"@":b=
+=3D"0123456789";break;case"D":case"M":return null;case"'":d("'")?b+=3D"'":=
c=3D!0;break;default:b+=3Da.charAt(e)}return b},_get:function(a,b){return a=
.settings[b]!=3D=3Dundefined?a.settings[b]:this._defaults[b]},_setDateFromF=
ield:function(a,b){if(a.input.val()=3D=3Da.lastVal)return;var c=3Dthis._get=
(a,"dateFormat"),d=3Da.lastVal=3Da.input?a.input.val():null,e,f;e=3Df=3Dthi=
s._getDefaultDate(a);var g=3Dthis._getFormatConfig(a);try{e=3Dthis.parseDat=
e(c,d,g)||f}catch(h){this.log(h),d=3Db?"":d}a.selectedDay=3De.getDate(),a.d=
rawMonth=3Da.selectedMonth=3De.getMonth(),a.drawYear=3Da.selectedYear=3De.g=
etFullYear(),a.currentDay=3Dd?e.getDate():0,a.currentMonth=3Dd?e.getMonth()=
:0,a.currentYear=3Dd?e.getFullYear():0,this._adjustInstDate(a)},_getDefault=
Date:function(a){return this._restrictMinMax(a,this._determineDate(a,this._=
get(a,"defaultDate"),new Date))},_determineDate:function(a,b,c){var d=3Dfun=
ction(a){var b=3Dnew Date;return b.setDate(b.getDate()+a),b},e=3Dfunction(b=
){try{return $.datepicker.parseDate($.datepicker._get(a,"dateFormat"),b,$.d=
atepicker._getFormatConfig(a))}catch(c){}var d=3D(b.toLowerCase().match(/^c=
/)?$.datepicker._getDate(a):null)||new Date,e=3Dd.getFullYear(),f=3Dd.getMo=
nth(),g=3Dd.getDate(),h=3D/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,i=3Dh.exec(=
b);while(i){switch(i[2]||"d"){case"d":case"D":g+=3DparseInt(i[1],10);break;=
case"w":case"W":g+=3DparseInt(i[1],10)*7;break;case"m":case"M":f+=3DparseIn=
t(i[1],10),g=3DMath.min(g,$.datepicker._getDaysInMonth(e,f));break;case"y":=
case"Y":e+=3DparseInt(i[1],10),g=3DMath.min(g,$.datepicker._getDaysInMonth(=
e,f))}i=3Dh.exec(b)}return new Date(e,f,g)},f=3Db=3D=3Dnull||b=3D=3D=3D""?c=
:typeof b=3D=3D"string"?e(b):typeof b=3D=3D"number"?isNaN(b)?c:d(b):new Dat=
e(b.getTime());return f=3Df&&f.toString()=3D=3D"Invalid Date"?c:f,f&&(f.set=
Hours(0),f.setMinutes(0),f.setSeconds(0),f.setMilliseconds(0)),this._daylig=
htSavingAdjust(f)},_daylightSavingAdjust:function(a){return a?(a.setHours(a=
.getHours()>12?a.getHours()+2:0),a):null},_setDate:function(a,b,c){var d=3D=
!b,e=3Da.selectedMonth,f=3Da.selectedYear,g=3Dthis._restrictMinMax(a,this._=
determineDate(a,b,new Date));a.selectedDay=3Da.currentDay=3Dg.getDate(),a.d=
rawMonth=3Da.selectedMonth=3Da.currentMonth=3Dg.getMonth(),a.drawYear=3Da.s=
electedYear=3Da.currentYear=3Dg.getFullYear(),(e!=3Da.selectedMonth||f!=3Da=
.selectedYear)&&!c&&this._notifyChange(a),this._adjustInstDate(a),a.input&&=
a.input.val(d?"":this._formatDate(a))},_getDate:function(a){var b=3D!a.curr=
entYear||a.input&&a.input.val()=3D=3D""?null:this._daylightSavingAdjust(new=
 Date(a.currentYear,a.currentMonth,a.currentDay));return b},_generateHTML:f=
unction(a){var b=3Dnew Date;b=3Dthis._daylightSavingAdjust(new Date(b.getFu=
llYear(),b.getMonth(),b.getDate()));var c=3Dthis._get(a,"isRTL"),d=3Dthis._=
get(a,"showButtonPanel"),e=3Dthis._get(a,"hideIfNoPrevNext"),f=3Dthis._get(=
a,"navigationAsDateFormat"),g=3Dthis._getNumberOfMonths(a),h=3Dthis._get(a,=
"showCurrentAtPos"),i=3Dthis._get(a,"stepMonths"),j=3Dg[0]!=3D1||g[1]!=3D1,=
k=3Dthis._daylightSavingAdjust(a.currentDay?new Date(a.currentYear,a.curren=
tMonth,a.currentDay):new Date(9999,9,9)),l=3Dthis._getMinMaxDate(a,"min"),m=
=3Dthis._getMinMaxDate(a,"max"),n=3Da.drawMonth-h,o=3Da.drawYear;n<0&&(n+=
=3D12,o--);if(m){var p=3Dthis._daylightSavingAdjust(new Date(m.getFullYear(=
),m.getMonth()-g[0]*g[1]+1,m.getDate()));p=3Dl&&p<l?l:p;while(this._dayligh=
tSavingAdjust(new Date(o,n,1))>p)n--,n<0&&(n=3D11,o--)}a.drawMonth=3Dn,a.dr=
awYear=3Do;var q=3Dthis._get(a,"prevText");q=3Df?this.formatDate(q,this._da=
ylightSavingAdjust(new Date(o,n-i,1)),this._getFormatConfig(a)):q;var r=3Dt=
his._canAdjustMonth(a,-1,o,n)?'<a class=3D"ui-datepicker-prev ui-corner-all=
" onclick=3D"DP_jQuery_'+dpuuid+".datepicker._adjustDate('#"+a.id+"', -"+i+=
", 'M');\""+' title=3D"'+q+'"><span class=3D"ui-icon ui-icon-circle-triangl=
e-'+(c?"e":"w")+'">'+q+"</span></a>":e?"":'<a class=3D"ui-datepicker-prev u=
i-corner-all ui-state-disabled" title=3D"'+q+'"><span class=3D"ui-icon ui-i=
con-circle-triangle-'+(c?"e":"w")+'">'+q+"</span></a>",s=3Dthis._get(a,"nex=
tText");s=3Df?this.formatDate(s,this._daylightSavingAdjust(new Date(o,n+i,1=
)),this._getFormatConfig(a)):s;var t=3Dthis._canAdjustMonth(a,1,o,n)?'<a cl=
ass=3D"ui-datepicker-next ui-corner-all" onclick=3D"DP_jQuery_'+dpuuid+".da=
tepicker._adjustDate('#"+a.id+"', +"+i+", 'M');\""+' title=3D"'+s+'"><span =
class=3D"ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</span></a>"=
:e?"":'<a class=3D"ui-datepicker-next ui-corner-all ui-state-disabled" titl=
e=3D"'+s+'"><span class=3D"ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'"=
>'+s+"</span></a>",u=3Dthis._get(a,"currentText"),v=3Dthis._get(a,"gotoCurr=
ent")&&a.currentDay?k:b;u=3Df?this.formatDate(u,v,this._getFormatConfig(a))=
:u;var w=3Da.inline?"":'<button type=3D"button" class=3D"ui-datepicker-clos=
e ui-state-default ui-priority-primary ui-corner-all" onclick=3D"DP_jQuery_=
'+dpuuid+'.datepicker._hideDatepicker();">'+this._get(a,"closeText")+"</but=
ton>",x=3Dd?'<div class=3D"ui-datepicker-buttonpane ui-widget-content">'+(c=
?w:"")+(this._isInRange(a,v)?'<button type=3D"button" class=3D"ui-datepicke=
r-current ui-state-default ui-priority-secondary ui-corner-all" onclick=3D"=
DP_jQuery_'+dpuuid+".datepicker._gotoToday('#"+a.id+"');\""+">"+u+"</button=
>":"")+(c?"":w)+"</div>":"",y=3DparseInt(this._get(a,"firstDay"),10);y=3Dis=
NaN(y)?0:y;var z=3Dthis._get(a,"showWeek"),A=3Dthis._get(a,"dayNames"),B=3D=
this._get(a,"dayNamesShort"),C=3Dthis._get(a,"dayNamesMin"),D=3Dthis._get(a=
,"monthNames"),E=3Dthis._get(a,"monthNamesShort"),F=3Dthis._get(a,"beforeSh=
owDay"),G=3Dthis._get(a,"showOtherMonths"),H=3Dthis._get(a,"selectOtherMont=
hs"),I=3Dthis._get(a,"calculateWeek")||this.iso8601Week,J=3Dthis._getDefaul=
tDate(a),K=3D"";for(var L=3D0;L<g[0];L++){var M=3D"";this.maxRows=3D4;for(v=
ar N=3D0;N<g[1];N++){var O=3Dthis._daylightSavingAdjust(new Date(o,n,a.sele=
ctedDay)),P=3D" ui-corner-all",Q=3D"";if(j){Q+=3D'<div class=3D"ui-datepick=
er-group';if(g[1]>1)switch(N){case 0:Q+=3D" ui-datepicker-group-first",P=3D=
" ui-corner-"+(c?"right":"left");break;case g[1]-1:Q+=3D" ui-datepicker-gro=
up-last",P=3D" ui-corner-"+(c?"left":"right");break;default:Q+=3D" ui-datep=
icker-group-middle",P=3D""}Q+=3D'">'}Q+=3D'<div class=3D"ui-datepicker-head=
er ui-widget-header ui-helper-clearfix'+P+'">'+(/all|left/.test(P)&&L=3D=3D=
0?c?t:r:"")+(/all|right/.test(P)&&L=3D=3D0?c?r:t:"")+this._generateMonthYea=
rHeader(a,n,o,l,m,L>0||N>0,D,E)+'</div><table class=3D"ui-datepicker-calend=
ar"><thead>'+"<tr>";var R=3Dz?'<th class=3D"ui-datepicker-week-col">'+this.=
_get(a,"weekHeader")+"</th>":"";for(var S=3D0;S<7;S++){var T=3D(S+y)%7;R+=
=3D"<th"+((S+y+6)%7>=3D5?' class=3D"ui-datepicker-week-end"':"")+">"+'<span=
 title=3D"'+A[T]+'">'+C[T]+"</span></th>"}Q+=3DR+"</tr></thead><tbody>";var=
 U=3Dthis._getDaysInMonth(o,n);o=3D=3Da.selectedYear&&n=3D=3Da.selectedMont=
h&&(a.selectedDay=3DMath.min(a.selectedDay,U));var V=3D(this._getFirstDayOf=
Month(o,n)-y+7)%7,W=3DMath.ceil((V+U)/7),X=3Dj?this.maxRows>W?this.maxRows:=
W:W;this.maxRows=3DX;var Y=3Dthis._daylightSavingAdjust(new Date(o,n,1-V));=
for(var Z=3D0;Z<X;Z++){Q+=3D"<tr>";var _=3Dz?'<td class=3D"ui-datepicker-we=
ek-col">'+this._get(a,"calculateWeek")(Y)+"</td>":"";for(var S=3D0;S<7;S++)=
{var ba=3DF?F.apply(a.input?a.input[0]:null,[Y]):[!0,""],bb=3DY.getMonth()!=
=3Dn,bc=3Dbb&&!H||!ba[0]||l&&Y<l||m&&Y>m;_+=3D'<td class=3D"'+((S+y+6)%7>=
=3D5?" ui-datepicker-week-end":"")+(bb?" ui-datepicker-other-month":"")+(Y.=
getTime()=3D=3DO.getTime()&&n=3D=3Da.selectedMonth&&a._keyEvent||J.getTime(=
)=3D=3DY.getTime()&&J.getTime()=3D=3DO.getTime()?" "+this._dayOverClass:"")=
+(bc?" "+this._unselectableClass+" ui-state-disabled":"")+(bb&&!G?"":" "+ba=
[1]+(Y.getTime()=3D=3Dk.getTime()?" "+this._currentClass:"")+(Y.getTime()=
=3D=3Db.getTime()?" ui-datepicker-today":""))+'"'+((!bb||G)&&ba[2]?' title=
=3D"'+ba[2]+'"':"")+(bc?"":' onclick=3D"DP_jQuery_'+dpuuid+".datepicker._se=
lectDay('#"+a.id+"',"+Y.getMonth()+","+Y.getFullYear()+', this);return fals=
e;"')+">"+(bb&&!G?"&#xa0;":bc?'<span class=3D"ui-state-default">'+Y.getDate=
()+"</span>":'<a class=3D"ui-state-default'+(Y.getTime()=3D=3Db.getTime()?"=
 ui-state-highlight":"")+(Y.getTime()=3D=3Dk.getTime()?" ui-state-active":"=
")+(bb?" ui-priority-secondary":"")+'" href=3D"#">'+Y.getDate()+"</a>")+"</=
td>",Y.setDate(Y.getDate()+1),Y=3Dthis._daylightSavingAdjust(Y)}Q+=3D_+"</t=
r>"}n++,n>11&&(n=3D0,o++),Q+=3D"</tbody></table>"+(j?"</div>"+(g[0]>0&&N=3D=
=3Dg[1]-1?'<div class=3D"ui-datepicker-row-break"></div>':""):""),M+=3DQ}K+=
=3DM}return K+=3Dx+($.browser.msie&&parseInt($.browser.version,10)<7&&!a.in=
line?'<iframe src=3D"javascript:false;" class=3D"ui-datepicker-cover" frame=
border=3D"0"></iframe>':""),a._keyEvent=3D!1,K},_generateMonthYearHeader:fu=
nction(a,b,c,d,e,f,g,h){var i=3Dthis._get(a,"changeMonth"),j=3Dthis._get(a,=
"changeYear"),k=3Dthis._get(a,"showMonthAfterYear"),l=3D'<div class=3D"ui-d=
atepicker-title">',m=3D"";if(f||!i)m+=3D'<span class=3D"ui-datepicker-month=
">'+g[b]+"</span>";else{var n=3Dd&&d.getFullYear()=3D=3Dc,o=3De&&e.getFullY=
ear()=3D=3Dc;m+=3D'<select class=3D"ui-datepicker-month" onchange=3D"DP_jQu=
ery_'+dpuuid+".datepicker._selectMonthYear('#"+a.id+"', this, 'M');\" "+">"=
;for(var p=3D0;p<12;p++)(!n||p>=3Dd.getMonth())&&(!o||p<=3De.getMonth())&&(=
m+=3D'<option value=3D"'+p+'"'+(p=3D=3Db?' selected=3D"selected"':"")+">"+h=
[p]+"</option>");m+=3D"</select>"}k||(l+=3Dm+(f||!i||!j?"&#xa0;":""));if(!a=
.yearshtml){a.yearshtml=3D"";if(f||!j)l+=3D'<span class=3D"ui-datepicker-ye=
ar">'+c+"</span>";else{var q=3Dthis._get(a,"yearRange").split(":"),r=3D(new=
 Date).getFullYear(),s=3Dfunction(a){var b=3Da.match(/c[+-].*/)?c+parseInt(=
a.substring(1),10):a.match(/[+-].*/)?r+parseInt(a,10):parseInt(a,10);return=
 isNaN(b)?r:b},t=3Ds(q[0]),u=3DMath.max(t,s(q[1]||""));t=3Dd?Math.max(t,d.g=
etFullYear()):t,u=3De?Math.min(u,e.getFullYear()):u,a.yearshtml+=3D'<select=
 class=3D"ui-datepicker-year" onchange=3D"DP_jQuery_'+dpuuid+".datepicker._=
selectMonthYear('#"+a.id+"', this, 'Y');\" "+">";for(;t<=3Du;t++)a.yearshtm=
l+=3D'<option value=3D"'+t+'"'+(t=3D=3Dc?' selected=3D"selected"':"")+">"+t=
+"</option>";a.yearshtml+=3D"</select>",l+=3Da.yearshtml,a.yearshtml=3Dnull=
}}return l+=3Dthis._get(a,"yearSuffix"),k&&(l+=3D(f||!i||!j?"&#xa0;":"")+m)=
,l+=3D"</div>",l},_adjustInstDate:function(a,b,c){var d=3Da.drawYear+(c=3D=
=3D"Y"?b:0),e=3Da.drawMonth+(c=3D=3D"M"?b:0),f=3DMath.min(a.selectedDay,thi=
s._getDaysInMonth(d,e))+(c=3D=3D"D"?b:0),g=3Dthis._restrictMinMax(a,this._d=
aylightSavingAdjust(new Date(d,e,f)));a.selectedDay=3Dg.getDate(),a.drawMon=
th=3Da.selectedMonth=3Dg.getMonth(),a.drawYear=3Da.selectedYear=3Dg.getFull=
Year(),(c=3D=3D"M"||c=3D=3D"Y")&&this._notifyChange(a)},_restrictMinMax:fun=
ction(a,b){var c=3Dthis._getMinMaxDate(a,"min"),d=3Dthis._getMinMaxDate(a,"=
max"),e=3Dc&&b<c?c:b;return e=3Dd&&e>d?d:e,e},_notifyChange:function(a){var=
 b=3Dthis._get(a,"onChangeMonthYear");b&&b.apply(a.input?a.input[0]:null,[a=
.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){var b=
=3Dthis._get(a,"numberOfMonths");return b=3D=3Dnull?[1,1]:typeof b=3D=3D"nu=
mber"?[1,b]:b},_getMinMaxDate:function(a,b){return this._determineDate(a,th=
is._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-this._da=
ylightSavingAdjust(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:functio=
n(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,d){=
var e=3Dthis._getNumberOfMonths(a),f=3Dthis._daylightSavingAdjust(new Date(=
c,d+(b<0?b:e[0]*e[1]),1));return b<0&&f.setDate(this._getDaysInMonth(f.getF=
ullYear(),f.getMonth())),this._isInRange(a,f)},_isInRange:function(a,b){var=
 c=3Dthis._getMinMaxDate(a,"min"),d=3Dthis._getMinMaxDate(a,"max");return(!=
c||b.getTime()>=3Dc.getTime())&&(!d||b.getTime()<=3Dd.getTime())},_getForma=
tConfig:function(a){var b=3Dthis._get(a,"shortYearCutoff");return b=3Dtypeo=
f b!=3D"string"?b:(new Date).getFullYear()%100+parseInt(b,10),{shortYearCut=
off:b,dayNamesShort:this._get(a,"dayNamesShort"),dayNames:this._get(a,"dayN=
ames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(=
a,"monthNames")}},_formatDate:function(a,b,c,d){b||(a.currentDay=3Da.select=
edDay,a.currentMonth=3Da.selectedMonth,a.currentYear=3Da.selectedYear);var =
e=3Db?typeof b=3D=3D"object"?b:this._daylightSavingAdjust(new Date(d,c,b)):=
this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentD=
ay));return this.formatDate(this._get(a,"dateFormat"),e,this._getFormatConf=
ig(a))}}),$.fn.datepicker=3Dfunction(a){if(!this.length)return this;$.datep=
icker.initialized||($(document).mousedown($.datepicker._checkExternalClick)=
.find("body").append($.datepicker.dpDiv),$.datepicker.initialized=3D!0);var=
 b=3DArray.prototype.slice.call(arguments,1);return typeof a!=3D"string"||a=
!=3D"isDisabled"&&a!=3D"getDate"&&a!=3D"widget"?a=3D=3D"option"&&arguments.=
length=3D=3D2&&typeof arguments[1]=3D=3D"string"?$.datepicker["_"+a+"Datepi=
cker"].apply($.datepicker,[this[0]].concat(b)):this.each(function(){typeof =
a=3D=3D"string"?$.datepicker["_"+a+"Datepicker"].apply($.datepicker,[this].=
concat(b)):$.datepicker._attachDatepicker(this,a)}):$.datepicker["_"+a+"Dat=
epicker"].apply($.datepicker,[this[0]].concat(b))},$.datepicker=3Dnew Datep=
icker,$.datepicker.initialized=3D!1,$.datepicker.uuid=3D(new Date).getTime(=
),$.datepicker.version=3D"1.8.21",window["DP_jQuery_"+dpuuid]=3D$})(jQuery)=
;;
\ No newline at end of file
+(function($,undefined){function Datepicker(){this.debug=3D!1,this._curInst=
=3Dnull,this._keyEvent=3D!1,this._disabledInputs=3D[],this._datepickerShowi=
ng=3D!1,this._inDialog=3D!1,this._mainDivId=3D"ui-datepicker-div",this._inl=
ineClass=3D"ui-datepicker-inline",this._appendClass=3D"ui-datepicker-append=
",this._triggerClass=3D"ui-datepicker-trigger",this._dialogClass=3D"ui-date=
picker-dialog",this._disableClass=3D"ui-datepicker-disabled",this._unselect=
ableClass=3D"ui-datepicker-unselectable",this._currentClass=3D"ui-datepicke=
r-current-day",this._dayOverClass=3D"ui-datepicker-days-cell-over",this.reg=
ional=3D[],this.regional[""]=3D{closeText:"Done",prevText:"Prev",nextText:"=
Next",currentText:"Today",monthNames:["January","February","March","April",=
"May","June","July","August","September","October","November","December"],m=
onthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct"=
,"Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday",=
"Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sa=
t"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFo=
rmat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},th=
is._defaults=3D{showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate=
:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hide=
IfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,cha=
ngeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,sh=
owWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null=
,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:n=
ull,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0=
,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,s=
howButtonPanel:!1,autoSize:!1,disabled:!1},$.extend(this._defaults,this.reg=
ional[""]),this.dpDiv=3DbindHover($('<div id=3D"'+this._mainDivId+'" class=
=3D"ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-=
all"></div>'))}function bindHover(a){var b=3D"button, .ui-datepicker-prev, =
.ui-datepicker-next, .ui-datepicker-calendar td a";return a.bind("mouseout"=
,function(a){var c=3D$(a.target).closest(b);if(!c.length)return;c.removeCla=
ss("ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover")}).bi=
nd("mouseover",function(c){var d=3D$(c.target).closest(b);if($.datepicker._=
isDisabledDatepicker(instActive.inline?a.parent()[0]:instActive.input[0])||=
!d.length)return;d.parents(".ui-datepicker-calendar").find("a").removeClass=
("ui-state-hover"),d.addClass("ui-state-hover"),d.hasClass("ui-datepicker-p=
rev")&&d.addClass("ui-datepicker-prev-hover"),d.hasClass("ui-datepicker-nex=
t")&&d.addClass("ui-datepicker-next-hover")})}function extendRemove(a,b){$.=
extend(a,b);for(var c in b)if(b[c]=3D=3Dnull||b[c]=3D=3Dundefined)a[c]=3Db[=
c];return a}function isArray(a){return a&&($.browser.safari&&typeof a=3D=3D=
"object"&&a.length||a.constructor&&a.constructor.toString().match(/\Array\(=
\)/))}$.extend($.ui,{datepicker:{version:"1.8.23"}});var PROP_NAME=3D"datep=
icker",dpuuid=3D(new Date).getTime(),instActive;$.extend(Datepicker.prototy=
pe,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&co=
nsole.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpD=
iv},setDefaults:function(a){return extendRemove(this._defaults,a||{}),this}=
,_attachDatepicker:function(target,settings){var inlineSettings=3Dnull;for(=
var attrName in this._defaults){var attrValue=3Dtarget.getAttribute("date:"=
+attrName);if(attrValue){inlineSettings=3DinlineSettings||{};try{inlineSett=
ings[attrName]=3Deval(attrValue)}catch(err){inlineSettings[attrName]=3Dattr=
Value}}}var nodeName=3Dtarget.nodeName.toLowerCase(),inline=3DnodeName=3D=
=3D"div"||nodeName=3D=3D"span";target.id||(this.uuid+=3D1,target.id=3D"dp"+=
this.uuid);var inst=3Dthis._newInst($(target),inline);inst.settings=3D$.ext=
end({},settings||{},inlineSettings||{}),nodeName=3D=3D"input"?this._connect=
Datepicker(target,inst):inline&&this._inlineDatepicker(target,inst)},_newIn=
st:function(a,b){var c=3Da[0].id.replace(/([^A-Za-z0-9_-])/g,"\\\\$1");retu=
rn{id:c,input:a,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,dr=
awYear:0,inline:b,dpDiv:b?bindHover($('<div class=3D"'+this._inlineClass+' =
ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"=
></div>')):this.dpDiv}},_connectDatepicker:function(a,b){var c=3D$(a);b.app=
end=3D$([]),b.trigger=3D$([]);if(c.hasClass(this.markerClassName))return;th=
is._attachments(c,b),c.addClass(this.markerClassName).keydown(this._doKeyDo=
wn).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicke=
r",function(a,c,d){b.settings[c]=3Dd}).bind("getData.datepicker",function(a=
,c){return this._get(b,c)}),this._autoSize(b),$.data(a,PROP_NAME,b),b.setti=
ngs.disabled&&this._disableDatepicker(a)},_attachments:function(a,b){var c=
=3Dthis._get(b,"appendText"),d=3Dthis._get(b,"isRTL");b.append&&b.append.re=
move(),c&&(b.append=3D$('<span class=3D"'+this._appendClass+'">'+c+"</span>=
"),a[d?"before":"after"](b.append)),a.unbind("focus",this._showDatepicker),=
b.trigger&&b.trigger.remove();var e=3Dthis._get(b,"showOn");(e=3D=3D"focus"=
||e=3D=3D"both")&&a.focus(this._showDatepicker);if(e=3D=3D"button"||e=3D=3D=
"both"){var f=3Dthis._get(b,"buttonText"),g=3Dthis._get(b,"buttonImage");b.=
trigger=3D$(this._get(b,"buttonImageOnly")?$("<img/>").addClass(this._trigg=
erClass).attr({src:g,alt:f,title:f}):$('<button type=3D"button"></button>')=
.addClass(this._triggerClass).html(g=3D=3D""?f:$("<img/>").attr({src:g,alt:=
f,title:f}))),a[d?"before":"after"](b.trigger),b.trigger.click(function(){r=
eturn $.datepicker._datepickerShowing&&$.datepicker._lastInput=3D=3Da[0]?$.=
datepicker._hideDatepicker():$.datepicker._datepickerShowing&&$.datepicker.=
_lastInput!=3Da[0]?($.datepicker._hideDatepicker(),$.datepicker._showDatepi=
cker(a[0])):$.datepicker._showDatepicker(a[0]),!1})}},_autoSize:function(a)=
{if(this._get(a,"autoSize")&&!a.inline){var b=3Dnew Date(2009,11,20),c=3Dth=
is._get(a,"dateFormat");if(c.match(/[DM]/)){var d=3Dfunction(a){var b=3D0,c=
=3D0;for(var d=3D0;d<a.length;d++)a[d].length>b&&(b=3Da[d].length,c=3Dd);re=
turn c};b.setMonth(d(this._get(a,c.match(/MM/)?"monthNames":"monthNamesShor=
t"))),b.setDate(d(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20=
-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDat=
epicker:function(a,b){var c=3D$(a);if(c.hasClass(this.markerClassName))retu=
rn;c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicke=
r",function(a,c,d){b.settings[c]=3Dd}).bind("getData.datepicker",function(a=
,c){return this._get(b,c)}),$.data(a,PROP_NAME,b),this._setDate(b,this._get=
DefaultDate(b),!0),this._updateDatepicker(b),this._updateAlternate(b),b.set=
tings.disabled&&this._disableDatepicker(a),b.dpDiv.css("display","block")},=
_dialogDatepicker:function(a,b,c,d,e){var f=3Dthis._dialogInst;if(!f){this.=
uuid+=3D1;var g=3D"dp"+this.uuid;this._dialogInput=3D$('<input type=3D"text=
" id=3D"'+g+'" style=3D"position: absolute; top: -100px; width: 0px;"/>'),t=
his._dialogInput.keydown(this._doKeyDown),$("body").append(this._dialogInpu=
t),f=3Dthis._dialogInst=3Dthis._newInst(this._dialogInput,!1),f.settings=3D=
{},$.data(this._dialogInput[0],PROP_NAME,f)}extendRemove(f.settings,d||{}),=
b=3Db&&b.constructor=3D=3DDate?this._formatDate(f,b):b,this._dialogInput.va=
l(b),this._pos=3De?e.length?e:[e.pageX,e.pageY]:null;if(!this._pos){var h=
=3Ddocument.documentElement.clientWidth,i=3Ddocument.documentElement.client=
Height,j=3Ddocument.documentElement.scrollLeft||document.body.scrollLeft,k=
=3Ddocument.documentElement.scrollTop||document.body.scrollTop;this._pos=3D=
[h/2-100+j,i/2-150+k]}return this._dialogInput.css("left",this._pos[0]+20+"=
px").css("top",this._pos[1]+"px"),f.settings.onSelect=3Dc,this._inDialog=3D=
!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialog=
Input[0]),$.blockUI&&$.blockUI(this.dpDiv),$.data(this._dialogInput[0],PROP=
_NAME,f),this},_destroyDatepicker:function(a){var b=3D$(a),c=3D$.data(a,PRO=
P_NAME);if(!b.hasClass(this.markerClassName))return;var d=3Da.nodeName.toLo=
werCase();$.removeData(a,PROP_NAME),d=3D=3D"input"?(c.append.remove(),c.tri=
gger.remove(),b.removeClass(this.markerClassName).unbind("focus",this._show=
Datepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKey=
Press).unbind("keyup",this._doKeyUp)):(d=3D=3D"div"||d=3D=3D"span")&&b.remo=
veClass(this.markerClassName).empty()},_enableDatepicker:function(a){var b=
=3D$(a),c=3D$.data(a,PROP_NAME);if(!b.hasClass(this.markerClassName))return=
;var d=3Da.nodeName.toLowerCase();if(d=3D=3D"input")a.disabled=3D!1,c.trigg=
er.filter("button").each(function(){this.disabled=3D!1}).end().filter("img"=
).css({opacity:"1.0",cursor:""});else if(d=3D=3D"div"||d=3D=3D"span"){var e=
=3Db.children("."+this._inlineClass);e.children().removeClass("ui-state-dis=
abled"),e.find("select.ui-datepicker-month, select.ui-datepicker-year").rem=
oveAttr("disabled")}this._disabledInputs=3D$.map(this._disabledInputs,funct=
ion(b){return b=3D=3Da?null:b})},_disableDatepicker:function(a){var b=3D$(a=
),c=3D$.data(a,PROP_NAME);if(!b.hasClass(this.markerClassName))return;var d=
=3Da.nodeName.toLowerCase();if(d=3D=3D"input")a.disabled=3D!0,c.trigger.fil=
ter("button").each(function(){this.disabled=3D!0}).end().filter("img").css(=
{opacity:"0.5",cursor:"default"});else if(d=3D=3D"div"||d=3D=3D"span"){var =
e=3Db.children("."+this._inlineClass);e.children().addClass("ui-state-disab=
led"),e.find("select.ui-datepicker-month, select.ui-datepicker-year").attr(=
"disabled","disabled")}this._disabledInputs=3D$.map(this._disabledInputs,fu=
nction(b){return b=3D=3Da?null:b}),this._disabledInputs[this._disabledInput=
s.length]=3Da},_isDisabledDatepicker:function(a){if(!a)return!1;for(var b=
=3D0;b<this._disabledInputs.length;b++)if(this._disabledInputs[b]=3D=3Da)re=
turn!0;return!1},_getInst:function(a){try{return $.data(a,PROP_NAME)}catch(=
b){throw"Missing instance data for this datepicker"}},_optionDatepicker:fun=
ction(a,b,c){var d=3Dthis._getInst(a);if(arguments.length=3D=3D2&&typeof b=
=3D=3D"string")return b=3D=3D"defaults"?$.extend({},$.datepicker._defaults)=
:d?b=3D=3D"all"?$.extend({},d.settings):this._get(d,b):null;var e=3Db||{};t=
ypeof b=3D=3D"string"&&(e=3D{},e[b]=3Dc);if(d){this._curInst=3D=3Dd&&this._=
hideDatepicker();var f=3Dthis._getDateDatepicker(a,!0),g=3Dthis._getMinMaxD=
ate(d,"min"),h=3Dthis._getMinMaxDate(d,"max");extendRemove(d.settings,e),g!=
=3D=3Dnull&&e.dateFormat!=3D=3Dundefined&&e.minDate=3D=3D=3Dundefined&&(d.s=
ettings.minDate=3Dthis._formatDate(d,g)),h!=3D=3Dnull&&e.dateFormat!=3D=3Du=
ndefined&&e.maxDate=3D=3D=3Dundefined&&(d.settings.maxDate=3Dthis._formatDa=
te(d,h)),this._attachments($(a),d),this._autoSize(d),this._setDate(d,f),thi=
s._updateAlternate(d),this._updateDatepicker(d)}},_changeDatepicker:functio=
n(a,b,c){this._optionDatepicker(a,b,c)},_refreshDatepicker:function(a){var =
b=3Dthis._getInst(a);b&&this._updateDatepicker(b)},_setDateDatepicker:funct=
ion(a,b){var c=3Dthis._getInst(a);c&&(this._setDate(c,b),this._updateDatepi=
cker(c),this._updateAlternate(c))},_getDateDatepicker:function(a,b){var c=
=3Dthis._getInst(a);return c&&!c.inline&&this._setDateFromField(c,b),c?this=
._getDate(c):null},_doKeyDown:function(a){var b=3D$.datepicker._getInst(a.t=
arget),c=3D!0,d=3Db.dpDiv.is(".ui-datepicker-rtl");b._keyEvent=3D!0;if($.da=
tepicker._datepickerShowing)switch(a.keyCode){case 9:$.datepicker._hideDate=
picker(),c=3D!1;break;case 13:var e=3D$("td."+$.datepicker._dayOverClass+":=
not(."+$.datepicker._currentClass+")",b.dpDiv);e[0]&&$.datepicker._selectDa=
y(a.target,b.selectedMonth,b.selectedYear,e[0]);var f=3D$.datepicker._get(b=
,"onSelect");if(f){var g=3D$.datepicker._formatDate(b);f.apply(b.input?b.in=
put[0]:null,[g,b])}else $.datepicker._hideDatepicker();return!1;case 27:$.d=
atepicker._hideDatepicker();break;case 33:$.datepicker._adjustDate(a.target=
,a.ctrlKey?-$.datepicker._get(b,"stepBigMonths"):-$.datepicker._get(b,"step=
Months"),"M");break;case 34:$.datepicker._adjustDate(a.target,a.ctrlKey?+$.=
datepicker._get(b,"stepBigMonths"):+$.datepicker._get(b,"stepMonths"),"M");=
break;case 35:(a.ctrlKey||a.metaKey)&&$.datepicker._clearDate(a.target),c=
=3Da.ctrlKey||a.metaKey;break;case 36:(a.ctrlKey||a.metaKey)&&$.datepicker.=
_gotoToday(a.target),c=3Da.ctrlKey||a.metaKey;break;case 37:(a.ctrlKey||a.m=
etaKey)&&$.datepicker._adjustDate(a.target,d?1:-1,"D"),c=3Da.ctrlKey||a.met=
aKey,a.originalEvent.altKey&&$.datepicker._adjustDate(a.target,a.ctrlKey?-$=
.datepicker._get(b,"stepBigMonths"):-$.datepicker._get(b,"stepMonths"),"M")=
;break;case 38:(a.ctrlKey||a.metaKey)&&$.datepicker._adjustDate(a.target,-7=
,"D"),c=3Da.ctrlKey||a.metaKey;break;case 39:(a.ctrlKey||a.metaKey)&&$.date=
picker._adjustDate(a.target,d?-1:1,"D"),c=3Da.ctrlKey||a.metaKey,a.original=
Event.altKey&&$.datepicker._adjustDate(a.target,a.ctrlKey?+$.datepicker._ge=
t(b,"stepBigMonths"):+$.datepicker._get(b,"stepMonths"),"M");break;case 40:=
(a.ctrlKey||a.metaKey)&&$.datepicker._adjustDate(a.target,7,"D"),c=3Da.ctrl=
Key||a.metaKey;break;default:c=3D!1}else a.keyCode=3D=3D36&&a.ctrlKey?$.dat=
epicker._showDatepicker(this):c=3D!1;c&&(a.preventDefault(),a.stopPropagati=
on())},_doKeyPress:function(a){var b=3D$.datepicker._getInst(a.target);if($=
.datepicker._get(b,"constrainInput")){var c=3D$.datepicker._possibleChars($=
.datepicker._get(b,"dateFormat")),d=3DString.fromCharCode(a.charCode=3D=3Du=
ndefined?a.keyCode:a.charCode);return a.ctrlKey||a.metaKey||d<" "||!c||c.in=
dexOf(d)>-1}},_doKeyUp:function(a){var b=3D$.datepicker._getInst(a.target);=
if(b.input.val()!=3Db.lastVal)try{var c=3D$.datepicker.parseDate($.datepick=
er._get(b,"dateFormat"),b.input?b.input.val():null,$.datepicker._getFormatC=
onfig(b));c&&($.datepicker._setDateFromField(b),$.datepicker._updateAlterna=
te(b),$.datepicker._updateDatepicker(b))}catch(d){$.datepicker.log(d)}retur=
n!0},_showDatepicker:function(a){a=3Da.target||a,a.nodeName.toLowerCase()!=
=3D"input"&&(a=3D$("input",a.parentNode)[0]);if($.datepicker._isDisabledDat=
epicker(a)||$.datepicker._lastInput=3D=3Da)return;var b=3D$.datepicker._get=
Inst(a);$.datepicker._curInst&&$.datepicker._curInst!=3Db&&($.datepicker._c=
urInst.dpDiv.stop(!0,!0),b&&$.datepicker._datepickerShowing&&$.datepicker._=
hideDatepicker($.datepicker._curInst.input[0]));var c=3D$.datepicker._get(b=
,"beforeShow"),d=3Dc?c.apply(a,[a,b]):{};if(d=3D=3D=3D!1)return;extendRemov=
e(b.settings,d),b.lastVal=3Dnull,$.datepicker._lastInput=3Da,$.datepicker._=
setDateFromField(b),$.datepicker._inDialog&&(a.value=3D""),$.datepicker._po=
s||($.datepicker._pos=3D$.datepicker._findPos(a),$.datepicker._pos[1]+=3Da.=
offsetHeight);var e=3D!1;$(a).parents().each(function(){return e|=3D$(this)=
.css("position")=3D=3D"fixed",!e}),e&&$.browser.opera&&($.datepicker._pos[0=
]-=3Ddocument.documentElement.scrollLeft,$.datepicker._pos[1]-=3Ddocument.d=
ocumentElement.scrollTop);var f=3D{left:$.datepicker._pos[0],top:$.datepick=
er._pos[1]};$.datepicker._pos=3Dnull,b.dpDiv.empty(),b.dpDiv.css({position:=
"absolute",display:"block",top:"-1000px"}),$.datepicker._updateDatepicker(b=
),f=3D$.datepicker._checkOffset(b,f,e),b.dpDiv.css({position:$.datepicker._=
inDialog&&$.blockUI?"static":e?"fixed":"absolute",display:"none",left:f.lef=
t+"px",top:f.top+"px"});if(!b.inline){var g=3D$.datepicker._get(b,"showAnim=
"),h=3D$.datepicker._get(b,"duration"),i=3Dfunction(){var a=3Db.dpDiv.find(=
"iframe.ui-datepicker-cover");if(!!a.length){var c=3D$.datepicker._getBorde=
rs(b.dpDiv);a.css({left:-c[0],top:-c[1],width:b.dpDiv.outerWidth(),height:b=
.dpDiv.outerHeight()})}};b.dpDiv.zIndex($(a).zIndex()+1),$.datepicker._date=
pickerShowing=3D!0,$.effects&&$.effects[g]?b.dpDiv.show(g,$.datepicker._get=
(b,"showOptions"),h,i):b.dpDiv[g||"show"](g?h:null,i),(!g||!h)&&i(),b.input=
.is(":visible")&&!b.input.is(":disabled")&&b.input.focus(),$.datepicker._cu=
rInst=3Db}},_updateDatepicker:function(a){var b=3Dthis;b.maxRows=3D4;var c=
=3D$.datepicker._getBorders(a.dpDiv);instActive=3Da,a.dpDiv.empty().append(=
this._generateHTML(a)),this._attachHandlers(a);var d=3Da.dpDiv.find("iframe=
.ui-datepicker-cover");!d.length||d.css({left:-c[0],top:-c[1],width:a.dpDiv=
.outerWidth(),height:a.dpDiv.outerHeight()}),a.dpDiv.find("."+this._dayOver=
Class+" a").mouseover();var e=3Dthis._getNumberOfMonths(a),f=3De[1],g=3D17;=
a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepic=
ker-multi-4").width(""),f>1&&a.dpDiv.addClass("ui-datepicker-multi-"+f).css=
("width",g*f+"em"),a.dpDiv[(e[0]!=3D1||e[1]!=3D1?"add":"remove")+"Class"]("=
ui-datepicker-multi"),a.dpDiv[(this._get(a,"isRTL")?"add":"remove")+"Class"=
]("ui-datepicker-rtl"),a=3D=3D$.datepicker._curInst&&$.datepicker._datepick=
erShowing&&a.input&&a.input.is(":visible")&&!a.input.is(":disabled")&&a.inp=
ut[0]!=3Ddocument.activeElement&&a.input.focus();if(a.yearshtml){var h=3Da.=
yearshtml;setTimeout(function(){h=3D=3D=3Da.yearshtml&&a.yearshtml&&a.dpDiv=
.find("select.ui-datepicker-year:first").replaceWith(a.yearshtml),h=3Da.yea=
rshtml=3Dnull},0)}},_getBorders:function(a){var b=3Dfunction(a){return{thin=
:1,medium:2,thick:3}[a]||a};return[parseFloat(b(a.css("border-left-width"))=
),parseFloat(b(a.css("border-top-width")))]},_checkOffset:function(a,b,c){v=
ar d=3Da.dpDiv.outerWidth(),e=3Da.dpDiv.outerHeight(),f=3Da.input?a.input.o=
uterWidth():0,g=3Da.input?a.input.outerHeight():0,h=3Ddocument.documentElem=
ent.clientWidth+(c?0:$(document).scrollLeft()),i=3Ddocument.documentElement=
.clientHeight+(c?0:$(document).scrollTop());return b.left-=3Dthis._get(a,"i=
sRTL")?d-f:0,b.left-=3Dc&&b.left=3D=3Da.input.offset().left?$(document).scr=
ollLeft():0,b.top-=3Dc&&b.top=3D=3Da.input.offset().top+g?$(document).scrol=
lTop():0,b.left-=3DMath.min(b.left,b.left+d>h&&h>d?Math.abs(b.left+d-h):0),=
b.top-=3DMath.min(b.top,b.top+e>i&&i>e?Math.abs(e+g):0),b},_findPos:functio=
n(a){var b=3Dthis._getInst(a),c=3Dthis._get(b,"isRTL");while(a&&(a.type=3D=
=3D"hidden"||a.nodeType!=3D1||$.expr.filters.hidden(a)))a=3Da[c?"previousSi=
bling":"nextSibling"];var d=3D$(a).offset();return[d.left,d.top]},_hideDate=
picker:function(a){var b=3Dthis._curInst;if(!b||a&&b!=3D$.data(a,PROP_NAME)=
)return;if(this._datepickerShowing){var c=3Dthis._get(b,"showAnim"),d=3Dthi=
s._get(b,"duration"),e=3Dfunction(){$.datepicker._tidyDialog(b)};$.effects&=
&$.effects[c]?b.dpDiv.hide(c,$.datepicker._get(b,"showOptions"),d,e):b.dpDi=
v[c=3D=3D"slideDown"?"slideUp":c=3D=3D"fadeIn"?"fadeOut":"hide"](c?d:null,e=
),c||e(),this._datepickerShowing=3D!1;var f=3Dthis._get(b,"onClose");f&&f.a=
pply(b.input?b.input[0]:null,[b.input?b.input.val():"",b]),this._lastInput=
=3Dnull,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0=
",top:"-100px"}),$.blockUI&&($.unblockUI(),$("body").append(this.dpDiv))),t=
his._inDialog=3D!1}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dial=
ogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(a)=
{if(!$.datepicker._curInst)return;var b=3D$(a.target),c=3D$.datepicker._get=
Inst(b[0]);(b[0].id!=3D$.datepicker._mainDivId&&b.parents("#"+$.datepicker.=
_mainDivId).length=3D=3D0&&!b.hasClass($.datepicker.markerClassName)&&!b.cl=
osest("."+$.datepicker._triggerClass).length&&$.datepicker._datepickerShowi=
ng&&(!$.datepicker._inDialog||!$.blockUI)||b.hasClass($.datepicker.markerCl=
assName)&&$.datepicker._curInst!=3Dc)&&$.datepicker._hideDatepicker()},_adj=
ustDate:function(a,b,c){var d=3D$(a),e=3Dthis._getInst(d[0]);if(this._isDis=
abledDatepicker(d[0]))return;this._adjustInstDate(e,b+(c=3D=3D"M"?this._get=
(e,"showCurrentAtPos"):0),c),this._updateDatepicker(e)},_gotoToday:function=
(a){var b=3D$(a),c=3Dthis._getInst(b[0]);if(this._get(c,"gotoCurrent")&&c.c=
urrentDay)c.selectedDay=3Dc.currentDay,c.drawMonth=3Dc.selectedMonth=3Dc.cu=
rrentMonth,c.drawYear=3Dc.selectedYear=3Dc.currentYear;else{var d=3Dnew Dat=
e;c.selectedDay=3Dd.getDate(),c.drawMonth=3Dc.selectedMonth=3Dd.getMonth(),=
c.drawYear=3Dc.selectedYear=3Dd.getFullYear()}this._notifyChange(c),this._a=
djustDate(b)},_selectMonthYear:function(a,b,c){var d=3D$(a),e=3Dthis._getIn=
st(d[0]);e["selected"+(c=3D=3D"M"?"Month":"Year")]=3De["draw"+(c=3D=3D"M"?"=
Month":"Year")]=3DparseInt(b.options[b.selectedIndex].value,10),this._notif=
yChange(e),this._adjustDate(d)},_selectDay:function(a,b,c,d){var e=3D$(a);i=
f($(d).hasClass(this._unselectableClass)||this._isDisabledDatepicker(e[0]))=
return;var f=3Dthis._getInst(e[0]);f.selectedDay=3Df.currentDay=3D$("a",d).=
html(),f.selectedMonth=3Df.currentMonth=3Db,f.selectedYear=3Df.currentYear=
=3Dc,this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.cu=
rrentYear))},_clearDate:function(a){var b=3D$(a),c=3Dthis._getInst(b[0]);th=
is._selectDate(b,"")},_selectDate:function(a,b){var c=3D$(a),d=3Dthis._getI=
nst(c[0]);b=3Db!=3Dnull?b:this._formatDate(d),d.input&&d.input.val(b),this.=
_updateAlternate(d);var e=3Dthis._get(d,"onSelect");e?e.apply(d.input?d.inp=
ut[0]:null,[b,d]):d.input&&d.input.trigger("change"),d.inline?this._updateD=
atepicker(d):(this._hideDatepicker(),this._lastInput=3Dd.input[0],typeof d.=
input[0]!=3D"object"&&d.input.focus(),this._lastInput=3Dnull)},_updateAlter=
nate:function(a){var b=3Dthis._get(a,"altField");if(b){var c=3Dthis._get(a,=
"altFormat")||this._get(a,"dateFormat"),d=3Dthis._getDate(a),e=3Dthis.forma=
tDate(c,d,this._getFormatConfig(a));$(b).each(function(){$(this).val(e)})}}=
,noWeekends:function(a){var b=3Da.getDay();return[b>0&&b<6,""]},iso8601Week=
:function(a){var b=3Dnew Date(a.getTime());b.setDate(b.getDate()+4-(b.getDa=
y()||7));var c=3Db.getTime();return b.setMonth(0),b.setDate(1),Math.floor(M=
ath.round((c-b)/864e5)/7)+1},parseDate:function(a,b,c){if(a=3D=3Dnull||b=3D=
=3Dnull)throw"Invalid arguments";b=3Dtypeof b=3D=3D"object"?b.toString():b+=
"";if(b=3D=3D"")return null;var d=3D(c?c.shortYearCutoff:null)||this._defau=
lts.shortYearCutoff;d=3Dtypeof d!=3D"string"?d:(new Date).getFullYear()%100=
+parseInt(d,10);var e=3D(c?c.dayNamesShort:null)||this._defaults.dayNamesSh=
ort,f=3D(c?c.dayNames:null)||this._defaults.dayNames,g=3D(c?c.monthNamesSho=
rt:null)||this._defaults.monthNamesShort,h=3D(c?c.monthNames:null)||this._d=
efaults.monthNames,i=3D-1,j=3D-1,k=3D-1,l=3D-1,m=3D!1,n=3Dfunction(b){var c=
=3Ds+1<a.length&&a.charAt(s+1)=3D=3Db;return c&&s++,c},o=3Dfunction(a){var =
c=3Dn(a),d=3Da=3D=3D"@"?14:a=3D=3D"!"?20:a=3D=3D"y"&&c?4:a=3D=3D"o"?3:2,e=
=3Dnew RegExp("^\\d{1,"+d+"}"),f=3Db.substring(r).match(e);if(!f)throw"Miss=
ing number at position "+r;return r+=3Df[0].length,parseInt(f[0],10)},p=3Df=
unction(a,c,d){var e=3D$.map(n(a)?d:c,function(a,b){return[[b,a]]}).sort(fu=
nction(a,b){return-(a[1].length-b[1].length)}),f=3D-1;$.each(e,function(a,c=
){var d=3Dc[1];if(b.substr(r,d.length).toLowerCase()=3D=3Dd.toLowerCase())r=
eturn f=3Dc[0],r+=3Dd.length,!1});if(f!=3D-1)return f+1;throw"Unknown name =
at position "+r},q=3Dfunction(){if(b.charAt(r)!=3Da.charAt(s))throw"Unexpec=
ted literal at position "+r;r++},r=3D0;for(var s=3D0;s<a.length;s++)if(m)a.=
charAt(s)=3D=3D"'"&&!n("'")?m=3D!1:q();else switch(a.charAt(s)){case"d":k=
=3Do("d");break;case"D":p("D",e,f);break;case"o":l=3Do("o");break;case"m":j=
=3Do("m");break;case"M":j=3Dp("M",g,h);break;case"y":i=3Do("y");break;case"=
@":var t=3Dnew Date(o("@"));i=3Dt.getFullYear(),j=3Dt.getMonth()+1,k=3Dt.ge=
tDate();break;case"!":var t=3Dnew Date((o("!")-this._ticksTo1970)/1e4);i=3D=
t.getFullYear(),j=3Dt.getMonth()+1,k=3Dt.getDate();break;case"'":n("'")?q()=
:m=3D!0;break;default:q()}if(r<b.length)throw"Extra/unparsed characters fou=
nd in date: "+b.substring(r);i=3D=3D-1?i=3D(new Date).getFullYear():i<100&&=
(i+=3D(new Date).getFullYear()-(new Date).getFullYear()%100+(i<=3Dd?0:-100)=
);if(l>-1){j=3D1,k=3Dl;do{var u=3Dthis._getDaysInMonth(i,j-1);if(k<=3Du)bre=
ak;j++,k-=3Du}while(!0)}var t=3Dthis._daylightSavingAdjust(new Date(i,j-1,k=
));if(t.getFullYear()!=3Di||t.getMonth()+1!=3Dj||t.getDate()!=3Dk)throw"Inv=
alid date";return t},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd=
",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, =
d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy=
-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(=
4.925))*24*60*60*1e7,formatDate:function(a,b,c){if(!b)return"";var d=3D(c?c=
.dayNamesShort:null)||this._defaults.dayNamesShort,e=3D(c?c.dayNames:null)|=
|this._defaults.dayNames,f=3D(c?c.monthNamesShort:null)||this._defaults.mon=
thNamesShort,g=3D(c?c.monthNames:null)||this._defaults.monthNames,h=3Dfunct=
ion(b){var c=3Dm+1<a.length&&a.charAt(m+1)=3D=3Db;return c&&m++,c},i=3Dfunc=
tion(a,b,c){var d=3D""+b;if(h(a))while(d.length<c)d=3D"0"+d;return d},j=3Df=
unction(a,b,c,d){return h(a)?d[b]:c[b]},k=3D"",l=3D!1;if(b)for(var m=3D0;m<=
a.length;m++)if(l)a.charAt(m)=3D=3D"'"&&!h("'")?l=3D!1:k+=3Da.charAt(m);els=
e switch(a.charAt(m)){case"d":k+=3Di("d",b.getDate(),2);break;case"D":k+=3D=
j("D",b.getDay(),d,e);break;case"o":k+=3Di("o",Math.round(((new Date(b.getF=
ullYear(),b.getMonth(),b.getDate())).getTime()-(new Date(b.getFullYear(),0,=
0)).getTime())/864e5),3);break;case"m":k+=3Di("m",b.getMonth()+1,2);break;c=
ase"M":k+=3Dj("M",b.getMonth(),f,g);break;case"y":k+=3Dh("y")?b.getFullYear=
():(b.getYear()%100<10?"0":"")+b.getYear()%100;break;case"@":k+=3Db.getTime=
();break;case"!":k+=3Db.getTime()*1e4+this._ticksTo1970;break;case"'":h("'"=
)?k+=3D"'":l=3D!0;break;default:k+=3Da.charAt(m)}return k},_possibleChars:f=
unction(a){var b=3D"",c=3D!1,d=3Dfunction(b){var c=3De+1<a.length&&a.charAt=
(e+1)=3D=3Db;return c&&e++,c};for(var e=3D0;e<a.length;e++)if(c)a.charAt(e)=
=3D=3D"'"&&!d("'")?c=3D!1:b+=3Da.charAt(e);else switch(a.charAt(e)){case"d"=
:case"m":case"y":case"@":b+=3D"0123456789";break;case"D":case"M":return nul=
l;case"'":d("'")?b+=3D"'":c=3D!0;break;default:b+=3Da.charAt(e)}return b},_=
get:function(a,b){return a.settings[b]!=3D=3Dundefined?a.settings[b]:this._=
defaults[b]},_setDateFromField:function(a,b){if(a.input.val()=3D=3Da.lastVa=
l)return;var c=3Dthis._get(a,"dateFormat"),d=3Da.lastVal=3Da.input?a.input.=
val():null,e,f;e=3Df=3Dthis._getDefaultDate(a);var g=3Dthis._getFormatConfi=
g(a);try{e=3Dthis.parseDate(c,d,g)||f}catch(h){this.log(h),d=3Db?"":d}a.sel=
ectedDay=3De.getDate(),a.drawMonth=3Da.selectedMonth=3De.getMonth(),a.drawY=
ear=3Da.selectedYear=3De.getFullYear(),a.currentDay=3Dd?e.getDate():0,a.cur=
rentMonth=3Dd?e.getMonth():0,a.currentYear=3Dd?e.getFullYear():0,this._adju=
stInstDate(a)},_getDefaultDate:function(a){return this._restrictMinMax(a,th=
is._determineDate(a,this._get(a,"defaultDate"),new Date))},_determineDate:f=
unction(a,b,c){var d=3Dfunction(a){var b=3Dnew Date;return b.setDate(b.getD=
ate()+a),b},e=3Dfunction(b){try{return $.datepicker.parseDate($.datepicker.=
_get(a,"dateFormat"),b,$.datepicker._getFormatConfig(a))}catch(c){}var d=3D=
(b.toLowerCase().match(/^c/)?$.datepicker._getDate(a):null)||new Date,e=3Dd=
.getFullYear(),f=3Dd.getMonth(),g=3Dd.getDate(),h=3D/([+-]?[0-9]+)\s*(d|D|w=
|W|m|M|y|Y)?/g,i=3Dh.exec(b);while(i){switch(i[2]||"d"){case"d":case"D":g+=
=3DparseInt(i[1],10);break;case"w":case"W":g+=3DparseInt(i[1],10)*7;break;c=
ase"m":case"M":f+=3DparseInt(i[1],10),g=3DMath.min(g,$.datepicker._getDaysI=
nMonth(e,f));break;case"y":case"Y":e+=3DparseInt(i[1],10),g=3DMath.min(g,$.=
datepicker._getDaysInMonth(e,f))}i=3Dh.exec(b)}return new Date(e,f,g)},f=3D=
b=3D=3Dnull||b=3D=3D=3D""?c:typeof b=3D=3D"string"?e(b):typeof b=3D=3D"numb=
er"?isNaN(b)?c:d(b):new Date(b.getTime());return f=3Df&&f.toString()=3D=3D"=
Invalid Date"?c:f,f&&(f.setHours(0),f.setMinutes(0),f.setSeconds(0),f.setMi=
lliseconds(0)),this._daylightSavingAdjust(f)},_daylightSavingAdjust:functio=
n(a){return a?(a.setHours(a.getHours()>12?a.getHours()+2:0),a):null},_setDa=
te:function(a,b,c){var d=3D!b,e=3Da.selectedMonth,f=3Da.selectedYear,g=3Dth=
is._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay=3Da.c=
urrentDay=3Dg.getDate(),a.drawMonth=3Da.selectedMonth=3Da.currentMonth=3Dg.=
getMonth(),a.drawYear=3Da.selectedYear=3Da.currentYear=3Dg.getFullYear(),(e=
!=3Da.selectedMonth||f!=3Da.selectedYear)&&!c&&this._notifyChange(a),this._=
adjustInstDate(a),a.input&&a.input.val(d?"":this._formatDate(a))},_getDate:=
function(a){var b=3D!a.currentYear||a.input&&a.input.val()=3D=3D""?null:thi=
s._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay)=
);return b},_attachHandlers:function(a){var b=3Dthis._get(a,"stepMonths"),c=
=3D"#"+a.id.replace(/\\\\/g,"\\");a.dpDiv.find("[data-handler]").map(functi=
on(){var a=3D{prev:function(){window["DP_jQuery_"+dpuuid].datepicker._adjus=
tDate(c,-b,"M")},next:function(){window["DP_jQuery_"+dpuuid].datepicker._ad=
justDate(c,+b,"M")},hide:function(){window["DP_jQuery_"+dpuuid].datepicker.=
_hideDatepicker()},today:function(){window["DP_jQuery_"+dpuuid].datepicker.=
_gotoToday(c)},selectDay:function(){return window["DP_jQuery_"+dpuuid].date=
picker._selectDay(c,+this.getAttribute("data-month"),+this.getAttribute("da=
ta-year"),this),!1},selectMonth:function(){return window["DP_jQuery_"+dpuui=
d].datepicker._selectMonthYear(c,this,"M"),!1},selectYear:function(){return=
 window["DP_jQuery_"+dpuuid].datepicker._selectMonthYear(c,this,"Y"),!1}};$=
(this).bind(this.getAttribute("data-event"),a[this.getAttribute("data-handl=
er")])})},_generateHTML:function(a){var b=3Dnew Date;b=3Dthis._daylightSavi=
ngAdjust(new Date(b.getFullYear(),b.getMonth(),b.getDate()));var c=3Dthis._=
get(a,"isRTL"),d=3Dthis._get(a,"showButtonPanel"),e=3Dthis._get(a,"hideIfNo=
PrevNext"),f=3Dthis._get(a,"navigationAsDateFormat"),g=3Dthis._getNumberOfM=
onths(a),h=3Dthis._get(a,"showCurrentAtPos"),i=3Dthis._get(a,"stepMonths"),=
j=3Dg[0]!=3D1||g[1]!=3D1,k=3Dthis._daylightSavingAdjust(a.currentDay?new Da=
te(a.currentYear,a.currentMonth,a.currentDay):new Date(9999,9,9)),l=3Dthis.=
_getMinMaxDate(a,"min"),m=3Dthis._getMinMaxDate(a,"max"),n=3Da.drawMonth-h,=
o=3Da.drawYear;n<0&&(n+=3D12,o--);if(m){var p=3Dthis._daylightSavingAdjust(=
new Date(m.getFullYear(),m.getMonth()-g[0]*g[1]+1,m.getDate()));p=3Dl&&p<l?=
l:p;while(this._daylightSavingAdjust(new Date(o,n,1))>p)n--,n<0&&(n=3D11,o-=
-)}a.drawMonth=3Dn,a.drawYear=3Do;var q=3Dthis._get(a,"prevText");q=3Df?thi=
s.formatDate(q,this._daylightSavingAdjust(new Date(o,n-i,1)),this._getForma=
tConfig(a)):q;var r=3Dthis._canAdjustMonth(a,-1,o,n)?'<a class=3D"ui-datepi=
cker-prev ui-corner-all" data-handler=3D"prev" data-event=3D"click" title=
=3D"'+q+'"><span class=3D"ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">=
'+q+"</span></a>":e?"":'<a class=3D"ui-datepicker-prev ui-corner-all ui-sta=
te-disabled" title=3D"'+q+'"><span class=3D"ui-icon ui-icon-circle-triangle=
-'+(c?"e":"w")+'">'+q+"</span></a>",s=3Dthis._get(a,"nextText");s=3Df?this.=
formatDate(s,this._daylightSavingAdjust(new Date(o,n+i,1)),this._getFormatC=
onfig(a)):s;var t=3Dthis._canAdjustMonth(a,1,o,n)?'<a class=3D"ui-datepicke=
r-next ui-corner-all" data-handler=3D"next" data-event=3D"click" title=3D"'=
+s+'"><span class=3D"ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"=
</span></a>":e?"":'<a class=3D"ui-datepicker-next ui-corner-all ui-state-di=
sabled" title=3D"'+s+'"><span class=3D"ui-icon ui-icon-circle-triangle-'+(c=
?"w":"e")+'">'+s+"</span></a>",u=3Dthis._get(a,"currentText"),v=3Dthis._get=
(a,"gotoCurrent")&&a.currentDay?k:b;u=3Df?this.formatDate(u,v,this._getForm=
atConfig(a)):u;var w=3Da.inline?"":'<button type=3D"button" class=3D"ui-dat=
epicker-close ui-state-default ui-priority-primary ui-corner-all" data-hand=
ler=3D"hide" data-event=3D"click">'+this._get(a,"closeText")+"</button>",x=
=3Dd?'<div class=3D"ui-datepicker-buttonpane ui-widget-content">'+(c?w:"")+=
(this._isInRange(a,v)?'<button type=3D"button" class=3D"ui-datepicker-curre=
nt ui-state-default ui-priority-secondary ui-corner-all" data-handler=3D"to=
day" data-event=3D"click">'+u+"</button>":"")+(c?"":w)+"</div>":"",y=3Dpars=
eInt(this._get(a,"firstDay"),10);y=3DisNaN(y)?0:y;var z=3Dthis._get(a,"show=
Week"),A=3Dthis._get(a,"dayNames"),B=3Dthis._get(a,"dayNamesShort"),C=3Dthi=
s._get(a,"dayNamesMin"),D=3Dthis._get(a,"monthNames"),E=3Dthis._get(a,"mont=
hNamesShort"),F=3Dthis._get(a,"beforeShowDay"),G=3Dthis._get(a,"showOtherMo=
nths"),H=3Dthis._get(a,"selectOtherMonths"),I=3Dthis._get(a,"calculateWeek"=
)||this.iso8601Week,J=3Dthis._getDefaultDate(a),K=3D"";for(var L=3D0;L<g[0]=
;L++){var M=3D"";this.maxRows=3D4;for(var N=3D0;N<g[1];N++){var O=3Dthis._d=
aylightSavingAdjust(new Date(o,n,a.selectedDay)),P=3D" ui-corner-all",Q=3D"=
";if(j){Q+=3D'<div class=3D"ui-datepicker-group';if(g[1]>1)switch(N){case 0=
:Q+=3D" ui-datepicker-group-first",P=3D" ui-corner-"+(c?"right":"left");bre=
ak;case g[1]-1:Q+=3D" ui-datepicker-group-last",P=3D" ui-corner-"+(c?"left"=
:"right");break;default:Q+=3D" ui-datepicker-group-middle",P=3D""}Q+=3D'">'=
}Q+=3D'<div class=3D"ui-datepicker-header ui-widget-header ui-helper-clearf=
ix'+P+'">'+(/all|left/.test(P)&&L=3D=3D0?c?t:r:"")+(/all|right/.test(P)&&L=
=3D=3D0?c?r:t:"")+this._generateMonthYearHeader(a,n,o,l,m,L>0||N>0,D,E)+'</=
div><table class=3D"ui-datepicker-calendar"><thead>'+"<tr>";var R=3Dz?'<th =
class=3D"ui-datepicker-week-col">'+this._get(a,"weekHeader")+"</th>":"";for=
(var S=3D0;S<7;S++){var T=3D(S+y)%7;R+=3D"<th"+((S+y+6)%7>=3D5?' class=3D"u=
i-datepicker-week-end"':"")+">"+'<span title=3D"'+A[T]+'">'+C[T]+"</span></=
th>"}Q+=3DR+"</tr></thead><tbody>";var U=3Dthis._getDaysInMonth(o,n);o=3D=
=3Da.selectedYear&&n=3D=3Da.selectedMonth&&(a.selectedDay=3DMath.min(a.sele=
ctedDay,U));var V=3D(this._getFirstDayOfMonth(o,n)-y+7)%7,W=3DMath.ceil((V+=
U)/7),X=3Dj?this.maxRows>W?this.maxRows:W:W;this.maxRows=3DX;var Y=3Dthis._=
daylightSavingAdjust(new Date(o,n,1-V));for(var Z=3D0;Z<X;Z++){Q+=3D"<tr>";=
var _=3Dz?'<td class=3D"ui-datepicker-week-col">'+this._get(a,"calculateWee=
k")(Y)+"</td>":"";for(var S=3D0;S<7;S++){var ba=3DF?F.apply(a.input?a.input=
[0]:null,[Y]):[!0,""],bb=3DY.getMonth()!=3Dn,bc=3Dbb&&!H||!ba[0]||l&&Y<l||m=
&&Y>m;_+=3D'<td class=3D"'+((S+y+6)%7>=3D5?" ui-datepicker-week-end":"")+(b=
b?" ui-datepicker-other-month":"")+(Y.getTime()=3D=3DO.getTime()&&n=3D=3Da.=
selectedMonth&&a._keyEvent||J.getTime()=3D=3DY.getTime()&&J.getTime()=3D=3D=
O.getTime()?" "+this._dayOverClass:"")+(bc?" "+this._unselectableClass+" ui=
-state-disabled":"")+(bb&&!G?"":" "+ba[1]+(Y.getTime()=3D=3Dk.getTime()?" "=
+this._currentClass:"")+(Y.getTime()=3D=3Db.getTime()?" ui-datepicker-today=
":""))+'"'+((!bb||G)&&ba[2]?' title=3D"'+ba[2]+'"':"")+(bc?"":' data-handle=
r=3D"selectDay" data-event=3D"click" data-month=3D"'+Y.getMonth()+'" data-y=
ear=3D"'+Y.getFullYear()+'"')+">"+(bb&&!G?"&#xa0;":bc?'<span class=3D"ui-st=
ate-default">'+Y.getDate()+"</span>":'<a class=3D"ui-state-default'+(Y.getT=
ime()=3D=3Db.getTime()?" ui-state-highlight":"")+(Y.getTime()=3D=3Dk.getTim=
e()?" ui-state-active":"")+(bb?" ui-priority-secondary":"")+'" href=3D"#">'=
+Y.getDate()+"</a>")+"</td>",Y.setDate(Y.getDate()+1),Y=3Dthis._daylightSav=
ingAdjust(Y)}Q+=3D_+"</tr>"}n++,n>11&&(n=3D0,o++),Q+=3D"</tbody></table>"+(=
j?"</div>"+(g[0]>0&&N=3D=3Dg[1]-1?'<div class=3D"ui-datepicker-row-break"><=
/div>':""):""),M+=3DQ}K+=3DM}return K+=3Dx+($.browser.msie&&parseInt($.brow=
ser.version,10)<7&&!a.inline?'<iframe src=3D"javascript:false;" class=3D"ui=
-datepicker-cover" frameborder=3D"0"></iframe>':""),a._keyEvent=3D!1,K},_ge=
nerateMonthYearHeader:function(a,b,c,d,e,f,g,h){var i=3Dthis._get(a,"change=
Month"),j=3Dthis._get(a,"changeYear"),k=3Dthis._get(a,"showMonthAfterYear")=
,l=3D'<div class=3D"ui-datepicker-title">',m=3D"";if(f||!i)m+=3D'<span clas=
s=3D"ui-datepicker-month">'+g[b]+"</span>";else{var n=3Dd&&d.getFullYear()=
=3D=3Dc,o=3De&&e.getFullYear()=3D=3Dc;m+=3D'<select class=3D"ui-datepicker-=
month" data-handler=3D"selectMonth" data-event=3D"change">';for(var p=3D0;p=
<12;p++)(!n||p>=3Dd.getMonth())&&(!o||p<=3De.getMonth())&&(m+=3D'<option va=
lue=3D"'+p+'"'+(p=3D=3Db?' selected=3D"selected"':"")+">"+h[p]+"</option>")=
;m+=3D"</select>"}k||(l+=3Dm+(f||!i||!j?"&#xa0;":""));if(!a.yearshtml){a.ye=
arshtml=3D"";if(f||!j)l+=3D'<span class=3D"ui-datepicker-year">'+c+"</span>=
";else{var q=3Dthis._get(a,"yearRange").split(":"),r=3D(new Date).getFullYe=
ar(),s=3Dfunction(a){var b=3Da.match(/c[+-].*/)?c+parseInt(a.substring(1),1=
0):a.match(/[+-].*/)?r+parseInt(a,10):parseInt(a,10);return isNaN(b)?r:b},t=
=3Ds(q[0]),u=3DMath.max(t,s(q[1]||""));t=3Dd?Math.max(t,d.getFullYear()):t,=
u=3De?Math.min(u,e.getFullYear()):u,a.yearshtml+=3D'<select class=3D"ui-dat=
epicker-year" data-handler=3D"selectYear" data-event=3D"change">';for(;t<=
=3Du;t++)a.yearshtml+=3D'<option value=3D"'+t+'"'+(t=3D=3Dc?' selected=3D"s=
elected"':"")+">"+t+"</option>";a.yearshtml+=3D"</select>",l+=3Da.yearshtml=
,a.yearshtml=3Dnull}}return l+=3Dthis._get(a,"yearSuffix"),k&&(l+=3D(f||!i|=
|!j?"&#xa0;":"")+m),l+=3D"</div>",l},_adjustInstDate:function(a,b,c){var d=
=3Da.drawYear+(c=3D=3D"Y"?b:0),e=3Da.drawMonth+(c=3D=3D"M"?b:0),f=3DMath.mi=
n(a.selectedDay,this._getDaysInMonth(d,e))+(c=3D=3D"D"?b:0),g=3Dthis._restr=
ictMinMax(a,this._daylightSavingAdjust(new Date(d,e,f)));a.selectedDay=3Dg.=
getDate(),a.drawMonth=3Da.selectedMonth=3Dg.getMonth(),a.drawYear=3Da.selec=
tedYear=3Dg.getFullYear(),(c=3D=3D"M"||c=3D=3D"Y")&&this._notifyChange(a)},=
_restrictMinMax:function(a,b){var c=3Dthis._getMinMaxDate(a,"min"),d=3Dthis=
._getMinMaxDate(a,"max"),e=3Dc&&b<c?c:b;return e=3Dd&&e>d?d:e,e},_notifyCha=
nge:function(a){var b=3Dthis._get(a,"onChangeMonthYear");b&&b.apply(a.input=
?a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:=
function(a){var b=3Dthis._get(a,"numberOfMonths");return b=3D=3Dnull?[1,1]:=
typeof b=3D=3D"number"?[1,b]:b},_getMinMaxDate:function(a,b){return this._d=
etermineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){r=
eturn 32-this._daylightSavingAdjust(new Date(a,b,32)).getDate()},_getFirstD=
ayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:f=
unction(a,b,c,d){var e=3Dthis._getNumberOfMonths(a),f=3Dthis._daylightSavin=
gAdjust(new Date(c,d+(b<0?b:e[0]*e[1]),1));return b<0&&f.setDate(this._getD=
aysInMonth(f.getFullYear(),f.getMonth())),this._isInRange(a,f)},_isInRange:=
function(a,b){var c=3Dthis._getMinMaxDate(a,"min"),d=3Dthis._getMinMaxDate(=
a,"max");return(!c||b.getTime()>=3Dc.getTime())&&(!d||b.getTime()<=3Dd.getT=
ime())},_getFormatConfig:function(a){var b=3Dthis._get(a,"shortYearCutoff")=
;return b=3Dtypeof b!=3D"string"?b:(new Date).getFullYear()%100+parseInt(b,=
10),{shortYearCutoff:b,dayNamesShort:this._get(a,"dayNamesShort"),dayNames:=
this._get(a,"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),mont=
hNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,d){b||(a.curr=
entDay=3Da.selectedDay,a.currentMonth=3Da.selectedMonth,a.currentYear=3Da.s=
electedYear);var e=3Db?typeof b=3D=3D"object"?b:this._daylightSavingAdjust(=
new Date(d,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.curren=
tMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),e,th=
is._getFormatConfig(a))}}),$.fn.datepicker=3Dfunction(a){if(!this.length)re=
turn this;$.datepicker.initialized||($(document).mousedown($.datepicker._ch=
eckExternalClick).find("body").append($.datepicker.dpDiv),$.datepicker.init=
ialized=3D!0);var b=3DArray.prototype.slice.call(arguments,1);return typeof=
 a!=3D"string"||a!=3D"isDisabled"&&a!=3D"getDate"&&a!=3D"widget"?a=3D=3D"op=
tion"&&arguments.length=3D=3D2&&typeof arguments[1]=3D=3D"string"?$.datepic=
ker["_"+a+"Datepicker"].apply($.datepicker,[this[0]].concat(b)):this.each(f=
unction(){typeof a=3D=3D"string"?$.datepicker["_"+a+"Datepicker"].apply($.d=
atepicker,[this].concat(b)):$.datepicker._attachDatepicker(this,a)}):$.date=
picker["_"+a+"Datepicker"].apply($.datepicker,[this[0]].concat(b))},$.datep=
icker=3Dnew Datepicker,$.datepicker.initialized=3D!1,$.datepicker.uuid=3D(n=
ew Date).getTime(),$.datepicker.version=3D"1.8.23",window["DP_jQuery_"+dpuu=
id]=3D$})(jQuery);;
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmp=
l/opac-tmpl/prog/en/modules/opac-results.tt
index 321d662..905f378 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
@@ -285,7 +285,7 @@ $(document).ready(function(){
     <div id=3D"yui-main">
     <div class=3D"yui-b">
     <div id=3D"userresults" class=3D"container">
-    [% IF ( DidYouMeanFromAuthorities ) %]
+    [% IF ( DidYouMean ) %]
         <div id=3D'didyoumean'>Not what you expected? Check for <a href=3D=
'/cgi-bin/koha/svc/suggestion?render=3Dstandalone&q=3D[% querystring | uri =
%]'>suggestions</a></div>
     [% END %]
=20
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/text/explodedterms.tt b/ko=
ha-tmpl/opac-tmpl/prog/en/modules/text/explodedterms.tt
new file mode 100644
index 0000000..6f394ad
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/text/explodedterms.tt
@@ -0,0 +1,8 @@
+[%- SWITCH index -%]
+[%- CASE 'su-na' -%]
+Search also for narrower subjects
+[%- CASE 'su-br' -%]
+Search also for broader subjects
+[%- CASE 'su-rl' -%]
+Search also for related subjects
+[%- END -%]
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 216de2f..5c04a59 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -828,7 +828,7 @@ if (C4::Context->preference('GoogleIndicTransliteration=
')) {
         $template->param('GoogleIndicTransliteration' =3D> 1);
 }
=20
-$template->{VARS}->{DidYouMeanFromAuthorities} =3D C4::Context->preference=
('DidYouMeanFromAuthorities');
+$template->{VARS}->{DidYouMean} =3D C4::Context->preference('OPACdidyoumea=
n') =3D~ m/enable/;
=20
     $template->param( borrowernumber    =3D> $borrowernumber);
 output_with_http_headers $cgi, $cookie, $template->output, $content_type;
diff --git a/opac/svc/suggestion b/opac/svc/suggestion
index 7234ffd..9c08565 100755
--- a/opac/svc/suggestion
+++ b/opac/svc/suggestion
@@ -80,12 +80,20 @@ my ( $template, $loggedinuser, $cookie ) =3D get_templa=
te_and_user(
     }
 );
=20
-unless ( C4::Context->preference('DidYouMeanFromAuthorities') ) {
+my @plugins =3D ();
+
+my $pluginsconfig =3D from_json(C4::Context->preference('OPACdidyoumean') =
|| '[]');
+
+foreach my $plugin (@$pluginsconfig) {
+    push @plugins, $plugin->{name} if ($plugin->{enabled});
+}
+
+unless ( @plugins ) {
     print $query->header;
     exit;
 }
=20
-my $suggestor =3D Koha::SuggestionEngine->new( { plugins =3D> ('AuthorityF=
ile') } );
+my $suggestor =3D Koha::SuggestionEngine->new( { plugins =3D> \@plugins } =
);
=20
 my $suggestions =3D
   $suggestor->get_suggestions( { search =3D> $search, count =3D> $count } =
);
diff --git a/t/SuggestionEngine_ExplodedTerms.t b/t/SuggestionEngine_Explod=
edTerms.t
new file mode 100755
index 0000000..d597aa1
--- /dev/null
+++ b/t/SuggestionEngine_ExplodedTerms.t
@@ -0,0 +1,31 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::More;
+
+BEGIN {
+        use_ok('Koha::SuggestionEngine');
+}
+
+my $suggestor =3D Koha::SuggestionEngine->new( { plugins =3D> ( 'ExplodedT=
erms' ) } );
+is(ref($suggestor), 'Koha::SuggestionEngine', 'Created suggestion engine')=
;
+
+my $result =3D $suggestor->get_suggestions({search =3D> 'Cookery'});
+
+ok((grep { $_->{'search'} eq 'su-na=3DCookery' } @$result) && (grep { $_->=
{'search'} eq 'su-br=3DCookery' } @$result) && (grep { $_->{'search'} eq 's=
u-rl=3DCookery' } @$result), "Suggested correct alternatives for keyword se=
arch 'Cookery'");
+
+$result =3D $suggestor->get_suggestions({search =3D> 'su:Cookery'});
+
+ok((grep { $_->{'search'} eq 'su-na=3DCookery' } @$result) && (grep { $_->=
{'search'} eq 'su-br=3DCookery' } @$result) && (grep { $_->{'search'} eq 's=
u-rl=3DCookery' } @$result), "Suggested correct alternatives for subject se=
arch 'Cookery'");
+
+$result =3D $suggestor->get_suggestions({search =3D> 'nt:Cookery'});
+
+is(scalar @$result, 0, "No suggestions for fielded search");
+
+$result =3D $suggestor->get_suggestions({search =3D> 'ccl=3Dsu:Cookery'});
+
+is(scalar @$result, 0, "No suggestions for CCL search");
+
+done_testing();
--=20
1.7.11.4


------=_Part_3872_9533057.1347300578501--


From tomascohen at gmail.com  Mon Sep 10 20:30:58 2012
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Mon, 10 Sep 2012 15:30:58 -0300
Subject: [Koha-patches] [PATCH] Bug 8750 - Chronological terms authorities
	not correctly indexed
Message-ID: <1347301858-25356-1-git-send-email-tomascohen@gmail.com>

There was no entry in authority's record.abs for indexing chronological terms.
They ccouldn't be searched and (obviously) linked.

I've added those entries using the index names defined in authorities/etc/bib1.att

Regards
To+

Sponsored-by: Universidad Nacional de C?rdoba
---
 .../marc_defs/marc21/authorities/record.abs        |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/etc/zebradb/marc_defs/marc21/authorities/record.abs b/etc/zebradb/marc_defs/marc21/authorities/record.abs
index dcd2c24..e76107c 100644
--- a/etc/zebradb/marc_defs/marc21/authorities/record.abs
+++ b/etc/zebradb/marc_defs/marc21/authorities/record.abs
@@ -46,6 +46,12 @@ melm 130 Title-uniform:w,Title-uniform:p,Title-uniform:s,Heading:w,Heading:p,Hea
 melm 431 Title-uniform-see-from:w,Title-uniform-see-from:p,Title-uniform-see-from:s,See-from:w,See-from:p,See-from:s,Match:w,Match:p
 melm 531 Title-uniform-see-also-from:w,Title-uniform-see-also-from:p,Title-uniform-see-also-from:s,See-also-from:w,See-also-from:p,See-also-from:s,Match:w,Match:p
 
+# Chronological Term
+melm 148$a Chronological-term-heading:w,Chronological-term-heading:p,Chronological-term-heading:s,Chronological-term:w,Chronological-term:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s
+melm 148 Chronological-term:w,Chronological-term:p,Chronological-term:s,Heading:w,Heading:p,Heading:s
+melm 448 Chronological-term-see-from:w,Chronological-term-see-from:p,Chronological-term-see-from:s,See-from:w,See-from:p,See-from:s
+melm 548 Chronological-term-see-also-from:w,Chronological-term-see-also-from:p,Chronological-term-see-also-from:s,See-also-from:w,See-also-from:p,See-also-from:s
+
 # Topical Term
 melm 150$a Subject-topical-heading:w,Subject-topical-heading:p,Subject-topical-heading:s,Subject-topical:w,Subject-topical:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p
 melm 150 Subject-topical:w,Subject-topical:p,Subject-topical:s,Heading:w,Heading:p,Heading:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-- 
1.7.9.5


From matted-34813 at mypacks.net  Mon Sep 10 23:54:50 2012
From: matted-34813 at mypacks.net (matted-34813 at mypacks.net)
Date: Mon, 10 Sep 2012 16:54:50 -0500 (GMT-05:00)
Subject: [Koha-patches] SIGNED-OFF-Bug-8215-Course-Reserves
Message-ID: <29194467.1347314090885.JavaMail.root@wamui-june.atl.sa.earthlink.net>

This patch adds a new feature enabling course reserves.

- courses
- course-reserves (items reserved for courses)
- course-instructors (Teacher patron type)
- visibility in holdings views

Alot of work. Congratulations khall on your persistence.

wajasu

From colin.campbell at ptfs-europe.com  Tue Sep 11 20:09:37 2012
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Tue, 11 Sep 2012 19:09:37 +0100
Subject: [Koha-patches] [PATCH] Bug 8761 Dont inadvertantly use slices
Message-ID: <1347386977-12117-1-git-send-email-colin.campbell@ptfs-europe.com>

Assignment to a single element slice is better written
as a scalar - This generates a compile time warning as it
can lead to odd behaviour see perldiag for details
This corrects some cases which were added in a recent
commit
---
 C4/Circulation.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 8bd53b9..273c6f3 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -982,16 +982,16 @@ sub CanBookBeIssued {
         # Index points to the next value
         my $restrictionyear = 0;
         if (($take <= $#values) && ($take >= 0)){
-            $restrictionyear += @values[$take];
+            $restrictionyear += $values[$take];
         }
 
         if ($restrictionyear > 0) {
             if ( $borrower->{'dateofbirth'}  ) {
                 my @alloweddate =  split /-/,$borrower->{'dateofbirth'} ;
-                @alloweddate[0] += $restrictionyear;
+                $alloweddate[0] += $restrictionyear;
                 #Prevent runime eror on leap year (invalid date)
-                if ((@alloweddate[1] == 2) && (@alloweddate[2] == 29)) {
-                    @alloweddate[2] = 28;
+                if (($alloweddate[1] == 2) && ($alloweddate[2] == 29)) {
+                    $alloweddate[2] = 28;
                 }
 
                 if ( Date_to_Days(Today) <  Date_to_Days(@alloweddate) -1  ) {
-- 
1.7.12.146.g16d26b1


From melia at test.bywatersolutions.com  Tue Sep 11 23:44:57 2012
From: melia at test.bywatersolutions.com (Melia Meggs)
Date: Tue, 11 Sep 2012 16:44:57 -0500
Subject: [Koha-patches] [PATCH] Bug 7143: Adding Kathryn Tyree to the
	history and About page.
Message-ID: <1347399897-16036-1-git-send-email-melia@test.bywatersolutions.com>

---
 docs/history.txt                                 |    3 ++-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/history.txt b/docs/history.txt
index 4a58f9d..eb06f03 100644
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -627,4 +627,5 @@ July 3 2012	Mark Tompsett becomes the 186th developer to have a patch pushed
 July 7 2012	Stacey Walker becomes the 187th developer to have a patch pushed
 July 7 2012	Mirko Tietgen becomes the 188th developer to have a patch pushed
 July 22 2012	Koha 3.8.3 released	releases
-July 22 2012	Koha 3.6.7 released	releases
\ No newline at end of file
+July 22 2012	Koha 3.6.7 released	releases
+September 3 2012    Kathryn Tyree becomes the 189th developer to have a patch pushed
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 11d6834..742fbb0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -314,7 +314,8 @@
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692101577">Steve Tonnesen (early MARC work, Virtual Bookshelves concept, KohaCD)</a></li>
                 <li>Bruno Toumi</li>
                 <li>Andrei V. Toutoukine</li>
-                <li>Darrell Ulm</li>
+                <li>Kathryn Tyree</li>
+		<li>Darrell Ulm</li>
                 <li>Universidad ORT Uruguay (Ernesto Silva, Andres Tarallo)</li>
                 <li>Marc Veron</li>
                 <li>Aleksa Vujicic</li>
-- 
1.7.2.5


From srdjan at catalyst.net.nz  Wed Sep 12 03:20:09 2012
From: srdjan at catalyst.net.nz (Srdjan)
Date: Wed, 12 Sep 2012 13:20:09 +1200
Subject: [Koha-patches] [PATCH] bug_8034: Restored network printer
	maintenance and selection
In-Reply-To: <bug 8034>
References: <bug 8034>
Message-ID: <1347412809-20447-1-git-send-email-srdjan@catalyst.net.nz>

This patch is just for restoring printer maintenance and selection, not
for priting itself. It is just a preparation step.

* Added UsePrintQueues syspref. If set to No, no printer info will be
  displayed/used
* Database changes:
- printers table PRIMARY KEY is now printqueue. It is more natural. We
  should really have a synthetic id, but printqueue is good enough
- branches.branchprinter is a FOREIGN KEY to printers.printqueue
* Created C4::Auth::get_user_printer() function that will return
  appropriate printer. In order of preference:
- session selected
- logged in branch branchprinter
* Moved printer functions to C4::Printer
* Restored printer maint/selection in admin zone UsePrintQueues
  permitting
* Restored printer selection in circ/selectbranchprinter.pl
  UsePrintQueues permitting

Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
---
 C4/Auth.pm                                         |   49 +++++--
 C4/Context.pm                                      |    2 +-
 C4/Koha.pm                                         |   40 ------
 C4/Printer.pm                                      |  148 +++++++++++++++++++
 admin/branches.pl                                  |   30 ++--
 admin/printers.pl                                  |  152 ++++++++++----------
 circ/circulation.pl                                |   12 +-
 circ/returns.pl                                    |    8 --
 circ/selectbranchprinter.pl                        |   49 ++++---
 installer/data/mysql/kohastructure.sql             |   16 ++-
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |   12 ++
 .../intranet-tmpl/prog/en/includes/admin-menu.inc  |    1 +
 .../intranet-tmpl/prog/en/includes/header.inc      |    3 +
 .../prog/en/modules/admin/admin-home.tt            |    4 +-
 .../prog/en/modules/admin/branches.tt              |   20 +--
 .../en/modules/admin/preferences/circulation.pref  |    6 +
 .../prog/en/modules/admin/printers.tt              |   33 +----
 .../prog/en/modules/circ/circulation.tt            |    2 -
 .../prog/en/modules/circ/selectbranchprinter.tt    |    5 +-
 t/db_dependent/lib/KohaTest/Koha.pm                |    2 -
 t/db_dependent/lib/KohaTest/Printer.pm             |   26 ++++
 22 files changed, 393 insertions(+), 228 deletions(-)
 create mode 100644 C4/Printer.pm
 create mode 100644 t/db_dependent/lib/KohaTest/Printer.pm

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 59c9955..71abfb3 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -28,6 +28,7 @@ require Exporter;
 use C4::Context;
 use C4::Templates;    # to get the template
 use C4::Branch; # GetBranches
+use C4::Printer qw(GetPrinterDetails);
 use C4::VirtualShelves;
 use POSIX qw/strftime/;
 use List::MoreUtils qw/ any /;
@@ -46,7 +47,8 @@ BEGIN {
     $debug       = $ENV{DEBUG};
     @ISA         = qw(Exporter);
     @EXPORT      = qw(&checkauth &get_template_and_user &haspermission &get_user_subpermissions);
-    @EXPORT_OK   = qw(&check_api_auth &get_session &check_cookie_auth &checkpw &get_all_subpermissions &get_user_subpermissions);
+    @EXPORT_OK   = qw(&check_api_auth &get_session &check_cookie_auth &checkpw
+                      &get_all_subpermissions &get_user_subpermissions &get_user_printer);
     %EXPORT_TAGS = ( EditPermissions => [qw(get_all_subpermissions get_user_subpermissions)] );
     $ldap        = C4::Context->config('useldapserver') || 0;
     $cas         = C4::Context->preference('casAuthentication');
@@ -310,6 +312,9 @@ sub get_template_and_user {
         $template->param(dateformat_iso => 1);
     }
 
+    my $userenv = C4::Context->userenv;
+    my $userenv_branch = $userenv ? $userenv->{"branch"} : undef;
+
     # these template parameters are set the same regardless of $in->{'type'}
     $template->param(
             "BiblioDefaultView".C4::Context->preference("BiblioDefaultView")         => 1,
@@ -317,9 +322,9 @@ sub get_template_and_user {
             GoogleJackets                => C4::Context->preference("GoogleJackets"),
             OpenLibraryCovers            => C4::Context->preference("OpenLibraryCovers"),
             KohaAdminEmailAddress        => "" . C4::Context->preference("KohaAdminEmailAddress"),
-            LoginBranchcode              => (C4::Context->userenv?C4::Context->userenv->{"branch"}:"insecure"),
-            LoginFirstname               => (C4::Context->userenv?C4::Context->userenv->{"firstname"}:"Bel"),
-            LoginSurname                 => C4::Context->userenv?C4::Context->userenv->{"surname"}:"Inconnu",
+            LoginBranchcode              => ($userenv?$userenv_branch:"insecure"),
+            LoginFirstname               => ($userenv?$userenv->{"firstname"}:"Bel"),
+            LoginSurname                 => $userenv?$userenv->{"surname"}:"Inconnu",
             TagsEnabled                  => C4::Context->preference("TagsEnabled"),
             hide_marc                    => C4::Context->preference("hide_marc"),
             item_level_itypes            => C4::Context->preference('item-level_itypes'),
@@ -344,7 +349,7 @@ sub get_template_and_user {
             IntranetNav                 => C4::Context->preference("IntranetNav"),
             IntranetmainUserblock       => C4::Context->preference("IntranetmainUserblock"),
             LibraryName                 => C4::Context->preference("LibraryName"),
-            LoginBranchname             => (C4::Context->userenv?C4::Context->userenv->{"branchname"}:"insecure"),
+            LoginBranchname             => ($userenv?$userenv->{"branchname"}:"insecure"),
             advancedMARCEditor          => C4::Context->preference("advancedMARCEditor"),
             canreservefromotherbranches => C4::Context->preference('canreservefromotherbranches'),
             intranetcolorstylesheet     => C4::Context->preference("intranetcolorstylesheet"),
@@ -364,6 +369,14 @@ sub get_template_and_user {
             AllowMultipleCovers         => C4::Context->preference('AllowMultipleCovers'),
             EnableBorrowerFiles         => C4::Context->preference('EnableBorrowerFiles'),
         );
+        if ( C4::Context->preference('UsePrintQueues') ) {
+            my $printer = get_user_printer();
+            my $printer_rec = $printer ? GetPrinterDetails($printer) : {};
+            $template->param(
+                UsePrintQueues          => 1,
+                PrinterName             => $printer_rec->{printername},
+            );
+        }
     }
     else {
         warn "template type should be OPAC, here it is=[" . $in->{'type'} . "]" unless ( $in->{'type'} eq 'opac' );
@@ -382,8 +395,8 @@ sub get_template_and_user {
         my $opac_name = '';
         if (($opac_search_limit =~ /branch:(\w+)/ && $opac_limit_override) || $in->{'query'}->param('limit') =~ /branch:(\w+)/){
             $opac_name = $1;   # opac_search_limit is a branch, so we use it.
-        } elsif (C4::Context->preference("SearchMyLibraryFirst") && C4::Context->userenv && C4::Context->userenv->{'branch'}) {
-            $opac_name = C4::Context->userenv->{'branch'};
+        } elsif (C4::Context->preference("SearchMyLibraryFirst") && $userenv_branch) {
+            $opac_name = $userenv_branch
         }
         $template->param(
             opaccolorstylesheet       => C4::Context->preference("opaccolorstylesheet"),
@@ -393,7 +406,7 @@ sub get_template_and_user {
             CalendarFirstDayOfWeek      => (C4::Context->preference("CalendarFirstDayOfWeek") eq "Sunday")?0:1,
             LibraryName               => "" . C4::Context->preference("LibraryName"),
             LibraryNameTitle          => "" . $LibraryNameTitle,
-            LoginBranchname           => C4::Context->userenv?C4::Context->userenv->{"branchname"}:"",
+            LoginBranchname           => $userenv?$userenv->{"branchname"}:"",
             OPACAmazonCoverImages     => C4::Context->preference("OPACAmazonCoverImages"),
             OPACFRBRizeEditions       => C4::Context->preference("OPACFRBRizeEditions"),
             OpacHighlightedWords       => C4::Context->preference("OpacHighlightedWords"),
@@ -424,7 +437,7 @@ sub get_template_and_user {
             RequestOnOpac             => C4::Context->preference("RequestOnOpac"),
             'Version'                 => C4::Context->preference('Version'),
             hidelostitems             => C4::Context->preference("hidelostitems"),
-            mylibraryfirst            => (C4::Context->preference("SearchMyLibraryFirst") && C4::Context->userenv) ? C4::Context->userenv->{'branch'} : '',
+            mylibraryfirst            => (C4::Context->preference("SearchMyLibraryFirst") && $userenv) ? $userenv_branch : '',
             opaclayoutstylesheet      => "" . C4::Context->preference("opaclayoutstylesheet"),
             opacbookbag               => "" . C4::Context->preference("opacbookbag"),
             opaccredits               => "" . C4::Context->preference("opaccredits"),
@@ -1644,8 +1657,24 @@ sub getborrowernumber {
     return 0;
 }
 
+=head2 get_user_printer
+
+  $printer = get_user_printer();
+
+  Returns printer queue that is to be used for the logged in user
+
+=cut
+
+sub get_user_printer {
+    my $userenv = C4::Context->userenv or return;
+    if (my $printer = $userenv->{branchprinter}) {
+        return $printer;
+    }
+    my $branchname = $userenv->{branch} or return;
+    my $branch = GetBranchDetail($branchname) or return;
+    return $branch->{branchprinter};
+}
 
-END { }    # module clean-up code here (global destructor)
 1;
 __END__
 
diff --git a/C4/Context.pm b/C4/Context.pm
index 0a56aa8..7835497 100644
--- a/C4/Context.pm
+++ b/C4/Context.pm
@@ -978,7 +978,7 @@ sub userenv {
 =head2 set_userenv
 
   C4::Context->set_userenv($usernum, $userid, $usercnum, $userfirstname, 
-                  $usersurname, $userbranch, $userflags, $emailaddress);
+                  $usersurname, $userbranch, $userflags, $emailaddress, $branchprinter);
 
 Establish a hash of user environment variables.
 
diff --git a/C4/Koha.pm b/C4/Koha.pm
index 26106cf..1e1a412 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -39,7 +39,6 @@ BEGIN {
 	@EXPORT = qw(
 		&slashifyDate
 		&subfield_is_koha_internal_p
-		&GetPrinters &GetPrinter
 		&GetItemTypes &getitemtypeinfo
 		&GetCcodes
 		&GetSupportName &GetSupportList
@@ -600,45 +599,6 @@ sub getImageSets {
     return \@imagesets;
 }
 
-=head2 GetPrinters
-
-  $printers = &GetPrinters();
-  @queues = keys %$printers;
-
-Returns information about existing printer queues.
-
-C<$printers> is a reference-to-hash whose keys are the print queues
-defined in the printers table of the Koha database. The values are
-references-to-hash, whose keys are the fields in the printers table.
-
-=cut
-
-sub GetPrinters {
-    my %printers;
-    my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare("select * from printers");
-    $sth->execute;
-    while ( my $printer = $sth->fetchrow_hashref ) {
-        $printers{ $printer->{'printqueue'} } = $printer;
-    }
-    return ( \%printers );
-}
-
-=head2 GetPrinter
-
-  $printer = GetPrinter( $query, $printers );
-
-=cut
-
-sub GetPrinter ($$) {
-    my ( $query, $printers ) = @_;    # get printer for this query from printers
-    my $printer = $query->param('printer');
-    my %cookie = $query->cookie('userenv');
-    ($printer) || ( $printer = $cookie{'printer'} ) || ( $printer = '' );
-    ( $printers->{$printer} ) || ( $printer = ( keys %$printers )[0] );
-    return $printer;
-}
-
 =head2 getnbpages
 
 Returns the number of pages to display in a pagination bar, given the number
diff --git a/C4/Printer.pm b/C4/Printer.pm
new file mode 100644
index 0000000..0990bad
--- /dev/null
+++ b/C4/Printer.pm
@@ -0,0 +1,148 @@
+#!/usr/bin/perl
+
+package C4::Printer;
+
+# Copyright 2012 Catalyst IT
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use strict;
+use warnings;
+
+use C4::Context;
+
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
+
+BEGIN {
+    $VERSION = 3.07.00.049;
+    require Exporter;
+    @ISA    = qw(Exporter);
+    @EXPORT = qw(
+    );
+    @EXPORT_OK = qw(
+        &GetPrinters &SearchPrinters &GetPrinterDetails
+        &AddPrinter &UpdatePrinter &DeletePrinter
+    );
+}
+
+=head1 NAME
+
+C4::Printer - functions that deal with printer selection
+
+=head1 SYNOPSIS
+
+  use C4::Printer;
+
+=head1 DESCRIPTION
+
+This module provides functions to select printer for slips etc.
+
+TODO: Move SQL from admin/printers.pl to this module
+
+=head1 FUNCTIONS
+
+=head2 GetPrinters
+
+  $printers = &GetPrinters();
+  @queues = keys %$printers;
+
+Returns information about existing printer queues.
+
+C<$printers> is a reference-to-hash whose keys are the print queues
+defined in the printers table of the Koha database. The values are
+references-to-hash, whose keys are the fields in the printers table.
+
+=cut
+
+sub GetPrinters {
+    my %printers;
+    my $dbh = C4::Context->dbh;
+    my $sth = $dbh->prepare("select * from printers");
+    $sth->execute;
+    while ( my $printer = $sth->fetchrow_hashref ) {
+        $printers{ $printer->{'printqueue'} } = $printer;
+    }
+    return ( \%printers );
+}
+
+=head2 SearchPrinters
+
+  $printers = SearchPrinters( $searchstring );
+
+=cut
+
+sub SearchPrinters {
+    my ($searchstring)=@_;
+    $searchstring .= '%';
+    return C4::Context->dbh->selectall_arrayref("
+        SELECT * FROM printers 
+        WHERE printername like ? OR printqueue like ? ORDER BY printername
+        ", {Slice => {}}, $searchstring, $searchstring);
+}
+
+=head2 GetPrinterDetails
+
+  $printer_rec = GetPrinterDetails( $printqueue );
+
+=cut
+
+sub GetPrinterDetails {
+    my ( $printer ) = @_;
+    my $dbh = C4::Context->dbh;
+    my $printername = $dbh->selectrow_hashref('SELECT * FROM printers WHERE printqueue = ?', undef, $printer);
+    return $printername;
+}
+
+=head2 AddPrinter
+
+  AddPrinter( $data );
+
+=cut
+
+sub AddPrinter {
+    my ( $data ) = @_;
+    my $dbh = C4::Context->dbh;
+    $dbh->do("INSERT INTO printers (printername,printqueue,printtype) VALUES (?,?,?)", undef,
+        $data->{printername}, $data->{printqueue}, $data->{printtype});
+}
+
+=head2 UpdatePrinter
+
+  UpdatePrinter( $printqueue, $data );
+
+=cut
+
+sub UpdatePrinter {
+    my ( $printqueue, $data ) = @_;
+    my $dbh = C4::Context->dbh;
+    $dbh->do("UPDATE printers SET printqueue = ?, printername = ?, printtype = ? WHERE printqueue = ?", undef,
+        $data->{printqueue}, $data->{printername}, $data->{printtype}, $printqueue);
+}
+
+=head2 DeletePrinter
+
+  DeletePrinter( $printqueue );
+
+=cut
+
+sub DeletePrinter {
+    my ( $printqueue ) = @_;
+    my $dbh = C4::Context->dbh;
+    $dbh->do("DELETE FROM printers WHERE printqueue = ?", undef,
+        $printqueue);
+}
+
+1;
diff --git a/admin/branches.pl b/admin/branches.pl
index d172ea6..3671f43 100755
--- a/admin/branches.pl
+++ b/admin/branches.pl
@@ -45,6 +45,7 @@ use C4::Context;
 use C4::Output;
 use C4::Koha;
 use C4::Branch;
+use C4::Printer qw(GetPrinters);
 
 # Fixed variables
 my $script_name = "/cgi-bin/koha/admin/branches.pl";
@@ -226,12 +227,9 @@ sub default {
 
 sub editbranchform {
     my ($branchcode,$innertemplate) = @_;
-    # initiate the scrolling-list to select the printers
-    my $printers = GetPrinters();
-    my @printerloop;
+
     my $data;
     my $oldprinter = "";
-
     if ($branchcode) {
         $data = GetBranchInfo($branchcode);
         $data = $data->[0];
@@ -241,15 +239,21 @@ sub editbranchform {
         _branch_to_template($data, $innertemplate);
     }
 
-    foreach my $thisprinter ( keys %$printers ) {
-        push @printerloop, {
-            value         => $thisprinter,
-            selected      => ( $oldprinter eq $printers->{$thisprinter} ),
-            branchprinter => $printers->{$thisprinter}->{'printqueue'},
-        };
+    if ( C4::Context->preference('UsePrintQueues') ) {
+        # initiate the scrolling-list to select the printers
+        my $printers = GetPrinters();
+        my @printerloop;
+        foreach my $thisprinter ( keys %$printers ) {
+            push @printerloop, {
+                value         => $thisprinter,
+                selected      => ( $oldprinter eq $thisprinter ),
+                branchprinter => $printers->{$thisprinter}->{'printername'},
+            };
+        }
+
+        $innertemplate->param( printerloop => \@printerloop );
     }
 
-    $innertemplate->param( printerloop => \@printerloop );
     # make the checkboxes.....
     #
     # We export a "categoryloop" array to the template, each element of which
@@ -308,6 +312,7 @@ sub branchinfotable {
 
     my ($branchcode,$innertemplate) = @_;
     my $branchinfo = $branchcode ? GetBranchInfo($branchcode) : GetBranchInfo();
+    my $printers = GetPrinters();
     my @loop_data = ();
     foreach my $branch (@$branchinfo) {
         #
@@ -367,6 +372,9 @@ sub branchinfotable {
         $row{'branch_name'} = $branch->{'branchname'};
         $row{'branch_code'} = $branch->{'branchcode'};
         $row{'value'}       = $branch->{'branchcode'};
+        if (my $printer = $branch->{'branchprinter'}) {
+            $row{'branchprintername'} = $printers->{$printer}->{'printername'};
+        }
 
         push @loop_data, \%row;
     }
diff --git a/admin/printers.pl b/admin/printers.pl
index c7e7492..12e42d7 100755
--- a/admin/printers.pl
+++ b/admin/printers.pl
@@ -7,17 +7,17 @@
 # ALGO :
 # this script use an $op to know what to do.
 # if $op is empty or none of the above values,
-#	- the default screen is build (with all records, or filtered datas).
-#	- the   user can clic on add, modify or delete record.
+#    - the default screen is build (with all records, or filtered datas).
+#    - the   user can clic on add, modify or delete record.
 # if $op=add_form
-#	- if primkey exists, this is a modification,so we read the $primkey record
-#	- builds the add/modify form
+#    - if primkey exists, this is a modification,so we read the $primkey record
+#    - builds the add/modify form
 # if $op=add_validate
-#	- the user has just send datas, so we create/modify the record
+#    - the user has just send datas, so we create/modify the record
 # if $op=delete_form
-#	- we show the record having primkey=$primkey and ask for deletion validation form
+#    - we show the record having primkey=$primkey and ask for deletion validation form
 # if $op=delete_confirm
-#	- we delete the record having primkey=$primkey
+#    - we delete the record having primkey=$primkey
 
 
 # Copyright 2000-2002 Katipo Communications
@@ -43,19 +43,7 @@ use CGI;
 use C4::Context;
 use C4::Output;
 use C4::Auth;
-
-sub StringSearch  {
-	my ($searchstring,$type)=@_;		# why bother with $type if we don't use it?!
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $sth = C4::Context->dbh->prepare("
-		SELECT printername,printqueue,printtype from printers 
-		WHERE (printername like ?) order by printername
-	");
-	$sth->execute("$data[0]%");
-	my $data=$sth->fetchall_arrayref({});
-	return (scalar(@$data),$data);
-}
+use C4::Printer qw(GetPrinterDetails SearchPrinters AddPrinter UpdatePrinter DeletePrinter);
 
 my $input = new CGI;
 my $searchfield=$input->param('searchfield');
@@ -68,83 +56,95 @@ my $op = $input->param('op');
 $searchfield=~ s/\,//g;
 
 my ($template, $loggedinuser, $cookie) = get_template_and_user({
-	   template_name => "admin/printers.tmpl",
-			   query => $input,
-			 	type => "intranet",
-	 authnotrequired => 0,
+       template_name => "admin/printers.tmpl",
+               query => $input,
+                type => "intranet",
+     authnotrequired => 0,
        flagsrequired => {parameters => 'parameters_remaining_permissions'},
-		       debug => 1,
+               debug => 1,
 });
 
-$template->param(searchfield => $searchfield,
-		 script_name => $script_name);
-
 #start the page and read in includes
 
 my $dbh = C4::Context->dbh;
+my $list_printers = 1;
 ################## ADD_FORM ##################################
 # called by default. Used to create form to add or  modify a record
 if ($op eq 'add_form') {
-	$template->param(add_form => 1);
-	#---- if primkey exists, it's a modify action, so read values to modify...
-	my $data;
-	if ($searchfield) {
-		my $sth=$dbh->prepare("SELECT printername,printqueue,printtype from printers where printername=?");
-		$sth->execute($searchfield);
-		$data=$sth->fetchrow_hashref;
-	}
-
-	$template->param(printqueue => $data->{'printqueue'},
-			 printtype => $data->{'printtype'});
-													# END $OP eq ADD_FORM
+    $list_printers = 0;
+    $template->param(add_form => 1);
+    #---- if primkey exists, it's a modify action, so read values to modify...
+    my $data;
+    if ($searchfield) {
+        $data=GetPrinterDetails($searchfield);
+    }
+
+    $template->param(
+        printqueue => $data->{'printqueue'},
+        printername => $data->{'printername'},
+        printtype => $data->{'printtype'}
+    );
+# END $OP eq ADD_FORM
 ################## ADD_VALIDATE ##################################
 # called by add_form, used to insert/modify data in DB
 } elsif ($op eq 'add_validate') {
-	$template->param(add_validate => 1);
-	if ($input->param('add')){
-		my $sth=$dbh->prepare("INSERT INTO printers (printername,printqueue,printtype) VALUES (?,?,?)");
-		$sth->execute($input->param('printername'),$input->param('printqueue'),$input->param('printtype'));
-	} else {
-		my $sth=$dbh->prepare("UPDATE printers SET printqueue=?,printtype=? WHERE printername=?");
-		$sth->execute($input->param('printqueue'),$input->param('printtype'),$input->param('printername'));
-	}
-													# END $OP eq ADD_VALIDATE
+    my $params = $input->Vars;
+    if ($input->param('add')){
+        AddPrinter($params);
+    } else {
+        UpdatePrinter($searchfield, $params);
+    }
+    $template->param(add_validate => 1);
+    $searchfield = '';
+# END $OP eq ADD_VALIDATE
 ################## DELETE_CONFIRM ##################################
 # called by default form, used to confirm deletion of data in DB
 } elsif ($op eq 'delete_confirm') {
-	$template->param(delete_confirm => 1);
-	my $sth=$dbh->prepare("select printername,printqueue,printtype from printers where printername=?");
-	$sth->execute($searchfield);
-	my $data=$sth->fetchrow_hashref;
-	$template->param(printqueue => $data->{'printqueue'},
-			 printtype  => $data->{'printtype'});
-													# END $OP eq DELETE_CONFIRM
+    $list_printers = 0;
+    $template->param(delete_confirm => 1);
+    my $data=GetPrinterDetails($searchfield);
+    $template->param(
+        printqueue => $data->{'printqueue'},
+        printtype  => $data->{'printtype'},
+    );
+# END $OP eq DELETE_CONFIRM
 ################## DELETE_CONFIRMED ##################################
 # called by delete_confirm, used to effectively confirm deletion of data in DB
 } elsif ($op eq 'delete_confirmed') {
-	$template->param(delete_confirmed => 1);
-	my $sth=$dbh->prepare("delete from printers where printername=?");
-	$sth->execute($searchfield);
-													# END $OP eq DELETE_CONFIRMED
+    # XXX Delete can fail
+    DeletePrinter($searchfield);
+    $template->param(delete_confirmed => 1);
+    $template->param(list_printers => 1);
+    $searchfield = '';
+# END $OP eq DELETE_CONFIRMED
 ################## DEFAULT ###########################################
 } else { # DEFAULT
-	$template->param(else => 1);
-	my ($count,$results)=StringSearch($searchfield,'web');
-	my $max = ($offset+$pagesize < $count) ? $offset+$pagesize : $count;
-	my @loop = (@$results)[$offset..$max];
-	
-	$template->param(loop => \@loop);
-	
-	if ($offset>0) {
-		$template->param(offsetgtzero => 1,
-				 prevpage => $offset-$pagesize);
-	}
-	if ($offset+$pagesize<$count) {
-		$template->param(ltcount => 1,
-				 nextpage => $offset+$pagesize);
-	}
-
+    $searchfield ||= $input->param('description') || "";
 } #---- END $OP eq DEFAULT
 
+if ($list_printers) {
+    $template->param(list_printers => 1);
+    my $results=SearchPrinters($searchfield);
+    my $count = $results ? scalar(@$results) : 0;
+    my $max = ($offset+$pagesize < $count) ? $offset+$pagesize : $count;
+    my @loop = (@$results)[$offset..$max-1];
+    
+    $template->param(loop => \@loop);
+    
+    if ($offset>0) {
+        $template->param(offsetgtzero => 1,
+                 prevpage => $offset-$pagesize);
+    }
+    if ($offset+$pagesize<$count) {
+        $template->param(ltcount => 1,
+                 nextpage => $offset+$pagesize);
+    }
+}
+
+$template->param(
+    searchfield => $searchfield,
+    script_name => $script_name
+);
+
 output_html_with_http_headers $input, $cookie, $template->output;
 
diff --git a/circ/circulation.pl b/circ/circulation.pl
index 78ac1a4..54138ef 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -29,7 +29,7 @@ use C4::Print;
 use C4::Auth qw/:DEFAULT get_session/;
 use C4::Dates qw/format_date/;
 use C4::Branch; # GetBranches
-use C4::Koha;   # GetPrinter
+use C4::Koha;
 use C4::Circulation;
 use C4::Overdues qw/CheckBorrowerDebarred/;
 use C4::Members;
@@ -67,12 +67,6 @@ if ($branch){
     $session->param('branchname', GetBranchName($branch));
 }
 
-my $printer = $query->param('printer');
-if ($printer){
-    # update our session so the userenv is updated
-    $session->param('branchprinter', $printer);
-}
-
 if (!C4::Context->userenv && !$branch){
     if ($session->param('branch') eq 'NO_LIBRARY_SET'){
         # no branch set we can't issue
@@ -102,8 +96,6 @@ $findborrower =~ s|,| |g;
 my $borrowernumber = $query->param('borrowernumber');
 
 $branch  = C4::Context->userenv->{'branch'};  
-$printer = C4::Context->userenv->{'branchprinter'};
-
 
 # If AutoLocation is not activated, we show the Circulation Parameters to chage settings of librarian
 if (C4::Context->preference("AutoLocation") != 1) {
@@ -665,8 +657,6 @@ $template->param(
     borrowernumber    => $borrowernumber,
     branch            => $branch,
     branchname        => GetBranchName($borrower->{'branchcode'}),
-    printer           => $printer,
-    printername       => $printer,
     firstname         => $borrower->{'firstname'},
     surname           => $borrower->{'surname'},
     showname          => $borrower->{'showname'},
diff --git a/circ/returns.pl b/circ/returns.pl
index 743bf18..0efa712 100755
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -36,7 +36,6 @@ use C4::Context;
 use C4::Auth qw/:DEFAULT get_session/;
 use C4::Output;
 use C4::Circulation;
-use C4::Print;
 use C4::Reserves;
 use C4::Biblio;
 use C4::Items;
@@ -73,15 +72,10 @@ my ( $template, $librarian, $cookie ) = get_template_and_user(
 #####################
 #Global vars
 my $branches = GetBranches();
-my $printers = GetPrinters();
 
-my $printer = C4::Context->userenv ? C4::Context->userenv->{'branchprinter'} : "";
 my $overduecharges = (C4::Context->preference('finesMode') && C4::Context->preference('finesMode') ne 'off');
 
 my $userenv_branch = C4::Context->userenv->{'branch'} || '';
-#
-# Some code to handle the error if there is no branch or printer setting.....
-#
 
 # Set up the item stack ....
 my %returneditems;
@@ -601,9 +595,7 @@ foreach ( sort { $a <=> $b } keys %returneditems ) {
 $template->param(
     riloop         => \@riloop,
     genbrname      => $branches->{$userenv_branch}->{'branchname'},
-    genprname      => $printers->{$printer}->{'printername'},
     branchname     => $branches->{$userenv_branch}->{'branchname'},
-    printer        => $printer,
     errmsgloop     => \@errmsgloop,
     exemptfine     => $exemptfine,
     dropboxmode    => $dropboxmode,
diff --git a/circ/selectbranchprinter.pl b/circ/selectbranchprinter.pl
index b5adcfc..67034b7 100755
--- a/circ/selectbranchprinter.pl
+++ b/circ/selectbranchprinter.pl
@@ -23,10 +23,10 @@ use CGI;
 
 use C4::Context;
 use C4::Output;
-use C4::Auth qw/:DEFAULT get_session/;
-use C4::Print;  # GetPrinters
+use C4::Auth qw/:DEFAULT get_session get_user_printer/;
 use C4::Koha;
 use C4::Branch; # GetBranches GetBranchesLoop
+use C4::Printer qw(GetPrinters);
 
 # this will be the script that chooses branch and printer settings....
 
@@ -56,9 +56,10 @@ my $userenv_printer = C4::Context->userenv->{'branchprinter'} || '';
 my @updated;
 
 # $session lddines here are doing the updating
-if ($branch and $branches->{$branch}) {
+my $branch_rec = $branch ? $branches->{$branch} : undef;
+if ($branch_rec) {
     if (! $userenv_branch or $userenv_branch ne $branch ) {
-        my $branchname = GetBranchName($branch);
+        my $branchname = $branch_rec->{branchname};
         $template->param(LoginBranchname => $branchname);   # update template for new branch
         $template->param(LoginBranchcode => $branch);       # update template for new branch
         $session->param('branchname', $branchname);         # update sesssion in DB
@@ -67,6 +68,8 @@ if ($branch and $branches->{$branch}) {
             updated_branch => 1,
                 old_branch => $userenv_branch,
         };
+        $printer ||= $branch_rec->{branchprinter};
+        undef $userenv_printer;
     } # else branch the same, no update
 } else {
     $branch = $userenv_branch;  # fallback value
@@ -87,7 +90,7 @@ if ($printer) {
         };
     } # else printer is the same, no update
 } else {
-    $printer = $userenv_printer;  # fallback value
+    $printer = get_user_printer();  # fallback value
 }
 
 $template->param(updated => \@updated) if (scalar @updated);
@@ -96,21 +99,6 @@ unless ($branches->{$branch}) {
     $branch = (keys %$branches)[0];  # if branch didn't really exist, then replace it w/ one that does
 }
 
-my @printkeys = sort keys %$printers;
-if (scalar(@printkeys) == 1 or not $printers->{$printer}) {
-    $printer = $printkeys[0];   # if printer didn't really exist, or there is only 1 anyway, then replace it w/ one that does
-}
-
-my @printerloop;
-foreach ( @printkeys ) {
-    next unless ($_); # skip printer if blank.
-    push @printerloop, {
-        selected => ( $_ eq $printer ),
-        name     => $printers->{$_}->{'printername'},
-        value    => $_,
-    };
-}
-
 my @recycle_loop;
 foreach ($query->param()) {
     $_ or next;                   # disclude blanks
@@ -133,9 +121,28 @@ if (scalar @updated and not scalar @recycle_loop) {
 
 $template->param(
     referer     => $referer,
-    printerloop => \@printerloop,
     branchloop  => GetBranchesLoop($branch),
     recycle_loop=> \@recycle_loop,
 );
 
+if ( C4::Context->preference('UsePrintQueues') ) {
+    my @printkeys = keys %$printers;
+    if (scalar(@printkeys) == 1 or not $printers->{$printer}) {
+        $printer = $printkeys[0];   # if printer didn't really exist, or there is only 1 anyway, then replace it w/ one that does
+    }
+
+    my @printerloop;
+    foreach ( @printkeys ) {
+        push @printerloop, {
+            selected => ( $_ eq $printer ),
+            name     => $printers->{$_}->{'printername'},
+            value    => $_,
+        };
+    }
+
+    $template->param(
+        printerloop => \@printerloop,
+    );
+}
+
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 91d42a2..048a7ea 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -364,10 +364,11 @@ CREATE TABLE `branches` ( -- information about your libraries or branches are st
   `branchurl` mediumtext, -- the URL for your library or branch's website
   `issuing` tinyint(4) default NULL, -- unused in Koha
   `branchip` varchar(15) default NULL, -- the IP address for your library or branch
-  `branchprinter` varchar(100) default NULL, -- unused in Koha
+  `branchprinter` varchar(20) default NULL,
   `branchnotes` mediumtext, -- notes related to your library or branch
   opac_info text, -- HTML that displays in OPAC
   PRIMARY KEY (`branchcode`)
+  FOREIGN KEY (branchprinter) REFERENCES printers (printqueue) ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
@@ -1570,12 +1571,13 @@ CREATE TABLE `pending_offline_operations` (
 -- Table structure for table `printers`
 --
 
-DROP TABLE IF EXISTS `printers`;
-CREATE TABLE `printers` (
-  `printername` varchar(40) NOT NULL default '',
-  `printqueue` varchar(20) default NULL,
-  `printtype` varchar(20) default NULL,
-  PRIMARY KEY  (`printername`)
+DROP TABLE IF EXISTS printers;
+CREATE TABLE printers (
+  printername varchar(40) NOT NULL default '',
+  printqueue varchar(20) NOT NULL,
+  printtype varchar(20) default NULL,
+  PRIMARY KEY  (printqueue),
+  UNIQUE (printername)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 35f92cc..f21b071 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -366,6 +366,7 @@ INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES (
 INSERT INTO systempreferences (variable,value,explanation,type) VALUES('EnableBorrowerFiles','0','If enabled, allows librarians to upload and attach arbitrary files to a borrower record.','YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('UpdateTotalIssuesOnCirc','0','Whether to update the totalissues field in the biblio on each circ.',NULL,'YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('IntranetSlipPrinterJS','','Use this JavaScript for printing slips. Define at least function printThenClose(). For use e.g. with Firefox PlugIn jsPrintSetup, see http://jsprintsetup.mozdev.org/','','Free');
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('UsePrintQueues','0',NULL,NULL,'YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacSuppressionByIPRange','','Restrict the suppression to IP adresses outside of the IP range','','free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('PrefillItem','0','When a new item is added, should it be prefilled with last created item values?','','YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('SubfieldsToUseWhenPrefill','','Define a list of subfields to use when prefilling items (separated by space)','','Free');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 25cd367..3649a78 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -5696,6 +5696,18 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion($DBversion);
 }
 
+
+
+$DBversion = "3.09.00.XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    $dbh->do("ALTER TABLE printers DROP PRIMARY KEY, MODIFY printqueue varchar(20) NOT NULL PRIMARY KEY, ADD UNIQUE (printername)");
+    $dbh->do("ALTER TABLE branches MODIFY branchprinter varchar(20) NULL, ADD FOREIGN KEY (branchprinter) REFERENCES printers (printqueue) ON UPDATE CASCADE");
+    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('UsePrintQueues','0',NULL,NULL,'YesNo')");
+
+    print "Upgrade to $DBversion done (Add borrowers.default_printqueue and 'UsePrintQueues' syspref)\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
index 72162d3..7da6f1f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
@@ -59,6 +59,7 @@
 <h5>Additional parameters</h5>
 
 <ul>
+    [% IF UsePrintQueues %]<li><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></li>[% END %]
     [% IF ( NoZebra ) %]<li><a href="/cgi-bin/koha/admin/stopwords.pl">Stop words</a></li>[% END %]
 	<!-- <li><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></li> -->
     <li><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 client targets</a></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 3d71d45..7d3aa24 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -57,6 +57,9 @@
                 [% LoginBranchname %]
             [% END %]
             </strong>
+            [% IF UsePrintQueues && PrinterName %]
+            - [% PrinterName %]
+            [% END %]
             [% IF ( IndependantBranches ) %]
                 [% IF ( CAN_user_management || CAN_user_editcatalogue_edit_catalogue ) %]
                     ( <a class="toplinks" href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a> )
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
index 3906c46..d2e0fc5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
@@ -101,8 +101,8 @@
 <dl>
 	[% IF ( NoZebra ) %]<dt><a href="/cgi-bin/koha/admin/stopwords.pl">Stop words</a></dt>
 	<dd>Words ignored during search.</dd>[% END %]
-	<!-- <dt><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></dt>
-	<dd>Printers (UNIX paths).</dd> -->
+   [% IF UsePrintQueues %]<dt><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></dt>
+ <dd>Printers (UNIX paths).</dd>[% END %]
     <dt><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 client targets</a></dt>
 	<dd>Define which servers to query for MARC data in the integrated Z39.50 client.</dd>
 </dl>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
index 15e8064..bcb918f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
@@ -143,10 +143,10 @@ tinyMCE.init({
         <li><label for="branchurl">URL</label><input type="text" name="branchurl" id="branchurl" value="[% branchurl |html %]" /></li>
         <li><label for="opac_info">OPAC info</label><textarea name="opac_info" id="opac_info">[% opac_info |html %]</textarea></li>
         <li><label for="branchip">IP</label><input type="text" name="branchip" id="branchip" value="[% branchip |html %]" /> <span class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</span></li>
-		<!--
-        <li><label for="branchprinter">Library Printer</label>
+[% IF UsePrintQueues %]
+        <li><label for="branchprinter">Library printer</label>
             <select id="branchprinter" name="branchprinter">
-                <option value="">None</option>
+                <option value="">(None)</option>
             [% FOREACH printerloo IN printerloop %]
                 [% IF ( printerloo.selected ) %]
 				<option value="[% printerloo.value %]" selected="selected">[% printerloo.branchprinter %]</option>
@@ -155,7 +155,7 @@ tinyMCE.init({
 				[% END %]
                 [% END %]
             </select></li>
-			-->
+[% END %]
         <li><label for="branchnotes">Notes</label><input type="text" name="branchnotes" id="branchnotes" value="[% branchnotes |html %]" /></li>
         </ol>
         </fieldset>
@@ -198,7 +198,9 @@ tinyMCE.init({
             <th>Address</th>
             <th>Properties</th>
             <th>IP</th>
-            <!-- <th>Printer</th> -->
+[% IF UsePrintQueues %]
+            <th>Printer</th>
+[% END %]
             <th colspan="2">&nbsp;</th>
         </tr></thead><tbody>
         [% FOREACH branche IN branches %]
@@ -250,9 +252,11 @@ tinyMCE.init({
                 <td>
                     [% branche.branchip %]
                 </td>
-                <!-- <td>
-                    [% branche.branchprinter %]
-                </td> -->
+[% IF UsePrintQueues %]
+                <td>
+                    [% branche.branchprintername %]
+                </td>
+[% END %]
                 <td>
                     <a href="[% branche.action %]?op=edit&amp;branchcode=[% branche.value |url %]">Edit</a>
                 </td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index a9ed6f7..23cd7ee 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -110,6 +110,12 @@ Circulation:
                   yes: Do
                   no: "Do not"
             - update a bibliographic record's total issues count whenever an item is issued (WARNING! This increases server load significantly; if performance is a concern, use the update_totalissues.pl cron job to update the total issues count).
+        -
+            - pref: UsePrintQueues
+              choices:
+                  yes: "Use"
+                  no: "Don't use"
+            - server print queues.
     Checkout Policy:
         -
             - pref: AllowNotForLoanOverride
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
index 7dfb80b..06fd229 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
@@ -4,7 +4,7 @@
 [% IF ( add_validate ) %] Printers &rsaquo; Printer added[% END %]
 [% IF ( delete_confirm ) %] Printers &rsaquo; Confirm deletion of printer '[% searchfield %]'[% END %]
 [% IF ( delete_confirmed ) %] Printers &rsaquo; Printer deleted[% END %]
-[% IF ( else ) %]Printers[% END %]</title>
+[% IF ( list_printers ) %]Printers[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% IF ( add_form ) %]<script type="text/javascript">
 //<![CDATA[
@@ -71,7 +71,7 @@
 [% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Printer added[% END %]
 [% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Confirm deletion of printer '[% searchfield %]'[% END %]
 [% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Printer deleted[% END %]
-[% IF ( else ) %]Printers[% END %]</div>
+[% IF ( list_printers ) %]Printers[% END %]</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -89,22 +89,17 @@
         <form action="[% script_name %]" name="Aform" method="post">
         <input type="hidden" name="op" value="add_validate" />
 	[% IF ( searchfield ) %]
+          <input type="hidden" name="searchfield" value="[% searchfield %]" />
 		<input type="hidden" name="add" value="0" />
 	[% ELSE %]
 		<input type="hidden" name="add" value="1" />
 	[% END %]
 	<fieldset class="rows">
-<ol>	[% IF ( searchfield ) %]
-		<li>
-            <span class="label">Printer name: </span>
-				<input type="hidden" name="printername" id="" value="[% searchfield %]" />[% searchfield %]
-		</li>
-	[% ELSE %]
+<ol>
 		<li>
             <label for="printername">Printer name: </label>
-				<input type="text" name="printername" id="printername" size="50" maxlength="50" />
+                             <input type="text" name="printername" id="printername" size="50" maxlength="50" value="[% printername %]" />
 		</li>
-	[% END %]
         	<li>
 			<label for="printqueue">Queue: </label>
 			<input type="text" name="printqueue" id="printqueue" size="50" maxlength="50" value="[% printqueue %]" /> 
@@ -119,13 +114,6 @@
 
 [% END %]
 
-[% IF ( add_validate ) %]
-<h3>Printer added</h3>
-<form action="[% script_name %]" method="post">
-       <fieldset class="action"> <input type="submit" value="OK" /></fieldset>
-</form>
-[% END %]
-
 [% IF ( delete_confirm ) %]
 <h3>Confirm deletion of printer <em>[% searchfield %]</em></h3>
 <ul>
@@ -151,14 +139,7 @@
 			</form>
 [% END %]
 
-[% IF ( delete_confirmed ) %]
-<h3>Printer deleted</h3>
-<form action="[% script_name %]" method="post">
-		<fieldset class="action"><input type="submit" value="OK" /></fieldset>
-</form>
-[% END %]
-
-[% IF ( else ) %]
+[% IF ( list_printers ) %]
 
 <div id="toolbar">
 	<script type="text/javascript">
@@ -190,7 +171,7 @@
 			<td>[% loo.printername %]</td>
 			<td>[% loo.printqueue %]</td>
 			<td>[% loo.printtype %]</td>
-			<td><a href="[% loo.script_name %]?op=add_form&amp;searchfield=[% loo.printername %]">Edit</a> <a href="[% loo.script_name %]?op=delete_confirm&amp;searchfield=[% loo.printername %]">Delete</a></td>
+                     <td><a href="[% loo.script_name %]?op=add_form&amp;searchfield=[% loo.printqueue %]">Edit</a> <a href="[% loo.script_name %]?op=delete_confirm&amp;searchfield=[% loo.printqueue %]">Delete</a></td>
 		</tr>
 		[% END %]
 	</table>[% ELSE %]<div class="notice">No printers defined.</div>[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 8724e9d..0dc95a8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -457,7 +457,6 @@ No patron matched <span class="ex">[% message %]</span>
     <legend>Patron selection</legend>
 
     <input type="hidden" name="branch" value="[% branch %]" />
-    <input type="hidden" name="printer" value="[% printer %]" />
     <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
     <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
 
@@ -515,7 +514,6 @@ No patron matched <span class="ex">[% message %]</span>
 </div>[% END %]
           <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
           <input type="hidden" name="branch" value="[% branch %]" />
-          <input type="hidden" name="printer" value="[% printer %]" />
           <input type="hidden" name="print" value="maybe" />
           <input type="hidden" name="debt_confirmed" value="[% debt_confirmed %]" />
                 [% IF ( CHARGES ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt
index acad21c..e742f81 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt
@@ -28,7 +28,7 @@ Updated:<ul>
     [% IF ( update.updated_branch ) %]
         <li>Library: [% update.old_branch or "?" %] &rArr; [% update.LoginBranchcode or "?" %]</li>
     [% ELSIF ( update.updated_printer ) %]
-      <!-- FIXME:  <li>Printer: [% update.old_printer or "?" %] &rArr; [% update.new_printer or "?" %]</li> -->
+        <li>Printer: [% update.old_printer or "?" %] &rArr; [% update.new_printer or "?" %]</li>
     [% ELSE %]
         <li>ERROR - unknown</li>
     [% END %]
@@ -63,7 +63,6 @@ Updated:<ul>
         [% END %]
         </select></li>
     [% END %]
-<!--
     [% IF ( printerloop ) %]
         <li><label for="printer">Choose a network printer:</label>
         <select name="printer" id="printer">
@@ -75,7 +74,7 @@ Updated:<ul>
                 [% END %]
             [% END %]
         </select></li>
-    [% END %] -->
+    [% END %]
     </ol>
 </fieldset>
 <fieldset class="action"><input type="submit" value="Submit" /></fieldset>
diff --git a/t/db_dependent/lib/KohaTest/Koha.pm b/t/db_dependent/lib/KohaTest/Koha.pm
index 13a145a..0dda47a 100644
--- a/t/db_dependent/lib/KohaTest/Koha.pm
+++ b/t/db_dependent/lib/KohaTest/Koha.pm
@@ -28,8 +28,6 @@ sub methods : Test( 1 ) {
       _getImagesFromDirectory
       _getSubdirectoryNames
       getImageSets
-      GetPrinters
-      GetPrinter
       getnbpages
       getallthemes
       getFacets
diff --git a/t/db_dependent/lib/KohaTest/Printer.pm b/t/db_dependent/lib/KohaTest/Printer.pm
new file mode 100644
index 0000000..4caef06
--- /dev/null
+++ b/t/db_dependent/lib/KohaTest/Printer.pm
@@ -0,0 +1,26 @@
+package KohaTest::Printer;
+use base qw( KohaTest );
+
+use strict;
+use warnings;
+
+use Test::More;
+
+use C4::Printer;
+sub testing_class { 'C4::Printer' }
+
+sub methods : Test( 1 ) {
+    my $self    = shift;
+    my @methods = qw(
+      GetPrinters
+      SearchPrinters
+      GetPrinterDetails
+      AddPrinter
+      UpdatePrinter
+      DeletePrinter
+    );
+
+    can_ok( $self->testing_class, @methods );
+}
+
+1;
-- 
1.7.9.5


From oleonard at myacpl.org  Wed Sep 12 20:06:06 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 12 Sep 2012 14:06:06 -0400
Subject: [Koha-patches] [PATCH] Bug 8715 [Follow-up] Receiving all serials
	for a year
Message-ID: <1347473166-11919-1-git-send-email-oleonard@myacpl.org>

Follow-up: For consistency, I would prefer to have the
column of checkboxes at the beginning of the table and the
select/clear links above.
---
 .../prog/en/modules/serials/serials-collection.tt  |   56 +++++++++-----------
 1 file changed, 25 insertions(+), 31 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
index fc658c3..f8f1a84 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
@@ -60,7 +60,7 @@ $(document).ready(function() {
 
     $(".subscription-year-table").dataTable($.extend(true, {}, dataTablesDefaults, {
         "aoColumnDefs": [
-            { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
+            { "aTargets": [ 0 ], "bSortable": false, "bSearchable": false },
         ],
         "bAutoWidth": false,
         "bPaginate": false,
@@ -216,10 +216,16 @@ $(document).ready(function() {
             <input type="button" value="Generate Next" onclick="javascript:generateNext([% subscriptionidlist %])" />
         </p>
     [% END %]
-
+      <span class="checkall">
+        <a class="CheckAll" href="#" onclick="CheckAll('subscription-year-[% year.year %]'); return false;">Select all</a>
+      </span> |
+      <span class="clearall">
+        <a class="CheckNone" href="#" onclick="CheckNone('subscription-year-[% year.year %]'); return false;">Clear all</a>
+      </span>
         <table class="subscription-year-table">
           <thead>
             <tr>
+                [% IF ( CAN_user_serials_receive_serials ) %]<th>Edit</th>[% END %]
 [% IF ( subscriptions.size > 1 ) %]
                 <th># Subs</th>
 [% END %]
@@ -236,23 +242,28 @@ $(document).ready(function() {
                 <th>Library
                 </th>
                 [% IF ( routing ) %]<th>Routing</th>[% END %]
-                [% IF ( CAN_user_serials_receive_serials ) %]
-                  <th style="min-width: 60px;">
-                    <span style="font-size: 70%;">
-                      <span class="checkall">
-                        <a class="CheckAll" href="#" onclick="CheckAll('subscription-year-[% year.year %]'); return false;">Select all</a>
-                      </span>
-                      <span class="clearall">
-                        <a class="CheckNone" href="#" onclick="CheckNone('subscription-year-[% year.year %]'); return false;">Clear all</a>
-                      </span>
-                    </span>
-                  </th>
-                [% END %]
             </tr>
           </thead>
           <tbody>
       [% FOREACH serial IN year.serials %]
     [% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
+            [% IF ( CAN_user_serials_receive_serials ) %]
+                <td>
+                  [% IF ( serial.cannotedit ) %]
+                    disabled
+                  [% ELSE %]
+                    [% IF ( serial.subscriptionexpired ) %]
+                    <input type="checkbox" name="serialid" value="[% serial.serialid %]" disabled="disabled" />
+                    [% ELSE %]
+                      [% IF ( serial.checked ) %]
+                    <input type="checkbox" class="checkboxed" name="serialid" checked="checked" value="[% serial.serialid %]" />
+                      [% ELSE %]
+                    <input type="checkbox" class="checkboxed" name="serialid" value="[% serial.serialid %]" />
+                      [% END %]
+                    [% END %]
+                  [% END %]
+                </td>
+            [% END %]
 [% IF ( subscriptions.size > 1 ) %]
                  <td><a href="serials-collection.pl?subscriptionid=[% serial.subscriptionid %]">[% serial.subscriptionid %]</a></td>
 [% END %]
@@ -279,23 +290,6 @@ $(document).ready(function() {
                     <a href="" onclick="print_slip([% serial.subscriptionid |html %], '[% serial.serialseq |html %] ([% serial.planneddate %])'); return false" >Print list</a>
                 </td>
                 [% END %]
-            [% IF ( CAN_user_serials_receive_serials ) %]
-                <td>
-                  [% IF ( serial.cannotedit ) %]
-                    disabled
-                  [% ELSE %]
-                    [% IF ( serial.subscriptionexpired ) %]
-                    <input type="checkbox" name="serialid" value="[% serial.serialid %]" disabled="disabled" />
-                    [% ELSE %]
-                      [% IF ( serial.checked ) %]
-                    <input type="checkbox" class="checkboxed" name="serialid" checked="checked" value="[% serial.serialid %]" />
-                      [% ELSE %]
-                    <input type="checkbox" class="checkboxed" name="serialid" value="[% serial.serialid %]" />
-                      [% END %]
-                    [% END %]
-                  [% END %]
-                </td>
-            [% END %]
             </tr>
           [% END %]
         </tbody>
-- 
1.7.9.5


From colin.campbell at ptfs-europe.com  Thu Sep 13 11:43:00 2012
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Thu, 13 Sep 2012 10:43:00 +0100
Subject: [Koha-patches] [PATCH] bug 8768 correct an error in ItemType.t
Message-ID: <1347529380-9233-1-git-send-email-colin.campbell@ptfs-europe.com>

The second test in ItemType.t tests that an empty table
returns no rows however as Mock::DBD has no resultset
it fails with an error in DBI It requires that an
empty resultset is defined in Mock::DBD first
This patch adds that mocked empty table
---
 t/ItemType.t | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/t/ItemType.t b/t/ItemType.t
index 476ca19..87e090e 100755
--- a/t/ItemType.t
+++ b/t/ItemType.t
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 #
-# This Koha test module is a stub!
 # Add more tests here!!!
 
 use strict;
@@ -33,7 +32,15 @@ my $itemtypes = [
     [ 'CD', 'CDRom', 0, 0, '', '' ]
 ];
 
+my $itemtypes_empty = [
+    [
+        'itemtype', 'description', 'rentalcharge', 'notforloan',
+        'imageurl', 'summary'
+    ],
+];
+
 my $dbh = C4::Context->dbh();
+$dbh->{mock_add_resultset} = $itemtypes_empty;
 
 my @itemtypes = C4::ItemType->all();
 is( @itemtypes, 0, 'Testing all itemtypes is empty' );
-- 
1.7.12.363.g53284de


From colin.campbell at ptfs-europe.com  Fri Sep 14 15:07:20 2012
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Fri, 14 Sep 2012 14:07:20 +0100
Subject: [Koha-patches] [PATCH] Bug 6679 Enable Newly added files to pass
	testcritic
Message-ID: <1347628040-8658-1-git-send-email-colin.campbell@ptfs-europe.com>

Ywo cases of return null in recently added modules
are causing testcritic to fail. Replace return undefs
with return
---
 Koha/Authority.pm                        | 4 +++-
 Koha/Filter/MARC/EmbedSeeFromHeadings.pm | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Koha/Authority.pm b/Koha/Authority.pm
index b64f8de..329b438 100644
--- a/Koha/Authority.pm
+++ b/Koha/Authority.pm
@@ -77,7 +77,9 @@ sub get_from_authid {
     my ($authtypecode, $marcxml) = $sth->fetchrow;
     my $record=eval {MARC::Record->new_from_xml(StripNonXmlChars($marcxml),'UTF-8',
         (C4::Context->preference("marcflavour") eq "UNIMARC"?"UNIMARCAUTH":C4::Context->preference("marcflavour")))};
-    return undef if ($@);
+    if ($@) {
+        return;
+    }
     $record->encoding('UTF-8');
 
     my $self = $class->SUPER::new( { authid => $authid,
diff --git a/Koha/Filter/MARC/EmbedSeeFromHeadings.pm b/Koha/Filter/MARC/EmbedSeeFromHeadings.pm
index ea7e38b..bf6295f 100644
--- a/Koha/Filter/MARC/EmbedSeeFromHeadings.pm
+++ b/Koha/Filter/MARC/EmbedSeeFromHeadings.pm
@@ -54,7 +54,9 @@ sub filter {
     my $record = shift;
     my $newrecord;
 
-    return undef unless defined $record;
+    if ( !defined $record ) {
+        return;
+    }
 
     if (ref $record eq 'ARRAY') {
         my @recarray;
-- 
1.7.12.363.g53284de


From oleonard at myacpl.org  Fri Sep 14 18:36:03 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri, 14 Sep 2012 12:36:03 -0400
Subject: [Koha-patches] [PATCH] Bug 6037 [Follow-up] Invalid markup,
	missing breadcrumbs on Keyword to MARC Mapping page
Message-ID: <1347640563-9851-1-git-send-email-oleonard@myacpl.org>

Extra </div> returned. Killing it again.

After applying the patch the validator should only warn of
invalid "autocomplete" attribute.
---
 .../prog/en/modules/admin/fieldmapping.tt          |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt
index e4fc007..295299b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt
@@ -83,5 +83,5 @@ $(document).ready(function() {
 	<div class="yui-b">
 		[% INCLUDE 'admin-menu.inc' %]
 	</div>
-</div>
+
 [% INCLUDE 'intranet-bottom.inc' %]
-- 
1.7.9.5


From oleonard at myacpl.org  Fri Sep 14 20:52:02 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri, 14 Sep 2012 14:52:02 -0400
Subject: [Koha-patches] [PATCH] Bug 6689 [Follow-up] Improve styling of
	table pager
Message-ID: <1347648722-10981-1-git-send-email-oleonard@myacpl.org>

Small correction to add non-vendor-prefixed border
radius declaration to make style consistent on
newer browsers.

To test, view a page with a sorted table and pager controls,
like members/readingrec.pl. The pager controls "box" should
show rounded corners in Firefox 15+
---
 .../intranet-tmpl/prog/en/css/staff-global.css     |    1 +
 1 file changed, 1 insertion(+)

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 00fb312..9753f4f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -2127,6 +2127,7 @@ div.pager {
 	background-color : #E8E8E8;
 	border : 1px solid #BCBCBC;
 	-moz-border-radius : 5px;
+    border-radius : 5px;
 	display : inline-block;
 	font-size : 85%;
 	padding : .3em .5em .3em .5em;
-- 
1.7.9.5


From tomascohen at gmail.com  Tue Sep 18 00:37:48 2012
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Mon, 17 Sep 2012 19:37:48 -0300
Subject: [Koha-patches] [PATCH] Bug 8773 - Start per-instance
	koha-index-daemon in .deb setup
Message-ID: <1347921468-13667-1-git-send-email-tomascohen@gmail.com>

This bug is the .deb version of 8519 [1]. It is motivated by the fact that
using 1-minute (or more) frecquency cronjobs to do the incremental
indexing of records does not scale for us, nor is accepted by our
librarians.

Using an indexing daemon avoids launching a new interpreter each time
the cron triggers the indexing, and also allows sub-minute reindexing.
Frecquency is hardcoded right now. A follow up could provide a way
to set it for each instance.

This patch relies on Koha::Contrib::Tamil's koha-index-daemon script [2],
but could be easily adjusted to use another if we got a new one (SolR?).

I havent got the time to setup my infrastructure to generate my own debs,
and thus haven't got the oportunity to test this patch. If anyone with the
skills helps me on setting that I could test them and fix possible issues.

If there's something I could change to make this patches better just let me know.

Regards
To+

[1] http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8519
[2] The default cronjob that is set using the debian/koha-common.cron.d file
is being disbaled by this patch to avoid collision.

Sponsored-by: Universidad Nacional de C?rdoba
---
 debian/docs/koha-common.xml          |   21 ++++++++++++++
 debian/docs/koha-restart-indexer.xml |   43 +++++++++++++++++++++++++++++
 debian/docs/koha-start-indexer.xml   |   43 +++++++++++++++++++++++++++++
 debian/docs/koha-stop-indexer.xml    |   43 +++++++++++++++++++++++++++++
 debian/koha-common.cron.d            |    2 +-
 debian/koha-common.init              |    3 ++
 debian/koha-common.install           |    3 ++
 debian/scripts/koha-create           |    3 ++
 debian/scripts/koha-restart-indexer  |   50 ++++++++++++++++++++++++++++++++++
 debian/scripts/koha-start-indexer    |   50 ++++++++++++++++++++++++++++++++++
 debian/scripts/koha-stop-indexer     |   50 ++++++++++++++++++++++++++++++++++
 11 files changed, 310 insertions(+), 1 deletion(-)
 create mode 100644 debian/docs/koha-restart-indexer.xml
 create mode 100644 debian/docs/koha-start-indexer.xml
 create mode 100644 debian/docs/koha-stop-indexer.xml
 create mode 100755 debian/scripts/koha-restart-indexer
 create mode 100755 debian/scripts/koha-start-indexer
 create mode 100755 debian/scripts/koha-stop-indexer

diff --git a/debian/docs/koha-common.xml b/debian/docs/koha-common.xml
index 0e70595..2389043 100644
--- a/debian/docs/koha-common.xml
+++ b/debian/docs/koha-common.xml
@@ -131,6 +131,27 @@
           <para>Stop Zebra for named Koha instances.</para>
         </listitem>
       </varlistentry>
+
+      <varlistentry>
+        <term><option>koha-start-indexer</option></term>
+        <listitem>
+          <para>Start the indexer daemon for named Koha instances.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>koha-restart-indexer</option></term>
+        <listitem>
+          <para>Restart the indexer daemon for named Koha instances.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>koha-stop-indexer</option></term>
+        <listitem>
+          <para>Stop the indexer daemon for named Koha instances.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
     </refsect2>
 
diff --git a/debian/docs/koha-restart-indexer.xml b/debian/docs/koha-restart-indexer.xml
new file mode 100644
index 0000000..f9e20be
--- /dev/null
+++ b/debian/docs/koha-restart-indexer.xml
@@ -0,0 +1,43 @@
+<article xmlns='http://docbook.org/ns/docbook'>
+<title>koha-restart-indexer</title>
+<info>
+<productname>Koha</productname> is the first free software library automation package.
+<author>
+  <orgname>The Koha Communnity</orgname>
+  <uri>http://koha-community.org/</uri>
+</author>
+</info>
+
+<refentry xml:id="koha-restart-indexer">
+
+  <refmeta>
+    <refentrytitle>koha-restart-indexer</refentrytitle>
+    <manvolnum>8</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>koha-restart-indexer</refname>
+    <refpurpose>Restart the indexer daemon for named Koha instances.</refpurpose>
+    <refclass>UNIX/Linux</refclass>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>koha-restart-indexer</command> <arg choice="req" rep="repeat"><replaceable>instancename</replaceable></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1><title>Description</title>
+  <para>Restart the indexer daemon for named Koha instances.</para>
+  </refsect1>
+  
+  <refsect1><title>See also</title>
+  <simplelist type="inline">
+    <member><command>koha-start-indexer(8)</command></member>
+    <member><command>koha-stop-indexer(8)</command></member>
+  </simplelist>
+  </refsect1>
+  
+</refentry>
+
+</article>
diff --git a/debian/docs/koha-start-indexer.xml b/debian/docs/koha-start-indexer.xml
new file mode 100644
index 0000000..cd59757
--- /dev/null
+++ b/debian/docs/koha-start-indexer.xml
@@ -0,0 +1,43 @@
+<article xmlns='http://docbook.org/ns/docbook'>
+<title>koha-start-indexer</title>
+<info>
+<productname>Koha</productname> is the first free software library automation package.
+<author>
+  <orgname>The Koha Communnity</orgname>
+  <uri>http://koha-community.org/</uri>
+</author>
+</info>
+
+<refentry xml:id="koha-start-indexer">
+
+  <refmeta>
+    <refentrytitle>koha-start-indexer</refentrytitle>
+    <manvolnum>8</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>koha-start-indexer</refname>
+    <refpurpose>Start the indexer daemon for named Koha instances.</refpurpose>
+    <refclass>UNIX/Linux</refclass>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>koha-start-indexer</command> <arg choice="req" rep="repeat"><replaceable>instancename</replaceable></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1><title>Description</title>
+  <para>Start the indexer daemon for named Koha instances.</para>
+  </refsect1>
+  
+  <refsect1><title>See also</title>
+  <simplelist type="inline">
+    <member><command>koha-restart-indexer(8)</command></member>
+    <member><command>koha-stop-indexer(8)</command></member>
+  </simplelist>
+  </refsect1>
+  
+</refentry>
+
+</article>
diff --git a/debian/docs/koha-stop-indexer.xml b/debian/docs/koha-stop-indexer.xml
new file mode 100644
index 0000000..6652918
--- /dev/null
+++ b/debian/docs/koha-stop-indexer.xml
@@ -0,0 +1,43 @@
+<article xmlns='http://docbook.org/ns/docbook'>
+<title>koha-stop-indexer</title>
+<info>
+<productname>Koha</productname> is the first free software library automation package.
+<author>
+  <orgname>The Koha Communnity</orgname>
+  <uri>http://koha-community.org/</uri>
+</author>
+</info>
+
+<refentry xml:id="koha-stop-indexer">
+
+  <refmeta>
+    <refentrytitle>koha-stop-indexer</refentrytitle>
+    <manvolnum>8</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>koha-stop-indexer</refname>
+    <refpurpose>Stop indexer daemon for named Koha instances.</refpurpose>
+    <refclass>UNIX/Linux</refclass>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>koha-stop-indexer</command> <arg choice="req" rep="repeat"><replaceable>instancename</replaceable></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1><title>Description</title>
+  <para>Stop indexer daemon for named Koha instances.</para>
+  </refsect1>
+  
+  <refsect1><title>See also</title>
+  <simplelist type="inline">
+    <member><command>koha-restart-indexer(8)</command></member>
+    <member><command>koha-start-indexer(8)</command></member>
+  </simplelist>
+  </refsect1>
+  
+</refentry>
+
+</article>
diff --git a/debian/koha-common.cron.d b/debian/koha-common.cron.d
index cd7f3c2..c7fc94e 100644
--- a/debian/koha-common.cron.d
+++ b/debian/koha-common.cron.d
@@ -6,5 +6,5 @@
 SHELL=/bin/sh
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
-*/5 * * * * root test -x /usr/sbin/koha-rebuild-zebra && koha-rebuild-zebra $(koha-list --enabled)
+# */5 * * * * root test -x /usr/sbin/koha-rebuild-zebra && koha-rebuild-zebra $(koha-list --enabled)
 */15 * * * * root koha-foreach --enabled --email /usr/share/koha/bin/cronjobs/process_message_queue.pl
diff --git a/debian/koha-common.init b/debian/koha-common.init
index 5be77d3..7946785 100755
--- a/debian/koha-common.init
+++ b/debian/koha-common.init
@@ -45,6 +45,7 @@ do_start()
     # We insure all required directories exist, including disabled ones.
     koha-create-dirs $(koha-list)
     koha-start-zebra $(koha-list --enabled)
+    koha-start-indexer $(koha-list --enabled)
 }
 
 #
@@ -54,6 +55,7 @@ do_stop()
 {
     # We stop everything, including disabled ones.
     koha-stop-zebra $(koha-list) || true
+    koha-stop-indexer $(koha-list --enabled)
 }
 
 #
@@ -61,6 +63,7 @@ do_stop()
 #
 do_reload() {
     koha-restart-zebra $(koha-list --enabled)
+    koha-restart-indexer $(koha-list --enabled)
 }
 
 case "$1" in
diff --git a/debian/koha-common.install b/debian/koha-common.install
index 50affbd..522bba3 100644
--- a/debian/koha-common.install
+++ b/debian/koha-common.install
@@ -21,10 +21,13 @@ debian/scripts/koha-mysql                   usr/sbin
 debian/scripts/koha-rebuild-zebra           usr/sbin
 debian/scripts/koha-remove                  usr/sbin
 debian/scripts/koha-reset-passwd            usr/sbin
+debian/scripts/koha-restart-indexer         usr/sbin
 debian/scripts/koha-restart-zebra           usr/sbin
 debian/scripts/koha-restore                 usr/sbin
 debian/scripts/koha-run-backups             usr/sbin
+debian/scripts/koha-start-indexer           usr/sbin
 debian/scripts/koha-start-zebra             usr/sbin
+debian/scripts/koha-stop-indexer            usr/sbin
 debian/scripts/koha-stop-zebra              usr/sbin
 debian/scripts/koha-upgrade-schema          usr/sbin
 debian/scripts/koha-upgrade-to-3.4          usr/sbin
diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create
index b0c418c..5ec3349 100755
--- a/debian/scripts/koha-create
+++ b/debian/scripts/koha-create
@@ -340,6 +340,9 @@ then
 
     # Start Zebra.
     koha-start-zebra "$name"
+
+    # Start Indexer daemon
+    koha-start-indexer "$name"
 fi
 
 
diff --git a/debian/scripts/koha-restart-indexer b/debian/scripts/koha-restart-indexer
new file mode 100755
index 0000000..a45b9be
--- /dev/null
+++ b/debian/scripts/koha-restart-indexer
@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# koha-restart-indexer -- Restart Indexer Daemon for named Koha instandes
+# Copyright 2012 Tom?s Cohen Arazi @ Universidad Nacional de C?rdoba
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set -e
+
+. /lib/lsb/init-functions
+
+INDEXDAEMON="koha-index-daemon"
+PERL5LIB="/usr/share/koha/lib"
+
+for name in "$@"
+do
+
+      KOHA_CONF="/etc/koha/sites/$name/koha-conf.xml"
+
+      INDEXDAEMON_OPTS="--timeout 30 \
+                        --conf $KOHA_CONF \
+                        --directory /var/tmp/koha-indexer-daemon-$name"
+
+      DAEMONOPTS="--name=$name-koha-indexer \
+            --errlog=/var/log/koha/$name/koha-indexer-error.log \
+            --stdout=/var/log/koha/$name/koha-indexer.log \
+            --output=/var/log/koha/$name/koha-indexer-output.log \
+            --verbose=1 --respawn --delay=30 \
+            --user=$name-koha.$name-koha"
+
+      log_daemon_msg "Restarting Koha indexing daemon for $name"
+
+      if daemon $DAEMONOPTS --restart -- $INDEXDAEMON $INDEXDAEMON_OPTS; then
+        log_end_msg 0
+      else
+        log_end_msg 1
+      fi
+
+done
diff --git a/debian/scripts/koha-start-indexer b/debian/scripts/koha-start-indexer
new file mode 100755
index 0000000..8d77d88
--- /dev/null
+++ b/debian/scripts/koha-start-indexer
@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# koha-start-indexer -- Start Indexer Daemon for named Koha instandes
+# Copyright 2012 Tom?s Cohen Arazi @ Universidad Nacional de C?rdoba
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set -e
+
+. /lib/lsb/init-functions
+
+INDEXDAEMON="koha-index-daemon"
+PERL5LIB="/usr/share/koha/lib"
+
+for name in "$@"
+do
+
+      KOHA_CONF="/etc/koha/sites/$name/koha-conf.xml"
+
+      INDEXDAEMON_OPTS="--timeout 30 \
+                        --conf $KOHA_CONF \
+                        --directory /var/tmp/koha-indexer-daemon-$name"
+
+      DAEMONOPTS="--name=$name-koha-indexer \
+            --errlog=/var/log/koha/$name/koha-indexer-error.log \
+            --stdout=/var/log/koha/$name/koha-indexer.log \
+            --output=/var/log/koha/$name/koha-indexer-output.log \
+            --verbose=1 --respawn --delay=30 \
+            --user=$name-koha.$name-koha"
+
+      log_daemon_msg "Starting Koha indexing daemon for $name"
+
+      if daemon $DAEMONOPTS -- $INDEXDAEMON $INDEXDAEMON_OPTS; then
+        log_end_msg 0
+      else
+        log_end_msg 1
+      fi
+
+done
diff --git a/debian/scripts/koha-stop-indexer b/debian/scripts/koha-stop-indexer
new file mode 100755
index 0000000..f9a2153
--- /dev/null
+++ b/debian/scripts/koha-stop-indexer
@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# koha-stop-indexer -- Stop Indexer Daemon for named Koha instandes
+# Copyright 2012 Tom?s Cohen Arazi @ Universidad Nacional de C?rdoba
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set -e
+
+. /lib/lsb/init-functions
+
+INDEXDAEMON="koha-index-daemon"
+PERL5LIB="/usr/share/koha/lib"
+
+for name in "$@"
+do
+
+      KOHA_CONF="/etc/koha/sites/$name/koha-conf.xml"
+
+      INDEXDAEMON_OPTS="--timeout 30 \
+                        --conf $KOHA_CONF \
+                        --directory /var/tmp/koha-indexer-daemon-$name"
+
+      DAEMONOPTS="--name=$name-koha-indexer \
+            --errlog=/var/log/koha/$name/koha-indexer-error.log \
+            --stdout=/var/log/koha/$name/koha-indexer.log \
+            --output=/var/log/koha/$name/koha-indexer-output.log \
+            --verbose=1 --respawn --delay=30 \
+            --user=$name-koha.$name-koha"
+
+      log_daemon_msg "Stopping Koha indexing daemon for $name"
+
+      if daemon $DAEMONOPTS --stop -- $INDEXDAEMON $INDEXDAEMON_OPTS; then
+        log_end_msg 0
+      else
+        log_end_msg 1
+      fi
+
+done
-- 
1.7.9.5


From srdjan at catalyst.net.nz  Wed Sep 19 02:18:01 2012
From: srdjan at catalyst.net.nz (Srdjan)
Date: Wed, 19 Sep 2012 12:18:01 +1200
Subject: [Koha-patches] [PATCH] bug_5786, bug_5787, bug_5788: Holds rewrite
In-Reply-To: <bug 5786>
References: <bug 5786>
Message-ID: <1348013881-5573-1-git-send-email-srdjan@catalyst.net.nz>

bug_5786: moved AllowOnShelfHolds to issuingrules
bug_5787: moved OPACItemHolds to issuingrules
bug_5788: Added reservesmaxpickupdelay to issuingrules

C4::Reserves:
* Added OnShelfHoldsAllowed() to check issuingrules
* Added OPACItemHoldsAllowed() to check issuingrules
* IsAvailableForItemLevelRequest() changed interface, now takes
  $item_record,$borrower_record; calls OnShelfHoldsAllowed()

opac/opac-reserve.pl and opac/opac-search.pl:
* rewrote hold allowed rule to use OPACItemHoldsAllowed()
* also use OnShelfHoldsAllowed() through
* IsAvailableForItemLevelRequest()

templates:
* Removed AllowOnShelfHolds and OPACItemHolds global flags, they now
  only have meaning per item type

Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>

I have tested this patch left, right and upside down for the last
several months. All tests have passed.

Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
---
 C4/Auth.pm                                         |    1 -
 C4/ILSDI/Services.pm                               |    2 +-
 C4/Items.pm                                        |    2 +
 C4/Reserves.pm                                     |  341 ++++++++++++--------
 C4/VirtualShelves/Page.pm                          |    1 -
 admin/smart-rules.pl                               |   19 +-
 admin/systempreferences.pl                         |    2 -
 .../mysql/it-IT/necessari/system_preferences.sql   |    1 -
 installer/data/mysql/kohastructure.sql             |    3 +
 installer/data/mysql/sysprefs.sql                  |    2 -
 installer/data/mysql/updatedatabase.pl             |   36 ++-
 installer/html-template-to-template-toolkit.pl     |    2 +-
 .../en/modules/admin/preferences/circulation.pref  |    6 -
 .../prog/en/modules/admin/preferences/opac.pref    |    6 -
 .../prog/en/modules/admin/smart-rules.tt           |   94 +++---
 .../prog/en/includes/opac-detail-sidebar.inc       |    8 +-
 .../opac-tmpl/prog/en/modules/opac-reserve.tt      |  177 +++++-----
 .../prog/en/modules/opac-results-grouped.tt        |   18 +-
 .../opac-tmpl/prog/en/modules/opac-results.tt      |    6 +-
 .../opac-tmpl/prog/en/modules/opac-shelves.tt      |    2 +-
 opac/opac-ISBDdetail.pl                            |    9 +-
 opac/opac-MARCdetail.pl                            |    8 +-
 opac/opac-detail.pl                                |    2 -
 opac/opac-reserve.pl                               |   43 +--
 opac/opac-search.pl                                |   19 +-
 reserve/request.pl                                 |    2 +-
 26 files changed, 439 insertions(+), 373 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index d4ad292..787772b 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -397,7 +397,6 @@ sub get_template_and_user {
             OPACAmazonCoverImages     => C4::Context->preference("OPACAmazonCoverImages"),
             OPACFRBRizeEditions       => C4::Context->preference("OPACFRBRizeEditions"),
             OpacHighlightedWords       => C4::Context->preference("OpacHighlightedWords"),
-            OPACItemHolds             => C4::Context->preference("OPACItemHolds"),
             OPACShelfBrowser          => "". C4::Context->preference("OPACShelfBrowser"),
             OpacShowRecentComments    => C4::Context->preference("OpacShowRecentComments"),
             OPACURLOpenInNewWindow    => "" . C4::Context->preference("OPACURLOpenInNewWindow"),
diff --git a/C4/ILSDI/Services.pm b/C4/ILSDI/Services.pm
index d685e6c..14d92c8 100644
--- a/C4/ILSDI/Services.pm
+++ b/C4/ILSDI/Services.pm
@@ -489,7 +489,7 @@ sub GetServices {
     my $canbookbereserved = CanBookBeReserved( $borrower, $biblionumber );
     if ($canbookbereserved) {
         push @availablefor, 'title level hold';
-        my $canitembereserved = IsAvailableForItemLevelRequest($itemnumber);
+        my $canitembereserved = IsAvailableForItemLevelRequest($item, $borrower);
         if ($canitembereserved) {
             push @availablefor, 'item level hold';
         }
diff --git a/C4/Items.pm b/C4/Items.pm
index e9af3dd..8e33896 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -164,6 +164,8 @@ sub GetItem {
         ($data->{'serialseq'} , $data->{'publisheddate'}) = $ssth->fetchrow_array();
     }
 	#if we don't have an items.itype, use biblioitems.itemtype.
+    # FIXME this should respect the itypes systempreference
+    # if (C4::Context->preference('item-level_itypes')) {
 	if( ! $data->{'itype'} ) {
 		my $sth = $dbh->prepare("SELECT itemtype FROM biblioitems  WHERE biblionumber = ?");
 		$sth->execute($data->{'biblionumber'});
diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index 585d1e5..a59b445 100644
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -68,13 +68,13 @@ This modules provides somes functions to deal with reservations.
   The complete workflow is :
   ==== 1st use case ====
   patron request a document, 1st available :                      P >0, F=NULL, I=NULL
-  a library having it run "transfertodo", and clic on the list    
+  a library having it run "transfertodo", and clic on the list
          if there is no transfer to do, the reserve waiting
-         patron can pick it up                                    P =0, F=W,    I=filled 
+         patron can pick it up                                    P =0, F=W,    I=filled
          if there is a transfer to do, write in branchtransfer    P =0, F=T,    I=filled
            The pickup library recieve the book, it check in       P =0, F=W,    I=filled
   The patron borrow the book                                      P =0, F=F,    I=filled
-  
+
   ==== 2nd use case ====
   patron requests a document, a given item,
     If pickup is holding branch                                   P =0, F=W,   I=filled
@@ -93,7 +93,7 @@ BEGIN {
     @ISA = qw(Exporter);
     @EXPORT = qw(
         &AddReserve
-  
+
         &GetReservesFromItemnumber
         &GetReservesFromBiblionumber
         &GetReservesFromBorrowernumber
@@ -103,9 +103,9 @@ BEGIN {
         &GetReserveFee
         &GetReserveInfo
         &GetReserveStatus
-        
+
         &GetOtherReserves
-        
+
         &ModReserveFill
         &ModReserveAffect
         &ModReserve
@@ -113,7 +113,7 @@ BEGIN {
         &ModReserveCancelAll
         &ModReserveMinusPriority
         &MoveReserve
-        
+
         &CheckReserves
         &CanBookBeReserved
 	&CanItemBeReserved
@@ -123,7 +123,9 @@ BEGIN {
         &AutoUnsuspendReserves
 
         &IsAvailableForItemLevelRequest
-        
+
+        &OPACItemHoldsAllowed
+
         &AlterPriority
         &ToggleLowestPriority
 
@@ -132,7 +134,7 @@ BEGIN {
         &SuspendAll
     );
     @EXPORT_OK = qw( MergeHolds );
-}    
+}
 
 =head2 AddReserve
 
@@ -240,7 +242,7 @@ sub AddReserve {
     foreach (@$bibitems) {
         $sth->execute($borrowernumber, $biblionumber, $resdate, $_);
     }
-        
+
     return;     # FIXME: why not have a useful return value?
 }
 
@@ -302,7 +304,7 @@ sub GetReservesFromBiblionumber {
                 push( @bibitemno, $bibitemnos );    # FIXME: inefficient: use fetchall_arrayref
             }
             my $count = scalar @bibitemno;
-    
+
             # if we have two or more different specific itemtypes
             # reserved by same person on same day
             my $bdata;
@@ -417,30 +419,30 @@ This function return 1 if an item can be issued by this borrower.
 
 sub CanItemBeReserved{
     my ($borrowernumber, $itemnumber) = @_;
-    
+
     my $dbh             = C4::Context->dbh;
     my $allowedreserves = 0;
-            
+
     my $controlbranch = C4::Context->preference('ReservesControlBranch');
     my $itype         = C4::Context->preference('item-level_itypes') ? "itype" : "itemtype";
 
     # we retrieve borrowers and items informations #
     my $item     = GetItem($itemnumber);
-    my $borrower = C4::Members::GetMember('borrowernumber'=>$borrowernumber);     
-    
+    my $borrower = C4::Members::GetMember('borrowernumber'=>$borrowernumber);
+
     # we retrieve user rights on this itemtype and branchcode
-    my $sth = $dbh->prepare("SELECT categorycode, itemtype, branchcode, reservesallowed 
-                             FROM issuingrules 
-                             WHERE (categorycode in (?,'*') ) 
-                             AND (itemtype IN (?,'*')) 
-                             AND (branchcode IN (?,'*')) 
-                             ORDER BY 
-                               categorycode DESC, 
-                               itemtype     DESC, 
+    my $sth = $dbh->prepare("SELECT categorycode, itemtype, branchcode, reservesallowed
+                             FROM issuingrules
+                             WHERE (categorycode in (?,'*') )
+                             AND (itemtype IN (?,'*'))
+                             AND (branchcode IN (?,'*'))
+                             ORDER BY
+                               categorycode DESC,
+                               itemtype     DESC,
                                branchcode   DESC;"
                            );
-                           
-    my $querycount ="SELECT 
+
+    my $querycount ="SELECT
                             count(*) as count
                             FROM reserves
                                 LEFT JOIN items USING (itemnumber)
@@ -448,13 +450,13 @@ sub CanItemBeReserved{
                                 LEFT JOIN borrowers USING (borrowernumber)
                             WHERE borrowernumber = ?
                                 ";
-    
-    
+
+
     my $itemtype     = $item->{$itype};
     my $categorycode = $borrower->{categorycode};
     my $branchcode   = "";
     my $branchfield  = "reserves.branchcode";
-    
+
     if( $controlbranch eq "ItemHomeLibrary" ){
         $branchfield = "items.homebranch";
         $branchcode = $item->{homebranch};
@@ -462,34 +464,33 @@ sub CanItemBeReserved{
         $branchfield = "borrowers.branchcode";
         $branchcode = $borrower->{branchcode};
     }
-    
-    # we retrieve rights 
+
+    # we retrieve rights
     $sth->execute($categorycode, $itemtype, $branchcode);
     if(my $rights = $sth->fetchrow_hashref()){
         $itemtype        = $rights->{itemtype};
-        $allowedreserves = $rights->{reservesallowed}; 
+        $allowedreserves = $rights->{reservesallowed};
     }else{
         $itemtype = '*';
     }
-    
+
     # we retrieve count
-    
+
     $querycount .= "AND $branchfield = ?";
-    
+
     $querycount .= " AND $itype = ?" if ($itemtype ne "*");
     my $sthcount = $dbh->prepare($querycount);
-    
+
     if($itemtype eq "*"){
         $sthcount->execute($borrowernumber, $branchcode);
     }else{
         $sthcount->execute($borrowernumber, $branchcode, $itemtype);
     }
-    
+
     my $reservecount = "0";
     if(my $rowcount = $sthcount->fetchrow_hashref()){
         $reservecount = $rowcount->{count};
     }
-    
     # we check if it's ok or not
     if( $reservecount < $allowedreserves ){
         return 1;
@@ -688,8 +689,8 @@ sub GetReservesToBranch {
     my $dbh = C4::Context->dbh;
     my $sth = $dbh->prepare(
         "SELECT borrowernumber,reservedate,itemnumber,timestamp
-         FROM reserves 
-         WHERE priority='0' 
+         FROM reserves
+         WHERE priority='0'
            AND branchcode=?"
     );
     $sth->execute( $frombranch );
@@ -712,7 +713,7 @@ sub GetReservesForBranch {
     my ($frombranch) = @_;
     my $dbh          = C4::Context->dbh;
 	my $query        = "SELECT borrowernumber,reservedate,itemnumber,waitingdate
-        FROM   reserves 
+        FROM   reserves
         WHERE   priority='0'
             AND found='W' ";
     if ($frombranch){
@@ -737,11 +738,11 @@ sub GetReservesForBranch {
 
 sub GetReserveStatus {
     my ($itemnumber) = @_;
-    
+
     my $dbh = C4::Context->dbh;
-    
+
     my $itemstatus = $dbh->prepare("SELECT found FROM reserves WHERE itemnumber = ?");
-    
+
     $itemstatus->execute($itemnumber);
     my ($found) = $itemstatus->fetchrow_array;
     return $found;
@@ -803,7 +804,7 @@ sub CheckReserves {
            LEFT JOIN itemtypes   ON biblioitems.itemtype   = itemtypes.itemtype
         ";
     }
-   
+
     if ($item) {
         $sth = $dbh->prepare("$select WHERE itemnumber = ?");
         $sth->execute($item);
@@ -818,7 +819,7 @@ sub CheckReserves {
     return ( '' ) unless $itemnumber; # bail if we got nothing.
 
     # if item is not for loan it cannot be reserved either.....
-    #    execpt where items.notforloan < 0 :  This indicates the item is holdable. 
+    #    execpt where items.notforloan < 0 :  This indicates the item is holdable.
     return ( '' ) if  ( $notforloan_per_item > 0 ) or $notforloan_per_itemtype;
 
     # Find this item in the reserves
@@ -873,7 +874,7 @@ sub CancelExpiredReserves {
     # Cancel reserves that have passed their expiration date.
     my $dbh = C4::Context->dbh;
     my $sth = $dbh->prepare( "
-        SELECT * FROM reserves WHERE DATE(expirationdate) < DATE( CURDATE() ) 
+        SELECT * FROM reserves WHERE DATE(expirationdate) < DATE( CURDATE() )
         AND expirationdate IS NOT NULL
         AND found IS NULL
     " );
@@ -882,7 +883,7 @@ sub CancelExpiredReserves {
     while ( my $res = $sth->fetchrow_hashref() ) {
         CancelReserve( $res->{'biblionumber'}, '', $res->{'borrowernumber'} );
     }
-  
+
     # Cancel reserves that have been waiting too long
     if ( C4::Context->preference("ExpireReservesMaxPickUpDelay") ) {
         my $max_pickup_delay = C4::Context->preference("ReservesMaxPickUpDelay");
@@ -1038,12 +1039,12 @@ If C<$rank> is 'del', the hold request is cancelled.
 
 If C<$rank> is an integer greater than zero, the priority of
 the request is set to that value.  Since priority != 0 means
-that the item is not waiting on the hold shelf, setting the 
+that the item is not waiting on the hold shelf, setting the
 priority to a non-zero value also sets the request's found
-status and waiting date to NULL. 
+status and waiting date to NULL.
 
 The optional C<$itemnumber> parameter is used only when
-C<$rank> is a non-zero integer; if supplied, the itemnumber 
+C<$rank> is a non-zero integer; if supplied, the itemnumber
 of the hold request is set accordingly; if omitted, the itemnumber
 is cleared.
 
@@ -1073,20 +1074,20 @@ sub ModReserve {
         $query = qq/
             INSERT INTO old_reserves
             SELECT *
-            FROM   reserves 
+            FROM   reserves
             WHERE  biblionumber   = ?
              AND   borrowernumber = ?
         /;
         $sth = $dbh->prepare($query);
         $sth->execute( $biblio, $borrower );
         $query = qq/
-            DELETE FROM reserves 
+            DELETE FROM reserves
             WHERE  biblionumber   = ?
              AND   borrowernumber = ?
         /;
         $sth = $dbh->prepare($query);
         $sth->execute( $biblio, $borrower );
-        
+
     }
     elsif ($rank =~ /^\d+/ and $rank > 0) {
         my $query = "
@@ -1171,7 +1172,7 @@ sub ModReserveFill {
                 ";
     $sth = $dbh->prepare($query);
     $sth->execute( $biblionumber, $resdate, $borrowernumber );
-    
+
     # now fix the priority on the others (if the priority wasn't
     # already sorted!)....
     unless ( $priority == 0 ) {
@@ -1216,7 +1217,7 @@ with the biblionumber & the borrowernumber, we can affect the itemnumber
 to the correct reserve.
 
 if $transferToDo is not set, then the status is set to "Waiting" as well.
-otherwise, a transfer is on the way, and the end of the transfer will 
+otherwise, a transfer is on the way, and the end of the transfer will
 take care of the waiting status
 
 =cut
@@ -1297,7 +1298,7 @@ sub ModReserveCancelAll {
 
   &ModReserveMinusPriority($itemnumber,$borrowernumber,$biblionumber)
 
-Reduce the values of queuded list     
+Reduce the values of queuded list
 
 =cut
 
@@ -1308,7 +1309,7 @@ sub ModReserveMinusPriority {
     my $dbh   = C4::Context->dbh;
     my $query = "
         UPDATE reserves
-        SET    priority = 0 , itemnumber = ? 
+        SET    priority = 0 , itemnumber = ?
         WHERE  borrowernumber=?
           AND  biblionumber=?
     ";
@@ -1330,42 +1331,42 @@ Current implementation this query should have a single result.
 sub GetReserveInfo {
 	my ( $borrowernumber, $biblionumber ) = @_;
     my $dbh = C4::Context->dbh;
-	my $strsth="SELECT 
-	               reservedate, 
-	               reservenotes, 
+	my $strsth="SELECT
+	               reservedate,
+	               reservenotes,
 	               reserves.borrowernumber,
-				   reserves.biblionumber, 
+				   reserves.biblionumber,
 				   reserves.branchcode,
 				   reserves.waitingdate,
-				   notificationdate, 
-				   reminderdate, 
-				   priority, 
+				   notificationdate,
+				   reminderdate,
+				   priority,
 				   found,
-				   firstname, 
-				   surname, 
-				   phone, 
-				   email, 
-				   address, 
+				   firstname,
+				   surname,
+				   phone,
+				   email,
+				   address,
 				   address2,
-				   cardnumber, 
-				   city, 
+				   cardnumber,
+				   city,
 				   zipcode,
-				   biblio.title, 
+				   biblio.title,
 				   biblio.author,
-				   items.holdingbranch, 
-				   items.itemcallnumber, 
+				   items.holdingbranch,
+				   items.itemcallnumber,
 				   items.itemnumber,
-				   items.location, 
-				   barcode, 
+				   items.location,
+				   barcode,
 				   notes
-			FROM reserves 
-			 LEFT JOIN items USING(itemnumber) 
+			FROM reserves
+			 LEFT JOIN items USING(itemnumber)
 		     LEFT JOIN borrowers USING(borrowernumber)
-		     LEFT JOIN biblio ON  (reserves.biblionumber=biblio.biblionumber) 
-			WHERE 
+		     LEFT JOIN biblio ON  (reserves.biblionumber=biblio.biblionumber)
+			WHERE
 				reserves.borrowernumber=?
 				AND reserves.biblionumber=?";
-	my $sth = $dbh->prepare($strsth); 
+	my $sth = $dbh->prepare($strsth);
 	$sth->execute($borrowernumber,$biblionumber);
 
 	my $data = $sth->fetchrow_hashref;
@@ -1375,22 +1376,18 @@ sub GetReserveInfo {
 
 =head2 IsAvailableForItemLevelRequest
 
-  my $is_available = IsAvailableForItemLevelRequest($itemnumber);
+  my $is_available = IsAvailableForItemLevelRequest($item_record,$borrower_record);
 
 Checks whether a given item record is available for an
 item-level hold request.  An item is available if
 
-* it is not lost AND 
-* it is not damaged AND 
-* it is not withdrawn AND 
+* it is not lost AND
+* it is not damaged AND
+* it is not withdrawn AND
 * does not have a not for loan value > 0
 
-Whether or not the item is currently on loan is 
-also checked - if the AllowOnShelfHolds system preference
-is ON, an item can be requested even if it is currently
-on loan to somebody else.  If the system preference
-is OFF, an item that is currently checked out cannot
-be the target of an item-level hold request.
+Need to check the issuingrules onshelfholds column,
+if this is set items on the shelf can be placed on hold
 
 Note that IsAvailableForItemLevelRequest() does not
 check if the staff operator is authorized to place
@@ -1401,50 +1398,82 @@ and canreservefromotherbranches.
 =cut
 
 sub IsAvailableForItemLevelRequest {
-    my $itemnumber = shift;
-   
-    my $item = GetItem($itemnumber);
+    my $item = shift;
+    my $borrower = shift;
 
+    my $dbh = C4::Context->dbh;
     # must check the notforloan setting of the itemtype
     # FIXME - a lot of places in the code do this
     #         or something similar - need to be
     #         consolidated
-    my $dbh = C4::Context->dbh;
-    my $notforloan_query;
+    my $itype;
     if (C4::Context->preference('item-level_itypes')) {
-        $notforloan_query = "SELECT itemtypes.notforloan
-                             FROM items
-                             JOIN itemtypes ON (itemtypes.itemtype = items.itype)
-                             WHERE itemnumber = ?";
-    } else {
-        $notforloan_query = "SELECT itemtypes.notforloan
-                             FROM items
-                             JOIN biblioitems USING (biblioitemnumber)
-                             JOIN itemtypes USING (itemtype)
-                             WHERE itemnumber = ?";
+        # We cant trust GetItem to honour the syspref, so safest to do it ourselves
+        # When GetItem is fixed, we can remove this
+        $itype = $item->{itype};
     }
-    my $sth = $dbh->prepare($notforloan_query);
-    $sth->execute($itemnumber);
-    my $notforloan_per_itemtype = 0;
-    if (my ($notforloan) = $sth->fetchrow_array) {
-        $notforloan_per_itemtype = 1 if $notforloan;
+    else {
+        # XXX This is a bit dodgy. It relies on biblio itemtype column having different name.
+        # So if we already have a biblioitems join when calling this function,
+        # we don't need to access the database again
+        $itype = $item->{itemtype};
+    }
+    unless ($itype) {
+        my $query = "SELECT itemtype FROM biblioitems WHERE biblioitemnumber = ? ";
+        my $sth = $dbh->prepare($query);
+        $sth->execute($item->{biblioitemnumber});
+        if (my $data = $sth->fetchrow_hashref()){
+            $itype = $data->{itemtype};
+        }
     }
 
-    my $available_per_item = 1;
-    $available_per_item = 0 if $item->{itemlost} or
-                               ( $item->{notforloan} > 0 ) or
-                               ($item->{damaged} and not C4::Context->preference('AllowHoldsOnDamagedItems')) or
-                               $item->{wthdrawn} or
-                               $notforloan_per_itemtype;
+    my $notforloan_per_itemtype
+      = $dbh->selectrow_array("SELECT notforloan FROM itemtypes WHERE itemtype = ?",
+                              undef, $itype);
+
+    return 0 if
+        $notforloan_per_itemtype ||
+        $item->{itemlost}        ||
+        $item->{notforloan} > 0  ||
+        $item->{wthdrawn}        ||
+        ($item->{damaged} && !C4::Context->preference('AllowHoldsOnDamagedItems'));
 
 
-    if (C4::Context->preference('AllowOnShelfHolds')) {
-        return $available_per_item;
+    if (OnShelfHoldsAllowed($itype,$borrower->{categorycode},$item->{holdingbranch})) {
+        return 1;
     } else {
-        return ($available_per_item and ($item->{onloan} or GetReserveStatus($itemnumber) eq "W")); 
+        return $item->{onloan} || GetReserveStatus($item->{itemnumber}) eq "W";
     }
 }
 
+=head2 OnShelfHoldsAllowed
+
+  OnShelfHoldsAllowed($itemtype,$borrowercategory,$branchcode);
+
+Checks issuingrules, using the borrowers categorycode, the itemtype, and branchcode to see if onshelf
+holds are allowed, returns true if so.
+
+=cut
+
+sub OnShelfHoldsAllowed {
+    my ($itype,$borrowercategory,$branchcode) = @_;
+
+    my $query = "SELECT onshelfholds FROM issuingrules WHERE
+          (issuingrules.categorycode = ? OR issuingrules.categorycode = '*')
+        AND
+          (issuingrules.itemtype = ? OR issuingrules.itemtype = '*')
+        AND
+          (issuingrules.branchcode = ? OR issuingrules.branchcode = '*')
+        ORDER BY
+          issuingrules.categorycode desc,
+          issuingrules.itemtype desc,
+          issuingrules.branchcode desc
+       LIMIT 1";
+    my $dbh = C4::Context->dbh;
+    my $onshelfholds = $dbh->selectrow_array($query, undef, $borrowercategory,$itype,$branchcode);
+    return $onshelfholds;
+}
+
 =head2 AlterPriority
 
   AlterPriority( $where, $borrowernumber, $biblionumber, $reservedate );
@@ -1466,8 +1495,8 @@ sub AlterPriority {
     $sth->finish();
 
     if ( $where eq 'up' || $where eq 'down' ) {
-    
-      my $priority = $reserve->{'priority'};        
+
+      my $priority = $reserve->{'priority'};
       $priority = $where eq 'up' ? $priority - 1 : $priority + 1;
       _FixPriority( $biblionumber, $borrowernumber, $priority )
 
@@ -1505,7 +1534,7 @@ sub ToggleLowestPriority {
         $borrowernumber,
     );
     $sth->finish;
-    
+
     _FixPriority( $biblionumber, $borrowernumber, '999999' );
 }
 
@@ -1612,7 +1641,7 @@ the array index (+1 as array starts from 0)
 and if $rank is supplied will splice item from the array and splice it back in again
 in new priority rank
 
-=cut 
+=cut
 
 sub _FixPriority {
     my ( $biblio, $borrowernumber, $rank, $ignoreSetLowestRank ) = @_;
@@ -1691,10 +1720,10 @@ sub _FixPriority {
         );
         $sth->finish;
     }
-    
+
     $sth = $dbh->prepare( "SELECT borrowernumber FROM reserves WHERE lowestPriority = 1 ORDER BY priority" );
     $sth->execute();
-    
+
     unless ( $ignoreSetLowestRank ) {
       while ( my $res = $sth->fetchrow_hashref() ) {
         _FixPriority( $biblio, $res->{'borrowernumber'}, '999999', 1 );
@@ -1754,7 +1783,7 @@ sub _Findgroupreserve {
         push( @results, $data );
     }
     return @results if @results;
-    
+
     # check for title-level targetted match
     my $title_level_target_query = qq/
         SELECT reserves.biblionumber        AS biblionumber,
@@ -1833,7 +1862,7 @@ sub _koha_notify_reserve {
 
     my $dbh = C4::Context->dbh;
     my $borrower = C4::Members::GetMember(borrowernumber => $borrowernumber);
-    
+
     # Try to get the borrower's email address
     my $to_address;
     my $which_address = C4::Context->preference('AutoEmailPrimaryAddress');
@@ -1843,7 +1872,7 @@ sub _koha_notify_reserve {
     } else {
         $to_address = $borrower->{$which_address};
     }
-    
+
     my $letter_code;
     my $print_mode = 0;
     my $messagingprefs;
@@ -1888,7 +1917,7 @@ sub _koha_notify_reserve {
             borrowernumber => $borrowernumber,
             message_transport_type => 'print',
         } );
-        
+
         return;
     }
 
@@ -1967,6 +1996,58 @@ sub _ShiftPriorityByDateAndPriority {
     return $new_priority;  # so the caller knows what priority they wind up receiving
 }
 
+=head2 OPACItemHoldsAllowed
+
+  OPACItemHoldsAllowed($item_record,$borrower_record);
+
+Checks issuingrules, using the borrowers categorycode, the itemtype, and branchcode to see
+if specific item holds are allowed, returns true if so.
+
+=cut
+
+sub OPACItemHoldsAllowed {
+    my ($item,$borrower) = @_;
+
+    my $branchcode = $item->{homebranch} or die "No homebranch";
+    my $itype;
+    my $dbh = C4::Context->dbh;
+    if (C4::Context->preference('item-level_itypes')) {
+       # We cant trust GetItem to honour the syspref, so safest to do it ourselves
+       # When GetItem is fixed, we can remove this
+       $itype = $item->{itype};
+    }
+    else {
+       my $query = "SELECT itemtype FROM biblioitems WHERE biblioitemnumber = ? ";
+       my $sth = $dbh->prepare($query);
+       $sth->execute($item->{biblioitemnumber});
+       if (my $data = $sth->fetchrow_hashref()){
+           $itype = $data->{itemtype};
+       }
+    }
+
+    my $query = "SELECT opacitemholds,categorycode,itemtype,branchcode FROM issuingrules WHERE
+          (issuingrules.categorycode = ? OR issuingrules.categorycode = '*')
+        AND
+          (issuingrules.itemtype = ? OR issuingrules.itemtype = '*')
+        AND
+          (issuingrules.branchcode = ? OR issuingrules.branchcode = '*')
+        ORDER BY
+          issuingrules.categorycode desc,
+          issuingrules.itemtype desc,
+          issuingrules.branchcode desc
+       LIMIT 1";
+    my $dbh = C4::Context->dbh;
+    my $sth = $dbh->prepare($query);
+    $sth->execute($borrower->{categorycode},$itype,$branchcode);
+    my $data = $sth->fetchrow_hashref;
+    if ($data->{opacitemholds}){
+       return 1;
+    }
+    else {
+       return 0;
+    }
+}
+
 =head2 MoveReserve
 
   MoveReserve( $itemnumber, $borrowernumber, $cancelreserve )
diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
index 988244c..1d984ed 100644
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -238,7 +238,6 @@ sub shelfpage {
             # explicitly fetch this shelf
             my ($shelfnumber2,$shelfname,$owner,$category,$sorton) = GetShelf($shelfnumber);
 
-            $template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
             if (C4::Context->preference('TagsEnabled')) {
                 $template->param(TagsEnabled => 1);
                     foreach (qw(TagsShowOnList TagsInputOnList)) {
diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
index f45ea43..faf9781 100755
--- a/admin/smart-rules.pl
+++ b/admin/smart-rules.pl
@@ -101,12 +101,12 @@ elsif ($op eq 'delete-branch-item') {
 # save the values entered
 elsif ($op eq 'add') {
     my $sth_search = $dbh->prepare('SELECT COUNT(*) AS total FROM issuingrules WHERE branchcode=? AND categorycode=? AND itemtype=?');
-    my $sth_insert = $dbh->prepare('INSERT INTO issuingrules (branchcode, categorycode, itemtype, maxissueqty, renewalsallowed, reservesallowed, issuelength, lengthunit, hardduedate, hardduedatecompare, fine, finedays, firstremind, chargeperiod,rentaldiscount, overduefinescap) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)');
-    my $sth_update=$dbh->prepare("UPDATE issuingrules SET fine=?, finedays=?, firstremind=?, chargeperiod=?, maxissueqty=?, renewalsallowed=?, reservesallowed=?, issuelength=?, lengthunit = ?, hardduedate=?, hardduedatecompare=?, rentaldiscount=?, overduefinescap=?  WHERE branchcode=? AND categorycode=? AND itemtype=?");
+    my $sth_insert = $dbh->prepare('INSERT INTO issuingrules (branchcode, categorycode, itemtype, maxissueqty, renewalsallowed, reservesallowed, issuelength, lengthunit, hardduedate, hardduedatecompare, fine, finedays, firstremind, chargeperiod,rentaldiscount, onshelfholds, opacitemholds, reservesmaxpickupdelay, overduefinescap) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)');
+    my $sth_update=$dbh->prepare("UPDATE issuingrules SET fine=?, finedays=?, firstremind=?, chargeperiod=?, maxissueqty=?, renewalsallowed=?, reservesallowed=?, issuelength=?, lengthunit=?, hardduedate=?, hardduedatecompare=?, rentaldiscount=?, onshelfholds=?, opacitemholds=?, reservesmaxpickupdelay=?, overduefinescap=? WHERE branchcode=? AND categorycode=? AND itemtype=?");
     
     my $br = $branch; # branch
     my $bor  = $input->param('categorycode'); # borrower category
-    my $cat  = $input->param('itemtype');     # item type
+    my $itemtype  = $input->param('itemtype');     # item type
     my $fine = $input->param('fine');
     my $finedays     = $input->param('finedays');
     my $firstremind  = $input->param('firstremind');
@@ -114,6 +114,7 @@ elsif ($op eq 'add') {
     my $maxissueqty  = $input->param('maxissueqty');
     my $renewalsallowed  = $input->param('renewalsallowed');
     my $reservesallowed  = $input->param('reservesallowed');
+    my $onshelfholds     = $input->param('onshelfholds') || 0;
     $maxissueqty =~ s/\s//g;
     $maxissueqty = undef if $maxissueqty !~ /^\d+/;
     my $issuelength  = $input->param('issuelength');
@@ -122,15 +123,17 @@ elsif ($op eq 'add') {
     $hardduedate = format_date_in_iso($hardduedate);
     my $hardduedatecompare = $input->param('hardduedatecompare');
     my $rentaldiscount = $input->param('rentaldiscount');
+    my $reservesmaxpickupdelay = $input->param('reservesmaxpickupdelay');
+    my $opacitemholds = $input->param('opacitemholds') || 0;
     my $overduefinescap = $input->param('overduefinescap') || undef;
-    $debug and warn "Adding $br, $bor, $cat, $fine, $maxissueqty";
+    $debug and warn "Adding $br, $bor, $itemtype, $fine, $maxissueqty";
 
-    $sth_search->execute($br,$bor,$cat);
+    $sth_search->execute($br,$bor,$itemtype);
     my $res = $sth_search->fetchrow_hashref();
     if ($res->{total}) {
-        $sth_update->execute($fine, $finedays,$firstremind, $chargeperiod, $maxissueqty, $renewalsallowed,$reservesallowed, $issuelength,$lengthunit, $hardduedate,$hardduedatecompare,$rentaldiscount,$overduefinescap, $br,$bor,$cat);
+        $sth_update->execute($fine, $finedays,$firstremind, $chargeperiod, $maxissueqty, $renewalsallowed,$reservesallowed, $issuelength,$lengthunit, $hardduedate,$hardduedatecompare,$rentaldiscount, $onshelfholds, $opacitemholds, $reservesmaxpickupdelay, $overduefinescap, $br,$bor,$itemtype);
     } else {
-        $sth_insert->execute($br,$bor,$cat,$maxissueqty,$renewalsallowed,$reservesallowed,$issuelength,$lengthunit,$hardduedate,$hardduedatecompare,$fine,$finedays,$firstremind,$chargeperiod,$rentaldiscount,$overduefinescap);
+        $sth_insert->execute($br,$bor,$itemtype,$maxissueqty,$renewalsallowed,$reservesallowed,$issuelength,$lengthunit,$hardduedate,$hardduedatecompare,$fine,$finedays,$firstremind,$chargeperiod,$rentaldiscount,$onshelfholds,$opacitemholds,$reservesmaxpickupdelay,$overduefinescap);
     }
 } 
 elsif ($op eq "set-branch-defaults") {
@@ -385,7 +388,7 @@ while (my $row = $sth2->fetchrow_hashref) {
     $row->{'humancategorycode'} ||= $row->{'categorycode'};
     $row->{'default_humancategorycode'} = 1 if $row->{'humancategorycode'} eq '*';
     $row->{'fine'} = sprintf('%.2f', $row->{'fine'});
-    if ($row->{'hardduedate'} ne '0000-00-00') {
+    if ($row->{'hardduedate'} && $row->{'hardduedate'} ne '0000-00-00') {
        $row->{'hardduedate'} = format_date( $row->{'hardduedate'});
        $row->{'hardduedatebefore'} = 1 if ($row->{'hardduedatecompare'} == -1);
        $row->{'hardduedateexact'} = 1 if ($row->{'hardduedatecompare'} ==  0);
diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index 175f6a0..6686904 100755
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -186,7 +186,6 @@ $tabsysprefs{HomeOrHoldingBranch}            = "Circulation";
 $tabsysprefs{HomeOrHoldingBranchReturn}      = "Circulation";
 $tabsysprefs{RandomizeHoldsQueueWeight}      = "Circulation";
 $tabsysprefs{StaticHoldsQueueWeight}         = "Circulation";
-$tabsysprefs{AllowOnShelfHolds}              = "Circulation";
 $tabsysprefs{AllowHoldsOnDamagedItems}       = "Circulation";
 $tabsysprefs{UseBranchTransferLimits}        = "Circulation";
 $tabsysprefs{AllowHoldPolicyOverride}        = "Circulation";
@@ -367,7 +366,6 @@ $tabsysprefs{suggestion}           = "OPAC";
 $tabsysprefs{OpacTopissue}         = "OPAC";
 $tabsysprefs{OpacBrowser}          = "OPAC";
 $tabsysprefs{OpacRenewalAllowed}   = "OPAC";
-$tabsysprefs{OPACItemHolds}        = "OPAC";
 $tabsysprefs{OPACGroupResults}     = "OPAC";
 $tabsysprefs{XSLTDetailsDisplay}   = "OPAC";
 $tabsysprefs{XSLTResultsDisplay}   = "OPAC";
diff --git a/installer/data/mysql/it-IT/necessari/system_preferences.sql b/installer/data/mysql/it-IT/necessari/system_preferences.sql
index b4ddfa0..7aaa066 100644
--- a/installer/data/mysql/it-IT/necessari/system_preferences.sql
+++ b/installer/data/mysql/it-IT/necessari/system_preferences.sql
@@ -17,7 +17,6 @@
 -- 51 Franklin Street' WHERE variable = ' Fifth Floor' WHERE variable = ' Boston' WHERE variable = ' MA 02110-1301 USA.
 
 UPDATE systempreferences SET value = 'cataloguing' WHERE variable = 'AcqCreateItem';
-UPDATE systempreferences SET value = '1' WHERE variable = 'AllowOnShelfHolds';
 UPDATE systempreferences SET value = '1' WHERE variable = 'AllowRenewalLimitOverride';
 UPDATE systempreferences SET value = 'annual' WHERE variable = 'autoBarcode';
 UPDATE systempreferences SET value = 'email' WHERE variable = 'AutoEmailPrimaryAddress';
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 8fd20a4..d213545 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1001,6 +1001,9 @@ CREATE TABLE `issuingrules` ( -- circulation and fine rules
   `reservesallowed` smallint(6) NOT NULL default "0", -- how many holds are allowed
   `branchcode` varchar(10) NOT NULL default '', -- the branch this rule is for (branches.branchcode)
   overduefinescap decimal default NULL, -- the maximum amount of an overdue fine
+  onshelfholds tinyint(1) NOT NULL default 0, -- allow holds for items that are on shelf
+  opacitemholds tinyint(1) NOT NULL default "0", -- allow opac users to place specific items on hold
+  reservesmaxpickupdelay smallint(6) default NULL, -- max pickup delay
   PRIMARY KEY  (`branchcode`,`categorycode`,`itemtype`),
   KEY `categorycode` (`categorycode`),
   KEY `itemtype` (`itemtype`)
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 7b33ce6..be0f802 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -187,7 +187,6 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH:archiveID','KOHA-OAI-TEST','OAI-PMH archive identification',NULL,'Free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH:MaxCount','50','OAI-PMH maximum number of records by answer to ListRecords and ListIdentifiers queries',NULL,'Integer');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH:ConfFile','','If empty, Koha OAI Server operates in normal mode, otherwise it operates in extended mode.',NULL,'File');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACItemHolds','1','Allow OPAC users to place hold on specific items. If OFF, users can only request next available copy.','','YesNo');
 
 INSERT INTO `systempreferences` (variable, value,options,type, explanation) VALUES ('AddPatronLists','categorycode','categorycode|category_type','Choice','Allow user to choose what list to pick up from when adding patrons');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ExtendedPatronAttributes','0','Use extended patron IDs and attributes',NULL,'YesNo');
@@ -220,7 +219,6 @@ INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES
 ('XSLTDetailsDisplay','','','Enable XSL stylesheet control over details page display on intranet','Free'),
 ('XSLTResultsDisplay','','','Enable XSL stylesheet control over results page display on intranet','Free');
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AdvancedSearchTypes','itemtypes','itemtypes|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice');
-INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowOnShelfHolds', '0', '', 'Allow hold requests to be placed on items that are not on loan', 'YesNo');
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowHoldsOnDamagedItems', '1', '', 'Allow hold requests to be placed on damaged items', 'YesNo');
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('OpacSuppression', '0', '', 'Turn ON the OPAC Suppression feature, requires further setup, ask your system administrator for details', 'YesNo');
 -- FIXME: add FrameworksLoaded, noOPACUserLogin?
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 5d6f7db..bc11d4d 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -2092,7 +2092,6 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     $dbh->do("UPDATE `systempreferences` SET options='10' WHERE variable='globalDueDate'");
     $dbh->do("UPDATE `systempreferences` SET type='Integer' WHERE variable='numSearchResults'");
     $dbh->do("UPDATE `systempreferences` SET type='Integer' WHERE variable='OPACnumSearchResults'");
-    $dbh->do("UPDATE `systempreferences` SET type='Integer' WHERE variable='ReservesMaxPickupDelay'");
     $dbh->do("UPDATE `systempreferences` SET type='Integer' WHERE variable='TransfersMaxDaysWarning'");
     $dbh->do("UPDATE `systempreferences` SET type='Integer' WHERE variable='StaticHoldsQueueWeight'");
     $dbh->do("UPDATE `systempreferences` SET type='Integer' WHERE variable='holdCancelLength'");
@@ -5859,6 +5858,41 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion($DBversion);
 }
 
+
+
+$DBversion = '3.09.00.XXX';
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    # First create the column
+    $dbh->do("ALTER TABLE issuingrules ADD onshelfholds tinyint(1) default 0");
+    # Now update the column
+    if (C4::Context->preference("AllowOnShelfHolds")){
+        # Pref is on, set allow for all rules
+        $dbh->do("UPDATE issuingrules SET onshelfholds=1");
+    } else {
+        # If the preference is not set, leave off
+        $dbh->do("UPDATE issuingrules SET onshelfholds=0");
+    }
+    $dbh->do("ALTER TABLE issuingrules MODIFY onshelfholds tinyint(1) default 0 NOT NULL");
+    # Remove from the systempreferences table
+    $dbh->do("DELETE FROM systempreferences WHERE variable = 'AllowOnShelfHolds'");
+
+    # First create the column
+    $dbh->do("ALTER TABLE issuingrules ADD opacitemholds tinyint(1) DEFAULT 0");
+    # Now update the column
+    if (C4::Context->preference("OPACItemHolds")){
+       # Pref is on, set allow for all rules
+       $dbh->do("UPDATE issuingrules SET opacitemholds=1");
+    }
+    # If the preference is not set, leave off
+    # Remove from the systempreferences table
+    $dbh->do("DELETE FROM systempreferences WHERE variable = 'OPACItemHolds'");
+
+    $dbh->do("ALTER TABLE issuingrules ADD reservesmaxpickupdelay smallint(6) DEFAULT NULL");
+
+    print "Upgrade to $DBversion done (Move AllowOnShelfHolds to circulation matrix; Move OPACItemHolds system preference to circulation matrix; ReservesMaxPickupDelay circulation rule)\n";
+    SetVersion ($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
diff --git a/installer/html-template-to-template-toolkit.pl b/installer/html-template-to-template-toolkit.pl
index e99b195..5f0e0ac 100755
--- a/installer/html-template-to-template-toolkit.pl
+++ b/installer/html-template-to-template-toolkit.pl
@@ -32,7 +32,7 @@ my @globals = ("themelang","JacketImages","OPACAmazonCoverImages","GoogleJackets
 "SyndeticsEnabled", "OpacRenewalAllowed", "item_level_itypes","noItemTypeImages",
 "virtualshelves", "RequestOnOpac", "COinSinOPACResults", "OPACXSLTResultsDisplay",
 "OPACItemsResultsDisplay", "LibraryThingForLibrariesID", "opacuserlogin", "TagsEnabled",
-"TagsShowOnList", "TagsInputOnList","loggedinusername","AllowOnShelfHolds","opacbookbag",
+"TagsShowOnList", "TagsInputOnList","loggedinusername","opacbookbag",
 "OPACAmazonEnabled", "SyndeticsCoverImages","using_https");
 
 # Arguments:
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index 531b878..103b8b9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -299,12 +299,6 @@ Circulation:
                   no: "Don't allow"
             - hold requests to be placed on damaged items.
         -
-            - pref: AllowOnShelfHolds
-              choices:
-                  yes: Allow
-                  no: "Don't allow"
-            - hold requests to be placed on items that are not checked out.
-        -
             - pref: AllowHoldDateInFuture
               choices:
                   yes: Allow
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index e645785..6386213 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -401,12 +401,6 @@ OPAC:
 #              choices:
 #            - If ON, enables subject cloud on OPAC
         -
-            - pref: OPACItemHolds
-              choices:
-                  yes: Allow
-                  no: "Don't allow"
-            - patrons to place holds on specific items in the OPAC. If this is disabled, users can only put a hold on the next available item.
-        -
             - pref: OpacRenewalAllowed
               choices:
                   yes: Allow
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
index b2f62f7..429f33d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -76,57 +76,46 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
                 <th>Suspension in days (day)</th>
                 <th>Renewals allowed (count)</th>
                 <th>Holds allowed (count)</th>
-		<th>Rental discount (%)</th>
-				<th>&nbsp;</th>
+                <th>On Shelf Holds Allowed</th>
+                <th>Allow OPAC Users to place Holds on Items</th>
+                <th>Holds Max Pickup Delay (day)</th>
+                <th>Rental discount (%)</th>
+                <th>&nbsp;</th>
             </tr>
-				[% FOREACH rule IN rules %]
-					[% UNLESS ( loop.odd ) %]
-					<tr class="highlight">
-					[% ELSE %]
-					<tr>
-					[% END %]
-							<td>[% IF ( rule.default_humancategorycode ) %]
-									<em>All</em>
-								[% ELSE %]
-									[% rule.humancategorycode %]
-								[% END %]
-							</td>
-							<td>[% IF ( rule.default_humanitemtype ) %]
-									<em>All</em>
-								[% ELSE %]
-									[% rule.humanitemtype %]
-								[% END %]
-							</td>
-							<td>[% IF ( rule.unlimited_maxissueqty ) %]
-									Unlimited
-								[% ELSE %]
-									[% rule.maxissueqty %]
-								[% END %]
-							</td>
-							<td>[% rule.issuelength %]</td>
-							<td>
-							    [% rule.lengthunit %]
-							</td>
-                                                        <td>[% IF ( rule.hardduedate ) %]
-                                                               [% IF ( rule.hardduedatebefore ) %]before [% rule.hardduedate %]</td>
-                                                               [% ELSE %][% IF ( rule.hardduedateexact ) %]on [% rule.hardduedate %]</td>
-                                                                                 [% ELSE %][% IF ( rule.hardduedateafter ) %]after [% rule.hardduedate %]</td>[% END %]
-                                                                                 [% END %]
-                                                               [% END %]
-                                                            [% ELSE %]None defined[% END %]   
-							<td>[% rule.fine %]</td>
-							<td>[% rule.chargeperiod %]</td>
-							<td>[% rule.firstremind %]</td>
-                            <td>[% rule.overduefinescap FILTER format("%.2f") %]</td>
-							<td>[% rule.finedays %]</td>
-							<td>[% rule.renewalsallowed %]</td>
-							<td>[% rule.reservesallowed %]</td>
-							<td>[% rule.rentaldiscount %]</td>
-							<td>
-								<a class="button" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&amp;itemtype=[% rule.itemtype %]&amp;categorycode=[% rule.categorycode %]&amp;branch=[% rule.current_branch %]">Delete</a>
-							</td>
-                	</tr>
-            	[% END %]
+        [% FOREACH rule IN rules %]
+            [% IF ( loop.odd ) %] <tr> [% ELSE %] <tr class="highlight"> [% END %]
+                <td>[% IF ( rule.default_humancategorycode ) %]<em>All</em>[% ELSE %][% rule.humancategorycode %][% END %]</td>
+                <td>[% IF ( rule.default_humanitemtype ) %]<em>All</em>[% ELSE %][% rule.humanitemtype %][% END %]</td>
+                <td>[% IF ( rule.unlimited_maxissueqty ) %] Unlimited [% ELSE %][% rule.maxissueqty %][% END %]</td>
+                <td>[% rule.issuelength %]</td>
+                <td>[% rule.lengthunit %]</td>
+                <td>
+                [% IF ( rule.hardduedate ) %]
+                    [% IF ( rule.hardduedatebefore ) %]
+                        before [% rule.hardduedate %]
+                    [% ELSIF ( rule.hardduedateexact ) %]
+                        on [% rule.hardduedate %]
+                    [% ELSIF ( rule.hardduedateafter ) %]
+                        after [% rule.hardduedate %]
+                    [% END %]
+                [% ELSE %]
+                    None defined
+                [% END %]   
+                </td>
+                <td>[% rule.fine %]</td>
+                <td>[% rule.chargeperiod %]</td>
+                <td>[% rule.firstremind %]</td>
+                <td>[% rule.overduefinescap FILTER format("%.2f") %]</td>
+                <td>[% rule.finedays %]</td>
+                <td>[% rule.renewalsallowed %]</td>
+                <td>[% rule.reservesallowed %]</td>
+                <td>[% IF rule.onshelfholds %]Yes[% ELSE %]No[% END %]</td>
+                <td>[% IF rule.opacitemholds %]Yes[% ELSE %]No[% END %]</td>
+                <td>[% rule.reservesmaxpickupdelay %]</td>
+                <td>[% rule.rentaldiscount %]</td>
+                <td> <a class="button" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&amp;itemtype=[% rule.itemtype %]&amp;categorycode=[% rule.categorycode %]&amp;branch=[% rule.current_branch %]">Delete</a> </td>
+             </tr>
+        [% END %]
                 <tr>
                     <td>
                         <select name="categorycode">
@@ -167,7 +156,10 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
                     <td><input name="finedays" size="3" /> </td>
                     <td><input name="renewalsallowed" size="2" /></td>
                     <td><input name="reservesallowed" size="2" /></td>
-		    <td><input name="rentaldiscount" size="2" /></td>
+                    <td><input type="checkbox" name="onshelfholds" value="1" /></td>
+                    <td><input type="checkbox" name="opacitemholds" value="1" /></td>
+                    <td><input name="reservesmaxpickupdelay" size="2" /></td>
+                    <td><input name="rentaldiscount" size="2" /></td>
                     <td><input type="hidden" name="branch" value="[% current_branch %]"/><input type="submit" value="Add" class="submit" /></td>
                 </tr>
             </table>
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-detail-sidebar.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-detail-sidebar.inc
index 0f16f3a..3e79d46 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-detail-sidebar.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-detail-sidebar.inc
@@ -2,13 +2,7 @@
     [% UNLESS ( norequests ) %]
         [% IF ( opacuserlogin ) %]
             [% IF ( RequestOnOpac ) %]
-                [% IF ( AllowOnShelfHolds ) %]
-                    <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place hold</a></li>
-                [% ELSE %]
-                    [% IF ( ItemsIssued ) %]
-                        <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place hold</a></li>
-                    [% END %]
-                [% END %]
+                <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place hold</a></li>
             [% END %]
         [% END %]
     [% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
index a5f3602..00f7c75 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
@@ -209,23 +209,22 @@
             [% IF ( bad_data ) %]
               <div id="bad_data" class="dialog alert">ERROR: Internal error: incomplete hold request.</div>
             [% END %]
-          [% ELSE %]
-            [% IF ( none_available ) %]
+          [% ELSIF ( none_available ) %]
                 <div id="none_available" class="dialog alert"><strong>Sorry</strong>, none of these items can be placed on hold.
                 </div>
-              [% END %]
           [% END %]<!-- NAME="message" -->
 
       [% UNLESS ( message ) %][% UNLESS ( none_available ) %]<h3>Confirm holds for:
                       [% FOREACH USER_INF IN USER_INFO %]
                         [% USER_INF.firstname %] [% USER_INF.surname %] ([% USER_INF.cardnumber %])
                       [% END %]
-                    </h3>[% END %]
-	      [% IF (RESERVE_CHARGE) %]
+                    </h3>
+          [% IF (RESERVE_CHARGE) %]
 	      <div class="dialog alert" id="reserve_fee">
 	        There is a charge of [% RESERVE_CHARGE %] for placing this hold
 	      </div>
-	      [% END %]
+          [% END %]
+      [% END %][% END %]
 
             <form action="/cgi-bin/koha/opac-reserve.pl" method="post" id="hold-request-form">
             <input type="hidden" name="place_reserve" value="1"/>
@@ -234,38 +233,47 @@
             <input type="hidden" name="biblionumbers" id="biblionumbers"/>
             <input type="hidden" name="selecteditems" id="selections"/>
             <div id="bigloop">
+            [% extra_cols = 2 %]
               <table id="bibitemloop">
-                [% UNLESS ( none_available ) %]<tr>
+                <tr>
+                [% UNLESS ( none_available ) %]
                   <th>Hold</th>
+                [% END %]
                   <th>Title</th>
-                  [% UNLESS ( item_level_itypes ) %]
+                [% UNLESS ( item_level_itypes ) %]
                     <th>Item type</th>
-                  [% END %]
+                [% END %]
+                [% UNLESS ( none_available ) %]
                   [% IF showholds && showpriority %]
+                    [% extra_cols = extra_cols + 1 %]
                   <th>Holds and priority</th>
                   [% ELSIF showholds %]
+                    [% extra_cols = extra_cols + 1 %]
                   <th>Holds</th>
                   [% ELSIF showpriority %]
+                    [% extra_cols = extra_cols + 1 %]
                   <th>Priority</th>
                   [% END %]
 		  [% IF ( reserve_in_future ) %]
+                    [% extra_cols = extra_cols + 1 %]
         <th>Hold starts on date</th>
 		  [% END %]
         <th>Hold not needed after</th>
-                  [% IF ( OPACItemHolds ) %]
                     <th id="place_on_hdr" style="display:none">Place on</th>
-                  [% END %]
                   [% UNLESS ( singleBranchMode ) %]
 		    [% IF ( choose_branch ) %]
+                      [% extra_cols = extra_cols + 1 %]
                         <th>Pickup location</th>
 		    [% END %]
                   [% END %]
-                </tr>[% ELSE %]<tr><th colspan="5">Title</th></tr>[% END %]
+                [% END %]
+                </tr>
 
                 [% FOREACH bibitemloo IN bibitemloop %]
-                  <tr>
-                      [% IF ( bibitemloo.holdable ) %]
-                                    <td class="hold">
+                <tr>
+                    [% UNLESS none_available %]
+                    <td class="hold">
+                        [% IF ( bibitemloo.holdable ) %]
                       <input class="reserve_mode" name="reserve_mode" type="hidden" value="single"/>
                       <input class="single_bib" name="single_bib" type="hidden" value="[% bibitemloo.biblionumber %]"/>
                         <span class="confirmjs_hold" title="[% bibitemloo.biblionumber %]"></span>
@@ -276,38 +284,35 @@
                                  value="any" />
                           <label class="confirm_label" for="[% bibitemloo.checkitem_bib %]">Next available copy</label>
                         </span>
-					</td>
-                      [% ELSE %]
-                                      [% UNLESS ( none_available ) %]<td class="hold">&nbsp;</td>[% END %]
-                      [% END %]
-                    [% IF ( bibitemloo.holdable ) %]<td class="title">[% ELSE %]<td class="title" colspan="5">[% END %]
+                        [% ELSE %]
+                        &nbsp;
+                        [% END %]
+                    </td>
+                    [% END %]
+                    <td class="title">
                       <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% bibitemloo.biblionumber %]">[% bibitemloo.title |html %][% IF ( bibitemloo.subtitle ) %] [% FOREACH subtitl IN bibitemloo.subtitle %][% subtitl.subfield %][% END %][% END %]</a>
                       [% IF ( bibitemloo.author ) %],  by [% bibitemloo.author %][% END %]
 
                       [% UNLESS ( bibitemloo.holdable ) %]
-
+                          <div class="bibmessage">
                         [% IF ( bibitemloo.already_reserved ) %]
-                          <div class="bibmessage">You have already requested this title.</div>
+                            You have already requested this title.
+                        [% ELSIF ( bibitemloo.bib_available ) %]
+                            No available items.
                         [% ELSE %]
-                          [% UNLESS ( bibitemloo.bib_available ) %]
-                            <div class="bibmessage">No available items.</div>
-                          [% ELSE %]
-                            <div class="bibmessage">This title cannot be requested.</div>
-                          [% END %]
-                        [% END %]
-
-
+                            This title cannot be requested.
                         [% END %]
-
+                          </div>
+                      [% END %]
                     </td>
-                    [% IF ( bibitemloo.holdable ) %]
-            <!-- HOLDABLE -->
                         [% UNLESS ( item_level_itypes ) %]
                         <td class="itype">
                             [% IF ( bibitemloo.imageurl ) %]<img src="[% bibitemloo.imageurl %]" alt="" />[% END %]
                             [% bibitemloo.description %]
                         </td>
                         [% END %]
+                    [% IF ( bibitemloo.holdable ) %]
+            <!-- HOLDABLE -->
                         [% IF showholds || showpriority %]
                         <td class="priority">
                         [% IF showpriority %] [% bibitemloo.rank %] [% END %]
@@ -332,68 +337,36 @@
         <input name="expiration_date_[% bibitemloo.biblionumber %]" id="to" size="10" readonly="readonly" class="datepickerto" />
       <p style="margin:.3em 2em;">
       <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('expiration_date_[% bibitemloo.biblionumber %]').value='';return false;">Clear date</a></p>
-    </td>[% END %]
+    </td>
 
-                    [% IF ( bibitemloo.holdable ) %]
-		    <!-- HOLD ABLE -->
-		    [% IF ( OPACItemHolds ) %]
+                        <td class="place_on_type" style="display:none">
 		    <!-- ITEM HOLDS -->
-                                          <td class="place_on_type" style="display:none">
-                                            <ul>
-                                                <li>
-                                                  [% UNLESS ( bibitemloo.holdable ) %]
-                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
-                                                           id="reqany_[% bibitemloo.biblionumber %]"
-                                                           class="selectany"
-                                                           value="Any"
-                                                           disabled="disabled"
-                                                    />
-                                                  [% ELSE %]
-                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
-                                                           id="reqany_[% bibitemloo.biblionumber %]"
-                                                           class="selectany"
-                                                           value="Any"
-                                                           checked="checked"
-                                                    />
-                                                  [% END %]
-                                                  <label for="reqany_[% bibitemloo.biblionumber %]">Next available copy</label>
-                                                </li>
-                                                <li>
-                                                  [% UNLESS ( bibitemloo.holdable ) %]
-                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
-                                                           id="reqspecific_[% bibitemloo.biblionumber %]"
-                                                           class="selectspecific"
-                                                           disabled="disabled"
-                                                           value="Specific"
-                                                    />
-                                                  [% ELSE %]
-                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
-                                                           id="reqspecific_[% bibitemloo.biblionumber %]"
-                                                           class="selectspecific"
-                                                           value="Specific"
-                                                    />
-                                                  [% END %]
-                                                  <label for="reqspecific_[% bibitemloo.biblionumber %]">A specific copy</label>
-                                                </li>
-                                            </ul>
-                                          </td>
-                                        [% END %][% END %]
-
-                    [% UNLESS ( singleBranchMode ) %]
-                        [% IF ( bibitemloo.holdable ) %]
+                          <ul>
+                              <li>
+                                  <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
+                                         id="reqany_[% bibitemloo.biblionumber %]"
+                                         class="selectany"
+                                         value="Any"
+                                         checked="checked"
+                                  />
+                                <label for="reqany_[% bibitemloo.biblionumber %]">Next available copy</label>
+                              </li>
+                        [% IF ( bibitemloo.itemholdable ) %]
+                              <li>
+                                  <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
+                                         id="reqspecific_[% bibitemloo.biblionumber %]"
+                                         class="selectspecific"
+                                         value="Specific"
+                                  />
+                                <label for="reqspecific_[% bibitemloo.biblionumber %]">A specific copy</label>
+                              </li>
+                        [% END %]
+                          </ul>
+                        </td>
+
+                        [% UNLESS ( singleBranchMode ) %]
 			    [% IF ( choose_branch ) %]
-                                          <td class="branch">
-                         [% UNLESS ( bibitemloo.holdable ) %]
-                            <select name="branch" id="branch_[% bibitemloo.biblionumber %]" disabled="disabled">
-                              [% FOREACH branchChoicesLoo IN bibitemloo.branchChoicesLoop %]
-                                [% IF ( branchChoicesLoo.selected ) %]
-                                  <option value="[% branchChoicesLoo.value %]" selected="selected">[% branchChoicesLoo.branchname %]</option>
-                                [% ELSE %]
-                                  <option value="[% branchChoicesLoo.value %]">[% branchChoicesLoo.branchname %]</option>
-                                [% END %]
-                              [% END %]
-                          </select>
-                          [% ELSE %]
+                        <td class="branch">
                             <select name="branch" id="branch_[% bibitemloo.biblionumber %]">
                               [% FOREACH branchChoicesLoo IN bibitemloo.branchChoicesLoop %]
                                 [% IF ( branchChoicesLoo.selected ) %]
@@ -403,15 +376,15 @@
                                 [% END %]
                               [% END %]
                             </select>
-                          [% END %]
                        </td>
-			    [% END %]
-		        [% END %]
-                    [% END %]
+                            [% END %]
+                        [% END %]
+                    [% ELSIF NOT none_available %]
+                       <td colspan="[% extra_cols %]">&nbsp;</td>
+                    [% END # holdable%]
                   </tr>
 
-                  [% IF ( OPACItemHolds ) %]
-                  [% IF ( bibitemloo.holdable ) %]
+                    [% IF ( bibitemloo.itemholdable ) %]
                     <tr class="copiesrow" id="copiesrow_[% bibitemloo.biblionumber %]">
                       <td>&nbsp;</td>
                       <td colspan="[% itemtable_colspan %]">
@@ -490,11 +463,9 @@
                         </table>
                       </td>
                     </tr>
-                  [% END %]<!-- bib_available -->
-                  [% END %]<!-- OPACItemHolds -->
-                [% END %]
-              </table><!-- bibitemloop -->
-              [% END %] <!-- if message -->
+                    [% END # itemholdable%]
+                [% END %]<!-- bibitemloop -->
+              </table>
             </div><!-- bigloop -->
 
             [% UNLESS ( message ) %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
index 86e1a08..85db58b 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
@@ -269,18 +269,14 @@ function highlightOn() {
 
 				<p>
                                 [% IF ( RequestOnOpac ) %]
-					[% UNLESS ( GROUP_RESULT.norequests ) %]
-						[% IF ( opacuserlogin ) %]
-							[% IF ( AllowOnShelfHolds ) %]
+                                    [% UNLESS ( GROUP_RESULT.norequests ) %]
+                                        [% IF ( opacuserlogin ) %]
+                                            [% IF ( GROUP_RESULT.holdable ) %]
                                 <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% GROUP_RESULT.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue-->
-							[% ELSE %]
-								[% IF ( GROUP_RESULT.itemsissued ) %]
-                                    <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% GROUP_RESULT.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue-->
-								[% END %]
-							[% END %]
-						[% END %]
-					[% END %]
-				[% END %]
+                                            [% END %]
+                                        [% END %]
+                                    [% END %]
+                                [% END %]
 
 				[% IF ( opacbookbag || virtualshelves ) %]<input type="checkbox" name="biblionumber" value="[% GROUP_RESULT.biblionumber %]" title="Click to add to cart" /> <label for="bib[% GROUP_RESULT.biblionumber %]">[% END %]<img src="[% themelang %]/images/[% GROUP_RESULT.itemtype %].gif" alt="[% GROUP_RESULT.ccode %]" title="[% GROUP_RESULT.ccode %]" />[% IF ( opacbookbag || virtualshelves ) %]</label>[% END %] [% IF ( GROUP_RESULT.classification ) %]
                                     <a href="/cgi-bin/koha/opac-search.pl?q=callnum:[% GROUP_RESULT.classification |url %]">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
index e5238f7..1d04cec 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
@@ -587,12 +587,8 @@ $(document).ready(function(){
                 [% IF ( RequestOnOpac ) %]
                     [% UNLESS ( SEARCH_RESULT.norequests ) %]
                         [% IF ( opacuserlogin ) %]
-                            [% IF ( AllowOnShelfHolds ) %]
+                            [% IF ( SEARCH_RESULT.holdable ) %]
                                 <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue-->
-                            [% ELSE %]
-                                [% IF ( SEARCH_RESULT.itemsissued ) %]
-                                    <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue-->
-                                [% END %]
                             [% END %]
                         [% END %]
                     [% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
index 9e782fb..ed139ca 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
@@ -384,7 +384,7 @@ $(function() {
       [% IF ( RequestOnOpac ) %]
           [% UNLESS ( itemsloo.norequests ) %]
             [% IF ( opacuserlogin ) %]
-              [% IF ( AllowOnShelfHolds ) %]
+              [% IF ( itemsloo.allow_onshelf_holds ) %]
                 <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% itemsloo.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue-->
               [% ELSE %]
                 [% IF ( itemsloo.itemsissued ) %]
diff --git a/opac/opac-ISBDdetail.pl b/opac/opac-ISBDdetail.pl
index 773ed51..cfa149b 100755
--- a/opac/opac-ISBDdetail.pl
+++ b/opac/opac-ISBDdetail.pl
@@ -69,17 +69,13 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 my $biblionumber = $query->param('biblionumber');
 
 # get biblionumbers stored in the cart
-my @cart_list;
-
-if($query->cookie("bib_list")){
-    my $cart_list = $query->cookie("bib_list");
-    @cart_list = split(/\//, $cart_list);
+if(my $cart_list = $query->cookie("bib_list")){
+    my @cart_list = split(/\//, $cart_list);
     if ( grep {$_ eq $biblionumber} @cart_list) {
         $template->param( incart => 1 );
     }
 }
 
-$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
 $template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
 
 my $marcflavour      = C4::Context->preference("marcflavour");
@@ -162,7 +158,6 @@ foreach ( @$reviews ) {
 
 $template->param(
     RequestOnOpac       => C4::Context->preference("RequestOnOpac"),
-    AllowOnShelfHolds   => C4::Context->preference('AllowOnShelfHolds'),
     norequests   => $norequests,
     ISBD         => $res,
     biblionumber => $biblionumber,
diff --git a/opac/opac-MARCdetail.pl b/opac/opac-MARCdetail.pl
index 2d9dc25..34c9125 100755
--- a/opac/opac-MARCdetail.pl
+++ b/opac/opac-MARCdetail.pl
@@ -82,17 +82,13 @@ $template->param(
 );
 
 # get biblionumbers stored in the cart
-my @cart_list;
-
-if($query->cookie("bib_list")){
-    my $cart_list = $query->cookie("bib_list");
-    @cart_list = split(/\//, $cart_list);
+if(my $cart_list = $query->cookie("bib_list")){
+    my @cart_list = split(/\//, $cart_list);
     if ( grep {$_ eq $biblionumber} @cart_list) {
         $template->param( incart => 1 );
     }
 }
 
-$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
 $template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
 
 # adding the $RequestOnOpac param
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index cdb4a5a..f9a64e2 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -386,8 +386,6 @@ if ($session->param('busc')) {
 }
 
 
-
-$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
 $template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
 
 
diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index bb23752..7bf505a 100755
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -400,6 +400,7 @@ foreach my $biblioNum (@biblionumbers) {
 
     $biblioLoopIter{itemLoop} = [];
     my $numCopiesAvailable = 0;
+    my $numCopiesOPACAvailable = 0;
     foreach my $itemInfo (@{$biblioData->{itemInfos}}) {
         my $itemNum = $itemInfo->{itemnumber};
         my $itemLoopIter = {};
@@ -492,16 +493,26 @@ foreach my $biblioNum (@biblionumbers) {
 
         my $branch = C4::Circulation::_GetCircControlBranch($itemLoopIter, $borr);
 
-        my $branchitemrule = GetBranchItemRule( $branch, $itemInfo->{'itype'} );
-        my $policy_holdallowed = 1;
-
-        if ( $branchitemrule->{'holdallowed'} == 0 ||
-                ( $branchitemrule->{'holdallowed'} == 1 && $borr->{'branchcode'} ne $itemInfo->{'homebranch'} ) ) {
-            $policy_holdallowed = 0;
+        my $policy_holdallowed = !$itemLoopIter->{already_reserved};
+        if ($policy_holdallowed) {
+            if (my $branchitemrule = GetBranchItemRule( $branch, $itemInfo->{'itype'} )) {
+                $policy_holdallowed =
+                  ($branchitemrule->{'holdallowed'} == 2) ||
+                  ($branchitemrule->{'holdallowed'} == 1
+                      && $borr->{'branchcode'} eq $itemInfo->{'homebranch'});
+            } else {
+                $policy_holdallowed = 0; # No rule - not allowed
+            }
         }
-
-        if (IsAvailableForItemLevelRequest($itemNum) and $policy_holdallowed and CanItemBeReserved($borrowernumber,$itemNum) and ($itemLoopIter->{already_reserved} ne 1)) {
-            $itemLoopIter->{available} = 1;
+        $policy_holdallowed &&=
+            IsAvailableForItemLevelRequest($itemInfo,$borr) &&
+            CanItemBeReserved($borrowernumber,$itemNum);
+
+        if ($policy_holdallowed) {
+            if ( OPACItemHoldsAllowed( $itemInfo, $borr ) ) {
+                $itemLoopIter->{available} = 1;
+                $numCopiesOPACAvailable++;
+            }
             $numCopiesAvailable++;
         }
 
@@ -527,18 +538,17 @@ foreach my $biblioNum (@biblionumbers) {
         $numBibsAvailable++;
         $biblioLoopIter{bib_available} = 1;
         $biblioLoopIter{holdable} = 1;
-        $anyholdable = 1;
+        $biblioLoopIter{itemholdable} = 1 if $numCopiesOPACAvailable;
     }
     if ($biblioLoopIter{already_reserved}) {
         $biblioLoopIter{holdable} = undef;
-        $anyholdable = undef;
-    }
-    if(not CanBookBeReserved($borrowernumber,$biblioNum)){
-        $biblioLoopIter{holdable} = undef;
-        $anyholdable = undef;
+        $biblioLoopIter{itemholdable} = undef;
     }
+    $biblioLoopIter{holdable} &&= CanBookBeReserved($borrowernumber,$biblioNum);
 
     push @$biblioLoop, \%biblioLoopIter;
+
+    $anyholdable = 1 if $biblioLoopIter{holdable};
 }
 
 if ( $numBibsAvailable == 0 || !$anyholdable) {
@@ -546,9 +556,6 @@ if ( $numBibsAvailable == 0 || !$anyholdable) {
 }
 
 my $itemTableColspan = 7;
-if (! $template->{VARS}->{'OPACItemHolds'}) {
-    $itemTableColspan--;
-}
 if (! $template->{VARS}->{'singleBranchMode'}) {
     $itemTableColspan--;
 }
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 6415a29..cbbfefe 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -51,6 +51,8 @@ use C4::Tags qw(get_tags);
 use C4::Branch; # GetBranches
 use C4::SocialData;
 use C4::Ratings;
+use C4::Members;
+use C4::Reserves;
 
 use POSIX qw(ceil floor strftime);
 use URI::Escape;
@@ -124,7 +126,7 @@ if (C4::Context->preference("marcflavour") eq "UNIMARC" ) {
 elsif (C4::Context->preference("marcflavour") eq "MARC21" ) {
     $template->param('usmarc' => 1);
 }
-$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
+
 $template->param( 'OPACNoResultsFound' => C4::Context->preference('OPACNoResultsFound') );
 
 $template->param(
@@ -512,8 +514,11 @@ if ($@ || $error) {
     exit;
 }
 
+my $borrower = $borrowernumber ? GetMember( borrowernumber => $borrowernumber ) : undef;
+
 # At this point, each server has given us a result set
 # now we build that set for template display
+my %allow_onshelf_holds;
 my @sup_results_array;
 for (my $i=0;$i<@servers;$i++) {
     my $server = $servers[$i];
@@ -528,11 +533,23 @@ for (my $i=0;$i<@servers;$i++) {
                 # we need to set the offset parameter of searchResults to 0
                 my @group_results = searchResults( 'opac', $query_desc, $group->{'group_count'},$results_per_page, 0, $scan,
                                                    $group->{"RECORDS"});
+                if ($borrower) {
+                    $_->{holdable} =
+                        IsAvailableForItemLevelRequest($_, $borrower) &&
+                        OPACItemHoldsAllowed($_, $borrower)
+                      foreach @group_results;
+                }
                 push @newresults, { group_label => $group->{'group_label'}, GROUP_RESULTS => \@group_results };
             }
         } else {
             @newresults = searchResults('opac', $query_desc, $hits, $results_per_page, $offset, $scan,
                                         $results_hashref->{$server}->{"RECORDS"});
+            if ($borrower) {
+                $_->{holdable} =
+                    IsAvailableForItemLevelRequest($_, $borrower) &&
+                    OPACItemHoldsAllowed($_, $borrower)
+                  foreach @newresults;
+            }
         }
 
         # must define a value for size if not present in DB
diff --git a/reserve/request.pl b/reserve/request.pl
index c34a614..a922c8f 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -456,7 +456,7 @@ foreach my $biblionumber (@biblionumbers) {
             if (
                    $policy_holdallowed
                 && !$item->{cantreserve}
-                && IsAvailableForItemLevelRequest($itemnumber)
+                && IsAvailableForItemLevelRequest($item, $borrowerinfo)
                 && CanItemBeReserved(
                     $borrowerinfo->{borrowernumber}, $itemnumber
                 )
-- 
1.7.9.5


From fridolyn.somers at biblibre.com  Wed Sep 19 11:48:19 2012
From: fridolyn.somers at biblibre.com (Fridolyn SOMERS)
Date: Wed, 19 Sep 2012 11:48:19 +0200
Subject: [Koha-patches] [PATCH] Bug 8791: OPAC UNIMARC XSLT details: subject
	with subfield 3
Message-ID: <1348048099-7991-1-git-send-email-fridolyn.somers@biblibre.com>

---
 .../opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl    |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
index 32f8cde..09bd9e0 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
@@ -214,7 +214,7 @@
             <xsl:variable name="start" select="position()"/>
             <xsl:variable name="ends">
               <xsl:for-each select="../marc:subfield[position() &gt; $start]">
-                <xsl:if test="@code=3 or @code=9 or @code=2">
+                <xsl:if test="@code=9">
                   <xsl:variable name="end" select="position() + $start"/>
                   <xsl:value-of select="$end"/>
                   <xsl:text>,</xsl:text>
@@ -232,7 +232,7 @@
               </xsl:choose>
             </xsl:variable>
             <xsl:variable name="display">
-              <xsl:for-each select="../marc:subfield[position() &gt; $start and position() &lt; $end]">
+              <xsl:for-each select="../marc:subfield[position() &gt; $start and position() &lt; $end and @code!=2 and @code!=3]">
                 <xsl:value-of select="."/>
                 <xsl:if test="not(position()=last())">
                   <xsl:text>, </xsl:text>
-- 
1.7.9.5


From colin.campbell at ptfs-europe.com  Wed Sep 19 18:39:11 2012
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Wed, 19 Sep 2012 17:39:11 +0100
Subject: [Koha-patches] [PATCH] Bug 6679 Avoid critic failure caused by
	ambiguous code
Message-ID: <1348072751-2482-1-git-send-email-colin.campbell@ptfs-europe.com>

If countitems not set to 1 it was not being declared
but is referred to outside this scope, generating
runtime warnings and test failure
---
 cataloguing/value_builder/marc21_linking_section.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cataloguing/value_builder/marc21_linking_section.pl b/cataloguing/value_builder/marc21_linking_section.pl
index 275d3a5..f317f8b 100644
--- a/cataloguing/value_builder/marc21_linking_section.pl
+++ b/cataloguing/value_builder/marc21_linking_section.pl
@@ -226,7 +226,7 @@ sub plugin {
                       my $record = MARC::Record::new_from_usmarc( $results->[$i] );
                   my $rechash = TransformMarcToKoha( $dbh, $record );
                     my $pos;
-                       my $countitems = 1 if ( $rechash->{itemnumber} );
+                       my $countitems = $rechash->{itembumber} ? 1 : 0;
                       while ( index( $rechash->{itemnumber}, '|', $pos ) > 0 ) {
                              $countitems += 1;
                               $pos = index( $rechash->{itemnumber}, '|', $pos ) + 1;
@@ -406,4 +406,4 @@ sub plugin {
       output_html_with_http_headers $query, $cookie, $template->output;
 }
 
-1;
\ No newline at end of file
+1;
-- 
1.7.12.464.g83379df


From christophe.croullebois at biblibre.com  Thu Sep 20 09:24:05 2012
From: christophe.croullebois at biblibre.com (Christophe Croullebois)
Date: Thu, 20 Sep 2012 09:24:05 +0200
Subject: [Koha-patches] [PATCH 1/1] Bug 8795: Adding the login branch as
	default in orderreceive.tt
Message-ID: <1348125845-4977-1-git-send-email-christophe.croullebois@biblibre.com>

The homebranch and holdingbranch ddl in item block are not default selected.
I just put the default choice as the login branch.
---
 C4/Items.pm |    1 +
 1 file changed, 1 insertion(+)

diff --git a/C4/Items.pm b/C4/Items.pm
index e9af3dd..40751e7 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -2700,6 +2700,7 @@ sub PrepareItemrecordDisplay {
                                 $authorised_lib{$branchcode} = $branchname;
                             }
                         }
+                        $defaultvalue = C4::Context->userenv->{branch};
 
                         #----- itemtypes
                     } elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes" ) {
-- 
1.7.9.5


From oleonard at myacpl.org  Fri Sep 21 23:01:14 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri, 21 Sep 2012 17:01:14 -0400
Subject: [Koha-patches] [PATCH] Bug 8804 - Quiet errors in the log from
	Auth.pm
Message-ID: <1348261274-14159-1-git-send-email-oleonard@myacpl.org>

Found three cases where variables were being
referenced which did not (in each case) exist. Adding
checks for those variables' existence.

Errors appeared when logged in and viewing a detail
page in the OPAC.
---
 C4/Auth.pm |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 5486f76..90de92c 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -381,7 +381,7 @@ sub get_template_and_user {
         my $opac_search_limit = $ENV{'OPAC_SEARCH_LIMIT'};
         my $opac_limit_override = $ENV{'OPAC_LIMIT_OVERRIDE'};
         my $opac_name = '';
-        if (($opac_search_limit =~ /branch:(\w+)/ && $opac_limit_override) || $in->{'query'}->param('limit') =~ /branch:(\w+)/){
+        if ((($opac_search_limit && $opac_search_limit =~ /branch:(\w+)/) && $opac_limit_override) || ($in->{'query'}->param('limit') && $in->{'query'}->param('limit') =~ /branch:(\w+)/)){
             $opac_name = $1;   # opac_search_limit is a branch, so we use it.
         } elsif (C4::Context->preference("SearchMyLibraryFirst") && C4::Context->userenv && C4::Context->userenv->{'branch'}) {
             $opac_name = C4::Context->userenv->{'branch'};
@@ -702,7 +702,7 @@ sub checkauth {
         else {
             $cookie = $query->cookie( CGISESSID => $session->id );
             $session->param('lasttime',time());
-            unless ( $sessiontype eq 'anon' ) { #if this is an anonymous session, we want to update the session, but not behave as if they are logged in...
+            unless ( $sessiontype && $sessiontype eq 'anon' ) { #if this is an anonymous session, we want to update the session, but not behave as if they are logged in...
                 $flags = haspermission($userid, $flagsrequired);
                 if ($flags) {
                     $loggedin = 1;
-- 
1.7.9.5


From tomascohen at gmail.com  Fri Sep 21 23:18:05 2012
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Fri, 21 Sep 2012 18:18:05 -0300
Subject: [Koha-patches] [PATCH] Bug 8800 - useDaysMode=Datedue wrong
	behaviour
Message-ID: <1348262285-21799-1-git-send-email-tomascohen@gmail.com>

useDaysMode=Datedue wasn't used as advertised in the docs. Added a
next_open_day sub to Koha::Calendar and some tests for it.

- AddIssue was fixed for the case $datedue was defined in circ/circulation.pl
- CalcDateDue was modified to be consistent with the intended behaviour

Regards
To+

Sponsored-by: Universidad Nacional de C?rdoba
Signed-off-by: Elliott Davis <elliott at bywatersolutions.com>
---
 C4/Circulation.pm |   40 +++++++++++++++++++++++++++++-----------
 Koha/Calendar.pm  |   26 +++++++++++++++++++++++---
 t/Calendar.t      |    6 +++++-
 3 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 71e13bb..6f156cf 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -1158,10 +1158,9 @@ AddIssue does the following things :
 sub AddIssue {
     my ( $borrower, $barcode, $datedue, $cancelreserve, $issuedate, $sipmode) = @_;
     my $dbh = C4::Context->dbh;
-	my $barcodecheck=CheckValidBarcode($barcode);
-    if ($datedue && ref $datedue ne 'DateTime') {
-        $datedue = dt_from_string($datedue);
-    }
+
+    my $barcodecheck=CheckValidBarcode($barcode);
+
     # $issuedate defaults to today.
     if ( ! defined $issuedate ) {
         $issuedate = DateTime->now(time_zone => C4::Context->tz());
@@ -1176,7 +1175,20 @@ sub AddIssue {
 		# find which item we issue
 		my $item = GetItem('', $barcode) or return;	# if we don't get an Item, abort.
 		my $branch = _GetCircControlBranch($item,$borrower);
-		
+
+                # $datedue was passed as a parameter, check validity
+                # and adjust if mandated by sysprefs
+                if ($datedue && ref $datedue ne 'DateTime') {
+                    $datedue = dt_from_string($datedue);
+                    my $calendar = Koha::Calendar->new( branchcode => $branch );
+                    if ( C4::Context->preference('useDaysMode') eq 'Datedue'
+                       || C4::Context->preference('useDaysMode') eq 'Calendar' )
+                    {
+                        # use the calendar to push the due date to the next open day
+                        $datedue = $calendar->next_open_day($datedue);
+                    }
+		}
+
 		# get actual issuing if there is one
 		my $actualissue = GetItemIssue( $item->{itemnumber});
 		
@@ -3004,22 +3016,29 @@ sub CalcDateDue {
             C4::Context->preference('dateformat')
         );
     } else {
-
         # otherwise, calculate the datedue as normal
-        if ( C4::Context->preference('useDaysMode') eq 'Days' )
-        {    # ignoring calendar
+        my $calendar = Koha::Calendar->new( branchcode => $branch );
+
+        if ( C4::Context->preference('useDaysMode') ne 'Calendar' )
+        {   # ignoring calendar to calculate date due
             my $dt =
               DateTime->now( time_zone => C4::Context->tz() )
               ->truncate( to => 'minute' );
             if ( $loanlength->{lengthunit} eq 'hours' ) {
                 $dt->add( hours => $loanlength->{issuelength} );
-                return $dt;
             } else {    # days
                 $dt->add( days => $loanlength->{issuelength} );
                 $dt->set_hour(23);
                 $dt->set_minute(59);
-                return $dt;
             }
+            
+            if ( C4::Context->preference('useDaysMode') eq 'Datedue' ) {
+                # use the calendar to push the due date to the next open day
+                $dt = $calendar->next_open_day($dt);
+            }
+
+            return $dt;
+
         } else {
             my $dur;
             if ($loanlength->{lengthunit} eq 'hours') {
@@ -3031,7 +3050,6 @@ sub CalcDateDue {
             if (ref $startdate ne 'DateTime' ) {
                 $startdate = dt_from_string($startdate);
             }
-            my $calendar = Koha::Calendar->new( branchcode => $branch );
             $datedue = $calendar->addDate( $startdate, $dur, $loanlength->{lengthunit} );
             if ($loanlength->{lengthunit} eq 'days') {
                 $datedue->set_hour(23);
diff --git a/Koha/Calendar.pm b/Koha/Calendar.pm
index 2a2e062..862e4f8 100644
--- a/Koha/Calendar.pm
+++ b/Koha/Calendar.pm
@@ -164,6 +164,16 @@ sub is_holiday {
     return 0;
 }
 
+sub next_open_day {
+    my ( $self, $dt ) = @_;
+
+    while ($self->is_holiday($dt)) {
+        $dt->add(days => 1);
+    }
+
+    return $dt;
+}
+
 sub days_between {
     my $self     = shift;
     my $start_dt = shift;
@@ -273,9 +283,9 @@ This documentation refers to Koha::Calendar version 0.0.1
 
 =head1 SYNOPSIS
 
-  use Koha::Calendat
+  use Koha::Calendar
 
-  my $c = Koha::Calender->new( branchcode => 'MAIN' );
+  my $c = Koha::Calendar->new( branchcode => 'MAIN' );
   my $dt = DateTime->now();
 
   # are we open
@@ -315,7 +325,7 @@ parameter will be removed when issuingrules properly cope with that
 
 $yesno = $calendar->is_holiday($dt);
 
-passed at DateTime object returns 1 if it is a closed day
+passed a DateTime object returns 1 if it is a closed day
 0 if not according to the calendar
 
 =head2 days_between
@@ -326,6 +336,16 @@ Passed two dates returns a DateTime::Duration object measuring the length betwee
 ignoring closed days. Always returns a positive number irrespective of the
 relative order of the parameters
 
+=head2 next_open_day
+
+$datetime = $calendar->next_open_day($duedate_dt)
+
+Passed a Datetime returns another Datetime representing the next open day. It is
+intended for use to calculate the due date when useDaysMode syspref is set to either
+'Datedue' or 'Calendar'.
+
+Note: if is_holiday($duedate_dt) = 0 then it should return the same date.
+
 =head2 set_daysmode
 
 For testing only allows the calling script to change days mode
diff --git a/t/Calendar.t b/t/Calendar.t
index 283300e..9ff4e13 100755
--- a/t/Calendar.t
+++ b/t/Calendar.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 use DateTime;
-use Test::More tests => 21;
+use Test::More tests => 23;
 use Koha::DateUtils;
 
 BEGIN {
@@ -127,3 +127,7 @@ $cal->add_holiday( dt_from_string('2012-07-07','iso') );
 $daycount = $cal->days_between( dt_from_string("2012-07-01",'iso'),
     dt_from_string("2012-07-15",'iso') )->in_units('days');
 cmp_ok( $daycount, '==', 12, 'multiple holidays correctly recognized' );
+$dt = dt_from_string('2012-07-07','iso');
+cmp_ok( $dt->add(days => 1), '==', $cal->next_open_day(dt_from_string('2012-07-07','iso')), 'Next open day correctly calculated' );
+$dt = dt_from_string('2012-07-08','iso');
+cmp_ok( $dt, '==', $cal->next_open_day(dt_from_string('2012-07-08','iso')), 'Next open day correctly calculated (idempotent version)' );
-- 
1.7.9.5


From robin at catalyst.net.nz  Mon Sep 24 07:33:22 2012
From: robin at catalyst.net.nz (Robin Sheat)
Date: Mon, 24 Sep 2012 17:33:22 +1200
Subject: [Koha-patches] [PATCH] Bug 8806 - [3.6.x] Update changelog for
	3.6.5-3.6.9, dependencies.
Message-ID: <1348464802-13896-1-git-send-email-robin@catalyst.net.nz>

---
 debian/changelog |   30 ++++++++++++++++++++++++++++++
 debian/control   |   10 ++--------
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 381af42..61d7833 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,33 @@
+koha (3.6.9-1) oldstable; urgency=low
+
+  * new upstream release (3.06.09) 
+
+ -- Robin Sheat <robin at catalyst.net.nz>  Mon, 24 Sep 2012 17:17:39 +1200
+
+koha (3.6.8-1) oldstable; urgency=low
+
+  * new upstream release (3.06.08) 
+
+ -- Robin Sheat <robin at catalyst.net.nz>  Tue, 28 Aug 2012 01:25:01 +1200
+
+koha (3.6.7-1) oldstable; urgency=low
+
+  * new upstream release (3.06.07) 
+
+ -- Robin Sheat <robin at catalyst.net.nz>  Tue, 24 Jul 2012 01:52:46 +1200
+
+koha (3.6.6-1) oldstable; urgency=low
+
+  * new upstream release (3.06.06) 
+
+ -- Robin Sheat <robin at catalyst.net.nz>  Tue, 26 Jun 2012 03:02:16 +1200
+
+koha (3.6.5-1) oldstable; urgency=low
+
+  * New upstream release (3.06.05) 
+
+ -- Robin Sheat <robin at catalyst.net.nz>  Mon, 11 Jun 2012 03:42:50 +1200
+
 koha (3.6.4-1) squeeze; urgency=low
 
   * New upstream release (3.06.04)
diff --git a/debian/control b/debian/control
index 322d921..c39fc97 100644
--- a/debian/control
+++ b/debian/control
@@ -6,12 +6,12 @@ Standards-Version: 3.8.4
 # NOTA BENE: Build dependencies end up as runtime dependencies as well.
 # See debian/rules, the override_dh_gencontrol rules. 
 # There are some exceptions.
-Build-Depends: libcgi-session-driver-memcached-perl,
- libalgorithm-checkdigits-perl,
+Build-Depends: libalgorithm-checkdigits-perl,
  libauthen-cas-client-perl,
  libbiblio-endnotestyle-perl,
  libbusiness-isbn-perl,
  libcgi-pm-perl | perl-modules,
+ libcgi-session-driver-memcached-perl,
  libcgi-session-perl,
  libcgi-session-serialize-yaml-perl,
  libclass-accessor-perl,
@@ -19,12 +19,8 @@ Build-Depends: libcgi-session-driver-memcached-perl,
  libdata-ical-perl,
  libdate-calc-perl,
  libdate-manip-perl,
- libdatetime-event-ical-perl,
- libdatetime-format-dateparse-perl,
  libdatetime-format-ical-perl,
  libdatetime-perl,
- libdatetime-set-perl,
- libdatetime-timezone-perl,
  libdbd-mysql-perl,
  libdbd-sqlite2-perl,
  libdbi-perl,
@@ -60,8 +56,6 @@ Build-Depends: libcgi-session-driver-memcached-perl,
  libpdf-reuse-perl,
  libpdf-table-perl,
  libpoe-perl,
- libreadonly-perl,
- libreadonly-xs-perl,
  libscalar-list-utils-perl,
  libschedule-at-perl,
  libsms-send-perl,
-- 
1.7.5.4


From robin at catalyst.net.nz  Mon Sep 24 09:11:32 2012
From: robin at catalyst.net.nz (Robin Sheat)
Date: Mon, 24 Sep 2012 19:11:32 +1200
Subject: [Koha-patches] [PATCH] Bug 8806 - [3.8.x] Changelog updates,
	dependencies
Message-ID: <1348470692-15712-1-git-send-email-robin@catalyst.net.nz>

This adds dependencies that are required for tests to run, but weren't
added to the dependencies file, and so causing issues with package
builds.
---
 C4/Installer/PerlDependencies.pm |   12 +++++++++++-
 debian/changelog                 |   38 +++++++++++++++++++++++++++++++-------
 debian/control                   |    9 ++++++---
 3 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/C4/Installer/PerlDependencies.pm b/C4/Installer/PerlDependencies.pm
index 86e9c77..8898087 100644
--- a/C4/Installer/PerlDependencies.pm
+++ b/C4/Installer/PerlDependencies.pm
@@ -533,7 +533,17 @@ our $PERL_DEPS = {
         'usage'    => 'Core',
         'required' => '0',
         'min_ver'  => '0.04',
-    }
+    },
+    'Test::MockModule' => {
+    	'usage'     => 'Core',
+    	'required'  => '1',
+    	'min_ver'   => '0.05',
+    },
+    'DBD::Mock' => {
+    	'usage'     => 'Core',
+    	'required'  => '1',
+    	'min_ver'   => '1.39',
+    },
 };
 
 1;
diff --git a/debian/changelog b/debian/changelog
index da90761..d7a2d20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,44 @@
-koha (3.8.4) squeeze; urgency=low
+koha (3.8.5-1) squeeze; urgency=low
 
-  * New upsream release (3.08.04)
+  * New upstream release (3.08.05) 
 
- -- Chris Cormack <chrisc at catalyst.net.nz>  Sun, 26 Aug 2012 16:29:39 +1200
+ -- Robin Sheat <robin at catalyst.net.nz>  Mon, 24 Sep 2012 18:08:32 +1200
+
+koha (3.8.4.1-1) squeeze; urgency=low
+
+  * Update to remove some unnecessary files 
+
+ -- Robin Sheat <robin at catalyst.net.nz>  Wed, 05 Sep 2012 22:51:27 +1200
+
+koha (3.8.4-1) squeeze; urgency=low
+
+  * New upstream release (3.08.04) 
+
+ -- Robin Sheat <robin at catalyst.net.nz>  Fri, 24 Aug 2012 02:21:57 +1200
+
+koha (3.8.3.1-1) squeeze; urgency=low
+
+  * Bump release - wrong source version included in the previous release 
+
+ -- Robin Sheat <robin at catalyst.net.nz>  Tue, 24 Jul 2012 20:22:55 +1200
 
 koha (3.8.3-1) squeeze; urgency=low
 
-  *  New upstream release (3.08.03)
+  * New upstream release (3.08.03)
+
+ -- Robin Sheat <robin at catalyst.net.nz>  Tue, 24 Jul 2012 02:38:56 +1200
+
+koha (3.8.2-1) squeeze; urgency=low
+
+  * New upstream release (3.08.02) 
 
- -- Chris Cormack <chrisc at catalyst.net.nz>  Sun, 29 Jul 2012 06:43:49 +1200
+ -- Robin Sheat <robin at catalyst.net.nz>  Sat, 23 Jun 2012 00:56:22 +1200
 
 koha (3.8.1-1) squeeze; urgency=low
 
-  * New upstream release (3.08.01)
+  * New upstream release (3.08.01) 
 
- -- Chris Cormack <chrisc at catalyst.net.nz>  Wed, 23 May 2012 20:00:37 +1200
+ -- Robin Sheat <robin at catalyst.net.nz>  Thu, 24 May 2012 17:17:31 +1200
 
 koha (3.8.0-1) squeeze; urgency=low
 
diff --git a/debian/control b/debian/control
index 6e530eb..0368c02 100644
--- a/debian/control
+++ b/debian/control
@@ -6,12 +6,12 @@ Standards-Version: 3.8.4
 # NOTA BENE: Build dependencies end up as runtime dependencies as well.
 # See debian/rules, the override_dh_gencontrol rules. 
 # There are some exceptions.
-Build-Depends: libcgi-session-driver-memcached-perl,
- libalgorithm-checkdigits-perl,
+Build-Depends: libalgorithm-checkdigits-perl,
  libauthen-cas-client-perl,
  libbiblio-endnotestyle-perl,
  libbusiness-isbn-perl,
  libcgi-pm-perl | perl-modules,
+ libcgi-session-driver-memcached-perl,
  libcgi-session-perl,
  libcgi-session-serialize-yaml-perl,
  libclass-accessor-perl,
@@ -25,8 +25,8 @@ Build-Depends: libcgi-session-driver-memcached-perl,
  libdatetime-perl,
  libdatetime-set-perl,
  libdatetime-timezone-perl,
- libdbd-mysql-perl,
  libdbd-mock-perl,
+ libdbd-mysql-perl,
  libdbd-sqlite2-perl,
  libdbi-perl,
  libdigest-sha-perl | perl,
@@ -35,6 +35,7 @@ Build-Depends: libcgi-session-driver-memcached-perl,
  libgd-gd2-noxpm-perl | libgd-gd2-perl,
  libgraphics-magick-perl,
  libgravatar-url-perl,
+ libhtml-format-perl,
  libhtml-scrubber-perl,
  libhttp-oai-perl,
  libjson-perl,
@@ -67,9 +68,11 @@ Build-Depends: libcgi-session-driver-memcached-perl,
  libschedule-at-perl,
  libsms-send-perl,
  libtemplate-perl,
+ libtemplate-plugin-htmltotext-perl,
  libtest-mockmodule-perl,
  libtest-simple-perl | perl-modules,
  libtest-strict-perl,
+ libtest-yaml-valid-perl,
  libtext-csv-encoded-perl,
  libtext-csv-perl,
  libtext-csv-xs-perl,
-- 
1.7.5.4


From oleonard at myacpl.org  Mon Sep 24 16:52:08 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 24 Sep 2012 10:52:08 -0400
Subject: [Koha-patches] [PATCH] Bug 8811 - can't run report after saving
Message-ID: <1348498328-16085-1-git-send-email-oleonard@myacpl.org>

The fix for Bug 7993 removed some lines from guided_reports.pl
which passed a new report's name and id to the template after
saving. For some reason this was removed, making it impossible
to run or edit a new report immediately after saving.

This patch adds back that part of the script which passes those
variables to the template. Before this patch, after adding a new
SQL report you would not see a "run this report" link. The
"run this report" and "edit" buttons in the toolbar would not
work. After applying the patch these should work.
---
 reports/guided_reports.pl |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl
index 00f52ef..de18072 100755
--- a/reports/guided_reports.pl
+++ b/reports/guided_reports.pl
@@ -501,7 +501,7 @@ elsif ( $phase eq 'Save Report' ) {
         );
     }
     else {
-        save_report( {
+        my $id = save_report( {
                 borrowernumber => $borrowernumber,
                 sql            => $sql,
                 name           => $name,
@@ -513,7 +513,11 @@ elsif ( $phase eq 'Save Report' ) {
                 cache_expiry   => $cache_expiry,
                 public         => $public,
             } );
-        $template->param( 'save_successful' => 1, );
+        $template->param(
+            'save_successful' => 1,
+            'reportname'      => $name,
+            'id'              => $id,
+        );
     }
 }
 
-- 
1.7.9.5


From oleonard at myacpl.org  Mon Sep 24 22:05:38 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 24 Sep 2012 16:05:38 -0400
Subject: [Koha-patches] [PATCH] Bug 8766 - OPACBaseURL still called as
	OPACBaseurl in many files
Message-ID: <1348517138-4082-1-git-send-email-oleonard@myacpl.org>

This patch fixes incorrect capitalization of the OPACBaseURL
variable in three templates. The fix can be confirmed in
opac-results.tt by inspecting the link attached to the RSS
icon on the OPAC's search results screen. The same fix is included
in opac-opensearch.tt and search/results.tt but I'm not sure
how you confirm that this change fixes anything, if it does.
---
 .../opac-tmpl/prog/en/modules/opac-opensearch.tt   |   10 +++++-----
 .../opac-tmpl/prog/en/modules/opac-results.tt      |    2 +-
 .../opac-tmpl/prog/en/modules/search/results.tt    |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-opensearch.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-opensearch.tt
index e761402..324d22c 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-opensearch.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-opensearch.tt
@@ -19,7 +19,7 @@
    <channel>
      <title><![CDATA[[% LibraryName |html %] Search [% IF ( query_desc ) %]for '[% query_desc |html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc |html %]'[% END %]]]></title>
      <link>[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;format=rss2</link>
-     <atom:link rel="self" type="application/rss+xml" href="[% OPACBaseurl %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;sort_by=[% sort_by |html %]&amp;format=rss2"/>
+     <atom:link rel="self" type="application/rss+xml" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;sort_by=[% sort_by |html %]&amp;format=rss2"/>
      <description><![CDATA[ Search results [% IF ( query_desc ) %]for '[% query_desc |html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc |html %]'[% END %] at [% LibraryName |html %]]]></description>
      <opensearch:totalResults>[% total %]</opensearch:totalResults>
      <opensearch:startIndex>[% offset %]</opensearch:startIndex>
@@ -29,7 +29,7 @@
        <opensearch:itemsPerPage>20</opensearch:itemsPerPage>
      [% END %]
 	 [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
-     <atom:link rel="search" type="application/opensearchdescription+xml" href="[% SEARCH_RESULT.OPACBaseurl %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi |html %][% SEARCH_RESULT.limit_cgi |html %]&amp;sort_by=[% SEARCH_RESULT.sort_by |html %]&amp;format=opensearchdescription"/>
+     <atom:link rel="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi |html %][% SEARCH_RESULT.limit_cgi |html %]&amp;sort_by=[% SEARCH_RESULT.sort_by |html %]&amp;format=opensearchdescription"/>
      <opensearch:Query role="request" searchTerms="[% SEARCH_RESULT.query_desc |url %][% SEARCH_RESULT.limit_desc |url %]" startPage="[% SEARCH_RESULT.page %]" />
      <item>
        <title>[% SEARCH_RESULT.title |html %] [% FOREACH subtitl IN SEARCH_RESULT.subtitle %], [% subtitl.subfield |html %][% END %]</title>
@@ -51,7 +51,7 @@
                         [% IF ( SEARCH_RESULT.size ) %] [% SEARCH_RESULT.size |html %]. [% END %]
                         [% IF ( SEARCH_RESULT.isbn ) %] [% SEARCH_RESULT.isbn |html %][% END %] </p><p>
 [% IF ( RequestOnOpac ) %]
-<a href="[% SEARCH_RESULT.OPACBaseurl %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place Hold on <i>[% SEARCH_RESULT.title %]</i></a></p>
+<a href="[% OPACBaseURL %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place Hold on <i>[% SEARCH_RESULT.title %]</i></a></p>
 [% END %]
 						]]></description>
        <guid>[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]</guid>
@@ -80,12 +80,12 @@
      <opensearch:itemsPerPage>20</opensearch:itemsPerPage>
    [% END %]
    <opensearch:Query role="request" searchTerms="[% query_desc |html %] [% limit_desc |html %]" startPage="[% page |html %]" />
-   <link rel="alternate" href="[% OPACBaseurl %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]pw=[% page %]&amp;format=atom" type="application/atom+xml"/>
+   <link rel="alternate" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]pw=[% page %]&amp;format=atom" type="application/atom+xml"/>
    <link rel="self" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]&amp;format=atom" type="application/atom+xml"/>
    <link rel="first" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]pw=1&amp;format=atom" type="application/atom+xml"/>
    <link rel="previous" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]pw=2&amp;format=atom" type="application/atom+xml"/>
    <link rel="next" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]pw=4&amp;format=atom" type="application/atom+xml"/>
-   <link rel="last" href="[% OPACBaseurl %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]pw=42299&amp;format=atom" type="application/atom+xml"/>
+   <link rel="last" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]pw=42299&amp;format=atom" type="application/atom+xml"/>
    <link rel="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?format=opensearchdescription"/>
 
    [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
index e5238f7..422ec58 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
@@ -6,7 +6,7 @@
     You did not specify any search criteria.
 [% END %]
 [% INCLUDE 'doc-head-close.inc' %]
-<link rel="alternate" type="application/rss+xml" title="[% LibraryName |html %] Search RSS Feed" href="[% OPACBaseurl %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;count=[% countrss |html %]&amp;sort_by=acqdate_dsc&amp;format=rss2" />
+<link rel="alternate" type="application/rss+xml" title="[% LibraryName |html %] Search RSS Feed" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;count=[% countrss |html %]&amp;sort_by=acqdate_dsc&amp;format=rss2" />
 [% IF ( OpacStarRatings == 'all' ) %]<script type="text/javascript" src="/opac-tmpl/prog/en/lib/jquery/plugins/jquery.rating.js"></script>
 <link rel="stylesheet" type="text/css" href="/opac-tmpl/prog/en/css/jquery.rating.css" />[% END %]
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/search/results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/search/results.tt
index ab2ea12..39b5405 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/search/results.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/search/results.tt
@@ -6,7 +6,7 @@
     You did not specify any search criteria.
 [% END %]
 [% INCLUDE 'doc-head-close.inc' %]
-<link rel="alternate" type="application/rss+xml" title="[% LibraryName |html %] Search RSS Feed" href="[% OPACBaseurl %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;count=[% countrss |html %]&amp;sort_by=acqdate_dsc&amp;format=rss2" />
+<link rel="alternate" type="application/rss+xml" title="[% LibraryName |html %] Search RSS Feed" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;count=[% countrss |html %]&amp;sort_by=acqdate_dsc&amp;format=rss2" />
 <script type="text/javascript" src="/opac-tmpl/prog/en/lib/jquery/jquery.js"></script>
 <link rel="stylesheet" type="text/css" href="/opac-tmpl/prog/en/css/jquery.rating.css" />
 
-- 
1.7.9.5


From fridolyn.somers at biblibre.com  Tue Sep 25 09:46:08 2012
From: fridolyn.somers at biblibre.com (Fridolyn SOMERS)
Date: Tue, 25 Sep 2012 09:46:08 +0200
Subject: [Koha-patches] [PATCH] Bug 8443: Suggestions publication year and
	copyright date
Message-ID: <1348559168-4685-1-git-send-email-fridolyn.somers@biblibre.com>

---
 C4/Acquisition.pm                                  |    4 +-
 C4/Serials.pm                                      |    2 +-
 C4/Suggestions.pm                                  |   79 ++++++++++++--------
 .../prog/en/modules/suggestion/suggestion.tt       |   14 ++--
 suggestion/suggestion.pl                           |   26 +++++--
 5 files changed, 77 insertions(+), 48 deletions(-)

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index 7d67e6f..a437616 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -1032,7 +1032,7 @@ Else, the upcoming July 1st is used.
 
 =item defaults entrydate to Now
 
-The following keys are used: "biblionumber", "title", "basketno", "quantity", "notes", "biblioitemnumber", "rrp", "ecost", "gstrate", "unitprice", "subscription", "sort1", "sort2", "booksellerinvoicenumber", "listprice", "budgetdate", "purchaseordernumber", "branchcode", "booksellerinvoicenumber", "bookfundid".
+The following keys are used: "biblionumber", "title", "basketno", "quantity", "notes", "biblioitemnumber", "rrp", "ecost", "gstrate", "unitprice", "subscription", "sort1", "sort2", "booksellerinvoicenumber", "listprice", "budgetdate", "purchaseordernumber", "branchcode", "booksellerinvoicenumber", "budget_id".
 
 =back
 
@@ -1491,7 +1491,7 @@ C<@results> is an array of references-to-hash with the following keys:
 
 =item C<branchcode>
 
-=item C<bookfundid>
+=item C<budget_id>
 
 =back
 
diff --git a/C4/Serials.pm b/C4/Serials.pm
index cedbcff..1596e8e 100644
--- a/C4/Serials.pm
+++ b/C4/Serials.pm
@@ -299,7 +299,7 @@ $subs = GetSubscription($subscriptionid)
 this function returns the subscription which has $subscriptionid as id.
 return :
 a hashref. This hash containts
-subscription, subscriptionhistory, aqbudget.bookfundid, biblio.title
+subscription, subscriptionhistory, aqbooksellers.name, biblio.title
 
 =cut
 
diff --git a/C4/Suggestions.pm b/C4/Suggestions.pm
index 0cb484a..610d161 100644
--- a/C4/Suggestions.pm
+++ b/C4/Suggestions.pm
@@ -93,7 +93,7 @@ sub SearchSuggestion  {
     my $dbh = C4::Context->dbh;
     my @sql_params;
     my @query = (
-    q{ SELECT suggestions.*,
+    q/SELECT suggestions.*,
         U1.branchcode   AS branchcodesuggestedby,
         B1.branchname   AS branchnamesuggestedby,
         U1.surname   AS surnamesuggestedby,
@@ -115,49 +115,61 @@ sub SearchSuggestion  {
     LEFT JOIN borrowers AS U2 ON managedby=U2.borrowernumber
     LEFT JOIN branches AS B2 ON B2.branchcode=U2.branchcode
     LEFT JOIN categories AS C2 ON C2.categorycode = U2.categorycode
-    WHERE 1=1
-    } , map {
-        if ( my $s = $suggestion->{$_} ) {
-        push @sql_params,'%'.$s.'%'; 
-        " and suggestions.$_ like ? ";
-        } else { () }
-    } qw( title author isbn publishercode collectiontitle )
+    WHERE 1=1/
     );
+    
+    # filter on biblio informations
+    foreach my $field (
+        grep {
+            my $fieldname = $_;
+            any { $fieldname eq $_ } qw/title author isbn publishercode copyrightdate collectiontitle/
+        } keys %$suggestion
+      )
+    {
+        if ( $suggestion->{$field} ) {
+            push @sql_params, $suggestion->{$field};
+            push @query, " AND suggestions.$field = ?";
+        }
+    }
 
+    # filter on user branch
     my $userenv = C4::Context->userenv;
     if (C4::Context->preference('IndependantBranches')) {
-            if ($userenv) {
-                if (($userenv->{flags} % 2) != 1 && !$suggestion->{branchcode}){
-                push @sql_params,$$userenv{branch};
-                push @query,q{ and (suggestions.branchcode = ? or suggestions.branchcode ='')};
-                }
+        if ($userenv) {
+            if (($userenv->{flags} % 2) != 1 && !$suggestion->{branchcode}){
+                push @sql_params, $userenv->{branch};
+                push @query, q/ AND (suggestions.branchcode = ? or suggestions.branchcode = '')/;
             }
+        }
     }
 
-    foreach my $field (grep { my $fieldname=$_;
-        any {$fieldname eq $_ } qw<
-    STATUS branchcode itemtype suggestedby managedby acceptedby
-    bookfundid biblionumber
-    >} keys %$suggestion
-    ) {
-        if ($$suggestion{$field}){
-            push @sql_params,$suggestion->{$field};
-            push @query, " and suggestions.$field=?";
-        } 
+    # filter on nillable fields
+    foreach my $field (
+        grep {
+            my $fieldname = $_;
+            any { $fieldname eq $_ } qw/STATUS branchcode itemtype suggestedby managedby acceptedby budgetid biblionumber/
+        } keys %$suggestion
+      )
+    {
+        if ( $suggestion->{$field} ) {
+            push @sql_params, $suggestion->{$field};
+            push @query, " AND suggestions.$field = ?";
+        }
         else {
-            push @query, " and (suggestions.$field='' OR suggestions.$field IS NULL)";
+            push @query, " AND (suggestions.$field = '' OR suggestions.$field IS NULL)";
         }
     }
 
+    # filter on date fields
     my $today = C4::Dates->today('iso');
-
-    foreach ( qw( suggesteddate manageddate accepteddate ) ) {
-        my $from = $_ . "_from";
-        my $to = $_ . "_to";
-        if ($$suggestion{$from} || $$suggestion{$to}) {
-            push @query, " AND suggestions.suggesteddate BETWEEN '" 
-                . (format_date_in_iso($$suggestion{$from}) || 0000-00-00) . "' AND '" . (format_date_in_iso($$suggestion{$to}) || $today) . "'";
-        } 
+    foreach my $field ( qw/suggesteddate manageddate accepteddate/ ) {
+        my $from = $field."_from";
+        my $to = $field."_to";
+        if ($suggestion->{$from} || $suggestion->{$to}) {
+            push @query, " AND suggestions.$field BETWEEN ? AND ?";
+            push @sql_params, format_date_in_iso($suggestion->{$from}) || '0000-00-00';
+            push @sql_params, format_date_in_iso($suggestion->{$to}) || $today;
+        }
     }
 
     $debug && warn "@query";
@@ -165,7 +177,8 @@ sub SearchSuggestion  {
     $sth->execute(@sql_params);
     my @results;
     while ( my $data=$sth->fetchrow_hashref ){
-        $$data{$$data{STATUS}} = 1;
+        # add status as field
+        $data->{$data->{STATUS}} = 1;
         push(@results,$data);
     }
     return (\@results);
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index fb73fd1..554bc24 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -493,7 +493,7 @@ $(document).ready(function() { calcNewsuggTotal(); });
                     <li><label for="author"> Author:</label><input type="text" id="author" name="author" value="[% author %]" /></li>
                     <li><label for="isbn"> ISBN:</label><input type="text" id="isbn"  name="isbn" value="[% isbn %]" /></li>
                     <li><label for="publishercode"> Publisher:</label><input type="text" id="publishercode" name="publishercode" value="[% publishercode %]" /></li>
-                    <li><label for="publicationyear"> Publication year:</label><input type="text" id="publicationyear" name="publicationyear" value="[% publicationyear %]" /></li>
+                    <li><label for="copyrightdate_filter"> Copyright date:</label><input type="text" id="copyrightdate_filter" name="copyrightdate" value="[% copyrightdate %]" /></li>
                     <li><label for="collectiontitle"> Collection title:</label><input type="text" id="collectiontitle" name="collectiontitle" value="[% collectiontitle %]" /></li><li><input type="submit" value="Go" /></li></ol>
                 </fieldset>
 				 <fieldset class="brief"><h4 class="collapse"><a href="#">Suggestion information</a></h4>
@@ -514,10 +514,10 @@ $(document).ready(function() { calcNewsuggTotal(); });
                     <li><label for="suggesteddate_from"> Suggested on:</label>[% suggesteddate %]
                         <table class="invis">
                         <tr>
-                        <td><label for="suggesteddate_from">from:</label></td><td><input type="text" id="suggesteddate_from" name="suggesteddate_from" style="width:80px;" /></td>
+                        <td><label for="suggesteddate_from">from:</label></td><td><input type="text" id="suggesteddate_from" name="suggesteddate_from" style="width:76px;" /></td>
                         </tr>
                         <tr>
-                        <td><label for="suggesteddate_to">to:</label></td><td><input type="text" id="suggesteddate_to" name="suggesteddate_to" style="width:80px;" /></td>
+                        <td><label for="suggesteddate_to">to:</label></td><td><input type="text" id="suggesteddate_to" name="suggesteddate_to" style="width:76px;" /></td>
                         </tr>
                         </table>
                     </li>
@@ -527,10 +527,10 @@ $(document).ready(function() { calcNewsuggTotal(); });
                     <li><label for="manageddate_from"> Management date:</label>[% manageddate %]
                         <table class="invis">
                         <tr>
-                        <td><label for="manageddate_from">from:</label></td><td><input type="text" id="manageddate_from" name="manageddate_from" style="width:80px;" /></td>
+                        <td><label for="manageddate_from">from:</label></td><td><input type="text" id="manageddate_from" name="manageddate_from" style="width:76px;" /></td>
                         </tr>
                         <tr>
-                        <td><label for="manageddate_to">to:</label></td><td><input type="text" id="manageddate_to" name="manageddate_to" style="width:80px;" /></td>
+                        <td><label for="manageddate_to">to:</label></td><td><input type="text" id="manageddate_to" name="manageddate_to" style="width:76px;" /></td>
                         </tr>
                         </table>
                     </li>
@@ -540,10 +540,10 @@ $(document).ready(function() { calcNewsuggTotal(); });
                     <li><label for="accepteddate_from"> Accepted on:</label>[% accepteddate %]
                         <table class="invis">
                         <tr>
-                        <td><label for="accepteddate_from">from:</label></td><td><input type="text" id="accepteddate_from" name="accepteddate_from" style="width:80px;" /></td>
+                        <td><label for="accepteddate_from">from:</label></td><td><input type="text" id="accepteddate_from" name="accepteddate_from" style="width:76px;" /></td>
                         </tr>
                         <tr>
-                        <td><label for="accepteddate_to">to:</label></td><td><input type="text" id="accepteddate_to" name="accepteddate_to" style="width:80px;" /></td>
+                        <td><label for="accepteddate_to">to:</label></td><td><input type="text" id="accepteddate_to" name="accepteddate_to" style="width:76px;" /></td>
                         </tr>
                         </table>
                     </li>
diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl
index 99f38eb..de85573 100755
--- a/suggestion/suggestion.pl
+++ b/suggestion/suggestion.pl
@@ -188,12 +188,24 @@ elsif ( $op eq 'show' ) {
 if ($op=~/else/) {
     $op='else';
     
-    $displayby||="STATUS";
+    $displayby||="STATUS"; # by default, organize by status
     delete $$suggestion_ref{'branchcode'} if($displayby eq "branchcode");
     my $criteria_list=GetDistinctValues("suggestions.".$displayby);
+    my %criteria_dv;
+    foreach (@$criteria_list) {
+        my $criteria_key;
+        if ($_->{value}) {
+            $criteria_key = $_->{value};
+        } else {
+            # agregate null and empty values under empty value
+            $criteria_key = '';
+        }
+        my $criteria_cnt = $criteria_dv{$criteria_key} || 0;
+        $criteria_dv{$criteria_key} = $criteria_cnt + $_->{cnt};
+    }
     my @allsuggestions;
     my $reasonsloop = GetAuthorisedValues("SUGGEST");
-    foreach my $criteriumvalue ( map { $$_{'value'} } @$criteria_list ) {
+    foreach my $criteriumvalue (keys %criteria_dv) {
         # By default, display suggestions from current working branch
         if(not defined $branchfilter) {
             $$suggestion_ref{'branchcode'} = C4::Context->userenv->{'branch'};
@@ -356,16 +368,20 @@ $template->param(
 	total            => sprintf("%.2f", $$suggestion_ref{'total'}||0),
 );
 
+# lists of distinct values (without empty) for filters
 my %hashlists;
 foreach my $field ( qw(managedby acceptedby suggestedby budgetid) ) {
     my $values_list;
-    $values_list = GetDistinctValues( "suggestions." . $field );
-    my @codes_list = map {
+    $values_list = GetDistinctValues( "suggestions.$field" );
+    my @codes_list = 
+      map {
         {   'code' => $$_{'value'},
             'desc' => GetCriteriumDesc( $$_{'value'}, $field ),
             'selected' => ($$suggestion_ref{$field}) ? $$_{'value'} eq $$suggestion_ref{$field} : 0,
         }
-    } @$values_list;
+      }
+      grep { $$_{'value'} }
+      @$values_list;
     $hashlists{ lc($field) . "_loop" } = \@codes_list;
 }
 $template->param(%hashlists);
-- 
1.7.9.5


From nengard at bywatersolutions.com  Tue Sep 25 17:54:41 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 25 Sep 2012 11:54:41 -0400
Subject: [Koha-patches] [PATCH] Bug 7412: Follow up: Update preference to
	sentence
Message-ID: <1348588481-2668-1-git-send-email-nengard@bywatersolutions.com>

This patch updates the preference question to a sentence
to follow the standard set with previous preferences.
---
 .../en/modules/admin/preferences/cataloguing.pref  |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
index 404a04e..a6a3377 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
@@ -96,11 +96,11 @@ Cataloging:
                   EAN13: incremental EAN-13 barcodes
                   "OFF": not generated automatically.
         -
-            - When a new item is added, should it be prefilled with last created item values?
+            - When a new item is added, 
             - pref: PrefillItem
               choices:
-                  yes: the new item is prefilled with last created item values
-                  no: the new item is not prefilled with last created item values
+                  yes: the new item is prefilled with last created item values.
+                  no: the new item is not prefilled with last created item values.
         -
             - Define a list of subfields to use when prefilling items (separated by space)
             - pref: SubfieldsToUseWhenPrefill
-- 
1.7.2.3


From oleonard at myacpl.org  Tue Sep 25 20:33:24 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 25 Sep 2012 14:33:24 -0400
Subject: [Koha-patches] [PATCH] Bug 8820 - Don't show orders table if there
	are no orders
Message-ID: <1348598004-6284-1-git-send-email-oleonard@myacpl.org>

This page removes the "basket empty" message in favor of
hiding the orders table altogether when a basket has no
orders. This patch also moves the "Show all details"
checkbox under the "Orders" heading to associate it more
closely with the area it affects.

Other textual changes:

- Correcting capitalization according to coding guidelines
- Correcting terminology (basket group instead of basketgroup)
- Replacing the "Order Details" heading with the more
  succinct "Orders"
---
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |   16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
index bd9d145..f271823 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -251,8 +251,8 @@
                         <input type="submit" value="Change basket group" /></p>
 
                     </form>
-                    [% IF ( basketgroupdeliveryplace ) %]<p>Basketgroup Delivery place: [% basketgroupdeliveryplace %]</p>[% END %]
-                    [% IF ( basketgroupbillingplace ) %]<p>Basketgroup Billing place: [% basketgroupbillingplace %]</p>[% END %]
+                    [% IF ( basketgroupdeliveryplace ) %]<p>Basket group delivery place: [% basketgroupdeliveryplace %]</p>[% END %]
+                    [% IF ( basketgroupbillingplace ) %]<p>Basket group billing place: [% basketgroupbillingplace %]</p>[% END %]
                 </div>
                 [% END %]
             </div>
@@ -261,12 +261,12 @@
 
         [% UNLESS ( delete_confirm ) %]
         <div id="acqui_basket_content" class="yui-g">
+        [% IF ( books_loop ) %]
+        <h2>Orders</h2>
         <label for="show_all_details">
             <input type="checkbox" style="vertical-align: middle;" id="show_all_details" />
             Show all details
         </label>
-        <h2>Order Details</h2>
-        [% IF ( books_loop ) %]
             <table id="orders">
                 <thead>
                     <tr>
@@ -394,10 +394,6 @@
                 [% END %]
                 </tbody>
             </table>
-        [% ELSE %]
-            <table>
-                <tr><td>Basket empty</td></tr>
-            </table>
         [% END %]
         [% IF ( listincgst ) %]<small class="highlight">** Vendor's listings already include tax.</small>
         [% END %]
@@ -478,8 +474,8 @@
             <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
             <input type="hidden" name="confirm" value="1" />
             <input type="hidden" name="basketgroupname" value="[% basketgroupname %]" />
-            <input type="submit" class="approve" value="Yes, Close (Y)" accesskey="y" />
-            <input type="submit" class="deny" value="No, Don't Close (N)" accesskey="n" onclick="javascript:window.location='/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]';return false;" />
+            <input type="submit" class="approve" value="Yes, close (Y)" accesskey="y" />
+            <input type="submit" class="deny" value="No, don't close (N)" accesskey="n" onclick="javascript:window.location='/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]';return false;" />
         </form>
         </div>
     [% END %]
-- 
1.7.9.5


From I.Brown at littleover.derby.sch.uk  Tue Sep 25 17:14:43 2012
From: I.Brown at littleover.derby.sch.uk (Ivan Brown)
Date: Tue, 25 Sep 2012 16:14:43 +0100
Subject: [Koha-patches] [PATCH] Bug 7643 - Can't upload and import zipped
	file of patron images
Message-ID: <1348586083-4292-1-git-send-email-I.Brown@littleover.derby.sch.uk>

Fixed problem with re-declaration of $filesuffix
---
 tools/picture-upload.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/picture-upload.pl b/tools/picture-upload.pl
index bfb233e..4507fa1 100755
--- a/tools/picture-upload.pl
+++ b/tools/picture-upload.pl
@@ -80,7 +80,7 @@ if ( ($op eq 'Upload') && $uploadfile ) {       # Case is important in these ope
     $debug and warn "dirname = $dirname";
     my $filesuffix;
     if ( $uploadfilename =~ m/(\..+)$/i ) {
-        my $filesuffix = $1;
+        $filesuffix = $1;
     }
     ( $tfh, $tempfile ) = File::Temp::tempfile( SUFFIX => $filesuffix, UNLINK => 1 );
     $debug and warn "tempfile = $tempfile";
-- 
1.7.11.msysgit.1


[None] made the following annotations

---------------------------------------------------------------------

The views expressed in this email are personal and may not necessarily reflect those of Derby City Council, unless explicitly stated otherwise

This email, and any files transmitted with it, are confidential and intended solely for the use of the individual or entity to whom they are addressed. If you have received this email in error, please notify me immediately.

If you are not the intended recipient of this email, you should not copy it for any purpose, or disclose its contents to any other person.

Senders and recipients of e-mail should be aware that under the Data Protection Act 1998 and Freedom of Information Act 2000, the contents may have to be disclosed.


---------------------------------------------------------------------



From oleonard at myacpl.org  Tue Sep 25 21:45:52 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 25 Sep 2012 15:45:52 -0400
Subject: [Koha-patches] [PATCH] Bug 8821 - Receive shipment page should hide
	inactive funds like new order form
Message-ID: <1348602352-7042-1-git-send-email-oleonard@myacpl.org>

This patch adapts the fund-handling code from neworderempty.pl
in order to limit the display of funds by default to active ones,
with the option to check a box to display all funds.

To test, make sure you have both active and inactive funds.
Start the process of receiving a shipment. The "fund" option
in the receive shipment form should show only active funds.
Checking the "show all" checkbox should allow you to choose
from both active and inactive funds.
---
 acqui/parcels.pl                                   |   23 +++++++++++++++-----
 .../intranet-tmpl/prog/en/modules/acqui/parcels.tt |   23 ++++++++++++++++----
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/acqui/parcels.pl b/acqui/parcels.pl
index 4f2849d..8fbb883 100755
--- a/acqui/parcels.pl
+++ b/acqui/parcels.pl
@@ -161,13 +161,24 @@ if ($count_parcels) {
     $template->param( searchresults => $loopres, count => $count_parcels );
 }
 
-my $budgets = GetBudgets();
-my @budgets_loop;
-foreach my $budget (@$budgets) {
-    next unless CanUserUseBudget($loggedinuser, $budget, $flags);
-    push @budgets_loop, $budget;
+# build budget list
+my $budget_loop = [];
+my $budgets = GetBudgetHierarchy;
+foreach my $r (@{$budgets}) {
+    next unless (CanUserUseBudget($loggedinuser, $r, $flags));
+    if (!defined $r->{budget_amount} || $r->{budget_amount} == 0) {
+        next;
+    }
+    push @{$budget_loop}, {
+        b_id  => $r->{budget_id},
+        b_txt => $r->{budget_name},
+        b_active => $r->{budget_period_active},
+    };
 }
 
+@{$budget_loop} =
+  sort { uc( $a->{b_txt}) cmp uc( $b->{b_txt}) } @{$budget_loop};
+
 $template->param(
     orderby                  => $order,
     filter                   => $code,
@@ -179,7 +190,7 @@ $template->param(
     shipmentdate_today       => C4::Dates->new()->output(),
     booksellerid             => $booksellerid,
     GST                      => C4::Context->preference('gist'),
-    budgets                  => \@budgets_loop,
+    budget_loop              => $budget_loop,
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
index 616139c..ba3fa37 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
@@ -12,6 +12,15 @@
     var parcelst = $("#parcelst").dataTable($.extend(true, {}, dataTablesDefaults, {
         "sPaginationType": "four_button"
     } ) );
+    $('#showallfunds').click(function() {
+        if ( $('#shipmentcost_budgetid .b_inactive').is(":visible") )
+        {
+        $('#shipmentcost_budgetid .b_inactive').hide();
+        }
+        else {
+        $('#shipmentcost_budgetid .b_inactive').show();
+        }
+    });
  });
  //]]>
 </script>
@@ -136,13 +145,19 @@
             <input type="text" id="shipmentcost" name="shipmentcost" size="10" />
         </li>
         <li>
-            <label for="shipmentcost_budgetid">Budget: </label>
+            <label for="shipmentcost_budgetid">Fund: </label>
             <select id="shipmentcost_budgetid" name="shipmentcost_budgetid">
-                <option value="">No budget</option>
-                [% FOREACH budget IN budgets %]
-                    <option value="[% budget.budget_id %]">[% budget.budget_name %]</option>
+                    <option value="">No fund</option>
+            [% FOREACH budget_loo IN budget_loop %]
+                [% IF ( budget_loo.b_active ) %]
+                    <option value="[% budget_loo.b_id %]">[% budget_loo.b_txt %]</option>
+                [% ELSE %]
+                    <option value="[% budget_loo.b_id %]" class="b_inactive" style="display : none;">[% budget_loo.b_txt %]</option>
                 [% END %]
+            [% END %]
             </select>
+            <label for="showallfunds" style="float:none;width:auto;">&nbsp;Show all:</label>
+            <input type="checkbox" id="showallfunds" />
         </li>
 		</ol>
     </fieldset>
-- 
1.7.9.5


From mtj at kohaaloha.com  Wed Sep 26 09:54:32 2012
From: mtj at kohaaloha.com (Mason James)
Date: Wed, 26 Sep 2012 19:54:32 +1200
Subject: [Koha-patches] [PATCH] git bz test
Message-ID: <1348646072-20608-1-git-send-email-mtj@kohaaloha.com>

http://bugs.koha-community.org/show_bug.cgi?id=6473
---
 kohaversion.pl |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/kohaversion.pl b/kohaversion.pl
index 1eefc92..4844d65 100644
--- a/kohaversion.pl
+++ b/kohaversion.pl
@@ -12,6 +12,7 @@ the kohaversion is divided in 4 parts :
         used by developers when the database changes. updatedatabase take care of the changes itself
         and is automatically called by Auth.pm when needed.
 =cut
+xxxxxxxxxxx
 
 use strict;
 
-- 
1.7.2.5

From oleonard at myacpl.org  Wed Sep 26 15:05:00 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 26 Sep 2012 09:05:00 -0400
Subject: [Koha-patches] [PATCH] Bug 8827 - YUI CSS files no longer found on
	Yahoo servers
Message-ID: <1348664700-7899-1-git-send-email-oleonard@myacpl.org>

This patch removes the [% yuipath %] variable from the link
to the YUI CSS files in the OPAC and adds a hard-coded path
to the local files.

To test, set your yuipath system preference to "from Yahoo's
servers," clear your browser cache, and view the OPAC. The
style and layout should look the same as if your yuipath
preference were set to "local."
---
 .../opac-tmpl/prog/en/includes/doc-head-close.inc  |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
index f032b20..35d395f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
@@ -3,8 +3,8 @@
 <meta name="generator" content="Koha [% Version %]" /> <!-- leave this for stats -->
 <link rel="shortcut icon" href="[% IF ( OpacFavicon ) %][% OpacFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" />
 <link rel="stylesheet" type="text/css" href="[% themelang %]/lib/jquery/jquery-ui.css" />
-<link rel="stylesheet" type="text/css" href="[% yuipath %]/reset-fonts-grids.css" />
-<link rel="stylesheet" type="text/css" href="[% yuipath %]/skin.css" />
+<link rel="stylesheet" type="text/css" href="/opac-tmpl/lib/yui/reset-fonts-grids.css" />
+<link rel="stylesheet" type="text/css" href="/opac-tmpl/lib/yui/skin.css" />
 [% SET opaclayoutstylesheet='opac.css' UNLESS opaclayoutstylesheet %]
 [% IF (opaclayoutstylesheet.match('^https?:|^\/')) %]
     <link rel="stylesheet" type="text/css" href="[% opaclayoutstylesheet %]" />
-- 
1.7.9.5


From nengard at bywatersolutions.com  Wed Sep 26 03:32:10 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 25 Sep 2012 21:32:10 -0400
Subject: [Koha-patches] [PATCH] [FOLLOW UP] Bug 7751: Decrease loan length
	with many holds
Message-ID: <1348623130-4303-1-git-send-email-nengard@bywatersolutions.com>

This patch merges the three preferences in to one sentence
to make it clear that they are all linked together and to
eliminate confusion that can come by having them as
individual preferences.
---
 .../en/modules/admin/preferences/circulation.pref  |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index 531b878..20c37d8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -412,17 +412,13 @@ Circulation:
               choices:
                   yes: Enable
                   no:  "Don't enable"
-            - the reduction of loan period for items with number of holds above the threshold specified in decreaseLoanHighHoldsValue
-        -
-            - A loan should be reduced by
+            - the reduction of loan period by 
             - pref: decreaseLoanHighHoldsDuration
               class: integer
-            - days, when decreaseLoanHighHoldsValue threshold is reached (if decreaseLoanHighHolds is enabled)
-        -
-            - A loan should be reduced by decreaseLoanHighHoldsDuration when
+            - days for items with more than 
             - pref: decreaseLoanHighHoldsValue
               class: integer
-            - holds have been places (if decreaseLoanHighHolds is enables)
+            - holds.
     Fines Policy:
         -
             - Calculate fines based on days overdue
-- 
1.7.2.3


From fridolyn.somers at biblibre.com  Wed Sep 26 16:47:37 2012
From: fridolyn.somers at biblibre.com (Fridolyn SOMERS)
Date: Wed, 26 Sep 2012 16:47:37 +0200
Subject: [Koha-patches] [PATCH] Bug 8481: Items table is showing in
	opac-MARCdetail.pl but not in MARCdetail.pl
Message-ID: <1348670857-11547-1-git-send-email-fridolyn.somers@biblibre.com>

---
 catalogue/MARCdetail.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catalogue/MARCdetail.pl b/catalogue/MARCdetail.pl
index 72e6709..2b967df 100755
--- a/catalogue/MARCdetail.pl
+++ b/catalogue/MARCdetail.pl
@@ -82,7 +82,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my $record = GetMarcBiblio($biblionumber);
+my $record = GetMarcBiblio($biblionumber, 1);
 $template->param( ocoins => GetCOinSBiblio($record) );
 
 if ( not defined $record ) {
-- 
1.7.9.5


From nengard at bywatersolutions.com  Wed Sep 26 18:45:40 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Wed, 26 Sep 2012 12:45:40 -0400
Subject: [Koha-patches] [PATCH] Bug 8831: relabel gstrate with Tax rate
Message-ID: <1348677940-2815-1-git-send-email-nengard@bywatersolutions.com>

This patch changes gstrate to Tax rate to match the standard set
on all other acq pages.
---
 .../prog/en/modules/acqui/neworderempty.tt         |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index ea044bb..6185e32 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -450,10 +450,10 @@ $(document).ready(function()
             [% END %]
             <li>
                 [% IF ( close ) %]
-                    <span class="label">gstrate: </span>
+                    <span class="label">Tax rate: </span>
                     <input type="hidden" size="20" name="gstrate" id="gstrate" value="[% gstrate %]" />[% gstrate %]%
                 [% ELSE %]
-                    <label for="gst">gstrate: </label>
+                    <label for="gst">Tax rate: </label>
                     <select name="gstrate" id="gstrate" onchange="updateCosts();">
                     [% FOREACH gst IN gst_values %]
                       [% IF ( gst.option == gstrate ) %]
-- 
1.7.2.3


From jcamins at cpbibliography.com  Wed Sep 26 22:38:06 2012
From: jcamins at cpbibliography.com (Jared Camins-Esakov)
Date: Wed, 26 Sep 2012 16:38:06 -0400
Subject: [Koha-patches] [PATCH] Bug 8829: Fix authority importing
Message-ID: <1348691886-3650-1-git-send-email-jcamins@cpbibliography.com>

A subroutine was not being imported by C4::ImportBatch (ironic, no?)
so this patch makes the call fully-qualified. This patch also cleans
up two warnings in C4::Auth that are raised when logged in as the
database user.
---
 C4/Auth.pm        |   10 ++++++++--
 C4/ImportBatch.pm |    4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 5486f76..dc4de57 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -653,7 +653,7 @@ sub checkauth {
             $ip       = $session->param('ip');
             $lasttime = $session->param('lasttime');
             $userid   = $session->param('id');
-			$sessiontype = $session->param('sessiontype');
+            $sessiontype = $session->param('sessiontype') || '';
         }
         if ( ( ($query->param('koha_login_context')) && ($query->param('userid') ne $session->param('id')) )
           || ( $cas && $query->param('ticket') ) ) {
@@ -1492,7 +1492,13 @@ sub getuserflags {
     my $userid  = shift;
     my $dbh     = @_ ? shift : C4::Context->dbh;
     my $userflags;
-    $flags = 0 unless $flags;
+    { 
+        # I don't want to do this, but if someone logs in as the database
+        # user, it would be preferable not to spam them to death with
+        # numeric warnings. So, we make $flags numeric.
+        no warnings 'numeric';
+        $flags += 0;
+    }
     my $sth = $dbh->prepare("SELECT bit, flag, defaulton FROM userflags");
     $sth->execute;
 
diff --git a/C4/ImportBatch.pm b/C4/ImportBatch.pm
index a655f29..648d96e 100644
--- a/C4/ImportBatch.pm
+++ b/C4/ImportBatch.pm
@@ -1306,7 +1306,7 @@ sub GetImportRecordMatches {
     $sth->execute();
     while (my $row = $sth->fetchrow_hashref) {
         if ($row->{'record_type'} eq 'auth') {
-            $row->{'authorized_heading'} = GetAuthorizedHeading( { authid => $row->{'candidate_match_id'} } );
+            $row->{'authorized_heading'} = C4::AuthoritiesMarc::GetAuthorizedHeading( { authid => $row->{'candidate_match_id'} } );
         }
         next if ($row->{'record_type'} eq 'biblio' && not $row->{'biblionumber'});
         push @$results, $row;
@@ -1375,7 +1375,7 @@ sub _add_auth_fields {
     if ($marc_record->field('001')) {
         $controlnumber = $marc_record->field('001')->data();
     }
-    my $authorized_heading = GetAuthorizedHeading({ record => $marc_record });
+    my $authorized_heading = C4::AuthoritiesMarc::GetAuthorizedHeading({ record => $marc_record });
     my $dbh = C4::Context->dbh;
     my $sth = $dbh->prepare("INSERT INTO import_auths (import_record_id, control_number, authorized_heading) VALUES (?, ?, ?)");
     $sth->execute($import_record_id, $controlnumber, $authorized_heading);
-- 
1.7.2.5

From jcamins at cpbibliography.com  Wed Sep 26 23:39:32 2012
From: jcamins at cpbibliography.com (Jared Camins-Esakov)
Date: Wed, 26 Sep 2012 17:39:32 -0400
Subject: [Koha-patches] [PATCH] Bug 8823: CatalogModuleRelink Creates
	Multiple Links between Bib and Auth record
Message-ID: <1348695572-4174-1-git-send-email-jcamins@cpbibliography.com>

On 3.8.x, it was possible for multiple automatically generated
authorities to be linked to a single heading. This patch deletes
previous links from headings prior to linking them to
automatically-generated headings. This patch also corrects a
potential problem wherein multiple authorities might be generated if
a record is edited repeatedly in quick succession. The latter problem
exists on Master and 3.6.x as well, and the code that corrects the
multiple linkages is equally applicable if seemingly unnecessary.
---
 C4/Biblio.pm |  124 +++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 80 insertions(+), 44 deletions(-)

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index ed8a169..9de9b85 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -568,21 +568,27 @@ sub LinkBibHeadingsToAuthorities {
                 $results{'fuzzy'}->{ $heading->display_form() }++;
             }
             elsif ( C4::Context->preference('AutoCreateAuthorities') ) {
-                my $authtypedata =
-                  C4::AuthoritiesMarc::GetAuthType( $heading->auth_type() );
-                my $marcrecordauth = MARC::Record->new();
-                if ( C4::Context->preference('marcflavour') eq 'MARC21' ) {
-                    $marcrecordauth->leader('     nz  a22     o  4500');
-                    SetMarcUnicodeFlag( $marcrecordauth, 'MARC21' );
+                if ( _check_valid_auth_link( $current_link, $field ) ) {
+                    $results{'linked'}->{ $heading->display_form() }++;
                 }
-                my $authfield =
-                  MARC::Field->new( $authtypedata->{auth_tag_to_report},
-                    '', '', "a" => "" . $field->subfield('a') );
-                map {
-                    $authfield->add_subfields( $_->[0] => $_->[1] )
-                      if ( $_->[0] =~ /[A-z]/ && $_->[0] ne "a" )
-                } $field->subfields();
-                $marcrecordauth->insert_fields_ordered($authfield);
+                else {
+                    my $authtypedata =
+                      C4::AuthoritiesMarc::GetAuthType( $heading->auth_type() );
+                    my $marcrecordauth = MARC::Record->new();
+                    if ( C4::Context->preference('marcflavour') eq 'MARC21' ) {
+                        $marcrecordauth->leader('     nz  a22     o  4500');
+                        SetMarcUnicodeFlag( $marcrecordauth, 'MARC21' );
+                    }
+                    $field->delete_subfield( code => '9' )
+                      if defined $current_link;
+                    my $authfield =
+                      MARC::Field->new( $authtypedata->{auth_tag_to_report},
+                        '', '', "a" => "" . $field->subfield('a') );
+                    map {
+                        $authfield->add_subfields( $_->[0] => $_->[1] )
+                          if ( $_->[0] =~ /[A-z]/ && $_->[0] ne "a" )
+                    } $field->subfields();
+                    $marcrecordauth->insert_fields_ordered($authfield);
 
 # bug 2317: ensure new authority knows it's using UTF-8; currently
 # only need to do this for MARC21, as MARC::Record->as_xml_record() handles
@@ -591,41 +597,47 @@ sub LinkBibHeadingsToAuthorities {
 # use UTF-8, but as of 2008-08-05, did not want to introduce that kind
 # of change to a core API just before the 3.0 release.
 
-                if ( C4::Context->preference('marcflavour') eq 'MARC21' ) {
-                    $marcrecordauth->insert_fields_ordered(
-                        MARC::Field->new(
-                            '667', '', '',
-                            'a' => "Machine generated authority record."
-                        )
-                    );
-                    my $cite =
-                        $bib->author() . ", "
-                      . $bib->title_proper() . ", "
-                      . $bib->publication_date() . " ";
-                    $cite =~ s/^[\s\,]*//;
-                    $cite =~ s/[\s\,]*$//;
-                    $cite =
-                        "Work cat.: ("
-                      . C4::Context->preference('MARCOrgCode') . ")"
-                      . $bib->subfield( '999', 'c' ) . ": "
-                      . $cite;
-                    $marcrecordauth->insert_fields_ordered(
-                        MARC::Field->new( '670', '', '', 'a' => $cite ) );
-                }
+                    if ( C4::Context->preference('marcflavour') eq 'MARC21' ) {
+                        $marcrecordauth->insert_fields_ordered(
+                            MARC::Field->new(
+                                '667', '', '',
+                                'a' => "Machine generated authority record."
+                            )
+                        );
+                        my $cite =
+                            $bib->author() . ", "
+                          . $bib->title_proper() . ", "
+                          . $bib->publication_date() . " ";
+                        $cite =~ s/^[\s\,]*//;
+                        $cite =~ s/[\s\,]*$//;
+                        $cite =
+                            "Work cat.: ("
+                          . C4::Context->preference('MARCOrgCode') . ")"
+                          . $bib->subfield( '999', 'c' ) . ": "
+                          . $cite;
+                        $marcrecordauth->insert_fields_ordered(
+                            MARC::Field->new( '670', '', '', 'a' => $cite ) );
+                    }
 
            #          warn "AUTH RECORD ADDED : ".$marcrecordauth->as_formatted;
 
-                $authid =
-                  C4::AuthoritiesMarc::AddAuthority( $marcrecordauth, '',
-                    $heading->auth_type() );
-                $field->add_subfields( '9', $authid );
-                $num_headings_changed++;
-                $results{'added'}->{ $heading->display_form() }++;
+                    $authid =
+                      C4::AuthoritiesMarc::AddAuthority( $marcrecordauth, '',
+                        $heading->auth_type() );
+                    $field->add_subfields( '9', $authid );
+                    $num_headings_changed++;
+                    $results{'added'}->{ $heading->display_form() }++;
+                }
             }
             elsif ( defined $current_link ) {
-                $field->delete_subfield( code => '9' );
-                $num_headings_changed++;
-                $results{'unlinked'}->{ $heading->display_form() }++;
+                if ( _check_valid_auth_link( $current_link, $field ) ) {
+                    $results{'linked'}->{ $heading->display_form() }++;
+                }
+                else {
+                    $field->delete_subfield( code => '9' );
+                    $num_headings_changed++;
+                    $results{'unlinked'}->{ $heading->display_form() }++;
+                }
             }
             else {
                 $results{'unlinked'}->{ $heading->display_form() }++;
@@ -636,6 +648,30 @@ sub LinkBibHeadingsToAuthorities {
     return $num_headings_changed, \%results;
 }
 
+=head2 _check_valid_auth_link
+
+    if ( _check_valid_auth_link($authid, $field) ) {
+        ...
+    }
+
+Check whether the specified heading-auth link is valid without reference
+to Zebra/Solr. Ideally this code would be in C4::Heading, but that won't be
+possible until we have de-cycled C4::AuthoritiesMarc, so this is the
+safest place.
+
+=cut
+
+sub _check_valid_auth_link {
+    my ( $authid, $field ) = @_;
+
+    require C4::AuthoritiesMarc;
+
+    my $authorized_heading =
+      C4::AuthoritiesMarc::GetAuthorizedHeading( { 'authid' => $authid } );
+
+   return ($field->as_string('abcdefghijklmnopqrstuvwxyz') eq $authorized_heading);
+}
+
 =head2 GetRecordValue
 
   my $values = GetRecordValue($field, $record, $frameworkcode);
-- 
1.7.2.5

From nengard at bywatersolutions.com  Thu Sep 27 06:06:43 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Thu, 27 Sep 2012 00:06:43 -0400
Subject: [Koha-patches] [PATCH] Bug 7621: Follow up to clarify preference
	language
Message-ID: <1348718803-5076-1-git-send-email-nengard@bywatersolutions.com>

This patch changes strings only, not functionality. It will
clarify the meaning of the  AgeRestrictionMarker preference.
---
 .../en/modules/admin/preferences/circulation.pref  |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index 531b878..9b0e3d3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -236,8 +236,9 @@ Circulation:
                   no: "Prevent"
             - patrons from checking out an item whose rental charge would take them over the limit.
         -
+            - "Restrict patrons with the following target audience values from checking out inappropriate materials:"
             - pref: AgeRestrictionMarker
-            - "E.g. FSK|PEGI|Age| (No white space near |). Entry in MARC field (e.g. 521a) as defined for agerestriction in Koha to MARC mapping. Entry in MARC field like FSK 12 or PEGI 12 would mean: Borrower must be 12 years old. (Empty: Do not apply age restriction.)"
+            - "E.g. enter targe audience keyword split by | (bar) FSK|PEGI|Age| (No white space near |). Be sure to map agerestriction in Koha to MARC mapping (e.g. 521$a). A MARC field value of FSK 12 or PEGI 12 would mean: Borrower must be 12 years old. Leave empty to not apply an age restriction."
         -
             - pref: AgeRestrictionOverride
               choices:
-- 
1.7.2.3


From nengard at bywatersolutions.com  Thu Sep 27 06:10:45 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Thu, 27 Sep 2012 00:10:45 -0400
Subject: [Koha-patches] [PATCH] Bug 7621: Follow up to clarify preference
	language
Message-ID: <1348719045-5141-1-git-send-email-nengard@bywatersolutions.com>

This patch changes strings only, not functionality. It will
clarify the meaning of the  AgeRestrictionMarker preference.
---
 .../en/modules/admin/preferences/circulation.pref  |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index 531b878..844f658 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -236,8 +236,9 @@ Circulation:
                   no: "Prevent"
             - patrons from checking out an item whose rental charge would take them over the limit.
         -
+            - "Restrict patrons with the following target audience values from checking out inappropriate materials:"
             - pref: AgeRestrictionMarker
-            - "E.g. FSK|PEGI|Age| (No white space near |). Entry in MARC field (e.g. 521a) as defined for agerestriction in Koha to MARC mapping. Entry in MARC field like FSK 12 or PEGI 12 would mean: Borrower must be 12 years old. (Empty: Do not apply age restriction.)"
+            - "E.g. enter target audience keyword(s) split by | (bar) FSK|PEGI|Age| (No white space near |). Be sure to map agerestriction in Koha to MARC mapping (e.g. 521$a). A MARC field value of FSK 12 or PEGI 12 would mean: Borrower must be 12 years old. Leave empty to not apply an age restriction."
         -
             - pref: AgeRestrictionOverride
               choices:
-- 
1.7.2.3


From nengard at bywatersolutions.com  Thu Sep 27 06:56:05 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Thu, 27 Sep 2012 00:56:05 -0400
Subject: [Koha-patches] [PATCH] Bug 6716: Update biblioitems tables
Message-ID: <1348721765-5445-1-git-send-email-nengard@bywatersolutions.com>

This patch documents the cn_sort and agerestriction fields
in the biblioitems and deletedbiblioitems tables.
---
 installer/data/mysql/kohastructure.sql |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 39857b7..3e4ad37 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -177,8 +177,8 @@ CREATE TABLE `biblioitems` ( -- information related to bibliographic records in
   `cn_class` varchar(30) default NULL,
   `cn_item` varchar(10) default NULL,
   `cn_suffix` varchar(10) default NULL,
-  `cn_sort` varchar(30) default NULL,
-  `agerestriction` varchar(255) default NULL,
+  `cn_sort` varchar(30) default NULL, -- normalized version of the call number used for sorting
+  `agerestriction` varchar(255) default NULL, -- target audience/age restriction from the bib record (MARC21 521$a)
   `totalissues` int(10),
   `marcxml` longtext NOT NULL, -- full bibliographic MARC record in MARCXML
   PRIMARY KEY  (`biblioitemnumber`),
@@ -650,8 +650,8 @@ CREATE TABLE `deletedbiblioitems` ( -- information about bibliographic records t
   `cn_class` varchar(30) default NULL,
   `cn_item` varchar(10) default NULL,
   `cn_suffix` varchar(10) default NULL,
-  `cn_sort` varchar(30) default NULL,
-  `agerestriction` varchar(255) default NULL,
+  `cn_sort` varchar(30) default NULL, -- normalized version of the call number used for sorting
+  `agerestriction` varchar(255) default NULL, -- target audience/age restriction from the bib record (MARC21 521$a)
   `totalissues` int(10),
   `marcxml` longtext NOT NULL, -- full bibliographic MARC record in MARCXML
   PRIMARY KEY  (`biblioitemnumber`),
-- 
1.7.2.3


From colin.campbell at ptfs-europe.com  Fri Sep 28 13:37:30 2012
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Fri, 28 Sep 2012 12:37:30 +0100
Subject: [Koha-patches] [PATCH] Bug 8841 Duedate should be set to end of
	expiry day
Message-ID: <1348832250-9284-1-git-send-email-colin.campbell@ptfs-europe.com>

When reducing duedate to patron's expiry date
it should be set to end of that day not 00:00
take account of the fact that the borrower
expiry date will have no hours/minutes
---
 C4/Circulation.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 71e13bb..3278039 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -3062,6 +3062,7 @@ sub CalcDateDue {
     # if ReturnBeforeExpiry ON the datedue can't be after borrower expirydate
     if ( C4::Context->preference('ReturnBeforeExpiry') ) {
         my $expiry_dt = dt_from_string( $borrower->{dateexpiry}, 'iso' );
+        $expiry_dt->set( hour => 23, minute => 59);
         if ( DateTime->compare( $datedue, $expiry_dt ) == 1 ) {
             $datedue = $expiry_dt->clone;
         }
-- 
1.7.12.1.428.g652398a


From fridolyn.somers at biblibre.com  Fri Sep 28 15:34:10 2012
From: fridolyn.somers at biblibre.com (Fridolyn SOMERS)
Date: Fri, 28 Sep 2012 15:34:10 +0200
Subject: [Koha-patches] [PATCH] Bug 8462: OpacHiddenItems and hidelostitems
	hide items, but query result count is off
Message-ID: <1348839250-15371-1-git-send-email-fridolyn.somers@biblibre.com>

---
 C4/Search.pm |    5 -----
 1 file changed, 5 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index 7c20780..97d7d15 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1884,11 +1884,6 @@ sub searchResults {
             }
         }    # notforloan, item level and biblioitem level
 
-        # if all items are hidden, do not show the record
-        if ($items_count > 0 && $hideatopac_count == $items_count) {
-            next;
-        }
-
         my ( $availableitemscount, $onloanitemscount, $otheritemscount );
         for my $key ( sort keys %$onloan_items ) {
             (++$onloanitemscount > $maxitems) and last;
-- 
1.7.9.5


From christophe.croullebois at biblibre.com  Fri Sep 28 16:13:58 2012
From: christophe.croullebois at biblibre.com (Christophe Croullebois)
Date: Fri, 28 Sep 2012 16:13:58 +0200
Subject: [Koha-patches] [PATCH 1/1] Bug 8218 : A script for maintenance to
	clean any &amp; 
Message-ID: <1348841638-5579-1-git-send-email-christophe.croullebois@biblibre.com>

Two subs written by Alex Arnaud in C4/Charset.pm, SanitizeEntity and entity_clean
I had created two scripts for Biblibre, one to be used in cron, it reindexes all transformed records.
Sophie Meynieux brought together the two scripts, she has created a batch mode, usefull but without the reindexing
So I have rewrited it and I have integrated "Fixing copyright headers and license and description"
written by Chris Cormack and "Followup: Perltidy and QA FIX" written by Jonathan Druart
Thx to all
---
 C4/Charset.pm                           |   48 +++++++++
 misc/maintenance/batchSanitizeEntity.pl |  165 +++++++++++++++++++++++++++++++
 2 files changed, 213 insertions(+), 0 deletions(-)
 create mode 100644 misc/maintenance/batchSanitizeEntity.pl

diff --git a/C4/Charset.pm b/C4/Charset.pm
index 91d43b4..f225ada 100644
--- a/C4/Charset.pm
+++ b/C4/Charset.pm
@@ -42,6 +42,7 @@ BEGIN {
       StripNonXmlChars
       nsb_clean
       fix_unimarc_titles
+      SanitizeEntity
     );
 }
 
@@ -1232,6 +1233,53 @@ sub fix_unimarc_titles {
     }
 }
 
+=head2 SanitizeEntity
+
+=over 4
+
+SanitizeEntity($marcrecord);
+
+=back
+
+Sanitize Entity
+
+=cut
+
+sub SanitizeEntity {
+    my $record = shift;
+
+    foreach my $field ($record->fields()) {
+        if ($field->is_control_field()) {
+            $field->update(entity_clean($field->data()));
+        } else {
+            my @subfields = $field->subfields();
+            my @new_subfields;
+            foreach my $subfield (@subfields) {
+                push @new_subfields, $subfield->[0] => entity_clean($subfield->[1]);
+            }
+            if (scalar(@new_subfields) > 0) {
+                my $new_field;
+                eval {
+                    $new_field = MARC::Field->new($field->tag(), $field->indicator(1), $field->indicator(2), @new_subfields);
+                };
+                if ($@) {
+                    warn "error : $@";
+                } else {
+                    $field->replace_with($new_field);
+                }
+
+            }
+        }
+    }
+    return $record;
+}
+
+sub entity_clean {
+    my $string=shift;
+    $string=~s/(&)(amp;)+/$1/g;
+    return $string;
+}
+
 1;
 
 =head1 AUTHOR
diff --git a/misc/maintenance/batchSanitizeEntity.pl b/misc/maintenance/batchSanitizeEntity.pl
new file mode 100644
index 0000000..7bd5e5f
--- /dev/null
+++ b/misc/maintenance/batchSanitizeEntity.pl
@@ -0,0 +1,165 @@
+#!/usr/bin/perl
+# small script that replaces '&amp;amp;amp;etc.' by '&amp;' in a record
+
+# Copyright 2012 Biblibre SARL
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use Modern::Perl;
+use C4::Charset;
+use C4::Context;
+use DBI;
+use C4::Biblio;
+use Getopt::Long;
+use Pod::Usage;
+
+my ( $biblios,$run,$want_help,$batch,$cron );
+my $result = GetOptions(
+    'where=s' => \$biblios,
+    '--run'   => \$run,
+    'help|h'  => \$want_help,
+    'batch|b' => \$batch,
+    'cron|c'  => \$cron,
+);
+
+# We check if required entries are given :
+if ( not $result or $want_help or not $biblios or not $run ) {
+    print_usage();
+    exit 0;
+}
+
+# We initialise some tools :
+my $count;
+my $bibliocount;
+my @bibliofile;
+my @biblionum;
+my @biblios;
+my $record;
+my $cleanrecord;
+
+# We first detect if we have a file or biblos directly entered by command line
+#or if we want to use findAmp() sub
+if ( $biblios eq "search" ) {
+    @biblios = findAmp();
+}
+else {
+    if ( $biblios =~ m|/| ) {
+        open( FILE, "$biblios" ) || die("Can't open $biblios");
+        @bibliofile = <FILE>;
+        close(FILE);
+    }
+    else {
+        @biblionum = split ',', $biblios;
+    }
+    
+    # We take the biblios
+    @biblios = @bibliofile ? @bibliofile : @biblionum;
+}
+
+# We remove spaces
+s/(^\s*|\s*$)//g for @biblios;
+# Remove empty lines
+ at biblios = grep {!/^$/} @biblios;
+
+# We valid the input
+foreach my $biblio (@biblios) {
+    if ( $biblio !~ /^\d+$/ ) {
+        print
+"=============== \"$biblio\" is not a biblionumber !!! ===============\n";
+        print "=============== please verify \"$biblio\" !!! ===============\n";
+        $count++;
+    }
+    exit(1) if $count;
+}
+
+$bibliocount = scalar @biblios;
+
+print
+"=============== $bibliocount Biblio(s) ready to be cleaned ===============\n";
+if ( !$batch or !$cron ) {
+    my $confirm = 0;
+    print "=============== You are ok ? Types yes/no :\n";
+    while ( $confirm == 0 ) {
+        my $prout = <STDIN>;
+        if ($prout eq "yes\n") {
+            $confirm = 1;
+        }
+        elsif ($prout eq "no\n") {
+            print "=============== Ok, bye ===============\n";
+            exit(0);
+        }
+        else {
+            print "======= Bad answer please types 'yes' or 'no' !!!!!!!!!!! ===============\n";
+        }
+            }
+}
+
+foreach my $biblio ( @biblios ) {
+    print "=============== N?? $biblio selected ===============\n";
+    $record      = GetMarcBiblio($biblio);
+    $cleanrecord = SanitizeEntity($record);
+    my $frameworkcode = GetFrameworkCode($biblio);
+    ModBiblio( $cleanrecord, $biblio, $frameworkcode );
+    print "=============== Biblio n?? $biblio cleaning done ===============\n";
+    $count++;
+}
+
+print "==============================================================\n";
+print "=============== $count Biblios cleaned ===============\n";
+
+if ( $cron ) {
+    print "==============================================================\n";
+    print
+"========= Now we are reindexing -b -v -where \"biblionumber=xxx\" =========\n";
+    print "==============================================================\n";
+    $count = 0;
+    my $kohapath = C4::Context->config('intranetdir');
+    foreach my $biblio ( @biblios ) {
+        system("$kohapath/misc/migration_tools/rebuild_zebra.pl
+        -b -v -where \"biblionumber=$biblio\"");
+        print "========= Biblio n?? $biblio re-indexing done =========\n";
+        $count ++;
+}
+    print "=============== $count Biblios re-indexed ===============\n";
+}
+
+sub print_usage {
+    print <<_USAGE_;
+$0: replaces '&amp;' by '&' in a record, you can either give some biblionumbers or a file with biblionumbers or
+
+Parameters:
+    -where                  use this to give biblionumbers in a string with "" (separated by coma)
+                            or an absolute path to a file containing biblionumbers (1 by row)
+                            or the command 'search' that creates an array with biblionumbers with "&amp;amp;..."
+    --run                   run the command
+    --batch or -b           run in batch mode
+    --cron or -c            run in cron mode, it reindexes the changed records (you can redirect the output to a file)
+    --help or -h            show this message.
+_USAGE_
+}
+
+sub findAmp {
+    my @bibliosearch;
+    my $dbh = C4::Context->dbh;
+    my $strsth =
+      qq{SELECT biblionumber FROM biblioitems WHERE marcxml LIKE "%amp;amp;%"};
+    my $sth = $dbh->prepare($strsth);
+    $sth->execute();
+    while ( my $bib = $sth-> fetchrow_array() ) {
+        push @bibliosearch, $bib;
+    }
+    return @bibliosearch;
+}
-- 
1.7.0.4


From oleonard at myacpl.org  Fri Sep 28 16:51:45 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri, 28 Sep 2012 10:51:45 -0400
Subject: [Koha-patches] [PATCH] Bug 8843 - Cannot export bibliographic
	records by call number
Message-ID: <1348843905-12683-1-git-send-email-oleonard@myacpl.org>

When building the query for exports by call number the script
has the logic reversed. It tries to select records with call
numbers less than the starting call number and greater than
the ending call number. This should be reversed.

To test, test an export in an unpatched system. An export by
call number will return an empty file. After applying the patch
an export by call number should give valid results.
---
 tools/export.pl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/export.pl b/tools/export.pl
index a4eb6e9..c7a8fd8 100755
--- a/tools/export.pl
+++ b/tools/export.pl
@@ -538,12 +538,12 @@ sub construct_query {
             }
 
             if ($start_callnumber) {
-                $sql_query .= " AND itemcallnumber <= ? ";
+                $sql_query .= " AND itemcallnumber >= ? ";
                 push @sql_params, $start_callnumber;
             }
 
             if ($end_callnumber) {
-                $sql_query .= " AND itemcallnumber >= ? ";
+                $sql_query .= " AND itemcallnumber <= ? ";
                 push @sql_params, $end_callnumber;
             }
             if ($start_accession) {
-- 
1.7.9.5


From nengard at bywatersolutions.com  Thu Sep 27 21:06:42 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Thu, 27 Sep 2012 15:06:42 -0400
Subject: [Koha-patches] [PATCH] Follow up: Bug 8525: Update preference
	description
Message-ID: <1348772802-16583-1-git-send-email-nengard@bywatersolutions.com>

The feature in bug 8525 added highlighting to the detail
pages in the opac. This patch updates the preference to
note this change.
---
 .../prog/en/modules/admin/preferences/opac.pref    |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index e645785..4827fab 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -125,7 +125,7 @@ OPAC:
               choices:
                   yes: Highlight
                   no: "Don't highlight"
-            - words the patron searched for in their search results.
+            - words the patron searched for in their search results and detail pages.
         -
             - pref: AuthorisedValueImages
               choices:
-- 
1.7.2.3


From fridolyn.somers at biblibre.com  Fri Sep 28 18:46:08 2012
From: fridolyn.somers at biblibre.com (Fridolyn SOMERS)
Date: Fri, 28 Sep 2012 18:46:08 +0200
Subject: [Koha-patches] [PATCH] Bug 8844:
	UNIMARC_sync_date_created_with_marc_biblio.pl creates a
	modification log
Message-ID: <1348850768-19378-1-git-send-email-fridolyn.somers@biblibre.com>

---
 .../UNIMARC_sync_date_created_with_marc_biblio.pl  |  237 +++++++++++++++++---
 1 file changed, 200 insertions(+), 37 deletions(-)

diff --git a/misc/maintenance/UNIMARC_sync_date_created_with_marc_biblio.pl b/misc/maintenance/UNIMARC_sync_date_created_with_marc_biblio.pl
index 43b5550..d271560 100755
--- a/misc/maintenance/UNIMARC_sync_date_created_with_marc_biblio.pl
+++ b/misc/maintenance/UNIMARC_sync_date_created_with_marc_biblio.pl
@@ -2,7 +2,7 @@
 #
 # This script should be used only with UNIMARC flavour
 # It is designed to report some missing information from biblio
-# table into  marc data
+# table into marc data
 #
 use strict;
 use warnings;
@@ -13,63 +13,226 @@ BEGIN {
 }
 
 use C4::Biblio;
+use Getopt::Long;
+
+sub _read_marc_code {
+    my $input = shift;
+    my ( $field, $subfield );
+    if ( $input =~ /^(\d{3})$/ ) {
+        $field    = $1;
+    } elsif ( $input =~ /^(\d{3})(\w)$/ ) {
+        $field    = $1;
+        $subfield = $2;
+    }
+    return ( $field, $subfield );
+}
+
+my ( $run, $help, $verbose, $where, $date_created_marc, $date_modified_marc );
+GetOptions(
+    'help|h'                 => \$help,
+    'verbose|v'              => \$verbose,
+    'run'                    => \$run,
+    'where:s'                => \$where,
+    'date-created-marc|c:s'  => \$date_created_marc,
+    'date-modified-marc|m:s' => \$date_modified_marc,
+);
+my $debug = $ENV{DEBUG};
+$verbose = 1 if $debug;
+
+# display help ?
+if ($help) {
+    print_usage();
+    exit 0;
+}
+
+$verbose and print "================================\n";
+
+# date created MARC field/subfield
+$date_created_marc = '099c' unless $date_created_marc;
+my ( $c_field, $c_subfield ) = _read_marc_code($date_created_marc);
+die "date-created-marc '$date_created_marc' is not correct." unless $c_field;
+if ($verbose) {
+    print "Date created on $c_field";
+    print $c_subfield if defined $c_subfield; # use of defined to allow 0
+    print "\n";
+}
+
+# date last modified MARC field/subfield
+$date_modified_marc = '099d' unless $date_modified_marc;
+my ( $m_field, $m_subfield ) = _read_marc_code($date_modified_marc);
+die "date-modified-marc '$date_modified_marc' is not correct." unless $m_field;
+die
+"When date-created-marc and date-modified-marc are on same field, they should have distinct subfields"
+  if ( $c_field eq $m_field )
+  && ( !defined $c_subfield
+    || !defined $m_subfield
+    || $c_subfield eq $m_subfield );
+if ($verbose) {
+    print "Date last modified on $m_field";
+    print $m_subfield if defined $m_subfield; # use of defined to allow 0
+    print "\n";
+}
+
+my $dbh;
+my $sth_prepared;
 
 sub updateMarc {
-    my $id = shift;
-    my $dbh = C4::Context->dbh;
-    my $field;
+    my $id     = shift;
     my $biblio = GetMarcBiblio($id);
 
-    return unless $biblio;
-
-    if(!$biblio->field('099'))
-    {
-        $field = new MARC::Field('099','','',
-                    'c' => '',
-                    'd'=>'');
-        $biblio->add_fields($field);
+    unless ($biblio) {
+        $debug and warn '[ERROR] GetMarcBiblio did not return any biblio.';
+        return;
     }
 
-    $field = $biblio->field('099');
+    my $c_marc_field = $biblio->field($c_field);
+    my $m_marc_field = $biblio->field($m_field);
 
-    my $sth = $dbh->prepare("SELECT DATE_FORMAT(datecreated,'%Y-%m-%d') as datecreated,
-                                    DATE_FORMAT(timestamp,'%Y-%m-%d') as timestamp,
-                                    frameworkcode
-                                    FROM biblio
-                                    WHERE biblionumber = ?");
-    $sth->execute($id);
-    (my $bibliorow = $sth->fetchrow_hashref);
+    my $c_marc_value;
+    if ($c_marc_field) {
+        $c_marc_value =
+          defined $c_subfield
+          ? $c_marc_field->subfield($c_subfield)
+          : $c_marc_field->data();
+    }
+    $c_marc_value = '' unless defined $c_marc_value;
+
+    my $m_marc_value;
+    if ($m_marc_field) {
+        $m_marc_value =
+          defined $m_subfield
+          ? $m_marc_field->subfield($m_subfield)
+          : $m_marc_field->data();
+    }
+    $m_marc_value ||= '';
+
+    $sth_prepared = $dbh->prepare(
+        q{
+        SELECT
+            DATE_FORMAT(datecreated,'%Y-%m-%d') AS datecreatediso,
+            DATE_FORMAT(timestamp,'%Y-%m-%d') AS datemodifiediso,
+            frameworkcode
+        FROM biblio
+        WHERE biblionumber = ?
+    }
+    ) unless $sth_prepared;
+    $sth_prepared->execute($id);
+    my $bibliorow     = $sth_prepared->fetchrow_hashref;
     my $frameworkcode = $bibliorow->{'frameworkcode'};
+    my $c_db_value    = $bibliorow->{'datecreatediso'} || '';
+    my $m_db_value    = $bibliorow->{'datemodifiediso'} || '';
 
-    $field->update( 'c' => $bibliorow->{'datecreated'},
-                    'd' => $bibliorow->{'timestamp'}
-                    );
+    # do nothing if already sync
+    return if ( $c_marc_value eq $c_db_value && $m_marc_value eq $m_db_value );
 
-     if(&ModBiblio($biblio, $id, $frameworkcode))
-     {
-        print "\r$id";
-     }
+    # do apply to database ?
+    return 1 unless $run;
 
+    # update MARC record
+
+    # date created field
+    if ($c_marc_field) {
+        if ( defined $c_subfield ) {
+            $c_marc_field->update( $c_subfield, $c_db_value );
+        }
+        else {
+            $c_marc_field->update($c_db_value);
+        }
+    }
+    else {
+        $c_marc_field =
+          new MARC::Field( $c_field, '', '', $c_subfield => $c_db_value, );
+        $biblio->add_fields($c_marc_field);
+        $debug and warn "[WARN] $c_field did not exist.";
+
+        # when on same field
+        if ( $m_field eq $c_field ) {
+            $m_marc_field = $c_marc_field;
+        }
+    }
+
+    # date last modified field
+    if ($m_marc_field) {
+        if ( defined $m_subfield ) {
+            $m_marc_field->update( $m_subfield, $m_db_value );
+        }
+        else {
+            $m_marc_field->update($m_db_value);
+        }
+    }
+    else {
+        $m_marc_field =
+          new MARC::Field( $m_field, '', '', $m_subfield => $m_db_value, );
+        $biblio->add_fields($m_marc_field);
+        $debug and warn "[WARN] $m_field did not exist.";
+    }
+
+    # apply to databse
+    if ( &ModBiblio( $biblio, $id, $frameworkcode ) ) {
+        return 1;
+    }
+
+    $debug and warn '[ERROR] ModBiblio failed.';
+    return;
 }
 
 sub process {
 
-    my $dbh = C4::Context->dbh;
+    $dbh = C4::Context->dbh;
+    my $mod_count = 0;
 
-    my $sth = $dbh->prepare("SELECT biblionumber FROM biblio");
+    my $query = q{
+        SELECT biblionumber
+        FROM biblio
+        JOIN biblioitems USING (biblionumber)
+    };
+    $query .= qq{ WHERE $where} if $where;
+    my $sth = $dbh->prepare($query);
     $sth->execute();
 
-    while(my $biblios = $sth->fetchrow_hashref)
-    {
-        updateMarc($biblios->{'biblionumber'});
-        print ".";
+    $verbose and print "Number of concerned biblios: " . $sth->rows . "\n";
+
+    while ( my $biblios = $sth->fetchrow_hashref ) {
+        $verbose and print 'Bib ' . $biblios->{'biblionumber'} . ':';
+        my $ret = updateMarc( $biblios->{'biblionumber'} );
+        if ($ret) {
+            $verbose and print 'modified';
+            $mod_count++;
+        }
+        $verbose and print "\n";
     }
 
+    $verbose and print "Number of modified biblios: " . $mod_count . "\n";
 }
 
-if (lc(C4::Context->preference('marcflavour')) eq "unimarc"){
-process();
-} 
+if ( lc( C4::Context->preference('marcflavour') ) eq "unimarc" ) {
+    $verbose
+      and !$run
+      and print "*** Not in run mode, modifications will not be applyed ***\n";
+
+    $verbose and print "================================\n";
+    process();
+}
 else {
-	print "this script is UNIMARC only and should be used only on unimarc databases\n";
+    print
+"This script is UNIMARC only and should be used only on UNIMARC databases\n";
+}
+
+sub print_usage {
+    print <<_USAGE_;
+Synchronizes date created and date last modified from biblio table to MARC data.
+Does not update biblio if dates are already synchronized.
+UNIMARC specific.
+
+Parameters:
+    --help or -h                show this message
+    --verbose or -v             verbose logging
+    --run                       run the command else modifications will not be applyed to database
+    --where                     (optional) use this to limit execution to some biblios :
+                                write a SQL where clause using biblio and/or biblioitems fields
+    --date-created-marc or c    (optional) date created MARC field and optional subfield,
+                                099c by default
+    --date-modified-marc or m   (optional) date last modified MARC field and optional subfield,
+                                099d by default
+_USAGE_
 }
-- 
1.7.9.5


From jcamins at cpbibliography.com  Sat Sep 29 15:31:34 2012
From: jcamins at cpbibliography.com (Jared Camins-Esakov)
Date: Sat, 29 Sep 2012 09:31:34 -0400
Subject: [Koha-patches] [PATCH] Bug 8846: Exploded Terms test sneakily uses
	database
Message-ID: <1348925494-3609-1-git-send-email-jcamins@cpbibliography.com>

Even though there is no need for anything stored in the database for the
test, C4::Templates requires the database. The solution is to mock all
database-using routines.

To test:
1) Stop MySQL
2) Run test
---
 t/SuggestionEngine_ExplodedTerms.t |   56 ++++++++++++++++++++++++++++++++++++
 1 files changed, 56 insertions(+), 0 deletions(-)

diff --git a/t/SuggestionEngine_ExplodedTerms.t b/t/SuggestionEngine_ExplodedTerms.t
index 52683b2..c43b562 100755
--- a/t/SuggestionEngine_ExplodedTerms.t
+++ b/t/SuggestionEngine_ExplodedTerms.t
@@ -3,12 +3,68 @@
 use strict;
 use warnings;
 
+use File::Basename;
+use File::Spec;
 use Test::More;
+use Test::MockModule;
 
 BEGIN {
         use_ok('Koha::SuggestionEngine');
 }
 
+my $langModule = new Test::MockModule('C4::Languages');
+$langModule->mock('regex_lang_subtags', sub {
+    return {
+        'extension' => undef,
+        'script' => undef,
+        'privateuse' => undef,
+        'variant' => undef,
+        'language' => 'en',
+        'region' => undef,
+        'rfc4646_subtag' => 'en'
+    };
+});
+$langModule->mock('getTranslatedLanguages', sub {
+   return [
+       {
+           'sublanguages_loop' => [
+           {
+               'script' => undef,
+               'extension' => undef,
+               'language' => 'en',
+               'region' => undef,
+               'region_description' => undef,
+               'sublanguage_current' => 1,
+               'privateuse' => undef,
+               'variant' => undef,
+               'variant_description' => undef,
+               'script_description' => undef,
+               'rfc4646_subtag' => 'en',
+               'native_description' => 'English',
+               'enabled' => 1
+           },
+           ],
+           'plural' => 1,
+           'language' => 'en',
+           'current' => 1,
+           'native_description' => 'English',
+           'rfc4646_subtag' => 'en',
+           'group_enabled' => 1
+       }
+   ];
+});
+my $tmplModule = new Test::MockModule('C4::Templates');
+$tmplModule->mock('_get_template_file', sub {
+    my ($tmplbase, $interface, $query) = @_;
+    my $opactmpl = File::Spec->rel2abs(dirname(__FILE__) . '/../koha-tmpl/opac-tmpl');
+    return ($opactmpl, 'prog', 'en', "$opactmpl/prog/en/modules/$tmplbase");
+});
+my $contextModule = new Test::MockModule('C4::Context');
+$contextModule->mock('preference', sub {
+    return '';
+});
+
+
 my $suggestor = Koha::SuggestionEngine->new( { plugins => [ 'ExplodedTerms' ] } );
 is(ref($suggestor), 'Koha::SuggestionEngine', 'Created suggestion engine');
 
-- 
1.7.2.5