webapps/term_portal
18
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

First full release

Browse Source
This commit is contained in:
Luka Romih
2023-03-10 12:50:23 +01:00
parent 257f3c354f
commit 9867875ef2
285 changed files with 10980 additions and 4692 deletions
Download Patch File Download Diff File Expand all files Collapse all files
express/views/components/admin/admin-navigation.pug
+11 -11
View File
@@ -4,37 +4,37 @@ extends ../../common/side-navigation-common
.admin-nav-mobile
button#nav-button.nav-button
img#burger-menu-img(src="/images/burger-menu-button-icon.svg" alt="Meni")
span.nav-title Administrator
span.nav-title= t('Administracija')
nav
ul.admin-nav-content.slidable
ul.admin-nav-content.slidable.scroller-style
li.admin-nav-item
a(href="#")
img(src="/images/cog.svg" alt="")
p Osnovne nastavitve
p= t('Osnovne nastavitve')
li.admin-nav-item.focused-menu
a.menu-selected(href="#")
img(src="/images/link.svg" alt="")
p Povezave
p= t('Povezave')
ul.sub-links
li
a.menu-selected(href="#") Portali
a.menu-selected(href="#")= t('Portali')
li
a(href="#") Domači slovarji
a(href="#")= t('Domači slovarji')
li
a(href="#") Tuji slovarji
a(href="#")= t('Tuji slovarji')
li.admin-nav-item
a(href="#")
img(src="/images/book.svg" alt="")
p Slovarji
p= t('Slovarji')
li.admin-nav-item
a(href="#")
img(src="/images/users.svg" alt="")
p Uporabniki
p= t('Uporabniki')
li.admin-nav-item
a(href="#")
img(src="/images/areas.svg" alt="")
p Področja
p= t('Področja')
li.admin-nav-item
a(href="#")
img(src="/images/statistics.svg" alt="")
p Statistika
p= t('Statistika')
express/views/components/consultancy/admin/consultancy-item-admin.pug
+15 -15
View File
@@ -41,7 +41,7 @@ mixin consultancyItem(data, section)
else
.row.mt-2.mb-2
span.consultancy-description-text
b.text-p875rem= 'Opis terminološkega problema: '
b.text-p875rem= t('Opis terminološkega problema: ')
span.text-p875rem= data.description
.row.mt-3.btn-group
if section.inProgress
@@ -51,57 +51,57 @@ mixin consultancyItem(data, section)
type="button"
)
img.i1p5rx1p5r(src="/images/u_edit-alt.svg" alt="")
span.ps-1 DODELI
span.ps-1 #{ t('DODELI') }
.col-md-2
button.btn.btn-secondary.w-100.consultancy-modal-share(
type="button"
)
img.i1p5rx1p5r(src="/images/users.svg" alt="")
span.ps-1 DELI
span.ps-1 #{ t('DELI') }
.col-md-2
button.btn.btn-secondary.w-100.reject-item
img.i1p5rx1p5r(src="/images/x-circle-red.svg" alt="")
span.ps-1 ZAVRNI
span.ps-1 #{ t('ZAVRNI') }
.col-md-2
button.edit-button.btn.btn-secondary.w-100
img.i1p5rx1p5r(src="/images/u_edit-alt.svg" alt="")
span.ps-1 UREDI
span.ps-1 #{ t('UREDI') }
.col-md-2
button.btn.btn-primary.review-btn.w-100(disabled=!data.title)
img.i1p5rx1p5r(src="/images/book-open-white.svg" alt="")
span.ps-1 OBJAVI
span.text-white.ps-1 #{ t('OBJAVI') }
else if section.new
.col-md-2
button.btn.btn-secondary.w-100.consultancy-modal-assign(
type="button"
)
img.i1p5rx1p5r(src="/images/u_edit-alt.svg" alt="")
span.ps-1 DODELI
span.ps-1 #{ t('DODELI') }
.col-md-2
button.btn.btn-secondary.w-100.delete-item
img.i1p5rx1p5r(src="/images/trash-2.svg" alt="")
span.ps-1 BRIŠI
span.ps-1 #{ t('BRIŠI') }
else if section.rejected
.col-md-2
button.btn.btn-secondary.w-100.consultancy-modal-assign(
type="button"
)
img.i1p5rx1p5r(src="/images/u_edit-alt.svg" alt="")
span.ps-1 DODELI
span.ps-1 #{ t('DODELI') }
.col-md-2
button.btn.btn-secondary.w-100.delete-item
img.i1p5rx1p5r(src="/images/trash-2.svg" alt="")
span.ps-1 BRIŠI
span.ps-1 #{ t('BRIŠI') }
else if section.prepared
.col-md-2
button.edit-button.btn.btn-secondary.w-100
img.i1p5rx1p5r(src="/images/u_edit-alt.svg" alt="")
span.ps-1 UREDI
span.ps-1 #{ t('UREDI') }
if user.hasRole('consultancy admin')
.col-md-2
button.btn.btn-primary.publish-btn.w-100(disabled=!data.title)
img.i1p5rx1p5r(src="/images/book-open-white.svg" alt="")
span.ps-1 OBJAVI
span.text-white.ps-1 #{ t('OBJAVI') }
else if section.published
if user.hasRole('consultancy admin')
.col-md-2
@@ -109,15 +109,15 @@ mixin consultancyItem(data, section)
type="button"
)
img.i1p5rx1p5r(src="/images/u_edit-alt.svg" alt="")
span.ps-1 DODELI
span.ps-1 #{ t('DODELI') }
.col-md-2
button.edit-button.btn.btn-secondary.w-100
img.i1p5rx1p5r(src="/images/u_edit-alt.svg" alt="")
span.ps-1 UREDI
span.ps-1 #{ t('UREDI') }
if user.hasRole('consultancy admin')
.col-md-2
button.btn.btn-secondary.w-100.delete-item
img.i1p5rx1p5r(src="/images/trash-2.svg" alt="")
span.ps-1 BRIŠI
span.ps-1 #{ t('BRIŠI') }
.hovered.position-absolute
express/views/components/consultancy/api/consultancy-item-rendered.pug
+13
View File
@@ -0,0 +1,13 @@
if isAdminPage
include /components/consultancy/admin/consultancy-item-admin
else
include /components/consultancy/consultancy-item
.consultancy-container
// To remove duplicates
//- - const moderatorList = entryList.filter(a => a.isModerator) // All published questions have a moderator...
each entry in entries
if isAdminPage
+consultancyItem(entry, section)
else
+consultancyItem(entry)
express/views/components/consultancy/consultancy-item.pug
+6 -4
View File
@@ -4,14 +4,16 @@ mixin consultancyItem(entry)
.row.mt-4.mb-2
.col.d-flex.justify-content-start
//- 9. 11. 2021 --> questionDateDMYformat
span.question-asked-time.text-p875rem= `Vprašanje poslano: ${entry.formattedTimeCreated}`
//- span.question-asked-time.text-p875rem= `Vprašanje poslano: ${entry.formattedTimeCreated}`
span.question-asked-time.text-p875rem= t('Vprašanje poslano:') + `${entry.formattedTimeCreated}`
.row.mb-2
.col
h5-pb-0.navigation-text-color
h5.pb-0.title-cons
b= entry.title
.row
//- span.consultancy-description-text
span.text-p875rem!= `<b>Opis terminološkega problema:</b> ${entry.question}`
span.text-p875rem.clipx!= `<b>${t('Opis terminološkega problema')}:</b> ${entry.question}`
//- span.consultancy-description-text
span.text-p875rem!= `<b>Odgovor:</b> ${entry.answerSummary}`
//- span.text-p875rem.clipx!= `<b>Odgovor:</b> ${entry.answerSummary}`
span.text-p875rem.clipx!= t('<b>Odgovor:</b>') + `${entry.answerSummary}`
.hovered.position-absolute
express/views/components/dictionary/dictionary-list.pug
+14 -8
View File
@@ -6,26 +6,32 @@ mixin table(lstt= [{name: "Terminološki slovar fizike in astronomije", area: "B
.row.g-0
.col-8.d-flex.justify-content-start.ps-4
button#sortByDictName.no-bg.no-border.text-decoration-none.navigation-text-color
span Ime
span= t('Ime')
img#dictNameImg.invisible(src="images/arrow_drop_down.svg")
.col-4.d-flex.justify-content-start
button#sortByDomainName.no-bg.no-border.text-decoration-none.navigation-text-color
span Področje
span= t('Področje')
img#domainNameImg.invisible(src="images/arrow_drop_down.svg")
.col-1.row.d-flex.justify-content-end.g-0
//- .col-4.d-flex.justify-content-center Vir
//- .col-4.d-flex.justify-content-center Opis
.col.d-flex.justify-content-center
.no-bg.no-border.text-decoration-none.navigation-text-color.fw-400 Iskanje
.no-bg.no-border.text-decoration-none.navigation-text-color.fw-400= t('Iskanje')
each val in lstt
.row.table-dict-content.py-2.g-0(id=val.id)
.col-11.row.g-0
.col-sm-8.d-flex.justify-content-start.text-p875rem.ps-4.fw-500
a.d-flex.flex-row.text-decoration-none(
href=`/slovarji/${val.id}/o-slovarju?sentFromEntryId=dictsList`
)
img.mt-1.d-flex.i16x16(src="/images/book.svg" alt="")
span.px-3.d-flex.flex-grow-1= val.dictionarysl
if val.count_comments != null
a.d-flex.flex-row.text-decoration-none.hover-opacity-blue(
href=`/slovarji/${val.id}/o-slovarju?sentFromEntryId=dictsList`
)
img.mt-1.d-flex.i16x16(src="/images/book.svg" alt="")
span.px-3.d-flex.flex-grow-1= val.dictionarysl
else
.d-flex.flex-row.text-decoration-none
img.mt-1.d-flex.i16x16(src="/images/book.svg" alt="")
span.px-3.d-flex.flex-grow-1= val.dictionarysl
.col-sm-4.pe-3.d-flex.justify-content-start.text-p875rem.dpr= val.domain_primary
.col-1.row.d-flex.justify-content-end.g-0
//- .col-4.d-flex.justify-content-center.align-items-center
express/views/components/login-signup/login-signup.pug
+32 -32
View File
@@ -1,6 +1,6 @@
-
const registration_login_label = "registracija"
const registration_suggestion_label = "Še niste registriran uporabnik, registrirajte se."
const registration_login_label = t("registracija")
const registration_suggestion_label = t("Še niste registriran uporabnik, registrirajte se.")
@@ -14,8 +14,8 @@
.modal-dialog.modal-dialog-centered.modal-fullscreen-sm-down.modal-lg
.modal-content.ps-4.pe-4
.modal-header.mt-3
h2.logintitle.modal-title.color-primary-text.fs-2 Prijava
h2.regtitle.d-none.modal-title.color-primary-text.fs-2 Registracija
h2.logintitle.modal-title.color-primary-text.fs-2= t('Prijava')
h2.regtitle.d-none.modal-title.color-primary-text.fs-2= t('Registracija')
button.no-bg-and-borders(
type="button"
data-bs-dismiss="modal"
@@ -23,8 +23,8 @@
)
img(src="/images/x.svg" alt="Zapri")
#logreg-mb.modal-body.pt-0.pe-5
p.logindesc.text-header-description-gray S prijavo pridobite možnost uporabe vseh funkcij terminološkega portala.
p.regdesc.d-none.text-header-description-gray Z registracijo pridobite možnost uporabe vseh funkcij terminološkega portala.
p.logindesc.text-header-description-gray= t('S prijavo pridobite možnost uporabe vseh funkcij terminološkega portala.')
p.regdesc.d-none.text-header-description-gray= t('Z registracijo pridobite možnost uporabe vseh funkcij terminološkega portala.')
.pspelogsig-5
form#login-form(
action="/api/v1/users/login"
@@ -35,7 +35,7 @@
.col-2.d-flex.align-items-center.justify-content-center.pe-4
img(src="/images/user.svg" alt="")
.col-8.input-floor.ps-0
label.loginregisterlabel(for="login-username-or-email") UPORABNIK
label.loginregisterlabel(for="login-username-or-email")= t('UPORABNIK')
input#login-username-or-email.d-block.w-100.input-lr(
name="usernameOrEmail"
)
@@ -48,7 +48,7 @@
.col-2.d-flex.align-items-center.justify-content-center.pe-4
img(src="/images/lock.svg" alt="")
.col-8.input-floor.ps-0
label.loginregisterlabel(for="login-password") GESLO
label.loginregisterlabel(for="login-password")= t('GESLO')
input#login-password.d-block.w-100.input-lr(
name="password"
type="password"
@@ -71,17 +71,17 @@
)
label.ps-2.align-middle.rememberloginlabel.text-header-description-gray.pe-2(
for="login-remember-me"
) Zapomni si prijavo
)= t('Zapomni si prijavo')
.col-5.pt-2.d-flex-and-align-end.pe-0
a.ms-auto.forgotten-password.gray1-text.no-text-decoration.align-middle(
a#forgotten-password.ms-auto.forgotten-password.gray1-text.no-text-decoration.align-middle(
href="#"
) Pozabljeno geslo
)= t('Pozabljeno geslo')
.row.pt-0
.col
p#error-description.error-text.pt-3.mb-1 Nepravilno uporabniško ime, elektronski naslov ali geslo.
p#error-description.error-text.pt-3.mb-1= t('Nepravilno uporabniško ime, elektronski naslov ali geslo.')
.row.pt-3
.col
button.btn.btn-primary.h41.w151 PRIJAVA
button.btn.btn-primary.h41.w151= t('PRIJAVA')
.row.pt-3
.col
p#login-message-container
@@ -95,7 +95,7 @@
.col-2.d-flex.align-items-center.justify-content-center.pe-4
img(src="/images/user.svg" alt="")
.col-8.input-floor.ps-0
label.loginregisterlabel(for="register-username") UPORABNIK
label.loginregisterlabel(for="register-username")= t('UPORABNIK')
input#register-username.w-100.input-lr(name="username")
.col-2.input-floor.d-flex.justify-content-end.pe-0
@@ -105,12 +105,12 @@
)
.row.pt-1
.col.pe-0
p#error-username.mb-0.error-text.text-end Uporabniško ime že obstaja
p#error-username.mb-0.error-text.text-end= t('Uporabniško ime že obstaja')
.row.pt-0
.col-2.d-flex.align-items-center.justify-content-center.pe-4
img(src="/images/user.svg" alt="")
.col-8.input-floor.ps-0
label.loginregisterlabel(for="register-name") IME
label.loginregisterlabel(for="register-name")= t('IME')
input#register-name.w-100.input-lr(name="firstName")
.col-2.input-floor.d-flex.justify-content-end.pe-0
img.error-icon.error-name.align-self-end.d-flex(
@@ -119,12 +119,12 @@
)
.row.pt-1
.col.pe-0
p#error-name.mb-0.error-text.text-end Prazno obvezno polje
p#error-name.mb-0.error-text.text-end= t('Prazno obvezno polje')
.row.pt-1
.col-2.d-flex.align-items-center.justify-content-center.pe-4
img(src="/images/user.svg" alt="")
.col-8.input-floor.ps-0
label.loginregisterlabel(for="register-surname") PRIIMEK
label.loginregisterlabel(for="register-surname")= t('PRIIMEK')
input#register-surname.w-100.input-lr(name="lastName")
.col-2.input-floor.d-flex.justify-content-end.pe-0
img.error-icon.error-surname.align-self-end.d-flex(
@@ -133,12 +133,12 @@
)
.row.pt-1
.col.pe-0
p#error-surname.mb-0.error-text.text-end Prazno obvezno polje
p#error-surname.mb-0.error-text.text-end= t('Prazno obvezno polje')
.row.pt-1
.col-2.d-flex.align-items-center.justify-content-center.pe-4
img(src="/images/user.svg" alt="")
.col-8.input-floor.ps-0
label.loginregisterlabel(for="register-email") ELEKTRONSKI NASLOV
label.loginregisterlabel(for="register-email")= t('ELEKTRONSKI NASLOV')
input#register-email.w-100.input-lr(name="email")
.col-2.input-floor.d-flex.justify-content-end.pe-0
img.error-icon.error-email.align-self-end.d-flex(
@@ -147,12 +147,12 @@
)
.row.pt-1
.col.pe-0
p#error-email.mb-0.error-text.text-end Elektronski naslov že obstaja
p#error-email.mb-0.error-text.text-end= t('Elektronski naslov že obstaja')
.row.pt-1
.col-2.d-flex.align-items-center.justify-content-center.pe-4
img(src="/images/lock.svg" alt="")
.col-8.input-floor.ps-0
label.loginregisterlabel(for="register-password") GESLO
label.loginregisterlabel(for="register-password")= t('GESLO')
input#register-password.w-100.input-lr(
name="password"
type="password"
@@ -164,12 +164,12 @@
)
.row.pt-1
.col.pe-0
p#error-password.mb-0.error-text.text-end Geslo je prekratko
p#error-password.mb-0.error-text.text-end= t('Geslo je prekratko')
.row.pt-1
.col-2.d-flex.align-items-center.justify-content-center.pe-4
img(src="/images/lock.svg" alt="")
.col-8.input-floor.ps-0
label.loginregisterlabel(for="register-password-repeat") PONOVI GESLO
label.loginregisterlabel(for="register-password-repeat")= t('PONOVI GESLO')
input#register-password-repeat.w-100.input-lr(
name="passwordRepeat"
type="password"
@@ -181,21 +181,21 @@
)
.row.pt-1
.col.pe-0
p#error-password-repeat.mb-0.repeat.error-text.text-end Geslo se ne ujema
p#error-password-repeat.mb-0.repeat.error-text.text-end= t('Geslo se ne ujema')
.row.mt-1.pt-0
.col-2.d-flex.align-items-center.justify-content-center.pe-4
.col-8.ps-0
.mb-2
input#terms-of-use.me-3(type="checkbox")
span Strinjam se s <a href="/pogoji-uporabe">pogoji uporabe</a>
span!= t('Strinjam se s <a target="_blank" href="/pogoji-uporabe">pogoji uporabe</a>')
.mb-2
input#privacy-policy.me-3(type="checkbox")
span Soglašam s <a href="/politika-zasebnosti">politiko zasebnosti</a>
span!= t('Soglašam s <a target="_blank" href="/politika-zasebnosti">politiko zasebnosti</a>')
.col-2.d-flex.justify-content-end.pe-0
.row
.col-2.d-flex.ps-4.align-items-center.pe-4
.col-10.ps-0
button.btn.btn-primary.h41.w151 Registracija
button#regbtnmain.btn.btn-primary.h41.w151(disabled)= ('Registracija')
.row
.col-sm-2.d-flex.ps-4.align-items-center
.col-sm-10
@@ -214,8 +214,8 @@
//-<i class="bi-person-plus"></i>
img(src="/images/icon-user-x.svg" alt="")
span.form-data
h6 Registracija
p Še niste registriran uporabnik, registrirajte se.
h6= t('Registracija')
p= t('Še niste registriran uporabnik, registrirajte se.')
#loginbtn.registration.register-login-form.login.d-none
button(
style="border: none; background: none; text-decoration: none"
@@ -225,7 +225,7 @@
//-<i class="bi-person-plus"></i>
img(src="/images/icon-user-x.svg" alt="")
span.form-data
h6 Prijava
p Nazaj na prijavo
h6= t('Prijava')
p= t('Nazaj na prijavo')
script(nonce=cspNonce src="/javascripts/login-and-register.js")
express/views/components/main-panel/generic-main-panel-header.pug
+2 -5
View File
@@ -4,10 +4,7 @@
#chevrons-left.d-flex.align-items-start.justify-content-start
.header-section-root
.header-container-divider-left.pe-5
h2 Naslov
h1 Podnaslov
h2= t('Naslov')
h1= t('Podnaslov')
span.d-block.pe-5
| Splošen opis področja. Anim duis u llamco Lorem reprehenderit.
| Reprehenderit aliqua quis ut velit eu irure non ad sunt sunt
| ipsum sunt esse.
block right-section
express/views/components/main-panel/implementations/one-button.pug
+3 -1
View File
@@ -1,6 +1,8 @@
// TODO MARK FOR DELETION
extends ../generic-main-panel-header
block right-section
.header-container-divider-right
button.optional-floating-action-button
| Besedilo gre tukaj
= t('Besedilo gre tukaj')
express/views/components/main-panel/implementations/two-buttons.pug
+4 -2
View File
@@ -1,8 +1,10 @@
// TODO MARK FOR DELETION
extends ../generic-main-panel-header
block right-section
.header-container-divider-right
button.optional-floating-action-button
| Besedilo gre tukaj
= t('Besedilo gre tukaj')
button.optional-floating-action-button
| Besedilo gre tukaj
= t('Besedilo gre tukaj')
express/views/components/navigation/main-navigation-right-mixin.pug
+18 -16
View File
@@ -2,39 +2,41 @@ mixin main-navigation-right(languageToolbarPresent=false, menuTextPresent=false,
li.nav-item
.container
//-<span class="nav">
//- if languageToolbarPresent
a.col-sm.nav-entry.language-desktop-entry(href="#")
if languageToolbarPresent
a.col-sm.nav-entry.language-desktop-entry(
href=`/spremeni-jezik/${determinedLanguage === 'sl' ? 'en' : 'sl'}`
)
img(src="/images/globe.svg" alt="")
span#langtoggle.text-white SL
span#langtoggle.text-white= determinedLanguage === 'sl' ? 'EN' : 'SL'
.col-sm.nav-entry.menu-link
button#dropdownMenuButton1(
type="button"
data-bs-toggle="dropdown"
aria-expanded="false"
)
img.threedots(src="/images/threedots.svg" alt="")
img.threedots.mx-0(src="/images/threedots.svg" alt="")
if menuTextPresent
span.text-white.menutxt MENI
span.text-white.menutxt= t('MENI')
ul.dropdown-menu(aria-labelledby="dropdownMenuButton1")
li
a.dropdown-item(href="/") Iskanje
a.dropdown-item(href="/")= t('Iskanje')
if extractionEnabled
li
a.dropdown-item(href="/luscenje") Luščenje
a.dropdown-item(href="/luscenje")= t('Luščenje')
if dictionariesEnabled
li
a.dropdown-item(href="/slovarji/moji") Urejanje
a.dropdown-item(href="/slovarji/moji")= t('Urejanje')
if consultancyEnabled
li
a.dropdown-item(href="/svetovanje") Svetovanje
a.dropdown-item(href="/svetovanje")= t('Svetovanje')
if user && (user.hasRole('portal admin') || user.hasRole('dictionaries admin'))
li
a.dropdown-item(href="/admin") Administracija
a.dropdown-item(href="/admin")= t('Administracija')
li
a.dropdown-item(href="/pomoc") Pomoč
a.dropdown-item(href="/pomoc")= t('Pomoč')
if user
button#dropdownAccountButton.col-sm.nav-entry.no-border.no-bg.pe-3(
button#dropdownAccountButton.col-sm.nav-entry.no-border.no-bg.me-2rem(
type="button"
data-bs-toggle="dropdown"
aria-expanded="false"
@@ -43,7 +45,7 @@ mixin main-navigation-right(languageToolbarPresent=false, menuTextPresent=false,
// .position-absolute
// .green-dot
if userTextPresent
span.text-white.signintxt.position-relative.left-2 RAČUN
span.text-white.signintxt.position-relative.left-2= t('RAČUN')
ul.dropdown-menu.dropdown-menu-end.py-3.children-pspe-4.children-pt-pb-1.ul-children-hover(
aria-labelledby="dropdownAccountButton"
)
@@ -60,7 +62,7 @@ mixin main-navigation-right(languageToolbarPresent=false, menuTextPresent=false,
.col-3
img(src="/images/cog.svg" alt="")
.col-9
span.text-header-description-gray.d-block Nastavitve
span.text-header-description-gray.d-block= t('Nastavitve')
li.pb-0.mb-0.ps-3
form(action="/users/logout" method="post")
button.profile-menu-button
@@ -68,7 +70,7 @@ mixin main-navigation-right(languageToolbarPresent=false, menuTextPresent=false,
.col-3
img(src="/images/log-out.svg" alt="")
.col-9
span.text-header-description-gray.d-block Odjava
span.text-header-description-gray.d-block= t('Odjava')
else
button#login-static-backdrop-button.col-sm.nav-entry.no-border.no-bg(
href="#"
@@ -78,4 +80,4 @@ mixin main-navigation-right(languageToolbarPresent=false, menuTextPresent=false,
)
img(src="/images/profile.svg" alt="")
if userTextPresent
span.text-white.signintxt.ps-2 PRIJAVA
span.text-white.signintxt.ps-2= t('PRIJAVA')
express/views/components/search-and-filter/advanced-search-modal-area-only.pug
+4 -3
View File
@@ -15,12 +15,13 @@ mixin consultancySM(adminFields=false)
)
//- option.d-none(value="-1")= ' '
each domain in allPrimaryDomains
option(value=domain.id) #{ domain.nameSl }
option(value=domain.id selected=domain.selected) #{ domain.nameSl }
span.advanced-input-label
//- span.advanced-input-label Področje
//- img#area-img(src="/images/chevron-down-darker.svg" alt="")
span#area-suggestions.suggs
//- TODO Miha Stele to himself - good job! You've done it! You've made it!
if adminFields
span#consultant
.d-flex.w-100
@@ -39,5 +40,5 @@ mixin consultancySM(adminFields=false)
.advanced-search-final-options
//- button Počisti filtre
span
button#clear-in-filter-modal.btn.clear-f Počisti filtre
button#search-in-filter-modal.btn.search-btn-a Najdi
button#clear-in-filter-modal.btn.clear-f #{ t('Počisti filtre') }
button#search-in-filter-modal.btn.search-btn-a #{ t('Najdi') }
express/views/components/search-and-filter/advanced-search-modal.pug
+9 -9
View File
@@ -23,9 +23,9 @@
//- input#src-lang-input.box-sizing-content.bg-transparent
select#src-lang-select.select-src-lang-field(multiple="multiple")
each language in sourceLanguages
option(value=language.id) #{ language.nameSl }
option(value=language.id selected=language.selected) #{ language.nameSl }
span.advanced-input-label
//- span.advanced-input-label Izvorni jezik
//- span.advanced-input-label Jezik iskanja
//- img#src-lang-img(src="/images/chevron-down-darker.svg" alt="")
span#src-lang-suggestions.suggs
span#dest-lang
@@ -35,14 +35,14 @@
//- input#dest-lang-input.box-sizing-content.bg-transparent
select#dest-lang-select.select-dest-lang-field(multiple="multiple")
each language in targetLanguages
option(value=language.id) #{ language.nameSl }
option(value=language.id selected=language.selected) #{ language.nameSl }
span.advanced-input-label
//- span.advanced-input-label Ciljni jezik
//- img#dest-lang-img(src="/images/chevron-down-darker.svg" alt="")
span#dest-lang-suggestions.suggs
//- span#src-lang
//- span.sf-label.position-relative
//- span.position-absolute Izvorni jezik
//- span.position-absolute Jezik iskanja
//- .resizable
//- input(placeholder="" type="text")
//- img(src="/images/chevron-down-darker.svg" alt="")
@@ -62,7 +62,7 @@
multiple="multiple"
)
each domain in allPrimaryDomains
option(value=domain.id) #{ domain.nameSl }
option(value=domain.id selected=domain.selected) #{ domain.nameSl }
span.advanced-input-label
//- span.advanced-input-label Področje
//- img#area-img(src="/images/chevron-down-darker.svg" alt="")
@@ -78,7 +78,7 @@
multiple="multiple"
)
each dictionary in allDictionaryNames
option(value=dictionary.id) #{ dictionary.nameSl }
option(value=dictionary.id selected=dictionary.selected) #{ dictionary.nameSl }
span.advanced-input-label
//- span.advanced-input-label Slovar
//- img#dict-img(src="/images/chevron-down-darker.svg" alt="")
@@ -91,7 +91,7 @@
//- input#source-input.box-sizing-content.bg-transparent
select#src-select.select-source-field(multiple="multiple")
each portal in portals
option(value=portal.code) #{ portal.name }
option(value=portal.code selected=portal.selected) #{ portal.name }
span.advanced-input-label
//- span.advanced-input-label Vir
//- img#source-img(src="/images/chevron-down-darker.svg" alt="")
@@ -100,5 +100,5 @@
.advanced-search-final-options
//- button Počisti filtre
span
button#clear-in-filter-modal.btn.clear-f Počisti filtre
button#search-in-filter-modal.btn.search-btn-a Najdi
button#clear-in-filter-modal.btn.clear-f #{ t('Počisti filtre') }
button#search-in-filter-modal.btn.search-btn-a #{ t('Najdi') }
express/views/components/search-and-filter/consultancy-results-content.pug
+10
View File
@@ -0,0 +1,10 @@
-
let resultString = t("rezultatov")
if( consultancyHits == 3 || consultancyHits == 4 ) resultString = t("rezultati")
if( consultancyHits == 2) resultString = t("rezultata")
if( consultancyHits == 1) resultString = t("rezultat")
span.text-header-title-gray
span!= `<a href=${consultancyURL}>${t('Svetovalnica')}</a>&nbsp`
span= `- ${consultancyHits} ${resultString}`
a.mt-minus-p3(href=consultancyURL)
img.ms-2.px-1.mt-minus-p3(src="/images/fi_copy.svg")
express/views/components/search-and-filter/inline-search.pug
+1 -1
View File
@@ -1,6 +1,6 @@
.classic-search-container
.classic-search.border1px-gray-2
input.input-search(type="text" placeholder="Išči")
input#input-search.input-search(type="text" placeholder=t('Išči'))
.position-relative
button#inline-search-btn.border-0.bg-transparent
img(src="/images/search.svg" alt="")
express/views/components/search-and-filter/result-item.pug
+23 -7
View File
@@ -16,9 +16,9 @@ mixin result-item(headword, entry, isLast=false)
a.rl.py-3(href=`/termin/${entry.id}`)
.anchor(id='e-' + entry.id)
.result-item.d-flex.flex-row.w-100
.row.w-100.result-items-row
.col-lg-4
.row.w-100.ls
.row.w-100.result-items-row.g-0
.col-lg-4.px-0
.row.w-100.ls.g-0
.col-10.word-constraint-container
.results-item-headword.d-flex.flex-grow-1.word-constraint.d-flex.flex-direction-column.w-100.flex-nowrap
span.rihw.word-breakable.ps-2.long-text-wrap-r!= headword
@@ -33,9 +33,25 @@ mixin result-item(headword, entry, isLast=false)
.col-2.flex-column.row.rsc
.results-comments.d-inline.me-4.align-top
if slovenianDefinitionExists
img.bgmsg.mb-1(src="/images/message-square-black.svg")
//- tabindex="0"
img.bgmsg.mb-1(
data-bs-toggle="tooltip"
data-bs-title=t('Definicija')
data-bs-container="body"
data-bs-placement="right"
data-tooltip-content=t('Definicija')
src="/images/message-square-black.svg"
)
else if checkAllForeignDefinitions
img.bgmsg.mb-1(src="/images/message-square.svg")
//- tabindex="0"
img.bgmsg.mb-1(
data-bs-toggle="tooltip"
data-bs-title=t('Definicija')
data-bs-container="body"
data-bs-placement="right"
data-tooltip-content=t('Definicija')
src="/images/message-square.svg"
)
.col-lg-4.d-flex.px-0
//- .results-foreign-languages.d-inline-block.align-top
ul.mt-1.px-0
@@ -67,8 +83,8 @@ mixin result-item(headword, entry, isLast=false)
li.results-foreign-term.align-items-top.d-flex
p.word-breakable.text-truncate.pb-0.mb-0.lh-18px.syn-h.long-text-wrap-r!= synonym
.col-lg-4
.row
.col-lg-4.px-0
.row.g-0.px-2
.col
.results-keywords.d-flex.flex-grow-1.ms-2
span.res-domain= domain
express/views/components/search-and-filter/result-panel-decision-mixin.pug
+3 -3
View File
@@ -5,12 +5,12 @@ mixin decision(sel)
a#headword.m-auto.d-inline-block.text-header-title-gray(
href="#"
class=sel == 0 ? 'selected' : ''
) TERMIN
)= t('TERMIN')
a#translation.m-auto.ps-3.d-inline-block.text-header-title-gray(
href="#"
class=sel == 1 ? 'selected' : ''
) TUJI TERMIN
)= t('TUJI TERMIN')
a#other.m-auto.ps-3.d-inline-block.text-header-title-gray(
href="#"
class=sel == 2 ? 'selected' : ''
) DRUGO
)= t('DRUGO')
express/views/components/search-and-filter/result-panel.pug
+20 -9
View File
@@ -8,27 +8,38 @@ mixin result-section(list, title)
mixin result-sections
+result-section(entriesByCategory.uncategorized, "")
+result-section(entriesByCategory.byTerm, "ISKANI NIZ JE BIL NAJDEN <b class='results-secton-title fw-700'>V IZTOČNICAH</b> SLOVARSKIH SESTAVKOV")
+result-section(entriesByCategory.byForeignTerm, "ISKANI NIZ JE BIL NAJDEN <b class='results-secton-title fw-700'>V TUJEJEZIČNIH USTREZNIKIH</b> SLOVARSKIH SESTAVKOV")
+result-section(entriesByCategory.byOther, "ISKANI NIZ JE BIL NAJDEN <b class='results-secton-title fw-700'>V DRUGI VSEBINI</b> SLOVARSKIH SESTAVKOV")
+result-section(entriesByCategory.byTerm, `${t('ISKANI NIZ JE BIL NAJDEN')} <b class='results-secton-title fw-700'>${t('V IZTOČNICAH')}</b> ${t('SLOVARSKIH SESTAVKOV')}`)
+result-section(entriesByCategory.byForeignTerm, `${t('ISKANI NIZ JE BIL NAJDEN')} <b class='results-secton-title fw-700'>${t('V TUJEJEZIČNIH USTREZNIKIH')}</b> ${t('SLOVARSKIH SESTAVKOV')}`)
+result-section(entriesByCategory.byOther, `${t('ISKANI NIZ JE BIL NAJDEN')} <b class='results-secton-title fw-700'>${t('V DRUGI VSEBINI')}</b> ${t('SLOVARSKIH SESTAVKOV')}`)
mixin result-panel(rpList)
#res-panel.results-root.w-100.ms-0
#chevrons-left.d-flex
.header-container-divider-left
h1#site-heading Seznam zadetkov
h1#site-heading= t('Seznam zadetkov')
hr#disposable-break.mt-0
//- include ./result-panel-decision-mixin
//- +decision(0)
include /utilities/pager
.results-quickstats.row.align-items-center
.row.pe-0.align-items-center
.col-md-6
span.text-header-title-gray Rezultati: #{ numberOfAllHits }
.col-md-6.mx-auto.text-center.d-flex.justify-content-end.pe-0
include /utilities/pager
+pager(page)
.col-md-3
span.text-header-title-gray= t('Rezultati: ') + numberOfAllHits
.col-md-5
if (consultancyHits > 0)
#consulancy-results-container
include /components/search-and-filter/consultancy-results-content
.col-md-4.mx-auto.text-center.d-flex.justify-content-end.pe-0
+pager(page, 'pagination-top')
#results-data.results-data.mt-4
include ./result-item
+result-sections
.results-quickstats.row.align-items-center.mt-4
.row.pe-0.align-items-center
.col-md-6
span.text-header-title-gray= t('Rezultati: ') + numberOfAllHits
.col-md-6.mx-auto.text-center.d-flex.justify-content-end.pe-0
+pager(page, 'pagination-bottom')
express/views/components/search-and-filter/search-filter-modal.pug
+4 -4
View File
@@ -8,7 +8,7 @@ section.filter-modal-root
.modal-content
.modal-header.flex-wrap.pb-2
h5#modal-filter-label.modal-title.maincolor-text
| #{ "PLACEHOLDER" }
| #{ "Filter" }
button.btn-close(
type="button"
data-bs-dismiss="modal"
@@ -16,13 +16,13 @@ section.filter-modal-root
)
.flex.w-100.search-modal-header-root
span.search-modal-filter
input(type="text")
span
input#filterSfmText.rm-outline.onEnterListener(type="text")
button#filter-sfm.no-border.no-bg
img(src="/images/search_blue.svg" alt="")
span.d-flex.flex-grow-1.align-content-center
a#ccf.clear-filter-modal-section(href="#")
img(src="/images/square-minus.svg" alt="")
span POČISTI FILTRE
span.ps-2 POČISTI FILTRE
.modal-body.pb-2
ul#modal-list.nav-modal-section-content.mb-0.pb-0
// Added dynamically...
express/views/components/search-and-filter/search-filter-navigation-mixin.pug
+12 -12
View File
@@ -4,15 +4,15 @@ mixin sideMenuEntry(id, selectMoreId , title, content, contentRoot, disabledSect
.nav-section-header
span(class=disabledSection ? 'disabled-opacity' : '')= title
span.btn-area
button.btn.btn-primary(
button.border-0(
id=selectMoreId
type="button"
data-bs-toggle="modal"
data-bs-target="#modal-filter"
disabled=disabledSection
)
span.select-more-text IZBERI VEČ
div
span.select-more-text= t('IZBERI VEČ')
.ps-2
img(src="/images/fi_copy.svg" alt="")
ul.nav-section-content(id=id)
//- root struct check in case of empty results
@@ -35,7 +35,7 @@ mixin sideMenuEntry(id, selectMoreId , title, content, contentRoot, disabledSect
if isAtLeastOneChecked
a.showall(href="#" id='show-all-' + id)
img(src="/images/chevron-left-blue.svg" alt="")
span PRIKAŽI VSE
span= t('PRIKAŽI VSE')
mixin sfSideNavigation(sideNavigationData)
.admin-nav
@@ -46,17 +46,17 @@ mixin sfSideNavigation(sideNavigationData)
src="/images/burger-menu-button-icon.svg"
alt="Meni"
)
span#nav-title.nav-title Iskanje po slovarjih
span#nav-title.nav-title= t('Iskanje po slovarjih')
#mobile-right-holder
nav
.admin-nav-content.slidable.sf-min-h.nav-bg.ps-2rem.sf-correct
.search-filter-nav-content.w24rem.me-0.ps-2rem
.search-filter-nav-content.w24rem.me-0.ps-2rem.pe-0
.slidable-list.scroller-style
a#clear-filters.clear-filter-section.d-flex(href="#")
img.align-self-center(src="/images/square-minus.svg" alt="")
span.fs-075rem.fw-400 POČISTI FILTRE
+sideMenuEntry("src-lang-side", "select-src-langs", "Izvorni jeziki", sideNavigationData.sourceLanguages, sideNavigationData, disabledSideMenuFilters.sourceLanguages)
+sideMenuEntry("dest-lang-side", "select-dest-langs", "Ciljni jeziki", sideNavigationData.targetLanguages, sideNavigationData, disabledSideMenuFilters.targetLanguages)
+sideMenuEntry("domain-side", "select-domains", "Področja", sideNavigationData.primaryDomains, sideNavigationData, disabledSideMenuFilters.primaryDomains)
+sideMenuEntry("dict-side", "select-dicts", "Slovarji", sideNavigationData.dictionaries, sideNavigationData, disabledSideMenuFilters.dictionaries)
+sideMenuEntry("source-side", "select-sources", "Viri", sideNavigationData.sources, sideNavigationData, disabledSideMenuFilters.sources)
span.ps-2.fs-075rem.fw-400= t('POČISTI FILTRE')
+sideMenuEntry("src-lang-side", "select-src-langs", t("Jeziki iskanja"), sideNavigationData.sourceLanguages, sideNavigationData, disabledSideMenuFilters.sourceLanguages)
+sideMenuEntry("dest-lang-side", "select-dest-langs", t("Ciljni jeziki"), sideNavigationData.targetLanguages, sideNavigationData, disabledSideMenuFilters.targetLanguages)
+sideMenuEntry("domain-side", "select-domains", t("Področja"), sideNavigationData.primaryDomains, sideNavigationData, disabledSideMenuFilters.primaryDomains)
+sideMenuEntry("dict-side", "select-dicts", t("Slovarji"), sideNavigationData.dictionaries, sideNavigationData, disabledSideMenuFilters.dictionaries)
+sideMenuEntry("source-side", "select-sources", t("Viri"), sideNavigationData.sources, sideNavigationData, disabledSideMenuFilters.sources)
express/views/components/search-and-filter/search-filter-navigation.pug
+12 -12
View File
@@ -2,24 +2,24 @@
.admin-nav-mobile
button#nav-button.nav-button
img#burger-menu-img(src="/images/burger-menu-button-icon.svg" alt="Meni")
span.nav-title Filtri
span.nav-title= t('Filtri')
nav
.admin-nav-content.slidable
.admin-nav-content.slidable.scroller-style
.search-filter-nav-content
a.clear-filter-section(href="#")
img(src="/images/square-minus.svg" alt="")
span POČISTI FILTRE
span= t('POČISTI FILTRE')
.nav-section
hr
.nav-section-header
span Izvorni jeziki
span= t('Jeziki iskanja')
span.btn-area
button.btn.btn-primary(
type="button"
data-bs-toggle="modal"
data-bs-target="#modal-filter"
)
span.select-more-text IZBERI VEČ
span.select-more-text= t('IZBERI VEČ')
div
img(src="/images/fi_copy.svg" alt="")
ul.nav-section-content
@@ -28,37 +28,37 @@
a#sl(href="#")
div
img(src="/images/chevron-right.svg" alt="")
span.nav-section-content-desc Slovenščina
span.nav-section-content-desc= t('Slovenščina')
span 461
li
a#hr(href="#")
div
img(src="/images/chevron-right.svg" alt="")
span.nav-section-content-desc Hrvaščina
span.nav-section-content-desc= t('Hrvaščina')
span 461
li
a#it(href="#")
div
img(src="/images/chevron-right.svg" alt="")
span.nav-section-content-desc Italijanščina
span.nav-section-content-desc= t('Italijanščina')
span 461
li
a(href="#")
div
img(src="/images/chevron-right.svg" alt="")
span.nav-section-content-desc Slovenščina
span.nav-section-content-desc= t('Slovenščina')
span 461
.nav-section
hr
.nav-section-header
span Slovarji
span= t('Slovarji')
span.btn-area
button.btn.btn-primary(
type="button"
data-bs-toggle="modal"
data-bs-target="#modal-filter"
)
span.select-more-text IZBERI VEČ
span.select-more-text= t('IZBERI VEČ')
div
img(src="/images/fi_copy.svg" alt="")
ul.nav-section-content
@@ -67,7 +67,7 @@
a(href="#")
div
img(src="/images/chevron-right.svg" alt="")
span.nav-section-content-desc Nemško-slovenski slovar tehnike in naravoslovja
span.nav-section-content-desc= t('Nemško-slovenski slovar tehnike in naravoslovja')
span 111
li
a(href="#")
express/views/components/search-and-filter/search-with-primary-domain-filter.pug
+4 -3
View File
@@ -1,4 +1,4 @@
mixin searchWithPrimaryDomainFilter(formId, searchId, searchBtnId, initialMarginClass="mt-3")
mixin searchWithPrimaryDomainFilter(formId, searchId, searchBtnId, initialMarginClass="mt-3", filledText="")
form.needs-validation.w-100(id=formId class=initialMarginClass)
- let checkrightSection = headerContent && headerContent.buttons && headerContent.buttons.length
.header-consultancy-divider.d-flex.d-column.w-100.row.g-0.ms-0
@@ -12,9 +12,10 @@ mixin searchWithPrimaryDomainFilter(formId, searchId, searchBtnId, initialMargin
.search-bar.height-46p(tabindex="0")
button.searchbar-icon-container(id=searchBtnId type="submit")
img.search_icon(src="/images/search.svg" alt="OK")
input#search-query.search-input(
input#search-query.search-input.pdf(
type="text"
placeholder=isDictionaryListPage ? 'Ime slovarja' : 'Vpišite iskalni niz'
placeholder=isDictionaryListPage ? t('Ime slovarja') : t('Vpišite iskalni niz')
value=filledText
)
button#keyboard.search-button-keyboard
span
express/views/components/search-and-filter/small-device-search.pug
+1 -1
View File
@@ -12,7 +12,7 @@ mixin mini-searchbar
img.search_icon(src="/images/search.svg" alt="OK")
input#search-query.search-input.focused-for-enter.fw-300.placeholder-gray(
type="text"
placeholder="Vpišite iskalni niz"
placeholder=t('Vpišite iskalni niz')
)
button#keyboard.search-button-keyboard
span