diff --git a/fid/config/vufind/fid.ini b/fid/config/vufind/fid.ini
index f9615bf43bb767c9f23c6697454d531717b00993..1739235747aa01027b1faf8e1a942c3f072b1a4a 100644
--- a/fid/config/vufind/fid.ini
+++ b/fid/config/vufind/fid.ini
@@ -14,12 +14,6 @@ role_display_priority[] = "full_access>limited_access>basic_access"
role_display_order = "full_access>limited_access>basic_access"
[Admin]
-; Whitelist of all fields that admins shall be able
-; to change for other users
-;editable_user_fields[] = 'HomeLibrary'
-editable_user_fields[] = 'Permissions'
-editable_user_fields[] = 'Salutation'
-
;list of user fields to be shown in overview table
overview_fields[] = 'UserName'
overview_fields[] = 'Firstname'
diff --git a/module/fid/config/admin-edit-form.php b/module/fid/config/admin-edit-form.php
index 81322e19f9306857c29d156410b139a279e0a6c4..55db3fe0391185e81f4bbdbdc3e6a3c62a492824 100644
--- a/module/fid/config/admin-edit-form.php
+++ b/module/fid/config/admin-edit-form.php
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright (C) 2019 Leipzig University Library
+ * Copyright (C) 2020 Leipzig University Library
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -20,22 +20,25 @@
*/
use fid\Hydrator\UserHydrator;
-use fid\InputFilter\AdminEditFormInputFilter;
use fid\InputFilter\RootAwareBaseInputFilter;
-use Zend\Filter\StringTrim;
use Zend\Form\Element\Collection;
use Zend\Form\Element\Hidden;
use Zend\Form\Element\Radio;
use Zend\Form\Element\Select;
use Zend\Form\Element\Submit;
use Zend\Form\Element\Text;
-use Zend\Validator\Regex;
-use Zend\Validator\StringLength;
+use Zend\Form\Fieldset;
+use Zend\Form\InputFilterProviderFieldset;
return [
- 'name' => 'admin-edit-form',
- 'hydrator' => UserHydrator::class,
- 'elements' => [
+ 'name' => 'user-update-form',
+ 'hydrator' => UserHydrator::class,
+ 'validation_group' => [
+ 'id',
+ 'job_title',
+ 'permissions'
+ ],
+ 'elements' => [
'id' => [
'spec' => [
'name' => 'id',
@@ -44,9 +47,9 @@ return [
],
'salutation' => [
'spec' => [
- 'name' => 'salutation',
- 'type' => Select::class,
- 'options' => [
+ 'name' => 'salutation',
+ 'type' => Select::class,
+ 'options' => [
'label' => 'label_salutation',
'options' => [
'mr' => [
@@ -60,15 +63,21 @@ return [
],
'empty_option' => '',
],
+ 'attributes' => [
+ 'disabled' => true,
+ ],
],
],
'academic_title' => [
'spec' => [
- 'name' => 'academic_title',
- 'type' => Text::class,
- 'options' => [
+ 'name' => 'academic_title',
+ 'type' => Text::class,
+ 'options' => [
'label' => 'label_academic_title',
],
+ 'attributes' => [
+ 'readonly' => true,
+ ],
],
],
'firstname' => [
@@ -79,7 +88,7 @@ return [
'label' => 'label_firstname',
],
'attributes' => [
- 'required' => true,
+ 'readonly' => true,
],
],
],
@@ -91,7 +100,7 @@ return [
'label' => 'label_lastname',
],
'attributes' => [
- 'required' => true,
+ 'readonly' => true,
],
],
],
@@ -100,21 +109,23 @@ return [
'name' => 'home_library',
'type' => Select::class,
'options' => [
- 'label' => 'label_home_library',
- 'use_hidden_element' => true,
+ 'label' => 'label_home_library',
],
'attributes' => [
- 'required' => true,
+ 'disabled' => true,
],
],
],
'college' => [
'spec' => [
- 'name' => 'college',
- 'type' => Text::class,
- 'options' => [
+ 'name' => 'college',
+ 'type' => Text::class,
+ 'options' => [
'label' => 'label_college',
- ]
+ ],
+ 'attributes' => [
+ 'readonly' => true,
+ ],
],
],
'job_title' => [
@@ -153,110 +164,116 @@ return [
],
],
],
- 'submit' => [
- 'spec' => [
- 'name' => 'submit',
- 'type' => Submit::class,
- 'attributes' => [
- 'value' => 'label_update_submit',
- ],
- ],
-],
- ],
- 'input_filter' => [
- 'type' => RootAwareBaseInputFilter::class,
- 'id' => [
- 'name' => 'id',
- 'required' => true,
- ],
- 'salutation' => [
- 'name' => 'salutation',
- 'required' => false,
- 'filters' => [
- StringTrim::class => [
- 'name' => StringTrim::class,
- ],
- ],
- ],
- 'academic_title' => [
- 'name' => 'academic_title',
- 'required' => false,
- 'filters' => [
- StringTrim::class => [
- 'name' => StringTrim::class,
- ],
- ],
- ],
- 'firstname' => [
- 'name' => 'firstname',
- 'required' => false,
- 'filters' => [
- StringTrim::class => [
- 'name' => StringTrim::class,
- ],
- ],
- 'validators' => [
- StringLength::class => [
- 'name' => StringLength::class,
- 'options' => [
- 'max' => 255
- ],
- ],
- Regex::class => [
- 'name' => Regex::class,
- 'options' => [
- 'pattern' => '/^\D*$/',
+ 'addresses' => [
+ 'spec' => [
+ 'name' => 'addresses',
+ 'type' => Fieldset::class,
+ 'elements' => [
+ 'address_0' => [
+ 'spec' => [
+ 'name' => 0,
+ 'type' => Fieldset::class,
+ 'options' => [
+ 'template' => 'fid/user/address-fieldset.phtml',
+ ],
+ 'elements' => [
+ 'id' => [
+ 'spec' => [
+ 'name' => 'id',
+ 'type' => Hidden::class,
+ ],
+ ],
+ 'line1' => [
+ 'spec' => [
+ 'name' => 'line1',
+ 'options' => [
+ 'label' => 'label_address_0_line_1',
+ ],
+ 'attributes' => [
+ 'readonly' => true,
+ ],
+ ],
+ ],
+ 'line2' => [
+ 'spec' => [
+ 'name' => 'line2',
+ 'options' => [
+ 'label' => 'label_address_0_line_2',
+ ],
+ 'attributes' => [
+ 'readonly' => true,
+ ],
+ ],
+ ],
+ 'zip' => [
+ 'spec' => [
+ 'name' => 'zip',
+ 'options' => [
+ 'label' => 'label_address_0_zip',
+ ],
+ 'attributes' => [
+ 'readonly' => true,
+ ],
+ ],
+ ],
+ 'city' => [
+ 'spec' => [
+ 'name' => 'city',
+ 'options' => [
+ 'label' => 'label_address_0_city',
+ ],
+ 'attributes' => [
+ 'readonly' => true,
+ ],
+ ],
+ ],
+ 'country' => [
+ 'spec' => [
+ 'name' => 'country',
+ 'options' => [
+ 'label' => 'label_address_0_country',
+ ],
+ 'attributes' => [
+ 'readonly' => true,
+ ],
+ ],
+ ],
+ ],
+ ],
+ ],
],
],
],
- ],
- 'lastname' => [
- 'name' => 'lastname',
- 'required' => false,
- 'filters' => [
- StringTrim::class => [
- 'name' => StringTrim::class,
+ 'data' => [
+ 'spec' => [
+ 'name' => 'data',
+ 'type' => InputFilterProviderFieldset::class,
],
],
- 'validators' => [
- StringLength::class => [
- 'name' => StringLength::class,
- 'options' => [
- 'max' => 255
- ]
- ],
- Regex::class => [
- 'name' => Regex::class,
- 'options' => [
- 'pattern' => '/^\D*$/',
+ 'submit' => [
+ 'spec' => [
+ 'name' => 'submit',
+ 'type' => Submit::class,
+ 'attributes' => [
+ 'value' => 'label_update_submit',
],
],
],
],
- 'home_library' => [
- 'name' => 'home_library',
- 'filters' => [
- StringTrim::class => [
- 'name' => StringTrim::class,
- ],
+ 'input_filter' => [
+ 'type' => RootAwareBaseInputFilter::class,
+ 'id' => [
+ 'name' => 'id',
+ 'required' => true,
],
- ],
- 'college' => [
- 'name' => 'college',
- 'required' => false,
- 'filters' => [
- StringTrim::class => [
- 'name' => StringTrim::class,
- ],
+ 'job_title' => [
+ 'name' => 'job_title',
+ 'required' => true,
+ ],
+ 'submit' => [
+ 'name' => 'submit',
+ 'required' => true,
],
],
- 'job_title' => [
- 'name' => 'job_title',
- 'required' => true,
- ],
- 'submit' => [
- 'name' => 'submit',
- 'required' => true,
- ],
-],
-];
\ No newline at end of file
+];
+
diff --git a/module/fid/config/username-change-form.php b/module/fid/config/username-change-form.php
index 75ac717b6a862512ecfb7193f0c4ddb59fafc102..9139e55b080c8b2780e32640170fd0c37ec3dc6a 100644
--- a/module/fid/config/username-change-form.php
+++ b/module/fid/config/username-change-form.php
@@ -46,7 +46,7 @@ return [
'usernameConfirmation' => [
'spec' => [
'name' => 'usernameConfirmation',
- 'type' => Text::class,
+ 'type' => Email::class,
'options' => [
'label' => 'label_newusername_confirmation',
],
diff --git a/module/fid/src/Controller/UserController.php b/module/fid/src/Controller/UserController.php
index 2e8d89f664e26f06036cca1126cc77fb048f42f7..7eb04a7da71cacdf802bfdbbe83e0ee5798ecb07 100644
--- a/module/fid/src/Controller/UserController.php
+++ b/module/fid/src/Controller/UserController.php
@@ -458,6 +458,12 @@ class UserController extends AbstractBase
$form = $this->serviceLocator->get(PasswordResetModel::class);
$forwarded = $this->params()->fromRoute('forwarded', false);
+ if($this->getUser()) {
+ $form->get('username')->setAttribute('disabled', 'true');
+ $form->get('username')->setValue($this->client->requestUserDetails()->getUsername());
+ $form->setValidationGroup(['submit']);
+ }
+
if ($submitted = $this->formWasSubmitted()) {
$form->setData($request->getPost());
if (!$forwarded && $form->isValid()) {
@@ -474,11 +480,15 @@ class UserController extends AbstractBase
protected function sendResetPassword(Form $form)
{
- /** @var PasswordResetModel $model */
$messenger = $this->getMessenger();
- $model = $form->getHydrator()->hydrate(
- $form->getData(), new PasswordResetModel());
- $username = $model->getUsername();
+ if ($this->getUser()) {
+ $username = $this->client->requestUserDetails()->getUsername();
+ } else {
+ /** @var PasswordResetModel $model */
+ $model = $form->getHydrator()->hydrate(
+ $form->getData(), new PasswordResetModel());
+ $username = $model->getUsername();
+ }
try {
/** @noinspection PhpUndefinedFieldInspection */
diff --git a/module/fid/src/Helper/SearchTabs.php b/module/fid/src/Helper/SearchTabs.php
index 2a01a5397053850b24623d888f58a1d4ebb15ea8..6bc141ea137fd59bf2ece8f453328cfcfbe83d3e 100644
--- a/module/fid/src/Helper/SearchTabs.php
+++ b/module/fid/src/Helper/SearchTabs.php
@@ -73,6 +73,7 @@ class SearchTabs extends \VuFind\View\Helper\Root\SearchTabs
{
$retval = parent::createSelectedTab($id, $class, $label, $permissionName);
$retval['hiddenFilters'] = $this->helper->getTabFilterConfig()[$id] ?? null;
+ $retval['shortLabel'] = 'SearchTabs::'.$label;
return $retval;
}
diff --git a/module/fid/src/View/Helper/Root/GetIt.php b/module/fid/src/View/Helper/Root/GetIt.php
index aee1bc4139d749fbad1c5d9841e4eb60a32fa827..a47a8c51c4058522b364ffed800f3118219b1b06 100644
--- a/module/fid/src/View/Helper/Root/GetIt.php
+++ b/module/fid/src/View/Helper/Root/GetIt.php
@@ -55,6 +55,22 @@ class GetIt extends AbstractHelper
*/
protected $driver;
+ /**
+ * @var array list of available source ID definitions from config
+ */
+ protected $sids = [
+ 'source_idsV1',
+ 'source_idsV3',
+ 'source_idsV4',
+ 'source_idsV5',
+ 'source_idsV6',
+ 'source_idsV7',
+ 'source_idsV8',
+ 'source_idsV9',
+ 'source_idsV10',
+ 'source_idsV11',
+ ];
+
/**
* FID API Client
*
@@ -72,6 +88,11 @@ class GetIt extends AbstractHelper
protected $isbn;
protected $issn;
+ protected $accordeonColorDefault;
+ protected $accordeonColorAlternative;
+ protected $accordeonHeadlineDefault;
+ protected $accordeonHeadlineAlternative;
+
/**
* GetIt constructor.
*
@@ -100,10 +121,17 @@ class GetIt extends AbstractHelper
$this->isbn = $this->driver->tryMethod('getISBNs');
$this->issn = $this->driver->tryMethod('getISSNs');
+ $this->accordeonColorDefault = 'azure';
+ $this->accordeonColorAlternative = 'amber';
+ $this->accordeonHeadlineDefault = $this->translate('getit_infos');
+ $this->accordeonHeadlineAlternative = $this->translate('getit_links');
+
return $this;
}
/**
+ * Retrieve SIDs from config (getit.ini)
+ *
* @param $value
*
* @return array
@@ -115,6 +143,8 @@ class GetIt extends AbstractHelper
}
/**
+ * Retrieve NonSIDs from config (getit.ini)
+ *
* @param $value
*
* @return string
@@ -126,323 +156,583 @@ class GetIt extends AbstractHelper
}
/**
- * @param $defaultval
- * @param $additionalval
+ * Read specific config of given record
+ * Set default Values of getit box
*
- * @return mixed
+ * @return array config of given record
*/
- private function _accordeon($defaultval, $additionalval)
+ public function getConfig()
{
- if (in_array($this->sid, $this->_getSourceIds('source_idsV1'))) {
- return $additionalval;
- } elseif (in_array($this->sid, $this->_getSourceIds('source_idsV3'))) {
- return $additionalval;
- } elseif (in_array($this->sid, $this->_getSourceIds('source_idsV5'))) {
- return $additionalval;
- } elseif (in_array($this->sid, $this->_getSourceIds('source_idsV7'))) {
- return $additionalval;
- } elseif (in_array($this->sid, $this->_getSourceIds('source_idsV8'))) {
- if (in_array('Free', $this->facetAvail)) {
- return $additionalval;
- } elseif (in_array('Online', $this->facetAvail)
- && (preg_grep($this->_getNonSourceIds('source_idsV8_5'), $this->format)
- || preg_grep($this->_getNonSourceIds('source_idsV8_6'), $this->format)
- || preg_grep($this->_getNonSourceIds('source_idsV8_1'), $this->format))
- ) {
- return $additionalval;
+ //set default values
+ $accordeonColor = $this->accordeonColorDefault;
+ $accordeonHeadline = $this->accordeonHeadlineDefault;
+ $boxHeadline = $this->translate('Get it');
+ $notice = $this->translate('getit_text_default');
+ $showLinks = true;
+ $showOrderButton = false;
+ $showPartCopyButton = false;
+ $bossData = false;
+ $isEBCEBooks = false;
+ $hideNotice = false;
+ $isAiSidRecord = false;
+
+ // let specific functions override defaults where necessary
+ foreach ($this->sids as $sid_config) {
+ if (in_array($this->sid, $sid = $this->_getSourceIds($sid_config)))
+ {
+ $foo = 'get_config_'.$sid_config;
+ $this->$foo(
+ $accordeonColor,
+ $accordeonHeadline,
+ $boxHeadline,
+ $notice,
+ $showLinks,
+ $showOrderButton,
+ $showPartCopyButton,
+ $bossData,
+ $isEBCEBooks,
+ $hideNotice,
+ $isAiSidRecord
+ );
+ if ($this->sid !== '0')
+ {
+ //special case for source ID 0
+ // this is th only SID that is contained in multiple configs (V8 + V9)
+ break;
+ }
}
- } elseif (in_array($this->sid, $this->_getSourceIds('source_idsV10'))) {
- return $additionalval;
}
- return $defaultval;
+ return compact(
+ 'accordeonColor',
+ 'accordeonHeadline',
+ 'boxHeadline',
+ 'notice',
+ 'showLinks',
+ 'showOrderButton',
+ 'showPartCopyButton',
+ 'bossData',
+ 'isEBCEBooks',
+ 'hideNotice',
+ 'isAiSidRecord'
+ );
}
/**
- * @return string
+ * Configuration of SIDs 13,22,26,28,30,34,53,80,84,87,88,99,101,150,153,170
+ *
+ * @param $accordeonColor string accordeon color
+ * @param $accordeonHeadline string accordeon headline
+ * @param $boxHeadline string headline text get it box
+ * @param $notice string text of box version
+ * @param $showLinks boolean display links
+ * @param $showOrderButton boolean display order button
+ * @param $showPartCopyButton boolean display part copy button
+ * @param $bossData boolean display data of BOSS webservice
+ * @param $isEBCEBooks boolean is given record UBL-FID-EBC
+ * @param $hideNotice boolean hide notice
+ * @param $isAiSidRecord boolean is given record an ai record
*/
- public function getAccordeonColor()
+ public function get_config_source_idsV1(
+ &$accordeonColor,
+ &$accordeonHeadline,
+ &$boxHeadline,
+ &$notice,
+ &$showLinks,
+ &$showOrderButton,
+ &$showPartCopyButton,
+ &$bossData,
+ &$isEBCEBooks,
+ &$hideNotice,
+ &$isAiSidRecord
+ )
{
- return $this->_accordeon('azure', 'amber');
+ $accordeonColor = $this->accordeonColorAlternative;
+ $accordeonHeadline = $this->accordeonHeadlineAlternative;
+ $notice = $this->translate('getit_text_1');
}
/**
- * @return mixed
+ * Configuration of SID 49,55,68,105
+ *
+ * @param $accordeonColor string accordeon color
+ * @param $accordeonHeadline string accordeon headline
+ * @param $boxHeadline string headline text get it box
+ * @param $notice string text of box version
+ * @param $showLinks boolean display links
+ * @param $showOrderButton boolean display order button
+ * @param $showPartCopyButton boolean display part copy button
+ * @param $bossData boolean display data of BOSS webservice
+ * @param $isEBCEBooks boolean is given record UBL-FID-EBC
+ * @param $hideNotice boolean hide notice
+ * @param $isAiSidRecord boolean is given record an ai record
*/
- public function getAccordeonHeadline()
+ public function get_config_source_idsV3(
+ &$accordeonColor,
+ &$accordeonHeadline,
+ &$boxHeadline,
+ &$notice,
+ &$showLinks,
+ &$showOrderButton,
+ &$showPartCopyButton,
+ &$bossData,
+ &$isEBCEBooks,
+ &$hideNotice,
+ &$isAiSidRecord
+ )
{
- $links = $this->translate('getit_links');
- $infos = $this->translate('getit_infos');
- return $this->_accordeon($infos, $links);
+ $accordeonColor = $this->accordeonColorAlternative;
+ $accordeonHeadline = $this->accordeonHeadlineAlternative;
+ $boxHeadline = $this->fidClient->isLoggedOn() ? $this->translate('Get it') : $this->translate('getit_logged_not');
+ $notice = '';
+ $isAiSidRecord = true;
}
/**
- * @return string
+ * Configuration of SID 51
+ *
+ * @param $accordeonColor string accordeon color
+ * @param $accordeonHeadline string accordeon headline
+ * @param $boxHeadline string headline text get it box
+ * @param $notice string text of box version
+ * @param $showLinks boolean display links
+ * @param $showOrderButton boolean display order button
+ * @param $showPartCopyButton boolean display part copy button
+ * @param $bossData boolean display data of BOSS webservice
+ * @param $isEBCEBooks boolean is given record UBL-FID-EBC
+ * @param $hideNotice boolean hide notice
+ * @param $isAiSidRecord boolean is given record an ai record
*/
- public function getBoxHeadline()
+ public function get_config_source_idsV4(
+ &$accordeonColor,
+ &$accordeonHeadline,
+ &$boxHeadline,
+ &$notice,
+ &$showLinks,
+ &$showOrderButton,
+ &$showPartCopyButton,
+ &$bossData,
+ &$isEBCEBooks,
+ &$hideNotice,
+ &$isAiSidRecord
+ )
{
- if (in_array($this->sid, $this->_getSourceIds('source_idsV3'))) {
- if (!$this->fidClient->isLoggedOn()) {
- return $this->translate('getit_logged_not');
- }
- } elseif (in_array($this->sid, $this->_getSourceIds('source_idsV4'))) {
- if (!$this->fidClient->isLoggedOn()) {
- return $this->translate('getit_logged_not');
- }
- } elseif (in_array($this->sid, $this->_getSourceIds('source_idsV5'))) {
- if (!$this->fidClient->isLoggedOn()) {
- return $this->translate('getit_logged_not');
- }
- } elseif (in_array($this->sid, $this->_getSourceIds('source_idsV8'))) {
- $isLogin = false;
- if (in_array('Local', $this->facetAvail)
- && ((preg_grep($this->_getNonSourceIds('source_idsV8_1'), $this->format)
- && !in_array($this->_getNonSourceIds('source_idsV8_1'), $this->institution))
- || preg_grep($this->_getNonSourceIds('source_idsV8_3'), $this->format)
- )
- ) {
- $isLogin = true;
- } elseif (in_array('Online', $this->facetAvail)
- && !in_array('Free', $this->facetAvail)
- && (preg_grep($this->_getNonSourceIds('source_idsV8_1'), $this->format))
- ) {
- $isLogin = true;
- }
- if (in_array($this->sid, $this->_getSourceIds('source_idsV9'))
- && preg_grep($this->_getNonSourceIds('source_idsV8_8'), $this->format)
- ) {
- $isLogin = true;
- }
- if ($isLogin && !$this->fidClient->isLoggedOn()) {
- return $this->translate('getit_logged_not');
- }
- }
- return $this->translate('Get it');
+ $boxHeadline = $this->fidClient->isLoggedOn() ? $this->translate('Get it') : $this->translate('getit_logged_not');
+ $notice = $this->fidClient->isLoggedOn() ? $this->translate('getit_text_12') : $this->translate('getit_text_2');
}
/**
- * @return string
+ * Configuration of SID 76
+ *
+ * @param $accordeonColor string accordeon color
+ * @param $accordeonHeadline string accordeon headline
+ * @param $boxHeadline string headline text get it box
+ * @param $notice string text of box version
+ * @param $showLinks boolean display links
+ * @param $showOrderButton boolean display order button
+ * @param $showPartCopyButton boolean display part copy button
+ * @param $bossData boolean display data of BOSS webservice
+ * @param $isEBCEBooks boolean is given record UBL-FID-EBC
+ * @param $hideNotice boolean hide notice
+ * @param $isAiSidRecord boolean is given record an ai record
*/
- public function getNotices()
+ public function get_config_source_idsV5(
+ &$accordeonColor,
+ &$accordeonHeadline,
+ &$boxHeadline,
+ &$notice,
+ &$showLinks,
+ &$showOrderButton,
+ &$showPartCopyButton,
+ &$bossData,
+ &$isEBCEBooks,
+ &$hideNotice,
+ &$isAiSidRecord
+ )
{
- if (in_array($this->sid, $this->_getSourceIds('source_idsV1'))) {
- return $this->translate('getit_text_1');
- } elseif (in_array($this->sid, $this->_getSourceIds('source_idsV3'))) {
- return;
- } elseif (in_array($this->sid, $this->_getSourceIds('source_idsV4'))) {
- if (!$this->fidClient->isLoggedOn()) {
- return $this->translate('getit_text_2');
- } else {
- return $this->translate('getit_text_12');
+ $accordeonColor = $this->accordeonColorAlternative;
+ $accordeonHeadline = $this->accordeonHeadlineAlternative;
+ $notice = !$this->fidClient->isLoggedOn() ? $this->translate('getit_text_3_1') : $this->translate('getit_text_13');
+ $boxHeadline = $this->fidClient->isLoggedOn() ? $this->translate('Get it') : $this->translate('getit_logged_not');
+ $showLinks = $this->fidClient->isLoggedOn();
+ }
+
+ /**
+ * Configuration of SID 78
+ *
+ * @param $accordeonColor string accordeon color
+ * @param $accordeonHeadline string accordeon headline
+ * @param $boxHeadline string headline text get it box
+ * @param $notice string text of box version
+ * @param $showLinks boolean display links
+ * @param $showOrderButton boolean display order button
+ * @param $showPartCopyButton boolean display part copy button
+ * @param $bossData boolean display data of BOSS webservice
+ * @param $isEBCEBooks boolean is given record UBL-FID-EBC
+ * @param $hideNotice boolean hide notice
+ * @param $isAiSidRecord boolean is given record an ai record
+ */
+ public function get_config_source_idsV6(
+ &$accordeonColor,
+ &$accordeonHeadline,
+ &$boxHeadline,
+ &$notice,
+ &$showLinks,
+ &$showOrderButton,
+ &$showPartCopyButton,
+ &$bossData,
+ &$isEBCEBooks,
+ &$hideNotice,
+ &$isAiSidRecord
+ )
+ {
+ $notice = $this->translate('getit_text_4');
+ }
+
+ /**
+ * Configuration of SID 103
+ *
+ * @param $accordeonColor string accordeon color
+ * @param $accordeonHeadline string accordeon headline
+ * @param $boxHeadline string headline text get it box
+ * @param $notice string text of box version
+ * @param $showLinks boolean display links
+ * @param $showOrderButton boolean display order button
+ * @param $showPartCopyButton boolean display part copy button
+ * @param $bossData boolean display data of BOSS webservice
+ * @param $isEBCEBooks boolean is given record UBL-FID-EBC
+ * @param $hideNotice boolean hide notice
+ * @param $isAiSidRecord boolean is given record an ai record
+ */
+ public function get_config_source_idsV7(
+ &$accordeonColor,
+ &$accordeonHeadline,
+ &$boxHeadline,
+ &$notice,
+ &$showLinks,
+ &$showOrderButton,
+ &$showPartCopyButton,
+ &$bossData,
+ &$isEBCEBooks,
+ &$hideNotice,
+ &$isAiSidRecord
+ )
+ {
+ $accordeonColor = $this->accordeonColorAlternative;
+ $accordeonHeadline = $this->accordeonHeadlineAlternative;
+ $notice = $this->translate('getit_text_5');
+ }
+
+ /**
+ * Configuration of SID 0,109,117,119,127,142,148,151,155
+ *
+ * @param $accordeonColor string accordeon color
+ * @param $accordeonHeadline string accordeon headline
+ * @param $boxHeadline string headline text get it box
+ * @param $notice string text of box version
+ * @param $showLinks boolean display links
+ * @param $showOrderButton boolean display order button
+ * @param $showPartCopyButton boolean display part copy button
+ * @param $bossData boolean display data of BOSS webservice
+ * @param $isEBCEBooks boolean is given record UBL-FID-EBC
+ * @param $hideNotice boolean hide notice
+ * @param $isAiSidRecord boolean is given record an ai record
+ */
+ public function get_config_source_idsV8(
+ &$accordeonColor,
+ &$accordeonHeadline,
+ &$boxHeadline,
+ &$notice,
+ &$showLinks,
+ &$showOrderButton,
+ &$showPartCopyButton,
+ &$bossData,
+ &$isEBCEBooks,
+ &$hideNotice,
+ &$isAiSidRecord
+ )
+ {
+ //accordeon
+ if (in_array('Free', $this->facetAvail)) {
+ $accordeonHeadline = $this->accordeonHeadlineAlternative;
+ $accordeonColor = $this->accordeonColorAlternative;
+ } elseif (in_array('Online', $this->facetAvail)
+ && (preg_grep($this->_getNonSourceIds('source_idsV8_5'), $this->format)
+ || preg_grep($this->_getNonSourceIds('source_idsV8_6'), $this->format)
+ || preg_grep($this->_getNonSourceIds('source_idsV8_1'), $this->format))
+ ) {
+ $accordeonHeadline = $this->accordeonHeadlineAlternative;
+ $accordeonColor = $this->accordeonColorAlternative;
+ }
+ //END accordeon
+ //box headline
+ $isLogin = false;
+ if (in_array($this->sid, $this->_getSourceIds('source_idsV9'))
+ && preg_grep($this->_getNonSourceIds('source_idsV8_8'), $this->format)
+ ) {
+ $isLogin = true;
+ }
+ elseif (in_array('Local', $this->facetAvail)
+ && ((preg_grep($this->_getNonSourceIds('source_idsV8_1'), $this->format)
+ && !in_array($this->_getNonSourceIds('source_idsV8_9'), $this->institution))
+ || preg_grep($this->_getNonSourceIds('source_idsV8_3'), $this->format)
+ )
+ ) {
+ $isLogin = true;
+ } elseif (in_array('Online', $this->facetAvail)
+ && !in_array('Free', $this->facetAvail)
+ && (preg_grep($this->_getNonSourceIds('source_idsV8_1'), $this->format))
+ ) {
+ $isLogin = true;
+ }
+ if ($isLogin && !$this->fidClient->isLoggedOn()) {
+ $boxHeadline = $this->translate('getit_logged_not');
+ }
+ //END boxheadline
+ //notice
+ if (in_array($this->sid, $this->_getSourceIds('source_idsV9'))) {
+ if (preg_grep($this->_getNonSourceIds('source_idsV8_8'), $this->collection)) {
+ if (!$this->fidClient->isLoggedOn()) {
+ $notice = $this->translate('getit_text_3_1');
+ } else {
+ $notice = $this->translate('getit_text_13');
+ }
}
- } elseif (in_array($this->sid, $this->_getSourceIds('source_idsV5'))) {
- if (!$this->fidClient->isLoggedOn()) {
- return $this->translate('getit_text_3_1');
- } else {
- return $this->translate('getit_text_13');
+ elseif ($this->isCollection) {
+ $notice = $this->translate('getit_text_11',['%%hierarchy_tree%%' => $this->translate('hierarchy_tree')]);
}
- } elseif (in_array($this->sid, $this->_getSourceIds('source_idsV6'))) {
- return $this->translate('getit_text_4');
- } elseif (in_array($this->sid, $this->_getSourceIds('source_idsV7'))) {
- return $this->translate('getit_text_5');
- } elseif (in_array($this->sid, $this->_getSourceIds('source_idsV10'))) {
- return $this->translate('getit_text_6');
- } elseif (in_array($this->sid, $this->_getSourceIds('source_idsV11'))) {
- return $this->translate('getit_text_7');
- } elseif (in_array($this->sid, $this->_getSourceIds('source_idsV8'))) {
- if (in_array($this->sid, $this->_getSourceIds('source_idsV9'))) {
- if (preg_grep($this->_getNonSourceIds('source_idsV8_8'), $this->collection)) {
- if (!$this->fidClient->isLoggedOn()) {
- return $this->translate('getit_text_3_1');
- } else {
- return $this->translate('getit_text_13');
- }
- }
- if ($this->isCollection) {
- return $this->translate('getit_text_11',['%%hierarchy_tree%%' => $this->translate('hierarchy_tree')]);
- }
- if (preg_grep($this->_getNonSourceIds('source_idsV8_7'), $this->megacollection)
- ) {
- return $this->translate('getit_text_1');
- }
- if (in_array('Local', $this->facetAvail)
- && (preg_grep($this->_getNonSourceIds('source_idsV8_1'), $this->format)
- || preg_grep($this->_getNonSourceIds('source_idsV8_3'), $this->format))
- ) {
- if (!$this->fidClient->isLoggedOn()) {
- return $this->translate('getit_text_10');
- } elseif (preg_grep($this->_getNonSourceIds('source_idsV8_3'), $this->format)) {
- return $this->translate('getit_text_14');
- } else {
- return '';
- }
- }
- if (in_array('Local', $this->facetAvail)
- && preg_grep($this->_getNonSourceIds('source_idsV8_2'), $this->format)
- ) {
- return $this->translate('getit_text_8');
- }
- if (in_array('Free', $this->facetAvail)) {
- return $this->translate('getit_text_1');
- }
- if (in_array('Online', $this->facetAvail)
- && (preg_grep($this->_getNonSourceIds('source_idsV8_5'), $this->format)
- || preg_grep($this->_getNonSourceIds('source_idsV8_6'), $this->format))
- ) {
- return $this->translate('getit_text_9');
- } elseif (in_array('Online', $this->facetAvail)
- && preg_grep($this->_getNonSourceIds('source_idsV8_1'), $this->format)
- ) {
- if (!$this->fidClient->isLoggedOn()) {
- return $this->translate('getit_text_10');
- } else {
- return $this->translate('getit_text_15');
- }
- }
- } elseif ($this->isCollection) {
- return $this->translate('getit_text_11',['%%hierarchy_tree%%' => $this->translate('hierarchy_tree')]);
- } elseif (in_array('Local', $this->facetAvail)
- && preg_grep($this->_getNonSourceIds('source_idsV8_2'), $this->format)
+ elseif (preg_grep($this->_getNonSourceIds('source_idsV8_7'), $this->megacollection)
+ ) {
+ $notice = $this->translate('getit_text_1');
+ }
+ elseif (in_array('Local', $this->facetAvail)
+ && (preg_grep($this->_getNonSourceIds('source_idsV8_1'), $this->format)
+ || preg_grep($this->_getNonSourceIds('source_idsV8_3'), $this->format))
) {
- return $this->translate('getit_text_8');
- } elseif (in_array('Local', $this->facetAvail)) {
if (!$this->fidClient->isLoggedOn()) {
- return $this->translate('getit_text_10');
+ $notice = $this->translate('getit_text_10');
} elseif (preg_grep($this->_getNonSourceIds('source_idsV8_3'), $this->format)) {
- return $this->translate('getit_text_14');
+ $notice = $this->translate('getit_text_14');
} else {
- return '';
+ $notice = '';
}
- } elseif (in_array('Free', $this->facetAvail)) {
- return $this->translate('getit_text_1');
- } elseif (in_array('Online', $this->facetAvail)
+ }
+ elseif (in_array('Local', $this->facetAvail)
+ && preg_grep($this->_getNonSourceIds('source_idsV8_2'), $this->format)
+ ) {
+ $notice = $this->translate('getit_text_8');
+ }
+ elseif (in_array('Free', $this->facetAvail)) {
+ $notice = $this->translate('getit_text_1');
+ }
+ elseif (in_array('Online', $this->facetAvail)
&& (preg_grep($this->_getNonSourceIds('source_idsV8_5'), $this->format)
|| preg_grep($this->_getNonSourceIds('source_idsV8_6'), $this->format))
) {
- return $this->translate('getit_text_9');
+ $notice = $this->translate('getit_text_9');
} elseif (in_array('Online', $this->facetAvail)
&& preg_grep($this->_getNonSourceIds('source_idsV8_1'), $this->format)
) {
if (!$this->fidClient->isLoggedOn()) {
- return $this->translate('getit_text_10');
+ $notice = $this->translate('getit_text_10');
} else {
- return $this->translate('getit_text_15');
+ $notice = $this->translate('getit_text_15');
}
}
- }
- return $this->translate('getit_text_default');
- }
-
- /**
- * @return bool
- */
- public function showLinks()
- {
- if (in_array($this->sid, $this->_getSourceIds('source_idsV5'))
- || (in_array($this->sid, $this->_getSourceIds('source_idsV9'))
- && preg_grep($this->_getNonSourceIds('source_idsV8_8'), $this->collection))
+ } elseif ($this->isCollection) {
+ $notice = $this->translate('getit_text_11',['%%hierarchy_tree%%' => $this->translate('hierarchy_tree')]);
+ } elseif (in_array('Local', $this->facetAvail)
+ && preg_grep($this->_getNonSourceIds('source_idsV8_2'), $this->format)
) {
+ $notice = $this->translate('getit_text_8');
+ } elseif (in_array('Local', $this->facetAvail)) {
if (!$this->fidClient->isLoggedOn()) {
- return false;
+ $notice = $this->translate('getit_text_10');
+ } elseif (preg_grep($this->_getNonSourceIds('source_idsV8_3'), $this->format)) {
+ $notice = $this->translate('getit_text_14');
+ } elseif (!preg_grep($this->_getNonSourceIds('source_idsV8_10'), $this->format)) {
+ $notice = '';
}
- }
- return true;
- }
-
- /**
- * @return bool
- */
- public function showOrderButton()
- {
- if (in_array($this->sid, $this->_getSourceIds('source_idsV9'))
- && preg_grep($this->_getNonSourceIds('source_idsV8_1'), $this->format)
- && !in_array($this->_getNonSourceIds('source_idsV8_9'), $this->institution)
- && !$this->isCollection
- && !preg_grep($this->_getNonSourceIds('source_idsV8_8'), $this->collection)
+ } elseif (in_array('Free', $this->facetAvail)) {
+ $notice = $this->translate('getit_text_1');
+ } elseif (in_array('Online', $this->facetAvail)
+ && (preg_grep($this->_getNonSourceIds('source_idsV8_5'), $this->format)
+ || preg_grep($this->_getNonSourceIds('source_idsV8_6'), $this->format))
) {
- return true;
- }
- return false;
- }
-
- /**
- * @return bool
- */
- public function showPartCopyButton()
- {
- if (!in_array('Free', $this->facetAvail)
- && in_array($this->sid, $this->_getSourceIds('source_idsV8'))
+ $notice = $this->translate('getit_text_9');
+ } elseif (in_array('Online', $this->facetAvail)
&& preg_grep($this->_getNonSourceIds('source_idsV8_1'), $this->format)
- && !$this->isCollection
- && !preg_grep($this->_getNonSourceIds('source_idsV8_8'), $this->collection)
) {
- return true;
+ if (!$this->fidClient->isLoggedOn()) {
+ $notice = $this->translate('getit_text_10');
+ } else {
+ $notice = $this->translate('getit_text_15');
+ }
}
- return false;
- }
-
- /**
- * @return bool
- */
- public function showBOSSData()
- {
+ //END notice
+ //bossData
if (!in_array('Free', $this->facetAvail)
- && in_array($this->sid, $this->_getSourceIds('source_idsV8'))
//&& (!empty($this->isbn) || !empty($this->issn))
&& !preg_grep($this->_getNonSourceIds('source_idsV8_8'), $this->collection)
) {
if (preg_grep($this->_getNonSourceIds('source_idsV8_1'), $this->format)
) {
- return true;
+ $bossData = true;
+ if (!$this->isCollection) {
+ $showPartCopyButton = true;
+ }
} elseif (in_array('Local', $this->facetAvail)
&& preg_grep($this->_getNonSourceIds('source_idsV8_3'), $this->format)
) {
- return true;
+ $bossData = true;
+ }
+ }
+ //END bossData
+ //hideNotice
+ if ($this->fidClient->isLoggedOn()) {
+ if (in_array('Local', $this->facetAvail))
+ {
+ if (preg_grep($this->_getNonSourceIds('source_idsV8_1'), $this->format)
+ && empty($this->isbn)
+ && !preg_grep($this->_getNonSourceIds('source_idsV8_9'), $this->institution)
+ && !preg_grep($this->_getNonSourceIds('source_idsV8_8'), $this->collection)
+ ) {
+ $hideNotice = true;
+ }
+ if ($this->isCollection) {
+ $hideNotice = false;
+ }
}
}
- return false;
+ //END hideNotice
}
- public function isEBCEBooks()
+ /**
+ * Configuration of SID 0 (special cases)
+ *
+ * @param $accordeonColor string accordeon color
+ * @param $accordeonHeadline string accordeon headline
+ * @param $boxHeadline string headline text get it box
+ * @param $notice string text of box version
+ * @param $showLinks boolean display links
+ * @param $showOrderButton boolean display order button
+ * @param $showPartCopyButton boolean display part copy button
+ * @param $bossData boolean display data of BOSS webservice
+ * @param $isEBCEBooks boolean is given record UBL-FID-EBC
+ * @param $hideNotice boolean hide notice
+ * @param $isAiSidRecord boolean is given record an ai record
+ */
+ public function get_config_source_idsV9(
+ &$accordeonColor,
+ &$accordeonHeadline,
+ &$boxHeadline,
+ &$notice,
+ &$showLinks,
+ &$showOrderButton,
+ &$showPartCopyButton,
+ &$bossData,
+ &$isEBCEBooks,
+ &$hideNotice,
+ &$isAiSidRecord
+ )
{
+ //accordeon
+ if (preg_grep($this->_getNonSourceIds('source_idsV8_8'), $this->collection)
+ || preg_grep($this->_getNonSourceIds('source_idsV8_7'), $this->megacollection)
+ ) {
+ $accordeonHeadline = $this->accordeonHeadlineAlternative;
+ $accordeonColor = $this->accordeonColorAlternative;
+ }
+ //END accordeon
+ //showLinks
+ if (
+ preg_grep($this->_getNonSourceIds('source_idsV8_8'), $this->collection)
+ ) {
+ if (!$this->fidClient->isLoggedOn()) {
+ $showLinks = false;
+ }
+ }
+ //END showLinks
+ //orderButton
+ if (preg_grep($this->_getNonSourceIds('source_idsV8_1'), $this->format)
+ && !preg_grep($this->_getNonSourceIds('source_idsV8_9'), $this->institution)
+ && !$this->isCollection
+ && !preg_grep($this->_getNonSourceIds('source_idsV8_8'), $this->collection)
+ ) {
+ $showOrderButton = true;
+ }
+ //END orderButton
+ //EBCEbooks
if (in_array('Online', $this->facetAvail)
- && in_array($this->sid, $this->_getSourceIds('source_idsV9'))
&& preg_grep($this->_getNonSourceIds('source_idsV8_8'), $this->collection)
) {
- return true;
+ $isEBCEBooks = true;
}
- return false;
+ //END EBCEbooks
}
- public function hideNotice()
+ /**
+ * Configuration of SID 169
+ *
+ * @param $accordeonColor string accordeon color
+ * @param $accordeonHeadline string accordeon headline
+ * @param $boxHeadline string headline text get it box
+ * @param $notice string text of box version
+ * @param $showLinks boolean display links
+ * @param $showOrderButton boolean display order button
+ * @param $showPartCopyButton boolean display part copy button
+ * @param $bossData boolean display data of BOSS webservice
+ * @param $isEBCEBooks boolean is given record UBL-FID-EBC
+ * @param $hideNotice boolean hide notice
+ * @param $isAiSidRecord boolean is given record an ai record
+ */
+ public function get_config_source_idsV10(
+ &$accordeonColor,
+ &$accordeonHeadline,
+ &$boxHeadline,
+ &$notice,
+ &$showLinks,
+ &$showOrderButton,
+ &$showPartCopyButton,
+ &$bossData,
+ &$isEBCEBooks,
+ &$hideNotice,
+ &$isAiSidRecord
+ )
{
- if (in_array($this->sid, $this->_getSourceIds('source_idsV8'))) {
- if (in_array('Online', $this->facetAvail)
- && (preg_grep($this->_getNonSourceIds('source_idsV8_1'), $this->format)
- || preg_grep($this->_getNonSourceIds('source_idsV8_5'), $this->format)
- || preg_grep($this->_getNonSourceIds('source_idsV8_6'), $this->format))
- ) {
- return false;
- } elseif (in_array('Local', $this->facetAvail)
- && (preg_grep($this->_getNonSourceIds('source_idsV8_3'), $this->format)
- || preg_grep($this->_getNonSourceIds('source_idsV8_2'), $this->format))
- ) {
- return false;
- } elseif (in_array('Local', $this->facetAvail)
- && preg_grep($this->_getNonSourceIds('source_idsV8_1'), $this->format)
- ) {
- return false;
- }
- } elseif (in_array($this->sid, $this->_getSourceIds('source_idsV3'))) {
- return false;
- }
- return true;
+ $accordeonColor = $this->accordeonColorAlternative;
+ $accordeonHeadline = $this->accordeonHeadlineAlternative;
+ $notice = $this->translate('getit_text_6');
}
- public function isAISIDRecord()
+ /**
+ * Configuration of SID 126
+ *
+ * @param $accordeonColor string accordeon color
+ * @param $accordeonHeadline string accordeon headline
+ * @param $boxHeadline string headline text get it box
+ * @param $notice string text of box version
+ * @param $showLinks boolean display links
+ * @param $showOrderButton boolean display order button
+ * @param $showPartCopyButton boolean display part copy button
+ * @param $bossData boolean display data of BOSS webservice
+ * @param $isEBCEBooks boolean is given record UBL-FID-EBC
+ * @param $hideNotice boolean hide notice
+ * @param $isAiSidRecord boolean is given record an ai record
+ */
+ public function get_config_source_idsV11(
+ &$accordeonColor,
+ &$accordeonHeadline,
+ &$boxHeadline,
+ &$notice,
+ &$showLinks,
+ &$showOrderButton,
+ &$showPartCopyButton,
+ &$bossData,
+ &$isEBCEBooks,
+ &$hideNotice,
+ &$isAiSidRecord
+ )
{
- if (in_array($this->sid, $this->_getSourceIds('source_idsV3'))) {
- return true;
- }
- return false;
+ $notice = $this->translate('getit_text_7');
}
}
diff --git a/module/finc/src/finc/Recommend/EbscoResults.php b/module/finc/src/finc/Recommend/EbscoResults.php
index 0aaf556bf342571d4760d05ec33109ed01703494..fec111d4998a10ba2aa96c18b33650c0d1e523c9 100644
--- a/module/finc/src/finc/Recommend/EbscoResults.php
+++ b/module/finc/src/finc/Recommend/EbscoResults.php
@@ -166,12 +166,17 @@ class EbscoResults implements
if (!$results->isSuccess()) {
$this->results = false;
+ return;
}
$this->results = $this->sortByHits(
json_decode($results->getBody(), true)
);
if (json_last_error() !== JSON_ERROR_NONE) {
- throw new \Exception('JSON type error ' . json_last_error_msg());
+ $this->debug(
+ 'JSON type error "'
+ . json_last_error_msg().'"'
+ . (empty($results->getBody()) ? '. EBSCO result was empty.' : '')
+ );
}
}
diff --git a/themes/fid/languages/fid/de.ini b/themes/fid/languages/fid/de.ini
index c6b2429f49a38d7e1e18ac1cd31d98d9af2f4986..9e3e16e570023de702f87ef9f4375039a72b6988 100644
--- a/themes/fid/languages/fid/de.ini
+++ b/themes/fid/languages/fid/de.ini
@@ -6,8 +6,10 @@ user_init_form_title = "Registrierung"
user_create_form_title = "Registrierung abschließen"
user_update_form_title = "Profildaten editieren."
password_reset_form_title = "Passwort zurücksetzen"
+password_reset_form_information = "Bitte geben Sie die E-Mail-Adresse ein, mit der Sie sich registriert haben. Wir senden Ihnen einen Link per E-Mail, über den Sie Ihr Passwort ändern können."
password_change_form_title = "Neues Passwort speichern"
username_change_form_title = "E-Mail-Adresse ändern"
+username_change_form_information = "Bitte geben Sie Ihre neue E-Mail-Adresse ein. Wir senden Ihnen einen Link per E-Mail, über den Sie Ihre neue E-Mail-Adresse bestätigen müssen. Danach können Sie sich mit Ihrer neuen E-Mail-Adresse anmelden."
label_username = "E-Mail-Adresse"
label_newusername = "Neue E-Mail-Adresse"
diff --git a/themes/fid/languages/fid/en.ini b/themes/fid/languages/fid/en.ini
index d23b1f317e91a096bc6dc441f46aced014e8b296..45291196faabba6997c7f74c11b2270f9cfc5687 100644
--- a/themes/fid/languages/fid/en.ini
+++ b/themes/fid/languages/fid/en.ini
@@ -6,8 +6,10 @@ user_init_form_title = "Registration"
user_create_form_title = "Complete registration"
user_update_form_title = "Profile data"
password_reset_form_title = "Reset password"
+password_reset_form_information = "Please enter the e-mail address by which you registered your user account. We will send you a link to change your password."
password_change_form_title = "Save new password"
username_change_form_title = "Update email address"
+username_change_form_information = "Please enter your new e-mail address. We will send you a link to confirm your new email address. Then you can login with your new e-mail address."
label_username = "Email address"
label_newusername = "New email address"
diff --git a/themes/fid/templates/Auth/AbstractBase/loginfields.phtml b/themes/fid/templates/Auth/AbstractBase/loginfields.phtml
new file mode 100644
index 0000000000000000000000000000000000000000..9001e9f97ed1bd1eb337474a8bf87b40e708ddc7
--- /dev/null
+++ b/themes/fid/templates/Auth/AbstractBase/loginfields.phtml
@@ -0,0 +1,8 @@
+<div class="form-group">
+ <label class="control-label" for="login_<?=$this->escapeHtmlAttr($topClass)?>_username"><?=$this->transEsc('Username')?>:</label>
+ <input type="email" name="username" id="login_<?=$this->escapeHtmlAttr($topClass)?>_username" value="<?=$this->escapeHtmlAttr($this->request->get('username'))?>" class="form-control"/>
+</div>
+<div class="form-group">
+ <label class="control-label" for="login_<?=$this->escapeHtmlAttr($topClass)?>_password"><?=$this->transEsc('Password')?>:</label>
+ <input type="password" name="password" id="login_<?=$this->escapeHtmlAttr($topClass)?>_password" class="form-control"/>
+</div>
\ No newline at end of file
diff --git a/themes/fid/templates/ajax/resolverLinks.phtml b/themes/fid/templates/ajax/resolverLinks.phtml
index 2a88fdcb335e051ef439ebe70e99337516b045e2..f0218fb8074dd2a2c260abc198f355f076b98303 100644
--- a/themes/fid/templates/ajax/resolverLinks.phtml
+++ b/themes/fid/templates/ajax/resolverLinks.phtml
@@ -11,7 +11,9 @@
<li>
<?php if (!empty($link['href'])): ?>
<?php /* fid: #16136 remove traffic light - GG */?>
- <a href="<?=$this->escapeHtmlAttr($link['href'])?>" target="_blank" title="<?=isset($link['service_type'])?$this->escapeHtmlAttr($link['service_type']):''?>"<?=!empty($link['access'])?' class="access-'.$link['access'].'"':''?>><?=isset($link['title'])?$this->escapeHtml($this->transEsc($link['title'])):''?></a> <br />
+ <a href="<?=$this->escapeHtmlAttr($link['href'])?>" target="_blank" title="<?=isset($link['service_type'])?$this->escapeHtmlAttr($link['service_type']):''?>"<?=!empty($link['access'])?' class="access-'.$link['access'].'"':''?>>
+ <i class="icon icon-external-link" aria-hidden="true"></i><?=isset($link['title'])?$this->escapeHtml($this->transEsc($link['title'])):''?>
+ </a> <br />
<?php /* fid: #16136 remove coverage - GG */?>
<?php else: ?>
<?=isset($link['title'])?$this->escapeHtml($this->transEsc($link['title'])):''?>
diff --git a/themes/fid/templates/fid/admin/edit.phtml b/themes/fid/templates/fid/admin/edit.phtml
index 81cc338eaf41898ad6c5798bd92d1ae877389f45..7f37ffbffd67776dc61dc55e64fd878ec29b3fa9 100644
--- a/themes/fid/templates/fid/admin/edit.phtml
+++ b/themes/fid/templates/fid/admin/edit.phtml
@@ -20,19 +20,23 @@
* @license http://opensource.org/licenses/gpl-2.0.php GNU GPLv2
*/
-use Zend\Form\Element as Element;
+use Zend\Form\Element;
+use Zend\Form\Element\Checkbox;
use Zend\Form\Element\Submit;
+use Zend\Form\Form;
use Zend\Form\View\Helper\FormElementErrors;
use Zend\Form\View\Helper\FormLabel;
use Zend\Form\View\Helper\FormRadio;
use Zend\Form\View\Helper\FormSelect;
use Zend\Form\View\Helper\FormSubmit;
+/** @var Form $form */
/** @var FormLabel $formLabel */
/** @var FormRadio $formRadio */
/** @var FormSelect $formSelect */
/** @var FormSubmit $formSubmit */
/** @var FormElementErrors $formElementErrors */
+$form = $this->form;
$formLabel = $this->formLabel();
$formRadio = $this->formRadio();
$formSelect = $this->formSelect();
@@ -47,14 +51,12 @@ $this->headTitle($title = $this->translate("fid::user_edit_form_title", [
'%%userid%%' => $user->getId(),
'%%username%%' => $user->getUsername()
]));
-$editableFields = $this->config['Admin']['editable_user_fields'] ?? [];
-$form->setAttributes(['class' => 'row']);
-echo $this->form()->openTag($form);
?>
-<h2 class="row col-md-12"><?= $title ?></h2>
-<div class="row col-md-12"><?= $this->transEsc("fid::required_fields_note") ?></div>
+<h2><?= $title ?></h2>
+<div><?= $this->transEsc("fid::required_fields_note") ?></div>
<?= $this->flashmessages() ?>
+<?= $this->form()->openTag($form) ?>
<br/>
<? /* id */ ?>
@@ -64,13 +66,10 @@ echo $this->form()->openTag($form);
<?php
/** @var Element\Select $elemSalutation */
$elemSalutation = $form->get('salutation');
-$elemSalutation->setLabelAttributes(['class' => 'col-md-3']);
-$elemSalutation->setAttributes(['class' => 'col-md-3']);
-if (!in_array('Salutation', $editableFields)) {
- $elemSalutation->setAttribute('readonly', '1');
-}
+$elemSalutation->setLabelAttributes(['class' => 'col-md-4']);
+$elemSalutation->setAttributes(['class' => 'form-control']);
?>
-<div class="row">
+<div class="form-group">
<?= $this->formLabel($elemSalutation) ?>
<?= $this->formSelect($elemSalutation) ?>
</div>
@@ -79,29 +78,22 @@ if (!in_array('Salutation', $editableFields)) {
<?php
/** @var Element\Text $elemAcademicTitle */
$elemAcademicTitle = $form->get('academic_title');
-$elemAcademicTitle->setLabelAttributes(['class' => 'col-md-3']);
-$elemAcademicTitle->setAttributes(['class' => 'col-md-3']);
-if (!in_array('AcademicTitle', $editableFields)) {
- $elemAcademicTitle->setAttribute('readonly', '1');
-}
+$elemAcademicTitle->setLabelAttributes(['class' => 'col-md-4']);
+$elemAcademicTitle->setAttributes(['class' => 'form-control']);
?>
-<div class="row">
+<div class="form-group">
<?= $this->formLabel($elemAcademicTitle) ?>
<?= $this->formElement($elemAcademicTitle) ?>
- <br/>
</div>
<? /* firstname */ ?>
<?php
/** @var Element\Text $elemFirstname */
$elemFirstname = $form->get('firstname');
-$elemFirstname->setLabelAttributes(['class' => 'col-md-3']);
-$elemFirstname->setAttributes(['class' => 'col-md-3']);
-if (!in_array('Firstname', $editableFields)) {
- $elemFirstname->setAttribute('readonly', '1');
-}
+$elemFirstname->setLabelAttributes(['class' => 'col-md-4']);
+$elemFirstname->setAttributes(['class' => 'form-control']);
?>
-<div class="row">
+<div class="form-group">
<?= $this->formLabel($elemFirstname) ?>
<?= $this->formElement($elemFirstname) ?>
<?= $this->formElementErrors($elemFirstname) ?>
@@ -111,45 +103,23 @@ if (!in_array('Firstname', $editableFields)) {
<?php
/** @var Element\Text $elemLastname */
$elemLastname = $form->get('lastname');
-$elemLastname->setLabelAttributes(['class' => 'col-md-3']);
-$elemLastname->setAttributes(['class' => 'col-md-3']);
-if (!in_array('Lastname', $editableFields)) {
- $elemLastname->setAttribute('readonly', '1');
-}
+$elemLastname->setLabelAttributes(['class' => 'col-md-4']);
+$elemLastname->setAttributes(['class' => 'form-control']);
?>
-<div class="row">
+<div class="form-group">
<?= $this->formLabel($elemLastname) ?>
<?= $this->formElement($elemLastname) ?>
<?= $this->formElementErrors($elemLastname) ?>
</div>
-<? /* college */ ?>
-<?php
-/** @var Element\Text $elemCollege */
-$elemCollege = $form->get('college');
-$elemCollege->setLabelAttributes(['class' => 'col-md-3']);
-$elemCollege->setAttributes(['class' => 'col-md-3']);
-if (!in_array('College', $editableFields)) {
- $elemCollege->setAttribute('readonly', '1');
-}
-?>
-<div class="row">
- <?= $this->formLabel($elemCollege) ?>
- <?= $this->formElement($elemCollege) ?>
- <?= $this->formElementErrors($elemCollege) ?>
-</div>
-
<? /* home library */ ?>
<?php
/** @var Element\Select $elemHomeLibrary */
$elemHomeLibrary = $form->get('home_library');
-$elemHomeLibrary->setLabelAttributes(['class' => 'col-md-3']);
-$elemHomeLibrary->setAttributes(['class' => 'col-md-6']);
-if (!in_array('HomeLibrary', $editableFields)) {
- $elemHomeLibrary->setAttribute('disabled', '1');
-}
+$elemHomeLibrary->setLabelAttributes(['class' => 'col-md-4']);
+$elemHomeLibrary->setAttributes(['class' => 'form-control']);
?>
-<div class="row">
+<div class="form-group">
<?= $this->formLabel($elemHomeLibrary) ?>
<?= $this->formSelect($elemHomeLibrary) ?>
<?= $this->formElementErrors($elemHomeLibrary) ?>
@@ -159,15 +129,12 @@ if (!in_array('HomeLibrary', $editableFields)) {
<?php
/** @var Element\Radio $elemJobTitle */
$elemJobTitle = $form->get('job_title');
-$elemJobTitle->setLabelAttributes(['class' => 'col-md-3']);
-$elemJobTitle->setAttributes(['class' => 'col-md-6']);
-if (!in_array('JobTitle', $editableFields)) {
- $elemJobTitle->setAttribute('readonly', '1');
-}
+$elemJobTitle->setLabelAttributes(['class' => 'col-md-4']);
+$elemJobTitle->setAttributes(['class' => 'form-control']);
?>
-<div class="row">
+<div class="form-group">
<?= $this->formLabel($elemJobTitle) ?>
- <?= $this->formElement($elemJobTitle) ?>
+ <?= $this->formSelect($elemJobTitle) ?>
<?= $this->formElementErrors($elemJobTitle) ?>
</div>
@@ -176,34 +143,29 @@ if (!in_array('JobTitle', $editableFields)) {
/** @var Element\Collection $elemPermissions */
/** @var Element\Select[] $elemPermissionsElems */
$elemPermissions = $form->get('permissions');
-$elemPermissions->setLabelAttributes(['class' => 'col-md-3']);
$elemPermissionsElems = $elemPermissions->getElements();
$permissions = $this->config['Admin']['permission_options'] ?? [];
foreach ($permissions as $permission) {
$element = $elemPermissionsElems[$permission];
$element->setLabel("permission_$permission");
- $element->setAttributes(['class' => 'col-md-2']);
- $element->setLabelAttributes(['class' => 'col-md-6']);
+ $element->setAttributes(['class' => 'form-control']);
+ $element->setLabelAttributes(['class' => 'col-md-4']);
$element->setAttribute('id', $element->getName());
$elements[] = $element;
}
?>
-<div class="row">
- <?= $this->formLabel($elemPermissions) ?>
- <div class="col-md-9">
- <?php foreach ($elements as $element): ?>
- <div class="row">
- <?= $this->formElement($element) ?>
- <?= $this->formLabel($element) ?>
- </div>
- <? endforeach; ?>
- <div class="row">
- <?= $this->formElementErrors($elemPermissions) ?>
- </div>
- </div>
+<h3><?= $this->formLabel($elemPermissions) ?></h3>
+<?php foreach ($elements ?? [] as $element): ?>
+<div class="form-group">
+ <?= $this->formLabel($element) ?>
+ <?= $this->formElement($element) ?>
</div>
+<?php endforeach; ?>
+
+<? /* addresses */ ?>
+<?= $this->render('fid/user/address-collection.phtml') ?>
<? /* submit button */ ?>
<?php
@@ -211,10 +173,10 @@ foreach ($permissions as $permission) {
$elemSubmit = $form->get('submit');
$elemSubmit->setAttributes(['class' => 'btn btn-primary']);
?>
-<div class="row">
+<div class="form-group">
<div class="col-lg-11 col-md-9 col-sm-11 col-xs-12">
<?= $this->formSubmit($elemSubmit) ?>
- <a href="<?= $this->url('fid/admin/list') ?>"
+ <a href="<?= $this->url('myresearch-profile') ?>"
class="btn btn-primary">
<?= $this->transEsc('Cancel') ?>
</a>
@@ -222,4 +184,3 @@ $elemSubmit->setAttributes(['class' => 'btn btn-primary']);
</div>
<?= $this->form()->closeTag($form) ?>
-<!-- fid: admin - edit - END -->
\ No newline at end of file
diff --git a/themes/fid/templates/fid/user/password-reset.phtml b/themes/fid/templates/fid/user/password-reset.phtml
index 3bf4994ed40108c5a67ae37625d5a333745c156f..02cb1122f8b6b725b91a335cc9131575041139ad 100644
--- a/themes/fid/templates/fid/user/password-reset.phtml
+++ b/themes/fid/templates/fid/user/password-reset.phtml
@@ -53,6 +53,7 @@ $this->headTitle($this->translate("fid::password_reset_form_title"));
?>
<h2><?= $this->translate("fid::password_reset_form_title") ?></h2>
<?= $this->flashmessages() ?>
+<?= $this->translate("fid::password_reset_form_information") ?>
<?= $this->form()->openTag($form) ?>
<br/>
<?php /* username */ ?>
diff --git a/themes/fid/templates/fid/user/username-change.phtml b/themes/fid/templates/fid/user/username-change.phtml
index 4d9f6945dfcb05cf80734001916971165d550969..80331a37350bed8bd9c2178bd8ffe066d0311e2e 100644
--- a/themes/fid/templates/fid/user/username-change.phtml
+++ b/themes/fid/templates/fid/user/username-change.phtml
@@ -54,12 +54,8 @@ $this->headTitle($this->translate("fid::username_change_form_title"));
?>
<h2><?= $this->translate("fid::username_change_form_title") ?></h2>
-
-<div class="subito-pg">
- * <?=$this->transEsc("This field is required")?>
-</div>
-
<?= $this->flashmessages() ?>
+<?= $this->translate("fid::username_change_form_information") ?>
<?= $this->form()->openTag($form) ?>
<br/>
<? /* username */ ?>