&<!--#echo var="OILS

Date: Fri, 10 Sep 2010 21:14:08 +0000 Subject: [PATCH] 1.6.1 xml files git-svn-id: svn://svn.open-ils.org/ILS-Contrib/conifer/branches/rel_1_6_1@984 6d9bc8c9-1ec2-4278-b937-99fde70a366f --- web/opac/skin/uwin/xml/advanced/adv_global_row.xml | 72 +-- .../skin/uwin/xml/advanced/advanced_global.xml | 616 +++++++++++---------- web/opac/skin/uwin/xml/advanced/advanced_marc.xml | 92 +-- web/opac/skin/uwin/xml/advanced/advanced_quick.xml | 60 +- web/opac/skin/uwin/xml/body.xml | 60 +- web/opac/skin/uwin/xml/common/altcanvas.xml | 74 +-- web/opac/skin/uwin/xml/common/cn_browse.xml | 68 +-- web/opac/skin/uwin/xml/common/css_common.xml | 48 +- web/opac/skin/uwin/xml/common/fonts.xml | 50 +- web/opac/skin/uwin/xml/common/format_selector.xml | 20 +- web/opac/skin/uwin/xml/common/holds.xml | 464 ++++++++-------- web/opac/skin/uwin/xml/common/ilsevents.xml | 28 +- web/opac/skin/uwin/xml/common/js_common.xml | 149 +++-- web/opac/skin/uwin/xml/common/libselect.xml | 30 +- web/opac/skin/uwin/xml/common/login.xml | 222 ++++---- web/opac/skin/uwin/xml/common/logo.xml | 8 +- web/opac/skin/uwin/xml/common/orgtree.xml | 54 +- web/opac/skin/uwin/xml/common/searchbar.xml | 128 ++--- web/opac/skin/uwin/xml/common/sidebar.xml | 444 ++++++++------- web/opac/skin/uwin/xml/common/statusbar.xml | 56 +- web/opac/skin/uwin/xml/common/stypes_selector.xml | 17 +- web/opac/skin/uwin/xml/common/tips.xml | 16 +- web/opac/skin/uwin/xml/footer.xml | 89 +-- web/opac/skin/uwin/xml/header.xml | 26 +- web/opac/skin/uwin/xml/home/homesearch.xml | 270 ++++----- web/opac/skin/uwin/xml/home/index_body.xml | 76 +-- web/opac/skin/uwin/xml/html_xsl.xml | 20 +- web/opac/skin/uwin/xml/index.xml | 44 +- web/opac/skin/uwin/xml/myopac/myopac_bookbags.xml | 271 ++++----- web/opac/skin/uwin/xml/myopac/myopac_checked.xml | 214 +++---- web/opac/skin/uwin/xml/myopac/myopac_fines.xml | 202 +++---- web/opac/skin/uwin/xml/myopac/myopac_holds.xml | 244 ++++---- web/opac/skin/uwin/xml/myopac/myopac_prefs.xml | 210 +++---- web/opac/skin/uwin/xml/myopac/myopac_summary.xml | 572 +++++++++---------- web/opac/skin/uwin/xml/page_advanced.xml | 28 +- web/opac/skin/uwin/xml/page_cnbrowse.xml | 12 +- web/opac/skin/uwin/xml/page_mresult.xml | 18 +- web/opac/skin/uwin/xml/page_myopac.xml | 136 ++--- web/opac/skin/uwin/xml/page_rdetail.xml | 17 +- web/opac/skin/uwin/xml/page_rresult.xml | 18 +- .../skin/uwin/xml/rdetail/rdetail_altcanvas.xml | 56 +- .../skin/uwin/xml/rdetail/rdetail_cn_details.xml | 208 +++---- .../skin/uwin/xml/rdetail/rdetail_copyinfo.xml | 182 +++--- web/opac/skin/uwin/xml/rdetail/rdetail_extras.xml | 250 ++++----- web/opac/skin/uwin/xml/rdetail/rdetail_summary.xml | 613 ++++++++++++++------ web/opac/skin/uwin/xml/result/filtersort.xml | 40 +- web/opac/skin/uwin/xml/result/result_common.xml | 72 +-- web/opac/skin/uwin/xml/result/result_info.xml | 148 ++--- web/opac/skin/uwin/xml/result/result_lowhits.xml | 98 ++-- web/opac/skin/uwin/xml/result/result_table.xml | 513 ++++++++++------- 50 files changed, 3895 insertions(+), 3528 deletions(-) diff --git a/web/opac/skin/uwin/xml/advanced/adv_global_row.xml b/web/opac/skin/uwin/xml/advanced/adv_global_row.xml index 614c305fc4..f5c5ca7dd9 100644 --- a/web/opac/skin/uwin/xml/advanced/adv_global_row.xml +++ b/web/opac/skin/uwin/xml/advanced/adv_global_row.xml @@ -1,36 +1,36 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/web/opac/skin/uwin/xml/advanced/advanced_global.xml b/web/opac/skin/uwin/xml/advanced/advanced_global.xml index 736a20adae..46270ae6ae 100644 --- a/web/opac/skin/uwin/xml/advanced/advanced_global.xml +++ b/web/opac/skin/uwin/xml/advanced/advanced_global.xml @@ -1,307 +1,309 @@ - - - - - - - - - - - - - - - - - - - - - - - - -

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

&advanced.search.title;
- - - - - -

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

&advanced.search.filters;
- &advanced.item.form; -	- -
- &advanced.item.type; - &advanced.link; - - &advanced.basic.link; -	- - -
- &advanced.literary.form; - &advanced.link; - - &advanced.basic.link; -	- - -
- &advanced.language; -	- -
- &advanced.audience; - - &advanced.link; - - &advanced.basic.link; -	- - -
- &advanced.biblevel; -	- -
- &advanced.filter.pubyear; -	- - - - - &common.and; - - -
&opac.advanced.copy_loc_filter;	- -

- - - - - -

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

&advanced.sort.criteria;	&advanced.search.library;
- -	- -
- -	- -
- &advanced.frbrize; - -	- &result.limit2avail; - -

+ + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + +

&advanced.search.title;
+ + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

&advanced.search.filters;
+ &advanced.item.form; +	+ +
+ &advanced.item.type; + &advanced.link; + + &advanced.basic.link; +	+ + +
+ &advanced.literary.form; + &advanced.link; + + &advanced.basic.link; +	+ + +
+ &advanced.language; +	+ +
+ &advanced.audience; + + &advanced.link; + + &advanced.basic.link; +	+ + +
+ &advanced.biblevel; +	+ +
+ &advanced.filter.pubyear; +	+ + + + + &common.and; + + +
&opac.advanced.copy_loc_filter;	+ +

+ + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

&advanced.sort.criteria;	&advanced.search.library;
+ +	+ +
+ +	+ +
+ &advanced.frbrize; + +	+ &result.limit2avail; + +

+ + diff --git a/web/opac/skin/uwin/xml/advanced/advanced_marc.xml b/web/opac/skin/uwin/xml/advanced/advanced_marc.xml index 43eaff5466..46fe2879ed 100644 --- a/web/opac/skin/uwin/xml/advanced/advanced_marc.xml +++ b/web/opac/skin/uwin/xml/advanced/advanced_marc.xml @@ -1,46 +1,46 @@ - - - - - - - - - - - - - - - - - - - - -

&opac.advanced.marc.title;
- &opac.advanced.marc.tag;: - -	- &opac.advanced.marc.subfield;: - -	- &opac.advanced.marc.value;: - -	- -
- - - - -

+ + + + + + + + + + + + + + + + + + + + +

&opac.advanced.marc.title;
+ &opac.advanced.marc.tag;: + +	+ &opac.advanced.marc.subfield;: + +	+ &opac.advanced.marc.value;: + +	+ +
+ + + + +

diff --git a/web/opac/skin/uwin/xml/advanced/advanced_quick.xml b/web/opac/skin/uwin/xml/advanced/advanced_quick.xml index ea00d041ed..3f7da6ff5e 100644 --- a/web/opac/skin/uwin/xml/advanced/advanced_quick.xml +++ b/web/opac/skin/uwin/xml/advanced/advanced_quick.xml @@ -1,30 +1,30 @@ - - - - - - - - - - - - - - - -

&opac.advanced.quick.title;
- &common.call.number.label; - - -	- &common.isbn.label; - - -	- &common.issn.label; - - -

+ + + + + + + + + + + + + + + +

&opac.advanced.quick.title;
+ &common.call.number.label; + + +	+ &common.isbn.label; + + +	+ &common.issn.label; + + +

diff --git a/web/opac/skin/uwin/xml/body.xml b/web/opac/skin/uwin/xml/body.xml index b96704b635..ec290b610e 100644 --- a/web/opac/skin/uwin/xml/body.xml +++ b/web/opac/skin/uwin/xml/body.xml @@ -1,30 +1,30 @@ - - - - - - - - -

- - -

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

-
- -

- - + + + + + + + + +

+ + +

+ + + + + + + + + + + +

+
+ +

+ + diff --git a/web/opac/skin/uwin/xml/common/altcanvas.xml b/web/opac/skin/uwin/xml/common/altcanvas.xml index e1fa24bb36..97448daa77 100644 --- a/web/opac/skin/uwin/xml/common/altcanvas.xml +++ b/web/opac/skin/uwin/xml/common/altcanvas.xml @@ -1,37 +1,37 @@ - - - -

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

- -

+ + + +

+ + + + + + + + + + + + + + + + + + +

+ +

diff --git a/web/opac/skin/uwin/xml/common/cn_browse.xml b/web/opac/skin/uwin/xml/common/cn_browse.xml index 8c4a66895f..aea7fa171f 100644 --- a/web/opac/skin/uwin/xml/common/cn_browse.xml +++ b/web/opac/skin/uwin/xml/common/cn_browse.xml @@ -1,34 +1,34 @@ -

&common.cn.loading;

- - -

- &common.cn.browsing; -

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

&common.cn.previous;	&common.cn.shelf;	&common.cn.next;
- - - - - -

&common.cn.loading;

+ + +

+ &common.cn.browsing; +

+ + + + + + + + + + + + + +

&common.cn.previous;	&common.cn.shelf;	&common.cn.next;
+ + + + + +

diff --git a/web/opac/skin/uwin/xml/common/css_common.xml b/web/opac/skin/uwin/xml/common/css_common.xml index f4eb708d30..4df8206885 100644 --- a/web/opac/skin/uwin/xml/common/css_common.xml +++ b/web/opac/skin/uwin/xml/common/css_common.xml @@ -1,24 +1,24 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/web/opac/skin/uwin/xml/common/fonts.xml b/web/opac/skin/uwin/xml/common/fonts.xml index a5c7f233cc..8b3ce40a0e 100644 --- a/web/opac/skin/uwin/xml/common/fonts.xml +++ b/web/opac/skin/uwin/xml/common/fonts.xml @@ -1,25 +1,25 @@ -

- -

- &common.textsize.title; - &common.textsize.regular; - &common.textsize.separator; - &common.textsize.large; - -

- -

+ +

+ &common.textsize.title; + &common.textsize.regular; + &common.textsize.separator; + &common.textsize.large; + | + &common.language; + + + +

+ +

diff --git a/web/opac/skin/uwin/xml/common/format_selector.xml b/web/opac/skin/uwin/xml/common/format_selector.xml index 37e29ec3b1..c5663aa7da 100644 --- a/web/opac/skin/uwin/xml/common/format_selector.xml +++ b/web/opac/skin/uwin/xml/common/format_selector.xml @@ -1,10 +1,10 @@ - - + + diff --git a/web/opac/skin/uwin/xml/common/holds.xml b/web/opac/skin/uwin/xml/common/holds.xml index 6b60d8fc73..ea7aec0f07 100644 --- a/web/opac/skin/uwin/xml/common/holds.xml +++ b/web/opac/skin/uwin/xml/common/holds.xml @@ -1,232 +1,232 @@ - -

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

&opac.holds.xulRecipient;:

&opac.holds.xulRecipient;:

- -

-

- &common.hold.check; -

- -

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

&common.hold.create;
&opac.holds.recipient;:
&common.title.label;
&common.author;
&common.format;
&common.physical.label;
&common.call.number.label;
&common.copy.barcode.label;
&common.hold.type.label;	&common.hold.volume;	&common.hold.copy;
&opac.holds.contactPhone;:	- - &common.phone.format; -
&common.phone.enable;	- -
&opac.holds.contactEmail;:	- - &common.email.none; - &common.email.set; - - - &common.email.none; - - -
&common.email.enable;	- -
&opac.holds.pickupLocation;	- -
&opac.holds.expire_time;	- -
- &opac.holds.freeze; - &common.help; -	- -
- - &opac.holds.freeze.thaw_date; -	- -
- - &common.hold.advanced; - -
- - &common.format.alternatives; - &common.help; - - &common.control.click; -	- -
- - - - -

- -

&opac.holds.success;

&opac.holds.failure;

- - &common.phone.format.help; - - - - &common.hold.failed; - - -

- - - &opac.search.books; - &opac.search.largePrint; - &opac.search.audioBooks; - &opac.search.videoRecordings; - &opac.search.music; - &opac.search.electronic; - - - &holds.advanced_options; - - &common.hold.delivery; - - &common.hold.exists; - - &common.hold.exists.override; - - &common.hold.barred; - - &common.hold.item.invalid; - - &common.hold.patron.invalid; - -

+ +

+ + + + + + + + + + + +

&opac.holds.xulRecipient;:

&opac.holds.xulRecipient;:

+ +

+

+ &common.hold.check; +

+ +

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

&common.hold.create;
&opac.holds.recipient;:
&common.title.label;
&common.author;
&common.format;
&common.physical.label;
&common.call.number.label;
&common.copy.barcode.label;
&common.hold.type.label;	&common.hold.volume;	&common.hold.copy;
&opac.holds.contactPhone;:	+ + &common.phone.format; +
&common.phone.enable;	+ +
&opac.holds.contactEmail;:	+ + &common.email.none; + &common.email.set; + + + &common.email.none; + + +
&common.email.enable;	+ +
&opac.holds.pickupLocation;	+ +
&opac.holds.expire_time;	+ +
+ &opac.holds.freeze; + &common.help; +	+ +
+ + &opac.holds.freeze.thaw_date; +	+ +
+ + &common.hold.advanced; + +
+ + &common.format.alternatives; + &common.help; + + &common.control.click; +	+ +
+ + + + +

+ +

&opac.holds.success;

&opac.holds.failure;

+ + &common.phone.format.help; + + + + &common.hold.failed; + + +

+ + + &opac.search.books; + &opac.search.largePrint; + &opac.search.audioBooks; + &opac.search.videoRecordings; + &opac.search.music; + &opac.search.electronic; + + + &holds.advanced_options; + + &common.hold.delivery; + + &common.hold.exists; + + &common.hold.exists.override; + + &common.hold.barred; + + &common.hold.item.invalid; + + &common.hold.patron.invalid; + +

diff --git a/web/opac/skin/uwin/xml/common/ilsevents.xml b/web/opac/skin/uwin/xml/common/ilsevents.xml index 11d0bea4ad..dcef13f28b 100644 --- a/web/opac/skin/uwin/xml/common/ilsevents.xml +++ b/web/opac/skin/uwin/xml/common/ilsevents.xml @@ -1,14 +1,14 @@ - - &ilsevent.1000; - &ilsevent.1001; - &ilsevent.1002; - &ilsevent.1200; - &ilsevent.5000; - &ilsperm.CREATE_HOLD; - - - &opac.session_expiring; - &opac.session_expired; - &common.user_not_found; - - + + &ilsevent.1000; + &ilsevent.1001; + &ilsevent.1002; + &ilsevent.1200; + &ilsevent.5000; + &ilsperm.CREATE_HOLD; + + + &opac.session_expiring; + &opac.session_expired; + &common.user_not_found; + + diff --git a/web/opac/skin/uwin/xml/common/js_common.xml b/web/opac/skin/uwin/xml/common/js_common.xml index 24aa1dee8c..0237db9358 100644 --- a/web/opac/skin/uwin/xml/common/js_common.xml +++ b/web/opac/skin/uwin/xml/common/js_common.xml @@ -1,77 +1,72 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/opac/skin/uwin/xml/common/libselect.xml b/web/opac/skin/uwin/xml/common/libselect.xml index acb73e9c73..0dcbeea96d 100644 --- a/web/opac/skin/uwin/xml/common/libselect.xml +++ b/web/opac/skin/uwin/xml/common/libselect.xml @@ -1,15 +1,15 @@ - - - - - &library.select; - - - - - &library.select.help; - - - + + + + + &library.select; + + + + + &library.select.help; + + + diff --git a/web/opac/skin/uwin/xml/common/login.xml b/web/opac/skin/uwin/xml/common/login.xml index 465e0d1e22..15fbcf0cb7 100644 --- a/web/opac/skin/uwin/xml/common/login.xml +++ b/web/opac/skin/uwin/xml/common/login.xml @@ -1,110 +1,112 @@ - -

- - - -
- -

- &uwin.myopac.loginhelp.question; &uwin.myopac.loginhelp.url_text; -

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

&login.username;	- - - -
- &common.password; -	- - - -

- - - - - - -

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

&login.password;
- &login.first.time; - &common.password_criteria; -
&login.password.current.enter;
&login.password.new.enter;
&login.password.new.reenter;

- - - -

- - &login.password.nomatch; - &login.password.success; - - - &login.password.strength; - &common.password_criteria; - - - &login.barcode.inactive; - - &login.account.inactive; - - &login.failed; - -

- - + +

+ + + + +
+ +

+ &opac.login.login; +

+ +
+ + + + + + + + + + + + + + + + +

&login.username;	+ + + +
+ &common.password; +	+ + + +

+ + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

&login.password;
+ &login.first.time; + &common.password_criteria; +
&login.password.current.enter;
&login.password.new.enter;
&login.password.new.reenter;

+ + + +

+ + &login.password.nomatch; + &login.password.success; + + + &login.password.strength; + &common.password_criteria; + + + &login.barcode.inactive; + + &login.account.inactive; + + &login.failed; + +

+ + diff --git a/web/opac/skin/uwin/xml/common/logo.xml b/web/opac/skin/uwin/xml/common/logo.xml index ec40e64fd5..9eba9c7a21 100644 --- a/web/opac/skin/uwin/xml/common/logo.xml +++ b/web/opac/skin/uwin/xml/common/logo.xml @@ -1,4 +1,4 @@ -

- -

+ +

diff --git a/web/opac/skin/uwin/xml/common/orgtree.xml b/web/opac/skin/uwin/xml/common/orgtree.xml index 66e6324691..d4008d3f68 100644 --- a/web/opac/skin/uwin/xml/common/orgtree.xml +++ b/web/opac/skin/uwin/xml/common/orgtree.xml @@ -1,27 +1,27 @@ - - -

- -

- - &common.org.openAll; - - - &common.org.closeAll; - - - &common.org.cancel; - -

- -

&common.org.loading;

-
-

&common.org.note; - &common.org.notetext; -

-
-

+ + +

+ +

+ + &common.org.openAll; + + + &common.org.closeAll; + + + &common.org.cancel; + +

+ +

&common.org.loading;

+
+

&common.org.note; + &common.org.notetext; +

+
+

diff --git a/web/opac/skin/uwin/xml/common/searchbar.xml b/web/opac/skin/uwin/xml/common/searchbar.xml index b5f008528b..1327d8f4d5 100644 --- a/web/opac/skin/uwin/xml/common/searchbar.xml +++ b/web/opac/skin/uwin/xml/common/searchbar.xml @@ -1,64 +1,64 @@ - - - -

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

- - - - - -

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

- -

- - - - - - + + + +

+ + + + + + + + + + + + + + +

+ + + + + +

+ + + + + + + + + + + + + +

+ +

+ + + + + + diff --git a/web/opac/skin/uwin/xml/common/sidebar.xml b/web/opac/skin/uwin/xml/common/sidebar.xml index 649ba317bb..7cfae04d3a 100644 --- a/web/opac/skin/uwin/xml/common/sidebar.xml +++ b/web/opac/skin/uwin/xml/common/sidebar.xml @@ -1,224 +1,220 @@ - - - -

- -

- &navigate.home; -

- -

- &uwin.askON; -

- -

- &opac.navigate.advanced; -

- -

- &navigate.myopac; -

- -

- &navigate.login; -

- -

- &navigate.logout; -

- - - - -

- &navigate.loggedinas; -

- -

- &navigate.titleGroupResults; -

- -

- &navigate.titleResults; -

- -

- &navigate.title.details; -

- - - - - -

- -

&sidebar.quick.search;

- - -

- -

- - &sidebar.copy.not.found; -

- &common.submit; -

- -

&search.marc;

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

&search.marc.tag;		&search.marc.subfield;
&search.marc.value;
- &common.close; -

- &search.marc.add.row; - &common.submit; -

- - - - - - - - - - -

- + + + +

+ +

+ &navigate.home; +

+ +

+ &opac.navigate.advanced; +

+ +

+ &navigate.myopac; +

+ +

+ &navigate.login; +

+ +

+ &navigate.logout; +

+ + + + +

+ &navigate.loggedinas; +

+ +

+ &navigate.titleGroupResults; +

+ +

+ &navigate.titleResults; +

+ +

+ &navigate.title.details; +

+ +

&sidebar.quick.search;

+ + +

+ +

+ + + &sidebar.copy.not.found; +

+ &common.submit; +

+ +

&search.marc;

+ + + + + + + + + + + + + + + + + +

&search.marc.tag;		&search.marc.subfield;
&search.marc.value;
+ &common.close; +

+ &search.marc.add.row; + &common.submit; +

+ + + + + + + + + + +

+ diff --git a/web/opac/skin/uwin/xml/common/statusbar.xml b/web/opac/skin/uwin/xml/common/statusbar.xml index 3c7097a4cc..237be6264b 100644 --- a/web/opac/skin/uwin/xml/common/statusbar.xml +++ b/web/opac/skin/uwin/xml/common/statusbar.xml @@ -1,28 +1,28 @@ - -

- - - - - - - - -

- - - - - &status.results; - -

- - - -

+ +

+ + + + + + + + +

+ + + + + &status.results; + +

+ + + +

diff --git a/web/opac/skin/uwin/xml/common/stypes_selector.xml b/web/opac/skin/uwin/xml/common/stypes_selector.xml index 5e272cfa95..d1927b9f5a 100644 --- a/web/opac/skin/uwin/xml/common/stypes_selector.xml +++ b/web/opac/skin/uwin/xml/common/stypes_selector.xml @@ -1,8 +1,9 @@ - - + + diff --git a/web/opac/skin/uwin/xml/common/tips.xml b/web/opac/skin/uwin/xml/common/tips.xml index 4012bd2df1..84919f54e1 100644 --- a/web/opac/skin/uwin/xml/common/tips.xml +++ b/web/opac/skin/uwin/xml/common/tips.xml @@ -1,8 +1,8 @@ - -

- &common.tips.tip1; - &common.tips.tip2; -

- &tips.label; -

+ +

+ &common.tips.tip1; + &common.tips.tip2; +

+ &tips.label; +

diff --git a/web/opac/skin/uwin/xml/footer.xml b/web/opac/skin/uwin/xml/footer.xml index 598f6d8e8f..0d2e973a19 100644 --- a/web/opac/skin/uwin/xml/footer.xml +++ b/web/opac/skin/uwin/xml/footer.xml @@ -1,39 +1,50 @@ -

- &footer.copyright; -

&footer.logo; -

+ &footer.copyright; +

&footer.logo; +

diff --git a/web/opac/skin/uwin/xml/header.xml b/web/opac/skin/uwin/xml/header.xml index 0aab923e69..7990eb32f5 100644 --- a/web/opac/skin/uwin/xml/header.xml +++ b/web/opac/skin/uwin/xml/header.xml @@ -1,13 +1,13 @@ - - - - - - &; - - - - - - - + + + + + + &; + + + + + + + diff --git a/web/opac/skin/uwin/xml/home/homesearch.xml b/web/opac/skin/uwin/xml/home/homesearch.xml index 3a544675b1..40ad129ea1 100644 --- a/web/opac/skin/uwin/xml/home/homesearch.xml +++ b/web/opac/skin/uwin/xml/home/homesearch.xml @@ -1,135 +1,135 @@ - -

- - - - - - - - -

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

- &opac.search.nowSearching; - -

- - - - -

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

- - &opac.navigate.advanced; - - - - - - &opac.navigate.selectOrg; - - - - &opac.navigate.myopac; - -

- -

- - - - - - + +

+ + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ &opac.search.nowSearching; + +

+ + + + +

+ + + + + + + + + + + +

+ + &opac.navigate.advanced; + + + + + + &opac.navigate.selectOrg; + + + + &opac.navigate.myopac; + +

+ &common.language; + + + +

+ +

+ + + + + + diff --git a/web/opac/skin/uwin/xml/home/index_body.xml b/web/opac/skin/uwin/xml/home/index_body.xml index e7e53daae0..7bc4784c86 100644 --- a/web/opac/skin/uwin/xml/home/index_body.xml +++ b/web/opac/skin/uwin/xml/home/index_body.xml @@ -1,38 +1,38 @@ - - - - - - - - - - - - -

- - -

- - - - - - + + + + + + + + + + + + +

+ + +

+ + + + + + diff --git a/web/opac/skin/uwin/xml/html_xsl.xml b/web/opac/skin/uwin/xml/html_xsl.xml index 5b3501528a..f22332079d 100644 --- a/web/opac/skin/uwin/xml/html_xsl.xml +++ b/web/opac/skin/uwin/xml/html_xsl.xml @@ -1,10 +1,10 @@ - - - - - - - - + + + + + + + + diff --git a/web/opac/skin/uwin/xml/index.xml b/web/opac/skin/uwin/xml/index.xml index 137ace2d67..81db882cab 100644 --- a/web/opac/skin/uwin/xml/index.xml +++ b/web/opac/skin/uwin/xml/index.xml @@ -1,22 +1,22 @@ - - - - - - - -]> - - - - - - - - - - - + + + + + + + +]> + + + + + + + + + + + diff --git a/web/opac/skin/uwin/xml/myopac/myopac_bookbags.xml b/web/opac/skin/uwin/xml/myopac/myopac_bookbags.xml index b4319fb7a4..1a58b750eb 100644 --- a/web/opac/skin/uwin/xml/myopac/myopac_bookbags.xml +++ b/web/opac/skin/uwin/xml/myopac/myopac_bookbags.xml @@ -1,135 +1,136 @@ - -

- - - -

- &myopac.delete.bookbag; -

- -

&myopac.no.bookbags;

- -

- &myopac.bookbags.title; - -

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

&common.name;	&myopac.bookbag.items;	&myopac.bookbag.shared;	&myopac.bookbag.toggle;	&myopac.bookbag.delete;
- -	&myopac.items;	- &common.no; - &common.yes; - &myopac.view; - - - -	- &myopac.bookbag.hide; - &myopac.bookbag.share; -	- &myopac.delete; -

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

&myopac.bookbag.create;
- &myopac.bookbag.naming; - -
- &myopac.bookbag.share; - &common.help; - &common.yes; - &common.no; - -

- - -

- -

&myopac.bookbag.no.items;

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

&common.title;	&common.authors;	&myopac.bookbag.remove;
		&myopac.remove.link;

- - - - &myopac.publish.text; - - - - &myopac.item.confirm; - - - - &myopac.publish.confirm; - - - - &myopac.unpublish.confirm; - - - - &myopac.update.success; - - - - &myopac.create.warning; - - - - &myopac.describe.bookbags; - - - - &myopac.updated.success; - - -

- - + +

+ + + +

+ &myopac.delete.bookbag; +

+ +

&myopac.no.bookbags;

+ +

+ &myopac.bookbags.title; + +

+ + + + + + + + + + + + + + + + +

&common.name;	&myopac.bookbag.items;	&myopac.bookbag.shared;	&myopac.bookbag.toggle;	&myopac.bookbag.delete;
+ +	&myopac.items;	+ &common.no; + &common.yes; + &myopac.view; + + + + &myopac.bookbag.refworks; +	+ &myopac.bookbag.hide; + &myopac.bookbag.share; +	+ &myopac.delete; +

+ + + + + + + + + + + + + +

&myopac.bookbag.create;
+ &myopac.bookbag.naming; + +
+ &myopac.bookbag.share; + &common.help; + &common.yes; + &common.no; + +

+ + +

+ +

&myopac.bookbag.no.items;

+ + + + + + + + + + + + + +

&common.title;	&common.authors;	&myopac.bookbag.remove;
		&myopac.remove.link;

+ + + + &myopac.publish.text; + + + + &myopac.item.confirm; + + + + &myopac.publish.confirm; + + + + &myopac.unpublish.confirm; + + + + &myopac.update.success; + + + + &myopac.create.warning; + + + + &myopac.describe.bookbags; + + + + &myopac.updated.success; + + +

+ + diff --git a/web/opac/skin/uwin/xml/myopac/myopac_checked.xml b/web/opac/skin/uwin/xml/myopac/myopac_checked.xml index 42e88a67c3..5d00be1aab 100644 --- a/web/opac/skin/uwin/xml/myopac/myopac_checked.xml +++ b/web/opac/skin/uwin/xml/myopac/myopac_checked.xml @@ -1,107 +1,107 @@ - -

- - - - - - - - - -

- - &myopac.checked.out; 0 / - &myopac.checked.overdue; 0 -	- -
&myopac.checked.renewing;

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

&common.title;	&common.author;	&myopac.fines.due;	&myopac.checked.renew.remaining;	&common.select; - (&common.all;/&common.none;) -
&myopac.checked.noitems;
&common.loading;
- -	- -

- -

-
-

&myopac.common.other.circ;

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

&myopac.checked.circ.lib;	&myopac.checked.item.type;	&myopac.checked.circ.time;
-	-	-

- -

&myopac.checked.renew.success;

- - &myopac.checked.renew.confirm; - - &myopac.checked.renew.fail; - - &myopac.checked.renew.fail2; - -

- - + +

+ + + + + + + + + +

+ + &myopac.checked.out; 0 / + &myopac.checked.overdue; 0 +	+ +
&myopac.checked.renewing;

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

&common.title;	&common.author;	&myopac.fines.due;	&myopac.checked.renew.remaining;	&common.select; + (&common.all;/&common.none;) +
&myopac.checked.noitems;
&common.loading;
+ +	+ +

+ +

+
+

&myopac.common.other.circ;

+ + + + + + + + + + + + +

&myopac.checked.circ.lib;	&myopac.checked.item.type;	&myopac.checked.circ.time;
+	+	+

+ +

&myopac.checked.renew.success;

+ + &myopac.checked.renew.confirm; + + &myopac.checked.renew.fail; + + &myopac.checked.renew.fail2; + +

+ + diff --git a/web/opac/skin/uwin/xml/myopac/myopac_fines.xml b/web/opac/skin/uwin/xml/myopac/myopac_fines.xml index a91f353518..db129c0162 100644 --- a/web/opac/skin/uwin/xml/myopac/myopac_fines.xml +++ b/web/opac/skin/uwin/xml/myopac/myopac_fines.xml @@ -1,101 +1,101 @@ - -

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

&myopac.fines.title;
&myopac.fines.owed;	&myopac.fines.paid;	&myopac.fines.balance;
&myopac.fines.status;
&common.currency;	&common.currency;	&common.currency;

- - - - - -

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

&myopac.fines.overdue;
&common.title;	&common.author;	&myopac.fines.checkout;	&myopac.fines.due;	&myopac.fines.returned;	&myopac.fines.balance;
				&myopac.fines.accruing;	- &common.currency; -

- - -

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

&myopac.fines.other;
&myopac.fines.time.start;	&myopac.fines.time.paid;	&myopac.fines.owed.initial;	&myopac.fines.paid.amount;	&myopac.fines.balance;	&myopac.fines.type;
		&common.currency;	&common.currency;	- * - &common.currency; -

- -
- -

- - + +

+ + + + + + + + + + + + + + + + + + + + +

&myopac.fines.title;
&myopac.fines.owed;	&myopac.fines.paid;	&myopac.fines.balance;
&myopac.fines.status;
&common.currency;	&common.currency;	&common.currency;

+ + + + + +

+ + + + + + + + + + + + + + + + + + + + + + +

&myopac.fines.overdue;
&common.title;	&common.author;	&myopac.fines.checkout;	&myopac.fines.due;	&myopac.fines.returned;	&myopac.fines.balance;
				&myopac.fines.accruing;	+ &common.currency; +

+ + +

+ + + + + + + + + + + + + + + + + + + + + + + +

&myopac.fines.other;
&myopac.fines.time.start;	&myopac.fines.time.paid;	&myopac.fines.owed.initial;	&myopac.fines.paid.amount;	&myopac.fines.balance;	&myopac.fines.type;
		&common.currency;	&common.currency;	+ * + &common.currency; +

+ +
+ +

+ + diff --git a/web/opac/skin/uwin/xml/myopac/myopac_holds.xml b/web/opac/skin/uwin/xml/myopac/myopac_holds.xml index dc6cf8ece1..b1c0fc9672 100644 --- a/web/opac/skin/uwin/xml/myopac/myopac_holds.xml +++ b/web/opac/skin/uwin/xml/myopac/myopac_holds.xml @@ -1,122 +1,122 @@ - -

- - - - - - -

- -

- - &myopac.holds.cancel.confirm; - &myopac.holds.freeze.confirm; - &myopac.holds.thaw.confirm; - &myopac.holds.thaw_date.confirm; - &myopac.holds.freeze.select_thaw; - - - -

&myopac.holds.processing;

- -

&myopac.holds.freeze.select_thaw;

- -

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

&common.title;	&common.author;	&myopac.holds.formats;	&myopac.holds.location;	&common.status;	&myopac.holds.estimated_wait;	&myopac.holds.unfrozen;	&myopac.holds.frozen.until;	&opac.holds.expire_time;	&common.select; - (&common.all;/&common.none;) -	&myopac.holds.edit;
&myopac.holds.status.none;
&myopac.loading;
- - - - - -	- -			- &myopac.holds.status.waiting; - &myopac.holds.status.intransit; - &myopac.holds.status.available; - -	- -	- - &common.no; - &common.yes; -				- &myopac.holds.edit; -

- - - &myopac.holds.verify; - - -

- - + +

+ + + + + + +

+ +

+ + &myopac.holds.cancel.confirm; + &myopac.holds.freeze.confirm; + &myopac.holds.thaw.confirm; + &myopac.holds.thaw_date.confirm; + &myopac.holds.freeze.select_thaw; + + + +

&myopac.holds.processing;

+ +

&myopac.holds.freeze.select_thaw;

+ +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

&common.title;	&common.author;	&myopac.holds.formats;	&myopac.holds.location;	&common.status;	&myopac.holds.estimated_wait;	&myopac.holds.unfrozen;	&myopac.holds.frozen.until;	&opac.holds.expire_time;	&common.select; + (&common.all;/&common.none;) +	&myopac.holds.edit;
&myopac.holds.status.none;
&myopac.loading;
+ + + + + +	+ +			+ &myopac.holds.status.waiting; + &myopac.holds.status.intransit; + &myopac.holds.status.available; + +	+ +	+ + &common.no; + &common.yes; +				+ &myopac.holds.edit; +

+ + + &myopac.holds.verify; + + +

+ + diff --git a/web/opac/skin/uwin/xml/myopac/myopac_prefs.xml b/web/opac/skin/uwin/xml/myopac/myopac_prefs.xml index 5da0a6f72b..0687aa6294 100644 --- a/web/opac/skin/uwin/xml/myopac/myopac_prefs.xml +++ b/web/opac/skin/uwin/xml/myopac/myopac_prefs.xml @@ -1,105 +1,105 @@ - -

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

- &myopac.prefs.title; -
&myopac.loading;
&myopac.prefs.hits;	- -
&myopac.prefs.font;	- -
- &myopac.prefs.holds.notify; - &common.help; -	- -
&myopac.prefs.search.location;	- - &myopac.prefs.search.home; - - -
&myopac.prefs.search.range;	- -

- -

- -

&myopac.prefs.save.success;

&myopac.prefs.save.failed;

- - &myopac.prefs.help; - - -

- - + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ &myopac.prefs.title; +
&myopac.loading;
&myopac.prefs.hits;	+ +
&myopac.prefs.font;	+ +
+ &myopac.prefs.holds.notify; + &common.help; +	+ +
&myopac.prefs.search.location;	+ + &myopac.prefs.search.home; + + +
&myopac.prefs.search.range;	+ +

+ +

+ +

&myopac.prefs.save.success;

&myopac.prefs.save.failed;

+ + &myopac.prefs.help; + + +

+ + diff --git a/web/opac/skin/uwin/xml/myopac/myopac_summary.xml b/web/opac/skin/uwin/xml/myopac/myopac_summary.xml index 7205f24bc4..0ff10f093d 100644 --- a/web/opac/skin/uwin/xml/myopac/myopac_summary.xml +++ b/web/opac/skin/uwin/xml/myopac/myopac_summary.xml @@ -1,286 +1,286 @@ - -

- - -

- - - - - - -

- &myopac.summary.expired; -

- -

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

&myopac.summary.notes;
- : -

-
-

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

&common.name;

- - - - - -

&myopac.summary.phone.day;

&myopac.summary.phone.evening;

&myopac.summary.phone.other;

&common.username;

&myopac.summary.change;

- &myopac.summary.username.enter; - - - - - - - -

&common.password;

&myopac.summary.password.text;

&myopac.summary.change;

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

&myopac.summary.password.current;
&myopac.summary.password.new;
&myopac.summary.password.reenter;

- - - - - - - -

&myopac.summary.email;

&myopac.summary.change;

- &myopac.summary.email.new; - - - - - - - -

&myopac.summary.id.primary;

&myopac.summary.barcode;

&myopac.summary.home;

&myopac.summary.genesis;

- - -

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

&myopac.summary.addresses;

&myopac.summary.addresses.pending;

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

&myopac.summary.address.type;
&myopac.summary.address.street;
&myopac.summary.address.street;
&myopac.summary.address.city;
&myopac.summary.address.county;
&myopac.summary.address.state;
&myopac.summary.address.country;
&myopac.summary.address.zip;
- Edit Address -

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

&myopac.summary.address.type;
&myopac.summary.address.street;
&myopac.summary.address.street;
&myopac.summary.address.city;
&myopac.summary.address.county;
&myopac.summary.address.state;
&myopac.summary.address.country;
&myopac.summary.address.zip;
- Save Changes - Discard Pending Address -

- -

&myopac.summary.username.error;

- &myopac.summary.username.dup; -

&myopac.summary.username.success;

&myopac.summary.username.failure;

- -

&myopac.summary.email.error;

&myopac.summary.email.success;

&myopac.summary.email.failed;

- -

&myopac.summary.password.error;

&myopac.summary.password.success;

&myopac.summary.password.failure;

- &myopac.summary.username.invalid; - Address Saved -

- - + +

+ + +

+ + + + + + +

+ &myopac.summary.expired; +

+ +

+ + + + + + + + + + + +

&myopac.summary.notes;
+ : +

+
+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

&common.name;

+ + + + + +

&myopac.summary.phone.day;

&myopac.summary.phone.evening;

&myopac.summary.phone.other;

&common.username;

&myopac.summary.change;

+ &myopac.summary.username.enter; + + + + + + + +

&common.password;

&myopac.summary.password.text;

&myopac.summary.change;

+ + + + + + + + + + + + + + +

&myopac.summary.password.current;
&myopac.summary.password.new;
&myopac.summary.password.reenter;

+ + + + + + + +

&myopac.summary.email;

&myopac.summary.change;

+ &myopac.summary.email.new; + + + + + + + +

&myopac.summary.id.primary;

&myopac.summary.barcode;

&myopac.summary.home;

&myopac.summary.genesis;

+ + +

+ + + + + + + + + + + + + + +

&myopac.summary.addresses;

&myopac.summary.addresses.pending;

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

&myopac.summary.address.type;
&myopac.summary.address.street;
&myopac.summary.address.street;
&myopac.summary.address.city;
&myopac.summary.address.county;
&myopac.summary.address.state;
&myopac.summary.address.country;
&myopac.summary.address.zip;
+ Edit Address +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

&myopac.summary.address.type;
&myopac.summary.address.street;
&myopac.summary.address.street;
&myopac.summary.address.city;
&myopac.summary.address.county;
&myopac.summary.address.state;
&myopac.summary.address.country;
&myopac.summary.address.zip;
+ Save Changes + Discard Pending Address +

+ +

&myopac.summary.username.error;

+ &myopac.summary.username.dup; +

&myopac.summary.username.success;

&myopac.summary.username.failure;

+ +

&myopac.summary.email.error;

&myopac.summary.email.success;

&myopac.summary.email.failed;

+ +

&myopac.summary.password.error;

&myopac.summary.password.success;

&myopac.summary.password.failure;

+ &myopac.summary.username.invalid; + Address Saved +

+ + diff --git a/web/opac/skin/uwin/xml/page_advanced.xml b/web/opac/skin/uwin/xml/page_advanced.xml index afce599fc2..6c77ea0698 100644 --- a/web/opac/skin/uwin/xml/page_advanced.xml +++ b/web/opac/skin/uwin/xml/page_advanced.xml @@ -1,14 +1,14 @@ -

- - - - - -

- -

- - +

+ + + + + +

+ +

+ + diff --git a/web/opac/skin/uwin/xml/page_cnbrowse.xml b/web/opac/skin/uwin/xml/page_cnbrowse.xml index de78c50877..ca5cc7253b 100644 --- a/web/opac/skin/uwin/xml/page_cnbrowse.xml +++ b/web/opac/skin/uwin/xml/page_cnbrowse.xml @@ -1,6 +1,6 @@ -

- - -

- - +

+ + +

+ + diff --git a/web/opac/skin/uwin/xml/page_mresult.xml b/web/opac/skin/uwin/xml/page_mresult.xml index 73c5cc3b81..eec6aa07fa 100644 --- a/web/opac/skin/uwin/xml/page_mresult.xml +++ b/web/opac/skin/uwin/xml/page_mresult.xml @@ -1,9 +1,9 @@ -

- - - - - - -

- +

+ + + + + + +

+ diff --git a/web/opac/skin/uwin/xml/page_myopac.xml b/web/opac/skin/uwin/xml/page_myopac.xml index a749baa64b..f298ee95c8 100644 --- a/web/opac/skin/uwin/xml/page_myopac.xml +++ b/web/opac/skin/uwin/xml/page_myopac.xml @@ -1,68 +1,68 @@ -

- - - - - -

&common.loading;

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

- &myopac.account; -

- &myopac.checkouts; -

- &myopac.holds; -

- &myopac.fines; -

- &myopac.preferences; -

- &myopac.bookbags; - -

- -
- -

- - - - - - -

- -

- - +

+ + + + + +

&common.loading;

+ + + +
+ + + + + + + + + + + + + + + + + + +

+ &myopac.account; +

+ &myopac.checkouts; +

+ &myopac.holds; +

+ &myopac.fines; +

+ &myopac.preferences; +

+ &myopac.bookbags; + +

+ +
+ +

+ + + + + + +

+ +

+ + diff --git a/web/opac/skin/uwin/xml/page_rdetail.xml b/web/opac/skin/uwin/xml/page_rdetail.xml index c1d1ea257b..ef55029da5 100644 --- a/web/opac/skin/uwin/xml/page_rdetail.xml +++ b/web/opac/skin/uwin/xml/page_rdetail.xml @@ -7,11 +7,6 @@ - - - - - - - - - - - - +

+ + + + + + +

+ diff --git a/web/opac/skin/uwin/xml/rdetail/rdetail_altcanvas.xml b/web/opac/skin/uwin/xml/rdetail/rdetail_altcanvas.xml index e7abdb285b..ff17d172c3 100644 --- a/web/opac/skin/uwin/xml/rdetail/rdetail_altcanvas.xml +++ b/web/opac/skin/uwin/xml/rdetail/rdetail_altcanvas.xml @@ -1,28 +1,28 @@ - - -

- - - -

- + + +

+ + + +

+ diff --git a/web/opac/skin/uwin/xml/rdetail/rdetail_cn_details.xml b/web/opac/skin/uwin/xml/rdetail/rdetail_cn_details.xml index c2a1756414..00b936ee55 100644 --- a/web/opac/skin/uwin/xml/rdetail/rdetail_cn_details.xml +++ b/web/opac/skin/uwin/xml/rdetail/rdetail_cn_details.xml @@ -1,103 +1,105 @@ - - - - - - - - -

- - &rdetail.print; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

&rdetail.cn.barcode;

&common.status;

&rdetail.cn.location;

&rdetail.cn.hold.age;

&rdetail.cn.genesis;

&rdetail.cn.holdable;

&rdetail.cn.due;

- - &rdetail.cn.more; - &rdetail.cn.less; - &rdetail.cn.hold; -

&rdetail.cn.disabled;

- -

- - - - - - - -

- &rdetail.cn.note; - &rdetail.cn.category; -

- : -

- -&common.yes; -&common.no; - - -

- -

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

&common.library;
&common.title;
&common.author;
&common.edition;
&common.pubdate;
&common.publisher;
&common.physical;

&common.callnumber;

- + + + + + + + + +

+ + &rdetail.print; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

&rdetail.cn.barcode;

&common.status;

&rdetail.cn.location;

&rdetail.cn.hold.age;

&rdetail.cn.genesis;

&rdetail.cn.holdable;

&rdetail.cn.due;

+ + &rdetail.cn.more; + &rdetail.cn.less; + &rdetail.cn.hold; + &rdetail.cn.reserve; +

&rdetail.cn.disabled;

+ +

+ + + + + + + +

+ &rdetail.cn.note; + &rdetail.cn.category; +

+ : +

+ +&common.yes; +&common.no; + + +

+ +

+ + + + + + + + + + + + + + +

&common.library;
&common.title;
&common.author;
&common.edition;
&common.pubdate;
&common.publisher;
&common.physical;

&common.callnumber;

+ diff --git a/web/opac/skin/uwin/xml/rdetail/rdetail_copyinfo.xml b/web/opac/skin/uwin/xml/rdetail/rdetail_copyinfo.xml index a25c8f3cb5..01e463bf7d 100644 --- a/web/opac/skin/uwin/xml/rdetail/rdetail_copyinfo.xml +++ b/web/opac/skin/uwin/xml/rdetail/rdetail_copyinfo.xml @@ -1,93 +1,89 @@ - - -

- -

- - &rdetail.copyInfo.local; - - - &rdetail.copyInfo.all; - -

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

&rdetail.copyInfo.library;	&rdetail.copyInfo.callnumber;	&rdetail.copyInfo.copylocation;	&rdetail.copyInfo.actions;	- -
- - &rdetail.copyInfo.print; - -			- - &rdetail.copyInfo.details; - - - - - -
&rdetail.loading;

- - - -

- -

&rdetail.noneAvailable;

- - - -

- - + + +

+ +

+ + &rdetail.copyInfo.local; + + + &rdetail.copyInfo.all; + +

+ + + + + + + + + + + + + + + + + + + + + + + + + +

&rdetail.copyInfo.library;	&rdetail.copyInfo.callnumber;	&rdetail.copyInfo.copylocation;	&rdetail.copyInfo.actions;	+ +
+ + &rdetail.copyInfo.print; + +			+ + &rdetail.copyInfo.details; + + + &rdetail.copyInfo.browse; + + + &rdetail.copyInfo.hold; + +
&rdetail.loading;

+ + + +

+ +

&rdetail.noneAvailable;

+ + + +

+ + diff --git a/web/opac/skin/uwin/xml/rdetail/rdetail_extras.xml b/web/opac/skin/uwin/xml/rdetail/rdetail_extras.xml index 256e2d376c..c6f9926ebe 100644 --- a/web/opac/skin/uwin/xml/rdetail/rdetail_extras.xml +++ b/web/opac/skin/uwin/xml/rdetail/rdetail_extras.xml @@ -1,125 +1,125 @@ - -

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

- &rdetail.extras.summary; -	- &rdetail.extras.browser; -	- &rdetail.extras.reviews; -	- &rdetail.extras.toc; -	- &rdetail.extras.excerpt; -	- &rdetail.extras.preview; -	- &rdetail.extras.author.notes; -	- &rdetail.extras.performer.notes; -	- &rdetail.extras.annotation; -	- &rdetail.extras.marc; -

- -

&common.loading;

- - -

- -

- &rdetail.extras.call.null; -

- -

- &rdetail.extras.call.local; - -

- - -

- - - -

- -

&rdetail.extras.preview.fulltext;

&rdetail.extras.preview.title;

&rdetail.extras.preview.badge;

+ +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ &rdetail.extras.summary; +	+ &rdetail.extras.browser; +	+ &rdetail.extras.reviews; +	+ &rdetail.extras.toc; +	+ &rdetail.extras.excerpt; +	+ &rdetail.extras.preview; +	+ &rdetail.extras.author.notes; +	+ &rdetail.extras.performer.notes; +	+ &rdetail.extras.annotation; +	+ &rdetail.extras.marc; +

+ +

&common.loading;

+ + +

+ +

+ &rdetail.extras.call.null; +

+ +

+ &rdetail.extras.call.local; + +

+ + +

+ + + +

+ +

&rdetail.extras.preview.fulltext;

&rdetail.extras.preview.title;

&rdetail.extras.preview.badge;

diff --git a/web/opac/skin/uwin/xml/rdetail/rdetail_summary.xml b/web/opac/skin/uwin/xml/rdetail/rdetail_summary.xml index 1e58f36c88..e62a09c2c7 100644 --- a/web/opac/skin/uwin/xml/rdetail/rdetail_summary.xml +++ b/web/opac/skin/uwin/xml/rdetail/rdetail_summary.xml @@ -1,171 +1,442 @@ - - - -

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

- - - - - - &opac.image_provided; - &vendor.name; - -	- - &common.title;
	&common.author;	- -
	&common.isbn;
	&common.issn;
	&common.edition;
	Place of Publication
	&common.publisher;
	&common.pubdate;
	&common.physical;
	&common.format;	- - -
	&rdetail.detailMain.abstract;
	Subjects	- -
	&rdetail.summary.online;	- -

- - - - - - - - -

- + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + &opac.image_provided; + &vendor.name; + +	&common.title;	+ +
	&common.alternate.title;	+ +
	&common.author;	+ +
	&common.author;	+ +
	&common.corporate.author;	+ +
	&common.meeting.name;	+ +
	&common.isbn;	+ +
	&common.issn;	+ +
	&common.edition;	+ +
	&common.pubdate;
	&common.publisher;	+ +
	&common.physical;
	&common.format;	+ + +
	&rdetail.detailMain.abstract;	+ +
	&common.subject.600;	+ +
	&common.subject.610;	+ +
	&common.subject.611;	+ +
	&common.subject.630;	+ +
	&common.subject.648;	+ +
	&common.subjects;	+ +
	&common.subject.651;	+ +
	&common.subject.653;	+ +
	&common.subject.654;	+ +
	&common.subject.655;	+ +
	&common.subject.656;	+ +
	&common.subject.657;	+ +
	&common.subject.658;	+ +
	&common.subject.662;	+ +
	&common.general.note;	+ +
	&common.contents.note;	+ +
	&common.usage.restrictions;	+ +
	&common.performer.note;	+ +
	&common.additional.authors;	+ +
	&common.preceding.entry;	+ +
	&common.succeeding.entry;	+ +
	&rdetail.summary.online;	+ +

+ + + +

+ diff --git a/web/opac/skin/uwin/xml/result/filtersort.xml b/web/opac/skin/uwin/xml/result/filtersort.xml index 16f4cfef64..27eb382ee6 100644 --- a/web/opac/skin/uwin/xml/result/filtersort.xml +++ b/web/opac/skin/uwin/xml/result/filtersort.xml @@ -1,20 +1,20 @@ - - &result.limit2avail; - - + + &result.limit2avail; + + diff --git a/web/opac/skin/uwin/xml/result/result_common.xml b/web/opac/skin/uwin/xml/result/result_common.xml index 15dad4c759..86848ab51f 100644 --- a/web/opac/skin/uwin/xml/result/result_common.xml +++ b/web/opac/skin/uwin/xml/result/result_common.xml @@ -1,36 +1,36 @@ - -

- - - - - - -

- - + +

+ + + + + + +

+ + diff --git a/web/opac/skin/uwin/xml/result/result_info.xml b/web/opac/skin/uwin/xml/result/result_info.xml index 5b9ddb5d13..902035b808 100644 --- a/web/opac/skin/uwin/xml/result/result_info.xml +++ b/web/opac/skin/uwin/xml/result/result_info.xml @@ -1,74 +1,74 @@ - - - - - - - - - - - - - - - - -

- - - &common.results; - - - - - &common.ofAtLeast; - - (page - - &common.of; - - - - - &rdetail.start;« - - - - » - - - -	- - &result.info.copies; - -
- - - * - &result.info.no.items; - &result.info.format.items; - - - - - &result.info.show; - - - - &result.info.show; - - -

- + + + + + + + + + + + + + + + + +

+ + + &common.results; + + - + + &common.ofAtLeast; + + (page + + &common.of; + + + + + &rdetail.start;&rdetail.page.previous.short; + + + + &rdetail.page.next.short; + + + +	+ + &result.info.copies; + +
+ + + * + &result.info.no.items; + &result.info.format.items; + + + + + &result.info.show; + + + + &result.info.show; + + +

+ diff --git a/web/opac/skin/uwin/xml/result/result_lowhits.xml b/web/opac/skin/uwin/xml/result/result_lowhits.xml index 98fd9c90bb..0933ed1572 100644 --- a/web/opac/skin/uwin/xml/result/result_lowhits.xml +++ b/web/opac/skin/uwin/xml/result/result_lowhits.xml @@ -1,49 +1,49 @@ - -

- -

- -

&result.lowhits.few;

&result.lowhits.zero;

- - -

- &result.lowhits.did.you.mean; - -

- -

- &result.lowhits.formats; - &result.lowhits.formats.search; -

- -

- &result.lowhits.related; -

- -

- &result.lowhits.expand; - -

- -

- &result.lowhits.class; - &result.lowhits.title; - &result.lowhits.author; - &result.lowhits.subject; - &result.lowhits.series; - &result.lowhits.keyword; -

- -

- + +

+ +

+ +

&result.lowhits.few;

&result.lowhits.zero;

+ + +

+ &result.lowhits.did.you.mean; + +

+ +

+ &result.lowhits.formats; + &result.lowhits.formats.search; +

+ +

+ &result.lowhits.related; +

+ +

+ &result.lowhits.expand; + +

+ +

+ &result.lowhits.class; + &result.lowhits.title; + &result.lowhits.author; + &result.lowhits.subject; + &result.lowhits.series; + &result.lowhits.keyword; +

+ +

+ diff --git a/web/opac/skin/uwin/xml/result/result_table.xml b/web/opac/skin/uwin/xml/result/result_table.xml index 10fcbe1bc0..cdd1cefa24 100644 --- a/web/opac/skin/uwin/xml/result/result_table.xml +++ b/web/opac/skin/uwin/xml/result/result_table.xml @@ -1,209 +1,304 @@ - - -

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

- -

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

- -	- - - - -	-
	- - - - - - - \| - \| - - - - -
	- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - &common.relevancy; - - - - - - - - - - - - - - - - - -

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

- - - &common.results; - - - - - &common.ofAtLeast; - - (page - - &common.of; - - - - - &rdetail.start;« - - - » - - - -

- -

- - - - - -

- - + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + +

+ +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ +	+ + + + +	+
	+ + + + + + + \| + \| + + + + +
	&result.localCallNumbers; + + + = max_items) { + return output.innerHTML; + } + dojo.query('copy', vol).forEach(function (cp) { + if (cp.getAttribute('deleted') == 't') { + return; + } + var loc_id; + var vol_appended = false; + dojo.query('location', cp).forEach(function (location) { + loc_id = parseInt(location.getAttribute('ident')); + if (loc_id != 8 && loc_id != 20) { + if (!vol_appended) { + dojo.create('span',{ className: 'live_location_cell', + innerHTML: vol.getAttribute('label')}, + output); + vol_appended = true; + } + /* + var pfx = dojo.doc.createTextNode(' - '); + output.appendChild(pfx); + */ + dojo.create('span', { className: 'live_separator_cell', + "innerHTML": ' - '}, + output); + dojo.create('span', { className: 'live_location_cell', + "innerHTML": dojox.xml.parser.textContent(location)}, + output); + } + }); + if (loc_id == 8 \|\| loc_id == 20) { + return; + } + dojo.query('status', cp).forEach(function (status) { + var pfx = dojo.doc.createTextNode(' ('); + output.appendChild(pfx); + dojo.create('span', { className: 'live_status_cell', + "innerHTML": dojox.xml.parser.textContent(status) }, output); + var sfx = dojo.doc.createTextNode(')'); + output.appendChild(sfx); + }); + dojo.create('br', null, output); + + item_cnt++; + if (item_cnt >= max_items) { + output.appendChild(dojo.doc.createTextNode('... more items in full record')); + } + }); + }); + return output.innerHTML; + ]]> + + + + + + + +
	+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + &common.relevancy; + + + + &opac.holds.placeHold; + + + + + + + + + + &result.googleBooks.browse; + + + +

+ + + + + + + + + + + + + +

+ + + &common.results; + + - + + &common.ofAtLeast; + + (page + + &common.of; + + + + + &rdetail.start;&rdetail.page.previous.symbol; + + + &rdetail.page.next.symbol; + + + +

+ +

+ + + + + +

+ + -- 2.11.0