Bugzilla – Attachment 9589 Details for
Bug 4048
CSS and JS libs must be outside of translated paths
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
follow-up: changes for all .tt and .inc files
0003-Bug-4048-follow-up-changes-for-staff-interface-.tt-a.patch (text/plain), 167.85 KB, created by
Julian Maurice
on 2012-05-15 15:00:26 UTC
(
hide
)
Description:
follow-up: changes for all .tt and .inc files
Filename:
MIME Type:
Creator:
Julian Maurice
Created:
2012-05-15 15:00:26 UTC
Size:
167.85 KB
patch
obsolete
>From 9d8b5587d7cebc1d429d2357746d7ee633ef2509 Mon Sep 17 00:00:00 2001 >From: Julian Maurice <julian.maurice@biblibre.com> >Date: Tue, 15 May 2012 16:57:47 +0200 >Subject: [PATCH 3/3] Bug 4048 follow-up: changes for staff interface .tt and > .inc files > >--- > .../intranet-tmpl/prog/en/includes/calendar.inc | 6 +++--- > .../prog/en/includes/checkouts-table-footer.inc | 2 +- > .../intranet-tmpl/prog/en/includes/file-upload.inc | 2 +- > .../intranet-tmpl/prog/en/includes/greybox.inc | 10 +++++----- > .../intranet-tmpl/prog/en/includes/help-top.inc | 16 ++++++++-------- > .../prog/en/modules/acqui/addorderiso2709.tt | 4 ++-- > .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +- > .../prog/en/modules/acqui/basketgroup.tt | 2 +- > .../prog/en/modules/acqui/basketheader.tt | 2 +- > .../prog/en/modules/acqui/booksellers.tt | 6 +++--- > .../prog/en/modules/acqui/histsearch.tt | 4 ++-- > .../prog/en/modules/acqui/lateorders.tt | 6 +++--- > .../prog/en/modules/acqui/neworderempty.tt | 4 ++-- > .../prog/en/modules/acqui/orderreceive.tt | 2 +- > .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 2 +- > .../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 2 +- > .../prog/en/modules/acqui/uncertainprice.tt | 2 +- > .../prog/en/modules/acqui/z3950_search.tt | 8 ++++---- > .../prog/en/modules/admin/aqbudgetperiods.tt | 4 ++-- > .../prog/en/modules/admin/aqbudgets.tt | 10 +++++----- > .../prog/en/modules/admin/aqcontract.tt | 6 +++--- > .../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 2 +- > .../prog/en/modules/admin/auth_tag_structure.tt | 4 ++-- > .../prog/en/modules/admin/authorised_values.tt | 4 ++-- > .../en/modules/admin/branch_transfer_limits.tt | 6 +++--- > .../prog/en/modules/admin/branches.tt | 8 ++++---- > .../prog/en/modules/admin/categorie.tt | 6 +++--- > .../intranet-tmpl/prog/en/modules/admin/cities.tt | 4 ++-- > .../prog/en/modules/admin/itemtypes.tt | 4 ++-- > .../prog/en/modules/admin/marctagstructure.tt | 4 ++-- > .../prog/en/modules/admin/preferences.tt | 14 +++++++------- > .../prog/en/modules/admin/smart-rules.tt | 10 +++++----- > .../prog/en/modules/admin/systempreferences.tt | 2 +- > .../prog/en/modules/admin/z3950servers.tt | 2 +- > .../prog/en/modules/authorities/authorities.tt | 10 +++++----- > .../prog/en/modules/authorities/detail.tt | 2 +- > .../intranet-tmpl/prog/en/modules/basket/basket.tt | 6 +++--- > .../prog/en/modules/catalogue/advsearch.tt | 4 ++-- > .../prog/en/modules/catalogue/detailprint.tt | 2 +- > .../prog/en/modules/cataloguing/addbiblio.tt | 12 ++++++------ > .../prog/en/modules/cataloguing/additem.tt | 4 ++-- > .../cataloguing/value_builder/marc21_field_006.tt | 2 +- > .../cataloguing/value_builder/marc21_field_008.tt | 2 +- > .../value_builder/unimarc_field_210c_bis.tt | 2 +- > .../prog/en/modules/cataloguing/z3950_search.tt | 4 ++-- > .../prog/en/modules/circ/circulation.tt | 8 ++++---- > .../intranet-tmpl/prog/en/modules/circ/overdue.tt | 4 ++-- > .../prog/en/modules/circ/pendingreserves.tt | 18 +++++++++--------- > .../prog/en/modules/circ/printslip.tt | 2 +- > .../prog/en/modules/circ/reserveratios.tt | 14 +++++++------- > .../prog/en/modules/circ/transferstoreceive.tt | 2 +- > .../prog/en/modules/circ/view_holdsqueue.tt | 2 +- > .../prog/en/modules/circ/waitingreserves.tt | 2 +- > .../intranet-tmpl/prog/en/modules/help/edithelp.tt | 10 +++++----- > .../intranet-tmpl/prog/en/modules/intranet-main.tt | 2 +- > .../prog/en/modules/labels/label-home.tt | 2 +- > .../intranet-tmpl/prog/en/modules/labels/result.tt | 2 +- > .../intranet-tmpl/prog/en/modules/labels/search.tt | 4 ++-- > .../prog/en/modules/labels/spinelabel-print.tt | 2 +- > .../prog/en/modules/members/member-flags.tt | 4 ++-- > .../prog/en/modules/members/memberentrygen.tt | 10 +++++----- > .../prog/en/modules/members/moremember-print.tt | 2 +- > .../prog/en/modules/members/moremember-receipt.tt | 2 +- > .../prog/en/modules/members/moremember.tt | 6 +++--- > .../prog/en/modules/members/notices.tt | 2 +- > .../prog/en/modules/members/printfeercpt.tt | 2 +- > .../prog/en/modules/members/printinvoice.tt | 2 +- > .../prog/en/modules/members/readingrec.tt | 6 +++--- > .../prog/en/modules/members/update-child.tt | 2 +- > .../prog/en/modules/offline_circ/list.tt | 4 ++-- > .../prog/en/modules/offline_circ/process_koc.tt | 2 +- > .../prog/en/modules/patroncards/home.tt | 2 +- > .../prog/en/modules/patroncards/members-search.tt | 2 +- > .../prog/en/modules/reports/acquisitions_stats.tt | 8 ++++---- > .../prog/en/modules/reports/bor_issues_top.tt | 8 ++++---- > .../prog/en/modules/reports/borrowers_out.tt | 2 +- > .../prog/en/modules/reports/borrowers_stats.tt | 4 ++-- > .../prog/en/modules/reports/cat_issues_top.tt | 8 ++++---- > .../prog/en/modules/reports/dictionary.tt | 4 ++-- > .../en/modules/reports/guided_reports_start.tt | 12 ++++++------ > .../prog/en/modules/reports/issues_avg_stats.tt | 8 ++++---- > .../prog/en/modules/reports/issues_stats.tt | 4 ++-- > .../prog/en/modules/reports/itemtypes.tt | 2 +- > .../prog/en/modules/reports/reserves_stats.tt | 20 ++++++++++---------- > .../prog/en/modules/reports/serials_stats.tt | 2 +- > .../prog/en/modules/reports/stats_screen.tt | 4 ++-- > .../prog/en/modules/reserve/request.tt | 6 +++--- > .../prog/en/modules/serials/checkexpiration.tt | 2 +- > .../prog/en/modules/serials/claims.tt | 8 ++++---- > .../prog/en/modules/serials/serials-home.tt | 6 +++--- > .../prog/en/modules/serials/subscription-add.tt | 8 ++++---- > .../prog/en/modules/suggestion/suggestion.tt | 18 +++++++++--------- > .../intranet-tmpl/prog/en/modules/tags/list.tt | 2 +- > .../intranet-tmpl/prog/en/modules/tags/review.tt | 6 +++--- > .../prog/en/modules/test/progressbar.tt | 2 +- > .../prog/en/modules/tools/batchMod-del.tt | 12 ++++++------ > .../prog/en/modules/tools/batchMod-edit.tt | 14 +++++++------- > .../prog/en/modules/tools/batchMod.tt | 2 +- > .../intranet-tmpl/prog/en/modules/tools/export.tt | 12 ++++++------ > .../prog/en/modules/tools/holidays.tt | 4 ++-- > .../prog/en/modules/tools/inventory.tt | 6 +++--- > .../prog/en/modules/tools/koha-news.tt | 10 +++++----- > .../intranet-tmpl/prog/en/modules/tools/letter.tt | 2 +- > .../prog/en/modules/tools/manage-marc-import.tt | 2 +- > .../prog/en/modules/tools/scheduler.tt | 2 +- > .../prog/en/modules/tools/stage-marc-import.tt | 2 +- > .../prog/en/modules/tools/upload-images.tt | 2 +- > .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 4 ++-- > .../prog/en/modules/virtualshelves/shelves.tt | 2 +- > 109 files changed, 282 insertions(+), 282 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc >index d70716c..7ce6c9d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc >@@ -1,5 +1,5 @@ >-<link rel="stylesheet" type="text/css" href="[% themelang %]/lib/calendar/calendar-system.css"/> >-<script type="text/javascript" src="[% themelang %]/lib/calendar/calendar.js"></script> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/calendar/calendar-system.css"/> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/calendar/calendar.js"></script> > <script type="text/javascript"> > // full day names > Calendar._DN = new Array(_("Sunday"),_("Monday"),_("Tuesday"),_("Wednesday"),_("Thursday"),_("Friday"),_("Saturday"),_("Sunday")); >@@ -61,7 +61,7 @@ Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e"; > Calendar._TT["WK"] = _("wk"); > Calendar._TT["TIME"] = _("Time:"); > </script> >-<script type="text/javascript" src="[% themelang %]/lib/calendar/calendar-setup.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/calendar/calendar-setup.js"></script> > <script type="text/javascript"> > //<![CDATA[ > var debug = "[% debug %]"; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc >index 5638710..8a23100 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc >@@ -5,7 +5,7 @@ > <td>[% totalprice %]</td> > <td colspan="2"> > <p>Renewal due date: <input type="text" size="8" id="newduedate" name="newduedate" value="[% newduedate %]" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="newduedate_button" alt="Show Calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="newduedate_button" alt="Show Calendar" /> > <script type="text/javascript"> //<![CDATA[ > //#TODO - ADD syspref (AllowPostDatedCheckouts). > Calendar.setup( >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/file-upload.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/file-upload.inc >index 2fbb9f3..147acce 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/file-upload.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/file-upload.inc >@@ -1,5 +1,5 @@ > <!-- AJAX file upload stuff --> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/ajaxfileupload.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/ajaxfileupload.js"></script> > <script type="text/javascript"> > //<![CDATA[ > var fileUploadProgressTimer = 0; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc >index 24e4eed..2aa5219 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc >@@ -1,7 +1,7 @@ > <script type="text/javascript"> >- var GB_ROOT_DIR = "[% themelang %]/lib/greybox/"; >+ var GB_ROOT_DIR = "[% interface %]/[% theme %]/lib/greybox/"; > </script> >-<script type="text/javascript" src="[% themelang %]/lib/greybox/AJS.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/greybox/AJS_fx.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/greybox/gb_scripts.js"></script> >-<link href="[% themelang %]/lib/greybox/gb_styles.css" rel="stylesheet" type="text/css" /> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/greybox/AJS.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/greybox/AJS_fx.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/greybox/gb_scripts.js"></script> >+<link href="[% interface %]/[% theme %]/lib/greybox/gb_styles.css" rel="stylesheet" type="text/css" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc >index 13ec5cf..c743d41 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc >@@ -2,18 +2,18 @@ > <title>Online Help</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" /> >-<link rel="stylesheet" type="text/css" media="print" href="[% themelang %]/css/print.css" /> >+<link rel="stylesheet" type="text/css" media="print" href="[% interface %]/[% theme %]/css/print.css" /> > [% IF ( intranetstylesheet ) %] > <link rel="stylesheet" type="text/css" href="[% intranetstylesheet %]" /> > [% ELSE %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/staff-global.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/staff-global.css" /> > [% END %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/jquery.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/ui.tabs.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.hotkeys.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/jquery.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/ui.tabs.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.hotkeys.min.js"></script> > <!-- local colors --> > [% IF ( intranetcolorstylesheet ) %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% intranetcolorstylesheet %]" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/[% intranetcolorstylesheet %]" /> > [% END %] > <!-- yui js --> > <script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script> >@@ -22,8 +22,8 @@ > <script type="text/javascript" src="[% yuipath %]/container/container_core-min.js"></script> > <script type="text/javascript" src="[% yuipath %]/menu/menu-min.js"></script> > <!-- koha core js --> >-<script type="text/javascript" src="[% themelang %]/js/staff-global.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/staff-global.js"></script> > >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/help.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/help.css" /> > </head> > <body id="help"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >index 3fdd631..a835053 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -8,8 +8,8 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >-<script type="text/javascript" src="[% themelang %]/js/acq.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script> > <script type="text/JavaScript"> > //<![CDATA[ > $(document).ready(function() { >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 0cf7ff6..280329f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -3,7 +3,7 @@ > <title>Koha › Acquisitions › [% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname|html %] ([% basketno %]) for [% name|html %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% UNLESS ( closedate ) %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >index 572d353..5843e32 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >@@ -1,7 +1,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Basket grouping for [% booksellername |html %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/js/acq.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script> > [% IF ( grouping ) %] > <script type="text/javascript" src="[% yuipath %]/yahoo-dom-event/yahoo-dom-event.js"></script> > <script type="text/javascript" src="[% yuipath %]/animation/animation-min.js"></script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >index 1ac8d96..04b6f59 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >@@ -7,7 +7,7 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/js/acq.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script> > <script type="text/javascript"> > //<![CDATA[ > // to check if the data are correctly entered. >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >index 4077b5d..500e382 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >@@ -7,10 +7,10 @@ > vertical-align: top; > } > </style> >-<link rel="stylesheet" href="[% themelang %]/css/datatables.css" /> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script> >+<link rel="stylesheet" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.dataTables.min.js"></script> > [% INCLUDE 'datatables-strings.inc' %] >-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/datatables.js"></script> > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >index 3249cf7..054b7f6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >@@ -28,12 +28,12 @@ > <li><label for="booksellerinvoicenumber ">Bookseller invoice no: </label> <input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" value="[% booksellerinvoicenumber %]" /></li> > <li><label for="from">From: </label> > <input type="text" size="10" id="from" name="from" value="[% from_placed_on %]" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="openCalendarFrom" style="cursor: pointer;" alt="Show Calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="openCalendarFrom" style="cursor: pointer;" alt="Show Calendar" /> > <div class="hint">[% INCLUDE 'date-format.inc' %]</div> > </li> > <li><label for="to">To: </label> > <input type="text" size="10" id="to" name="to" value="[% to_placed_on %]" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" alt="Show Calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" alt="Show Calendar" /> > <script type="text/javascript"> > // return true if the date is blocked. > function disable_from(date) {var limit = get_Calendar_limit(date,'to' ); return (limit && limit < date);} // true or false >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >index cf54b03..eda1e37 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >@@ -2,7 +2,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Late orders</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > [% INCLUDE 'calendar.inc' %] > <script type="text/javascript"> > //<![CDATA[ >@@ -152,12 +152,12 @@ $(document).ready(function() { > <li><label for="delay">Order date:</label><input size="3" maxlength="3" id="delay" type="text" name="delay" value="[% delay %]" /> days ago</li> > <li><label for="delay">Estimated Delivery date from: </label> > <input type="text" size="10" id="estimateddeliverydatefrom" name="estimateddeliverydatefrom" value="[% estimateddeliverydatefrom %]" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="openCalendarFrom" style="cursor: pointer;" alt="Show Calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="openCalendarFrom" style="cursor: pointer;" alt="Show Calendar" /> > <div class="hint">[% INCLUDE 'date-format.inc' %]</div> > </li> > <li><label for="delay">To: </label> > <input type="text" size="10" id="estimateddeliverydateto" name="estimateddeliverydateto" value="[% estimateddeliverydateto %]" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" alt="Show Calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" alt="Show Calendar" /> > <script type="text/javascript"> > // return true if the date is blocked. > function disable_from(date) {var limit = get_Calendar_limit(date,'estimateddeliverydatefrom'); return (limit && limit < date);} >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 8aec465..a577228 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >@@ -3,9 +3,9 @@ > <title>Koha › Acquisitions › Basket [% basketno %] › [% IF ( ordernumber ) %]Modify order details (line #[% ordernumber %])[% ELSE %]New order[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > >-<script type="text/javascript" src="[% themelang %]/js/acq.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script> > [% INCLUDE 'additem.js.inc' %] >-<script type="text/javascript" src="[% themelang %]/js/additem.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/additem.js"></script> > <script type="text/javascript"> > //<![CDATA[ > actTotal = ""; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >index 97a7223..e45d1c9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >@@ -2,7 +2,7 @@ > <title>Koha › Acquisitions › Receipt summary for : [% name %] [% IF ( invoice ) %]invoice, [% invoice %][% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'additem.js.inc' %] >-<script type="text/javascript" src="[% themelang %]/js/additem.js"> </script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/additem.js"> </script> > <script type="text/javascript"> > //<![CDATA[ > function Check(form) { >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 a5d3e1a..6de654b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -4,7 +4,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'greybox.inc' %] > <script type="text/javascript" src="[% yuipath %]/json/json-min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> > <script type="text/javascript"> > //<![CDATA[ > >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 740d0bb..ffb2060 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >@@ -103,7 +103,7 @@ > </li> --> > <li><label for="datereceived">Shipment date: </label> > <input type="text" id="datereceived" name="datereceived" maxlength="10" size="10" value="[% datereceived_today %]" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="datereceived_button" alt="Show Calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="datereceived_button" alt="Show Calendar" /> > <script language="JavaScript" type="text/javascript"> > Calendar.setup( > { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >index 5717034..1d0ee8a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >@@ -1,7 +1,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Orders with uncertain prices for Vendor [% booksellername %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/js/acq.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script> > <script type="text/javascript"> > //<![CDATA[ > function check(form) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >index dd7144f..9959464 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >@@ -1,13 +1,13 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › [% IF ( opsearch ) %]Order from external source[% ELSE %]Order from external source › Search results[% END %]</title> > [% INCLUDE 'greybox.inc' %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.dataTables.min.js"></script> > [% INCLUDE 'datatables-strings.inc' %] >-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/datatables.js"></script> > >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >index aae5925..efb9ae6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >@@ -2,8 +2,8 @@ > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] > >-<script type="text/javascript" src="[% themelang %]/js/acq.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> > <script type="text/javascript"> > // ################################################################################# > // Javascript >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >index bf778c7..5d4ecb8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >@@ -1,7 +1,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Funds[% IF ( add_form ) %] › [% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name %]'[% END %][% ELSE %]Add fund [% END %][% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/js/acq.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script> > > [% IF ( add_form ) %] > <script type="text/javascript"> >@@ -84,11 +84,11 @@ > //]]> > </script> > [% ELSE %] >-<link href="[% themelang %]/lib/jquery/plugins/treetable/stylesheets/jquery.treeTable.css" rel="stylesheet" type="text/css" /> >+<link href="[% interface %]/[% theme %]/lib/jquery/plugins/treetable/stylesheets/jquery.treeTable.css" rel="stylesheet" type="text/css" /> > >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/treetable/jquery.treeTable.min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.qtip.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/treetable/jquery.treeTable.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.qtip.js"></script> > > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >index 20f06cb..4d3b080 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >@@ -10,7 +10,7 @@ > [% IF ( delete_confirmed ) %]Contract deleted[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >-<script type="text/javascript" src="[% themelang %]/js/acq.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script> > <script type="text/javascript"> > //<![CDATA[ > // to check if the data are correctly entered. >@@ -112,7 +112,7 @@ function Check(ff) { > </li> > <li><label for="contractstartdate" class="required">Start date *</label> > <input type="text" name="contractstartdate" id="contractstartdate" value="[% contractstartdate %]" maxlength="10" size="10"/> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="contractstartdate_button" alt="Show Calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="contractstartdate_button" alt="Show Calendar" /> > <script language="JavaScript" type="text/javascript"> > Calendar.setup( > { >@@ -126,7 +126,7 @@ function Check(ff) { > </li> > <li><label for="contractenddate" class="required">End date *</label> > <input type="text" name="contractenddate" id="contractenddate" value="[% contractenddate %]" maxlength="10" size="10" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="contractenddate_button" alt="Show Calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="contractenddate_button" alt="Show Calendar" /> > <script language="JavaScript" type="text/javascript"> > Calendar.setup( > { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >index d16acfa..fec89c1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >@@ -2,7 +2,7 @@ > <title>Koha › Administration › Budgets › Funds › Planning for [% budget_period_description %] by [% authcat %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >-<script type="text/javascript" src="[% themelang %]/js/acq.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script> > <script type="text/javascript"> > //<![CDATA[ > // --------------------------------------------------------------------- >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >index c26f5b0..23e75ed 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >@@ -4,8 +4,8 @@ > [% IF ( heading_add_tag_p ) %]› [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default framework[% END %] › New tag[% END %] > [% ELSE %]› [% action %][% END %][% END %][% IF ( delete_confirm ) %]› [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default framework[% END %] › Confirm deletion[% END %][% IF ( delete_confirmed ) %]› [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default framework[% END %] › Data deleted[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script> > <script type="text/javascript" id="js">$(document).ready(function() { > $("#table_authtagstructure").tablesorter({ > sortList: [[0,0]], >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >index 0deebe1..ef74736 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >@@ -5,8 +5,8 @@ > [% IF ( delete_confirm ) %] › Confirm deletion[% END %] > [% IF ( else ) %]Authorized values[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script> > <script type="text/javascript" id="js">$(document).ready(function() { > // call the tablesorter plugin > $("#table_authorized_values").tablesorter({ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >index c9bd51c..eb33cd9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >@@ -1,9 +1,9 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Library checkin and transfer policy</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function(){ >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 bedeb8b..03dd7a8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >@@ -11,14 +11,14 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script> >-<script type="text/javascript" src="[% themelang %]/js/tinymce/jscripts/tiny_mce/tiny_mce.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/tinymce/jscripts/tiny_mce/tiny_mce.js"></script> > <script language="javascript" type="text/javascript"> > tinyMCE.init({ > mode : "textareas", > theme : "advanced", >- content_css : "[% themelang %]/css/tinymce.css", >+ content_css : "[% interface %]/[% theme %]/css/tinymce.css", > plugins : "table,save,advhr,advlink,iespell,contextmenu", > theme_advanced_buttons1 : "save,|,bold,italic,|,cut,copy,paste,|,justifyleft,justifycenter,justifyright,justifyfull,|,formatselect,|,link,unlink,anchor,cleanup,help,code,advhr,", > theme_advanced_buttons2 : "tablecontrols,|,bullist,numlist,|,outdent,indent,|,undo,redo,|,removeformat,|,visualaid,|,sub,sup,|,charmap", >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt >index e2425af..8faf718 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt >@@ -4,8 +4,8 @@ > [% IF ( delete_confirm ) %][% IF ( totalgtzero ) %]Cannot delete: category [% categorycode |html %] in use[% ELSE %]Confirm deletion of category '[% categorycode |html %]'[% END %][% END %] > [% IF ( delete_confirmed ) %]Category deleted[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script> > <script type="text/javascript" id="js">$(document).ready(function() { > $("#table_categorie").tablesorter({ > sortList: [[0,0]], >@@ -133,7 +133,7 @@ > <li><label for="enrolmentperiod" style="width:6em;">In months: </label> > <input type="text" name="enrolmentperiod" id="enrolmentperiod" size="3" maxlength="3" value="[% IF ( enrolmentperiod ) %][% enrolmentperiod %][% END %]" /> months</li> > <li><label for="enrolmentperioddate" style="width:6em;">Until date: </label> >- <input type="text" name="enrolmentperioddate" id="enrolmentperioddate" value="[% enrolmentperioddate %]" /> <img src="[% themelang %]/lib/calendar/cal.gif" id="enrolmentperioddate_button" alt="Show Calendar" /> >+ <input type="text" name="enrolmentperioddate" id="enrolmentperioddate" value="[% enrolmentperioddate %]" /> <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="enrolmentperioddate_button" alt="Show Calendar" /> > <script type="text/javascript"> > //<![CDATA[ > Calendar.setup({ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >index 4b5dc0b..8a79f8e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >@@ -1,8 +1,8 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › [% IF ( add_form ) %]Cities › [% IF ( cityid ) %] Modify city[% ELSE %] New city[% END %][% ELSE %][% IF ( delete_confirm ) %]Cities › Confirm deletion of city[% ELSE %] Cities[% END %][% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script> > <script type="text/javascript" id="js">$(document).ready(function() { > $.tablesorter.defaults.widgets = ['zebra']; > $("#table_cities").tablesorter({ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >index 16cd705..47fca01 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >@@ -18,8 +18,8 @@ Data deleted > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script> > <script type="text/javascript" id="js">$(document).ready(function() { > // call the tablesorter plugin > $("#table_item_type").tablesorter({ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >index d0f0132..da0d269 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >@@ -5,8 +5,8 @@ > [% IF ( delete_confirmed ) %]MARC frameworks › Data deleted[% END %] > [% IF ( else ) %]MARC frameworks[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script> > <script type="text/javascript" id="js">$(document).ready(function() { > $("#table_marctagstructure").tablesorter({ > sortList: [[0,0]], >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >index 875b863..5185192 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >@@ -1,11 +1,11 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › System preferences</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/preferences.css" /> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/humanmsg.css" /> >-<script src="[% themelang %]/lib/jquery/plugins/humanmsg.js" type="text/javascript"></script> >-<script src="[% themelang %]/js/ajax.js" type="text/javascript"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/preferences.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/humanmsg.css" /> >+<script src="[% interface %]/[% theme %]/lib/jquery/plugins/humanmsg.js" type="text/javascript"></script> >+<script src="[% interface %]/[% theme %]/js/ajax.js" type="text/javascript"></script> > <script type="text/javascript"> > //<![CDATA[ > // This is here because of its dependence on template variables, everything else should go in js/pages/preferences.js - jpw >@@ -19,8 +19,8 @@ > var MSG_CLICK_TO_COLLAPSE = _("Click to collapse this section"); > //]]> > </script> >-<script src="[% themelang %]/js/pages/preferences.js" type="text/javascript"></script> >-<script src="[% themelang %]/lib/jquery/plugins/jquery.highlight-3.js" type="text/javascript"></script> >+<script src="[% interface %]/[% theme %]/js/pages/preferences.js" type="text/javascript"></script> >+<script src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.highlight-3.js" type="text/javascript"></script> > </head> > <body id="admin_preferences" class="admin"> > [% INCLUDE 'header.inc' %] >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 635051f..a827cec 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 >@@ -13,10 +13,10 @@ $(document).ready(function() { > //]]> > </script> > <!-- Enable Calendar system --> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/lib/calendar/calendar-system.css" /> >-<script type="text/javascript" src="[% themelang %]/lib/calendar/calendar.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/calendar/calendar-en.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/calendar/calendar-setup.js"></script> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/calendar/calendar-system.css" /> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/calendar/calendar.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/calendar/calendar-en.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/calendar/calendar-setup.js"></script> > <!-- End Calendar system additions --> > </head> > <body id="admin_smart-rules" class="admin"> >@@ -163,7 +163,7 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde > </select> > <input type="text" size="10" id="hardduedate" name="hardduedate" value="[% hardduedate %]" /> > [% INCLUDE 'date-format.inc' %] >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="CalendarDueDate" style="cursor: pointer;"/> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="CalendarDueDate" style="cursor: pointer;"/> > <script language="JavaScript" type="text/javascript"> > function refocus(calendar) { > document.getElementById('hardduedate').focus(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >index d9d0a5c..ac63363 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >@@ -242,7 +242,7 @@ > [% IF ( else ) %] > > <div id="toolbar"> >- <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> > <script type="text/javascript"> > //<![CDATA[ > // prepare DOM for YUI Toolbar >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >index 3205e6f..20e8c8e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >@@ -278,7 +278,7 @@ > [% IF ( else ) %] > > <div id="toolbar"> >- <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> > <script type="text/javascript"> > //<![CDATA[ > // prepare DOM for YUI Toolbar >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >index d720b35..df01b33 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >@@ -1,7 +1,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Authorities › [% IF ( authid ) %]Modify authority #[% authid %] ([% authtypetext %])[% ELSE %]Adding authority ([% authtypetext %])[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/yui/plugins/bubbling-min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/yui/plugins/bubbling-min.js"></script> > > <script type="text/javascript"> > //<![CDATA[ >@@ -503,7 +503,7 @@ function searchauthority() { > } > //]]> > </script> >-<link type="text/css" rel="stylesheet" href="[% themelang %]/css/addbiblio.css" /> >+<link type="text/css" rel="stylesheet" href="[% interface %]/[% theme %]/css/addbiblio.css" /> > </head> > <body id="auth_authorities" class="auth"> > <div id="yui-cms-loading"> >@@ -511,7 +511,7 @@ function searchauthority() { > Loading, please wait... > </div> > </div> >-<script type="text/javascript" src="[% themelang %]/lib/yui/plugins/loading-min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/yui/plugins/loading-min.js"></script> > <script type="text/javascript"> > //<![CDATA[ > (function() { >@@ -680,9 +680,9 @@ function searchauthority() { > > [% UNLESS ( subfield_loo.hide_marc ) %] > [% IF ( subfield_loo.fixedfield ) %] >- <img class="buttonUp" style="display:none;" src="[% themelang %]/../img/up.png" onclick="upSubfield('subfield[% subfield_loo.tag %][% subfield_loo.subfield %]')" alt="Move Up" title="Move Up" /> >+ <img class="buttonUp" style="display:none;" src="[% interface %]/[% theme %]/img/up.png" onclick="upSubfield('subfield[% subfield_loo.tag %][% subfield_loo.subfield %]')" alt="Move Up" title="Move Up" /> > [% ELSE %] >- <img class="buttonUp" src="[% themelang %]/../img/up.png" onclick="upSubfield('subfield[% subfield_loo.tag %][% subfield_loo.subfield %]')" alt="Move Up" title="Move Up" /> >+ <img class="buttonUp" src="[% interface %]/[% theme %]/img/up.png" onclick="upSubfield('subfield[% subfield_loo.tag %][% subfield_loo.subfield %]')" alt="Move Up" title="Move Up" /> > [% END %] > <input title="[% subfield_loo.marc_lib_plain %]" > style=" [% IF ( subfield_loo.fixedfield ) %]display:none; [% END %]border:0;" type="text" >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >index 6b36351..40c1096 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >@@ -27,7 +27,7 @@ function Dopop(link) { > //]]> > </script> > [% IF ( displayhierarchy ) %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/hierarchy.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/hierarchy.css" /> > <script type="text/javascript"> > function showParents(mynumber) { > var parents=document.getElementsByName(mynumber+'p') >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >index 2fd8832..bccafc1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >@@ -6,11 +6,11 @@ > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" /> > <meta http-equiv="Content-Language" content="en-us" /> > <style type="text/css"> >- @import url([% themelang %]/css/print.css); >+ @import url([% interface %]/[% theme %]/css/print.css); > </style> > [% ELSE %][% INCLUDE 'doc-head-close.inc' %] >- <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >- <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> > <script type="text/javascript"> > //<![CDATA[ > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >index 2ea2737..5ea2fb1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >@@ -37,7 +37,7 @@ > <fieldset> > <legend>Select local databases</legend> > [% FOREACH local_servers_loo IN local_servers_loop %] >-[% IF ( local_servers_loo.checked ) %]<input type="checkbox" id="[% local_servers_loo.id %]" name="[% local_servers_loo.name %]" checked="checked" value="[% local_servers_loo.value %]" />[% ELSE %]<input type="checkbox" id="[% local_servers_loo.id %]" name="[% local_servers_loo.name %]" value="[% local_servers_loo.value %]" />[% END %]<label for="[% local_servers_loo.id %]"><img width="16" height="16" alt="[% local_servers_loo.id %]" src="[% themelang %]/img/[% local_servers_loo.icon %]" /> [% local_servers_loo.label %]</label>[% END %] >+[% IF ( local_servers_loo.checked ) %]<input type="checkbox" id="[% local_servers_loo.id %]" name="[% local_servers_loo.name %]" checked="checked" value="[% local_servers_loo.value %]" />[% ELSE %]<input type="checkbox" id="[% local_servers_loo.id %]" name="[% local_servers_loo.name %]" value="[% local_servers_loo.value %]" />[% END %]<label for="[% local_servers_loo.id %]"><img width="16" height="16" alt="[% local_servers_loo.id %]" src="[% interface %]/[% theme %]/img/[% local_servers_loo.icon %]" /> [% local_servers_loo.label %]</label>[% END %] > </fieldset> > <!-- /DATABASES --> > [% END %] >@@ -48,7 +48,7 @@ > <legend>Select remote databases</legend> > [% FOREACH outer_servers_loo IN outer_servers_loop %] > [% IF ( outer_servers_loo.checked ) %]<input type="checkbox" id="[% outer_servers_loo.id %]" name="[% outer_servers_loo.name %]" checked="checked" value="[% outer_servers_loo.value %]" />[% ELSE %]<input type="checkbox" id="[% outer_servers_loo.id %]" name="[% outer_servers_loo.name %]" value="[% outer_servers_loo.value %]" />[% END %] >-<label for="[% outer_servers_loo.id %]"><img alt="[% outer_servers_loo.id %]" src="[% themelang %]/images/[% outer_servers_loo.icon %]" />[% outer_servers_loo.label %]</label> >+<label for="[% outer_servers_loo.id %]"><img alt="[% outer_servers_loo.id %]" src="[% interface %]/[% theme %]/images/[% outer_servers_loo.icon %]" />[% outer_servers_loo.label %]</label> > [% END %] > </fieldset> > <!-- /REMOTE DATABASES --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detailprint.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detailprint.tt >index 3f4312a..30caf02 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detailprint.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detailprint.tt >@@ -1,7 +1,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Catalog › Details for [% title |html %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" href="[% themelang %]/css/print.css" type="text/css" /> >+<link rel="stylesheet" href="[% interface %]/[% theme %]/css/print.css" type="text/css" /> > </head> > > <body id="catalog_detailprint" class="catalog"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >index da22e93..91237a6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >@@ -1,8 +1,8 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Cataloging › [% IF ( biblionumber ) %]Editing [% title |html %] (Record number [% biblionumber %])[% ELSE %]Add MARC record[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/yui/plugins/bubbling-min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.fixFloat.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/yui/plugins/bubbling-min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.fixFloat.js"></script> > <script type="text/javascript"> > //<![CDATA[ > >@@ -637,7 +637,7 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ? > } > //]]> > </script> >-<link type="text/css" rel="stylesheet" href="[% themelang %]/css/addbiblio.css" /> >+<link type="text/css" rel="stylesheet" href="[% interface %]/[% theme %]/css/addbiblio.css" /> > </head> > <body id="cat_addbiblio" class="cat"> > <div id="yui-cms-loading"> >@@ -645,7 +645,7 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ? > Loading, please wait... > </div> > </div> >-<script type="text/javascript" src="[% themelang %]/lib/yui/plugins/loading-min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/yui/plugins/loading-min.js"></script> > <script type="text/javascript"> > //<![CDATA[ > (function() { >@@ -870,9 +870,9 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ? > > [% UNLESS hide_marc %] > <span class="subfieldcode">[% IF ( subfield_loo.fixedfield ) %] >- <img class="buttonUp" style="display:none;" src="[% themelang %]/../img/up.png" onclick="upSubfield('subfield[% subfield_loo.tag %][% subfield_loo.subfield %][% subfield_loo.random %]')" alt="Move Up" title="Move Up" /> >+ <img class="buttonUp" style="display:none;" src="[% interface %]/[% theme %]/img/up.png" onclick="upSubfield('subfield[% subfield_loo.tag %][% subfield_loo.subfield %][% subfield_loo.random %]')" alt="Move Up" title="Move Up" /> > [% ELSE %] >- <img class="buttonUp" src="[% themelang %]/../img/up.png" onclick="upSubfield('subfield[% subfield_loo.tag %][% subfield_loo.subfield %][% subfield_loo.random %]')" alt="Move Up" title="Move Up" /> >+ <img class="buttonUp" src="[% interface %]/[% theme %]/img/up.png" onclick="upSubfield('subfield[% subfield_loo.tag %][% subfield_loo.subfield %][% subfield_loo.random %]')" alt="Move Up" title="Move Up" /> > [% END %] > <input title="[% subfield_loo.marc_lib_plain %]" style=" [% IF ( subfield_loo.fixedfield ) %]display:none; [% END %]border:0;" type="text" tabindex="0" name="tag_[% subfield_loo.tag %]_code_[% subfield_loo.subfield %]_[% subfield_loo.index %]_[% subfield_loo.index_subfield %]" value="[% subfield_loo.subfield %]" size="1" maxlength="1" class="flat" /> > </span> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >index eabf5a8..e2dad7f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >@@ -25,7 +25,7 @@ function active(numlayer) > if (numlayer==i) { > document.getElementById(ong).style.visibility="visible"; > document.getElementById(link).style.backgroundColor="#11AA11"; >- document.getElementById(link).style.backgroundImage="url([% themelang %]/images/background-mem.gif)"; >+ document.getElementById(link).style.backgroundImage="url([% interface %]/[% theme %]/images/background-mem.gif)"; > } else { > document.getElementById(ong).style.visibility="hidden"; > document.getElementById(link).style.backgroundColor="#FFFFFF"; >@@ -159,7 +159,7 @@ $(document).ready(function() { > }); > //]]> > </script> >-<link type="text/css" rel="stylesheet" href="[% themelang %]/css/addbiblio.css" /> >+<link type="text/css" rel="stylesheet" href="[% interface %]/[% theme %]/css/addbiblio.css" /> > </head> > <body id="cat_additem" class="cat"> > [% INCLUDE 'header.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt >index 2824577..8bb0166 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt >@@ -2,7 +2,7 @@ > <title>Koha › Cataloging › 006 builder</title> > [% INCLUDE 'doc-head-close.inc' %] > >-<script type="text/javascript" src='[% themelang %]/js/xmlControlfield.js'></script> >+<script type="text/javascript" src='[% interface %]/[% theme %]/js/xmlControlfield.js'></script> > <script type="text/javascript"> > var objXmlControlField; > var tr_result; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt >index b292991..04d43e2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt >@@ -2,7 +2,7 @@ > <title>Koha › Cataloging › 008 builder</title> > [% INCLUDE 'doc-head-close.inc' %] > >-<script type="text/javascript" src='[% themelang %]/js/xmlControlfield.js'></script> >+<script type="text/javascript" src='[% interface %]/[% theme %]/js/xmlControlfield.js'></script> > <script type="text/javascript"> > var objXmlControlField; > var tr_result; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c_bis.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c_bis.tt >index 1eedf4c..bc521ad 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c_bis.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c_bis.tt >@@ -7,7 +7,7 @@ > <script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script> > <script type="text/javascript" src="[% yuipath %]/datasource/datasource.js"></script> > <script type="text/javascript" src="[% yuipath %]/autocomplete/autocomplete-min.js"></script> >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/staff-global.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/staff-global.css" /> > > </head> > <body id="cat_unimarc_field_210c_bis" class="cat"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >index 3db24d3..d1f49c5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >@@ -2,8 +2,8 @@ > <title>Koha › Z39.50 search results</title> > [% INCLUDE 'greybox.inc' %] > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> > <script type="text/javascript"> > //<![CDATA[ > function Import(GetThisOne,biblionumber) { >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 fa92507..c734ca9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -1,8 +1,8 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation [% IF ( borrowernumber ) %] › Checking out to [% INCLUDE 'patron-title.inc' %] [% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-[% IF ( UseTablesortForCirc ) %]<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>[% END %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+[% IF ( UseTablesortForCirc ) %]<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>[% END %] >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > <script type="text/javascript"> > //<![CDATA[ > [% IF ( borrowernumber ) %]if($.cookie("holdfor") != [% borrowernumber %]){ $.cookie("holdfor",null, { path: "/", expires: 0 }); }[% ELSE %]$.cookie("holdfor",null, { path: "/", expires: 0 });[% END %] >@@ -483,7 +483,7 @@ No patron matched <span class="ex">[% message %]</span> > <div class="hint">Specify due date [% INCLUDE 'date-format.inc' %]: </div> > [% IF ( duedatespec ) %]<input type="text" size="10" id="duedatespec" name="duedatespec" value="[% duedatespec %]" />[% ELSE %]<input type="text" size="10" id="duedatespec" name="duedatespec" value="" /> > [% END %] >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="CalendarDueDate" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="CalendarDueDate" style="cursor: pointer;" /> > <script language="JavaScript" type="text/javascript"> > //<![CDATA[ > function validate1(date) { >@@ -998,7 +998,7 @@ No patron matched <span class="ex">[% message %]</span> > [% IF AutoResumeSuspendedHolds %] > <label for="suspend_until">until</label> > <input type="text" size="10" id="suspend_until" name="suspend_until"/> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="CalendarSuspendUntil" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="CalendarSuspendUntil" style="cursor: pointer;" /> > <span class="hint">Specify date on which to resume [% INCLUDE 'date-format.inc' %]: </span> > > <script language="JavaScript" type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >index 4440d49..5683c2a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >@@ -144,7 +144,7 @@ > <ol> > <li><label for="dateduefrom">From:</label> > <input type="text" id="dateduefrom" name="dateduefrom" size="10" value="[% dateduefrom %]" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="dateduefrom_button" alt="Show calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="dateduefrom_button" alt="Show calendar" /> > <script language="JavaScript" type="text/javascript"> > Calendar.setup( > { >@@ -158,7 +158,7 @@ > <li> > <label for="datedueto">To:</label> > <input type="text" id="datedueto" name="datedueto" size="10" value="[% datedueto %]" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="datedueto_button" alt="Show calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="datedueto_button" alt="Show calendar" /> > <script language="JavaScript" type="text/javascript"> > Calendar.setup( > { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >index c79a231..67b46ce 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >@@ -2,15 +2,15 @@ > <title>Koha › Circulation › Holds to pull</title> > [% INCLUDE 'doc-head-close.inc' %] > <!-- Additions to enable Calendar system --> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/lib/calendar/calendar-system.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/calendar/calendar-system.css" /> > <!-- End of additions --><!-- Additions to enable Calendar system --> >-<script type="text/javascript" src="[% themelang %]/lib/calendar/calendar.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/calendar/calendar-en.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/calendar/calendar-setup.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/calendar/calendar.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/calendar/calendar-en.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/calendar/calendar-setup.js"></script> > <!-- Plugin datatables --> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script> >-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.dataTables.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/datatables.js"></script> > <script type="text/JavaScript" language="JavaScript"> > //<![CDATA[ > $(document).ready(function() { >@@ -151,7 +151,7 @@ $(document).ready(function() { > Start date: > </label> > <input type="text" size="10" id="from" name="from" value="[% from %]" /> >-<img src="[% themelang %]/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" alt="" /> >+<img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" alt="" /> > <script language="JavaScript" type="text/javascript"> > function validate1(date) { > var day = date.getDate(); >@@ -182,7 +182,7 @@ Calendar.setup( > End date: > </label> > <input size="10" id="to" name="to" value="[% to %]" type="text" /> >-<img src="[% themelang %]/lib/calendar/cal.gif" alt="" id="openCalendarTo" style="cursor: pointer;" border="0" /> >+<img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="" id="openCalendarTo" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > function validate2(date) { > var day = date.getDate(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >index 3e60d73..5b43ce0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >@@ -2,7 +2,7 @@ > <title>[% title %]</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" /> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/print.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/print.css" /> > [% IF stylesheet %] > <link rel="stylesheet" type="text/css" href="[% stylesheet %]" /> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >index ddecef5..59bd122 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >@@ -2,13 +2,13 @@ > <title>Koha › Circulation › Hold ratios</title> > [% INCLUDE 'doc-head-close.inc' %] > <!-- Additions to enable Calendar system --> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/lib/calendar/calendar-system.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/calendar/calendar-system.css" /> > <!-- End of additions --><!-- Additions to enable Calendar system --> >-<script type="text/javascript" src="[% themelang %]/lib/calendar/calendar.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/calendar/calendar-en.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/calendar/calendar-setup.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/calendar/calendar.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/calendar/calendar-en.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/calendar/calendar-setup.js"></script> > <!-- End of additions --> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> > <script type="text/javascript"> > //<![CDATA[ > $.tablesorter.addParser({ >@@ -118,7 +118,7 @@ $.tablesorter.addParser({ > Start date: > </label> > <input type="text" size="10" id="from" name="from" value="[% from %]" /> >-<img src="[% themelang %]/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" alt="" /> >+<img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" alt="" /> > <script language="JavaScript" type="text/javascript"> > function validate1(date) { > var day = date.getDate(); >@@ -149,7 +149,7 @@ Calendar.setup( > End date: > </label> > <input size="10" id="to" name="to" value="[% to %]" type="text" /> >-<img src="[% themelang %]/lib/calendar/cal.gif" alt="" id="openCalendarTo" style="cursor: pointer;" border="0" /> >+<img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="" id="openCalendarTo" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > function validate2(date) { > var day = date.getDate(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >index dec516d..5feea07 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >@@ -1,7 +1,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Transfers to your library</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> > <script type="text/javascript" language="JavaScript"> > //<![CDATA[ > $.tablesorter.addParser({ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >index d8d8536..2923a13 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >@@ -7,7 +7,7 @@ > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] > >-<script type="text/javascript" src="[% ( themelang ) %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> > <script type="text/javascript">//<![CDATA[ > $(document).ready(function() { > $("#holdst").tablesorter({ >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 f4b4d4c..b23d5f8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >@@ -1,7 +1,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Holds awaiting pickup</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> > <script type="text/javascript" language="JavaScript"> > //<![CDATA[ > $.tablesorter.addParser({ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt >index 9226c8a..99cda53 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt >@@ -1,11 +1,11 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Online help</title> >-<script language="javascript" type="text/javascript" src="[% themelang %]/js/tinymce/jscripts/tiny_mce/tiny_mce.js"></script> >+<script language="javascript" type="text/javascript" src="[% interface %]/[% theme %]/js/tinymce/jscripts/tiny_mce/tiny_mce.js"></script> > <script language="javascript" type="text/javascript"> > tinyMCE.init({ > mode : "textareas", > theme : "advanced", >- content_css : "[% themelang %]/css/tinymce.css", >+ content_css : "[% interface %]/[% theme %]/css/tinymce.css", > plugins : "table,save,advhr,advlink,iespell,searchreplace,print,contextmenu", > theme_advanced_disable : "underline,strikethrough,styleselect,image", > theme_advanced_buttons1_add_before : "save,|", >@@ -23,12 +23,12 @@ tinyMCE.init({ > [% IF ( intranetstylesheet ) %] > <link rel="stylesheet" type="text/css" href="[% intranetstylesheet %]" /> > [% ELSE %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/staff-global.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/staff-global.css" /> > [% END %] > [% IF ( intranetcolorstylesheet ) %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% intranetcolorstylesheet %]" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/[% intranetcolorstylesheet %]" /> > [% END %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/help.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/help.css" /> > </head> > <body id="help"> > <h1>Online Help</h1> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >index 0e9aed6..c8847b7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >@@ -1,6 +1,6 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha staff client</title> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/mainpage.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/mainpage.css" /> > [% INCLUDE 'doc-head-close.inc' %] > <style type="text/css"> </style> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt >index 22f5dc4..469c497 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt >@@ -1,7 +1,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Labels home</title> > [% INCLUDE 'doc-head-close.inc' %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/label.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/label.css" /> > </head> > <body id="labels_label-home" class="tools labels"> > [% INCLUDE 'header.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >index 65837ef..526385a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >@@ -2,7 +2,7 @@ > <title>Koha › Barcodes and labels › Search results</title> > [% INCLUDE 'doc-head-close.inc' %] > <style type="text/css">#custom-doc { width:46.23em;*width:45.04em;min-width:700px; margin:auto;margin-top: .4em; text-align:left; }</style> >- <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt >index 3928edb..6c6630a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt >@@ -92,7 +92,7 @@ to add to Batch [% batch_id %] > <li> > <label for="datefrom">Added on or after date</label> > <input type="text" size="10" id="datefrom" name="datefrom" value="" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" border="0" id="openCalendarFrom" alt="Show Calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" border="0" id="openCalendarFrom" alt="Show Calendar" /> > <script type="text/javascript"> > Calendar.setup({ > inputField : "datefrom", >@@ -107,7 +107,7 @@ to add to Batch [% batch_id %] > <li> > <label for="dateto">Added on or before date</label> > <input type="text" size="10" id="dateto" name="dateto" value="" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" border="0" id="openCalendarTo" alt="Show Calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" border="0" id="openCalendarTo" alt="Show Calendar" /> > > <script type="text/javascript"> > Calendar.setup({ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt >index ab51f9f..457b5b8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt >@@ -8,7 +8,7 @@ > <head> > <title>Koha › Tools › Spine labels</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/spinelabel.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/spinelabel.css" /> > > <style type="text/css"> > @media print { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt >index aa1eebd..49e15c5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt >@@ -1,8 +1,8 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Patrons › Set privileges for [% surname %], [% firstname %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/treeview/jquery.treeview.css"/> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.treeview.pack.js"></script> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/treeview/jquery.treeview.css"/> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.treeview.pack.js"></script> > <!-- set up tree --> > <script type="text/javascript"> > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >index 0cb2877..40d5090 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -93,7 +93,7 @@ > var MSG_PASSWORD_MISMATCH = _("The passwords entered do not match"); > //]]> > </script> >-<script type="text/javascript" src="[% themelang %]/js/members.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/members.js"></script> > </head> > <body id="pat_memberentrygen" class="pat"> > [% INCLUDE 'header.inc' %] >@@ -295,7 +295,7 @@ > <input type="text" id="dateofbirth" name="dateofbirth" size="20" value="[% IF ( opduplicate ) %][% ELSE %][% dateofbirth %][% END %]" /> > [% END %] > >- <img src="[% themelang %]/lib/calendar/cal.gif" id="dateofbirth_button" alt="Show Calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="dateofbirth_button" alt="Show Calendar" /> > <script language="JavaScript" type="text/javascript"> > Calendar.setup( > { >@@ -1106,7 +1106,7 @@ > [% ELSE %] > <input type="text" id="dateenrolled" name="dateenrolled" maxlength="10" size="10" value="[% dateenrolled %]" /> > [% END %] >- <img src="[% themelang %]/lib/calendar/cal.gif" id="dateenrolled_button" alt="Show Calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="dateenrolled_button" alt="Show Calendar" /> > <script language="JavaScript" type="text/javascript"> > Calendar.setup( > { >@@ -1142,7 +1142,7 @@ > <input type="text" id="dateexpiry" name="dateexpiry" maxlength="10" size="10" /> > [% END %] > [% END %] >- <img src="[% themelang %]/lib/calendar/cal.gif" id="dateexpiry_button" alt="Show Calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="dateexpiry_button" alt="Show Calendar" /> > <script language="JavaScript" type="text/javascript"> > Calendar.setup( > { >@@ -1352,7 +1352,7 @@ > [% ELSE %] > <input type="text" name="datedebarred" id="datedebarred" class="debarred" value="[% datedebarred %]" /> > [% END %] >- <img src="[% themelang %]/lib/calendar/cal.gif" id="debarred_button" alt="Show Calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="debarred_button" alt="Show Calendar" /> > <script language="JavaScript" type="text/javascript"> > Calendar.setup( > { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >index d3e5b49..7da9953 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >@@ -2,7 +2,7 @@ > <title>Summary for [% firstname %] [% surname %] ([% cardnumber %])</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" /> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/print.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/print.css" /> > <script language="javascript"> > function printThenClose() { > window.print(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt >index 512f6d9..05138c5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt >@@ -2,7 +2,7 @@ > <title>Print Receipt for [% cardnumber %]</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" /> >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/print.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/print.css" /> > > <script language="javascript"> > function printThenClose() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >index 326de06..6872a6d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -8,8 +8,8 @@ > </title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > <script type="text/JavaScript" language="JavaScript"> > //<![CDATA[ > $.tablesorter.addParser({ >@@ -654,7 +654,7 @@ function validate1(date) { > [% IF AutoResumeSuspendedHolds %] > <label for="suspend_until">until</label> > <input type="text" size="10" id="suspend_until" name="suspend_until"/> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="CalendarSuspendUntil" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="CalendarSuspendUntil" style="cursor: pointer;" /> > <span class="hint">Specify date on which to resume [% INCLUDE 'date-format.inc' %]: </span> > > <script language="JavaScript" type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >index bd345b8..969a384 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >@@ -1,7 +1,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Sent notices for [% INCLUDE 'patron-title.inc' %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> > <script type="text/javascript" language="javascript"> > //<![CDATA[ > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt >index 3444bbf..99a5154 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt >@@ -2,7 +2,7 @@ > <title>Print Receipt for [% cardnumber %]</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" /> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/printreceiptinvoice.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/printreceiptinvoice.css" /> > <script language="javascript"> > function printThenClose() { > window.print(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt >index 627d466..371271b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt >@@ -2,7 +2,7 @@ > <title>Print Receipt for [% cardnumber %]</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" /> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/printreceiptinvoice.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/printreceiptinvoice.css" /> > <script language="javascript"> > function printThenClose() { > window.print(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >index f90d7a8..7501ff6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >@@ -1,10 +1,10 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Circulation History for [% INCLUDE 'patron-title.inc' %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="/intranet-tmpl/prog/en/css/datatables.css" /> >-<script type="text/javascript" src="/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js"></script> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.dataTables.min.js"></script> > [% INCLUDE 'datatables-strings.inc' %] >-<script type="text/javascript" src="/intranet-tmpl/prog/en/js/datatables.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/datatables.js"></script> > <script type="text/javascript" id="js">$(document).ready(function() { > $(document).ready(function() { > $("#table_readingrec").dataTable($.extend(true, {}, dataTablesDefaults, { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt >index 8413468..a9e4aef 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt >@@ -1,7 +1,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Choose Adult category</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> > <script type="text/javascript"> > $(document).ready(function() { > $.tablesorter.defaults.widgets = ['zebra']; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt >index d22cf5f..27ae37e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt >@@ -1,8 +1,8 @@ > [% INCLUDE "doc-head-open.inc" %] > <title>Koha › Circulation › Offline circulation</title> > [% INCLUDE "doc-head-close.inc" %] >- <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >- <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > <script type="text/javascript" language="javascript"> > //<![CDATA[ > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >index b818039..a848cb0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >@@ -2,7 +2,7 @@ > <title>Koha › Circulation › Offline circulation file upload</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'file-upload.inc' %] >-<script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar.js"></script> > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt >index 1862c8e..cbde8d5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt >@@ -1,7 +1,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Patron card creator</title> > [% INCLUDE 'doc-head-close.inc' %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/card.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/card.css" /> > </head> > <body id="pcard_home" class="tools pcard"> > [% INCLUDE 'header.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt >index f34c2bd..29d46dd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt >@@ -4,7 +4,7 @@ > <style type="text/css"> > #custom-doc { width:47.23em;*width:46.04em;min-width:600px; margin:auto; text-align:left; } > </style> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt >index 79d289a..22563c6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt >@@ -79,7 +79,7 @@ > <td><input type="radio" name="Line" value="aqbasket.closedate" /></td> > <td><input type="radio" checked="checked" name="Column" value="aqbasket.closedate" /> </td> > <td> From <input type="text" size="10" id="from" name="Filter" value="" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" /> > <script type="text/javascript"> > //<![CDATA[ > function validate1(date) { >@@ -111,7 +111,7 @@ > </script> > <span class="hint">[% INCLUDE 'date-format.inc' %]</span> > To <input size="10" id="to" name="Filter" type="text" value="" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > //<![CDATA[ > function validate2(date) { >@@ -161,7 +161,7 @@ > <td><input type="radio" name="Line" value="aqorders.datereceived" /></td> > <td><input type="radio" name="Column" value="aqorders.datereceived" /></td> > <td> From <input type="text" size="10" id="fromRO" name="Filter" value="" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFromRO" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFromRO" style="cursor: pointer;" /> > <script type="text/javascript"> > //<![CDATA[ > function validate1(date) { >@@ -193,7 +193,7 @@ > </script> > <span class="hint">[% INCLUDE 'date-format.inc' %]</span> > To <input type="text" size="10" id="toRO" name="Filter" value="" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarToRO" style="cursor: pointer;" border="0" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarToRO" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > //<![CDATA[ > function validate2(date) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt >index ab4cd65..c1598c9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt >@@ -68,7 +68,7 @@ function Dopop(link) { > <form method="post" action="/cgi-bin/koha/reports/bor_issues_top.pl"> > <fieldset class="rows"> > <ol><li><label for="from">Checkout date from:</label> <input type="text" readonly="readonly" size="10" id="from" name="Filter" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" /> > <script language="JavaScript" type="text/javascript"> > function validate1(date) { > var day = date.getDate(); >@@ -97,7 +97,7 @@ function Dopop(link) { > ); > </script> > <label class="inline" for="to">To: </label> <input readonly="readonly" size="10" id="to" name="Filter" value="" type="text" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > function validate2(date) { > var day = date.getDate(); >@@ -126,7 +126,7 @@ function Dopop(link) { > ); > </script><span class="hint">[% INCLUDE 'date-format.inc' %]</span></li> > <li> <label for="fromRO">Check-in date from:</label> <input type="text" readonly="readonly" size="10" id="fromRO" name="Filter" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" border="0" id="openCalendarFromRO" style="cursor: pointer;" alt="Show Calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" border="0" id="openCalendarFromRO" style="cursor: pointer;" alt="Show Calendar" /> > <script language="JavaScript" type="text/javascript"> > function validate1(date) { > var day = date.getDate(); >@@ -155,7 +155,7 @@ function Dopop(link) { > ); > </script> > <label class="inline" for="toRO">To: </label> <input type="text" readonly="readonly" size="10" id="toRO" name="Filter" value="" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="openCalendarToRO" style="cursor: pointer;" alt="Show Calendar" border="0" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="openCalendarToRO" style="cursor: pointer;" alt="Show Calendar" border="0" /> > <script type="text/javascript"> > function validate2(date) { > var day = date.getDate(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt >index 682e6e5..278adfa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt >@@ -59,7 +59,7 @@ > </select> > </li> > <li><label for="to">Not checked out since: </label> <input size="10" id="to" name="Filter" value="" type="text" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > Calendar.setup( > { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt >index 701b24c..d1d79dc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt >@@ -151,7 +151,7 @@ > <td>Date of birth</td> > <td colspan="2"></td> > <td><label for="from">From</label> <input type="text" size="10" id="from" name="Filter" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" /> > <script type="text/javascript"> > //<![CDATA[ > function validate1(date) { >@@ -179,7 +179,7 @@ > //]]> > </script> > <label for="to">To</label> <input size="10" id="to" name="Filter" value="" type="text" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > //<![CDATA[ > function validate2(date) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt >index 4104fab..2bc43f6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt >@@ -77,7 +77,7 @@ function Dopop(link) { > <fieldset class="rows"> > <ol> > <li><label for="from">Checkout date from: </label> <input type="text" readonly="readonly" size="10" id="from" name="Filter" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" /> > <script language="JavaScript" type="text/javascript"> > function validate1(date) { > var day = date.getDate(); >@@ -106,7 +106,7 @@ function Dopop(link) { > ); > </script> > <label for="to" class="inline">To:</label> <input readonly="readonly" size="10" id="to" name="Filter" value="" type="text" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > function validate2(date) { > var day = date.getDate(); >@@ -135,7 +135,7 @@ function Dopop(link) { > ); > </script> <span class="hint">[% INCLUDE 'date-format.inc' %]</span></li> > <li><label for="fromRO">Check-in date from</label> <input type="text" readonly="readonly" size="10" id="fromRO" name="Filter" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFromRO" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFromRO" style="cursor: pointer;" /> > <script language="JavaScript" type="text/javascript"> > function validate1(date) { > var day = date.getDate(); >@@ -164,7 +164,7 @@ function Dopop(link) { > ); > </script> > <label for="toRO" class="inline">To: </label> <input type="text" readonly="readonly" size="10" id="toRO" name="Filter" value="" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarToRO" style="cursor: pointer;" border="0" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarToRO" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > function validate2(date) { > var day = date.getDate(); >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 3f913d4..9c5afcb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt >@@ -185,7 +185,7 @@ > <tr> > <td>Start of date range</td> > <td><input type="text" size="10" id="[% column.name %]_start_value" name="[% column.name %]_start_value" value="" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="buttonfrom1" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="buttonfrom1" style="cursor: pointer;" /> > <script type="text/javascript"> > Calendar.setup({ > inputField : "[% column.name %]_start_value", >@@ -201,7 +201,7 @@ > <td>End of date range</td> > <td> > <input type="text" size="10" id="[% column.name %]_end_value" name="[% column.name %]_end_value" value="" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="buttonfrom2" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="buttonfrom2" style="cursor: pointer;" /> > <script type="text/javascript"> > Calendar.setup({ > inputField : "[% column.name %]_end_value", >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 f6ebbfe..967e4ee 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 >@@ -19,8 +19,8 @@ > <style type="text/css"> > #sql { width: 90%; height: 9em;} > </style> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script> > > <script type="text/javascript"> > //<![CDATA[ >@@ -348,7 +348,7 @@ canned reports and writing custom SQL reports.</p> > [% IF ( criteri.date ) %] > <td> > <input type="text" size="10" id="[% criteri.name %]_value" name="[% criteri.name %]_value" value="" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="buttonfrom[% criteri.name %]" style="cursor: pointer;" alt="Show calendar" title="Show calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="buttonfrom[% criteri.name %]" style="cursor: pointer;" alt="Show calendar" title="Show calendar" /> > <script type="text/javascript"> > Calendar.setup({ > inputField : "[% criteri.name %]_value", >@@ -371,7 +371,7 @@ canned reports and writing custom SQL reports.</p> > [% IF ( criteri.daterange ) %] > <td>from > <input type="text" size="10" id="from_[% criteri.name %]_value" name="from_[% criteri.name %]_value" value="" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="buttonfromfrom_[% criteri.name %]" style="cursor: pointer;" alt="Show calendar" title="Show calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="buttonfromfrom_[% criteri.name %]" style="cursor: pointer;" alt="Show calendar" title="Show calendar" /> > <script type="text/javascript"> > Calendar.setup({ > inputField : "from_[% criteri.name %]_value", >@@ -382,7 +382,7 @@ canned reports and writing custom SQL reports.</p> > </script> > to > <input type="text" size="10" id="to_[% criteri.name %]_value" name="to_[% criteri.name %]_value" value="" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="buttonfromto_[% criteri.name %]" style="cursor: pointer;" alt="Show calendar" title="Show calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="buttonfromto_[% criteri.name %]" style="cursor: pointer;" alt="Show calendar" title="Show calendar" /> > <script type="text/javascript"> > Calendar.setup({ > inputField : "to_[% criteri.name %]_value", >@@ -752,7 +752,7 @@ Sub report:<select name="subreport"> > <h3>Filter</h3> > <ol> > <li><label for="filter_date">Date: >- <img src="[% themelang %]/lib/calendar/cal.gif" id="datedueto_button" alt="Show calendar" /></label> <input type="text" id="filter_date" name="filter_date" size="10" value="[% filter_date %]" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="datedueto_button" alt="Show calendar" /></label> <input type="text" id="filter_date" name="filter_date" size="10" value="[% filter_date %]" /> > <div class="hint">[% INCLUDE 'date-format.inc' %]</div> > <script type="text/javascript"> > Calendar.setup( >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt >index 4e1d324..0f4073f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt >@@ -78,7 +78,7 @@ > <td><input type="radio" name="Line" value="timestamp" /></td> > <td><input type="radio" name="Column" value="timestamp" /></td> > <td > <label for="from">From</label> <input type="text" size="10" id="from" name="Filter" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" /> > <script language="JavaScript" type="text/javascript"> > function validate1(date) { > var day = date.getDate(); >@@ -107,7 +107,7 @@ > ); > </script> > <label for="to">To</label> <input size="10" id="to" name="Filter" value="" type="text" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > function validate2(date) { > var day = date.getDate(); >@@ -154,7 +154,7 @@ > <td><input type="radio" name="Line" value="returndate" /></td> > <td><input type="radio" name="Column" value="returndate" /></td> > <td > <label for="fromRO">From</label> <input type="text" size="10" id="fromRO" name="Filter" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="openCalendarFromRO" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="openCalendarFromRO" style="cursor: pointer;" /> > <script language="JavaScript" type="text/javascript"> > function validate1(date) { > var day = date.getDate(); >@@ -183,7 +183,7 @@ > ); > </script> > <label for="toRO">To</label> <input type="text" size="10" id="toRO" name="Filter" value="" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" id="openCalendarToRO" style="cursor: pointer;" border="0" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show calendar" id="openCalendarToRO" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > function validate2(date) { > var day = date.getDate(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt >index 0c47d91..988df41 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt >@@ -84,7 +84,7 @@ > <td><input type="radio" name="Line" value="datetime" /></td> > <td><input type="radio" name="Column" value="datetime" /></td> > <td><label for="from">From</label> <input type="text" size="10" id="from" name="Filter" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" /> > <script type="text/javascript"> > //<![CDATA[ > function validate1(date) { >@@ -112,7 +112,7 @@ > //]]> > </script> > <label for="to">To</label> <input size="10" id="to" name="Filter" value="" type="text" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > //<![CDATA[ > function validate2(date) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >index 6a30dc9..50051d0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >@@ -1,7 +1,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Reports › Catalog by item types</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt >index 00600eb..5bf6378 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt >@@ -101,7 +101,7 @@ > <td><input type="radio" name="Line" value="reservedate" /></td> > <td><input type="radio" name="Column" value="reservedate" /></td> > <td><label for="filter_reservedate_begin">From</label> <input type="text" size="10" id="filter_reservedate_begin" name="filter_reservedate_begin" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="openreservedateFrom" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="openreservedateFrom" style="cursor: pointer;" /> > <script type="text/javascript"> > //<![CDATA[ > function validate1(date) { >@@ -129,7 +129,7 @@ > //]]> > </script> > <label for="filter_reservedate_end">To</label> <input size="10" id="filter_reservedate_end" name="filter_reservedate_end" value="" type="text" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" id="openreservedateTo" style="cursor: pointer;" border="0" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show calendar" id="openreservedateTo" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > //<![CDATA[ > function validate2(date) { >@@ -163,7 +163,7 @@ > <td><input type="radio" name="Line" value="notificationdate" /></td> > <td><input type="radio" name="Column" value="notificationdate" /></td> > <td><label for="filter_notificationdate_begin">From</label> <input type="text" size="10" id="filter_notificationdate_begin" name="filter_notificationdate_begin" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="opennotificationdateFrom" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="opennotificationdateFrom" style="cursor: pointer;" /> > <script type="text/javascript"> > //<![CDATA[ > function validate1(date) { >@@ -191,7 +191,7 @@ > //]]> > </script> > <label for="filter_notificationdate_end">To</label> <input size="10" id="filter_notificationdate_end" name="filter_notificationdate_end" value="" type="text" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" id="opennotificationdateTo" style="cursor: pointer;" border="0" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show calendar" id="opennotificationdateTo" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > //<![CDATA[ > function validate2(date) { >@@ -225,7 +225,7 @@ > <td><input type="radio" name="Line" value="reminderdate" /></td> > <td><input type="radio" name="Column" value="reminderdate" /></td> > <td><label for="filter_reminderdate_begin">From</label> <input type="text" size="10" id="filter_reminderdate_begin" name="Filter" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="openreminderdateFrom" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="openreminderdateFrom" style="cursor: pointer;" /> > <script type="text/javascript"> > //<![CDATA[ > function validate1(date) { >@@ -253,7 +253,7 @@ > //]]> > </script> > <label for="filter_reminderdate_end">To</label> <input size="10" id="filter_reminderdate_end" name="filter_reminderdate_end" value="" type="text" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" id="openreminderdateTo" style="cursor: pointer;" border="0" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show calendar" id="openreminderdateTo" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > //<![CDATA[ > function validate2(date) { >@@ -287,7 +287,7 @@ > <td><input type="radio" name="Line" value="waitingdate" /></td> > <td><input type="radio" name="Column" value="waitingdate" /></td> > <td><label for="filter_waitingdate_begin">From</label> <input type="text" size="10" id="filter_waitingdate_begin" name="filter_waitingdate_begin" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="openwaitingdateFrom" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="openwaitingdateFrom" style="cursor: pointer;" /> > <script type="text/javascript"> > //<![CDATA[ > function validate1(date) { >@@ -315,7 +315,7 @@ > //]]> > </script> > <label for="filter_waitingdate_end">To</label> <input size="10" id="filter_waitingdate_end" name="filter_waitingdate_end" value="" type="text" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" id="openwaitingdateTo" style="cursor: pointer;" border="0" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show calendar" id="openwaitingdateTo" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > //<![CDATA[ > function validate2(date) { >@@ -349,7 +349,7 @@ > <td><input type="radio" name="Line" value="cancellationdate" /></td> > <td><input type="radio" name="Column" value="cancellationdate" /></td> > <td><label for="filter_cancellationdate_begin">From</label> <input type="text" size="10" id="filter_cancellationdate_begin" name="filter_cancellationdate_begin" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="opencancellationdateFrom" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="opencancellationdateFrom" style="cursor: pointer;" /> > <script type="text/javascript"> > //<![CDATA[ > function validate1(date) { >@@ -377,7 +377,7 @@ > //]]> > </script> > <label for="filter_cancellationdate_end">To</label> <input size="10" id="filter_cancellationdate_end" name="filter_cancellationdate_end" value="" type="text" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" id="opencancellationdateTo" style="cursor: pointer;" border="0" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show calendar" id="opencancellationdateTo" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > //<![CDATA[ > function validate2(date) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt >index c42bc45..72518c9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt >@@ -4,7 +4,7 @@ > <style type="text/css"> > .sql {display: none;} > </style> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> > <script type="text/JavaScript" language="JavaScript"> > //<![CDATA[ > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/stats_screen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/stats_screen.tt >index 282ef98..d93f046 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/stats_screen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/stats_screen.tt >@@ -22,7 +22,7 @@ > <form action="stats.screen.pl" method="post"> > <label for="from">Start Date: </label> > <input type="text" name="time" size="10" value="[% IF ( date ) %][% date %][% ELSE %]today[% END %]" id="from" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="buttonfrom1" alt="Show calendar" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="buttonfrom1" alt="Show calendar" style="cursor: pointer;" /> > <script type="text/javascript"> > Calendar.setup({ > inputField : "from", >@@ -33,7 +33,7 @@ > </script> > <label for="to">End Date: </label> > <input type="text" name="time2" size="10" value="[% IF ( date2 ) %][% date2 %][% ELSE %]tomorrow[% END %]" id="to" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="buttonto1" alt="Show calendar" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="buttonto1" alt="Show calendar" style="cursor: pointer;" /> > <script type="text/javascript"> > Calendar.setup({ > inputField : "to", >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >index eba6756..e297783 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -289,7 +289,7 @@ function checkMultiHold() { > <li> > <label for="reserve_date">Hold starts on date:</label> > <input name="reserve_date" id="reserve_date" size="10" readonly="readonly"> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="CalendarReserveDate" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="CalendarReserveDate" style="cursor: pointer;" /> > <script language="JavaScript" type="text/javascript"> > //<![CDATA[ > function validate1(date) { >@@ -321,7 +321,7 @@ function checkMultiHold() { > <li> > <label for="expiration_date">Hold expires on date:</label> > <input name="expiration_date" id="expiration_date" size="10" readonly="readonly" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="CalendarExpirationDate" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="CalendarExpirationDate" style="cursor: pointer;" /> > <script language="JavaScript" type="text/javascript"> > //<![CDATA[ > function validate1(date) { >@@ -736,7 +736,7 @@ function checkMultiHold() { > [% IF AutoResumeSuspendedHolds %] > <label for="suspend_until_[% reserveloo.borrowernumber %]">[% IF ( reserveloo.suspend ) %] on [% ELSE %] until [% END %]</label> > <input name="suspend_until" id="suspend_until_[% reserveloo.borrowernumber %]" size="10" readonly="readonly" value="[% reserveloo.suspend_until %]" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="SuspendUntilDate_[% reserveloo.borrowernumber %]" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="SuspendUntilDate_[% reserveloo.borrowernumber %]" style="cursor: pointer;" /> > <script language="JavaScript" type="text/javascript"> > //<![CDATA[ > function validate1(date) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt >index 272f19e..090a1ae 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt >@@ -54,7 +54,7 @@ > > <li><label for="date" class="required" title="Required field">Expiring before:</label> > <input id="date" type="text" name="date" size="10" value="[% date %]" class="focus" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="openCalendar" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="openCalendar" style="cursor: pointer;" /> > <script type="text/javascript"> > Calendar.setup( > { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >index 399c933..7e30485 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >@@ -1,8 +1,8 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Serials › Claims</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.uitablefilter.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.uitablefilter.js"></script> > <script type="text/JavaScript" language="JavaScript"> > //<![CDATA[ > $(document).ready(function() { >@@ -228,7 +228,7 @@ > > <li> > <label for="begindate">From</label> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="begindatebutton" style="cursor: pointer;" alt="Show calendar" title="Show Calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="begindatebutton" style="cursor: pointer;" alt="Show calendar" title="Show Calendar" /> > <input type="text" name="begindate" id="begindate" value="[% begindate %]" size="10" maxlength="10" /> > <script type="text/javascript"> > //<![CDATA[ >@@ -241,7 +241,7 @@ > </script> > > <label for="enddate" style="float:none;">To</label> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="enddatebutton" style="cursor: pointer;" alt="Show calendar" title="Show Calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="enddatebutton" style="cursor: pointer;" alt="Show calendar" title="Show Calendar" /> > <input type="text" name="enddate" id="enddate" value="[% enddate %]" size="10" maxlength="10" /> > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt >index 1fdf693..23c8422 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt >@@ -1,10 +1,10 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Serials [% biblionumber %]</title> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.dataTables.min.js"></script> > [% INCLUDE 'datatables-strings.inc' %] >-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/datatables.js"></script> > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >index d72a20f..72c148d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >@@ -1124,12 +1124,12 @@ $(document).ready(function() { > <ol> > <li> > <label for="acqui_date"> First issue publication date:</label> >- [% UNLESS ( modify ) %]<img src="[% themelang %]/lib/calendar/cal.gif" id="acqui_button" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" />[% END %] >+ [% UNLESS ( modify ) %]<img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="acqui_button" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" />[% END %] > [% IF ( modify ) %]<input type="text" name="firstacquidate" value="[% firstacquidate %]" size="13" maxlength="10" id="acqui_date" disabled="disabled" /> > [% ELSE %]<input type="text" name="firstacquidate" value="[% firstacquidate %]" size="13" maxlength="10" id="acqui_date" />[% END %] > </li> > [% IF ( modify ) %]<li><label for="next_acqui_date"> Next issue publication date:</label> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="next_acqui_button" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="next_acqui_button" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" /> > <input type="text" name="nextacquidate" value="[% nextacquidate %]" size="13" maxlength="10" id="next_acqui_date" /> > </li>[% END %] > >@@ -1316,7 +1316,7 @@ $(document).ready(function() { > <li> > <label for="beginning_date" class="required"> Subscription start date:</label> > >- <img src="[% themelang %]/lib/calendar/cal.gif" id="button1" style="cursor: pointer;" alt="Show calendar" title="Show calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="button1" style="cursor: pointer;" alt="Show calendar" title="Show calendar" /> > <input type="text" name="startdate" value="[% startdate %]" size="13" maxlength="10" id="beginning_date" /> > <!-- both scripts for calendar must follow the input field --> > <script type="text/javascript"> >@@ -1349,7 +1349,7 @@ $(document).ready(function() { > <li> > <label for="ending_date"> Subscription end date:</label> > >- <img src="[% themelang %]/lib/calendar/cal.gif" id="buttonend1" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="buttonend1" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" /> > <input type="text" name="enddate" value="[% enddate %]" size="13" maxlength="10" id="ending_date" /> > <!-- both scripts for calendar must follow the input field --> > <script type="text/javascript"> >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 4a92f85..b67f455 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -16,8 +16,8 @@ > </title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >-[% IF ( op_else ) %] <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+[% IF ( op_else ) %] <script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > <script type="text/javascript"> > // <![CDATA[ > >@@ -100,7 +100,7 @@ $(document).ready(function() { calcNewsuggTotal(); }); > // ]]> > </script> > [% END %] >-<script type="text/javascript" src="[% themelang %]/js/acq.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script> > </head> > <body id="acq_suggestion" class="acq"> > [% INCLUDE 'header.inc' %] >@@ -474,7 +474,7 @@ $(document).ready(function() { calcNewsuggTotal(); }); > <li><label for="suggesteddate_from"> Suggested on:</label>[% suggesteddate %] > <table class="invis"> > <tr> >- <td>from :</td><td><input type="text" id="suggesteddate_from" name="suggesteddate_from" style="width:80px;" /><img src="[% themelang %]/lib/calendar/cal.gif" id="suggesteddate_from_button" alt="Show calendar" /> >+ <td>from :</td><td><input type="text" id="suggesteddate_from" name="suggesteddate_from" style="width:80px;" /><img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="suggesteddate_from_button" alt="Show calendar" /> > <script language="JavaScript" type="text/javascript"> > Calendar.setup( > { >@@ -486,7 +486,7 @@ $(document).ready(function() { calcNewsuggTotal(); }); > </script></td> > </tr> > <tr> >- <td>to :</td><td><input type="text" id="suggesteddate_to" name="suggesteddate_to" style="width:80px;" /><img src="[% themelang %]/lib/calendar/cal.gif" id="suggesteddate_to_button" alt="Show calendar" /> >+ <td>to :</td><td><input type="text" id="suggesteddate_to" name="suggesteddate_to" style="width:80px;" /><img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="suggesteddate_to_button" alt="Show calendar" /> > <script language="JavaScript" type="text/javascript"> > Calendar.setup( > { >@@ -505,7 +505,7 @@ $(document).ready(function() { calcNewsuggTotal(); }); > <li><label for="manageddate_from"> Management date:</label>[% manageddate %] > <table class="invis"> > <tr> >- <td>from :</td><td><input type="text" id="manageddate_from" name="manageddate_from" style="width:80px;" /><img src="[% themelang %]/lib/calendar/cal.gif" id="manageddate_from_button" alt="Show calendar" /> >+ <td>from :</td><td><input type="text" id="manageddate_from" name="manageddate_from" style="width:80px;" /><img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="manageddate_from_button" alt="Show calendar" /> > <script language="JavaScript" type="text/javascript"> > Calendar.setup( > { >@@ -517,7 +517,7 @@ $(document).ready(function() { calcNewsuggTotal(); }); > </script></td> > </tr> > <tr> >- <td>to :</td><td><input type="text" id="manageddate_to" name="manageddate_to" style="width:80px;" /><img src="[% themelang %]/lib/calendar/cal.gif" id="manageddate_to_button" alt="Show calendar" /> >+ <td>to :</td><td><input type="text" id="manageddate_to" name="manageddate_to" style="width:80px;" /><img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="manageddate_to_button" alt="Show calendar" /> > <script language="JavaScript" type="text/javascript"> > Calendar.setup( > { >@@ -536,7 +536,7 @@ $(document).ready(function() { calcNewsuggTotal(); }); > <li><label for="accepteddate_from"> Accepted on:</label>[% accepteddate %] > <table class="invis"> > <tr> >- <td>from :</td><td><input type="text" id="accepteddate_from" name="accepteddate_from" style="width:80px;" /><img src="[% themelang %]/lib/calendar/cal.gif" id="accepteddate_from_button" alt="Show calendar" /> >+ <td>from :</td><td><input type="text" id="accepteddate_from" name="accepteddate_from" style="width:80px;" /><img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="accepteddate_from_button" alt="Show calendar" /> > <script language="JavaScript" type="text/javascript"> > Calendar.setup( > { >@@ -548,7 +548,7 @@ $(document).ready(function() { calcNewsuggTotal(); }); > </script></td> > </tr> > <tr> >- <td>to :</td><td><input type="text" id="accepteddate_to" name="accepteddate_to" style="width:80px;" /><img src="[% themelang %]/lib/calendar/cal.gif" id="accepteddate_to_button" alt="Show calendar" /> >+ <td>to :</td><td><input type="text" id="accepteddate_to" name="accepteddate_to" style="width:80px;" /><img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="accepteddate_to_button" alt="Show calendar" /> > <script language="JavaScript" type="text/javascript"> > Calendar.setup( > { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >index e9c683a..0566cb1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >@@ -1,7 +1,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Tags › [% IF ( do_it ) %]Review › [% ELSE %]Review tags[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> > <script type="text/javascript"> > //<![CDATA[ > $.tablesorter.addParser({ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >index ddd59d3..6c96258 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >@@ -2,7 +2,7 @@ > <title>Home › Tools › Tags › [% IF ( do_it ) %]Review › [% ELSE %]Review tags[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > <style type="text/css"> > .setlabel {width: 6em; font-family: courier; background-color:#E8E8E8;} > .red {color:darkred; background-color: pink;} >@@ -322,12 +322,12 @@ td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > <li> > <label for="from">Date: from </label> > <input type="text" size="10" id="from" name="from" value="[% filter_date_approved_from %]" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" border="0" alt="Show calendar" style="cursor: pointer;" id="openCalendarFrom" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" border="0" alt="Show calendar" style="cursor: pointer;" id="openCalendarFrom" /> > <div class="hint">[% INCLUDE 'date-format.inc' %]</div> > > <label for="to">...to </label> > <input type="text" size="10" id="to" name="to" value="[% filter_date_approved_to %]" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" border="0" alt="Show calendar" style="cursor: pointer;" id="openCalendarTo" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" border="0" alt="Show calendar" style="cursor: pointer;" id="openCalendarTo" /> > <div class="hint">[% INCLUDE 'date-format.inc' %]</div> > </li> > </ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/test/progressbar.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/test/progressbar.tt >index b4009e5..b5f6c3b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/test/progressbar.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/test/progressbar.tt >@@ -2,7 +2,7 @@ > <title>Koha › Tools › Stage MARC records for import</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'file-upload.inc' %] >-<script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar.js"></script> > <style type="text/css"> > #uploadpanel,#fileuploadstatus,#fileuploadfailed,#jobpanel,#jobstatus,#jobfailed { display : none; } > #fileuploadstatus,#jobstatus { margin:.4em; } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >index b88401c..03430cd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >@@ -1,11 +1,11 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Batch item deletion</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/pages/batchMod.css" /> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >-<script src="[% themelang %]/lib/yui/cookie/cookie-min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar.js"></script> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/pages/batchMod.css" /> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script src="[% interface %]/[% theme %]/lib/yui/cookie/cookie-min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > <script type="text/javascript"> > //<![CDATA[ > >@@ -18,7 +18,7 @@ for( x=0; x<allColumns.length; x++ ){ > } > //]]> > </script> >-<script type="text/javascript" src="[% themelang %]/js/pages/batchMod.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/batchMod.js"></script> > <!--[if IE]> > <style type="text/css">#selections { display: none; }</style> > <![endif]--> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >index e64776a..94fb10c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >@@ -1,11 +1,11 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Batch item modification</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/pages/batchMod.css" /> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >-<script src="[% themelang %]/lib/yui/cookie/cookie-min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar.js"></script> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/pages/batchMod.css" /> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script src="[% interface %]/[% theme %]/lib/yui/cookie/cookie-min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > <script type="text/javascript"> > //<![CDATA[ > >@@ -39,11 +39,11 @@ $("input[name='disable_input']").click(function() { > > //]]> > </script> >-<script type="text/javascript" src="[% themelang %]/js/pages/batchMod.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/batchMod.js"></script> > <!--[if IE]> > <style type="text/css">#selections { display: none; }</style> > <![endif]--> >-<link type="text/css" rel="stylesheet" href="[% themelang %]/css/addbiblio.css" /> >+<link type="text/css" rel="stylesheet" href="[% interface %]/[% theme %]/css/addbiblio.css" /> > </head> > <body id="tools_batchMod-edit" class="tools"> > [% INCLUDE 'header.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt >index df6fa57..cd21ddb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt >@@ -1,7 +1,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › [% IF ( del ) %]Batch item deletion[% ELSE %]Batch item modification[% END %] </title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> > <script type="text/JavaScript" language="JavaScript"> > //<![CDATA[ > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >index ae4d3ec..93f636b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >@@ -1,10 +1,10 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › MARC export</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/lib/calendar/calendar-system.css" /> >-<script type="text/javascript" src="[% themelang %]/lib/calendar/calendar.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/calendar/calendar-en.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/calendar/calendar-setup.js"></script> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/calendar/calendar-system.css" /> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/calendar/calendar.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/calendar/calendar-en.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/calendar/calendar-setup.js"></script> > </head> > <body id="tools_export" class="tools"> > [% INCLUDE 'header.inc' %] >@@ -72,7 +72,7 @@ > <ul><li> > <label for="start_accession">Start date:</label> > <input type="text" size="10" id="start_accession" name="start_accession" value="[% from %]" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" alt="" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" alt="" /> > <script language="JavaScript" type="text/javascript"> > Calendar.setup( > { >@@ -86,7 +86,7 @@ Calendar.setup( > End date: > </label> > <input size="10" id="end_accession" name="end_accession" value="[% end_accession %]" type="text" /> >-<img src="[% themelang %]/lib/calendar/cal.gif" alt="" id="openCalendarTo" style="cursor: pointer;" border="0" /> >+<img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="" id="openCalendarTo" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > > Calendar.setup( >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >index 6e50425..8f5d79e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >@@ -2,7 +2,7 @@ > <title>Koha › Tools › [% branchname %] Calendar</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> > <script language="JavaScript" type="text/javascript"> > //<![CDATA[ > >@@ -249,7 +249,7 @@ > <li class="dateinsert"> > <b>To date : </b> > <input type="text" id="dateofrange" name="dateofrange" size="20" value="[% dateofrange %]" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="dateofrange_button" alt="Show calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="dateofrange_button" alt="Show calendar" /> > <script language="JavaScript" type="text/javascript"> > Calendar.setup( > { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >index d8eb82f..ac6348e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >@@ -2,7 +2,7 @@ > <title>Koha › Tools › Inventory</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function(){ >@@ -59,7 +59,7 @@ $(document).ready(function(){ > <ol> > <li><label for="uploadbarcodes">Barcode file: </label> <input type="file" id="uploadbarcodes" name="uploadbarcodes" /></li> > <li><label for="setdate">Set inventory date to:</label> <input type="text" id="setdate" name="setdate" value="[% today %]" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="setdate_button" alt="Show calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="setdate_button" alt="Show calendar" /> > <script type="text/javascript"> > Calendar.setup( > { >@@ -142,7 +142,7 @@ $(document).ready(function(){ > > <li><label for="datelastseen">Inventory date:</label> > <input type="text" id="datelastseen" name="datelastseen" value="[% datelastseen %]" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="datelastseen_button" alt="Show Calendar" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="datelastseen_button" alt="Show Calendar" /> > <script type="text/javascript"> > Calendar.setup( > { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt >index ce64053..dc17354 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt >@@ -2,7 +2,7 @@ > <title>Koha › Tools › News</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> > <script type="text/javascript">//<![CDATA[ > $(document).ready(function() { > $("#newst").tablesorter({[% IF ( dateformat == 'metric' ) %] >@@ -13,12 +13,12 @@ $(document).ready(function() { > }); > //]]> > </script> >-<script language="javascript" type="text/javascript" src="[% themelang %]/js/tinymce/jscripts/tiny_mce/tiny_mce.js"></script> >+<script language="javascript" type="text/javascript" src="[% interface %]/[% theme %]/js/tinymce/jscripts/tiny_mce/tiny_mce.js"></script> > <script language="javascript" type="text/javascript"> > tinyMCE.init({ > mode : "textareas", > theme : "advanced", >- content_css : "[% themelang %]/css/tinymce.css", >+ content_css : "[% interface %]/[% theme %]/css/tinymce.css", > plugins : "table,save,advhr,advlink,iespell,searchreplace,print,contextmenu", > theme_advanced_buttons1 : "save,|,bold,italic,|,cut,copy,paste,|,search,replace,|,justifyleft,justifycenter,justifyright,justifyfull,|,formatselect,|,link,unlink,anchor,cleanup,help,code,advhr,|,print", > theme_advanced_buttons2 : "tablecontrols,|,bullist,numlist,|,outdent,indent,|,undo,redo,|,removeformat,|,visualaid,|,sub,sup,|,charmap", >@@ -89,7 +89,7 @@ Edit News Item[% ELSE %]Add News Item[% END %][% ELSE %]News[% END %]</div> > <li> > <label for="timestamp">Publication date</label> > <input id="timestamp" type="text" name="timestamp" size="15" value="[% new_detail.timestamp %]" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="timestampButton" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="timestampButton" style="cursor: pointer;" /> > <script type="text/javascript"> > Calendar.setup( > { >@@ -104,7 +104,7 @@ Edit News Item[% ELSE %]Add News Item[% END %][% ELSE %]News[% END %]</div> > <li> > <label for="expirationdate">Expiration date</label> > <input id="expirationdate" type="text" name="expirationdate" size="15" value="[% new_detail.expirationdate %]" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="openCalendar" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="openCalendar" style="cursor: pointer;" /> > <script type="text/javascript"> > Calendar.setup( > { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >index 374b2f1..aa6e805 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >@@ -1,7 +1,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Notices[% IF ( add_form ) %][% IF ( modify ) %] › Modify notice[% ELSE %] › Add notice[% END %][% END %][% IF ( add_validate ) %] › Notice added[% END %][% IF ( delete_confirm ) %] › Confirm deletion[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >index 4ff9900..0122303 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >@@ -6,7 +6,7 @@ > </title> > [% INCLUDE 'greybox.inc' %] > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar.js"></script> > <script type="text/JavaScript" language="JavaScript"> > //<![CDATA[ > $(document).ready(function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt >index 0509578..f3cd95a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt >@@ -31,7 +31,7 @@ > <li><label for="starttime">Time:</label> > <input type="text" name="starttime" id="starttime" value="" maxlength="5" size="5" /></li> > <li><label for="startdate">Date: </label> <input type="text" size="10" id="startdate" name="startdate" value="" /> >-<img src="[% themelang %]/lib/calendar/cal.gif" border="0" alt="Show calendar" id="openCalendarStartdate" style="cursor: pointer;" /> >+<img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" border="0" alt="Show calendar" id="openCalendarStartdate" style="cursor: pointer;" /> > > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >index 478527c..34019fa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >@@ -2,7 +2,7 @@ > <title>Koha › Tools › Stage MARC records for import</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'file-upload.inc' %] >-<script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar.js"></script> > <style type="text/css"> > #uploadpanel,#fileuploadstatus,#fileuploadfailed,#jobpanel,#jobstatus,#jobfailed { display : none; } > #fileuploadstatus,#jobstatus { margin:.4em; } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >index 5508e87..bd1623c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >@@ -2,7 +2,7 @@ > <title>Koha › Tools › Upload images</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'file-upload.inc' %] >-<script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar.js"></script> > <style type="text/css"> > #uploadpanel,#fileuploadstatus,#fileuploadfailed,#jobpanel,#jobstatus,#jobfailed { display : none; } > #fileuploadstatus,#jobstatus { margin:.4em; } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >index a56a10f..5e8b377 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >@@ -76,12 +76,12 @@ > </li> > <li> > <label for="from"> Display from: </label> <input type="text" size="10" id="from" name="from" value="[% datefrom %]" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" border="0" alt="Show calendar" id="openCalendarFrom" style="cursor: pointer;" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" border="0" alt="Show calendar" id="openCalendarFrom" style="cursor: pointer;" /> > <div class="hint">[% INCLUDE 'date-format.inc' %]</div> > </li> > <li> > <label for="to">Display to: </label> <input size="10" id="to" name="to" type="text" value="[% dateto %]" /> >- <img src="[% themelang %]/lib/calendar/cal.gif" id="openCalendarTo" alt="Show calendar" style="cursor: pointer;" border="0" /> >+ <img src="[% interface %]/[% theme %]/lib/calendar/cal.gif" id="openCalendarTo" alt="Show calendar" style="cursor: pointer;" border="0" /> > <script type="text/javascript"> > //<![CDATA[ > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >index 650be11..7204d08 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >@@ -1,7 +1,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › [% IF ( viewshelf ) %]Lists › Contents of [% shelfname | html %][% ELSE %]lists[% END %][% IF ( shelves ) %] › Create new list[% END %][% IF ( edit ) %] › Edit list [% shelfname | html %][% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > <script type="text/javascript"> > //<![CDATA[ > >-- >1.7.10 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 4048
:
9587
| 9589