Bugzilla – Attachment 50469 Details for
Bug 16241
Move staff client CSS out of language directory
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 16241 - Move staff client CSS out of language directory
SIGNED-OFF-Bug-16241---Move-staff-client-CSS-out-o.patch (text/plain), 179.52 KB, created by
Bernardo Gonzalez Kriegel
on 2016-04-20 16:08:16 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 16241 - Move staff client CSS out of language directory
Filename:
MIME Type:
Creator:
Bernardo Gonzalez Kriegel
Created:
2016-04-20 16:08:16 UTC
Size:
179.52 KB
patch
obsolete
>From f6371976180edffb7bd6cbdbc066329d32a673b7 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 12 Apr 2016 13:21:33 -0400 >Subject: [PATCH] [SIGNED-OFF] Bug 16241 - Move staff client CSS out of > language directory > >The staff client CSS is not language-specific, so it can be moved out of >the en/ directory and thus not be duplicated for every translation. > >In order to be able to have a generic path to the YUI CSS files, the YUI >directory is moved by this patch to the staff client's lib/ directory. > >To test, apply the patch and visit various pages in the staff client. >Look in particular at pages which include more than the standard CSS. >For example: > >- The staff client login page. >- The staff client home page. >- Patron -> Set permissions. >- The advanced cataloging editor. >- Acquisitions -> Vendor -> Basket groups. >- Tools -> News -> Edit news. >- Administration -> System preferences. > >Revised: I intended for this to be built on top of Bug 15883. Now it is. > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> > >On top of 15883 >Works as described, all pages on test plan >No Errors >--- > .../en => }/lib/yui/animation/animation-debug.js | 0 > .../en => }/lib/yui/animation/animation-min.js | 0 > .../{prog/en => }/lib/yui/animation/animation.js | 0 > .../en => }/lib/yui/button/assets/button-core.css | 0 > .../yui/button/assets/skins/sam/button-skin.css | 0 > .../lib/yui/button/assets/skins/sam/button.css | 0 > .../skins/sam/menu-button-arrow-disabled.png | Bin > .../button/assets/skins/sam/menu-button-arrow.png | Bin > .../assets/skins/sam/split-button-arrow-active.png | Bin > .../skins/sam/split-button-arrow-disabled.png | Bin > .../assets/skins/sam/split-button-arrow-focus.png | Bin > .../assets/skins/sam/split-button-arrow-hover.png | Bin > .../button/assets/skins/sam/split-button-arrow.png | Bin > .../en => }/lib/yui/button/button-beta-min.js | 0 > .../{prog/en => }/lib/yui/button/button-debug.js | 0 > .../{prog/en => }/lib/yui/button/button-min.js | 0 > .../{prog/en => }/lib/yui/button/button.js | 0 > .../en => }/lib/yui/container/assets/alrt16_1.gif | Bin > .../en => }/lib/yui/container/assets/blck16_1.gif | Bin > .../en => }/lib/yui/container/assets/close12_1.gif | Bin > .../lib/yui/container/assets/container-core.css | 0 > .../en => }/lib/yui/container/assets/container.css | 0 > .../en => }/lib/yui/container/assets/hlp16_1.gif | Bin > .../en => }/lib/yui/container/assets/info16_1.gif | Bin > .../container/assets/skins/sam/container-skin.css | 0 > .../yui/container/assets/skins/sam/container.css | 0 > .../en => }/lib/yui/container/assets/tip16_1.gif | Bin > .../en => }/lib/yui/container/assets/warn16_1.gif | Bin > .../en => }/lib/yui/container/container-debug.js | 0 > .../en => }/lib/yui/container/container-min.js | 0 > .../{prog/en => }/lib/yui/container/container.js | 0 > .../lib/yui/container/container_core-debug.js | 0 > .../lib/yui/container/container_core-min.js | 0 > .../en => }/lib/yui/container/container_core.js | 0 > .../en => }/lib/yui/dragdrop/dragdrop-debug.js | 0 > .../{prog/en => }/lib/yui/dragdrop/dragdrop-min.js | 0 > .../{prog/en => }/lib/yui/dragdrop/dragdrop.js | 0 > .../en => }/lib/yui/element/element-beta-min.js | 0 > .../{prog/en => }/lib/yui/element/element-debug.js | 0 > .../{prog/en => }/lib/yui/element/element-min.js | 0 > .../{prog/en => }/lib/yui/element/element.js | 0 > .../{prog/en => }/lib/yui/json/json-debug.js | 0 > .../{prog/en => }/lib/yui/json/json-min.js | 0 > .../{prog/en => }/lib/yui/json/json.js | 0 > .../en => }/lib/yui/menu-button-arrow-disabled.png | Bin > .../{prog/en => }/lib/yui/menu-button-arrow.png | Bin > .../en => }/lib/yui/menu/assets/menu-core.css | 0 > .../{prog/en => }/lib/yui/menu/assets/menu.css | 0 > .../lib/yui/menu/assets/menu_down_arrow.png | Bin > .../yui/menu/assets/menu_down_arrow_disabled.png | Bin > .../en => }/lib/yui/menu/assets/menu_up_arrow.png | Bin > .../lib/yui/menu/assets/menu_up_arrow_disabled.png | Bin > .../menu/assets/menubaritem_submenuindicator.png | Bin > .../menubaritem_submenuindicator_disabled.png | Bin > .../menubaritem_submenuindicator_selected.png | Bin > .../lib/yui/menu/assets/menuitem_checkbox.png | Bin > .../yui/menu/assets/menuitem_checkbox_disabled.png | Bin > .../yui/menu/assets/menuitem_checkbox_selected.png | Bin > .../yui/menu/assets/menuitem_submenuindicator.png | Bin > .../assets/menuitem_submenuindicator_disabled.png | Bin > .../assets/menuitem_submenuindicator_selected.png | Bin > .../lib/yui/menu/assets/skins/sam/menu-skin.css | 0 > .../en => }/lib/yui/menu/assets/skins/sam/menu.css | 0 > .../skins/sam/menubaritem_submenuindicator.png | Bin > .../sam/menubaritem_submenuindicator_disabled.png | Bin > .../menu/assets/skins/sam/menuitem_checkbox.png | Bin > .../skins/sam/menuitem_checkbox_disabled.png | Bin > .../assets/skins/sam/menuitem_submenuindicator.png | Bin > .../sam/menuitem_submenuindicator_disabled.png | Bin > .../{prog/en => }/lib/yui/menu/menu-debug.js | 0 > .../{prog/en => }/lib/yui/menu/menu-min.js | 0 > .../{prog/en => }/lib/yui/menu/menu.js | 0 > .../{prog/en => }/lib/yui/plugins/bubbling-min.js | 0 > .../{prog/en => }/lib/yui/plugins/loading-min.js | 0 > .../{prog/en => }/lib/yui/reset-fonts-grids.css | 0 > .../en => }/lib/yui/split-button-arrow-active.png | Bin > .../lib/yui/split-button-arrow-disabled.png | Bin > .../en => }/lib/yui/split-button-arrow-focus.png | Bin > .../en => }/lib/yui/split-button-arrow-hover.png | Bin > .../{prog/en => }/lib/yui/split-button-arrow.png | Bin > .../intranet-tmpl/{prog/en => }/lib/yui/sprite.png | Bin > .../{prog/en => }/lib/yui/utilities/utilities.js | 0 > .../lib/yui/yahoo-dom-event/yahoo-dom-event.js | 0 > .../intranet-tmpl/prog/{en => }/css/addbiblio.css | 4 +- > .../prog/{en => }/css/buttons.dataTables.min.css | 0 > .../intranet-tmpl/prog/{en => }/css/cateditor.css | 4 +- > .../intranet-tmpl/prog/{en => }/css/datatables.css | 34 +++++----- > koha-tmpl/intranet-tmpl/prog/{en => }/css/help.css | 0 > .../intranet-tmpl/prog/{en => }/css/hierarchy.css | 0 > .../intranet-tmpl/prog/{en => }/css/humanmsg.css | 0 > .../prog/{en => }/css/itemsearchform.css | 4 +- > .../intranet-tmpl/prog/{en => }/css/login.css | 2 +- > .../intranet-tmpl/prog/{en => }/css/mainpage.css | 4 +- > .../prog/{en => }/css/preferences.css | 6 +- > .../intranet-tmpl/prog/{en => }/css/print.css | 0 > .../prog/{en => }/css/printreceiptinvoice.css | 0 > .../intranet-tmpl/prog/{en => }/css/quotes.css | 0 > .../prog/{en => }/css/right-to-left.css | 6 +- > .../intranet-tmpl/prog/{en => }/css/spinelabel.css | 0 > .../prog/{en => }/css/staff-global.css | 72 ++++++++++----------- > .../intranet-tmpl/prog/{en => }/css/tinymce.css | 0 > .../prog/{en => }/css/treeview/images/file.gif | Bin > .../{en => }/css/treeview/images/folder-closed.gif | Bin > .../prog/{en => }/css/treeview/images/folder.gif | Bin > .../prog/{en => }/css/treeview/images/minus.gif | Bin > .../prog/{en => }/css/treeview/images/plus.gif | Bin > .../css/treeview/images/treeview-black-line.gif | Bin > .../css/treeview/images/treeview-black.gif | Bin > .../css/treeview/images/treeview-default-line.gif | Bin > .../css/treeview/images/treeview-default.gif | Bin > .../treeview/images/treeview-famfamfam-line.gif | Bin > .../css/treeview/images/treeview-famfamfam.gif | Bin > .../css/treeview/images/treeview-gray-line.gif | Bin > .../{en => }/css/treeview/images/treeview-gray.gif | Bin > .../css/treeview/images/treeview-red-line.gif | Bin > .../{en => }/css/treeview/images/treeview-red.gif | Bin > .../prog/{en => }/css/treeview/jquery.treeview.css | 0 > .../intranet-tmpl/prog/{en => }/css/uploader.css | 2 +- > .../intranet-tmpl/prog/en/includes/datatables.inc | 2 +- > .../prog/en/includes/doc-head-close-receipt.inc | 2 +- > .../prog/en/includes/doc-head-close.inc | 6 +- > .../intranet-tmpl/prog/en/includes/help-top.inc | 6 +- > .../prog/en/includes/installer-doc-head-close.inc | 2 +- > .../prog/en/includes/intranetstylesheet.inc | 4 +- > .../prog/en/includes/wysiwyg-systempreferences.inc | 2 +- > .../prog/en/modules/acqui/acqui-home.tt | 2 +- > .../prog/en/modules/acqui/addorderiso2709.tt | 2 +- > .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +- > .../prog/en/modules/acqui/basketgroup.tt | 18 +++--- > .../prog/en/modules/acqui/booksellers.tt | 2 +- > .../prog/en/modules/acqui/edifactmsgs.tt | 2 +- > .../prog/en/modules/acqui/histsearch.tt | 2 +- > .../prog/en/modules/acqui/invoice-files.tt | 2 +- > .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- > .../prog/en/modules/acqui/invoices.tt | 2 +- > .../prog/en/modules/acqui/lateorders.tt | 2 +- > .../prog/en/modules/acqui/neworderbiblio.tt | 2 +- > .../prog/en/modules/acqui/newordersubscription.tt | 2 +- > .../prog/en/modules/acqui/newordersuggestion.tt | 2 +- > .../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 2 +- > .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 2 +- > .../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 2 +- > .../intranet-tmpl/prog/en/modules/acqui/spent.tt | 2 +- > .../prog/en/modules/acqui/supplier.tt | 2 +- > .../prog/en/modules/acqui/uncertainprice.tt | 2 +- > .../prog/en/modules/acqui/z3950_search.tt | 2 +- > .../prog/en/modules/admin/aqbudgetperiods.tt | 2 +- > .../prog/en/modules/admin/aqbudgets.tt | 2 +- > .../prog/en/modules/admin/auth_tag_structure.tt | 2 +- > .../prog/en/modules/admin/authorised_values.tt | 2 +- > .../prog/en/modules/admin/authtypes.tt | 2 +- > .../prog/en/modules/admin/biblio_framework.tt | 2 +- > .../en/modules/admin/branch_transfer_limits.tt | 2 +- > .../prog/en/modules/admin/branches.tt | 4 +- > .../prog/en/modules/admin/categories.tt | 2 +- > .../intranet-tmpl/prog/en/modules/admin/cities.tt | 2 +- > .../prog/en/modules/admin/currency.tt | 2 +- > .../prog/en/modules/admin/itemtypes.tt | 2 +- > .../prog/en/modules/admin/localization.tt | 2 +- > .../prog/en/modules/admin/marctagstructure.tt | 2 +- > .../prog/en/modules/admin/preferences.tt | 8 +-- > .../prog/en/modules/admin/systempreferences.tt | 2 +- > .../prog/en/modules/admin/z3950servers.tt | 2 +- > .../prog/en/modules/authorities/authorities.tt | 4 +- > .../intranet-tmpl/prog/en/modules/basket/basket.tt | 4 +- > .../prog/en/modules/catalogue/detail.tt | 2 +- > .../prog/en/modules/catalogue/issuehistory.tt | 2 +- > .../prog/en/modules/catalogue/itemsearch.tt | 4 +- > .../prog/en/modules/catalogue/search-history.tt | 2 +- > .../prog/en/modules/cataloguing/addbiblio.tt | 4 +- > .../prog/en/modules/cataloguing/additem.tt | 6 +- > .../prog/en/modules/cataloguing/editor.tt | 8 +-- > .../cataloguing/value_builder/cn_browser.tt | 2 +- > .../en/modules/cataloguing/z3950_auth_search.tt | 2 +- > .../prog/en/modules/cataloguing/z3950_search.tt | 2 +- > .../prog/en/modules/circ/circulation.tt | 2 +- > .../en/modules/circ/circulation_batch_checkouts.tt | 2 +- > .../prog/en/modules/circ/offline-mf.tt | 4 +- > .../prog/en/modules/circ/on-site_checkouts.tt | 2 +- > .../prog/en/modules/circ/pendingreserves.tt | 2 +- > .../prog/en/modules/circ/printslip.tt | 2 +- > .../prog/en/modules/circ/reserveratios.tt | 2 +- > .../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- > .../prog/en/modules/circ/transferstoreceive.tt | 2 +- > .../prog/en/modules/circ/view_holdsqueue.tt | 2 +- > .../prog/en/modules/circ/waitingreserves.tt | 2 +- > .../prog/en/modules/common/patron_search.tt | 2 +- > .../en/modules/course_reserves/course-details.tt | 2 +- > .../en/modules/course_reserves/course-reserves.tt | 2 +- > .../intranet-tmpl/prog/en/modules/help/edithelp.tt | 4 +- > .../prog/en/modules/help/labels/spinelabel-home.tt | 2 +- > .../intranet-tmpl/prog/en/modules/intranet-main.tt | 2 +- > .../prog/en/modules/labels/label-edit-batch.tt | 2 +- > .../prog/en/modules/labels/label-home.tt | 2 +- > .../prog/en/modules/labels/label-manage.tt | 2 +- > .../prog/en/modules/labels/spinelabel-print.tt | 2 +- > .../prog/en/modules/members/boraccount.tt | 2 +- > .../prog/en/modules/members/member-flags.tt | 2 +- > .../prog/en/modules/members/member.tt | 2 +- > .../prog/en/modules/members/moremember-print.tt | 2 +- > .../prog/en/modules/members/moremember-receipt.tt | 2 +- > .../prog/en/modules/members/notices.tt | 2 +- > .../prog/en/modules/members/printfeercpt.tt | 2 +- > .../prog/en/modules/members/printinvoice.tt | 2 +- > .../en/modules/members/purchase-suggestions.tt | 2 +- > .../prog/en/modules/members/readingrec.tt | 2 +- > .../prog/en/modules/members/statistics.tt | 2 +- > .../prog/en/modules/members/update-child.tt | 2 +- > .../prog/en/modules/patron_lists/list.tt | 2 +- > .../prog/en/modules/patron_lists/lists.tt | 2 +- > .../prog/en/modules/patroncards/edit-batch.tt | 2 +- > .../en/modules/reports/guided_reports_start.tt | 2 +- > .../prog/en/modules/reports/itemslost.tt | 2 +- > .../prog/en/modules/reports/itemtypes.tt | 2 +- > .../prog/en/modules/reports/serials_stats.tt | 2 +- > .../prog/en/modules/reserve/request.tt | 2 +- > .../rotating_collections/rotatingCollections.tt | 2 +- > .../prog/en/modules/serials/add_fields.tt | 2 +- > .../prog/en/modules/serials/claims.tt | 2 +- > .../prog/en/modules/serials/serials-collection.tt | 2 +- > .../prog/en/modules/serials/serials-search.tt | 2 +- > .../prog/en/modules/suggestion/suggestion.tt | 2 +- > .../prog/en/modules/tools/batchMod-del.tt | 2 +- > .../prog/en/modules/tools/batchMod-edit.tt | 4 +- > .../prog/en/modules/tools/batch_delete_records.tt | 2 +- > .../en/modules/tools/batch_record_modification.tt | 2 +- > .../prog/en/modules/tools/holidays.tt | 2 +- > .../prog/en/modules/tools/inventory.tt | 2 +- > .../prog/en/modules/tools/koha-news.tt | 4 +- > .../intranet-tmpl/prog/en/modules/tools/letter.tt | 2 +- > .../prog/en/modules/tools/manage-marc-import.tt | 2 +- > .../prog/en/modules/tools/modborrowers.tt | 2 +- > .../prog/en/modules/tools/quotes-upload.tt | 6 +- > .../intranet-tmpl/prog/en/modules/tools/quotes.tt | 4 +- > .../prog/en/modules/virtualshelves/shelves.tt | 2 +- > 235 files changed, 219 insertions(+), 219 deletions(-) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/animation/animation-debug.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/animation/animation-min.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/animation/animation.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/assets/button-core.css (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/assets/skins/sam/button-skin.css (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/assets/skins/sam/button.css (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/assets/skins/sam/menu-button-arrow-disabled.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/assets/skins/sam/menu-button-arrow.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/assets/skins/sam/split-button-arrow-active.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/assets/skins/sam/split-button-arrow-disabled.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/assets/skins/sam/split-button-arrow-focus.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/assets/skins/sam/split-button-arrow-hover.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/assets/skins/sam/split-button-arrow.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/button-beta-min.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/button-debug.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/button-min.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/button.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/assets/alrt16_1.gif (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/assets/blck16_1.gif (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/assets/close12_1.gif (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/assets/container-core.css (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/assets/container.css (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/assets/hlp16_1.gif (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/assets/info16_1.gif (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/assets/skins/sam/container-skin.css (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/assets/skins/sam/container.css (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/assets/tip16_1.gif (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/assets/warn16_1.gif (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/container-debug.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/container-min.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/container.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/container_core-debug.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/container_core-min.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/container_core.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/dragdrop/dragdrop-debug.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/dragdrop/dragdrop-min.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/dragdrop/dragdrop.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/element/element-beta-min.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/element/element-debug.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/element/element-min.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/element/element.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/json/json-debug.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/json/json-min.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/json/json.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu-button-arrow-disabled.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu-button-arrow.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menu-core.css (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menu.css (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menu_down_arrow.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menu_down_arrow_disabled.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menu_up_arrow.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menu_up_arrow_disabled.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menubaritem_submenuindicator.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menubaritem_submenuindicator_disabled.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menubaritem_submenuindicator_selected.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menuitem_checkbox.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menuitem_checkbox_disabled.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menuitem_checkbox_selected.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menuitem_submenuindicator.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menuitem_submenuindicator_disabled.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menuitem_submenuindicator_selected.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/skins/sam/menu-skin.css (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/skins/sam/menu.css (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/skins/sam/menubaritem_submenuindicator.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/skins/sam/menubaritem_submenuindicator_disabled.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/skins/sam/menuitem_checkbox.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/skins/sam/menuitem_checkbox_disabled.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/skins/sam/menuitem_submenuindicator.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/skins/sam/menuitem_submenuindicator_disabled.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/menu-debug.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/menu-min.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/menu.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/plugins/bubbling-min.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/plugins/loading-min.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/reset-fonts-grids.css (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/split-button-arrow-active.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/split-button-arrow-disabled.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/split-button-arrow-focus.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/split-button-arrow-hover.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/split-button-arrow.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/sprite.png (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/utilities/utilities.js (100%) > rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/yahoo-dom-event/yahoo-dom-event.js (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/addbiblio.css (94%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/buttons.dataTables.min.css (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/cateditor.css (97%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/datatables.css (80%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/help.css (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/hierarchy.css (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/humanmsg.css (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/itemsearchform.css (84%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/login.css (98%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/mainpage.css (97%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/preferences.css (83%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/print.css (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/printreceiptinvoice.css (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/quotes.css (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/right-to-left.css (96%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/spinelabel.css (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/staff-global.css (95%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/tinymce.css (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/file.gif (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/folder-closed.gif (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/folder.gif (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/minus.gif (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/plus.gif (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/treeview-black-line.gif (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/treeview-black.gif (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/treeview-default-line.gif (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/treeview-default.gif (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/treeview-famfamfam-line.gif (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/treeview-famfamfam.gif (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/treeview-gray-line.gif (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/treeview-gray.gif (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/treeview-red-line.gif (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/treeview-red.gif (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/jquery.treeview.css (100%) > rename koha-tmpl/intranet-tmpl/prog/{en => }/css/uploader.css (93%) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/animation/animation-debug.js b/koha-tmpl/intranet-tmpl/lib/yui/animation/animation-debug.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/animation/animation-debug.js >rename to koha-tmpl/intranet-tmpl/lib/yui/animation/animation-debug.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/animation/animation-min.js b/koha-tmpl/intranet-tmpl/lib/yui/animation/animation-min.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/animation/animation-min.js >rename to koha-tmpl/intranet-tmpl/lib/yui/animation/animation-min.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/animation/animation.js b/koha-tmpl/intranet-tmpl/lib/yui/animation/animation.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/animation/animation.js >rename to koha-tmpl/intranet-tmpl/lib/yui/animation/animation.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/assets/button-core.css b/koha-tmpl/intranet-tmpl/lib/yui/button/assets/button-core.css >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/assets/button-core.css >rename to koha-tmpl/intranet-tmpl/lib/yui/button/assets/button-core.css >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/assets/skins/sam/button-skin.css b/koha-tmpl/intranet-tmpl/lib/yui/button/assets/skins/sam/button-skin.css >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/assets/skins/sam/button-skin.css >rename to koha-tmpl/intranet-tmpl/lib/yui/button/assets/skins/sam/button-skin.css >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/assets/skins/sam/button.css b/koha-tmpl/intranet-tmpl/lib/yui/button/assets/skins/sam/button.css >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/assets/skins/sam/button.css >rename to koha-tmpl/intranet-tmpl/lib/yui/button/assets/skins/sam/button.css >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/assets/skins/sam/menu-button-arrow-disabled.png b/koha-tmpl/intranet-tmpl/lib/yui/button/assets/skins/sam/menu-button-arrow-disabled.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/assets/skins/sam/menu-button-arrow-disabled.png >rename to koha-tmpl/intranet-tmpl/lib/yui/button/assets/skins/sam/menu-button-arrow-disabled.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/assets/skins/sam/menu-button-arrow.png b/koha-tmpl/intranet-tmpl/lib/yui/button/assets/skins/sam/menu-button-arrow.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/assets/skins/sam/menu-button-arrow.png >rename to koha-tmpl/intranet-tmpl/lib/yui/button/assets/skins/sam/menu-button-arrow.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/assets/skins/sam/split-button-arrow-active.png b/koha-tmpl/intranet-tmpl/lib/yui/button/assets/skins/sam/split-button-arrow-active.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/assets/skins/sam/split-button-arrow-active.png >rename to koha-tmpl/intranet-tmpl/lib/yui/button/assets/skins/sam/split-button-arrow-active.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/assets/skins/sam/split-button-arrow-disabled.png b/koha-tmpl/intranet-tmpl/lib/yui/button/assets/skins/sam/split-button-arrow-disabled.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/assets/skins/sam/split-button-arrow-disabled.png >rename to koha-tmpl/intranet-tmpl/lib/yui/button/assets/skins/sam/split-button-arrow-disabled.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/assets/skins/sam/split-button-arrow-focus.png b/koha-tmpl/intranet-tmpl/lib/yui/button/assets/skins/sam/split-button-arrow-focus.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/assets/skins/sam/split-button-arrow-focus.png >rename to koha-tmpl/intranet-tmpl/lib/yui/button/assets/skins/sam/split-button-arrow-focus.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/assets/skins/sam/split-button-arrow-hover.png b/koha-tmpl/intranet-tmpl/lib/yui/button/assets/skins/sam/split-button-arrow-hover.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/assets/skins/sam/split-button-arrow-hover.png >rename to koha-tmpl/intranet-tmpl/lib/yui/button/assets/skins/sam/split-button-arrow-hover.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/assets/skins/sam/split-button-arrow.png b/koha-tmpl/intranet-tmpl/lib/yui/button/assets/skins/sam/split-button-arrow.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/assets/skins/sam/split-button-arrow.png >rename to koha-tmpl/intranet-tmpl/lib/yui/button/assets/skins/sam/split-button-arrow.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/button-beta-min.js b/koha-tmpl/intranet-tmpl/lib/yui/button/button-beta-min.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/button-beta-min.js >rename to koha-tmpl/intranet-tmpl/lib/yui/button/button-beta-min.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/button-debug.js b/koha-tmpl/intranet-tmpl/lib/yui/button/button-debug.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/button-debug.js >rename to koha-tmpl/intranet-tmpl/lib/yui/button/button-debug.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/button-min.js b/koha-tmpl/intranet-tmpl/lib/yui/button/button-min.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/button-min.js >rename to koha-tmpl/intranet-tmpl/lib/yui/button/button-min.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/button.js b/koha-tmpl/intranet-tmpl/lib/yui/button/button.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/button/button.js >rename to koha-tmpl/intranet-tmpl/lib/yui/button/button.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/assets/alrt16_1.gif b/koha-tmpl/intranet-tmpl/lib/yui/container/assets/alrt16_1.gif >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/assets/alrt16_1.gif >rename to koha-tmpl/intranet-tmpl/lib/yui/container/assets/alrt16_1.gif >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/assets/blck16_1.gif b/koha-tmpl/intranet-tmpl/lib/yui/container/assets/blck16_1.gif >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/assets/blck16_1.gif >rename to koha-tmpl/intranet-tmpl/lib/yui/container/assets/blck16_1.gif >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/assets/close12_1.gif b/koha-tmpl/intranet-tmpl/lib/yui/container/assets/close12_1.gif >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/assets/close12_1.gif >rename to koha-tmpl/intranet-tmpl/lib/yui/container/assets/close12_1.gif >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/assets/container-core.css b/koha-tmpl/intranet-tmpl/lib/yui/container/assets/container-core.css >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/assets/container-core.css >rename to koha-tmpl/intranet-tmpl/lib/yui/container/assets/container-core.css >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/assets/container.css b/koha-tmpl/intranet-tmpl/lib/yui/container/assets/container.css >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/assets/container.css >rename to koha-tmpl/intranet-tmpl/lib/yui/container/assets/container.css >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/assets/hlp16_1.gif b/koha-tmpl/intranet-tmpl/lib/yui/container/assets/hlp16_1.gif >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/assets/hlp16_1.gif >rename to koha-tmpl/intranet-tmpl/lib/yui/container/assets/hlp16_1.gif >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/assets/info16_1.gif b/koha-tmpl/intranet-tmpl/lib/yui/container/assets/info16_1.gif >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/assets/info16_1.gif >rename to koha-tmpl/intranet-tmpl/lib/yui/container/assets/info16_1.gif >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/assets/skins/sam/container-skin.css b/koha-tmpl/intranet-tmpl/lib/yui/container/assets/skins/sam/container-skin.css >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/assets/skins/sam/container-skin.css >rename to koha-tmpl/intranet-tmpl/lib/yui/container/assets/skins/sam/container-skin.css >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/assets/skins/sam/container.css b/koha-tmpl/intranet-tmpl/lib/yui/container/assets/skins/sam/container.css >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/assets/skins/sam/container.css >rename to koha-tmpl/intranet-tmpl/lib/yui/container/assets/skins/sam/container.css >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/assets/tip16_1.gif b/koha-tmpl/intranet-tmpl/lib/yui/container/assets/tip16_1.gif >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/assets/tip16_1.gif >rename to koha-tmpl/intranet-tmpl/lib/yui/container/assets/tip16_1.gif >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/assets/warn16_1.gif b/koha-tmpl/intranet-tmpl/lib/yui/container/assets/warn16_1.gif >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/assets/warn16_1.gif >rename to koha-tmpl/intranet-tmpl/lib/yui/container/assets/warn16_1.gif >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/container-debug.js b/koha-tmpl/intranet-tmpl/lib/yui/container/container-debug.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/container-debug.js >rename to koha-tmpl/intranet-tmpl/lib/yui/container/container-debug.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/container-min.js b/koha-tmpl/intranet-tmpl/lib/yui/container/container-min.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/container-min.js >rename to koha-tmpl/intranet-tmpl/lib/yui/container/container-min.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/container.js b/koha-tmpl/intranet-tmpl/lib/yui/container/container.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/container.js >rename to koha-tmpl/intranet-tmpl/lib/yui/container/container.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/container_core-debug.js b/koha-tmpl/intranet-tmpl/lib/yui/container/container_core-debug.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/container_core-debug.js >rename to koha-tmpl/intranet-tmpl/lib/yui/container/container_core-debug.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/container_core-min.js b/koha-tmpl/intranet-tmpl/lib/yui/container/container_core-min.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/container_core-min.js >rename to koha-tmpl/intranet-tmpl/lib/yui/container/container_core-min.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/container_core.js b/koha-tmpl/intranet-tmpl/lib/yui/container/container_core.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/container/container_core.js >rename to koha-tmpl/intranet-tmpl/lib/yui/container/container_core.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/dragdrop/dragdrop-debug.js b/koha-tmpl/intranet-tmpl/lib/yui/dragdrop/dragdrop-debug.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/dragdrop/dragdrop-debug.js >rename to koha-tmpl/intranet-tmpl/lib/yui/dragdrop/dragdrop-debug.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/dragdrop/dragdrop-min.js b/koha-tmpl/intranet-tmpl/lib/yui/dragdrop/dragdrop-min.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/dragdrop/dragdrop-min.js >rename to koha-tmpl/intranet-tmpl/lib/yui/dragdrop/dragdrop-min.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/dragdrop/dragdrop.js b/koha-tmpl/intranet-tmpl/lib/yui/dragdrop/dragdrop.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/dragdrop/dragdrop.js >rename to koha-tmpl/intranet-tmpl/lib/yui/dragdrop/dragdrop.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/element/element-beta-min.js b/koha-tmpl/intranet-tmpl/lib/yui/element/element-beta-min.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/element/element-beta-min.js >rename to koha-tmpl/intranet-tmpl/lib/yui/element/element-beta-min.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/element/element-debug.js b/koha-tmpl/intranet-tmpl/lib/yui/element/element-debug.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/element/element-debug.js >rename to koha-tmpl/intranet-tmpl/lib/yui/element/element-debug.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/element/element-min.js b/koha-tmpl/intranet-tmpl/lib/yui/element/element-min.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/element/element-min.js >rename to koha-tmpl/intranet-tmpl/lib/yui/element/element-min.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/element/element.js b/koha-tmpl/intranet-tmpl/lib/yui/element/element.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/element/element.js >rename to koha-tmpl/intranet-tmpl/lib/yui/element/element.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/json/json-debug.js b/koha-tmpl/intranet-tmpl/lib/yui/json/json-debug.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/json/json-debug.js >rename to koha-tmpl/intranet-tmpl/lib/yui/json/json-debug.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/json/json-min.js b/koha-tmpl/intranet-tmpl/lib/yui/json/json-min.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/json/json-min.js >rename to koha-tmpl/intranet-tmpl/lib/yui/json/json-min.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/json/json.js b/koha-tmpl/intranet-tmpl/lib/yui/json/json.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/json/json.js >rename to koha-tmpl/intranet-tmpl/lib/yui/json/json.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow-disabled.png b/koha-tmpl/intranet-tmpl/lib/yui/menu-button-arrow-disabled.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow-disabled.png >rename to koha-tmpl/intranet-tmpl/lib/yui/menu-button-arrow-disabled.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow.png b/koha-tmpl/intranet-tmpl/lib/yui/menu-button-arrow.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow.png >rename to koha-tmpl/intranet-tmpl/lib/yui/menu-button-arrow.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menu-core.css b/koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menu-core.css >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menu-core.css >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menu-core.css >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menu.css b/koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menu.css >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menu.css >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menu.css >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menu_down_arrow.png b/koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menu_down_arrow.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menu_down_arrow.png >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menu_down_arrow.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menu_down_arrow_disabled.png b/koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menu_down_arrow_disabled.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menu_down_arrow_disabled.png >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menu_down_arrow_disabled.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menu_up_arrow.png b/koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menu_up_arrow.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menu_up_arrow.png >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menu_up_arrow.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menu_up_arrow_disabled.png b/koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menu_up_arrow_disabled.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menu_up_arrow_disabled.png >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menu_up_arrow_disabled.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menubaritem_submenuindicator.png b/koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menubaritem_submenuindicator.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menubaritem_submenuindicator.png >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menubaritem_submenuindicator.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menubaritem_submenuindicator_disabled.png b/koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menubaritem_submenuindicator_disabled.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menubaritem_submenuindicator_disabled.png >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menubaritem_submenuindicator_disabled.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menubaritem_submenuindicator_selected.png b/koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menubaritem_submenuindicator_selected.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menubaritem_submenuindicator_selected.png >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menubaritem_submenuindicator_selected.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menuitem_checkbox.png b/koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menuitem_checkbox.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menuitem_checkbox.png >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menuitem_checkbox.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menuitem_checkbox_disabled.png b/koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menuitem_checkbox_disabled.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menuitem_checkbox_disabled.png >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menuitem_checkbox_disabled.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menuitem_checkbox_selected.png b/koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menuitem_checkbox_selected.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menuitem_checkbox_selected.png >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menuitem_checkbox_selected.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menuitem_submenuindicator.png b/koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menuitem_submenuindicator.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menuitem_submenuindicator.png >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menuitem_submenuindicator.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menuitem_submenuindicator_disabled.png b/koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menuitem_submenuindicator_disabled.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menuitem_submenuindicator_disabled.png >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menuitem_submenuindicator_disabled.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menuitem_submenuindicator_selected.png b/koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menuitem_submenuindicator_selected.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/menuitem_submenuindicator_selected.png >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/assets/menuitem_submenuindicator_selected.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/skins/sam/menu-skin.css b/koha-tmpl/intranet-tmpl/lib/yui/menu/assets/skins/sam/menu-skin.css >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/skins/sam/menu-skin.css >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/assets/skins/sam/menu-skin.css >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/skins/sam/menu.css b/koha-tmpl/intranet-tmpl/lib/yui/menu/assets/skins/sam/menu.css >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/skins/sam/menu.css >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/assets/skins/sam/menu.css >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/skins/sam/menubaritem_submenuindicator.png b/koha-tmpl/intranet-tmpl/lib/yui/menu/assets/skins/sam/menubaritem_submenuindicator.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/skins/sam/menubaritem_submenuindicator.png >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/assets/skins/sam/menubaritem_submenuindicator.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/skins/sam/menubaritem_submenuindicator_disabled.png b/koha-tmpl/intranet-tmpl/lib/yui/menu/assets/skins/sam/menubaritem_submenuindicator_disabled.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/skins/sam/menubaritem_submenuindicator_disabled.png >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/assets/skins/sam/menubaritem_submenuindicator_disabled.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/skins/sam/menuitem_checkbox.png b/koha-tmpl/intranet-tmpl/lib/yui/menu/assets/skins/sam/menuitem_checkbox.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/skins/sam/menuitem_checkbox.png >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/assets/skins/sam/menuitem_checkbox.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/skins/sam/menuitem_checkbox_disabled.png b/koha-tmpl/intranet-tmpl/lib/yui/menu/assets/skins/sam/menuitem_checkbox_disabled.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/skins/sam/menuitem_checkbox_disabled.png >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/assets/skins/sam/menuitem_checkbox_disabled.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/skins/sam/menuitem_submenuindicator.png b/koha-tmpl/intranet-tmpl/lib/yui/menu/assets/skins/sam/menuitem_submenuindicator.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/skins/sam/menuitem_submenuindicator.png >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/assets/skins/sam/menuitem_submenuindicator.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/skins/sam/menuitem_submenuindicator_disabled.png b/koha-tmpl/intranet-tmpl/lib/yui/menu/assets/skins/sam/menuitem_submenuindicator_disabled.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/assets/skins/sam/menuitem_submenuindicator_disabled.png >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/assets/skins/sam/menuitem_submenuindicator_disabled.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/menu-debug.js b/koha-tmpl/intranet-tmpl/lib/yui/menu/menu-debug.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/menu-debug.js >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/menu-debug.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/menu-min.js b/koha-tmpl/intranet-tmpl/lib/yui/menu/menu-min.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/menu-min.js >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/menu-min.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/menu.js b/koha-tmpl/intranet-tmpl/lib/yui/menu/menu.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/menu.js >rename to koha-tmpl/intranet-tmpl/lib/yui/menu/menu.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/plugins/bubbling-min.js b/koha-tmpl/intranet-tmpl/lib/yui/plugins/bubbling-min.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/plugins/bubbling-min.js >rename to koha-tmpl/intranet-tmpl/lib/yui/plugins/bubbling-min.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/plugins/loading-min.js b/koha-tmpl/intranet-tmpl/lib/yui/plugins/loading-min.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/plugins/loading-min.js >rename to koha-tmpl/intranet-tmpl/lib/yui/plugins/loading-min.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/reset-fonts-grids.css b/koha-tmpl/intranet-tmpl/lib/yui/reset-fonts-grids.css >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/reset-fonts-grids.css >rename to koha-tmpl/intranet-tmpl/lib/yui/reset-fonts-grids.css >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-active.png b/koha-tmpl/intranet-tmpl/lib/yui/split-button-arrow-active.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-active.png >rename to koha-tmpl/intranet-tmpl/lib/yui/split-button-arrow-active.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-disabled.png b/koha-tmpl/intranet-tmpl/lib/yui/split-button-arrow-disabled.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-disabled.png >rename to koha-tmpl/intranet-tmpl/lib/yui/split-button-arrow-disabled.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-focus.png b/koha-tmpl/intranet-tmpl/lib/yui/split-button-arrow-focus.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-focus.png >rename to koha-tmpl/intranet-tmpl/lib/yui/split-button-arrow-focus.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-hover.png b/koha-tmpl/intranet-tmpl/lib/yui/split-button-arrow-hover.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-hover.png >rename to koha-tmpl/intranet-tmpl/lib/yui/split-button-arrow-hover.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow.png b/koha-tmpl/intranet-tmpl/lib/yui/split-button-arrow.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow.png >rename to koha-tmpl/intranet-tmpl/lib/yui/split-button-arrow.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/sprite.png b/koha-tmpl/intranet-tmpl/lib/yui/sprite.png >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/sprite.png >rename to koha-tmpl/intranet-tmpl/lib/yui/sprite.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/utilities/utilities.js b/koha-tmpl/intranet-tmpl/lib/yui/utilities/utilities.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/utilities/utilities.js >rename to koha-tmpl/intranet-tmpl/lib/yui/utilities/utilities.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/yahoo-dom-event/yahoo-dom-event.js b/koha-tmpl/intranet-tmpl/lib/yui/yahoo-dom-event/yahoo-dom-event.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/lib/yui/yahoo-dom-event/yahoo-dom-event.js >rename to koha-tmpl/intranet-tmpl/lib/yui/yahoo-dom-event/yahoo-dom-event.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css b/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css >similarity index 94% >rename from koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css >rename to koha-tmpl/intranet-tmpl/prog/css/addbiblio.css >index 6098d4a..b8c6da3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css >+++ b/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css >@@ -127,7 +127,7 @@ a.tagnum { > .linktools a:first-child { border-bottom: 1px solid #DDD; } > .linktools a:hover { background-color: #FFC; } > .subfield_controls { margin : 0 .5em; } >-.readonly { border-width : 1px; border-style: inset; padding-left : 15px; background: #EEE url(../../img/locked.png) center left no-repeat; width:29em; } >+.readonly { border-width : 1px; border-style: inset; padding-left : 15px; background: #EEE url(../img/locked.png) center left no-repeat; width:29em; } > > #cataloguing_additem_itemlist { > margin-bottom : 1em; >@@ -157,7 +157,7 @@ tbody tr.active td { > z-index: 1000; > } > #loading div { >- background : transparent url(../../img/loading.gif) top left no-repeat; >+ background : transparent url(../img/loading.gif) top left no-repeat; > font-size : 175%; > font-weight: bold; > height: 2em; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/buttons.dataTables.min.css b/koha-tmpl/intranet-tmpl/prog/css/buttons.dataTables.min.css >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/css/buttons.dataTables.min.css >rename to koha-tmpl/intranet-tmpl/prog/css/buttons.dataTables.min.css >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/cateditor.css b/koha-tmpl/intranet-tmpl/prog/css/cateditor.css >similarity index 97% >rename from koha-tmpl/intranet-tmpl/prog/en/css/cateditor.css >rename to koha-tmpl/intranet-tmpl/prog/css/cateditor.css >index 882ddf2..bb92094b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/css/cateditor.css >+++ b/koha-tmpl/intranet-tmpl/prog/css/cateditor.css >@@ -16,7 +16,7 @@ body { > } > > #loading div { >- background : transparent url(../../img/loading.gif) top left no-repeat; >+ background : transparent url(../img/loading.gif) top left no-repeat; > font-size : 175%; > font-weight: bold; > height: 2em; >@@ -286,7 +286,7 @@ body { > display: inline-block; > height: 16px; > width: 16px; >- background: transparent url("../../img/spinner-small.gif") top left no-repeat; >+ background: transparent url("../img/spinner-small.gif") top left no-repeat; > padding: -1px; > vertical-align: text-top; > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css b/koha-tmpl/intranet-tmpl/prog/css/datatables.css >similarity index 80% >rename from koha-tmpl/intranet-tmpl/prog/en/css/datatables.css >rename to koha-tmpl/intranet-tmpl/prog/css/datatables.css >index 2912f8c..c42e553 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css >+++ b/koha-tmpl/intranet-tmpl/prog/css/datatables.css >@@ -3,23 +3,23 @@ input.search_init { > } > .sorting_asc { > padding-right: 19px; >- background: url("../../img/asc.gif") no-repeat scroll right center #EEEEEE; >+ background: url("../img/asc.gif") no-repeat scroll right center #EEEEEE; > } > .sorting_desc { > padding-right: 19px; >- background: url("../../img/desc.gif") no-repeat scroll right center #EEEEEE; >+ background: url("../img/desc.gif") no-repeat scroll right center #EEEEEE; > } > .sorting { > padding-right: 19px; >- background: url("../../img/ascdesc.gif") no-repeat scroll right center #EEEEEE; >+ background: url("../img/ascdesc.gif") no-repeat scroll right center #EEEEEE; > } > .sorting_asc_disabled { > padding-right: 19px; >- background: url("../../img/datatables/sort_asc_disabled.png") no-repeat scroll right center #EEEEEE; >+ background: url("../img/datatables/sort_asc_disabled.png") no-repeat scroll right center #EEEEEE; > } > .sorting_desc_disabled { > padding-right: 19px; >- background: url("../../img/datatables/sort_desc_disabled.png") no-repeat scroll right center #EEEEEE; >+ background: url("../img/datatables/sort_desc_disabled.png") no-repeat scroll right center #EEEEEE; > } > .sorting_disabled { > padding-right: 19px; >@@ -89,25 +89,25 @@ div.dataTables_paginate { > } > .paging_full_numbers a.paginate_button.first { > background-color: transparent; >- background-image : url('../../img/first.png'); >+ background-image : url('../img/first.png'); > background-position : 3px center; > padding-left : 23px; > } > .paging_full_numbers a.paginate_button.previous { > background-color: transparent; >- background-image : url('../../img/prev.png'); >+ background-image : url('../img/prev.png'); > background-position : 3px center; > padding-left : 23px; > } > .paging_full_numbers a.paginate_button.next { > background-color: transparent; >- background-image : url('../../img/next.png'); >+ background-image : url('../img/next.png'); > background-position : 93% center; > padding-right : 25px; > } > .paging_full_numbers a.paginate_button.last { > background-color: transparent; >- background-image : url('../../img/last.png'); >+ background-image : url('../img/last.png'); > background-position : 93% center; > border-right : 0; > padding-right : 25px; >@@ -184,31 +184,31 @@ div.dataTables_paginate.paging_four_button { > } > > .paginate_disabled_first { >- background: transparent url("../../img/first-disabled.png") no-repeat 3px top; >+ background: transparent url("../img/first-disabled.png") no-repeat 3px top; > } > .paginate_enabled_first { >- background: transparent url("../../img/first.png") no-repeat 3px top; >+ background: transparent url("../img/first.png") no-repeat 3px top; > cursor: pointer; > } > .paginate_disabled_previous { >- background: transparent url("../../img/prev-disabled.png") no-repeat 3px top; >+ background: transparent url("../img/prev-disabled.png") no-repeat 3px top; > } > .paginate_enabled_previous { >- background: transparent url("../../img/prev.png") no-repeat 3px top; >+ background: transparent url("../img/prev.png") no-repeat 3px top; > cursor: pointer; > } > .paginate_disabled_next { >- background: transparent url("../../img/next-disabled.png") no-repeat right top; >+ background: transparent url("../img/next-disabled.png") no-repeat right top; > } > .paginate_enabled_next { >- background: transparent url("../../img/next.png") no-repeat right top; >+ background: transparent url("../img/next.png") no-repeat right top; > cursor: pointer; > } > .paginate_disabled_last { >- background: transparent url("../../img/last-disabled.png") no-repeat right top; >+ background: transparent url("../img/last-disabled.png") no-repeat right top; > } > .paginate_enabled_last { >- background: transparent url("../../img/last.png") no-repeat right top; >+ background: transparent url("../img/last.png") no-repeat right top; > cursor: pointer; > } > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/help.css b/koha-tmpl/intranet-tmpl/prog/css/help.css >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/css/help.css >rename to koha-tmpl/intranet-tmpl/prog/css/help.css >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/hierarchy.css b/koha-tmpl/intranet-tmpl/prog/css/hierarchy.css >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/css/hierarchy.css >rename to koha-tmpl/intranet-tmpl/prog/css/hierarchy.css >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/humanmsg.css b/koha-tmpl/intranet-tmpl/prog/css/humanmsg.css >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/css/humanmsg.css >rename to koha-tmpl/intranet-tmpl/prog/css/humanmsg.css >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/itemsearchform.css b/koha-tmpl/intranet-tmpl/prog/css/itemsearchform.css >similarity index 84% >rename from koha-tmpl/intranet-tmpl/prog/en/css/itemsearchform.css >rename to koha-tmpl/intranet-tmpl/prog/css/itemsearchform.css >index 34c76de..8edc941 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/css/itemsearchform.css >+++ b/koha-tmpl/intranet-tmpl/prog/css/itemsearchform.css >@@ -31,11 +31,11 @@ th.active { > } > > th.sort-asc { >- background-image: url('../../img/asc.gif'); >+ background-image: url('../img/asc.gif'); > } > > th.sort-desc { >- background-image: url('../../img/desc.gif'); >+ background-image: url('../img/desc.gif'); > } > > th select { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/login.css b/koha-tmpl/intranet-tmpl/prog/css/login.css >similarity index 98% >rename from koha-tmpl/intranet-tmpl/prog/en/css/login.css >rename to koha-tmpl/intranet-tmpl/prog/css/login.css >index 61988a2..14f2714 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/css/login.css >+++ b/koha-tmpl/intranet-tmpl/prog/css/login.css >@@ -78,7 +78,7 @@ label { > } > > #login h1 { >- background: url(../../img/koha-logo.gif) no-repeat top center; >+ background: url(../img/koha-logo.gif) no-repeat top center; > margin-top: 0; > margin-bottom : .5em; > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css b/koha-tmpl/intranet-tmpl/prog/css/mainpage.css >similarity index 97% >rename from koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css >rename to koha-tmpl/intranet-tmpl/prog/css/mainpage.css >index a0abee3..ded0003 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css >+++ b/koha-tmpl/intranet-tmpl/prog/css/mainpage.css >@@ -13,7 +13,7 @@ > > #doc3 { > /* Contains the news + both columns of links + pending box + userblock box */ >- background-image:url('../../img/background_koha_logo.png'); >+ background-image:url('../img/background_koha_logo.png'); > background-repeat:no-repeat; > background-position:left top; > padding-top: 12px; >@@ -72,7 +72,7 @@ ul.biglinks-list li { > > ul.biglinks-list li a.icon_general { > /* Class used for each module link */ >- background-image:url('../../img/staff-home-icons-sprite.png'); >+ background-image:url('../img/staff-home-icons-sprite.png'); > display: block; > float: left; > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/preferences.css b/koha-tmpl/intranet-tmpl/prog/css/preferences.css >similarity index 83% >rename from koha-tmpl/intranet-tmpl/prog/en/css/preferences.css >rename to koha-tmpl/intranet-tmpl/prog/css/preferences.css >index 7640a29..b004267 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/css/preferences.css >+++ b/koha-tmpl/intranet-tmpl/prog/css/preferences.css >@@ -51,13 +51,13 @@ h3 { > } > > h3.expanded { >- background : transparent url("../../img/collapse.gif") 0 6px no-repeat; >+ background: transparent url("../img/collapse.gif") 0 6px no-repeat; > cursor : pointer; > padding-left : 12px; > } > > h3.collapsed { >- background : transparent url("../../img/expand.gif") 0 6px no-repeat; >+ background: transparent url("../img/expand.gif") 0 6px no-repeat; > cursor : pointer; > padding-left : 12px; > } >@@ -79,7 +79,7 @@ h3.collapsed { > display: inline-block; > height : 16px; > width: 16px; >- background: transparent url("../../img/spinner-small.gif") top left no-repeat; >+ background: transparent url("../img/spinner-small.gif") top left no-repeat; > padding : 0 4px; > vertical-align: middle; > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/print.css b/koha-tmpl/intranet-tmpl/prog/css/print.css >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/css/print.css >rename to koha-tmpl/intranet-tmpl/prog/css/print.css >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css b/koha-tmpl/intranet-tmpl/prog/css/printreceiptinvoice.css >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css >rename to koha-tmpl/intranet-tmpl/prog/css/printreceiptinvoice.css >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/quotes.css b/koha-tmpl/intranet-tmpl/prog/css/quotes.css >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/css/quotes.css >rename to koha-tmpl/intranet-tmpl/prog/css/quotes.css >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/right-to-left.css b/koha-tmpl/intranet-tmpl/prog/css/right-to-left.css >similarity index 96% >rename from koha-tmpl/intranet-tmpl/prog/en/css/right-to-left.css >rename to koha-tmpl/intranet-tmpl/prog/css/right-to-left.css >index ef8d51b..fb59844 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/css/right-to-left.css >+++ b/koha-tmpl/intranet-tmpl/prog/css/right-to-left.css >@@ -332,7 +332,7 @@ ul#toplevelmenu { > float: right; > } > #cartmenulink { >- background: url("../../img/cart-small.gif") no-repeat scroll right center transparent; >+ background: url("../img/cart-small.gif") no-repeat scroll right center transparent; > padding-right: 15px; > } > >@@ -401,12 +401,12 @@ p label, { > > /*the arrwos in pref.*/ > h3.expanded { >- background: url("../../img/collapse.gif") no-repeat scroll right 6px transparent; >+ background: url("../img/collapse.gif") no-repeat scroll right 6px transparent; > cursor: pointer; > padding-right: 12px; > } > h3.collapsed { >- background: url("../../img/expand.gif") no-repeat scroll right 6px transparent; >+ background: url("../img/expand.gif") no-repeat scroll right 6px transparent; > cursor: pointer; > padding-right: 12px; > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/spinelabel.css b/koha-tmpl/intranet-tmpl/prog/css/spinelabel.css >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/css/spinelabel.css >rename to koha-tmpl/intranet-tmpl/prog/css/spinelabel.css >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css >similarity index 95% >rename from koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css >rename to koha-tmpl/intranet-tmpl/prog/css/staff-global.css >index a638129..09c3668 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css >+++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css >@@ -1,4 +1,4 @@ >-@import url("../lib/yui/reset-fonts-grids.css") screen; >+@import url("../../lib/yui/reset-fonts-grids.css") screen; > > input:focus, textarea:focus { > border-color:#538200; >@@ -25,7 +25,7 @@ a:hover, a:active { > } > > a.popup { >- background : transparent url("../../img/pop-up-link.png") center right no-repeat; >+ background : transparent url("../img/pop-up-link.png") center right no-repeat; > padding-right : 15px; > } > >@@ -119,7 +119,7 @@ input, textarea { > > #navmenulist li { > padding : .2em 0; >- list-style-image : url("../../img/arrow-bullet.gif"); >+ list-style-image : url("../img/arrow-bullet.gif"); > border-bottom : 1px solid #EEE; > } > >@@ -776,21 +776,21 @@ fieldset.rows .inputnote { > } > #new_course a, #newbiblio a, #addchild a, #newentry a, #newshelf a, #newmenuc .first-child, #newsupplier .first-child, #newlabel a, #newtemplate a, #newlabelbatch a, #newpatroncardbatch a, #newprofile a, #newsubscription a, #newdictionary a, #newbasket a, #newrootbudget-button, #budgets_menuc .first-child { > padding-left : 34px; >- background-image: url("../../img/toolbar-new.gif"); >+ background-image: url("../img/toolbar-new.gif"); > background-position : center left; > background-repeat : no-repeat; > } > > #changepassword a { > padding-left : 34px; >- background-image: url("../../img/toolbar-password.gif"); >+ background-image: url("../img/toolbar-password.gif"); > background-position : center left; > background-repeat : no-repeat; > } > > #manageorders a { > padding-left : 34px; >- background-image: url("../../img/toolbar-orders.gif"); >+ background-image: url("../img/toolbar-orders.gif"); > background-position : center left; > background-repeat : no-repeat; > } >@@ -798,7 +798,7 @@ fieldset.rows .inputnote { > > #savemenuc .first-child, #addbiblio .first-child { > padding-left : 34px; >- background-image: url("../../img/toolbar-save.gif"); >+ background-image: url("../img/toolbar-save.gif"); > background-position : center left; > background-repeat : no-repeat; > } >@@ -815,42 +815,42 @@ fieldset.rows .inputnote { > #manageprofile a, > #periods_menuc .first-child { > padding-left : 34px; >- background-image: url("../../img/toolbar-edit.gif"); >+ background-image: url("../img/toolbar-edit.gif"); > background-position : center left; > background-repeat : no-repeat; > } > > #duplicate a { > padding-left : 34px; >- background-image: url("../../img/toolbar-duplicate.gif"); >+ background-image: url("../img/toolbar-duplicate.gif"); > background-position : center left; > background-repeat : no-repeat; > } > > #receive a { > padding-left : 34px; >- background-image: url("../../img/toolbar-receive.gif"); >+ background-image: url("../img/toolbar-receive.gif"); > background-position : center left; > background-repeat : no-repeat; > } > > #renew a { > padding-left : 34px; >- background-image: url("../../img/toolbar-renew.gif"); >+ background-image: url("../img/toolbar-renew.gif"); > background-position : center left; > background-repeat : no-repeat; > } > > #deletebiblio button, #deletebiblio a, #deletepatron a, #deleteshelf .first-child, #delete a { > padding-left : 34px; >- background-image: url("../../img/toolbar-delete.gif"); >+ background-image: url("../img/toolbar-delete.gif"); > background-position : center left; > background-repeat : no-repeat; > } > > #z3950search .first-child { > padding-left : 34px; >- background-image: url("../../img/toolbar-search.gif"); >+ background-image: url("../img/toolbar-search.gif"); > background-position : center left; > background-repeat : no-repeat; > } >@@ -878,14 +878,14 @@ fieldset.rows .inputnote { > > #printbiblio button, #printbiblio a, #printmenuc .first-child { > padding-left : 34px; >- background-image: url("../../img/toolbar-print.gif"); >+ background-image: url("../img/toolbar-print.gif"); > background-position : center left; > background-repeat : no-repeat; > } > > #addtoshelf button, #addtoshelf a { > padding-left : 34px; >- background-image: url("../../img/toolbar-add-to-shelf.gif"); >+ background-image: url("../img/toolbar-add-to-shelf.gif"); > background-position : center left; > background-repeat : no-repeat; > } >@@ -894,7 +894,7 @@ fieldset.rows .inputnote { > #placehold button, > #holdfor .first-child { > padding-left : 34px; >- background-image: url("../../img/toolbar-hold.gif"); >+ background-image: url("../img/toolbar-hold.gif"); > background-position : center left; > background-repeat : no-repeat; > } >@@ -1046,7 +1046,7 @@ div.help { > } > > .circmessage li { >- list-style : url(../../img/arrow-bullet.gif); >+ list-style : url(../img/arrow-bullet.gif); > margin-bottom : .2em; > } > >@@ -1110,13 +1110,13 @@ div.first fieldset { > } > > .dialog input.save { >- background: #fff url(../../img/toolbar-save.gif) no-repeat 4px center; >+ background: #fff url(../img/toolbar-save.gif) no-repeat 4px center; > color:black; > padding: .4em .4em .4em 34px; > } > > .dialog input.edit { >- background: #fff url(../../img/toolbar-edit.gif) no-repeat 4px center; >+ background: #fff url(../img/toolbar-edit.gif) no-repeat 4px center; > color:black; > max-width : 13em; > padding: .4em .4em .4em 34px; >@@ -1124,7 +1124,7 @@ div.first fieldset { > } > > .dialog input.new { >- background: #fff url(../../img/toolbar-new.gif) no-repeat 4px center; >+ background: #fff url(../img/toolbar-new.gif) no-repeat 4px center; > color:black; > max-width : 13em; > padding: .4em .4em .4em 34px; >@@ -1132,7 +1132,7 @@ div.first fieldset { > } > > .dialog input.print { >- background : #FFF url(../../img/print-confirm.gif) no-repeat 4px center; >+ background : #FFF url(../img/print-confirm.gif) no-repeat 4px center; > padding : .4em .4em .4em 25px; > } > >@@ -1199,12 +1199,12 @@ div.alert strong { > } > > a.clear-field { >- background : transparent url("../../img/clear-field.png") center left no-repeat; >+ background: transparent url("../img/clear-field.png") center left no-repeat; > padding-left : 16px; > } > > a.clone-field { >- background : transparent url("../../img/clone-field.png") center left no-repeat; >+ background: transparent url("../img/clone-field.png") center left no-repeat; > padding-left : 20px; > } > >@@ -1215,15 +1215,15 @@ a.document { > } > > a.pdf { >- background-image : url("../../img/famfamfam/silk/page_white_acrobat.png"); >+ background-image: url("../img/famfamfam/silk/page_white_acrobat.png"); > } > > a.csv { >- background-image : url("../../img/famfamfam/silk/page_white_excel.png"); >+ background-image: url("../img/famfamfam/silk/page_white_excel.png"); > } > > a.xml { >- background-image : url("../../img/famfamfam/silk/page_white_code.png"); >+ background-image: url("../img/famfamfam/silk/page_white_code.png"); > } > > div.message { >@@ -1385,7 +1385,7 @@ h1#logo { > width:180px; > } > h1#logo { >- background:transparent url(../../img/koha-logo-medium.gif) no-repeat scroll 0%; >+ background: transparent url(../img/koha-logo-medium.gif) no-repeat scroll 0%; > margin:0.75em .3em 0.75em .7em; > } > >@@ -1477,7 +1477,7 @@ li.email { > > #searchresults ul li { > font-size : 90%; >- list-style : url(../../img/item-bullet.gif); >+ list-style: url(../img/item-bullet.gif); > padding : .2em 0; > clear : left; > } >@@ -1678,7 +1678,7 @@ ul li input.submit { > } > > input.warning { >- background : #FFF url(../../img/famfamfam/silk/error.png) no-repeat 4px center; >+ background: #FFF url(../img/famfamfam/silk/error.png) no-repeat 4px center; > padding : 0.25em 0.25em 0.25em 25px; > } > >@@ -1792,7 +1792,7 @@ span.permissiondesc { > z-index : 50; > } > #cartmenulink { >- background: transparent url("../../img/cart-small.gif") left center no-repeat; >+ background: transparent url("../img/cart-small.gif") left center no-repeat; > padding-left : 15px; > } > #cartmenulink span#basketcount span { >@@ -2060,7 +2060,7 @@ div#acqui_order_supplierlist > div.supplier > div.baskets { > color: #212121; > } > .ui-autocomplete-loading { >- background: #FFF url("../../img/loading-small.gif") right center no-repeat; >+ background: #FFF url("../img/loading-small.gif") right center no-repeat; > } > > /* jQuery UI standard tabs */ >@@ -2458,8 +2458,8 @@ a.btn:visited{ > a.dropdown-toggle { > white-space: nowrap; > } >-[class^="icon-"],[class*=" icon-"]{background-image:url("../../img/glyphicons-halflings-koha.png");} >-.icon-white,.nav-tabs>.active>a>[class^="icon-"],.nav-tabs>.active>a>[class*=" icon-"],.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"]{background-image:url("../../img/glyphicons-halflings-white-koha.png");} >+[class^="icon-"],[class*=" icon-"]{background-image:url("../img/glyphicons-halflings-koha.png");} >+.icon-white,.nav-tabs>.active>a>[class^="icon-"],.nav-tabs>.active>a>[class*=" icon-"],.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"]{background-image:url("../img/glyphicons-halflings-white-koha.png");} > a.disabled { > color : #999999; > } >@@ -2603,7 +2603,7 @@ fieldset.rows table.mceListBox { > > #jobpanel,#jobstatus,#jobfailed { display : none; } > #jobstatus { margin:.4em; } >-#jobprogress{ width:200px;height:10px;border:1px solid #666;background:url('../../img/progress.png') -300px 0px no-repeat; } >+#jobprogress{ width:200px;height:10px;border:1px solid #666;background:url('../img/progress.png') -300px 0px no-repeat; } > #selections { width : 100%; white-space : normal; } > #selections span { margin:3px;padding:3px;background-color:#EBF3FF;-moz-border-radius:5px;border-radius:5px;white-space:nowrap;line-height:240%;font-size:75%; } > #selections span.selected { background-color : #CCE0FC; } >@@ -2637,7 +2637,7 @@ div#toolbar.floating, > } > > .tag_editor { >- background: transparent url("../../img/edit-tag.png") top left no-repeat; >+ background: transparent url("../img/edit-tag.png") top left no-repeat; > display : block; > float : left; > width : 16px; >@@ -2719,7 +2719,7 @@ span.browse-button { > z-index: 1000; > } > .loading-overlay div { >- background : transparent url(../../img/loading.gif) top left no-repeat; >+ background : transparent url(../img/loading.gif) top left no-repeat; > font-size : 175%; > font-weight: bold; > height: 2em; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/tinymce.css b/koha-tmpl/intranet-tmpl/prog/css/tinymce.css >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/css/tinymce.css >rename to koha-tmpl/intranet-tmpl/prog/css/tinymce.css >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/file.gif b/koha-tmpl/intranet-tmpl/prog/css/treeview/images/file.gif >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/file.gif >rename to koha-tmpl/intranet-tmpl/prog/css/treeview/images/file.gif >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/folder-closed.gif b/koha-tmpl/intranet-tmpl/prog/css/treeview/images/folder-closed.gif >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/folder-closed.gif >rename to koha-tmpl/intranet-tmpl/prog/css/treeview/images/folder-closed.gif >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/folder.gif b/koha-tmpl/intranet-tmpl/prog/css/treeview/images/folder.gif >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/folder.gif >rename to koha-tmpl/intranet-tmpl/prog/css/treeview/images/folder.gif >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/minus.gif b/koha-tmpl/intranet-tmpl/prog/css/treeview/images/minus.gif >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/minus.gif >rename to koha-tmpl/intranet-tmpl/prog/css/treeview/images/minus.gif >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/plus.gif b/koha-tmpl/intranet-tmpl/prog/css/treeview/images/plus.gif >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/plus.gif >rename to koha-tmpl/intranet-tmpl/prog/css/treeview/images/plus.gif >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/treeview-black-line.gif b/koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-black-line.gif >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/treeview-black-line.gif >rename to koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-black-line.gif >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/treeview-black.gif b/koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-black.gif >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/treeview-black.gif >rename to koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-black.gif >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/treeview-default-line.gif b/koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-default-line.gif >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/treeview-default-line.gif >rename to koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-default-line.gif >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/treeview-default.gif b/koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-default.gif >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/treeview-default.gif >rename to koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-default.gif >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/treeview-famfamfam-line.gif b/koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-famfamfam-line.gif >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/treeview-famfamfam-line.gif >rename to koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-famfamfam-line.gif >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/treeview-famfamfam.gif b/koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-famfamfam.gif >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/treeview-famfamfam.gif >rename to koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-famfamfam.gif >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/treeview-gray-line.gif b/koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-gray-line.gif >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/treeview-gray-line.gif >rename to koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-gray-line.gif >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/treeview-gray.gif b/koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-gray.gif >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/treeview-gray.gif >rename to koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-gray.gif >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/treeview-red-line.gif b/koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-red-line.gif >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/treeview-red-line.gif >rename to koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-red-line.gif >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/treeview-red.gif b/koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-red.gif >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/css/treeview/images/treeview-red.gif >rename to koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-red.gif >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/treeview/jquery.treeview.css b/koha-tmpl/intranet-tmpl/prog/css/treeview/jquery.treeview.css >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/css/treeview/jquery.treeview.css >rename to koha-tmpl/intranet-tmpl/prog/css/treeview/jquery.treeview.css >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/uploader.css b/koha-tmpl/intranet-tmpl/prog/css/uploader.css >similarity index 93% >rename from koha-tmpl/intranet-tmpl/prog/en/css/uploader.css >rename to koha-tmpl/intranet-tmpl/prog/css/uploader.css >index e48af29..0184955 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/css/uploader.css >+++ b/koha-tmpl/intranet-tmpl/prog/css/uploader.css >@@ -20,7 +20,7 @@ > } > #server_response { > background-color: white; >- background-image: url("../../img/x_alt_16x16.png"); >+ background-image: url("../img/x_alt_16x16.png"); > background-repeat: no-repeat; > background-origin: padding-box; > background-position: right top; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc >index fff2fda..40626f5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc >@@ -1,5 +1,5 @@ > [% INCLUDE 'format_price.inc' %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/buttons.dataTables.min.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/buttons.dataTables.min.css" /> > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.min.js"></script> > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/dataTables.buttons.min.js"></script> > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/buttons.colVis.min.js"></script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc >index 31d9a47..c564793 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc >@@ -1,4 +1,4 @@ > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/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" /> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc >index d9d65ad..2dfba4b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc >@@ -21,9 +21,9 @@ > <link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/jquery-ui-1.11.4.min.css" /> > <link rel="stylesheet" type="text/css" href="[% interface %]/lib/bootstrap/bootstrap.min.css" /> > <link rel="stylesheet" type="text/css" href="[% interface %]/lib/font-awesome/css/font-awesome.min.css" /> >-<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" /> > [% INCLUDE intranetstylesheet.inc %] >-[% IF ( bidi ) %]<link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" />[% END %] >+[% IF ( bidi ) %]<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left.css" />[% END %] > > <script type="text/javascript" src="[% interface %]/lib/jquery/jquery-2.2.3.min.js"></script> > <script type="text/javascript" src="[% interface %]/lib/jquery/jquery-migrate-1.3.0.min.js"></script> >@@ -35,7 +35,7 @@ > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.validate.min.js"></script> > > [% IF ( login ) %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/login.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/login.css" /> > [% END %] > [% IF ( IntranetUserCSS ) %]<style type="text/css">[% IntranetUserCSS %]</style>[% END %] > >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 0baef8c..330ca33 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc >@@ -3,10 +3,10 @@ > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" /> > <link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/jquery-ui-1.11.4.min.css" /> >-<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" /> > [% INCLUDE intranetstylesheet.inc %] > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left.css" /> > [% END %] > <script type="text/javascript" src="[% interface %]/lib/jquery/jquery-2.2.3.min.js"></script> > <script type="text/javascript" src="[% interface %]/lib/jquery/jquery-migrate-1.3.0.min.js"></script> >@@ -15,6 +15,6 @@ > <!-- koha core js --> > <script type="text/javascript" src="[% themelang %]/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" class="help"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc >index fc30f48..a4b435c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc >@@ -3,7 +3,7 @@ > <style type="text/css" media="screen"> > > [% IF ( login ) %] >- @import url([% themelang %]/css/login.css); >+ @import url([% interface %]/[% theme %]/css/login.css); > [% END %] > > html { background: #eee; } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc >index 8c5af96..54ead22 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc >@@ -2,7 +2,7 @@ > [% IF (intranetstylesheet.match('^https?:|^\/')) %] > <link rel="stylesheet" type="text/css" href="[% intranetstylesheet %]" /> > [% ELSE %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% intranetstylesheet %]" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/[% intranetstylesheet %]" /> > [% END %] > > <!-- local colors --> >@@ -10,6 +10,6 @@ > [% IF (intranetcolorstylesheet.match('^https?:|^\/')) %] > <link rel="stylesheet" type="text/css" href="[% intranetcolorstylesheet %]" /> > [% ELSE %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% intranetcolorstylesheet %]" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/[% intranetcolorstylesheet %]" /> > [% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc >index 6bbe401..89230df 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc >@@ -46,7 +46,7 @@ tinyMCE.init({ > mode : "specific_textareas", > editor_selector : "mce", > theme : "advanced", >- content_css : "[% themelang %]/css/tinymce.css", >+ content_css : "[% interface %]/[% theme %]/css/tinymce.css", > plugins : "table,save,advhr,advlink,contextmenu,advimage", > theme_advanced_buttons1 : "bold,italic,|,cut,copy,paste,|,justifyleft,justifycenter,justifyright,justifyfull,|,formatselect,|,image,link,unlink,anchor,cleanup,help,code,advhr,", > theme_advanced_buttons2 : "tablecontrols,|,bullist,numlist,|,outdent,indent,|,undo,redo,|,removeformat,|,visualaid,|,sub,sup,|,charmap|,forecolor,backcolor", >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >index 112a4ab..cb05068 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >@@ -2,7 +2,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions</title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > <link href="[% interface %]/lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css" rel="stylesheet" type="text/css" /> > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/treetable/jquery.treetable.js"></script> >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 36bf23d..b40da8b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -7,7 +7,7 @@ > › Batch list > [% END %] > </title> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > <style type="text/css">#dataPreview { width : 80%; margin-left : -40%; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } }</style> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] >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 9ab28be..dd61251 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -4,7 +4,7 @@ > > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno %]) for [% name|html %]</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' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >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 e2dac37..8327140 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >@@ -1,19 +1,19 @@ > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Basket grouping for [% booksellername |html %]</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' %] > [% INCLUDE 'datatables.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/yui/utilities/utilities.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/yui/button/button-min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/yui/container/container_core-min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/yui/menu/menu-min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/yui/utilities/utilities.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/yui/button/button-min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/yui/container/container_core-min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/yui/menu/menu-min.js"></script> > <script type="text/javascript" src="[% themelang %]/js/basketgroup.js"></script> > [% IF ( grouping ) %] >-<script type="text/javascript" src="[% themelang %]/lib/yui/yahoo-dom-event/yahoo-dom-event.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/yui/animation/animation-min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/yui/dragdrop/dragdrop-min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/yui/element/element-min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/yui/yahoo-dom-event/yahoo-dom-event.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/yui/animation/animation-min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/yui/dragdrop/dragdrop-min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/yui/element/element-min.js"></script> > <style type="text/css"> > /*margin and padding on body element > can introduce errors in determining >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 2a5feb9..ff92a91 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >@@ -7,7 +7,7 @@ > vertical-align: top; > } > </style> >-<link rel="stylesheet" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >index 168b12a..daf8096 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >@@ -1,6 +1,6 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions</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' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >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 988fd27..a3ef54a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >@@ -2,7 +2,7 @@ > [% USE ColumnsSettings %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › [% IF ( order_loop ) %]Orders search › Search results[% ELSE %]Order search[% END %]</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' %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt >index b2e26aa..92c31fe 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt >@@ -2,7 +2,7 @@ > > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Invoice › Files</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' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >index 59e20f9..f41e2af 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >@@ -4,7 +4,7 @@ > > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Invoice</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' %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >index e458af1..c5f386d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >@@ -2,7 +2,7 @@ > > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Invoices</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' %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'calendar.inc' %] >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 5bebcb6..ad3270b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >@@ -3,7 +3,7 @@ > [% USE ColumnsSettings %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Late orders</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' %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >index 037dc10..baf70cf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >@@ -1,6 +1,6 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Search existing records</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' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >index d6e65a0..de7d0ff 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >@@ -3,7 +3,7 @@ > [% USE Koha %] > [% 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' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >index 5d996fb..35a9bdb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >@@ -1,6 +1,6 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Add order from a suggestion</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' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >index bc9de26..022113a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >@@ -2,7 +2,7 @@ > [% USE ItemTypes %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Ordered</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' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >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 05de288..3172675 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -5,7 +5,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › [% IF ( date ) %] > Receipt summary for [% name %] [% IF ( invoice ) %]invoice [% invoice %][% END %] on [% datereceived | $KohaDates %][% ELSE %]Receive orders from [% name %][% END %]</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' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script> >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 613098d..a155061 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >@@ -1,7 +1,7 @@ > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Receive shipment from vendor [% name %]</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' %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >index 754c200..bb9485e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >@@ -2,7 +2,7 @@ > [% USE ItemTypes %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Spent</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' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >index c50629c..c71188e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >@@ -77,7 +77,7 @@ > > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Vendor [% bookselname %]</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' %] > [% INCLUDE 'datatables.inc' %] > >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 df50898..6a13bf4 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 @@ > [% USE Koha %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › [% IF ( booksellername ) %]Orders with uncertain prices for vendor [% booksellername %][% ELSE %]Orders with uncertain prices[% END %]</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' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >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 6e1ad43..ebb18df 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,6 +1,6 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › [% IF ( opsearch ) %]Order from external source[% ELSE %]Order from external source › Search results[% END %]</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' %] > [% INCLUDE 'datatables.inc' %] > >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 e58a21d..3d285e2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >@@ -27,7 +27,7 @@ > [% END -%] > > [% INCLUDE 'doc-head-open.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' %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >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 fc22747..c6cbfc8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >@@ -145,7 +145,7 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") > //]]> > </script> > [% ELSIF op == 'list' %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > <link href="[% interface %]/lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css" rel="stylesheet" type="text/css" /> > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/treetable/jquery.treetable.js"></script> >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 c495205..1bcb257 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 >@@ -5,7 +5,7 @@ > [% 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' %] > >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 293a379..5ffb01c 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 >@@ -8,7 +8,7 @@ > </title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >index 4740e4d..6ab761b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >@@ -7,7 +7,7 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >index 8c9c8cb..407c9c8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >@@ -7,7 +7,7 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > <script type="text/javascript"> > /* Set some variable needed in biblio_framework.js */ >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 29729bc..1515a6f 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,7 +1,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Library checkin and transfer policy</title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > <script type="text/javascript"> >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 47da934..b698a86 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >@@ -11,7 +11,7 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/tiny_mce/tiny_mce.js"></script> > <script type="text/javascript"> >@@ -40,7 +40,7 @@ > tinyMCE.init({ > mode : "textareas", > theme : "advanced", >- content_css : "[% themelang %]/css/tinymce.css", >+ content_css : "[% interface %]/[% theme %]/css/tinymce.css", > plugins : "table,save,advhr,advlink,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/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >index 1c2bf23..3ccc41b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >@@ -7,7 +7,7 @@ > </title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.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 'datatables.inc' %] > <script type="text/javascript" id="js"> > //<![CDATA[ >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 eb21abd..f6a85ea 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >@@ -1,7 +1,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › [% IF op =='add_form' %]Cities › [% IF city.cityid %] Modify city[% ELSE %] New city[% END %][% ELSE %][% IF op == 'delete_confirm' %]Cities › Confirm deletion of city[% ELSE %] Cities[% END %][% END %]</title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >index e25f64a..8c39742 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >@@ -6,7 +6,7 @@ > [% IF op == 'delete_' %]Confirm deletion of currency '[% searchfield %]'[% END %] > [% IF op == 'list' %]Currencies[% END %]</title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] > <script type="text/javascript"> >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 1e046d7..8d2bc26 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >@@ -21,7 +21,7 @@ Data deleted > [% END %] > </title> > [% INCLUDE 'doc-head-close.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 'greybox.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt >index 7d86d61..9d53e5c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt >@@ -1,7 +1,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Localization</title> > [% INCLUDE 'doc-head-close.inc' popup => 1 %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'greybox.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >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 c007f84..1f0a5d8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >@@ -5,7 +5,7 @@ > [% IF ( delete_confirmed ) %]MARC frameworks › Data deleted[% END %] > [% IF ( else ) %]MARC frameworks[% END %]</title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.cookie.min.js"></script> > >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 b95436f..a580e66 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >@@ -2,11 +2,11 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › System preferences</title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/preferences.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/preferences.css" /> > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left.css" /> > [% END %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat.js"></script> > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/multiple-select/jquery.multiple.select.js"></script> >@@ -43,7 +43,7 @@ > > //]]> > </script> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/humanmsg.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/humanmsg.css" /> > <script src="[% interface %]/lib/jquery/plugins/humanmsg.js" type="text/javascript"></script> > <script src="[% themelang %]/js/ajax.js" type="text/javascript"></script> > <script src="[% themelang %]/js/pages/preferences.js" type="text/javascript"></script> >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 eca3be5..e7c56a7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >@@ -6,7 +6,7 @@ > [%# Add WYSIWYG editor for htmlarea system preferences %] > [% INCLUDE 'wysiwyg-systempreferences.inc' %] > [% IF ( else ) %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 8131083..66d1a85 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >@@ -15,7 +15,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > > [% IF op == 'list' %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > [% END %] > >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 d8501a3..49528d9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >@@ -152,9 +152,9 @@ function confirmnotdup(redirect){ > } > //]]> > </script> >-<link type="text/css" rel="stylesheet" href="[% themelang %]/css/addbiblio.css" /> >+<link type="text/css" rel="stylesheet" href="[% interface %]/[% theme %]/css/addbiblio.css" /> > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left.css" /> > [% END %] > </head> > <body id="auth_authorities" class="auth"> >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 8ba7dab..72db196 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 %][% interface %]/[% theme %]/img/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="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index e314fa1..175ab2b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -198,7 +198,7 @@ function verify_images() { > });[% END %] > //]]> > </script> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script> > [% INCLUDE 'browser-strings.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >index b15dfdb..ed58a96 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >@@ -4,7 +4,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Catalog › Checkout history for [% title |html %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" id="js"> > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >index 15cbb91..80c4e3e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >@@ -159,10 +159,10 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Catalog › Item search</title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script> >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/itemsearchform.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/itemsearchform.css" /> > <script type="text/javascript"> > //<![CDATA[ > var authorised_values = [% authorised_values_json %]; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >index 48310c1..a31c4bc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >@@ -3,7 +3,7 @@ > [% USE KohaDates %] > <title>Koha › Catalog › Search history</title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > <script type="text/javascript"> >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 cb2e288..a56a252 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >@@ -379,9 +379,9 @@ function Changefwk(FwkList) { > > //]]> > </script> >-<link type="text/css" rel="stylesheet" href="[% themelang %]/css/addbiblio.css" /> >+<link type="text/css" rel="stylesheet" href="[% interface %]/[% theme %]/css/addbiblio.css" /> > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left.css" /> > [% END %] > </head> > <body id="cat_addbiblio" class="cat"> >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 1de8960..130481c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >@@ -2,7 +2,7 @@ > > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Cataloging › [% title |html %] [% IF ( author ) %] by [% author %][% END %] (Record #[% biblionumber %]) › Items</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' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script> >@@ -105,9 +105,9 @@ function confirm_deletion() { > > //]]> > </script> >-<link type="text/css" rel="stylesheet" href="[% themelang %]/css/addbiblio.css" /> >+<link type="text/css" rel="stylesheet" href="[% interface %]/[% theme %]/css/addbiblio.css" /> > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left.css" /> > [% END %] > </head> > <body id="cat_additem" class="cat"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >index 90fdf85..cbfbfe5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >@@ -1,13 +1,13 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Cataloging › Editor</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" href="[% themelang %]/css/cateditor.css" /> >-<link rel="stylesheet" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" href="[% interface %]/[% theme %]/css/cateditor.css" /> >+<link rel="stylesheet" href="[% interface %]/[% theme %]/css/datatables.css" /> > <link rel="stylesheet" href="[% interface %]/lib/codemirror/codemirror.css" /> >-<link rel="stylesheet" href="[% themelang %]/css/humanmsg.css" /> >+<link rel="stylesheet" href="[% interface %]/[% theme %]/css/humanmsg.css" /> > <script src="[% interface %]/lib/jquery/plugins/humanmsg.js" type="text/javascript"></script> > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left.css" /> > [% END %] > </head> > <body id="cat_addbiblio" class="cat"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt >index d892bc1..b1a3142 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt >@@ -1,6 +1,6 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools</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' %] > [% INCLUDE 'datatables.inc' %] > </head> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >index de1c781..bc74c20 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >@@ -2,7 +2,7 @@ > <title>Koha › Z39.50 search results</title> > [% INCLUDE 'doc-head-close.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 d66c007..e5f82c5 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,7 +2,7 @@ > <title>Koha › Z39.50/SRU search results</title> > [% INCLUDE 'doc-head-close.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 4727192..939a52e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -17,7 +17,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.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 'strings.inc' %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >index eadeb1d..50bd8f9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >@@ -13,7 +13,7 @@ > </title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.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 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt >index ff6ebd4..be8b544 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt >@@ -17,8 +17,8 @@ CACHE: > [% interface %]/lib/shortcut/shortcut.js > [% interface %]/lib/jquery/plugins/jquery.indexeddb.js > [% interface %]/lib/jquery/plugins/jquery.validate.min.js >-[% themelang %]/css/print.css >-[% themelang %]/css/staff-global.css >+[% interface %]/[% theme %]/css/print.css >+[% interface %]/[% theme %]/css/staff-global.css > [% themelang %]/js/basket.js > [% themelang %]/js/offlinecirc.js > [% themelang %]/js/staff-global.js >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >index 5c94e96..483c24e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >@@ -4,7 +4,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Pending on-site checkouts</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 919f0c3..eab69b8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >@@ -7,7 +7,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] > <!-- Plugin datatables --> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/JavaScript"> > //<![CDATA[ >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 9bf6707..59b6c28 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >@@ -12,7 +12,7 @@ > > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/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 ( Koha.Preference('SlipCSS') ) %] > <link rel="stylesheet" type="text/css" href="[% Koha.Preference('SlipCSS') %]" /> > [% 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 b92ca70..ec92cb7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >@@ -6,7 +6,7 @@ > <title>Koha › Circulation › Hold ratios</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.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 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >index 2c650d9..00591c7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -8,7 +8,7 @@ > > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Check in [% title |html %]</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' %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] >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 2121abe..6c2f533 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >@@ -3,7 +3,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Transfers to your library</title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 461a8da..541ddbd 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 @@ > <title>Koha › Circulation › Holds queue</title> > [% INCLUDE 'doc-head-close.inc' %] > <style type="text/css"> p { margin-top: 0; }</style> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] > <script type="text/javascript">//<![CDATA[ >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 5c871fe..3183442 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >@@ -3,7 +3,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Holds awaiting pickup</title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt >index 74dc57e..c1ce712 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt >@@ -2,7 +2,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Patron search</title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >index 2284c17..d1dd110 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >@@ -5,7 +5,7 @@ > <title>Koha › Course reserves › Course details for [% course.course_name %]</title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >index 5d755fc..99e6014 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >@@ -3,7 +3,7 @@ > <title>Koha › Course reserves</title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > <script type="text/javascript" id="js"> > $(document).ready(function() { >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 4dd38a1..67b4c19 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt >@@ -5,7 +5,7 @@ > tinyMCE.init({ > mode : "textareas", > theme : "advanced", >- content_css : "[% themelang %]/css/tinymce.css", >+ content_css : "[% interface %]/[% theme %]/css/tinymce.css", > plugins : "table,save,advhr,advlink,searchreplace,print,contextmenu", > theme_advanced_disable : "underline,strikethrough,styleselect,image", > theme_advanced_buttons1_add_before : "save,|", >@@ -22,7 +22,7 @@ tinyMCE.init({ > //]]> > </script> > [% INCLUDE intranetstylesheet.inc %] >-<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_edithelp" class="help"> > <h1>Online Help</h1> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/spinelabel-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/spinelabel-home.tt >index 7035956..4aee0d8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/spinelabel-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/spinelabel-home.tt >@@ -6,7 +6,7 @@ > > <ul> > <li>Define the fields you want to print on the spine label in the SpineLabelFormat system preference</li> >- <li>Format your label printing by editing spinelabel.css found in [% themelang %]/css/</li> >+ <li>Format your label printing by editing spinelabel.css found in [% interface %]/[% theme %]/css/</li> > </ul> > > <p>To use this tool you simply need the barcode for the book you'd like to print the spine label for.</p> >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 f7e8b36..26d583c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >@@ -1,7 +1,7 @@ > [% USE Koha %] > [% 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> > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >index 53e5854..4d8007b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >@@ -3,7 +3,7 @@ > <title>Koha › Tools › Label creator › Batches › [% IF batch_id %]Edit ([% batch_id %])[% ELSE %]New[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% 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 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 08588dc..f5e7725 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 >@@ -2,7 +2,7 @@ > <title>Koha › Tools › Label creator</title> > [% INCLUDE 'doc-head-close.inc' %] > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left.css" /> > [% END %] > </head> > <body id="labels_label-home" class="tools labels"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >index 00f17eb..0c527ba 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >@@ -67,7 +67,7 @@ > //]]> > </script> > >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" id="js"> > $(document).ready(function() { >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 8c813e6..85aaae4 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 >@@ -3,7 +3,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/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >index 09b5c67..9876022 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >@@ -3,7 +3,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Patrons › Account for [% INCLUDE 'patron-title.inc' %]</title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > <script type="text/javascript"> > $(document).ready(function() { >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 f68027a..3dc62ab 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,7 +1,7 @@ > [% PROCESS 'permissions.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Patrons › Set permissions for [% surname %], [% firstname %]</title> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/treeview/jquery.treeview.css"/> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/treeview/jquery.treeview.css"/> > [% INCLUDE 'doc-head-close.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.treeview.pack.js"></script> > <!-- set up tree --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >index cfe6f21..d2983de 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >@@ -5,7 +5,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Patrons [% IF ( searching ) %]› Search results[% END %]</title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] > <script type="text/javascript"> >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 d7637ec..44f6a2b 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 >@@ -5,7 +5,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 %][% interface %]/[% theme %]/img/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" /> > [% INCLUDE 'slip-print.inc' #printThenClose %] > </head> > <body id="pat_moremember-print" class="pat" onload="printThenClose();"> >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 c7d67a1..85203fd 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 >@@ -3,7 +3,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 %][% interface %]/[% theme %]/img/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" /> > > [% INCLUDE 'slip-print.inc' #printThenClose %] > </head> >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 6572e6c..dbe5713 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >@@ -4,7 +4,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Sent notices for [% INCLUDE 'patron-title.inc' %]</title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 d99c1a9..1563e12 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt >@@ -4,7 +4,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 %][% interface %]/[% theme %]/img/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" /> > [% INCLUDE 'slip-print.inc' #printThenClose %] > </head> > <body id="pat_printfeercpt" class="pat" onload="printThenClose();"> >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 d5899d1..50e7254 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt >@@ -3,7 +3,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 %][% interface %]/[% theme %]/img/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" /> > [% INCLUDE 'slip-print.inc' #printThenClose %] > </head> > <body id="printinvoice" class="pat" onload="printThenClose();"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >index aebe665..c6dac98 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >@@ -2,7 +2,7 @@ > [% USE AuthorisedValues %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Patrons › Purchase suggestions for [% INCLUDE 'patron-title.inc' %]</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' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >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 0f3bbe9..2937e15 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >@@ -5,7 +5,7 @@ > [% 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="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" id="js"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >index e39d87f..44f82a7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >@@ -9,7 +9,7 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > [% INCLUDE 'calendar.inc' %] > <script type="text/javascript"> >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 947a29a..ccb49ce 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' %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >index c0fb966..fb6415c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >@@ -3,7 +3,7 @@ > <title>Koha › Tools › Patron lists › [% list.name %] › Add patrons</title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > > <script type="text/javascript" src="[% interface %]/js/autocomplete/patrons.js"></script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >index f9b3406..3e4ba75 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >@@ -2,7 +2,7 @@ > <title>Koha › Tools › Patron lists</title> > [% INCLUDE 'doc-head-close.inc' %] > [% 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 'datatables.inc' %] > > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >index 05d3ca7..6652836 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >@@ -2,7 +2,7 @@ > <title>Koha › Tools › Patron card creator › Batches › [% IF batch_id %]Edit ([% batch_id %])[% ELSE %]New[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% 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 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 dee52ed..8ab1736 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 >@@ -33,7 +33,7 @@ > #sql { width: 90%; height: 9em;} > </style> > [% IF ( saved1 ) %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >index ae6535e..29f65d0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >@@ -3,7 +3,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Reports › Lost items</title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] > <script type='text/javascript'> >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 1ba8478..e5fda40 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >@@ -3,7 +3,7 @@ > <title>Koha › Reports › Catalog by item types</title> > [% INCLUDE 'doc-head-close.inc' %] > [% IF ( do_it ) %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 d465a96..1476b14 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 >@@ -6,7 +6,7 @@ > <style type="text/css"> > .sql {display: none;} > </style> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 473cfb4..c4eb45e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -7,7 +7,7 @@ > <title>Koha › Circulation › Holds › Confirm holds</title> > [% END %] > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > [% INCLUDE 'calendar.inc' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt >index 229e42c..f8d8598 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt >@@ -2,7 +2,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Rotating collections</title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > <script type="text/javascript"> > $(document).ready(function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt >index b5fdad4..51d5b06 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt >@@ -8,7 +8,7 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.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 "datatables.inc" %] > <script type="text/javascript"> > //<![CDATA[ >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 dd77a73..450b6c5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >@@ -5,7 +5,7 @@ > <title>Koha › Serials › Claims</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.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 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >index ad60863..f26313b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >@@ -4,7 +4,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Serials › Serial collection information for [% bibliotitle %]</title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >index ed2ac49..aa0ad03 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >@@ -5,7 +5,7 @@ > <title>Koha › Serials [% biblionumber %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.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 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 95c7c7f..be8c95c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -30,7 +30,7 @@ > </script> > [% END %] > [% IF ( op_else ) %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > <script type="text/javascript"> >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 cb6038d..ae80d7f 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 >@@ -2,7 +2,7 @@ > <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/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% themelang %]/js/pages/batchMod.js"></script> > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >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 362bf9a..9e862bf 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 >@@ -3,7 +3,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > <script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script> > <script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script> >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > <script type="text/javascript" src="[% themelang %]/js/pages/batchMod.js"></script> >@@ -39,7 +39,7 @@ $(document).ready(function(){ > <style type="text/css">#selections { display: none; }</style> > <![endif]--> > <style type="text/css">input[type=checkbox]{ margin : 0 .5em; }</style> >-<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/batch_delete_records.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >index 9df964b..98c0be9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >@@ -2,7 +2,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Batch record deletion</title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >index 1d95ef7..16385d6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >@@ -2,7 +2,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Batch record modification</title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > <script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script> >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 4f77b04..1f15b64 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' %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 9be593d..8b5c4d9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >@@ -3,7 +3,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Inventory</title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > [% INCLUDE 'calendar.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> >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 bee9945..481fc58 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 >@@ -4,7 +4,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] > [% IF ( opac_news_count ) %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript">//<![CDATA[ > $(document).ready(function() { >@@ -30,7 +30,7 @@ tinyMCE.init({ > theme : "advanced", > convert_urls : false, > relative_urls : false, >- content_css : "[% themelang %]/css/tinymce.css", >+ content_css : "[% interface %]/[% theme %]/css/tinymce.css", > plugins : "table,save,advhr,advlink,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", >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 7b86d93..4b81dd1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >@@ -3,7 +3,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Notices[% IF ( add_form or copy_form ) %][% IF ( modify ) %] › Modify notice[% ELSE %] › Add notice[% END %][% END %][% IF ( add_validate or copy_validate) %] › Notice added[% END %][% IF ( delete_confirm ) %] › Confirm deletion[% END %]</title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.insertatcaret.js"></script> > <script type="text/javascript"> >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 d06ff67..f313b81 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 >@@ -33,7 +33,7 @@ > </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/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >index 2d8d5cf..7e16b64 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >@@ -3,7 +3,7 @@ > <title>Koha › Tools › Batch patron modification</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.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 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt >index 36806fa..f98d6dd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt >@@ -1,9 +1,9 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Quote uploader</title> > [% INCLUDE 'doc-head-close.inc' %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/uploader.css" /> >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/quotes.css" /> >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/uploader.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/quotes.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.jeditable.mini.js"></script> > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >index 6f777d9..4e71ea1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >@@ -1,8 +1,8 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Quote editor</title> > [% INCLUDE 'doc-head-close.inc' %] >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/quotes.css" /> >- <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/quotes.css" /> >+ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/dataTables.fnReloadAjax.js"></script> > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.jeditable.mini.js"></script> >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 48f7b39..236fac2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >@@ -5,7 +5,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › [% IF op == 'view' %]Lists › Contents of [% shelf.shelfname | html %][% ELSE %]Lists[% END %][% IF op == 'add_form' %] › Create new list[% END %][% IF op == 'edit_form' %] › Edit list [% shelf.shelfname | html %][% END %]</title> > [% INCLUDE 'doc-head-close.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 'datatables.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script> > >-- >1.9.1
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 16241
:
50129
|
50155
|
50469
|
50630
|
50643
|
50659
|
50660