Merge branch 'master' of git.evergreen-ils.org:Evergreen into library_schema

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Conflicts:
	Open-ILS/src/templates/opac/parts/record/copy_table.tt2

diff --cc Open-ILS/src/templates/opac/parts/record/copy_table.tt2
index 736ee06,9c8407b..1f4eb4d
--- 1/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
--- 2/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
@@@ -93,16 -93,12 +93,16 @@@ END; # FOREACH bi
              [%- IF serial_holdings %]<td headers='copy_header_holding_label' class='rdetail-issue-issue'>
                  [%- copy_info.holding_label | html; -%]
              </td>
-             [%- ELSE %]<td headers='copy_header_library'>
+             [%- ELSE %]<td headers='copy_header_library' property="seller">
              [%-
                  org_name = ctx.get_aou(copy_info.circ_lib).name;
 +                org_sname = ctx.get_aou(copy_info.circ_lib).shortname;
                  lib_url = ctx.get_org_setting(copy_info.circ_lib, 'lib.info_url');
 -                IF lib_url; '<a href="'; lib_url | url; '">'; END;
 -                org_name | html;
 +                UNLESS lib_url;
 +                    lib_url = mkurl(ctx.opac_root _ '/library/' _ ctx.get_aou(copy_info.circ_lib).shortname, {}, 1);
 +                END; 
 +                IF lib_url; '<a property="seller" typeof="Library" href="'; lib_url | url; '">'; END;
 +                '<span property="name">'; org_name | html; '</span>';
                  IF lib_url; '</a>'; END;
              -%]
                  <link property="businessFunction" href="http://purl.org/goodrelations/v1#LeaseOut">