diff --git a/local_packages/psi/Configuration/Sets/Psi/TypoScript/Plugins/indexed-search/setup.typoscript b/local_packages/psi/Configuration/Sets/Psi/TypoScript/Plugins/indexed-search/setup.typoscript index 8ec5a43..1019eea 100644 --- a/local_packages/psi/Configuration/Sets/Psi/TypoScript/Plugins/indexed-search/setup.typoscript +++ b/local_packages/psi/Configuration/Sets/Psi/TypoScript/Plugins/indexed-search/setup.typoscript @@ -1 +1,3 @@ @import "EXT:indexed_search/Configuration/TypoScript/setup.typoscript" + +plugin.tx_indexedsearch.targetPid = {$psi.pageIds.searchresult} diff --git a/local_packages/psi/Configuration/Sets/Psi/TypoScript/frontenduser.typoscript b/local_packages/psi/Configuration/Sets/Psi/TypoScript/frontenduser.typoscript index 07848ae..629d327 100644 --- a/local_packages/psi/Configuration/Sets/Psi/TypoScript/frontenduser.typoscript +++ b/local_packages/psi/Configuration/Sets/Psi/TypoScript/frontenduser.typoscript @@ -32,13 +32,3 @@ lib.frontenduseravatar { } } - -lib.frontenduserlogoutbutton = COA_INT -lib.frontenduserlogoutbutton { - 10 = TEXT - 10.value = LOGOUT - 10.typolink { - parameter.data = TSFE:id - additionalParams = &logintype=logout - } -} diff --git a/local_packages/psi/Configuration/Sets/Psi/settings.yaml b/local_packages/psi/Configuration/Sets/Psi/settings.yaml index 013c9fb..9c6bc63 100644 --- a/local_packages/psi/Configuration/Sets/Psi/settings.yaml +++ b/local_packages/psi/Configuration/Sets/Psi/settings.yaml @@ -3,7 +3,7 @@ psi: mainnavigation: 1 footernavigation: 12 pageIds: - searchresult: 37 + searchresult: 7 breakpoints: desktop: media: '(min-width: 1200px)' diff --git a/local_packages/psi/Resources/Private/Language/es.locallang.xlf b/local_packages/psi/Resources/Private/Language/es.locallang.xlf new file mode 100644 index 0000000..5d69eb4 --- /dev/null +++ b/local_packages/psi/Resources/Private/Language/es.locallang.xlf @@ -0,0 +1,84 @@ + + + +
+ + + Confidentiality Header + + + Confidentiality Message + + + + User information + Informaciones Usero + + + Contact information + + + Short Bio + + + + First Name: + + + Last Name: + + + Position / Department: + + + Address: + + + Country: + + + City: + + + ZIP Code: + + + Email Address: + + + Telephone: + + + Fax: + + + You are on page: + Estas en pagina: + + + Search + Buscar + + + Search form + Buscar Formular + + + Search form + Formulario de búsquedar + + + Advanced Search + Búsqueda Avanzada + + + No results found. + No se han encontrado resultados. + + + Logout + Salir del systema + + + + diff --git a/local_packages/psi/Resources/Private/Language/locallang.xlf b/local_packages/psi/Resources/Private/Language/locallang.xlf index 7087921..96450c5 100644 --- a/local_packages/psi/Resources/Private/Language/locallang.xlf +++ b/local_packages/psi/Resources/Private/Language/locallang.xlf @@ -50,6 +50,27 @@ Fax: + + You are on page: + + + Search + + + Search form + + + Search for + + + Advanced Search + + + No results found. + + + Logout + diff --git a/local_packages/psi/Resources/Private/Templates/Partials/Footer.html b/local_packages/psi/Resources/Private/Templates/Partials/Footer.html index 1da49a8..863fdde 100644 --- a/local_packages/psi/Resources/Private/Templates/Partials/Footer.html +++ b/local_packages/psi/Resources/Private/Templates/Partials/Footer.html @@ -2,16 +2,21 @@
- +
- {frontenduserlogoutbutton -> f:format.raw()} + + + + + +
{breadcrumb}
-

You are on page:

+

- \ No newline at end of file + diff --git a/local_packages/psi/Resources/Private/Templates/Partials/Header.html b/local_packages/psi/Resources/Private/Templates/Partials/Header.html index 19186a1..85e7a1b 100644 --- a/local_packages/psi/Resources/Private/Templates/Partials/Header.html +++ b/local_packages/psi/Resources/Private/Templates/Partials/Header.html @@ -17,18 +17,22 @@
- +
diff --git a/local_packages/psi/Resources/Private/Templates/Plugins/IndexedSearch/Partials/Form.html b/local_packages/psi/Resources/Private/Templates/Plugins/IndexedSearch/Partials/Form.html index 3f56b42..36fd32a 100644 --- a/local_packages/psi/Resources/Private/Templates/Plugins/IndexedSearch/Partials/Form.html +++ b/local_packages/psi/Resources/Private/Templates/Plugins/IndexedSearch/Partials/Form.html @@ -15,16 +15,16 @@ -
- +
+
- - + +
- + @@ -75,17 +75,17 @@
- +

- + - +

diff --git a/local_packages/psi/Resources/Private/Templates/Plugins/IndexedSearch/Templates/Search/Search.html b/local_packages/psi/Resources/Private/Templates/Plugins/IndexedSearch/Templates/Search/Search.html new file mode 100644 index 0000000..da26a90 --- /dev/null +++ b/local_packages/psi/Resources/Private/Templates/Plugins/IndexedSearch/Templates/Search/Search.html @@ -0,0 +1,84 @@ + + + + + + + + + +

{result.categoryTitle}

+ + +
+ + + +  {searchWord.sword} + + +  {searchWord.sword} + + + +
+ + {result.searchedInSectionInfo} + + +
+ + + + + + +
+ + + + + + +
-->  + + + {sectionData.0} + + +  ({sectionData.1} ) + +
+
+ + + +
+ + + +
+

{row.sectionTitle} {row.numResultRows}

+
+ + + + + + +
+ +
+ + +
+ +
+ + + + diff --git a/local_packages/psi/Resources/Public/Css/main.css b/local_packages/psi/Resources/Public/Css/main.css index d56d13a..9b39fe6 100644 --- a/local_packages/psi/Resources/Public/Css/main.css +++ b/local_packages/psi/Resources/Public/Css/main.css @@ -631,9 +631,56 @@ h5 { } .header-search-container { + display: flex; + justify-content: center; margin: 0 auto; } +.header-search-container form { + margin: auto; +} + +.header-searchbox { + border-radius: 5px; + border: none; + padding: 10px 50px; + padding-left: 5px; +} + +.header-searchbutton { + appearance: none; + background: #63B21F; + border: none; + border-radius: 5px; + color: #FFF; + font-weight: 700; + padding: 10px 15px; + transition: background-color 0.3s; +} + +.header-searchbutton:hover { + background-color: #FFF; + color: #000; + cursor: pointer; +} + +#search-form { + border: 1px solid #63B21F; + margin-bottom: 25px; +} + +.search-searchbox { + border-style: solid; + border-color: #63B21F; + border-radius: 5px; + padding: 10px 50px; + padding-left: 5px; +} + +.tx-indexedsearch-form { + margin-bottom: 25px; +} + #site-content { display: flex; } @@ -643,7 +690,7 @@ h5 { display: flex; /*height: calc(100vh - 80px);*/ /*transition: width 0.3s;*/ - max-width: 240px; + width: 240px; } #site-content.sidebar-collapse .sidebar-container { @@ -735,6 +782,9 @@ h5 { .user-info-avatar img { border: 1px solid #63B21F; border-radius: 50%; + height: 32px; + object-fit: cover; + width: 32px; } .user-info-name { @@ -768,8 +818,10 @@ h5 { } .footer-logout { + align-items: center; background-color: #C7C7C7; display: flex; + gap: 5px; width: 240px; } @@ -779,10 +831,15 @@ h5 { font-size: 20px; font-weight: 600; margin: auto 0; - padding-left: 30px; + padding-left: 20px; text-decoration: none; } +.footer-logout svg { + height: auto; + width: 30px; +} + .footermenu-container { display: flex; justify-content: center;