diff --git a/themes/fid_bbi/languages/fid/de.ini b/themes/fid_bbi/languages/fid/de.ini index 8aeb8e14a771bd41458e5c70320bc54c3f09a918..1fdea9d06f81a50b02963b57012fe84f729d701b 100644 --- a/themes/fid_bbi/languages/fid/de.ini +++ b/themes/fid_bbi/languages/fid/de.ini @@ -14,3 +14,4 @@ permission_full_access = "Zugriff auf lizenzbewehrte Literatur, Direktlieferung label_college = "Hochschule oder andere affiliierte Institution" acquisition_fid_name = "FID BBI" +policy_terms_text = "Für dieses Formular gelten die bereits von Ihnen bestätigte %%policy%% und %%terms%%." \ No newline at end of file diff --git a/themes/fid_bbi/languages/fid/en.ini b/themes/fid_bbi/languages/fid/en.ini index dd6370c39112a20fe96b4f110d0df82a48aa2d3c..e3e2cb8965a1bcd832d65a59d891729c038991f2 100644 --- a/themes/fid_bbi/languages/fid/en.ini +++ b/themes/fid_bbi/languages/fid/en.ini @@ -10,3 +10,6 @@ permission_extended_access = "Access to FID-Licences" permission_full_access = "Access to licenced literature, patron driven aquisition & digitise-on-demand" label_college = "Affiliation" + +acquisition_fid_name = "FID BBI" +policy_terms_text = "For this form, the %%policy%% and %%terms%% that you have already confirmed apply." diff --git a/themes/fid_bbi/templates/fid/record/acquisition-address-details.phtml b/themes/fid_bbi/templates/fid/record/acquisition-address-details.phtml index caee99e60cb099db17d51270d198ca12d189f1f9..7147d5392df96b634eceafda3e4486367e3c240c 100644 --- a/themes/fid_bbi/templates/fid/record/acquisition-address-details.phtml +++ b/themes/fid_bbi/templates/fid/record/acquisition-address-details.phtml @@ -10,18 +10,6 @@ $address = $this->user->getDeliveryAddress(); <th><?= $this->translate("fid::acquisition_order_delivery_name") ?></th> <td><?= $this->user->getFirstname() ?> <?= $this->user->getLastname() ?></td> </tr> - <tr> - <th><?= $this->translate("fid::order_delivery_address") ?></th> - <td> - <?php if($user->deliveryAddressIsBusinessAddress() && !empty($college=$user->getCollege())): ?> - <?= $college ?><br> - <?php endif ?> - <?= $address->getLine1() ?><br> - <?= !empty($address->getLine2()) ? $address->getLine2() . '<br>' : '' ?> - <?= $address->getZip() ?> <?= $address->getCity() ?><br> - <?= $address->getCountry() ?> - </td> - </tr> <tr> <th><?= $this->translate("Email Address") ?></th> <td><?= $this->user->getUsername() ?></td> diff --git a/themes/fid_bbi/templates/fid/record/acquisition-digitization.phtml b/themes/fid_bbi/templates/fid/record/acquisition-digitization.phtml index 96b18ff52d589027957ba76392ec5f42948c3d89..0028c85797f3cb5ad3d3986e5115ecb22eea1347 100644 --- a/themes/fid_bbi/templates/fid/record/acquisition-digitization.phtml +++ b/themes/fid_bbi/templates/fid/record/acquisition-digitization.phtml @@ -47,33 +47,55 @@ $form->setAttribute('class','fid-acquisition-form'); $elemFormat->setAttributes(['class' => 'form-control']); ?> - <? /* comments */ ?> - <?php - /** @var Element\Text $elemComment */ - $elemComment = $form->get('comment'); - $elemComment->setLabelAttributes(['class' => 'control-label']); - $elemComment->setAttributes(['class' => 'form-control']); - ?> - <div class="form-group"> <?= $this->formElementErrors($elemFormat) ?> <?= $this->formLabel($elemFormat) ?> <?= $this->formElement($elemFormat) ?> </div> +<? /* comments */ ?> +<?php +/** @var Element\Textarea $elemComment */ +$elemComment = $form->get('comment'); +$elemComment->setLabelAttributes(['class' => 'control-label']); +$elemComment->setAttributes(['class' => 'form-control']); +?> + <div class="form-group"> <?= $this->formElementErrors($elemComment) ?> <?= $this->formLabel($elemComment) ?> <?= $this->formElement($elemComment) ?> </div> +<?php // eula privacy policy ?> +<div class="form-group eula"> + <div> + <?php + $policy_link = '<a data-lightbox href="' + . $this->url('fid/user/policy') + . '">' + . $this->transEsc("fid::policy") + . '</a>'; + $terms_link = '<a data-lightbox href="' + . $this->url('fid/user/terms') + . '">' + . $this->transEsc("fid::terms") + . '</a>'; + ?> + <?=$this->translate("fid::policy_terms_text", [ + '%%policy%%' => $policy_link, + '%%terms%%' => $terms_link + ])?> + </div> +</div> + <? /* submit button */ ?> <?php /** @var Element\Submit $elemSubmit */ $elemSubmit = $form->get('submit'); $elemSubmit->setAttributes(['class' => 'btn btn-primary']); ?> - <div class="form-group right"> + <div class="form-group"> <?= $this->formElement($elemSubmit) ?> </div>