diff --git a/local_packages/psi/Configuration/Sets/Psi/TsConfig/Page/TCEFORM.tsconfig b/local_packages/psi/Configuration/Sets/Psi/TsConfig/Page/TCEFORM.tsconfig index 4b5a01d..2219c4d 100644 --- a/local_packages/psi/Configuration/Sets/Psi/TsConfig/Page/TCEFORM.tsconfig +++ b/local_packages/psi/Configuration/Sets/Psi/TsConfig/Page/TCEFORM.tsconfig @@ -92,6 +92,8 @@ TCEFORM { // Header Link header_link.disabled = 1 + subheader.label = LLL:EXT:psi/Resources/Private/Language/locallang_db.xlf:tt_content.topline + frame_class { disabled = 1 } diff --git a/local_packages/psi/Resources/Private/Language/es.locallang.xlf b/local_packages/psi/Resources/Private/Language/es.locallang.xlf index 2105438..bfe7681 100644 --- a/local_packages/psi/Resources/Private/Language/es.locallang.xlf +++ b/local_packages/psi/Resources/Private/Language/es.locallang.xlf @@ -5,51 +5,85 @@ Confidentiality Header + Encabezado de Confidencialidad Confidentiality Message + Mensaje de Confidencialidad + + + Login failure + Error de inicio de sesión + + + An error occurred during login. Most likely you didn't enter the username or password correctly. Be certain that you enter them precisely as they are, including upper/lower case. Another possibility is that cookies might be disabled in your web browser. + Se produjo un error durante el inicio de sesión. Lo más probable es que no haya ingresado el nombre de usuario o la contraseña correctamente. Asegúrese de ingresarlos exactamente como son, incluyendo mayúsculas y minúsculas. Otra posibilidad es que las cookies estén desactivadas en su navegador web. User information - Informaciones Usero + Información de Usuario + + + Personal information + Información Personal - - Contact information + + Address + Dirección - - Short Bio + + Personal Profile + Perfil Personal + + Address + Dirección + - First Name: + First Name + Nombre - Last Name: + Last Name + Apellido - Position / Department: + Position / Department + Puesto / Departamento - Address: + Address + Dirección - Country: + Country + País - City: + City + Ciudad - ZIP Code: + ZIP Code + Código Postal - Email Address: + Email Address + Correo Electrónico - Telephone: + Telephone + Teléfono - Fax: + Fax + Fax + + + Bio + Biografía You are on page: diff --git a/local_packages/psi/Resources/Private/Language/locallang.xlf b/local_packages/psi/Resources/Private/Language/locallang.xlf index 0989435..ad61d25 100644 --- a/local_packages/psi/Resources/Private/Language/locallang.xlf +++ b/local_packages/psi/Resources/Private/Language/locallang.xlf @@ -9,46 +9,61 @@ Confidentiality Message + + Login failure + + + An error occurred during login. Most likely you didn't enter the username or password correctly. Be certain that you enter them precisely as they are, including upper/lower case. Another possibility is that cookies might be disabled in your web browser. + User information - - Contact information + + Personal information + + + Address - - Short Bio + + Personal Profile + + Address + - First Name: + First Name - Last Name: + Last Name - Position / Department: + Position / Department - Address: + Address - Country: + Country - City: + City - ZIP Code: + ZIP Code - Email Address: + Email Address - Telephone: + Telephone - Fax: + Fax + + + Bio You are on page: diff --git a/local_packages/psi/Resources/Private/Language/locallang_db.xlf b/local_packages/psi/Resources/Private/Language/locallang_db.xlf index 81fa207..c058223 100644 --- a/local_packages/psi/Resources/Private/Language/locallang_db.xlf +++ b/local_packages/psi/Resources/Private/Language/locallang_db.xlf @@ -3,6 +3,9 @@
+ + Topline + Employee List diff --git a/local_packages/psi/Resources/Private/Scss/Base/_globals.scss b/local_packages/psi/Resources/Private/Scss/Base/_globals.scss index 2487353..f48ac7c 100644 --- a/local_packages/psi/Resources/Private/Scss/Base/_globals.scss +++ b/local_packages/psi/Resources/Private/Scss/Base/_globals.scss @@ -1,4 +1,4 @@ -*, +*, :before, :after { padding: 0; @@ -12,7 +12,7 @@ html { } body { - font-family: $font-family-main; + font-family: $font-family-main, sans-serif; font-weight: 400; color: var(--text, #1d0b1e); position: relative; @@ -58,4 +58,4 @@ section { a { color: var(--link); -} \ No newline at end of file +} diff --git a/local_packages/psi/Resources/Private/Scss/Base/_grid.scss b/local_packages/psi/Resources/Private/Scss/Base/_grid.scss index ca0b2dd..3dc3744 100644 --- a/local_packages/psi/Resources/Private/Scss/Base/_grid.scss +++ b/local_packages/psi/Resources/Private/Scss/Base/_grid.scss @@ -38,9 +38,9 @@ padding-right: calc(var(--gutter) / 2); .row { - display: flex; + display: flex; flex-wrap: wrap; - gap: var(--gutter); + column-gap: var(--gutter); } .col { @@ -73,7 +73,7 @@ flex-basis: calc((100% - #{map-get($grid-config, gutter)} * 2 ) / #{map-get($grid-config, columns)} * #{$i}); } - } + } @for $i from 1 through map-get($grid-config, columns) { .#{$bp}-offset-#{$i}-l { margin-right: calc(100% / (#{map-get($grid-config, columns)} / #{$i})); @@ -81,6 +81,6 @@ .#{$bp}-offset-#{$i}-r { margin-right: calc(100% / (#{map-get($grid-config, columns)} / #{$i})); } - } + } } -} \ No newline at end of file +} diff --git a/local_packages/psi/Resources/Private/Scss/Base/_variables.scss b/local_packages/psi/Resources/Private/Scss/Base/_variables.scss index 12624aa..c115a90 100644 --- a/local_packages/psi/Resources/Private/Scss/Base/_variables.scss +++ b/local_packages/psi/Resources/Private/Scss/Base/_variables.scss @@ -32,8 +32,9 @@ $secondary: #99D6B4; $accent: #79C9B2; $light: #F4F9F1; $dark: #090C05; +$white: #FFFFFF; -// utility +// utility $success: $primary; $error: #FF5D2D; $warn: #F4C659; @@ -46,13 +47,13 @@ $contrast-accent: #D5C904; $contrast-light: #F4F9F1; $contrast-dark: #090C05; -// utility +// utility $contrast-success: $success; $contrast-error: $error; $contrast-warn: $warn; $contrast-hint: $hint; -// color scheme handling +// color scheme handling $color-themes: ( // light theme colors light: ( @@ -61,18 +62,18 @@ $color-themes: ( accent: $accent, light: $light, dark: $dark, - background: #fff, + background: $white, text: $dark, text-light: #6F6F6F, link: $primary, - - // utility + + // utility success: $success, error: $error, warn: $warn, hint: $hint, - ), - + ), + contrastMode: ( primary: $contrast-primary, secondary: $contrast-secondary, @@ -82,7 +83,7 @@ $color-themes: ( text-light: $contrast-secondary, link: var(--primary), - // utility + // utility success: $contrast-success, error: $contrast-error, warn: $contrast-warn, @@ -99,7 +100,7 @@ $color-themes: ( // generating base root :root{ @each $key, $val in $map{ - --#{$key}: #{$val}; + --#{$key}: #{$val}; } } @@ -121,7 +122,7 @@ $color-themes: ( } $spacings: ( - 4, + 4, 8, 16 24, @@ -150,6 +151,6 @@ $border-radius: ( large: toUnit(12, 'px') ); -$box-shadow-shade: color-mix(in srgb, var(--dark), transparent 70%); +$box-shadow-shade: color-mix(in srgb, var(--dark), transparent 70%); $box-shadow-small: 0 0 rem(4) 0 $box-shadow-shade; -$box-shadow-medium: 0 0 rem(8) 0 $box-shadow-shade; \ No newline at end of file +$box-shadow-medium: 0 0 rem(8) 0 $box-shadow-shade; diff --git a/local_packages/psi/Resources/Private/Scss/Components/_employee_list.scss b/local_packages/psi/Resources/Private/Scss/Components/_employee_list.scss index 0da8d29..0fdef8a 100644 --- a/local_packages/psi/Resources/Private/Scss/Components/_employee_list.scss +++ b/local_packages/psi/Resources/Private/Scss/Components/_employee_list.scss @@ -1,16 +1,21 @@ .employee { + + &__list { + row-gap: var(--gutter); + } + &__item { display: flex; flex-direction: row; - padding: 16px; + padding: rem(16) rem(24); gap: 34px; - background: $secondary; + background: var(--light); } &__image { width: 100%; - height: 72px; - max-width: 72px; + height: rem(72); + max-width: rem(72); object-fit: cover; border-radius: 50%; box-shadow: 0 0 2px rgba(0, 0, 0, 0.5); @@ -21,6 +26,7 @@ display: flex; flex-direction: column; width: 100%; + word-break: break-word; } &__title { @@ -40,6 +46,18 @@ & + & { margin-top: 6px; } + + a { + color: var(--primary); + text-decoration: none; + border-bottom: 1px solid var(--primary); + + &:hover, + &:focus, + &:active { + border-bottom: 2px dashed; + } + } } &__label { diff --git a/local_packages/psi/Resources/Private/Scss/Components/_image.scss b/local_packages/psi/Resources/Private/Scss/Components/_image.scss index 293bcb6..c132282 100644 --- a/local_packages/psi/Resources/Private/Scss/Components/_image.scss +++ b/local_packages/psi/Resources/Private/Scss/Components/_image.scss @@ -4,7 +4,7 @@ } &__figure { - margin: 0; + margin: 32px 0 0; } &__file { diff --git a/local_packages/psi/Resources/Private/Scss/Components/_text.scss b/local_packages/psi/Resources/Private/Scss/Components/_text.scss index 29646bb..c420a40 100644 --- a/local_packages/psi/Resources/Private/Scss/Components/_text.scss +++ b/local_packages/psi/Resources/Private/Scss/Components/_text.scss @@ -1,4 +1,8 @@ .text { + &__body { + margin-top: 32px; + } + &-center { text-align: center; } diff --git a/local_packages/psi/Resources/Private/Scss/Components/_textpic.scss b/local_packages/psi/Resources/Private/Scss/Components/_textpic.scss index 6f80f0a..8d4c600 100644 --- a/local_packages/psi/Resources/Private/Scss/Components/_textpic.scss +++ b/local_packages/psi/Resources/Private/Scss/Components/_textpic.scss @@ -1,6 +1,6 @@ .textpic { &__row { - flex-flow: column!important; + flex-flow: column; justify-content: space-evenly; } @@ -22,10 +22,10 @@ } } -@media (min-width: 768px) { +@include breakpoint-up(md) { .textpic { &__row { - flex-flow: row!important; + flex-flow: row; align-items: center; } } diff --git a/local_packages/psi/Resources/Private/Scss/Plugins/Felogin/_login.scss b/local_packages/psi/Resources/Private/Scss/Plugins/Felogin/_login.scss index cd8a485..f7e50d7 100644 --- a/local_packages/psi/Resources/Private/Scss/Plugins/Felogin/_login.scss +++ b/local_packages/psi/Resources/Private/Scss/Plugins/Felogin/_login.scss @@ -4,6 +4,7 @@ justify-content: center; height: 100%; min-height: 100vh; + padding: 60px 0; } &__box { @@ -22,13 +23,12 @@ margin: 0 0 15px; padding: 15px; border: 0; - background: #f2f2f2; + background: var(--light); box-sizing: border-box; font-size: 14px; &:focus { - outline: none; - background: #F2F0FF; + outline-color: var(--primary); } } @@ -43,16 +43,52 @@ width: 100%; margin: 15px 0 0; padding: 15px; - border: 0; - background: #9B8BF4; + color: var(--primary); + background: none; + border: 2px var(--primary) solid; + border-radius: 4px; box-sizing: border-box; font-size: 18px; font-weight: 600; - color: #ffffff; cursor: pointer; &:hover { - background: #c379b8; + color: var(--text); + background: var(--accent); + border-color: var(--accent); + } + + &:focus { + outline-color: var(--accent); + } + } + + &__header { + margin-bottom: 16px; + } + + &__welcome { + margin-bottom: 32px; + + &-header { + margin-bottom: 12px; + } + } + + &__confidentiality { + margin-top: 32px; + + &-message { + font-size: 14px; } } + + &__error { + margin-top: 32px; + padding: 16px 14px; + color: var(--text); + background: rgba(255,93,45, .3); + border: 2px var(--error) solid; + border-radius: 4px; + } } diff --git a/local_packages/psi/Resources/Private/Scss/Plugins/Felogin/_profile.scss b/local_packages/psi/Resources/Private/Scss/Plugins/Felogin/_profile.scss index b5f1367..71f2c02 100644 --- a/local_packages/psi/Resources/Private/Scss/Plugins/Felogin/_profile.scss +++ b/local_packages/psi/Resources/Private/Scss/Plugins/Felogin/_profile.scss @@ -1,28 +1,73 @@ .profile { - padding-top: 60px; - padding-bottom: 60px; - - &__card, - &__info { - padding: 1.25rem 1.5rem; - word-wrap: break-word; - border: 1px solid rgba(0, 0, 0, .05); - border-radius: 0.625rem; - background-color: #fff; - background-clip: border-box; - box-shadow: 0 0 2rem 0 rgba(136, 152, 170, .15); - } - - &__image { - width: 200px; - height: 200px; - } - - &__header { - font-size: .75rem; - padding-top: .25rem; - padding-bottom: .25rem; - letter-spacing: .04em; - text-transform: uppercase; - } + &__info { + padding: 32px; + word-wrap: break-word; + border-radius: 0.625rem; + background-color: #fff; + background-clip: border-box; + box-shadow: 0 0 2rem 0 rgba(136, 152, 170, .15); + + &-inner { + border: 1px solid rgba(0, 0, 0, .05); + box-shadow: none; + + & + & { + margin-top: 32px; + } + } + + &-item { + display: flex; + flex-direction: column; + gap: 8px; + } + } + + &__image { + width: 100%; + height: rem(100); + max-width: rem(100); + object-fit: cover; + border-radius: 50%; + box-shadow: 0 0 2px rgba(0, 0, 0, 0.5); + transition: all 0.5s ease-in-out; + } + + &__description { + flex-flow: column; + align-items: flex-start; + } + + &__basic { + display: flex; + flex-direction: column; + gap: 8px; + } + + &__label, + &__data { + color: var(--text-light); + } + + &__data { + font-weight: 600; + } + + &__location { + font-weight: 400; + } + + &__header { + flex-basis: 100%; + font-size: 18px; + font-weight: 600; + } +} + +@include breakpoint-up(md) { + .profile { + &__description { + flex-flow: row; + } + } } diff --git a/local_packages/psi/Resources/Private/Templates/Content/EmployeeList.html b/local_packages/psi/Resources/Private/Templates/Content/EmployeeList.html index 47f1cd9..c4150a8 100644 --- a/local_packages/psi/Resources/Private/Templates/Content/EmployeeList.html +++ b/local_packages/psi/Resources/Private/Templates/Content/EmployeeList.html @@ -5,7 +5,7 @@
    -
  • +
  • @@ -19,7 +19,7 @@
    {user.first_name}, {user.last_name}
    @@ -27,7 +27,7 @@
    {user.first_name}, {user.last_name}
    - + : {user.telephone}
    @@ -35,7 +35,7 @@
    {user.first_name}, {user.last_name}
    - + : {user.fax}
    diff --git a/local_packages/psi/Resources/Private/Templates/Content/Image.html b/local_packages/psi/Resources/Private/Templates/Content/Image.html index 1b3ba35..3375f0c 100644 --- a/local_packages/psi/Resources/Private/Templates/Content/Image.html +++ b/local_packages/psi/Resources/Private/Templates/Content/Image.html @@ -5,7 +5,7 @@
    + class="topline {f:if(condition: '{data.header} && {data.header_position}', then: 'headline-{data.header_position}')}"> {data.subheader} diff --git a/local_packages/psi/Resources/Private/Templates/Content/Text.html b/local_packages/psi/Resources/Private/Templates/Content/Text.html index f8419d5..8c10b0e 100644 --- a/local_packages/psi/Resources/Private/Templates/Content/Text.html +++ b/local_packages/psi/Resources/Private/Templates/Content/Text.html @@ -1,10 +1,10 @@
    -
    +
    + class="topline {f:if(condition: '{data.header} && {data.header_position}', then: 'headline-{data.header_position}')}"> {data.subheader} @@ -16,7 +16,9 @@ default: settings.defaultHeaderType}"/> - {data.bodytext} +
    + {data.bodytext} +
    diff --git a/local_packages/psi/Resources/Private/Templates/Content/Textpic.html b/local_packages/psi/Resources/Private/Templates/Content/Textpic.html index c091ed8..c61f41a 100644 --- a/local_packages/psi/Resources/Private/Templates/Content/Textpic.html +++ b/local_packages/psi/Resources/Private/Templates/Content/Textpic.html @@ -2,14 +2,15 @@
    -
    +
    - {data.subheader} + {data.subheader} - {data.bodytext} +
    + {data.bodytext} +
    diff --git a/local_packages/psi/Resources/Private/Templates/Plugins/Felogin/Login/Login.html b/local_packages/psi/Resources/Private/Templates/Plugins/Felogin/Login/Login.html index 60280b3..6075a0b 100644 --- a/local_packages/psi/Resources/Private/Templates/Plugins/Felogin/Login/Login.html +++ b/local_packages/psi/Resources/Private/Templates/Plugins/Felogin/Login/Login.html @@ -2,7 +2,7 @@